diff --git a/CHANGELOG.md b/CHANGELOG.md index ac378c19..eb7d3623 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ - Chg #330: Rename `insertWithReturningPks()` to `insertReturningPks()` in `Command` and `DMLQueryBuilder` classes (@Tigrov) - Enh #336: Provide `yiisoft/db-implementation` virtual package (@vjik) - Enh #340: Adapt to `Param` refactoring in `yiisoft/db` package (@vjik) +- Enh #341: Adapt to specific condition interfaces removing in `yiisoft/db` package (@vjik) ## 1.3.0 March 21, 2024 diff --git a/src/Builder/InConditionBuilder.php b/src/Builder/InConditionBuilder.php index 7bcfae4f..f8c7ca03 100644 --- a/src/Builder/InConditionBuilder.php +++ b/src/Builder/InConditionBuilder.php @@ -9,7 +9,7 @@ use Yiisoft\Db\Exception\InvalidConfigException; use Yiisoft\Db\Exception\NotSupportedException; use Yiisoft\Db\Expression\ExpressionInterface; -use Yiisoft\Db\QueryBuilder\Condition\Interface\InConditionInterface; +use Yiisoft\Db\QueryBuilder\Condition\InCondition; use function array_slice; use function array_unshift; @@ -17,14 +17,14 @@ use function is_array; /** - * Build an object of {@see \Yiisoft\Db\QueryBuilder\Condition\InCondition} into SQL expressions for Oracle Server. + * Build an object of {@see InCondition} into SQL expressions for Oracle Server. */ final class InConditionBuilder extends \Yiisoft\Db\QueryBuilder\Condition\Builder\InConditionBuilder { /** * The Method builds the raw SQL from the $expression that won't be additionally escaped or quoted. * - * @param InConditionInterface $expression The expression to build. + * @param InCondition $expression The expression to build. * @param array $params The binding parameters. * * @throws Exception @@ -55,7 +55,7 @@ public function build(ExpressionInterface $expression, array &$params = []): str * * @return string|null `null` when split isn't required. Otherwise - built SQL condition. */ - protected function splitCondition(InConditionInterface $condition, array &$params): string|null + protected function splitCondition(InCondition $condition, array &$params): string|null { $operator = $condition->getOperator(); $values = $condition->getValues(); diff --git a/src/Builder/LikeConditionBuilder.php b/src/Builder/LikeConditionBuilder.php index 727e4733..7554253b 100644 --- a/src/Builder/LikeConditionBuilder.php +++ b/src/Builder/LikeConditionBuilder.php @@ -5,14 +5,14 @@ namespace Yiisoft\Db\Oracle\Builder; use Yiisoft\Db\Expression\ExpressionInterface; -use Yiisoft\Db\QueryBuilder\Condition\Interface\LikeConditionInterface; +use Yiisoft\Db\QueryBuilder\Condition\LikeCondition; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; use Yiisoft\Db\Schema\Quoter; use function substr; /** - * Build an object of {@see `\Yiisoft\Db\QueryBuilder\Condition\LikeCondition`} into SQL expressions for Oracle Server. + * Build an object of {@see LikeCondition} into SQL expressions for Oracle Server. */ final class LikeConditionBuilder extends \Yiisoft\Db\QueryBuilder\Condition\Builder\LikeConditionBuilder { @@ -46,7 +46,7 @@ public function build(ExpressionInterface $expression, array &$params = []): str return parent::build($expression, $params); } - protected function prepareColumn(LikeConditionInterface $expression, array &$params): string + protected function prepareColumn(LikeCondition $expression, array &$params): string { $column = parent::prepareColumn($expression, $params); @@ -59,7 +59,7 @@ protected function prepareColumn(LikeConditionInterface $expression, array &$par protected function preparePlaceholderName( string|ExpressionInterface $value, - LikeConditionInterface $expression, + LikeCondition $expression, ?array $escape, array &$params, ): string {