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

Tests/ErrorHandlerTest.php

@@ -31,7 +31,7 @@
  */
 class ErrorHandlerTest extends TestCase
 {
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $r = new \ReflectionProperty(ErrorHandler::class, 'exitCode');
         $r->setAccessible(true);

Tests/ErrorRenderer/FileLinkFormatterTest.php

@@ -27,6 +27,11 @@ public function testWhenNoFileLinkFormatAndNoRequest()
 
     public function testAfterUnserialize()
     {
+        if (get_cfg_var('xdebug.file_link_format')) {
+            // There is no way to override "xdebug.file_link_format" option in a test.
+            $this->markTestSkipped('php.ini has a custom option for "xdebug.file_link_format".');
+        }
+
         $ide = $_ENV['SYMFONY_IDE'] ?? $_SERVER['SYMFONY_IDE'] ?? null;
         $_ENV['SYMFONY_IDE'] = $_SERVER['SYMFONY_IDE'] = null;
         $sut = unserialize(serialize(new FileLinkFormatter()));