Merge d3a24cb into 44bf0e2

langleyfoxall · Oct 31, 2018 · bd081f0 · bd081f0
2 parents 44bf0e2 + d3a24cb
commit bd081f0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/PasswordRules.php b/src/PasswordRules.php
@@ -36,6 +36,23 @@ public static function changePassword($username, $oldPassword = null)
         return $rules;
     }
 
+    public static function optionallyChangePassword($username, $oldPassword = null)
+    {
+        $rules = self::changePassword($username, $oldPassword);
+
+        $rules = array_merge($rules, [
+            'nullable',
+        ]);
+
+        foreach ($rules as $key => $rule) {
+            if (is_string($rule) && $rule === 'required') {
+                unset($rules[$key]);
+            }
+        }
+
+        return $rules;
+    }
+
     public static function login()
     {
         return [

diff --git a/tests/Unit/PasswordRulesTest.php b/tests/Unit/PasswordRulesTest.php
@@ -14,6 +14,8 @@ private function getPasswordRuleSets()
             PasswordRules::register('username'),
             PasswordRules::changePassword('username', 'oldPassword'),
             PasswordRules::changePassword('username'),
+            PasswordRules::optionallyChangePassword('username', 'oldPassword'),
+            PasswordRules::optionallyChangePassword('username'),
             PasswordRules::login(),
         ];
     }