Skip to content

Commit e743f9b

Browse files
committed
Merge #414 - Fix #413 - Adding guard checks before checking keyword
Pull-request: #414 Fixes: #413 Signed-off-by: William Desportes <williamdes@wdes.fr>
2 parents dab0f43 + 80b39d9 commit e743f9b

File tree

6 files changed

+827
-6
lines changed

6 files changed

+827
-6
lines changed

phpstan-baseline.neon

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -540,11 +540,6 @@ parameters:
540540
count: 12
541541
path: src/Parser.php
542542

543-
-
544-
message: "#^Cannot access property \\$keyword on PhpMyAdmin\\\\SqlParser\\\\Token\\|null\\.$#"
545-
count: 2
546-
path: src/Parser.php
547-
548543
-
549544
message: "#^Cannot access property \\$tokens on PhpMyAdmin\\\\SqlParser\\\\TokensList\\|null\\.$#"
550545
count: 1

src/Parser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ public function parse()
480480
// 2 - Explain statement, in case of MariaDB https://mariadb.com/kb/en/explain-analyze/
481481
// We need to point case 2 to use the EXPLAIN Parser.
482482
$statementName = 'EXPLAIN';
483-
if ($first->keyword === 'TABLE' || $second->keyword === 'TABLE') {
483+
if (($first && $first->keyword === 'TABLE') || ($second && $second->keyword === 'TABLE')) {
484484
$statementName = 'ANALYZE';
485485
}
486486

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ANALYZE NO_WRITE_TO_BINLOG

0 commit comments

Comments
 (0)