Merge branch '5.9.x'

Signed-off-by: Maurício Meneghini Fauth <[email protected]>
phpmyadmin · Sep 17, 2023 · d4581b8 · d4581b8
2 parents 6b20105 + cb58d58
commit d4581b8
Show file tree

Hide file tree

Showing 29 changed files with 12,655 additions and 0 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -495,6 +495,46 @@
       <code>ContextMariaDb100600</code>
     </UnusedClass>
   </file>
+  <file src="src/Contexts/ContextMariaDb100700.php">
+    <UnusedClass>
+      <code>ContextMariaDb100700</code>
+    </UnusedClass>
+  </file>
+  <file src="src/Contexts/ContextMariaDb100800.php">
+    <UnusedClass>
+      <code>ContextMariaDb100800</code>
+    </UnusedClass>
+  </file>
+  <file src="src/Contexts/ContextMariaDb100900.php">
+    <UnusedClass>
+      <code>ContextMariaDb100900</code>
+    </UnusedClass>
+  </file>
+  <file src="src/Contexts/ContextMariaDb101000.php">
+    <UnusedClass>
+      <code>ContextMariaDb101000</code>
+    </UnusedClass>
+  </file>
+  <file src="src/Contexts/ContextMariaDb101100.php">
+    <UnusedClass>
+      <code>ContextMariaDb101100</code>
+    </UnusedClass>
+  </file>
+  <file src="src/Contexts/ContextMariaDb110000.php">
+    <UnusedClass>
+      <code>ContextMariaDb110000</code>
+    </UnusedClass>
+  </file>
+  <file src="src/Contexts/ContextMariaDb110100.php">
+    <UnusedClass>
+      <code>ContextMariaDb110100</code>
+    </UnusedClass>
+  </file>
+  <file src="src/Contexts/ContextMariaDb110200.php">
+    <UnusedClass>
+      <code>ContextMariaDb110200</code>
+    </UnusedClass>
+  </file>
   <file src="src/Contexts/ContextMySql50000.php">
     <UnusedClass>
       <code>ContextMySql50000</code>
@@ -525,6 +565,11 @@
       <code>ContextMySql80000</code>
     </UnusedClass>
   </file>
+  <file src="src/Contexts/ContextMySql80100.php">
+    <UnusedClass>
+      <code>ContextMySql80100</code>
+    </UnusedClass>
+  </file>
   <file src="src/Core.php">
     <RedundantConditionGivenDocblockType>
       <code>Context::$keywords !== []</code>

diff --git a/src/Contexts/ContextMariaDb100700.php b/src/Contexts/ContextMariaDb100700.php
diff --git a/src/Contexts/ContextMariaDb100800.php b/src/Contexts/ContextMariaDb100800.php
diff --git a/src/Contexts/ContextMariaDb100900.php b/src/Contexts/ContextMariaDb100900.php
diff --git a/src/Contexts/ContextMariaDb101000.php b/src/Contexts/ContextMariaDb101000.php
diff --git a/src/Contexts/ContextMariaDb101100.php b/src/Contexts/ContextMariaDb101100.php
diff --git a/src/Contexts/ContextMariaDb110000.php b/src/Contexts/ContextMariaDb110000.php
diff --git a/src/Contexts/ContextMariaDb110100.php b/src/Contexts/ContextMariaDb110100.php
diff --git a/src/Contexts/ContextMariaDb110200.php b/src/Contexts/ContextMariaDb110200.php
diff --git a/src/Contexts/ContextMySql80100.php b/src/Contexts/ContextMySql80100.php
diff --git a/src/Tools/ContextGenerator.php b/src/Tools/ContextGenerator.php
@@ -61,13 +61,22 @@ class ContextGenerator
         'MySql50600' => 'https://dev.mysql.com/doc/refman/5.6/en/keywords.html',
         'MySql50700' => 'https://dev.mysql.com/doc/refman/5.7/en/keywords.html',
         'MySql80000' => 'https://dev.mysql.com/doc/refman/8.0/en/keywords.html',
+        'MySql80100' => 'https://dev.mysql.com/doc/refman/8.1/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/',
         'MariaDb100300' => 'https://mariadb.com/kb/en/reserved-words/',
         'MariaDb100400' => 'https://mariadb.com/kb/en/reserved-words/',
         'MariaDb100500' => 'https://mariadb.com/kb/en/reserved-words/',
         'MariaDb100600' => 'https://mariadb.com/kb/en/reserved-words/',
+        'MariaDb100700' => 'https://mariadb.com/kb/en/reserved-words/',
+        'MariaDb100800' => 'https://mariadb.com/kb/en/reserved-words/',
+        'MariaDb100900' => 'https://mariadb.com/kb/en/reserved-words/',
+        'MariaDb101000' => 'https://mariadb.com/kb/en/reserved-words/',
+        'MariaDb101100' => 'https://mariadb.com/kb/en/reserved-words/',
+        'MariaDb110000' => 'https://mariadb.com/kb/en/reserved-words/',
+        'MariaDb110100' => 'https://mariadb.com/kb/en/reserved-words/',
+        'MariaDb110200' => 'https://mariadb.com/kb/en/reserved-words/',
     ];
 
     /**