Merge 6320be7 into 3cc5c83

Author: Tomáš Votruba

.gitignore

@@ -1,3 +1,4 @@
+/temp
 /example
 /vendor
 composer.lock

.travis.yml

@@ -5,6 +5,8 @@ php:
 
 install:
   - composer install
+  # prepare nette/sandbox
+  - composer create-project nette/sandbox:@dev temp/nette-sandbox
 
 script:
   - vendor/bin/phpunit --coverage-clover coverage.xml
@@ -13,6 +15,8 @@ script:
   - composer check-cs
   # check with phpstan (defined in composer.json "scripts" section)
   - composer phpstan
+  # try on nette/sandbox
+  - bin/rector process temp/nette-sandbox --config src/config/level/nette/all.yml
 
 after_script:
   # upload coverage to Coveralls.io

bin/rector.php

@@ -33,6 +33,11 @@
     exit($statusCode);
 } catch (Throwable $throwable) {
     $symfonyStyle = SymfonyStyleFactory::create();
-    $symfonyStyle->error($throwable->getMessage());
+    $symfonyStyle->error(sprintf(
+        '%s in %s on line %d',
+        $throwable->getMessage(),
+        $throwable->getFile(),
+        $throwable->getLine()
+    ));
     exit(1);
 }

packages/NodeTypeResolver/src/NodeVisitor/NamespaceResolver.php

@@ -32,7 +32,7 @@ public function beforeTraverse(array $nodes): void
     public function enterNode(Node $node): void
     {
         if ($node instanceof Namespace_) {
-            $this->namespace = $node->name->toString();
+            $this->namespace = $node->name ? $node->name->toString() : '';
         }
 
         if ($node instanceof Use_) {

packages/NodeTypeResolver/src/NodeVisitor/TypeResolver.php

@@ -87,20 +87,38 @@ public function enterNode(Node $node): void
 
     private function getTypeFromNewNode(New_ $newNode): string
     {
+        // e.g. new $someClass;
         if ($newNode->class instanceof Variable) {
             // can be anything (dynamic)
             $variableName = $newNode->class->name;
 
             return $this->typeContext->getTypeForVariable($variableName);
         }
 
+        // e.g. new SomeClass;
         if ($newNode->class instanceof Name) {
             /** @var FullyQualified $fqnName */
             $fqnName = $newNode->class->getAttribute(Attribute::RESOLVED_NAME);
 
             return $fqnName->toString();
         }
 
+        // e.g. new $this->templateClass;
+        if ($newNode->class instanceof PropertyFetch) {
+            if ($newNode->class->var->name !== 'this') {
+                throw new NotImplementedException(sprintf(
+                    'Not implemented yet. Go to "%s()" and add check for "%s" node for external dependency.',
+                    __METHOD__,
+                    get_class($newNode->class)
+                ));
+            }
+
+            // can be anything (dynamic)
+            $propertyName = (string) $newNode->class->name;
+
+            return $this->typeContext->getTypeForProperty($propertyName);
+        }
+
         throw new NotImplementedException(sprintf(
             'Not implemented yet. Go to "%s()" and add check for "%s" node.',
             __METHOD__,

packages/NodeTypeResolver/src/TypeContext.php

@@ -6,9 +6,11 @@
 use PhpParser\Node\FunctionLike;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassLike;
+use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Function_;
 use Rector\BetterReflection\Reflector\MethodReflector;
 use Rector\NodeTypeResolver\TypesExtractor\ConstructorPropertyTypesExtractor;
-use ReflectionFunction;
+use Roave\BetterReflection\Reflection\ReflectionFunction;
 use Roave\BetterReflection\Reflection\ReflectionMethod;
 
 /**
@@ -100,21 +102,29 @@ public function addAssign(string $newVariable, string $oldVariable): void
     }
 
     /**
-     * @return \Roave\BetterReflection\Reflection\ReflectionFunction|ReflectionMethod|null
+     * @param Function_|ClassMethod|Closure $functionLikeNode
+     *
+     * @return ReflectionFunction|ReflectionMethod|null
      */
     private function getFunctionReflection(FunctionLike $functionLikeNode)
     {
-        if ($this->classLikeNode) {
-            if ($functionLikeNode instanceof Closure) {
-                return null;
-            }
+        if ($functionLikeNode instanceof Closure) {
+            return null;
+        }
 
+        if ($this->classLikeNode) {
             $className = $this->classLikeNode->namespacedName->toString();
             $methodName = (string) $functionLikeNode->name;
 
             return $this->methodReflector->reflectClassMethod($className, $methodName);
         }
 
-        return new ReflectionFunction((string) $functionLikeNode->name);
+        /** @var Function_ $functionLikeNode */
+        $functionName = (string) $functionLikeNode->name;
+        if (! function_exists($functionName)) {
+            return null;
+        }
+
+        return ReflectionFunction::createFromName($functionName);
     }
 }

rector.yml

@@ -1,2 +1,2 @@
 rectors:
-    - Rector\Rector\Contrib\Nette\Application\InjectPropertyRector
+    - Rector\Rector\Contrib\Nette\Application\InjectPropertyRector

src/Console/Command/ProcessCommand.php

@@ -4,6 +4,7 @@
 
 use Nette\Utils\Finder;
 use Rector\Application\FileProcessor;
+use Rector\Exception\FileSystem\DirectoryNotFoundException;
 use Rector\Exception\NoRectorsLoadedException;
 use Rector\Naming\CommandNaming;
 use Rector\Rector\RectorCollector;
@@ -61,15 +62,17 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $this->ensureSomeRectorsAreRegistered();
+        $source = $input->getArgument(self::ARGUMENT_SOURCE_NAME);
+        $this->ensureDirectoriesExist($source);
 
-        $this->reportLoadedRectors();
+        $this->ensureSomeRectorsAreRegistered();
 
-        $source = $input->getArgument(self::ARGUMENT_SOURCE_NAME);
         $files = $this->findPhpFilesInDirectories($source);
 
         $this->reportFoundFiles($files);
 
+        $this->reportLoadedRectors();
+
         $this->fileProcessor->processFiles($files);
 
         return 0;
@@ -133,4 +136,21 @@ private function reportFoundFiles(array $files): void
 
         $this->symfonyStyle->newLine();
     }
+
+    /**
+     * @param string[] $directories
+     */
+    private function ensureDirectoriesExist(array $directories): void
+    {
+        foreach ($directories as $directory) {
+            if (file_exists($directory)) {
+                continue;
+            }
+
+            throw new DirectoryNotFoundException(sprintf(
+                'Directory "%s" was not found.',
+                $directory
+            ));
+        }
+    }
 }

src/Exception/FileSystem/DirectoryNotFoundException.php

@@ -0,0 +1,9 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Exception\FileSystem;
+
+use Exception;
+
+final class DirectoryNotFoundException extends Exception
+{
+}

src/Rector/Contrib/Nette/Bootstrap/RemoveConfiguratorConstantsRector.php

@@ -4,6 +4,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\ClassConstFetch;
+use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Scalar\String_;
 use Rector\Node\Attribute;
 use Rector\Rector\AbstractRector;
@@ -42,6 +43,10 @@ private function getClassNameFromClassConstFetch(ClassConstFetch $classConstFetc
         /** @var Node\Name\FullyQualified $fqnName */
         $fqnName = $classConstFetchNode->class->getAttribute(Attribute::RESOLVED_NAME);
 
+        if ($fqnName === null && $classConstFetchNode->class instanceof Variable) {
+            return (string) $classConstFetchNode->class->name;
+        }
+
         return $fqnName->toString();
     }