Remove PHP/Symfony versions matrix hacks (#62)

Author: yann-eugone

README.md

@@ -89,14 +89,6 @@ class Member
 }
 ```
 
-> **note** both PHP Attributes & Annotations are supported :
-> ```php
->     /**
->      * @Enum(StatusEnum::class)
->      */
->     public ?string $status = null;
-> ```
-
 ### Setting up the form
 
 Now that validation is configured, the only thing we have to do is to add a field on our form :

src/Enum.php

@@ -12,15 +12,12 @@
  */
 class Enum implements EnumInterface
 {
-    /**
-     * @var string
-     */
-    private $name;
+    private string $name;
 
     /**
      * @var array<string, mixed>|null
      */
-    private $choices;
+    private array|null $choices;
 
     /**
      * @param array<string, mixed>|null $choices Allowed to be null if you are extending this class
@@ -41,8 +38,10 @@ public function __construct(?array $choices, ?string $name = null)
         if ($name === null) {
             $name = static::class;
             if (
-                \strpos($name, 'Yokai\\EnumBundle\\') === 0 // using FQCN as name is only allowed for other namespaces
-                && \strpos($name, 'Yokai\\EnumBundle\\Tests\\') !== 0 // except for our tests
+                // using FQCN as name is only allowed for other namespaces
+                \str_starts_with($name, 'Yokai\\EnumBundle\\')
+                // except for our tests
+                && !\str_starts_with($name, 'Yokai\\EnumBundle\\Tests\\')
             ) {
                 throw new LogicException(
                     'When using ' . static::class . ', $name argument in ' . __METHOD__ . ' method cannot be null'
@@ -67,7 +66,7 @@ public function getValues(): array
         return \array_values($this->choices);
     }
 
-    public function getLabel($value): string
+    public function getLabel(mixed $value): string
     {
         $this->init();
 

src/EnumInterface.php

@@ -25,10 +25,8 @@ public function getValues(): array;
 
     /**
      * Returns enum value label.
-     *
-     * @param mixed $value
      */
-    public function getLabel($value): string;
+    public function getLabel(mixed $value): string;
 
     /**
      * Returns enum identifier (must be unique across app).

src/EnumRegistry.php

@@ -15,7 +15,7 @@ final class EnumRegistry
     /**
      * @var EnumInterface[]
      */
-    private $enums = [];
+    private array $enums = [];
 
     /**
      * @throws LogicException

src/Form/Type/EnumType.php

@@ -16,10 +16,7 @@
  */
 final class EnumType extends AbstractType
 {
-    /**
-     * @var EnumRegistry
-     */
-    private $enumRegistry;
+    private EnumRegistry $enumRegistry;
 
     public function __construct(EnumRegistry $enumRegistry)
     {

src/TranslatedEnum.php

@@ -15,22 +15,13 @@ class TranslatedEnum extends Enum
     /**
      * @var array<int|string, mixed>
      */
-    private $values;
+    private array $values;
 
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
+    private TranslatorInterface $translator;
 
-    /**
-     * @var string
-     */
-    private $transPattern;
+    private string $transPattern;
 
-    /**
-     * @var string
-     */
-    private $transDomain;
+    private string $transDomain;
 
     /**
      * @param array<int|string, mixed> $values
@@ -44,7 +35,7 @@ public function __construct(
         string $transDomain = 'messages',
         ?string $name = null
     ) {
-        if (\strpos($transPattern, '%s') === false) {
+        if (!\str_contains($transPattern, '%s')) {
             throw LogicException::placeholderRequired($transPattern);
         }
 

src/Twig/Extension/EnumExtension.php

@@ -14,10 +14,7 @@
  */
 final class EnumExtension extends AbstractExtension
 {
-    /**
-     * @var EnumRegistry
-     */
-    private $registry;
+    private EnumRegistry $registry;
 
     public function __construct(EnumRegistry $registry)
     {

src/Validator/Constraints/Enum.php

@@ -7,18 +7,12 @@
 use Symfony\Component\Validator\Constraints\Choice;
 
 /**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
  * @author Yann Eugoné <[email protected]>
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD)]
 final class Enum extends Choice
 {
-    /**
-     * @var string
-     */
-    public $enum;
+    public string $enum;
 
     /**
      * @param array<string, mixed> $options

src/Validator/Constraints/EnumValidator.php

@@ -15,10 +15,7 @@
  */
 final class EnumValidator extends ChoiceValidator
 {
-    /**
-     * @var EnumRegistry
-     */
-    private $enumRegistry;
+    private EnumRegistry $enumRegistry;
 
     public function __construct(EnumRegistry $enumRegistry)
     {
@@ -34,7 +31,7 @@ public function validate(mixed $value, Constraint $constraint): void
         $constraint->choices = null;
         $constraint->callback = null;
 
-        if (!$constraint->enum) {
+        if (!isset($constraint->enum)) {
             throw new ConstraintDefinitionException('"enum" must be specified on constraint Enum');
         }
 

tests/Integration/config/packages/annotations.yaml

@@ -5,4 +5,5 @@ services:
 
     Yokai\EnumBundle\Tests\Integration\App\Enum\PullRequestLabelEnum: ~
     Yokai\EnumBundle\Tests\Integration\App\Enum\PullRequestMyCLabsStatusEnum: ~
+    Yokai\EnumBundle\Tests\Integration\App\Enum\PullRequestNativeStatusEnum: ~
     Yokai\EnumBundle\Tests\Integration\App\Form\PullRequestType: ~

tests/Integration/config/services-8.1.yaml

@@ -18,9 +18,6 @@ public function registerBundles(): iterable
     {
         yield new \Symfony\Bundle\FrameworkBundle\FrameworkBundle();
         yield new \Yokai\EnumBundle\YokaiEnumBundle();
-        if (\PHP_VERSION_ID < 80000) {
-            yield new \Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle();
-        }
     }
 
     public function getProjectDir(): string
@@ -32,22 +29,14 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(__DIR__ . '/../config/packages/framework.yaml');
         $loader->load(__DIR__ . '/../config/packages/translation.yaml');
-        if (\PHP_VERSION_ID < 80000) {
-            $loader->load(__DIR__ . '/../config/packages/annotations.yaml');
-        }
-
-        if (\PHP_VERSION_ID < 80100) {
-            $loader->load(__DIR__ . '/../config/services-8.0.yaml');
-        } else {
-            $loader->load(__DIR__ . '/../config/services-8.1.yaml');
-        }
+        $loader->load(__DIR__ . '/../config/services.yaml');
     }
 
     protected function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(
             new class() implements CompilerPassInterface {
-                public function process(ContainerBuilder $container)
+                public function process(ContainerBuilder $container): void
                 {
                     $container->findDefinition('form.factory')->setPublic(true);
                 }

tests/Integration/config/services-8.0.yaml tests/Integration/config/services.yaml

@@ -11,17 +11,14 @@
 /**
  * @author Yann Eugoné <[email protected]>
  */
-final class PullRequestPhp80
+final class MyCLabsPullRequest
 {
-    /**
-     * @var MyCLabsStatus
-     */
     #[Enum(enum: PullRequestMyCLabsStatusEnum::class)]
-    public $status;
+    public MyCLabsStatus $status;
 
     /**
      * @var string[]
      */
     #[Enum(enum: PullRequestLabelEnum::class, multiple: true)]
-    public $labels;
+    public array $labels;
 }

tests/Integration/src/Kernel.php

@@ -11,17 +11,14 @@
 /**
  * @author Yann Eugoné <[email protected]>
  */
-final class PullRequestPhp81
+final class NativeEnumPullRequest
 {
-    /**
-     * @var NativeStatus
-     */
     #[Enum(enum: PullRequestNativeStatusEnum::class)]
-    public $status;
+    public NativeStatus $status;
 
     /**
      * @var string[]
      */
     #[Enum(enum: PullRequestLabelEnum::class, multiple: true)]
-    public $labels;
+    public array $labels;
 }