Merge branch '5.11.x'

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
phpmyadmin · Dec 1, 2024 · 06880a3 · 06880a3
2 parents 6d8c215 + 4eb1510
commit 06880a3
Show file tree

Hide file tree

Showing 8 changed files with 310 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -124,7 +124,7 @@ LC_ALL=pl ./vendor/bin/sql-parser --lint --query "SELECT 1"
 ```php
 require __DIR__ . '/vendor/autoload.php';
 
-$GLOBALS['lang'] = 'pl';
+PhpMyAdmin\SqlParser\Translator::setLocale('pl');
 
 $query1 = 'select * from a';
 $parser = new PhpMyAdmin\SqlParser\Parser($query1);

diff --git a/composer.json b/composer.json
@@ -29,9 +29,11 @@
         "phpbench/phpbench": "^1.2",
         "phpmyadmin/coding-standard": "^4.0",
         "phpmyadmin/motranslator": "^5.3",
-        "phpstan/extension-installer": "^1.2",
-        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-phpunit": "^1.3",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan": "^1.12",
+        "phpstan/phpstan-deprecation-rules": "^1.2",
+        "phpstan/phpstan-phpunit": "^1.4",
+        "phpstan/phpstan-strict-rules": "^1.6",
         "phpunit/phpunit": "^10.0",
         "psalm/plugin-phpunit": "^0.18.4",
         "vimeo/psalm": "^5.7",