Skip to content

PHPUnit 10/11 Only set attribute when target attribute class exists on CoversAnnotationWithValueToAttributeRector #493

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 3 commits into from
May 22, 2025
Merged

PHPUnit 10/11 Only set attribute when target attribute class exists on CoversAnnotationWithValueToAttributeRector #493

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2179c33
PHPUnit 10/11 Only set attribute when target attribute class exists o…
samsonasik May 22, 2025
af44a0c
[ci-review] Rector Rectify
actions-user May 22, 2025
b4f48c4
fix phpstan
samsonasik May 22, 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
43 changes: 33 additions & 10 deletions rules/AnnotationsToAttributes/Rector/Class_/CoversAnnotationWithValueToAttributeRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,17 @@ public function refactor(Node $node): ?Node
return $node;
}

private function createAttributeGroup(string $annotationValue): AttributeGroup
private function createAttributeGroup(string $annotationValue): ?AttributeGroup
{
if (str_starts_with($annotationValue, '::')) {
$attributeClass = self::COVERS_FUNCTION_ATTRIBUTE;
$attributeValue = [trim($annotationValue, ':()')];
} elseif (str_contains($annotationValue, '::')) {
$attributeClass = self::COVERS_METHOD_ATTRIBUTE;
if (! $this->reflectionProvider->hasClass($attributeClass)) {
return null;
}

$attributeValue = [$this->getClass($annotationValue) . '::class', $this->getMethod($annotationValue)];
} else {
$attributeClass = self::COVERTS_CLASS_ATTRIBUTE;
Expand All @@ -161,6 +165,9 @@ private function createAttributeGroup(string $annotationValue): AttributeGroup

if ($classReflection->isTrait()) {
$attributeClass = self::COVERTS_TRAIT_ATTRIBUTE;
if (! $this->reflectionProvider->hasClass($attributeClass)) {
return null;
}
}
}

Expand Down Expand Up @@ -206,7 +213,13 @@ private function handleCoversDefaultClass(PhpDocInfo $phpDocInfo): array
continue;
}

$attributeGroups[] = $this->createAttributeGroup($desiredTagValueNode->value->value);
$attributeGroup = $this->createAttributeGroup($desiredTagValueNode->value->value);
// phpunit 10 may not fully support attribute
if (! $attributeGroup instanceof AttributeGroup) {
continue;
}

$attributeGroups[] = $attributeGroup;
$this->phpDocTagRemover->removeTagValueFromNode($phpDocInfo, $desiredTagValueNode);
}

Expand All @@ -226,10 +239,15 @@ private function handleCovers(PhpDocInfo $phpDocInfo, bool $hasCoversDefault): a
}

$covers = $desiredTagValueNode->value->value;
if (str_starts_with($covers, '\\')) {
$attributeGroups[$covers] = $this->createAttributeGroup($covers);
} elseif (! $hasCoversDefault && str_starts_with($covers, '::')) {
$attributeGroups[$covers] = $this->createAttributeGroup($covers);
if (str_starts_with($covers, '\\') || (! $hasCoversDefault && str_starts_with($covers, '::'))) {
$attributeGroup = $this->createAttributeGroup($covers);

// phpunit 10 may not fully support attribute
if (! $attributeGroup instanceof AttributeGroup) {
continue;
}

$attributeGroups[$covers] = $attributeGroup;
}

$this->phpDocTagRemover->removeTagValueFromNode($phpDocInfo, $desiredTagValueNode);
Expand All @@ -256,10 +274,15 @@ private function resolveMethodAttributes(ClassMethod $classMethod, bool $hasCove
}

$covers = $desiredTagValueNode->value->value;
if (str_starts_with($covers, '\\')) {
$attributeGroups[$covers] = $this->createAttributeGroup($covers);
} elseif (! $hasCoversDefault && str_starts_with($covers, '::')) {
$attributeGroups[$covers] = $this->createAttributeGroup($covers);
if (str_starts_with($covers, '\\') || (! $hasCoversDefault && str_starts_with($covers, '::'))) {
$attributeGroup = $this->createAttributeGroup($covers);

// phpunit 10 may not fully support attribute
if (! $attributeGroup instanceof AttributeGroup) {
continue;
}

$attributeGroups[$covers] = $attributeGroup;
}
}

Expand Down
Loading