Adapt to change expression builders' namespaces

Author: vjik

src/Builder/ArrayExpressionBuilder.php

@@ -4,12 +4,12 @@
 
 namespace Yiisoft\Db\Pgsql\Builder;
 
-use Yiisoft\Db\Command\Param;
 use Yiisoft\Db\Constant\ColumnType;
 use Yiisoft\Db\Constant\DataType;
-use Yiisoft\Db\Expression\AbstractArrayExpressionBuilder;
 use Yiisoft\Db\Expression\ArrayExpression;
+use Yiisoft\Db\Expression\Builder\AbstractArrayExpressionBuilder;
 use Yiisoft\Db\Expression\ExpressionInterface;
+use Yiisoft\Db\Expression\Param;
 use Yiisoft\Db\Pgsql\Data\LazyArray;
 use Yiisoft\Db\Query\QueryInterface;
 use Yiisoft\Db\Schema\Column\AbstractArrayColumn;

src/Builder/ArrayOverlapsBuilder.php

@@ -9,7 +9,7 @@
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Expression\ArrayExpression;
-use Yiisoft\Db\Expression\ExpressionBuilderInterface;
+use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface;
 use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Expression\JsonExpression;
 use Yiisoft\Db\QueryBuilder\Condition\ArrayOverlaps;

src/Builder/CaseExpressionBuilder.php

@@ -14,7 +14,7 @@
 /**
  * Builds expressions for {@see CaseExpression}.
  */
-final class CaseExpressionBuilder extends \Yiisoft\Db\Expression\CaseExpressionBuilder
+final class CaseExpressionBuilder extends \Yiisoft\Db\Expression\Builder\CaseExpressionBuilder
 {
     public function build(ExpressionInterface $expression, array &$params = []): string
     {

src/Builder/JsonExpressionBuilder.php

@@ -10,10 +10,10 @@
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Expression\ArrayExpression;
-use Yiisoft\Db\Expression\ExpressionBuilderInterface;
+use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface;
 use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Expression\JsonExpression;
-use Yiisoft\Db\Expression\JsonExpressionBuilder as BaseJsonExpressionBuilder;
+use Yiisoft\Db\Expression\Builder\JsonExpressionBuilder as BaseJsonExpressionBuilder;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
 
 /**

src/Builder/JsonOverlapsBuilder.php

@@ -9,7 +9,7 @@
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Expression\ArrayExpression;
-use Yiisoft\Db\Expression\ExpressionBuilderInterface;
+use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface;
 use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Expression\JsonExpression;
 use Yiisoft\Db\QueryBuilder\Condition\JsonOverlaps;

src/Builder/StructuredExpressionBuilder.php

@@ -4,13 +4,13 @@
 
 namespace Yiisoft\Db\Pgsql\Builder;
 
-use Yiisoft\Db\Command\Param;
 use Yiisoft\Db\Constant\DataType;
 use Yiisoft\Db\Exception\Exception;
 use InvalidArgumentException;
 use Yiisoft\Db\Exception\InvalidConfigException;
 use Yiisoft\Db\Exception\NotSupportedException;
-use Yiisoft\Db\Expression\AbstractStructuredExpressionBuilder;
+use Yiisoft\Db\Expression\Builder\AbstractStructuredExpressionBuilder;
+use Yiisoft\Db\Expression\Param;
 use Yiisoft\Db\Expression\StructuredExpression;
 use Yiisoft\Db\Pgsql\Data\StructuredLazyArray;
 use Yiisoft\Db\Query\QueryInterface;

tests/ArrayExpressionBuilderTest.php

@@ -7,12 +7,12 @@
 use ArrayIterator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
-use Yiisoft\Db\Command\Param;
 use Yiisoft\Db\Constant\ColumnType;
 use Yiisoft\Db\Constant\DataType;
 use Yiisoft\Db\Expression\ArrayExpression;
 use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Expression\JsonExpression;
+use Yiisoft\Db\Expression\Param;
 use Yiisoft\Db\Expression\StructuredExpression;
 use Yiisoft\Db\Pgsql\Builder\ArrayExpressionBuilder;
 use Yiisoft\Db\Pgsql\Column\ColumnBuilder;

tests/JsonExpressionBuilderTest.php

@@ -7,10 +7,10 @@
 use ArrayIterator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
-use Yiisoft\Db\Command\Param;
 use Yiisoft\Db\Constant\DataType;
 use Yiisoft\Db\Expression\ArrayExpression;
 use Yiisoft\Db\Expression\JsonExpression;
+use Yiisoft\Db\Expression\Param;
 use Yiisoft\Db\Pgsql\Builder\JsonExpressionBuilder;
 use Yiisoft\Db\Pgsql\Column\IntegerColumn;
 use Yiisoft\Db\Pgsql\Data\LazyArray;

tests/Provider/QueryBuilderProvider.php

@@ -4,12 +4,12 @@
 
 namespace Yiisoft\Db\Pgsql\Tests\Provider;
 
-use Yiisoft\Db\Command\Param;
 use Yiisoft\Db\Constant\DataType;
 use Yiisoft\Db\Constant\PseudoType;
 use Yiisoft\Db\Expression\ArrayExpression;
 use Yiisoft\Db\Expression\CaseExpression;
 use Yiisoft\Db\Expression\Expression;
+use Yiisoft\Db\Expression\Param;
 use Yiisoft\Db\Pgsql\Column\ColumnBuilder;
 use Yiisoft\Db\Pgsql\Column\IntegerColumn;
 use Yiisoft\Db\Pgsql\Tests\Support\TestTrait;

tests/StructuredExpressionBuilderTest.php

@@ -7,8 +7,8 @@
 use ArrayIterator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
-use Yiisoft\Db\Command\Param;
 use Yiisoft\Db\Constant\DataType;
+use Yiisoft\Db\Expression\Param;
 use Yiisoft\Db\Expression\StructuredExpression;
 use Yiisoft\Db\Pgsql\Builder\StructuredExpressionBuilder;
 use Yiisoft\Db\Pgsql\Column\ColumnBuilder;