use array_replace_recursive instead

66959262 · Kristof Ringleff · e8698528 · 66959262
Commit 66959262 authored May 12, 2014 by Kristof Ringleff
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/code/community/EcomDev/PHPUnit/Model/Fixture.php app/code/community/EcomDev/PHPUnit/Model/Fixture.php +1 -1

No files found.
--- a/app/code/community/EcomDev/PHPUnit/Model/Fixture.php
+++ b/app/code/community/EcomDev/PHPUnit/Model/Fixture.php
@@ -412,7 +412,7 @@ class EcomDev_PHPUnit_Model_Fixture
        if (empty($this->_fixture)) {
            $this->_fixture = $data;
        } else {
-            $this->_fixture = array_merge_recursive($this->_fixture, $data);
+            $this->_fixture = array_replace_recursive($this->_fixture, $data);
        }

        return $this;