Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

Commit 050e947

Browse files
committed
zendframework/zendframework#6899 - avoiding unused variable assignment
1 parent 0cf2e1f commit 050e947

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/ArrayUtils.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,8 @@ public static function iteratorToArray($iterator, $recursive = true)
258258
public static function merge(array $a, array $b, $preserveNumericKeys = false)
259259
{
260260
foreach ($b as $key => $value) {
261-
$isRemove = $value instanceof MergeRemoveKey;
262-
263261
if (isset($a[$key]) || array_key_exists($key, $a)) {
264-
if ($isRemove) {
262+
if ($value instanceof MergeRemoveKey) {
265263
unset($a[$key]);
266264
} elseif (!$preserveNumericKeys && is_int($key)) {
267265
$a[] = $value;
@@ -271,7 +269,7 @@ public static function merge(array $a, array $b, $preserveNumericKeys = false)
271269
$a[$key] = $value;
272270
}
273271
} else {
274-
if (!$isRemove) {
272+
if (!$value instanceof MergeRemoveKey) {
275273
$a[$key] = $value;
276274
}
277275
}

0 commit comments

Comments
 (0)