8000 Fix mostly naming and style reviews · symfony/symfony@d9bf597 · GitHub
[go: up one dir, main page]
Skip to content

Commit d9bf597

Browse files
srozesroze
committed
Fix mostly naming and style reviews
1 parent d6c046a commit d9bf597

File tree

5 files changed

+19
-23
lines changed

5 files changed

+19
-23
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -970,10 +970,6 @@ private function addMessengerSection(ArrayNodeDefinition $rootNode)
970970
->arrayNode('messenger')
971971
->info('Messenger configuration')
972972
->{!class_exists(FullStack::class) && class_exists(MessageBusInterface::class) ? 'canBeDisabled' : 'canBeEnabled'}()
973-
->validate()
974-
->ifTrue(function ($v) { return isset($v['adapter']) && isset($v['adapters']); })
975-
->thenInvalid('"adapter" and "adapters" cannot be used together.')
976-
->end()
977973
->fixXmlConfig('adapter')
978974
->children()
979975
->arrayNode('routing')

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,15 +1472,15 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
14721472
}
14731473

14741474
foreach ($config['adapters'] as $name => $adapter) {
1475-
$container->setDefinition('messenger.'.$name.'_sender', (new Definition(SenderInterface::class))->setFactory(array(
1475+
$container->setDefinition('messenger.sender.'.$name, (new Definition(SenderInterface::class))->setFactory(array(
14761476
new Reference('messenger.adapter_factory'),
14771477
'createSender',
14781478
))->setArguments(array(
14791479
$adapter['dsn'],
14801480
$adapter['options'],
14811481
))->addTag('messenger.sender'));
14821482

1483-
$container->setDefinition('messenger.'.$name.'_receiver', (new Definition(ReceiverInterface::class))->setFactory(array(
1483+
$container->setDefinition('messenger.receiver.'.$name, (new Definition(ReceiverInterface::class))->setFactory(array(
14841484
new Reference('messenger.adapter_factory'),
14851485
'createReceiver',
14861486
))->setArguments(array(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ framework:
55
customised:
66
dsn: 'amqp://localhost/%2f/messages?exchange_name=exchange_name'
77
options:
8-
queue_name: Queue
8+
queue_name: Queue

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -547,26 +547,26 @@ public function testMessengerValidationDisabled()
547547
public function testMessengerAdapter()
548548
{
549549
$container = $this->createContainerFromFile('messenger_adapter');
550-
$this->assertTrue($container->hasDefinition('messenger.default_sender'));
551-
$this->assertTrue($container->getDefinition('messenger.default_sender')->hasTag('messenger.sender'));
552-
$this->assertTrue($container->hasDefinition('messenger.default_receiver'));
553-
$this->assertTrue($container->getDefinition('messenger.default_receiver')->hasTag('messenger.receiver'));
550+
$this->assertTrue($container->hasDefinition('messenger.sender.default'));
551+
$this->assertTrue($container->getDefinition('messenger.sender.default')->hasTag('messenger.sender'));
552+
$this->assertTrue($container->hasDefinition('messenger.receiver.default'));
553+
$this->assertTrue($container->getDefinition('messenger.receiver.default')->hasTag('messenger.receiver'));
554554

555-
$this->assertTrue($container->hasDefinition('messenger.customised_sender'));
556-
$senderFactory = $container->getDefinition('messenger.customised_sender')->getFactory();
557-
$senderArguments = $container->getDefinition('messenger.customised_sender')->getArguments();
555+
$this->assertTrue($container->hasDefinition('messenger.sender.customised'));
556+
$senderFactory = $container->getDefinition('messenger.sender.customised')->getFactory();
557+
$senderArguments = $container->getDefinition('messenger.sender.customised')->getArguments();
558558

559559
$this->assertEquals(array(new Reference('messenger.adapter_factory'), 'createSender'), $senderFactory);
560-
$this->assertEquals(2, count($senderArguments));
560+
$this->assertCount(2, $senderArguments);
561561
$this->assertEquals('amqp://localhost/%2f/messages?exchange_name=exchange_name', $senderArguments[0]);
562562
$this->assertEquals(array('queue_name' => 'Queue'), $senderArguments[1]);
563563

564-
$this->assertTrue($container->hasDefinition('messenger.customised_receiver'));
565-
$receiverFactory = $container->getDefinition('messenger.customised_receiver')->getFactory();
566-
$receiverArguments = $container->getDefinition('messenger.customised_receiver')->getArguments();
564+
$this->assertTrue($container->hasDefinition('messenger.receiver.customised'));
565+
$receiverFactory = $container->getDefinition('messenger.receiver.customised')->getFactory();
566+
$receiverArguments = $container->getDefinition('messenger.receiver.customised')->getArguments();
567567

568568
$this->assertEquals(array(new Reference('messenger.adapter_factory'), 'createReceiver'), $receiverFactory);
569-
$this->assertEquals(2, count($receiverArguments));
569+
$this->assertCount(2, $receiverArguments);
570570
$this->assertEquals('amqp://localhost/%2f/messages?exchange_name=exchange_name', $receiverArguments[0]);
571571
$this->assertEquals(array('queue_name' => 'Queue'), $receiverArguments[1]);
572572
}

‎src/Symfony/Component/Messenger/Adapter/PhpAmqp/AmqpReceiver.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ public function receive(callable $handler): void
6565
$this->connection->nack($message, AMQP_REQUEUE);
6666

6767
throw $e;
68-
}
69-
70-
if (function_exists('pcntl_signal_dispatch')) {
71-
pcntl_signal_dispatch();
68+
} finally {
69+
if (function_exists('pcntl_signal_dispatch')) {
70+
pcntl_signal_dispatch();
71+
}
7272
}
7373
}
7474
}

0 commit comments

Comments
 (0)
0