Skip to content

Y
yii2
Commit 336dd760 by Alexander Makarov
Options

Merge pull request #5279 from mikehaertl/master

[skip ci] Expand abnormally used ternary operator to if
parents 8e16e176 bf97adbf
Showing with 5 additions and 1 deletion
framework/helpers/BaseArrayHelper.php
...@@ -120,7 +120,11 @@ class BaseArrayHelper ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment