Merge multiple calls of phpstanConfig and phpstanConfigs

rectorphp · Aug 16, 2023 · c915c41 · c915c41
1 parent 446492e
commit c915c41
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/packages/Config/RectorConfig.php b/packages/Config/RectorConfig.php
@@ -133,29 +133,29 @@ public function importShortClasses(bool $importShortClasses = true): void
     }
 
     /**
-     * Set PHPStan custom config to load extensions and custom configuration to Rector.
-     * By default, the "phpstan.neon" path is used.
+     * Add PHPStan custom config to load extensions and custom configuration to Rector.
      */
     public function phpstanConfig(string $filePath): void
     {
         Assert::fileExists($filePath);
 
-        SimpleParameterProvider::setParameter(Option::PHPSTAN_FOR_RECTOR_PATH, $filePath);
+        $paths = SimpleParameterProvider::provideArrayParameter(Option::PHPSTAN_FOR_RECTOR_PATHS);
+
+        $paths[] = $filePath;
+
+        SimpleParameterProvider::setParameter(Option::PHPSTAN_FOR_RECTOR_PATHS, $paths);
     }
 
     /**
-     * Set PHPStan custom config to load extensions and custom configuration to Rector.
-     * By default, the "phpstan.neon" path is used.
+     * Add PHPStan custom configs to load extensions and custom configuration to Rector.
      *
-     * @param string[] $filePath
+     * @param string[] $filePaths
      */
     public function phpstanConfigs(array $filePaths): void
     {
         foreach ($filePaths as $filePath) {
-            Assert::fileExists($filePaths);
+            $this->phpstanConfig($filePath);
         }
-
-        SimpleParameterProvider::setParameter(Option::PHPSTAN_FOR_RECTOR_PATHS, $filePaths);
     }
 
     /**

diff --git a/packages/NodeTypeResolver/DependencyInjection/PHPStanServicesFactory.php b/packages/NodeTypeResolver/DependencyInjection/PHPStanServicesFactory.php
@@ -141,10 +141,6 @@ private function resolveAdditionalConfigFiles(): array
     {
         $additionalConfigFiles = [];
 
-        if (SimpleParameterProvider::hasParameter(Option::PHPSTAN_FOR_RECTOR_PATH)) {
-            $additionalConfigFiles[] = SimpleParameterProvider::provideStringParameter(Option::PHPSTAN_FOR_RECTOR_PATH);
-        }
-
         if (SimpleParameterProvider::hasParameter(Option::PHPSTAN_FOR_RECTOR_PATHS)) {
             $paths = SimpleParameterProvider::provideArrayParameter(Option::PHPSTAN_FOR_RECTOR_PATHS);
             foreach ($paths as $path) {

diff --git a/src/Configuration/Option.php b/src/Configuration/Option.php
@@ -150,12 +150,6 @@ final class Option
      * @internal Use @see \Rector\Config\RectorConfig::phpstanConfig() instead
      * @var string
      */
-    public const PHPSTAN_FOR_RECTOR_PATH = 'phpstan_for_rector_path';
-
-    /**
-     * @internal Use @see \Rector\Config\RectorConfig::phpstanConfigs() instead
-     * @var string
-     */
     public const PHPSTAN_FOR_RECTOR_PATHS = 'phpstan_for_rector_paths';
 
     /**