upd specs rel to subscription consumer

Author: makasim

src/Amqp/BasicConsumeBreakOnFalseSpec.php

@@ -2,16 +2,14 @@
 
 namespace Interop\Queue\Spec\Amqp;
 
-use Interop\Amqp\AmqpConsumer;
 use Interop\Amqp\AmqpContext;
-use Interop\Amqp\AmqpMessage;
 use Interop\Amqp\AmqpQueue;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @group functional
  */
-abstract class BasicConsumeShouldAddConsumerTagOnSubscribeSpec extends TestCase
+abstract class SubscriptionConsumerAddConsumerTagOnSubscribeSpec extends TestCase
 {
     /**
      * @var AmqpContext
@@ -32,27 +30,23 @@ public function test()
         $this->context = $context = $this->createContext();
         $context->setQos(0, 5, false);
 
-        $queue = $this->createQueue($context, 'basic_consume_should_add_consumer_tag_on_subscribe_spec');
+        $queue = $this->createQueue($context, 'amqp_subscription_consumer_add_consumer_tag_on_subscribe_spec');
 
         $consumer = $context->createConsumer($queue);
 
-        $context->subscribe($consumer, function() {});
+        //guard
+        $this->assertNull($consumer->getConsumerTag());
+
+        $subscriptionConsumer = $context->createSubscriptionConsumer();
+
+        $subscriptionConsumer->subscribe($consumer, function() {});
 
         $this->assertNotEmpty($consumer->getConsumerTag());
     }
 
-    /**
-     * @return AmqpContext
-     */
-    abstract protected function createContext();
+    abstract protected function createContext(): AmqpContext;
 
-    /**
-     * @param AmqpContext $context
-     * @param string      $queueName
-     *
-     * @return AmqpQueue
-     */
-    protected function createQueue(AmqpContext $context, $queueName)
+    protected function createQueue(AmqpContext $context, string $queueName): AmqpQueue
     {
         $queue = $context->createQueue($queueName);
         $context->declareQueue($queue);

src/Amqp/BasicConsumeFromAllSubscribedQueuesSpec.php

@@ -2,16 +2,14 @@
 
 namespace Interop\Queue\Spec\Amqp;
 
-use Interop\Amqp\AmqpConsumer;
 use Interop\Amqp\AmqpContext;
-use Interop\Amqp\AmqpMessage;
 use Interop\Amqp\AmqpQueue;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @group functional
  */
-abstract class BasicConsumeShouldRemoveConsumerTagOnUnsubscribeSpec extends TestCase
+abstract class SubscriptionConsumerRemoveConsumerTagOnUnsubscribeSpec extends TestCase
 {
     /**
      * @var AmqpContext
@@ -36,29 +34,21 @@ public function test()
 
         $consumer = $context->createConsumer($queue);
 
-        $context->subscribe($consumer, function() {});
-        $context->consume(100);
+        $subscriptionConsumer = $context->createSubscriptionConsumer();
+        $subscriptionConsumer->subscribe($consumer, function() {});
+        $subscriptionConsumer->consume(100);
 
         // guard
         $this->assertNotEmpty($consumer->getConsumerTag());
 
-        $context->unsubscribe($consumer);
+        $subscriptionConsumer->unsubscribe($consumer);
 
         $this->assertEmpty($consumer->getConsumerTag());
     }
 
-    /**
-     * @return AmqpContext
-     */
-    abstract protected function createContext();
+    abstract protected function createContext(): AmqpContext;
 
-    /**
-     * @param AmqpContext $context
-     * @param string      $queueName
-     *
-     * @return AmqpQueue
-     */
-    protected function createQueue(AmqpContext $context, $queueName)
+    protected function createQueue(AmqpContext $context, string $queueName): AmqpQueue
     {
         $queue = $context->createQueue($queueName);
         $context->declareQueue($queue);

src/Amqp/BasicConsumeUntilUnsubscribedSpec.php

@@ -6,7 +6,6 @@
 use Interop\Queue\PsrContext;
 use Interop\Queue\PsrMessage;
 use Interop\Queue\PsrQueue;
-use Interop\Queue\PsrSubscriptionConsumerAwareContext;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -72,7 +71,7 @@ public function test()
     }
 
     /**
-     * @return PsrContext|PsrSubscriptionConsumerAwareContext
+     * @return PsrContext
      */
     abstract protected function createContext();