bug #36995 [TwigBridge] fix fallback html-to-txt body converter (nicolas-grekas)

fabpot · fabpot · commit 96d2d19de23a · 2020-05-28T15:43:01.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [TwigBridge] fix fallback html-to-txt body converter | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Right now, the content of the `<head>` and `<style>` are dumped as text. This fixes it. Of course, use `league/html-to-markdown` if you need a better parser. Commits ------- 6f59d60 [TwigBridge] fix fallback html-to-txt body converter
diff --git a/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php b/src/Symfony/Bridge/Twig/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.*?</\1>}i', '', $html));
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Mime/BodyRendererTest.php b/src/Symfony/Bridge/Twig/Tests/Mime/BodyRendererTest.php
@@ -29,11 +29,12 @@ public function testRenderTextOnly(): void
 
     public function testRenderHtmlOnly(): void
     {
-        $email = $this->prepareEmail(null, '<b>HTML</b>');
+        $html = '<head>head</head><b>HTML</b><style type="text/css">css</style>';
+        $email = $this->prepareEmail(null, $html);
         $body = $email->getBody();
         $this->assertInstanceOf(AlternativePart::class, $body);
         $this->assertEquals('HTML', $body->getParts()[0]->bodyToString());
-        $this->assertEquals('<b>HTML</b>', $body->getParts()[1]->bodyToString());
+        $this->assertEquals(str_replace('=', '=3D', $html), $body->getParts()[1]->bodyToString());
     }
 
     public function testRenderHtmlOnlyWithTextSet(): void

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($html);`
	`77`	`+ return strip_tags(preg_replace('{<(head\|style)\b.*?</\1>}i', '', $html));`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,12 @@ public function testRenderTextOnly(): void`
`29`	`29`
`30`	`30`	`public function testRenderHtmlOnly(): void`
`31`	`31`	`{`
`32`		`- $email = $this->prepareEmail(null, '<b>HTML</b>');`
	`32`	`+ $html = '<head>head</head><b>HTML</b><style type="text/css">css</style>';`
	`33`	`+ $email = $this->prepareEmail(null, $html);`
`33`	`34`	`$body = $email->getBody();`
`34`	`35`	`$this->assertInstanceOf(AlternativePart::class, $body);`
`35`	`36`	`$this->assertEquals('HTML', $body->getParts()[0]->bodyToString());`
`36`		`- $this->assertEquals('<b>HTML</b>', $body->getParts()[1]->bodyToString());`
	`37`	`+ $this->assertEquals(str_replace('=', '=3D', $html), $body->getParts()[1]->bodyToString());`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`public function testRenderHtmlOnlyWithTextSet(): void`