Fix mostly naming and style reviews

sroze · sroze · commit 47e2a1d8280e · 2018-04-05T08:44:08.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1472,15 +1472,15 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
         }
 
         foreach ($config['adapters'] as $name => $adapter) {
-            $container->setDefinition('messenger.'.$name.'_sender', (new Definition(SenderInterface::class))->setFactory(array(
+            $container->setDefinition('messenger.sender.'.$name, (new Definition(SenderInterface::class))->setFactory(array(
                 new Reference('messenger.adapter_factory'),
                 'createSender',
             ))->setArguments(array(
                 $adapter['dsn'],
                 $adapter['options'],
             ))->addTag('messenger.sender'));
 
-            $container->setDefinition('messenger.'.$name.'_receiver', (new Definition(ReceiverInterface::class))->setFactory(array(
+            $container->setDefinition('messenger.receiver.'.$name, (new Definition(ReceiverInterface::class))->setFactory(array(
                 new Reference('messenger.adapter_factory'),
                 'createReceiver',
             ))->setArguments(array(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_adapter.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_adapter.yml
@@ -5,4 +5,4 @@ framework:
             customised:
                 dsn: 'amqp://localhost/%2f/messages?exchange_name=exchange_name'
                 options:
-                    queue_name: Queue
+                    queue_name: Queue
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -547,26 +547,26 @@ public function testMessengerValidationDisabled()
     public function testMessengerAdapter()
     {
         $container = $this->createContainerFromFile('messenger_adapter');
-        $this->assertTrue($container->hasDefinition('messenger.default_sender'));
-        $this->assertTrue($container->getDefinition('messenger.default_sender')->hasTag('messenger.sender'));
-        $this->assertTrue($container->hasDefinition('messenger.default_receiver'));
-        $this->assertTrue($container->getDefinition('messenger.default_receiver')->hasTag('messenger.receiver'));
+        $this->assertTrue($container->hasDefinition('messenger.sender.default'));
+        $this->assertTrue($container->getDefinition('messenger.sender.default')->hasTag('messenger.sender'));
+        $this->assertTrue($container->hasDefinition('messenger.receiver.default'));
+        $this->assertTrue($container->getDefinition('messenger.receiver.default')->hasTag('messenger.receiver'));
 
-        $this->assertTrue($container->hasDefinition('messenger.customised_sender'));
-        $senderFactory = $container->getDefinition('messenger.customised_sender')->getFactory();
-        $senderArguments = $container->getDefinition('messenger.customised_sender')->getArguments();
+        $this->assertTrue($container->hasDefinition('messenger.sender.customised'));
+        $senderFactory = $container->getDefinition('messenger.sender.customised')->getFactory();
+        $senderArguments = $container->getDefinition('messenger.sender.customised')->getArguments();
 
         $this->assertEquals(array(new Reference('messenger.adapter_factory'), 'createSender'), $senderFactory);
-        $this->assertEquals(2, count($senderArguments));
+        $this->assertCount(2, $senderArguments);
         $this->assertEquals('amqp://localhost/%2f/messages?exchange_name=exchange_name', $senderArguments[0]);
         $this->assertEquals(array('queue_name' => 'Queue'), $senderArguments[1]);
 
-        $this->assertTrue($container->hasDefinition('messenger.customised_receiver'));
-        $receiverFactory = $container->getDefinition('messenger.customised_receiver')->getFactory();
-        $receiverArguments = $container->getDefinition('messenger.customised_receiver')->getArguments();
+        $this->assertTrue($container->hasDefinition('messenger.receiver.customised'));
+        $receiverFactory = $container->getDefinition('messenger.receiver.customised')->getFactory();
+        $receiverArguments = $container->getDefinition('messenger.receiver.customised')->getArguments();
 
         $this->assertEquals(array(new Reference('messenger.adapter_factory'), 'createReceiver'), $receiverFactory);
-        $this->assertEquals(2, count($receiverArguments));
+        $this->assertCount(2, $receiverArguments);
         $this->assertEquals('amqp://localhost/%2f/messages?exchange_name=exchange_name', $receiverArguments[0]);
         $this->assertEquals(array('queue_name' => 'Queue'), $receiverArguments[1]);
     }
diff --git a/src/Symfony/Component/Messenger/Adapter/PhpAmqp/AmqpReceiver.php b/src/Symfony/Component/Messenger/Adapter/PhpAmqp/AmqpReceiver.php
@@ -65,10 +65,10 @@ public function receive(callable $handler): void
                 $this->connection->nack($message, AMQP_REQUEUE);
 
                 throw $e;
-            }
-
-            if (function_exists('pcntl_signal_dispatch')) {
-                pcntl_signal_dispatch();
+            } finally {
+                if (function_exists('pcntl_signal_dispatch')) {
+                    pcntl_signal_dispatch();
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -65,10 +65,10 @@ public function receive(callable $handler): void`
`65`	`65`	`$this->connection->nack($message, AMQP_REQUEUE);`
`66`	`66`
`67`	`67`	`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`	`+ }`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`