10000 bug #27177 Rename middlewares to middleware (fabpot, sroze) · symfony/messenger@ce4fddc · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit ce4fddc

Browse files
srozesroze
committed
bug #27177 Rename middlewares to middleware (fabpot, sroze)
This PR was merged into the 4.1-dev branch. Discussion ---------- Rename middlewares to middleware | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a `middleware` is uncountable in English (like software or information). So, I've removed the `s` everywhere. We can probably be a bit more explicit if we think it makes thing easier to understand like I've done in one class, like `middlewareHandler`. Commits ------- 9ae7c11805 Do not fix the `middleware` XML name anymore 52e7500edb removed usage of middlewares
2 parents f7e913f + 7370b99 commit ce4fddc

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎DependencyInjection/MessengerPass.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ public function process(ContainerBuilder $container)
5454
}
5555

5656
foreach ($container->findTaggedServiceIds($this->busTag) as $busId => $tags) {
57-
if ($container->hasParameter($busMiddlewaresParameter = $busId.'.middlewares')) {
58-
$this->registerBusMiddlewares($container, $busId, $container->getParameter($busMiddlewaresParameter));
57+
if ($container->hasParameter($busMiddlewareParameter = $busId.'.middleware')) {
58+
$this->registerBusMiddleware($container, $busId, $container->getParameter($busMiddlewareParameter));
5959

60-
$container->getParameterBag()->remove($busMiddlewaresParameter);
60+
$container->getParameterBag()->remove($busMiddlewareParameter);
6161
}
6262

6363
if ($container->hasDefinition('messenger.data_collector')) {
@@ -200,7 +200,7 @@ private function registerBusToCollector(ContainerBuilder $container, string $bus
200200
$container->getDefinition('messenger.data_collector')->addMethodCall('registerBus', array($busId, new Reference($tracedBusId)));
201201
}
202202

203-
private function registerBusMiddlewares(ContainerBuilder $container, string $busId, array $middlewares)
203+
private function registerBusMiddleware(ContainerBuilder $container, string $busId, array $middleware)
204204
{
205205
$container->getDefinition($busId)->replaceArgument(0, array_map(function (string $name) use ($container, $busId) {
206206
if (!$container->has($messengerMiddlewareId = 'messenger.middleware.'.$name)) {
@@ -218,6 +218,6 @@ private function registerBusMiddlewares(ContainerBuilder $container, string $bus
218218
}
219219

220220
return new Reference($messengerMiddlewareId);
221-
}, $middlewares));
221+
}, $middleware));
222222
}
223223
}

‎MessageBus.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
*/
2020
class MessageBus implements MessageBusInterface
2121
{
22-
private $middlewares;
22+
private $middlewareHandlers;
2323

2424
/**
2525
* @var MiddlewareInterface[]|null
2626
*/
27-
private $indexedMiddlewares;
27+
private $indexedMiddlewareHandlers;
2828

2929
/**
30-
* @param MiddlewareInterface[]|iterable $middlewares
30+
* @param MiddlewareInterface[]|iterable $middlewareHandlers
3131
*/
32-
public function __construct(iterable $middlewares = array())
32+
public function __construct(iterable $middlewareHandlers = array())
3333
{
34-
$this->middlewares = $middlewares;
34+
$this->middlewareHandlers = $middlewareHandlers;
3535
}
3636

3737
/**
@@ -44,15 +44,15 @@ public function dispatch($message)
4444

4545
private function callableForNextMiddleware(int $index): callable
4646
{
47-
if (null === $this->indexedMiddlewares) {
48-
$this->indexedMiddlewares = \is_array($this->middlewares) ? array_values($this->middlewares) : iterator_to_array($this->middlewares, false);
47+
if (null === $this->indexedMiddlewareHandlers) {
48+
$this->indexedMiddlewareHandlers = \is_array($this->middlewareHandlers) ? array_values($this->middlewareHandlers) : iterator_to_array($this->middlewareHandlers, false);
4949
}
5050

51-
if (!isset($this->indexedMiddlewares[$index])) {
51+
if (!isset($this->indexedMiddlewareHandlers[$index])) {
5252
return function () {};
5353
}
5454

55-
$middleware = $this->indexedMiddlewares[$index];
55+
$middleware = $this->indexedMiddlewareHandlers[$index];
5656

5757
return function ($message) use ($middleware, $index) {
5858
return $middleware->handle($message, $this->callableForNextMiddleware($index + 1));

‎Tests/DependencyInjection/MessengerPassTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,20 +257,20 @@ public function testRegistersTraceableBusesToCollector()
257257
$this->assertEquals(array(array('registerBus', array($fooBusId, new Reference($debuggedFooBusId)))), $container->getDefinition('messenger.data_collector')->getMethodCalls());
258258
}
259259

260-
public function testRegistersMiddlewaresFromServices()
260+
public function testRegistersMiddlewareFromServices()
261261
{
262262
$container = $this->getContainerBuilder();
263263
$container->register($fooBusId = 'messenger.bus.foo', MessageBusInterface::class)->setArgument(0, array())->addTag('messenger.bus');
264264
$container->register('messenger.middleware.allow_no_handler', AllowNoHandlerMiddleware::class)->setAbstract(true);
265265
$container->register(UselessMiddleware::class, UselessMiddleware::class);
266266

267-
$container->setParameter($middlewaresParameter = $fooBusId.'.middlewares', array(UselessMiddleware::class, 'allow_no_handler'));
267+
$container->setParameter($middlewareParameter = $fooBusId.'.middleware', array(UselessMiddleware::class, 'allow_no_handler'));
268268

269269
(new MessengerPass())->process($container);
270270

271271
$this->assertTrue($container->hasDefinition($childMiddlewareId = $fooBusId.'.middleware.allow_no_handler'));
272272
$this->assertEquals(array(new Reference(UselessMiddleware::class), new Reference($childMiddlewareId)), $container->getDefinition($fooBusId)->getArgument(0));
273-
$this->assertFalse($container->hasParameter($middlewaresParameter));
273+
$this->assertFalse($container->hasParameter($middlewareParameter));
274274
}
275275

276276
/**
@@ -281,7 +281,7 @@ public function testCannotRegistersAnUndefinedMiddleware()
281281
{
282282
$container = $this->getContainerBuilder();
283283
$container->register($fooBusId = 'messenger.bus.foo', MessageBusInterface::class)->setArgument(0, array())->addTag('messenger.bus');
284-
$container->setParameter($middlewaresParameter = $fooBusId.'.middlewares', array('not_defined_middleware'));
284+
$container->setParameter($middlewareParameter = $fooBusId.'.middleware', array('not_defined_middleware'));
285285

286286
(new MessengerPass())->process($container);
287287
}

‎Tests/MessageBusTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function testItHasTheRightInterface()
2626
$this->assertInstanceOf(MessageBusInterface::class, $bus);
2727
}
2828

29-
public function testItCallsTheMiddlewaresAndChainTheReturnValue()
29+
public function testItCallsMiddlewareAndChainTheReturnValue()
3030
{
3131
$message = new DummyMessage('Hello');
3232
$responseFromDepthMiddleware = 1234;

0 commit comments

Comments
 (0)
0