Skip to content

Commit d5179ee

Browse files
X-Coder264fabpot
authored andcommitted
[Mime] Fix email (de)serialization issues
1 parent 9a0cbd5 commit d5179ee

File tree

4 files changed

+33
-2
lines changed

4 files changed

+33
-2
lines changed

Part/DataPart.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public function __wakeup()
156156
throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
157157
}
158158
foreach (['body', 'charset', 'subtype', 'disposition', 'name', 'encoding'] as $name) {
159-
if (null !== $this->_parent[$name] && !\is_string($this->_parent[$name])) {
159+
if (null !== $this->_parent[$name] && !\is_string($this->_parent[$name]) && !$this->_parent[$name] instanceof File) {
160160
throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
161161
}
162162
$r = new \ReflectionProperty(TextPart::class, $name);

Part/TextPart.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ private function chooseEncoding(): string
226226
public function __sleep(): array
227227
{
228228
// convert resources to strings for serialization
229-
if (null !== $this->seekable || $this->body instanceof File) {
229+
if (null !== $this->seekable) {
230230
$this->body = $this->getBody();
231231
$this->seekable = null;
232232
}

Tests/EmailTest.php

+30
Original file line numberDiff line numberDiff line change
@@ -658,4 +658,34 @@ public function testBodyCache()
658658
$body2 = $email->getBody();
659659
$this->assertNotSame($body1, $body2, 'The two bodies must not reference the same object, so the body cache does not ensure that the hash for the DKIM signature is unique.');
660660
}
661+
662+
public function testAttachmentBodyIsPartOfTheSerializationEmailPayloadWhenUsingAttachMethod()
663+
{
664+
$email = new Email();
665+
$email->attach(file_get_contents(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.'foo_attachment.txt') ?: '');
666+
667+
$this->assertTrue(str_contains(serialize($email), 'foo_bar_xyz_123'));
668+
}
669+
670+
public function testAttachmentBodyIsNotPartOfTheSerializationEmailPayloadWhenUsingAttachFromPathMethod()
671+
{
672+
$email = new Email();
673+
$email->attachFromPath(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.'foo_attachment.txt');
674+
675+
$this->assertFalse(str_contains(serialize($email), 'foo_bar_xyz_123'));
676+
}
677+
678+
public function testEmailsWithAttachmentsWhichAreAFileInstanceCanBeUnserialized()
679+
{
680+
$email = new Email();
681+
$email->attachFromPath(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.'foo_attachment.txt');
682+
683+
$email = unserialize(serialize($email));
684+
$this->assertInstanceOf(Email::class, $email);
685+
686+
$attachments = $email->getAttachments();
687+
688+
$this->assertCount(1, $attachments);
689+
$this->assertStringContainsString('foo_bar_xyz_123', $attachments[0]->getBody());
690+
}
661691
}

Tests/Fixtures/foo_attachment.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
foo_bar_xyz_123

0 commit comments

Comments
 (0)