Merge pull request #576 from niconoe-/feature/include-mysql-9.0-and-m…

…ariadb-11.5 Add missing MySQL 9.0 and MariaDB 11.5 contexts.
phpmyadmin · Aug 26, 2024 · 6e7dafd · 6e7dafd
2 parents a4bdc3a + 5a8080e
commit 6e7dafd
Show file tree

Hide file tree

Showing 9 changed files with 4,288 additions and 1 deletion.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -629,6 +629,9 @@
   <file src="src/Contexts/ContextMariaDb110400.php">
     <PropertyTypeCoercion occurrences="1"/>
   </file>
+  <file src="src/Contexts/ContextMariaDb110500.php">
+    <PropertyTypeCoercion occurrences="1"/>
+  </file>
   <file src="src/Contexts/ContextMySql50000.php">
     <PropertyTypeCoercion occurrences="1"/>
   </file>
@@ -659,6 +662,9 @@
   <file src="src/Contexts/ContextMySql80400.php">
     <PropertyTypeCoercion occurrences="1"/>
   </file>
+  <file src="src/Contexts/ContextMySql90000.php">
+    <PropertyTypeCoercion occurrences="1"/>
+  </file>
   <file src="src/Lexer.php">
     <LoopInvalidation occurrences="3">
       <code>$this-&gt;last</code>

diff --git a/src/Contexts/ContextMariaDb110500.php b/src/Contexts/ContextMariaDb110500.php
diff --git a/src/Contexts/ContextMySql90000.php b/src/Contexts/ContextMySql90000.php
diff --git a/src/Tools/ContextGenerator.php b/src/Tools/ContextGenerator.php
@@ -65,6 +65,7 @@ class ContextGenerator
         'MySql80200' => 'https://dev.mysql.com/doc/refman/8.2/en/keywords.html',
         'MySql80300' => 'https://dev.mysql.com/doc/refman/8.3/en/keywords.html',
         'MySql80400' => 'https://dev.mysql.com/doc/refman/8.4/en/keywords.html',
+        'MySql90000' => 'https://dev.mysql.com/doc/refman/9.0/en/keywords.html',
         'MariaDb100000' => 'https://mariadb.com/kb/en/reserved-words/',
         'MariaDb100100' => 'https://mariadb.com/kb/en/reserved-words/',
         'MariaDb100200' => 'https://mariadb.com/kb/en/reserved-words/',
@@ -82,6 +83,7 @@ class ContextGenerator
         'MariaDb110200' => 'https://mariadb.com/kb/en/reserved-words/',
         'MariaDb110300' => 'https://mariadb.com/kb/en/reserved-words/',
         'MariaDb110400' => 'https://mariadb.com/kb/en/reserved-words/',
+        'MariaDb110500' => 'https://mariadb.com/kb/en/reserved-words/',
     ];
 
     /**

diff --git a/tests/Lexer/ContextTest.php b/tests/Lexer/ContextTest.php
@@ -65,7 +65,7 @@ public static function contextLoadingProvider(): array
                 'MySql50700',
             ],
             'MySQL fallback' => [
-                'MySql99999',
+                'MySql9897969594',
                 'MySql50700',
             ],
             'MariaDB match' => [
@@ -114,6 +114,8 @@ public static function contextNamesProvider(): array
             ['MySql80100'],
             ['MySql80200'],
             ['MySql80300'],
+            ['MySql80400'],
+            ['MySql90000'],
             ['MariaDb100000'],
             ['MariaDb100100'],
             ['MariaDb100200'],
@@ -131,6 +133,7 @@ public static function contextNamesProvider(): array
             ['MariaDb110200'],
             ['MariaDb110300'],
             ['MariaDb110400'],
+            ['MariaDb110500'],
         ];
     }
 
@@ -161,6 +164,8 @@ public function contextClassesProvider(): array
             [Contexts\ContextMySql80100::class],
             [Contexts\ContextMySql80200::class],
             [Contexts\ContextMySql80300::class],
+            [Contexts\ContextMySql80400::class],
+            [Contexts\ContextMySql90000::class],
             [Contexts\ContextMariaDb100000::class],
             [Contexts\ContextMariaDb100100::class],
             [Contexts\ContextMariaDb100200::class],
@@ -178,6 +183,7 @@ public function contextClassesProvider(): array
             [Contexts\ContextMariaDb110200::class],
             [Contexts\ContextMariaDb110300::class],
             [Contexts\ContextMariaDb110400::class],
+            [Contexts\ContextMariaDb110500::class],
         ];
     }