Skip to content

Replace else branches in Sql with guard clauses and match #220

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

Replace else branches in Sql with guard clauses and match #220

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
52f373d
Replace else branches in Sql with guard clauses and match
simon-mundy Oct 4, 2026
d9fdfea
Merge branch '0.6.x' into qa/mago-sql-guard-clauses
simon-mundy Oct 6, 2026
1c44d18
Merge remote-tracking branch 'origin/0.6.x' into upd/qa/mago-sql-guar…
simon-mundy Oct 6, 2026
121b433
Merge remote-tracking branch 'upstream/0.6.x' into qa/mago-sql-guard-…
simon-mundy Oct 9, 2026
e1b4113
Merge branch '0.6.x' into qa/mago-sql-guard-clauses
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
16 changes: 8 additions & 8 deletions analyzer-baseline.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1776,6 +1776,12 @@ code = "possibly-invalid-argument"
message = 'Possible argument type mismatch for argument #1 of `PhpDb\Adapter\Platform\PlatformInterface::quoteIdentifierInFragment`: expected `string`, but possibly received `bool|int|string`.'
count = 1

[[issues]]
file = "src/Sql/AbstractSql.php"
code = "possibly-invalid-argument"
message = 'Possible argument type mismatch for argument #1 of `PhpDb\Adapter\Platform\PlatformInterface::quoteIdentifier`: expected `string`, but possibly received `non-empty-array<string, PhpDb\Sql\Expression|PhpDb\Sql\Select|PhpDb\Sql\TableIdentifier|string>|null|string`.'
count = 1

[[issues]]
file = "src/Sql/AbstractSql.php"
code = "possibly-invalid-argument"
Expand Down Expand Up @@ -2160,12 +2166,6 @@ code = "mixed-argument"
message = 'Invalid argument type for argument #1 of `PhpDb\Sql\Ddl\Column\Column::setDefault`: expected `PhpDb\Sql\Argument\Literal|PhpDb\Sql\Argument\Value|null|scalar`, but found `mixed`.'
count = 1

[[issues]]
file = "src/Sql/Ddl/Column/Column.php"
code = "redundant-comparison"
message = "Avoid direct comparison with boolean literals."
count = 1

[[issues]]
file = "src/Sql/Ddl/Column/Column.php"
code = "uninitialized-property"
Expand Down Expand Up @@ -2601,7 +2601,7 @@ count = 1
[[issues]]
file = "src/Sql/Insert.php"
code = "less-specific-nested-argument-type"
message = "Argument type mismatch for argument #2 of `implode`: expected `array<array-key, Stringable|null|scalar>|null`, but provided type `non-empty-list<mixed>` is less specific."
message = "Argument type mismatch for argument #2 of `implode`: expected `array<array-key, Stringable|null|scalar>|null`, but provided type `list<mixed>` is less specific."
count = 1

[[issues]]
Expand Down Expand Up @@ -3309,7 +3309,7 @@ count = 1
[[issues]]
file = "src/Sql/Select.php"
code = "invalid-return-statement"
message = 'Invalid return type for function `PhpDb\Sql\Select::resolveTable`: expected `array{0: null|string, 1: string}`, but found `list{array<array-key, mixed>|null|string, string}`.'
message = '''Invalid return type for function `PhpDb\Sql\Select::resolveTable`: expected `array{0: null|string, 1: string}`, but found `list{array<array-key, mixed>|null|string, string('')|truthy-string}`.'''
count = 1

[[issues]]
Expand Down
162 changes: 0 additions & 162 deletions lint-baseline.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,18 +354,6 @@ code = "kan-defect"
message = "Class has a high kan defect score."
count = 1

[[issues]]
file = "src/Sql/AbstractSql.php"
code = "no-else-clause"
message = "Avoid `else` clauses."
count = 8

[[issues]]
file = "src/Sql/AbstractSql.php"
code = "no-else-clause"
message = "Avoid `elseif` clauses."
count = 5

[[issues]]
file = "src/Sql/AbstractSql.php"
code = "too-many-methods"
Expand Down Expand Up @@ -396,18 +384,6 @@ code = "kan-defect"
message = "Class has a high kan defect score."
count = 1

[[issues]]
file = "src/Sql/Ddl/AlterTable.php"
code = "no-else-clause"
message = "Avoid `else` clauses."
count = 1

[[issues]]
file = "src/Sql/Ddl/AlterTable.php"
code = "no-else-clause"
message = "Avoid `elseif` clauses."
count = 2

[[issues]]
file = "src/Sql/Ddl/AlterTable.php"
code = "too-many-methods"
Expand All @@ -426,138 +402,36 @@ code = "halstead"
message = "Method has a high halstead difficulty"
count = 1

[[issues]]
file = "src/Sql/Ddl/Column/Column.php"
code = "no-else-clause"
message = "Avoid `else` clauses."
count = 1

[[issues]]
file = "src/Sql/Ddl/Column/Column.php"
code = "no-else-clause"
message = "Avoid `elseif` clauses."
count = 1

[[issues]]
file = "src/Sql/Ddl/Constraint/ForeignKey.php"
code = "excessive-parameter-list"
message = "Parameter list is too long."
count = 1

[[issues]]
file = "src/Sql/Ddl/CreateTable.php"
code = "cyclomatic-complexity"
message = "Class has high complexity."
count = 1

[[issues]]
file = "src/Sql/Ddl/CreateTable.php"
code = "no-else-clause"
message = "Avoid `else` clauses."
count = 1

[[issues]]
file = "src/Sql/Ddl/CreateTable.php"
code = "no-else-clause"
message = "Avoid `elseif` clauses."
count = 2

[[issues]]
file = "src/Sql/Ddl/CreateTable.php"
code = "too-many-methods"
message = "Class has too many methods."
count = 1

[[issues]]
file = "src/Sql/Delete.php"
code = "no-else-clause"
message = "Avoid `else` clauses."
count = 1

[[issues]]
file = "src/Sql/Expression.php"
code = "halstead"
message = "Method has a high halstead difficulty"
count = 1

[[issues]]
file = "src/Sql/Expression.php"
code = "no-else-clause"
message = "Avoid `elseif` clauses."
count = 2

[[issues]]
file = "src/Sql/Insert.php"
code = "cyclomatic-complexity"
message = "Class has high complexity."
count = 1

[[issues]]
file = "src/Sql/Insert.php"
code = "no-else-clause"
message = "Avoid `else` clauses."
count = 2

[[issues]]
file = "src/Sql/Insert.php"
code = "too-many-methods"
message = "Class has too many methods."
count = 1

[[issues]]
file = "src/Sql/Predicate/In.php"
code = "halstead"
message = "Method has a high halstead difficulty"
count = 1

[[issues]]
file = "src/Sql/Predicate/In.php"
code = "no-else-clause"
message = "Avoid `else` clauses."
count = 1

[[issues]]
file = "src/Sql/Predicate/In.php"
code = "no-else-clause"
message = "Avoid `elseif` clauses."
count = 1

[[issues]]
file = "src/Sql/Predicate/Operator.php"
code = "halstead"
message = "Method has a high halstead difficulty"
count = 2

[[issues]]
file = "src/Sql/Predicate/Operator.php"
code = "no-else-clause"
message = "Avoid `else` clauses."
count = 2

[[issues]]
file = "src/Sql/Predicate/Operator.php"
code = "no-else-clause"
message = "Avoid `elseif` clauses."
count = 2

[[issues]]
file = "src/Sql/Predicate/Predicate.php"
code = "no-else-clause"
message = "Avoid `else` clauses."
count = 1

[[issues]]
file = "src/Sql/Predicate/Predicate.php"
code = "too-many-methods"
message = "Class has too many methods."
count = 1

[[issues]]
file = "src/Sql/Predicate/PredicateSet.php"
code = "cyclomatic-complexity"
message = "Class has high complexity."
count = 1

[[issues]]
file = "src/Sql/Predicate/PredicateSet.php"
code = "halstead"
Expand All @@ -570,18 +444,6 @@ code = "kan-defect"
message = "Class has a high kan defect score."
count = 1

[[issues]]
file = "src/Sql/Predicate/PredicateSet.php"
code = "no-else-clause"
message = "Avoid `else` clauses."
count = 2

[[issues]]
file = "src/Sql/Predicate/PredicateSet.php"
code = "no-else-clause"
message = "Avoid `elseif` clauses."
count = 5

[[issues]]
file = "src/Sql/Select.php"
code = "cyclomatic-complexity"
Expand All @@ -594,30 +456,12 @@ code = "halstead"
message = "Method has a high halstead difficulty"
count = 2

[[issues]]
file = "src/Sql/Select.php"
code = "halstead"
message = "Method has a high halstead effort"
count = 1

[[issues]]
file = "src/Sql/Select.php"
code = "kan-defect"
message = "Class has a high kan defect score."
count = 1

[[issues]]
file = "src/Sql/Select.php"
code = "no-else-clause"
message = "Avoid `else` clauses."
count = 8

[[issues]]
file = "src/Sql/Select.php"
code = "no-else-clause"
message = "Avoid `elseif` clauses."
count = 3

[[issues]]
file = "src/Sql/Select.php"
code = "too-many-methods"
Expand All @@ -642,12 +486,6 @@ code = "halstead"
message = "Method has a high halstead difficulty"
count = 1

[[issues]]
file = "src/Sql/Update.php"
code = "no-else-clause"
message = "Avoid `else` clauses."
count = 2

[[issues]]
file = "src/Sql/Update.php"
code = "too-many-methods"
Expand Down
Loading
Loading