merged branch zakharovvi/process_exception_exitcode (PR #7628)

fabpot · fabpot · commit 09fd2af1cdfe · 2013-04-12T08:33:25.000+02:00
This PR was merged into the master branch. Discussion ---------- [Process] added exit code to ProcessFailedException message | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | no | License | MIT | Doc PR | n/a Commits ------- 7519fdc [Process] added exit code to ProcessFailedException message
diff --git a/src/Symfony/Component/Process/Exception/ProcessFailedException.php b/src/Symfony/Component/Process/Exception/ProcessFailedException.php
@@ -30,8 +30,10 @@ public function __construct(Process $process)
 
         parent::__construct(
             sprintf(
-                'The command "%s" failed.'."\n\nOutput:\n================\n%s\n\nError Output:\n================\n%s",
+                'The command "%s" failed.'."\nExit Code: %s(%s)\n\nOutput:\n================\n%s\n\nError Output:\n================\n%s",
                 $process->getCommandLine(),
+                $process->getExitCode(),
+                $process->getExitCodeText(),
                 $process->getOutput(),
                 $process->getErrorOutput()
             )
diff --git a/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php b/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php
@@ -46,12 +46,14 @@ public function testProcessFailedExceptionThrowsException()
     public function testProcessFailedExceptionPopulatesInformationFromProcessOutput()
     {
         $cmd = 'php';
+        $exitCode = 1;
+        $exitText = 'General error';
         $output = "Command output";
         $errorOutput = "FATAL: Unexpected error";
 
         $process = $this->getMock(
             'Symfony\Component\Process\Process',
-            array('isSuccessful', 'getOutput', 'getErrorOutput'),
+            array('isSuccessful', 'getOutput', 'getErrorOutput', 'getExitCode', 'getExitCodeText'),
             array($cmd)
         );
         $process->expects($this->once())
@@ -63,11 +65,17 @@ public function testProcessFailedExceptionPopulatesInformationFromProcessOutput(
         $process->expects($this->once())
             ->method('getErrorOutput')
             ->will($this->returnValue($errorOutput));
+        $process->expects($this->once())
+            ->method('getExitCode')
+            ->will($this->returnValue($exitCode));
+        $process->expects($this->once())
+            ->method('getExitCodeText')
+            ->will($this->returnValue($exitText));
 
         $exception = new ProcessFailedException($process);
 
         $this->assertEquals(
-            "The command \"$cmd\" failed.\n\nOutput:\n================\n{$output}\n\nError Output:\n================\n{$errorOutput}",
+            "The command \"$cmd\" failed.\nExit Code: $exitCode($exitText)\n\nOutput:\n================\n{$output}\n\nError Output:\n================\n{$errorOutput}",
             $exception->getMessage()
         );
     }
