From 89588c4ca91a013bbd95f367f952e9cf22cf3ae4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 22 Jan 2025 07:25:51 +0100
Subject: update to 5.2.2 (2025-01-21, security and bugfix release)

---
 composer.json | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 4726ad0..247193d 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,7 @@
     "keywords": ["phpmyadmin","mysql","web"],
     "homepage": "https://www.phpmyadmin.net/",
     "support": {
+        "security": "https://www.phpmyadmin.net/security/",
         "forum": "https://www.phpmyadmin.net/support/",
         "issues": "https://github.com/phpmyadmin/phpmyadmin/issues",
         "wiki": "https://wiki.phpmyadmin.net/",
@@ -24,7 +25,15 @@
         "psr-4": {
             "PhpMyAdmin\\": "libraries/classes"
         },
-        "files": ["vendor/phpmyadmin/motranslator/src/functions.php"]
+        "files": ["vendor/phpmyadmin/motranslator/src/functions.php"],
+        "exclude-from-classmap": [
+            "/test/",
+            "/vendor/tecnickcom/tcpdf/tcpdf_barcodes_*.php",
+            "/vendor/tecnickcom/tcpdf/tcpdf_import.php",
+            "/vendor/tecnickcom/tcpdf/tcpdf_parser.php",
+            "/vendor/tecnickcom/tcpdf/include/tcpdf_filters.php",
+            "/vendor/tecnickcom/tcpdf/include/barcodes"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
@@ -53,11 +62,11 @@
         "paragonie/sodium_compat": "^1.17",
         "phpmyadmin/motranslator": "^5.0",
         "phpmyadmin/shapefile": "^3.0.1",
-        "phpmyadmin/sql-parser": "^5.5",
-        "phpmyadmin/twig-i18n-extension": "^4.0",
+        "phpmyadmin/sql-parser": "^5.8",
+        "phpmyadmin/twig-i18n-extension": "^4.1.3 || ^5.0.0",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0",
-        "slim/psr7": "^1.4",
+        "slim/psr7": "^1.4.1",
         "symfony/config": "^5.2.3",
         "symfony/dependency-injection": "^5.2.3",
         "symfony/expression-language": "^5.2.3",
@@ -85,24 +94,28 @@
         "tecnickcom/tcpdf": "For PDF support",
         "pragmarx/google2fa-qrcode": "^2.1 - For 2FA authentication",
         "bacon/bacon-qr-code": "^2.0 - For 2FA authentication",
-        "code-lts/u2f-php-server": "For FIDO U2F authentication"
+        "code-lts/u2f-php-server": "For FIDO U2F authentication",
+        "web-auth/webauthn-lib": "For better WebAuthn/FIDO2 authentication support"
     },
     "require-dev": {
         "bacon/bacon-qr-code": "^2.0",
         "code-lts/u2f-php-server": "^1.2",
-        "php-webdriver/webdriver": "^1.11",
+        "php-webdriver/webdriver": "^1.13",
         "phpmyadmin/coding-standard": "^3.0.0",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.4.8",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpstan/phpstan-webmozart-assert": "^1.0",
-        "phpunit/phpunit": "^8.5 || ^9.5",
+        "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",
+        "phpstan/phpstan-webmozart-assert": "^1.2",
+        "phpunit/phpunit": "^8.5.16 || ^9.6",
         "pragmarx/google2fa-qrcode": "^2.1",
         "psalm/plugin-phpunit": "^0.16.1",
         "roave/security-advisories": "dev-latest",
         "symfony/console": "^5.2.3",
         "tecnickcom/tcpdf": "^6.4.4",
-        "vimeo/psalm": "^4.22"
+        "vimeo/psalm": "^4.30",
+        "web-auth/webauthn-lib": "^3.3.2"
     },
     "extra": {
         "branch-alias": {
@@ -135,5 +148,6 @@
             "phpstan/extension-installer": true,
             "composer/package-versions-deprecated": true
         }
-    }
+    },
+    "version": "5.2.2"
 }
-- 
cgit