fix

Signed-off-by: Christian Hartmann <[email protected]>

lib/Controller/ApiController.php

@@ -1081,9 +1081,9 @@ public function reorderOptions(int $formId, int $questionId, array $newOrder) {
 			$oldOrder = $options[$arrayKey]->getOrder();
 
 			// Only set order, if it changed.
-			if ($oldOrder !== $arrayKey + 1) {
+			if ($oldOrder !== (int)$arrayKey + 1) {
 				// Set Order. ArrayKey counts from zero, order counts from 1.
-				$options[$arrayKey]->setOrder($arrayKey + 1);
+				$options[$arrayKey]->setOrder((int)$arrayKey + 1);
 			}
 		}
 

lib/ResponseDefinitions.php

@@ -49,9 +49,9 @@
  *   isRequired: bool,
  *   text: string,
  *   name: string,
- *   options: array<FormsOption>,
+ *   options: list<FormsOption>,
  *   accept: string[],
- *   extraSettings: \stdClass
+ *   extraSettings: array<string, string>
  * }
  *
  * @psalm-type FormsAnswer = array{
@@ -66,13 +66,13 @@
  *   formId: int,
  *   userId: string,
  *   timestamp: int,
- *   answers: array<FormsAnswer>,
+ *   answers: list<FormsAnswer>,
  *   userDisplayName: string
  * }
  *
  * @psalm-type FormsSubmissions = array{
- *   submissions: array<FormsSubmission>,
- *   questions: array<FormsQuestion>
+ *   submissions: list<FormsSubmission>,
+ *   questions: list<FormsQuestion>
  * }
  *
  * @psalm-type FormsForm = array{
@@ -82,17 +82,17 @@
  *   description: string,
  *   ownerId: string,
  *   created: int,
- *   access: \stdClass,
+ *   access: string[],
  *   expires: int,
  *   isAnonymous: bool,
  *   submitMultiple: bool,
  *   showExpiration: bool,
  *   canSubmit: bool,
  *   permissions: string[],
- *   questions: array<FormsQuestion>,
+ *   questions: list<FormsQuestion>,
  *   state: int,
  *   shares: string[],
- *   submissions: array<FormsSubmission>,
+ *   submissions: list<FormsSubmission>,
  * }
  *
  * @psalm-type FormsUploadedFile = array{

openapi.json

@@ -115,8 +115,10 @@
                         "format": "int64"
                     },
                     "access": {
-                        "type": "object",
-                        "additionalProperties": true
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
                     },
                     "expires": {
                         "type": "integer",
@@ -309,7 +311,9 @@
                     },
                     "extraSettings": {
                         "type": "object",
-                        "additionalProperties": true
+                        "additionalProperties": {
+                            "type": "string"
+                        }
                     }
                 }
             },