From 13a9659ebceea38814ef8fde6399e36760ea08ad Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 28 May 2020 15:20:36 +0200 Subject: [PATCH] [TwigBridge] fix fallback html-to-txt body converter --- Mime/BodyRenderer.php | 2 +- Tests/Mime/BodyRendererTest.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Mime/BodyRenderer.php b/Mime/BodyRenderer.php index e1031b3d..e082d831 100644 --- 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($html); + return strip_tags(preg_replace('{<(head|style)\b.*?}i', '', $html)); } } diff --git a/Tests/Mime/BodyRendererTest.php b/Tests/Mime/BodyRendererTest.php index 6eeade3a..175a8e19 100644 --- a/Tests/Mime/BodyRendererTest.php +++ b/Tests/Mime/BodyRendererTest.php @@ -29,11 +29,12 @@ public function testRenderTextOnly(): void public function testRenderHtmlOnly(): void { - $email = $this->prepareEmail(null, 'HTML'); + $html = 'headHTML'; + $email = $this->prepareEmail(null, $html); $body = $email->getBody(); $this->assertInstanceOf(AlternativePart::class, $body); $this->assertEquals('HTML', $body->getParts()[0]->bodyToString()); - $this->assertEquals('HTML', $body->getParts()[1]->bodyToString()); + $this->assertEquals(str_replace('=', '=3D', $html), $body->getParts()[1]->bodyToString()); } public function testRenderHtmlOnlyWithTextSet(): void