improve collection handling

BenSampo · Aug 21, 2024 · 9445db9 · 9445db9
1 parent dbe6357
commit 9445db9
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/src/Rector/ToNativeUsagesRector.php b/src/Rector/ToNativeUsagesRector.php
@@ -5,6 +5,7 @@
 use BenSampo\Enum\Enum;
 use BenSampo\Enum\Tests\Enums\UserType;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Enumerable;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
@@ -565,7 +566,9 @@ protected function refactorMaybeMagicStaticCall(StaticCall $call): ?Node
      */
     protected function refactorIsOrIsNot(MethodCall|NullsafeMethodCall $call, bool $is): ?Node
     {
-        $comparison = $is ? Identical::class : NotIdentical::class;
+        $comparison = $is
+            ? Identical::class
+            : NotIdentical::class;
 
         if ($call->isFirstClassCallable()) {
             $param = new Variable('value');
@@ -601,7 +604,7 @@ protected function refactorInOrNotIn(MethodCall|NullsafeMethodCall $call, bool $
     {
         $args = $call->args;
         if (isset($args[0]) && $args[0] instanceof Arg) {
-            $needleArg = new Arg($call->var);
+            $enumArg = new Arg($call->var);
             $valuesArg = $args[0];
 
             $valuesValue = $valuesArg->value;
@@ -611,6 +614,16 @@ protected function refactorInOrNotIn(MethodCall|NullsafeMethodCall $call, bool $
                 }
             }
 
+            if ($this->isObjectType($valuesValue, new ObjectType(Enumerable::class))) {
+                return new MethodCall(
+                    $valuesValue,
+                    new Identifier($in
+                        ? 'contains'
+                        : 'doesntContain'),
+                    [$enumArg],
+                );
+            }
+
             $haystackArg = $this->getType($valuesValue)->isArray()->yes()
                 ? $valuesArg
                 : new Arg(
@@ -622,7 +635,7 @@ protected function refactorInOrNotIn(MethodCall|NullsafeMethodCall $call, bool $
 
             $inArray = new FuncCall(
                 new Name('in_array'),
-                [$needleArg, $haystackArg],
+                [$enumArg, $haystackArg],
                 [self::COMPARED_AGAINST_ENUM_INSTANCE => true],
             );
 

diff --git a/tests/Rector/Usages/in.php.inc b/tests/Rector/Usages/in.php.inc
@@ -5,8 +5,10 @@ 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);
+/** @var iterable<UserType> $iterable */
+$userType->in($iterable);
+/** @var \Illuminate\Support\Collection $collection */
+$userType->in($collection);
 -----
 <?php
 
@@ -15,5 +17,7 @@ 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));
+/** @var iterable<UserType> $iterable */
+in_array($userType, iterator_to_array($iterable));
+/** @var \Illuminate\Support\Collection $collection */
+$collection->contains($userType);
diff --git a/tests/Rector/Usages/notIn.php.inc b/tests/Rector/Usages/notIn.php.inc
@@ -7,6 +7,8 @@ $userType->notIn([UserType::Administrator]);
 $userType?->notIn([UserType::Administrator, $userType]);
 /** @var iterable<UserType> $userTypes */
 $userType->notIn($userTypes);
+/** @var \Illuminate\Support\Collection $collection */
+$userType->notIn($collection);
 -----
 <?php
 
@@ -17,3 +19,5 @@ use BenSampo\Enum\Tests\Enums\UserType;
 !in_array($userType, [UserType::Administrator, $userType]);
 /** @var iterable<UserType> $userTypes */
 !in_array($userType, iterator_to_array($userTypes));
+/** @var \Illuminate\Support\Collection $collection */
+$collection->doesntContain($userType);