This commit is contained in:
TomasVotruba 2018-01-04 16:01:17 +01:00
parent 8257181fec
commit 8e285ba5bc
3 changed files with 13 additions and 9 deletions

View File

@ -59,7 +59,11 @@ final class ExpressionPrepender
public function prependNodeAfterNode(Expr $nodeToPrepend, Node $positionNode): void
{
$expressionToPrepend = new Expression($nodeToPrepend);
$positionExpressionNode = $this->betterNodeFinder->findFirstAncestorInstanceOf($positionNode, Expression::class);
$positionExpressionNode = $this->betterNodeFinder->findFirstAncestorInstanceOf(
$positionNode,
Expression::class
);
if (isset($this->expressionsToPrepend[$positionExpressionNode])) {
$this->expressionsToPrepend[$positionExpressionNode] = array_merge(
@ -72,13 +76,13 @@ final class ExpressionPrepender
}
/**
* @param array $nodes
* @return mixed
* @param Node[] $nodes
* @return Node[]
*/
public function prependExpressionsToNodes(array $nodes)
public function prependExpressionsToNodes(array $nodes): array
{
$this->expressionPrependingNodeVisitor->setExpressionsToPrepend($this->expressionsToPrepend);
$nodes = $this->nodeTraverser->traverse($nodes);
return $nodes;
return $this->nodeTraverser->traverse($nodes);
}
}

View File

@ -13,7 +13,7 @@ final class ExpressionPrependingNodeVisitor extends NodeVisitorAbstract
*/
private $expressionsToPrepend;
public function setExpressionsToPrepend(SplObjectStorage $expressionsToPrepend)
public function setExpressionsToPrepend(SplObjectStorage $expressionsToPrepend): void
{
$this->expressionsToPrepend = $expressionsToPrepend;
}

View File

@ -60,8 +60,8 @@ final class DelegateExceptionArgumentsRector extends AbstractRector
if (! $this->methodCallAnalyzer->isTypesAndMethods(
$node,
$this->phpUnitTestCaseClasses,
array_keys($this->oldToNewMethod))
) {
array_keys($this->oldToNewMethod)
)) {
return false;
}