Merge branch 'hotfix/93-addresslist-semicolon' into develop

Forward port #93

CHANGELOG.md

@@ -44,7 +44,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#93](https://github.com/laminas/laminas-mail/pull/93) fixes an issue whereby an address containing a `;` character was not getting quoted, causing it to be interpreted as an address separator instead of part of the address.
 
 ## 2.10.1 - 2020-04-21
 

src/Header/AbstractAddressList.php

@@ -135,7 +135,9 @@ public function getFieldValue($format = HeaderInterface::FORMAT_RAW)
             $email = $address->getEmail();
             $name  = $address->getName();
 
-            if (! empty($name) && false !== strstr($name, ',')) {
+            // quote $name if value requires so
+            if (! empty($name) && (false !== strpos($name, ',') || false !== strpos($name, ';'))) {
+                // FIXME: what if name contains double quote?
                 $name = sprintf('"%s"', $name);
             }
 
@@ -241,7 +243,7 @@ protected static function getComments($value)
      * Supposed to be private, protected as a workaround for PHP bug 68194
      *
      * @param string $value
-     * @return void
+     * @return string
      */
     protected static function stripComments($value)
     {

test/Storage/MessageTest.php

@@ -10,6 +10,7 @@
 
 use Exception as GeneralException;
 use Laminas\Mail\Exception as MailException;
+use Laminas\Mail\Headers;
 use Laminas\Mail\Storage;
 use Laminas\Mail\Storage\Exception;
 use Laminas\Mail\Storage\Message;
@@ -433,6 +434,31 @@ public function testSpaceInFieldName()
         $this->assertEquals(Mime\Decode::splitHeaderField($header, 'baz'), 42);
     }
 
+    /**
+     * splitMessage with Headers as input fails to process AddressList with semicolons
+     *
+     * @see https://github.com/laminas/laminas-mail/pull/93
+     */
+    public function testHeadersLosesNameQuoting()
+    {
+        $headerList = [
+            'From: "Famous bearings |;" <skf@example.com>',
+            'Reply-To: "Famous bearings |:" <skf@example.com>',
+        ];
+
+        // create Headers object from array
+        Mime\Decode::splitMessage(implode("\r\n", $headerList), $headers1, $body);
+        $this->assertInstanceOf(Headers::class, $headers1);
+        // create Headers object from Headers object
+        Mime\Decode::splitMessage($headers1, $headers2, $body);
+        $this->assertInstanceOf(Headers::class, $headers2);
+
+        // test that same problem does not happen with Storage\Message internally
+        $message = new Message(['headers' => $headers2, 'content' => (string)$body]);
+        $this->assertEquals('"Famous bearings |;" <skf@example.com>', $message->from);
+        $this->assertEquals('Famous bearings |: <skf@example.com>', $message->replyTo);
+    }
+
     /**
      * @group Laminas-372
      */