Merge pull request zendframework/zendframework#2 from zendframework/m…

…aster

Update

src/Header/MessageId.php

@@ -117,5 +117,4 @@ public function createMessageId()
 
         return sha1($time . $user . $rand) . '@' . $hostName;
     }
-
 }

src/Protocol/Imap.php

@@ -790,5 +790,4 @@ public function search(array $params)
         }
         return array();
     }
-
 }

src/Protocol/Smtp.php

@@ -45,14 +45,6 @@ class Smtp extends AbstractProtocol
     protected $sess = false;
 
 
-    /**
-     * Indicates the HELO command has been issues
-     *
-     * @var bool
-     */
-    protected $helo = false;
-
-
     /**
      * Indicates an smtp AUTH has been issued and authenticated
      *

src/Storage/AbstractStorage.php

@@ -338,5 +338,4 @@ public function seek($pos)
         }
         $this->iterationPos = $pos;
      }
-
 }

src/Storage/Mbox.php

@@ -397,5 +397,4 @@ public function __wakeup()
             }
         }
     }
-
 }

test/TestAsset/SmtpProtocolSpy.php

@@ -22,7 +22,6 @@
 class SmtpProtocolSpy extends Smtp
 {
     protected $connect = false;
-    protected $helo;
     protected $mail;
     protected $rcptTest = array();
     protected $sess = true;
@@ -36,18 +35,15 @@ public function connect()
     public function helo($serverName = '127.0.0.1')
     {
         parent::helo($serverName);
-        $this->helo = $serverName;
     }
 
     public function quit()
     {
-        $this->helo = null;
         $this->rset();
     }
 
     public function disconnect()
     {
-        $this->helo    = null;
         $this->connect = false;
         $this->rset();
     }
@@ -91,16 +87,6 @@ public function isConnected()
         return $this->connect;
     }
 
-    /**
-     * Get server name we opened a connection with
-     *
-     * @return null|string
-     */
-    public function getHelo()
-    {
-        return $this->helo;
-    }
-
     /**
      * Get value of mail property
      *