From 0e64f11348bb03ffaab92dfaa38175838197192a Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 30 Aug 2025 12:41:58 +0700 Subject: [PATCH 1/2] Rearrange expression namespaces --- src/Builder/JsonOverlapsBuilder.php | 4 ++-- tests/ColumnTest.php | 2 +- tests/Provider/QueryBuilderProvider.php | 2 +- tests/QueryBuilderTest.php | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Builder/JsonOverlapsBuilder.php b/src/Builder/JsonOverlapsBuilder.php index c0dfb814..77129a04 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/ColumnTest.php b/tests/ColumnTest.php index 5a86c1d9..6aac83d3 100644 --- a/tests/ColumnTest.php +++ b/tests/ColumnTest.php @@ -8,7 +8,7 @@ use DateTimeZone; use PDO; use Yiisoft\Db\Connection\ConnectionInterface; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Schema\Column\BinaryColumn; use Yiisoft\Db\Schema\Column\BooleanColumn; use Yiisoft\Db\Schema\Column\DoubleColumn; diff --git a/tests/Provider/QueryBuilderProvider.php b/tests/Provider/QueryBuilderProvider.php index 33dcc587..e1021929 100644 --- a/tests/Provider/QueryBuilderProvider.php +++ b/tests/Provider/QueryBuilderProvider.php @@ -8,7 +8,7 @@ use Yiisoft\Db\Constant\PseudoType; 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\Query\Query; use Yiisoft\Db\QueryBuilder\Condition\In; use Yiisoft\Db\Sqlite\Column\ColumnBuilder; diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php index 334918cf..5c0330aa 100644 --- a/tests/QueryBuilderTest.php +++ b/tests/QueryBuilderTest.php @@ -8,12 +8,12 @@ use PHPUnit\Framework\Attributes\DataProviderExternal; use Yiisoft\Db\Constant\DataType; use Yiisoft\Db\Exception\NotSupportedException; -use Yiisoft\Db\Expression\ArrayExpression; -use Yiisoft\Db\Expression\CaseExpression; +use Yiisoft\Db\Expression\Value\ArrayExpression; +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\Query\Query; use Yiisoft\Db\Query\QueryInterface; use Yiisoft\Db\QueryBuilder\Condition\JsonOverlaps; From d223b74a7b0352d706ce727f6e065dbc03297fb4 Mon Sep 17 00:00:00 2001 From: Tigrov Date: Sat, 30 Aug 2025 13:15:17 +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 73819fe3..a2534e8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,7 @@ - New #385: Add `Connection::getColumnBuilderClass()` method (@Tigrov) - New #384, #390: Implement `ArrayMergeBuilder`, `GreatestBuilder` and `LeastBuilder` classes (@Tigrov) - Enh #387: Refactor `DMLQueryBuilder::upsert()` method (@Tigrov) +- Chg #391: Update expression namespaces according to changes in `yiisoft/db` package (@Tigrov) ## 1.2.0 March 21, 2024