Merge pull request #7988 from GromNaN/completion

Fix conflict of option -c with shell completion
vimeo · May 20, 2022 · 50fb396 · 50fb396
2 parents 5c1d95b + afed93b
commit 50fb396
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Cli/Plugin.php b/src/Psalm/Internal/Cli/Plugin.php
@@ -9,7 +9,6 @@
 use Psalm\Internal\PluginManager\Command\ShowCommand;
 use Psalm\Internal\PluginManager\PluginListFactory;
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Input\InputOption;
 
 use function dirname;
 use function getcwd;
@@ -41,10 +40,6 @@ public static function run(): void
             new DisableCommand($plugin_list_factory),
         ]);
 
-        $app->getDefinition()->addOption(
-            new InputOption('config', 'c', InputOption::VALUE_REQUIRED, 'Path to Psalm config file')
-        );
-
         $app->setDefaultCommand('show');
         $app->run();
     }

diff --git a/src/Psalm/Internal/PluginManager/Command/DisableCommand.php b/src/Psalm/Internal/PluginManager/Command/DisableCommand.php
@@ -7,6 +7,7 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use UnexpectedValueException;
@@ -41,6 +42,7 @@ protected function configure(): void
                 InputArgument::REQUIRED,
                 'Plugin name (fully qualified class name or composer package name)'
             )
+            ->addOption('config', 'c', InputOption::VALUE_REQUIRED, 'Path to Psalm config file')
             ->addUsage('vendor/plugin-package-name [-c path/to/psalm.xml]');
         $this->addUsage('\'Plugin\Class\Name\' [-c path/to/psalm.xml]');
     }

diff --git a/src/Psalm/Internal/PluginManager/Command/EnableCommand.php b/src/Psalm/Internal/PluginManager/Command/EnableCommand.php
@@ -7,6 +7,7 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use UnexpectedValueException;
@@ -41,6 +42,7 @@ protected function configure(): void
                 InputArgument::REQUIRED,
                 'Plugin name (fully qualified class name or composer package name)'
             )
+            ->addOption('config', 'c', InputOption::VALUE_REQUIRED, 'Path to Psalm config file')
             ->addUsage('vendor/plugin-package-name [-c path/to/psalm.xml]');
         $this->addUsage('\'Plugin\Class\Name\' [-c path/to/psalm.xml]');
     }

diff --git a/src/Psalm/Internal/PluginManager/Command/ShowCommand.php b/src/Psalm/Internal/PluginManager/Command/ShowCommand.php
@@ -5,6 +5,7 @@
 use Psalm\Internal\PluginManager\PluginListFactory;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use UnexpectedValueException;
@@ -37,6 +38,7 @@ protected function configure(): void
         $this
             ->setName('show')
             ->setDescription('Lists enabled and available plugins')
+            ->addOption('config', 'c', InputOption::VALUE_REQUIRED, 'Path to Psalm config file')
             ->addUsage('[-c path/to/psalm.xml]');
     }