Suggestions by @nicolas-grekas to help, deserialize previously serialized payloads

mkrauser · mkrauser · commit 1bc73619f9a1 · 2023-11-24T21:23:28.000+01:00
diff --git a/src/Symfony/Bridge/Twig/Mime/TemplatedEmail.php b/src/Symfony/Bridge/Twig/Mime/TemplatedEmail.php
@@ -100,15 +100,16 @@ public function markAsRendered(): void
      */
     public function __serialize(): array
     {
-        return [$this->htmlTemplate, $this->textTemplate, $this->context, $this->locale, parent::__serialize()];
+        return [$this->htmlTemplate, $this->textTemplate, $this->context,parent::__serialize(),  $this->locale];
     }
 
     /**
      * @internal
      */
     public function __unserialize(array $data): void
     {
-        [$this->htmlTemplate, $this->textTemplate, $this->context, $this->locale, $parentData] = $data;
+        [$this->htmlTemplate, $this->textTemplate, $this->context, $parentData] = $data;
+        $this->locale = $data[4] ?? null;
 
         parent::__unserialize($parentData);
     }

Original file line number	Diff line number	Diff line change
`@@ -100,15 +100,16 @@ public function markAsRendered(): void`
`100`	`100`	`*/`
`101`	`101`	`public function __serialize(): array`
`102`	`102`	`{`
`103`		`- return [$this->htmlTemplate, $this->textTemplate, $this->context, $this->locale, parent::__serialize()];`
	`103`	`+ return [$this->htmlTemplate, $this->textTemplate, $this->context,parent::__serialize(), $this->locale];`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`/**`
`107`	`107`	`* @internal`
`108`	`108`	`*/`
`109`	`109`	`public function __unserialize(array $data): void`
`110`	`110`	`{`
`111`		`- [$this->htmlTemplate, $this->textTemplate, $this->context, $this->locale, $parentData] = $data;`
	`111`	`+ [$this->htmlTemplate, $this->textTemplate, $this->context, $parentData] = $data;`
	`112`	`+ $this->locale = $data[4] ?? null;`
`112`	`113`
`113`	`114`	`parent::__unserialize($parentData);`
`114`	`115`	`}`