Skip to content

Fix @return annotation for ConditionInterface::fromArrayDefinition() #20599

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 4 commits into from
Oct 14, 2025
+2 −1
Merged

Fix @return annotation for ConditionInterface::fromArrayDefinition() #20599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a9332d
Fix `@return` annotation for `ConditionInterface::fromArrayDefinition()`
mspirkov Oct 13, 2025
cee0667
changelog
mspirkov Oct 13, 2025
6a99214
Merge branch 'master' into fix-condition-interface
mspirkov Oct 13, 2025
a188378
Merge branch 'master' into fix-condition-interface
mspirkov Oct 13, 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 @@ -50,6 +50,7 @@ Yii Framework 2 Change Log
- Bug #20585: Fix `@return` annotation for `CompositeUrlRule::createRules()` (mspirkov)
- Bug #20587: Fix `@var` annotation for `yii\rbac\Item::$ruleName` (mspirkov)
- Bug #20589: Fix `@var` annotations for `yii\rbac\DbManager` properties (mspirkov)
- Bug #20599: Fix `@return` annotation for `ConditionInterface::fromArrayDefinition()` (mspirkov)
- Enh #20591: Add PHPStan/Psalm annotations for `yii\rbac\BaseManager::getItems()` (mspirkov)
- Bug #20594: Fix `@return` annotation for `Instance::get()` (mspirkov)
- Bug #20595: Fix `@return` annotation for `BaseHtml::getAttributeValue()` (mspirkov)
Expand Down
2 changes: 1 addition & 1 deletion framework/db/conditions/ConditionInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ interface ConditionInterface extends ExpressionInterface
* @param string $operator operator in uppercase.
* @param array $operands array of corresponding operands
*
* @return $this
* @return static
* @throws InvalidParamException if input parameters are not suitable for this condition
*/
public static function fromArrayDefinition($operator, $operands);
Expand Down
Loading