Corrections as suggested

Spomky · Spomky · commit 8fe91370c905 · 2023-03-30T14:28:31.000+02:00
diff --git a/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php b/src/Symfony/Component/Validator/Constraints/PasswordStrengthValidator.php
@@ -18,6 +18,9 @@
 
 final class PasswordStrengthValidator extends ConstraintValidator
 {
+    /**
+     * @param (\Closure(string):PasswordStrength::STRENGTH_*)|null $passwordStrengthEstimator
+     */
     public function __construct(
         private readonly ?\Closure $passwordStrengthEstimator = null,
     ) {
@@ -36,7 +39,7 @@ public function validate(#[\SensitiveParameter] mixed $value, Constraint $constr
         if (!\is_string($value)) {
             throw new UnexpectedValueException($value, 'string');
         }
-        $passwordStrengthEstimator = $this->passwordStrengthEstimator ?? $this->estimate(...);
+        $passwordStrengthEstimator = $this->passwordStrengthEstimator ?? self::estimateStrength(...);
         $strength = $passwordStrengthEstimator($value);
 
         if ($strength < $constraint->minScore) {
@@ -47,26 +50,22 @@ public function validate(#[\SensitiveParameter] mixed $value, Constraint $constr
     }
 
     /**
-     * Returns the estimated strength of a password between 0 and 4.
+     * Returns the estimated strength of a password.
      * The higher the value, the stronger the password.
      *
-     * @return int<0, 4>
+     * @return PasswordStrength::STRENGTH_*
      */
-    private static function estimate(#[\SensitiveParameter] string $password): int
+    private static function estimateStrength(#[\SensitiveParameter] string $password): int
     {
-        $criteria = [
-            ['score' => PasswordStrength::STRENGTH_VERY_STRONG, 'minEntropy' => 120],
-            ['score' => PasswordStrength::STRENGTH_STRONG, 'minEntropy' => 100],
-            ['score' => PasswordStrength::STRENGTH_REASONABLE, 'minEntropy' => 80],
-            ['score' => PasswordStrength::STRENGTH_WEAK, 'minEntropy' => 60],
-            ['score' => PasswordStrength::STRENGTH_VERY_WEAK, 'minEntropy' => 0],
-        ];
         $uniqueChars = array_unique(str_split($password));
         $entropy = log(\count($uniqueChars) ** \strlen($password), 2);
-        $fulfilledCriteria = array_filter($criteria, function (array $option) use ($entropy) {
-            return $entropy >= $option['minEntropy'];
-        });
 
-        return current($fulfilledCriteria)['score'] ?? PasswordStrength::STRENGTH_VERY_WEAK;
+        return match (true) {
+            $entropy >= 120 => PasswordStrength::STRENGTH_VERY_STRONG,
+            $entropy >= 100 => PasswordStrength::STRENGTH_STRONG,
+            $entropy >= 80 => PasswordStrength::STRENGTH_REASONABLE,
+            $entropy >= 60 => PasswordStrength::STRENGTH_WEAK,
+            default => PasswordStrength::STRENGTH_VERY_WEAK,
+        };
     }
 }
