bug #47455 [Mime] Fix TextPart broken after being serialized (fabpot)

fabpot · fabpot · commit 72a3ad54ca8b · 2022-09-02T10:03:51.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Mime] Fix TextPart broken after being serialized | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | n/a  | License | MIT | Doc PR | n/a When serializing a TextPart, it's broken as we change the body to a string but we don't reset the seekable property (this property was introduced in 5.4). Commits ------- a1a1609 [Mime] Fix TextPart broken after being serialized
diff --git a/src/Symfony/Component/Mime/Part/TextPart.php b/src/Symfony/Component/Mime/Part/TextPart.php
@@ -197,6 +197,7 @@ public function __sleep()
         // convert resources to strings for serialization
         if (null !== $this->seekable) {
             $this->body = $this->getBody();
+            $this->seekable = null;
         }
 
         $this->_headers = $this->getHeaders();
diff --git a/src/Symfony/Component/Mime/Tests/Part/TextPartTest.php b/src/Symfony/Component/Mime/Tests/Part/TextPartTest.php
@@ -87,6 +87,8 @@ public function testSerialize()
         $p = new TextPart($r);
         $p->getHeaders()->addTextHeader('foo', 'bar');
         $expected = clone $p;
-        $this->assertEquals($expected->toString(), unserialize(serialize($p))->toString());
+        $n = unserialize(serialize($p));
+        $this->assertEquals($expected->toString(), $p->toString());
+        $this->assertEquals($expected->toString(), $n->toString());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,7 @@ public function __sleep()`
`197`	`197`	`// convert resources to strings for serialization`
`198`	`198`	`if (null !== $this->seekable) {`
`199`	`199`	`$this->body = $this->getBody();`
	`200`	`+ $this->seekable = null;`
`200`	`201`	`}`
`201`	`202`
`202`	`203`	`$this->_headers = $this->getHeaders();`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,8 @@ public function testSerialize()`
`87`	`87`	`$p = new TextPart($r);`
`88`	`88`	`$p->getHeaders()->addTextHeader('foo', 'bar');`
`89`	`89`	`$expected = clone $p;`
`90`		`- $this->assertEquals($expected->toString(), unserialize(serialize($p))->toString());`
	`90`	`+ $n = unserialize(serialize($p));`
	`91`	`+ $this->assertEquals($expected->toString(), $p->toString());`
	`92`	`+ $this->assertEquals($expected->toString(), $n->toString());`
`91`	`93`	`}`
`92`	`94`	`}`