diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 722531ed0a..75e8e3fdbb 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -26,6 +26,7 @@ Yii Framework 2 Change Log - Bug #20508: Fix PHPDoc, add PHPStan/Psalm annotations for `yii\web\CookieCollection::getIterator`. Add missing `@property` annotation in `yii\base\Model` (max-s-lab) - Bug #20513: Fix code examples in PHPDoc (max-s-lab) - Enh #20514: Add `@property` annotations for `yii\console\Controller` (max-s-lab) +- Bug #20515: Fix `@param` annotations in `BetweenColumnsCondition`, `InCondition` and `LikeCondition` (max-s-lab) - Bug #20516: Fix `@template` annotations in `ActiveRecord` (max-s-lab) diff --git a/framework/db/conditions/BetweenColumnsCondition.php b/framework/db/conditions/BetweenColumnsCondition.php index ab3f097d08..0fd15e7c60 100644 --- a/framework/db/conditions/BetweenColumnsCondition.php +++ b/framework/db/conditions/BetweenColumnsCondition.php @@ -62,7 +62,7 @@ class BetweenColumnsCondition implements ConditionInterface /** * Creates a condition with the `BETWEEN` operator. * - * @param mixed the value to compare against + * @param mixed $value the value to compare against * @param string $operator the operator to use (e.g. `BETWEEN` or `NOT BETWEEN`) * @param string|ExpressionInterface $intervalStartColumn the column name or expression that is a beginning of the interval * @param string|ExpressionInterface $intervalEndColumn the column name or expression that is an end of the interval diff --git a/framework/db/conditions/InCondition.php b/framework/db/conditions/InCondition.php index 9d4f0728e8..01a6ee815b 100644 --- a/framework/db/conditions/InCondition.php +++ b/framework/db/conditions/InCondition.php @@ -39,10 +39,10 @@ class InCondition implements ConditionInterface /** * SimpleCondition constructor * - * @param string|string[] the column name. If it is an array, a composite `IN` condition + * @param string|string[] $column the column name. If it is an array, a composite `IN` condition * will be generated. * @param string $operator the operator to use (e.g. `IN` or `NOT IN`) - * @param array an array of values that [[column]] value should be among. If it is an empty array the generated + * @param array $values an array of values that [[column]] value should be among. If it is an empty array the generated * expression will be a `false` value if [[operator]] is `IN` and empty if operator is `NOT IN`. */ public function __construct($column, $operator, $values) diff --git a/framework/db/conditions/LikeCondition.php b/framework/db/conditions/LikeCondition.php index 0fe2a8fa0e..d886320e3f 100644 --- a/framework/db/conditions/LikeCondition.php +++ b/framework/db/conditions/LikeCondition.php @@ -40,7 +40,7 @@ class LikeCondition extends SimpleCondition /** * This method allows to specify how to escape special characters in the value(s). * - * @param array|null|false an array of mappings from the special characters to their escaped counterparts. + * @param array|null|false $escapingReplacements an array of mappings from the special characters to their escaped counterparts. * You may use `false` to indicate the values are already escaped and no escape should be applied, * or either `null` or empty array if escaping is condition builder responsibility. * Note that when using an escape mapping (or the third operand is not provided),