Skip to content

[Ast] Improve AstResolver and ClassLikeAstResolver performance #3714

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
Apr 30, 2023
Merged

[Ast] Improve AstResolver and ClassLikeAstResolver performance #3714

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
11 changes: 5 additions & 6 deletions src/PhpParser/AstResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ public function resolveClassFromName(string $className): Class_ | Trait_ | Inter
public function resolveClassMethodFromMethodReflection(MethodReflection $methodReflection): ?ClassMethod
{
$classReflection = $methodReflection->getDeclaringClass();

$classLikeName = $classReflection->getName();
$methodName = $methodReflection->getName();

$fileName = $classReflection->getFileName();

// probably native PHP method → un-parseable
Expand All @@ -92,6 +88,9 @@ public function resolveClassMethodFromMethodReflection(MethodReflection $methodR
return null;
}

$classLikeName = $classReflection->getName();
$methodName = $methodReflection->getName();

$classMethod = null;
$this->simpleCallableNodeTraverser->traverseNodesWithCallable(
$nodes,
Expand Down Expand Up @@ -131,8 +130,6 @@ public function resolveClassMethodOrFunctionFromCall(

public function resolveFunctionFromFunctionReflection(FunctionReflection $functionReflection): ?Function_
{
$functionName = $functionReflection->getName();

$fileName = $functionReflection->getFileName();
if ($fileName === null) {
return null;
Expand All @@ -143,7 +140,9 @@ public function resolveFunctionFromFunctionReflection(FunctionReflection $functi
return null;
}

$functionName = $functionReflection->getName();
$functionNode = null;

$this->simpleCallableNodeTraverser->traverseNodesWithCallable(
$nodes,
function (Node $node) use ($functionName, &$functionNode): ?int {
Expand Down
2 changes: 1 addition & 1 deletion src/PhpParser/ClassLikeAstResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public function resolveClassFromClassReflection(
return null;
}

$className = $classReflection->getName();
$fileName = $classReflection->getFileName();

// probably internal class
Expand All @@ -51,6 +50,7 @@ public function resolveClassFromClassReflection(
return null;
}

$className = $classReflection->getName();
/** @var Class_|Trait_|Interface_|Enum_|null $classLike */
$classLike = $this->betterNodeFinder->findFirst(
$stmts,
Expand Down