Decouple Static Type Mapper

composer.json

@@ -70,6 +70,7 @@
             "Rector\\NetteTesterToPHPUnit\\": "packages/nette-tester-to-phpunit/src",
             "Rector\\NetteToSymfony\\": "packages/nette-to-symfony/src",
             "Rector\\Nette\\": "packages/nette/src",
+            "Rector\\NodeCollector\\": "packages/node-collector/src",
             "Rector\\NodeTypeResolver\\": "packages/node-type-resolver/src",
             "Rector\\NodeNameResolver\\": "packages/node-name-resolver/src",
             "Rector\\PHPStan\\": "packages/phpstan/src",
@@ -97,6 +98,7 @@
             "Rector\\Sensio\\": "packages/sensio/src",
             "Rector\\Shopware\\": "packages/shopware/src",
             "Rector\\Silverstripe\\": "packages/silverstripe/src",
+            "Rector\\StaticTypeMapper\\": "packages/static-type-mapper/src",
             "Rector\\Sylius\\": "packages/sylius/src",
             "Rector\\SymfonyCodeQuality\\": "packages/symfony-code-quality/src",
             "Rector\\SymfonyPHPUnit\\": "packages/symfony-phpunit/src",

packages/autodiscovery/src/Analyzer/ClassAnalyzer.php

@@ -9,7 +9,7 @@
 use PHPStan\Type\ObjectType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocNode\JMS\SerializerTypeTagValueNode;
-use Rector\Core\NodeContainer\NodeCollector\ParsedNodeCollector;
+use Rector\NodeCollector\NodeCollector\ParsedNodeCollector;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\NodeTypeResolver;

packages/better-php-doc-parser/src/PhpDocInfo/PhpDocInfo.php

@@ -31,7 +31,7 @@
 use Rector\Core\Exception\NotImplementedException;
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\NodeTypeResolver\PHPStan\TypeComparator;
-use Rector\NodeTypeResolver\StaticTypeMapper;
+use Rector\StaticTypeMapper\StaticTypeMapper;
 
 /**
  * @see \Rector\BetterPhpDocParser\Tests\PhpDocInfo\PhpDocInfo\PhpDocInfoTest

packages/better-php-doc-parser/src/PhpDocInfo/PhpDocInfoFactory.php

@@ -16,7 +16,7 @@
 use Rector\Core\Configuration\CurrentNodeProvider;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\PHPStan\TypeComparator;
-use Rector\NodeTypeResolver\StaticTypeMapper;
+use Rector\StaticTypeMapper\StaticTypeMapper;
 
 final class PhpDocInfoFactory
 {

packages/coding-style/src/Node/NameImporter.php

@@ -15,8 +15,8 @@
 use Rector\Core\Configuration\Option;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
-use Rector\NodeTypeResolver\StaticTypeMapper;
 use Rector\PHPStan\Type\FullyQualifiedObjectType;
+use Rector\StaticTypeMapper\StaticTypeMapper;
 use Symplify\PackageBuilder\Parameter\ParameterProvider;
 
 final class NameImporter

packages/dead-code/src/UnusedNodeResolver/ClassUnusedPrivateClassMethodResolver.php

@@ -6,8 +6,8 @@
 
 use Nette\Utils\Strings;
 use PhpParser\Node\Stmt\Class_;
-use Rector\Core\NodeContainer\NodeFinder\FunctionLikeParsedNodesFinder;
 use Rector\Core\PhpParser\Node\Manipulator\ClassManipulator;
+use Rector\NodeCollector\NodeFinder\FunctionLikeParsedNodesFinder;
 use Rector\NodeNameResolver\NodeNameResolver;
 use ReflectionMethod;
 

packages/dead-code/src/UnusedNodeResolver/UnusedClassResolver.php

@@ -13,8 +13,8 @@
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Class_;
 use Rector\Core\Exception\NotImplementedException;
-use Rector\Core\NodeContainer\NodeCollector\ParsedNodeCollector;
 use Rector\Core\Testing\PHPUnit\PHPUnitEnvironment;
+use Rector\NodeCollector\NodeCollector\ParsedNodeCollector;
 use Rector\NodeNameResolver\NodeNameResolver;
 
 final class UnusedClassResolver

packages/doctrine/src/PhpDocParser/DoctrineDocBlockResolver.php

@@ -14,7 +14,7 @@
 use Rector\BetterPhpDocParser\PhpDocNode\Doctrine\Property_\ColumnTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocNode\Doctrine\Property_\IdTagValueNode;
 use Rector\Core\Exception\ShouldNotHappenException;
-use Rector\Core\NodeContainer\NodeCollector\ParsedNodeCollector;
+use Rector\NodeCollector\NodeCollector\ParsedNodeCollector;
 use Rector\NodeTypeResolver\ClassExistenceStaticHelper;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use ReflectionClass;

packages/doctrine/src/Provider/EntityWithMissingUuidProvider.php

@@ -10,9 +10,9 @@
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocNode\Doctrine\Property_\ColumnTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocNode\Doctrine\Property_\IdTagValueNode;
-use Rector\Core\NodeContainer\NodeCollector\ParsedNodeCollector;
 use Rector\Core\PhpParser\Node\Manipulator\ClassManipulator;
 use Rector\Doctrine\PhpDocParser\DoctrineDocBlockResolver;
+use Rector\NodeCollector\NodeCollector\ParsedNodeCollector;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 

packages/dynamic-type-analysis/src/Rector/ClassMethod/AddArgumentTypeWithProbeDataRector.php

@@ -103,10 +103,6 @@ private function completeTypesToClassMethodParams(ClassMethod $classMethod, arra
             // single value → can we add it?
             if (count($parameterData) === 1) {
                 $typeNode = $this->staticTypeMapper->mapStringToPhpParserNode($parameterData[0]);
-                if ($typeNode === null) {
-                    continue;
-                }
-
                 $param->type = $typeNode;
             }
         }

packages/nette-to-symfony/src/Route/RouteInfoFactory.php

@@ -10,9 +10,9 @@
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Scalar\String_;
-use Rector\Core\NodeContainer\NodeCollector\ParsedNodeCollector;
 use Rector\Core\PhpParser\Node\Value\ValueResolver;
 use Rector\NetteToSymfony\ValueObject\RouteInfo;
+use Rector\NodeCollector\NodeCollector\ParsedNodeCollector;
 use Rector\NodeNameResolver\NodeNameResolver;
 
 final class RouteInfoFactory

packages/node-collector/config/config.yaml

@@ -0,0 +1,7 @@
+services:
+    _defaults:
+        public: true
+        autowire: true
+
+    Rector\NodeCollector\:
+        resource: '../src'

src/NodeContainer/NodeCollector/ParsedFunctionLikeNodeCollector.php → packages/node-collector/src/NodeCollector/ParsedFunctionLikeNodeCollector.php

@@ -2,15 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Rector\Core\NodeContainer\NodeCollector;
+namespace Rector\NodeCollector\NodeCollector;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\Variable;
-use PhpParser\Node\Param;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;

src/NodeContainer/NodeCollector/ParsedNodeCollector.php → packages/node-collector/src/NodeCollector/ParsedNodeCollector.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Core\NodeContainer\NodeCollector;
+namespace Rector\NodeCollector\NodeCollector;
 
 use Nette\Utils\Strings;
 use PhpParser\Node;

src/NodeContainer/NodeFinder/ClassLikeParsedNodesFinder.php → packages/node-collector/src/NodeFinder/ClassLikeParsedNodesFinder.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Rector\Core\NodeContainer\NodeFinder;
+namespace Rector\NodeCollector\NodeFinder;
 
 use Nette\Utils\Strings;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\Interface_;
 use PhpParser\Node\Stmt\Trait_;
-use Rector\Core\NodeContainer\NodeCollector\ParsedNodeCollector;
+use Rector\NodeCollector\NodeCollector\ParsedNodeCollector;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 

src/NodeContainer/NodeFinder/FunctionLikeParsedNodesFinder.php → packages/node-collector/src/NodeFinder/FunctionLikeParsedNodesFinder.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Core\NodeContainer\NodeFinder;
+namespace Rector\NodeCollector\NodeFinder;
 
 use Nette\Utils\Strings;
 use PhpParser\Node\Expr\Array_;
@@ -11,7 +11,7 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
 use PHPStan\Type\TypeUtils;
-use Rector\Core\NodeContainer\NodeCollector\ParsedFunctionLikeNodeCollector;
+use Rector\NodeCollector\NodeCollector\ParsedFunctionLikeNodeCollector;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\NodeTypeResolver;

packages/node-type-resolver/src/NodeVisitor/NodeCollectorNodeVisitor.php → packages/node-collector/src/NodeVisitor/NodeCollectorNodeVisitor.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Rector\NodeTypeResolver\NodeVisitor;
+namespace Rector\NodeCollector\NodeVisitor;
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
-use Rector\Core\NodeContainer\NodeCollector\ParsedFunctionLikeNodeCollector;
-use Rector\Core\NodeContainer\NodeCollector\ParsedNodeCollector;
+use Rector\NodeCollector\NodeCollector\ParsedFunctionLikeNodeCollector;
+use Rector\NodeCollector\NodeCollector\ParsedNodeCollector;
 
 final class NodeCollectorNodeVisitor extends NodeVisitorAbstract
 {

packages/node-type-resolver/src/Contract/PerNodeTypeResolver/PerNodeTypeResolverInterface.php → packages/node-type-resolver/src/Contract/NodeTypeResolverInterface.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Rector\NodeTypeResolver\Contract\PerNodeTypeResolver;
+namespace Rector\NodeTypeResolver\Contract;
 
 use PhpParser\Node;
 use PHPStan\Type\Type;
 
-interface PerNodeTypeResolverInterface
+interface NodeTypeResolverInterface
 {
     /**
      * @return string[]

packages/node-type-resolver/src/DependencyInjection/PHPStanServicesFactory.php

@@ -41,10 +41,10 @@ public function __construct()
         $additionalConfigFiles = [];
 
         // possible path collision for Docker
-        $phpstanPhpunitExtensionConfig = $currentWorkingDirectory . '/vendor/phpstan/phpstan-phpunit/extension.neon';
-        if (file_exists($phpstanPhpunitExtensionConfig) && class_exists('PHPUnit\\Framework\\TestCase')) {
-            $additionalConfigFiles[] = $phpstanPhpunitExtensionConfig;
-        }
+        $additionalConfigFiles = $this->appendPhpstanPHPUnitExtensionIfExists(
+            $currentWorkingDirectory,
+            $additionalConfigFiles
+        );
 
         $temporaryPhpstanNeon = null;
 
@@ -111,4 +111,15 @@ public function createTypeNodeResolver(): TypeNodeResolver
     {
         return $this->container->getByType(TypeNodeResolver::class);
     }
+
+    private function appendPhpstanPHPUnitExtensionIfExists(
+        string $currentWorkingDirectory,
+        array $additionalConfigFiles
+    ): array {
+        $phpstanPhpunitExtensionConfig = $currentWorkingDirectory . '/vendor/phpstan/phpstan-phpunit/extension.neon';
+        if (file_exists($phpstanPhpunitExtensionConfig) && class_exists('PHPUnit\\Framework\\TestCase')) {
+            $additionalConfigFiles[] = $phpstanPhpunitExtensionConfig;
+        }
+        return $additionalConfigFiles;
+    }
 }

packages/node-type-resolver/src/NodeScopeAndMetadataDecorator.php

@@ -9,10 +9,10 @@
 use PhpParser\NodeVisitor\CloningVisitor;
 use PhpParser\NodeVisitor\NameResolver;
 use Rector\Core\Configuration\Configuration;
+use Rector\NodeCollector\NodeVisitor\NodeCollectorNodeVisitor;
 use Rector\NodeTypeResolver\NodeVisitor\FileInfoNodeVisitor;
 use Rector\NodeTypeResolver\NodeVisitor\FunctionMethodAndClassNodeVisitor;
 use Rector\NodeTypeResolver\NodeVisitor\NamespaceNodeVisitor;
-use Rector\NodeTypeResolver\NodeVisitor\NodeCollectorNodeVisitor;
 use Rector\NodeTypeResolver\NodeVisitor\ParentAndNextNodeVisitor;
 use Rector\NodeTypeResolver\NodeVisitor\PhpDocInfoNodeVisitor;
 use Rector\NodeTypeResolver\NodeVisitor\StatementNodeVisitor;

packages/node-type-resolver/src/NodeTypeResolver.php

@@ -28,7 +28,7 @@
 use PHPStan\Type\UnionType;
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\NodeNameResolver\NodeNameResolver;
-use Rector\NodeTypeResolver\Contract\PerNodeTypeResolver\PerNodeTypeResolverInterface;
+use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
 use Rector\NodeTypeResolver\Reflection\ClassReflectionTypesResolver;
@@ -38,9 +38,9 @@
 final class NodeTypeResolver
 {
     /**
-     * @var PerNodeTypeResolverInterface[]
+     * @var NodeTypeResolverInterface[]
      */
-    private $perNodeTypeResolvers = [];
+    private $nodeTypeResolvers = [];
 
     /**
      * @var NodeNameResolver
@@ -73,20 +73,20 @@ final class NodeTypeResolver
     private $arrayTypeAnalyzer;
 
     /**
-     * @param PerNodeTypeResolverInterface[] $perNodeTypeResolvers
+     * @param NodeTypeResolverInterface[] $nodeTypeResolvers
      */
     public function __construct(
         NodeNameResolver $nodeNameResolver,
         ClassReflectionTypesResolver $classReflectionTypesResolver,
         ReflectionProvider $reflectionProvider,
         TypeFactory $typeFactory,
         ObjectTypeSpecifier $objectTypeSpecifier,
-        array $perNodeTypeResolvers
+        array $nodeTypeResolvers
     ) {
         $this->nodeNameResolver = $nodeNameResolver;
 
-        foreach ($perNodeTypeResolvers as $perNodeTypeResolver) {
-            $this->addPerNodeTypeResolver($perNodeTypeResolver);
+        foreach ($nodeTypeResolvers as $nodeTypeResolver) {
+            $this->addNodeTypeResolver($nodeTypeResolver);
         }
 
         $this->classReflectionTypesResolver = $classReflectionTypesResolver;
@@ -238,10 +238,10 @@ public function isStaticType(Node $node, string $staticTypeClass): bool
         return is_a($this->resolve($node), $staticTypeClass);
     }
 
-    private function addPerNodeTypeResolver(PerNodeTypeResolverInterface $perNodeTypeResolver): void
+    private function addNodeTypeResolver(NodeTypeResolverInterface $nodeTypeResolver): void
     {
-        foreach ($perNodeTypeResolver->getNodeClasses() as $nodeClass) {
-            $this->perNodeTypeResolvers[$nodeClass] = $perNodeTypeResolver;
+        foreach ($nodeTypeResolver->getNodeClasses() as $nodeClass) {
+            $this->nodeTypeResolvers[$nodeClass] = $nodeTypeResolver;
         }
     }
 
@@ -283,13 +283,13 @@ private function isFnMatch(Node $node, string $requiredType): bool
 
     private function resolveFirstType(Node $node): Type
     {
-        foreach ($this->perNodeTypeResolvers as $perNodeTypeResolver) {
-            foreach ($perNodeTypeResolver->getNodeClasses() as $nodeClass) {
+        foreach ($this->nodeTypeResolvers as $nodeTypeResolver) {
+            foreach ($nodeTypeResolver->getNodeClasses() as $nodeClass) {
                 if (! is_a($node, $nodeClass)) {
                     continue;
                 }
 
-                return $perNodeTypeResolver->resolve($node);
+                return $nodeTypeResolver->resolve($node);
             }
         }
 

packages/node-type-resolver/src/PerNodeTypeResolver/ArrayDimFetchTypeResolver.php → packages/node-type-resolver/src/NodeTypeResolver/ArrayDimFetchTypeResolver.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Rector\NodeTypeResolver\PerNodeTypeResolver;
+namespace Rector\NodeTypeResolver\NodeTypeResolver;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\ArrayDimFetch;
 use PHPStan\Type\Type;
-use Rector\NodeTypeResolver\Contract\PerNodeTypeResolver\PerNodeTypeResolverInterface;
+use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
 use Rector\NodeTypeResolver\NodeTypeResolver;
 
-final class ArrayDimFetchTypeResolver implements PerNodeTypeResolverInterface
+final class ArrayDimFetchTypeResolver implements NodeTypeResolverInterface
 {
     /**
      * @var NodeTypeResolver

packages/node-type-resolver/src/PerNodeTypeResolver/CastTypeResolver.php → packages/node-type-resolver/src/NodeTypeResolver/CastTypeResolver.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Rector\NodeTypeResolver\PerNodeTypeResolver;
+namespace Rector\NodeTypeResolver\NodeTypeResolver;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\Cast;
 use PHPStan\Type\Type;
-use Rector\NodeTypeResolver\Contract\PerNodeTypeResolver\PerNodeTypeResolverInterface;
+use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
 use Rector\NodeTypeResolver\NodeTypeResolver;
 
-final class CastTypeResolver implements PerNodeTypeResolverInterface
+final class CastTypeResolver implements NodeTypeResolverInterface
 {
     /**
      * @var NodeTypeResolver

packages/node-type-resolver/src/PerNodeTypeResolver/ClassAndInterfaceTypeResolver.php → packages/node-type-resolver/src/NodeTypeResolver/ClassAndInterfaceTypeResolver.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\NodeTypeResolver\PerNodeTypeResolver;
+namespace Rector\NodeTypeResolver\NodeTypeResolver;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
@@ -11,12 +11,12 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\Type;
 use Rector\Core\Exception\ShouldNotHappenException;
-use Rector\NodeTypeResolver\Contract\PerNodeTypeResolver\PerNodeTypeResolverInterface;
+use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
 use Rector\NodeTypeResolver\Reflection\ClassReflectionTypesResolver;
 
-final class ClassAndInterfaceTypeResolver implements PerNodeTypeResolverInterface
+final class ClassAndInterfaceTypeResolver implements NodeTypeResolverInterface
 {
     /**
      * @var ClassReflectionTypesResolver