Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions scoper.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,21 @@ static function (string $filePath, string $prefix, string $content): string {

return Strings::replace(
$content,
'#(public function getRuleDefinition\(\): RuleDefinition\s+\{\R)(.*?)(\R\s*\);\R\s*\})#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', '');

return $match[1] . $body . $match[3];
'#(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];
}
);
},
Expand Down
57 changes: 47 additions & 10 deletions tests/Scoper/ScoperPatchersTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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
,
[]
Expand All @@ -66,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;
}
}
Expand All @@ -79,14 +98,26 @@ public function refactor(): void
);
}

$this->assertStringContainsString('use Webmozart\Assert\Assert;', (string) $content);
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);
$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("'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('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
Expand All @@ -103,12 +134,17 @@ final class SomeRector
{
public function getRuleDefinition(): RuleDefinition
{
return new CodeSample(
'<?php
return new RuleDefinition('Demo', [
new CodeSample(<<<'CODE_SAMPLE'
<?php

namespace RectorPrefix202607;

RectorPrefix202607\SomeVendor\ValueObject::class;'
);
RectorPrefix202607\SomeVendor\ValueObject::class;
\class_alias('SomeClass', 'SomeClass', \false);
CODE_SAMPLE
, ''),
]);
}
}
PHP
Expand All @@ -124,6 +160,7 @@ public function getRuleDefinition(): RuleDefinition

$this->assertStringNotContainsString('namespace RectorPrefix202607;', (string) $content);
$this->assertStringContainsString('SomeVendor\ValueObject::class;', (string) $content);
$this->assertStringNotContainsString('\class_alias', (string) $content);
}

/**
Expand Down
Loading