Add SameNamespacedTypeSpecifier (#2169)

* narrow to FQN * add ObjectTypeSpecifier * require Scope * add SameNamespacedTypeSpecifier
rectorphp · Apr 26, 2022 · 43aa4d9 · 43aa4d9
1 parent 148dda7
commit 43aa4d9
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 26 deletions.
diff --git a/rules/TypeDeclaration/PHPStan/Type/ObjectTypeSpecifier.php b/rules/TypeDeclaration/PHPStan/Type/ObjectTypeSpecifier.php
@@ -43,11 +43,6 @@ public function narrowToFullyQualifiedOrAliasedObjectType(
         ObjectType $objectType,
         Scope|null $scope
     ): TypeWithClassName | NonExistingObjectType | UnionType | MixedType {
-        $sameNamespacedFullyQualifiedObjectType = $this->matchSameNamespacedObjectType($node, $objectType);
-        if ($sameNamespacedFullyQualifiedObjectType !== null) {
-            return $sameNamespacedFullyQualifiedObjectType;
-        }
-
         if ($scope instanceof Scope) {
             foreach ($this->typeWithClassTypeSpecifiers as $typeWithClassTypeSpecifier) {
                 if ($typeWithClassTypeSpecifier->match($objectType, $scope)) {
@@ -194,27 +189,6 @@ private function matchShortenedObjectType(
         return null;
     }
 
-    private function matchSameNamespacedObjectType(Node $node, ObjectType $objectType): ?FullyQualifiedObjectType
-    {
-        $scope = $node->getAttribute(AttributeKey::SCOPE);
-        if (! $scope instanceof Scope) {
-            return null;
-        }
-
-        $namespaceName = $scope->getNamespace();
-        if ($namespaceName === null) {
-            return null;
-        }
-
-        $namespacedObject = $namespaceName . '\\' . ltrim($objectType->getClassName(), '\\');
-
-        if ($this->reflectionProvider->hasClass($namespacedObject)) {
-            return new FullyQualifiedObjectType($namespacedObject);
-        }
-
-        return null;
-    }
-
     private function matchPartialNamespaceObjectType(ObjectType $objectType, UseUse $useUse): ?ShortenedObjectType
     {
         // partial namespace

diff --git a/rules/TypeDeclaration/PHPStan/TypeSpecifier/SameNamespacedTypeSpecifier.php b/rules/TypeDeclaration/PHPStan/TypeSpecifier/SameNamespacedTypeSpecifier.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\TypeDeclaration\PHPStan\TypeSpecifier;
+
+use PHPStan\Analyser\Scope;
+use PHPStan\Reflection\ReflectionProvider;
+use PHPStan\Type\ObjectType;
+use PHPStan\Type\TypeWithClassName;
+use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
+use Rector\TypeDeclaration\Contract\PHPStan\TypeWithClassTypeSpecifierInterface;
+
+final class SameNamespacedTypeSpecifier implements TypeWithClassTypeSpecifierInterface
+{
+    public function __construct(
+        private readonly ReflectionProvider $reflectionProvider,
+    ) {
+    }
+
+    public function match(ObjectType $objectType, Scope $scope): bool
+    {
+        $namespaceName = $scope->getNamespace();
+        if ($namespaceName === null) {
+            return false;
+        }
+
+        $namespacedClassName = $namespaceName . '\\' . ltrim($objectType->getClassName(), '\\');
+        return $this->reflectionProvider->hasClass($namespacedClassName);
+    }
+
+    public function resolveObjectReferenceType(ObjectType $objectType, Scope $scope): TypeWithClassName
+    {
+        $namespacedClassName = $scope->getNamespace() . '\\' . ltrim($objectType->getClassName(), '\\');
+        return new FullyQualifiedObjectType($namespacedClassName);
+    }
+}