Skip to content

FileTypeMapper: Don't deep traverse method/function/hook bodies #4730

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

Closed
staabm wants to merge 1 commit into from
+11 −4
Closed

FileTypeMapper: Don't deep traverse method/function/hook bodies #4730

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
15 changes: 11 additions & 4 deletions src/Type/FileTypeMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ final class FileTypeMapper

private const SKIP_NODE = 1;
private const POP_TYPE_MAP_STACK = 2;
private const DONT_TRAVERSE_CHILDREN = 3;

/** @var NameScope[][] */
private array $memoryCache = [];
Expand Down Expand Up @@ -319,6 +320,10 @@ function (Node $node) use ($fileName, $lookForTrait, &$traitFound, $traitMethodA
$phpDocNodeMap[$nameScopeKey] = $this->phpDocStringResolver->resolve($docComment);
}

if ($node instanceof Node\Stmt\ClassMethod || $node instanceof Node\Stmt\Function_) {
return self::DONT_TRAVERSE_CHILDREN;
}

return null;
} elseif ($node instanceof Node\PropertyHook) {
$propertyName = $node->getAttribute('propertyName');
Expand All @@ -330,7 +335,7 @@ function (Node $node) use ($fileName, $lookForTrait, &$traitFound, $traitMethodA
}
}

return null;
return self::DONT_TRAVERSE_CHILDREN;
}

if ($node instanceof Node\Stmt\Namespace_) {
Expand Down Expand Up @@ -821,9 +826,11 @@ private function processNodes($node, Closure $nodeCallback, Closure $endNodeCall
if ($callbackResult === self::SKIP_NODE) {
return;
}
foreach ($node->getSubNodeNames() as $subNodeName) {
$subNode = $node->{$subNodeName};
$this->processNodes($subNode, $nodeCallback, $endNodeCallback);
if ($callbackResult !== self::DONT_TRAVERSE_CHILDREN) {
foreach ($node->getSubNodeNames() as $subNodeName) {
$subNode = $node->{$subNodeName};
$this->processNodes($subNode, $nodeCallback, $endNodeCallback);
}
}
$endNodeCallback($node, $callbackResult);
} elseif (is_array($node)) {
Expand Down
Loading