Skip to content

Remove "Condition" suffix from condition classes #439

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 2 commits into from
Jul 29, 2025
Merged

Remove "Condition" suffix from condition classes #439

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5100939
Remove "Condition" suffix from condition classes
vjik Jul 23, 2025
e0b3055
Merge branch 'master' into rm-condition-suffix
vjik Jul 24, 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
14 changes: 7 additions & 7 deletions src/ActiveRelationTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
use Yiisoft\Db\Exception\Exception;
use InvalidArgumentException;
use Yiisoft\Db\Exception\InvalidConfigException;
use Yiisoft\Db\QueryBuilder\Condition\InCondition;
use Yiisoft\Db\QueryBuilder\Condition\ArrayOverlapsCondition;
use Yiisoft\Db\QueryBuilder\Condition\JsonOverlapsCondition;
use Yiisoft\Db\QueryBuilder\Condition\In;
use Yiisoft\Db\QueryBuilder\Condition\ArrayOverlaps;
use Yiisoft\Db\QueryBuilder\Condition\JsonOverlaps;

use function array_column;
use function array_combine;
Expand Down Expand Up @@ -571,9 +571,9 @@ protected function filterByModels(array $models): void
$propertyName = array_key_first($this->link);

match ($this->getArInstance()->columnType($propertyName)) {
ColumnType::ARRAY => $this->andWhere(new ArrayOverlapsCondition($columnName, $values)),
ColumnType::JSON => $this->andWhere(new JsonOverlapsCondition($columnName, $values)),
default => $this->andWhere(new InCondition($columnName, 'IN', $values)),
ColumnType::ARRAY => $this->andWhere(new ArrayOverlaps($columnName, $values)),
ColumnType::JSON => $this->andWhere(new JsonOverlaps($columnName, $values)),
default => $this->andWhere(new In($columnName, 'IN', $values)),
};

return;
Expand Down Expand Up @@ -607,7 +607,7 @@ protected function filterByModels(array $models): void
return;
}

$this->andWhere(new InCondition($columnNames, 'IN', $values));
$this->andWhere(new In($columnNames, 'IN', $values));
}

private function getModelKeys(ActiveRecordInterface|array $model, array $properties): array
Expand Down