feature #44917 [Mailer] Add downloadable attachments to profiler (dbrekelmans)

fabpot · fabpot · commit 19e99a68b29b · 2022-01-19T17:02:10.000+01:00
This PR was squashed before being merged into the 6.1 branch. Discussion ---------- [Mailer] Add downloadable attachments to profiler | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | n/a | License | MIT | Doc PR | n/a This PR allows developers to download email attachments from the profiler. This is very useful for debugging if you are sending emails with PDF attachments for example, and you want to check some data within the attachment through the profiler. Commits ------- 4320220 [Mailer] Add downloadable attachments to profiler
diff --git a/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md b/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.1
+---
+
+ * Add a download link in mailer profiler for email attachments
+
 5.4
 ---
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/mailer.html.twig
@@ -187,6 +187,15 @@
                                                     <div class="tab">
                                                         <h3 class="tab-title">Attachment #{{ loop.index }}</h3>
                                                         <div class="tab-content">
+                                                            <p>
+                                                                <a href="data:{{ attachment.contentType|default('application/octet-stream') }};base64,{{ collector.base64Encode(attachment.body) }}" download="{{ attachment.filename|default('attachment') }}">
+                                                                    {% if attachment.filename|default %}
+                                                                        {{ attachment.filename }}
+                                                                    {% else %}
+                                                                        <em>(no filename)</em>
+                                                                    {% endif %}
+                                                                </a>
+                                                            </p>
                                                             <pre class="prewrap" style="max-height: 600px">{{ attachment.toString() }}</pre>
                                                         </div>
                                                     </div>
diff --git a/src/Symfony/Component/Mime/CHANGELOG.md b/src/Symfony/Component/Mime/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.1
+---
+
+ * Add `DataPart::getFilename()` and `DataPart::getContentType()`
+
 6.0
 ---
 
diff --git a/src/Symfony/Component/Mime/Part/DataPart.php b/src/Symfony/Component/Mime/Part/DataPart.php
@@ -122,6 +122,16 @@ public function asDebugString(): string
         return $str;
     }
 
+    public function getFilename(): ?string
+    {
+        return $this->filename;
+    }
+
+    public function getContentType(): string
+    {
+        return implode('/', [$this->getMediaType(), $this->getMediaSubtype()]);
+    }
+
     private function generateContentId(): string
     {
         return bin2hex(random_bytes(16)).'@symfony';
diff --git a/src/Symfony/Component/Mime/Tests/Part/DataPartTest.php b/src/Symfony/Component/Mime/Tests/Part/DataPartTest.php
@@ -135,6 +135,24 @@ public function testHasContentId()
         $this->assertTrue($p->hasContentId());
     }
 
+    public function testGetFilename()
+    {
+        $p = new DataPart('content', null);
+        self::assertNull($p->getFilename());
+
+        $p = new DataPart('content', 'filename');
+        self::assertSame('filename', $p->getFilename());
+    }
+
+    public function testGetContentType()
+    {
+        $p = new DataPart('content');
+        self::assertSame('application/octet-stream', $p->getContentType());
+
+        $p = new DataPart('content', null, 'application/pdf');
+        self::assertSame('application/pdf', $p->getContentType());
+    }
+
     public function testSerialize()
     {
         $r = fopen('php://memory', 'r+', false);
