From f63faee158401cb65c733495f0a0c6c87f99ab56 Mon Sep 17 00:00:00 2001
From: Jolien Trog <jolien.trog@icinga.com>
Date: Thu, 28 Aug 2025 15:51:04 +0200
Subject: [PATCH] codereview

---
 application/forms/Config/User/UserForm.php                    | 4 +++-
 library/Icinga/Application/ApplicationBootstrap.php           | 4 ++--
 .../Icinga/Application/ProvidedHook/DefaultPasswordPolicy.php | 2 +-
 .../{NonePasswordPolicy.php => NoPasswordPolicy.php}          | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)
 rename library/Icinga/Application/ProvidedHook/{NonePasswordPolicy.php => NoPasswordPolicy.php} (90%)

diff --git a/application/forms/Config/User/UserForm.php b/application/forms/Config/User/UserForm.php
index 442876fd6..8d8a591e7 100644
--- a/application/forms/Config/User/UserForm.php
+++ b/application/forms/Config/User/UserForm.php
@@ -5,6 +5,7 @@ namespace Icinga\Forms\Config\User;
 
 use Icinga\Application\Config;
 use Icinga\Application\Hook\ConfigFormEventsHook;
+use Icinga\Application\ProvidedHook\DefaultPasswordPolicy;
 use Icinga\Authentication\PasswordValidator;
 use Icinga\Data\Filter\Filter;
 use Icinga\Forms\RepositoryForm;
@@ -22,7 +23,8 @@ class UserForm extends RepositoryForm
         $passwordPolicyObject = null;
         $passwordPolicy = Config::app()->get(
             'global',
-            'password_policy'
+            'password_policy',
+            DefaultPasswordPolicy::class
         );
         if (isset($passwordPolicy)) {
             $passwordPolicyObject = new $passwordPolicy();
diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index cbe04b09a..b290e463a 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -8,7 +8,7 @@ use ErrorException;
 use Exception;
 use Icinga\Application\ProvidedHook\DbMigration;
 use Icinga\Application\ProvidedHook\DefaultPasswordPolicy;
-use Icinga\Application\ProvidedHook\NonePasswordPolicy;
+use Icinga\Application\ProvidedHook\NoPasswordPolicy;
 use ipl\I18n\GettextTranslator;
 use ipl\I18n\StaticTranslator;
 use LogicException;
@@ -743,7 +743,7 @@ abstract class ApplicationBootstrap
     {
         Hook::register('DbMigration', DbMigration::class, DbMigration::class);
         Hook::register('passwordpolicy', DefaultPasswordPolicy::class, DefaultPasswordPolicy::class);
-        Hook::register('passwordpolicy', NonePasswordPolicy::class, NonePasswordPolicy::class);
+        Hook::register('passwordpolicy', NoPasswordPolicy::class, NoPasswordPolicy::class);
 
         return $this;
     }
diff --git a/library/Icinga/Application/ProvidedHook/DefaultPasswordPolicy.php b/library/Icinga/Application/ProvidedHook/DefaultPasswordPolicy.php
index ad611cccd..3feb2a99d 100644
--- a/library/Icinga/Application/ProvidedHook/DefaultPasswordPolicy.php
+++ b/library/Icinga/Application/ProvidedHook/DefaultPasswordPolicy.php
@@ -28,7 +28,7 @@ class DefaultPasswordPolicy implements PasswordPolicyHook
     public function getDescription(): string
     {
         return $this->translate(
-            'Password requirements: minimum 12 characters,' .
+            'Password requirements: minimum 12 characters, ' .
             'at least 1 number, 1 special character, uppercase and lowercase letters.'
         );
     }
diff --git a/library/Icinga/Application/ProvidedHook/NonePasswordPolicy.php b/library/Icinga/Application/ProvidedHook/NoPasswordPolicy.php
similarity index 90%
rename from library/Icinga/Application/ProvidedHook/NonePasswordPolicy.php
rename to library/Icinga/Application/ProvidedHook/NoPasswordPolicy.php
index 60ac8674b..b4d109b5f 100644
--- a/library/Icinga/Application/ProvidedHook/NonePasswordPolicy.php
+++ b/library/Icinga/Application/ProvidedHook/NoPasswordPolicy.php
@@ -9,9 +9,10 @@ use ipl\I18n\Translation;
 /**
  * None Password Policy to validate all passwords
  */
-class NonePasswordPolicy implements PasswordPolicyHook
+class NoPasswordPolicy implements PasswordPolicyHook
 {
     use Translation;
+
     public function getName(): string
     {
         return $this->translate('None');