fix: improvements in name generation and guessing types.

waffler-io · Sep 5, 2022 · 937973c · 937973c
1 parent c25ee1d
commit 937973c
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 4 deletions.
diff --git a/src/OpenGen/Adapters/OpenApiV3Adapter.php b/src/OpenGen/Adapters/OpenApiV3Adapter.php
@@ -432,9 +432,13 @@ protected function addSecurityRequirementParameter(Method $method, OpenApi $open
         }
     }
 
-    protected function mustIncludeParameter(string $in, int|string|array $search): bool
+    protected function mustIncludeParameter(?string $in, null|int|string|array $search): bool
     {
-        $search = arrayWrap($search);
+        $search = arrayWrap($search ?? []);
+
+        if (is_null($in)) {
+            return false;
+        }
 
         if (!isset($this->ignoreParameters[$in])) {
             return true;

diff --git a/src/OpenGen/Adapters/SwaggerV2Adapter.php b/src/OpenGen/Adapters/SwaggerV2Adapter.php
@@ -128,7 +128,7 @@ private function adaptParametersToOpenApiV3Format(OpenApi $specification): void
                 foreach ($operation->parameters as $parameter) {
                     $parameter = $parameter->getSerializableData();
                     $schema = new Schema([
-                        'type' => $parameter->type ?? $parameter?->schema?->type,
+                        'type' => $parameter->type ?? $parameter?->schema?->type ?? $this->guessSchemaType($parameter->schema, $parameter->in),
                         'required' => $parameter->required ?? false,
                         'description' => $parameter->description ?? null
                     ]);
@@ -196,4 +196,12 @@ protected function addSecurityRequirementParameter(Method $method, OpenApi $open
 
         parent::addSecurityRequirementParameter($method, $openApi, $securityName);
     }
+
+    private function guessSchemaType(object $schema, string $in): string
+    {
+        if ($in === 'body') {
+            return count($schema->parameters ?? []) > 1 ? 'object' : 'array';
+        }
+        return 'string';
+    }
 }
diff --git a/src/OpenGen/StringHelper.php b/src/OpenGen/StringHelper.php
@@ -34,7 +34,15 @@ public static function camelCase(string $value): string
             return self::$camelCache[$value];
         }
 
-        $pieces = explode(' ', str_replace(['-', '_', '/', '\\'], ' ', $value));
+        $separators = ['-', '_', '/', '\\'];
+        $pieces = explode(
+            ' ',
+            str_replace(
+                $separators,
+                ' ',
+                self::contains($value, $separators) ? strtolower($value) : $value,
+            )
+        );
 
         $newPieces = [];
         foreach ($pieces as $piece) {
@@ -43,4 +51,20 @@ public static function camelCase(string $value): string
 
         return self::$camelCache[$value] = lcfirst(implode('', $newPieces));
     }
+
+    public static function contains($haystack, $needles, $ignoreCase = false)
+    {
+        if ($ignoreCase) {
+            $haystack = mb_strtolower($haystack);
+            $needles = array_map('mb_strtolower', (array) $needles);
+        }
+
+        foreach ((array) $needles as $needle) {
+            if ($needle !== '' && str_contains($haystack, $needle)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }