[dbal] fix tests.

Author: makasim

pkg/dbal/DbalConsumer.php

@@ -142,6 +142,8 @@ protected function receiveMessage(): ?DbalMessage
             if (empty($dbalMessage['time_to_live']) || ($dbalMessage['time_to_live'] / 1000) > microtime(true)) {
                 return $this->convertMessage($dbalMessage);
             }
+
+            return null;
         } catch (\Exception $e) {
             $this->dbal->rollBack();
 
@@ -186,7 +188,7 @@ private function fetchPrioritizedMessage(int $now): ?array
 
         $sql = $query->getSQL().' '.$this->dbal->getDatabasePlatform()->getWriteLockSQL();
 
-        return $this->dbal->executeQuery(
+        $result = $this->dbal->executeQuery(
             $sql,
             [
                 'queue' => $this->queue->getQueueName(),
@@ -197,6 +199,8 @@ private function fetchPrioritizedMessage(int $now): ?array
                 'delayedUntil' => Type::INTEGER,
             ]
         )->fetch();
+
+        return $result ?: null;
     }
 
     private function fetchMessage(int $now): ?array
@@ -214,7 +218,7 @@ private function fetchMessage(int $now): ?array
 
         $sql = $query->getSQL().' '.$this->dbal->getDatabasePlatform()->getWriteLockSQL();
 
-        return $this->dbal->executeQuery(
+        $result = $this->dbal->executeQuery(
             $sql,
             [
                 'queue' => $this->queue->getQueueName(),
@@ -225,5 +229,7 @@ private function fetchMessage(int $now): ?array
                 'delayedUntil' => Type::INTEGER,
             ]
         )->fetch();
+
+        return $result ?: null;
     }
 }

pkg/dbal/DbalProducer.php

@@ -69,15 +69,6 @@ public function send(PsrDestination $destination, PsrMessage $message): void
         }
 
         $body = $message->getBody();
-        if (is_scalar($body) || null === $body) {
-            $body = (string) $body;
-        } else {
-            throw new InvalidMessageException(sprintf(
-                'The message body must be a scalar or null. Got: %s',
-                is_object($body) ? get_class($body) : gettype($body)
-            ));
-        }
-
         $uuid = Uuid::uuid1();
 
         $publishedAt = null !== $message->getPublishedAt() ?

pkg/dbal/Tests/DbalConsumerTest.php

@@ -127,83 +127,83 @@ private function createContextMock()
 
 class InvalidMessage implements PsrMessage
 {
-    public function getBody()
+    public function getBody(): string
     {
     }
 
-    public function setBody($body)
+    public function setBody(string $body): void
     {
     }
 
-    public function setProperties(array $properties)
+    public function setProperties(array $properties): void
     {
     }
 
-    public function getProperties()
+    public function getProperties(): array
     {
     }
 
-    public function setProperty($name, $value)
+    public function setProperty(string $name, $value): void
     {
     }
 
-    public function getProperty($name, $default = null)
+    public function getProperty(string $name, $default = null)
     {
     }
 
-    public function setHeaders(array $headers)
+    public function setHeaders(array $headers): void
     {
     }
 
-    public function getHeaders()
+    public function getHeaders(): array
     {
     }
 
-    public function setHeader($name, $value)
+    public function setHeader(string $name, $value): void
     {
     }
 
-    public function getHeader($name, $default = null)
+    public function getHeader(string $name, $default = null)
     {
     }
 
-    public function setRedelivered($redelivered)
+    public function setRedelivered(bool $redelivered): void
     {
     }
 
-    public function isRedelivered()
+    public function isRedelivered(): bool
     {
     }
 
-    public function setCorrelationId($correlationId)
+    public function setCorrelationId(string $correlationId = null): void
     {
     }
 
-    public function getCorrelationId()
+    public function getCorrelationId(): ?string
     {
     }
 
-    public function setMessageId($messageId)
+    public function setMessageId(string $messageId = null): void
     {
     }
 
-    public function getMessageId()
+    public function getMessageId(): ?string
     {
     }
 
-    public function getTimestamp()
+    public function getTimestamp(): ?int
     {
     }
 
-    public function setTimestamp($timestamp)
+    public function setTimestamp(int $timestamp = null): void
     {
     }
 
-    public function setReplyTo($replyTo)
+    public function setReplyTo(string $replyTo = null): void
     {
     }
 
-    public function getReplyTo()
+    public function getReplyTo(): ?string
     {
     }
 }

pkg/dbal/Tests/DbalContextTest.php

@@ -12,6 +12,7 @@
 use Interop\Queue\InvalidDestinationException;
 use Interop\Queue\PsrContext;
 use Interop\Queue\PsrDestination;
+use Interop\Queue\TemporaryQueueNotSupportedException;
 
 class DbalContextTest extends \PHPUnit_Framework_TestCase
 {
@@ -139,8 +140,7 @@ public function testShouldThrowBadMethodCallExceptionOncreateTemporaryQueueCall(
     {
         $context = new DbalContext($connection = $this->createConnectionMock());
 
-        $this->expectException(\BadMethodCallException::class);
-        $this->expectExceptionMessage('Dbal transport does not support temporary queues');
+        $this->expectException(TemporaryQueueNotSupportedException::class);
 
         $context->createTemporaryQueue();
     }

pkg/dbal/Tests/DbalProducerTest.php

@@ -3,12 +3,10 @@
 namespace Enqueue\Dbal\Tests;
 
 use Enqueue\Dbal\DbalContext;
-use Enqueue\Dbal\DbalDestination;
 use Enqueue\Dbal\DbalMessage;
 use Enqueue\Dbal\DbalProducer;
 use Enqueue\Test\ClassExtensionTrait;
 use Interop\Queue\InvalidDestinationException;
-use Interop\Queue\InvalidMessageException;
 use Interop\Queue\PsrDestination;
 use Interop\Queue\PsrProducer;
 
@@ -26,18 +24,6 @@ public function testCouldBeConstructedWithRequiredArguments()
         new DbalProducer($this->createContextMock());
     }
 
-    public function testShouldThrowIfBodyOfInvalidType()
-    {
-        $this->expectException(InvalidMessageException::class);
-        $this->expectExceptionMessage('The message body must be a scalar or null. Got: stdClass');
-
-        $producer = new DbalProducer($this->createContextMock());
-
-        $message = new DbalMessage(new \stdClass());
-
-        $producer->send(new DbalDestination(''), $message);
-    }
-
     public function testShouldThrowIfDestinationOfInvalidType()
     {
         $this->expectException(InvalidDestinationException::class);