From 2e6fbd52108e3b397d165842887156742154dad8 Mon Sep 17 00:00:00 2001 From: Amrouche Hamza Date: Wed, 29 May 2019 07:28:49 +0200 Subject: [PATCH] [Messenger] minor: Remove logging middleware --- .../Middleware/LoggingMiddleware.php | 58 ------------------ .../Middleware/LoggingMiddlewareTest.php | 61 ------------------- 2 files changed, 119 deletions(-) delete mode 100644 src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php delete mode 100644 src/Symfony/Component/Messenger/Tests/Middleware/LoggingMiddlewareTest.php diff --git a/src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php b/src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php deleted file mode 100644 index f68b6d802d..0000000000 --- a/src/Symfony/Component/Messenger/Middleware/LoggingMiddleware.php +++ /dev/null @@ -1,58 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Messenger\Middleware; - -@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, pass a logger to SendMessageMiddleware instead.', LoggingMiddleware::class), E_USER_DEPRECATED); - -use Psr\Log\LoggerInterface; -use Symfony\Component\Messenger\Envelope; - -/** - * @author Samuel Roze - * - * @deprecated since 4.3, pass a logger to SendMessageMiddleware instead - */ -class LoggingMiddleware implements MiddlewareInterface -{ - private $logger; - - public function __construct(LoggerInterface $logger) - { - $this->logger = $logger; - } - - /** - * {@inheritdoc} - */ - public function handle(Envelope $envelope, StackInterface $stack): Envelope - { - $message = $envelope->getMessage(); - $context = [ - 'message' => $message, - 'class' => \get_class($envelope->getMessage()), - ]; - $this->logger->debug('Starting handling message "{class}"', $context); - - try { - $envelope = $stack->next()->handle($envelope, $stack); - } catch (\Throwable $e) { - $context['exception'] = $e; - $this->logger->warning('An exception occurred while handling message "{class}": '.$e->getMessage(), $context); - - throw $e; - } - - $this->logger->debug('Finished handling message "{class}"', $context); - - return $envelope; - } -} diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/LoggingMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/LoggingMiddlewareTest.php deleted file mode 100644 index 675ff76730..0000000000 --- a/src/Symfony/Component/Messenger/Tests/Middleware/LoggingMiddlewareTest.php +++ /dev/null @@ -1,61 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Messenger\Tests\Middleware; - -use Psr\Log\LoggerInterface; -use Symfony\Component\Messenger\Envelope; -use Symfony\Component\Messenger\Middleware\LoggingMiddleware; -use Symfony\Component\Messenger\Test\Middleware\MiddlewareTestCase; -use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; - -/** - * @group legacy - */ -class LoggingMiddlewareTest extends MiddlewareTestCase -{ - public function testDebugLogAndNextMiddleware() - { - $message = new DummyMessage('Hey'); - $envelope = new Envelope($message); - - $logger = $this->createMock(LoggerInterface::class); - $logger - ->expects($this->exactly(2)) - ->method('debug') - ; - - (new LoggingMiddleware($logger))->handle($envelope, $this->getStackMock()); - } - - /** - * @expectedException \RuntimeException - * @expectedExceptionMessage Thrown from next middleware. - */ - public function testWarningLogOnException() - { - $message = new DummyMessage('Hey'); - $envelope = new Envelope($message); - - $logger = $this->createMock(LoggerInterface::class); - $logger - ->expects($this->once()) - ->method('debug') - ; - $logger - ->expects($this->once()) - ->method('warning') - ; - $stack = $this->getThrowingStackMock(); - - (new LoggingMiddleware($logger))->handle($envelope, $stack); - } -}