fix typo in option name that lead to missed config loader

rectorphp · May 15, 2021 · 037cfd4 · TomasVotruba · May 15, 2021 · 037cfd4
1 parent 83e02e8
commit 037cfd4
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/config/config.php b/config/config.php
@@ -3,7 +3,6 @@
 declare(strict_types=1);
 
 use Rector\Core\Bootstrap\ExtensionConfigResolver;
-use Rector\Core\Configuration\Option;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
@@ -20,8 +19,4 @@
 
     // require only in dev
     $containerConfigurator->import(__DIR__ . '/../utils/compiler/config/config.php', null, 'not_found');
-
-    // to override extension-loaded config
-    $parameters = $containerConfigurator->parameters();
-    $parameters->set(Option::PHPSTAN_FOR_RECTOR_PATH, getcwd() . '/phpstan-for-rector.neon');
 };
diff --git a/config/parameters.php b/config/parameters.php
@@ -27,6 +27,8 @@
     $parameters->set(Option::NESTED_CHAIN_METHOD_CALL_LIMIT, 30);
     $parameters->set(Option::SKIP, []);
 
+    $parameters->set(Option::PHPSTAN_FOR_RECTOR_PATH, null);
+
     // cache
     $parameters->set(Option::ENABLE_CACHE, false);
     $parameters->set(Option::CACHE_DIR, sys_get_temp_dir() . '/rector_cached_files');

diff --git a/rector.php b/rector.php
@@ -104,6 +104,7 @@
         '*/Expected*/*',
     ]);
 
+    $parameters->set(Option::PHPSTAN_FOR_RECTOR_PATH, __DIR__ . '/phpstan-for-rector.neon');
     $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_74);
     $parameters->set(Option::ENABLE_CACHE, true);
 };
diff --git a/src/Bootstrap/RectorConfigsResolver.php b/src/Bootstrap/RectorConfigsResolver.php
@@ -43,7 +43,7 @@ private function resolveRectorRecipeConfig(ArgvInput $argvInput): ?SmartFileInfo
 
     private function resolveFromInput(ArgvInput $argvInput): ?SmartFileInfo
     {
-        $configValue = $this->getOptionValue($argvInput, ['config', 'c']);
+        $configValue = $this->getOptionValue($argvInput, ['--config', '-c']);
         if ($configValue === null) {
             return null;
         }

diff --git a/src/HttpKernel/RectorKernel.php b/src/HttpKernel/RectorKernel.php
@@ -69,7 +69,6 @@ public function getLogDir(): string
     public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(__DIR__ . '/../../config/config.php');
-
         foreach ($this->configFileInfos as $configFileInfo) {
             $loader->load($configFileInfo->getRealPath());
         }