Fix Symfony 8 compatibility issues (#7009)

Author: derrabus

.github/workflows/continuous-integration.yml

@@ -226,7 +226,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
+          - "8.4"
 
     steps:
       - name: "Checkout"
@@ -240,7 +240,9 @@ jobs:
           fail-fast: true
 
       - name: "Lower minimum stability"
-        run: "composer config minimum-stability dev"
+        run: | 
+          composer config minimum-stability dev
+          composer require --no-update --dev symfony/console:^8 symfony/cache:^8
 
       - name: "Install development dependencies with Composer"
         uses: "ramsey/composer-install@v3"

src/Tools/Console/Command/CommandCompatibility.php

@@ -9,10 +9,32 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-if ((new ReflectionMethod(Command::class, 'execute'))->hasReturnType()) {
+// Symfony 8
+if ((new ReflectionMethod(Command::class, 'configure'))->hasReturnType()) {
     /** @internal */
     trait CommandCompatibility
     {
+        protected function configure(): void
+        {
+            $this->doConfigure();
+        }
+
+        protected function execute(InputInterface $input, OutputInterface $output): int
+        {
+            return $this->doExecute($input, $output);
+        }
+    }
+// Symfony 7
+} elseif ((new ReflectionMethod(Command::class, 'execute'))->hasReturnType()) {
+    /** @internal */
+    trait CommandCompatibility
+    {
+        /** @return void */
+        protected function configure()
+        {
+            $this->doConfigure();
+        }
+
         protected function execute(InputInterface $input, OutputInterface $output): int
         {
             return $this->doExecute($input, $output);
@@ -22,6 +44,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     /** @internal */
     trait CommandCompatibility
     {
+        /** @return void */
+        protected function configure()
+        {
+            $this->doConfigure();
+        }
+
         /**
          * {@inheritDoc}
          *

src/Tools/Console/Command/ReservedWordsCommand.php

@@ -97,8 +97,7 @@ public function setKeywordListClass($name, $class)
         $this->keywordLists[$name] = new $class();
     }
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this
         ->setName('dbal:reserved-words')

src/Tools/Console/Command/RunSqlCommand.php

@@ -37,8 +37,7 @@ public function __construct(ConnectionProvider $connectionProvider)
         $this->connectionProvider = $connectionProvider;
     }
 
-    /** @return void */
-    protected function configure()
+    private function doConfigure(): void
     {
         $this
         ->setName('dbal:run-sql')

tests/Tools/Console/RunSqlCommandTest.php

@@ -11,6 +11,7 @@
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 
+use function method_exists;
 use function str_replace;
 
 class RunSqlCommandTest extends TestCase
@@ -26,7 +27,12 @@ protected function setUp(): void
         $this->connectionMock = $this->createMock(Connection::class);
         $this->command        = new RunSqlCommand(new SingleConnectionProvider($this->connectionMock));
 
-        (new Application())->add($this->command);
+        if (method_exists(Application::class, 'addCommand')) {
+            // @phpstan-ignore method.notFound (This method will be added in Symfony 7.4)
+            (new Application())->addCommand($this->command);
+        } else {
+            (new Application())->add($this->command);
+        }
 
         $this->commandTester = new CommandTester($this->command);
     }