Merge pull request #46222 from nextcloud/fix/task-processing-api-controller/dont-use-plus

skjnldsv · web-flow · commit 452e4be4f5e2 · 2024-11-06T09:02:23.000+01:00
diff --git a/core/Controller/TaskProcessingApiController.php b/core/Controller/TaskProcessingApiController.php
@@ -378,7 +378,7 @@ private function extractFileIdsFromTask(Task $task): array {
 				/** @var int|list<int> $inputSlot */
 				$inputSlot = $task->getInput()[$key];
 				if (is_array($inputSlot)) {
-					$ids += $inputSlot;
+					$ids = array_merge($inputSlot, $ids);
 				} else {
 					$ids[] = $inputSlot;
 				}
@@ -390,14 +390,14 @@ private function extractFileIdsFromTask(Task $task): array {
 					/** @var int|list<int> $outputSlot */
 					$outputSlot = $task->getOutput()[$key];
 					if (is_array($outputSlot)) {
-						$ids += $outputSlot;
+						$ids = array_merge($outputSlot, $ids);
 					} else {
 						$ids[] = $outputSlot;
 					}
 				}
 			}
 		}
-		return array_values($ids);
+		return $ids;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ private function extractFileIdsFromTask(Task $task): array {`
`378`	`378`	`/** @var int\|list<int> $inputSlot */`
`379`	`379`	`$inputSlot = $task->getInput()[$key];`
`380`	`380`	`if (is_array($inputSlot)) {`
`381`		`- $ids += $inputSlot;`
	`381`	`+ $ids = array_merge($inputSlot, $ids);`
`382`	`382`	`} else {`
`383`	`383`	`$ids[] = $inputSlot;`
`384`	`384`	`}`
`@@ -390,14 +390,14 @@ private function extractFileIdsFromTask(Task $task): array {`
`390`	`390`	`/** @var int\|list<int> $outputSlot */`
`391`	`391`	`$outputSlot = $task->getOutput()[$key];`
`392`	`392`	`if (is_array($outputSlot)) {`
`393`		`- $ids += $outputSlot;`
	`393`	`+ $ids = array_merge($outputSlot, $ids);`
`394`	`394`	`} else {`
`395`	`395`	`$ids[] = $outputSlot;`
`396`	`396`	`}`
`397`	`397`	`}`
`398`	`398`	`}`
`399`	`399`	`}`
`400`		`- return array_values($ids);`
	`400`	`+ return $ids;`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`/**`