Message: slashes in "display-name" are stripped

dg · dg · commit 82fb366ff218 · 2019-07-01T14:17:45.000+02:00
see https://tools.ietf.org/html/rfc2822
diff --git a/src/Mail/Message.php b/src/Mail/Message.php
@@ -143,9 +143,10 @@ private function formatEmail(string $email, string $name = null): array
 	{
 		if (!$name && preg_match('#^(.+) +<(.*)>\z#', $email, $matches)) {
 			[, $name, $email] = $matches;
+			$name = stripslashes($name);
 			$tmp = substr($name, 1, -1);
 			if ($name === '"' . $tmp . '"') {
-				$name = stripslashes($tmp);
+				$name = $tmp;
 			}
 		}
 		return [$email => $name];
diff --git a/tests/Mail/Mail.email.parse.phpt b/tests/Mail/Mail.email.parse.phpt
@@ -34,7 +34,7 @@ $mail->setFrom('"Žluťouč\"k\ý kůň" <kun1@example.com>');
 Assert::same(['kun1@example.com' => 'Žluťouč"ký kůň'], $mail->getFrom());
 
 $mail->setFrom('The\Mail <kun1@example.com>');
-Assert::same(['kun1@example.com' => 'The\Mail'], $mail->getFrom());
+Assert::same(['kun1@example.com' => 'TheMail'], $mail->getFrom());
 
 $mail->setFrom('The.Mail <kun1@example.com>');
 Assert::same(['kun1@example.com' => 'The.Mail'], $mail->getFrom());
diff --git a/tests/Mail/Mail.email.phpt b/tests/Mail/Mail.email.phpt
@@ -46,7 +46,7 @@ Reply-To: =?UTF-8?B?xb1sdcWlb3XEjWvDvSBrxa/FiA==?= <kun2@example.com>,
 	John Doe <doe2@example.com>
 To: =?UTF-8?B?xb1sdcWlb3XEjWvDvSAia8WvxYgi?= <kun3@example.com>,
 	John 'jd' Doe <doe3@example.com>
-Cc: "The\\Mail" <nette@example.com>,John Doe <doe4@example.com>,"The.Mail"
+Cc: TheMail <nette@example.com>,John Doe <doe4@example.com>,"The.Mail"
 	 <nette2@example.com>
 Bcc: =?UTF-8?B?xb1sdcWlb3XEjWvDvSBrxa/FiA==?= <kun5@example.com>,
 	doe5@example.com

Original file line number	Diff line number	Diff line change
`@@ -143,9 +143,10 @@ private function formatEmail(string $email, string $name = null): array`
`143`	`143`	`{`
`144`	`144`	`if (!$name && preg_match('#^(.+) +<(.*)>\z#', $email, $matches)) {`
`145`	`145`	`[, $name, $email] = $matches;`
	`146`	`+ $name = stripslashes($name);`
`146`	`147`	`$tmp = substr($name, 1, -1);`
`147`	`148`	`if ($name === '"' . $tmp . '"') {`
`148`		`- $name = stripslashes($tmp);`
	`149`	`+ $name = $tmp;`
`149`	`150`	`}`
`150`	`151`	`}`
`151`	`152`	`return [$email => $name];`
-Original file line number
+Diff line change
 Assert::same(['[email protected]' => 'Žluťouč"ký kůň'], $mail->getFrom());
 $mail->setFrom('The\Mail <[email protected]>');
 -Assert::same(['[email protected]' => 'The\Mail'], $mail->getFrom());
 +Assert::same(['[email protected]' => 'TheMail'], $mail->getFrom());
 $mail->setFrom('The.Mail <[email protected]>');
 Assert::same(['[email protected]' => 'The.Mail'], $mail->getFrom());
-Original file line number
+Diff line change
 	John Doe <[email protected]>
 To: =?UTF-8?B?xb1sdcWlb3XEjWvDvSAia8WvxYgi?= <[email protected]>,
 	John 'jd' Doe <[email protected]>
 -Cc: "The\\Mail" <[email protected]>,John Doe <[email protected]>,"The.Mail"
 +Cc: TheMail <[email protected]>,John Doe <[email protected]>,"The.Mail"
 	 <[email protected]>
 Bcc: =?UTF-8?B?xb1sdcWlb3XEjWvDvSBrxa/FiA==?= <[email protected]>,
 	[email protected]