Merge branch 'hotfix/7374-master'

Close zendframework/zendframework#7374 Fixes zendframework/zendframework#7076
zendframework · Mar 27, 2015 · dea46b2 · dea46b2
2 parents b44104c + 27ee42b
commit dea46b2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/Header/ContentType.php b/src/Header/ContentType.php
@@ -55,7 +55,7 @@ public static function fromString($headerLine)
             $parameters = array();
             foreach ($parts as $parameter) {
                 $parameter = trim($parameter);
-                if (!preg_match('/^(?P<key>[^\s\=]+)\=(?P<value>[^\s\=]*)$/', $parameter, $matches)) {
+                if (!preg_match('/^(?P<key>[^\s\=]+)\="?(?P<value>[^\s\"]*)"?$/', $parameter, $matches)) {
                     continue;
                 }
                 $parameters[$matches['key']] = $matches['value'];

diff --git a/test/Header/ContentTypeTest.php b/test/Header/ContentTypeTest.php
@@ -117,4 +117,27 @@ public function testReturnsMatchingMediaTypeOfFirstCriteriaToValidate($criteria)
         $result = $header->match($criteria);
         $this->assertEquals('application/vnd.*+json', $result);
     }
+
+    public function contentTypeParameterExamples()
+    {
+        return array(
+            'no-quotes' => array('Content-Type: foo/bar; param=baz', 'baz'),
+            'with-quotes' => array('Content-Type: foo/bar; param="baz"', 'baz'),
+            'with-equals' => array('Content-Type: foo/bar; param=baz=bat', 'baz=bat'),
+            'with-equals-and-quotes' => array('Content-Type: foo/bar; param="baz=bat"', 'baz=bat'),
+        );
+    }
+
+    /**
+     * @dataProvider contentTypeParameterExamples
+     */
+    public function testContentTypeParsesParametersCorrectly($headerString, $expectedParameterValue)
+    {
+        $contentTypeHeader = ContentType::fromString($headerString);
+
+        $parameters = $contentTypeHeader->getParameters();
+
+        $this->assertArrayHasKey('param', $parameters);
+        $this->assertSame($expectedParameterValue, $parameters['param']);
+    }
 }