Fix conversion of Enum::fromKey() to native enum

BenSampo · Sep 26, 2023 · caa3ebd · caa3ebd
1 parent cab2e22
commit caa3ebd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 6.6.4
+
+### Fixed
+
+- Fix conversion of `Enum::fromKey()` to native enum
+
 ## 6.6.3
 
 ### Fixed

diff --git a/src/Rector/ToNativeUsagesRector.php b/src/Rector/ToNativeUsagesRector.php
@@ -4,6 +4,7 @@
 
 use BenSampo\Enum\Enum;
 use BenSampo\Enum\Tests\Enums\UserType;
+use Illuminate\Support\Arr;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
@@ -41,7 +42,6 @@
 use PhpParser\Node\Param;
 use PhpParser\Node\Scalar\Encapsed;
 use PhpParser\Node\Scalar\EncapsedStringPart;
-use PhpParser\Node\Scalar\LNumber;
 use PhpParser\Node\Stmt\Case_;
 use PhpParser\Node\Stmt\Return_;
 use PhpParser\Node\Stmt\Switch_;
@@ -291,7 +291,13 @@ protected function refactorFromKey(StaticCall $call): ?Node
                     ],
                 );
 
-                return new ArrayDimFetch($arrayMatching, new LNumber(0));
+                return new StaticCall(
+                    new Name(Arr::class),
+                    'first',
+                    [
+                        new Arg($arrayMatching),
+                    ],
+                );
             };
 
             if ($call->isFirstClassCallable()) {

diff --git a/tests/Rector/Usages/fromKey.php.inc b/tests/Rector/Usages/fromKey.php.inc
@@ -9,5 +9,5 @@ UserType::fromKey(...);
 
 use BenSampo\Enum\Tests\Enums\UserType;
 
-array_filter(UserType::cases(), fn(UserType $userType): bool => $userType->name === 'foo')[0];
-static fn(string $key): UserType => array_filter(UserType::cases(), fn(UserType $userType): bool => $userType->name === $key)[0];
+Illuminate\Support\Arr::first(array_filter(UserType::cases(), fn(UserType $userType): bool => $userType->name === 'foo'));
+static fn(string $key): UserType => Illuminate\Support\Arr::first(array_filter(UserType::cases(), fn(UserType $userType): bool => $userType->name === $key));