Postpone BC layer removal to 6.0.

l-vo · l-vo · commit fa0aa5ab7a95 · 2020-08-13T09:33:43.000+02:00
Since users on 5.0 and 5.1 hassn't have the deprecation, removing the BC layer (and so thrwing an exception) in 5.x will be a big BC break.
diff --git a/src/Symfony/Component/Validator/Constraints/Range.php b/src/Symfony/Component/Validator/Constraints/Range.php
@@ -46,7 +46,6 @@ class Range extends Constraint
     public $max;
     public $maxPropertyPath;
 
-    // BC layer, to be removed in 5.0
     /**
      * @internal
      */
@@ -76,8 +75,9 @@ public function __construct($options = null)
                 $this->deprecatedMinMessageSet = isset($options['minMessage']);
                 $this->deprecatedMaxMessageSet = isset($options['maxMessage']);
 
+                // BC layer, should throw  a ConstraintDefinitionException in 6.0
                 if ($this->deprecatedMinMessageSet || $this->deprecatedMaxMessageSet) {
-                    @trigger_error('Since symfony/validator 4.4: "minMessage" and "maxMessage" are deprecated when the "min" and "max" options are both set. Use "notInRangeMessage" instead.', E_USER_DEPRECATED);
+                    @trigger_deprecation('symfony/validator', '4.4', '"minMessage" and "maxMessage" are deprecated when the "min" and "max" options are both set. Use "notInRangeMessage" instead.');
                 }
             }
         }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/RangeTest.php b/src/Symfony/Component/Validator/Tests/Constraints/RangeTest.php
@@ -3,10 +3,13 @@
 namespace Symfony\Component\Validator\Tests\Constraints;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Validator\Constraints\Range;
 
 class RangeTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     public function testThrowsConstraintExceptionIfBothMinLimitAndPropertyPath()
     {
         $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
@@ -52,11 +55,12 @@ public function provideDeprecationTriggeredIfMinMaxAndMinMessageOrMaxMessageSet(
 
     /**
      * @group legacy
-     * @expectedDeprecation Since symfony/validator 4.4: "minMessage" and "maxMessage" are deprecated when the "min" and "max" options are both set. Use "notInRangeMessage" instead.
      * @dataProvider provideDeprecationTriggeredIfMinMaxAndMinMessageOrMaxMessageSet
      */
     public function testDeprecationTriggeredIfMinMaxAndMinMessageOrMaxMessageSet(array $options, bool $expectedDeprecatedMinMessageSet, bool $expectedDeprecatedMaxMessageSet)
     {
+        $this->expectDeprecation('Since symfony/validator 4.4: "minMessage" and "maxMessage" are deprecated when the "min" and "max" options are both set. Use "notInRangeMessage" instead.');
+
         $sut = new Range($options);
         $this->assertEquals($expectedDeprecatedMinMessageSet, $sut->deprecatedMinMessageSet);
         $this->assertEquals($expectedDeprecatedMaxMessageSet, $sut->deprecatedMaxMessageSet);
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
@@ -47,6 +47,7 @@
         "symfony/expression-language": "<5.1",
         "symfony/http-kernel": "<4.4",
         "symfony/intl": "<4.4",
+        "symfony/phpunit-bridge": "^5.1",
         "symfony/translation": "<4.4",
         "symfony/yaml": "<4.4"
     },

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ class Range extends Constraint`
`46`	`46`	`public $max;`
`47`	`47`	`public $maxPropertyPath;`
`48`	`48`
`49`		`- // BC layer, to be removed in 5.0`
`50`	`49`	`/**`
`51`	`50`	`* @internal`
`52`	`51`	`*/`
`@@ -76,8 +75,9 @@ public function __construct($options = null)`
`76`	`75`	`$this->deprecatedMinMessageSet = isset($options['minMessage']);`
`77`	`76`	`$this->deprecatedMaxMessageSet = isset($options['maxMessage']);`
`78`	`77`
	`78`	`+ // BC layer, should throw a ConstraintDefinitionException in 6.0`
`79`	`79`	`if ($this->deprecatedMinMessageSet \|\| $this->deprecatedMaxMessageSet) {`
`80`		`- @trigger_error('Since symfony/validator 4.4: "minMessage" and "maxMessage" are deprecated when the "min" and "max" options are both set. Use "notInRangeMessage" instead.', E_USER_DEPRECATED);`
	`80`	`+ @trigger_deprecation('symfony/validator', '4.4', '"minMessage" and "maxMessage" are deprecated when the "min" and "max" options are both set. Use "notInRangeMessage" instead.');`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`}`