|
|
@ -120,7 +120,11 @@ class BaseArrayHelper |
|
|
|
$next = array_shift($args); |
|
|
|
$next = array_shift($args); |
|
|
|
foreach ($next as $k => $v) { |
|
|
|
foreach ($next as $k => $v) { |
|
|
|
if (is_integer($k)) { |
|
|
|
if (is_integer($k)) { |
|
|
|
isset($res[$k]) ? $res[] = $v : $res[$k] = $v; |
|
|
|
if (isset($res[$k])) { |
|
|
|
|
|
|
|
$res[] = $v; |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
$res[$k] = $v; |
|
|
|
|
|
|
|
} |
|
|
|
} elseif (is_array($v) && isset($res[$k]) && is_array($res[$k])) { |
|
|
|
} elseif (is_array($v) && isset($res[$k]) && is_array($res[$k])) { |
|
|
|
$res[$k] = self::merge($res[$k], $v); |
|
|
|
$res[$k] = self::merge($res[$k], $v); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|