Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jan 8, 2020. It is now read-only.

Fixes #5962 #6157

Merged
Ocramius merged 4 commits into from
Apr 30, 2014
Merged

Fixes #5962 #6157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
029744d
Fixes #5962
samsonasik Apr 17, 2014
57bc719
remove unused execution getBodyText() because already executed in ass…
samsonasik Apr 17, 2014
c384a0a
swap to remove else
samsonasik Apr 30, 2014
8c161a3
add test in ZendTest\Mail for MimeMessage and remove dependencies of …
samsonasik Apr 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions library/Zend/Mime/Message.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
12 changes: 12 additions & 0 deletions tests/ZendTest/Mail/MessageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,4 +683,16 @@ public function testRestoreFromSerializedString()
$restoredMessage = Message::fromString($serialized);
$this->assertEquals($serialized, $restoredMessage->toString());
}

/**
* @group ZF2-5962
*/
public function testPassEmptyArrayIntoSetPartsOfMimeMessageShouldReturnEmptyBodyString()
{
$mimeMessage = new MimeMessage();
$mimeMessage->setParts(array());

$this->message->setBody($mimeMessage);
$this->assertEquals('', $this->message->getBodyText());
}
}
11 changes: 11 additions & 0 deletions tests/ZendTest/Mime/MessageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}