Fix Choice annotation/attribute constructor args changing with Symfon…

…y versions (#53)
yokai-php · Feb 21, 2022 · 8e56a65 · 8e56a65
1 parent e98614b
commit 8e56a65
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 16 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,6 +18,10 @@ jobs:
             symfony-version: 4.4.*
           - php-version: 8.1
             symfony-version: 4.4.*
+          - php-version: 7.2
+            symfony-version: 5.2.*
+          - php-version: 7.2
+            symfony-version: 5.3.*
           - php-version: 7.2
             symfony-version: 5.4.*
           - php-version: 8.1

diff --git a/src/Validator/Constraints/Enum.php b/src/Validator/Constraints/Enum.php
@@ -42,23 +42,45 @@ public function __construct(
             if (\is_string($enum)) {
                 $this->enum = $enum;
             }
-
             // Symfony 5.x Constraints has many constructor arguments for PHP 8.0 Attributes support
-            parent::__construct(
-                null,
-                $callback,
-                $multiple,
-                $strict,
-                $min,
-                $max,
-                $message,
-                $multipleMessage,
-                $minMessage,
-                $maxMessage,
-                $groups,
-                $payload,
-                $options
-            );
+
+            $firstConstructorArg = (new \ReflectionClass(Choice::class))
+                ->getConstructor()->getParameters()[0]->getName();
+            if ($firstConstructorArg === 'choices') {
+                // Prior to Symfony 5.3, first argument of Choice was $choices
+                parent::__construct(
+                    null,
+                    $callback,
+                    $multiple,
+                    $strict,
+                    $min,
+                    $max,
+                    $message,
+                    $multipleMessage,
+                    $minMessage,
+                    $maxMessage,
+                    $groups,
+                    $payload,
+                    $options
+                );
+            } else {
+                // Since Symfony 5.3, first argument of Choice is $options
+                parent::__construct(
+                    $options,
+                    null,
+                    $callback,
+                    $multiple,
+                    $strict,
+                    $min,
+                    $max,
+                    $message,
+                    $multipleMessage,
+                    $minMessage,
+                    $maxMessage,
+                    $groups,
+                    $payload
+                );
+            }
         }
     }