Skip to content

[AnnotationToAttribute] Handle already in use on DataProviderAnnotationToAttributeRector #523

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.

Sign up for GitHub

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 2 commits into from
Aug 26, 2025
Merged

[AnnotationToAttribute] Handle already in use on DataProviderAnnotationToAttributeRector #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7df97d
[AnnotationToAttribute] Handle already in use on DataProviderAnnotati…
samsonasik Aug 26, 2025
b2855e8
[ci-review] Rector Rectify
actions-user Aug 26, 2025
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
35 changes: 35 additions & 0 deletions ...Rector/ClassMethod/DataProviderAnnotationToAttributeRector/Fixture/already_in_use.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?php

namespace Rector\PHPUnit\Tests\AnnotationsToAttributes\Rector\ClassMethod\DataProviderAnnotationToAttributeRector\Fixture;

use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;

final class AlreadyInUse extends TestCase
{
/**
* @dataProvider someMethod()
*/
public function test(): void
{
}
}

?>
-----
<?php

namespace Rector\PHPUnit\Tests\AnnotationsToAttributes\Rector\ClassMethod\DataProviderAnnotationToAttributeRector\Fixture;

use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;

final class AlreadyInUse extends TestCase
{
#[\PHPUnit\Framework\Attributes\DataProvider('@dataProvider')]
Copy link
Member

@TomasVotruba TomasVotruba Aug 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there should be a method name instead:

Suggested change
#[\PHPUnit\Framework\Attributes\DataProvider('@dataProvider')]
#[\PHPUnit\Framework\Attributes\DataProvider('someMethod')]

Copy link
Member Author

@samsonasik samsonasik Aug 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I will check :)

Copy link
Member Author

@samsonasik samsonasik Aug 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#524

public function test(): void
{
}
}

?>
9 changes: 7 additions & 2 deletions rules/AnnotationsToAttributes/Rector/ClassMethod/DataProviderAnnotationToAttributeRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\ReflectionProvider;
use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover;
Expand Down Expand Up @@ -132,11 +133,15 @@ public function refactor(Node $node): ?Node
}

foreach ($desiredTagValueNodes as $desiredTagValueNode) {
if (! $desiredTagValueNode->value instanceof GenericTagValueNode) {
if (! $desiredTagValueNode->value instanceof GenericTagValueNode && ! $desiredTagValueNode->value instanceof DoctrineAnnotationTagValueNode) {
continue;
}

$originalAttributeValue = $desiredTagValueNode->value->value;
if ($desiredTagValueNode->value instanceof GenericTagValueNode) {
$originalAttributeValue = $desiredTagValueNode->value->value;
} else {
$originalAttributeValue = $desiredTagValueNode->value->identifierTypeNode->name;
}

$node->attrGroups[] = $this->createAttributeGroup(strtok($originalAttributeValue, " \t\n\r\0\x0B"));

Expand Down