Merge branch 'hotfix/zendframework/zendframework#5962-mime-empty-stri…

…ng-on-no-part' into develop Close zendframework/zendframework#5962 Close zendframework/zendframework#6157 Forward Port zendframework/zendframework#5962 Forward Port zendframework/zendframework#6157
zendframework · Apr 30, 2014 · a90af82 · a90af82
commit a90af82
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/Message.php b/src/Message.php
@@ -107,6 +107,9 @@ public function getMime()
     public function generateMessage($EOL = Mime::LINEEND)
     {
         if (!$this->isMultiPart()) {
+            if (empty($this->parts)) {
+                return '';
+            }
             $part = current($this->parts);
             $body = $part->getContent($EOL);
         } else {

diff --git a/test/MessageTest.php b/test/MessageTest.php
@@ -124,4 +124,15 @@ public function testNonMultipartMessageShouldNotRemovePartFromMessage()
         $test  = current($parts);
         $this->assertSame($part, $test);
     }
+
+    /**
+     * @group ZF2-5962
+     */
+    public function testPassEmptyArrayIntoSetPartsShouldReturnEmptyString()
+    {
+        $mimeMessage = new Mime\Message();
+        $mimeMessage->setParts(array());
+
+        $this->assertEquals('', $mimeMessage->generateMessage());
+    }
 }