From 792619ff99e86420f959a4954069adac88b8b355 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Fri, 18 Nov 2022 20:19:33 +0400 Subject: [PATCH 1/4] Fix CHANGELOG --- framework/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 5a88f6d74a6..55308a189a9 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -22,6 +22,7 @@ Yii Framework 2 Change Log - Bug #19581: Fix regression in `CompositeAuth` introduced in #19418 (SamMousa, WinterSilence, samdark) - 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 +69,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) From 68b473679a5f1c85f50ac2aa608a9a8e82b370ee Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Fri, 18 Nov 2022 20:21:58 +0400 Subject: [PATCH 2/4] release version 2.0.47 --- framework/BaseYii.php | 2 +- framework/CHANGELOG.md | 14 +++++++------- framework/base/Controller.php | 2 +- framework/mutex/MysqlMutex.php | 1 + framework/validators/TrimValidator.php | 1 + framework/widgets/MaskedInput.php | 1 + 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/framework/BaseYii.php b/framework/BaseYii.php index b002ad49c39..582c102610b 100644 --- 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.47'; } /** diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 55308a189a9..cea445194d0 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -1,7 +1,7 @@ Yii Framework 2 Change Log ========================== -2.0.47 under development +2.0.47 November 18, 2022 ------------------------ - Bug #12636: Fix CompareValidator successful state when compareAttribute has an error (manchenkoff) @@ -9,19 +9,19 @@ Yii Framework 2 Change Log - 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) diff --git a/framework/base/Controller.php b/framework/base/Controller.php index 3e609be2e9c..2205712fb28 100644 --- 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 diff --git a/framework/mutex/MysqlMutex.php b/framework/mutex/MysqlMutex.php index 0880b2fa1ac..cbbd49dad3f 100644 --- 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 index 89a2eb86b97..022369810b5 100644 --- 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 index 0ed87e131f5..7513169e9b0 100644 --- a/framework/widgets/MaskedInput.php +++ b/framework/widgets/MaskedInput.php @@ -123,6 +123,7 @@ class MaskedInput extends InputWidget 'canClearPosition' ]; + /** * Initializes the widget. * From aed647b78cc778dfeb988b3302d6ca52076efca0 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Fri, 18 Nov 2022 20:22:13 +0400 Subject: [PATCH 3/4] prepare for next release --- framework/BaseYii.php | 2 +- framework/CHANGELOG.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/framework/BaseYii.php b/framework/BaseYii.php index 582c102610b..efc453add05 100644 --- a/framework/BaseYii.php +++ b/framework/BaseYii.php @@ -93,7 +93,7 @@ class BaseYii */ public static function getVersion() { - return '2.0.47'; + return '2.0.48-dev'; } /** diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index cea445194d0..40a25165de2 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -1,6 +1,12 @@ Yii Framework 2 Change Log ========================== +2.0.48 under development +------------------------ + +- no changes in this release. + + 2.0.47 November 18, 2022 ------------------------ From d27f2dbc5887aeaec55940415697d2fd6863afe4 Mon Sep 17 00:00:00 2001 From: Ihor Sychevskyi Date: Sun, 20 Nov 2022 09:48:22 +0200 Subject: [PATCH 4/4] update rest-quick-start.md wiki links (#19686) --- docs/guide-es/rest-quick-start.md | 2 +- docs/guide-ru/rest-quick-start.md | 2 +- docs/guide-uk/rest-quick-start.md | 2 +- docs/guide-zh-CN/rest-quick-start.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/guide-es/rest-quick-start.md b/docs/guide-es/rest-quick-start.md index 06ae63d2a32..89d940c1867 100644 --- 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 index 5e93b0bfdb7..04c31712935 100644 --- 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 index 8e3f06a8af1..16316c61644 100644 --- 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 index 339ea9bab81..da25e7a1ec6 100644 --- 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` 动词的支持； * 认证和授权；