bug #197 Fix #[EnumCase] inheritance to set & get extras (ogizanagi)

This PR was squashed before being merged into the 2.x-dev branch.

Discussion
----------

Fix #[EnumCase] inheritance to set & get extras

- [x] Add test case

Commits
-------

552cf2d Fix framework.http_method_override deprec
7d0385c [CS] Update cs-fixer
8a5324a Fix #[EnumCase] inheritance to set & get extras

.php-cs-fixer.php

@@ -13,16 +13,6 @@
     ->exclude('tests/Fixtures/Integration/Symfony/var')
     ->exclude('tests/Unit/Bridge/Doctrine/DBAL/Types/TypesDumperTest')
     ->exclude('tests/Unit/Bridge/Doctrine/ODM/Types/TypesDumperTest')
-    // Enum ignored for now since php-cs-fixer removes extra blank lines:
-    ->notPath([
-        'tests/Fixtures/Enum/SuitWithAttributesMissingLabel.php',
-        'tests/Fixtures/Enum/Suit.php',
-        'tests/Fixtures/Enum/SuitWithAttributesMissingAttribute.php',
-        'tests/Fixtures/Enum/SuitWithAttributes.php',
-        'tests/Fixtures/Enum/SuitWithExtras.php',
-        'tests/Fixtures/Enum/UnitSuit.php',
-        'tests/Fixtures/Integration/Symfony/src/Enum/Suit.php',
-    ])
 ;
 
 return (new PhpCsFixer\Config())

Makefile

@@ -1,7 +1,7 @@
 include .make/help.mk
 include .make/text.mk
 
-PHP_CS_FIXER_VERSION=v3.8.0
+PHP_CS_FIXER_VERSION=v3.9.4
 
 ###########
 # Install #

src/EnumCaseAttributesTrait.php

@@ -32,7 +32,7 @@ private static function enumCaseAttributes(): \SplObjectStorage
             $attributes = new \SplObjectStorage();
 
             foreach ((new \ReflectionEnum(static::class))->getCases() as $rCase) {
-                if (null === $rAttr = $rCase->getAttributes(EnumCase::class)[0] ?? null) {
+                if (null === $rAttr = $rCase->getAttributes(EnumCase::class, \ReflectionAttribute::IS_INSTANCEOF)[0] ?? null) {
                     continue;
                 }
 

src/ReadableEnumTrait.php

@@ -55,7 +55,7 @@ public static function readableForName(string $name): string
             throw new NameException($name, static::class);
         }
 
-        return ($map[$name])->getReadable();
+        return $map[$name]->getReadable();
     }
 
     /**

tests/Fixtures/Enum/SuitWithCustomCase.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the "elao/enum" package.
+ *
+ * Copyright (C) Elao
+ *
+ * @author Elao <[email protected]>
+ */
+
+namespace Elao\Enum\Tests\Fixtures\Enum;
+
+use Elao\Enum\Attribute\EnumCase;
+use Elao\Enum\ExtrasTrait;
+
+enum SuitWithCustomCase
+{
+    use ExtrasTrait;
+
+    #[CustomCase(icon: 'fa-heart', color: 'red')]
+    case Hearts;
+
+    #[CustomCase(icon: 'fa-diamond', color: 'red')]
+    case Diamonds;
+
+    #[CustomCase(icon: 'fa-club', color: 'black')]
+    case Clubs;
+
+    #[CustomCase(icon: 'fa-spade', color: 'black')]
+    case Spades;
+}
+
+#[\Attribute(\Attribute::TARGET_CLASS_CONSTANT)]
+class CustomCase extends EnumCase
+{
+    public function __construct(string $icon, string $color)
+    {
+        parent::__construct(null, ['icon' => $icon, 'color' => $color]);
+    }
+}

tests/Fixtures/Integration/Symfony/config/config.yml

@@ -9,6 +9,7 @@ framework:
         storage_factory_id: 'session.storage.factory.mock_file'
     test: ~
     assets: false
+    http_method_override: false
 
 doctrine:
     dbal:

tests/Unit/EnumExtrasTest.php

@@ -12,6 +12,7 @@
 
 namespace Elao\Enum\Tests\Unit;
 
+use Elao\Enum\Tests\Fixtures\Enum\SuitWithCustomCase;
 use Elao\Enum\Tests\Fixtures\Enum\SuitWithExtras;
 use Elao\Enum\Tests\IterableAssertionsTrait;
 use PHPUnit\Framework\TestCase;
@@ -31,6 +32,15 @@ public function testGetExtra(): void
         self::assertSame('value', SuitWithExtras::Hearts->getExtra('only-for-hearts'));
     }
 
+    public function testGetExtraWithCustomCase(): void
+    {
+        self::assertSame('black', SuitWithCustomCase::Clubs->getExtra('color'));
+        self::assertSame('fa-club', SuitWithCustomCase::Clubs->getExtra('icon'));
+
+        self::assertSame('red', SuitWithCustomCase::Diamonds->getExtra('color'));
+        self::assertSame('fa-diamond', SuitWithCustomCase::Diamonds->getExtra('icon'));
+    }
+
     public function testGetExtraReturnsNullOnMissingKey(): void
     {
         self::assertNull(SuitWithExtras::Clubs->getExtra('missing-key'));
@@ -55,6 +65,16 @@ public function testExtrasCanBeIteratedWithEnumCaseAsKeys(): void
         })(), SuitWithExtras::extras('color'));
     }
 
+    public function testWithCustomCaseExtrasCanBeIteratedWithEnumCaseAsKeys(): void
+    {
+        self::assertIterablesMatch((static function () {
+            yield SuitWithCustomCase::Hearts => 'red';
+            yield SuitWithCustomCase::Diamonds => 'red';
+            yield SuitWithCustomCase::Clubs => 'black';
+            yield SuitWithCustomCase::Spades => 'black';
+        })(), SuitWithCustomCase::extras('color'));
+    }
+
     public function testExtrasAreNullOnMissingKey(): void
     {
         self::assertIterablesMatch((static function () {