From ed57c9f286eaa9bad90a27e772572486736f7119 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 10 Jul 2026 18:37:54 +0700
Subject: [PATCH 1/4] Fix scoper to clean up prefix under getRuleDefinition()
 method (part 3)

---
 scoper.php                          |  9 +++++----
 tests/Scoper/ScoperPatchersTest.php | 28 +++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/scoper.php b/scoper.php
index 2dcf08eb98f..71caf13d743 100644
--- a/scoper.php
+++ b/scoper.php
@@ -119,12 +119,13 @@ static function (string $filePath, string $prefix, string $content): string {
 
             return Strings::replace(
                 $content,
-                '#(public function getRuleDefinition\(\): RuleDefinition\s+\{\R)(.*?)(\R\s*\);\R\s*\})#s',
+                "#(<<<'?(?<label>CODE_SAMPLE|SAMPLE)'?\\R)(.*?)(\\R\\s*\\k<label>)#s",
                 static function (array $match) use ($prefix): string {
-                    $body = str_replace($prefix . '\\', '', $match[2]);
-                    $body = Strings::replace($body, '#^\s*namespace ' . preg_quote($prefix, '#') . ';\R\R?#m', '');
+                    $body = str_replace($prefix . '\\', '', $match[3]);
+                    $body = Strings::replace($body, '#^[ \t]*namespace ' . preg_quote($prefix, '#') . ';\R\R?#m', '');
+                    $body = Strings::replace($body, '#^[ \t]*\\\\class_alias\(.*?\);\R?#m', '');
 
-                    return $match[1] . $body . $match[3];
+                    return $match[1] . $body . $match[4];
                 }
             );
         },
diff --git a/tests/Scoper/ScoperPatchersTest.php b/tests/Scoper/ScoperPatchersTest.php
index 4fb1331a175..34e5d2dd7b6 100644
--- a/tests/Scoper/ScoperPatchersTest.php
+++ b/tests/Scoper/ScoperPatchersTest.php
@@ -12,7 +12,7 @@ final class ScoperPatchersTest extends TestCase
 {
     private static bool $isFinderAliased = false;
 
-    public function testKeepsPrefixedClassesInGetRuleDefinitionUnprefixed(): void
+    public function testKeepsPrefixedClassesInCodeSampleBlocksUnprefixed(): void
     {
         $scoperConfig = $this->provideScoperConfig();
 
@@ -44,14 +44,24 @@ public function run()
     {
     }
 }
+\class_alias('SomeClass', 'SomeClass', \false);
 CODE_SAMPLE
                     ,
                     <<<'CODE_SAMPLE'
 <?php
 
+namespace RectorPrefix202607;
+
 use RectorPrefix202607\Webmozart\Assert\Assert;
 
-\RectorPrefix202607\Webmozart\Assert\Assert::allString($items);
+class SomeClass
+{
+    public function run()
+    {
+        \RectorPrefix202607\Webmozart\Assert\Assert::allString($items);
+    }
+}
+\class_alias('SomeClass', 'SomeClass', \false);
 CODE_SAMPLE
                     ,
                     []
@@ -83,10 +93,10 @@ public function refactor(): void
         $this->assertStringContainsString('use RectorPrefix202607\Webmozart\Assert\Assert;', (string) $content);
         $this->assertStringContainsString('\Webmozart\Assert\Assert::allString($items);', (string) $content);
         $this->assertStringContainsString("'SomeVendor\ValueObject::class'", (string) $content);
-        $this->assertStringContainsString("'new SomeVendor\ValueObject()'", (string) $content);
         $this->assertStringContainsString('$metadata = \'Webmozart\Assert\Assert\';', (string) $content);
         $this->assertStringContainsString('\RectorPrefix202607\SomeVendor\Runtime::class;', (string) $content);
         $this->assertStringNotContainsString('namespace RectorPrefix202607;', (string) $content);
+        $this->assertStringNotContainsString('\class_alias', (string) $content);
     }
 
     public function testRemovesPrefixedNamespaceInGetRuleDefinitionWithWindowsLineEndings(): void
@@ -103,12 +113,15 @@ final class SomeRector
 {
     public function getRuleDefinition(): RuleDefinition
     {
-        return new CodeSample(
-            '<?php
+        return new CodeSample(<<<'CODE_SAMPLE'
+<?php
+
 namespace RectorPrefix202607;
 
-RectorPrefix202607\SomeVendor\ValueObject::class;'
-        );
+RectorPrefix202607\SomeVendor\ValueObject::class;
+\class_alias('SomeClass', 'SomeClass', \false);
+CODE_SAMPLE
+        , '');
     }
 }
 PHP
@@ -124,6 +137,7 @@ public function getRuleDefinition(): RuleDefinition
 
         $this->assertStringNotContainsString('namespace RectorPrefix202607;', (string) $content);
         $this->assertStringContainsString('SomeVendor\ValueObject::class;', (string) $content);
+        $this->assertStringNotContainsString('\class_alias', (string) $content);
     }
 
     /**

From fb0e8282c6a6ce146695f1f3dc01e174c26d8d91 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 10 Jul 2026 18:40:22 +0700
Subject: [PATCH 2/4] update ambiguous test

---
 tests/Scoper/ScoperPatchersTest.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/Scoper/ScoperPatchersTest.php b/tests/Scoper/ScoperPatchersTest.php
index 34e5d2dd7b6..64bb781872b 100644
--- a/tests/Scoper/ScoperPatchersTest.php
+++ b/tests/Scoper/ScoperPatchersTest.php
@@ -89,14 +89,18 @@ public function refactor(): void
             );
         }
 
-        $this->assertStringContainsString('use Webmozart\Assert\Assert;', (string) $content);
+        preg_match_all("#<<<'CODE_SAMPLE'\R(.*?)\RCODE_SAMPLE#s", (string) $content, $matches);
+        $codeSampleContent = implode("\n", $matches[1]);
+
         $this->assertStringContainsString('use RectorPrefix202607\Webmozart\Assert\Assert;', (string) $content);
-        $this->assertStringContainsString('\Webmozart\Assert\Assert::allString($items);', (string) $content);
+        $this->assertStringContainsString('use Webmozart\Assert\Assert;', $codeSampleContent);
+        $this->assertStringContainsString('\Webmozart\Assert\Assert::allString($items);', $codeSampleContent);
         $this->assertStringContainsString("'SomeVendor\ValueObject::class'", (string) $content);
         $this->assertStringContainsString('$metadata = \'Webmozart\Assert\Assert\';', (string) $content);
         $this->assertStringContainsString('\RectorPrefix202607\SomeVendor\Runtime::class;', (string) $content);
-        $this->assertStringNotContainsString('namespace RectorPrefix202607;', (string) $content);
-        $this->assertStringNotContainsString('\class_alias', (string) $content);
+        $this->assertStringNotContainsString('namespace RectorPrefix202607;', $codeSampleContent);
+        $this->assertStringNotContainsString('use RectorPrefix202607\Webmozart\Assert\Assert;', $codeSampleContent);
+        $this->assertStringNotContainsString('\class_alias', $codeSampleContent);
     }
 
     public function testRemovesPrefixedNamespaceInGetRuleDefinitionWithWindowsLineEndings(): void

From 1768c419782e415b4c8f673d047774864dbe5d20 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 10 Jul 2026 18:44:47 +0700
Subject: [PATCH 3/4] update regex

---
 scoper.php                          | 22 +++++++++++++++-------
 tests/Scoper/ScoperPatchersTest.php | 19 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/scoper.php b/scoper.php
index 71caf13d743..268250dc1a4 100644
--- a/scoper.php
+++ b/scoper.php
@@ -119,13 +119,21 @@ static function (string $filePath, string $prefix, string $content): string {
 
             return Strings::replace(
                 $content,
-                "#(<<<'?(?<label>CODE_SAMPLE|SAMPLE)'?\\R)(.*?)(\\R\\s*\\k<label>)#s",
-                static function (array $match) use ($prefix): string {
-                    $body = str_replace($prefix . '\\', '', $match[3]);
-                    $body = Strings::replace($body, '#^[ \t]*namespace ' . preg_quote($prefix, '#') . ';\R\R?#m', '');
-                    $body = Strings::replace($body, '#^[ \t]*\\\\class_alias\(.*?\);\R?#m', '');
-
-                    return $match[1] . $body . $match[4];
+                '#(public function getRuleDefinition\(\): RuleDefinition\s+\{\R)(.*?)(\R\s*\);\R\s*\})#s',
+                static function (array $ruleDefinitionMatch) use ($prefix): string {
+                    $ruleDefinitionContent = Strings::replace(
+                        $ruleDefinitionMatch[2],
+                        "#(<<<'?(?<label>CODE_SAMPLE|SAMPLE)'?\\R)(.*?)(\\R\\s*\\k<label>)#s",
+                        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', '');
+
+                            return $codeSampleMatch[1] . $body . $codeSampleMatch[4];
+                        }
+                    );
+
+                    return $ruleDefinitionMatch[1] . $ruleDefinitionContent . $ruleDefinitionMatch[3];
                 }
             );
         },
diff --git a/tests/Scoper/ScoperPatchersTest.php b/tests/Scoper/ScoperPatchersTest.php
index 64bb781872b..19db4cea05e 100644
--- a/tests/Scoper/ScoperPatchersTest.php
+++ b/tests/Scoper/ScoperPatchersTest.php
@@ -76,6 +76,15 @@ public function run()
 
     public function refactor(): void
     {
+        $sample = <<<'CODE_SAMPLE'
+<?php
+
+namespace RectorPrefix202607;
+
+\RectorPrefix202607\ShouldStayPrefixed::run();
+\class_alias('SomeClass', 'SomeClass', \false);
+CODE_SAMPLE;
+
         \RectorPrefix202607\SomeVendor\Runtime::class;
     }
 }
@@ -89,7 +98,14 @@ public function refactor(): void
             );
         }
 
-        preg_match_all("#<<<'CODE_SAMPLE'\R(.*?)\RCODE_SAMPLE#s", (string) $content, $matches);
+        preg_match(
+            '#public function getRuleDefinition\(\): RuleDefinition\s+\{\R(.*?)\R    \}\R\R    public function refactor\(\): void#s',
+            (string) $content,
+            $getRuleDefinitionMatches
+        );
+        $this->assertNotSame([], $getRuleDefinitionMatches);
+
+        preg_match_all("#<<<'CODE_SAMPLE'\R(.*?)\RCODE_SAMPLE#s", $getRuleDefinitionMatches[1], $matches);
         $codeSampleContent = implode("\n", $matches[1]);
 
         $this->assertStringContainsString('use RectorPrefix202607\Webmozart\Assert\Assert;', (string) $content);
@@ -101,6 +117,7 @@ public function refactor(): void
         $this->assertStringNotContainsString('namespace RectorPrefix202607;', $codeSampleContent);
         $this->assertStringNotContainsString('use RectorPrefix202607\Webmozart\Assert\Assert;', $codeSampleContent);
         $this->assertStringNotContainsString('\class_alias', $codeSampleContent);
+        $this->assertStringContainsString('\RectorPrefix202607\ShouldStayPrefixed::run();', (string) $content);
     }
 
     public function testRemovesPrefixedNamespaceInGetRuleDefinitionWithWindowsLineEndings(): void

From 0ad67c55482a6884eac14ad9a3efd63e53793cf0 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 10 Jul 2026 18:45:25 +0700
Subject: [PATCH 4/4] update regex

---
 scoper.php                          | 2 +-
 tests/Scoper/ScoperPatchersTest.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scoper.php b/scoper.php
index 268250dc1a4..55da027ca73 100644
--- a/scoper.php
+++ b/scoper.php
@@ -119,7 +119,7 @@ static function (string $filePath, string $prefix, string $content): string {
 
             return Strings::replace(
                 $content,
-                '#(public function getRuleDefinition\(\): RuleDefinition\s+\{\R)(.*?)(\R\s*\);\R\s*\})#s',
+                '#(public function getRuleDefinition\(\): RuleDefinition\s+\{\R)(.*?)(\R\s*\]?\);\R\s*\})#s',
                 static function (array $ruleDefinitionMatch) use ($prefix): string {
                     $ruleDefinitionContent = Strings::replace(
                         $ruleDefinitionMatch[2],
diff --git a/tests/Scoper/ScoperPatchersTest.php b/tests/Scoper/ScoperPatchersTest.php
index 19db4cea05e..82830e1a53b 100644
--- a/tests/Scoper/ScoperPatchersTest.php
+++ b/tests/Scoper/ScoperPatchersTest.php
@@ -134,7 +134,8 @@ final class SomeRector
 {
     public function getRuleDefinition(): RuleDefinition
     {
-        return new CodeSample(<<<'CODE_SAMPLE'
+        return new RuleDefinition('Demo', [
+            new CodeSample(<<<'CODE_SAMPLE'
 <?php
 
 namespace RectorPrefix202607;
@@ -142,7 +143,8 @@ public function getRuleDefinition(): RuleDefinition
 RectorPrefix202607\SomeVendor\ValueObject::class;
 \class_alias('SomeClass', 'SomeClass', \false);
 CODE_SAMPLE
-        , '');
+            , ''),
+        ]);
     }
 }
 PHP