Merge pull request #274 from nextcloud/fix/openapitype/class-string-array-key

Author: provokateurin

src/OpenApiType.php

@@ -220,9 +220,10 @@ public static function resolve(string $context, array $definitions, ParamTagValu
 			);
 		}
 
-		if ($node instanceof GenericTypeNode && $node->type->name === 'array' && count($node->genericTypes) === 2 && $node->genericTypes[0] instanceof IdentifierTypeNode) {
-			$allowedTypes = ['string', 'lowercase-string', 'non-empty-string', 'non-empty-lowercase-string'];
-			if (in_array($node->genericTypes[0]->name, $allowedTypes, true)) {
+		if ($node instanceof GenericTypeNode && $node->type->name === 'array' && count($node->genericTypes) === 2 && ($node->genericTypes[0] instanceof IdentifierTypeNode || $node->genericTypes[0] instanceof GenericTypeNode)) {
+			$key = $node->genericTypes[0] instanceof IdentifierTypeNode ? $node->genericTypes[0]->name : $node->genericTypes[0]->type->name;
+			$allowedTypes = ['string', 'lowercase-string', 'non-empty-string', 'non-empty-lowercase-string', 'class-string'];
+			if (in_array($key, $allowedTypes, true)) {
 				return new OpenApiType(
 					context: $context,
 					type: 'object',

tests/lib/ResponseDefinitions.php

@@ -18,6 +18,7 @@
  *     type: string,
  *     primary: bool,
  *     class: class-string<AdminSettingsController>,
+ *     arrayClass: array<class-string<AdminSettingsController>, int>,
  * }
  *
  * @psalm-type NotificationsCollection = list<NotificationsItem>

tests/openapi-full.json

@@ -57,7 +57,8 @@
                     "link",
                     "type",
                     "primary",
-                    "class"
+                    "class",
+                    "arrayClass"
                 ],
                 "properties": {
                     "label": {
@@ -75,6 +76,13 @@
                     "class": {
                         "type": "string",
                         "minLength": 1
+                    },
+                    "arrayClass": {
+                        "type": "object",
+                        "additionalProperties": {
+                            "type": "integer",
+                            "format": "int64"
+                        }
                     }
                 }
             },

tests/openapi.json

@@ -57,7 +57,8 @@
                     "link",
                     "type",
                     "primary",
-                    "class"
+                    "class",
+                    "arrayClass"
                 ],
                 "properties": {
                     "label": {
@@ -75,6 +76,13 @@
                     "class": {
                         "type": "string",
                         "minLength": 1
+                    },
+                    "arrayClass": {
+                        "type": "object",
+                        "additionalProperties": {
+                            "type": "integer",
+                            "format": "int64"
+                        }
                     }
                 }
             },