test double text mime (#107)

* test double text mime
genkgo · Jul 24, 2023 · d3fe29f · d3fe29f
1 parent d5edf5c
commit d3fe29f
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 2 deletions.
diff --git a/src/MessageBodyCollection.php b/src/MessageBodyCollection.php
@@ -404,7 +404,7 @@ private function extractFromMimePart(MultiPartInterface $parts): void
                 continue;
             }
 
-            if ($contentType === 'text/plain' && $disposition === 'inline') {
+            if ($this->text->isEmpty() && $contentType === 'text/plain' && $disposition === 'inline') {
                 $this->text = AlternativeText::fromEncodedText((string)new MimeBodyDecodedStream($part), $charset);
                 continue;
             }

diff --git a/src/Transport/PhpMailTransport.php b/src/Transport/PhpMailTransport.php
@@ -56,7 +56,7 @@ public function send(MessageInterface $message): void
                 $headers,
                 $parameters
             );
-        // @codeCoverageIgnoreEnd
+            // @codeCoverageIgnoreEnd
         } else {
             $callback = $this->replacedMailMethod;
             $callback(

diff --git a/test/Stub/MessageBodyCollection/double-text.eml b/test/Stub/MessageBodyCollection/double-text.eml
@@ -0,0 +1,23 @@
+Subject: Hello World
+To: me <[email protected]>
+Cc: other <[email protected]>
+MIME-Version: 1.0
+Content-Type:
+ multipart/mixed; boundary=Apple-Mail-E26EA4FA-4B4F-4801-BEB2-43B254B76FDF
+Content-Transfer-Encoding: 7bit
+
+--Apple-Mail-E26EA4FA-4B4F-4801-BEB2-43B254B76FDF
+Content-Type: text/plain;
+	charset=us-ascii
+Content-Transfer-Encoding: quoted-printable
+
+Hello World
+
+--Apple-Mail-E26EA4FA-4B4F-4801-BEB2-43B254B76FDF
+Content-Type: text/plain;
+	charset=us-ascii
+Content-Transfer-Encoding: 7bit
+
+Another Text
+
+--Apple-Mail-E26EA4FA-4B4F-4801-BEB2-43B254B76FDF--
diff --git a/test/Unit/MessageBodyCollectionTest.php b/test/Unit/MessageBodyCollectionTest.php
@@ -639,4 +639,26 @@ public function it_should_extract_the_first_html_part(): void
             $messageBodyCollection->getHtml()
         );
     }
+
+    /**
+     * @test
+     */
+    public function it_should_extract_the_first_text_part(): void
+    {
+        $messageBodyCollection = MessageBodyCollection::extract(
+            GenericMessage::fromString(
+                \file_get_contents(__DIR__ . '/../Stub/MessageBodyCollection/double-text.eml')
+            )
+        );
+
+        $this->assertStringNotContainsString(
+            'Another Text',
+            $messageBodyCollection->getText()->getRaw()
+        );
+
+        $this->assertStringContainsString(
+            'Hello World',
+            $messageBodyCollection->getText()->getRaw()
+        );
+    }
 }