Merge branch '4.4' into 5.3

* 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

Author: nicolas-grekas

DependencyInjection/RegisterControllerArgumentLocatorsPass.php

@@ -140,6 +140,11 @@ public function process(ContainerBuilder $container)
                     $type = ltrim($target = (string) ProxyHelper::getTypeHint($r, $p), '\\');
                     $invalidBehavior = ContainerInterface::IGNORE_ON_INVALID_REFERENCE;
 
+                    if (is_subclass_of($type, \UnitEnum::class)) {
+                        // do not attempt to register enum typed arguments
+                        continue;
+                    }
+
                     if (isset($arguments[$r->name][$p->name])) {
                         $target = $arguments[$r->name][$p->name];
                         if ('?' !== $target[0]) {

Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php

@@ -24,6 +24,7 @@
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\DependencyInjection\TypedReference;
 use Symfony\Component\HttpKernel\DependencyInjection\RegisterControllerArgumentLocatorsPass;
+use Symfony\Component\HttpKernel\Tests\Fixtures\Suit;
 
 class RegisterControllerArgumentLocatorsPassTest extends TestCase
 {
@@ -400,6 +401,25 @@ public function testAlias()
         $this->assertEqualsCanonicalizing([RegisterTestController::class.'::fooAction', 'foo::fooAction'], array_keys($locator));
     }
 
+    /**
+     * @requires PHP 8.1
+     */
+    public function testEnumArgumentIsIgnored()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+        $container->register('foo', NonNullableEnumArgumentWithDefaultController::class)
+            ->addTag('controller.service_arguments')
+        ;
+
+        $pass = new RegisterControllerArgumentLocatorsPass();
+        $pass->process($container);
+
+        $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+        $this->assertEmpty(array_keys($locator), 'enum typed argument is ignored');
+    }
+
     /**
      * @requires PHP 8
      */
@@ -482,6 +502,13 @@ public function fooAction(string $someArg)
     }
 }
 
+class NonNullableEnumArgumentWithDefaultController
+{
+    public function fooAction(Suit $suit = Suit::Spades)
+    {
+    }
+}
+
 class WithTarget
 {
     public function fooAction(

Tests/Fixtures/Suit.php

@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Fixtures;
+
+enum Suit: string
+{
+    case Hearts = 'H';
+    case Diamonds = 'D';
+    case Clubs = 'C';
+    case Spades = 'S';
+}