Add AutowireArrayParameterCompilerPass

bin/clean_trailing_spaces.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 # trailing whitespaces
-sed -i -E 's#\s+$##g' config/level/*/*.yml docs/*.md packages/*/README.md README.md
+sed -i -E 's#\s+$##g' config/level/*/*.yml docs/*.md README.md

composer.json

@@ -19,17 +19,17 @@
         "symfony/dependency-injection": "^3.4|^4.1",
         "symfony/finder": "^3.4|^4.1",
         "symfony/process": "^3.4|^4.1",
-        "symplify/better-phpdoc-parser": "^5.1",
-        "symplify/easy-coding-standard": "^5.1",
-        "symplify/package-builder": "^5.1",
+        "symplify/better-phpdoc-parser": "^5.2",
+        "symplify/easy-coding-standard": "^5.2",
+        "symplify/package-builder": "^5.2",
         "thecodingmachine/safe": "^0.1.4"
     },
     "require-dev": {
         "humbug/php-scoper": "^0.9.2",
         "phpunit/phpunit": "^7.3",
-        "symplify/changelog-linker": "^5.1",
-        "symplify/monorepo-builder": "^5.1",
-        "symplify/phpstan-extensions": "^5.1",
+        "symplify/changelog-linker": "^5.2",
+        "symplify/monorepo-builder": "^5.2",
+        "symplify/phpstan-extensions": "^5.2",
         "thecodingmachine/phpstan-safe-rule": "^0.1.0",
         "thecodingmachine/phpstan-strict-rules": "^0.10.3",
         "tracy/tracy": "^2.5"
@@ -216,5 +216,7 @@
     "bin": ["bin/rector"],
     "config": {
         "sort-packages": true
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

packages/FileSystemRector/config/config.yml

@@ -1,9 +1,2 @@
 imports:
     - { resource: 'services.yml' }
-
-parameters:
-    collectors:
-        -
-            main_type: 'Rector\FileSystemRector\FileSystemFileProcessor'
-            collected_type: 'Rector\FileSystemRector\Contract\FileSystemRectorInterface'
-            add_method: 'addFileSystemRector'

packages/FileSystemRector/src/FileSystemFileProcessor.php

@@ -12,9 +12,12 @@ final class FileSystemFileProcessor
      */
     private $fileSystemRectors = [];
 
-    public function addFileSystemRector(FileSystemRectorInterface $fileSystemRector): void
+    /**
+     * @param FileSystemRectorInterface[] $fileSystemRectors
+     */
+    public function __construct(array $fileSystemRectors = [])
     {
-        $this->fileSystemRectors[] = $fileSystemRector;
+        $this->fileSystemRectors = $fileSystemRectors;
     }
 
     /**

packages/NodeTypeResolver/src/NodeTypeResolver.php

@@ -34,25 +34,21 @@ final class NodeTypeResolver
      */
     private $classReflectionTypesResolver;
 
+    /**
+     * @param PerNodeTypeResolverInterface[] $perNodeTypeResolvers
+     */
     public function __construct(
         TypeToStringResolver $typeToStringResolver,
         Broker $broker,
-        ClassReflectionTypesResolver $classReflectionTypesResolver
+        ClassReflectionTypesResolver $classReflectionTypesResolver,
+        array $perNodeTypeResolvers = []
     ) {
         $this->typeToStringResolver = $typeToStringResolver;
         $this->broker = $broker;
         $this->classReflectionTypesResolver = $classReflectionTypesResolver;
-    }
 
-    public function addPerNodeTypeResolver(PerNodeTypeResolverInterface $perNodeTypeResolver): void
-    {
-        foreach ($perNodeTypeResolver->getNodeClasses() as $nodeClass) {
-            $this->perNodeTypeResolvers[$nodeClass] = $perNodeTypeResolver;
-        }
-
-        // in-code setter injection to drop CompilerPass requirement for 3rd party package install
-        if ($perNodeTypeResolver instanceof NodeTypeResolverAwareInterface) {
-            $perNodeTypeResolver->setNodeTypeResolver($this);
+        foreach ($perNodeTypeResolvers as $perNodeTypeResolver) {
+            $this->addPerNodeTypeResolver($perNodeTypeResolver);
         }
     }
 
@@ -80,6 +76,18 @@ public function resolve(Node $node): array
         return $types;
     }
 
+    private function addPerNodeTypeResolver(PerNodeTypeResolverInterface $perNodeTypeResolver): void
+    {
+        foreach ($perNodeTypeResolver->getNodeClasses() as $nodeClass) {
+            $this->perNodeTypeResolvers[$nodeClass] = $perNodeTypeResolver;
+        }
+
+        // in-code setter injection to drop CompilerPass requirement for 3rd party package install
+        if ($perNodeTypeResolver instanceof NodeTypeResolverAwareInterface) {
+            $perNodeTypeResolver->setNodeTypeResolver($this);
+        }
+    }
+
     /**
      * @return string[]
      */

packages/NodeTypeResolver/src/config/config.yml

@@ -1,12 +1,3 @@
 imports:
     - { resource: 'services.yml' }
     - { resource: '%vendor%/symplify/better-phpdoc-parser/src/config/config.yml' }
-
-parameters:
-    collectors:
-        -
-            main_type: 'Rector\NodeTypeResolver\NodeTypeResolver'
-            collected_type: 'Rector\NodeTypeResolver\Contract\PerNodeTypeResolver\PerNodeTypeResolverInterface'
-            add_method: 'addPerNodeTypeResolver'
-
-

packages/YamlRector/src/YamlFileProcessor.php

@@ -12,9 +12,12 @@ final class YamlFileProcessor
      */
     private $yamlRectors = [];
 
-    public function addYamlRector(YamlRectorInterface $yamlRector): void
+    /**
+     * @param YamlRectorInterface[] $yamlRectors
+     */
+    public function __construct(array $yamlRectors = [])
     {
-        $this->yamlRectors[] = $yamlRector;
+        $this->yamlRectors = $yamlRectors;
     }
 
     /**

packages/YamlRector/src/config/config.yml

@@ -1,9 +1,2 @@
 imports:
     - { resource: 'services.yml' }
-
-parameters:
-    collectors:
-        -
-            main_type: 'Rector\YamlRector\YamlFileProcessor'
-            collected_type: 'Rector\YamlRector\Contract\YamlRectorInterface'
-            add_method: 'addYamlRector'

phpstan.neon

@@ -55,8 +55,6 @@ parameters:
         - '#Cannot call method getAttribute\(\) on PhpParser\\Node\\Name\|null#'
         - '#Cannot call method getText\(\) on PhpParser\\Comment\\Doc\|null#'
 
-
-
         # Error php-parser token
         - '#Access to an undefined property PhpParser\\Node\\Expr\\Error\|PhpParser\\Node\\Expr\\Variable::\$name#'
 
@@ -90,6 +88,9 @@ parameters:
         - '#In method "Rector\\Node\\NodeFactory::createArray", parameter \$items can be type-hinted to "array"#'
         - '#In method "Rector\\Builder\\StatementGlue::addStatementToClassBeforeTypes", parameter \$types type is "array". Please provide a \@param annotation to further specify the type of the array. For instance: \@param int\[\] \$types#'
 
+        # not really needed, empty
+        - '#Rector\\NodeTraverser\\RectorNodeTraverser::__construct\(\) does not call parent constructor from PhpParser\\NodeTraverser#'
+
 services:
     -
         class: Symplify\PHPStanExtensions\Type\SplFileInfoTolerantDynamicMethodReturnTypeExtension

src/Console/Application.php

@@ -4,6 +4,7 @@
 
 use Jean85\PrettyVersions;
 use Symfony\Component\Console\Application as SymfonyApplication;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 use function Safe\getcwd;
@@ -15,9 +16,14 @@ final class Application extends SymfonyApplication
      */
     private const NAME = 'Rector';
 
-    public function __construct()
+    /**
+     * @param Command[] $commands
+     */
+    public function __construct(array $commands = [])
     {
         parent::__construct(self::NAME, PrettyVersions::getVersion('rector/rector')->getPrettyVersion());
+
+        $this->addCommands($commands);
     }
 
     protected function getDefaultInputDefinition(): InputDefinition

src/DependencyInjection/RectorKernel.php

@@ -3,7 +3,6 @@
 namespace Rector\DependencyInjection;
 
 use Rector\Contract\Rector\PhpRectorInterface;
-use Rector\DependencyInjection\CompilerPass\AutowireInterfacesCompilerPass;
 use Rector\DependencyInjection\Loader\TolerantRectorYamlFileLoader;
 use Rector\FileSystemRector\Contract\FileSystemRectorInterface;
 use Rector\YamlRector\Contract\YamlRectorInterface;
@@ -16,6 +15,8 @@
 use Symfony\Component\HttpKernel\Config\FileLocator;
 use Symfony\Component\HttpKernel\Kernel;
 use Symplify\PackageBuilder\DependencyInjection\CompilerPass\AutoBindParametersCompilerPass;
+use Symplify\PackageBuilder\DependencyInjection\CompilerPass\AutowireArrayParameterCompilerPass;
+use Symplify\PackageBuilder\DependencyInjection\CompilerPass\AutowireInterfacesCompilerPass;
 use Symplify\PackageBuilder\DependencyInjection\CompilerPass\AutowireSinglyImplementedCompilerPass;
 use Symplify\PackageBuilder\DependencyInjection\CompilerPass\ConfigurableCollectorCompilerPass;
 use Symplify\PackageBuilder\HttpKernel\SimpleKernelTrait;
@@ -58,6 +59,7 @@ protected function build(ContainerBuilder $containerBuilder): void
 
         // for defaults
         $containerBuilder->addCompilerPass(new AutowireSinglyImplementedCompilerPass());
+        $containerBuilder->addCompilerPass(new AutowireArrayParameterCompilerPass());
 
         // autowire Rectors by default (mainly for 3rd party code)
         $containerBuilder->addCompilerPass(new AutowireInterfacesCompilerPass([

src/NodeTraverser/RectorNodeTraverser.php

@@ -7,9 +7,14 @@
 
 final class RectorNodeTraverser extends NodeTraverser
 {
-    public function addRector(PhpRectorInterface $phpRector): void
+    /**
+     * @param PhpRectorInterface[] $phpRectors
+     */
+    public function __construct(array $phpRectors = [])
     {
-        $this->addVisitor($phpRector);
+        foreach ($phpRectors as $phpRector) {
+            $this->addVisitor($phpRector);
+        }
     }
 
     public function getRectorCount(): int

src/config/config.yml

@@ -1,17 +1,10 @@
 imports:
-  - { resource: '../../packages/**/src/config/config.yml' }
-  # new config location
-  - { resource: '../../packages/**/config/config.yml' }
-  - { resource: 'services.yml' }
-  - { resource: 'external-services.yml' }
+    - { resource: '../../packages/**/src/config/config.yml' }
+    # new config location
+    - { resource: '../../packages/**/config/config.yml' }
+    - { resource: 'services.yml' }
+    - { resource: 'external-services.yml' }
 
 parameters:
     exclude_paths: []
     autoload_paths: []
-
-    # see https://github.com/symplify/packagebuilder#collect-services-in-short-configs
-    collectors:
-        -
-            main_type: 'Rector\NodeTraverser\RectorNodeTraverser'
-            collected_type: 'Rector\Contract\Rector\PhpRectorInterface'
-            add_method: 'addRector'