Merge branch 'hotfix/3638' into develop

Forward port zendframework/zendframework#3638

src/Message.php

@@ -106,9 +106,9 @@ public function getMime()
      */
     public function generateMessage($EOL = Mime::LINEEND)
     {
-        if (! $this->isMultiPart()) {
-            $body = array_shift($this->parts);
-            $body = $body->getContent($EOL);
+        if (!$this->isMultiPart()) {
+            $part = current($this->parts);
+            $body = $part->getContent($EOL);
         } else {
             $mime = $this->getMime();
 
@@ -176,8 +176,8 @@ public function getPartContent($partnum, $EOL = Mime::LINEEND)
      */
     protected static function _disassembleMime($body, $boundary)
     {
-        $start = 0;
-        $res = array();
+        $start  = 0;
+        $res    = array();
         // find every mime part limiter and cut out the
         // string before it.
         // the part before the first boundary string is discarded:
@@ -260,6 +260,7 @@ public static function createFromMessage($message, $boundary, $EOL = Mime::LINEE
             }
             $res->addPart($newPart);
         }
+
         return $res;
     }
 }

test/MessageTest.php

@@ -116,4 +116,16 @@ public function testDecodeMimeMessage()
         $this->assertEquals('base64', $part2->encoding);
         $this->assertEquals('12', $part2->id);
     }
+
+    public function testNonMultipartMessageShouldNotRemovePartFromMessage()
+    {
+        $message = new Mime\Message();  // No Parts
+        $part    = new Mime\Part('This is a test');
+        $message->addPart($part);
+        $message->generateMessage();
+
+        $parts = $message->getParts();
+        $test  = current($parts);
+        $this->assertSame($part, $test);
+    }
 }