Fix type without class name mapping without substracted type (#1104)

packages/PHPStanStaticTypeMapper/TypeMapper/ObjectWithoutClassTypeMapper.php

@@ -16,17 +16,13 @@
 use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
-use Rector\PHPStanStaticTypeMapper\PHPStanStaticTypeMapper;
 use Rector\StaticTypeMapper\ValueObject\Type\ParentObjectWithoutClassType;
-use Symfony\Contracts\Service\Attribute\Required;
 
 /**
  * @implements TypeMapperInterface<ObjectWithoutClassType>
  */
 final class ObjectWithoutClassTypeMapper implements TypeMapperInterface
 {
-    private PHPStanStaticTypeMapper $phpStanStaticTypeMapper;
-
     public function __construct(
         private PhpVersionProvider $phpVersionProvider
     ) {
@@ -62,21 +58,10 @@ public function mapToPHPStanPhpDocTypeNode(Type $type, TypeKind $typeKind): Type
      */
     public function mapToPhpParserNode(Type $type, TypeKind $typeKind): ?Node
     {
-        $subtractedType = $type->getSubtractedType();
-        if ($subtractedType !== null) {
-            return $this->phpStanStaticTypeMapper->mapToPhpParserNode($subtractedType, $typeKind);
-        }
-
         if (! $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::OBJECT_TYPE)) {
             return null;
         }
 
         return new Name('object');
     }
-
-    #[Required]
-    public function autowireObjectWithoutClassTypeMapper(PHPStanStaticTypeMapper $phpStanStaticTypeMapper): void
-    {
-        $this->phpStanStaticTypeMapper = $phpStanStaticTypeMapper;
-    }
 }

rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/Fixture/skip_instanceof_enum.php.inc

@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector\Fixture;
+
+use MyCLabs\Enum\Enum;
+
+final class SkipInstanceOfEnum
+{
+    public function run(object $object)
+    {
+        if ($object instanceof Enum) {
+            return;
+        }
+
+        return $this->processTheRest($object);
+    }
+
+    private function processTheRest($object)
+    {
+        return $object;
+    }
+}
+
+?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector\Fixture;
+
+use MyCLabs\Enum\Enum;
+
+final class SkipInstanceOfEnum
+{
+    public function run(object $object)
+    {
+        if ($object instanceof Enum) {
+            return;
+        }
+
+        return $this->processTheRest($object);
+    }
+
+    private function processTheRest(object $object)
+    {
+        return $object;
+    }
+}
+
+?>

rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php

@@ -45,6 +45,7 @@ public function resolveStrictTypesFromCalls(array $calls): array
                 }
 
                 $argValueType = $this->resolveStrictArgValueType($arg);
+
                 $staticTypesByArgumentPosition[$position][] = $argValueType;
             }
         }
@@ -82,6 +83,7 @@ private function unionToSingleType(array $staticTypesByArgumentPosition): array
 
             // narrow parents to most child type
             $unionedType = $this->narrowParentObjectTreeToSingleObjectChildType($unionedType);
+
             $staticTypeByArgumentPosition[$position] = $unionedType;
         }