Skip to content

Commit 724bb3d

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.4' into 7.2
* 6.4: [Validator] Remove comment to GitHub issue [Serializer] Add support for discriminator map in property normalizer [DependencyInjection] Fix inlining when public services are involved fix contracts directory name Fix TraceableSerializer when collected caller from array map [HttpClient] Limit curl's connection cache size [FrameworkBundle] Fix argument not provided to `add_bus_name_stamp_middleware`
2 parents 9218dcd + 9a3effe commit 724bb3d

File tree

5 files changed

+89
-4
lines changed

5 files changed

+89
-4
lines changed

‎DependencyInjection/FrameworkExtension.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2176,16 +2176,18 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
21762176
$defaultMiddleware['after'][0]['arguments'] = [$bus['default_middleware']['allow_no_senders']];
21772177
$defaultMiddleware['after'][1]['arguments'] = [$bus['default_middleware']['allow_no_handlers']];
21782178

2179-
// argument to add_bus_name_stamp_middleware
2180-
$defaultMiddleware['before'][0]['arguments'] = [$busId];
2181-
21822179
$middleware = array_merge($defaultMiddleware['before'], $middleware, $defaultMiddleware['after']);
21832180
}
21842181

2185-
foreach ($middleware as $middlewareItem) {
2182+
foreach ($middleware as $key => $middlewareItem) {
21862183
if (!$validationEnabled && \in_array($middlewareItem['id'], ['validation', 'messenger.middleware.validation'], true)) {
21872184
throw new LogicException('The Validation middleware is only available when the Validator component is installed and enabled. Try running "composer require symfony/validator".');
21882185
}
2186+
2187+
// argument to add_bus_name_stamp_middleware
2188+
if ('add_bus_name_stamp_middleware' === $middlewareItem['id']) {
2189+
$middleware[$key]['arguments'] = [$busId];
2190+
}
21892191
}
21902192

21912193
if ($container->getParameter('kernel.debug') && class_exists(Stopwatch::class)) {

‎Tests/DependencyInjection/Fixtures/php/messenger_bus_name_stamp.php

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', [
4+
'annotations' => false,
5+
'http_method_override' => false,
6+
'handle_all_throwables' => true,
7+
'php_errors' => ['log' => true],
8+
'messenger' => [
9+
'default_bus' => 'messenger.bus.commands',
10+
'buses' => [
11+
'messenger.bus.commands' => [
12+
'default_middleware' => false,
13+
'middleware' => [
14+
'add_bus_name_stamp_middleware',
15+
'send_message',
16+
'handle_message',
17+
],
18+
],
19+
'messenger.bus.events' => [
20+
'default_middleware' => true,
21+
],
22+
],
23+
],
24+
]);

‎Tests/DependencyInjection/Fixtures/xml/messenger_bus_name_stamp.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:framework="http://symfony.com/schema/dic/symfony"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
6+
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
7+
8+
<framework:config http-method-override="false" handle-all-throwables="true">
9+
<framework:annotations enabled="false" />
10+
<framework:php-errors log="true" />
11+
<framework:messenger default-bus="messenger.bus.commands">
12+
<framework:bus name="messenger.bus.commands" default-middleware="false">
13+
<framework:middleware id="add_bus_name_stamp_middleware" />
14+
<framework:middleware id="send_message" />
15+
<framework:middleware id="handle_message" />
16+
</framework:bus>
17+
<framework:bus name="messenger.bus.events" default-middleware="true" />
18+
</framework:messenger>
19+
</framework:config>
20+
</container>

‎Tests/DependencyInjection/Fixtures/yml/messenger_bus_name_stamp.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
framework:
2+
annotations: false
3+
http_method_override: false
4+
handle_all_throwables: true
5+
php_errors:
6+
log: true
7+
messenger:
8+
default_bus: messenger.bus.commands
9+
buses:
10+
messenger.bus.commands:
11+
default_middleware: false
12+
middleware:
13+
- "add_bus_name_stamp_middleware"
14+
- "send_message"
15+
- "handle_message"
16+
messenger.bus.events:
17+
default_middleware: true

‎Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,28 @@ public function testMessengerWithMultipleBuses()
10931093
$this->assertSame('messenger.bus.commands', (string) $container->getAlias('messenger.default_bus'));
10941094
}
10951095

1096+
public function testMessengerWithAddBusNameStampMiddleware()
1097+
{
1098+
$container = $this->createContainerFromFile('messenger_bus_name_stamp');
1099+
1100+
$this->assertTrue($container->has('messenger.bus.commands'));
1101+
$this->assertEquals([
1102+
['id' => 'add_bus_name_stamp_middleware', 'arguments' => ['messenger.bus.commands']],
1103+
['id' => 'send_message', 'arguments' => []],
1104+
['id' => 'handle_message', 'arguments' => []],
1105+
], $container->getParameter('messenger.bus.commands.middleware'));
1106+
$this->assertTrue($container->has('messenger.bus.events'));
1107+
$this->assertSame([], $container->getDefinition('messenger.bus.events')->getArgument(0));
1108+
$this->assertEquals([
1109+
['id' => 'add_bus_name_stamp_middleware', 'arguments' => ['messenger.bus.events']],
1110+
['id' => 'reject_redelivered_message_middleware'],
1111+
['id' => 'dispatch_after_current_bus'],
1112+
['id' => 'failed_message_processing_middleware'],
1113+
['id' => 'send_message', 'arguments' => [true]],
1114+
['id' => 'handle_message', 'arguments' => [false]],
1115+
], $container->getParameter('messenger.bus.events.middleware'));
1116+
}
1117+
10961118
public function testMessengerMiddlewareFactoryErroneousFormat()
10971119
{
10981120
$this->expectException(\InvalidArgumentException::class);

0 commit comments

Comments
 (0)