Skip to content

Type the Sql class constants as string #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simon-mundy merged 5 commits into from
Oct 9, 2026
Merged

Type the Sql class constants as string #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0fd0d3
Type the Sql class constants as string
simon-mundy Oct 4, 2026
caf0e89
Merge branch '0.6.x' into qa/mago-sql-typed-constants
simon-mundy Oct 6, 2026
9eba43b
Merge remote-tracking branch 'origin/0.6.x' into upd/qa/mago-sql-type…
simon-mundy Oct 6, 2026
2b59e49
Merge remote-tracking branch 'upstream/0.6.x' into qa/mago-sql-typed-…
simon-mundy Oct 9, 2026
58c2bab
Merge remote-tracking branch 'upstream/0.6.x' into qa/mago-sql-typed-…
simon-mundy Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
510 changes: 0 additions & 510 deletions analyzer-baseline.toml
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/Sql/Combine.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
*/
class Combine extends AbstractPreparableSql
{
final public const COLUMNS = 'columns';
final public const string COLUMNS = 'columns';

final public const COMBINE = 'combine';
final public const string COMBINE = 'combine';

final public const COMBINE_UNION = 'union';
final public const string COMBINE_UNION = 'union';

final public const COMBINE_EXCEPT = 'except';
final public const string COMBINE_EXCEPT = 'except';

final public const COMBINE_INTERSECT = 'intersect';
final public const string COMBINE_INTERSECT = 'intersect';

/** @var array<string, Specification> */
protected array $specifications = [
Expand Down
16 changes: 8 additions & 8 deletions src/Sql/Ddl/AlterTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@
*/
class AlterTable extends AbstractSql
{
final public const ADD_COLUMNS = 'addColumns';
final public const string ADD_COLUMNS = 'addColumns';

final public const ADD_CONSTRAINTS = 'addConstraints';
final public const string ADD_CONSTRAINTS = 'addConstraints';

final public const CHANGE_COLUMNS = 'changeColumns';
final public const string CHANGE_COLUMNS = 'changeColumns';

final public const DROP_COLUMNS = 'dropColumns';
final public const string DROP_COLUMNS = 'dropColumns';

final public const DROP_CONSTRAINTS = 'dropConstraints';
final public const string DROP_CONSTRAINTS = 'dropConstraints';

final public const DROP_INDEXES = 'dropIndexes';
final public const string DROP_INDEXES = 'dropIndexes';

final public const TABLE = 'table';
final public const string TABLE = 'table';

final public const TABLE_OPTIONS = 'tableOptions';
final public const string TABLE_OPTIONS = 'tableOptions';

/** @var list<Column\ColumnInterface> */
protected array $addColumns = [];
Expand Down
8 changes: 4 additions & 4 deletions src/Sql/Ddl/CreateTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
*/
class CreateTable extends AbstractSql
{
final public const COLUMNS = 'columns';
final public const string COLUMNS = 'columns';

final public const CONSTRAINTS = 'constraints';
final public const string CONSTRAINTS = 'constraints';

final public const TABLE = 'table';
final public const string TABLE = 'table';

final public const TABLE_OPTIONS = 'tableOptions';
final public const string TABLE_OPTIONS = 'tableOptions';

/** @var list<Column\ColumnInterface> */
protected array $columns = [];
Expand Down
2 changes: 1 addition & 1 deletion src/Sql/Ddl/DropTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
class DropTable extends AbstractSql
{
final public const TABLE = 'table';
final public const string TABLE = 'table';

protected bool $ifExists = false;

Expand Down
4 changes: 2 additions & 2 deletions src/Sql/Delete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ class Delete extends AbstractPreparableSql
/**@#+
* @const
*/
public const SPECIFICATION_DELETE = 'delete';
public const string SPECIFICATION_DELETE = 'delete';

final public const SPECIFICATION_WHERE = 'where';
final public const string SPECIFICATION_WHERE = 'where';

/** @#- */

Expand Down
2 changes: 1 addition & 1 deletion src/Sql/Expression.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Expression extends AbstractExpression
/**
* @const
*/
final public const PLACEHOLDER = '?';
final public const string PLACEHOLDER = '?';

protected string $expression = '';

Expand Down
8 changes: 4 additions & 4 deletions src/Sql/Insert.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ class Insert extends AbstractPreparableSql
*
* @const
*/
public const SPECIFICATION_INSERT = 'insert';
public const string SPECIFICATION_INSERT = 'insert';

final public const SPECIFICATION_SELECT = 'select';
final public const string SPECIFICATION_SELECT = 'select';

final public const VALUES_MERGE = 'merge';
final public const string VALUES_MERGE = 'merge';

final public const VALUES_SET = 'set';
final public const string VALUES_SET = 'set';

/** @var array<string, Specification> */
protected array $specifications = [
Expand Down
14 changes: 7 additions & 7 deletions src/Sql/Join.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@
*/
class Join implements Iterator, Countable
{
final public const JOIN_INNER = 'inner';
final public const string JOIN_INNER = 'inner';

final public const JOIN_OUTER = 'outer';
final public const string JOIN_OUTER = 'outer';

final public const JOIN_FULL_OUTER = 'full outer';
final public const string JOIN_FULL_OUTER = 'full outer';

final public const JOIN_LEFT = 'left';
final public const string JOIN_LEFT = 'left';

final public const JOIN_RIGHT = 'right';
final public const string JOIN_RIGHT = 'right';

final public const JOIN_RIGHT_OUTER = 'right outer';
final public const string JOIN_RIGHT_OUTER = 'right outer';

final public const JOIN_LEFT_OUTER = 'left outer';
final public const string JOIN_LEFT_OUTER = 'left outer';

/**
* Current iterator position.
Expand Down
24 changes: 12 additions & 12 deletions src/Sql/Predicate/Operator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,29 @@

class Operator extends AbstractExpression implements PredicateInterface
{
final public const OPERATOR_EQUAL_TO = '=';
final public const string OPERATOR_EQUAL_TO = '=';

final public const OP_EQ = '=';
final public const string OP_EQ = '=';

final public const OPERATOR_NOT_EQUAL_TO = '!=';
final public const string OPERATOR_NOT_EQUAL_TO = '!=';

final public const OP_NE = '!=';
final public const string OP_NE = '!=';

final public const OPERATOR_LESS_THAN = '<';
final public const string OPERATOR_LESS_THAN = '<';

final public const OP_LT = '<';
final public const string OP_LT = '<';

final public const OPERATOR_LESS_THAN_OR_EQUAL_TO = '<=';
final public const string OPERATOR_LESS_THAN_OR_EQUAL_TO = '<=';

final public const OP_LTE = '<=';
final public const string OP_LTE = '<=';

final public const OPERATOR_GREATER_THAN = '>';
final public const string OPERATOR_GREATER_THAN = '>';

final public const OP_GT = '>';
final public const string OP_GT = '>';

final public const OPERATOR_GREATER_THAN_OR_EQUAL_TO = '>=';
final public const string OPERATOR_GREATER_THAN_OR_EQUAL_TO = '>=';

final public const OP_GTE = '>=';
final public const string OP_GTE = '>=';

protected ?ArgumentInterface $left = null;
protected ?ArgumentInterface $right = null;
Expand Down
8 changes: 4 additions & 4 deletions src/Sql/Predicate/PredicateSet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@

class PredicateSet implements PredicateInterface, Countable
{
final public const OP_AND = 'AND';
final public const string OP_AND = 'AND';

final public const OP_OR = 'OR';
final public const string OP_OR = 'OR';

/** @deprecated Use OP_AND instead */
final public const COMBINED_BY_AND = self::OP_AND;
final public const string COMBINED_BY_AND = self::OP_AND;

/** @deprecated Use OP_OR instead */
final public const COMBINED_BY_OR = self::OP_OR;
final public const string COMBINED_BY_OR = self::OP_OR;

protected string $defaultCombination = self::OP_AND;

Expand Down
54 changes: 27 additions & 27 deletions src/Sql/Select.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,59 +48,59 @@ class Select extends AbstractPreparableSql
*
* @const
*/
final public const SELECT = 'select';
final public const string SELECT = 'select';

final public const QUANTIFIER = 'quantifier';
final public const string QUANTIFIER = 'quantifier';

final public const COLUMNS = 'columns';
final public const string COLUMNS = 'columns';

final public const TABLE = 'table';
final public const string TABLE = 'table';

final public const JOINS = 'joins';
final public const string JOINS = 'joins';

final public const WHERE = 'where';
final public const string WHERE = 'where';

final public const GROUP = 'group';
final public const string GROUP = 'group';

final public const HAVING = 'having';
final public const string HAVING = 'having';

final public const ORDER = 'order';
final public const string ORDER = 'order';

final public const LIMIT = 'limit';
final public const string LIMIT = 'limit';

final public const OFFSET = 'offset';
final public const string OFFSET = 'offset';

final public const QUANTIFIER_DISTINCT = 'DISTINCT';
final public const string QUANTIFIER_DISTINCT = 'DISTINCT';

final public const QUANTIFIER_ALL = 'ALL';
final public const string QUANTIFIER_ALL = 'ALL';

final public const JOIN_INNER = Join::JOIN_INNER;
final public const string JOIN_INNER = Join::JOIN_INNER;

final public const JOIN_OUTER = Join::JOIN_OUTER;
final public const string JOIN_OUTER = Join::JOIN_OUTER;

final public const JOIN_FULL_OUTER = Join::JOIN_FULL_OUTER;
final public const string JOIN_FULL_OUTER = Join::JOIN_FULL_OUTER;

final public const JOIN_LEFT = Join::JOIN_LEFT;
final public const string JOIN_LEFT = Join::JOIN_LEFT;

final public const JOIN_RIGHT = Join::JOIN_RIGHT;
final public const string JOIN_RIGHT = Join::JOIN_RIGHT;

final public const JOIN_RIGHT_OUTER = Join::JOIN_RIGHT_OUTER;
final public const string JOIN_RIGHT_OUTER = Join::JOIN_RIGHT_OUTER;

final public const JOIN_LEFT_OUTER = Join::JOIN_LEFT_OUTER;
final public const string JOIN_LEFT_OUTER = Join::JOIN_LEFT_OUTER;

final public const SQL_STAR = '*';
final public const string SQL_STAR = '*';

final public const ORDER_ASCENDING = 'ASC';
final public const string ORDER_ASCENDING = 'ASC';

final public const ORDER_DESCENDING = 'DESC';
final public const string ORDER_DESCENDING = 'DESC';

final public const COMBINE = 'combine';
final public const string COMBINE = 'combine';

final public const COMBINE_UNION = 'union';
final public const string COMBINE_UNION = 'union';

final public const COMBINE_EXCEPT = 'except';
final public const string COMBINE_EXCEPT = 'except';

final public const COMBINE_INTERSECT = 'intersect';
final public const string COMBINE_INTERSECT = 'intersect';

/** @var array<string, Specification> */
protected array $specifications = [
Expand Down
8 changes: 4 additions & 4 deletions src/Sql/SqlInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ interface SqlInterface
*
* @see ArgumentType
*/
public const TYPE_IDENTIFIER = 'identifier';
public const string TYPE_IDENTIFIER = 'identifier';

public const TYPE_VALUE = 'value';
public const string TYPE_VALUE = 'value';

public const TYPE_LITERAL = 'literal';
public const string TYPE_LITERAL = 'literal';

public const TYPE_SELECT = 'select';
public const string TYPE_SELECT = 'select';

/**
* Get SQL string for statement
Expand Down
12 changes: 6 additions & 6 deletions src/Sql/Update.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ class Update extends AbstractPreparableSql
/**@#++
* @const
*/
public const SPECIFICATION_UPDATE = 'update';
public const string SPECIFICATION_UPDATE = 'update';

final public const SPECIFICATION_SET = 'set';
final public const string SPECIFICATION_SET = 'set';

final public const SPECIFICATION_WHERE = 'where';
final public const string SPECIFICATION_WHERE = 'where';

final public const SPECIFICATION_JOIN = 'joins';
final public const string SPECIFICATION_JOIN = 'joins';

final public const VALUES_MERGE = 'merge';
final public const string VALUES_MERGE = 'merge';

final public const VALUES_SET = 'set';
final public const string VALUES_SET = 'set';

/** @#-* */

Expand Down
2 changes: 1 addition & 1 deletion test/unit/TestAsset/DeleteIgnore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

class DeleteIgnore extends Delete
{
public const SPECIFICATION_DELETE = 'deleteIgnore';
public const string SPECIFICATION_DELETE = 'deleteIgnore';

/** @var array<string, string> */
protected array $specifications = [
Expand Down
2 changes: 1 addition & 1 deletion test/unit/TestAsset/Replace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

class Replace extends Insert
{
public const SPECIFICATION_INSERT = 'replace';
public const string SPECIFICATION_INSERT = 'replace';

/** @var array<string, string> */
protected array $specifications = [
Expand Down
2 changes: 1 addition & 1 deletion test/unit/TestAsset/UpdateIgnore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class UpdateIgnore extends Update
*
* @psalm-suppress InvalidClassConstantType
*/
public const SPECIFICATION_UPDATE = 'updateIgnore';
public const string SPECIFICATION_UPDATE = 'updateIgnore';

/** @var array<string, string> */
protected array $specifications = [
Expand Down
Loading