More proper fix for ClassReflection refresh (part 2)

rules/TypeDeclaration/PHPStan/ObjectTypeSpecifier.php

@@ -64,6 +64,13 @@ public function narrowToFullyQualifiedOrAliasedObjectType(
         }
 
         if ($this->reflectionProvider->hasClass($className)) {
+            // keep the scope class reflection of the current class, as it is refreshed on class change,
+            // while the reflection provider one still reads the original file
+            $classReflection = $scope?->getClassReflection();
+            if ($classReflection instanceof ClassReflection && $classReflection->getName() === $className) {
+                return new FullyQualifiedObjectType($className, null, $classReflection);
+            }
+
             return new FullyQualifiedObjectType($className);
         }
 

tests/Issues/ClassReflectionRefresh/Source/AddTraitByReflectionRector.php

@@ -47,7 +47,16 @@ public function refactor(Node $node): ?Class_
             return null;
         }
 
-        if ($classReflection->hasTraitUse(SomeTrait::class)) {
+        // both the scope and the resolved type must see the refreshed class reflection
+        $typeClassReflection = $this->getType($node)
+            ->getObjectClassReflections()[0] ?? null;
+
+        $hasTraitInScope = $classReflection->hasTraitUse(SomeTrait::class);
+        $hasTraitInType = $typeClassReflection instanceof ClassReflection && $typeClassReflection->hasTraitUse(
+            SomeTrait::class
+        );
+
+        if ($hasTraitInScope && $hasTraitInType) {
             return null;
         }
 

tests/Issues/ClassReflectionRefreshOnModifier/ClassReflectionRefreshOnModifierTest.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Issues\ClassReflectionRefreshOnModifier;
+
+use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class ClassReflectionRefreshOnModifierTest extends AbstractRectorTestCase
+{
+    #[DataProvider('provideData')]
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    public static function provideData(): Iterator
+    {
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}

tests/Issues/ClassReflectionRefreshOnModifier/Fixture/refresh_on_class_change.php.inc

@@ -0,0 +1,25 @@
+<?php
+
+namespace Rector\Tests\Issues\ClassReflectionRefreshOnModifier\Fixture;
+
+class RefreshOnClassChange
+{
+    public function run()
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Issues\ClassReflectionRefreshOnModifier\Fixture;
+
+final readonly class RefreshOnClassChange
+{
+    public function run()
+    {
+    }
+}
+
+?>

tests/Issues/ClassReflectionRefreshOnModifier/Fixture/refresh_on_class_change_with_imported_interface.php.inc

@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\Issues\ClassReflectionRefreshOnModifier\Fixture;
+
+use Rector\Tests\Issues\ClassReflectionRefreshOnModifier\Source\SomeInterface;
+
+class RefreshOnClassChangeWithImportedInterface implements SomeInterface
+{
+    public function run(): SomeInterface
+    {
+        return $this;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Issues\ClassReflectionRefreshOnModifier\Fixture;
+
+use Rector\Tests\Issues\ClassReflectionRefreshOnModifier\Source\SomeInterface;
+
+final readonly class RefreshOnClassChangeWithImportedInterface implements SomeInterface
+{
+    public function run(): SomeInterface
+    {
+        return $this;
+    }
+}
+
+?>

tests/Issues/ClassReflectionRefreshOnModifier/Source/FinalizeByReflectionRector.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Issues\ClassReflectionRefreshOnModifier\Source;
+
+use PhpParser\Modifiers;
+use PhpParser\Node;
+use PhpParser\Node\Stmt\Class_;
+use PHPStan\Reflection\ClassReflection;
+use Rector\Rector\AbstractRector;
+use Rector\Reflection\ReflectionResolver;
+use Rector\RuleDoc\RuleDefinition;
+
+final class FinalizeByReflectionRector extends AbstractRector
+{
+    public function __construct(
+        private readonly ReflectionResolver $reflectionResolver
+    ) {
+    }
+
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition('', []);
+    }
+
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes(): array
+    {
+        return [Class_::class];
+    }
+
+    /**
+     * @param Class_ $node
+     */
+    public function refactor(Node $node): ?Class_
+    {
+        $classReflection = $this->reflectionResolver->resolveClassReflection($node);
+        if (! $classReflection instanceof ClassReflection || $classReflection->isFinal()) {
+            return null;
+        }
+
+        $node->flags |= Modifiers::FINAL;
+
+        return $node;
+    }
+}

tests/Issues/ClassReflectionRefreshOnModifier/Source/ReadonlyOnFinalByReflectionRector.php

@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Issues\ClassReflectionRefreshOnModifier\Source;
+
+use PhpParser\Modifiers;
+use PhpParser\Node;
+use PhpParser\Node\Stmt\Class_;
+use PHPStan\Reflection\ClassReflection;
+use Rector\Rector\AbstractRector;
+use Rector\Reflection\ReflectionResolver;
+use Rector\RuleDoc\RuleDefinition;
+
+/**
+ * Sees the final added by FinalizeByReflectionRector only when the class reflection is refreshed
+ * after the class node changed, both on the scope and on the resolved type
+ */
+final class ReadonlyOnFinalByReflectionRector extends AbstractRector
+{
+    public function __construct(
+        private readonly ReflectionResolver $reflectionResolver
+    ) {
+    }
+
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition('', []);
+    }
+
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes(): array
+    {
+        return [Class_::class];
+    }
+
+    /**
+     * @param Class_ $node
+     */
+    public function refactor(Node $node): ?Class_
+    {
+        $scopeClassReflection = $this->reflectionResolver->resolveClassReflection($node);
+        if (! $scopeClassReflection instanceof ClassReflection || ! $scopeClassReflection->isFinal()) {
+            return null;
+        }
+
+        if ($scopeClassReflection->isReadOnly()) {
+            return null;
+        }
+
+        $typeClassReflection = $this->getType($node)
+            ->getObjectClassReflections()[0] ?? null;
+        if (! $typeClassReflection instanceof ClassReflection || ! $typeClassReflection->isFinal()) {
+            return null;
+        }
+
+        $node->flags |= Modifiers::READONLY;
+
+        return $node;
+    }
+}

tests/Issues/ClassReflectionRefreshOnModifier/Source/SomeInterface.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Issues\ClassReflectionRefreshOnModifier\Source;
+
+interface SomeInterface
+{
+}

tests/Issues/ClassReflectionRefreshOnModifier/config/configured_rule.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\Tests\Issues\ClassReflectionRefreshOnModifier\Source\FinalizeByReflectionRector;
+use Rector\Tests\Issues\ClassReflectionRefreshOnModifier\Source\ReadonlyOnFinalByReflectionRector;
+
+return RectorConfig::configure()
+    ->withRules([FinalizeByReflectionRector::class, ReadonlyOnFinalByReflectionRector::class]);