fix: conditional branch test mock and psalm types

- update test to mock getActiveBranches (plural)
- type getActiveBranches/findActiveBranches as non-nullable array
- add triggerType and branches to extra settings type
- simplify branch guard in question cloning

Signed-off-by: Micke Nordin <kano@sunet.se>

Author: mickenordin

lib/Controller/ApiController.php

@@ -244,8 +244,8 @@ public function newForm(?int $fromId = null): DataResponse {
 					$this->optionMapper->insert($newOption);
 					$optionIdMapper[$oldOptionID] = $newOption->getId();
 				}
-				$branches = $questionData['extraSettings']['branches'] ?? null;
-				if (isset($branches) && \is_array($branches) > 0) {
+				$branches = $questionData['extraSettings']['branches'] ?? [];
+				if (!empty($branches)) {
 					foreach ($branches as $branchKey => $branch) {
 						if (isset($branch['conditions']) && \is_array($branch['conditions'])) {
 							foreach ($branch['conditions'] as $conditionKey => $cond) {

lib/ResponseDefinitions.php

@@ -42,6 +42,8 @@
  *   validationRegex?: string,
  *   validationType?: string,
  *   questionType?: string,
+ *   triggerType?: string,
+ *   branches?: list<array<string, mixed>>,
  * }
  *
  * @psalm-type FormsQuestionType = "dropdown"|"multiple"|"multiple_unique"|"date"|"time"|"short"|"long"|"file"|"datetime"|"grid"|"color"|"conditional"

lib/Service/SubmissionService.php

@@ -797,7 +797,7 @@ private function validateConditionalQuestion(array $question, array $answerData,
 	 * @param array $triggerAnswer The trigger answer values
 	 * @return array The active branches or empty array if none matches
 	 */
-	public function getActiveBranches(array $question, array $triggerAnswer): ?array {
+	public function getActiveBranches(array $question, array $triggerAnswer): array {
 		$extraSettings = $question['extraSettings'] ?? [];
 		return $this->findActiveBranches(
 			$extraSettings['triggerType'] ?? '',
@@ -816,7 +816,7 @@ public function getActiveBranches(array $question, array $triggerAnswer): ?array
 	 * @param array $options The options for the trigger question
 	 * @return array The active branches or empty array if none matches
 	 */
-	private function findActiveBranches(string $triggerType, array $triggerAnswer, array $branches, array $options): ?array {
+	private function findActiveBranches(string $triggerType, array $triggerAnswer, array $branches, array $options): array {
 		return array_filter($branches, function ($branch) use ($triggerType, $triggerAnswer) {
 			$conditions = $branch['conditions'] ?? [];
 			if (empty($conditions)) {

openapi.json

@@ -582,6 +582,18 @@
                     },
                     "questionType": {
                         "type": "string"
+                    },
+                    "triggerType": {
+                        "type": "string"
+                    },
+                    "branches": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "additionalProperties": {
+                                "type": "object"
+                            }
+                        }
                     }
                 }
             },

tests/Unit/Controller/ApiControllerTest.php

@@ -937,9 +937,9 @@ public function testNewSubmission_conditionalQuestion() {
 			}));
 
 		$this->submissionService->expects($this->once())
-			->method('getActiveBranch')
+			->method('getActiveBranches')
 			->with($questions[0], $answers[100]['trigger'])
-			->willReturn($questions[0]['extraSettings']['branches'][0]);
+			->willReturn([$questions[0]['extraSettings']['branches'][0]]);
 
 		// Trigger answer + subquestion answer = 2 inserts
 		$this->answerMapper->expects($this->exactly(2))