Small improvements + rebase

AlptisAssurances · AlptisAssurances · commit 0a8460dd2e93 · 2018-04-20T15:09:18.000+02:00
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Enhancers/MemoryLimitReceiverTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Enhancers/MemoryLimitReceiverTest.php
@@ -101,7 +101,10 @@ public function testReceiverLogsMemoryExceededWhenLoggerIsGiven()
 
         $logger = $this->createMock(LoggerInterface::class);
         $logger->expects($this->once())->method('info')
-            ->with($this->equalTo('Receiver stopped due to memory limit exceeded.'));
+            ->with(
+                $this->equalTo('Receiver stopped due to memory limit of {limit} exceeded'),
+                $this->equalTo(array('limit' => 64 * 1024 * 1024))
+            );
 
         $memoryResolver = function () {
             return 70 * 1024 * 1024;
diff --git a/src/Symfony/Component/Messenger/Transport/Enhancers/MemoryLimitReceiver.php b/src/Symfony/Component/Messenger/Transport/Enhancers/MemoryLimitReceiver.php
@@ -46,8 +46,8 @@ public function receive(callable $handler): void
             $memoryResolver = $this->memoryResolver;
             if ($memoryResolver() >= $this->memoryLimit) {
                 $this->stop();
-                if ($this->logger) {
-                    $this->logger->info('Receiver stopped due to memory limit exceeded.');
+                if (null !== $this->logger) {
+                    $this->logger->info('Receiver stopped due to memory limit of {limit} exceeded', array('limit' => $this->memoryLimit));
                 }
             }
         });
@@ -62,14 +62,14 @@ private function convertToOctets(string $size): int
     {
         if (!\preg_match('/^(\d+)([G|M|K]*)$/', $size, $matches)) {
             throw new \InvalidArgumentException('Invalid memory limit given.');
-        } else {
-            if ('G' == $matches[2]) {
-                $size = $matches[1] * 1024 * 1024 * 1024;
-            } elseif ('M' == $matches[2]) {
-                $size = $matches[1] * 1024 * 1024;
-            } elseif ('K' == $matches[2]) {
-                $size = $matches[1] * 1024;
-            }
+        }
+
+        if ('G' == $matches[2]) {
+            $size = $matches[1] * 1024 * 1024 * 1024;
+        } elseif ('M' == $matches[2]) {
+            $size = $matches[1] * 1024 * 1024;
+        } elseif ('K' == $matches[2]) {
+            $size = $matches[1] * 1024;
         }
 
         return $size;
