merged branch Tobion/console-exit-code (PR #8080)

fabpot · fabpot · commit 92399ff79a7a · 2013-05-19T21:02:55.000+02:00
This PR was merged into the 2.1 branch. Discussion ---------- [Console] fix and refactor exit code handling Split of #8038 Commits ------- 5c317b7 [Console] fix and refactor exit code handling
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -115,7 +115,7 @@ public function run(InputInterface $input = null, OutputInterface $output = null
             }
             $statusCode = $e->getCode();
 
-            $statusCode = is_numeric($statusCode) && $statusCode ? $statusCode : 1;
+            $statusCode = $statusCode ? (is_numeric($statusCode) ? (int) $statusCode : 1) : 0;
         }
 
         if ($this->autoExit) {
@@ -192,7 +192,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
         $statusCode = $command->run($input, $output);
         $this->runningCommand = null;
 
-        return is_numeric($statusCode) ? $statusCode : 0;
+        return $statusCode;
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
@@ -238,7 +238,7 @@ public function run(InputInterface $input, OutputInterface $output)
             $statusCode = $this->execute($input, $output);
         }
 
-        return is_numeric($statusCode) ? $statusCode : 0;
+        return is_numeric($statusCode) ? (int) $statusCode : 0;
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -501,6 +501,21 @@ public function testRun()
         $this->assertSame('called'.PHP_EOL, $tester->getDisplay(), '->run() does not call interact() if -n is passed');
     }
 
+    public function testRunReturnsIntegerExitCode()
+    {
+        $exception = new \Exception('', 4);
+
+        $application = $this->getMock('Symfony\Component\Console\Application', array('doRun'));
+        $application->setAutoExit(false);
+        $application->expects($this->once())
+             ->method('doRun')
+             ->will($this->throwException($exception));
+
+        $exitCode = $application->run(new ArrayInput(array()), new NullOutput());
+
+        $this->assertSame(4, $exitCode, '->run() returns integer exit code extracted from raised exception');
+    }
+
     /**
      * @expectedException \LogicException
      * @dataProvider getAddingAlreadySetDefinitionElementData
diff --git a/src/Symfony/Component/Console/Tests/Command/CommandTest.php b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
@@ -221,6 +221,20 @@ public function testRun()
         }
     }
 
+    public function testRunReturnsIntegerExitCode()
+    {
+        $command = new \TestCommand();
+        $exitCode = $command->run(new StringInput(''), new NullOutput());
+        $this->assertSame(0, $exitCode, '->run() returns integer exit code (treats null as 0)');
+
+        $command = $this->getMock('TestCommand', array('execute'));
+        $command->expects($this->once())
+             ->method('execute')
+             ->will($this->returnValue('2.3'));
+        $exitCode = $command->run(new StringInput(''), new NullOutput());
+        $this->assertSame(2, $exitCode, '->run() returns integer exit code (casts numeric to int)');
+    }
+
     public function testRunReturnsAlwaysInteger()
     {
         $command = new \TestCommand();

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public function run(InputInterface $input = null, OutputInterface $output = null`
`115`	`115`	`}`
`116`	`116`	`$statusCode = $e->getCode();`
`117`	`117`
`118`		`- $statusCode = is_numeric($statusCode) && $statusCode ? $statusCode : 1;`
	`118`	`+ $statusCode = $statusCode ? (is_numeric($statusCode) ? (int) $statusCode : 1) : 0;`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`if ($this->autoExit) {`
`@@ -192,7 +192,7 @@ public function doRun(InputInterface $input, OutputInterface $output)`
`192`	`192`	`$statusCode = $command->run($input, $output);`
`193`	`193`	`$this->runningCommand = null;`
`194`	`194`
`195`		`- return is_numeric($statusCode) ? $statusCode : 0;`
	`195`	`+ return $statusCode;`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public function run(InputInterface $input, OutputInterface $output)`
`238`	`238`	`$statusCode = $this->execute($input, $output);`
`239`	`239`	`}`
`240`	`240`
`241`		`- return is_numeric($statusCode) ? $statusCode : 0;`
	`241`	`+ return is_numeric($statusCode) ? (int) $statusCode : 0;`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`/**`