Skip to content

[Messenger] Allow same middleware to be used multiple times with different arguments #37569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 1 commit into from
Jul 23, 2020
Merged

[Messenger] Allow same middleware to be used multiple times with different arguments #37569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ private function registerBusMiddleware(ContainerBuilder $container, string $busI
if ($container->findDefinition($messengerMiddlewareId)->isAbstract()) {
$childDefinition = new ChildDefinition($messengerMiddlewareId);
$childDefinition->setArguments($arguments);
$container->setDefinition($messengerMiddlewareId = $busId.'.middleware.'.$id, $childDefinition);
$container->setDefinition($messengerMiddlewareId = $busId.'.middleware.'.$id.'.'.ContainerBuilder::hash($arguments), $childDefinition);
} elseif ($arguments) {
throw new RuntimeException(sprintf('Invalid middleware factory "%s": a middleware factory must be an abstract definition.', $id));
}
Expand Down
25 changes: 20 additions & 5 deletions src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,21 +508,35 @@ public function testRegistersMiddlewareFromServices()

$container->setParameter($middlewareParameter = $fooBusId.'.middleware', [
['id' => UselessMiddleware::class],
['id' => 'middleware_with_factory', 'arguments' => ['index_0' => 'foo', 'bar']],
['id' => 'middleware_with_factory', 'arguments' => $factoryChildMiddlewareArgs1 = ['index_0' => 'foo', 'bar']],
['id' => 'middleware_with_factory', 'arguments' => $factoryChildMiddlewareArgs2 = ['index_0' => 'baz']],
['id' => 'middleware_with_factory_using_default'],
]);

(new MessengerPass())->process($container);
(new ResolveChildDefinitionsPass())->process($container);

$this->assertTrue($container->hasDefinition($factoryChildMiddlewareId = $fooBusId.'.middleware.middleware_with_factory'));
$this->assertTrue($container->hasDefinition(
$factoryChildMiddlewareArgs1Id = $fooBusId.'.middleware.middleware_with_factory.'.ContainerBuilder::hash($factoryChildMiddlewareArgs1)
));
$this->assertEquals(
['foo', 'bar'],
$container->getDefinition($factoryChildMiddlewareId)->getArguments(),
$container->getDefinition($factoryChildMiddlewareArgs1Id)->getArguments(),
'parent default argument is overridden, and next ones appended'
);

$this->assertTrue($container->hasDefinition($factoryWithDefaultChildMiddlewareId = $fooBusId.'.middleware.middleware_with_factory_using_default'));
$this->assertTrue($container->hasDefinition(
$factoryChildMiddlewareArgs2Id = $fooBusId.'.middleware.middleware_with_factory.'.ContainerBuilder::hash($factoryChildMiddlewareArgs2)
));
$this->assertEquals(
['baz'],
$container->getDefinition($factoryChildMiddlewareArgs2Id)->getArguments(),
'parent default argument is overridden, and next ones appended'
);

$this->assertTrue($container->hasDefinition(
$factoryWithDefaultChildMiddlewareId = $fooBusId.'.middleware.middleware_with_factory_using_default.'.ContainerBuilder::hash([])
));
$this->assertEquals(
['some_default'],
$container->getDefinition($factoryWithDefaultChildMiddlewareId)->getArguments(),
Expand All @@ -531,7 +545,8 @@ public function testRegistersMiddlewareFromServices()

$this->assertEquals([
new Reference(UselessMiddleware::class),
new Reference($factoryChildMiddlewareId),
new Reference($factoryChildMiddlewareArgs1Id),
new Reference($factoryChildMiddlewareArgs2Id),
new Reference($factoryWithDefaultChildMiddlewareId),
], $container->getDefinition($fooBusId)->getArgument(0)->getValues());
$this->assertFalse($container->hasParameter($middlewareParameter));
Expand Down