cs fix

symfony · monteiro · Dec 14, 2019 · Sep 19, 2020 · Sep 19, 2020 · Sep 19, 2020
commit 0cd81d0b6d86f18af058a6b9f4279aeecffe40fc
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1862,14 +1862,14 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
 
         $container->getDefinition('messenger.retry_strategy_locator')
             ->replaceArgument(0, $transportRetryReferences);
-        
+
         $failureTransports = [];
 
         if ($config['failure_transport']) {
             if (!isset($senderReferences[$config['failure_transport']])) {
                 throw new LogicException(sprintf('Invalid Messenger configuration: the failure transport "%s" is not a valid transport or service id.', $config['failure_transport']));
             }
-            
+
             $failureTransports[$config['failure_transport']] = $senderReferences[$config['failure_transport']];
         }
 
@@ -1886,13 +1886,13 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
         $failureTransportsServiceLocatorId = 'messenger.failure_transports.locator';
         if (\count($failureTransports) > 0) {
             $failureTransportsServiceLocator = ServiceLocatorTagPass::register($container, $failureTransports, $failureTransportsServiceLocatorId);
-            
+
             $container->getDefinition($failureTransportsServiceLocatorId)
                 ->replaceArgument(0, $failureTransports);
-            
+
             $container->getDefinition('messenger.failure.send_failed_message_to_failure_transport_listener')
                 ->replaceArgument(0, $failureTransportsServiceLocator);
-            
+
             $globalFailureReceiver = $config['failure_transport'] ?? null;
             $container->getDefinition('console.command.messenger_failed_messages_retry')
                 ->replaceArgument(0, $globalFailureReceiver)
@@ -1904,7 +1904,6 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             $container->getDefinition('console.command.messenger_failed_messages_remove')
                 ->replaceArgument(0, $globalFailureReceiver)
                 ->replaceArgument(1, $container->getDefinition($failureTransportsServiceLocatorId));
-
         } else {
             $container->removeDefinition('console.command.messenger_failed_messages_retry');
             $container->removeDefinition('console.command.messenger_failed_messages_show');

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php
@@ -170,7 +170,7 @@
                 service('messenger.routable_message_bus'),
                 service('event_dispatcher'),
                 service('logger'),
-                abstract_arg('Receivers')
+                abstract_arg('Receivers'),
             ])
             ->tag('console.command', ['command' => 'messenger:failed:retry'])
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
@@ -137,7 +137,7 @@
                 abstract_arg('failed transports map by name'),
             ])
             ->tag('container.service_locator')
-        
+
         // retry
         ->set('messenger.retry_strategy_locator')
             ->args([

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -40,7 +40,6 @@
 use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
 use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBag;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\RetryableHttpClient;
@@ -672,19 +671,18 @@ public function testMessengerMultipleFailureTransports()
             if (\in_array($transportName, $failedTransports)) {
                 continue;
             }
-            
+
             $this->assertSame('messenger.transport.'.$expectedFailureTransportsMapping[$transportName], (string) $ref, sprintf('The transport "%s" does not have the expected failed transport reference', $transportName));
-
         }
-        
+
         $this->assertTrue(true);
     }
 
     public function testMessengerMultipleFailureTransportsWithGlobalFailureTransport()
     {
         $container = $this->createContainerFromFile('messenger_multiple_failure_transports_global');
         $failureTransportsLocatorDefinition = $container->getDefinition('messenger.failure_transports.locator');
-        
+
         /** @var Reference $failureTransportsMapping */
         $failureTransportsMapping = $failureTransportsLocatorDefinition->getArgument(0);
 
@@ -707,7 +705,7 @@ public function testMessengerMultipleFailureTransportsWithGlobalFailureTransport
 
             $this->assertSame('messenger.transport.'.$expectedFailureTransportsMapping[$transportName], (string) $ref, sprintf('The transport "%s" does not have the expected failed transport reference', $transportName));
         }
-        
+
         $this->assertTrue(true);
     }
 
@@ -756,10 +754,10 @@ public function testMessengerTransports()
         $this->assertSame(7, $container->getDefinition('messenger.retry.multiplier_retry_strategy.customised')->getArgument(1));
         $this->assertSame(3, $container->getDefinition('messenger.retry.multiplier_retry_strategy.customised')->getArgument(2));
         $this->assertSame(100, $container->getDefinition('messenger.retry.multiplier_retry_strategy.customised')->getArgument(3));
-        
+
         $failureTransportsLocator = $container->getDefinition('messenger.failure_transports.locator');
         $expectedFailureTransports = [
-            'failed' => new Reference('messenger.transport.failed')
+            'failed' => new Reference('messenger.transport.failed'),
         ];
         $this->assertEquals($expectedFailureTransports, $failureTransportsLocator->getArgument(0));
     }

diff --git a/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php b/src/Symfony/Component/Messenger/Command/AbstractFailedMessagesCommand.php
@@ -39,9 +39,9 @@ public function __construct(?string $globalFailureReceiverName, $failureTranspor
         if (!$failureTransports instanceof ServiceLocator) {
             trigger_deprecation('symfony/messenger', '5.2', 'Passing failureTransports should now pass a ServiceLocator', __METHOD__);
 
-            $this->failureTransports = new ServiceLocator([$this->globalFailureReceiverName => function() use ($failureTransports) { return $failureTransports; }]);
-        } 
-        
+            $this->failureTransports = new ServiceLocator([$this->globalFailureReceiverName => function () use ($failureTransports) { return $failureTransports; }]);
+        }
+
         parent::__construct();
     }
 

diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesRemoveCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesRemoveCommand.php
@@ -60,10 +60,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
 
         $failureTransportName = $input->getOption('failure-transport');
-        if ($failureTransportName === null) {
+        if (null === $failureTransportName) {
             $failureTransportName = $this->getGlobalFailureReceiverName();
         }
-        
+
         $receiver = $this->getReceiver($failureTransportName);
 
         $shouldForce = $input->getOption('force');

diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
@@ -36,7 +36,7 @@
 class FailedMessagesRetryCommand extends AbstractFailedMessagesCommand
 {
     protected static $defaultName = 'messenger:failed:retry';
-    
+
     private $eventDispatcher;
     private $messageBus;
     private $logger;
@@ -48,8 +48,8 @@ public function __construct(?string $globalReceiverName, ?ReceiverInterface $glo
         $this->messageBus = $messageBus;
         $this->logger = $logger;
         $this->globalReceiverName = $globalReceiverName;
-        
-        parent::__construct($globalReceiverName, $failureTransports === null ? $globalReceiver : $failureTransports);
+
+        parent::__construct($globalReceiverName, null === $failureTransports ? $globalReceiver : $failureTransports);
     }
 
     /**
@@ -100,10 +100,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $failureTransportName = $input->getOption('failure-transport');
-        if ($failureTransportName === null) {
+        if (null === $failureTransportName) {
             $failureTransportName = $this->getGlobalFailureReceiverName();
         }
-        
+
         $receiver = $this->getReceiver($failureTransportName);
         $this->printPendingMessagesMessage($receiver, $io);
 

diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesShowCommand.php
@@ -60,7 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
 
         $failureTransportName = $input->getOption('failure-transport');
-        if ($failureTransportName === null) {
+        if (null === $failureTransportName) {
             $failureTransportName = $this->getGlobalFailureReceiverName();
         }
 

diff --git a/...Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php b/...Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
@@ -38,12 +38,12 @@ public function __construct($failureSender, LoggerInterface $logger = null)
     {
         if (!$failureSender instanceof ServiceLocator) {
             trigger_deprecation('symfony/messenger', '5.2', 'Passing failureTransports should now pass a ServiceLocator', __METHOD__);
-        } 
-        
+        }
+
         $this->failureSender = $failureSender;
         $this->logger = $logger;
     }
-    
+
     public function onMessageFailed(WorkerMessageFailedEvent $event)
     {
         if ($event->willRetry()) {
@@ -75,10 +75,10 @@ public function onMessageFailed(WorkerMessageFailedEvent $event)
         );
 
         $failureSender = $this->getFailureSender($event->getReceiverName());
-        if ($failureSender === null) {
+        if (null === $failureSender) {
             return;
         }
-        
+
         if (null !== $this->logger) {
             $this->logger->info('Rejected message {class} will be sent to the failure transport {transport}.', [
                 'class' => \get_class($envelope->getMessage()),
@@ -101,7 +101,7 @@ private function getFailureSender(string $receiverName): ?SenderInterface
         if ($this->failureSender instanceof ServiceLocator && $this->failureSender->has($receiverName)) {
             return $this->failureSender->get($receiverName);
         }
-        
+
         return $this->failureSender;
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRemoveCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRemoveCommandTest.php
@@ -73,7 +73,7 @@ public function testRemoveMultipleMessages()
         );
         $serviceLocator = $this->createMock(ServiceLocator::class);
         $serviceLocator->expects($this->any())->method('get')->with($globalFailureReceiverName)->willReturn($receiver);
-        
+
         $command = new FailedMessagesRemoveCommand(
             $globalFailureReceiverName,
             $receiver

diff --git a/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRetryCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRetryCommandTest.php
@@ -34,7 +34,7 @@ public function testBasicRun()
         $bus = $this->createMock(MessageBusInterface::class);
         // the bus should be called in the worker
         $bus->expects($this->exactly(2))->method('dispatch')->willReturn(new Envelope(new \stdClass()));
-        
+
         $command = new FailedMessagesRetryCommand(
             'failure_receiver',
             $receiver,

diff --git a/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesShowCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesShowCommandTest.php
@@ -110,7 +110,7 @@ public function testMultipleRedeliveryFails()
             $redeliveryStamp1,
             $redeliveryStamp2,
         ]);
-        
+
         $globalFailureReceiverName = 'failure_receiver';
         $receiver = $this->createMock(ListableReceiverInterface::class);
         $receiver->expects($this->once())->method('find')->with(15)->willReturn($envelope);