[Messenger] Rename TolerateNoHandler to AllowNoHandlerMiddleware

nicolas-grekas · nicolas-grekas · commit 5434780d5854 · 2018-05-04T16:04:01.000-07:00
diff --git a/src/Symfony/Component/Messenger/Middleware/AllowNoHandlerMiddleware.php b/src/Symfony/Component/Messenger/Middleware/AllowNoHandlerMiddleware.php
@@ -16,14 +16,14 @@
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
  */
-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
@@ -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/AllowNoHandlerMiddlewareTest.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);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@`
`16`	`16`	`/**`
`17`	`17`	`* @author Samuel Roze <samuel.roze@gmail.com>`
`18`	`18`	`*/`
`19`		`-class TolerateNoHandler implements MiddlewareInterface`
	`19`	`+class AllowNoHandlerMiddleware implements MiddlewareInterface`
`20`	`20`	`{`
`21`	`21`	`public function handle($message, callable $next)`
`22`	`22`	`{`
`23`	`23`	`try {`
`24`	`24`	`return $next($message);`
`25`	`25`	`} catch (NoHandlerForMessageException $e) {`
`26`		`- // We tolerate not having a handler for this message.`
	`26`	`+ // We allow not having a handler for this message.`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;`
`16`		`-use Symfony\Component\Messenger\Middleware\TolerateNoHandler;`
	`16`	`+use Symfony\Component\Messenger\Middleware\AllowNoHandlerMiddleware;`
`17`	`17`	`use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;`
`18`	`18`
`19`		`-class TolerateNoHandlerTest extends TestCase`
	`19`	`+class AllowNoHandlerMiddlewareTest extends TestCase`
`20`	`20`	`{`
`21`	`21`	`public function testItCallsNextMiddlewareAndReturnsItsResult()`
`22`	`22`	`{`
`@@ -25,7 +25,7 @@ public function testItCallsNextMiddlewareAndReturnsItsResult()`
`25`	`25`	`$next = $this->createPartialMock(\stdClass::class, array('__invoke'));`
`26`	`26`	`$next->expects($this->once())->method('__invoke')->with($message)->willReturn('Foo');`
`27`	`27`
`28`		`- $middleware = new TolerateNoHandler();`
	`28`	`+ $middleware = new AllowNoHandlerMiddleware();`
`29`	`29`	`$this->assertSame('Foo', $middleware->handle($message, $next));`
`30`	`30`	`}`
`31`	`31`
`@@ -34,7 +34,7 @@ public function testItCatchesTheNoHandlerException()`
`34`	`34`	`$next = $this->createPartialMock(\stdClass::class, array('__invoke'));`
`35`	`35`	`$next->expects($this->once())->method('__invoke')->will($this->throwException(new NoHandlerForMessageException()));`
`36`	`36`
`37`		`- $middleware = new TolerateNoHandler();`
	`37`	`+ $middleware = new AllowNoHandlerMiddleware();`
`38`	`38`
`39`	`39`	`$this->assertNull($middleware->handle(new DummyMessage('Hey'), $next));`
`40`	`40`	`}`
`@@ -48,7 +48,7 @@ public function testItDoesNotCatchOtherExceptions()`
`48`	`48`	`$next = $this->createPartialMock(\stdClass::class, array('__invoke'));`
`49`	`49`	`$next->expects($this->once())->method('__invoke')->will($this->throwException(new \RuntimeException('Something went wrong.')));`
`50`	`50`
`51`		`- $middleware = new TolerateNoHandler();`
	`51`	`+ $middleware = new AllowNoHandlerMiddleware();`
`52`	`52`	`$middleware->handle(new DummyMessage('Hey'), $next);`
`53`	`53`	`}`
`54`	`54`	`}`