Use setArgument as argument does not exist on older versions

GromNaN · GromNaN · commit 799c2742f3fc · 2021-11-03T14:00:30.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php
@@ -150,8 +150,8 @@
                 service('event_dispatcher'),
                 service('logger')->nullOnInvalid(),
                 [], // Receiver names
-                service('messenger.listener.reset_services')->nullOnInvalid(),
                 [], // Bus names
+                service('messenger.listener.reset_services')->nullOnInvalid(),
             ])
             ->tag('console.command')
             ->tag('monolog.logger', ['channel' => 'messenger'])
diff --git a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php
@@ -46,18 +46,18 @@ class ConsumeMessagesCommand extends Command
     private $eventDispatcher;
     private $logger;
     private $receiverNames;
-    private $resetServicesListener;
     private $busIds;
+    private $resetServicesListener;
 
-    public function __construct(RoutableMessageBus $routableBus, ContainerInterface $receiverLocator, EventDispatcherInterface $eventDispatcher, LoggerInterface $logger = null, array $receiverNames = [], ResetServicesListener $resetServicesListener = null, array $busIds = [])
+    public function __construct(RoutableMessageBus $routableBus, ContainerInterface $receiverLocator, EventDispatcherInterface $eventDispatcher, LoggerInterface $logger = null, array $receiverNames = [], array $busIds = [], ResetServicesListener $resetServicesListener = null)
     {
         $this->routableBus = $routableBus;
         $this->receiverLocator = $receiverLocator;
         $this->eventDispatcher = $eventDispatcher;
         $this->logger = $logger;
         $this->receiverNames = $receiverNames;
-        $this->resetServicesListener = $resetServicesListener;
         $this->busIds = $busIds;
+        $this->resetServicesListener = $resetServicesListener;
 
         parent::__construct();
     }
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -309,7 +309,7 @@ private function registerReceivers(ContainerBuilder $container, array $busIds)
             }
 
             $consumeCommandDefinition->replaceArgument(4, array_values($receiverNames));
-            $consumeCommandDefinition->replaceArgument(6, $busIds);
+            $consumeCommandDefinition->setArgument(5, $busIds);
         }
 
         if ($container->hasDefinition('console.command.messenger_setup_transports')) {
diff --git a/src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php
@@ -137,7 +137,7 @@ public function testRunWithResetServicesOption(bool $shouldReset)
         $servicesResetter = $this->createMock(ServicesResetter::class);
         $servicesResetter->expects($this->exactly($shouldReset ? $msgCount : 0))->method('reset');
 
-        $command = new ConsumeMessagesCommand($bus, $receiverLocator, new EventDispatcher(), null, [], new ResetServicesListener($servicesResetter));
+        $command = new ConsumeMessagesCommand($bus, $receiverLocator, new EventDispatcher(), null, [], [], new ResetServicesListener($servicesResetter));
 
         $application = new Application();
         $application->add($command);
@@ -159,7 +159,7 @@ public function testComplete(array $input, array $expectedSuggestions)
     {
         $bus = $this->createMock(RoutableMessageBus::class);
         $receiverLocator = $this->createMock(ContainerInterface::class);
-        $command = new ConsumeMessagesCommand($bus, $receiverLocator, new EventDispatcher(), null, ['async', 'async_high', 'failed'], null, ['messenger.bus.default']);
+        $command = new ConsumeMessagesCommand($bus, $receiverLocator, new EventDispatcher(), null, ['async', 'async_high', 'failed'], ['messenger.bus.default']);
         $tester = new CommandCompletionTester($command);
         $suggestions = $tester->complete($input);
         $this->assertSame($expectedSuggestions, $suggestions);

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ private function registerReceivers(ContainerBuilder $container, array $busIds)`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`$consumeCommandDefinition->replaceArgument(4, array_values($receiverNames));`
`312`		`- $consumeCommandDefinition->replaceArgument(6, $busIds);`
	`312`	`+ $consumeCommandDefinition->setArgument(5, $busIds);`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`if ($container->hasDefinition('console.command.messenger_setup_transports')) {`