Fix class scope refresh losing method scope when class node is already in class (#8725)

Author: samsonasik

src/Application/ChangedNodeScopeRefresher.php

@@ -23,6 +23,7 @@
 use PhpParser\Node\StaticVar;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\Declare_;
 use PhpParser\Node\Stmt\Else_;
 use PhpParser\Node\Stmt\ElseIf_;
@@ -76,6 +77,13 @@ public function refresh(Node $node, string $filePath, ?MutatingScope $mutatingSc
             fn (Node $subNode): ?Node => NodeAttributeReIndexer::reIndexNodeAttributes($subNode)
         );
 
+        // a class-like scope is already inside the class, so PHPStan cannot enter it again and would fail
+        // on the class node, leaving its methods with the class scope; process the class stmts directly instead
+        if ($node instanceof ClassLike && $mutatingScope->isInClass()) {
+            $this->phpStanNodeScopeResolver->processNodes($node->stmts, $filePath, $mutatingScope);
+            return;
+        }
+
         $stmts = $this->resolveStmts($node);
         $this->phpStanNodeScopeResolver->processNodes($stmts, $filePath, $mutatingScope);
     }

tests/Issues/ClassScopeRefresh/ClassScopeRefreshTest.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Issues\ClassScopeRefresh;
+
+use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class ClassScopeRefreshTest 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/ClassScopeRefresh/Fixture/keep_method_scope_after_class_change.php.inc

@@ -0,0 +1,51 @@
+<?php
+
+namespace Rector\Tests\Issues\ClassScopeRefresh\Fixture;
+
+final class KeepMethodScopeAfterClassChange
+{
+    public function __construct(
+        private readonly int $value
+    ) {
+    }
+
+    public function run(array $items): array
+    {
+        $result = [];
+        foreach ($items as $item) {
+            $result = [...$result, ...$items];
+        }
+
+        return $result;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Issues\ClassScopeRefresh\Fixture;
+
+final class KeepMethodScopeAfterClassChange
+{
+    /**
+     * @readonly
+     */
+    private int $value;
+    public function __construct(int $value)
+    {
+        $this->value = $value;
+    }
+
+    public function run(array $items): array
+    {
+        $result = [];
+        foreach ($items as $item) {
+            $result = array_merge($result, $items);
+        }
+
+        return $result;
+    }
+}
+
+?>

tests/Issues/ClassScopeRefresh/config/configured_rule.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\DowngradePhp74\Rector\Array_\DowngradeArraySpreadRector;
+use Rector\DowngradePhp80\Rector\Class_\DowngradePropertyPromotionRector;
+use Rector\DowngradePhp81\Rector\Property\DowngradeReadonlyPropertyRector;
+
+return RectorConfig::configure()
+    ->withRules([
+        DowngradePropertyPromotionRector::class,
+        DowngradeReadonlyPropertyRector::class,
+        DowngradeArraySpreadRector::class,
+    ]);