Merge pull request php-amqplib#170 from fprochazka/patch-4

fixed fatal error and few typos

Author: videlalvaro

PhpAmqpLib/Channel/AMQPChannel.php

@@ -106,8 +106,7 @@ public function __construct($connection, $channel_id = null, $auto_decode = true
 
     public function __destruct()
     {
-        //TODO:???if($this->connection)
-        //    $this->close("destroying channel");
+        $this->close();
     }
 
 
@@ -117,9 +116,11 @@ public function __destruct()
      */
     protected function do_close()
     {
-        $this->is_open = false;
-        unset($this->connection->channels[$this->channel_id]);
+        if ($this->channel_id !== NULL) {
+            unset($this->connection->channels[$this->channel_id]);
+        }
         $this->channel_id = $this->connection = null;
+        $this->is_open = false;
     }
 
 
@@ -151,6 +152,11 @@ protected function channel_alert($args)
      */
     public function close($reply_code = 0, $reply_text = "", $method_sig = array(0, 0))
     {
+        if ($this->is_open !== true || !$this->connection || !$this->connection->isConnected()) {
+            $this->do_close();
+            return; // already closed
+        }
+
         list($class_id, $method_id, $args) = $this->protocolWriter->channelClose(
             $reply_code,
             $reply_text,

PhpAmqpLib/Channel/AbstractChannel.php

@@ -23,7 +23,6 @@ class AbstractChannel
     protected $debug;
 
     /**
-     *
      * @var AbstractConnection
      */
     protected $connection;

PhpAmqpLib/Connection/AMQPLazyConnection.php

@@ -36,7 +36,9 @@ public function channel($channel_id = null)
      */
     protected function getIO()
     {
-        $this->connect();
+        if (!$this->io) {
+            $this->connect();
+        }
 
         return $this->io;
     }

PhpAmqpLib/Connection/AbstractConnection.php

@@ -606,8 +606,8 @@ public function channel($channel_id = null)
      */
     public function close($reply_code = 0, $reply_text = "", $method_sig = array(0, 0))
     {
-        if (!$this->protocolWriter) {
-            return;
+        if (!$this->protocolWriter || !$this->isConnected()) {
+            return NULL;
         }
 
         list($class_id, $method_id, $args) = $this->protocolWriter->connectionClose(

PhpAmqpLib/Wire/GenericContent.php

@@ -64,6 +64,8 @@ public function has($name)
     /**
      * Look for additional properties in the 'properties' dictionary,
      * and if present - the 'delivery_info' dictionary.
+     *
+     * @return mixed|AMQPChannel
      */
     public function get($name)
     {