summaryrefslogtreecommitdiffstats
path: root/tests/integration/fixtures/folderfixture.php
diff options
context:
space:
mode:
Diffstat (limited to 'tests/integration/fixtures/folderfixture.php')
-rw-r--r--tests/integration/fixtures/folderfixture.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/integration/fixtures/folderfixture.php b/tests/integration/fixtures/folderfixture.php
index 872ee33b8..2c884c6ed 100644
--- a/tests/integration/fixtures/folderfixture.php
+++ b/tests/integration/fixtures/folderfixture.php
@@ -20,7 +20,7 @@ class FolderFixture extends Folder {
public function __construct(array $defaults=[]) {
parent::__construct();
- $defaults = array_combine([
+ $defaults = array_merge([
'parentId' => 0,
'name' => 'folder',
'userId' => 'test',