Merge branch '4.4' into 5.3

nicolas-grekas · nicolas-grekas · commit 61ce40a96758 · 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/LockRegistry.php b/LockRegistry.php
@@ -89,7 +89,7 @@ public static function compute(callable $callback, ItemInterface $item, bool &$s
 
         $key = self::$files ? abs(crc32($item->getKey())) % \count(self::$files) : -1;
 
-        if ($key < 0 || (self::$lockedFiles[$key] ?? false) || !$lock = self::open($key)) {
+        if ($key < 0 || self::$lockedFiles || !$lock = self::open($key)) {
             return $callback($item, $save);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public static function compute(callable $callback, ItemInterface $item, bool &$s`
`89`	`89`
`90`	`90`	`$key = self::$files ? abs(crc32($item->getKey())) % \count(self::$files) : -1;`
`91`	`91`
`92`		`- if ($key < 0 \|\| (self::$lockedFiles[$key] ?? false) \|\| !$lock = self::open($key)) {`
	`92`	`+ if ($key < 0 \|\| self::$lockedFiles \|\| !$lock = self::open($key)) {`
`93`	`93`	`return $callback($item, $save);`
`94`	`94`	`}`
`95`	`95`