Fix deprecated usages of symfony/validator

Author: W0rma

Tests/Controller/Annotations/AbstractScalarParamTest.php

@@ -80,10 +80,10 @@ public function testScalarRequirements()
         $this->param->requirements = 'foo %bar% %%';
         $this->assertEquals([
             new NotNull(),
-            new Regex([
-                'pattern' => '#^(?:foo %bar% %%)$#xsu',
-                'message' => "Parameter 'bar' value, does not match requirements 'foo %bar% %%'",
-            ]),
+            new Regex(
+                '#^(?:foo %bar% %%)$#xsu',
+                "Parameter 'bar' value, does not match requirements 'foo %bar% %%'",
+            ),
         ], $this->param->getConstraints());
     }
 
@@ -95,10 +95,10 @@ public function testArrayRequirements()
         ];
         $this->assertEquals([
             new NotNull(),
-            new Regex([
-                'pattern' => '#^(?:foo)$#xsu',
-                'message' => 'bar',
-            ]),
+            new Regex(
+                '#^(?:foo)$#xsu',
+                'bar',
+            ),
         ], $this->param->getConstraints());
     }
 

Tests/Fixtures/Annotations/IdenticalToRequestParam.php

@@ -11,6 +11,7 @@
 
 namespace FOS\RestBundle\Tests\Fixtures\Annotations;
 
+use Composer\InstalledVersions;
 use FOS\RestBundle\Controller\Annotations\RequestParam;
 use Symfony\Component\Validator\Constraints\IdenticalTo;
 
@@ -41,6 +42,21 @@ public function __construct(
         bool $nullable = false,
         bool $allowBlank = true
     ) {
-        parent::__construct($name, $key, null !== $identicalTo ? new IdenticalTo($identicalTo) : null, $default, $description, $incompatibles, $strict, $map, $nullable, $allowBlank);
+        $validatorSupportsArrayConfig = true;
+        if (class_exists(InstalledVersions::class)) {
+            $validatorVersion = InstalledVersions::getVersion('symfony/validator');
+
+            $validatorSupportsArrayConfig = version_compare($validatorVersion, '8.0', '<');
+        }
+
+        if (null === $identicalTo) {
+            $options = null;
+        } elseif ($validatorSupportsArrayConfig) {
+            $options = $identicalTo;
+        } else {
+            $options = $identicalTo['value'];
+        }
+
+        parent::__construct($name, $key, null !== $options ? new IdenticalTo($options) : null, $default, $description, $incompatibles, $strict, $map, $nullable, $allowBlank);
     }
 }