Skip to content

Commit 7c4ef12

Browse files
[CodingStyle] Use native php-parser node API over class reflection (#8218)
isAnonymous() and isFinalByKeyword() on the node own class reflection answer questions the Class_ node already answers via isAnonymous() and isFinal(). Read them off the node instead, and hoist the anonymous-class checks above the reflection lookup so it is skipped entirely. Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
1 parent d0f304c commit 7c4ef12

3 files changed

Lines changed: 17 additions & 9 deletions

File tree

‎rules/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ public function getNodeTypes(): array
7878
*/
7979
public function refactor(Node $node): ?Node
8080
{
81-
$classReflection = $this->reflectionResolver->resolveClassReflection($node);
82-
if (! $classReflection instanceof ClassReflection) {
81+
if ($node->isAnonymous()) {
8382
return null;
8483
}
8584

86-
if ($classReflection->isAnonymous()) {
85+
$classReflection = $this->reflectionResolver->resolveClassReflection($node);
86+
if (! $classReflection instanceof ClassReflection) {
8787
return null;
8888
}
8989

‎rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodRector.php‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ public function refactor(Node $node): ?Node
8585
return null;
8686
}
8787

88+
// unreliable to detect on anonymous class: doesn't make sense
89+
if ($node->isAnonymous()) {
90+
return null;
91+
}
92+
8893
$hasChanged = false;
8994

9095
$classReflection = $this->reflectionResolver->resolveClassReflection($node);
@@ -138,13 +143,16 @@ public function refactor(Node $node): ?Node
138143
}
139144

140145
return null;
141-
142146
}
143147

144148
private function shouldSkip(ClassMethod $classMethod, ClassReflection $classReflection): bool
145149
{
146-
// unreliable to detect anonymous class: doesn't make sense
147-
if ($classReflection->isAnonymous()) {
150+
// unreliable to detect trait, interface: doesn't make sense
151+
if ($classReflection->isTrait()) {
152+
return true;
153+
}
154+
155+
if ($classReflection->isInterface()) {
148156
return true;
149157
}
150158

‎rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,17 +158,17 @@ private function processThisToStatic(Class_ $class, ClassReflection $classReflec
158158

159159
$this->hasChanged = true;
160160

161-
$objectReference = $this->resolveClassSelf($classReflection, $subNode);
161+
$objectReference = $this->resolveClassSelf($class, $subNode);
162162
return $this->nodeFactory->createStaticCall($objectReference, $methodName, $subNode->args);
163163
});
164164
}
165165

166166
/**
167167
* @return ObjectReference::STATIC|ObjectReference::SELF
168168
*/
169-
private function resolveClassSelf(ClassReflection $classReflection, MethodCall $methodCall): string
169+
private function resolveClassSelf(Class_ $class, MethodCall $methodCall): string
170170
{
171-
if ($classReflection->isFinalByKeyword()) {
171+
if ($class->isFinal()) {
172172
return ObjectReference::SELF;
173173
}
174174

0 commit comments

Comments
 (0)