php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-10-31 18:47:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #20594: Fix @return annotation for Instance::get()

Browse Source
This commit is contained in:
Maksim Spirkov
2025-10-13 10:01:02 +03:00
committed by GitHub
parent fe9b52c61b
commit e53622d6d3
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -49,6 +49,7 @@ Yii Framework 2 Change Log
- Bug #20583: Fix return value in `Request::getServerPort` (mspirkov) - Bug #20583: Fix return value in `Request::getServerPort` (mspirkov)
- Bug #20587: Fix `@var` annotation for `yii\rbac\Item::$ruleName` (mspirkov) - Bug #20587: Fix `@var` annotation for `yii\rbac\Item::$ruleName` (mspirkov)
- Bug #20589: Fix `@var` annotations for `yii\rbac\DbManager` properties (mspirkov) - Bug #20589: Fix `@var` annotations for `yii\rbac\DbManager` properties (mspirkov)
- Bug #20594: Fix `@return` annotation for `Instance::get()` (mspirkov)
- Bug #20595: Fix `@return` annotation for `BaseHtml::getAttributeValue()` (mspirkov) - Bug #20595: Fix `@return` annotation for `BaseHtml::getAttributeValue()` (mspirkov)

2
framework/di/Instance.php
View File

@ -173,7 +173,7 @@ class Instance
* Returns the actual object referenced by this Instance object. * Returns the actual object referenced by this Instance object.
* @param ServiceLocator|Container|null $container the container used to locate the referenced object. * @param ServiceLocator|Container|null $container the container used to locate the referenced object.
* If null, the method will first try `Yii::$app` then `Yii::$container`. * If null, the method will first try `Yii::$app` then `Yii::$container`.
* @return object the actual object referenced by this Instance object. * @return object|null the actual object referenced by this Instance object.
*/ */
public function get($container = null) public function get($container = null)
{ {