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

Fix #19467: Revert changes in Inflector::camel2words() (#19495)

Browse Source 
* Fix #19467: Revert changes in `Inflector::camel2words()` introduced in #19204

* Add UPGRADE note
This commit is contained in:
Alexander Makarov
2022-07-30 15:32:29 +03:00
committed by GitHub
parent 59f69fc9cd
commit 9c4c36ee72
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -4,6 +4,7 @@ Yii Framework 2 Change Log
2.0.46 under development 2.0.46 under development
------------------------ ------------------------
- Bug #19467: Revert changes in `Inflector::camel2words()` introduced in #19204 (samdark)
- Bug #19471: Enable console commands on hostings with disabled `exec()` function (WinterSilence, lubosdz) - Bug #19471: Enable console commands on hostings with disabled `exec()` function (WinterSilence, lubosdz)
- Bug #19469: Fix a virtual relation not working because of new isset checks in `\yii\db\ActiveRelationTrait` (wvanheumen) - Bug #19469: Fix a virtual relation not working because of new isset checks in `\yii\db\ActiveRelationTrait` (wvanheumen)
- Bug #19380: Fix PHP 8.1 passing non string to trim() in `yii\db\Query` (wa1kb0y) - Bug #19380: Fix PHP 8.1 passing non string to trim() in `yii\db\Query` (wa1kb0y)

6
framework/UPGRADE.md
View File

@ -51,6 +51,12 @@ if you want to upgrade from version A to version C and there is
version B between A and C, you need to follow the instructions version B between A and C, you need to follow the instructions
for both A and B. for both A and B.
Upgrade from Yii 2.0.45
-----------------------
* Changes in `Inflector::camel2words()` introduced in 2.0.45 were reverted so it works as in pre-2.0.45. If you need
2.0.45 behavior, [introduce your own method](https://github.com/yiisoft/yii2/pull/19495/files).
Upgrade from Yii 2.0.44 Upgrade from Yii 2.0.44
----------------------- -----------------------

2
framework/helpers/BaseInflector.php
View File

@ -388,7 +388,7 @@ class BaseInflector
} }
// Add a space before any uppercase letter preceded by a lowercase letter (xY => x Y) // 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) // 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}\d])\p{Lu}(?=\p{Ll})|(\d+)/u', ' \0', $name); $label = preg_replace('/(?<=\p{Ll})\p{Lu}|(?<=\p{L})\p{Lu}(?=\p{Ll})/u', ' \0', $name);
$label = mb_strtolower(trim(str_replace(['-', '_', '.'], ' ', $label)), self::encoding()); $label = mb_strtolower(trim(str_replace(['-', '_', '.'], ' ', $label)), self::encoding());

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

@ -121,9 +121,6 @@ class InflectorTest extends TestCase
$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'));
$this->assertEquals('Foo Bar', Inflector::camel2words('FOO BAR')); $this->assertEquals('Foo Bar', Inflector::camel2words('FOO BAR'));
$this->assertEquals('Order 4 Other Phones', Inflector::camel2words('Order4OtherPhones'));
$this->assertEquals('I Have 23 Dogs', Inflector::camel2words('IHave23Dogs'));
$this->assertEquals('Con Chó Cười 34 Lần', Inflector::camel2words('ConChóCười34Lần'));
} }
public function testCamel2id() public function testCamel2id()