symfony · yalit · May 10, 2024 · May 10, 2024 · May 10, 2024 · May 11, 2024
diff --git a/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php b/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
@@ -15,14 +15,12 @@
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
+use Symfony\Component\Validator\Password\PasswordStrengthEstimatorInterface;
 
 final class PasswordStrengthValidator extends ConstraintValidator
 {
-    /**
-     * @param (\Closure(string):PasswordStrength::STRENGTH_*)|null $passwordStrengthEstimator
-     */
     public function __construct(
-        private readonly ?\Closure $passwordStrengthEstimator = null,
+        private readonly PasswordStrengthEstimatorInterface $passwordStrengthEstimator
     ) {
     }
 
@@ -39,8 +37,8 @@ public function validate(#[\SensitiveParameter] mixed $value, Constraint $constr
         if (!\is_string($value) && !$value instanceof \Stringable) {
             throw new UnexpectedValueException($value, 'string');
         }
-        $passwordStrengthEstimator = $this->passwordStrengthEstimator ?? self::estimateStrength(...);
-        $strength = $passwordStrengthEstimator((string) $value);
+
+        $strength = $this->passwordStrengthEstimator->estimateStrength((string) $value);
 
         if ($strength < $constraint->minScore) {
             $this->context->buildViolation($constraint->message)
@@ -49,43 +47,4 @@ public function validate(#[\SensitiveParameter] mixed $value, Constraint $constr
                 ->addViolation();
         }
     }
-
-    /**
-     * Returns the estimated strength of a password.
-     *
-     * The higher the value, the stronger the password.
-     *
-     * @return PasswordStrength::STRENGTH_*
-     */
-    private static function estimateStrength(#[\SensitiveParameter] string $password): int
-    {
-        if (!$length = \strlen($password)) {
-            return PasswordStrength::STRENGTH_VERY_WEAK;
-        }
-        $password = count_chars($password, 1);
-        $chars = \count($password);
-
-        $control = $digit = $upper = $lower = $symbol = $other = 0;
-        foreach ($password as $chr => $count) {
-            match (true) {
-                $chr < 32 || 127 === $chr => $control = 33,
-                48 <= $chr && $chr <= 57 => $digit = 10,
-                65 <= $chr && $chr <= 90 => $upper = 26,
-                97 <= $chr && $chr <= 122 => $lower = 26,
-                128 <= $chr => $other = 128,
-                default => $symbol = 33,
-            };
-        }
-
-        $pool = $lower + $upper + $digit + $symbol + $control + $other;
-        $entropy = $chars * log($pool, 2) + ($length - $chars) * log($chars, 2);
-
-        return match (true) {
-            $entropy >= 120 => PasswordStrength::STRENGTH_VERY_STRONG,
-            $entropy >= 100 => PasswordStrength::STRENGTH_STRONG,
-            $entropy >= 80 => PasswordStrength::STRENGTH_MEDIUM,
-            $entropy >= 60 => PasswordStrength::STRENGTH_WEAK,
-            default => PasswordStrength::STRENGTH_VERY_WEAK,
-        };
-    }
 }
diff --git a/src/Symfony/Component/Validator/Password/PasswordStrengthEstimator.php b/src/Symfony/Component/Validator/Password/PasswordStrengthEstimator.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Symfony\Component\Validator\Password;
+
+use Stringable;
+use Symfony\Component\Validator\Constraints\PasswordStrength;
+
+class PasswordStrengthEstimator implements PasswordStrengthEstimatorInterface
+{
+    public function estimateStrength(#[\SensitiveParameter] string|Stringable $password): int
+    {
+        if (!$length = \strlen($password)) {
+            return PasswordStrength::STRENGTH_VERY_WEAK;
+        }
+        $password = count_chars($password, 1);
+        $chars = \count($password);
+
+        $control = $digit = $upper = $lower = $symbol = $other = 0;
+        f
8000
oreach ($password as $chr => $count) {
+            match (true) {
+                $chr < 32 || 127 === $chr => $control = 33,
+                48 <= $chr && $chr <= 57 => $digit = 10,
+                65 <= $chr && $chr <= 90 => $upper = 26,
+                97 <= $chr && $chr <= 122 => $lower = 26,
+                128 <= $chr => $other = 128,
+                default => $symbol = 33,
+            };
+        }
+
+        $pool = $lower + $upper + $digit + $symbol + $control + $other;
+        $entropy = $chars * log($pool, 2) + ($length - $chars) * log($chars, 2);
+
+        return match (true) {
+            $entropy >= 120 => PasswordStrength::STRENGTH_VERY_STRONG,
+            $entropy >= 100 => PasswordStrength::STRENGTH_STRONG,
+            $entropy >= 80 => PasswordStrength::STRENGTH_MEDIUM,
+            $entropy >= 60 => PasswordStrength::STRENGTH_WEAK,
+            default => PasswordStrength::STRENGTH_VERY_WEAK,
+        };
+    }
+}
diff --git a/src/Symfony/Component/Validator/Password/PasswordStrengthEstimatorInterface.php b/src/Symfony/Component/Validator/Password/PasswordStrengthEstimatorInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Validator\Password;
+
+use Stringable;
+use Symfony\Component\Validator\Constraints\PasswordStrength;
+
+interface PasswordStrengthEstimatorInterface
+{
+    /**
+     * Returns the estimated strength of a password.
+     *
+     * The higher the value, the stronger the password.
+     *
+     * @return PasswordStrength::STRENGTH_*
+     */
+    public function estimateStrength(#[\SensitiveParameter] string|Stringable $password): int;
+}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/PasswordStrengthValidatorTest.php
@@ -13,14 +13,15 @@
 
 use Symfony\Component\Validator\Constraints\PasswordStrength;
 use Symfony\Component\Validator\Constraints\PasswordStrengthValidator;
+use Symfony\Component\Validator\Password\PasswordStrengthEstimator;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 use Symfony\Component\Validator\Tests\Constraints\Fixtures\StringableValue;
 
 class PasswordStrengthValidatorTest extends ConstraintValidatorTestCase
 {
     protected function createValidator(): PasswordStrengthValidator
     {
-        return new PasswordStrengthValidator();
+        return new PasswordStrengthValidator(new PasswordStrengthEstimator());
     }
 
     /**

diff --git a/src/Symfony/Component/Validator/Tests/Password/PasswordStrengthEstimatorTest.php b/src/Symfony/Component/Validator/Tests/Password/PasswordStrengthEstimatorTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Symfony\Component\Validator\Tests\Password;
+
+use PHPUnit\Framework\TestCase;
+use Stringable;
+use Symfony\Component\Validator\Constraints\PasswordStrength;
+use Symfony\Component\Validator\Password\PasswordStrengthEstimator;
+use Symfony\Component\Validator\Tests\Constraints\Fixtures\StringableValue;
+
+class PasswordStrengthEstimatorTest extends TestCase
+{
+    /** @dataProvider getPasswords */
+    public function testEstimateStrength(string|Stringable $password, int $expectedStrength): void
+    {
+        self::assertSame($expectedStrength, (new PasswordStrengthEstimator())->estimateStrength($password));
+    }
+
+    /** @return array<string, array<string, int>> */
+    public function getPasswords(): iterable
+    {
+        yield ['How-is-this', PasswordStrength::STRENGTH_WEAK];
+        yield ['Reasonable-pwd', PasswordStrength::STRENGTH_MEDIUM];
+        yield ['This 1s a very g00d Pa55word! ;-)', PasswordStrength::STRENGTH_VERY_STRONG];
+        yield ['pudding-smack-👌🏼-fox-😎', PasswordStrength::STRENGTH_VERY_STRONG];
+        yield [new StringableValue('How-is-this'), PasswordStrength::STRENGTH_WEAK];
+    }
+}