object syntax body param

Author: mtrajano

src/Parameters/BodyParameterGenerator.php

@@ -66,23 +66,23 @@ protected function addToProperties(&$properties, $nameTokens, $rules)
             $type = $this->getParamType($rules);
         }
 
-        $propObj = [
-            'type' => $type
-        ];
-
-        if ($enums = $this->getEnumValues($rules)) {
-            $propObj['enum'] = $enums;
-        }
-
         if ($name === '*') {
             $name = 0;
         }
 
-        $properties[$name] = $propObj;
+        if (!isset($properties[$name])) {
+            $propObj = $this->getNewPropObj($type, $rules);
+
+            $properties[$name] = $propObj;
+        } else {
+            //overwrite previous type in case it wasn't given before
+            $properties[$name]['type'] = $type;
+        }
 
         if ($type === 'array') {
-            $properties[$name]['items'] = [];
             $this->addToProperties($properties[$name]['items'], $nameTokens, $rules);
+        } else if ($type === 'object') {
+            $this->addToProperties($properties[$name]['properties'], $nameTokens, $rules);
         }
     }
 
@@ -94,4 +94,23 @@ protected function getNestedParamType($nameTokens)
             return 'object';
         }
     }
+
+    protected function getNewPropObj($type, $rules)
+    {
+        $propObj = [
+            'type' => $type
+        ];
+
+        if ($enums = $this->getEnumValues($rules)) {
+            $propObj['enum'] = $enums;
+        }
+
+        if ($type === 'array') {
+            $propObj['items'] = [];
+        } else if ($type === 'object') {
+            $propObj['properties'] = [];
+        }
+
+        return $propObj;
+    }
 }

tests/Parameters/BodyParameterGeneratorTest.php

@@ -101,6 +101,57 @@ public function testArraySyntax()
         ], $bodyParameters['schema']['properties']);
     }
 
+    public function testObjectInArraySyntax()
+    {
+        $bodyParameters = $this->getBodyParameters([
+            'points' => 'array',
+            'points.*.x' => 'numeric',
+            'points.*.y' => 'numeric',
+        ]);
+
+        $this->assertEquals([
+            'points' => [
+                'type' => 'array',
+                'items' => [
+                    [
+                        'type' => 'object',
+                        'properties' => [
+                            'x' => [
+                                'type' => 'number'
+                            ],
+                            'y' => [
+                                'type' => 'number'
+                            ],
+                        ]
+                    ]
+                ]
+            ]
+        ], $bodyParameters['schema']['properties']);
+    }
+
+    public function testSingleObjectSyntax()
+    {
+        $bodyParameters = $this->getBodyParameters([
+            'point' => '',
+            'point.x' => 'numeric',
+            'point.y' => 'numeric',
+        ]);
+
+        $this->assertEquals([
+            'point' => [
+                'type' => 'object',
+                'properties' => [
+                    'x' => [
+                        'type' => 'number'
+                    ],
+                    'y' => [
+                        'type' => 'number'
+                    ],
+                ]
+            ]
+        ], $bodyParameters['schema']['properties']);
+    }
+
     private function getBodyParameters(array $rules)
     {
         $bodyParameters = (new BodyParameterGenerator($rules))->getParameters();