php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-02 21:41:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge from yiisoft/yii2

Browse Source
This commit is contained in:
cuileon
2018-11-14 11:57:32 +08:00
parent 47df8a8cc0
commit 489dd119a5
426 changed files with 18465 additions and 4215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/helpers/BaseArrayHelper.php
View File

@ -131,7 +131,7 @@ class BaseArrayHelper
$res[$k] = $v;
}
} elseif (is_array($v) && isset($res[$k]) && is_array($res[$k])) {
$res[$k] = self::merge($res[$k], $v);
$res[$k] = static::merge($res[$k], $v);
} else {
$res[$k] = $v;
}
@ -509,7 +509,7 @@ class BaseArrayHelper
* ```
*
* @param array $array
* @param string|\Closure $name
* @param int|string|\Closure $name
* @param bool $keepKeys whether to maintain the array keys. If false, the resulting array
* will be re-indexed with integers.
* @return array the list of column values