Merge branch 'master' into horizon

Author: vyuldashev

composer.json

@@ -14,8 +14,8 @@
     "illuminate/database": "5.6.*|5.7.*|5.8.*",
     "illuminate/support": "5.6.*|5.7.*|5.8.*",
     "illuminate/queue": "5.6.*|5.7.*|5.8.*",
-    "enqueue/amqp-lib": "0.8.*",
-    "queue-interop/amqp-interop": "^0.7"
+    "enqueue/amqp-lib": "0.9.*",
+    "queue-interop/amqp-interop": "0.8.*"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.0",

tests/Mock/AmqpConnectionFactorySpy.php

@@ -2,6 +2,8 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Mock;
 
+use Interop\Queue\Context;
+
 class AmqpConnectionFactorySpy implements \Interop\Amqp\AmqpConnectionFactory
 {
     /** @var \Closure */
@@ -14,7 +16,7 @@ public function __construct($config)
         $spy($config);
     }
 
-    public function createContext()
+    public function createContext(): Context
     {
         return new AmqpContextMock();
     }

tests/Mock/AmqpContextMock.php

@@ -6,97 +6,93 @@
 use Interop\Amqp\AmqpQueue;
 use Interop\Amqp\AmqpTopic;
 use Interop\Amqp\AmqpContext;
-use Interop\Amqp\AmqpConsumer;
-use Interop\Queue\PsrDestination;
+use Interop\Queue\Consumer;
+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 AmqpContextMock implements AmqpContext
 {
-    public function declareTopic(AmqpTopic $topic)
+    public function createSubscriptionConsumer(): SubscriptionConsumer
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function deleteTopic(AmqpTopic $topic)
+    public function declareTopic(AmqpTopic $topic): void
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function declareQueue(AmqpQueue $queue)
+    public function deleteTopic(AmqpTopic $topic): void
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function deleteQueue(AmqpQueue $queue)
+    public function declareQueue(AmqpQueue $queue): int
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function purgeQueue(AmqpQueue $queue)
+    public function deleteQueue(AmqpQueue $queue): void
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function bind(AmqpBind $bind)
+    public function purgeQueue(Queue $queue): void
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function unbind(AmqpBind $bind)
+    public function bind(AmqpBind $bind): void
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function setQos($prefetchSize, $prefetchCount, $global)
+    public function unbind(AmqpBind $bind): void
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function subscribe(AmqpConsumer $consumer, callable $callback)
+    public function setQos(int $prefetchSize, int $prefetchCount, bool $global): void
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function unsubscribe(AmqpConsumer $consumer)
-    {
-        throw new \LogicException('It is not expected to be called');
-    }
-
-    public function consume($timeout = 0)
-    {
-        throw new \LogicException('It is not expected to be called');
-    }
 
-    public function close()
+    public function close(): void
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function createQueue($queueName)
+    public function createQueue(string $queueName): Queue
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function createTemporaryQueue()
+    public function createTemporaryQueue(): Queue
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function createProducer()
+    public function createProducer(): Producer
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function createConsumer(PsrDestination $destination)
+    public function createConsumer(Destination $destination): Consumer
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function createTopic($amqpTopic)
+    public function createTopic(string $amqpTopic): Topic
     {
         throw new \LogicException('It is not expected to be called');
     }
 
-    public function createMessage($body = '', array $properties = [], array $headers = [])
+    public function createMessage(string $body = '', array $properties = [], array $headers = []): Message
     {
         throw new \LogicException('It is not expected to be called');
     }

tests/Mock/CustomContextAmqpConnectionFactoryMock.php

@@ -2,11 +2,13 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Mock;
 
+use Interop\Queue\Context;
+
 class CustomContextAmqpConnectionFactoryMock implements \Interop\Amqp\AmqpConnectionFactory
 {
     public static $context;
 
-    public function createContext()
+    public function createContext(): Context
     {
         return static::$context;
     }

tests/Mock/DelayStrategyAwareAmqpConnectionFactorySpy.php

@@ -4,13 +4,14 @@
 
 use Enqueue\AmqpTools\DelayStrategy;
 use Enqueue\AmqpTools\DelayStrategyAware;
+use Interop\Queue\Context;
 
 class DelayStrategyAwareAmqpConnectionFactorySpy implements \Interop\Amqp\AmqpConnectionFactory, DelayStrategyAware
 {
     /** @var \Closure */
     public static $spy;
 
-    public function createContext()
+    public function createContext(): Context
     {
         return new AmqpContextMock();
     }
@@ -20,10 +21,12 @@ public function createContext()
      *
      * @return self
      */
-    public function setDelayStrategy(DelayStrategy $delayStrategy = null)
+    public function setDelayStrategy(DelayStrategy $delayStrategy = null): DelayStrategyAware
     {
         $spy = static::$spy;
 
         $spy($delayStrategy);
+
+        return $this;
     }
 }