changed merge for zend-stdlib's merge. Changed a use namespace reference

zendframework · Sep 20, 2017 · 9457a25 · 9457a25
1 parent e7313bb
commit 9457a25
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/ArraySerializable.php b/src/ArraySerializable.php
@@ -70,7 +70,7 @@ public function hydrate(array $data, $object)
         if (is_callable([$object, 'exchangeArray'])) {
             if (is_callable([$object, 'getArrayCopy'])) {
                 $original = $object->getArrayCopy($object);
-                $replacement = array_merge($original, $replacement);
+                $replacement = \Zend\Stdlib\ArrayUtils::merge($original, $replacement);
             }
             $object->exchangeArray($replacement);
         } elseif (is_callable([$object, 'populate'])) {

diff --git a/test/ArraySerializableTest.php b/test/ArraySerializableTest.php
@@ -14,7 +14,6 @@
 use Zend\Hydrator\Exception\BadMethodCallException;
 use Zend\Hydrator\ArraySerializable;
 use ZendTest\Hydrator\TestAsset\ArraySerializable as ArraySerializableAsset;
-use ZendTest\Hydrator\TestAsset\ArraySerializableNoGetArrayCopy as ArraySerializableAssetNoGetArrayCopy;
 
 /**
  * Unit tests for {@see ArraySerializable}
@@ -121,10 +120,10 @@ public function testWillPreserveOriginalPropsAtHydration()
      */
     public function testWillReplaceArrayIfNoGetArrayCopy()
     {
-        $original = new ArraySerializableAssetNoGetArrayCopy();
+        $original = new \ZendTest\Hydrator\TestAsset\ArraySerializableNoGetArrayCopy();
 
         $data = [
-            'bar' => 'foo1'
+                'bar' => 'foo1'
         ];
 
         $expected = $data;