diff --git a/src/Composer/Downloader/GitDownloader.php b/src/Composer/Downloader/GitDownloader.php index d5c413dd346d..4e0ea0c29c6f 100644 --- a/src/Composer/Downloader/GitDownloader.php +++ b/src/Composer/Downloader/GitDownloader.php @@ -31,7 +31,7 @@ public function doDownload(PackageInterface $package, $path) $this->io->write(" Cloning ".$package->getSourceReference()); $command = sprintf('git clone %s %s && cd %2$s && git checkout %3$s && git reset --hard %3$s', $url, $path, $ref); if (0 !== $this->process->execute($command, $ignoredOutput)) { - throw new \RuntimeException('Failed to execute ' . $command); + throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput()); } } @@ -45,7 +45,7 @@ public function doUpdate(PackageInterface $initial, PackageInterface $target, $p $this->io->write(" Checking out ".$target->getSourceReference()); $command = sprintf('cd %s && git fetch && git checkout %2$s && git reset --hard %2$s', $path, $ref); if (0 !== $this->process->execute($command, $ignoredOutput)) { - throw new \RuntimeException('Failed to execute ' . $command); + throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput()); } } @@ -56,7 +56,7 @@ protected function enforceCleanDirectory($path) { $command = sprintf('cd %s && git status --porcelain', escapeshellarg($path)); if (0 !== $this->process->execute($command, $output)) { - throw new \RuntimeException('Failed to execute ' . $command); + throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput()); } if (trim($output)) { diff --git a/src/Composer/Util/ProcessExecutor.php b/src/Composer/Util/ProcessExecutor.php index 5bce6c73c907..3cc51d7bad65 100644 --- a/src/Composer/Util/ProcessExecutor.php +++ b/src/Composer/Util/ProcessExecutor.php @@ -21,6 +21,8 @@ class ProcessExecutor { static protected $timeout = 300; + protected $errorOutput; + /** * runs a process on the commandline * @@ -44,6 +46,8 @@ public function execute($command, &$output = null) $output = $process->getOutput(); } + $this->errorOutput = $process->getErrorOutput(); + return $process->getExitCode(); } @@ -52,6 +56,16 @@ public function splitLines($output) return ((string) $output === '') ? array() : preg_split('{\r?\n}', $output); } + /** + * Get any error output from the last command + * + * @return string + */ + public function getErrorOutput() + { + return $this->errorOutput; + } + static public function getTimeout() { return static::$timeout; diff --git a/tests/Composer/Test/Util/ProcessExecutorTest.php b/tests/Composer/Test/Util/ProcessExecutorTest.php index 0ec924bb44ac..f2b394d9f2f3 100644 --- a/tests/Composer/Test/Util/ProcessExecutorTest.php +++ b/tests/Composer/Test/Util/ProcessExecutorTest.php @@ -33,6 +33,13 @@ public function testExecuteOutputsIfNotCaptured() $this->assertEquals("foo".PHP_EOL, $output); } + public function testExecuteCapturesStderr() + { + $process = new ProcessExecutor; + $process->execute('cat foo', $output); + $this->assertNotNull($process->getErrorOutput()); + } + public function testTimeout() { ProcessExecutor::setTimeout(1);