Merge branch '6.2' into 6.3

* 6.2:
  Fix test

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/serializer_mapping_without_annotations.php

@@ -1,6 +1,7 @@
 <?php
 
 $container->loadFromExtension('framework', [
+    'http_method_override' => false,
     'serializer' => [
         'enable_annotations' => false,
         'mapping' => [

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/serializer_mapping_without_annotations.xml

@@ -4,7 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:framework="http://symfony.com/schema/dic/symfony">
 
-    <framework:config>
+    <framework:config http-method-override="false">
         <framework:serializer enable-annotations="false">
             <framework:mapping>
                 <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files</framework:path>

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/serializer_mapping_without_annotations.yml

@@ -1,4 +1,5 @@
 framework:
+    http_method_override: false
     serializer:
         enable_annotations: false
         mapping:

src/Symfony/Component/DependencyInjection/Loader/FileLoader.php

@@ -297,15 +297,7 @@ 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
             }
         }
 
@@ -324,7 +316,7 @@ private function addContainerExcludedTag(string $class, ?string $source): void
             $attributes[$source] = ['source' => sprintf('in "%s/%s"', basename(\dirname($source)), basename($source))];
         }
 
-        $this->container->register($class)
+        $this->container->register($class, $class)
             ->setAbstract(true)
             ->addTag('container.excluded', null !== $source ? $attributes[$source] : []);
     }