try to fix test

Signed-off-by: Christian Hartmann <[email protected]>
nextcloud · Nov 4, 2024 · 0096ea0 · 0096ea0
1 parent 91349b6
commit 0096ea0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/lib/Db/Question.php b/lib/Db/Question.php
@@ -33,17 +33,20 @@
 
 use OCA\Forms\ResponseDefinitions;
 use OCP\AppFramework\Db\Entity;
+use stdClass;
 
 /**
  * @psalm-import-type FormsQuestionExtraSettings from ResponseDefinitions
+ * @psalm-import-type FormsQuestionType from ResponseDefinitions
  * @method int getFormId()
  * @method void setFormId(integer $value)
  * @method int getOrder()
  * @method void setOrder(integer $value)
+ * @psalm-method FormsQuestionType getType()
  * @method string getType()
- * @psalm-method 'date'|'dropdown'|'file'|'long'|'multiple'|'multiple_unique'|'short'|'time' getType()
+ * @psalm-method 'date'|'datetime'|'dropdown'|'file'|'long'|'multiple'|'multiple_unique'|'short'|'time' getType()
  * @method void setType(string $value)
- * @psalm-method void setType('date'|'dropdown'|'file'|'long'|'multiple'|'multiple_unique'|'short'|'time' $value)
+ * @psalm-method void setType('date'|'datetime'|'dropdown'|'file'|'long'|'multiple'|'multiple_unique'|'short'|'time' $value)
  * @method bool getIsRequired()
  * @method void setIsRequired(bool $value)
  * @method string getText()
@@ -99,7 +102,7 @@ public function setExtraSettings(array $extraSettings) {
 	 *    id: int,
 	 *    formId: int,
 	 *    order: int,
-	 *    type: "dropdown"|"multiple"|"multiple_unique"|"date"|"time"|"short"|"long"|"file",
+	 *    type: FormsQuestionType,
 	 *    isRequired: bool,
 	 *    text: string,
 	 *    name: string,

diff --git a/lib/ResponseDefinitions.php b/lib/ResponseDefinitions.php
@@ -48,7 +48,7 @@
  *   validationType?: ?string
  * }
  *
- * @psalm-type FormsQuestionType = "dropdown"|"multiple"|"multiple_unique"|"date"|"time"|"short"|"long"|"file"
+ * @psalm-type FormsQuestionType = "dropdown"|"multiple"|"multiple_unique"|"date"|"time"|"short"|"long"|"file"|"datetime"
  *
  * @psalm-type FormsQuestion = array{
  *   id: int,

diff --git a/lib/Service/FormsService.php b/lib/Service/FormsService.php
@@ -143,6 +143,10 @@ public function getQuestions(int $formId): array {
 					}
 				}
 
+				if (empty($question['extraSettings'])) {
+					$question['extraSettings'] = new \stdClass();
+				}
+
 				$questionList[] = $question;
 			}
 		} catch (DoesNotExistException $e) {

diff --git a/openapi.json b/openapi.json
@@ -465,7 +465,8 @@
                     "time",
                     "short",
                     "long",
-                    "file"
+                    "file",
+                    "datetime"
                 ]
             },
             "Share": {