Improve types for Psalm and error's message improvement

Signed-off-by: Fawzi E. Abdulfattah <[email protected]>
phpmyadmin · Dec 6, 2021 · 85a6461 · 85a6461
1 parent 2961130
commit 85a6461
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 9 deletions.
diff --git a/src/Statements/WithStatement.php b/src/Statements/WithStatement.php
@@ -240,7 +240,14 @@ public function parse(Parser $parser, TokensList $list)
 
         // 5 is the only valid end state
         if ($state !== 5) {
-            $parser->error('Unexpected end of WITH CTE.', $list->tokens[$list->idx]);
+             /**
+             * Token parsed at this moment.
+             *
+             * @var Token
+             */
+            $token = $list->tokens[$list->idx];
+
+            $parser->error('Unexpected end of the WITH CTE.', $token);
         }
 
         --$list->idx;

diff --git a/tests/data/parser/parseWithStatement4.out b/tests/data/parser/parseWithStatement4.out
@@ -1699,7 +1699,7 @@
                 0
             ],
             [
-                "Unexpected end of WITH CTE.",
+                "Unexpected end of the WITH CTE.",
                 {
                     "@type": "@34"
                 },

diff --git a/tests/data/parser/parseWithStatementErr.out b/tests/data/parser/parseWithStatementErr.out
@@ -796,7 +796,7 @@
                 0
             ],
             [
-                "Unexpected end of WITH CTE.",
+                "Unexpected end of the WITH CTE.",
                 {
                     "@type": "@12"
                 },

diff --git a/tests/data/parser/parseWithStatementErr1.out b/tests/data/parser/parseWithStatementErr1.out
@@ -1594,7 +1594,7 @@
                 0
             ],
             [
-                "Unexpected end of WITH CTE.",
+                "Unexpected end of the WITH CTE.",
                 {
                     "@type": "@16"
                 },

diff --git a/tests/data/parser/parseWithStatementErr2.out b/tests/data/parser/parseWithStatementErr2.out
@@ -1347,7 +1347,7 @@
                 0
             ],
             [
-                "Unexpected end of WITH CTE.",
+                "Unexpected end of the WITH CTE.",
                 {
                     "@type": "@25"
                 },

diff --git a/tests/data/parser/parseWithStatementErr3.out b/tests/data/parser/parseWithStatementErr3.out
@@ -1672,7 +1672,7 @@
                 0
             ],
             [
-                "Unexpected end of WITH CTE.",
+                "Unexpected end of the WITH CTE.",
                 {
                     "@type": "@32"
                 },

diff --git a/tests/data/parser/parseWithStatementErr4.out b/tests/data/parser/parseWithStatementErr4.out
@@ -1681,7 +1681,7 @@
                 0
             ],
             [
-                "Unexpected end of WITH CTE.",
+                "Unexpected end of the WITH CTE.",
                 {
                     "@type": "@32"
                 },

diff --git a/tests/data/parser/parseWithStatementErr5.out b/tests/data/parser/parseWithStatementErr5.out
@@ -909,7 +909,7 @@
                 0
             ],
             [
-                "Unexpected end of WITH CTE.",
+                "Unexpected end of the WITH CTE.",
                 {
                     "@type": "@10"
                 },

diff --git a/tests/data/parser/parseWithStatementErr6.out b/tests/data/parser/parseWithStatementErr6.out
@@ -1421,7 +1421,7 @@
                 0
             ],
             [
-                "Unexpected end of WITH CTE.",
+                "Unexpected end of the WITH CTE.",
                 {
                     "@type": "@18"
                 },
-Original file line number
+Diff line change
@@ Expand Up / @@ -1699,7 +1699,7 @@ @@
                 ],
                 [
-                    "Unexpected end of WITH CTE.",
+                    "Unexpected end of the WITH CTE.",
                     {
                         "@type": "@34"
                     },
@@ Expand Down @@