Jordi Boggiano 12 lat temu
rodzic
commit
6b81ac8153

+ 2 - 9
src/Monolog/Handler/GelfHandler.php

@@ -39,15 +39,8 @@ class GelfHandler extends AbstractProcessingHandler
     {
         parent::__construct($level, $bubble);
 
-        $validPublisher = false;
-        if (interface_exists('\Gelf\IMessagePublisher') && $publisher instanceof IMessagePublisher) {
-            $validPublisher = true;
-        } elseif (interface_exists('\Gelf\PublisherInterface') && $publisher instanceof PublisherInterface) {
-            $validPublisher = true;
-        }
-
-        if (!$validPublisher) {
-            throw new InvalidArgumentException("Invalid publisher");
+        if (!$publisher instanceof IMessagePublisher && !$publisher instanceof PublisherInterface) {
+            throw new InvalidArgumentException("Invalid publisher, expected a Gelf\IMessagePublisher or Gelf\PublisherInterface instance");
         }
 
         $this->publisher = $publisher;

+ 1 - 1
tests/Monolog/Handler/GelfHandlerLegacyTest.php

@@ -20,7 +20,7 @@ class GelfHandlerLegacyTest extends TestCase
 {
     public function setUp()
     {
-        if (!class_exists('\Gelf\MessagePublisher') || !class_exists('\Gelf\Message')) {
+        if (!class_exists('Gelf\MessagePublisher') || !class_exists('Gelf\Message')) {
             $this->markTestSkipped("mlehner/gelf-php not installed");
         }
 

+ 2 - 2
tests/Monolog/Handler/GelfHandlerTest.php

@@ -20,7 +20,7 @@ class GelfHandlerTest extends TestCase
 {
     public function setUp()
     {
-        if (!class_exists('\Gelf\Publisher') || !class_exists('\Gelf\Message')) {
+        if (!class_exists('Gelf\Publisher') || !class_exists('Gelf\Message')) {
             $this->markTestSkipped("graylog2/gelf-php not installed");
         }
     }
@@ -43,7 +43,7 @@ class GelfHandlerTest extends TestCase
 
     protected function getMessagePublisher()
     {
-        return $this->getMock('\Gelf\Publisher', array('publish'), array(), '', false);
+        return $this->getMock('Gelf\Publisher', array('publish'), array(), '', false);
     }
 
     public function testDebug()