From 6f90870f737ca02407c59ebcf750c490fd8009fb Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 30 Aug 2025 12:42:10 +0700 Subject: [PATCH 1/2] Rearrange expression namespaces --- src/Builder/JsonOverlapsBuilder.php | 4 ++-- tests/Provider/QueryBuilderProvider.php | 4 ++-- tests/QueryBuilderTest.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Builder/JsonOverlapsBuilder.php b/src/Builder/JsonOverlapsBuilder.php index 68b62609..f9e56100 100644 --- a/src/Builder/JsonOverlapsBuilder.php +++ b/src/Builder/JsonOverlapsBuilder.php @@ -8,9 +8,9 @@ use InvalidArgumentException; use Yiisoft\Db\Exception\InvalidConfigException; use Yiisoft\Db\Exception\NotSupportedException; -use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\ExpressionInterface; -use Yiisoft\Db\Expression\JsonExpression; +use Yiisoft\Db\Expression\Value\JsonExpression; use Yiisoft\Db\QueryBuilder\Condition\JsonOverlaps; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; diff --git a/tests/Provider/QueryBuilderProvider.php b/tests/Provider/QueryBuilderProvider.php index 2a9b824c..c825861a 100644 --- a/tests/Provider/QueryBuilderProvider.php +++ b/tests/Provider/QueryBuilderProvider.php @@ -7,10 +7,10 @@ use Yiisoft\Db\Constant\ColumnType; use Yiisoft\Db\Constant\DataType; use Yiisoft\Db\Constant\PseudoType; -use Yiisoft\Db\Expression\ArrayExpression; +use Yiisoft\Db\Expression\Value\ArrayExpression; use Yiisoft\Db\Expression\Expression; use Yiisoft\Db\Expression\Function\ArrayMerge; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Mysql\Column\ColumnBuilder; use Yiisoft\Db\Mysql\Tests\Support\TestTrait; diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php index 2a61d22d..cbe0d4c0 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -9,11 +9,11 @@ use PHPUnit\Framework\Attributes\TestWith; use Yiisoft\Db\Constant\DataType; use Yiisoft\Db\Exception\NotSupportedException; -use Yiisoft\Db\Expression\CaseExpression; +use Yiisoft\Db\Expression\Statement\CaseExpression; use Yiisoft\Db\Expression\Expression; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Expression\Function\ArrayMerge; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Mysql\Tests\Provider\QueryBuilderProvider; use Yiisoft\Db\Mysql\Tests\Support\TestTrait; use Yiisoft\Db\Query\Query; From f927b8e21bff442ed6fa8046c2671bc56dabb6b0 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 30 Aug 2025 13:16:15 +0700 Subject: [PATCH 2/2] Add line to CHANGELOG.md [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5143055d..d5a4cafc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ - New #421: Add `Connection::getColumnBuilderClass()` method (@Tigrov) - New #420, #427: Implement `ArrayMergeBuilder`, `LongestBuilder` and `ShortestBuilder` classes (@Tigrov) - Enh #423: Refactor `DMLQueryBuilder::upsert()` method (@Tigrov) +- Chg #428: Update expression namespaces according to changes in `yiisoft/db` package (@Tigrov) ## 1.2.0 March 21, 2024