Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 497ce74

Browse files
TobionTobion
committed
bug #27229 [Messenger] Rename tag attribute "name" by "alias" (yceruto)
This PR was merged into the 4.1 branch. Discussion ---------- [Messenger] Rename tag attribute "name" by "alias" | Q | A | ------------- | --- | Branch? | 4.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - As "name" is a reserved attribute in YAML and XML schema it makes impossible to register manually a custom Sender or Receiver with another "name" attribute. > The file ".../demos/messenger-flex/config/services.yaml" does not contain valid YAML. Duplicate key "name" detected at line 30 (near "- { name: 'messenger.receiver', name: 'mail' }"). Commits ------- 1ef27a7 Rename tag attribute "name" by "alias"
2 parents 6988551 + 1ef27a7 commit 497ce74

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,8 +1514,8 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
15141514
$transportDefinition = (new Definition(TransportInterface::class))
15151515
->setFactory(array(new Reference('messenger.transport_factory'), 'createTransport'))
15161516
->setArguments(array($transport['dsn'], $transport['options']))
1517-
->addTag('messenger.receiver', array('name' => $name))
1518-
->addTag('messenger.sender', array('name' => $name))
1517+
->addTag('messenger.receiver', array('alias' => $name))
1518+
->addTag('messenger.sender', array('alias' => $name))
15191519
;
15201520
$container->setDefinition('messenger.transport.'.$name, $transportDefinition);
15211521
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -539,8 +539,8 @@ public function testMessengerTransports()
539539
$this->assertTrue($container->hasDefinition('messenger.transport.default'));
540540
$this->assertTrue($container->getDefinition('messenger.transport.default')->hasTag('messenger.receiver'));
541541
$this->assertTrue($container->getDefinition('messenger.transport.default')->hasTag('messenger.sender'));
542-
$this->assertEquals(array(array('name' => 'default')), $container->getDefinition('messenger.transport.default')->getTag('messenger.receiver'));
543-
$this->assertEquals(array(array('name' => 'default')), $container->getDefinition('messenger.transport.default')->getTag('messenger.sender'));
542+
$this->assertEquals(array(array('alias' => 'default')), $container->getDefinition('messenger.transport.default')->getTag('messenger.receiver'));
543+
$this->assertEquals(array(array('alias' => 'default')), $container->getDefinition('messenger.transport.default')->getTag('messenger.sender'));
544544

545545
$this->assertTrue($container->hasDefinition('messenger.transport.customised'));
546546
$transportFactory = $container->getDefinition('messenger.transport.customised')->getFactory();

‎src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function process(ContainerBuilder $container)
6363
}
6464

6565
if ($container->hasDefinition('messenger.data_collector')) {
66-
$this->registerBusToCollector($container, $busId, $tags[0]);
66+
$this->registerBusToCollector($container, $busId);
6767
}
6868
}
6969

@@ -177,8 +177,8 @@ private function registerReceivers(ContainerBuilder $container)
177177
$receiverMapping[$id] = new Reference($id);
178178

179179
foreach ($tags as $tag) {
180-
if (isset($tag['name'])) {
181-
$receiverMapping[$tag['name']] = $receiverMapping[$id];
180+
if (isset($tag['alias'])) {
181+
$receiverMapping[$tag['alias']] = $receiverMapping[$id];
182182
}
183183
}
184184
}
@@ -202,16 +202,16 @@ private function registerSenders(ContainerBuilder $container)
202202
$senderLocatorMapping[$id] = new Reference($id);
203203

204204
foreach ($tags as $tag) {
205-
if (isset($tag['name'])) {
206-
$senderLocatorMapping[$tag['name']] = $senderLocatorMapping[$id];
205+
if (isset($tag['alias'])) {
206+
$senderLocatorMapping[$tag['alias']] = $senderLocatorMapping[$id];
207207
}
208208
}
209209
}
210210

211211
$container->getDefinition('messenger.sender_locator')->replaceArgument(0, $senderLocatorMapping);
212212
}
213213

214-
private function registerBusToCollector(ContainerBuilder $container, string $busId, array $tag)
214+
private function registerBusToCollector(ContainerBuilder $container, string $busId)
215215
{
216216
$container->setDefinition(
217217
$tracedBusId = 'debug.traced.'.$busId,

‎src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public function testGetClassesFromTheHandlerSubscriberInterface()
101101
public function testItRegistersReceivers()
102102
{
103103
$container = $this->getContainerBuilder();
104-
$container->register(AmqpReceiver::class, AmqpReceiver::class)->addTag('messenger.receiver', array('name' => 'amqp'));
104+
$container->register(AmqpReceiver::class, AmqpReceiver::class)->addTag('messenger.receiver', array('alias' => 'amqp'));
105105

106106
(new MessengerPass())->process($container);
107107

@@ -128,7 +128,7 @@ public function testItRegistersOneReceiverAndSetsTheDefaultOneOnTheCommand()
128128
null,
129129
));
130130

131-
$container->register(AmqpReceiver::class, AmqpReceiver::class)->addTag('messenger.receiver', array('name' => 'amqp'));
131+
$container->register(AmqpReceiver::class, AmqpReceiver::class)->addTag('messenger.receiver', array('alias' => 'amqp'));
132132

133133
(new MessengerPass())->process($container);
134134

@@ -145,8 +145,8 @@ public function testItRegistersMultipleReceiversAndDoesNotSetTheDefaultOneOnTheC
145145
null,
146146
));
147147

148-
$container->register(AmqpReceiver::class, AmqpReceiver::class)->addTag('messenger.receiver', array('name' => 'amqp'));
149-
$container->register(DummyReceiver::class, DummyReceiver::class)->addTag('messenger.receiver', array('name' => 'dummy'));
148+
$container->register(AmqpReceiver::class, AmqpReceiver::class)->addTag('messenger.receiver', array('alias' => 'amqp'));
149+
$container->register(DummyReceiver::class, DummyReceiver::class)->addTag('messenger.receiver', array('alias' => 'dummy'));
150150

151151
(new MessengerPass())->process($container);
152152

@@ -156,7 +156,7 @@ public function testItRegistersMultipleReceiversAndDoesNotSetTheDefaultOneOnTheC
156156
public function testItRegistersSenders()
157157
{
158158
$container = $this->getContainerBuilder();
159-
$container->register(AmqpSender::class, AmqpSender::class)->addTag('messenger.sender', array('name' => 'amqp'));
159+
$container->register(AmqpSender::class, AmqpSender::class)->addTag('messenger.sender', array('alias' => 'amqp'));
160160

161161
(new MessengerPass())->process($container);
162162

0 commit comments

Comments
 (0)