minor #60047 [Mailer] fix compatibility with TwigBridge < 7.3 (xabbuh)

fabpot · fabpot · commit b5b0cbf0acb5 · 2025-03-26T12:48:24.000+01:00
This PR was merged into the 7.3 branch. Discussion ---------- [Mailer] fix compatibility with TwigBridge < 7.3 | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT Commits ------- 6ce7ec5 fix compatibility with TwigBridge < 7.3
diff --git a/src/Symfony/Component/Mailer/EventListener/MessageListener.php b/src/Symfony/Component/Mailer/EventListener/MessageListener.php
@@ -122,7 +122,7 @@ private function setHeaders(Message $message): void
 
     private function translateSubject(Message $message): void
     {
-        if (!$message instanceof TemplatedEmail || !$this->translator || !$message->getTranslatableSubject() instanceof TranslatableMessage) {
+        if (!$message instanceof TemplatedEmail || !$this->translator || !method_exists(TemplatedEmail::class, 'getTranslatableSubject') || !$message->getTranslatableSubject() instanceof TranslatableMessage) {
             return;
         }
 
diff --git a/src/Symfony/Component/Mailer/Tests/EventListener/MessageListenerTest.php b/src/Symfony/Component/Mailer/Tests/EventListener/MessageListenerTest.php
@@ -120,6 +120,10 @@ public static function provideHeaders(): iterable
 
     public function testTranslatableSubject()
     {
+        if (!method_exists(TemplatedEmail::class, 'getTranslatableSubject')) {
+            $this->markTestSkipped('symfony/twig-bridge 7.3 or higher required');
+        }
+
         $message = new TemplatedEmail();
         $message->subject(new TranslatableMessage('hello.world'));
         $listener = new MessageListener(translator: new class implements TranslatorInterface {
diff --git a/src/Symfony/Component/Mailer/composer.json b/src/Symfony/Component/Mailer/composer.json
@@ -21,7 +21,7 @@
         "psr/event-dispatcher": "^1",
         "psr/log": "^1|^2|^3",
         "symfony/event-dispatcher": "^6.4|^7.0",
-        "symfony/mime": "^7.3",
+        "symfony/mime": "^7.2",
         "symfony/service-contracts": "^2.5|^3"
     },
     "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ private function setHeaders(Message $message): void`
`122`	`122`
`123`	`123`	`private function translateSubject(Message $message): void`
`124`	`124`	`{`
`125`		`- if (!$message instanceof TemplatedEmail \|\| !$this->translator \|\| !$message->getTranslatableSubject() instanceof TranslatableMessage) {`
	`125`	`+ if (!$message instanceof TemplatedEmail \|\| !$this->translator \|\| !method_exists(TemplatedEmail::class, 'getTranslatableSubject') \|\| !$message->getTranslatableSubject() instanceof TranslatableMessage) {`
`126`	`126`	`return;`
`127`	`127`	`}`
`128`	`128`