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

Fix wording & co

pull/472/merge
Jordi Boggiano 2012-03-18 21:16:36 +01:00
parent a5c2c6c07e
commit 51447074c2
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ class Application extends BaseApplication
public function __construct() public function __construct()
{ {
ErrorHandler::set(); ErrorHandler::register();
parent::__construct('Composer', Composer::VERSION); parent::__construct('Composer', Composer::VERSION);
} }

20
src/Composer/Util/ErrorHandler.php
View File

@ -13,7 +13,7 @@
namespace Composer\Util; namespace Composer\Util;
/** /**
* Convert PHP E_NOTICE, E_WARNING into exceptions * Convert PHP errors into exceptions
* *
* @author Artem Lopata <biozshock@gmail.com> * @author Artem Lopata <biozshock@gmail.com>
*/ */
@ -22,30 +22,30 @@ class ErrorHandler
/** /**
* Error handler * Error handler
* *
* @param int $errorNo Level of the error raised * @param int $level Level of the error raised
* @param string $errorString Error message * @param string $message Error message
* @param string $errorFile Filename that the error was raised in * @param string $file Filename that the error was raised in
* @param int $errorLine Line number the error was raised at * @param int $line Line number the error was raised at
* *
* @static * @static
* @throws \ErrorException * @throws \ErrorException
*/ */
public static function handle($errorNo, $errorString, $errorFile, $errorLine) public static function handle($level, $message, $file, $line)
{ {
//this allows error suppression in 3rd party code to work // respect error_reporting being disabled
if (!error_reporting()) { if (!error_reporting()) {
return; return;
} }
throw new \ErrorException(sprintf('%s in %s:%d', $errorString, $errorFile, $errorLine), $errorNo); throw new \ErrorException($message, 0, $level, $file, $line);
} }
/** /**
* Set error handler * Register error handler
* *
* @static * @static
*/ */
public static function set() public static function register()
{ {
set_error_handler(array(__CLASS__, 'handle')); set_error_handler(array(__CLASS__, 'handle'));
} }

8
tests/Composer/Test/Util/ErrorHandlerTest.php
View File

@ -27,9 +27,9 @@ class ErrorHandlerTest extends TestCase
*/ */
public function testErrorHandlerCaptureNotice() public function testErrorHandlerCaptureNotice()
{ {
$this->setExpectedException('\ErrorException', 'Undefined index: baz in ' . __FILE__); $this->setExpectedException('\ErrorException', 'Undefined index: baz');
ErrorHandler::set(); ErrorHandler::register();
$array = array('foo' => 'bar'); $array = array('foo' => 'bar');
$array['baz']; $array['baz'];
@ -40,9 +40,9 @@ class ErrorHandlerTest extends TestCase
*/ */
public function testErrorHandlerCaptureWarning() public function testErrorHandlerCaptureWarning()
{ {
$this->setExpectedException('\ErrorException', 'array_merge(): Argument #2 is not an array in ' . __FILE__); $this->setExpectedException('\ErrorException', 'array_merge(): Argument #2 is not an array');
ErrorHandler::set(); ErrorHandler::register();
array_merge(array(), 'string'); array_merge(array(), 'string');
} }