Merge pull request #507 from php-enqueue/remove-deprecated-things

Remove deprecated in 0.8 code

Author: makasim

Diff for: docs/transport/sqs.md

@@ -110,7 +110,7 @@ $consumer->acknowledge($message);
 
 $fooQueue = $psrContext->createQueue('foo');
 
-$psrContext->purge($fooQueue);
+$psrContext->purgeQueue($fooQueue);
 ```
 
 [back to index](../index.md)

Diff for: pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php

@@ -13,6 +13,15 @@
  */
 class AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest extends SubscriptionConsumerConsumeUntilUnsubscribedSpec
 {
+    protected function tearDown()
+    {
+        if ($this->subscriptionConsumer) {
+            $this->subscriptionConsumer->unsubscribeAll();
+        }
+
+        parent::tearDown();
+    }
+
     /**
      * @return AmqpContext
      *

Diff for: pkg/amqp-bunny/composer.json

@@ -16,7 +16,7 @@
         "enqueue/test": "0.9.x-dev",
         "enqueue/enqueue": "0.9.x-dev",
         "enqueue/null": "0.9.x-dev",
-        "queue-interop/queue-spec": "^0.5.8@dev",
+        "queue-interop/queue-spec": "^0.5.9@dev",
         "symfony/dependency-injection": "^3.4|^4",
         "symfony/config": "^3.4|^4"
     },

Diff for: pkg/amqp-ext/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php

@@ -13,6 +13,15 @@
  */
 class AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest extends SubscriptionConsumerConsumeUntilUnsubscribedSpec
 {
+    protected function tearDown()
+    {
+        if ($this->subscriptionConsumer) {
+            $this->subscriptionConsumer->unsubscribeAll();
+        }
+
+        parent::tearDown();
+    }
+
     /**
      * @return AmqpContext
      *

Diff for: pkg/amqp-ext/composer.json

@@ -16,7 +16,7 @@
         "enqueue/test": "0.9.x-dev",
         "enqueue/enqueue": "0.9.x-dev",
         "enqueue/null": "0.9.x-dev",
-        "queue-interop/queue-spec": "^0.5.8@dev",
+        "queue-interop/queue-spec": "^0.5.9@dev",
         "empi89/php-amqp-stubs": "*@dev",
         "symfony/dependency-injection": "^3.4|^4",
         "symfony/config": "^3.4|^4"

Diff for: pkg/amqp-lib/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php

@@ -13,6 +13,15 @@
  */
 class AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest extends SubscriptionConsumerConsumeUntilUnsubscribedSpec
 {
+    protected function tearDown()
+    {
+        if ($this->subscriptionConsumer) {
+            $this->subscriptionConsumer->unsubscribeAll();
+        }
+
+        parent::tearDown();
+    }
+
     /**
      * @return AmqpContext
      *

Diff for: pkg/amqp-lib/composer.json

@@ -16,7 +16,7 @@
         "enqueue/test": "0.9.x-dev",
         "enqueue/enqueue": "0.9.x-dev",
         "enqueue/null": "0.9.x-dev",
-        "queue-interop/queue-spec": "^0.5.8@dev",
+        "queue-interop/queue-spec": "^0.5.9@dev",
         "symfony/dependency-injection": "^3.4|^4",
         "symfony/config": "^3.4|^4"
     },

Diff for: pkg/amqp-tools/SubscriptionConsumer.php

@@ -148,22 +148,6 @@ public function sendEvent($topic, $message)
         $this->getProducer()->sendEvent($topic, $message);
     }
 
-    /**
-     * @deprecated since 0.8.18 and will be removed in 0.9. Use sendEvent method instead
-     *
-     * @param string       $topic
-     * @param string|array $message
-     * @param bool         $setupBroker
-     */
-    public function send($topic, $message, $setupBroker = false)
-    {
-        if ($setupBroker) {
-            $this->setupBroker();
-        }
-
-        $this->sendEvent($topic, $message);
-    }
-
     /**
      * @param ExtensionInterface|null $runtimeExtension
      */

Diff for: pkg/amqp-tools/Tests/SubscriptionConsumerTest.php

@@ -112,7 +112,9 @@ public function testProduceAndConsumeOneMessage($config)
             return Result::ACK;
         });
 
-        $client->send('foo_topic', 'Hello there!', true);
+        $client->setupBroker();
+
+        $client->sendEvent('foo_topic', 'Hello there!');
 
         $client->consume(new ChainExtension([
             new LimitConsumptionTimeExtension(new \DateTime('+5sec')),
@@ -144,7 +146,9 @@ public function testProduceAndRouteToTwoConsumes($config)
             return Result::ACK;
         });
 
-        $client->send('foo_topic', 'Hello there!', true);
+        $client->setupBroker();
+
+        $client->sendEvent('foo_topic', 'Hello there!');
 
         $client->consume(new ChainExtension([
             new LimitConsumptionTimeExtension(new \DateTime('+5sec')),

Diff for: pkg/job-queue/Schema.php

@@ -185,16 +185,6 @@ public function deleteQueue(SqsDestination $dest)
         unset($this->queueUrls[$dest->getQueueName()]);
     }
 
-    /**
-     * @deprecated since 0.8 will be removed 0.9 use self::purgeQueue()
-     *
-     * @param SqsDestination $dest
-     */
-    public function purge(SqsDestination $dest)
-    {
-        $this->purgeQueue($dest);
-    }
-
     /**
      * @param SqsDestination $destination
      */

Diff for: pkg/simple-client/SimpleClient.php

@@ -39,8 +39,8 @@ protected function setUp()
         $this->context->declareQueue($replyQueue);
 
         try {
-            $this->context->purge($queue);
-            $this->context->purge($replyQueue);
+            $this->context->purgeQueue($queue);
+            $this->context->purgeQueue($replyQueue);
         } catch (\Exception $e) {
         }
     }

Diff for: pkg/simple-client/Tests/Functional/SimpleClientTest.php

@@ -187,7 +187,7 @@ public function testShouldAllowPurgeQueue()
 
         $queue = $context->createQueue('aQueueName');
 
-        $context->purge($queue);
+        $context->purgeQueue($queue);
     }
 
     public function testShouldAllowGetQueueUrl()