diff --git a/CHANGELOG.md b/CHANGELOG.md index a92c5b645..99582792f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -143,6 +143,7 @@ methods (@Tigrov) - Enh #1049: Refactor `AbstractDQLQueryBuilder::buildSelect()` to fix possible bugs (@Tigrov) - Enh #1051: Refactor `Quoter` class (@Tigrov) +- Chg #1052: Rearrange expression namespaces (@Tigrov) ## 1.3.0 March 21, 2024 diff --git a/UPGRADE.md b/UPGRADE.md index 775729d01..5e65fbcb8 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -265,11 +265,11 @@ Each table column has its own class in the `Yiisoft\Db\Schema\Column` namespace - `ConditionInterface` moved to `Yiisoft\Db\QueryBuilder\Condition` namespace; - Remove `AbstractConjunctionCondition` and `AbstractOverlapsConditionBuilder`; - Change namespace of condition and condition builder classes; +- Change namespace of expression and expression builder classes; - Remove `AbstractDsn` and `AbstractDsnSocket` classes and `DsnInterface` interface; - Remove `Hash` condition; - Remove `AbstractTableSchema` and add `TableSchema` instead; - Remove `BetweenColumns` condition; -- Move expression builders to `Yiisoft\Db\Expression\Builder` namespace; - Change `QueryBuilderInterface::getExpressionBuilder()` result type to `ExpressionBuilderInterface`; - Change `DQLQueryBuilderInterface::getExpressionBuilder()` result type to `ExpressionBuilderInterface`; diff --git a/docs/guide/en/expressions/functions.md b/docs/guide/en/expressions/functions.md index 65b61d6ce..350f49850 100644 --- a/docs/guide/en/expressions/functions.md +++ b/docs/guide/en/expressions/functions.md @@ -3,8 +3,8 @@ The library provides several classes to represent SQL functions as expressions. > [!WARNING] -> The functions do not quote string values or column names, use [Value](../../../../src/Expression/Value.php) -> expression for string values and [ColumnName](../../../../src/Expression/ColumnName.php) expression for column names +> The functions do not quote string values or column names, use [Value](../../../../src/Expression/Value/Value.php) +> expression for string values and [ColumnName](../../../../src/Expression/Value/ColumnName.php) expression for column names > or quote the values directly. > > For example, `new Longest(new Value('short'), new ColumnName('column'), "'longest'")` diff --git a/src/Command/AbstractCommand.php b/src/Command/AbstractCommand.php index b7d10967d..3c2bd5728 100644 --- a/src/Command/AbstractCommand.php +++ b/src/Command/AbstractCommand.php @@ -8,7 +8,7 @@ use Throwable; use Yiisoft\Db\Connection\ConnectionInterface; use Yiisoft\Db\Exception\Exception; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Query\DataReaderInterface; use Yiisoft\Db\Query\QueryInterface; use Yiisoft\Db\QueryBuilder\DMLQueryBuilderInterface; diff --git a/src/Command/CommandInterface.php b/src/Command/CommandInterface.php index bc622ff46..7c9bd393b 100644 --- a/src/Command/CommandInterface.php +++ b/src/Command/CommandInterface.php @@ -19,7 +19,7 @@ use Yiisoft\Db\Exception\InvalidConfigException; use Yiisoft\Db\Exception\NotSupportedException; use Yiisoft\Db\Expression\ExpressionInterface; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Query\DataReaderInterface; use Yiisoft\Db\Query\QueryInterface; use Yiisoft\Db\QueryBuilder\DMLQueryBuilderInterface; diff --git a/src/Driver/Pdo/AbstractPdoCommand.php b/src/Driver/Pdo/AbstractPdoCommand.php index 8fd98f0d4..ea195ba4d 100644 --- a/src/Driver/Pdo/AbstractPdoCommand.php +++ b/src/Driver/Pdo/AbstractPdoCommand.php @@ -13,7 +13,7 @@ use Psr\Log\LogLevel; use Throwable; use Yiisoft\Db\Command\AbstractCommand; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Connection\ConnectionInterface; use Yiisoft\Db\Exception\ConvertException; use Yiisoft\Db\Exception\Exception; diff --git a/src/Expression/Builder/ExpressionBuilder.php b/src/Expression/ExpressionBuilder.php similarity index 97% rename from src/Expression/Builder/ExpressionBuilder.php rename to src/Expression/ExpressionBuilder.php index c912d9836..225906298 100644 --- a/src/Expression/Builder/ExpressionBuilder.php +++ b/src/Expression/ExpressionBuilder.php @@ -2,12 +2,10 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression\Builder; +namespace Yiisoft\Db\Expression; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Connection\ConnectionInterface; -use Yiisoft\Db\Expression\Expression; -use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; use function array_merge; diff --git a/src/Expression/Builder/ExpressionBuilderInterface.php b/src/Expression/ExpressionBuilderInterface.php similarity index 93% rename from src/Expression/Builder/ExpressionBuilderInterface.php rename to src/Expression/ExpressionBuilderInterface.php index c32e41c69..ce60d1fc3 100644 --- a/src/Expression/Builder/ExpressionBuilderInterface.php +++ b/src/Expression/ExpressionBuilderInterface.php @@ -2,9 +2,7 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression\Builder; - -use Yiisoft\Db\Expression\ExpressionInterface; +namespace Yiisoft\Db\Expression; /** * This interface defines the methods to build database expressions, such as conditions for a SELECT statement or values diff --git a/src/Expression/ExpressionInterface.php b/src/Expression/ExpressionInterface.php index 6bedbc53b..7283cbc53 100644 --- a/src/Expression/ExpressionInterface.php +++ b/src/Expression/ExpressionInterface.php @@ -4,8 +4,6 @@ namespace Yiisoft\Db\Expression; -use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface; - /** * This interface defines a set of methods that an object should implement to represent an expression in database * queries, such as one for filtering or ordering results. diff --git a/src/Expression/Function/Builder/LengthBuilder.php b/src/Expression/Function/Builder/LengthBuilder.php index b68301b6d..d028540f8 100644 --- a/src/Expression/Function/Builder/LengthBuilder.php +++ b/src/Expression/Function/Builder/LengthBuilder.php @@ -4,7 +4,7 @@ namespace Yiisoft\Db\Expression\Function\Builder; -use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Expression\Function\Length; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; diff --git a/src/Expression/Function/Builder/MultiOperandFunctionBuilder.php b/src/Expression/Function/Builder/MultiOperandFunctionBuilder.php index 5ca31bfb4..07a2ef429 100644 --- a/src/Expression/Function/Builder/MultiOperandFunctionBuilder.php +++ b/src/Expression/Function/Builder/MultiOperandFunctionBuilder.php @@ -5,7 +5,7 @@ namespace Yiisoft\Db\Expression\Function\Builder; use InvalidArgumentException; -use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Expression\Function\MultiOperandFunction; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; diff --git a/src/Expression/Builder/CaseExpressionBuilder.php b/src/Expression/Statement/Builder/CaseExpressionBuilder.php similarity index 94% rename from src/Expression/Builder/CaseExpressionBuilder.php rename to src/Expression/Statement/Builder/CaseExpressionBuilder.php index 4eb363ccd..4c564817c 100644 --- a/src/Expression/Builder/CaseExpressionBuilder.php +++ b/src/Expression/Statement/Builder/CaseExpressionBuilder.php @@ -2,11 +2,12 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression\Builder; +namespace Yiisoft\Db\Expression\Statement\Builder; use InvalidArgumentException; use Yiisoft\Db\Constant\GettypeResult; -use Yiisoft\Db\Expression\CaseExpression; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\Statement\CaseExpression; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; diff --git a/src/Expression/CaseExpression.php b/src/Expression/Statement/CaseExpression.php similarity index 98% rename from src/Expression/CaseExpression.php rename to src/Expression/Statement/CaseExpression.php index ef50cb39c..342204355 100644 --- a/src/Expression/CaseExpression.php +++ b/src/Expression/Statement/CaseExpression.php @@ -2,8 +2,9 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression; +namespace Yiisoft\Db\Expression\Statement; +use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Query\QueryInterface; use Yiisoft\Db\Schema\Column\ColumnInterface; diff --git a/src/Expression/WhenClause.php b/src/Expression/Statement/WhenClause.php similarity index 95% rename from src/Expression/WhenClause.php rename to src/Expression/Statement/WhenClause.php index a60a7bb5b..c8455d46a 100644 --- a/src/Expression/WhenClause.php +++ b/src/Expression/Statement/WhenClause.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression; +namespace Yiisoft\Db\Expression\Statement; use Yiisoft\Db\Query\QueryInterface; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; diff --git a/src/Expression/ArrayExpression.php b/src/Expression/Value/ArrayExpression.php similarity index 97% rename from src/Expression/ArrayExpression.php rename to src/Expression/Value/ArrayExpression.php index 22c4c272c..a014bfd99 100644 --- a/src/Expression/ArrayExpression.php +++ b/src/Expression/Value/ArrayExpression.php @@ -2,9 +2,10 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression; +namespace Yiisoft\Db\Expression\Value; use Traversable; +use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Query\QueryInterface; use Yiisoft\Db\QueryBuilder\ColumnDefinitionBuilderInterface; use Yiisoft\Db\Schema\Column\ColumnFactoryInterface; diff --git a/src/Expression/Builder/AbstractArrayExpressionBuilder.php b/src/Expression/Value/Builder/AbstractArrayExpressionBuilder.php similarity index 95% rename from src/Expression/Builder/AbstractArrayExpressionBuilder.php rename to src/Expression/Value/Builder/AbstractArrayExpressionBuilder.php index a2d909259..b5a02e537 100644 --- a/src/Expression/Builder/AbstractArrayExpressionBuilder.php +++ b/src/Expression/Value/Builder/AbstractArrayExpressionBuilder.php @@ -2,9 +2,10 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression\Builder; +namespace Yiisoft\Db\Expression\Value\Builder; -use Yiisoft\Db\Expression\ArrayExpression; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\Value\ArrayExpression; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Query\QueryInterface; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; diff --git a/src/Expression/Builder/AbstractStructuredExpressionBuilder.php b/src/Expression/Value/Builder/AbstractStructuredExpressionBuilder.php similarity index 97% rename from src/Expression/Builder/AbstractStructuredExpressionBuilder.php rename to src/Expression/Value/Builder/AbstractStructuredExpressionBuilder.php index ac4fe489d..a6c01979f 100644 --- a/src/Expression/Builder/AbstractStructuredExpressionBuilder.php +++ b/src/Expression/Value/Builder/AbstractStructuredExpressionBuilder.php @@ -2,14 +2,15 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression\Builder; +namespace Yiisoft\Db\Expression\Value\Builder; use Yiisoft\Db\Exception\Exception; use InvalidArgumentException; use Yiisoft\Db\Exception\InvalidConfigException; use Yiisoft\Db\Exception\NotSupportedException; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\ExpressionInterface; -use Yiisoft\Db\Expression\StructuredExpression; +use Yiisoft\Db\Expression\Value\StructuredExpression; use Yiisoft\Db\Helper\DbArrayHelper; use Yiisoft\Db\Query\QueryInterface; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; diff --git a/src/Expression/Builder/ArrayExpressionBuilder.php b/src/Expression/Value/Builder/ArrayExpressionBuilder.php similarity index 92% rename from src/Expression/Builder/ArrayExpressionBuilder.php rename to src/Expression/Value/Builder/ArrayExpressionBuilder.php index 4bc1a66dd..0bcc609f2 100644 --- a/src/Expression/Builder/ArrayExpressionBuilder.php +++ b/src/Expression/Value/Builder/ArrayExpressionBuilder.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression\Builder; +namespace Yiisoft\Db\Expression\Value\Builder; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Constant\DataType; -use Yiisoft\Db\Expression\ArrayExpression; +use Yiisoft\Db\Expression\Value\ArrayExpression; use Yiisoft\Db\Query\QueryInterface; use Yiisoft\Db\Schema\Data\JsonLazyArray; use Yiisoft\Db\Schema\Data\LazyArray; diff --git a/src/Expression/Builder/ColumnNameBuilder.php b/src/Expression/Value/Builder/ColumnNameBuilder.php similarity index 86% rename from src/Expression/Builder/ColumnNameBuilder.php rename to src/Expression/Value/Builder/ColumnNameBuilder.php index bd3f20858..d3689f5ba 100644 --- a/src/Expression/Builder/ColumnNameBuilder.php +++ b/src/Expression/Value/Builder/ColumnNameBuilder.php @@ -2,9 +2,10 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression\Builder; +namespace Yiisoft\Db\Expression\Value\Builder; -use Yiisoft\Db\Expression\ColumnName; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\Value\ColumnName; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; diff --git a/src/Expression/Value/Builder/DateTimeValueBuilder.php b/src/Expression/Value/Builder/DateTimeValueBuilder.php index c69767e0d..55a9f1898 100644 --- a/src/Expression/Value/Builder/DateTimeValueBuilder.php +++ b/src/Expression/Value/Builder/DateTimeValueBuilder.php @@ -5,7 +5,7 @@ namespace Yiisoft\Db\Expression\Value\Builder; use Yiisoft\Db\Constant\ColumnType; -use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\Value\DateTimeValue; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; diff --git a/src/Expression/Builder/JsonExpressionBuilder.php b/src/Expression/Value/Builder/JsonExpressionBuilder.php similarity index 94% rename from src/Expression/Builder/JsonExpressionBuilder.php rename to src/Expression/Value/Builder/JsonExpressionBuilder.php index 2c6b8c871..85b0f306e 100644 --- a/src/Expression/Builder/JsonExpressionBuilder.php +++ b/src/Expression/Value/Builder/JsonExpressionBuilder.php @@ -2,19 +2,20 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression\Builder; +namespace Yiisoft\Db\Expression\Value\Builder; use JsonException; use JsonSerializable; use Traversable; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\Value\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\ExpressionInterface; -use Yiisoft\Db\Expression\JsonExpression; +use Yiisoft\Db\Expression\Value\JsonExpression; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; use Yiisoft\Db\Schema\Data\JsonLazyArray; use Yiisoft\Db\Schema\Data\LazyArray; diff --git a/src/Expression/Builder/ParamBuilder.php b/src/Expression/Value/Builder/ParamBuilder.php similarity index 85% rename from src/Expression/Builder/ParamBuilder.php rename to src/Expression/Value/Builder/ParamBuilder.php index 3ceb9fd6a..8f945e78a 100644 --- a/src/Expression/Builder/ParamBuilder.php +++ b/src/Expression/Value/Builder/ParamBuilder.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression\Builder; +namespace Yiisoft\Db\Expression\Value\Builder; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\ExpressionInterface; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use function count; diff --git a/src/Expression/Builder/StructuredExpressionBuilder.php b/src/Expression/Value/Builder/StructuredExpressionBuilder.php similarity index 92% rename from src/Expression/Builder/StructuredExpressionBuilder.php rename to src/Expression/Value/Builder/StructuredExpressionBuilder.php index b77781941..2914232f9 100644 --- a/src/Expression/Builder/StructuredExpressionBuilder.php +++ b/src/Expression/Value/Builder/StructuredExpressionBuilder.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression\Builder; +namespace Yiisoft\Db\Expression\Value\Builder; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Constant\DataType; -use Yiisoft\Db\Expression\StructuredExpression; +use Yiisoft\Db\Expression\Value\StructuredExpression; use Yiisoft\Db\Query\QueryInterface; use Yiisoft\Db\Schema\Data\JsonLazyArray; use Yiisoft\Db\Schema\Data\LazyArray; diff --git a/src/Expression/Builder/ValueBuilder.php b/src/Expression/Value/Builder/ValueBuilder.php similarity index 87% rename from src/Expression/Builder/ValueBuilder.php rename to src/Expression/Value/Builder/ValueBuilder.php index 18770f5a6..3bf446612 100644 --- a/src/Expression/Builder/ValueBuilder.php +++ b/src/Expression/Value/Builder/ValueBuilder.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression\Builder; +namespace Yiisoft\Db\Expression\Value\Builder; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\ExpressionInterface; -use Yiisoft\Db\Expression\Value; +use Yiisoft\Db\Expression\Value\Value; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; /** diff --git a/src/Expression/ColumnName.php b/src/Expression/Value/ColumnName.php similarity index 82% rename from src/Expression/ColumnName.php rename to src/Expression/Value/ColumnName.php index 105ee8bc4..d0b1b34dc 100644 --- a/src/Expression/ColumnName.php +++ b/src/Expression/Value/ColumnName.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression; +namespace Yiisoft\Db\Expression\Value; + +use Yiisoft\Db\Expression\ExpressionInterface; /** * Represents a column name expression for SQL queries. diff --git a/src/Expression/JsonExpression.php b/src/Expression/Value/JsonExpression.php similarity index 96% rename from src/Expression/JsonExpression.php rename to src/Expression/Value/JsonExpression.php index b2f00ba5e..398bb6336 100644 --- a/src/Expression/JsonExpression.php +++ b/src/Expression/Value/JsonExpression.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression; +namespace Yiisoft\Db\Expression\Value; + +use Yiisoft\Db\Expression\ExpressionInterface; /** * Represents data to encode to JSON. diff --git a/src/Expression/Param.php b/src/Expression/Value/Param.php similarity index 92% rename from src/Expression/Param.php rename to src/Expression/Value/Param.php index a54fd2a42..7dade253f 100644 --- a/src/Expression/Param.php +++ b/src/Expression/Value/Param.php @@ -2,9 +2,10 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression; +namespace Yiisoft\Db\Expression\Value; use Yiisoft\Db\Constant\DataType; +use Yiisoft\Db\Expression\ExpressionInterface; /** * Represents a parameter used in building an SQL statement. diff --git a/src/Expression/StructuredExpression.php b/src/Expression/Value/StructuredExpression.php similarity index 97% rename from src/Expression/StructuredExpression.php rename to src/Expression/Value/StructuredExpression.php index 27df78502..8261a6344 100644 --- a/src/Expression/StructuredExpression.php +++ b/src/Expression/Value/StructuredExpression.php @@ -2,9 +2,10 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression; +namespace Yiisoft\Db\Expression\Value; use JsonSerializable; +use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Query\QueryInterface; use Yiisoft\Db\Schema\Column\AbstractStructuredColumn; diff --git a/src/Expression/Value.php b/src/Expression/Value/Value.php similarity index 83% rename from src/Expression/Value.php rename to src/Expression/Value/Value.php index 67eb024ec..7dd1eec80 100644 --- a/src/Expression/Value.php +++ b/src/Expression/Value/Value.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace Yiisoft\Db\Expression; +namespace Yiisoft\Db\Expression\Value; + +use Yiisoft\Db\Expression\ExpressionInterface; /** * Represents a value for SQL queries. diff --git a/src/Query/QueryExpressionBuilder.php b/src/Query/QueryExpressionBuilder.php index 65c100caa..c8efa3c19 100644 --- a/src/Query/QueryExpressionBuilder.php +++ b/src/Query/QueryExpressionBuilder.php @@ -8,7 +8,7 @@ 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\QueryBuilder\QueryBuilderInterface; diff --git a/src/QueryBuilder/AbstractDQLQueryBuilder.php b/src/QueryBuilder/AbstractDQLQueryBuilder.php index 5266495a0..7b3d4aa02 100644 --- a/src/QueryBuilder/AbstractDQLQueryBuilder.php +++ b/src/QueryBuilder/AbstractDQLQueryBuilder.php @@ -4,19 +4,19 @@ namespace Yiisoft\Db\QueryBuilder; -use Yiisoft\Db\Expression\Param; -use Yiisoft\Db\Expression\Builder\ParamBuilder; +use Yiisoft\Db\Expression\Value\Param; +use Yiisoft\Db\Expression\Value\Builder\ParamBuilder; use Yiisoft\Db\Exception\Exception; use InvalidArgumentException; use Yiisoft\Db\Exception\InvalidConfigException; use Yiisoft\Db\Exception\NotSupportedException; -use Yiisoft\Db\Expression\ArrayExpression; -use Yiisoft\Db\Expression\Builder\ArrayExpressionBuilder; -use Yiisoft\Db\Expression\ColumnName; -use Yiisoft\Db\Expression\Builder\ColumnNameBuilder; +use Yiisoft\Db\Expression\Value\ArrayExpression; +use Yiisoft\Db\Expression\Value\Builder\ArrayExpressionBuilder; +use Yiisoft\Db\Expression\Value\ColumnName; +use Yiisoft\Db\Expression\Value\Builder\ColumnNameBuilder; use Yiisoft\Db\Expression\Expression; -use Yiisoft\Db\Expression\Builder\ExpressionBuilder; -use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\ExpressionBuilder; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Expression\Function\Builder\GreatestBuilder; use Yiisoft\Db\Expression\Function\Builder\LeastBuilder; @@ -28,14 +28,14 @@ use Yiisoft\Db\Expression\Function\Length; use Yiisoft\Db\Expression\Function\Longest; use Yiisoft\Db\Expression\Function\Shortest; -use Yiisoft\Db\Expression\JsonExpression; -use Yiisoft\Db\Expression\Builder\JsonExpressionBuilder; -use Yiisoft\Db\Expression\CaseExpression; -use Yiisoft\Db\Expression\Builder\CaseExpressionBuilder; -use Yiisoft\Db\Expression\StructuredExpression; -use Yiisoft\Db\Expression\Builder\StructuredExpressionBuilder; -use Yiisoft\Db\Expression\Value; -use Yiisoft\Db\Expression\Builder\ValueBuilder; +use Yiisoft\Db\Expression\Value\JsonExpression; +use Yiisoft\Db\Expression\Value\Builder\JsonExpressionBuilder; +use Yiisoft\Db\Expression\Statement\CaseExpression; +use Yiisoft\Db\Expression\Statement\Builder\CaseExpressionBuilder; +use Yiisoft\Db\Expression\Value\StructuredExpression; +use Yiisoft\Db\Expression\Value\Builder\StructuredExpressionBuilder; +use Yiisoft\Db\Expression\Value\Value; +use Yiisoft\Db\Expression\Value\Builder\ValueBuilder; use Yiisoft\Db\Expression\Value\DateTimeValue; use Yiisoft\Db\Expression\Value\Builder\DateTimeValueBuilder; use Yiisoft\Db\QueryBuilder\Condition\ConditionInterface; diff --git a/src/QueryBuilder/AbstractQueryBuilder.php b/src/QueryBuilder/AbstractQueryBuilder.php index 0a3037875..e99351d83 100644 --- a/src/QueryBuilder/AbstractQueryBuilder.php +++ b/src/QueryBuilder/AbstractQueryBuilder.php @@ -10,16 +10,16 @@ use Stringable; use Traversable; use Yiisoft\Db\Command\CommandInterface; -use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Constant\DataType; use Yiisoft\Db\Connection\ConnectionInterface; use Yiisoft\Db\Connection\ServerInfoInterface; use Yiisoft\Db\Constant\GettypeResult; use InvalidArgumentException; -use Yiisoft\Db\Expression\ArrayExpression; +use Yiisoft\Db\Expression\Value\ArrayExpression; use Yiisoft\Db\Expression\ExpressionInterface; -use Yiisoft\Db\Expression\JsonExpression; +use Yiisoft\Db\Expression\Value\JsonExpression; use Yiisoft\Db\Query\QueryInterface; use Yiisoft\Db\QueryBuilder\Condition\ConditionInterface; use Yiisoft\Db\Schema\Column\ColumnFactoryInterface; diff --git a/src/QueryBuilder/Condition/Builder/AllBuilder.php b/src/QueryBuilder/Condition/Builder/AllBuilder.php index f70070600..033b24719 100644 --- a/src/QueryBuilder/Condition/Builder/AllBuilder.php +++ b/src/QueryBuilder/Condition/Builder/AllBuilder.php @@ -4,7 +4,7 @@ namespace Yiisoft\Db\QueryBuilder\Condition\Builder; -use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\QueryBuilder\Condition\All; diff --git a/src/QueryBuilder/Condition/Builder/BetweenBuilder.php b/src/QueryBuilder/Condition/Builder/BetweenBuilder.php index 6f6f36e20..ccc227287 100644 --- a/src/QueryBuilder/Condition/Builder/BetweenBuilder.php +++ b/src/QueryBuilder/Condition/Builder/BetweenBuilder.php @@ -8,7 +8,7 @@ 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\QueryBuilder\Condition\Between; use Yiisoft\Db\QueryBuilder\Condition\NotBetween; diff --git a/src/QueryBuilder/Condition/Builder/CompareBuilder.php b/src/QueryBuilder/Condition/Builder/CompareBuilder.php index 2e2de939e..eb21f033f 100644 --- a/src/QueryBuilder/Condition/Builder/CompareBuilder.php +++ b/src/QueryBuilder/Condition/Builder/CompareBuilder.php @@ -7,7 +7,7 @@ use Yiisoft\Db\Exception\Exception; 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\QueryBuilder\Condition\AbstractCompare; use Yiisoft\Db\QueryBuilder\Condition\Equals; diff --git a/src/QueryBuilder/Condition/Builder/ExistsBuilder.php b/src/QueryBuilder/Condition/Builder/ExistsBuilder.php index 946cbcbc7..c99da83ff 100644 --- a/src/QueryBuilder/Condition/Builder/ExistsBuilder.php +++ b/src/QueryBuilder/Condition/Builder/ExistsBuilder.php @@ -8,7 +8,7 @@ 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\QueryBuilder\Condition\Exists; use Yiisoft\Db\QueryBuilder\Condition\NotExists; diff --git a/src/QueryBuilder/Condition/Builder/InBuilder.php b/src/QueryBuilder/Condition/Builder/InBuilder.php index 953694337..ec6e8d853 100644 --- a/src/QueryBuilder/Condition/Builder/InBuilder.php +++ b/src/QueryBuilder/Condition/Builder/InBuilder.php @@ -11,7 +11,7 @@ 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\QueryBuilder\Condition\In; use Yiisoft\Db\QueryBuilder\Condition\NotIn; diff --git a/src/QueryBuilder/Condition/Builder/LikeBuilder.php b/src/QueryBuilder/Condition/Builder/LikeBuilder.php index cf981efef..b448e047f 100644 --- a/src/QueryBuilder/Condition/Builder/LikeBuilder.php +++ b/src/QueryBuilder/Condition/Builder/LikeBuilder.php @@ -5,13 +5,13 @@ namespace Yiisoft\Db\QueryBuilder\Condition\Builder; use Traversable; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\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\Builder\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\QueryBuilder\Condition\Like; use Yiisoft\Db\QueryBuilder\Condition\LikeConjunction; diff --git a/src/QueryBuilder/Condition/Builder/LogicalBuilder.php b/src/QueryBuilder/Condition/Builder/LogicalBuilder.php index 64bee955e..b781baf7c 100644 --- a/src/QueryBuilder/Condition/Builder/LogicalBuilder.php +++ b/src/QueryBuilder/Condition/Builder/LogicalBuilder.php @@ -8,7 +8,7 @@ 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\QueryBuilder\Condition\AndX; use Yiisoft\Db\QueryBuilder\Condition\OrX; diff --git a/src/QueryBuilder/Condition/Builder/NoneBuilder.php b/src/QueryBuilder/Condition/Builder/NoneBuilder.php index aba76c876..568d3fda3 100644 --- a/src/QueryBuilder/Condition/Builder/NoneBuilder.php +++ b/src/QueryBuilder/Condition/Builder/NoneBuilder.php @@ -4,7 +4,7 @@ namespace Yiisoft\Db\QueryBuilder\Condition\Builder; -use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\QueryBuilder\Condition\None; diff --git a/src/QueryBuilder/Condition/Builder/NotBuilder.php b/src/QueryBuilder/Condition/Builder/NotBuilder.php index 38df7c989..46b8d95ac 100644 --- a/src/QueryBuilder/Condition/Builder/NotBuilder.php +++ b/src/QueryBuilder/Condition/Builder/NotBuilder.php @@ -8,7 +8,7 @@ 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\QueryBuilder\Condition\Between; use Yiisoft\Db\QueryBuilder\Condition\ConditionInterface; diff --git a/src/QueryBuilder/Condition/Builder/SimpleBuilder.php b/src/QueryBuilder/Condition/Builder/SimpleBuilder.php index 29fa8ac43..3ed75dd59 100644 --- a/src/QueryBuilder/Condition/Builder/SimpleBuilder.php +++ b/src/QueryBuilder/Condition/Builder/SimpleBuilder.php @@ -8,7 +8,7 @@ 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\QueryBuilder\Condition\Simple; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; diff --git a/src/QueryBuilder/DQLQueryBuilderInterface.php b/src/QueryBuilder/DQLQueryBuilderInterface.php index 744e09155..39f67d00f 100644 --- a/src/QueryBuilder/DQLQueryBuilderInterface.php +++ b/src/QueryBuilder/DQLQueryBuilderInterface.php @@ -9,7 +9,7 @@ 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\Query\QueryPartsInterface; use Yiisoft\Db\QueryBuilder\Condition\ConditionInterface; diff --git a/src/QueryBuilder/QueryBuilderInterface.php b/src/QueryBuilder/QueryBuilderInterface.php index 621402323..29e61e102 100644 --- a/src/QueryBuilder/QueryBuilderInterface.php +++ b/src/QueryBuilder/QueryBuilderInterface.php @@ -4,11 +4,11 @@ namespace Yiisoft\Db\QueryBuilder; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Connection\ConnectionInterface; use Yiisoft\Db\Connection\ServerInfoInterface; use InvalidArgumentException; -use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Schema\Column\ColumnFactoryInterface; use Yiisoft\Db\Schema\Column\ColumnInterface; diff --git a/src/Schema/Column/AbstractArrayColumn.php b/src/Schema/Column/AbstractArrayColumn.php index c2c82c58e..5e6dbc8b6 100644 --- a/src/Schema/Column/AbstractArrayColumn.php +++ b/src/Schema/Column/AbstractArrayColumn.php @@ -5,7 +5,7 @@ namespace Yiisoft\Db\Schema\Column; use Yiisoft\Db\Constant\ColumnType; -use Yiisoft\Db\Expression\ArrayExpression; +use Yiisoft\Db\Expression\Value\ArrayExpression; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Query\QueryInterface; use Yiisoft\Db\Schema\Data\LazyArrayInterface; diff --git a/src/Schema/Column/AbstractJsonColumn.php b/src/Schema/Column/AbstractJsonColumn.php index 30862068d..1c96d067e 100644 --- a/src/Schema/Column/AbstractJsonColumn.php +++ b/src/Schema/Column/AbstractJsonColumn.php @@ -6,7 +6,7 @@ use Yiisoft\Db\Constant\ColumnType; use Yiisoft\Db\Expression\ExpressionInterface; -use Yiisoft\Db\Expression\JsonExpression; +use Yiisoft\Db\Expression\Value\JsonExpression; /** * Represents an abstract JSON column. diff --git a/src/Schema/Column/AbstractStructuredColumn.php b/src/Schema/Column/AbstractStructuredColumn.php index 323c6624e..d9b0b34d6 100644 --- a/src/Schema/Column/AbstractStructuredColumn.php +++ b/src/Schema/Column/AbstractStructuredColumn.php @@ -6,7 +6,7 @@ use Yiisoft\Db\Constant\ColumnType; use Yiisoft\Db\Expression\ExpressionInterface; -use Yiisoft\Db\Expression\StructuredExpression; +use Yiisoft\Db\Expression\Value\StructuredExpression; /** * Represents an abstract structured column. diff --git a/src/Schema/Column/BinaryColumn.php b/src/Schema/Column/BinaryColumn.php index 4ddc573d8..fd80d602e 100644 --- a/src/Schema/Column/BinaryColumn.php +++ b/src/Schema/Column/BinaryColumn.php @@ -7,7 +7,7 @@ use BackedEnum; use PDO; use Stringable; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Constant\ColumnType; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Constant\GettypeResult; diff --git a/tests/AbstractCommandTest.php b/tests/AbstractCommandTest.php index 4ce2a886f..b6a1f23ba 100644 --- a/tests/AbstractCommandTest.php +++ b/tests/AbstractCommandTest.php @@ -6,7 +6,7 @@ use PHPUnit\Framework\TestCase; use Throwable; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Exception\Exception; use Yiisoft\Db\Exception\InvalidConfigException; use Yiisoft\Db\Exception\NotSupportedException; diff --git a/tests/AbstractQueryBuilderTest.php b/tests/AbstractQueryBuilderTest.php index bad59c75d..32a945d7c 100644 --- a/tests/AbstractQueryBuilderTest.php +++ b/tests/AbstractQueryBuilderTest.php @@ -10,15 +10,15 @@ use PHPUnit\Framework\Attributes\DataProviderExternal; use PHPUnit\Framework\TestCase; use stdClass; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\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\CaseExpression; +use Yiisoft\Db\Expression\Statement\CaseExpression; use Yiisoft\Db\Expression\Expression; -use Yiisoft\Db\Expression\Builder\ExpressionBuilderInterface; +use Yiisoft\Db\Expression\ExpressionBuilderInterface; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Expression\Function\Length; use Yiisoft\Db\Query\Query; diff --git a/tests/Common/CommonCommandTest.php b/tests/Common/CommonCommandTest.php index aaebd404b..48c00211f 100644 --- a/tests/Common/CommonCommandTest.php +++ b/tests/Common/CommonCommandTest.php @@ -7,7 +7,7 @@ use PHPUnit\Framework\Attributes\DataProviderExternal; use Throwable; use Yiisoft\Db\Constant\DataType; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Constant\ColumnType; use Yiisoft\Db\Constant\PseudoType; use Yiisoft\Db\Driver\Pdo\AbstractPdoCommand; diff --git a/tests/Common/CommonPdoCommandTest.php b/tests/Common/CommonPdoCommandTest.php index 7146c6ae4..2b4884357 100644 --- a/tests/Common/CommonPdoCommandTest.php +++ b/tests/Common/CommonPdoCommandTest.php @@ -8,7 +8,7 @@ use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Driver\Pdo\AbstractPdoCommand; use InvalidArgumentException; use Yiisoft\Db\QueryBuilder\QueryBuilderInterface; diff --git a/tests/Common/CommonQueryBuilderTest.php b/tests/Common/CommonQueryBuilderTest.php index 2d3ed77bc..1a2c2e1b0 100644 --- a/tests/Common/CommonQueryBuilderTest.php +++ b/tests/Common/CommonQueryBuilderTest.php @@ -9,10 +9,10 @@ use PHPUnit\Framework\Attributes\DataProviderExternal; use PHPUnit\Framework\Attributes\DoesNotPerformAssertions; use Yiisoft\Db\Command\CommandInterface; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Constant\DataType; use Yiisoft\Db\Exception\Exception; -use Yiisoft\Db\Expression\CaseExpression; +use Yiisoft\Db\Expression\Statement\CaseExpression; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Expression\Function\Length; use Yiisoft\Db\Expression\Value\DateTimeValue; diff --git a/tests/Db/Expression/Function/LengthTest.php b/tests/Db/Expression/Function/LengthTest.php index 108cdab8b..4963c6a8f 100644 --- a/tests/Db/Expression/Function/LengthTest.php +++ b/tests/Db/Expression/Function/LengthTest.php @@ -9,7 +9,7 @@ use Yiisoft\Db\Constant\DataType; use Yiisoft\Db\Expression\ExpressionInterface; use Yiisoft\Db\Expression\Function\Length; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Tests\Support\TestTrait; final class LengthTest extends TestCase diff --git a/tests/Db/Expression/Function/MultiOperandFunctionTest.php b/tests/Db/Expression/Function/MultiOperandFunctionTest.php index 926cafa11..689841fb7 100644 --- a/tests/Db/Expression/Function/MultiOperandFunctionTest.php +++ b/tests/Db/Expression/Function/MultiOperandFunctionTest.php @@ -7,14 +7,14 @@ use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Yiisoft\Db\Constant\DataType; -use Yiisoft\Db\Expression\ArrayExpression; +use Yiisoft\Db\Expression\Value\ArrayExpression; use Yiisoft\Db\Expression\Function\ArrayMerge; use Yiisoft\Db\Expression\Function\Greatest; use Yiisoft\Db\Expression\Function\Least; use Yiisoft\Db\Expression\Function\Longest; use Yiisoft\Db\Expression\Function\MultiOperandFunction; use Yiisoft\Db\Expression\Function\Shortest; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Tests\Support\TestTrait; final class MultiOperandFunctionTest extends TestCase diff --git a/tests/Db/Expression/ArrayExpressionTest.php b/tests/Db/Expression/Value/ArrayExpressionTest.php similarity index 92% rename from tests/Db/Expression/ArrayExpressionTest.php rename to tests/Db/Expression/Value/ArrayExpressionTest.php index 2fdccc742..5ef271398 100644 --- a/tests/Db/Expression/ArrayExpressionTest.php +++ b/tests/Db/Expression/Value/ArrayExpressionTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Yiisoft\Db\Tests\Db\Expression; +namespace Yiisoft\Db\Tests\Db\Expression\Value; use ArrayIterator; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; -use Yiisoft\Db\Expression\ArrayExpression; +use Yiisoft\Db\Expression\Value\ArrayExpression; use Yiisoft\Db\Query\Query; use Yiisoft\Db\Query\QueryInterface; use Yiisoft\Db\Schema\Column\ArrayColumn; diff --git a/tests/Db/Expression/Builder/ArrayExpressionBuilderTest.php b/tests/Db/Expression/Value/Builder/ArrayExpressionBuilderTest.php similarity index 93% rename from tests/Db/Expression/Builder/ArrayExpressionBuilderTest.php rename to tests/Db/Expression/Value/Builder/ArrayExpressionBuilderTest.php index 93c37b492..668343e6f 100644 --- a/tests/Db/Expression/Builder/ArrayExpressionBuilderTest.php +++ b/tests/Db/Expression/Value/Builder/ArrayExpressionBuilderTest.php @@ -7,10 +7,10 @@ use ArrayIterator; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Constant\DataType; -use Yiisoft\Db\Expression\ArrayExpression; -use Yiisoft\Db\Expression\Builder\ArrayExpressionBuilder; +use Yiisoft\Db\Expression\Value\ArrayExpression; +use Yiisoft\Db\Expression\Value\Builder\ArrayExpressionBuilder; use Yiisoft\Db\Query\Query; use Yiisoft\Db\Schema\Data\LazyArray; use Yiisoft\Db\Schema\Data\LazyArrayInterface; diff --git a/tests/Db/Expression/Value/Builder/DateTimeValueBuilderTest.php b/tests/Db/Expression/Value/Builder/DateTimeValueBuilderTest.php index 42cae52d8..81527ae07 100644 --- a/tests/Db/Expression/Value/Builder/DateTimeValueBuilderTest.php +++ b/tests/Db/Expression/Value/Builder/DateTimeValueBuilderTest.php @@ -9,7 +9,7 @@ use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Yiisoft\Db\Constant\DataType; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Expression\Value\Builder\DateTimeValueBuilder; use Yiisoft\Db\Constant\ColumnType; use Yiisoft\Db\Expression\Value\DateTimeValue; diff --git a/tests/Db/Expression/Builder/JsonExpressionBuilderTest.php b/tests/Db/Expression/Value/Builder/JsonExpressionBuilderTest.php similarity index 95% rename from tests/Db/Expression/Builder/JsonExpressionBuilderTest.php rename to tests/Db/Expression/Value/Builder/JsonExpressionBuilderTest.php index 77509b206..f3477abfc 100644 --- a/tests/Db/Expression/Builder/JsonExpressionBuilderTest.php +++ b/tests/Db/Expression/Value/Builder/JsonExpressionBuilderTest.php @@ -7,10 +7,10 @@ use ArrayIterator; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Constant\DataType; -use Yiisoft\Db\Expression\JsonExpression; -use Yiisoft\Db\Expression\Builder\JsonExpressionBuilder; +use Yiisoft\Db\Expression\Value\JsonExpression; +use Yiisoft\Db\Expression\Value\Builder\JsonExpressionBuilder; use Yiisoft\Db\Query\Query; use Yiisoft\Db\Schema\Data\LazyArray; use Yiisoft\Db\Schema\Data\JsonLazyArray; diff --git a/tests/Db/Expression/Builder/ParamBuilderTest.php b/tests/Db/Expression/Value/Builder/ParamBuilderTest.php similarity index 91% rename from tests/Db/Expression/Builder/ParamBuilderTest.php rename to tests/Db/Expression/Value/Builder/ParamBuilderTest.php index 36888a07a..cf2244ff9 100644 --- a/tests/Db/Expression/Builder/ParamBuilderTest.php +++ b/tests/Db/Expression/Value/Builder/ParamBuilderTest.php @@ -5,7 +5,7 @@ namespace Yiisoft\Db\Tests\Db\Expression\Builder; use PHPUnit\Framework\TestCase; -use Yiisoft\Db\Expression\Builder\ParamBuilder; +use Yiisoft\Db\Expression\Value\Builder\ParamBuilder; use Yiisoft\Db\Expression\Expression; /** diff --git a/tests/Db/Expression/Builder/StructuredExpressionBuilderTest.php b/tests/Db/Expression/Value/Builder/StructuredExpressionBuilderTest.php similarity index 94% rename from tests/Db/Expression/Builder/StructuredExpressionBuilderTest.php rename to tests/Db/Expression/Value/Builder/StructuredExpressionBuilderTest.php index 0972f4208..d110d3397 100644 --- a/tests/Db/Expression/Builder/StructuredExpressionBuilderTest.php +++ b/tests/Db/Expression/Value/Builder/StructuredExpressionBuilderTest.php @@ -7,10 +7,10 @@ use ArrayIterator; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Constant\DataType; -use Yiisoft\Db\Expression\StructuredExpression; -use Yiisoft\Db\Expression\Builder\StructuredExpressionBuilder; +use Yiisoft\Db\Expression\Value\StructuredExpression; +use Yiisoft\Db\Expression\Value\Builder\StructuredExpressionBuilder; use Yiisoft\Db\Query\Query; use Yiisoft\Db\Schema\Column\AbstractStructuredColumn; use Yiisoft\Db\Schema\Column\ColumnBuilder; diff --git a/tests/Db/Expression/CaseExpressionTest.php b/tests/Db/Expression/Value/CaseExpressionTest.php similarity index 96% rename from tests/Db/Expression/CaseExpressionTest.php rename to tests/Db/Expression/Value/CaseExpressionTest.php index 2dcfe0411..707e2975f 100644 --- a/tests/Db/Expression/CaseExpressionTest.php +++ b/tests/Db/Expression/Value/CaseExpressionTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace Yiisoft\Db\Tests\Db\Expression; +namespace Yiisoft\Db\Tests\Db\Expression\Value; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Yiisoft\Db\Expression\Expression; -use Yiisoft\Db\Expression\CaseExpression; -use Yiisoft\Db\Expression\WhenClause; +use Yiisoft\Db\Expression\Statement\CaseExpression; +use Yiisoft\Db\Expression\Statement\WhenClause; use Yiisoft\Db\Schema\Column\IntegerColumn; use Yiisoft\Db\Tests\Support\Assert; use Yiisoft\Db\Tests\Support\TestTrait; diff --git a/tests/Db/Expression/JsonExpressionTest.php b/tests/Db/Expression/Value/JsonExpressionTest.php similarity index 91% rename from tests/Db/Expression/JsonExpressionTest.php rename to tests/Db/Expression/Value/JsonExpressionTest.php index 6ccbaffbe..b93ce6e85 100644 --- a/tests/Db/Expression/JsonExpressionTest.php +++ b/tests/Db/Expression/Value/JsonExpressionTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Yiisoft\Db\Tests\Db\Expression; +namespace Yiisoft\Db\Tests\Db\Expression\Value; use ArrayIterator; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; -use Yiisoft\Db\Expression\JsonExpression; +use Yiisoft\Db\Expression\Value\JsonExpression; use Yiisoft\Db\Query\Query; use Yiisoft\Db\Schema\Data\JsonLazyArray; use Yiisoft\Db\Tests\Support\TestTrait; diff --git a/tests/Db/Expression/StructuredExpressionTest.php b/tests/Db/Expression/Value/StructuredExpressionTest.php similarity index 93% rename from tests/Db/Expression/StructuredExpressionTest.php rename to tests/Db/Expression/Value/StructuredExpressionTest.php index 9a9f26d9a..97adee58e 100644 --- a/tests/Db/Expression/StructuredExpressionTest.php +++ b/tests/Db/Expression/Value/StructuredExpressionTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Yiisoft\Db\Tests\Db\Expression; +namespace Yiisoft\Db\Tests\Db\Expression\Value; use ArrayIterator; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; -use Yiisoft\Db\Expression\StructuredExpression; +use Yiisoft\Db\Expression\Value\StructuredExpression; use Yiisoft\Db\Query\Query; use Yiisoft\Db\Schema\Column\AbstractStructuredColumn; use Yiisoft\Db\Schema\Column\ColumnBuilder; diff --git a/tests/Db/QueryBuilder/Condition/Builder/CompareBuilderTest.php b/tests/Db/QueryBuilder/Condition/Builder/CompareBuilderTest.php index 205a69e9f..7c346f2cb 100644 --- a/tests/Db/QueryBuilder/Condition/Builder/CompareBuilderTest.php +++ b/tests/Db/QueryBuilder/Condition/Builder/CompareBuilderTest.php @@ -6,7 +6,7 @@ use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Constant\DataType; use Yiisoft\Db\Expression\Expression; use Yiisoft\Db\QueryBuilder\Condition\Builder\CompareBuilder; diff --git a/tests/Db/QueryBuilder/Condition/Builder/LikeBuilderTest.php b/tests/Db/QueryBuilder/Condition/Builder/LikeBuilderTest.php index 104d7b0ca..a49022b7e 100644 --- a/tests/Db/QueryBuilder/Condition/Builder/LikeBuilderTest.php +++ b/tests/Db/QueryBuilder/Condition/Builder/LikeBuilderTest.php @@ -6,7 +6,7 @@ use PHPUnit\Framework\Attributes\TestWith; use PHPUnit\Framework\TestCase; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Constant\DataType; use Yiisoft\Db\QueryBuilder\Condition\Builder\LikeBuilder; use Yiisoft\Db\QueryBuilder\Condition\Like; diff --git a/tests/Db/Schema/Column/ColumnTest.php b/tests/Db/Schema/Column/ColumnTest.php index 57e455c20..3272a2ab9 100644 --- a/tests/Db/Schema/Column/ColumnTest.php +++ b/tests/Db/Schema/Column/ColumnTest.php @@ -5,7 +5,7 @@ namespace Yiisoft\Db\Tests\Db\Schema\Column; use Yiisoft\Db\Constraint\ForeignKey; -use Yiisoft\Db\Expression\ArrayExpression; +use Yiisoft\Db\Expression\Value\ArrayExpression; use Yiisoft\Db\Schema\Column\ArrayColumn; use Yiisoft\Db\Schema\Column\CollatableColumnInterface; use Yiisoft\Db\Schema\Column\ColumnBuilder; diff --git a/tests/Provider/ColumnProvider.php b/tests/Provider/ColumnProvider.php index a7d97545e..22052c38b 100644 --- a/tests/Provider/ColumnProvider.php +++ b/tests/Provider/ColumnProvider.php @@ -10,13 +10,13 @@ use DateTimeZone; use PDO; use stdClass; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Constant\ColumnType; use Yiisoft\Db\Constraint\ForeignKey; -use Yiisoft\Db\Expression\ArrayExpression; +use Yiisoft\Db\Expression\Value\ArrayExpression; use Yiisoft\Db\Expression\Expression; -use Yiisoft\Db\Expression\JsonExpression; -use Yiisoft\Db\Expression\StructuredExpression; +use Yiisoft\Db\Expression\Value\JsonExpression; +use Yiisoft\Db\Expression\Value\StructuredExpression; use Yiisoft\Db\Schema\Column\ArrayColumn; use Yiisoft\Db\Schema\Column\ArrayLazyColumn; use Yiisoft\Db\Schema\Column\BigIntColumn; diff --git a/tests/Provider/CommandProvider.php b/tests/Provider/CommandProvider.php index fc506a4d1..85eb00ec0 100644 --- a/tests/Provider/CommandProvider.php +++ b/tests/Provider/CommandProvider.php @@ -8,12 +8,12 @@ use IteratorAggregate; use Traversable; use Yiisoft\Db\Constant\DataType; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Constant\ColumnType; use Yiisoft\Db\Constant\IndexType; use Yiisoft\Db\Constant\ReferentialAction; use Yiisoft\Db\Expression\Expression; -use Yiisoft\Db\Expression\JsonExpression; +use Yiisoft\Db\Expression\Value\JsonExpression; use Yiisoft\Db\Query\Query; use Yiisoft\Db\Schema\Column\ColumnBuilder; use Yiisoft\Db\Tests\Support\Stringable; diff --git a/tests/Provider/QueryBuilderProvider.php b/tests/Provider/QueryBuilderProvider.php index bd490013a..674cd1958 100644 --- a/tests/Provider/QueryBuilderProvider.php +++ b/tests/Provider/QueryBuilderProvider.php @@ -8,23 +8,23 @@ use DateTimeImmutable; use DateTimeZone; use Yiisoft\Db\Constant\DataType; -use Yiisoft\Db\Expression\ArrayExpression; +use Yiisoft\Db\Expression\Value\ArrayExpression; use Yiisoft\Db\Expression\Function\ArrayMerge; -use Yiisoft\Db\Expression\Param; +use Yiisoft\Db\Expression\Value\Param; use Yiisoft\Db\Constant\ColumnType; use Yiisoft\Db\Constant\IndexType; use Yiisoft\Db\Constant\PseudoType; use Yiisoft\Db\Constant\ReferentialAction; use Yiisoft\Db\Constraint\ForeignKey; -use Yiisoft\Db\Expression\CaseExpression; -use Yiisoft\Db\Expression\ColumnName; +use Yiisoft\Db\Expression\Statement\CaseExpression; +use Yiisoft\Db\Expression\Value\ColumnName; use Yiisoft\Db\Expression\Expression; use Yiisoft\Db\Expression\Function\Greatest; use Yiisoft\Db\Expression\Function\Least; use Yiisoft\Db\Expression\Function\Longest; use Yiisoft\Db\Expression\Function\Shortest; -use Yiisoft\Db\Expression\JsonExpression; -use Yiisoft\Db\Expression\Value; +use Yiisoft\Db\Expression\Value\JsonExpression; +use Yiisoft\Db\Expression\Value\Value; use Yiisoft\Db\Expression\Value\DateTimeValue; use Yiisoft\Db\Query\Query; use Yiisoft\Db\QueryBuilder\Condition\All; diff --git a/tests/Support/Stub/ExpressionBuilder.php b/tests/Support/Stub/ExpressionBuilder.php deleted file mode 100644 index add541b6b..000000000 --- a/tests/Support/Stub/ExpressionBuilder.php +++ /dev/null @@ -1,15 +0,0 @@ -