Skip to content

Commit 68600db

Browse files
authored
Fix #20524: Fix PHPStan/Psalm annotations in Yii::createObject
1 parent 398dea3 commit 68600db

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

framework/BaseYii.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,8 @@ public static function autoload($className)
343343
* @see \yii\di\Container
344344
*
345345
* @template T
346-
* @phpstan-param class-string<T>|array{class: class-string<T>, ...}|callable(): T $type
347-
* @psalm-param class-string<T>|array{class: class-string<T>, ...}|callable(): T $type
346+
* @phpstan-param class-string<T>|array{class?: class-string<T>, __class?: class-string<T>, ...}|callable(): T $type
347+
* @psalm-param class-string<T>|array{class?: class-string<T>, __class?: class-string<T>, ...}|callable(): T $type
348348
* @phpstan-return T
349349
* @psalm-return T
350350
*/

framework/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Yii Framework 2 Change Log
2828
- Enh #20514: Add `@property` annotations for `yii\console\Controller` (max-s-lab)
2929
- Bug #20515: Fix `@param` annotations in `BetweenColumnsCondition`, `InCondition` and `LikeCondition` (max-s-lab)
3030
- Bug #20516: Fix `@template` annotations in `ActiveRecord` (max-s-lab)
31+
- Bug #20524: Fix PHPStan/Psalm annotations in `Yii::createObject` (max-s-lab)
3132

3233

3334
2.0.53 June 27, 2025

0 commit comments

Comments
 (0)