From 6b81ac8153be8ae33a877a79be3f61809f1448d9 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Sun, 23 Feb 2014 16:06:45 +0100
Subject: [PATCH] CS fixes, refs #326

---
 src/Monolog/Handler/GelfHandler.php             | 11 ++---------
 tests/Monolog/Handler/GelfHandlerLegacyTest.php |  2 +-
 tests/Monolog/Handler/GelfHandlerTest.php       |  4 ++--
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/Monolog/Handler/GelfHandler.php b/src/Monolog/Handler/GelfHandler.php
index d9976677..c38aef80 100644
--- a/src/Monolog/Handler/GelfHandler.php
+++ b/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;
diff --git a/tests/Monolog/Handler/GelfHandlerLegacyTest.php b/tests/Monolog/Handler/GelfHandlerLegacyTest.php
index 1bd36f23..50cb7cfe 100644
--- a/tests/Monolog/Handler/GelfHandlerLegacyTest.php
+++ b/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");
         }
 
diff --git a/tests/Monolog/Handler/GelfHandlerTest.php b/tests/Monolog/Handler/GelfHandlerTest.php
index a14a1a9d..131e6526 100644
--- a/tests/Monolog/Handler/GelfHandlerTest.php
+++ b/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()