Merge branch 'yiisoft:master' into master

WinterSilence · Nov 21, 2022 · 9c7cee2 · 9c7cee2
2 parents d85f515 + d27f2db
commit 9c7cee2
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 14 deletions.
diff --git a/docs/guide-es/rest-quick-start.md b/docs/guide-es/rest-quick-start.md
@@ -9,7 +9,7 @@ En particular, Yii soporta las siguientes características sobre APIs RESTful;
 * Formato de respuesta de negocio (soporta JSON y XML por defecto);
 * Personalización de objetos serializados con soporte para campos de salida seleccionables;
 * Formateo apropiado de colecciones de datos y validación de errores;
-* Soporte para [HATEOAS](https://en.wikipedia.org/wiki/HATEOAS);
+* Soporte para [HATEOAS](https://es.wikipedia.org/wiki/HATEOAS);
 * Eficiente enrutamiento con una adecuada comprobación del verbo(verb) HTTP;
 * Incorporado soporte para las `OPTIONS` y `HEAD` verbos;
 * Autenticación y autorización;

diff --git a/docs/guide-ru/rest-quick-start.md b/docs/guide-ru/rest-quick-start.md
@@ -9,7 +9,7 @@ Yii включает полноценный набор средств для у
 * Получение сериализованных объектов с нужной вам выборкой полей;
 * Надлежащее форматирование данных и ошибок при их валидации;
 * Коллекция пагинаций, фильтров и сортировок;
-* Поддержка [HATEOAS](https://en.wikipedia.org/wiki/HATEOAS);
+* Поддержка [HATEOAS](https://ru.wikipedia.org/wiki/HATEOAS);
 * Эффективная маршрутизация с надлежащей проверкой HTTP методов;
 * Встроенная поддержка методов `OPTIONS` и `HEAD`;
 * Аутентификация и авторизация;

diff --git a/docs/guide-uk/rest-quick-start.md b/docs/guide-uk/rest-quick-start.md
@@ -9,7 +9,7 @@ Yii включає повноцінний набір засобів для сп
 * Отримання серіалізованих об'єктів із необхідною вам вибіркою полів;
 * Належне форматування даних та помилок при їх валідації;
 * Колекція пагінацій, фільтрів та сортувань;
-* Підтримка [HATEOAS](https://en.wikipedia.org/wiki/HATEOAS);
+* Підтримка [HATEOAS](https://uk.wikipedia.org/wiki/HATEOAS);
 * Ефективна маршрутизація з належною перевіркою методів HTTP;
 * Вбудована підтримка методів `OPTIONS` та `HEAD`;
 * Аутентифікація та авторизація;

diff --git a/docs/guide-zh-CN/rest-quick-start.md b/docs/guide-zh-CN/rest-quick-start.md
@@ -9,7 +9,7 @@ Yii 提供了一整套用来简化实现 RESTful 风格的 Web Service 服务的
 * 支持可选输出字段的定制对象序列化；
 * 适当的格式的数据采集和验证错误；
 * 集合分页，过滤和排序；
-* 支持 [HATEOAS](https://en.wikipedia.org/wiki/HATEOAS)；
+* 支持 [HATEOAS](https://zh.wikipedia.org/wiki/HATEOAS)；
 * 有适当 HTTP 动词检查的高效的路由；
 * 内置 `OPTIONS` 和 `HEAD` 动词的支持；
 * 认证和授权；

diff --git a/framework/BaseYii.php b/framework/BaseYii.php
@@ -93,7 +93,7 @@ class BaseYii
      */
     public static function getVersion()
     {
-        return '2.0.47-dev';
+        return '2.0.48-dev';
     }
 
     /**

diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -1,27 +1,34 @@
 Yii Framework 2 Change Log
 ==========================
 
-2.0.47 under development
+2.0.48 under development
+------------------------
+
+- no changes in this release.
+
+
+2.0.47 November 18, 2022
 ------------------------
 
 - Bug #12636: Fix CompareValidator successful state when compareAttribute has an error (manchenkoff)
 - Bug #14388: Fixed fixture loading order in output message (manchenkoff)
 - Bug #15500: Fix saving empty records to MySQL (manchenkoff)
 - Bug #15557: Fix empty fields exclusion in safe attributes of `yii\base\Model` (manchenkoff)
 - Bug #16658: Fix file readability check on publishing assets by `yii\web\AssetManager` (manchenkoff)
+- Bug #19316: Fix MysqlMutex with same connection but difference database (kamarton)
+- Bug #19507: Fix eager loading of nested one-to-many relations (spo0okie)
 - Bug #19508: Fix wrong selection for boolean attributes in GridView (alnidok)
 - Bug #19517: Fix regression in `CompositeAuth::authenticate()` introduced in #19418 (WinterSilence)
+- Bug #19520: Fix for TIMESTAMP & ROWVERSION columns in MSSQL insert query (darkdef)
 - Bug #19530: Fix specifying the field id for `yii\widgets\ActiveField` (kv4nt)
+- Bug #19534: Fix `yii\helpers\BaseHtml::renderSelectOptions()` to properly render boolean selection (bizley)
 - Bug #19537: Fix default expression detection for MariaDB `date` and `time` columns (bizley)
-- Bug #19589: Fix Error reporting in to the `BaseArrayHelper::getValue()` (lav45)
-- Bug #19316: Fix MysqlMutex with same connection but difference database (kamarton)
-- Bug #19507: Fix eager loading of nested one-to-many relations (spo0okie)
 - Bug #19546: Reverted #19309 (bizley)
-- Bug #19670: Fix Error null check PHP 8.1 `yii\rbac\DbManager` (samuelexyz)
-- Bug #19520: Fix for TIMESTAMP & ROWVERSION columns in MSSQL insert query (darkdef)
 - Bug #19581: Fix regression in `CompositeAuth` introduced in #19418 (SamMousa, WinterSilence, samdark)
+- Bug #19589: Fix Error reporting in to the `BaseArrayHelper::getValue()` (lav45)
+- Bug #19670: Fix Error null check PHP 8.1 `yii\rbac\DbManager` (samuelexyz)
 - Chg #17811: Do not reset `retryHandler` when `yii\db\Command::reset()` called (erickskrauch)
-- Bug #19534: Fix `yii\helpers\BaseHtml::renderSelectOptions()` to properly render boolean selection (bizley)
+- Chg #19354: Reuse `Validator::getAttributeNames()` in  `AttributeTypecastBehavior::detectAttributeTypes()` (WinterSilence)
 
 
 2.0.46 August 18, 2022
@@ -68,7 +75,6 @@ Yii Framework 2 Change Log
 - Enh #19401: Delay `exit(1)` in `yii\base\ErrorHandler::handleFatalError` (arrilot)
 - Enh #19416: Update and improve configurations for `yii\console\controllers\MessageController` (WinterSilence)
 - Enh #19420: Update list of JS callbacks in `yii\widgets\MaskedInput` (WinterSilence)
-- Chg #19354: Reuse `Validator::getAttributeNames()` in  `AttributeTypecastBehavior::detectAttributeTypes()` (WinterSilence)
 - Enh #19437: Add support to specify request port by trusted proxies in `\yii\web\Request::getServerPort()` (rhertogh)
 
 

diff --git a/framework/base/Controller.php b/framework/base/Controller.php
@@ -19,7 +19,7 @@
  * @property-read Module[] $modules All ancestor modules that this controller is located within.
  * @property-read string $route The route (module ID, controller ID and action ID) of the current request.
  * @property-read string $uniqueId The controller ID that is prefixed with the module ID (if any).
- * @property View $view The view object that can be used to render views or view files.
+ * @property View|\yii\web\View $view The view object that can be used to render views or view files.
  * @property string $viewPath The directory containing the view files for this controller.
  *
  * @author Qiang Xue <[email protected]>

diff --git a/framework/mutex/MysqlMutex.php b/framework/mutex/MysqlMutex.php
@@ -42,6 +42,7 @@ class MysqlMutex extends DbMutex
      */
     public $keyPrefix = null;
 
+
     /**
      * Initializes MySQL specific mutex component implementation.
      * @throws InvalidConfigException if [[db]] is not MySQL connection.

diff --git a/framework/validators/TrimValidator.php b/framework/validators/TrimValidator.php
@@ -31,6 +31,7 @@ class TrimValidator extends Validator
      */
     public $skipOnEmpty = false;
 
+
     /**
      * @inheritDoc
      */

diff --git a/framework/widgets/MaskedInput.php b/framework/widgets/MaskedInput.php
@@ -123,6 +123,7 @@ class MaskedInput extends InputWidget
         'canClearPosition'
     ];
 
+
     /**
      * Initializes the widget.
      *
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,7 +93,7 @@ class BaseYii @@
          */
         public static function getVersion()
         {
-            return '2.0.47-dev';
+            return '2.0.48-dev';
         }
         /**
@@ Expand Down @@