mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-01 19:00:20 +02:00
Code Issues Releases Wiki Activity

Fix naming conflicts in PhpConsoleHandler

Browse Source
This commit is contained in:
Jordi Boggiano
2015-12-18 17:15:26 +00:00
parent 906bc0e6a2
commit b5b773e12f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Monolog/Handler/PHPConsoleHandler.php
View File

@@ -15,7 +15,7 @@ use Exception;
use Monolog\Formatter\LineFormatter; use Monolog\Formatter\LineFormatter;
use Monolog\Logger; use Monolog\Logger;
use PhpConsole\Connector; use PhpConsole\Connector;
use PhpConsole\Handler; use PhpConsole\Handler as VendorPhpConsoleHandler;
use PhpConsole\Helper; use PhpConsole\Helper;
/** /**
@@ -107,7 +107,7 @@ class PHPConsoleHandler extends AbstractProcessingHandler
if ($this->options['enabled'] && $connector->isActiveClient()) { if ($this->options['enabled'] && $connector->isActiveClient()) {
if ($this->options['useOwnErrorsHandler'] || $this->options['useOwnExceptionsHandler']) { if ($this->options['useOwnErrorsHandler'] || $this->options['useOwnExceptionsHandler']) {
$handler = Handler::getInstance(); $handler = VendorPhpConsoleHandler::getInstance();
$handler->setHandleErrors($this->options['useOwnErrorsHandler']); $handler->setHandleErrors($this->options['useOwnErrorsHandler']);
$handler->setHandleExceptions($this->options['useOwnExceptionsHandler']); $handler->setHandleExceptions($this->options['useOwnExceptionsHandler']);
$handler->start(); $handler->start();

6
tests/Monolog/Handler/PHPConsoleHandlerTest.php
View File

@@ -18,7 +18,7 @@ use Monolog\TestCase;
use PhpConsole\Connector; use PhpConsole\Connector;
use PhpConsole\Dispatcher\Debug as DebugDispatcher; use PhpConsole\Dispatcher\Debug as DebugDispatcher;
use PhpConsole\Dispatcher\Errors as ErrorDispatcher; use PhpConsole\Dispatcher\Errors as ErrorDispatcher;
use PhpConsole\Handler; use PhpConsole\Handler as VendorPhpConsoleHandler;
use PHPUnit_Framework_MockObject_MockObject; use PHPUnit_Framework_MockObject_MockObject;
/** /**
@@ -214,9 +214,9 @@ class PHPConsoleHandlerTest extends TestCase
public function testOptionUseOwnErrorsAndExceptionsHandler() public function testOptionUseOwnErrorsAndExceptionsHandler()
{ {
$this->initLogger(array('useOwnErrorsHandler' => true, 'useOwnExceptionsHandler' => true)); $this->initLogger(array('useOwnErrorsHandler' => true, 'useOwnExceptionsHandler' => true));
$this->assertEquals(array(Handler::getInstance(), 'handleError'), set_error_handler(function () { $this->assertEquals(array(VendorPhpConsoleHandler::getInstance(), 'handleError'), set_error_handler(function () {
})); }));
$this->assertEquals(array(Handler::getInstance(), 'handleException'), set_exception_handler(function () { $this->assertEquals(array(VendorPhpConsoleHandler::getInstance(), 'handleException'), set_exception_handler(function () {
})); }));
} }