Merge pull request #84 from maikschneider/patch-1

Make OpenApi specification file valid
sourcebroker · Apr 28, 2024 · f7b3c1e · f7b3c1e
2 parents d89ff99 + 203e32f
commit f7b3c1e
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/Classes/Service/OpenApiBuilder.php b/Classes/Service/OpenApiBuilder.php
@@ -8,6 +8,7 @@
 use Exception;
 use GoldSpecDigital\ObjectOrientedOAS\Exceptions\InvalidArgumentException as OasInvalidArgumentException;
 use GoldSpecDigital\ObjectOrientedOAS\Objects\Components;
+use GoldSpecDigital\ObjectOrientedOAS\Objects\Info;
 use GoldSpecDigital\ObjectOrientedOAS\Objects\MediaType;
 use GoldSpecDigital\ObjectOrientedOAS\Objects\Operation;
 use GoldSpecDigital\ObjectOrientedOAS\Objects\Parameter;
@@ -63,12 +64,23 @@ public static function build(array $apiResources): OpenApi
 
         return OpenApi::create()
             ->openapi(OpenApi::OPENAPI_3_0_2)
+            ->info(self::getInfo())
             ->servers(...self::getServers())
             ->tags(...self::getTags($apiResources))
             ->paths(...self::getPaths($apiResources))
             ->components(self::$components);
     }
 
+    private static function getInfo(): Info
+    {
+        $siteConfig = SiteService::getCurrent()->getConfiguration();
+        $info = new Info();
+        return $info
+            ->title($siteConfig['routeEnhancers']['T3api']['title'] ?? '')
+            ->description($siteConfig['routeEnhancers']['T3api']['description'] ?? '')
+            ->version($siteConfig['routeEnhancers']['T3api']['version'] ?? '');
+    }
+
     /**
      * @return array
      */
@@ -229,10 +241,12 @@ protected static function getFilterParametersForOperation(OperationInterface $op
 
             /** @var Parameter $filterParameter */
             foreach ($filterParameters as $filterParameter) {
-                $parameters[] = $filterParameter->in(Parameter::IN_QUERY);
+                $parameters[$filterParameter->name] = $filterParameter->in(Parameter::IN_QUERY);
             }
         }
 
+        sort($parameters);
+
         return $parameters;
     }