Merge branch 'hotfix/3561' into develop

Close zendframework/zendframework#3561

src/Protocol/Smtp.php

@@ -193,6 +193,15 @@ public function helo($host = '127.0.0.1')
         $this->auth();
     }
 
+    /**
+     * Returns the perceived session status
+     *
+     * @return boolean
+     */
+    public function hasSession()
+    {
+        return $this->sess;
+    }
 
     /**
      * Send EHLO or HELO depending on capabilities of smtp host
@@ -367,6 +376,7 @@ public function auth()
      */
     public function disconnect()
     {
+        $this->quit();
         $this->_disconnect();
     }
 

src/Transport/Smtp.php

@@ -201,9 +201,8 @@ public function send(Message $message)
         // If sending multiple messages per session use existing adapter
         $connection = $this->getConnection();
 
-        if (!($connection instanceof Protocol\Smtp)) {
-            // First time connecting
-            $connection = $this->lazyLoadConnection();
+        if (!($connection instanceof Protocol\Smtp) || !$connection->hasSession()) {
+            $connection = $this->connect();
         } else {
             // Reset connection to ensure reliable transaction
             $connection->rset();
@@ -322,8 +321,21 @@ protected function lazyLoadConnection()
         $config['port'] = $options->getPort();
         $connection = $this->plugin($options->getConnectionClass(), $config);
         $this->connection = $connection;
+        return $this->connect();
+    }
+
+    /**
+     * Connect the connection, and pass it helo
+     *
+     * @return Protocol\Smtp
+     */
+    protected function connect()
+    {
+        if (!$this->connection instanceof Protocol\Smtp) {
+            $this->lazyLoadConnection();
+        }
         $this->connection->connect();
-        $this->connection->helo($options->getName());
+        $this->connection->helo($this->getOptions()->getName());
         return $this->connection;
     }
 }

test/Protocol/SmtpTest.php

@@ -46,7 +46,7 @@ public function testSendMinimalMail()
             ->setBody('testSendMailWithoutMinimalHeaders')
             ->addTo('zf-devteam@zend.com', 'ZF DevTeam')
         ;
-        $expectedMessage = "RSET\r\n"
+        $expectedMessage = "EHLO localhost\r\n"
                            . "MAIL FROM:<ralph.schindler@zend.com>\r\n"
                            . "DATA\r\n"
                            . "Date: Sun, 10 Jun 2012 20:07:24 +0200\r\n"

test/TestAsset/SmtpProtocolSpy.php

@@ -24,28 +24,27 @@ class SmtpProtocolSpy extends Smtp
     protected $connect = false;
     protected $mail;
     protected $rcptTest = array();
-    protected $sess = true;
 
     public function connect()
     {
         $this->connect = true;
         return true;
     }
 
-    public function helo($serverName = '127.0.0.1')
+    public function disconnect()
     {
-        parent::helo($serverName);
+        $this->connect = false;
+        parent::disconnect();
     }
 
-    public function quit()
+    public function helo($serverName = '127.0.0.1')
     {
-        $this->rset();
+        parent::helo($serverName);
     }
 
-    public function disconnect()
+    public function quit()
     {
-        $this->connect = false;
-        $this->rset();
+        parent::quit();
     }
 
     public function rset()

test/Transport/SmtpTest.php

@@ -157,7 +157,7 @@ public function testAutoDisconnectTrue()
     {
         $this->connection->connect();
         unset($this->transport);
-        $this->assertFalse($this->connection->isConnected());
+        $this->assertFalse($this->connection->hasSession());
     }
 
     public function testAutoDisconnectFalse()
@@ -175,4 +175,16 @@ public function testDisconnect()
         $this->transport->disconnect();
         $this->assertFalse($this->connection->isConnected());
     }
+
+    public function testDisconnectSendReconnects()
+    {
+        $this->assertFalse($this->connection->hasSession());
+        $this->transport->send($this->getMessage());
+        $this->assertTrue($this->connection->hasSession());
+        $this->connection->disconnect();
+
+        $this->assertFalse($this->connection->hasSession());
+        $this->transport->send($this->getMessage());
+        $this->assertTrue($this->connection->hasSession());
+    }
 }