Просмотр исходного кода

Fix naming conflicts in PhpConsoleHandler

Jordi Boggiano 10 лет назад
Родитель
Сommit
b5b773e12f

+ 2 - 2
src/Monolog/Handler/PHPConsoleHandler.php

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

+ 3 - 3
tests/Monolog/Handler/PHPConsoleHandlerTest.php

@@ -18,7 +18,7 @@ use Monolog\TestCase;
 use PhpConsole\Connector;
 use PhpConsole\Dispatcher\Debug as DebugDispatcher;
 use PhpConsole\Dispatcher\Errors as ErrorDispatcher;
-use PhpConsole\Handler;
+use PhpConsole\Handler as VendorPhpConsoleHandler;
 use PHPUnit_Framework_MockObject_MockObject;
 
 /**
@@ -214,9 +214,9 @@ class PHPConsoleHandlerTest extends TestCase
     public function testOptionUseOwnErrorsAndExceptionsHandler()
     {
         $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 () {
         }));
     }