Support Symfony Console 7.x

Author: stecman

composer.json

@@ -10,7 +10,7 @@
     ],
     "require": {
         "php": ">=8.0.2",
-        "symfony/console": "~6.3"
+        "symfony/console": "~6.3 || ^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

src/CompletionCommand.php

@@ -15,6 +15,7 @@ class CompletionCommand extends SymfonyCommand
      */
     protected $handler;
 
+
     protected function configure()
     {
         $this
@@ -51,7 +52,7 @@ public function getNativeDefinition(): InputDefinition
      * Any global options defined by user-code are meaningless to this command.
      * Options outside of the core defaults are ignored to avoid name and shortcut conflicts.
      */
-    public function mergeApplicationDefinition($mergeArgs = true): void
+    public function mergeApplicationDefinition(bool $mergeArgs = true): void
     {
         // Get current application options
         $appDefinition = $this->getApplication()->getDefinition();
@@ -91,7 +92,7 @@ protected function filterApplicationOptions(array $appOptions)
         });
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->handler = new CompletionHandler($this->getApplication());
         $handler = $this->handler;
@@ -132,7 +133,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->write($results, true);
         }
 
-        return 0;
+        return (int) SymfonyCommand::SUCCESS;
     }
 
     /**

tests/Stecman/Component/Symfony/Console/BashCompletion/Common/CompletionHandlerTestCase.php

@@ -30,6 +30,7 @@ public static function setUpBeforeClass(): void
 
     protected function setUp(): void
     {
+        parent::setUp();
         $this->application = new Application('Base application');
         $this->application->addCommands(array(
             new \CompletionAwareCommand(),

tests/Stecman/Component/Symfony/Console/BashCompletion/CompletionHandlerTest.php

@@ -143,7 +143,7 @@ public function testCompletionAwareCommand($commandLine, array $suggestions)
         $this->assertSame($suggestions, $this->getTerms($handler->runCompletion()));
     }
 
-    public function completionAwareCommandDataProvider()
+    public static function completionAwareCommandDataProvider(): array
     {
         return array(
             'not complete aware command' => array('app wave --vigorous ', array()),

tests/Stecman/Component/Symfony/Console/BashCompletion/Fixtures/HiddenCommand.php

@@ -1,11 +1,12 @@
 <?php
 
+use Symfony\Component\Console\Command\Command;
 
-class HiddenCommand extends \Symfony\Component\Console\Command\Command
+class HiddenCommand extends Command
 {
     protected function configure()
     {
         $this->setName('internals')
             ->setHidden(true);
     }
-}
+}

tests/Stecman/Component/Symfony/Console/BashCompletion/Fixtures/TestBasicCommand.php

@@ -1,7 +1,10 @@
 <?php
 
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
 
-class TestBasicCommand extends \Symfony\Component\Console\Command\Command
+class TestBasicCommand extends Command
 {
     protected function configure()
     {
@@ -16,11 +19,11 @@ protected function configure()
             ->addOption(
                 'style',
                 's',
-                \Symfony\Component\Console\Input\InputOption::VALUE_REQUIRED
+                InputOption::VALUE_REQUIRED
             )
             ->addArgument(
                 'target',
-                \Symfony\Component\Console\Input\InputArgument::REQUIRED
+                InputArgument::REQUIRED
             );
     }
 }

tests/Stecman/Component/Symfony/Console/BashCompletion/Fixtures/TestSymfonyStyleCommand.php

@@ -1,6 +1,9 @@
 <?php
 
-class TestSymfonyStyleCommand extends \Symfony\Component\Console\Command\Command
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputOption;
+
+class TestSymfonyStyleCommand extends Command
 {
     protected function configure()
     {
@@ -16,12 +19,12 @@ protected function configure()
             ->addOption(
                 'style',
                 's',
-                \Symfony\Component\Console\Input\InputOption::VALUE_REQUIRED
+                InputOption::VALUE_REQUIRED
             )
             ->addOption(
                 'target',
                 't',
-                \Symfony\Component\Console\Input\InputOption::VALUE_REQUIRED
+                InputOption::VALUE_REQUIRED
             );
     }
 }

tests/Stecman/Component/Symfony/Console/BashCompletion/HookFactoryTest.php

@@ -14,6 +14,7 @@ class HookFactoryTest extends TestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
         $this->factory = new HookFactory();
     }
 
@@ -43,7 +44,7 @@ public function testZshSyntax($programPath, $programName, $multiple)
         }
     }
 
-    public function generateHookDataProvider()
+    public static function generateHookDataProvider()
     {
         return array(
             array('/path/to/myprogram', null, false),