Visitar URL original
Merge pull request #536 from MauricioFauth/invalid-var · phpmyadmin/sql-parser@e55fadf · GitHub
Skip to content

Commit e55fadf

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #536 from MauricioFauth/invalid-var
Remove invalid var annotations
2 parents 69db6d8 + 958fc0c commit e55fadf

43 files changed

Lines changed: 359 additions & 230 deletions

Some content is hidden

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

‎phpcs.xml.dist‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
</rule>
3030

3131
<!-- Rules that should be followed, but are not required -->
32-
<rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.InvalidFormat">
33-
<severity>4</severity>
34-
</rule>
3532
<rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint">
3633
<severity>4</severity>
3734
</rule>

‎phpstan-baseline.neon‎

Lines changed: 129 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@ parameters:
7676
path: src/Components/DataType.php
7777

7878
-
79-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\:\\:\\$alias \\(string\\|null\\) does not accept mixed\\.$#"
80-
count: 3
79+
message: "#^Comparison operation \"\\<\" between int\\<1, max\\> and 0 is always false\\.$#"
80+
count: 1
8181
path: src/Components/Expression.php
8282

8383
-
84-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\:\\:\\$subquery \\(string\\|null\\) does not accept mixed\\.$#"
85-
count: 1
84+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\:\\:\\$alias \\(string\\|null\\) does not accept mixed\\.$#"
85+
count: 3
8686
path: src/Components/Expression.php
8787

8888
-
89-
message: "#^Strict comparison using \\=\\=\\= between PhpMyAdmin\\\\SqlParser\\\\Token and null will always evaluate to false\\.$#"
89+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Expression\\:\\:\\$subquery \\(string\\|null\\) does not accept mixed\\.$#"
9090
count: 1
9191
path: src/Components/Expression.php
9292

@@ -176,7 +176,7 @@ parameters:
176176
path: src/Components/JoinKeyword.php
177177

178178
-
179-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Key\\:\\:\\$columns \\(array\\<array\\{name\\?\\: string, length\\?\\: int, order\\?\\: string\\}\\>\\) does not accept non\\-empty\\-array\\<array\\<string, mixed\\>\\>\\.$#"
179+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\Key\\:\\:\\$columns \\(array\\<array\\{name\\?\\: string, length\\?\\: int, order\\?\\: string\\}\\>\\) does not accept non\\-empty\\-array\\<array\\<'length'\\|'name'\\|'order', mixed\\>\\>\\.$#"
180180
count: 1
181181
path: src/Components/Key.php
182182

@@ -405,13 +405,18 @@ parameters:
405405
count: 4
406406
path: src/Parser.php
407407

408+
-
409+
message: "#^Instantiated class not found\\.$#"
410+
count: 1
411+
path: src/Parser.php
412+
408413
-
409414
message: "#^Parameter \\#2 \\$list of method PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:validateClauseOrder\\(\\) expects PhpMyAdmin\\\\SqlParser\\\\TokensList, PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null given\\.$#"
410-
count: 3
415+
count: 2
411416
path: src/Parser.php
412417

413418
-
414-
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\SelectStatement\\:\\:\\$union \\(array\\<PhpMyAdmin\\\\SqlParser\\\\Statements\\\\SelectStatement\\>\\) does not accept array\\<array\\<int, bool\\|PhpMyAdmin\\\\SqlParser\\\\Statements\\\\SelectStatement\\|string\\>\\|PhpMyAdmin\\\\SqlParser\\\\Statements\\\\SelectStatement\\>\\.$#"
419+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\SelectStatement\\:\\:\\$union \\(array\\<PhpMyAdmin\\\\SqlParser\\\\Statements\\\\SelectStatement\\>\\) does not accept array\\<array\\<int, PhpMyAdmin\\\\SqlParser\\\\Statements\\\\SelectStatement\\|string\\>\\|PhpMyAdmin\\\\SqlParser\\\\Statements\\\\SelectStatement\\>\\.$#"
415420
count: 1
416421
path: src/Parser.php
417422

@@ -421,7 +426,112 @@ parameters:
421426
path: src/Parser.php
422427

423428
-
424-
message: "#^Call to an undefined static method PhpMyAdmin\\\\SqlParser\\\\Component\\:\\:buildAll\\(\\)\\.$#"
429+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$call\\.$#"
430+
count: 1
431+
path: src/Statement.php
432+
433+
-
434+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$endOptions\\.$#"
435+
count: 1
436+
path: src/Statement.php
437+
438+
-
439+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$expr\\.$#"
440+
count: 1
441+
path: src/Statement.php
442+
443+
-
444+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$fields\\.$#"
445+
count: 1
446+
path: src/Statement.php
447+
448+
-
449+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$from\\.$#"
450+
count: 1
451+
path: src/Statement.php
452+
453+
-
454+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$group\\.$#"
455+
count: 1
456+
path: src/Statement.php
457+
458+
-
459+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$groupOptions\\.$#"
460+
count: 1
461+
path: src/Statement.php
462+
463+
-
464+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$having\\.$#"
465+
count: 1
466+
path: src/Statement.php
467+
468+
-
469+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$index_hints\\.$#"
470+
count: 1
471+
path: src/Statement.php
472+
473+
-
474+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$into\\.$#"
475+
count: 1
476+
path: src/Statement.php
477+
478+
-
479+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$join\\.$#"
480+
count: 1
481+
path: src/Statement.php
482+
483+
-
484+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$limit\\.$#"
485+
count: 1
486+
path: src/Statement.php
487+
488+
-
489+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$order\\.$#"
490+
count: 1
491+
path: src/Statement.php
492+
493+
-
494+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$partition\\.$#"
495+
count: 1
496+
path: src/Statement.php
497+
498+
-
499+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$procedure\\.$#"
500+
count: 1
501+
path: src/Statement.php
502+
503+
-
504+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$renames\\.$#"
505+
count: 1
506+
path: src/Statement.php
507+
508+
-
509+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$set\\.$#"
510+
count: 1
511+
path: src/Statement.php
512+
513+
-
514+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$table\\.$#"
515+
count: 1
516+
path: src/Statement.php
517+
518+
-
519+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$tables\\.$#"
520+
count: 1
521+
path: src/Statement.php
522+
523+
-
524+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$union\\.$#"
525+
count: 1
526+
path: src/Statement.php
527+
528+
-
529+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$values\\.$#"
530+
count: 1
531+
path: src/Statement.php
532+
533+
-
534+
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$where\\.$#"
425535
count: 1
426536
path: src/Statement.php
427537

@@ -435,6 +545,11 @@ parameters:
435545
count: 1
436546
path: src/Statement.php
437547

548+
-
549+
message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$options \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\) does not accept mixed\\.$#"
550+
count: 1
551+
path: src/Statement.php
552+
438553
-
439554
message: "#^Argument of an invalid type array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\AlterOperation\\>\\|null supplied for foreach, only iterables are supported\\.$#"
440555
count: 1
@@ -570,6 +685,11 @@ parameters:
570685
count: 1
571686
path: src/Statements/LoadStatement.php
572687

688+
-
689+
message: "#^Comparison operation \"\\>\\=\" between int\\<3, max\\> and 3 is always true\\.$#"
690+
count: 1
691+
path: src/Statements/LoadStatement.php
692+
573693
-
574694
message: "#^Parameter \\#3 \\$keyword of method PhpMyAdmin\\\\SqlParser\\\\Statements\\\\LoadStatement\\:\\:parseFileOptions\\(\\) expects string, mixed given\\.$#"
575695
count: 1

0 commit comments

Comments
 (0)