From 445eade6e3e30f14c8d3b72f8823f4dafeacb08c Mon Sep 17 00:00:00 2001
From: Rhodri Pugh <rod@owsy.com>
Date: Wed, 16 May 2018 08:26:18 +0100
Subject: [PATCH 1/5] increase error reporting to all for phpunit

---
 phpunit.xml.dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 64fb8158..1facbd4a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -23,6 +23,7 @@
 
     <php>
         <ini name="date.timezone" value="UTC"/>
+        <ini name="error_reporting" value="-1"/>
 
         <!-- OB_ENABLED should be enabled for some tests to check if all
              functionality works as expected. Such tests include those for

From 9d97c8f50eb72018d98fa1366b61e8c3fa4bb2a5 Mon Sep 17 00:00:00 2001
From: Rhodri Pugh <rod@owsy.com>
Date: Thu, 7 Jun 2018 10:36:54 +0100
Subject: [PATCH 2/5] allow customizing delimiters

---
 src/Header/AddressListParser.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Header/AddressListParser.php b/src/Header/AddressListParser.php
index cb6141b0..c26bb65c 100644
--- a/src/Header/AddressListParser.php
+++ b/src/Header/AddressListParser.php
@@ -17,9 +17,10 @@ class AddressListParser
 
     /**
      * @param string $value
+     * @param array $delims
      * @return array
      */
-    public static function parse($value)
+    public static function parse($value, $delims = self::CHAR_DELIMS)
     {
         $values            = [];
         $length            = strlen($value);
@@ -40,7 +41,7 @@ public static function parse($value)
 
             // If we are not in a quoted string, and have a delimiter, append
             // the current value to the list, and reset the current value.
-            if (in_array($char, self::CHAR_DELIMS, true) && ! $inQuote) {
+            if (in_array($char, $delims, true) && ! $inQuote) {
                 $values [] = $currentValue;
                 $currentValue = '';
                 continue;

From d32d391eb29b63e963f3a0b56b129722a5320ab4 Mon Sep 17 00:00:00 2001
From: Rhodri Pugh <rod@owsy.com>
Date: Thu, 7 Jun 2018 10:37:33 +0100
Subject: [PATCH 3/5] fix for parsing content type where name contains special
 characters

---
 src/Header/AddressListParser.php |  2 +-
 src/Header/ContentType.php       | 19 ++++++++++---------
 test/Header/ContentTypeTest.php  | 23 +++++++++++++++++++++++
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/Header/AddressListParser.php b/src/Header/AddressListParser.php
index c26bb65c..a36c12ab 100644
--- a/src/Header/AddressListParser.php
+++ b/src/Header/AddressListParser.php
@@ -20,7 +20,7 @@ class AddressListParser
      * @param array $delims
      * @return array
      */
-    public static function parse($value, $delims = self::CHAR_DELIMS)
+    public static function parse($value, array $delims = self::CHAR_DELIMS)
     {
         $values            = [];
         $length            = strlen($value);
diff --git a/src/Header/ContentType.php b/src/Header/ContentType.php
index 7b67720d..e19f2099 100644
--- a/src/Header/ContentType.php
+++ b/src/Header/ContentType.php
@@ -40,19 +40,20 @@ public static function fromString($headerLine)
         }
 
         $value  = str_replace(Headers::FOLDING, ' ', $value);
-        $values = preg_split('#\s*;\s*#', $value);
+        $parts = explode(';', $value, 2);
 
-        $type   = array_shift($values);
         $header = new static();
-        $header->setType($type);
+        $header->setType($parts[0]);
 
-        // Remove empty values
-        $values = array_filter($values);
+        if (isset($parts[1])) {
+            $values = AddressListParser::parse(trim($parts[1]), [';', '=']);
+            $length = count($values);
 
-        foreach ($values as $keyValuePair) {
-            list($key, $value) = explode('=', $keyValuePair, 2);
-            $value = trim($value, "'\" \t\n\r\0\x0B");
-            $header->addParameter($key, $value);
+            for ($i = 0; $i < $length; $i += 2) {
+                $value = $values[$i + 1];
+                $value = trim($value, "'\" \t\n\r\0\x0B");
+                $header->addParameter($values[$i], $value);
+            }
         }
 
         return $header;
diff --git a/test/Header/ContentTypeTest.php b/test/Header/ContentTypeTest.php
index 2a8991f8..50c6e9cb 100644
--- a/test/Header/ContentTypeTest.php
+++ b/test/Header/ContentTypeTest.php
@@ -45,6 +45,29 @@ public function testExtractsExtraInformationWithoutBeingConfusedByTrailingSemico
         $this->assertEquals($header->getParameters(), ['name' => 'foo.pdf']);
     }
 
+    public static function getLiteralData()
+    {
+        return [
+            [
+                ['name' => 'foo; bar.txt'],
+                'text/plain; name="foo; bar.txt"'
+            ],
+            [
+                ['name' => 'foo&bar.txt'],
+                'text/plain; name="foo&bar.txt"'
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider getLiteralData
+     */
+    public function testHandlesLiterals(array $expected, $header)
+    {
+        $header = ContentType::fromString('Content-Type: '.$header);
+        $this->assertEquals($expected, $header->getParameters());
+    }
+
     /**
      * @dataProvider setTypeProvider
      */

From 62bf2098aa2e6e118d6cf6c724882297bd28799a Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Thu, 7 Jun 2018 08:27:40 -0500
Subject: [PATCH 4/5] Renames `AddressListParser` to `ListParser`

The purpose of the class is to parse a string into a list of values,
splitting on a set of delimiters.
---
 src/Header/AbstractAddressList.php                   | 2 +-
 src/Header/ContentType.php                           | 2 +-
 src/Header/{AddressListParser.php => ListParser.php} | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename src/Header/{AddressListParser.php => ListParser.php} (92%)

diff --git a/src/Header/AbstractAddressList.php b/src/Header/AbstractAddressList.php
index 4a868f9a..ab48f671 100644
--- a/src/Header/AbstractAddressList.php
+++ b/src/Header/AbstractAddressList.php
@@ -58,7 +58,7 @@ public static function fromString($headerLine)
         // split value on ","
         $fieldValue = str_replace(Headers::FOLDING, ' ', $fieldValue);
         $fieldValue = preg_replace('/[^:]+:([^;]*);/', '$1,', $fieldValue);
-        $values = AddressListParser::parse($fieldValue);
+        $values = ListParser::parse($fieldValue);
 
         $wasEncoded = false;
         $addresses = array_map(
diff --git a/src/Header/ContentType.php b/src/Header/ContentType.php
index e19f2099..eb535941 100644
--- a/src/Header/ContentType.php
+++ b/src/Header/ContentType.php
@@ -46,7 +46,7 @@ public static function fromString($headerLine)
         $header->setType($parts[0]);
 
         if (isset($parts[1])) {
-            $values = AddressListParser::parse(trim($parts[1]), [';', '=']);
+            $values = ListParser::parse(trim($parts[1]), [';', '=']);
             $length = count($values);
 
             for ($i = 0; $i < $length; $i += 2) {
diff --git a/src/Header/AddressListParser.php b/src/Header/ListParser.php
similarity index 92%
rename from src/Header/AddressListParser.php
rename to src/Header/ListParser.php
index a36c12ab..4b1f2be1 100644
--- a/src/Header/AddressListParser.php
+++ b/src/Header/ListParser.php
@@ -9,7 +9,7 @@
 
 use function in_array;
 
-class AddressListParser
+class ListParser
 {
     const CHAR_QUOTES = ['\'', '"'];
     const CHAR_DELIMS = [',', ';'];
@@ -17,7 +17,9 @@ class AddressListParser
 
     /**
      * @param string $value
-     * @param array $delims
+     * @param array $delims Delimiters allowed between values; parser will
+     *     split on these, as long as they are not within quotes. Defaults
+     *     to ListParser::CHAR_DELIMS.
      * @return array
      */
     public static function parse($value, array $delims = self::CHAR_DELIMS)

From c2b4f76aebd7f979f2647e2e0bdbbadc72d5489e Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Thu, 7 Jun 2018 08:32:50 -0500
Subject: [PATCH 5/5] Adds CHANGELOG entry for #211

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9173c3b4..7b58e5e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#211](https://github.com/zendframework/zend-mail/pull/211) fixes how the `ContentType` header class parses the value it receives. Previously,
+  it was incorrectly splitting the value on semi-colons that were inside quotes; in now correctly
+  ignores them.
+
 - [#204](https://github.com/zendframework/zend-mail/pull/204) fixes `HeaderWrap::mimeDecodeValue()` behavior when handling a multiline UTF-8
   header split across a character. The fix will only work when ext-imap is present, however.