rectorphp · TomasVotruba · Aug 3, 2017 · Jul 16, 2017 · Jul 16, 2017 · Jul 16, 2017
diff --git a/README.md b/README.md
@@ -9,7 +9,8 @@ This tool will *reconstruct* (change) your code - **run it only in a new clean g
 
 ## All Reconstructors
 
-- `InjectAnnotationToConstructorReconstructor`
+- `InjectAnnotationToConstructorNodeTraverser` ([Nette](https://github.com/nette/))
+- `NamedServicesToConstructorNodeTraverser` ([Symfony](https://github.com/symfony/))
 
 
 ## Install

diff --git a/composer.json b/composer.json
@@ -10,13 +10,14 @@
         "php": "^7.1",
         "symfony/console": "^3.3",
         "symfony/dependency-injection": "^3.3",
-        "nikic/php-parser": "^3.0",
-        "ocramius/code-generator-utils": "^0.4.1"
+        "nikic/php-parser": "4.0.x-dev as 3.0.2",
+        "ocramius/code-generator-utils": "^0.4",
+        "nette/utils": "^2.4"
     },
     "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": {
@@ -33,6 +34,6 @@
         "all": ["phpunit", "@cs", "@ps"],
         "cs": "ecs check src tests",
         "fs": "ecs check src tests --fix",
-        "ps": "phpstan analyse src tests --level 7 -c phpstan.neon"
+        "ps": "phpstan analyse src tests --level 7 --configuration phpstan.neon"
     }
 }
diff --git a/easy-coding-standard.neon b/easy-coding-standard.neon
@@ -0,0 +1,3 @@
+includes:
+# todo:
+#    - vendor/symplify/easy-coding-standard/config/
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,4 @@
 parameters:
     ignoreErrors:
-        - '#should return PhpParser\\Node\[\] but returns PhpParser\\Node\[\]\|null#'
-        # annotated => bug
-        - '#Access to an undefined property PhpParser\\Node\\Expr::\$value#'
+        - '#Internal error#'
+#        - '#should return PhpParser\\Node\[\] but returns PhpParser\\Node\[\]\|null#'
diff --git a/src/Application/FileProcessor.php b/src/Application/FileProcessor.php
@@ -2,8 +2,9 @@
 
 namespace Rector\Application;
 
+use PhpParser\Lexer;
+use PhpParser\NodeTraverser;
 use PhpParser\Parser;
-use Rector\Dispatcher\NodeDispatcher;
 use Rector\Printer\CodeStyledPrinter;
 use SplFileInfo;
 
@@ -15,20 +16,26 @@ final class FileProcessor
     private $parser;
 
     /**
-     * @var NodeDispatcher
+     * @var CodeStyledPrinter
      */
-    private $nodeDispatcher;
+    private $codeStyledPrinter;
 
     /**
-     * @var CodeStyledPrinter
+     * @var NodeTraverser
      */
-    private $codeStyledPrinter;
+    private $nodeTraverser;
 
-    public function __construct(Parser $parser, CodeStyledPrinter $codeStyledPrinter, NodeDispatcher $nodeDispatcher)
+    /**
+     * @var Lexer
+     */
+    private $lexer;
+
+    public function __construct(Parser $parser, CodeStyledPrinter $codeStyledPrinter, Lexer $lexer, NodeTraverser $nodeTraverser)
     {
         $this->parser = $parser;
-        $this->nodeDispatcher = $nodeDispatcher;
         $this->codeStyledPrinter = $codeStyledPrinter;
+        $this->nodeTraverser = $nodeTraverser;
+        $this->lexer = $lexer;
     }
 
     /**
@@ -44,18 +51,18 @@ public function processFiles(array $files): void
     public function processFile(SplFileInfo $file): void
     {
         $fileContent = file_get_contents($file->getRealPath());
-        $nodes = $this->parser->parse($fileContent);
-        if ($nodes === null) {
+        $oldStmts = $this->parser->parse($fileContent);
+        if ($oldStmts === null) {
             return;
         }
 
-        $originalNodes = $this->cloneArrayOfObjects($nodes);
+        $oldStmts = $this->cloneArrayOfObjects($oldStmts);
 
-        foreach ($nodes as $node) {
-            $this->nodeDispatcher->dispatch($node);
-        }
+        $oldTokens = $this->lexer->getTokens();
+
+        $newStmts = $this->nodeTraverser->traverse($oldStmts);
 
-        $this->codeStyledPrinter->printToFile($file, $originalNodes, $nodes);
+        $this->codeStyledPrinter->printToFile($file, $newStmts, $oldStmts, $oldTokens);
     }
 
     /**

diff --git a/src/Builder/Class_/ClassPropertyCollector.php b/src/Builder/Class_/ClassPropertyCollector.php
@@ -0,0 +1,26 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Builder\Class_;
+
+final class ClassPropertyCollector
+{
+    /**
+     * @var string[][]
+     */
+    private $classProperties = [];
+
+    public function addPropertyForClass(string $class, string $propertyType, string $propertyName): void
+    {
+        $this->classProperties[$class] = [
+            $propertyType => $propertyName
+        ];
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getPropertiesforClass(string $class): array
+    {
+        return $this->classProperties[$class] ?? [];
+    }
+}
diff --git a/src/Builder/ConstructorMethodBuilder.php b/src/Builder/ConstructorMethodBuilder.php
@@ -2,6 +2,7 @@
 
 namespace Rector\Builder;
 
+use Nette\Utils\Arrays;
 use PhpParser\Builder\Method;
 use PhpParser\Builder\Param;
 use PhpParser\BuilderFactory;
@@ -49,7 +50,7 @@ public function addPropertyAssignToClass(Class_ $classNode, string $propertyType
             ->addParam($this->createParameter($propertyType, $propertyName))
             ->addStmts($assign);
 
-        $classNode->stmts[] = $constructorMethod->getNode();
+        $this->addAsFirstMethod($classNode, $constructorMethod->getNode());
     }
 
     private function createParameter(string $propertyType, string $propertyName): Param
@@ -69,4 +70,21 @@ private function createPropertyAssignment(string $propertyName): array
             $propertyName
         ));
     }
-}
+
+    private function addAsFirstMethod(Class_ $classNode, ClassMethod $constructorMethod): void
+    {
+        foreach ($classNode->stmts as $key => $classElementNode) {
+            if ($classElementNode instanceof ClassMethod) {
+                Arrays::insertBefore(
+                    $classNode->stmts,
+                    $key,
+                    ['before_' . $key => $constructorMethod]
+                );
+
+                return;
+            }
+        }
+
+        $classNode->stmts[] = $constructorMethod;
+    }
+}
diff --git a/src/Builder/Kernel/ServiceFromKernelResolver.php b/src/Builder/Kernel/ServiceFromKernelResolver.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Builder\Kernel;
+
+use Symfony\Component\HttpKernel\Kernel;
+
+final class ServiceFromKernelResolver
+{
+    public function resolveServiceClassByNameFromKernel(string $serviceName, string $kernelClass): ?string
+    {
+        /** @var Kernel $kernel */
+        $kernel = new $kernelClass('dev', true);
+        $kernel->boot();
+
+        // @todo: cache
+        // @todo: initialize without creating cache or log directory
+        // @todo: call only loadBundles() and initializeContainer() methods
+
+        $container = $kernel->getContainer();
+        if (! $container->has($serviceName)) {
+            // service name could not be found
+            return null;
+        }
+
+        $service = $container->get($serviceName);
+
+        return get_class($service);
+    }
+}
diff --git a/src/Builder/Naming/NameResolver.php b/src/Builder/Naming/NameResolver.php
@@ -0,0 +1,14 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Builder\Naming;
+
+final class NameResolver
+{
+    public function resolvePropertyNameFromType(string $serviceType): string
+    {
+        $serviceNameParts = explode('\\', $serviceType);
+        $lastNamePart = array_pop($serviceNameParts);
+
+        return lcfirst($lastNamePart);
+    }
+}
diff --git a/src/Builder/PropertyBuilder.php b/src/Builder/PropertyBuilder.php
@@ -0,0 +1,77 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Builder;
+
+use Nette\Utils\Arrays;
+use PhpParser\BuilderFactory;
+use PhpParser\Comment\Doc;
+use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Property;
+
+final class PropertyBuilder
+{
+    /**
+     * @var BuilderFactory
+     */
+    private $builderFactory;
+
+    public function __construct(BuilderFactory $builderFactory)
+    {
+        $this->builderFactory = $builderFactory;
+    }
+
+    public function addPropertyToClass(Class_ $classNode, string $propertyType, string $propertyName): void
+    {
+        $propertyNode = $this->buildPrivatePropertyNode($propertyType, $propertyName);
+
+        // add before first method
+        foreach ($classNode->stmts as $key => $classElementNode) {
+            if ($classElementNode instanceof ClassMethod) {
+                Arrays::insertBefore(
+                    $classNode->stmts,
+                    $key,
+                    ['before_' . $key => $propertyNode]
+                );
+
+                return;
+            }
+        }
+
+        // or after last property
+        $previousElement = null;
+        foreach ($classNode->stmts as $key => $classElementNode) {
+            if ($previousElement instanceof Property && ! $classElementNode instanceof Property) {
+                Arrays::insertBefore(
+                    $classNode->stmts,
+                    $key,
+                    ['before_' . $key => $propertyNode]
+                );
+
+                return;
+            }
+
+            $previousElement = $classElementNode;
+        }
+
+        $classNode->stmts[] = $propertyNode;
+    }
+
+    private function buildPrivatePropertyNode(string $propertyType, string $propertyName): Property
+    {
+        $docComment = $this->createDocWithVarAnnotation($propertyType);
+
+        $propertyBuilder = $this->builderFactory->property($propertyName)
+            ->makePrivate()
+            ->setDocComment($docComment);
+
+        return $propertyBuilder->getNode();
+    }
+
+    private function createDocWithVarAnnotation(string $propertyType): Doc
+    {
+        return new Doc('/**'
+            . PHP_EOL . ' * @var ' . $propertyType
+            . PHP_EOL . ' */');
+    }
+}
diff --git a/src/Console/Command/ReconstructCommand.php b/src/Console/Command/ReconstructCommand.php
@@ -38,8 +38,6 @@ protected function configure(): void
     {
         $this->setName(self::NAME);
         $this->setDescription('Reconstruct set of your code.');
-
-        // @todo: use modular configure from ApiGen
         $this->addArgument(
             self::ARGUMENT_SOURCE_NAME,
             InputArgument::REQUIRED | InputArgument::IS_ARRAY,

diff --git a/src/Contract/Dispatcher/ReconstructorInterface.php b/src/Contract/Dispatcher/ReconstructorInterface.php
diff --git a/src/DependencyInjection/CompilerPass/CollectorCompilerPass.php b/src/DependencyInjection/CompilerPass/CollectorCompilerPass.php
@@ -2,8 +2,8 @@
 
 namespace Rector\DependencyInjection\CompilerPass;
 
-use Rector\Contract\Dispatcher\ReconstructorInterface;
-use Rector\Dispatcher\NodeDispatcher;
+use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -15,7 +15,7 @@ final class CollectorCompilerPass implements CompilerPassInterface
     public function process(ContainerBuilder $containerBuilder): void
     {
         $this->collectCommandsToConsoleApplication($containerBuilder);
-        $this->collectReconstructorsToNodeDispatcher($containerBuilder);
+        $this->collectNodeVisitorsToTraverser($containerBuilder);
     }
 
     private function collectCommandsToConsoleApplication(ContainerBuilder $containerBuilder): void
@@ -28,13 +28,13 @@ private function collectCommandsToConsoleApplication(ContainerBuilder $container
         );
     }
 
-    private function collectReconstructorsToNodeDispatcher(ContainerBuilder $containerBuilder): void
+    private function collectNodeVisitorsToTraverser(ContainerBuilder $containerBuilder): void
     {
         DefinitionCollector::loadCollectorWithType(
             $containerBuilder,
-            NodeDispatcher::class,
-            ReconstructorInterface::class,
-            'addReconstructor'
+            NodeTraverser::class,
+            NodeVisitor::class,
+            'addVisitor'
         );
     }
 }
diff --git a/src/Dispatcher/NodeDispatcher.php b/src/Dispatcher/NodeDispatcher.php