bug #60270 [Validator] [WordCount] Treat 0 as one character word and do not exclude it (sidz)

fabpot · fabpot · commit ff10bca4eaaf · 2025-04-27T17:48:28.000+02:00
This PR was squashed before being merged into the 7.2 branch. Discussion ---------- [Validator] [WordCount] Treat 0 as one character word and do not exclude it | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | no | License | MIT New **WordCount** validator has been introduced in the Symfony 7.2 but it has an issue and treats sentence ended on zero (0) as contains an empty string. This PR adds a callback function into `array_filter` to fix the issue. Commits ------- 6fded36 [Validator] [WordCount] Treat 0 as one character word and do not exclude it
diff --git a/src/Symfony/Component/Validator/Constraints/WordCountValidator.php b/src/Symfony/Component/Validator/Constraints/WordCountValidator.php
@@ -44,7 +44,7 @@ public function validate(mixed $value, Constraint $constraint): void
         $words = iterator_to_array($iterator->getPartsIterator());
 
         // erase "blank words" and don't count them as words
-        $wordsCount = \count(array_filter(array_map(trim(...), $words)));
+        $wordsCount = \count(array_filter(array_map(trim(...), $words), fn ($word) => '' !== $word));
 
         if (null !== $constraint->min && $wordsCount < $constraint->min) {
             $this->context->buildViolation($constraint->minMessage)
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/WordCountValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/WordCountValidatorTest.php
@@ -83,6 +83,7 @@ public static function provideValidValues()
         yield [new StringableValue('my ûtf 8'), 3];
         yield [null, 1]; // null should always pass and eventually be handled by NotNullValidator
         yield ['', 1]; // empty string should always pass and eventually be handled by NotBlankValidator
+        yield ['My String 0', 3];
     }
 
     public static function provideInvalidTypes()

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ public static function provideValidValues()`
`83`	`83`	`yield [new StringableValue('my ûtf 8'), 3];`
`84`	`84`	`yield [null, 1]; // null should always pass and eventually be handled by NotNullValidator`
`85`	`85`	`yield ['', 1]; // empty string should always pass and eventually be handled by NotBlankValidator`
	`86`	`+ yield ['My String 0', 3];`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`public static function provideInvalidTypes()`