Allow get content type from files when rendering attachments

aplus-framework · Oct 2, 2022 · fcb0729 · fcb0729
1 parent 507d84b
commit fcb0729
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/Message.php b/src/Message.php
@@ -338,7 +338,8 @@ protected function renderAttachments() : string
             $contents = (string) \file_get_contents($attachment);
             $contents = \base64_encode($contents);
             $part .= '--mixed-' . $this->getBoundary() . $crlf;
-            $part .= 'Content-Type: application/octet-stream; name="' . $filename . '"' . $crlf;
+            $part .= 'Content-Type: ' . $this->getContentType($attachment)
+                . '; name="' . $filename . '"' . $crlf;
             $part .= 'Content-Disposition: attachment; filename="' . $filename . '"' . $crlf;
             $part .= 'Content-Transfer-Encoding: base64' . $crlf . $crlf;
             $part .= \chunk_split($contents) . $crlf;

diff --git a/tests/MessageTest.php b/tests/MessageTest.php
@@ -150,9 +150,19 @@ public function testAttachments() : void
         self::assertEmpty($this->message->getAttachments());
         $this->message->addAttachment(__FILE__);
         self::assertSame([__FILE__], $this->message->getAttachments());
+        $this->message->addAttachment(__DIR__ . '/logo-circle.png');
+        self::assertSame([
+            __FILE__,
+            __DIR__ . '/logo-circle.png',
+        ], $this->message->getAttachments());
+        $contents = $this->message->renderAttachments();
+        self::assertStringContainsString(
+            'text/x-php; name="MessageTest.php"',
+            $contents
+        );
         self::assertStringContainsString(
-            'application/octet-stream; name="MessageTest.php"',
-            $this->message->renderAttachments()
+            'image/png; name="logo-circle.png"',
+            $contents
         );
     }