8000 [FrameworkBundle] Minor messenger component tweaks · symfony/symfony@6aec62b · GitHub
[go: up one dir, main page]
Skip to content

Commit 6aec62b

Browse files
ogizanagiogizanagi
committed
[FrameworkBundle] Minor messenger component tweaks
1 parent f9c9ca0 commit 6aec62b

File tree

9 files changed

+48
-5
lines changed
  • xml
  • yml
  • FrameworkExtensionTest.php
  • composer.json

    • 9 files changed

    +48
    -5
    lines changed

    ‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

    Lines changed: 5 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -60,6 +60,7 @@
    6060
    use Symfony\Component\Lock\Store\StoreFactory;
    6161
    use Symfony\Component\Lock\StoreInterface;
    6262
    use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
    63+
    use Symfony\Component\Messenger\MessageBusInterface;
    6364
    use Symfony\Component\Messenger\Transport\ReceiverInterface;
    6465
    use Symfony\Component\Messenger\Transport\SenderInterface;
    6566
    use Symfony\Component\PropertyAccess\PropertyAccessor;
    @@ -1436,6 +1437,10 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
    14361437

    14371438
    private function registerMessengerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
    14381439
    {
    1440+
    if (!interface_exists(MessageBusInterface::class)) {
    1441+
    throw new LogicException('Messenger support cannot be enabled as the Messenger component is not installed.');
    1442+
    }
    1443+
    14391444
    $loader->load('messenger.xml');
    14401445

    14411446
    $senderLocatorMapping = array();

    ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_validation.php renamed to ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_validation_disabled.php

    File renamed without changes.

    ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_validation_enabled.php

    Lines changed: 12 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,12 @@
    1+
    <?php
    2+
    3+
    $container->loadFromExtension('framework', array(
    4+
    'validation' => array('enabled' => true),
    5+
    'messenger' => array(
    6+
    'middlewares' => array(
    7+
    'validation' => array(
    8+
    'enabled' => true,
    9+
    ),
    10+
    ),
    11+
    ),
    12+
    ));

    ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_validation.xml renamed to ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_validation_disabled.xml

    File renamed without changes.

    ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_validation_enabled.xml

    Lines changed: 16 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,16 @@
    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 http://symfony.com/schema/dic/services/services-1.0.xsd
    6+
    http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
    7+
    8+
    <framework:config>
    9+
    <framework:validation enabled="true"/>
    10+
    <framework:messenger>
    11+
    <framework:middlewares>
    12+
    <framework:validation enabled="true"/>
    13+
    </framework:middlewares>
    14+
    </framework:messenger>
    15+
    </framework:config>
    16+
    </container>

    ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_validation.yml renamed to ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_validation_disabled.yml

    File renamed without changes.

    ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_validation_enabled.yml

    Lines changed: 7 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,7 @@
    1+
    framework:
    2+
    validation:
    3+
    enabled: true
    4+
    messenger:
    5+
    middlewares:
    6+
    validation:
    7+
    enabled: true

    ‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

    Lines changed: 7 additions & 5 deletions
    Original file line numberDiff line numberDiff line change
    @@ -520,13 +520,15 @@ public function testMessenger()
    520520
    $this->assertFalse($container->hasDefinition('messenger.middleware.doctrine_transaction'));
    521521
    }
    522522

    523-
    public function testMessengerValidationDisabled()
    523+
    public function testMessengerValidationEnabled()
    524524
    {
    525-
    if (!class_exists(Validation::class)) {
    526-
    self::markTestSkipped< 8000 span class="x">('Skipping tests since Validator component is not installed');
    527-
    }
    525+
    $container = $this->createContainerFromFile('messenger_validation_enabled');
    526+
    $this->assertTrue($definition = $container->hasDefinition('messenger.middleware.validator'));
    527+
    }
    528528

    529-
    $container = $this->createContainerFromFile('messenger_validation');
    529+
    public function testMessengerValidationDisabled()
    530+
    {
    531+
    $container = $this->createContainerFromFile('messenger_validation_disabled');
    530532
    $this->assertFalse($container->hasDefinition('messenger.middleware.validator'));
    531533
    }
    532534

    ‎src/Symfony/Bundle/FrameworkBundle/composer.json

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -41,6 +41,7 @@
    4141
    "symfony/security": "~3.4|~4.0",
    4242
    "symfony/form": "^4.1",
    4343
    "symfony/expression-language": "~3.4|~4.0",
    44+
    "symfony/messenger": "^4.1",
    4445
    "symfony/process": "~3.4|~4.0",
    4546
    "symfony/security-core": "~3.4|~4.0",
    4647
    "symfony/security-csrf": "~3.4|~4.0",

    0 commit comments

    Comments
     (0)
    0