Merge branch 'inflextor_fixes' of github.com:kjusupov/yii2 into inflextor_fixes

framework/CHANGELOG.md

@@ -6,6 +6,14 @@ Yii Framework 2 Change Log
 
 - 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)
+
+
+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.1 May 06, 2021
 ---------------------

framework/helpers/BaseInflector.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
@@ -622,4 +621,5 @@ class BaseInflector
     {
         return isset(Yii::$app) ? Yii::$app->charset : 'UTF-8';
     }
+
 }