diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index ed8843137c..db8bd5b164 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -39,6 +39,7 @@ Yii Framework 2 Change Log - 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) diff --git a/framework/web/UrlManager.php b/framework/web/UrlManager.php index 1837f6dc52..286246a2fc 100644 --- a/framework/web/UrlManager.php +++ b/framework/web/UrlManager.php @@ -119,7 +119,7 @@ class UrlManager extends Component */ public $routeParam = 'r'; /** - * @var CacheInterface|array|string|bool the cache object or the application component ID of the cache object. + * @var CacheInterface|array|string|bool|null the cache object or the application component ID of the cache object. * This can also be an array that is used to create a [[CacheInterface]] instance in case you do not want to use * an application component. * Compiled URL rules will be cached through this cache object, if it is available.