Merge branch '4.4' into 5.3

nicolas-grekas · nicolas-grekas · commit 0e2cc161f1e1 · 2021-12-28T18:08:14.000+01:00
* 4.4:
  [DomCrawler] Fix HTML5 parser charset option
  cs fix
  [HttpKernel] Do not attempt to register enum arguments in controller service locator
  [Cache] Don't lock when doing nested computations
  [Messenger] fix Redis support on 32b arch
  [HttpFoundation] Fix notice when HTTP_PHP_AUTH_USER passed without pass
diff --git a/Crawler.php b/Crawler.php
@@ -1146,7 +1146,7 @@ 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), [], $charset);
+        return $this->html5Parser->parse($this->convertToHtmlEntities($htmlContent, $charset));
     }
 
     private function parseXhtml(string $htmlContent, string $charset = 'UTF-8'): \DOMDocument

Original file line number	Diff line number	Diff line change
`@@ -1146,7 +1146,7 @@ protected function sibling(\DOMNode $node, string $siblingDir = 'nextSibling')`
`1146`	`1146`
`1147`	`1147`	`private function parseHtml5(string $htmlContent, string $charset = 'UTF-8'): \DOMDocument`
`1148`	`1148`	`{`
`1149`		`- return $this->html5Parser->parse($this->convertToHtmlEntities($htmlContent, $charset), [], $charset);`
	`1149`	`+ return $this->html5Parser->parse($this->convertToHtmlEntities($htmlContent, $charset));`
`1150`	`1150`	`}`
`1151`	`1151`
`1152`	`1152`	`private function parseXhtml(string $htmlContent, string $charset = 'UTF-8'): \DOMDocument`