Merge pull request #40575 from nextcloud/fix/openapi/core/ocm

provokateurin · web-flow · commit 3c5d8410fa3d · 2023-09-23T13:28:24.000+02:00
core: Fix OCM OpenAPI
diff --git a/core/Controller/OCMController.php b/core/Controller/OCMController.php
@@ -59,7 +59,7 @@ public function __construct(
 	 * @NoCSRFRequired
 	 * @psalm-suppress MoreSpecificReturnType
 	 * @psalm-suppress LessSpecificReturnStatement
-	 * @return DataResponse<Http::STATUS_OK, array{enabled: bool, apiVersion: string, endPoint: string, resourceTypes: array{array{name: string, shareTypes: string[], protocols: array{webdav: string}}}}, array{X-NEXTCLOUD-OCM-PROVIDERS: true, Content-Type: 'application/json'}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+	 * @return DataResponse<Http::STATUS_OK, array{enabled: bool, apiVersion: string, endPoint: string, resourceTypes: array{name: string, shareTypes: string[], protocols: array{webdav: string}}[]}, array{X-NEXTCLOUD-OCM-PROVIDERS: true, Content-Type: 'application/json'}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
 	 *
 	 * 200: OCM Provider details returned
 	 * 500: OCM not supported
diff --git a/core/openapi.json b/core/openapi.json
@@ -1336,38 +1336,33 @@
                                             "type": "string"
                                         },
                                         "resourceTypes": {
-                                            "type": "object",
-                                            "required": [
-                                                null
-                                            ],
-                                            "properties": {
-                                                "": {
-                                                    "type": "object",
-                                                    "required": [
-                                                        "name",
-                                                        "shareTypes",
-                                                        "protocols"
-                                                    ],
-                                                    "properties": {
-                                                        "name": {
+                                            "type": "array",
+                                            "items": {
+                                                "type": "object",
+                                                "required": [
+                                                    "name",
+                                                    "shareTypes",
+                                                    "protocols"
+                                                ],
+                                                "properties": {
+                                                    "name": {
+                                                        "type": "string"
+                                                    },
+                                                    "shareTypes": {
+                                                        "type": "array",
+                                                        "items": {
                                                             "type": "string"
-                                                        },
-                                                        "shareTypes": {
-                                                            "type": "array",
-                                                            "items": {
+                                                        }
+                                                    },
+                                                    "protocols": {
+                                                        "type": "object",
+                                                        "required": [
+                                                            "webdav"
+                                                        ],
+                                                        "properties": {
+                                                            "webdav": {
                                                                 "type": "string"
                                                             }
-                                                        },
-                                                        "protocols": {
-                                                            "type": "object",
-                                                            "required": [
-                                                                "webdav"
-                                                            ],
-                                                            "properties": {
-                                                                "webdav": {
-                                                                    "type": "string"
-                                                                }
-                                                            }
                                                         }
                                                     }
                                                 }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function __construct(`
`59`	`59`	`* @NoCSRFRequired`
`60`	`60`	`* @psalm-suppress MoreSpecificReturnType`
`61`	`61`	`* @psalm-suppress LessSpecificReturnStatement`
`62`		`- * @return DataResponse<Http::STATUS_OK, array{enabled: bool, apiVersion: string, endPoint: string, resourceTypes: array{array{name: string, shareTypes: string[], protocols: array{webdav: string}}}}, array{X-NEXTCLOUD-OCM-PROVIDERS: true, Content-Type: 'application/json'}>\|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>`
	`62`	`+ * @return DataResponse<Http::STATUS_OK, array{enabled: bool, apiVersion: string, endPoint: string, resourceTypes: array{name: string, shareTypes: string[], protocols: array{webdav: string}}[]}, array{X-NEXTCLOUD-OCM-PROVIDERS: true, Content-Type: 'application/json'}>\|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>`
`63`	`63`	`*`
`64`	`64`	`* 200: OCM Provider details returned`
`65`	`65`	`* 500: OCM not supported`