Merge branch 'feature/zendframework/zendframework#6900-array-utils-pe…

…rformance-tweaks' Close zendframework/zendframework#6900
zendframework · Nov 20, 2014 · 4ccab4a · 4ccab4a
commit 4ccab4a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/ArrayUtils.php b/src/ArrayUtils.php
@@ -257,8 +257,8 @@ public static function iteratorToArray($iterator, $recursive = true)
     public static function merge(array $a, array $b, $preserveNumericKeys = false)
     {
         foreach ($b as $key => $value) {
-            if (array_key_exists($key, $a)) {
-                if (is_int($key) && !$preserveNumericKeys) {
+            if (isset($a[$key]) || array_key_exists($key, $a)) {
+                if (!$preserveNumericKeys && is_int($key)) {
                     $a[] = $value;
                 } elseif (is_array($value) && is_array($a[$key])) {
                     $a[$key] = static::merge($a[$key], $value, $preserveNumericKeys);