Merge branch 'feature/mail' of https://github.com/ezimuel/zf2 into fe…

…ature/mail-smtp-connection

src/Transport/Smtp.php

@@ -49,6 +49,11 @@ class Smtp implements TransportInterface, Pluggable
      * @var Protocol\Smtp
      */
     protected $connection;
+
+    /**
+     * @var boolean
+     */
+    protected $autoDisconnect = true;
 
     /**
      * @var Protocol\SmtpBroker
@@ -122,7 +127,26 @@ public function getBroker()
         }
         return $this->broker;
     }
-
+    /**
+     * Set the automatic disconnection when destruct
+     * 
+     * @param  boolean $flag
+     * @return Smtp
+     */
+    public function setAutoDisconnect($flag) 
+    {
+        $this->autoDisconnect = (bool) $flag;
+        return $this;
+    }
+    /**
+     * Get the automatic disconnection value
+     * 
+     * @return boolean
+     */
+    public function getAutoDisconnect()
+    {
+        return $this->autoDisconnect;
+    }
     /**
      * Return an SMTP connection
      * 
@@ -146,11 +170,12 @@ public function __destruct()
             } catch (ProtocolException\ExceptionInterface $e) {
                 // ignore
             }
-            $this->connection->disconnect();
+            if ($this->autoDisconnect) {
+                $this->connection->disconnect();
+            }    
         }
     }
 
-
     /**
      * Sets the connection protocol instance
      *
@@ -171,7 +196,17 @@ public function getConnection()
     {
         return $this->connection;
     }
-
+    /**
+     * Disconnect the connection protocol instance
+     * 
+     * @return void
+     */
+    public function disconnect()
+    {
+        if (!empty($this->connection) && ($this->connection instanceof Protocol\Smtp)) {
+            $this->connection->disconnect();
+        }
+    }
     /**
      * Send an email via the SMTP connection protocol
      *

test/TestAsset/SmtpProtocolSpy.php

@@ -87,7 +87,7 @@ public function disconnect()
         $this->connect = false;
         $this->rset();
     }
-
+    
     /**
      * "Reset" connection
      *

test/Transport/SmtpTest.php

@@ -101,4 +101,38 @@ public function testCanUseAuthenticationExtensionsViaPluginBroker()
         $this->assertEquals('matthew', $connection->getUsername());
         $this->assertEquals('password', $connection->getPassword());
     }
+
+    public function testSetAutoDisconnect()
+    {
+        $this->transport->setAutoDisconnect(false);
+        $this->assertFalse($this->transport->getAutoDisconnect());
+    }
+
+    public function testGetDefaultAutoDisconnectValue()
+    {
+        $this->assertTrue($this->transport->getAutoDisconnect());
+    }
+
+    public function testAutoDisconnectTrue()
+    {
+        $this->connection->connect();
+        unset($this->transport);
+        $this->assertFalse($this->connection->isConnected());
+    }
+
+    public function testAutoDisconnectFalse()
+    {
+        $this->connection->connect();
+        $this->transport->setAutoDisconnect(false);
+        unset($this->transport);
+        $this->assertTrue($this->connection->isConnected());
+    }
+
+    public function testDisconnect()
+    {
+        $this->connection->connect();
+        $this->assertTrue($this->connection->isConnected());
+        $this->transport->disconnect();
+        $this->assertFalse($this->connection->isConnected());
+    }
 }