zendframework/zendframework#6899 - importing MergeRemoveKey class

zendframework · Dec 6, 2014 · 0cf2e1f · 0cf2e1f
1 parent 1920819
commit 0cf2e1f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/ArrayUtils.php b/src/ArrayUtils.php
@@ -10,6 +10,7 @@
 namespace Zend\Stdlib;
 
 use Traversable;
+use Zend\Stdlib\ArrayUtils\MergeRemoveKey;
 
 /**
  * Utility class for testing and manipulation of PHP arrays.
@@ -257,7 +258,7 @@ public static function iteratorToArray($iterator, $recursive = true)
     public static function merge(array $a, array $b, $preserveNumericKeys = false)
     {
         foreach ($b as $key => $value) {
-            $isRemove = $value instanceof ArrayUtils\MergeRemoveKey;
+            $isRemove = $value instanceof MergeRemoveKey;
 
             if (isset($a[$key]) || array_key_exists($key, $a)) {
                 if ($isRemove) {