Merge branch '5.10.x' into 5.11.x

Signed-off-by: Maurício Meneghini Fauth <[email protected]>
phpmyadmin · Dec 5, 2024 · 32c6769 · 32c6769
2 parents 4eb1510 + 72afbce
commit 32c6769
Show file tree

Hide file tree

Showing 13 changed files with 6,455 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## [5.10.2] - 2024-12-05
+
+### Added
+
+- Add MariaDb 11.6 and 11.7 contexts (#601)
+- Add context files for MySQL 9.1 (#603)
+
 ## [5.10.1] - 2024-11-10
 
 ### Fixed
@@ -590,6 +597,7 @@ __Breaking changes:__
 
 * First release of this library.
 
+[5.10.2]: https://github.com/phpmyadmin/sql-parser/compare/5.10.1...5.10.2
 [5.10.1]: https://github.com/phpmyadmin/sql-parser/compare/5.10.0...5.10.1
 [5.10.0]: https://github.com/phpmyadmin/sql-parser/compare/5.9.1...5.10.0
 [5.9.1]: https://github.com/phpmyadmin/sql-parser/compare/5.9.0...5.9.1

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -632,6 +632,12 @@
   <file src="src/Contexts/ContextMariaDb110500.php">
     <PropertyTypeCoercion occurrences="1"/>
   </file>
+  <file src="src/Contexts/ContextMariaDb110600.php">
+    <PropertyTypeCoercion occurrences="1"/>
+  </file>
+  <file src="src/Contexts/ContextMariaDb110700.php">
+    <PropertyTypeCoercion occurrences="1"/>
+  </file>
   <file src="src/Contexts/ContextMySql50000.php">
     <PropertyTypeCoercion occurrences="1"/>
   </file>
@@ -665,6 +671,9 @@
   <file src="src/Contexts/ContextMySql90000.php">
     <PropertyTypeCoercion occurrences="1"/>
   </file>
+  <file src="src/Contexts/ContextMySql90100.php">
+    <PropertyTypeCoercion occurrences="1"/>
+  </file>
   <file src="src/Lexer.php">
     <LoopInvalidation occurrences="3">
       <code>$this-&gt;last</code>