Skip to content

[Reflection] Reduce Scope pulling on ReflectionResolver #4548

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 1 commit into from
Jul 20, 2023
Merged

[Reflection] Reduce Scope pulling on ReflectionResolver #4548

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
2 changes: 1 addition & 1 deletion rules/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private function refactorClassMethod(ClassMethod $classMethod, Scope $scope): ?C
return null;
}

$classMethodReflection = $this->reflectionResolver->resolveMethodReflectionFromClassMethod($classMethod);
$classMethodReflection = $this->reflectionResolver->resolveMethodReflectionFromClassMethod($classMethod, $scope);
if (! $classMethodReflection instanceof MethodReflection) {
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions rules/Php70/Rector/StaticCall/StaticCallOnNonStaticToInstanceCallRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
return null;
}

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

private function isInstantiable(string $className): bool
private function isInstantiable(string $className, Scope $scope): bool
{
if (! $this->reflectionProvider->hasClass($className)) {
return false;
}

$methodReflection = $this->reflectionResolver->resolveMethodReflection($className, '__callStatic', null);
$methodReflection = $this->reflectionResolver->resolveMethodReflection($className, '__callStatic', $scope);
if ($methodReflection instanceof MethodReflection) {
return false;
}
Expand Down
5 changes: 2 additions & 3 deletions src/Reflection/ReflectionResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,16 +191,15 @@ public function resolveFunctionLikeReflectionFromCall(
return $this->resolveFunctionReflectionFromFuncCall($call);
}

public function resolveMethodReflectionFromClassMethod(ClassMethod $classMethod): ?MethodReflection
public function resolveMethodReflectionFromClassMethod(ClassMethod $classMethod, Scope $scope): ?MethodReflection
{
$classReflection = $this->resolveClassReflection($classMethod);
$classReflection = $scope->getClassReflection();
if (! $classReflection instanceof ClassReflection) {
return null;
}

$className = $classReflection->getName();
$methodName = $this->nodeNameResolver->getName($classMethod);
$scope = $classMethod->getAttribute(AttributeKey::SCOPE);

return $this->resolveMethodReflection($className, $methodName, $scope);
}
Expand Down