Fix TypeError in case of empty string a Content-Type (#61)

thephpleague · May 18, 2020 · 2091dd6 · 2091dd6
1 parent e3a546f
commit 2091dd6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/PSR7/Validators/BodyValidator/BodyValidator.php b/src/PSR7/Validators/BodyValidator/BodyValidator.php
@@ -86,7 +86,7 @@ private function messageContentType(MessageInterface $message) : ?string
         // ContentType can contain multiple statements (type/subtype + parameters), ie: 'multipart/form-data; charset=utf-8; boundary=__X_PAW_BOUNDARY__'
         // OpenAPI Spec only defines the first part of the header value (type/subtype)
         // Other parameters SHOULD be skipped
-        $contentType = strtok($contentType, ';');
+        $contentType = (string) strtok($contentType, ';');
 
         return $contentType;
     }

diff --git a/tests/PSR7/RequestTest.php b/tests/PSR7/RequestTest.php
@@ -65,6 +65,21 @@ public function testItValidatesBodyHasUnexpectedTypeRed() : void
         $validator->validate($request);
     }
 
+    public function testItValidatesBodyHasEmptyTypeRed() : void
+    {
+        $addr    = new OperationAddress('/request-body', 'post');
+        $request = $this->makeGoodRequest($addr->path(), $addr->method())
+            ->withHeader('Content-Type', '');
+
+        $this->expectException(InvalidHeaders::class);
+        $this->expectExceptionMessage(
+            'Missing required header "Content-Type" for Request [post /request-body]'
+        );
+
+        $validator = (new ValidatorBuilder())->fromYamlFile($this->apiSpecFile)->getRequestValidator();
+        $validator->validate($request);
+    }
+
     public function testItValidatesMessageWrongHeaderValueRed() : void
     {
         $addr    = new OperationAddress('/path1', 'get');