Merge branch '4.4' into 5.1

fabpot · fabpot · commit 0d9aac0844b0 · 2021-01-05T07:22:18.000+01:00
* 4.4:
  Remove full head content in HTML to text converter
  apply the sort callback on the whole search result
diff --git a/Mime/BodyRenderer.php b/Mime/BodyRenderer.php
@@ -74,6 +74,6 @@ private function convertHtmlToText(string $html): string
             return $this->converter->convert($html);
         }
 
-        return strip_tags(preg_replace('{<(head|style)\b.*?</\1>}i', '', $html));
+        return strip_tags(preg_replace('{<(head|style)\b.*?</\1>}is', '', $html));
     }
 }
diff --git a/Tests/Mime/BodyRendererTest.php b/Tests/Mime/BodyRendererTest.php
@@ -37,6 +37,23 @@ public function testRenderHtmlOnly()
         $this->assertEquals(str_replace('=', '=3D', $html), $body->getParts()[1]->bodyToString());
     }
 
+    public function testRenderMultiLineHtmlOnly()
+    {
+        $html = <<<HTML
+<head>
+<style type="text/css">
+css
+</style>
+</head>
+<b>HTML</b>
+HTML;
+        $email = $this->prepareEmail(null, $html);
+        $body = $email->getBody();
+        $this->assertInstanceOf(AlternativePart::class, $body);
+        $this->assertEquals('HTML', str_replace(["\r", "\n"], '', $body->getParts()[0]->bodyToString()));
+        $this->assertEquals(str_replace(['=', "\n"], ['=3D', "\r\n"], $html), $body->getParts()[1]->bodyToString());
+    }
+
     public function testRenderHtmlOnlyWithTextSet()
     {
         $email = $this->prepareEmail(null, '<b>HTML</b>');

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,6 @@ private function convertHtmlToText(string $html): string`
`74`	`74`	`return $this->converter->convert($html);`
`75`	`75`	`}`
`76`	`76`
`77`		`- return strip_tags(preg_replace('{<(head\|style)\b.*?</\1>}i', '', $html));`
	`77`	`+ return strip_tags(preg_replace('{<(head\|style)\b.*?</\1>}is', '', $html));`
`78`	`78`	`}`
`79`	`79`	`}`