close everything on tearDown.

makasim · makasim · commit aeedcfd059ae · 2017-10-12T14:22:51.000+03:00
diff --git a/src/Amqp/BasicConsumeBreakOnFalseSpec.php b/src/Amqp/BasicConsumeBreakOnFalseSpec.php
@@ -18,7 +18,7 @@ abstract class BasicConsumeBreakOnFalseSpec extends TestCase
      */
     private $context;
 
-    public function tearDown()
+    protected function tearDown()
     {
         if ($this->context) {
             $this->context->close();
diff --git a/src/Amqp/BasicConsumeFromAllSubscribedQueuesSpec.php b/src/Amqp/BasicConsumeFromAllSubscribedQueuesSpec.php
@@ -18,7 +18,7 @@ abstract class BasicConsumeFromAllSubscribedQueuesSpec extends TestCase
      */
     private $context;
 
-    public function tearDown()
+    protected function tearDown()
     {
         if ($this->context) {
             $this->context->close();
diff --git a/src/Amqp/BasicConsumeShouldAddConsumerTagOnSubscribeSpec.php b/src/Amqp/BasicConsumeShouldAddConsumerTagOnSubscribeSpec.php
@@ -18,7 +18,7 @@ abstract class BasicConsumeShouldAddConsumerTagOnSubscribeSpec extends TestCase
      */
     private $context;
 
-    public function tearDown()
+    protected function tearDown()
     {
         if ($this->context) {
             $this->context->close();
diff --git a/src/Amqp/BasicConsumeShouldRemoveConsumerTagOnUnsubscribeSpec.php b/src/Amqp/BasicConsumeShouldRemoveConsumerTagOnUnsubscribeSpec.php
@@ -18,7 +18,7 @@ abstract class BasicConsumeShouldRemoveConsumerTagOnUnsubscribeSpec extends Test
      */
     private $context;
 
-    public function tearDown()
+    protected function tearDown()
     {
         if ($this->context) {
             $this->context->close();
diff --git a/src/Amqp/BasicConsumeUntilUnsubscribedSpec.php b/src/Amqp/BasicConsumeUntilUnsubscribedSpec.php
@@ -18,7 +18,7 @@ abstract class BasicConsumeUntilUnsubscribedSpec extends TestCase
      */
     private $context;
 
-    public function tearDown()
+    protected function tearDown()
     {
         if ($this->context) {
             $this->context->close();
diff --git a/src/Amqp/PreFetchCountSpec.php b/src/Amqp/PreFetchCountSpec.php
@@ -18,7 +18,7 @@ abstract class PreFetchCountSpec extends TestCase
      */
     private $context;
 
-    public function tearDown()
+    protected function tearDown()
     {
         if ($this->context) {
             $this->context->close();
diff --git a/src/Amqp/SendAndReceiveTimestampAsIntegerSpec.php b/src/Amqp/SendAndReceiveTimestampAsIntegerSpec.php
@@ -17,7 +17,7 @@ abstract class SendAndReceiveTimestampAsIntegerSpec extends TestCase
      */
     private $context;
 
-    public function tearDown()
+    protected function tearDown()
     {
         if ($this->context) {
             $this->context->close();
diff --git a/src/SendAndReceiveDelayedMessageFromQueueSpec.php b/src/SendAndReceiveDelayedMessageFromQueueSpec.php
@@ -12,9 +12,23 @@
  */
 abstract class SendAndReceiveDelayedMessageFromQueueSpec extends TestCase
 {
+    /**
+     * @var PsrContext
+     */
+    private $context;
+
+    protected function tearDown()
+    {
+        if ($this->context) {
+            $this->context->close();
+        }
+
+        parent::tearDown();
+    }
+
     public function test()
     {
-        $context = $this->createContext();
+        $this->context = $context = $this->createContext();
         $queue = $this->createQueue($context, 'send_and_receive_delayed_message_from_queue_spec');
 
         $consumer = $context->createConsumer($queue);
diff --git a/src/SendAndReceivePriorityMessagesFromQueueSpec.php b/src/SendAndReceivePriorityMessagesFromQueueSpec.php
@@ -12,9 +12,23 @@
  */
 abstract class SendAndReceivePriorityMessagesFromQueueSpec extends TestCase
 {
+    /**
+     * @var PsrContext
+     */
+    private $context;
+
+    protected function tearDown()
+    {
+        if ($this->context) {
+            $this->context->close();
+        }
+
+        parent::tearDown();
+    }
+
     public function test()
     {
-        $context = $this->createContext();
+        $this->context = $context = $this->createContext();
         $queue = $this->createQueue($context, 'send_and_receive_priority_messages_from_queue_spec');
 
         $consumer = $context->createConsumer($queue);
diff --git a/src/SendAndReceiveTimeToLiveMessagesFromQueueSpec.php b/src/SendAndReceiveTimeToLiveMessagesFromQueueSpec.php
@@ -12,9 +12,23 @@
  */
 abstract class SendAndReceiveTimeToLiveMessagesFromQueueSpec extends TestCase
 {
+    /**
+     * @var PsrContext
+     */
+    private $context;
+
+    protected function tearDown()
+    {
+        if ($this->context) {
+            $this->context->close();
+        }
+
+        parent::tearDown();
+    }
+
     public function test()
     {
-        $context = $this->createContext();
+        $this->context = $context = $this->createContext();
         $queue = $this->createQueue($context, 'send_and_receive_time_to_live_messages_from_queue_spec');
 
         $consumer = $context->createConsumer($queue);
diff --git a/src/SendToAndReceiveFromQueueSpec.php b/src/SendToAndReceiveFromQueueSpec.php
@@ -12,9 +12,23 @@
  */
 abstract class SendToAndReceiveFromQueueSpec extends TestCase
 {
+    /**
+     * @var PsrContext
+     */
+    private $context;
+
+    protected function tearDown()
+    {
+        if ($this->context) {
+            $this->context->close();
+        }
+
+        parent::tearDown();
+    }
+
     public function test()
     {
-        $context = $this->createContext();
+        $this->context = $context = $this->createContext();
         $queue = $this->createQueue($context, 'send_to_and_receive_from_queue_spec');
 
         $consumer = $context->createConsumer($queue);
diff --git a/src/SendToAndReceiveFromTopicSpec.php b/src/SendToAndReceiveFromTopicSpec.php
@@ -12,9 +12,23 @@
  */
 abstract class SendToAndReceiveFromTopicSpec extends TestCase
 {
+    /**
+     * @var PsrContext
+     */
+    private $context;
+
+    protected function tearDown()
+    {
+        if ($this->context) {
+            $this->context->close();
+        }
+
+        parent::tearDown();
+    }
+
     public function test()
     {
-        $context = $this->createContext();
+        $this->context = $context = $this->createContext();
         $topic = $this->createTopic($context, 'send_to_and_receive_from_topic_spec');
 
         $consumer = $context->createConsumer($topic);
diff --git a/src/SendToAndReceiveNoWaitFromQueueSpec.php b/src/SendToAndReceiveNoWaitFromQueueSpec.php
@@ -12,9 +12,23 @@
  */
 abstract class SendToAndReceiveNoWaitFromQueueSpec extends TestCase
 {
+    /**
+     * @var PsrContext
+     */
+    private $context;
+
+    protected function tearDown()
+    {
+        if ($this->context) {
+            $this->context->close();
+        }
+
+        parent::tearDown();
+    }
+
     public function test()
     {
-        $context = $this->createContext();
+        $this->context = $context = $this->createContext();
         $queue = $this->createQueue($context, 'send_to_and_receive_no_wait_from_queue_spec');
 
         $consumer = $context->createConsumer($queue);
diff --git a/src/SendToAndReceiveNoWaitFromTopicSpec.php b/src/SendToAndReceiveNoWaitFromTopicSpec.php
@@ -12,9 +12,23 @@
  */
 abstract class SendToAndReceiveNoWaitFromTopicSpec extends TestCase
 {
+    /**
+     * @var PsrContext
+     */
+    private $context;
+
+    protected function tearDown()
+    {
+        if ($this->context) {
+            $this->context->close();
+        }
+
+        parent::tearDown();
+    }
+
     public function test()
     {
-        $context = $this->createContext();
+        $this->context = $context = $this->createContext();
         $topic = $this->createTopic($context, 'send_to_and_receive_no_wait_from_topic_spec');
 
         $consumer = $context->createConsumer($topic);
diff --git a/src/SendToTopicAndReceiveFromQueueSpec.php b/src/SendToTopicAndReceiveFromQueueSpec.php
@@ -13,9 +13,23 @@
  */
 abstract class SendToTopicAndReceiveFromQueueSpec extends TestCase
 {
+    /**
+     * @var PsrContext
+     */
+    private $context;
+
+    protected function tearDown()
+    {
+        if ($this->context) {
+            $this->context->close();
+        }
+
+        parent::tearDown();
+    }
+
     public function test()
     {
-        $context = $this->createContext();
+        $this->context = $context = $this->createContext();
         $topic = $this->createTopic($context, 'send_to_topic_and_receive_from_queue_spec');
         $queue = $this->createQueue($context, 'send_to_topic_and_receive_from_queue_spec');
 
diff --git a/src/SendToTopicAndReceiveNoWaitFromQueueSpec.php b/src/SendToTopicAndReceiveNoWaitFromQueueSpec.php
@@ -13,9 +13,23 @@
  */
 abstract class SendToTopicAndReceiveNoWaitFromQueueSpec extends TestCase
 {
+    /**
+     * @var PsrContext
+     */
+    private $context;
+
+    protected function tearDown()
+    {
+        if ($this->context) {
+            $this->context->close();
+        }
+
+        parent::tearDown();
+    }
+
     public function test()
     {
-        $context = $this->createContext();
+        $this->context = $context = $this->createContext();
         $topic = $this->createTopic($context, 'send_to_topic_and_receive_from_queue_spec');
         $queue = $this->createQueue($context, 'send_to_topic_and_receive_from_queue_spec');
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ abstract class BasicConsumeBreakOnFalseSpec extends TestCase`
`18`	`18`	`*/`
`19`	`19`	`private $context;`
`20`	`20`
`21`		`- public function tearDown()`
	`21`	`+ protected function tearDown()`
`22`	`22`	`{`
`23`	`23`	`if ($this->context) {`
`24`	`24`	`$this->context->close();`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ abstract class PreFetchCountSpec extends TestCase`
`18`	`18`	`*/`
`19`	`19`	`private $context;`
`20`	`20`
`21`		`- public function tearDown()`
	`21`	`+ protected function tearDown()`
`22`	`22`	`{`
`23`	`23`	`if ($this->context) {`
`24`	`24`	`$this->context->close();`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ abstract class SendAndReceiveTimestampAsIntegerSpec extends TestCase`
`17`	`17`	`*/`
`18`	`18`	`private $context;`
`19`	`19`
`20`		`- public function tearDown()`
	`20`	`+ protected function tearDown()`
`21`	`21`	`{`
`22`	`22`	`if ($this->context) {`
`23`	`23`	`$this->context->close();`