Message: added support for quoted "display-name" <email> [Closes #64]

see https://tools.ietf.org/html/rfc2822

Author: dg

src/Mail/Message.php

@@ -142,10 +142,13 @@ public function addBcc(string $email, string $name = null)
 	private function formatEmail(string $email, string $name = null): array
 	{
 		if (!$name && preg_match('#^(.+) +<(.*)>\z#', $email, $matches)) {
-			return [$matches[2] => $matches[1]];
-		} else {
-			return [$email => $name];
+			[, $name, $email] = $matches;
+			$tmp = substr($name, 1, -1);
+			if ($name === '"' . $tmp . '"') {
+				$name = stripslashes($tmp);
+			}
 		}
+		return [$email => $name];
 	}
 
 

tests/Mail/Mail.email.parse.phpt

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Test: Nette\Mail\Message email address parsing.
+ */
+
+declare(strict_types=1);
+
+use Nette\Mail\Message;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$mail = new Message;
+
+$mail->setFrom('[email protected]');
+Assert::same(['[email protected]' => null], $mail->getFrom());
+
+$mail->setFrom('[email protected]', 'Žluťoučký kůň');
+Assert::same(['[email protected]' => 'Žluťoučký kůň'], $mail->getFrom());
+
+$mail->setFrom('Žluťoučký kůň <[email protected]>');
+Assert::same(['[email protected]' => 'Žluťoučký kůň'], $mail->getFrom());
+
+$mail->setFrom('Žluťoučký "kůň" <[email protected]>');
+Assert::same(['[email protected]' => 'Žluťoučký "kůň"'], $mail->getFrom());
+
+$mail->setFrom('"Žluťoučký kůň" <[email protected]>');
+Assert::same(['[email protected]' => 'Žluťoučký kůň'], $mail->getFrom());
+
+$mail->setFrom('"Žluťouč\"k\ý kůň" <[email protected]>');
+Assert::same(['[email protected]' => 'Žluťouč"ký kůň'], $mail->getFrom());
+
+$mail->setFrom('The\Mail <[email protected]>');
+Assert::same(['[email protected]' => 'The\Mail'], $mail->getFrom());
+
+$mail->setFrom('The.Mail <[email protected]>');
+Assert::same(['[email protected]' => 'The.Mail'], $mail->getFrom());