[FrameworkBundle] Minor messenger component tweaks

symfony · fabpot · Apr 6, 2018 · Apr 5, 2018 · Apr 5, 2018 · Apr 5, 2018
commit 6aec62bad3d0636deb9e752947f2c712e94718b7
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -60,6 +60,7 @@
 use Symfony\Component\Lock\Store\StoreFactory;
 use Symfony\Component\Lock\StoreInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Transport\ReceiverInterface;
 use Symfony\Component\Messenger\Transport\SenderInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
@@ -1436,6 +1437,10 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
 
     private function registerMessengerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
+        if (!interface_exists(MessageBusInterface::class)) {
+            throw new LogicException('Messenger support cannot be enabled as the Messenger component is not installed.');
+        }
+
         $loader->load('messenger.xml');
 
         $senderLocatorMapping = array();

diff --git a/...ion/Fixtures/php/messenger_validation.php → ...res/php/messenger_validation_disabled.php b/...ion/Fixtures/php/messenger_validation.php → ...res/php/messenger_validation_disabled.php
diff --git a/...e/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_validation_enabled.php b/...e/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_validation_enabled.php
@@ -0,0 +1,12 @@
+<?php
+
+$container->loadFromExtension('framework', array(
+    'validation' => array('enabled' => true),
+    'messenger' => array(
+        'middlewares' => array(
+            'validation' => array(
+                'enabled' => true,
+            ),
+        ),
+    ),
+));
diff --git a/...ion/Fixtures/xml/messenger_validation.xml → ...res/xml/messenger_validation_disabled.xml b/...ion/Fixtures/xml/messenger_validation.xml → ...res/xml/messenger_validation_disabled.xml
diff --git a/...e/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_validation_enabled.xml b/...e/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_validation_enabled.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:validation enabled="true"/>
+        <framework:messenger>
+            <framework:middlewares>
+                <framework:validation enabled="true"/>
+            </framework:middlewares>
+        </framework:messenger>
+    </framework:config>
+</container>
diff --git a/...ion/Fixtures/yml/messenger_validation.yml → ...res/yml/messenger_validation_disabled.yml b/...ion/Fixtures/yml/messenger_validation.yml → ...res/yml/messenger_validation_disabled.yml
diff --git a/...e/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_validation_enabled.yml b/...e/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_validation_enabled.yml
@@ -0,0 +1,7 @@
+framework:
+    validation:
+        enabled: true
+    messenger:
+        middlewares:
+            validation:
+                enabled: true
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -520,13 +520,15 @@ public function testMessenger()
         $this->assertFalse($container->hasDefinition('messenger.middleware.doctrine_transaction'));
     }
 
-    public function testMessengerValidationDisabled()
+    public function testMessengerValidationEnabled()
     {
-        if (!class_exists(Validation::class)) {
-            self::markTestSkipped('Skipping tests since Validator component is not installed');
-        }
+        $container = $this->createContainerFromFile('messenger_validation_enabled');
+        $this->assertTrue($definition = $container->hasDefinition('messenger.middleware.validator'));
+    }
 
-        $container = $this->createContainerFromFile('messenger_validation');
+    public function testMessengerValidationDisabled()
+    {
+        $container = $this->createContainerFromFile('messenger_validation_disabled');
         $this->assertFalse($container->hasDefinition('messenger.middleware.validator'));
     }
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -41,6 +41,7 @@
         "symfony/security": "~3.4|~4.0",
         "symfony/form": "^4.1",
         "symfony/expression-language": "~3.4|~4.0",
+        "symfony/messenger": "^4.1",
         "symfony/process": "~3.4|~4.0",
         "symfony/security-core": "~3.4|~4.0",
         "symfony/security-csrf": "~3.4|~4.0",