[12.x] Fix required and sometimes validation of Password rule (#58034)

* Fix required and sometimes validation options to Password rule

* Update password validation tests for required and sometimes rules

---------

Co-authored-by: cuong.tt <[email protected]>

Author: mrvipchien

src/Illuminate/Validation/Rules/Password.php

@@ -44,6 +44,20 @@ class Password implements Rule, DataAwareRule, ValidatorAwareRule
      */
     protected $max;
 
+    /**
+     * If the password is required.
+     *
+     * @var bool
+     */
+    protected $required = false;
+
+    /**
+     * If the password should only be validated when present.
+     *
+     * @var bool
+     */
+    protected $sometimes = false;
+
     /**
      * If the password requires at least one uppercase and one lowercase letter.
      *
@@ -155,21 +169,29 @@ public static function default()
     /**
      * Get the default configuration of the password rule and mark the field as required.
      *
-     * @return array
+     * @return static
      */
     public static function required()
     {
-        return ['required', static::default()];
+        $password = static::default();
+
+        $password->required = true;
+
+        return $password;
     }
 
     /**
      * Get the default configuration of the password rule and mark the field as sometimes being required.
      *
-     * @return array
+     * @return static
      */
     public static function sometimes()
     {
-        return ['sometimes', static::default()];
+        $password = static::default();
+
+        $password->sometimes = true;
+
+        return $password;
     }
 
     /**
@@ -312,6 +334,8 @@ public function passes($attribute, $value)
         $validator = Validator::make(
             $this->data,
             [$attribute => [
+                ...($this->required ? ['required'] : []),
+                ...($this->sometimes ? ['sometimes'] : []),
                 'string',
                 'min:'.$this->min,
                 ...($this->max ? ['max:'.$this->max] : []),

tests/Validation/ValidationPasswordRuleTest.php

@@ -237,14 +237,14 @@ public function testItCanSetDefaultUsing()
 
         $this->passes(Password::default(), ['abcd', '454qb^', '接2133手田']);
         $this->assertSame($password, Password::default());
-        $this->assertSame(['required', $password], Password::required());
-        $this->assertSame(['sometimes', $password], Password::sometimes());
+        $this->assertInstanceOf(Password::class, Password::required());
+        $this->assertInstanceOf(Password::class, Password::sometimes());
 
         Password::defaults($password2);
         $this->passes(Password::default(), ['Nn', 'Mn', 'âA']);
         $this->assertSame($password2, Password::default());
-        $this->assertSame(['required', $password2], Password::required());
-        $this->assertSame(['sometimes', $password2], Password::sometimes());
+        $this->assertInstanceOf(Password::class, Password::required());
+        $this->assertInstanceOf(Password::class, Password::sometimes());
     }
 
     public function testItCannotSetDefaultUsingGivenString()
@@ -375,6 +375,74 @@ public function testCanRetrieveAllRulesApplied()
         ]);
     }
 
+    public function testRequired()
+    {
+        $this->fails(Password::required(), [null], [
+            'validation.required',
+        ]);
+
+        $this->passes(Password::required(), ['12345678', 'password123']);
+
+        $this->fails([Password::required()], ['short'], [
+            'validation.min.string',
+        ]);
+
+        $this->passes(Password::required()->mixedCase()->numbers(), ['Password1']);
+
+        // Ensure it still correct when using array
+        $this->passes([Password::required()], ['12345678', 'password123']);
+
+        $this->fails([Password::required()], ['short'], [
+            'validation.min.string',
+        ]);
+
+        $this->passes(['string', Password::required()], ['12345678', 'password123']);
+
+        $this->passes([Password::required()->mixedCase()->numbers()], ['Password1']);
+
+        // Test with custom defaults
+        Password::defaults(Password::min(6)->letters());
+
+        $this->fails(Password::required(), [null], [
+            'validation.required',
+        ]);
+
+        $this->passes(Password::required(), ['Password123', 'password123']);
+        $this->passes([Password::required()], ['Password123', 'password123']);
+    }
+
+    public function testSometimes()
+    {
+        $this->fails(Password::sometimes(), ['short'], [
+            'validation.min.string',
+        ]);
+
+        $this->passes(Password::sometimes(), ['12345678', 'password123']);
+
+        $this->fails([Password::sometimes()], ['12345'], [
+            'validation.min.string',
+        ]);
+
+        $this->passes(Password::sometimes()->mixedCase()->numbers(), ['Password1']);
+
+        // Ensure it still correct when using array
+        $this->passes([Password::sometimes()], ['12345678', 'password123']);
+
+        $this->fails([Password::sometimes()], ['12345'], [
+            'validation.min.string',
+        ]);
+
+        $this->passes(['string', Password::sometimes()], ['12345678', 'password123']);
+
+        $this->passes([Password::sometimes()->mixedCase()->numbers()], ['Password1']);
+
+        // Test with custom defaults
+        Password::defaults(Password::min(6)->letters());
+
+        $this->passes(Password::sometimes(), ['Password123', 'password123']);
+        $this->passes([Password::sometimes()], ['Password123', 'password123']);
+    }
+
     protected function passes($rule, $values)
     {
         $this->assertValidationRules($rule, $values, true, []);