Merge branch '5.1'

nicolas-grekas · nicolas-grekas · commit 53f48bd73d71 · 2020-05-30T22:38:10.000+02:00
* 5.1:
  Fix abstract method name in PHP doc block
  Various cleanups
  [HttpClient] fix issues in tests
  Fixes sprintf(): Too few arguments in form transformer
  [Console] Fix QuestionHelper::disableStty()
  [Validator] Use Mime component to determine mime type for file validator
  validate subforms in all validation groups
  Update Hungarian translations
  Add meaningful message when Process is not installed (ProcessHelper)
  [Messenger] Change the default notify timeout value for PostgreSQL
  [PropertyAccess] Fix TypeError parsing again.
  [TwigBridge] fix fallback html-to-txt body converter
  [Security/Http] fix merge
  [ErrorHandler] fix setting $trace to null in FatalError
  [Form] add missing Czech validators translation
  [Validator] add missing Czech translations
  never directly validate Existence (Required/Optional) constraints
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($html);
+        return strip_tags(preg_replace('{<(head|style)\b.*?</\1>}i', '', $html));
     }
 }
diff --git 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, '<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`