From 2a91892cb128cbdb1868b59bc1d1defd6636d5d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=A1=D0=BF=D0=B8?= =?UTF-8?q?=D1=80=D0=BA=D0=BE=D0=B2?= Date: Tue, 7 Oct 2025 20:27:58 +0400 Subject: [PATCH 1/2] Fix return value in `Request::getServerPort` --- framework/web/Request.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/web/Request.php b/framework/web/Request.php index 083b7329a9a..cfb51b17746 100644 --- a/framework/web/Request.php +++ b/framework/web/Request.php @@ -1173,7 +1173,7 @@ public function getServerPort() if ($this->headers->has($portHeader)) { $port = $this->headers->get($portHeader); if ($port !== null) { - return $port; + return (int) $port; } } } From 6369b2e9522d43ebad2ad4a9f9eb09002dc646cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=A1=D0=BF=D0=B8?= =?UTF-8?q?=D1=80=D0=BA=D0=BE=D0=B2?= Date: Tue, 7 Oct 2025 20:34:22 +0400 Subject: [PATCH 2/2] changelog --- framework/CHANGELOG.md | 73 +++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 2f8ecd26f05..06ac7b06f3c 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -6,46 +6,47 @@ Yii Framework 2 Change Log - Bug #20542: Fix `Formatter` working with more complex ICU unit data structure (OndrejVasicek) - Bug #20483: Fix `CompositeAuth` making bad assumptions on `AuthInterface` implementations (sammousa) -- Bug #20432: Fix PHPStan/Psalm annotations for `ActiveQuery::asArray` (max-s-lab) -- Bug #20437: Fix PHPStan/Psalm annotations for `BaseArrayHelper::merge` (max-s-lab) -- Enh #20434: Added PHPStan/Psalm annotations for `hasMany` and `hasOne` methods (max-s-lab) -- Enh #20433: Added PHPStan/Psalm annotations for some controllers methods: `beforeAction`, `afterAction` and `bindActionParams` (max-s-lab) -- Enh #20442: Add PHPStan/Psalm annotations for `yii\base\Controller` methods: `runAction`, `run`, `render`, `renderPartial` and `renderFile` (max-s-lab) -- Bug #20453: Fix PHPStan/Psalm types in `yii\web\View` (max-s-lab) -- Enh #20461: Add PHPStan/Psalm annotations for `yii\filters\auth\AuthInterface` (max-s-lab) -- Bug #20459: Fix return type in `RequestParserInterface::parse` (max-s-lab) +- Bug #20432: Fix PHPStan/Psalm annotations for `ActiveQuery::asArray` (mspirkov) +- Bug #20437: Fix PHPStan/Psalm annotations for `BaseArrayHelper::merge` (mspirkov) +- Enh #20434: Added PHPStan/Psalm annotations for `hasMany` and `hasOne` methods (mspirkov) +- Enh #20433: Added PHPStan/Psalm annotations for some controllers methods: `beforeAction`, `afterAction` and `bindActionParams` (mspirkov) +- Enh #20442: Add PHPStan/Psalm annotations for `yii\base\Controller` methods: `runAction`, `run`, `render`, `renderPartial` and `renderFile` (mspirkov) +- Bug #20453: Fix PHPStan/Psalm types in `yii\web\View` (mspirkov) +- Enh #20461: Add PHPStan/Psalm annotations for `yii\filters\auth\AuthInterface` (mspirkov) +- Bug #20459: Fix return type in `RequestParserInterface::parse` (mspirkov) - Bug #20475: Fix `Formatter` class `asScientific()` method for PHP `8.5` `sprintf` precision change (`6` to `0`) (terabytesoftw) - Bug #20482: Fix deprecation of `ReflectionMethod::setAccessible()` in PHP `8.5` (terabytesoftw) -- Enh #20480: Add PHPStan/Psalm annotations for `ServiceLocator::get` (max-s-lab) +- Enh #20480: Add PHPStan/Psalm annotations for `ServiceLocator::get` (mspirkov) - Bug #20447: Fix behavior for `yii\web\Controller::bindActionParams` around `mixed` type (chriscpty) - Bug #20479: Fix issue with MSSQL related to char and nchar (craiglondon) - Bug #20492: Fix deprecation of `finfo_close()` in PHP `8.5` by conditionally closing the resource (terabytesoftw) - Bug #20495: Fix behavior when resetting sequence in `QueryBuilder` for `MSSQL` (achretien) -- Bug #20489: Replace deprecated `strftime` with `date` in `YiiRequirementChecker` (max-s-lab) +- Bug #20489: Replace deprecated `strftime` with `date` in `YiiRequirementChecker` (mspirkov) - Bug #20494: Fix `PHPdoc`, add `PHPStan/Psalm` annotations for `authMethods` property in `CompositeAuth` class (terabytesoftw) -- Bug #20485: Fix error `Cannot unset string offsets` in `yii\di\Instance:ensure(['__class' => ...], 'some\class\name')` (max-s-lab) +- Bug #20485: Fix error `Cannot unset string offsets` in `yii\di\Instance:ensure(['__class' => ...], 'some\class\name')` (mspirkov) - Enh #20047: Throw exception when fixture not found rather than ignoring (borgou) - Enh #20505: `ArrayDataProvider` key handling with flexible path support (fetus-hina) -- Bug #20508: Fix PHPDoc, add PHPStan/Psalm annotations for `yii\web\CookieCollection::getIterator`. Add missing `@property` annotation in `yii\base\Model` (max-s-lab) -- Bug #20513: Fix code examples in PHPDoc (max-s-lab) -- Enh #20514: Add `@property` annotations for `yii\console\Controller` (max-s-lab) -- Bug #20515: Fix `@param` annotations in `BetweenColumnsCondition`, `InCondition` and `LikeCondition` (max-s-lab) -- Bug #20516: Fix `@template` annotations in `ActiveRecord` (max-s-lab) -- Bug #19506: Fix `@property` annotations in `yii\console\widgets\Table`, `yii\di\Container` and `yii\web\Session` (max-s-lab) -- Enh #20525: Add `@template` annotations for all actions (max-s-lab) -- Bug #20524: Fix PHPStan/Psalm annotations in `Yii::createObject` (max-s-lab) -- Bug #20530: Fix notice "Object of class DateTimeImmutable could not be converted to int" in `CookieCollection::has` (max-s-lab) -- Bug #20532: Add missing `return` statements in `CacheController::actionFlushSchema`, `FixtureController::actionUnload`, `HelpController::actionIndex` and `ServeController::actionIndex` (max-s-lab) -- Bug #19655: Fix `LinkPager::getPageRange` when `maxButtons` is 2 (max-s-lab) +- Bug #20508: Fix PHPDoc, add PHPStan/Psalm annotations for `yii\web\CookieCollection::getIterator`. Add missing `@property` annotation in `yii\base\Model` (mspirkov) +- Bug #20513: Fix code examples in PHPDoc (mspirkov) +- Enh #20514: Add `@property` annotations for `yii\console\Controller` (mspirkov) +- Bug #20515: Fix `@param` annotations in `BetweenColumnsCondition`, `InCondition` and `LikeCondition` (mspirkov) +- Bug #20516: Fix `@template` annotations in `ActiveRecord` (mspirkov) +- Bug #19506: Fix `@property` annotations in `yii\console\widgets\Table`, `yii\di\Container` and `yii\web\Session` (mspirkov) +- Enh #20525: Add `@template` annotations for all actions (mspirkov) +- Bug #20524: Fix PHPStan/Psalm annotations in `Yii::createObject` (mspirkov) +- Bug #20530: Fix notice "Object of class DateTimeImmutable could not be converted to int" in `CookieCollection::has` (mspirkov) +- Bug #20532: Add missing `return` statements in `CacheController::actionFlushSchema`, `FixtureController::actionUnload`, `HelpController::actionIndex` and `ServeController::actionIndex` (mspirkov) +- Bug #19655: Fix `LinkPager::getPageRange` when `maxButtons` is 2 (mspirkov) - Enh #20539: Update minimum PHP version requirement from `7.3` to `7.4` (terabytesoftw) - Bug #20541: Remove deprecated caching components: `XCache` and `ZendDataCache`, and update related tests and documentation (terabytesoftw) - Bug #20548: Fix PHP `8.5` `null` array offset deprecation warnings (terabytesoftw) -- Enh #19526: Add the `convertIniSizeToBytes` method to `BaseStringHelper` (max-s-lab) -- Bug #20570: Fix `@var` annotation for `UrlManager::$cache` (max-s-lab) -- Bug #20571: Fix `@var` annotation for `yii\web\Response::$stream` (max-s-lab) -- Bug #20569: Fix `@param` annotation for `$default` in `HeaderCollection::get` (max-s-lab) -- Bug #20576: Fix `@var` annotation for `StringValidator::$length` (max-s-lab) -- Enh #20579: Add PHPStan/Psalm annotations for `HeaderCollection::get` (max-s-lab) +- Enh #19526: Add the `convertIniSizeToBytes` method to `BaseStringHelper` (mspirkov) +- Bug #20570: Fix `@var` annotation for `UrlManager::$cache` (mspirkov) +- Bug #20571: Fix `@var` annotation for `yii\web\Response::$stream` (mspirkov) +- Bug #20569: Fix `@param` annotation for `$default` in `HeaderCollection::get` (mspirkov) +- Bug #20576: Fix `@var` annotation for `StringValidator::$length` (mspirkov) +- Enh #20579: Add PHPStan/Psalm annotations for `HeaderCollection::get` (mspirkov) +- Bug #20583: Fix return value in `Request::getServerPort` (mspirkov) 2.0.53 June 27, 2025 @@ -58,21 +59,21 @@ Yii Framework 2 Change Log - Bug #20351: Fix behavior for `yii\web\Controller::bindActionParams` around union types (chriscpty) - Bug #20355: Fix SQL syntax for resetting sequence in `QueryBuilder` for `MSSQL` (terabytesoftw) - Bug #20371: Fix "Typed property must not be accessed before initialization" when calling `toArray()` on a model with typed properties without default value (uaoleg) -- Bug #20373: Fixed the type of the first parameter `yii\base\Controller::bindInjectedParams()` (max-s-lab) +- Bug #20373: Fixed the type of the first parameter `yii\base\Controller::bindInjectedParams()` (mspirkov) - Bug #20387: Fixed the command generated to use router.php file in php built-in server (eseperio) - Bug #20423: `strcmp()` Passing `null` to parameter `2` ($string2) of type string is deprecated (terabytesoftw) - Enh #20309: Add custom attributes support to style tags (nzwz) -- Enh #20354: Add PHPStan/Psalm annotations for `Container` and `Instance` (max-s-lab) -- Enh #20361: Add PHPStan/Psalm annotations for `ActiveQuery` (max-s-lab) -- Enh #20363: Add PHPStan/Psalm annotations for `ActiveRecord` and `ActiveQuery` (max-s-lab) -- Enh #20372: Add PHPStan/Psalm annotations for `AssetBundle`, `AssetManager` and `View` (max-s-lab) -- Enh #20374: Add PHPStan/Psalm annotations for `BaseYii`, `BaseObject`, `Component`, `Model`, `Module` and `yii\base\Controller` (max-s-lab) +- Enh #20354: Add PHPStan/Psalm annotations for `Container` and `Instance` (mspirkov) +- Enh #20361: Add PHPStan/Psalm annotations for `ActiveQuery` (mspirkov) +- Enh #20363: Add PHPStan/Psalm annotations for `ActiveRecord` and `ActiveQuery` (mspirkov) +- Enh #20372: Add PHPStan/Psalm annotations for `AssetBundle`, `AssetManager` and `View` (mspirkov) +- Enh #20374: Add PHPStan/Psalm annotations for `BaseYii`, `BaseObject`, `Component`, `Model`, `Module` and `yii\base\Controller` (mspirkov) - Enh #20385: Fixed the memory leak issue when using `Query::exists()` with MySQL (snewer) -- Enh #20394: Add PHPStan/Psalm annotations for `Yii::getAlias` (max-s-lab) +- Enh #20394: Add PHPStan/Psalm annotations for `Yii::getAlias` (mspirkov) - Enh #20395: Add PHPStan/Psalm annotations for `ActiveForm::validate` (samuelrajan747) - Enh #20397: Add PHPStan/Psalm annotations for `ArrayHelper::merge` (samuelrajan747) - Enh #20400: Add PHPStan/Psalm annotations for `yii\web\User` (samuelrajan747) -- Enh #20413: Add PHPStan/Psalm annotations for `Action`, `ActionEvent`, `Application`, `DynamicModel` and `InlineAction` (max-s-lab) +- Enh #20413: Add PHPStan/Psalm annotations for `Action`, `ActionEvent`, `Application`, `DynamicModel` and `InlineAction` (mspirkov) - Enh #20416: Add `PHPStan`/`PSalm` annotation for `owner` property in `Behavior` class (terabytesoftw) - Enh #20426: Add `PHPStan`/`Psalm` annotation for `controller` property in `Action` class (terabytesoftw) - Enh #20430: Update PHPStan/Psalm annotations for `ArrayHelper::merge` to handle array-key (samuelrajan747)