Merge branch '6.2' into 6.3

* 6.2:
  [Serializer] Fix serializedpath for non scalar types
  [Serializer] Preserve array keys while denormalize variadic parameters
  [FrameworkBundle] enable metadata cache when annotation is disabled
  [DependencyInjection] Fix setting the class of auto-discovery services
  [FrameworkBundle] Fix auto-discovering validator constraints
  TranslatorBag::diff now iterates over catalogue domains instead of operation domains
  [HttpClient] Fix not calling the on progress callback when canceling a MockResponse
  [TwigBridge] Fix raw content rendering in HTML notification emails

Author: nicolas-grekas

Loader/FileLoader.php

@@ -153,6 +153,8 @@ public function registerClasses(Definition $prototype, string $namespace, string
 
                     continue;
                 }
+                $definition->setClass($class);
+
                 $interfaces = [];
                 foreach (class_implements($class, false) as $interface) {
                     $this->singlyImplemented[$interface] = ($this->singlyImplemented[$interface] ?? $class) !== $class ? false : $class;
@@ -295,7 +297,15 @@ private function findClasses(string $namespace, string $pattern, array $excludeP
         if (null !== $prefixLen) {
             foreach ($excludePaths as $path => $_) {
                 $class = $namespace.ltrim(str_replace('/', '\\', substr($path, $prefixLen, str_ends_with($path, '.php') ? -4 : null)), '\\');
+<<<<<<< HEAD
                 $this->addContainerExcludedTag($class, $source);
+=======
+                if (!$this->container->has($class)) {
+                    $this->container->register($class, $class)
+                        ->setAbstract(true)
+                        ->addTag('container.excluded', $attributes);
+                }
+>>>>>>> 6.2
             }
         }