Merge 1ca467c into ece418b

CHANGELOG.md

@@ -22,7 +22,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#226](https://github.com/zendframework/zend-mail/pull/226) fixes how `Zend\Mail\Header\ListParser::parse()` parses the string if a different quote delimiter
+  is found when already in quote.
 
 ## 2.10.0 - 2018-06-07
 

src/Header/ListParser.php

@@ -76,6 +76,12 @@ public static function parse($value, array $delims = self::CHAR_DELIMS)
                 continue;
             }
 
+            // If already in quote and the character does not match the previously
+            // matched quote delimiter, we're done here.
+            if ($inQuote) {
+                continue;
+            }
+
             // Otherwise, we're starting a quoted string.
             $inQuote = true;
             $currentQuoteDelim = $char;

test/Header/ListParser.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-mail for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-mail/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Mail\Header;
+
+use PHPUnit\Framework\TestCase;
+use Zend\Mail\Header\ListParser;
+
+/**
+ * @covers Zend\Mail\Header\ListParser<extended>
+ */
+class ListParserTest extends TestCase
+{
+    public function testParseIgnoreQuoteDelimiterIfAlreadyInQuote()
+    {
+        $parsed = ListParser::parse('"john\'doe" <john@doe.com>,jane <jane@doe.com>');
+        $this->assertEquals($parsed, [
+            '"john\'doe" <john@doe.com>',
+            'jane <jane@doe.com>'
+        ]);
+    }
+}