From 9c8f653554613ded3ef13a23b547cc5a969435e6 Mon Sep 17 00:00:00 2001
From: Kamchybek Jusupov <kjusupov@gmail.com>
Date: Mon, 3 May 2021 14:34:22 +0800
Subject: [PATCH] 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 @@
 <?php
+
 /**
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
@@ -219,6 +220,10 @@ class BaseInflector
         'whiting' => '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 @@
 <?php
+
 /**
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
@@ -44,6 +45,8 @@ class InflectorTest extends TestCase
             'car' => '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));