php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-10-31 02:28:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 20267-widget-end-resolved-classes

Browse Source
This commit is contained in:
Janne
2024-10-30 22:39:22 +02:00
parent 02ef942c53 e4d5d73490
commit 363f90a202
5 changed files with 360 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -10,6 +10,7 @@ Yii Framework 2 Change Log
- Bug #20256: Add support for dropping views in MSSQL server when running migrate/fresh (ambrozt)
- Enh #20248: Add support for attaching behaviors in configurations with Closure (timkelty)
- Enh #20267: Fixed called class check in `Widget::end()` when widget configured using callable (rob006, jrajamaki)
- Enh #20268: Minor optimisation in `\yii\helpers\BaseArrayHelper::map` (chriscpty)
2.0.51 July 18, 2024
--------------------

3
framework/helpers/BaseArrayHelper.php
View File

@ -595,6 +595,9 @@ class BaseArrayHelper
*/
public static function map($array, $from, $to, $group = null)
{
if (is_string($from) && is_string($to) && $group === null && strpos($from, '.') === false && strpos($to, '.') === false) {
return array_column($array, $to, $from);
}
$result = [];
foreach ($array as $element) {
$key = static::getValue($element, $from);

33
framework/helpers/BaseStringHelper.php
View File

@ -313,9 +313,14 @@ class BaseStringHelper
}
if ($skipEmpty) {
// Wrapped with array_values to make array keys sequential after empty values removing
$result = array_values(array_filter($result, function ($value) {
return $value !== '';
}));
$result = array_values(
array_filter(
$result,
function ($value) {
return $value !== '';
}
)
);
}
return $result;
@ -343,7 +348,7 @@ class BaseStringHelper
*/
public static function normalizeNumber($value)
{
$value = (string) $value;
$value = (string)$value;
$localeInfo = localeconv();
$decimalSeparator = isset($localeInfo['decimal_point']) ? $localeInfo['decimal_point'] : null;
@ -396,7 +401,7 @@ class BaseStringHelper
{
// . and , are the only decimal separators known in ICU data,
// so its safe to call str_replace here
return str_replace(',', '.', (string) $number);
return str_replace(',', '.', (string)$number);
}
/**
@ -422,14 +427,14 @@ class BaseStringHelper
$replacements = [
'\\\\\\\\' => '\\\\',
'\\\\\\*' => '[*]',
'\\\\\\?' => '[?]',
'\*' => '.*',
'\?' => '.',
'\[\!' => '[^',
'\[' => '[',
'\]' => ']',
'\-' => '-',
'\\\\\\*' => '[*]',
'\\\\\\?' => '[?]',
'\*' => '.*',
'\?' => '.',
'\[\!' => '[^',
'\[' => '[',
'\]' => ']',
'\-' => '-',
];
if (isset($options['escape']) && !$options['escape']) {
@ -483,7 +488,7 @@ class BaseStringHelper
*/
public static function mb_ucwords($string, $encoding = 'UTF-8')
{
$string = (string) $string;
$string = (string)$string;
if (empty($string)) {
return $string;
}