Merge branch '6.4' into 7.0

xabbuh · xabbuh · commit f8f02f282aef · 2024-04-05T21:52:53.000+02:00
* 6.4:
  fix merge
  fix syntax for PHP 7.2
  [Security] Fix Danish translations
  [Messenger] Improve deadlock handling on `ack()` and `reject()`
  [DomCrawler] Encode html entities only if nessecary
  [Serializer] reset backed_enum priority, and re-prioritise translatable
  [Validator] Accept `Stringable` in `ExecutionContext::build/addViolation()`
  [Serializer] Ignore when using #[Ignore] on a non-accessor
  [Filesystem] Strengthen the check of file permissions in `dumpFile`
  [Serializer] Fix XML scalar to object denormalization
  [HttpClient][EventSourceHttpClient] Fix consuming SSEs with \r\n separator
diff --git a/Crawler.php b/Crawler.php
@@ -1061,12 +1061,30 @@ protected function sibling(\DOMNode $node, string $siblingDir = 'nextSibling'):
 
     private function parseHtml5(string $htmlContent, string $charset = 'UTF-8'): \DOMDocument
     {
-        return $this->html5Parser->parse($this->convertToHtmlEntities($htmlContent, $charset));
+        if (!$this->supportsEncoding($charset)) {
+            $htmlContent = $this->convertToHtmlEntities($htmlContent, $charset);
+            $charset = 'UTF-8';
+        }
+
+        return $this->html5Parser->parse($htmlContent, ['encoding' => $charset]);
+    }
+
+    private function supportsEncoding(string $encoding): bool
+    {
+        try {
+            return '' === @mb_convert_encoding('', $encoding, 'UTF-8');
+        } catch (\Throwable $e) {
+            return false;
+        }
     }
 
     private function parseXhtml(string $htmlContent, string $charset = 'UTF-8'): \DOMDocument
     {
-        $htmlContent = $this->convertToHtmlEntities($htmlContent, $charset);
+        if ('UTF-8' === $charset && preg_match('//u', $htmlContent)) {
+            $htmlContent = '<?xml encoding="UTF-8">'.$htmlContent;
+        } else {
+            $htmlContent = $this->convertToHtmlEntities($htmlContent, $charset);
+        }
 
         $internalErrors = libxml_use_internal_errors(true);
 
diff --git a/Tests/AbstractCrawlerTestCase.php b/Tests/AbstractCrawlerTestCase.php
@@ -184,6 +184,10 @@ public function testAddContent()
         $crawler = $this->createCrawler();
         $crawler->addContent($this->getDoctype().'<html><meta http-equiv="Content-Type" content="text/html; charset=unicode" /><div class="foo"></html></html>');
         $this->assertEquals('foo', $crawler->filterXPath('//div')->attr('class'), '->addContent() ignores bad charset');
+
+        $crawler = $this->createCrawler();
+        $crawler->addContent($this->getDoctype().'<html><script>var foo = "bär";</script></html>', 'text/html; charset=UTF-8');
+        $this->assertEquals('var foo = "bär";', $crawler->filterXPath('//script')->text(), '->addContent() does not interfere with script content');
     }
 
     /**
