Merge branch '5.4' into 6.2

* 5.4: CS fix Fix test provider
symfony · Feb 16, 2023 · 8d7daad · 8d7daad
2 parents e34c975 + 535d93f
commit 8d7daad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Tests/Constraints/RangeTest.php b/Tests/Constraints/RangeTest.php
@@ -32,7 +32,7 @@ public function testThrowsConstraintExceptionIfBothMinLimitAndPropertyPathNamed(
     {
         $this->expectException(\Symfony\Component\Validator\Exception\ConstraintDefinitionException::class);
         $this->expectExceptionMessage('requires only one of the "min" or "minPropertyPath" options to be set, not both.');
-        eval('new \Symfony\Component\Validator\Constraints\Range(min: "min", minPropertyPath: "minPropertyPath");');
+        new Range(min: 'min', minPropertyPath: 'minPropertyPath');
     }
 
     public function testThrowsConstraintExceptionIfBothMaxLimitAndPropertyPath()
@@ -49,7 +49,7 @@ public function testThrowsConstraintExceptionIfBothMaxLimitAndPropertyPathNamed(
     {
         $this->expectException(\Symfony\Component\Validator\Exception\ConstraintDefinitionException::class);
         $this->expectExceptionMessage('requires only one of the "max" or "maxPropertyPath" options to be set, not both.');
-        eval('new \Symfony\Component\Validator\Constraints\Range(max: "max", maxPropertyPath: "maxPropertyPath");');
+        new Range(max: 'max', maxPropertyPath: 'maxPropertyPath');
     }
 
     public function testThrowsConstraintExceptionIfNoLimitNorPropertyPath()
@@ -69,6 +69,6 @@ public function testThrowsConstraintDefinitionExceptionIfBothMinAndMaxAndMinMess
     {
         $this->expectException(\Symfony\Component\Validator\Exception\ConstraintDefinitionException::class);
         $this->expectExceptionMessage('can not use "minMessage" and "maxMessage" when the "min" and "max" options are both set. Use "notInRangeMessage" instead.');
-        eval('new \Symfony\Component\Validator\Constraints\Range(min: "min", max: "max", minMessage: "minMessage", maxMessage: "maxMessage");');
+        new Range(min: 'min', max: 'max', minMessage: 'minMessage', maxMessage: 'maxMessage');
     }
 }
diff --git a/Tests/Constraints/UlidValidatorTest.php b/Tests/Constraints/UlidValidatorTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
-use stdClass;
 use Symfony\Component\Validator\Constraints\Ulid;
 use Symfony\Component\Validator\Constraints\UlidValidator;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
@@ -44,7 +43,7 @@ public function testEmptyStringIsValid()
     public function testExpectsStringCompatibleType()
     {
         $this->expectException(UnexpectedValueException::class);
-        $this->validator->validate(new stdClass(), new Ulid());
+        $this->validator->validate(new \stdClass(), new Ulid());
     }
 
     public function testValidUlid()