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

Commit c4980b6

Browse files
srozesroze
committed
Fix mostly naming and style reviews
1 parent 6fd239a commit c4980b6

File tree

5 files changed

+19
-24
lines changed

5 files changed

+19
-24
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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
use Symfony\Component\Lock\StoreInterface;
6363
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
6464
use Symfony\Component\Messenger\MessageBusInterface;
65-
use Symfony\Component\Messenger\Adapter\Factory\AdapterInterface as MessengerAdapterInterface;
6665
use Symfony\Component\Messenger\Transport\ReceiverInterface;
6766
use Symfony\Component\Messenger\Transport\SenderInterface;
6867
use Symfony\Component\PropertyAccess\PropertyAccessor;
@@ -1473,15 +1472,15 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
14731472
}
14741473

14751474
foreach ($config['adapters'] as $name => $adapter) {
1476-
$container->setDefinition('messenger.'.$name.'_sender', (new Definition(SenderInterface::class))->setFactory(array(
1475+
$container->setDefinition('messenger.sender.'.$name, (new Definition(SenderInterface::class))->setFactory(array(
14771476
new Reference('messenger.adapter_factory'),
14781477
'createSender',
14791478
))->setArguments(array(
14801479
$adapter['dsn'],
14811480
$adapter['options'],
14821481
))->addTag('messenger.sender'));
14831482

1484-
$container->setDefinition('messenger.'.$name.'_receiver', (new Definition(ReceiverInterface::class))->setFactory(array(
1483+
$container->setDefinition('messenger.receiver.'.$name, (new Definition(ReceiverInterface::class))->setFactory(array(
14851484
new Reference('messenger.adapter_factory'),
14861485
'createReceiver',
14871486
))->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
@@ -536,26 +536,26 @@ public function testMessengerValidationDisabled()
536536
public function testMessengerAdapter()
537537
{
538538
$container = $this->createContainerFromFile('messenger_adapter');
539-
$this->assertTrue($container->hasDefinition('messenger.default_sender'));
540-
$this->assertTrue($container->getDefinition('messenger.default_sender')->hasTag('messenger.sender'));
541-
$this->assertTrue($container->hasDefinition('messenger.default_receiver'));
542-
$this->assertTrue($container->getDefinition('messenger.default_receiver')->hasTag('messenger.receiver'));
539+
$this->assertTrue($container->hasDefinition('messenger.sender.default'));
540+
$this->assertTrue($container->getDefinition('messenger.sender.default')->hasTag('messenger.sender'));
541+
$this->assertTrue($container->hasDefinition('messenger.receiver.default'));
542+
$this->assertTrue($container->getDefinition('messenger.receiver.default')->hasTag('messenger.receiver'));
543543

544-
$this->assertTrue($container->hasDefinition('messenger.customised_sender'));
545-
$senderFactory = $container->getDefinition('messenger.< 628C span class="x x-first x-last">customised_sender')->getFactory();
546-
$senderArguments = $container->getDefinition('messenger.customised_sender')->getArguments();
544+
$this->assertTrue($container->hasDefinition('messenger.sender.customised'));
545+
$senderFactory = $container->getDefinition('messenger.sender.customised')->getFactory();
546+
$senderArguments = $container->getDefinition('messenger.sender.customised')->getArguments();
547547

548548
$this->assertEquals(array(new Reference('messenger.adapter_factory'), 'createSender'), $senderFactory);
549-
$this->assertEquals(2, count($senderArguments));
549+
$this->assertCount(2, $senderArguments);
550550
$this->assertEquals('amqp://localhost/%2f/messages?exchange_name=exchange_name', $senderArguments[0]);
551551
$this->assertEquals(array('queue_name' => 'Queue'), $senderArguments[1]);
552552

553-
$this->assertTrue($container->hasDefinition('messenger.customised_receiver'));
554-
$receiverFactory = $container->getDefinition('messenger.customised_receiver')->getFactory();
555-
$receiverArguments = $container->getDefinition('messenger.customised_receiver')->getArguments();
553+
$this->assertTrue($container->hasDefinition('messenger.receiver.customised'));
554+
$receiverFactory = $container->getDefinition('messenger.receiver.customised')->getFactory();
555+
$receiverArguments = $container->getDefinition('messenger.receiver.customised')->getArguments();
556556

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

‎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