Merge pull request #102 from genkgo/fix_double_html_content

frederikbosch · web-flow · commit c39138079515 · 2022-07-27T10:48:36.000+02:00
when a message contains multiple html parts, extract the first one
diff --git a/src/MessageBodyCollection.php b/src/MessageBodyCollection.php
@@ -396,7 +396,7 @@ private function extractFromMimePart(MultiPartInterface $parts): void
                 $disposition = 'inline';
             }
 
-            if ($contentType === 'text/html' && $disposition === 'inline') {
+            if ($this->html === '' && $contentType === 'text/html' && $disposition === 'inline') {
                 $this->html = self::ensureHtmlCharset(
                     (string)new MimeBodyDecodedStream($part),
                     $charset
diff --git a/test/Stub/MessageBodyCollection/double-html.eml b/test/Stub/MessageBodyCollection/double-html.eml
@@ -0,0 +1,29 @@
+Subject: Hello World
+From: me <me@example.com>
+To: you <you@example.com>
+Cc: other <other@example.com>
+MIME-Version: 1.0
+Content-Type: multipart/alternative; boundary=GenkgoMailV2Part187e28bf3cb4
+
+This is a multipart message in MIME format.
+
+--GenkgoMailV2Part187e28bf3cb4
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+Hello World
+
+--GenkgoMailV2Part187e28bf3cb4
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+<html><head><meta http-equiv="Content-Type" content="text/html;
+charset=UTF-8"/></head><body><p>Hello World</p></body></html>
+
+--GenkgoMailV2Part187e28bf3cb4
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+<html><head><meta http-equiv="Content-Type" content="text/html;
+charset=UTF-8"/></head><body><p>Another Text</p></body></html>
+--GenkgoMailV2Part187e28bf3cb4--
diff --git a/test/Unit/MessageBodyCollectionTest.php b/test/Unit/MessageBodyCollectionTest.php
@@ -617,4 +617,26 @@ public function it_should_accept_an_attachment_with_a_long_filename(): void
             $this->replaceBoundaries((string)$body->createMessage())
         );
     }
+
+    /**
+     * @test
+     */
+    public function it_should_extract_the_first_html_part(): void
+    {
+        $messageBodyCollection = MessageBodyCollection::extract(
+            GenericMessage::fromString(
+                \file_get_contents(__DIR__ . '/../Stub/MessageBodyCollection/double-html.eml')
+            )
+        );
+
+        $this->assertStringNotContainsString(
+            'Another Text',
+            $messageBodyCollection->getHtml()
+        );
+
+        $this->assertStringContainsString(
+            'Hello World',
+            $messageBodyCollection->getHtml()
+        );
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@ private function extractFromMimePart(MultiPartInterface $parts): void`
`396`	`396`	`$disposition = 'inline';`
`397`	`397`	`}`
`398`	`398`
`399`		`- if ($contentType === 'text/html' && $disposition === 'inline') {`
	`399`	`+ if ($this->html === '' && $contentType === 'text/html' && $disposition === 'inline') {`
`400`	`400`	`$this->html = self::ensureHtmlCharset(`
`401`	`401`	`(string)new MimeBodyDecodedStream($part),`
`402`	`402`	`$charset`