Fix merge

nicolas-grekas · nicolas-grekas · commit 0e10ab7b71b1 · 2025-11-06T12:17:34.000+01:00
diff --git a/src/Symfony/Component/Messenger/Command/StatsCommand.php b/src/Symfony/Component/Messenger/Command/StatsCommand.php
@@ -99,14 +99,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         match ($format) {
-            'txt' => $this->outputText($io, $outputTable, $uncountableTransports),
+            'txt' => $this->outputText($io, $errorIo, $outputTable, $uncountableTransports),
             'json' => $this->outputJson($io, $outputTable, $uncountableTransports),
         };
 
         return 0;
     }
 
-    private function outputText(SymfonyStyle $io, array $outputTable, array $uncountableTransports): void
+    private function outputText(SymfonyStyle $io, SymfonyStyle $errorIo, array $outputTable, array $uncountableTransports): void
     {
         $io->table(['Transport', 'Count'], $outputTable);
 
diff --git a/src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php
@@ -314,16 +314,14 @@ public function testSuccessMessageGoesToStdout()
         $receiver = $this->createMock(ReceiverInterface::class);
         $receiver->expects($this->once())->method('get')->willReturn([$envelope]);
 
-        $receiverLocator = $this->createMock(ContainerInterface::class);
-        $receiverLocator->expects($this->once())->method('has')->with('dummy-receiver')->willReturn(true);
-        $receiverLocator->expects($this->once())->method('get')->with('dummy-receiver')->willReturn($receiver);
+        $receiverLocator = new Container();
+        $receiverLocator->set('dummy-receiver', $receiver);
 
         $bus = $this->createMock(MessageBusInterface::class);
         $bus->expects($this->once())->method('dispatch');
 
-        $busLocator = $this->createMock(ContainerInterface::class);
-        $busLocator->expects($this->once())->method('has')->with('dummy-bus')->willReturn(true);
-        $busLocator->expects($this->once())->method('get')->with('dummy-bus')->willReturn($bus);
+        $busLocator = new Container();
+        $busLocator->set('dummy-bus', $bus);
 
         $command = new ConsumeMessagesCommand(new RoutableMessageBus($busLocator), $receiverLocator, new EventDispatcher());
 
@@ -349,16 +347,14 @@ public function testCommentsGoToStderr()
         $receiver = $this->createMock(ReceiverInterface::class);
         $receiver->expects($this->once())->method('get')->willReturn([$envelope]);
 
-        $receiverLocator = $this->createMock(ContainerInterface::class);
-        $receiverLocator->expects($this->once())->method('has')->with('dummy-receiver')->willReturn(true);
-        $receiverLocator->expects($this->once())->method('get')->with('dummy-receiver')->willReturn($receiver);
+        $receiverLocator = new Container();
+        $receiverLocator->set('dummy-receiver', $receiver);
 
         $bus = $this->createMock(MessageBusInterface::class);
         $bus->expects($this->once())->method('dispatch');
 
-        $busLocator = $this->createMock(ContainerInterface::class);
-        $busLocator->expects($this->once())->method('has')->with('dummy-bus')->willReturn(true);
-        $busLocator->expects($this->once())->method('get')->with('dummy-bus')->willReturn($bus);
+        $busLocator = new Container();
+        $busLocator->set('dummy-bus', $bus);
 
         $command = new ConsumeMessagesCommand(new RoutableMessageBus($busLocator), $receiverLocator, new EventDispatcher());
 

Original file line number	Diff line number	Diff line change
`@@ -99,14 +99,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`match ($format) {`
`102`		`- 'txt' => $this->outputText($io, $outputTable, $uncountableTransports),`
	`102`	`+ 'txt' => $this->outputText($io, $errorIo, $outputTable, $uncountableTransports),`
`103`	`103`	`'json' => $this->outputJson($io, $outputTable, $uncountableTransports),`
`104`	`104`	`};`
`105`	`105`
`106`	`106`	`return 0;`
`107`	`107`	`}`
`108`	`108`
`109`		`- private function outputText(SymfonyStyle $io, array $outputTable, array $uncountableTransports): void`
	`109`	`+ private function outputText(SymfonyStyle $io, SymfonyStyle $errorIo, array $outputTable, array $uncountableTransports): void`
`110`	`110`	`{`
`111`	`111`	`$io->table(['Transport', 'Count'], $outputTable);`
`112`	`112`