From 8e285ba5bc1d6970e7829b92d26716d755372b90 Mon Sep 17 00:00:00 2001 From: TomasVotruba Date: Thu, 4 Jan 2018 16:01:17 +0100 Subject: [PATCH] fix cs --- src/NodeChanger/ExpressionPrepender.php | 16 ++++++++++------ .../ExpressionPrependingNodeVisitor.php | 2 +- .../PHPUnit/DelegateExceptionArgumentsRector.php | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/NodeChanger/ExpressionPrepender.php b/src/NodeChanger/ExpressionPrepender.php index 6aac036ca16..0940feaf0e7 100644 --- a/src/NodeChanger/ExpressionPrepender.php +++ b/src/NodeChanger/ExpressionPrepender.php @@ -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); } } diff --git a/src/NodeVisitor/ExpressionPrependingNodeVisitor.php b/src/NodeVisitor/ExpressionPrependingNodeVisitor.php index ae9d83f28d5..013514cfebd 100644 --- a/src/NodeVisitor/ExpressionPrependingNodeVisitor.php +++ b/src/NodeVisitor/ExpressionPrependingNodeVisitor.php @@ -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; } diff --git a/src/Rector/Contrib/PHPUnit/DelegateExceptionArgumentsRector.php b/src/Rector/Contrib/PHPUnit/DelegateExceptionArgumentsRector.php index b3665021600..b8f8e9a63a3 100644 --- a/src/Rector/Contrib/PHPUnit/DelegateExceptionArgumentsRector.php +++ b/src/Rector/Contrib/PHPUnit/DelegateExceptionArgumentsRector.php @@ -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; }