Skip to content
This repository was archived by the owner on Jan 1, 2020. It is now read-only.

Commit 201428b

Browse files
committed
Use ArrayUtils::merge to allow recursive merging.
1 parent 2f7d1bf commit 201428b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

module/Application/test/Controller/IndexControllerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace ApplicationTest\Controller;
99

1010
use Application\Controller\IndexController;
11+
use Zend\Stdlib\ArrayUtils;
1112
use Zend\Test\PHPUnit\Controller\AbstractHttpControllerTestCase;
1213

1314
class IndexControllerTest extends AbstractHttpControllerTestCase
@@ -20,7 +21,7 @@ public function setUp()
2021
// etc.
2122
$configOverrides = [];
2223

23-
$this->setApplicationConfig(array_merge(
24+
$this->setApplicationConfig(ArrayUtils::merge(
2425
include __DIR__ . '/../../../../config/application.config.php',
2526
$configOverrides
2627
));

0 commit comments

Comments
 (0)