Fix email attachment unserialization

X-Coder264 · X-Coder264 · commit 56a4a33e7fdd · 2023-08-25T20:08:20.000+02:00
diff --git a/src/Symfony/Component/Mime/Part/DataPart.php b/src/Symfony/Component/Mime/Part/DataPart.php
@@ -156,6 +156,9 @@ public function __wakeup()
             throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
         }
         foreach (['body', 'charset', 'subtype', 'disposition', 'name', 'encoding'] as $name) {
+            if ('body' === $name && isset($this->_parent[$name]) && $this->_parent[$name] instanceof File) {
+                $this->_parent[$name] = file_get_contents($this->_parent[$name]->getPath());
+            }
             if (null !== $this->_parent[$name] && !\is_string($this->_parent[$name])) {
                 throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
             }
diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php
@@ -662,16 +662,30 @@ public function testBodyCache()
     public function testAttachmentBodyIsPartOfTheSerializationEmailPayloadWhenUsingAttachMethod()
     {
         $email = new Email();
-        $email->attach(file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'foo_attachment.txt') ?: '');
+        $email->attach(file_get_contents(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.'foo_attachment.txt') ?: '');
 
         $this->assertTrue(str_contains(serialize($email), 'foo_bar_xyz_123'));
     }
 
     public function testAttachmentBodyIsNotPartOfTheSerializationEmailPayloadWhenUsingAttachFromPathMethod()
     {
         $email = new Email();
-        $email->attachFromPath(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'foo_attachment.txt');
+        $email->attachFromPath(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.'foo_attachment.txt');
 
         $this->assertFalse(str_contains(serialize($email), 'foo_bar_xyz_123'));
     }
+
+    public function testEmailsWithAttachmentsWhichAreAFileInstanceCanBeUnserialized()
+    {
+        $email = new Email();
+        $email->attachFromPath(__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'.\DIRECTORY_SEPARATOR.'foo_attachment.txt');
+
+        $email = unserialize(serialize($email));
+        $this->assertInstanceOf(Email::class, $email);
+
+        $attachments = $email->getAttachments();
+
+        $this->assertCount(1, $attachments);
+        $this->assertStringContainsString('foo_bar_xyz_123', $attachments[0]->getBody());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,9 @@ public function __wakeup()`
`156`	`156`	`throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);`
`157`	`157`	`}`
`158`	`158`	`foreach (['body', 'charset', 'subtype', 'disposition', 'name', 'encoding'] as $name) {`
	`159`	`+ if ('body' === $name && isset($this->_parent[$name]) && $this->_parent[$name] instanceof File) {`
	`160`	`+ $this->_parent[$name] = file_get_contents($this->_parent[$name]->getPath());`
	`161`	`+ }`
`159`	`162`	`if (null !== $this->_parent[$name] && !\is_string($this->_parent[$name])) {`
`160`	`163`	`throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);`
`161`	`164`	`}`