Merge remote-tracking branch 'origin/master' into merge08

Author: makasim

.travis.yml

@@ -6,8 +6,8 @@ git:
 language: php
 
 php:
-    - '5.6'
-    - '7.0'
+    - '7.1'
+    - '7.2'
 
 cache:
     directories:

Client/NullDriver.php

@@ -1,15 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Null;
 
-use Interop\Queue\PsrConnectionFactory;
+use Interop\Queue\ConnectionFactory;
+use Interop\Queue\Context;
 
-class NullConnectionFactory implements PsrConnectionFactory
+class NullConnectionFactory implements ConnectionFactory
 {
     /**
-     * {@inheritdoc}
+     * @return NullContext
      */
-    public function createContext()
+    public function createContext(): Context
     {
         return new NullContext();
     }

NullConnectionFactory.php

@@ -1,61 +1,52 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Null;
 
-use Interop\Queue\PsrConsumer;
-use Interop\Queue\PsrDestination;
-use Interop\Queue\PsrMessage;
+use Interop\Queue\Consumer;
+use Interop\Queue\Destination;
+use Interop\Queue\Message;
+use Interop\Queue\Queue;
 
-class NullConsumer implements PsrConsumer
+class NullConsumer implements Consumer
 {
     /**
-     * @var PsrDestination
+     * @var Destination
      */
     private $queue;
 
-    /**
-     * @param PsrDestination $queue
-     */
-    public function __construct(PsrDestination $queue)
+    public function __construct(Destination $queue)
     {
         $this->queue = $queue;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getQueue()
+    public function getQueue(): Queue
     {
         return $this->queue;
     }
 
     /**
-     * {@inheritdoc}
+     * @return NullMessage
      */
-    public function receive($timeout = 0)
+    public function receive(int $timeout = 0): ?Message
     {
         return null;
     }
 
     /**
-     * {@inheritdoc}
+     * @return NullMessage
      */
-    public function receiveNoWait()
+    public function receiveNoWait(): ?Message
     {
         return null;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function acknowledge(PsrMessage $message)
+    public function acknowledge(Message $message): void
     {
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function reject(PsrMessage $message, $requeue = false)
+    public function reject(Message $message, bool $requeue = false): void
     {
     }
 }

NullConsumer.php

@@ -1,18 +1,24 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Null;
 
-use Interop\Queue\PsrContext;
-use Interop\Queue\PsrDestination;
+use Interop\Queue\Consumer;
+use Interop\Queue\Context;
+use Interop\Queue\Destination;
+use Interop\Queue\Message;
+use Interop\Queue\Producer;
+use Interop\Queue\Queue;
+use Interop\Queue\SubscriptionConsumer;
+use Interop\Queue\Topic;
 
-class NullContext implements PsrContext
+class NullContext implements Context
 {
     /**
-     * {@inheritdoc}
-     *
      * @return NullMessage
      */
-    public function createMessage($body = null, array $properties = [], array $headers = [])
+    public function createMessage(string $body = '', array $properties = [], array $headers = []): Message
     {
         $message = new NullMessage();
         $message->setBody($body);
@@ -23,55 +29,58 @@ public function createMessage($body = null, array $properties = [], array $heade
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @return NullQueue
      */
-    public function createQueue($name)
+    public function createQueue(string $name): Queue
     {
         return new NullQueue($name);
     }
 
     /**
-     * {@inheritdoc}
+     * @return NullQueue
      */
-    public function createTemporaryQueue()
+    public function createTemporaryQueue(): Queue
     {
         return $this->createQueue(uniqid('', true));
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @return NullTopic
      */
-    public function createTopic($name)
+    public function createTopic(string $name): Topic
     {
         return new NullTopic($name);
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @return NullConsumer
      */
-    public function createConsumer(PsrDestination $destination)
+    public function createConsumer(Destination $destination): Consumer
     {
         return new NullConsumer($destination);
     }
 
     /**
-     * {@inheritdoc}
+     * @return NullProducer
      */
-    public function createProducer()
+    public function createProducer(): Producer
     {
         return new NullProducer();
     }
 
     /**
-     * {@inheritdoc}
+     * @return NullSubscriptionConsumer
      */
-    public function close()
+    public function createSubscriptionConsumer(): SubscriptionConsumer
+    {
+        return new NullSubscriptionConsumer();
+    }
+
+    public function purgeQueue(Queue $queue): void
+    {
+    }
+
+    public function close(): void
     {
     }
 }