-
Notifications
You must be signed in to change notification settings - Fork 63
[AnnotationsToAttributes] Add @requires translation to attributes (#441) #442
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
samsonasik
merged 1 commit into
rectorphp:main
from
andrewnicols:RequiresAnnotationToAttribute
Jan 28, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
...ctor/Class_/RequiresAnnotationWithValueToAttributeRector/Fixture/requires_fixture.php.inc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| <?php | ||
|
|
||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| /** | ||
| * @requires PHP > 8.4 | ||
| * @requires PHPUnit >= 10 | ||
| * @requires OS Windows | ||
| * @requires OSFAMILY Darwin | ||
| * @requires function someFunction | ||
| * @requires function \some\className::someMethod | ||
| * @requires extension mysqli | ||
| * @requires extension mysqli >= 8.3.0 | ||
| * @requires setting date.timezone Europe/Berlin | ||
| */ | ||
| class BarController extends TestCase | ||
| { | ||
| /** | ||
| * @requires PHP > 8.4 | ||
| * @requires PHPUnit >= 10 | ||
| * @requires OS Windows | ||
| * @requires OSFAMILY Darwin | ||
| * @requires function someFunction | ||
| * @requires function \some\className::someMethod | ||
| * @requires extension mysqli | ||
| * @requires extension mysqli >= 8.3.0 | ||
| * @requires setting date.timezone Europe/Berlin | ||
| */ | ||
| public function testWithRequires() | ||
| { | ||
| } | ||
| } | ||
|
|
||
| ?> | ||
| ----- | ||
| <?php | ||
|
|
||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| #[\PHPUnit\Framework\Attributes\RequiresPhp('> 8.4')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresPhpunit('>= 10')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresOperatingSystem('Windows')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresOperatingSystemFamily('Darwin')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresFunction('someFunction')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresMethod(\some\className::class, 'someMethod')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresExtension('mysqli')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresExtension('mysqli', '>= 8.3.0')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresSetting('date.timezone', 'Europe/Berlin')] | ||
| class BarController extends TestCase | ||
| { | ||
| #[\PHPUnit\Framework\Attributes\RequiresPhp('> 8.4')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresPhpunit('>= 10')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresOperatingSystem('Windows')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresOperatingSystemFamily('Darwin')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresFunction('someFunction')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresMethod(\some\className::class, 'someMethod')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresExtension('mysqli')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresExtension('mysqli', '>= 8.3.0')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresSetting('date.timezone', 'Europe/Berlin')] | ||
| public function testWithRequires() | ||
| { | ||
| } | ||
| } | ||
|
|
||
| ?> |
28 changes: 28 additions & 0 deletions
28
...AnnotationWithValueToAttributeRector/RequiresAnnotationWithValueToAttributeRectorTest.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Rector\PHPUnit\Tests\AnnotationsToAttributes\Rector\Class_\RequiresAnnotationWithValueToAttributeRector; | ||
|
|
||
| use Iterator; | ||
| use PHPUnit\Framework\Attributes\DataProvider; | ||
| use Rector\Testing\PHPUnit\AbstractRectorTestCase; | ||
|
|
||
| final class RequiresAnnotationWithValueToAttributeRectorTest 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'; | ||
| } | ||
| } |
10 changes: 10 additions & 0 deletions
10
...tes/Rector/Class_/RequiresAnnotationWithValueToAttributeRector/config/configured_rule.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| use Rector\Config\RectorConfig; | ||
| use Rector\PHPUnit\AnnotationsToAttributes\Rector\Class_\RequiresAnnotationWithValueToAttributeRector; | ||
|
|
||
| return static function (RectorConfig $rectorConfig): void { | ||
| $rectorConfig->rule(RequiresAnnotationWithValueToAttributeRector::class); | ||
| }; |
247 changes: 247 additions & 0 deletions
247
rules/AnnotationsToAttributes/Rector/Class_/RequiresAnnotationWithValueToAttributeRector.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,247 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Rector\PHPUnit\AnnotationsToAttributes\Rector\Class_; | ||
|
|
||
| use PhpParser\Node; | ||
| use PhpParser\Node\AttributeGroup; | ||
| use PhpParser\Node\Stmt\Class_; | ||
| use PhpParser\Node\Stmt\ClassMethod; | ||
| use PHPStan\PhpDocParser\Ast\PhpDoc\GenericTagValueNode; | ||
| use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo; | ||
| use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory; | ||
| use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover; | ||
| use Rector\Comments\NodeDocBlock\DocBlockUpdater; | ||
| use Rector\PhpAttribute\NodeFactory\PhpAttributeGroupFactory; | ||
| use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer; | ||
| use Rector\Rector\AbstractRector; | ||
| use Rector\ValueObject\PhpVersionFeature; | ||
| use Rector\VersionBonding\Contract\MinPhpVersionInterface; | ||
| use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; | ||
| use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; | ||
|
|
||
| /** | ||
| * @see \Rector\PHPUnit\Tests\AnnotationsToAttributes\Rector\Class_\RequiresAnnotationWithValueToAttributeRector\RequiresAnnotationWithValueToAttributeRectorTest | ||
| */ | ||
| final class RequiresAnnotationWithValueToAttributeRector extends AbstractRector implements MinPhpVersionInterface | ||
| { | ||
| public function __construct( | ||
| private readonly PhpDocTagRemover $phpDocTagRemover, | ||
| private readonly PhpAttributeGroupFactory $phpAttributeGroupFactory, | ||
| private readonly TestsNodeAnalyzer $testsNodeAnalyzer, | ||
| private readonly DocBlockUpdater $docBlockUpdater, | ||
| private readonly PhpDocInfoFactory $phpDocInfoFactory, | ||
| ) { | ||
| } | ||
|
|
||
| public function getRuleDefinition(): RuleDefinition | ||
| { | ||
| return new RuleDefinition('Change Requires annotations with values to attributes', [ | ||
| new CodeSample( | ||
| <<<'CODE_SAMPLE' | ||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| /** | ||
| * @requires PHP > 8.4 | ||
| * @requires PHPUnit >= 10 | ||
| * @requires OS Windows | ||
| * @requires OSFAMILY Darwin | ||
| * @requires function someFunction | ||
| * @requires function \some\className::someMethod | ||
| * @requires extension mysqli | ||
| * @requires extension mysqli >= 8.3.0 | ||
| * @requires setting date.timezone Europe/Berlin | ||
| */ | ||
|
|
||
| final class SomeTest extends TestCase | ||
| { | ||
| /** | ||
| * @requires PHP > 8.4 | ||
| * @requires PHPUnit >= 10 | ||
| * @requires OS Windows | ||
| * @requires OSFAMILY Darwin | ||
| * @requires function someFunction | ||
| * @requires function \some\className::someMethod | ||
| * @requires extension mysqli | ||
| * @requires extension mysqli >= 8.3.0 | ||
| * @requires setting date.timezone Europe/Berlin | ||
| */ | ||
| public function test() | ||
| { | ||
| } | ||
| } | ||
| CODE_SAMPLE | ||
|
|
||
| , | ||
| <<<'CODE_SAMPLE' | ||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| #[\PHPUnit\Framework\Attributes\RequiresPhp('> 8.4')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresPhpunit('>= 10')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresOperatingSystem('Windows')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresOperatingSystemFamily('Darwin')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresFunction('someFunction')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresMethod(\some\className::class, 'someMethod')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresExtension('mysqli')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresExtension('mysqli', '>= 8.3.0')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresSetting('date.timezone', 'Europe/Berlin')] | ||
| final class SomeTest extends TestCase | ||
| { | ||
|
|
||
| #[\PHPUnit\Framework\Attributes\RequiresPhp('> 8.4')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresPhpunit('>= 10')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresOperatingSystem('Windows')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresOperatingSystemFamily('Darwin')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresFunction('someFunction')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresMethod(\some\className::class, 'someMethod')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresExtension('mysqli')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresExtension('mysqli', '>= 8.3.0')] | ||
| #[\PHPUnit\Framework\Attributes\RequiresSetting('date.timezone', 'Europe/Berlin')] | ||
| public function test() | ||
| { | ||
| } | ||
| } | ||
| CODE_SAMPLE | ||
| ), | ||
| ]); | ||
| } | ||
|
|
||
| /** | ||
| * @return array<class-string<Node>> | ||
| */ | ||
| public function getNodeTypes(): array | ||
| { | ||
| return [Class_::class, ClassMethod::class]; | ||
| } | ||
|
|
||
| public function provideMinPhpVersion(): int | ||
| { | ||
| return PhpVersionFeature::ATTRIBUTES; | ||
| } | ||
|
|
||
| /** | ||
| * @param Class_|ClassMethod $node | ||
| */ | ||
| public function refactor(Node $node): ?Node | ||
| { | ||
| if (! $this->testsNodeAnalyzer->isInTestClass($node)) { | ||
| return null; | ||
| } | ||
|
|
||
| $hasChanged = false; | ||
|
|
||
| if ($node instanceof Class_) { | ||
| $phpDocInfo = $this->phpDocInfoFactory->createFromNode($node); | ||
| if ($phpDocInfo instanceof PhpDocInfo) { | ||
| $requiresAttributeGroups = $this->handleRequires($phpDocInfo); | ||
| if ($requiresAttributeGroups !== []) { | ||
| $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node); | ||
| $node->attrGroups = array_merge($node->attrGroups, $requiresAttributeGroups); | ||
| $this->removeMethodRequiresAnnotations($phpDocInfo); | ||
andrewnicols marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| $hasChanged = true; | ||
| } | ||
| } | ||
|
|
||
| foreach ($node->getMethods() as $classMethod) { | ||
| $phpDocInfo = $this->phpDocInfoFactory->createFromNode($classMethod); | ||
| if ($phpDocInfo instanceof PhpDocInfo) { | ||
| $requiresAttributeGroups = $this->handleRequires($phpDocInfo); | ||
| if ($requiresAttributeGroups !== []) { | ||
| $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($classMethod); | ||
| $classMethod->attrGroups = array_merge($classMethod->attrGroups, $requiresAttributeGroups); | ||
| $this->removeMethodRequiresAnnotations($phpDocInfo); | ||
andrewnicols marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| $hasChanged = true; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return $hasChanged ? $node : null; | ||
| } | ||
|
|
||
| private function createAttributeGroup(string $annotationValue): ?AttributeGroup | ||
| { | ||
| $annotationValues = explode(' ', $annotationValue, 2); | ||
| $type = array_shift($annotationValues); | ||
| $attributeValue = array_shift($annotationValues); | ||
| switch ($type) { | ||
| case 'PHP': | ||
| $attributeClass = 'PHPUnit\Framework\Attributes\RequiresPhp'; | ||
| $attributeValue = [$attributeValue]; | ||
| break; | ||
| case 'PHPUnit': | ||
| $attributeClass = 'PHPUnit\Framework\Attributes\RequiresPhpunit'; | ||
| $attributeValue = [$attributeValue]; | ||
| break; | ||
| case 'OS': | ||
| $attributeClass = 'PHPUnit\Framework\Attributes\RequiresOperatingSystem'; | ||
| $attributeValue = [$attributeValue]; | ||
| break; | ||
| case 'OSFAMILY': | ||
| $attributeClass = 'PHPUnit\Framework\Attributes\RequiresOperatingSystemFamily'; | ||
| $attributeValue = [$attributeValue]; | ||
| break; | ||
| case 'function': | ||
| if (str_contains((string) $attributeValue, '::')) { | ||
| $attributeClass = 'PHPUnit\Framework\Attributes\RequiresMethod'; | ||
| $attributeValue = explode('::', (string) $attributeValue); | ||
| $attributeValue[0] .= '::class'; | ||
| } else { | ||
| $attributeClass = 'PHPUnit\Framework\Attributes\RequiresFunction'; | ||
| $attributeValue = [$attributeValue]; | ||
| } | ||
|
|
||
| break; | ||
| case 'extension': | ||
| $attributeClass = 'PHPUnit\Framework\Attributes\RequiresExtension'; | ||
| $attributeValue = explode(' ', (string) $attributeValue, 2); | ||
| break; | ||
| case 'setting': | ||
| $attributeClass = 'PHPUnit\Framework\Attributes\RequiresSetting'; | ||
| $attributeValue = explode(' ', (string) $attributeValue, 2); | ||
| break; | ||
| default: | ||
| return null; | ||
| } | ||
|
|
||
| return $this->phpAttributeGroupFactory->createFromClassWithItems($attributeClass, [...$attributeValue]); | ||
| } | ||
|
|
||
| /** | ||
| * @return array<string, AttributeGroup|null> | ||
| */ | ||
| private function handleRequires(PhpDocInfo $phpDocInfo): array | ||
| { | ||
| $attributeGroups = []; | ||
| $desiredTagValueNodes = $phpDocInfo->getTagsByName('requires'); | ||
| foreach ($desiredTagValueNodes as $desiredTagValueNode) { | ||
| if (! $desiredTagValueNode->value instanceof GenericTagValueNode) { | ||
| continue; | ||
| } | ||
|
|
||
| $requires = $desiredTagValueNode->value->value; | ||
| $attributeGroups[$requires] = $this->createAttributeGroup($requires); | ||
| $this->phpDocTagRemover->removeTagValueFromNode($phpDocInfo, $desiredTagValueNode); | ||
| } | ||
|
|
||
| return $attributeGroups; | ||
| } | ||
|
|
||
| private function removeMethodRequiresAnnotations(PhpDocInfo $phpDocInfo): bool | ||
| { | ||
| $hasChanged = false; | ||
|
|
||
| $desiredTagValueNodes = $phpDocInfo->getTagsByName('requires'); | ||
| foreach ($desiredTagValueNodes as $desiredTagValueNode) { | ||
| if (! $desiredTagValueNode->value instanceof GenericTagValueNode) { | ||
| continue; | ||
| } | ||
|
|
||
| $this->phpDocTagRemover->removeTagValueFromNode($phpDocInfo, $desiredTagValueNode); | ||
| $hasChanged = true; | ||
| } | ||
|
|
||
| return $hasChanged; | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.