From afed93b6bd8fea2389fd4a883eba488c7316436f Mon Sep 17 00:00:00 2001
From: Jerome TAMARELLE <jerome@tamarelle.net>
Date: Thu, 19 May 2022 22:14:20 +0200
Subject: [PATCH] Fix conflict of option -c with shell completion

---
 src/Psalm/Internal/Cli/Plugin.php                           | 5 -----
 src/Psalm/Internal/PluginManager/Command/DisableCommand.php | 2 ++
 src/Psalm/Internal/PluginManager/Command/EnableCommand.php  | 2 ++
 src/Psalm/Internal/PluginManager/Command/ShowCommand.php    | 2 ++
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Psalm/Internal/Cli/Plugin.php b/src/Psalm/Internal/Cli/Plugin.php
index 3e180d5af6d..5a891853f44 100644
--- 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
index 6bd53f5f3c1..ae05fb470e7 100644
--- 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
index e57ee4d5d19..d868ca18e95 100644
--- 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
index 50fc46492fe..1ef61655f55 100644
--- 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]');
     }