bug #52719 [Mime] Add TemplatedEmail::$locale to the serialized props (mkrauser)

fabpot · fabpot · commit 0c9985cee491 · 2023-11-25T09:25:24.000+01:00
This PR was squashed before being merged into the 6.4 branch. Discussion ---------- [Mime] Add `TemplatedEmail::$locale` to the serialized props | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? |no | Deprecations? | no | Issues | Fix #52718 | License | MIT To use the locale-property when working with Symfony Messenger asynchronously it has to be serialized. Commits ------- cedb7cc [Mime] Add `TemplatedEmail::$locale` to the serialized props
diff --git a/src/Symfony/Bridge/Twig/Mime/TemplatedEmail.php b/src/Symfony/Bridge/Twig/Mime/TemplatedEmail.php
@@ -100,7 +100,7 @@ public function markAsRendered(): void
      */
     public function __serialize(): array
     {
-        return [$this->htmlTemplate, $this->textTemplate, $this->context, parent::__serialize()];
+        return [$this->htmlTemplate, $this->textTemplate, $this->context, parent::__serialize(),  $this->locale];
     }
 
     /**
@@ -109,6 +109,7 @@ public function __serialize(): array
     public function __unserialize(array $data): void
     {
         [$this->htmlTemplate, $this->textTemplate, $this->context, $parentData] = $data;
+        $this->locale = $data[4] ?? null;
 
         parent::__unserialize($parentData);
     }
diff --git a/src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php b/src/Symfony/Bridge/Twig/Tests/Mime/TemplatedEmailTest.php
@@ -43,12 +43,14 @@ public function testSerialize()
             ->textTemplate('text.txt.twig')
             ->htmlTemplate('text.html.twig')
             ->context($context = ['a' => 'b'])
+            ->locale($locale = 'fr_FR')
         ;
 
         $email = unserialize(serialize($email));
         $this->assertEquals('text.txt.twig', $email->getTextTemplate());
         $this->assertEquals('text.html.twig', $email->getHtmlTemplate());
         $this->assertEquals($context, $email->getContext());
+        $this->assertEquals($locale, $email->getLocale());
     }
 
     public function testSymfonySerialize()

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function markAsRendered(): void`
`100`	`100`	`*/`
`101`	`101`	`public function __serialize(): array`
`102`	`102`	`{`
`103`		`- return [$this->htmlTemplate, $this->textTemplate, $this->context, parent::__serialize()];`
	`103`	`+ return [$this->htmlTemplate, $this->textTemplate, $this->context, parent::__serialize(), $this->locale];`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`/**`
`@@ -109,6 +109,7 @@ public function __serialize(): array`
`109`	`109`	`public function __unserialize(array $data): void`
`110`	`110`	`{`
`111`	`111`	`[$this->htmlTemplate, $this->textTemplate, $this->context, $parentData] = $data;`
	`112`	`+ $this->locale = $data[4] ?? null;`
`112`	`113`
`113`	`114`	`parent::__unserialize($parentData);`
`114`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,14 @@ public function testSerialize()`
`43`	`43`	`->textTemplate('text.txt.twig')`
`44`	`44`	`->htmlTemplate('text.html.twig')`
`45`	`45`	`->context($context = ['a' => 'b'])`
	`46`	`+ ->locale($locale = 'fr_FR')`
`46`	`47`	`;`
`47`	`48`
`48`	`49`	`$email = unserialize(serialize($email));`
`49`	`50`	`$this->assertEquals('text.txt.twig', $email->getTextTemplate());`
`50`	`51`	`$this->assertEquals('text.html.twig', $email->getHtmlTemplate());`
`51`	`52`	`$this->assertEquals($context, $email->getContext());`
	`53`	`+ $this->assertEquals($locale, $email->getLocale());`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`public function testSymfonySerialize()`