[TypeDeclaration] Handle nullable MockObject on TypedPropertyFromCreateMockAssignRector (#6179)

samsonasik · web-flow · commit 1a58300b7d6c · 2024-07-24T04:50:32.000+07:00
* [TypeDeclaration] Handle nullable MockObject on TypedPropertyFromCreateMockAssignRector

* Fix phpstan

* Fix phpstan
diff --git a/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector/Fixture/nullable_mock_object.php.inc b/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector/Fixture/nullable_mock_object.php.inc
@@ -0,0 +1,47 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Class_\TypedPropertyFromCreateMockAssignRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+use Rector\Tests\TypeDeclaration\Rector\Class_\TypedPropertyFromCreateMockAssignRector\Source\SomeMockedClass;
+
+class NullableMockObject extends TestCase
+{
+    public $someMock;
+
+    protected function setUp(): void
+    {
+        $this->someMock = $this->createMock(SomeMockedClass::class);
+    }
+
+    protected function tearDown(): void
+    {
+        $this->someMock = null;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Class_\TypedPropertyFromCreateMockAssignRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+use Rector\Tests\TypeDeclaration\Rector\Class_\TypedPropertyFromCreateMockAssignRector\Source\SomeMockedClass;
+
+class NullableMockObject extends TestCase
+{
+    public ?\PHPUnit\Framework\MockObject\MockObject $someMock;
+
+    protected function setUp(): void
+    {
+        $this->someMock = $this->createMock(SomeMockedClass::class);
+    }
+
+    protected function tearDown(): void
+    {
+        $this->someMock = null;
+    }
+}
+
+?>
diff --git a/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector/Fixture/skip_value_resetted.php.inc b/rules-tests/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector/Fixture/skip_value_resetted.php.inc
diff --git a/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector.php b/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector.php
@@ -5,14 +5,16 @@
 namespace Rector\TypeDeclaration\Rector\Class_;
 
 use PhpParser\Node;
-use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
-use PHPStan\Type\IntersectionType;
+use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
+use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Rector\Rector\AbstractRector;
-use Rector\TypeDeclaration\TypeInferer\PropertyTypeInferer\TrustedClassMethodPropertyTypeInferer;
+use Rector\Reflection\ReflectionResolver;
+use Rector\StaticTypeMapper\StaticTypeMapper;
+use Rector\TypeDeclaration\TypeInferer\PropertyTypeInferer\AllAssignNodePropertyTypeInferer;
 use Rector\ValueObject\MethodName;
 use Rector\ValueObject\PhpVersionFeature;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
@@ -35,7 +37,9 @@ final class TypedPropertyFromCreateMockAssignRector extends AbstractRector imple
     private const MOCK_OBJECT_CLASS = 'PHPUnit\Framework\MockObject\MockObject';
 
     public function __construct(
-        private readonly TrustedClassMethodPropertyTypeInferer $trustedClassMethodPropertyTypeInferer
+        private readonly ReflectionResolver $reflectionResolver,
+        private readonly AllAssignNodePropertyTypeInferer $allAssignNodePropertyTypeInferer,
+        private readonly StaticTypeMapper $staticTypeMapper
     ) {
     }
 
@@ -88,7 +92,9 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        $classReflection = null;
         $hasChanged = false;
+
         foreach ($node->getProperties() as $property) {
             // already typed
             if ($property->type instanceof Node) {
@@ -100,17 +106,35 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            $type = $this->trustedClassMethodPropertyTypeInferer->inferProperty(
-                $node,
+            if (! $classReflection instanceof ClassReflection) {
+                $classReflection = $this->reflectionResolver->resolveClassReflection($node);
+            }
+
+            // ClassReflection not detected, early skip
+            if (! $classReflection instanceof ClassReflection) {
+                return null;
+            }
+
+            $type = $this->allAssignNodePropertyTypeInferer->inferProperty(
                 $property,
-                $setUpClassMethod
+                $classReflection,
+                $this->file
             );
 
-            if (! $this->isMockObjectType($type)) {
+            if (! $type instanceof Type) {
+                continue;
+            }
+
+            $propertyType = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($type, TypeKind::PROPERTY);
+            if (! $propertyType instanceof Node) {
+                continue;
+            }
+
+            if (! $this->isObjectType($propertyType, new ObjectType(self::MOCK_OBJECT_CLASS))) {
                 continue;
             }
 
-            $property->type = new FullyQualified(self::MOCK_OBJECT_CLASS);
+            $property->type = $propertyType;
             $hasChanged = true;
         }
 
@@ -125,26 +149,4 @@ public function provideMinPhpVersion(): int
     {
         return PhpVersionFeature::TYPED_PROPERTIES;
     }
-
-    private function isMockObjectType(Type $type): bool
-    {
-        if ($type instanceof ObjectType && $type->isInstanceOf(self::MOCK_OBJECT_CLASS)->yes()) {
-            return true;
-        }
-
-        return $this->isIntersectionWithMockObjectType($type);
-    }
-
-    private function isIntersectionWithMockObjectType(Type $type): bool
-    {
-        if (! $type instanceof IntersectionType) {
-            return false;
-        }
-
-        if (count($type->getTypes()) !== 2) {
-            return false;
-        }
-
-        return in_array(self::MOCK_OBJECT_CLASS, $type->getObjectClassNames());
-    }
 }
