[CodeQuality] Fix aliased object type on FlipTypeControlToUseExclusiv…

…eTypeRector (#6497) * [CodeQuality] Fix aliased object type on FlipTypeControlToUseExclusiveTypeRector * [CodeQuality] Fix aliased object type on FlipTypeControlToUseExclusiveTypeRector * fix in ReflectionResolver
rectorphp · Nov 24, 2024 · 3c42539 · 3c42539
1 parent 23f8e4a
commit 3c42539
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 2 deletions.
diff --git a/...r/Identical/FlipTypeControlToUseExclusiveTypeRector/Fixture/nullable_type_aliased.php.inc b/...r/Identical/FlipTypeControlToUseExclusiveTypeRector/Fixture/nullable_type_aliased.php.inc
@@ -0,0 +1,55 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+
+use PhpParser\Node\Scalar\Int_ as SomeInt;
+
+class NullableTypeAliased
+{
+    public function run()
+    {
+        $intNode = $this->getIntNode();
+        if ($intNode === null) {
+            return;
+        }
+    }
+
+    private function getIntNode(): ?SomeInt
+    {
+        if (rand(0, 1)) {
+            return new SomeInt(1);
+        }
+
+        return null;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector\Fixture;
+
+use PhpParser\Node\Scalar\Int_ as SomeInt;
+
+class NullableTypeAliased
+{
+    public function run()
+    {
+        $intNode = $this->getIntNode();
+        if (!$intNode instanceof \PhpParser\Node\Scalar\Int_) {
+            return;
+        }
+    }
+
+    private function getIntNode(): ?SomeInt
+    {
+        if (rand(0, 1)) {
+            return new SomeInt(1);
+        }
+
+        return null;
+    }
+}
+
+?>
diff --git a/rules/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector.php b/rules/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector.php
@@ -14,6 +14,7 @@
 use PHPStan\Type\ObjectType;
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\Rector\AbstractRector;
+use Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType;
 use Rector\StaticTypeMapper\ValueObject\Type\ShortenedObjectType;
 use Rector\TypeDeclaration\TypeAnalyzer\NullableTypeAnalyzer;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -86,7 +87,9 @@ private function processConvertToExclusiveType(
         Expr $expr,
         Identical|NotIdentical $binaryOp
     ): BooleanNot|Instanceof_ {
-        $fullyQualifiedType = $objectType instanceof ShortenedObjectType ? $objectType->getFullyQualifiedName() : $objectType->getClassName();
+        $fullyQualifiedType = $objectType instanceof ShortenedObjectType || $objectType instanceof AliasedObjectType
+            ? $objectType->getFullyQualifiedName()
+            : $objectType->getClassName();
 
         $instanceof = new Instanceof_($expr, new FullyQualified($fullyQualifiedType));
         if ($binaryOp instanceof NotIdentical) {

diff --git a/src/Reflection/ReflectionResolver.php b/src/Reflection/ReflectionResolver.php
@@ -31,6 +31,7 @@
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\StaticTypeMapper\Resolver\ClassNameFromObjectTypeResolver;
+use Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType;
 use Rector\StaticTypeMapper\ValueObject\Type\ShortenedObjectType;
 use Rector\ValueObject\MethodName;
 
@@ -142,7 +143,7 @@ public function resolveMethodReflectionFromStaticCall(StaticCall $staticCall): ?
     {
         $objectType = $this->nodeTypeResolver->getType($staticCall->class);
 
-        if ($objectType instanceof ShortenedObjectType) {
+        if ($objectType instanceof ShortenedObjectType || $objectType instanceof AliasedObjectType) {
             /** @var array<class-string> $classNames */
             $classNames = [$objectType->getFullyQualifiedName()];
         } else {