From 9c8f653554613ded3ef13a23b547cc5a969435e6 Mon Sep 17 00:00:00 2001 From: Kamchybek Jusupov Date: Mon, 3 May 2021 14:34:22 +0800 Subject: [PATCH 1/9] Added 'software' and 'hardware' string to BaseInflector $specials. --- framework/helpers/BaseInflector.php | 6 +++++- tests/framework/helpers/InflectorTest.php | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/framework/helpers/BaseInflector.php b/framework/helpers/BaseInflector.php index 410ee59..888b79a 100644 --- a/framework/helpers/BaseInflector.php +++ b/framework/helpers/BaseInflector.php @@ -1,4 +1,5 @@ 'whiting', 'wildebeest' => 'wildebeest', 'Yengeese' => 'Yengeese', + 'software' => 'software', + 'Software' => 'Software', + 'hardware' => 'hardware', + 'Hardware' => 'Hardware', ]; /** * @var array fallback map for transliteration used by [[transliterate()]] when intl isn't available. @@ -619,5 +624,4 @@ class BaseInflector { return isset(Yii::$app) ? Yii::$app->charset : 'UTF-8'; } - } diff --git a/tests/framework/helpers/InflectorTest.php b/tests/framework/helpers/InflectorTest.php index 7b80522..e07b13a 100644 --- a/tests/framework/helpers/InflectorTest.php +++ b/tests/framework/helpers/InflectorTest.php @@ -1,4 +1,5 @@ 'cars', 'netherlands' => 'netherlands', 'currency' => 'currencies', + 'software' => 'software', + 'hardware' => 'hardware', ]; foreach ($testData as $testIn => $testOut) { @@ -73,6 +76,8 @@ class InflectorTest extends TestCase 'cars' => 'car', 'Netherlands' => 'Netherlands', 'currencies' => 'currency', + 'software' => 'software', + 'hardware' => 'hardware', ]; foreach ($testData as $testIn => $testOut) { $this->assertEquals($testOut, Inflector::singularize($testIn)); From c9889cfd2fc5b8ce0d828d5df5612e996c3fff38 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Fri, 7 May 2021 01:35:40 +0300 Subject: [PATCH 2/9] Update InflectorTest.php --- tests/framework/helpers/InflectorTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/framework/helpers/InflectorTest.php b/tests/framework/helpers/InflectorTest.php index e07b13a..eaadb1c 100644 --- a/tests/framework/helpers/InflectorTest.php +++ b/tests/framework/helpers/InflectorTest.php @@ -1,5 +1,4 @@ Date: Fri, 7 May 2021 01:36:02 +0300 Subject: [PATCH 3/9] Update BaseInflector.php --- framework/helpers/BaseInflector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/helpers/BaseInflector.php b/framework/helpers/BaseInflector.php index 888b79a..f77372e 100644 --- a/framework/helpers/BaseInflector.php +++ b/framework/helpers/BaseInflector.php @@ -1,5 +1,4 @@ charset : 'UTF-8'; } + } From b41f4dc76fed53eab1ed15140c394031b0062f04 Mon Sep 17 00:00:00 2001 From: Kamchybek Jusupov Date: Fri, 7 May 2021 21:32:13 +0800 Subject: [PATCH 4/9] Remove capitalized versions of rules --- framework/helpers/BaseInflector.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/framework/helpers/BaseInflector.php b/framework/helpers/BaseInflector.php index f77372e..82e7f24 100644 --- a/framework/helpers/BaseInflector.php +++ b/framework/helpers/BaseInflector.php @@ -1,4 +1,5 @@ 'wildebeest', 'Yengeese' => 'Yengeese', 'software' => 'software', - 'Software' => 'Software', 'hardware' => 'hardware', - 'Hardware' => 'Hardware', ]; /** * @var array fallback map for transliteration used by [[transliterate()]] when intl isn't available. @@ -623,5 +622,4 @@ class BaseInflector { return isset(Yii::$app) ? Yii::$app->charset : 'UTF-8'; } - } From c76e4dd7c7a06481990c0d82e9b899638c1d5b04 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Sun, 9 May 2021 00:59:33 +0300 Subject: [PATCH 5/9] Update BaseInflector.php --- framework/helpers/BaseInflector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/helpers/BaseInflector.php b/framework/helpers/BaseInflector.php index 82e7f24..2e01e76 100644 --- a/framework/helpers/BaseInflector.php +++ b/framework/helpers/BaseInflector.php @@ -1,5 +1,4 @@ charset : 'UTF-8'; } + } From 94a6b5d548ed6c6bac98cf507e317aaa3f98ac39 Mon Sep 17 00:00:00 2001 From: Kamchybek Jusupov Date: Mon, 10 May 2021 16:05:28 +0800 Subject: [PATCH 6/9] Added the CHANGELOG entry --- framework/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index d67780e..9fb306d 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -5,6 +5,7 @@ Yii Framework 2 Change Log -------------------------- - Bug #18634: Fix `yii\db\BaseActiveRecord::unlink()` and `unlinkAll()` to omit condition for `on` property when it doesn't exist (bizley) +- Enh: Added strings "software, hardware" to `$specials` array in `yii\helpers\BaseInflector` (kjusupov) 2.0.42 May 05, 2021 From e63be01f20ce8d3a5308fd41876cbe0f84539ecd Mon Sep 17 00:00:00 2001 From: Bizley Date: Mon, 10 May 2021 10:09:36 +0200 Subject: [PATCH 7/9] Update CHANGELOG.md --- framework/CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 8ade601..707a7be 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -4,14 +4,13 @@ Yii Framework 2 Change Log 2.0.43 under development ------------------------ -- no changes in this release. +- Enh #18628: Added strings "software", and "hardware" to `$specials` array in `yii\helpers\BaseInflector` (kjusupov) 2.0.42.1 May 06, 2021 --------------------- - Bug #18634: Fix `yii\db\BaseActiveRecord::unlink()` and `unlinkAll()` to omit condition for `on` property when it doesn't exist (bizley) -- Enh: Added strings "software, hardware" to `$specials` array in `yii\helpers\BaseInflector` (kjusupov) 2.0.42 May 05, 2021 From 3019d4aa8e8f2c4cc9c1a01ac47b8d378f6462fe Mon Sep 17 00:00:00 2001 From: Kamchybek Jusupov Date: Mon, 10 May 2021 16:10:08 +0800 Subject: [PATCH 8/9] Merge branch 'inflextor_fixes' of github.com:kjusupov/yii2 into inflextor_fixes --- framework/CHANGELOG.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 9fb306d..4235f6f 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -1,13 +1,17 @@ Yii Framework 2 Change Log ========================== -2.0.42.1 under development --------------------------- +2.0.43 under development +------------------------ -- Bug #18634: Fix `yii\db\BaseActiveRecord::unlink()` and `unlinkAll()` to omit condition for `on` property when it doesn't exist (bizley) - Enh: Added strings "software, hardware" to `$specials` array in `yii\helpers\BaseInflector` (kjusupov) +2.0.42.1 May 06, 2021 +--------------------- + +- Bug #18634: Fix `yii\db\BaseActiveRecord::unlink()` and `unlinkAll()` to omit condition for `on` property when it doesn't exist (bizley) + 2.0.42 May 05, 2021 ------------------- From 66ff8309b9b27cb7109bc7df743b7356abd3f91e Mon Sep 17 00:00:00 2001 From: Bizley Date: Mon, 10 May 2021 10:12:37 +0200 Subject: [PATCH 9/9] Update CHANGELOG.md --- framework/CHANGELOG.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index a74f57e..707a7be 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -4,8 +4,6 @@ Yii Framework 2 Change Log 2.0.43 under development ------------------------ -- Enh: Added strings "software, hardware" to `$specials` array in `yii\helpers\BaseInflector` (kjusupov) - - Enh #18628: Added strings "software", and "hardware" to `$specials` array in `yii\helpers\BaseInflector` (kjusupov) @@ -15,11 +13,6 @@ Yii Framework 2 Change Log - Bug #18634: Fix `yii\db\BaseActiveRecord::unlink()` and `unlinkAll()` to omit condition for `on` property when it doesn't exist (bizley) -2.0.42.1 May 06, 2021 ---------------------- - -- Bug #18634: Fix `yii\db\BaseActiveRecord::unlink()` and `unlinkAll()` to omit condition for `on` property when it doesn't exist (bizley) - 2.0.42 May 05, 2021 -------------------