aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMarcel Klehr <mklehr@gmx.net>2024-07-01 15:01:29 +0200
committerMarcel Klehr <mklehr@gmx.net>2024-07-01 18:46:59 +0200
commit224779c33f7ff27648a6d130918c0e7f662e1ed8 (patch)
tree60c3d7eb8e8a261bf6f1cb0953c76b6dcde51c7c /core
parent7bd215896e71fde5a8057413a39343981c52030a (diff)
downloadnextcloud-server-224779c33f7ff27648a6d130918c0e7f662e1ed8.tar.gz
nextcloud-server-224779c33f7ff27648a6d130918c0e7f662e1ed8.zip
fix(TaskProcessingApiController): Don't use + to merge non-assoc. arraysfix/task-processing-api-controller/dont-use-plus
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Diffstat (limited to 'core')
-rw-r--r--core/Controller/TaskProcessingApiController.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/Controller/TaskProcessingApiController.php b/core/Controller/TaskProcessingApiController.php
index 383a6d7a31a..0128dc9ffc0 100644
--- a/core/Controller/TaskProcessingApiController.php
+++ b/core/Controller/TaskProcessingApiController.php
@@ -285,7 +285,7 @@ class TaskProcessingApiController extends \OCP\AppFramework\OCSController {
/** @var int|list<int> $inputSlot */
$inputSlot = $task->getInput()[$key];
if (is_array($inputSlot)) {
- $ids += $inputSlot;
+ $ids = array_merge($inputSlot, $ids);
} else {
$ids[] = $inputSlot;
}
@@ -297,14 +297,14 @@ class TaskProcessingApiController extends \OCP\AppFramework\OCSController {
/** @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;
}
/**