From 822a214b0dc05380eeac7d6f32d3ac98ce6f8e13 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sun, 7 Apr 2024 23:18:04 +0700 Subject: [PATCH] Remove unnecessary psalm annotations --- src/Query/Query.php | 7 +------ src/QueryBuilder/AbstractDQLQueryBuilder.php | 6 ------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Query/Query.php b/src/Query/Query.php index b566941bf..d76b16b34 100644 --- a/src/Query/Query.php +++ b/src/Query/Query.php @@ -72,9 +72,7 @@ */ class Query implements QueryInterface { - /** - * @psalm-var SelectValue $select - */ + /** @psalm-var SelectValue $select */ protected array $select = []; protected string|null $selectOption = null; protected bool|null $distinct = null; @@ -184,9 +182,6 @@ public function andHaving(array|string|ExpressionInterface $condition, array $pa return $this; } - /** - * @psalm-param SelectValue|scalar|ExpressionInterface $columns - */ public function addSelect(array|bool|float|int|string|ExpressionInterface $columns): static { if ($this->select === []) { diff --git a/src/QueryBuilder/AbstractDQLQueryBuilder.php b/src/QueryBuilder/AbstractDQLQueryBuilder.php index 81b78c354..2717c134a 100644 --- a/src/QueryBuilder/AbstractDQLQueryBuilder.php +++ b/src/QueryBuilder/AbstractDQLQueryBuilder.php @@ -15,7 +15,6 @@ use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Helper\DbStringHelper; -use Yiisoft\Db\Query\QueryPartsInterface; use Yiisoft\Db\QueryBuilder\Condition\HashCondition; use Yiisoft\Db\QueryBuilder\Condition\Interface\ConditionInterface; use Yiisoft\Db\QueryBuilder\Condition\SimpleCondition; @@ -44,8 +43,6 @@ * It's used to query data from a database. * * @link https://en.wikipedia.org/wiki/Data_query_language - * - * @psalm-import-type SelectValue from QueryPartsInterface */ abstract class AbstractDQLQueryBuilder implements DQLQueryBuilderInterface { @@ -335,9 +332,6 @@ public function buildOrderByAndLimit( return $sql; } - /** - * @psalm-param SelectValue $columns - */ public function buildSelect( array $columns, array &$params,