Fix conversion of in() and notIn() to native enums when called wi…

…th non-arrays
BenSampo · Aug 21, 2024 · bc94b6a · bc94b6a
1 parent 0f82b99
commit bc94b6a
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed
+
+- Fix conversion of `in()` and `notIn()` to native enums when called with non-arrays
+
 ## 6.11.0
 
 ### Added

diff --git a/src/Rector/ToNativeUsagesRector.php b/src/Rector/ToNativeUsagesRector.php
@@ -601,19 +601,28 @@ protected function refactorInOrNotIn(MethodCall|NullsafeMethodCall $call, bool $
     {
         $args = $call->args;
         if (isset($args[0]) && $args[0] instanceof Arg) {
-            $needle = new Arg($call->var);
-            $haystack = $args[0];
+            $needleArg = new Arg($call->var);
+            $valuesArg = $args[0];
 
-            $haystackValue = $haystack->value;
-            if ($haystackValue instanceof Array_) {
-                foreach ($haystackValue->items as $item) {
+            $valuesValue = $valuesArg->value;
+            if ($valuesValue instanceof Array_) {
+                foreach ($valuesValue->items as $item) {
                     $item->setAttribute(self::COMPARED_AGAINST_ENUM_INSTANCE, true);
                 }
             }
 
+            $haystackArg = $this->getType($valuesValue)->isArray()->yes()
+                ? $valuesArg
+                : new Arg(
+                    new FuncCall(
+                        new Name('iterator_to_array'),
+                        [$valuesArg],
+                    ),
+                );
+
             $inArray = new FuncCall(
                 new Name('in_array'),
-                [$needle, $haystack],
+                [$needleArg, $haystackArg],
                 [self::COMPARED_AGAINST_ENUM_INSTANCE => true],
             );
 

diff --git a/tests/EnumAnnotateCommandTest.php b/tests/EnumAnnotateCommandTest.php
@@ -3,10 +3,12 @@
 namespace BenSampo\Enum\Tests;
 
 use Illuminate\Filesystem\Filesystem;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 final class EnumAnnotateCommandTest extends ApplicationTestCase
 {
     /** @dataProvider classes */
+    #[DataProvider('classes')]
     public function testAnnotateClass(string $class): void
     {
         $filesystem = $this->filesystem();
@@ -19,6 +21,7 @@ public function testAnnotateClass(string $class): void
     }
 
     /** @dataProvider classes */
+    #[DataProvider('classes')]
     public function testAnnotateClassAlreadyAnnotated(string $class): void
     {
         $filesystem = $this->filesystem();
@@ -48,6 +51,7 @@ public static function sources(): iterable
     }
 
     /** @dataProvider sources */
+    #[DataProvider('sources')]
     public function testAnnotateFolder(string $source): void
     {
         $filesystem = $this->filesystem();

diff --git a/tests/Rector/ToNativeImplementationRectorTest.php b/tests/Rector/ToNativeImplementationRectorTest.php
@@ -2,12 +2,14 @@
 
 namespace BenSampo\Enum\Tests\Rector;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 /** @see \BenSampo\Enum\Rector\ToNativeImplementationRector */
 final class ToNativeImplementationRectorTest extends AbstractRectorTestCase
 {
     /** @dataProvider provideData */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);

diff --git a/tests/Rector/ToNativeUsagesRectorTest.php b/tests/Rector/ToNativeUsagesRectorTest.php
@@ -2,12 +2,14 @@
 
 namespace BenSampo\Enum\Tests\Rector;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 /** @see \BenSampo\Enum\Rector\ToNativeUsagesRector */
 final class ToNativeUsagesRectorTest extends AbstractRectorTestCase
 {
     /** @dataProvider provideData */
+    #[DataProvider('provideData')]
     public function test(string $filePath): void
     {
         $this->doTestFile($filePath);

diff --git a/tests/Rector/Usages/in.php.inc b/tests/Rector/Usages/in.php.inc
@@ -5,6 +5,8 @@ use BenSampo\Enum\Tests\Enums\UserType;
 /** @var UserType $userType */
 $userType->in([UserType::Administrator, UserType::Subscriber(), null]);
 $userType?->in([UserType::Administrator, $userType, null]);
+/** @var iterable<UserType> $userTypes */
+$userType->in($userTypes);
 -----
 <?php
 
@@ -13,3 +15,5 @@ use BenSampo\Enum\Tests\Enums\UserType;
 /** @var UserType $userType */
 in_array($userType, [UserType::Administrator, UserType::Subscriber, null]);
 in_array($userType, [UserType::Administrator, $userType, null]);
+/** @var iterable<UserType> $userTypes */
+in_array($userType, iterator_to_array($userTypes));
diff --git a/tests/Rector/Usages/notIn.php.inc b/tests/Rector/Usages/notIn.php.inc
@@ -5,6 +5,8 @@ use BenSampo\Enum\Tests\Enums\UserType;
 /** @var UserType $userType */
 $userType->notIn([UserType::Administrator]);
 $userType?->notIn([UserType::Administrator, $userType]);
+/** @var iterable<UserType> $userTypes */
+$userType->notIn($userTypes);
 -----
 <?php
 
@@ -13,3 +15,5 @@ use BenSampo\Enum\Tests\Enums\UserType;
 /** @var UserType $userType */
 !in_array($userType, [UserType::Administrator]);
 !in_array($userType, [UserType::Administrator, $userType]);
+/** @var iterable<UserType> $userTypes */
+!in_array($userType, iterator_to_array($userTypes));