Merge pull request #116 from tomaj/json-property-with-name-type

Property with name `type` is now available in json schema

Author: tomaj

CHANGELOG.md

@@ -14,6 +14,7 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 * Yaml format for OpenApiHandler is available only if symfony/yaml is installed
 * RedirectOutput use new RedirectResponse
+* Property with name `type` is now available in json schema
 
 ## 2.6.0 - 2021-10-08
 

src/Handlers/OpenApiHandler.php

@@ -593,9 +593,12 @@ private function transformSchema(array $schema)
         return json_decode(str_replace('#/definitions/', '#/components/schemas/', json_encode($schema, JSON_UNESCAPED_SLASHES)), true);
     }
 
-    private function transformTypes(array &$schema)
+    private function transformTypes(array &$schema, ?string $parent = null)
     {
         foreach ($schema as $key => &$value) {
+            if ($parent === 'properties') {
+                continue;
+            }
             if ($key === 'type' && is_array($value)) {
                 if (count($value) === 2 && in_array('null', $value)) {
                     unset($value[array_search('null', $value)]);
@@ -605,7 +608,7 @@ private function transformTypes(array &$schema)
                     throw new InvalidArgumentException('Type cannot be array and if so, one element have to be "null"');
                 }
             } elseif (is_array($value)) {
-                $this->transformTypes($value);
+                $this->transformTypes($value, $key);
             }
         }
     }