Fix regexp for finding media type parameters

woohoolabs · Jan 31, 2018 · dfcd047 · dfcd047
1 parent d435e7a
commit dfcd047
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/JsonApi/Request/Request.php b/src/JsonApi/Request/Request.php
@@ -129,13 +129,8 @@ protected function isValidMediaTypeHeader(string $headerName): bool
     {
         $header = $this->getHeaderLine($headerName);
 
-        // The header doesn't contain the media type
-        if (strpos($header, "application/vnd.api+json") === false) {
-            return true;
-        }
-
         // The media type is modified with media type parameters
-        if (preg_match("/application\/vnd\.api\+json\s*;/i", $header)) {
+        if (preg_match("/application\/vnd\.api\+json\s*;\s*[a-z0-9]+/i", $header)) {
             return false;
         }
 

diff --git a/tests/JsonApi/Request/RequestTest.php b/tests/JsonApi/Request/RequestTest.php
@@ -26,6 +26,14 @@ public function validateJsonApiContentTypeHeader()
         $this->assertValidContentTypeHeader("application/vnd.api+json");
     }
 
+    /**
+     * @test
+     */
+    public function validateJsonApiContentTypeHeaderWithSemicolon()
+    {
+        $this->assertValidContentTypeHeader("application/vnd.api+json;");
+    }
+
     /**
      * @test
      */
@@ -55,7 +63,7 @@ public function validateMultipleMediaTypeContentTypeHeader()
      */
     public function validateCaseInsensitiveContentTypeHeader()
     {
-        $this->assertValidContentTypeHeader("Application/vnd.Api+JSON, text/*;q=0.3, text/html;q=0.7");
+        $this->assertValidContentTypeHeader("Application/vnd.Api+JSON, text/*;q=0.3, text/html;Q=0.7");
     }
 
     /**
@@ -79,10 +87,10 @@ public function validateInvalidContentTypeHeaderWithWhitespaceBeforeParameter()
     /**
      * @test
      */
-    public function validateContentTypeHeaderWithCharsetMediaType()
+    public function validateInvalidContentTypeHeaderWithCharsetMediaType()
     {
         $this->expectException(MediaTypeUnsupported::class);
-        $this->assertInvalidContentTypeHeader("application/vnd.api+json; charset=utf-8");
+        $this->assertInvalidContentTypeHeader("application/vnd.api+json; Charset=utf-8");
     }
 
     private function assertValidContentTypeHeader($value)