mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-02-23 19:24:48 +01:00
Code Issues Projects Releases Wiki Activity

prepare support for multi-types [ref #97]

Browse Source
This commit is contained in:
TomasVotruba 2017-10-25 12:16:41 +02:00
parent 7f05c600f7
commit c4c98d27c1
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/NodeTypeResolver/src/PerNodeTypeResolver/MethodCallTypeResolver.php
View File

@ -47,7 +47,7 @@ final class MethodCallTypeResolver implements PerNodeTypeResolverInterface
$variableNode = $methodCallNode->var;
if (! $variableNode instanceof Variable) {
return null;
return [];
}
$variableName = $variableNode->name;
@ -58,7 +58,7 @@ final class MethodCallTypeResolver implements PerNodeTypeResolverInterface
// 2. get method() return type
if (! $methodCallVariableTypes || ! $methodCallName) {
return null;
return [];
}
$methodCallVariableType = array_pop($methodCallVariableTypes);
@ -67,7 +67,7 @@ final class MethodCallTypeResolver implements PerNodeTypeResolverInterface
if ($variableType) {
$variableName = $this->getVariableToAssignTo($methodCallNode);
if ($variableName === null) {
return null;
return [];
}
$this->typeContext->addVariableWithTypes($variableName, [$variableType]);

2
packages/NodeTypeResolver/src/PerNodeTypeResolver/VariableTypeResolver.php
View File

@ -52,7 +52,7 @@ final class VariableTypeResolver implements PerNodeTypeResolverInterface, NodeTy
return $this->nodeTypeResolver->resolve($variableNode->name);
}
return null;
return [];
}
public function setNodeTypeResolver(NodeTypeResolver $nodeTypeResolver): void

3
packages/NodeTypeResolver/src/TypeContext.php
View File

@ -120,8 +120,7 @@ final class TypeContext
public function addAssign(string $newVariable, string $oldVariable): void
{
$variableTypes = $this->getTypesForVariable($oldVariable);
$this->addVariableWithTypes($newVariable, $variableTypes);
$this->addVariableWithTypes($newVariable, $this->getTypesForVariable($oldVariable));
}
/**