From 23c9842285f31f620c839dc24afc2d3d61d755e2 Mon Sep 17 00:00:00 2001
From: Remon van de Kamp <rpkamp@gmail.com>
Date: Tue, 13 Dec 2016 15:34:52 +0100
Subject: [PATCH] Remove remaining artifacts from mlehner/gelf-php (#896)

---
 .../Formatter/GelfMessageFormatterTest.php    |  2 +-
 .../Monolog/Handler/GelfHandlerLegacyTest.php | 95 -------------------
 .../Handler/GelfMockMessagePublisher.php      | 25 -----
 3 files changed, 1 insertion(+), 121 deletions(-)
 delete mode 100644 tests/Monolog/Handler/GelfHandlerLegacyTest.php
 delete mode 100644 tests/Monolog/Handler/GelfMockMessagePublisher.php

diff --git a/tests/Monolog/Formatter/GelfMessageFormatterTest.php b/tests/Monolog/Formatter/GelfMessageFormatterTest.php
index 897aa81f..15d9bda8 100644
--- a/tests/Monolog/Formatter/GelfMessageFormatterTest.php
+++ b/tests/Monolog/Formatter/GelfMessageFormatterTest.php
@@ -18,7 +18,7 @@ class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         if (!class_exists('\Gelf\Message')) {
-            $this->markTestSkipped("graylog2/gelf-php or mlehner/gelf-php is not installed");
+            $this->markTestSkipped("graylog2/gelf-php is not installed");
         }
     }
 
diff --git a/tests/Monolog/Handler/GelfHandlerLegacyTest.php b/tests/Monolog/Handler/GelfHandlerLegacyTest.php
deleted file mode 100644
index 00150a13..00000000
--- a/tests/Monolog/Handler/GelfHandlerLegacyTest.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Gelf\Message;
-use Monolog\Test\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\GelfMessageFormatter;
-
-class GelfHandlerLegacyTest extends TestCase
-{
-    public function setUp()
-    {
-        if (!class_exists('Gelf\MessagePublisher') || !class_exists('Gelf\Message')) {
-            $this->markTestSkipped("mlehner/gelf-php not installed");
-        }
-
-        require_once __DIR__ . '/GelfMockMessagePublisher.php';
-    }
-
-    /**
-     * @covers Monolog\Handler\GelfHandler::__construct
-     */
-    public function testConstruct()
-    {
-        $handler = new GelfHandler($this->getMessagePublisher());
-        $this->assertInstanceOf('Monolog\Handler\GelfHandler', $handler);
-    }
-
-    protected function getHandler($messagePublisher)
-    {
-        $handler = new GelfHandler($messagePublisher);
-
-        return $handler;
-    }
-
-    protected function getMessagePublisher()
-    {
-        return new GelfMockMessagePublisher('localhost');
-    }
-
-    public function testDebug()
-    {
-        $messagePublisher = $this->getMessagePublisher();
-        $handler = $this->getHandler($messagePublisher);
-
-        $record = $this->getRecord(Logger::DEBUG, "A test debug message");
-        $handler->handle($record);
-
-        $this->assertEquals(7, $messagePublisher->lastMessage->getLevel());
-        $this->assertEquals('test', $messagePublisher->lastMessage->getFacility());
-        $this->assertEquals($record['message'], $messagePublisher->lastMessage->getShortMessage());
-        $this->assertEquals(null, $messagePublisher->lastMessage->getFullMessage());
-    }
-
-    public function testWarning()
-    {
-        $messagePublisher = $this->getMessagePublisher();
-        $handler = $this->getHandler($messagePublisher);
-
-        $record = $this->getRecord(Logger::WARNING, "A test warning message");
-        $handler->handle($record);
-
-        $this->assertEquals(4, $messagePublisher->lastMessage->getLevel());
-        $this->assertEquals('test', $messagePublisher->lastMessage->getFacility());
-        $this->assertEquals($record['message'], $messagePublisher->lastMessage->getShortMessage());
-        $this->assertEquals(null, $messagePublisher->lastMessage->getFullMessage());
-    }
-
-    public function testInjectedGelfMessageFormatter()
-    {
-        $messagePublisher = $this->getMessagePublisher();
-        $handler = $this->getHandler($messagePublisher);
-
-        $handler->setFormatter(new GelfMessageFormatter('mysystem', 'EXT', 'CTX'));
-
-        $record = $this->getRecord(Logger::WARNING, "A test warning message");
-        $record['extra']['blarg'] = 'yep';
-        $record['context']['from'] = 'logger';
-        $handler->handle($record);
-
-        $this->assertEquals('mysystem', $messagePublisher->lastMessage->getHost());
-        $this->assertArrayHasKey('_EXTblarg', $messagePublisher->lastMessage->toArray());
-        $this->assertArrayHasKey('_CTXfrom', $messagePublisher->lastMessage->toArray());
-    }
-}
diff --git a/tests/Monolog/Handler/GelfMockMessagePublisher.php b/tests/Monolog/Handler/GelfMockMessagePublisher.php
deleted file mode 100644
index b1e94ed3..00000000
--- a/tests/Monolog/Handler/GelfMockMessagePublisher.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Gelf\MessagePublisher;
-use Gelf\Message;
-
-class GelfMockMessagePublisher extends MessagePublisher
-{
-    public function publish(Message $message)
-    {
-        $this->lastMessage = $message;
-    }
-
-    public $lastMessage = null;
-}