Merge branch '6.4' into 7.0

* 6.4:
  [Filesystem] Fix str_contains deprecation
  [Security] Correctly initialize the voter property
  [ErrorHandler] Skip failing tests when "xdebug.file_link_format" option is defined
  [FrameworkBundle] Fix typo
  Update `changed-translation-files` step with native git diff command
  [DependencyInjection] fix XmlDumper when a tag contains also a 'name' property
  [Lock] Check the correct SQLSTATE error code for MySQL
  [ErrorHandler] Fix `ErrorHandlerTest::tearDown()` visibility
  [Lock] compatiblity with redis cluster 7
  fix: typo
  [Messenger] trigger retry logic when message is a redelivery
  [PropertyAccess] Fix checking for missing properties
  add missing invalid extension error entry

Author: derrabus

Dumper/XmlDumper.php

@@ -134,16 +134,17 @@ private function addService(Definition $definition, ?string $id, \DOMElement $pa
         foreach ($tags as $name => $tags) {
             foreach ($tags as $attributes) {
                 $tag = $this->document->createElement('tag');
-                if (!\array_key_exists('name', $attributes)) {
-                    $tag->setAttribute('name', $name);
-                } else {
-                    $tag->appendChild($this->document->createTextNode($name));
-                }
 
                 // Check if we have recursive attributes
                 if (array_filter($attributes, \is_array(...))) {
+                    $tag->setAttribute('name', $name);
                     $this->addTagRecursiveAttributes($tag, $attributes);
                 } else {
+                    if (!\array_key_exists('name', $attributes)) {
+                        $tag->setAttribute('name', $name);
+                    } else {
+                        $tag->appendChild($this->document->createTextNode($name));
+                    }
                     foreach ($attributes as $key => $value) {
                         $tag->setAttribute($key, $value ?? '');
                     }

Tests/Fixtures/containers/container_non_scalar_tags.php

@@ -10,6 +10,7 @@
 $container
     ->register('foo', FooClass::class)
     ->addTag('foo_tag', [
+        'name' => 'attributeName',
         'foo' => 'bar',
         'bar' => [
             'foo' => 'bar',

Tests/Fixtures/xml/services_with_array_tags.xml

@@ -4,6 +4,7 @@
     <service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true"/>
     <service id="foo" class="Bar\FooClass">
       <tag name="foo_tag">
+        <attribute name="name">attributeName</attribute>
         <attribute name="foo">bar</attribute>
         <attribute name="bar">
           <attribute name="foo">bar</attribute>

Tests/Fixtures/yaml/services_with_array_tags.yml

@@ -7,4 +7,4 @@ services:
     foo:
         class: Bar\FooClass
         tags:
-            - foo_tag: { foo: bar, bar: { foo: bar, bar: foo } }
+            - foo_tag: { name: attributeName, foo: bar, bar: { foo: bar, bar: foo } }

Tests/Loader/XmlFileLoaderTest.php

@@ -460,7 +460,7 @@ public function testParseServiceTagsWithArrayAttributes()
         $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
         $loader->load('services_with_array_tags.xml');
 
-        $this->assertEquals(['foo_tag' => [['foo' => 'bar', 'bar' => ['foo' => 'bar', 'bar' => 'foo']]]], $container->getDefinition('foo')->getTags());
+        $this->assertEquals(['foo_tag' => [['name' => 'attributeName', 'foo' => 'bar', 'bar' => ['foo' => 'bar', 'bar' => 'foo']]]], $container->getDefinition('foo')->getTags());
     }
 
     public function testParseTagsWithoutNameThrowsException()