Implement conditional trait for Command::configure return type

Author: GromNaN

lib/Doctrine/ODM/MongoDB/Tools/Console/Command/ClearCache/MetadataCommand.php

@@ -22,7 +22,7 @@ class MetadataCommand extends Command
 {
     use CommandCompatibility;
 
-    protected function configure(): void
+    private function doConfigure(): void
     {
         $this
         ->setName('odm:clear-cache:metadata')

lib/Doctrine/ODM/MongoDB/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}
          *

lib/Doctrine/ODM/MongoDB/Tools/Console/Command/GenerateHydratorsCommand.php

@@ -31,7 +31,7 @@ class GenerateHydratorsCommand extends Command
 {
     use CommandCompatibility;
 
-    protected function configure(): void
+    private function doConfigure(): void
     {
         $this
         ->setName('odm:generate:hydrators')

lib/Doctrine/ODM/MongoDB/Tools/Console/Command/GeneratePersistentCollectionsCommand.php

@@ -31,7 +31,7 @@ class GeneratePersistentCollectionsCommand extends Command
 {
     use CommandCompatibility;
 
-    protected function configure(): void
+    private function doConfigure(): void
     {
         $this
             ->setName('odm:generate:persistent-collections')

lib/Doctrine/ODM/MongoDB/Tools/Console/Command/GenerateProxiesCommand.php

@@ -35,7 +35,7 @@ class GenerateProxiesCommand extends Command
 {
     use CommandCompatibility;
 
-    protected function configure(): void
+    private function doConfigure(): void
     {
         $this
         ->setName('odm:generate:proxies')

lib/Doctrine/ODM/MongoDB/Tools/Console/Command/QueryCommand.php

@@ -27,7 +27,7 @@ class QueryCommand extends Command
 {
     use CommandCompatibility;
 
-    protected function configure(): void
+    private function doConfigure(): void
     {
         $this
         ->setName('odm:query')

lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/AbstractCommand.php

@@ -19,15 +19,15 @@
 
 abstract class AbstractCommand extends Command
 {
+    use AbstractCommandCompatibility;
+
     public const DB           = 'db';
     public const COLLECTION   = 'collection';
     public const INDEX        = 'index';
     public const SEARCH_INDEX = 'search-index';
 
-    protected function configure(): void
+    private function configureCommonOptions(): void
     {
-        parent::configure();
-
         $this
             ->addOption('maxTimeMs', null, InputOption::VALUE_REQUIRED, 'An optional maxTimeMs that will be used for all schema operations.')
             ->addOption('w', null, InputOption::VALUE_REQUIRED, 'An optional w option for the write concern that will be used for all schema operations.')

lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/AbstractCommandCompatibility.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\ODM\MongoDB\Tools\Console\Command\Schema;
+
+use ReflectionMethod;
+use Symfony\Component\Console\Command\Command;
+
+// Symfony 8
+if ((new ReflectionMethod(Command::class, 'configure'))->hasReturnType()) {
+    /** @internal */
+    trait AbstractCommandCompatibility
+    {
+        protected function configure(): void
+        {
+            $this->configureCommonOptions();
+        }
+    }
+} else {
+    /** @internal */
+    trait AbstractCommandCompatibility
+    {
+        /** @return void */
+        protected function configure()
+        {
+            $this->configureCommonOptions();
+        }
+    }
+}

lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/CreateCommand.php

@@ -30,7 +30,7 @@ class CreateCommand extends AbstractCommand
         self::SEARCH_INDEX => ['search index(es)', 'search indexes'],
     ];
 
-    protected function configure(): void
+    private function doConfigure(): void
     {
         parent::configure();
 

lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/DropCommand.php

@@ -33,8 +33,6 @@ class DropCommand extends AbstractCommand
 
     protected function configure(): void
     {
-        parent::configure();
-
         $this
             ->setName('odm:schema:drop')
             ->addOption('class', 'c', InputOption::VALUE_REQUIRED, 'Document class to process (default: all classes)')