Merge branch '5.4' into 6.4

* 5.4:
  initialize RedisAdapter cursor to 0
  do not skip tests from data providers
  ensure compatibility with Twig 3.15
  [Mime] fix encoding issue with UTF-8 addresses containing doubles spaces
  fix translation file syntax
  [Validator] [Choice] Fix callback option if not array returned
  [DependencyInjection] Fix linting factories implemented via __callStatic
  [DependencyInjection] Fix replacing abstract arguments with bindings
  Minor fixes around parse_url() checks
  Ensure compatibility with mongodb v2
  Add missing translations for Turkish (tr)

Header/AbstractHeader.php

@@ -188,6 +188,20 @@ protected function getEncodableWordTokens(string $string): array
             $tokens[] = $encodedToken;
         }
 
+        foreach ($tokens as $i => $token) {
+            // whitespace(s) between 2 encoded tokens
+            if (
+                0 < $i
+                && isset($tokens[$i + 1])
+                && preg_match('~^[\t ]+$~', $token)
+                && $this->tokenNeedsEncoding($tokens[$i - 1])
+                && $this->tokenNeedsEncoding($tokens[$i + 1])
+            ) {
+                $tokens[$i - 1] .= $token.$tokens[$i + 1];
+                array_splice($tokens, $i, 2);
+            }
+        }
+
         return $tokens;
     }
 

Tests/Header/MailboxHeaderTest.php

@@ -62,6 +62,14 @@ public function testUtf8CharsInLocalPart()
     {
         $header = new MailboxHeader('Sender', new Address('fabï[email protected]'));
         $this->assertSame('fabï[email protected]', $header->getBodyAsString());
+
+        // name with single space
+        $header = new MailboxHeader('Sender', new Address('fabï[email protected]', 'Fabïen Pötencier'));
+        $this->assertSame('=?utf-8?Q?Fab=C3=AFen_P=C3=B6tencier?= <fabï[email protected]>', $header->getBodyAsString());
+
+        // name with double spaces
+        $header = new MailboxHeader('Sender', new Address('fabï[email protected]', 'Fabïen  Pötencier'));
+        $this->assertSame('=?utf-8?Q?Fab=C3=AFen__P=C3=B6tencier?= <fabï[email protected]>', $header->getBodyAsString());
     }
 
     public function testToString()