bug #48198 [Messenger] Fix time-limit check exception (alamirault)

nicolas-grekas · nicolas-grekas · commit 63221f0b3ef1 · 2022-11-14T10:53:27.000+01:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [Messenger] Fix time-limit check exception | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #48196  | License | MIT | Doc PR | symfony/symfony-docs#...  Check on `time-limit` was invalid. (Unrelated fabbot failure) Commits ------- a13b41a [Messenger] Fix time-limit check exception
diff --git a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php
@@ -179,7 +179,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         if (null !== ($timeLimit = $input->getOption('time-limit'))) {
-            if (!is_numeric($timeLimit) || 0 >= $limit) {
+            if (!is_numeric($timeLimit) || 0 >= $timeLimit) {
                 throw new InvalidOptionException(sprintf('Option "time-limit" must be a positive integer, "%s" passed.', $timeLimit));
             }
 
diff --git a/src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php
@@ -206,4 +206,35 @@ public function getInvalidOptions()
         yield 'Zero second time limit' => ['--time-limit', '0', 'Option "time-limit" must be a positive integer, "0" passed.'];
         yield 'Non-numeric time limit' => ['--time-limit', 'whatever', 'Option "time-limit" must be a positive integer, "whatever" passed.'];
     }
+
+    public function testRunWithTimeLimit()
+    {
+        $envelope = new Envelope(new \stdClass(), [new BusNameStamp('dummy-bus')]);
+
+        $receiver = $this->createMock(ReceiverInterface::class);
+        $receiver->method('get')->willReturn([$envelope]);
+
+        $receiverLocator = $this->createMock(ContainerInterface::class);
+        $receiverLocator->method('has')->with('dummy-receiver')->willReturn(true);
+        $receiverLocator->method('get')->with('dummy-receiver')->willReturn($receiver);
+
+        $bus = $this->createMock(MessageBusInterface::class);
+
+        $busLocator = $this->createMock(ContainerInterface::class);
+        $busLocator->method('has')->with('dummy-bus')->willReturn(true);
+        $busLocator->method('get')->with('dummy-bus')->willReturn($bus);
+
+        $command = new ConsumeMessagesCommand(new RoutableMessageBus($busLocator), $receiverLocator, new EventDispatcher());
+
+        $application = new Application();
+        $application->add($command);
+        $tester = new CommandTester($application->get('messenger:consume'));
+        $tester->execute([
+            'receivers' => ['dummy-receiver'],
+            '--time-limit' => 1,
+        ]);
+
+        $this->assertSame(0, $tester->getStatusCode());
+        $this->assertStringContainsString('[OK] Consuming messages from transports "dummy-receiver"', $tester->getDisplay());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`if (null !== ($timeLimit = $input->getOption('time-limit'))) {`
`182`		`- if (!is_numeric($timeLimit) \|\| 0 >= $limit) {`
	`182`	`+ if (!is_numeric($timeLimit) \|\| 0 >= $timeLimit) {`
`183`	`183`	`throw new InvalidOptionException(sprintf('Option "time-limit" must be a positive integer, "%s" passed.', $timeLimit));`
`184`	`184`	`}`
`185`	`185`