From 1ef27a7e6a10a24a023a4f136d60d6ebda35e5eb Mon Sep 17 00:00:00 2001 From: Yonel Ceruto Date: Thu, 10 May 2018 17:13:07 -0400 Subject: [PATCH] Rename tag attribute "name" by "alias" --- .../DependencyInjection/FrameworkExtension.php | 4 ++-- .../DependencyInjection/FrameworkExtensionTest.php | 4 ++-- .../Messenger/DependencyInjection/MessengerPass.php | 12 ++++++------ .../Tests/DependencyInjection/MessengerPassTest.php | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index c08ad7b3903af..af449c1a54988 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -1511,8 +1511,8 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder $transportDefinition = (new Definition(TransportInterface::class)) ->setFactory(array(new Reference('messenger.transport_factory'), 'createTransport')) ->setArguments(array($transport['dsn'], $transport['options'])) - ->addTag('messenger.receiver', array('name' => $name)) - ->addTag('messenger.sender', array('name' => $name)) + ->addTag('messenger.receiver', array('alias' => $name)) + ->addTag('messenger.sender', array('alias' => $name)) ; $container->setDefinition('messenger.transport.'.$name, $transportDefinition); } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index 8d94d32aa83b0..cbed3c89f8596 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -539,8 +539,8 @@ public function testMessengerTransports() $this->assertTrue($container->hasDefinition('messenger.transport.default')); $this->assertTrue($container->getDefinition('messenger.transport.default')->hasTag('messenger.receiver')); $this->assertTrue($container->getDefinition('messenger.transport.default')->hasTag('messenger.sender')); - $this->assertEquals(array(array('name' => 'default')), $container->getDefinition('messenger.transport.default')->getTag('messenger.receiver')); - $this->assertEquals(array(array('name' => 'default')), $container->getDefinition('messenger.transport.default')->getTag('messenger.sender')); + $this->assertEquals(array(array('alias' => 'default')), $container->getDefinition('messenger.transport.default')->getTag('messenger.receiver')); + $this->assertEquals(array(array('alias' => 'default')), $container->getDefinition('messenger.transport.default')->getTag('messenger.sender')); $this->assertTrue($container->hasDefinition('messenger.transport.customised')); $transportFactory = $container->getDefinition('messenger.transport.customised')->getFactory(); diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php index 9789ec038cf43..81f84617064cc 100644 --- a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php +++ b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php @@ -63,7 +63,7 @@ public function process(ContainerBuilder $container) } if ($container->hasDefinition('messenger.data_collector')) { - $this->registerBusToCollector($container, $busId, $tags[0]); + $this->registerBusToCollector($container, $busId); } } @@ -177,8 +177,8 @@ private function registerReceivers(ContainerBuilder $container) $receiverMapping[$id] = new Reference($id); foreach ($tags as $tag) { - if (isset($tag['name'])) { - $receiverMapping[$tag['name']] = $receiverMapping[$id]; + if (isset($tag['alias'])) { + $receiverMapping[$tag['alias']] = $receiverMapping[$id]; } } } @@ -202,8 +202,8 @@ private function registerSenders(ContainerBuilder $container) $senderLocatorMapping[$id] = new Reference($id); foreach ($tags as $tag) { - if (isset($tag['name'])) { - $senderLocatorMapping[$tag['name']] = $senderLocatorMapping[$id]; + if (isset($tag['alias'])) { + $senderLocatorMapping[$tag['alias']] = $senderLocatorMapping[$id]; } } } @@ -211,7 +211,7 @@ private function registerSenders(ContainerBuilder $container) $container->getDefinition('messenger.sender_locator')->replaceArgument(0, $senderLocatorMapping); } - private function registerBusToCollector(ContainerBuilder $container, string $busId, array $tag) + private function registerBusToCollector(ContainerBuilder $container, string $busId) { $container->setDefinition( $tracedBusId = 'debug.traced.'.$busId, diff --git a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php index eeb5d585f5cda..d49a38421b1d3 100644 --- a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php +++ b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php @@ -101,7 +101,7 @@ public function testGetClassesFromTheHandlerSubscriberInterface() public function testItRegistersReceivers() { $container = $this->getContainerBuilder(); - $container->register(AmqpReceiver::class, AmqpReceiver::class)->addTag('messenger.receiver', array('name' => 'amqp')); + $container->register(AmqpReceiver::class, AmqpReceiver::class)->addTag('messenger.receiver', array('alias' => 'amqp')); (new MessengerPass())->process($container); @@ -128,7 +128,7 @@ public function testItRegistersOneReceiverAndSetsTheDefaultOneOnTheCommand() null, )); - $container->register(AmqpReceiver::class, AmqpReceiver::class)->addTag('messenger.receiver', array('name' => 'amqp')); + $container->register(AmqpReceiver::class, AmqpReceiver::class)->addTag('messenger.receiver', array('alias' => 'amqp')); (new MessengerPass())->process($container); @@ -145,8 +145,8 @@ public function testItRegistersMultipleReceiversAndDoesNotSetTheDefaultOneOnTheC null, )); - $container->register(AmqpReceiver::class, AmqpReceiver::class)->addTag('messenger.receiver', array('name' => 'amqp')); - $container->register(DummyReceiver::class, DummyReceiver::class)->addTag('messenger.receiver', array('name' => 'dummy')); + $container->register(AmqpReceiver::class, AmqpReceiver::class)->addTag('messenger.receiver', array('alias' => 'amqp')); + $container->register(DummyReceiver::class, DummyReceiver::class)->addTag('messenger.receiver', array('alias' => 'dummy')); (new MessengerPass())->process($container); @@ -156,7 +156,7 @@ public function testItRegistersMultipleReceiversAndDoesNotSetTheDefaultOneOnTheC public function testItRegistersSenders() { $container = $this->getContainerBuilder(); - $container->register(AmqpSender::class, AmqpSender::class)->addTag('messenger.sender', array('name' => 'amqp')); + $container->register(AmqpSender::class, AmqpSender::class)->addTag('messenger.sender', array('alias' => 'amqp')); (new MessengerPass())->process($container);