[Mime] fix encoding issue with UTF-8 addresses containing doubles spaces

0xb4lint · fabpot · commit c6ed3c82e0cf · 2024-10-23T22:18:32.000+02:00
diff --git a/src/Symfony/Component/Mime/Header/AbstractHeader.php b/src/Symfony/Component/Mime/Header/AbstractHeader.php
@@ -180,6 +180,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;
     }
 
diff --git a/src/Symfony/Component/Mime/Tests/Header/MailboxHeaderTest.php b/src/Symfony/Component/Mime/Tests/Header/MailboxHeaderTest.php
@@ -62,6 +62,14 @@ public function testUtf8CharsInLocalPart()
     {
         $header = new MailboxHeader('Sender', new Address('fabïen@symfony.com'));
         $this->assertSame('fabïen@symfony.com', $header->getBodyAsString());
+
+        // name with single space
+        $header = new MailboxHeader('Sender', new Address('fabïen@symfony.com', 'Fabïen Pötencier'));
+        $this->assertSame('=?utf-8?Q?Fab=C3=AFen_P=C3=B6tencier?= <fabïen@symfony.com>', $header->getBodyAsString());
+
+        // name with double spaces
+        $header = new MailboxHeader('Sender', new Address('fabïen@symfony.com', 'Fabïen  Pötencier'));
+        $this->assertSame('=?utf-8?Q?Fab=C3=AFen__P=C3=B6tencier?= <fabïen@symfony.com>', $header->getBodyAsString());
     }
 
     public function testToString()

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,14 @@ public function testUtf8CharsInLocalPart()`
`62`	`62`	`{`
`63`	`63`	`$header = new MailboxHeader('Sender', new Address('fabïen@symfony.com'));`
`64`	`64`	`$this->assertSame('fabïen@symfony.com', $header->getBodyAsString());`
	`65`	`+`
	`66`	`+ // name with single space`
	`67`	`+ $header = new MailboxHeader('Sender', new Address('fabïen@symfony.com', 'Fabïen Pötencier'));`
	`68`	`+ $this->assertSame('=?utf-8?Q?Fab=C3=AFen_P=C3=B6tencier?= <fabïen@symfony.com>', $header->getBodyAsString());`
	`69`	`+`
	`70`	`+ // name with double spaces`
	`71`	`+ $header = new MailboxHeader('Sender', new Address('fabïen@symfony.com', 'Fabïen Pötencier'));`
	`72`	`+ $this->assertSame('=?utf-8?Q?Fab=C3=AFen__P=C3=B6tencier?= <fabïen@symfony.com>', $header->getBodyAsString());`
`65`	`73`	`}`
`66`	`74`
`67`	`75`	`public function testToString()`