Revert Fix $this/self docblock compare removed on on-final class, as …

…it can refer to child this type (#1246) (#1669) * Revert Fix $this/self docblock compare removed on on-final class, as it can refer to child this type (#1246) This reverts commit a2c2979 * Fix handling of $this return type in UnionTypes rule `$this` refers to the exact object identity, not just the same type. Therefore, its valid and should not be removed @see https://wiki.php.net/rfc/this_return_type for more context
rectorphp · Jan 17, 2022 · 7d7edc4 · 7d7edc4
1 parent 65c97a9
commit 7d7edc4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 30 deletions.
diff --git a/packages/NodeTypeResolver/TypeComparator/TypeComparator.php b/packages/NodeTypeResolver/TypeComparator/TypeComparator.php
@@ -5,10 +5,8 @@
 namespace Rector\NodeTypeResolver\TypeComparator;
 
 use PhpParser\Node;
-use PHPStan\Analyser\Scope;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
-use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantBooleanType;
@@ -23,7 +21,6 @@
 use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\UnionType;
 use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
 use Rector\NodeTypeResolver\PHPStan\TypeHasher;
 use Rector\StaticTypeMapper\StaticTypeMapper;
@@ -272,17 +269,13 @@ private function areTypesSameWithLiteralTypeInPhpDoc(
 
     private function isThisTypeInFinalClass(Type $phpStanDocType, Type $phpParserNodeType, Node $node): bool
     {
-        // special case for non-final $this/self compare; in case of interface/abstract class, it can be another $this
-        if ($phpStanDocType instanceof ThisType && $phpParserNodeType instanceof ThisType) {
-            $scope = $node->getAttribute(AttributeKey::SCOPE);
-            if ($scope instanceof Scope) {
-                $classReflection = $scope->getClassReflection();
-                if ($classReflection instanceof ClassReflection) {
-                    return $classReflection->isFinal();
-                }
-            }
-        }
 
-        return true;
+        /**
+         * Special case for $this/(self|static) compare
+         *
+         * $this refers to the exact object identity, not just the same type. Therefore, it's valid and should not be removed
+         * @see https://wiki.php.net/rfc/this_return_type for more context
+         */
+        return ! ($phpStanDocType instanceof ThisType && $phpParserNodeType instanceof StaticType);
     }
 }
diff --git a/...xture/union_self_this_final_class.php.inc → .../skip_union_self_this_final_class.php.inc b/...xture/union_self_this_final_class.php.inc → .../skip_union_self_this_final_class.php.inc
@@ -12,19 +12,3 @@ final class SkipUnionSelfThisFinalClass
         return $this;
     }
 }
-
-?>
------
-<?php
-
-namespace Rector\Tests\Php80\Rector\FunctionLike\UnionTypesRector\Fixture;
-
-final class SkipUnionSelfThisFinalClass
-{
-    public function withFromId(int $fromId): self
-    {
-        return $this;
-    }
-}
-
-?>
diff --git a/...s/Php80/Rector/FunctionLike/UnionTypesRector/Fixture/skip_union_static_this_class.php.inc b/...s/Php80/Rector/FunctionLike/UnionTypesRector/Fixture/skip_union_static_this_class.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\FunctionLike\UnionTypesRector\Fixture;
+
+class SkipUnionStaticThisClass
+{
+    /**
+     * @return $this
+     */
+    public function withFromId(int $fromId): static
+    {
+        return $this;
+    }
+}