This repository has been archived by the owner on Jan 8, 2020. It is now read-only.
Fixes #5962 #6157
Merged
Fixes #5962 #6157
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -107,8 +107,12 @@ public function getMime() | |||
| public function generateMessage($EOL = Mime::LINEEND) | |||
| { | |||
| if (!$this->isMultiPart()) { | |||
| $part = current($this->parts); | |||
| $body = $part->getContent($EOL); | |||
| if (!empty($this->parts)) { | |||
There was a problem hiding this comment.
Can you swap this to remove the else?
|
@Ocramius done ;) please let me know if I missed something , Thank you ;) |
| */ | ||
| public function testPassEmptyArrayIntoSetPartsShouldReturnEmptyString() | ||
| { | ||
| $mailMessage = new Mail\Message(); |
There was a problem hiding this comment.
Do you really need the mail dependency to testZend\Mime?
There was a problem hiding this comment.
it is to proof that this test fix the issue based on #5962 explanation, should I remove it ?
There was a problem hiding this comment.
@samsonasik an integration test in ZendTest\Mail would be better (plus the unit test here)
|
@Ocramius done ;) I added test in |
|
@samsonasik thanks, this is much cleaner! |
Ocramius
added a commit
that referenced
this pull request
Apr 30, 2014
weierophinney
pushed a commit
to zendframework/zend-mail
that referenced
this pull request
May 14, 2015
weierophinney
pushed a commit
to zendframework/zend-mail
that referenced
this pull request
May 14, 2015
…ng-on-no-part' into develop Close zendframework/zendframework#5962 Close zendframework/zendframework#6157 Forward Port zendframework/zendframework#5962 Forward Port zendframework/zendframework#6157
gianarb
pushed a commit
to zendframework/zend-mime
that referenced
this pull request
May 15, 2015
gianarb
pushed a commit
to zendframework/zend-mime
that referenced
this pull request
May 15, 2015
…ng-on-no-part' into develop Close zendframework/zendframework#5962 Close zendframework/zendframework#6157 Forward Port zendframework/zendframework#5962 Forward Port zendframework/zendframework#6157
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5962 . Based on Zend\Mime\Message::generateMessage() comment description, If no part had been added, an empty string is returned.