Merge branch '4.4' into 5.0
* 4.4: [Messenger] fix computing the id of same-name middleware
This commit is contained in:
commit
da30c7a4e8
@ -339,14 +339,17 @@ class MessengerPass implements CompilerPassInterface
|
||||
if ($container->findDefinition($messengerMiddlewareId)->isAbstract()) {
|
||||
$childDefinition = new ChildDefinition($messengerMiddlewareId);
|
||||
$childDefinition->setArguments($arguments);
|
||||
$container->setDefinition($messengerMiddlewareId = $busId.'.middleware.'.$id.'.'.ContainerBuilder::hash($arguments), $childDefinition);
|
||||
if (isset($middlewareReferences[$messengerMiddlewareId = $busId.'.middleware.'.$id])) {
|
||||
$messengerMiddlewareId .= '.'.ContainerBuilder::hash($arguments);
|
||||
}
|
||||
$container->setDefinition($messengerMiddlewareId, $childDefinition);
|
||||
} elseif ($arguments) {
|
||||
throw new RuntimeException(sprintf('Invalid middleware factory "%s": a middleware factory must be an abstract definition.', $id));
|
||||
}
|
||||
|
||||
$middlewareReferences[] = new Reference($messengerMiddlewareId);
|
||||
$middlewareReferences[$messengerMiddlewareId] = new Reference($messengerMiddlewareId);
|
||||
}
|
||||
|
||||
$container->getDefinition($busId)->replaceArgument(0, new IteratorArgument($middlewareReferences));
|
||||
$container->getDefinition($busId)->replaceArgument(0, new IteratorArgument(array_values($middlewareReferences)));
|
||||
}
|
||||
}
|
||||
|
@ -517,7 +517,7 @@ class MessengerPassTest extends TestCase
|
||||
(new ResolveChildDefinitionsPass())->process($container);
|
||||
|
||||
$this->assertTrue($container->hasDefinition(
|
||||
$factoryChildMiddlewareArgs1Id = $fooBusId.'.middleware.middleware_with_factory.'.ContainerBuilder::hash($factoryChildMiddlewareArgs1)
|
||||
$factoryChildMiddlewareArgs1Id = $fooBusId.'.middleware.middleware_with_factory'
|
||||
));
|
||||
$this->assertEquals(
|
||||
['foo', 'bar'],
|
||||
@ -535,7 +535,7 @@ class MessengerPassTest extends TestCase
|
||||
);
|
||||
|
||||
$this->assertTrue($container->hasDefinition(
|
||||
$factoryWithDefaultChildMiddlewareId = $fooBusId.'.middleware.middleware_with_factory_using_default.'.ContainerBuilder::hash([])
|
||||
$factoryWithDefaultChildMiddlewareId = $fooBusId.'.middleware.middleware_with_factory_using_default'
|
||||
));
|
||||
$this->assertEquals(
|
||||
['some_default'],
|
||||
|
Reference in New Issue
Block a user