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

Fix #18832 - Inflector::camel2words() adding extra spaces (#18833)

Browse Source
This commit is contained in:
Brandon Kelly
2021-08-14 01:43:23 -07:00
committed by GitHub
parent 463a67bc73
commit 63e93ba243
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -7,6 +7,7 @@ Yii Framework 2 Change Log
- Enh #18826: Add ability to turn the sorting off for a clicked column in GridView with multisort (ditibal) - Enh #18826: Add ability to turn the sorting off for a clicked column in GridView with multisort (ditibal)
- Bug #18646: Remove stale identity data from session if `IdentityInterface::findIdentity()` returns `null` (mikehaertl) - Bug #18646: Remove stale identity data from session if `IdentityInterface::findIdentity()` returns `null` (mikehaertl)
- Bug #18832: Fix `Inflector::camel2words()` adding extra spaces (brandonkelly)
2.0.43 August 09, 2021 2.0.43 August 09, 2021

10
framework/helpers/BaseInflector.php
View File

@ -371,11 +371,11 @@ class BaseInflector
*/ */
public static function camel2words($name, $ucwords = true) public static function camel2words($name, $ucwords = true)
{ {
$label = mb_strtolower(trim(str_replace([ // Add a space before any uppercase letter preceded by a lowercase letter (xY => x Y)
'-', // and any uppercase letter preceded by an uppercase letter and followed by a lowercase letter (XYz => X Yz)
'_', $label = preg_replace('/(?<=\p{Ll})\p{Lu}|(?<=\p{L})\p{Lu}(?=\p{Ll})/u', ' \0', $name);
'.',
], ' ', preg_replace('/(?<!\p{Lu})(\p{Lu})|(\p{Lu})(?=\p{Ll})/u', ' \0', $name))), self::encoding()); $label = mb_strtolower(trim(str_replace(['-', '_', '.'], ' ', $label)), self::encoding());
return $ucwords ? StringHelper::mb_ucwords($label, self::encoding()) : $label; return $ucwords ? StringHelper::mb_ucwords($label, self::encoding()) : $label;
} }

4
tests/framework/helpers/InflectorTest.php
View File

@ -117,6 +117,10 @@ class InflectorTest extends TestCase
$this->assertEquals('Generate Csrf', Inflector::camel2words('generateCSRF')); $this->assertEquals('Generate Csrf', Inflector::camel2words('generateCSRF'));
$this->assertEquals('Generate Csrf Token', Inflector::camel2words('generateCSRFToken')); $this->assertEquals('Generate Csrf Token', Inflector::camel2words('generateCSRFToken'));
$this->assertEquals('Csrf Token Generator', Inflector::camel2words('CSRFTokenGenerator')); $this->assertEquals('Csrf Token Generator', Inflector::camel2words('CSRFTokenGenerator'));
$this->assertEquals('Foo Bar', Inflector::camel2words('foo bar'));
$this->assertEquals('Foo Bar', Inflector::camel2words('foo BAR'));
$this->assertEquals('Foo Bar', Inflector::camel2words('Foo Bar'));
$this->assertEquals('Foo Bar', Inflector::camel2words('FOO BAR'));
} }
public function testCamel2id() public function testCamel2id()