Merge pull request php-amqplib#750 from ramunasd/fix_connection_close_exception

throw AMQPConnectionClosedException when broker wants to close connection

Author: lukebakken

PhpAmqpLib/Channel/AbstractChannel.php

@@ -32,14 +32,20 @@ abstract class AbstractChannel
      */
     const PROTOCOL_091 = Wire\Constants091::VERSION;
 
-    /** @var array */
-    protected $frame_queue;
+    /**
+     * Lower level queue for frames
+     * @var array
+     */
+    protected $frame_queue = array();
 
-    /** @var array */
-    protected $method_queue;
+    /**
+     * Higher level queue for methods
+     * @var array
+     */
+    protected $method_queue = array();
 
     /** @var bool */
-    protected $auto_decode;
+    protected $auto_decode = false;
 
     /** @var Wire\Constants */
     protected $constants;
@@ -87,9 +93,6 @@ public function __construct(AbstractConnection $connection, $channel_id)
         $this->connection = $connection;
         $this->channel_id = $channel_id;
         $connection->channels[$channel_id] = $this;
-        $this->frame_queue = array(); // Lower level queue for frames
-        $this->method_queue = array(); // Higher level queue for methods
-        $this->auto_decode = false;
 
         $this->msg_property_reader = new AMQPReader(null);
         $this->wait_content_reader = new AMQPReader(null);

PhpAmqpLib/Connection/AbstractConnection.php

@@ -8,7 +8,6 @@
 use PhpAmqpLib\Exception\AMQPInvalidFrameException;
 use PhpAmqpLib\Exception\AMQPIOException;
 use PhpAmqpLib\Exception\AMQPNoDataException;
-use PhpAmqpLib\Exception\AMQPProtocolConnectionException;
 use PhpAmqpLib\Exception\AMQPRuntimeException;
 use PhpAmqpLib\Exception\AMQPSocketException;
 use PhpAmqpLib\Exception\AMQPTimeoutException;
@@ -386,6 +385,8 @@ public function write($data)
 
     protected function do_close()
     {
+        $this->frame_queue = [];
+        $this->method_queue = [];
         $this->setIsConnected(false);
         $this->close_input();
         $this->close_socket();
@@ -723,18 +724,19 @@ public function close($reply_code = 0, $reply_text = '', $method_sig = array(0,
 
     /**
      * @param AMQPReader $reader
-     * @throws \PhpAmqpLib\Exception\AMQPProtocolConnectionException
+     * @throws AMQPConnectionClosedException
      */
     protected function connection_close(AMQPReader $reader)
     {
-        $reply_code = $reader->read_short();
-        $reply_text = $reader->read_shortstr();
-        $class_id = $reader->read_short();
-        $method_id = $reader->read_short();
+        $code = (int)$reader->read_short();
+        $reason = $reader->read_shortstr();
+        $class = $reader->read_short();
+        $method = $reader->read_short();
+        $reason .= sprintf('(%s, %s)', $class, $method);
 
         $this->x_close_ok();
 
-        throw new AMQPProtocolConnectionException($reply_code, $reply_text, array($class_id, $method_id));
+        throw new AMQPConnectionClosedException($code, $reason);
     }
 
     /**

PhpAmqpLib/Exception/AMQPProtocolConnectionException.php

@@ -1,6 +1,9 @@
 <?php
 namespace PhpAmqpLib\Exception;
 
+/**
+ * @deprecated
+ */
 class AMQPProtocolConnectionException extends AMQPProtocolException
 {
 }