Skip to content

Remove PHP version constraint from the #[\Override] attribute rules #4436

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

Open
wants to merge 2 commits into
base: 2.1.x
Choose a base branch
from
Open

Remove PHP version constraint from the #[\Override] attribute rules #4436

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
99e2ffa
Remove the PHP version constraint from the `#[\Override]` attribute r…
johnbillion Oct 13, 2025
52713b7
Test updates.
johnbillion Oct 13, 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
5 changes: 2 additions & 3 deletions src/Rules/Methods/OverridingMethodRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function processNode(Node $node, Scope&NodeCallbackInvoker $scope): array
}
}

if ($this->phpVersion->supportsOverrideAttribute() && $this->hasOverrideAttribute($node->getOriginalNode())) {
if ($this->hasOverrideAttribute($node->getOriginalNode())) {
return [
RuleErrorBuilder::message(sprintf(
'Method %s::%s() has #[\Override] attribute but does not override any method.',
Expand All @@ -111,8 +111,7 @@ public function processNode(Node $node, Scope&NodeCallbackInvoker $scope): array

$messages = [];
if (
$this->phpVersion->supportsOverrideAttribute()
&& $this->checkMissingOverrideMethodAttribute
$this->checkMissingOverrideMethodAttribute
&& !$scope->isInTrait()
&& !$this->hasOverrideAttribute($node->getOriginalNode())
) {
Expand Down
30 changes: 16 additions & 14 deletions tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,15 +687,12 @@ public function testBug9615(): void
public function testBug10149(): void
{
$this->phpVersionId = PHP_VERSION_ID;
$errors = [];
if (PHP_VERSION_ID >= 80300) {
$errors = [
[
'Method Bug10149\StdSat::__get() has #[\Override] attribute but does not override any method.',
10,
],
];
}
$errors = [
[
'Method Bug10149\StdSat::__get() has #[\Override] attribute but does not override any method.',
10,
],
];
$this->analyse([__DIR__ . '/data/bug-10149.php'], $errors);
}

Expand Down Expand Up @@ -726,7 +723,6 @@ public function testTraits(): void
$this->analyse([__DIR__ . '/data/overriding-trait-methods.php'], $errors);
}

#[RequiresPhp('>= 8.3')]
public function testOverrideAttribute(): void
{
$this->phpVersionId = PHP_VERSION_ID;
Expand All @@ -745,7 +741,16 @@ public function testOverrideAttribute(): void
public static function dataCheckMissingOverrideAttribute(): iterable
{
yield [false, 80000, []];
yield [true, 80000, []];
yield [true, 80000, [
[
'Method CheckMissingOverrideAttr\Bar::doFoo() overrides method CheckMissingOverrideAttr\Foo::doFoo() but is missing the #[\Override] attribute.',
18,
],
[
'Method CheckMissingOverrideAttr\ChildOfParentWithAbstractConstructor::__construct() overrides method CheckMissingOverrideAttr\ParentWithAbstractConstructor::__construct() but is missing the #[\Override] attribute.',
49,
],
]];
yield [false, 80300, []];
yield [true, 80300, [
[
Expand Down Expand Up @@ -785,7 +790,6 @@ public function testBug10153(): void
$this->analyse([__DIR__ . '/data/bug-10153.php'], $errors);
}

#[RequiresPhp('>= 8.3')]
public function testBug12471(): void
{
$this->checkMissingOverrideMethodAttribute = true;
Expand All @@ -812,15 +816,13 @@ public function testSimpleXmlElementChildClass(): void
$this->analyse([__DIR__ . '/data/simple-xml-element-child.php'], []);
}

#[RequiresPhp('>= 8.3')]
public function testFixOverride(): void
{
$this->phpVersionId = PHP_VERSION_ID;
$this->checkMissingOverrideMethodAttribute = true;
$this->fix(__DIR__ . '/data/fix-override-attribute.php', __DIR__ . '/data/fix-override-attribute.php.fixed');
}

#[RequiresPhp('>= 8.3')]
public function testFixWithTabs(): void
{
$this->phpVersionId = PHP_VERSION_ID;
Expand Down
Loading