public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Add ScriptExecutionException for CLI scripts and avoid showing the full exception to users, fixes #5281

pull/5277/merge
Jordi Boggiano 2016-05-05 13:26:26 +01:00
parent 6620136309
commit aaf2c06e7b
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Composer/Console/Application.php
View File

@ -27,6 +27,7 @@ use Composer\IO\IOInterface;
use Composer\IO\ConsoleIO; use Composer\IO\ConsoleIO;
use Composer\Json\JsonValidationException; use Composer\Json\JsonValidationException;
use Composer\Util\ErrorHandler; use Composer\Util\ErrorHandler;
use Composer\EventDispatcher\ScriptExecutionException;
/** /**
* The console application that handles the commands * The console application that handles the commands
@ -217,6 +218,8 @@ class Application extends BaseApplication
} }
return $result; return $result;
} catch (ScriptExecutionException $e) {
return $e->getCode();
} catch (\Exception $e) { } catch (\Exception $e) {
$this->hintCommonErrors($e); $this->hintCommonErrors($e);
throw $e; throw $e;

8
src/Composer/EventDispatcher/EventDispatcher.php
View File

@ -181,9 +181,9 @@ class EventDispatcher
} }
$exec = $phpPath . ' ' . realpath($_SERVER['argv'][0]) . substr($callable, 9); $exec = $phpPath . ' ' . realpath($_SERVER['argv'][0]) . substr($callable, 9);
if (0 !== ($exitCode = $this->process->execute($exec))) { if (0 !== ($exitCode = $this->process->execute($exec))) {
$this->io->writeError(sprintf('<error>Script %s handling the %s event returned with an error</error>', $callable, $event->getName())); $this->io->writeError(sprintf('<error>Script %s handling the %s event returned with error code '.$exitCode.'</error>', $callable, $event->getName()));
throw new \RuntimeException('Error Output: '.$this->process->getErrorOutput(), $exitCode); throw new ScriptExecutionException('Error Output: '.$this->process->getErrorOutput(), $exitCode);
} }
} else { } else {
if (!$this->getListeners(new Event($scriptName))) { if (!$this->getListeners(new Event($scriptName))) {
@ -221,9 +221,9 @@ class EventDispatcher
$this->io->writeError(sprintf('> %s', $exec)); $this->io->writeError(sprintf('> %s', $exec));
} }
if (0 !== ($exitCode = $this->process->execute($exec))) { if (0 !== ($exitCode = $this->process->execute($exec))) {
$this->io->writeError(sprintf('<error>Script %s handling the %s event returned with an error</error>', $callable, $event->getName())); $this->io->writeError(sprintf('<error>Script %s handling the %s event returned with error code '.$exitCode.'</error>', $callable, $event->getName()));
throw new \RuntimeException('Error Output: '.$this->process->getErrorOutput(), $exitCode); throw new ScriptExecutionException('Error Output: '.$this->process->getErrorOutput(), $exitCode);
} }
} }

20
src/Composer/EventDispatcher/ScriptExecutionException.php Normal file
View File

@ -0,0 +1,20 @@
<?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Composer\EventDispatcher;
/**
* @author Jordi Boggiano <j.boggiano@seld.be>
*/
class ScriptExecutionException extends \RuntimeException
{
}