deprecate disallowing empty strings with minimum lengths

xabbuh · xabbuh · commit 7c4046f5a59e · 2020-05-15T10:32:00.000+02:00
diff --git a/UPGRADE-5.2.md b/UPGRADE-5.2.md
@@ -0,0 +1,8 @@
+UPGRADE FROM 5.1 to 5.2
+=======================
+
+Validator
+---------
+
+ * Being able to explicitly set the `allowEmptyString` option of the `Length` constraint to `false` without configuring
+   a minimum length is deprecated.
diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md
@@ -113,6 +113,12 @@ Security
  * Removed `LogoutSuccessHandlerInterface` and `LogoutHandlerInterface`, register a listener on the `LogoutEvent` event instead.
  * Removed `DefaultLogoutSuccessHandler` in favor of `DefaultLogoutListener`.
 
+Validator
+---------
+
+ * Explicitly setting the `allowEmptyString` option of the `Length` constraint to `false` without configuring a minimum
+   length leads to an exception.
+
 Yaml
 ----
 
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.2.0
+-----
+
+ * deprecated support for explicitly setting the `allowEmptyString` option of the `Length` constraint to `false` without configuring a minimum length
+
 5.1.0
 -----
 
diff --git a/src/Symfony/Component/Validator/Constraints/Length.php b/src/Symfony/Component/Validator/Constraints/Length.php
@@ -64,5 +64,9 @@ public function __construct($options = null)
         if (null !== $this->normalizer && !\is_callable($this->normalizer)) {
             throw new InvalidArgumentException(sprintf('The "normalizer" option must be a valid callable ("%s" given).', get_debug_type($this->normalizer)));
         }
+
+        if (false === ($options['allowEmptyString'] ?? null) && null === $this->min) {
+            trigger_deprecation('symfony/validator', '5.2', 'Being able to set the "allowEmptyString" option to "false" without configuring a min length is deprecated.');
+        }
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LengthTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LengthTest.php
@@ -12,13 +12,16 @@
 namespace Symfony\Component\Validator\Tests\Constraints;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Validator\Constraints\Length;
 
 /**
  * @author Renan Taranto <renantaranto@gmail.com>
  */
 class LengthTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     public function testNormalizerCanBeSet()
     {
         $length = new Length(['min' => 0, 'max' => 10, 'normalizer' => 'trim']);
@@ -39,4 +42,14 @@ public function testInvalidNormalizerObjectThrowsException()
         $this->expectExceptionMessage('The "normalizer" option must be a valid callable ("stdClass" given).');
         new Length(['min' => 0, 'max' => 10, 'normalizer' => new \stdClass()]);
     }
+
+    /**
+     * @group legacy
+     */
+    public function testDoNotAllowEmptyStringWithoutMinLength()
+    {
+        $this->expectDeprecation('Since symfony/validator 5.2: Being able to set the "allowEmptyString" option to "false" without configuring a min length is deprecated.');
+
+        new Length(['allowEmptyString' => false, 'max' => 5]);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -64,5 +64,9 @@ public function __construct($options = null)`
`64`	`64`	`if (null !== $this->normalizer && !\is_callable($this->normalizer)) {`
`65`	`65`	`throw new InvalidArgumentException(sprintf('The "normalizer" option must be a valid callable ("%s" given).', get_debug_type($this->normalizer)));`
`66`	`66`	`}`
	`67`	`+`
	`68`	`+ if (false === ($options['allowEmptyString'] ?? null) && null === $this->min) {`
	`69`	`+ trigger_deprecation('symfony/validator', '5.2', 'Being able to set the "allowEmptyString" option to "false" without configuring a min length is deprecated.');`
	`70`	`+ }`
`67`	`71`	`}`
`68`	`72`	`}`