Merge pull request #336 from JarvusInnovations/develop

Release: v1.20.1
JarvusInnovations · Mar 22, 2022 · c83a479 · c83a479
2 parents 809698c + 10edfed
commit c83a479
Showing 1 changed file with 30 additions and 4 deletions.
diff --git a/php-classes/Emergence/OpenAPI/Reader.php b/php-classes/Emergence/OpenAPI/Reader.php
@@ -31,6 +31,11 @@ class Reader
         'type'
     ];
 
+    public static $parameterObjectProperties = [
+        'name',
+        'in'
+    ];
+
 
     public static function readTree(array $base = [], $root = 'api-docs')
     {
@@ -70,14 +75,26 @@ function (array $keys) {
             $data['components']['schemas'],
             [__CLASS__, 'isSchemaObject'],
             function (array $keys) {
-                return implode('\\', $keys);
+                return implode('-', $keys);
             }
         );
 
         $data['components']['schemas'] = array_map([__CLASS__, 'normalizeSchemaObject'], $data['components']['schemas']);
         ksort($data['components']['schemas']);
 
 
+        // collapse and normalize parameters
+        $data['components']['parameters'] = static::findObjects(
+            $data['components']['parameters'],
+            [__CLASS__, 'isParameterObject'],
+            function (array $keys) {
+                return implode('-', $keys);
+            }
+        );
+
+        ksort($data['components']['parameters']);
+
+
         return $data;
     }
 
@@ -124,6 +141,17 @@ protected static function isSchemaObject(array $object)
         return false;
     }
 
+    protected static function isParameterObject(array $object)
+    {
+        foreach (static::$parameterObjectProperties AS $key) {
+            if (array_key_exists($key, $object)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     protected static function normalizePathObject(array $object, array &$outSubPaths = null, array &$outDefinitions = null)
     {
         if (!empty($object['x-recordsRequestHandler'])) {
@@ -153,9 +181,7 @@ protected static function fillPathsFromRecordsRequestHandler($className, &$outPa
         $recordNoun = $recordClass::$singularNoun;
 
         // generate record definition
-        $recordDefinitionName = preg_replace_callback('/(^|\s+)([a-zA-Z])/', function ($matches) {
-            return strtoupper($matches[2]);
-        }, $recordNoun);
+        $recordDefinitionName = str_replace('\\', '-', $recordClass::getRootClass());
 
         $recordDefinition = [];
         static::fillSchemaFromActiveRecord($recordClass, $recordDefinition);