Fix return type annotations.

cakephp · Oct 4, 2017 · 1a0c868 · 1a0c868
1 parent 3d6b3eb
commit 1a0c868
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/Console/Command.php b/src/Console/Command.php
@@ -174,7 +174,9 @@ public function run(array $argv, ConsoleIo $io)
         $this->setOutputLevel($args, $io);
 
         if ($args->getOption('help')) {
-            return $this->displayHelp($parser, $args, $io);
+            $this->displayHelp($parser, $args, $io);
+
+            return static::CODE_SUCCESS;
         }
 
         return $this->execute($args, $io);

diff --git a/src/Console/CommandRunner.php b/src/Console/CommandRunner.php
@@ -136,6 +136,7 @@ public function run(array $argv, ConsoleIo $io = null)
         $io = $io ?: new ConsoleIo();
         $name = $this->resolveName($commands, $io, array_shift($argv));
 
+        $result = Shell::CODE_ERROR;
         $shell = $this->getShell($io, $commands, $name);
         if ($shell instanceof Shell) {
             $result = $this->runShell($shell, $argv);
@@ -236,7 +237,7 @@ protected function runShell(Shell $shell, array $argv)
      *
      * @param string $className Shell class name.
      * @param \Cake\Console\ConsoleIo $io The IO wrapper for the created shell class.
-     * @return \Cake\Console\Shell
+     * @return \Cake\Console\Shell|\Cake\Console\Command
      */
     protected function createShell($className, ConsoleIo $io)
     {

diff --git a/tests/TestCase/Console/CommandTest.php b/tests/TestCase/Console/CommandTest.php
@@ -134,7 +134,10 @@ public function testRunOutputHelp()
         $command->setName('cake example');
         $output = new ConsoleOutput();
 
-        $this->assertNull($command->run(['-h'], $this->getMockIo($output)));
+        $this->assertSame(
+            Command::CODE_SUCCESS,
+            $command->run(['-h'], $this->getMockIo($output))
+        );
         $messages = implode("\n", $output->messages());
         $this->assertNotContains('Example', $messages);
         $this->assertContains('cake example [-h]', $messages);
@@ -151,7 +154,10 @@ public function testRunOutputHelpLongOption()
         $command->setName('cake example');
         $output = new ConsoleOutput();
 
-        $this->assertNull($command->run(['--help'], $this->getMockIo($output)));
+        $this->assertSame(
+            Command::CODE_SUCCESS,
+            $command->run(['--help'], $this->getMockIo($output))
+        );
         $messages = implode("\n", $output->messages());
         $this->assertNotContains('Example', $messages);
         $this->assertContains('cake example [-h]', $messages);