diff --git a/composer.json b/composer.json index 330e6bda44b..45bd0db6e65 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "require-dev": { "phpunit/phpunit": "^6.2", "tracy/tracy": "^2.4", - "symplify/easy-coding-standard": "^2.1", + "symplify/easy-coding-standard": "@dev", "phpstan/phpstan": "^0.7" }, "autoload": { diff --git a/easy-coding-standard.neon b/easy-coding-standard.neon index 86776f6d184..afe9c18b53f 100644 --- a/easy-coding-standard.neon +++ b/easy-coding-standard.neon @@ -1,3 +1 @@ includes: - -checkers: diff --git a/src/DependencyInjection/CompilerPass/CollectorCompilerPass.php b/src/DependencyInjection/CompilerPass/CollectorCompilerPass.php index ad09d32380f..889e2d4d734 100644 --- a/src/DependencyInjection/CompilerPass/CollectorCompilerPass.php +++ b/src/DependencyInjection/CompilerPass/CollectorCompilerPass.php @@ -4,8 +4,6 @@ namespace Rector\DependencyInjection\CompilerPass; use PhpParser\NodeTraverser; use PhpParser\NodeVisitor; -use Rector\Contract\Dispatcher\ReconstructorInterface; -use Rector\Dispatcher\NodeDispatcher; use Symfony\Component\Console\Application; use Symfony\Component\Console\Command\Command; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; diff --git a/src/NodeVisitor/DependencyInjection/InjectAnnotationToConstructorNodeVisitor.php b/src/NodeVisitor/DependencyInjection/InjectAnnotationToConstructorNodeVisitor.php index 049ace415db..65676dc015c 100644 --- a/src/NodeVisitor/DependencyInjection/InjectAnnotationToConstructorNodeVisitor.php +++ b/src/NodeVisitor/DependencyInjection/InjectAnnotationToConstructorNodeVisitor.php @@ -101,28 +101,4 @@ final class InjectAnnotationToConstructorNodeVisitor extends NodeVisitorAbstract return NodeTraverser::DONT_TRAVERSE_CHILDREN; } - - /** - * Called when leaving a node. - * - * Return value semantics: - * * null - * => $node stays as-is - * * NodeTraverser::REMOVE_NODE - * => $node is removed from the parent array - * * NodeTraverser::STOP_TRAVERSAL - * => Traversal is aborted. $node stays as-is - * * array (of Nodes) - * => The return value is merged into the parent array (at the position of the $node) - * * otherwise - * => $node is set to the return value - * - * @param Node $node Node - * - * @return null|int|Node|Node[] Replacement node (or special return value) - */ - public function leaveNode(Node $node) - { - // TODO: Implement leaveNode() method. - } } diff --git a/src/NodeVisitor/DependencyInjection/NamedServicesToConstructorNodeVisitor.php b/src/NodeVisitor/DependencyInjection/NamedServicesToConstructorNodeVisitor.php index 4d709bf1c8b..5dc51ce09a4 100644 --- a/src/NodeVisitor/DependencyInjection/NamedServicesToConstructorNodeVisitor.php +++ b/src/NodeVisitor/DependencyInjection/NamedServicesToConstructorNodeVisitor.php @@ -11,6 +11,7 @@ use PhpParser\Node\Expr\Variable; use PhpParser\Node\Scalar\String_; use PhpParser\Node\Stmt\Class_; use PhpParser\Node\Stmt\ClassMethod; +use PhpParser\NodeTraverser; use PhpParser\NodeVisitorAbstract; use Rector\Analyzer\ClassAnalyzer; use Rector\Builder\ConstructorMethodBuilder; @@ -228,6 +229,11 @@ final class NamedServicesToConstructorNodeVisitor extends NodeVisitorAbstract */ public function enterNode(Node $node) { - return $this->isCandidate($node); + if ($this->isCandidate($node)) { + $this->reconstruct($node); + return; + } + + return NodeTraverser::DONT_TRAVERSE_CHILDREN; } }