From c2280a9e93607f65014ec1c16cf546dc3fe38592 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Mon, 6 May 2024 06:01:44 +0900
Subject: [PATCH 1/4] Add print PHP_CodeSniffer and PHP-CS-Fixer versions when
 --version

---
 src/Console/EasyCodingStandardConsoleApplication.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Console/EasyCodingStandardConsoleApplication.php b/src/Console/EasyCodingStandardConsoleApplication.php
index d2f8b25ec7..de718b2cf5 100644
--- a/src/Console/EasyCodingStandardConsoleApplication.php
+++ b/src/Console/EasyCodingStandardConsoleApplication.php
@@ -5,6 +5,8 @@
 namespace Symplify\EasyCodingStandard\Console;
 
 use Composer\XdebugHandler\XdebugHandler;
+use PHP_CodeSniffer\Config as PHP_CodeSniffer;
+use PhpCsFixer\Console\Application as PhpCsFixer;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
@@ -56,6 +58,14 @@ public function doRun(InputInterface $input, OutputInterface $output): int
             unset($xdebugHandler);
         }
 
+        if ($input->hasParameterOption(['--version', '-V'], true)) {
+            $output->writeln($this->getLongVersion());
+            $output->writeln(sprintf('- %s <info>%s</info>', 'PHP_CodeSniffer', PHP_CodeSniffer::VERSION));
+            $output->writeln(sprintf('- %s <info>%s</info>', 'PHP-CS-Fixer', PhpCsFixer::VERSION));
+
+            return 0;
+        }
+
         // skip in this case, since generate content must be clear from meta-info
         if ($this->shouldPrintMetaInformation($input)) {
             $output->writeln($this->getLongVersion());

From ce828f0b647d9eccd30e1e6efe81e8dcbfb6020d Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Mon, 6 May 2024 17:00:34 +0900
Subject: [PATCH 2/4] Replace list marker with "+"

---
 src/Console/EasyCodingStandardConsoleApplication.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Console/EasyCodingStandardConsoleApplication.php b/src/Console/EasyCodingStandardConsoleApplication.php
index de718b2cf5..fc092cc13b 100644
--- a/src/Console/EasyCodingStandardConsoleApplication.php
+++ b/src/Console/EasyCodingStandardConsoleApplication.php
@@ -60,8 +60,8 @@ public function doRun(InputInterface $input, OutputInterface $output): int
 
         if ($input->hasParameterOption(['--version', '-V'], true)) {
             $output->writeln($this->getLongVersion());
-            $output->writeln(sprintf('- %s <info>%s</info>', 'PHP_CodeSniffer', PHP_CodeSniffer::VERSION));
-            $output->writeln(sprintf('- %s <info>%s</info>', 'PHP-CS-Fixer', PhpCsFixer::VERSION));
+            $output->writeln(sprintf('+ %s <info>%s</info>', 'PHP_CodeSniffer', PHP_CodeSniffer::VERSION));
+            $output->writeln(sprintf('+ %s <info>%s</info>', 'PHP-CS-Fixer', PhpCsFixer::VERSION));
 
             return 0;
         }

From 4d31848bcf4e7669e37bbc627fe8b4035a4af714 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Mon, 6 May 2024 20:20:53 +0900
Subject: [PATCH 3/4] Remove unreached --version option check

---
 src/Console/EasyCodingStandardConsoleApplication.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Console/EasyCodingStandardConsoleApplication.php b/src/Console/EasyCodingStandardConsoleApplication.php
index fc092cc13b..26ac9bd87e 100644
--- a/src/Console/EasyCodingStandardConsoleApplication.php
+++ b/src/Console/EasyCodingStandardConsoleApplication.php
@@ -85,11 +85,6 @@ protected function getDefaultInputDefinition(): InputDefinition
     private function shouldPrintMetaInformation(InputInterface $input): bool
     {
         $hasNoArguments = $input->getFirstArgument() === null;
-        $hasVersionOption = $input->hasParameterOption('--version');
-
-        if ($hasVersionOption) {
-            return false;
-        }
 
         if ($hasNoArguments) {
             return false;

From 48fc8d404ca85f2fe2864cae0c1b64691ac3b217 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Mon, 6 May 2024 21:39:57 +0900
Subject: [PATCH 4/4] Append output instead of override doRun with --version

---
 .../EasyCodingStandardConsoleApplication.php   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Console/EasyCodingStandardConsoleApplication.php b/src/Console/EasyCodingStandardConsoleApplication.php
index 26ac9bd87e..e1f7ae0b31 100644
--- a/src/Console/EasyCodingStandardConsoleApplication.php
+++ b/src/Console/EasyCodingStandardConsoleApplication.php
@@ -58,20 +58,20 @@ public function doRun(InputInterface $input, OutputInterface $output): int
             unset($xdebugHandler);
         }
 
-        if ($input->hasParameterOption(['--version', '-V'], true)) {
-            $output->writeln($this->getLongVersion());
-            $output->writeln(sprintf('+ %s <info>%s</info>', 'PHP_CodeSniffer', PHP_CodeSniffer::VERSION));
-            $output->writeln(sprintf('+ %s <info>%s</info>', 'PHP-CS-Fixer', PhpCsFixer::VERSION));
-
-            return 0;
-        }
-
         // skip in this case, since generate content must be clear from meta-info
         if ($this->shouldPrintMetaInformation($input)) {
             $output->writeln($this->getLongVersion());
         }
 
-        return parent::doRun($input, $output);
+        $exitCode = parent::doRun($input, $output);
+
+        // Append to the output of --version
+        if ($exitCode === 0 && $input->hasParameterOption(['--version', '-V'], true)) {
+            $output->writeln(sprintf('+ %s <info>%s</info>', 'PHP_CodeSniffer', PHP_CodeSniffer::VERSION));
+            $output->writeln(sprintf('+ %s <info>%s</info>', 'PHP-CS-Fixer', PhpCsFixer::VERSION));
+        }
+
+        return $exitCode;
     }
 
     protected function getDefaultInputDefinition(): InputDefinition