merged branch Stelian/2.2 (PR #8183)

fabpot · fabpot · commit 28a900150e20 · 2013-06-04T16:58:25.000+02:00
This PR was submitted for the 2.2 branch but it was merged into the 2.1 branch instead (closes #8183). Discussion ---------- Fixed exit code for exceptions with error code 0 Covers #8180 Commits ------- 48e77f8 Fixed exit code for exceptions with error code 0
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 = $statusCode ? (is_numeric($statusCode) ? (int) $statusCode : 1) : 0;
+            $statusCode = is_numeric($statusCode) && $statusCode ? (int) $statusCode : 1;
         }
 
         if ($this->autoExit) {
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -516,6 +516,21 @@ public function testRunReturnsIntegerExitCode()
         $this->assertSame(4, $exitCode, '->run() returns integer exit code extracted from raised exception');
     }
 
+    public function testRunReturnsExitCodeOneForExceptionCodeZero()
+    {
+        $exception = new \Exception('', 0);
+
+        $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(1, $exitCode, '->run() returns exit code 1 when exception code is 0');
+    }
+
     /**
      * @expectedException \LogicException
      * @dataProvider getAddingAlreadySetDefinitionElementData

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 = $statusCode ? (is_numeric($statusCode) ? (int) $statusCode : 1) : 0;`
	`118`	`+ $statusCode = is_numeric($statusCode) && $statusCode ? (int) $statusCode : 1;`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`if ($this->autoExit) {`