[twig-bridge] Allow NotificationEmail to be marked as public

maxailloud · fabpot · commit 8f753d27f2ce · 2021-03-12T07:00:23.000+01:00
diff --git a/src/Symfony/Bridge/Twig/CHANGELOG.md b/src/Symfony/Bridge/Twig/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.3
+-----
+
+* Add a new `markAsPublic` method on `NotificationEmail` to change the `importance` context option to null after creation
+
 5.3.0
 -----
 
diff --git a/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php b/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php
@@ -64,12 +64,19 @@ public function __construct(Headers $headers = null, AbstractPart $body = null)
     public static function asPublicEmail(Headers $headers = null, AbstractPart $body = null): self
     {
         $email = new static($headers, $body);
-        $email->context['importance'] = null;
-        $email->context['footer_text'] = null;
+        $email->markAsPublic();
 
         return $email;
     }
 
+    public function markAsPublic(): self
+    {
+        $this->context['importance'] = null;
+        $this->context['footer_text'] = null;
+
+        return $this;
+    }
+
     /**
      * @return $this
      */
diff --git a/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php b/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php
@@ -85,12 +85,35 @@ public function testPublicMail()
             'a' => 'b',
             'footer_text' => null,
         ], $email->getContext());
+
+        $email = (new NotificationEmail())
+            ->markAsPublic()
+            ->markdown('Foo')
+            ->action('Bar', 'http://example.com/')
+            ->context(['a' => 'b'])
+        ;
+
+        $this->assertEquals([
+            'importance' => null,
+            'content' => 'Foo',
+            'exception' => false,
+            'action_text' => 'Bar',
+            'action_url' => 'http://example.com/',
+            'markdown' => true,
+            'raw' => false,
+            'a' => 'b',
+            'footer_text' => null,
+        ], $email->getContext());
     }
 
     public function testPublicMailSubject()
     {
         $email = NotificationEmail::asPublicEmail()->from('me@example.com')->subject('Foo');
         $headers = $email->getPreparedHeaders();
         $this->assertSame('Foo', $headers->get('Subject')->getValue());
+
+        $email = (new NotificationEmail())->markAsPublic()->from('me@example.com')->subject('Foo');
+        $headers = $email->getPreparedHeaders();
+        $this->assertSame('Foo', $headers->get('Subject')->getValue());
     }
 }
