bug #60759 [Messenger] Fix float value for worker memory limit (ro0NL)

nicolas-grekas · nicolas-grekas · commit 656f78685043 · 2025-06-16T08:47:39.000+02:00
This PR was squashed before being merged into the 6.4 branch. Discussion ---------- [Messenger] Fix float value for worker memory limit | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #60752 | License | MIT Commits ------- 451926b [Messenger] Fix float value for worker memory limit
diff --git a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php
@@ -289,7 +289,7 @@ private function convertToBytes(string $memoryLimit): int
         } elseif (str_starts_with($max, '0')) {
             $max = \intval($max, 8);
         } else {
-            $max = (int) $max;
+            $max = (float) $max;
         }
 
         switch (substr(rtrim($memoryLimit, 'b'), -1)) {
@@ -302,6 +302,6 @@ private function convertToBytes(string $memoryLimit): int
             case 'k': $max *= 1024;
         }
 
-        return $max;
+        return (int) $max;
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/ConsumeMessagesCommandTest.php
@@ -12,6 +12,8 @@
 namespace Symfony\Component\Messenger\Tests\Command;
 
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LoggerTrait;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Exception\InvalidOptionException;
 use Symfony\Component\Console\Tester\CommandCompletionTester;
@@ -214,6 +216,50 @@ public function testRunWithTimeLimit()
         $this->assertStringContainsString('[OK] Consuming messages from transport "dummy-receiver"', $tester->getDisplay());
     }
 
+    public function testRunWithMemoryLimit()
+    {
+        $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);
+
+        $logger = new class() implements LoggerInterface {
+            use LoggerTrait;
+
+            public array $logs = [];
+
+            public function log(...$args): void
+            {
+                $this->logs[] = $args;
+            }
+        };
+        $command = new ConsumeMessagesCommand(new RoutableMessageBus($busLocator), $receiverLocator, new EventDispatcher(), $logger);
+
+        $application = new Application();
+        $application->add($command);
+        $tester = new CommandTester($application->get('messenger:consume'));
+        $tester->execute([
+            'receivers' => ['dummy-receiver'],
+            '--memory-limit' => '1.5M',
+        ]);
+
+        $this->assertSame(0, $tester->getStatusCode());
+        $this->assertStringContainsString('[OK] Consuming messages from transport "dummy-receiver"', $tester->getDisplay());
+        $this->assertStringContainsString('The worker will automatically exit once it has exceeded 1.5M of memory', $tester->getDisplay());
+
+        $this->assertSame(1572864, $logger->logs[1][2]['limit']);
+    }
+
     /**
      * @dataProvider provideCompletionSuggestions
      */

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ private function convertToBytes(string $memoryLimit): int`
`289`	`289`	`} elseif (str_starts_with($max, '0')) {`
`290`	`290`	`$max = \intval($max, 8);`
`291`	`291`	`} else {`
`292`		`- $max = (int) $max;`
	`292`	`+ $max = (float) $max;`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`switch (substr(rtrim($memoryLimit, 'b'), -1)) {`
`@@ -302,6 +302,6 @@ private function convertToBytes(string $memoryLimit): int`
`302`	`302`	`case 'k': $max *= 1024;`
`303`	`303`	`}`
`304`	`304`
`305`		`- return $max;`
	`305`	`+ return (int) $max;`
`306`	`306`	`}`
`307`	`307`	`}`