Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit 15d1f7555f33 · 2025-11-01T10:19:23.000+01:00
* 7.4:
  [Messenger] Fix unreachable catch
  [DependencyInjection] Fix PHPDoc syntax for InstantiatorInterface
  [DomCrawler] Handle malformed tags in HTML5 parser
  [MonologBundle] Accept HttpExceptionInterface in HttpCodeActivationStrategy
  Add the proper type declarations for the messenger SerializerInterface
  [HttpKernel] Make Kernel::getShareDir() nullable
diff --git a/Crawler.php b/Crawler.php
@@ -1177,7 +1177,11 @@ private function copyFromHtml5ToDom(\Dom\Node $source, \DOMDocument $target): vo
                     continue;
                 }
 
-                $element = $target->createElement($source->tagName);
+                try {
+                    $element = $target->createElement($source->tagName);
+                } catch (\DOMException) {
+                    continue;
+                }
 
                 foreach ($source->attributes as $attr) {
                     try {
diff --git a/Tests/CrawlerTest.php b/Tests/CrawlerTest.php
@@ -1360,6 +1360,13 @@ public static function html5Provider(): iterable
         yield 'All together' => [$BOM.'  <!--c-->'.$html];
     }
 
+    public function testHtml5MalformedContent()
+    {
+        $crawler = $this->createCrawler();
+        $crawler->addHtmlContent('<script&>');
+        self::assertEquals('<head></head><body></body>', $crawler->html());
+    }
+
     public function testAlpineJs()
     {
         $crawler = $this->createCrawler();

Original file line number	Diff line number	Diff line change
`@@ -1360,6 +1360,13 @@ public static function html5Provider(): iterable`
`1360`	`1360`	`yield 'All together' => [$BOM.' <!--c-->'.$html];`
`1361`	`1361`	`}`
`1362`	`1362`
	`1363`	`+ public function testHtml5MalformedContent()`
	`1364`	`+ {`
	`1365`	`+ $crawler = $this->createCrawler();`
	`1366`	`+ $crawler->addHtmlContent('<script&>');`
	`1367`	`+ self::assertEquals('<head></head><body></body>', $crawler->html());`
	`1368`	`+ }`
	`1369`	`+`
`1363`	`1370`	`public function testAlpineJs()`
`1364`	`1371`	`{`
`1365`	`1372`	`$crawler = $this->createCrawler();`