Skip to content

Commit 1a28bea

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: [FrameworkBundle] remove messenger cache if not enabled [HttpClient] Fix strict parsing of response status codes [DI] Suggest typed argument when binding fails with untyped argument
2 parents f2a8c2e + 4ea8f63 commit 1a28bea

File tree

6 files changed

+34
-0
lines changed

6 files changed

+34
-0
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ public function load(array $configs, ContainerBuilder $container)
313313
$container->removeDefinition('console.command.messenger_failed_messages_retry');
314314
$container->removeDefinition('console.command.messenger_failed_messages_show');
315315
$container->removeDefinition('console.command.messenger_failed_messages_remove');
316+
$container->removeDefinition('cache.messenger.restart_workers_signal');
316317
}
317318

318319
if ($this->httpClientConfigEnabled = $this->isConfigEnabled($container, $config['http_client'])) {

Resources/config/schema/symfony-1.0.xsd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,7 @@
425425
<xsd:element name="bus" type="messenger_bus" minOccurs="0" maxOccurs="unbounded" />
426426
</xsd:sequence>
427427
<xsd:attribute name="default-bus" type="xsd:string" />
428+
<xsd:attribute name="enabled" type="xsd:boolean" />
428429
</xsd:complexType>
429430

430431
<xsd:complexType name="messenger_serializer">
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', [
4+
'messenger' => false,
5+
]);
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
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>
9+
<framework:messenger enabled="false" />
10+
</framework:config>
11+
</container>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
framework:
2+
messenger: false

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -668,9 +668,23 @@ public function testWebLink()
668668
$this->assertTrue($container->hasDefinition('web_link.add_link_header_listener'));
669669
}
670670

671+
public function testMessengerServicesRemovedWhenDisabled()
672+
{
673+
$container = $this->createContainerFromFile('messenger_disabled');
674+
$this->assertFalse($container->hasDefinition('console.command.messenger_consume_messages'));
675+
$this->assertFalse($container->hasDefinition('console.command.messenger_debug'));
676+
$this->assertFalse($container->hasDefinition('console.command.messenger_stop_workers'));
677+
$this->assertFalse($container->hasDefinition('console.command.messenger_setup_transports'));
678+
$this->assertFalse($container->hasDefinition('console.command.messenger_failed_messages_retry'));
679+
$this->assertFalse($container->hasDefinition('console.command.messenger_failed_messages_show'));
680+
$this->assertFalse($container->hasDefinition('console.command.messenger_failed_messages_remove'));
681+
$this->assertFalse($container->hasDefinition('cache.messenger.restart_workers_signal'));
682+
}
683+
671684
public function testMessenger()
672685
{
673686
$container = $this->createContainerFromFile('messenger');
687+
$this->assertTrue($container->hasDefinition('console.command.messenger_consume_messages'));
674688
$this->assertTrue($container->hasAlias('message_bus'));
675689
$this->assertTrue($container->getAlias('message_bus')->isPublic());
676690
$this->assertTrue($container->hasAlias('messenger.default_bus'));

0 commit comments

Comments
 (0)