Merge pull request #17 from sunrise-php/release/v1.5.1

v1.5.1
sunrise-php · Jun 9, 2020 · ed81e40 · ed81e40
2 parents 998ac32 + ed10f80
commit ed81e40
Showing 1 changed file with 27 additions and 3 deletions.
diff --git a/src/Middleware/RequestBodyValidationMiddleware.php b/src/Middleware/RequestBodyValidationMiddleware.php
@@ -159,12 +159,36 @@ protected function validate(ServerRequestInterface $request) : void
             ], $e->getCode(), $e);
         }
 
-        if (null === $jsonSchema) {
+        if (false === isset($jsonSchema, $jsonSchema['type'])) {
             return;
         }
 
-        $payload = json_encode($request->getParsedBody());
-        $payload = json_decode($payload);
+        $payload = null;
+        $parsedBody = $request->getParsedBody();
+
+        switch ($jsonSchema['type']) {
+            case 'array':
+                if ([] === $parsedBody) {
+                    $payload = [];
+                } else {
+                    $payload = json_encode($parsedBody);
+                    $payload = (array) json_decode($payload);
+                }
+                break;
+
+            case 'object':
+                if ([] === $parsedBody) {
+                    $payload = new \stdClass();
+                } else {
+                    $payload = json_encode($parsedBody);
+                    $payload = (object) json_decode($payload);
+                }
+                break;
+
+            case 'string':
+                $payload = (string) $request->getBody();
+                break;
+        }
 
         $validator = new Validator();
         $validator->validate($payload, $jsonSchema);