Merge pull request #14 from zfegg/develop

Fix ContentValidationMiddleware deep convert to array.
zfegg · Aug 11, 2021 · 6608ce9 · 6608ce9
2 parents e3e14ef + aec448a
commit 6608ce9
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 10 deletions.
diff --git a/src/ContentValidationMiddleware.php b/src/ContentValidationMiddleware.php
@@ -124,11 +124,19 @@ function (ValidationError $error) {
         ], 422);
     }
 
-    private static function object2Array(object $data): array
+    /**
+     * @param object|array $data
+     * @return mixed
+     */
+    private static function object2Array($data)
     {
-        $data = (array) $data;
-        foreach ($data as $key => $value) {
-            if (is_object($value)) {
+        if (is_object($data)) {
+            $data = (array) $data;
+            foreach ($data as $key => $value) {
+                $data[$key] = self::object2Array($value);
+            }
+        } elseif (is_array($data)) {
+            foreach ($data as $key => $value) {
                 $data[$key] = self::object2Array($value);
             }
         }

diff --git a/src/Opis/TransformersParser.php b/src/Opis/TransformersParser.php
@@ -14,17 +14,23 @@
 class TransformersParser extends KeywordParser
 {
     use VariablesTrait;
-    private Resolver\ResolverInterface $resolver;
 
-    public function __construct(Resolver\ResolverInterface $resolver)
-    {
-        parent::__construct('$transformers');
+    private Resolver\ResolverInterface $resolver;
+    private string $type;
+
+    public function __construct(
+        Resolver\ResolverInterface $resolver,
+        string $keyword = '$transformers',
+        string $type = self::TYPE_BEFORE
+    ) {
+        parent::__construct($keyword);
         $this->resolver = $resolver;
+        $this->type = $type;
     }
 
     public function type(): string
     {
-        return self::TYPE_BEFORE;
+        return $this->type;
     }
 
     public function parse(SchemaInfo $info, SchemaParser $parser, object $shared): ?Keyword

diff --git a/test/ContentValidationMiddlewareTest.php b/test/ContentValidationMiddlewareTest.php
@@ -72,7 +72,7 @@ public function invokeProvider(): array
                     [],
                     [],
                     [],
-                    ['name' => 'foo', 'age' => '18', 'sub' => ['foo' => '123']]
+                    ['name' => 'foo', 'age' => '18', 'sub' => ['foo' => '123'], 'list-obj' => [[['id' => 1]]]]
                 ),
             ],
             'HttpPostInvalid' => [

diff --git a/test/test.json b/test/test.json
@@ -58,6 +58,20 @@
           "type": "integer"
         }
       }
+    },
+    "list-obj": {
+      "type": "array",
+      "items": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "id": {
+              "type": "integer"
+            }
+          }
+        }
+      }
     }
   },
   "required": ["name", "age"],