Merge branch '6.1' into 6.2

* 6.1:
  [Yaml] Minor: Update Inline parse phpdoc
  [DependencyInjection] Fix dumping inlined withers
  [HttpClient] Move Http clients data collecting at a late level
  [FrameworkBundle] restore call to addGlobalIgnoredName
  Allow EmailValidator 4
  Fix detecting mapping with one line annotations

Author: fabpot

Dumper/PhpDumper.php

@@ -734,7 +734,7 @@ private function addServiceMethodCalls(Definition $definition, string $variableN
             $witherAssignation = '';
 
             if ($call[2] ?? false) {
-                if (null !== $sharedNonLazyId && $lastWitherIndex === $k) {
+                if (null !== $sharedNonLazyId && $lastWitherIndex === $k && 'instance' === $variableName) {
                     $witherAssignation = sprintf('$this->%s[\'%s\'] = ', $definition->isPublic() ? 'services' : 'privates', $sharedNonLazyId);
                 }
                 $witherAssignation .= sprintf('$%s = ', $variableName);

Tests/Dumper/PhpDumperTest.php

@@ -1405,7 +1405,8 @@ public function testAliasCanBeFoundInTheDumpedContainerWhenBothTheAliasAndTheSer
     public function testWither()
     {
         $container = new ContainerBuilder();
-        $container->register(Foo::class);
+        $container->register(Foo::class)
+            ->setAutowired(true);
 
         $container
             ->register('wither', Wither::class)

Tests/Fixtures/includes/autowiring_classes.php

@@ -13,6 +13,14 @@
 
 class Foo
 {
+    /**
+     * @required
+     * @return static
+     */
+    public function cloneFoo()
+    {
+        return clone $this;
+    }
 }
 
 class Bar

Tests/Fixtures/php/services_wither.php

@@ -53,6 +53,7 @@ protected function getWitherService()
         $instance = new \Symfony\Component\DependencyInjection\Tests\Compiler\Wither();
 
         $a = new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo();
+        $a = $a->cloneFoo();
 
         $instance = $instance->withFoo1($a);
         $this->services['wither'] = $instance = $instance->withFoo2($a);