Merge pull request #81 from danopz/body-parser

allow body parsers for media types containing +

Author: l0gicgate

src/ServerRequest.php

@@ -268,14 +268,17 @@ public function getParsedBody()
             return null;
         }
 
-        // Look for a media type with a structured syntax suffix (RFC 6839)
-        $parts = explode('+', $mediaType);
-        if (count($parts) >= 2) {
-            $mediaType = 'application/' . $parts[count($parts)-1];
+        // Check if this specific media type has a parser registered first
+        if (!isset($this->bodyParsers[$mediaType])) {
+            // If not, look for a media type with a structured syntax suffix (RFC 6839)
+            $parts = explode('+', $mediaType);
+            if (count($parts) >= 2) {
+                $mediaType = 'application/' . $parts[count($parts) - 1];
+            }
         }
 
-        if (isset($this->bodyParsers[$mediaType]) === true) {
-            $body = (string) $this->getBody();
+        if (isset($this->bodyParsers[$mediaType])) {
+            $body = (string)$this->getBody();
             $parsed = $this->bodyParsers[$mediaType]($body);
 
             if (!is_null($parsed) && !is_object($parsed) && !is_array($parsed)) {

tests/ServerRequestTest.php

@@ -780,6 +780,29 @@ public function testGetParsedBodyWithJsonStructuredSuffix()
         }
     }
 
+    public function testGetParsedBodyWithJsonStructuredSuffixAndRegisteredParser()
+    {
+        foreach ($this->factoryProviders as $factoryProvider) {
+            /** @var Psr17FactoryProvider $provider */
+            $provider = new $factoryProvider;
+            $decoratedServerRequestFactory = new DecoratedServerRequestFactory($provider->getServerRequestFactory());
+
+            $streamFactory = $provider->getStreamFactory();
+            $stream = $streamFactory->createStream('{"foo":"bar"}');
+
+            $request = $decoratedServerRequestFactory->createServerRequest('POST', 'https://google.com');
+            $request = $request
+                ->withHeader('Content-Type', 'application/vnd.api+json;charset=utf8')
+                ->withBody($stream);
+
+            $request->registerMediaTypeParser('application/vnd.api+json', function ($input) {
+                return ['data' => $input];
+            });
+
+            $this->assertEquals(['data' => '{"foo":"bar"}'], $request->getParsedBody());
+        }
+    }
+
     public function testGetParsedBodyXml()
     {
         foreach ($this->factoryProviders as $factoryProvider) {