Skip to content

Fix PHPdoc, add PHPStan/Psalm annotations for authMethods property in CompositeAuth class. #20494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 26, 2025
+5 −1
Merged

Fix PHPdoc, add PHPStan/Psalm annotations for authMethods property in CompositeAuth class. #20494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e54e83
Fix `PHPdoc`, add `PHPStan/Psalm` annotations for `authMethods` prope…
terabytesoftw Aug 21, 2025
dc46eb0
Add line to `CHANGELOG.md`.
terabytesoftw Aug 21, 2025
c8fbb71
Merge branch 'master' into fix-phpdoc-1
samdark Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions framework/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Yii Framework 2 Change Log
- Enh #20480: Add PHPStan/Psalm annotations for `ServiceLocator::get` (max-s-lab)
- Bug #20447: Fix behavior for `yii\web\Controller::bindActionParams` around `mixed` type (chriscpty)
- Bug #20492: Fix deprecation of `finfo_close()` in PHP `8.5` by conditionally closing the resource (terabytesoftw)
- 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)

2.0.53 June 27, 2025
Expand Down
5 changes: 4 additions & 1 deletion framework/filters/auth/CompositeAuth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,15 @@
class CompositeAuth extends AuthMethod
{
/**
* @var list<(class-string<AuthInterface>|array{class: class-string<AuthInterface>})> the supported authentication methods. This property should take a list of supported
* @var array the supported authentication methods. This property should take a list of supported
* authentication methods, each represented by an authentication class or configuration.
*
* If this property is empty, no authentication will be performed.
*
* Note that an auth method class must implement the [[\yii\filters\auth\AuthInterface]] interface.
*
* @phpstan-var list<(class-string<AuthInterface>|array{class: class-string<AuthInterface>})>
* @psalm-var list<(class-string<AuthInterface>|array{class: class-string<AuthInterface>})>
*/
public $authMethods = [];

Expand Down