[Validator] Allow empty string for LengthValidator

neufman · neufman · commit 07f30ec57afc · 2022-04-11T17:28:07.000+02:00
Allow empty string to match documentation "As with most of the other constraints, null and empty strings are considered valid values".
diff --git a/src/Symfony/Component/Validator/Constraints/LengthValidator.php b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
@@ -30,7 +30,7 @@ public function validate(mixed $value, Constraint $constraint)
             throw new UnexpectedTypeException($constraint, Length::class);
         }
 
-        if (null === $value) {
+        if (null === $value || '' === $value) {
             return;
         }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
@@ -30,20 +30,11 @@ public function testNullIsValid()
         $this->assertNoViolation();
     }
 
-    public function testEmptyStringIsInvalid()
+    public function testEmptyStringIsValid()
     {
-        $this->validator->validate('', new Length([
-            'value' => $limit = 6,
-            'exactMessage' => 'myMessage',
-        ]));
+        $this->validator->validate('', new Length(['value' => 6]));
 
-        $this->buildViolation('myMessage')
-            ->setParameter('{{ value }}', '""')
-            ->setParameter('{{ limit }}', $limit)
-            ->setInvalidValue('')
-            ->setPlural($limit)
-            ->setCode(Length::NOT_EQUAL_LENGTH_ERROR)
-            ->assertRaised();
+        $this->assertNoViolation();
     }
 
     public function testExpectsStringCompatibleType()
diff --git a/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
@@ -2202,10 +2202,9 @@ public function testAllConstraintValidateAllGroupsForNestedConstraints()
 
         $violations = $this->validator->validate($entity, null, ['one', 'two']);
 
-        $this->assertCount(3, $violations);
+        $this->assertCount(2, $violations);
         $this->assertInstanceOf(NotBlank::class, $violations->get(0)->getConstraint());
         $this->assertInstanceOf(Length::class, $violations->get(1)->getConstraint());
-        $this->assertInstanceOf(Length::class, $violations->get(2)->getConstraint());
     }
 
     public function testRequiredConstraintIsIgnored()

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function validate(mixed $value, Constraint $constraint)`
`30`	`30`	`throw new UnexpectedTypeException($constraint, Length::class);`
`31`	`31`	`}`
`32`	`32`
`33`		`- if (null === $value) {`
	`33`	`+ if (null === $value \|\| '' === $value) {`
`34`	`34`	`return;`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -2202,10 +2202,9 @@ public function testAllConstraintValidateAllGroupsForNestedConstraints()`
`2202`	`2202`
`2203`	`2203`	`$violations = $this->validator->validate($entity, null, ['one', 'two']);`
`2204`	`2204`
`2205`		`- $this->assertCount(3, $violations);`
	`2205`	`+ $this->assertCount(2, $violations);`
`2206`	`2206`	`$this->assertInstanceOf(NotBlank::class, $violations->get(0)->getConstraint());`
`2207`	`2207`	`$this->assertInstanceOf(Length::class, $violations->get(1)->getConstraint());`
`2208`		`- $this->assertInstanceOf(Length::class, $violations->get(2)->getConstraint());`
`2209`	`2208`	`}`
`2210`	`2209`
`2211`	`2210`	`public function testRequiredConstraintIsIgnored()`