Skip to content

Commit 22ea9c4

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '7.2' into 7.3
* 7.2: [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 3874a6d + 724bb3d commit 22ea9c4

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
@@ -2371,16 +2371,18 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
23712371
$defaultMiddleware['after'][0]['arguments'] = [$bus['default_middleware']['allow_no_senders']];
23722372
$defaultMiddleware['after'][1]['arguments'] = [$bus['default_middleware']['allow_no_handlers']];
23732373

2374-
// argument to add_bus_name_stamp_middleware
2375-
$defaultMiddleware['before'][0]['arguments'] = [$busId];
2376-
23772374
$middleware = array_merge($defaultMiddleware['before'], $middleware, $defaultMiddleware['after']);
23782375
}
23792376

2380-
foreach ($middleware as $middlewareItem) {
2377+
foreach ($middleware as $key => $middlewareItem) {
23812378
if (!$validationEnabled && \in_array($middlewareItem['id'], ['validation', 'messenger.middleware.validation'], true)) {
23822379
throw new LogicException('The Validation middleware is only available when the Validator component is installed and enabled. Try running "composer require symfony/validator".');
23832380
}
2381+
2382+
// argument to add_bus_name_stamp_middleware
2383+
if ('add_bus_name_stamp_middleware' === $middlewareItem['id']) {
2384+
$middleware[$key]['arguments'] = [$busId];
2385+
}
23842386
}
23852387

23862388
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
@@ -1099,6 +1099,28 @@ public function testMessengerWithMultipleBusesWithoutDeduplicateMiddleware()
10991099
$this->assertSame('messenger.bus.commands', (string) $container->getAlias('messenger.default_bus'));
11001100
}
11011101

1102+
public function testMessengerWithAddBusNameStampMiddleware()
1103+
{
1104+
$container = $this->createContainerFromFile('messenger_bus_name_stamp');
1105+
1106+
$this->assertTrue($container->has('messenger.bus.commands'));
1107+
$this->assertEquals([
1108+
['id' => 'add_bus_name_stamp_middleware', 'arguments' => ['messenger.bus.commands']],
1109+
['id' => 'send_message', 'arguments' => []],
1110+
['id' => 'handle_message', 'arguments' => []],
1111+
], $container->getParameter('messenger.bus.commands.middleware'));
1112+
$this->assertTrue($container->has('messenger.bus.events'));
1113+
$this->assertSame([], $container->getDefinition('messenger.bus.events')->getArgument(0));
1114+
$this->assertEquals([
1115+
['id' => 'add_bus_name_stamp_middleware', 'arguments' => ['messenger.bus.events']],
1116+
['id' => 'reject_redelivered_message_middleware'],
1117+
['id' => 'dispatch_after_current_bus'],
1118+
['id' => 'failed_message_processing_middleware'],
1119+
['id' => 'send_message', 'arguments' => [true]],
1120+
['id' => 'handle_message', 'arguments' => [false]],
1121+
], $container->getParameter('messenger.bus.events.middleware'));
1122+
}
1123+
11021124
public function testMessengerWithMultipleBusesWithDeduplicateMiddleware()
11031125
{
11041126
if (!class_exists(DeduplicateMiddleware::class)) {

0 commit comments

Comments
 (0)