Replaced DbalMessage::fromArrrayDbResult() with DbalContext::convertMessage()

Author: rosamarsky

pkg/dbal/DbalConsumer.php

@@ -142,7 +142,7 @@ protected function receiveMessage(): ?DbalMessage
             $this->dbal->commit();
 
             if (empty($dbalMessage['time_to_live']) || ($dbalMessage['time_to_live'] / 1000) > microtime(true)) {
-                return DbalMessage::fromArrayDbResult($dbalMessage);
+                return $this->context->convertMessage($dbalMessage);
             }
 
             return null;

pkg/dbal/DbalContext.php

@@ -128,6 +128,30 @@ public function createSubscriptionConsumer(): SubscriptionConsumer
         return new DbalSubscriptionConsumer($this);
     }
 
+    /**
+     * @internal It must be used here and in the consumer only
+     */
+    public function convertMessage(array $dbalMessage): DbalMessage
+    {
+        $dbalMessageObj = new DbalMessage(
+            $dbalMessage['body'],
+            $dbalMessage['properties'] ? JSON::decode($dbalMessage['properties']) : [],
+            $dbalMessage['headers'] ? JSON::decode($dbalMessage['headers']) : []
+        );
+
+        if (isset($dbalMessage['redelivered'])) {
+            $dbalMessageObj->setRedelivered((bool) $dbalMessage['redelivered']);
+        }
+        if (isset($dbalMessage['priority'])) {
+            $dbalMessageObj->setPriority((int) $dbalMessage['priority']);
+        }
+        if (isset($dbalMessage['published_at'])) {
+            $dbalMessageObj->setPublishedAt((int) $dbalMessage['published_at']);
+        }
+
+        return $dbalMessageObj;
+    }
+
     /**
      * @param DbalDestination $queue
      */

pkg/dbal/DbalMessage.php

@@ -67,27 +67,6 @@ public function __construct(string $body = '', array $properties = [], array $he
         $this->deliveryDelay = null;
     }
 
-    public static function fromArrayDbResult(array $dbalMessage): self
-    {
-        $dbalMessageObj = new self(
-            $dbalMessage['body'],
-            $dbalMessage['properties'] ? JSON::decode($dbalMessage['properties']) : [],
-            $dbalMessage['headers'] ? JSON::decode($dbalMessage['headers']) : []
-        );
-
-        if (isset($dbalMessage['redelivered'])) {
-            $dbalMessageObj->setRedelivered((bool) $dbalMessage['redelivered']);
-        }
-        if (isset($dbalMessage['priority'])) {
-            $dbalMessageObj->setPriority((int) $dbalMessage['priority']);
-        }
-        if (isset($dbalMessage['published_at'])) {
-            $dbalMessageObj->setPublishedAt((int) $dbalMessage['published_at']);
-        }
-
-        return $dbalMessageObj;
-    }
-
     public function setBody(string $body): void
     {
         $this->body = $body;

pkg/dbal/DbalSubscriptionConsumer.php

@@ -62,7 +62,7 @@ public function consume(int $timeout = 0): void
             if ($message) {
                 $this->dbal->delete($this->context->getTableName(), ['id' => $message['id']], ['id' => Type::GUID]);
 
-                $dbalMessage = DbalMessage::fromArrayDbResult($message);
+                $dbalMessage = $this->context->convertMessage($message);
 
                 /**
                  * @var DbalConsumer

pkg/dbal/Tests/DbalContextTest.php

@@ -64,6 +64,21 @@ public function testShouldCreateMessage()
         $this->assertFalse($message->isRedelivered());
     }
 
+    public function testShouldConvertArrayToDbalMessage()
+    {
+        $arrayData = [
+            'body' => 'theBody',
+            'properties' => json_encode(['barProp' => 'barPropVal']),
+            'headers' => json_encode(['fooHeader' => 'fooHeaderVal']),
+        ];
+        $context = new DbalContext($this->createConnectionMock());
+        $message = $context->convertMessage($arrayData);
+
+        $this->assertSame('theBody', $message->getBody());
+        $this->assertSame(['barProp' => 'barPropVal'], $message->getProperties());
+        $this->assertSame(['fooHeader' => 'fooHeaderVal'], $message->getHeaders());
+    }
+
     public function testShouldCreateTopic()
     {
         $context = new DbalContext($this->createConnectionMock());

pkg/dbal/Tests/DbalMessageTest.php

@@ -29,20 +29,6 @@ public function testCouldBeConstructedWithOptionalArguments()
         $this->assertSame(['fooHeader' => 'fooHeaderVal'], $message->getHeaders());
     }
 
-    public function testCouldBeCreatedFromArray()
-    {
-        $arrayData = [
-            'body' => 'theBody',
-            'properties' => json_encode(['barProp' => 'barPropVal']),
-            'headers' => json_encode(['fooHeader' => 'fooHeaderVal']),
-        ];
-        $message = DbalMessage::fromArrayDbResult($arrayData);
-
-        $this->assertSame('theBody', $message->getBody());
-        $this->assertSame(['barProp' => 'barPropVal'], $message->getProperties());
-        $this->assertSame(['fooHeader' => 'fooHeaderVal'], $message->getHeaders());
-    }
-
     public function testShouldSetPriorityToNullInConstructor()
     {
         $message = new DbalMessage();