Visitar URL original
Merge pull request #535 from kamil-tekiela/Components-refactoring · phpmyadmin/sql-parser@04a9299 · GitHub
Skip to content

Commit 04a9299

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #535 from kamil-tekiela/Components-refactoring
Components refactoring
2 parents 578d3aa + 33e49e6 commit 04a9299

59 files changed

Lines changed: 1672 additions & 1510 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎phpstan-baseline.neon‎

Lines changed: 102 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ parameters:
4545
count: 2
4646
path: src/Components/CaseExpression.php
4747

48-
-
49-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\CreateDefinition\\:\\:\\$name \\(string\\|null\\) does not accept mixed\\.$#"
50-
count: 2
51-
path: src/Components/CreateDefinition.php
52-
5348
-
5449
message: "#^Cannot access property \\$raw on array\\<PhpMyAdmin\\\\SqlParser\\\\Component\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
5550
count: 1
@@ -90,45 +85,15 @@ parameters:
9085
count: 1
9186
path: src/Components/Expression.php
9287

93-
-
94-
message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\ExpressionArray\\:\\:parse\\(\\) should return array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\> but returns array\\<int\\<0, max\\>, PhpMyAdmin\\\\SqlParser\\\\Components\\\\CaseExpression\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\>\\.$#"
95-
count: 1
96-
path: src/Components/ExpressionArray.php
97-
98-
-
99-
message: "#^Parameter \\#1 \\$string of function strlen expects string, string\\|null given\\.$#"
100-
count: 1
101-
path: src/Components/ExpressionArray.php
102-
103-
-
104-
message: "#^Parameter \\#1 \\$string of function substr expects string, string\\|null given\\.$#"
105-
count: 1
106-
path: src/Components/ExpressionArray.php
107-
108-
-
109-
message: "#^Parameter \\#2 \\$subject of function preg_match expects string, string\\|null given\\.$#"
110-
count: 1
111-
path: src/Components/ExpressionArray.php
112-
11388
-
11489
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\FunctionCall\\:\\:\\$parameters \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\|null\\) does not accept array\\<PhpMyAdmin\\\\SqlParser\\\\Component\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
11590
count: 1
11691
path: src/Components/FunctionCall.php
11792

11893
-
11994
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\GroupKeyword\\:\\:\\$expr \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
120-
count: 2
121-
path: src/Components/GroupKeyword.php
122-
123-
-
124-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\GroupKeyword\\:\\:\\$expr \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) in empty\\(\\) is not falsy\\.$#"
125-
count: 2
126-
path: src/Components/GroupKeyword.php
127-
128-
-
129-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\IndexHint\\:\\:\\$type \\(string\\|null\\) does not accept mixed\\.$#"
13095
count: 1
131-
path: src/Components/IndexHint.php
96+
path: src/Components/GroupKeyword.php
13297

13398
-
13499
message: "#^Cannot access property \\$values on array\\<PhpMyAdmin\\\\SqlParser\\\\Component\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
@@ -147,7 +112,7 @@ parameters:
147112

148113
-
149114
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\JoinKeyword\\:\\:\\$expr \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
150-
count: 2
115+
count: 1
151116
path: src/Components/JoinKeyword.php
152117

153118
-
@@ -165,11 +130,6 @@ parameters:
165130
count: 1
166131
path: src/Components/JoinKeyword.php
167132

168-
-
169-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\JoinKeyword\\:\\:\\$using \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\) does not accept array\\<PhpMyAdmin\\\\SqlParser\\\\Component\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
170-
count: 1
171-
path: src/Components/JoinKeyword.php
172-
173133
-
174134
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\JoinKeyword\\:\\:\\$using \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\) in empty\\(\\) is not falsy\\.$#"
175135
count: 1
@@ -267,12 +227,7 @@ parameters:
267227

268228
-
269229
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OrderKeyword\\:\\:\\$expr \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
270-
count: 2
271-
path: src/Components/OrderKeyword.php
272-
273-
-
274-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OrderKeyword\\:\\:\\$expr \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) in empty\\(\\) is not falsy\\.$#"
275-
count: 2
230+
count: 1
276231
path: src/Components/OrderKeyword.php
277232

278233
-
@@ -281,24 +236,114 @@ parameters:
281236
path: src/Components/ParameterDefinition.php
282237

283238
-
284-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\ParameterDefinition\\:\\:\\$name \\(string\\) does not accept mixed\\.$#"
239+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\ParameterDefinition\\:\\:\\$name \\(string\\) does not accept string\\|null\\.$#"
285240
count: 1
286241
path: src/Components/ParameterDefinition.php
287242

288243
-
289-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\ParameterDefinition\\:\\:\\$name \\(string\\) does not accept string\\|null\\.$#"
244+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\ParameterDefinition\\:\\:\\$type \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\DataType\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\DataType\\|null\\.$#"
290245
count: 1
291246
path: src/Components/ParameterDefinition.php
292247

248+
-
249+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\CreateDefinition\\:\\:\\$name \\(string\\|null\\) does not accept mixed\\.$#"
250+
count: 2
251+
path: src/Components/Parsers/CreateDefinitions.php
252+
253+
-
254+
message: "#^Method PhpMyAdmin\\\\SqlParser\\\\Components\\\\Parsers\\\\ExpressionArray\\:\\:parse\\(\\) should return array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\> but returns array\\<int\\<0, max\\>, PhpMyAdmin\\\\SqlParser\\\\Components\\\\CaseExpression\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\>\\.$#"
255+
count: 1
256+
path: src/Components/Parsers/ExpressionArray.php
257+
258+
-
259+
message: "#^Parameter \\#1 \\$string of function strlen expects string, string\\|null given\\.$#"
260+
count: 1
261+
path: src/Components/Parsers/ExpressionArray.php
262+
263+
-
264+
message: "#^Parameter \\#1 \\$string of function substr expects string, string\\|null given\\.$#"
265+
count: 1
266+
path: src/Components/Parsers/ExpressionArray.php
267+
268+
-
269+
message: "#^Parameter \\#2 \\$subject of function preg_match expects string, string\\|null given\\.$#"
270+
count: 1
271+
path: src/Components/Parsers/ExpressionArray.php
272+
273+
-
274+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\GroupKeyword\\:\\:\\$expr \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
275+
count: 1
276+
path: src/Components/Parsers/GroupKeywords.php
277+
278+
-
279+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\GroupKeyword\\:\\:\\$expr \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) in empty\\(\\) is not falsy\\.$#"
280+
count: 2
281+
path: src/Components/Parsers/GroupKeywords.php
282+
283+
-
284+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\IndexHint\\:\\:\\$type \\(string\\|null\\) does not accept mixed\\.$#"
285+
count: 1
286+
path: src/Components/Parsers/IndexHints.php
287+
288+
-
289+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\JoinKeyword\\:\\:\\$expr \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
290+
count: 1
291+
path: src/Components/Parsers/JoinKeywords.php
292+
293+
-
294+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\JoinKeyword\\:\\:\\$using \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\) does not accept array\\<PhpMyAdmin\\\\SqlParser\\\\Component\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\.$#"
295+
count: 1
296+
path: src/Components/Parsers/JoinKeywords.php
297+
298+
-
299+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OrderKeyword\\:\\:\\$expr \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
300+
count: 1
301+
path: src/Components/Parsers/OrderKeywords.php
302+
303+
-
304+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\OrderKeyword\\:\\:\\$expr \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) in empty\\(\\) is not falsy\\.$#"
305+
count: 2
306+
path: src/Components/Parsers/OrderKeywords.php
307+
308+
-
309+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\ParameterDefinition\\:\\:\\$name \\(string\\) does not accept mixed\\.$#"
310+
count: 1
311+
path: src/Components/Parsers/ParameterDefinitions.php
312+
293313
-
294314
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\ParameterDefinition\\:\\:\\$name \\(string\\) in isset\\(\\) is not nullable\\.$#"
295315
count: 1
296-
path: src/Components/ParameterDefinition.php
316+
path: src/Components/Parsers/ParameterDefinitions.php
297317

298318
-
299319
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\ParameterDefinition\\:\\:\\$type \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\DataType\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\DataType\\|null\\.$#"
320+
count: 1
321+
path: src/Components/Parsers/ParameterDefinitions.php
322+
323+
-
324+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\RenameOperation\\:\\:\\$new \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
325+
count: 1
326+
path: src/Components/Parsers/RenameOperations.php
327+
328+
-
329+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\RenameOperation\\:\\:\\$new \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) in empty\\(\\) is not falsy\\.$#"
330+
count: 1
331+
path: src/Components/Parsers/RenameOperations.php
332+
333+
-
334+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\RenameOperation\\:\\:\\$old \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
335+
count: 1
336+
path: src/Components/Parsers/RenameOperations.php
337+
338+
-
339+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\RenameOperation\\:\\:\\$old \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) in empty\\(\\) is not falsy\\.$#"
300340
count: 2
301-
path: src/Components/ParameterDefinition.php
341+
path: src/Components/Parsers/RenameOperations.php
342+
343+
-
344+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\SetOperation\\:\\:\\$value \\(string\\) does not accept string\\|null\\.$#"
345+
count: 1
346+
path: src/Components/Parsers/SetOperations.php
302347

303348
-
304349
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\PartitionDefinition\\:\\:\\$expr \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|string\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
@@ -342,28 +387,13 @@ parameters:
342387

343388
-
344389
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\RenameOperation\\:\\:\\$new \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
345-
count: 2
346-
path: src/Components/RenameOperation.php
347-
348-
-
349-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\RenameOperation\\:\\:\\$new \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) in empty\\(\\) is not falsy\\.$#"
350390
count: 1
351391
path: src/Components/RenameOperation.php
352392

353393
-
354394
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\RenameOperation\\:\\:\\$old \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|null\\.$#"
355-
count: 2
356-
path: src/Components/RenameOperation.php
357-
358-
-
359-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\RenameOperation\\:\\:\\$old \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\) in empty\\(\\) is not falsy\\.$#"
360-
count: 2
361-
path: src/Components/RenameOperation.php
362-
363-
-
364-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\SetOperation\\:\\:\\$value \\(string\\) does not accept string\\|null\\.$#"
365395
count: 1
366-
path: src/Components/SetOperation.php
396+
path: src/Components/RenameOperation.php
367397

368398
-
369399
message: "#^Static property PhpMyAdmin\\\\SqlParser\\\\Context\\:\\:\\$keywords \\(non\\-empty\\-array\\<non\\-empty\\-string, int\\>\\) does not accept default value of type array\\{\\}\\.$#"
@@ -541,7 +571,7 @@ parameters:
541571
path: src/Statement.php
542572

543573
-
544-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$options \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\) does not accept mixed\\.$#"
574+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$options \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\) does not accept array\\<PhpMyAdmin\\\\SqlParser\\\\Component\\>\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\FunctionCall\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\IntoKeyword\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit\\|PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#"
545575
count: 1
546576
path: src/Statement.php
547577

@@ -596,7 +626,7 @@ parameters:
596626
path: src/Statements/CreateStatement.php
597627

598628
-
599-
message: "#^Parameter \\#1 \\$component of static method PhpMyAdmin\\\\SqlParser\\\\Components\\\\ParameterDefinition\\:\\:buildAll\\(\\) expects array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\ParameterDefinition\\>, array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\ParameterDefinition\\>\\|null given\\.$#"
629+
message: "#^Parameter \\#1 \\$component of static method PhpMyAdmin\\\\SqlParser\\\\Components\\\\Parsers\\\\ParameterDefinitions\\:\\:buildAll\\(\\) expects array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\ParameterDefinition\\>, array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\ParameterDefinition\\>\\|null given\\.$#"
600630
count: 1
601631
path: src/Statements/CreateStatement.php
602632

@@ -711,7 +741,7 @@ parameters:
711741
path: src/Statements/PurgeStatement.php
712742

713743
-
714-
message: "#^Parameter \\#1 \\$component of static method PhpMyAdmin\\\\SqlParser\\\\Components\\\\RenameOperation\\:\\:buildAll\\(\\) expects array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\RenameOperation\\>, array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\RenameOperation\\>\\|null given\\.$#"
744+
message: "#^Parameter \\#1 \\$component of static method PhpMyAdmin\\\\SqlParser\\\\Components\\\\Parsers\\\\RenameOperations\\:\\:buildAll\\(\\) expects array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\RenameOperation\\>, array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\RenameOperation\\>\\|null given\\.$#"
715745
count: 1
716746
path: src/Statements/RenameStatement.php
717747

@@ -721,7 +751,7 @@ parameters:
721751
path: src/Statements/SetStatement.php
722752

723753
-
724-
message: "#^Parameter \\#1 \\$component of static method PhpMyAdmin\\\\SqlParser\\\\Components\\\\SetOperation\\:\\:buildAll\\(\\) expects array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\SetOperation\\>, array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\SetOperation\\>\\|null given\\.$#"
754+
message: "#^Parameter \\#1 \\$component of static method PhpMyAdmin\\\\SqlParser\\\\Components\\\\Parsers\\\\SetOperations\\:\\:buildAll\\(\\) expects array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\SetOperation\\>, array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\SetOperation\\>\\|null given\\.$#"
725755
count: 1
726756
path: src/Statements/SetStatement.php
727757

0 commit comments

Comments
 (0)