Merge pull request #382 from doctrine/revert-bc-break

revert BC break with command return types
doctrine · May 24, 2023 · c59d744 · c59d744
2 parents 322df15 + 208aeb3
commit c59d744
Show file tree

Hide file tree

Showing 25 changed files with 197 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+2.4.3
+-----
+
+* Revert BC break with command return types. If you extend the commands, you should add return type declarations anyways to be ready for 3.x.
+
 2.4.2
 -----
 

diff --git a/src/Command/LoadFixtureCommand.php b/src/Command/LoadFixtureCommand.php
@@ -28,7 +28,10 @@ class LoadFixtureCommand extends Command
 {
     use ContainerAwareTrait;
 
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         $this
             ->setName('doctrine:phpcr:fixtures:load')
@@ -62,7 +65,10 @@ protected function configure(): void
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         $dmName = $input->getOption('dm'); // defaults to null
         DoctrineCommandHelper::setApplicationDocumentManager(

diff --git a/src/Command/MigratorMigrateCommand.php b/src/Command/MigratorMigrateCommand.php
@@ -13,7 +13,10 @@ class MigratorMigrateCommand extends Command
 {
     use ContainerAwareTrait;
 
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         $this
             ->setName('doctrine:phpcr:migrator:migrate')
@@ -29,7 +32,10 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         DoctrineCommandHelper::setApplicationPHPCRSession(
             $this->getApplication(),

diff --git a/src/Command/NodeDumpCommand.php b/src/Command/NodeDumpCommand.php
@@ -46,7 +46,10 @@ public function setConsoleDumper(PhpcrConsoleDumperHelper $consoleDumper)
         $this->consoleDumper = $consoleDumper;
     }
 
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         parent::configure();
 
@@ -56,7 +59,10 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         $application = $this->getApplication();
         DoctrineCommandHelper::setApplicationPHPCRSession(

diff --git a/src/Command/NodeMoveCommand.php b/src/Command/NodeMoveCommand.php
@@ -14,7 +14,10 @@
  */
 class NodeMoveCommand extends BaseNodeMoveCommand
 {
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         parent::configure();
 
@@ -24,7 +27,10 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         DoctrineCommandHelper::setApplicationPHPCRSession(
             $this->getApplication(),

diff --git a/src/Command/NodeRemoveCommand.php b/src/Command/NodeRemoveCommand.php
@@ -14,7 +14,10 @@
  */
 class NodeRemoveCommand extends BaseNodeRemoveCommand
 {
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         parent::configure();
 
@@ -24,7 +27,10 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         DoctrineCommandHelper::setApplicationPHPCRSession(
             $this->getApplication(),

diff --git a/src/Command/NodeTouchCommand.php b/src/Command/NodeTouchCommand.php
@@ -14,7 +14,10 @@
  */
 class NodeTouchCommand extends BaseNodeTouchCommand
 {
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         parent::configure();
 
@@ -24,7 +27,10 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         DoctrineCommandHelper::setApplicationPHPCRSession(
             $this->getApplication(),

diff --git a/src/Command/NodeTypeListCommand.php b/src/Command/NodeTypeListCommand.php
@@ -14,7 +14,10 @@
  */
 class NodeTypeListCommand extends BaseTypeListCommand
 {
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         parent::configure();
 
@@ -24,7 +27,10 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         DoctrineCommandHelper::setApplicationPHPCRSession(
             $this->getApplication(),

diff --git a/src/Command/NodeTypeRegisterCommand.php b/src/Command/NodeTypeRegisterCommand.php
@@ -14,7 +14,10 @@ class NodeTypeRegisterCommand extends BaseRegisterNodeTypesCommand
 {
     private const BUNDLE_NT_PATH = 'Resources/config/phpcr-node-types';
 
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         parent::configure();
         $newHelp = <<<'EOT'
@@ -32,7 +35,10 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         DoctrineCommandHelper::setApplicationPHPCRSession(
             $this->getApplication(),

diff --git a/src/Command/NodesUpdateCommand.php b/src/Command/NodesUpdateCommand.php
@@ -14,7 +14,10 @@
  */
 class NodesUpdateCommand extends BaseNodesUpdateCommand
 {
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         parent::configure();
 
@@ -24,7 +27,10 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         DoctrineCommandHelper::setApplicationPHPCRSession(
             $this->getApplication(),

diff --git a/src/Command/PhpcrShellCommand.php b/src/Command/PhpcrShellCommand.php
@@ -15,7 +15,10 @@
  */
 class PhpcrShellCommand extends Command
 {
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         $this->setName('doctrine:phpcr:shell');
         $this->addArgument('cmd', InputArgument::IS_ARRAY);
@@ -51,7 +54,10 @@ protected function configure(): void
         );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         if (!class_exists(SessionApplication::class)) {
             throw new \InvalidArgumentException(

diff --git a/src/Command/RepositoryInitCommand.php b/src/Command/RepositoryInitCommand.php
@@ -18,7 +18,10 @@ class RepositoryInitCommand extends Command
 {
     use ContainerAwareTrait;
 
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         parent::configure();
 
@@ -34,7 +37,10 @@ protected function configure(): void
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         if (class_exists(RegisterSystemNodeTypesCommand::class)) {
             DoctrineCommandHelper::setApplicationPHPCRSession(

diff --git a/src/Command/WorkspaceCreateCommand.php b/src/Command/WorkspaceCreateCommand.php
@@ -12,7 +12,10 @@
  */
 class WorkspaceCreateCommand extends BaseWorkspaceCreateCommand
 {
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         parent::configure();
 
@@ -22,7 +25,10 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         DoctrineCommandHelper::setApplicationPHPCRSession(
             $this->getApplication(),

diff --git a/src/Command/WorkspaceDeleteCommand.php b/src/Command/WorkspaceDeleteCommand.php
@@ -14,7 +14,10 @@
  */
 class WorkspaceDeleteCommand extends BaseWorkspaceDeleteCommand
 {
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         parent::configure();
 
@@ -24,7 +27,10 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         DoctrineCommandHelper::setApplicationPHPCRSession(
             $this->getApplication(),

diff --git a/src/Command/WorkspaceExportCommand.php b/src/Command/WorkspaceExportCommand.php
@@ -14,7 +14,10 @@
  */
 class WorkspaceExportCommand extends BaseWorkspaceExportCommand
 {
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         parent::configure();
 
@@ -24,7 +27,10 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         DoctrineCommandHelper::setApplicationPHPCRSession(
             $this->getApplication(),

diff --git a/src/Command/WorkspaceImportCommand.php b/src/Command/WorkspaceImportCommand.php
@@ -14,7 +14,10 @@
  */
 class WorkspaceImportCommand extends BaseWorkspaceImportCommand
 {
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         parent::configure();
 
@@ -24,7 +27,10 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         DoctrineCommandHelper::setApplicationPHPCRSession(
             $this->getApplication(),

diff --git a/src/Command/WorkspaceListCommand.php b/src/Command/WorkspaceListCommand.php
@@ -12,7 +12,10 @@
  */
 class WorkspaceListCommand extends BaseWorkspaceListCommand
 {
-    protected function configure(): void
+    /**
+     * @return void
+     */
+    protected function configure()
     {
         parent::configure();
 
@@ -22,7 +25,10 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    /**
+     * @return int
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
         DoctrineCommandHelper::setApplicationPHPCRSession(
             $this->getApplication(),