danog/PHP-Parser
1
0
Fork 0
mirror of https://github.com/danog/PHP-Parser.git synced 2025-01-22 05:41:23 +01:00
Code Issues Projects Releases Wiki Activity

Resolve param type hints earlier

Browse Source 
For convenience of concurrent visitors that want to perform
enterNode actions based on Stmt\Function_ etc.

Fixes #188.
This commit is contained in:
Nikita Popov 2015-03-25 20:57:39 +01:00
parent dba7524b37
commit 52dafafd10
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/PhpParser/NodeVisitor/NameResolver.php
View File

@ -48,15 +48,11 @@ class NameResolver extends NodeVisitorAbstract
$this->addNamespacedName($node);
} elseif ($node instanceof Stmt\Function_) {
$this->addNamespacedName($node);
if ($node->returnType instanceof Name) {
$node->returnType = $this->resolveClassName($node->returnType);
}
$this->resolveSignature($node);
} elseif ($node instanceof Stmt\ClassMethod
|| $node instanceof Expr\Closure
) {
if ($node->returnType instanceof Name) {
$node->returnType = $this->resolveClassName($node->returnType);
}
$this->resolveSignature($node);
} elseif ($node instanceof Stmt\Const_) {
foreach ($node->consts as $const) {
$this->addNamespacedName($const);
@ -83,7 +79,7 @@ class NameResolver extends NodeVisitorAbstract
$trait = $this->resolveClassName($trait);
}
foreach($node->adaptations as $adaptation) {
foreach ($node->adaptations as $adaptation) {
if (null !== $adaptation->trait) {
$adaptation->trait = $this->resolveClassName($adaptation->trait);
}
@ -95,10 +91,6 @@ class NameResolver extends NodeVisitorAbstract
}
}
} elseif ($node instanceof Node\Param
&& $node->type instanceof Name
) {
$node->type = $this->resolveClassName($node->type);
}
}
@ -138,6 +130,18 @@ class NameResolver extends NodeVisitorAbstract
$this->aliases[$type][$aliasName] = $use->name;
}
/** @param Stmt\Function_|Stmt\ClassMethod|Expr\Closure $node */
private function resolveSignature($node) {
foreach ($node->params as $param) {
if ($param->type instanceof Name) {
$param->type = $this->resolveClassName($param->type);
}
}
if ($node->returnType instanceof Name) {
$node->returnType = $this->resolveClassName($node->returnType);
}
}
protected function resolveClassName(Name $name) {
// don't resolve special class names
if (in_array(strtolower($name->toString()), array('self', 'parent', 'static'))) {