Fix scoper to clean up prefix under getRuleDefinition() method (part 5) (#8169)

samsonasik · web-flow · commit d67958f43889 · 2026-07-10T19:14:44.000+07:00
diff --git a/scoper.php b/scoper.php
@@ -127,7 +127,7 @@ static function (array $ruleDefinitionMatch) use ($prefix): string {
                         static function (array $codeSampleMatch) use ($prefix): string {
                             $body = str_replace($prefix . '\\', '', $codeSampleMatch[3]);
                             $body = Strings::replace($body, '#^[ \t]*namespace ' . preg_quote($prefix, '#') . ';\R\R?#m', '');
-                            $body = Strings::replace($body, '#^[ \t]*\\\\class_alias\(.*?\);\R?#m', '');
+                            $body = Strings::replace($body, '#\R[ \t]*\\\\class_alias\(.*?\);$#', '');
 
                             return $codeSampleMatch[1] . $body . $codeSampleMatch[4];
                         }
diff --git a/tests/Scoper/ScoperPatchersTest.php b/tests/Scoper/ScoperPatchersTest.php
@@ -102,6 +102,10 @@ public function refactor(): void
         $this->assertStringNotContainsString('use RectorPrefix202607\Webmozart\Assert\Assert;', $codeSampleContent);
         $this->assertStringNotContainsString('\class_alias', $codeSampleContent);
         $this->assertStringContainsString('\RectorPrefix202607\ShouldStayPrefixed::run();', (string) $content);
+
+        foreach ($matches[1] as $codeSample) {
+            $this->assertStringEndsNotWith("\n", $codeSample);
+        }
     }
 
     public function testRemovesPrefixedNamespaceInGetRuleDefinitionWithWindowsLineEndings(): void

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ static function (array $ruleDefinitionMatch) use ($prefix): string {`
`127`	`127`	`static function (array $codeSampleMatch) use ($prefix): string {`
`128`	`128`	`$body = str_replace($prefix . '\\', '', $codeSampleMatch[3]);`
`129`	`129`	`$body = Strings::replace($body, '#^[ \t]*namespace ' . preg_quote($prefix, '#') . ';\R\R?#m', '');`
`130`		`- $body = Strings::replace($body, '#^[ \t]\\\\class_alias\(.?\);\R?#m', '');`
	`130`	`+ $body = Strings::replace($body, '#\R[ \t]\\\\class_alias\(.?\);$#', '');`
`131`	`131`
`132`	`132`	`return $codeSampleMatch[1] . $body . $codeSampleMatch[4];`
`133`	`133`	`}`