summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarcel Klehr <mklehr@gmx.net>2024-07-25 08:06:04 +0200
committerJulien Veyssier <julien-nc@posteo.net>2024-07-25 10:10:32 +0200
commit6363437ccb965eec5ac2dd16dfe46be5f461df48 (patch)
tree50f0ab6eb12ea5d6be2ab961c100f821cfc4ff43 /lib
parent9306ddeb695964ed4cbb38253a33be2dff9f94da (diff)
downloadnextcloud-server-6363437ccb965eec5ac2dd16dfe46be5f461df48.tar.gz
nextcloud-server-6363437ccb965eec5ac2dd16dfe46be5f461df48.zip
fix(taskprocessing): Update lib/private/TaskProcessing/Manager.php
Co-authored-by: Julien Veyssier <julien-nc@posteo.net> Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/TaskProcessing/Manager.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/TaskProcessing/Manager.php b/lib/private/TaskProcessing/Manager.php
index c0ca1b66b49..40ad33d5929 100644
--- a/lib/private/TaskProcessing/Manager.php
+++ b/lib/private/TaskProcessing/Manager.php
@@ -556,8 +556,8 @@ class Manager implements IManager {
* @return array<array-key, list<numeric|string>|numeric|string>
*/
public function fillInputDefaults(array $input, ...$defaultSpecs): array {
- $spec = array_reduce($defaultSpecs, fn ($carry, $spec) => $carry + $spec, []);
- return $spec + $input;
+ $spec = array_reduce($defaultSpecs, fn ($carry, $spec) => array_merge($carry, $spec), []);
+ return array_merge($spec, $input);
}
/**