From 5434780d5854f7b346ae39404fcd790ff1c82e19 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 4 May 2018 16:04:01 -0700 Subject: [PATCH] [Messenger] Rename TolerateNoHandler to AllowNoHandlerMiddleware --- ...erateNoHandler.php => AllowNoHandlerMiddleware.php} | 4 ++-- .../Tests/DependencyInjection/MessengerPassTest.php | 8 ++++---- ...andlerTest.php => AllowNoHandlerMiddlewareTest.php} | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) rename src/Symfony/Component/Messenger/Middleware/{TolerateNoHandler.php => AllowNoHandlerMiddleware.php} (82%) rename src/Symfony/Component/Messenger/Tests/Middleware/{TolerateNoHandlerTest.php => AllowNoHandlerMiddlewareTest.php} (85%) diff --git a/src/Symfony/Component/Messenger/Middleware/TolerateNoHandler.php b/src/Symfony/Component/Messenger/Middleware/AllowNoHandlerMiddleware.php similarity index 82% rename from src/Symfony/Component/Messenger/Middleware/TolerateNoHandler.php rename to src/Symfony/Component/Messenger/Middleware/AllowNoHandlerMiddleware.php index 5f13aa25b4dae..33494548f832f 100644 --- a/src/Symfony/Component/Messenger/Middleware/TolerateNoHandler.php +++ b/src/Symfony/Component/Messenger/Middleware/AllowNoHandlerMiddleware.php @@ -16,14 +16,14 @@ /** * @author Samuel Roze */ -class TolerateNoHandler implements MiddlewareInterface +class AllowNoHandlerMiddleware implements MiddlewareInterface { public function handle($message, callable $next) { try { return $next($message); } catch (NoHandlerForMessageException $e) { - // We tolerate not having a handler for this message. + // We allow not having a handler for this message. } } } diff --git a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php index 4f2636ab10a8f..b2ec984d0e790 100644 --- a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php +++ b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php @@ -24,7 +24,7 @@ use Symfony\Component\Messenger\Handler\ChainHandler; use Symfony\Component\Messenger\Handler\MessageSubscriberInterface; use Symfony\Component\Messenger\MessageBusInterface; -use Symfony\Component\Messenger\Middleware\TolerateNoHandler; +use Symfony\Component\Messenger\Middleware\AllowNoHandlerMiddleware; use Symfony\Component\Messenger\Middleware\MiddlewareInterface; use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; use Symfony\Component\Messenger\Tests\Fixtures\SecondMessage; @@ -264,14 +264,14 @@ public function testRegistersMiddlewaresFromServices() { $container = $this->getContainerBuilder(); $container->register($fooBusId = 'messenger.bus.foo', MessageBusInterface::class)->setArgument(0, array())->addTag('messenger.bus', array('name' => 'foo')); - $container->register('messenger.middleware.tolerate_no_handler', TolerateNoHandler::class)->setAbstract(true); + $container->register('messenger.middleware.allow_no_handler', AllowNoHandlerMiddleware::class)->setAbstract(true); $container->register(UselessMiddleware::class, UselessMiddleware::class); - $container->setParameter($middlewaresParameter = $fooBusId.'.middlewares', array(UselessMiddleware::class, 'tolerate_no_handler')); + $container->setParameter($middlewaresParameter = $fooBusId.'.middlewares', array(UselessMiddleware::class, 'allow_no_handler')); (new MessengerPass())->process($container); - $this->assertTrue($container->hasDefinition($childMiddlewareId = $fooBusId.'.middleware.tolerate_no_handler')); + $this->assertTrue($container->hasDefinition($childMiddlewareId = $fooBusId.'.middleware.allow_no_handler')); $this->assertEquals(array(new Reference(UselessMiddleware::class), new Reference($childMiddlewareId)), $container->getDefinition($fooBusId)->getArgument(0)); $this->assertFalse($container->hasParameter($middlewaresParameter)); } diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/TolerateNoHandlerTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/AllowNoHandlerMiddlewareTest.php similarity index 85% rename from src/Symfony/Component/Messenger/Tests/Middleware/TolerateNoHandlerTest.php rename to src/Symfony/Component/Messenger/Tests/Middleware/AllowNoHandlerMiddlewareTest.php index 9e0f2f5a5206c..74610d8029c70 100644 --- a/src/Symfony/Component/Messenger/Tests/Middleware/TolerateNoHandlerTest.php +++ b/src/Symfony/Component/Messenger/Tests/Middleware/AllowNoHandlerMiddlewareTest.php @@ -13,10 +13,10 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\Messenger\Exception\NoHandlerForMessageException; -use Symfony\Component\Messenger\Middleware\TolerateNoHandler; +use Symfony\Component\Messenger\Middleware\AllowNoHandlerMiddleware; use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; -class TolerateNoHandlerTest extends TestCase +class AllowNoHandlerMiddlewareTest extends TestCase { public function testItCallsNextMiddlewareAndReturnsItsResult() { @@ -25,7 +25,7 @@ public function testItCallsNextMiddlewareAndReturnsItsResult() $next = $this->createPartialMock(\stdClass::class, array('__invoke')); $next->expects($this->once())->method('__invoke')->with($message)->willReturn('Foo'); - $middleware = new TolerateNoHandler(); + $middleware = new AllowNoHandlerMiddleware(); $this->assertSame('Foo', $middleware->handle($message, $next)); } @@ -34,7 +34,7 @@ public function testItCatchesTheNoHandlerException() $next = $this->createPartialMock(\stdClass::class, array('__invoke')); $next->expects($this->once())->method('__invoke')->will($this->throwException(new NoHandlerForMessageException())); - $middleware = new TolerateNoHandler(); + $middleware = new AllowNoHandlerMiddleware(); $this->assertNull($middleware->handle(new DummyMessage('Hey'), $next)); } @@ -48,7 +48,7 @@ public function testItDoesNotCatchOtherExceptions() $next = $this->createPartialMock(\stdClass::class, array('__invoke')); $next->expects($this->once())->method('__invoke')->will($this->throwException(new \RuntimeException('Something went wrong.'))); - $middleware = new TolerateNoHandler(); + $middleware = new AllowNoHandlerMiddleware(); $middleware->handle(new DummyMessage('Hey'), $next); } }