diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-12-03 21:40:46 +0100 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-01-17 18:18:39 +0100 |
| commit | 570c75db776a79294d97a05cd8ac63ac4ab39685 (patch) | |
| tree | deedd28a10628a06b9d0b53400a2719b7a659562 /tests/integration/fixtures/folderfixture.php | |
| parent | e5d606d3ee7dc046e7db9eb1f94b6cc6e542ecbe (diff) | |
fix several integration test issues
Diffstat (limited to 'tests/integration/fixtures/folderfixture.php')
| -rw-r--r-- | tests/integration/fixtures/folderfixture.php | 2 |
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', |