From c9f491b4f7032794865d8a006547c09f99e8ad47 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Wed, 24 May 2023 23:04:02 +0400 Subject: [PATCH] release version 2.0.48.1 --- framework/BaseYii.php | 2 +- framework/CHANGELOG.md | 4 ++-- framework/console/Controller.php | 4 ++-- framework/web/Controller.php | 4 ---- framework/web/CookieCollection.php | 1 - framework/web/HeaderCollection.php | 3 --- framework/web/Session.php | 1 - 7 files changed, 5 insertions(+), 14 deletions(-) diff --git a/framework/BaseYii.php b/framework/BaseYii.php index 8f76ea5123..d5edc69b7d 100644 --- a/framework/BaseYii.php +++ b/framework/BaseYii.php @@ -93,7 +93,7 @@ class BaseYii */ public static function getVersion() { - return '2.0.49-dev'; + return '2.0.48.1'; } /** diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index e32578da38..92ff683fe4 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -1,8 +1,8 @@ Yii Framework 2 Change Log ========================== -2.0.28.1 under development --------------------------- +2.0.48.1 May 24, 2023 +--------------------- - Bug #19847: Fix regression introduced in #15376 that caused `DbManager::getRolesByUser()` to return stale data (michaelarnauts) diff --git a/framework/console/Controller.php b/framework/console/Controller.php index 614241d0f3..8762d338b5 100644 --- a/framework/console/Controller.php +++ b/framework/console/Controller.php @@ -28,8 +28,8 @@ use yii\helpers\Inflector; * where `` is a route to a controller action and the params will be populated as properties of a command. * See [[options()]] for details. * - * @property-read string $help The help information for this controller. - * @property-read string $helpSummary The one-line short summary describing this controller. + * @property-read string $help + * @property-read string $helpSummary * @property-read array $passedOptionValues The properties corresponding to the passed options. * @property-read array $passedOptions The names of the options passed during execution. * diff --git a/framework/web/Controller.php b/framework/web/Controller.php index 52de6c998e..e426584ca8 100644 --- a/framework/web/Controller.php +++ b/framework/web/Controller.php @@ -17,10 +17,6 @@ use yii\helpers\Url; * * For more details and usage information on Controller, see the [guide article on controllers](guide:structure-controllers). * - * @property Request $request The request object. - * @property Response $response The response object. - * @property View $view The view object that can be used to render views or view files. - * * @author Qiang Xue * @since 2.0 */ diff --git a/framework/web/CookieCollection.php b/framework/web/CookieCollection.php index aa09b9ca45..5c56e46f70 100644 --- a/framework/web/CookieCollection.php +++ b/framework/web/CookieCollection.php @@ -18,7 +18,6 @@ use yii\base\InvalidCallException; * For more details and usage information on CookieCollection, see the [guide article on handling cookies](guide:runtime-sessions-cookies). * * @property-read int $count The number of cookies in the collection. - * @property-read ArrayIterator $iterator An iterator for traversing the cookies in the collection. * * @author Qiang Xue * @since 2.0 diff --git a/framework/web/HeaderCollection.php b/framework/web/HeaderCollection.php index 07d6502ef4..724e875bc6 100644 --- a/framework/web/HeaderCollection.php +++ b/framework/web/HeaderCollection.php @@ -13,9 +13,6 @@ use yii\base\BaseObject; /** * HeaderCollection is used by [[Response]] to maintain the currently registered HTTP headers. * - * @property-read int $count The number of headers in the collection. - * @property-read \ArrayIterator $iterator An iterator for traversing the headers in the collection. - * * @author Qiang Xue * @since 2.0 */ diff --git a/framework/web/Session.php b/framework/web/Session.php index 01997ff5f5..a470e7bfea 100644 --- a/framework/web/Session.php +++ b/framework/web/Session.php @@ -57,7 +57,6 @@ use yii\base\InvalidConfigException; * @property bool $hasSessionId Whether the current request has sent the session ID. * @property string $id The current session ID. * @property-read bool $isActive Whether the session has started. - * @property-read SessionIterator $iterator An iterator for traversing the session variables. * @property string $name The current session name. * @property string $savePath The current session save path, defaults to '/tmp'. * @property int $timeout The number of seconds after which data will be seen as 'garbage' and cleaned up. The