Merge branch '6.2' into 6.3

* 6.2:
  [Cache] Send Predis SSL options in the $hosts parameter
  [DependencyInjection] Do not ignore tags `name` attribute when it does not define their name
  [Contracts] Rename ServiceLocatorTest
  [Cache] Fix success interpretation when pruning cache
  Fix Psalm errors
  Make onAuthenticationSuccess Response optional
  [Security] Fix return type of AuthenticationSuccessHandlerInterface::onAuthenticationSuccess()

Author: nicolas-grekas

Loader/XmlFileLoader.php

@@ -345,13 +345,14 @@ private function parseDefinition(\DOMElement $service, string $file, Definition
         $tags = $this->getChildren($service, 'tag');
 
         foreach ($tags as $tag) {
-            if ('' === $tagName = $tag->childElementCount || '' === $tag->nodeValue ? $tag->getAttribute('name') : $tag->nodeValue) {
+            $tagNameComesFromAttribute = $tag->childElementCount || '' === $tag->nodeValue;
+            if ('' === $tagName = $tagNameComesFromAttribute ? $tag->getAttribute('name') : $tag->nodeValue) {
                 throw new InvalidArgumentException(sprintf('The tag name for service "%s" in "%s" must be a non-empty string.', (string) $service->getAttribute('id'), $file));
             }
 
             $parameters = $this->getTagAttributes($tag, sprintf('The attribute name of tag "%s" for service "%s" in %s must be a non-empty string.', $tagName, (string) $service->getAttribute('id'), $file));
             foreach ($tag->attributes as $name => $node) {
-                if ('name' === $name) {
+                if ($tagNameComesFromAttribute && 'name' === $name) {
                     continue;
                 }
 

Tests/Fixtures/xml/tag_with_name_attribute.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="foo" class="BarClass">
+            <tag name="name_attribute">tag_name</tag>
+        </service>
+    </services>
+</container>

Tests/Loader/XmlFileLoaderTest.php

@@ -1225,6 +1225,16 @@ public static function dataForBindingsAndInnerCollections()
         ];
     }
 
+    public function testTagNameAttribute()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('tag_with_name_attribute.xml');
+
+        $definition = $container->getDefinition('foo');
+        $this->assertSame([['name' => 'name_attribute']], $definition->getTag('tag_name'));
+    }
+
     public function testFromCallable()
     {
         $container = new ContainerBuilder();

Tests/ServiceLocatorTest.php

@@ -18,9 +18,14 @@
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
-use Symfony\Contracts\Service\Test\ServiceLocatorTest as BaseServiceLocatorTest;
+use Symfony\Contracts\Service\Test\ServiceLocatorTest as LegacyServiceLocatorTestCase;
+use Symfony\Contracts\Service\Test\ServiceLocatorTestCase;
 
-class ServiceLocatorTest extends BaseServiceLocatorTest
+if (!class_exists(ServiceLocatorTestCase::class)) {
+    class_alias(LegacyServiceLocatorTestCase::class, ServiceLocatorTestCase::class);
+}
+
+class ServiceLocatorTest extends ServiceLocatorTestCase
 {
     public function getServiceLocator(array $factories): ContainerInterface
     {