bug #38433 [Mime] Fix serialization of RawMessage (gilbertsoft)

fabpot · fabpot · commit 87f328428e76 · 2020-10-06T16:40:04.000+02:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [Mime] Fix serialization of RawMessage | Q | A | ------------- | --- | Branch? | 4.4  | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #38430, Related #33394  | License | MIT | Doc PR | -  The serialization of RawMessage is currently broken if using a generator for message like done by `Symfony\Component\Mailer\SentMessage` see https://github.com/symfony/symfony/blob/5f1c3a797247a6d54992384df00bb22741fc1c34/src/Symfony/Component/Mailer/SentMessage.php#L45 This patch converts the message to a string so further serialization can be done. This patch probably also solves #33394.  Commits ------- fd99eb2 [Mime] Fix serialization of RawMessage
diff --git a/src/Symfony/Component/Mime/RawMessage.php b/src/Symfony/Component/Mime/RawMessage.php
@@ -78,7 +78,7 @@ final public function unserialize($serialized)
 
     public function __serialize(): array
     {
-        return [$this->message];
+        return [$this->toString()];
     }
 
     public function __unserialize(array $data): void
diff --git a/src/Symfony/Component/Mime/Tests/RawMessageTest.php b/src/Symfony/Component/Mime/Tests/RawMessageTest.php
@@ -32,4 +32,18 @@ public function testToString()
         $this->assertEquals('some string', $message->toString());
         $this->assertEquals('some string', implode('', iterator_to_array($message->toIterable())));
     }
+
+    public function testSerialization()
+    {
+        $message = new RawMessage('string');
+        $this->assertEquals('string', unserialize(serialize($message))->toString());
+        // calling methods more than once work
+        $this->assertEquals('string', unserialize(serialize($message))->toString());
+
+        $message = new RawMessage(new \ArrayObject(['some', ' ', 'string']));
+        $message = new RawMessage($message->toIterable());
+        $this->assertEquals('some string', unserialize(serialize($message))->toString());
+        // calling methods more than once work
+        $this->assertEquals('some string', unserialize(serialize($message))->toString());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ final public function unserialize($serialized)`
`78`	`78`
`79`	`79`	`public function __serialize(): array`
`80`	`80`	`{`
`81`		`- return [$this->message];`
	`81`	`+ return [$this->toString()];`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public function __unserialize(array $data): void`