Skip to content
/ rector-src Public

Fix StaticCallOnNonStaticToInstanceCallRector for same-class calls #7876

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
TomasVotruba merged 1 commit into from
Feb 3, 2026
+48 −2
Merged

Fix StaticCallOnNonStaticToInstanceCallRector for same-class calls #7876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 37 additions & 0 deletions ...taticCall/StaticCallOnNonStaticToInstanceCallRector/Fixture/same_class_non_static.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?php

namespace Rector\Tests\Php70\Rector\StaticCall\StaticCallOnNonStaticToInstanceCallRector\Fixture;

class SameClassNonStatic
{
public function run()
{
return SameClassNonStatic::doWork();
}

public function doWork()
{
return 'work done';
}
}

?>
-----
<?php

namespace Rector\Tests\Php70\Rector\StaticCall\StaticCallOnNonStaticToInstanceCallRector\Fixture;

class SameClassNonStatic
{
public function run()
{
return $this->doWork();
}

public function doWork()
{
return 'work done';
}
}

?>
13 changes: 11 additions & 2 deletions rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use PhpParser\Node\Expr\New_;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Expr\Variable;
use PHPStan\Analyser\Scope;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\MethodReflection;
Expand Down Expand Up @@ -123,6 +124,11 @@ public function refactor(Node $node): ?Node
return null;
}

$classReflection = $scope->getClassReflection();
if ($classReflection instanceof ClassReflection && $classReflection->getName() === $className) {
return new MethodCall(new Variable('this'), $node->name, $node->args);
}

if ($this->isInstantiable($className, $scope)) {
$new = new New_($node->class);
return new MethodCall($new, $node->name, $node->args);
Expand Down Expand Up @@ -168,8 +174,11 @@ private function shouldSkip(string $methodName, string $className, StaticCall $s
return true;
}

$reflection = $scope->getClassReflection();
if ($reflection instanceof ClassReflection && $reflection->is($className)) {
$currentClassReflection = $scope->getClassReflection();
if ($currentClassReflection instanceof ClassReflection
&& $this->reflectionProvider->hasClass($className)
&& $currentClassReflection->isSubclassOfClass($this->reflectionProvider->getClass($className))
) {
return true;
}

Expand Down