Skip to content

Commit 208f145

Browse files
committed
Add Parseable interface
Signed-off-by: Kamil Tekiela <[email protected]>
1 parent 6dfd1d2 commit 208f145

27 files changed

+73
-68
lines changed

psalm-baseline.xml

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@
6161
<MixedOperand>
6262
<code><![CDATA[$token->value]]></code>
6363
</MixedOperand>
64-
<UnusedParam>
65-
<code>$options</code>
66-
</UnusedParam>
6764
</file>
6865
<file src="src/Components/Condition.php">
6966
<PossiblyUnusedProperty>
@@ -84,9 +81,6 @@
8481
<code>$name</code>
8582
<code>$options</code>
8683
</PossiblyNullPropertyAssignmentValue>
87-
<UnusedParam>
88-
<code>$options</code>
89-
</UnusedParam>
9084
</file>
9185
<file src="src/Components/Expression.php">
9286
<DocblockTypeContradiction>
@@ -128,9 +122,6 @@
128122
<code><![CDATA[$this->name]]></code>
129123
<code><![CDATA[$this->parameters]]></code>
130124
</PossiblyNullOperand>
131-
<UnusedParam>
132-
<code>$options</code>
133-
</UnusedParam>
134125
</file>
135126
<file src="src/Components/GroupKeyword.php">
136127
<PossiblyNullPropertyAssignmentValue>
@@ -199,9 +190,6 @@
199190
<PropertyTypeCoercion>
200191
<code><![CDATA[$ret->columns]]></code>
201192
</PropertyTypeCoercion>
202-
<UnusedParam>
203-
<code>$options</code>
204-
</UnusedParam>
205193
</file>
206194
<file src="src/Components/Limit.php">
207195
<MixedAssignment>
@@ -219,9 +207,6 @@
219207
<code><![CDATA[$expr->name]]></code>
220208
<code><![CDATA[$expr->name]]></code>
221209
</MixedAssignment>
222-
<UnusedParam>
223-
<code>$options</code>
224-
</UnusedParam>
225210
</file>
226211
<file src="src/Components/Lists/ExpressionArray.php">
227212
<InvalidReturnStatement>
@@ -243,9 +228,6 @@
243228
<PossiblyNullPropertyAssignmentValue>
244229
<code>Expression::parse($parser, $list)</code>
245230
</PossiblyNullPropertyAssignmentValue>
246-
<UnusedParam>
247-
<code>$options</code>
248-
</UnusedParam>
249231
</file>
250232
<file src="src/Components/Lists/IndexHints.php">
251233
<MixedAssignment>
@@ -266,9 +248,6 @@
266248
<PossiblyNullPropertyAssignmentValue>
267249
<code><![CDATA[Expression::parse($parser, $list, ['field' => 'table'])]]></code>
268250
</PossiblyNullPropertyAssignmentValue>
269-
<UnusedParam>
270-
<code>$options</code>
271-
</UnusedParam>
272251
<UnusedVariable>
273252
<code>$state</code>
274253
<code>$state</code>
@@ -279,9 +258,6 @@
279258
<PossiblyNullPropertyAssignmentValue>
280259
<code>Expression::parse($parser, $list)</code>
281260
</PossiblyNullPropertyAssignmentValue>
282-
<UnusedParam>
283-
<code>$options</code>
284-
</UnusedParam>
285261
</file>
286262
<file src="src/Components/Lists/ParameterDefinitions.php">
287263
<MixedAssignment>
@@ -293,9 +269,6 @@
293269
<RedundantConditionGivenDocblockType>
294270
<code><![CDATA[isset($expr->name)]]></code>
295271
</RedundantConditionGivenDocblockType>
296-
<UnusedParam>
297-
<code>$options</code>
298-
</UnusedParam>
299272
</file>
300273
<file src="src/Components/Lists/RenameOperations.php">
301274
<PossiblyNullPropertyAssignmentValue>
@@ -316,9 +289,6 @@
316289
],
317290
)]]></code>
318291
</PossiblyNullPropertyAssignmentValue>
319-
<UnusedParam>
320-
<code>$options</code>
321-
</UnusedParam>
322292
</file>
323293
<file src="src/Components/Lists/SetOperations.php">
324294
<PossiblyNullPropertyAssignmentValue>
@@ -327,9 +297,6 @@
327297
<RedundantConditionGivenDocblockType>
328298
<code><![CDATA[$token->value === ',']]></code>
329299
</RedundantConditionGivenDocblockType>
330-
<UnusedParam>
331-
<code>$options</code>
332-
</UnusedParam>
333300
</file>
334301
<file src="src/Components/LockExpression.php">
335302
<MissingConstructor>
@@ -339,9 +306,6 @@
339306
<PossiblyNullPropertyAssignmentValue>
340307
<code><![CDATA[Expression::parse($parser, $list, ['parseField' => 'table'])]]></code>
341308
</PossiblyNullPropertyAssignmentValue>
342-
<UnusedParam>
343-
<code>$options</code>
344-
</UnusedParam>
345309
</file>
346310
<file src="src/Components/OptionsArray.php">
347311
<MixedArgument>
@@ -470,9 +434,6 @@
470434
['type' => self::class],
471435
)]]></code>
472436
</PropertyTypeCoercion>
473-
<UnusedParam>
474-
<code>$options</code>
475-
</UnusedParam>
476437
<UnusedVariable>
477438
<code>$idx</code>
478439
</UnusedVariable>
@@ -493,9 +454,6 @@
493454
],
494455
)]]></code>
495456
</PossiblyNullPropertyAssignmentValue>
496-
<UnusedParam>
497-
<code>$options</code>
498-
</UnusedParam>
499457
</file>
500458
<file src="src/Components/RenameOperation.php">
501459
<PossiblyNullPropertyAssignmentValue>

src/Components/AlterOperation.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace PhpMyAdmin\SqlParser\Components;
66

77
use PhpMyAdmin\SqlParser\Component;
8+
use PhpMyAdmin\SqlParser\Parseable;
89
use PhpMyAdmin\SqlParser\Parser;
910
use PhpMyAdmin\SqlParser\Token;
1011
use PhpMyAdmin\SqlParser\TokensList;
@@ -19,7 +20,7 @@
1920
/**
2021
* Parses an alter operation.
2122
*/
22-
final class AlterOperation implements Component
23+
final class AlterOperation implements Component, Parseable
2324
{
2425
/**
2526
* All database options.

src/Components/ArrayObj.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace PhpMyAdmin\SqlParser\Components;
66

77
use PhpMyAdmin\SqlParser\Component;
8+
use PhpMyAdmin\SqlParser\Parseable;
89
use PhpMyAdmin\SqlParser\Parser;
910
use PhpMyAdmin\SqlParser\TokensList;
1011
use PhpMyAdmin\SqlParser\TokenType;
@@ -16,7 +17,7 @@
1617
/**
1718
* Parses an array.
1819
*/
19-
final class ArrayObj implements Component
20+
final class ArrayObj implements Component, Parseable
2021
{
2122
/**
2223
* The array that contains the unprocessed value of each token.

src/Components/CaseExpression.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use PhpMyAdmin\SqlParser\Component;
88
use PhpMyAdmin\SqlParser\Components\Lists\Conditions;
99
use PhpMyAdmin\SqlParser\Context;
10+
use PhpMyAdmin\SqlParser\Parseable;
1011
use PhpMyAdmin\SqlParser\Parser;
1112
use PhpMyAdmin\SqlParser\Token;
1213
use PhpMyAdmin\SqlParser\TokensList;
@@ -17,7 +18,7 @@
1718
/**
1819
* Parses a reference to a CASE expression.
1920
*/
20-
final class CaseExpression implements Component
21+
final class CaseExpression implements Component, Parseable
2122
{
2223
/**
2324
* The value to be compared.

src/Components/DataType.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace PhpMyAdmin\SqlParser\Components;
66

77
use PhpMyAdmin\SqlParser\Component;
8+
use PhpMyAdmin\SqlParser\Parseable;
89
use PhpMyAdmin\SqlParser\Parser;
910
use PhpMyAdmin\SqlParser\Token;
1011
use PhpMyAdmin\SqlParser\TokensList;
@@ -18,7 +19,7 @@
1819
/**
1920
* Parses a data type.
2021
*/
21-
final class DataType implements Component
22+
final class DataType implements Component, Parseable
2223
{
2324
/**
2425
* All data type options.

src/Components/Expression.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use PhpMyAdmin\SqlParser\Component;
99
use PhpMyAdmin\SqlParser\Context;
1010
use PhpMyAdmin\SqlParser\Exceptions\ParserException;
11+
use PhpMyAdmin\SqlParser\Parseable;
1112
use PhpMyAdmin\SqlParser\Parser;
1213
use PhpMyAdmin\SqlParser\Token;
1314
use PhpMyAdmin\SqlParser\TokensList;
@@ -23,7 +24,7 @@
2324
* call, mathematical expression, etc.).
2425
*/
2526
#[AllowDynamicProperties]
26-
final class Expression implements Component
27+
final class Expression implements Component, Parseable
2728
{
2829
/**
2930
* List of allowed reserved keywords in expressions.

src/Components/FunctionCall.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace PhpMyAdmin\SqlParser\Components;
66

77
use PhpMyAdmin\SqlParser\Component;
8+
use PhpMyAdmin\SqlParser\Parseable;
89
use PhpMyAdmin\SqlParser\Parser;
910
use PhpMyAdmin\SqlParser\TokensList;
1011
use PhpMyAdmin\SqlParser\TokenType;
@@ -14,7 +15,7 @@
1415
/**
1516
* Parses a function call.
1617
*/
17-
final class FunctionCall implements Component
18+
final class FunctionCall implements Component, Parseable
1819
{
1920
/**
2021
* The name of this function.

src/Components/IntoKeyword.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use PhpMyAdmin\SqlParser\Component;
88
use PhpMyAdmin\SqlParser\Components\Lists\ExpressionArray;
9+
use PhpMyAdmin\SqlParser\Parseable;
910
use PhpMyAdmin\SqlParser\Parser;
1011
use PhpMyAdmin\SqlParser\Token;
1112
use PhpMyAdmin\SqlParser\TokensList;
@@ -17,7 +18,7 @@
1718
/**
1819
* `INTO` keyword parser.
1920
*/
20-
final class IntoKeyword implements Component
21+
final class IntoKeyword implements Component, Parseable
2122
{
2223
/**
2324
* FIELDS/COLUMNS Options for `SELECT...INTO` statements.

src/Components/Key.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use PhpMyAdmin\SqlParser\Component;
88
use PhpMyAdmin\SqlParser\Context;
9+
use PhpMyAdmin\SqlParser\Parseable;
910
use PhpMyAdmin\SqlParser\Parser;
1011
use PhpMyAdmin\SqlParser\TokensList;
1112
use PhpMyAdmin\SqlParser\TokenType;
@@ -18,7 +19,7 @@
1819
*
1920
* Used for parsing `CREATE TABLE` statement.
2021
*/
21-
final class Key implements Component
22+
final class Key implements Component, Parseable
2223
{
2324
/**
2425
* All key options.

src/Components/Limit.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace PhpMyAdmin\SqlParser\Components;
66

77
use PhpMyAdmin\SqlParser\Component;
8+
use PhpMyAdmin\SqlParser\Parseable;
89
use PhpMyAdmin\SqlParser\Parser;
910
use PhpMyAdmin\SqlParser\Token;
1011
use PhpMyAdmin\SqlParser\TokensList;
@@ -13,7 +14,7 @@
1314
/**
1415
* `LIMIT` keyword parser.
1516
*/
16-
final class Limit implements Component
17+
final class Limit implements Component, Parseable
1718
{
1819
/**
1920
* The number of rows skipped.

0 commit comments

Comments
 (0)