[8.x] Added ability to define extra default password rules

src/Illuminate/Validation/Rules/Password.php

@@ -79,6 +79,13 @@ class Password implements Rule, DataAwareRule, ValidatorAwareRule
      */
     protected $compromisedThreshold = 0;
 
+    /**
+     * Additional validation rules that should be merged into the default rules during validation.
+     *
+     * @var array
+     */
+    protected $customRules = [];
+
     /**
      * The failure messages, if any.
      *
@@ -259,6 +266,19 @@ public function symbols()
         return $this;
     }
 
+    /**
+     * Specify additional validation rules that should be merged with the default rules during validation.
+     *
+     * @param  string|array  $rules
+     * @return $this
+     */
+    public function rules($rules)
+    {
+        $this->customRules = Arr::wrap($rules);
+
+        return $this;
+    }
+
     /**
      * Determine if the validation rule passes.
      *
@@ -272,7 +292,7 @@ public function passes($attribute, $value)
 
         $validator = Validator::make(
             $this->data,
-            [$attribute => 'string|min:'.$this->min],
+            [$attribute => array_merge(['string', 'min:'.$this->min], $this->customRules)],
             $this->validator->customMessages,
             $this->validator->customAttributes
         )->after(function ($validator) use ($attribute, $value) {

tests/Validation/ValidationPasswordRuleTest.php

@@ -269,6 +269,41 @@ public function testItPassesWithValidDataIfTheSameValidationRulesAreReused()
         $this->assertTrue($v1->passes());
     }
 
+    public function testPassesWithCustomRules()
+    {
+        $closureRule = function ($attribute, $value, $fail) {
+            if ($value !== 'aa') {
+                $fail('Custom rule closure failed');
+            }
+        };
+
+        $ruleObject = new class implements \Illuminate\Contracts\Validation\Rule
+        {
+            public function passes($attribute, $value)
+            {
+                return $value === 'aa';
+            }
+
+            public function message()
+            {
+                return 'Custom rule object failed';
+            }
+        };
+
+        $this->passes(Password::min(2)->rules($closureRule), ['aa']);
+        $this->passes(Password::min(2)->rules([$closureRule]), ['aa']);
+        $this->passes(Password::min(2)->rules($ruleObject), ['aa']);
+        $this->passes(Password::min(2)->rules([$closureRule, $ruleObject]), ['aa']);
+
+        $this->fails(Password::min(2)->rules($closureRule), ['ab'], [
+            'Custom rule closure failed',
+        ]);
+
+        $this->fails(Password::min(2)->rules($ruleObject), ['ab'], [
+            'Custom rule object failed',
+        ]);
+    }
+
     protected function passes($rule, $values)
     {
         $this->assertValidationRules($rule, $values, true, []);