skip is_object() on anything

Author: TomasVotruba

rules-tests/TypedCollections/Rector/If_/RemoveIfInstanceofCollectionRector/Fixture/Ternary_/is_object_to_direct.php.inc

@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Doctrine\Tests\TypedCollections\Rector\If_\RemoveIfInstanceofCollectionRector\Fixture\Ternary;
+namespace Rector\Doctrine\Tests\TypedCollections\Rector\If_\RemoveIfInstanceofCollectionRector\Fixture\Ternary_;
 
 use Doctrine\Common\Collections\Collection;
 
@@ -18,7 +18,7 @@ final class IsObjectToDirect
 -----
 <?php
 
-namespace Rector\Doctrine\Tests\TypedCollections\Rector\If_\RemoveIfInstanceofCollectionRector\Fixture\Ternary;
+namespace Rector\Doctrine\Tests\TypedCollections\Rector\If_\RemoveIfInstanceofCollectionRector\Fixture\Ternary_;
 
 use Doctrine\Common\Collections\Collection;
 

rules-tests/TypedCollections/Rector/If_/RemoveIfInstanceofCollectionRector/Fixture/Ternary_/skip_is_object_on_anything.php.inc

@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\Doctrine\Tests\TypedCollections\Rector\If_\RemoveIfInstanceofCollectionRector\Fixture\Ternary_;
+
+final class SkipIsObjectOnAnything
+{
+    public $items;
+
+    public function someMethod()
+    {
+        return is_object($this->items) ? 1 : 2;
+    }
+}

rules/TypedCollections/Rector/If_/RemoveIfInstanceofCollectionRector.php

@@ -182,14 +182,18 @@ private function refactorTernary(Ternary $ternary): ?Expr
             $condition = $ternary->cond;
         }
 
-        if (! $condition instanceof FuncCall) {
-            return null;
-        }
-
-        if ($this->isName($condition, 'is_object')) {
+        if ($this->isIsObjectFuncCallOnCollection($condition)) {
             return $ternary->if;
         }
 
+//        if (! $condition instanceof FuncCall) {
+//            return null;
+//        }
+
+//        if ($this->isName($condition, 'is_object') && $this->isInstanceofCollectionType($condition->args[0]->value)) {
+//            return $ternary->if;
+//        }
+
         return null;
     }
 
@@ -201,4 +205,23 @@ private function isInstanceofCollectionType(Expr $expr): bool
 
         return $this->collectionTypeDetector->isCollectionType($expr->expr);
     }
+
+    private function isIsObjectFuncCallOnCollection(Expr $expr): bool
+    {
+        if (! $expr instanceof FuncCall) {
+            return false;
+        }
+
+        if ($expr->isFirstClassCallable()) {
+            return false;
+        }
+
+        if (! $this->isName($expr->name, 'is_object')) {
+            return false;
+        }
+
+        $firstArg = $expr->getArgs()[0];
+
+        return $this->collectionTypeDetector->isCollectionType($firstArg->value);
+    }
 }