zendframework/zendframework#6899 - avoiding unused variable assignment

zendframework · Dec 6, 2014 · 050e947 · 050e947
1 parent 0cf2e1f
commit 050e947
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/ArrayUtils.php b/src/ArrayUtils.php
@@ -258,10 +258,8 @@ 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 MergeRemoveKey;
-
             if (isset($a[$key]) || array_key_exists($key, $a)) {
-                if ($isRemove) {
+                if ($value instanceof MergeRemoveKey) {
                     unset($a[$key]);
                 } elseif (!$preserveNumericKeys && is_int($key)) {
                     $a[] = $value;
@@ -271,7 +269,7 @@ public static function merge(array $a, array $b, $preserveNumericKeys = false)
                     $a[$key] = $value;
                 }
             } else {
-                if (!$isRemove) {
+                if (!$value instanceof MergeRemoveKey) {
                     $a[$key] = $value;
                 }
             }