[FrameworkBundle]: Fail properly on unregistrable command

simPod · simPod · commit a66914dff865 · 2022-12-08T14:46:43.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -68,24 +68,29 @@ public function doRun(InputInterface $input, OutputInterface $output): int
     {
         $this->registerCommands();
 
+        $statusCode = Command::SUCCESS;
         if ($this->registrationErrors) {
+            $statusCode = Command::FAILURE;
+
             $this->renderRegistrationErrors($input, $output);
         }
 
         $this->setDispatcher($this->kernel->getContainer()->get('event_dispatcher'));
 
-        return parent::doRun($input, $output);
+        return max($statusCode, parent::doRun($input, $output));
     }
 
     protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output): int
     {
         if (!$command instanceof ListCommand) {
+            $statusCode = Command::SUCCESS;
             if ($this->registrationErrors) {
+                $statusCode = Command::FAILURE;
                 $this->renderRegistrationErrors($input, $output);
                 $this->registrationErrors = [];
             }
 
-            return parent::doRunCommand($command, $input, $output);
+            return max($statusCode, parent::doRunCommand($command, $input, $output));
         }
 
         $returnCode = parent::doRunCommand($command, $input, $output);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/ApplicationTest.php
@@ -123,7 +123,7 @@ public function testBundleCommandCanOverriddeAPreExistingCommandWithTheSameName(
         $this->assertSame($newCommand, $application->get('example'));
     }
 
-    public function testRunOnlyWarnsOnUnregistrableCommand()
+    public function testUnregistrableCommandsAreConsideredFailure()
     {
         $container = new ContainerBuilder();
         $container->register('event_dispatcher', EventDispatcher::class);
@@ -147,7 +147,7 @@ public function testRunOnlyWarnsOnUnregistrableCommand()
         $tester->run(['command' => 'fine']);
         $output = $tester->getDisplay();
 
-        $tester->assertCommandIsSuccessful();
+        $this->assertSame(1, $tester->getStatusCode());
         $this->assertStringContainsString('Some commands could not be registered:', $output);
         $this->assertStringContainsString('throwing', $output);
         $this->assertStringContainsString('fine', $output);
@@ -180,7 +180,7 @@ public function testRegistrationErrorsAreDisplayedOnCommandNotFound()
         $this->assertStringContainsString('Command "fine" is not defined.', $output);
     }
 
-    public function testRunOnlyWarnsOnUnregistrableCommandAtTheEnd()
+    public function testRunFailsOnUnregistrableCommandAtTheEnd()
     {
         $container = new ContainerBuilder();
         $container->register('event_dispatcher', EventDispatcher::class);
@@ -204,7 +204,7 @@ public function testRunOnlyWarnsOnUnregistrableCommandAtTheEnd()
         $tester = new ApplicationTester($application);
         $tester->run(['command' => 'list']);
 
-        $tester->assertCommandIsSuccessful();
+        $this->assertSame(1, $tester->getStatusCode());
         $display = explode('List commands', $tester->getDisplay());
 
         $this->assertStringContainsString(trim('[WARNING] Some commands could not be registered:'), trim($display[1]));

Original file line number	Diff line number	Diff line change
`@@ -68,24 +68,29 @@ public function doRun(InputInterface $input, OutputInterface $output): int`
`68`	`68`	`{`
`69`	`69`	`$this->registerCommands();`
`70`	`70`
	`71`	`+ $statusCode = Command::SUCCESS;`
`71`	`72`	`if ($this->registrationErrors) {`
	`73`	`+ $statusCode = Command::FAILURE;`
	`74`	`+`
`72`	`75`	`$this->renderRegistrationErrors($input, $output);`
`73`	`76`	`}`
`74`	`77`
`75`	`78`	`$this->setDispatcher($this->kernel->getContainer()->get('event_dispatcher'));`
`76`	`79`
`77`		`- return parent::doRun($input, $output);`
	`80`	`+ return max($statusCode, parent::doRun($input, $output));`
`78`	`81`	`}`
`79`	`82`
`80`	`83`	`protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output): int`
`81`	`84`	`{`
`82`	`85`	`if (!$command instanceof ListCommand) {`
	`86`	`+ $statusCode = Command::SUCCESS;`
`83`	`87`	`if ($this->registrationErrors) {`
	`88`	`+ $statusCode = Command::FAILURE;`
`84`	`89`	`$this->renderRegistrationErrors($input, $output);`
`85`	`90`	`$this->registrationErrors = [];`
`86`	`91`	`}`
`87`	`92`
`88`		`- return parent::doRunCommand($command, $input, $output);`
	`93`	`+ return max($statusCode, parent::doRunCommand($command, $input, $output));`
`89`	`94`	`}`
`90`	`95`
`91`	`96`	`$returnCode = parent::doRunCommand($command, $input, $output);`