Migrate null transport.

Author: makasim

pkg/dbal/composer.json

@@ -7,7 +7,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.1.3",
-        "queue-interop/queue-interop": "^0.6.2",
+        "queue-interop/queue-interop": "0.7.x-dev",
         "doctrine/dbal": "~2.5",
         "ramsey/uuid": "^3"
     },

pkg/null/NullConnectionFactory.php

@@ -3,13 +3,14 @@
 namespace Enqueue\Null;
 
 use Interop\Queue\PsrConnectionFactory;
+use Interop\Queue\PsrContext;
 
 class NullConnectionFactory implements PsrConnectionFactory
 {
     /**
-     * {@inheritdoc}
+     * @return NullContext
      */
-    public function createContext()
+    public function createContext(): PsrContext
     {
         return new NullContext();
     }

pkg/null/NullConsumer.php

@@ -5,6 +5,7 @@
 use Interop\Queue\PsrConsumer;
 use Interop\Queue\PsrDestination;
 use Interop\Queue\PsrMessage;
+use Interop\Queue\PsrQueue;
 
 class NullConsumer implements PsrConsumer
 {
@@ -13,49 +14,37 @@ class NullConsumer implements PsrConsumer
      */
     private $queue;
 
-    /**
-     * @param PsrDestination $queue
-     */
     public function __construct(PsrDestination $queue)
     {
         $this->queue = $queue;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getQueue()
+    public function getQueue(): PsrQueue
     {
         return $this->queue;
     }
 
     /**
-     * {@inheritdoc}
+     * @return NullMessage
      */
-    public function receive($timeout = 0)
+    public function receive(int $timeout = 0): ?PsrMessage
     {
         return null;
     }
 
     /**
-     * {@inheritdoc}
+     * @return NullMessage
      */
-    public function receiveNoWait()
+    public function receiveNoWait(): ?PsrMessage
     {
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function acknowledge(PsrMessage $message)
+    public function acknowledge(PsrMessage $message): void
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function reject(PsrMessage $message, $requeue = false)
+    public function reject(PsrMessage $message, bool $requeue = false): void
     {
     }
 }

pkg/null/NullContext.php

@@ -2,17 +2,21 @@
 
 namespace Enqueue\Null;
 
+use Interop\Queue\PsrConsumer;
 use Interop\Queue\PsrContext;
 use Interop\Queue\PsrDestination;
+use Interop\Queue\PsrMessage;
+use Interop\Queue\PsrProducer;
+use Interop\Queue\PsrQueue;
+use Interop\Queue\PsrSubscriptionConsumer;
+use Interop\Queue\PsrTopic;
 
 class NullContext implements PsrContext
 {
     /**
-     * {@inheritdoc}
-     *
      * @return NullMessage
      */
-    public function createMessage($body = null, array $properties = [], array $headers = [])
+    public function createMessage(string $body = '', array $properties = [], array $headers = []): PsrMessage
     {
         $message = new NullMessage();
         $message->setBody($body);
@@ -23,55 +27,58 @@ public function createMessage($body = null, array $properties = [], array $heade
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @return NullQueue
      */
-    public function createQueue($name)
+    public function createQueue(string $name): PsrQueue
     {
         return new NullQueue($name);
     }
 
     /**
-     * {@inheritdoc}
+     * @return NullQueue
      */
-    public function createTemporaryQueue()
+    public function createTemporaryQueue(): PsrQueue
     {
         return $this->createQueue(uniqid('', true));
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @return NullTopic
      */
-    public function createTopic($name)
+    public function createTopic(string $name): PsrTopic
     {
         return new NullTopic($name);
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @return NullConsumer
      */
-    public function createConsumer(PsrDestination $destination)
+    public function createConsumer(PsrDestination $destination): PsrConsumer
     {
         return new NullConsumer($destination);
     }
 
     /**
-     * {@inheritdoc}
+     * @return NullProducer
      */
-    public function createProducer()
+    public function createProducer(): PsrProducer
     {
         return new NullProducer();
     }
 
     /**
-     * {@inheritdoc}
+     * @return NullSubscriptionConsumer
      */
-    public function close()
+    public function createSubscriptionConsumer(): PsrSubscriptionConsumer
+    {
+        return new NullSubscriptionConsumer();
+    }
+
+    public function purgeQueue(PsrQueue $queue): void
+    {
+    }
+
+    public function close(): void
     {
     }
 }

pkg/null/NullMessage.php

@@ -26,7 +26,7 @@ class NullMessage implements PsrMessage
      */
     private $redelivered;
 
-    public function __construct($body = '', array $properties = [], array $headers = [])
+    public function __construct(string $body = '', array $properties = [], array $headers = [])
     {
         $this->body = $body;
         $this->properties = $properties;
@@ -35,173 +35,113 @@ public function __construct($body = '', array $properties = [], array $headers =
         $this->redelivered = false;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setBody($body)
+    public function setBody(string $body): void
     {
         $this->body = $body;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getBody()
+    public function getBody(): string
     {
         return $this->body;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setProperties(array $properties)
+    public function setProperties(array $properties): void
     {
         $this->properties = $properties;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getProperties()
+    public function getProperties(): array
     {
         return $this->properties;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setProperty($name, $value)
+    public function setProperty(string $name, $value): void
     {
         $this->properties[$name] = $value;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getProperty($name, $default = null)
+    public function getProperty(string $name, $default = null)
     {
         return array_key_exists($name, $this->properties) ? $this->properties[$name] : $default;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setHeaders(array $headers)
+    public function setHeaders(array $headers): void
     {
         $this->headers = $headers;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getHeaders()
+    public function getHeaders(): array
     {
         return $this->headers;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setHeader($name, $value)
+    public function setHeader(string $name, $value): void
     {
         $this->headers[$name] = $value;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getHeader($name, $default = null)
+    public function getHeader(string $name, $default = null)
     {
         return array_key_exists($name, $this->headers) ? $this->headers[$name] : $default;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function isRedelivered()
+    public function isRedelivered(): bool
     {
         return $this->redelivered;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setRedelivered($redelivered)
+    public function setRedelivered(bool $redelivered): void
     {
         $this->redelivered = $redelivered;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setCorrelationId($correlationId)
+    public function setCorrelationId(string $correlationId = null): void
     {
         $headers = $this->getHeaders();
         $headers['correlation_id'] = (string) $correlationId;
 
         $this->setHeaders($headers);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getCorrelationId()
+    public function getCorrelationId(): ?string
     {
         return $this->getHeader('correlation_id');
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setMessageId($messageId)
+    public function setMessageId(string $messageId = null): void
     {
         $headers = $this->getHeaders();
         $headers['message_id'] = (string) $messageId;
 
         $this->setHeaders($headers);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMessageId()
+    public function getMessageId(): ?string
     {
         return $this->getHeader('message_id');
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getTimestamp()
+    public function getTimestamp(): ?int
     {
         $value = $this->getHeader('timestamp');
 
         return null === $value ? null : (int) $value;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setTimestamp($timestamp)
+    public function setTimestamp(int $timestamp = null): void
     {
         $headers = $this->getHeaders();
         $headers['timestamp'] = (int) $timestamp;
 
         $this->setHeaders($headers);
     }
 
-    /**
-     * @param string|null $replyTo
-     */
-    public function setReplyTo($replyTo)
+    public function setReplyTo(string $replyTo = null): void
     {
         $this->setHeader('reply_to', $replyTo);
     }
 
-    /**
-     * @return string|null
-     */
-    public function getReplyTo()
+    public function getReplyTo(): ?string
     {
         return $this->getHeader('reply_to');
     }