update to 5.2.0-rc1

raise dependency on PHP 7.2.5
always use bundled libraries

1 files changed, 34 insertions, 26 deletions

diff --git a/composer.json b/composer.json
index c980a03..c50a703 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,8 @@
     "autoload": {
         "psr-4": {
             "PhpMyAdmin\\": "libraries/classes"
-        }
+        },
+        "files": ["vendor/phpmyadmin/motranslator/src/functions.php"]
     },
     "autoload-dev": {
         "psr-4": {
@@ -38,36 +39,41 @@
         }
     ],
     "require": {
-        "php": "^7.1.3 || ^8.0",
+        "php": "^7.2.5 || ^8.0",
         "ext-hash": "*",
         "ext-iconv": "*",
         "ext-json": "*",
         "ext-mysqli": "*",
+        "ext-openssl": "*",
         "ext-pcre": "*",
         "ext-xml": "*",
+        "composer/ca-bundle": "^1.2",
         "google/recaptcha": "^1.1",
         "nikic/fast-route": "^1.3",
+        "paragonie/sodium_compat": "^1.17",
         "phpmyadmin/motranslator": "^5.0",
-        "phpmyadmin/shapefile": "^2.0",
+        "phpmyadmin/shapefile": "^3.0.1",
         "phpmyadmin/sql-parser": "^5.5",
-        "phpmyadmin/twig-i18n-extension": "^3.0",
-        "phpseclib/phpseclib": "^2.0",
-        "symfony/config": "^4.4.9",
-        "symfony/dependency-injection": "^4.4.9",
-        "symfony/expression-language": "^4.4.9",
+        "phpmyadmin/twig-i18n-extension": "^4.0",
+        "psr/http-factory": "^1.0",
+        "psr/http-message": "^1.0",
+        "slim/psr7": "^1.4",
+        "symfony/config": "^5.2.3",
+        "symfony/dependency-injection": "^5.2.3",
+        "symfony/expression-language": "^5.2.3",
         "symfony/polyfill-ctype": "^1.17.0",
         "symfony/polyfill-mbstring": "^1.17.0",
-        "twig/twig": "^2.14.9 || ^3.3.5",
+        "symfony/polyfill-php80": "^1.16",
+        "twig/twig": "^3.3.5",
+        "webmozart/assert": "^1.10",
         "williamdes/mariadb-mysql-kbs": "^1.2"
     },
     "conflict": {
-        "phpseclib/phpseclib": "2.0.8",
-        "tecnickcom/tcpdf": "<6.2",
-        "pragmarx/google2fa": "<6.1.0 || >8.0",
-        "pragmarx/google2fa-qrcode": "<1.0.1"
+        "bacon/bacon-qr-code": "<2.0",
+        "pragmarx/google2fa-qrcode": "<2.1",
+        "tecnickcom/tcpdf": "<6.4.4"
     },
     "suggest": {
-        "ext-openssl": "For encryption performance",
         "ext-curl": "Updates checking",
         "ext-opcache": "Better performance",
         "ext-zlib": "For gz import and export",
@@ -75,24 +81,26 @@
         "ext-zip": "For zip import and export",
         "ext-gd2": "For image transformations",
         "ext-mbstring": "For best performance",
+        "ext-sodium": "Better encryption performance",
         "tecnickcom/tcpdf": "For PDF support",
-        "pragmarx/google2fa-qrcode": "For 2FA authentication",
-        "code-lts/u2f-php-server": "For FIDO U2F authentication",
-        "paragonie/sodium_compat": "For modern encryption 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"
     },
     "require-dev": {
+        "bacon/bacon-qr-code": "^2.0",
         "code-lts/u2f-php-server": "^1.2",
-        "paragonie/sodium_compat": "^1.17",
         "php-webdriver/webdriver": "^1.11",
-        "phpmyadmin/coding-standard": "^2.1.1",
+        "phpmyadmin/coding-standard": "^3.0.0",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan": "^1.3",
         "phpstan/phpstan-phpunit": "^1.0",
-        "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0",
-        "pragmarx/google2fa-qrcode": "^1.0.1",
-        "symfony/console": "^4.4",
-        "symfony/finder": "^4.4",
-        "symfony/twig-bridge": "^4.4",
+        "phpstan/phpstan-webmozart-assert": "^1.0",
+        "phpunit/phpunit": "^8.5 || ^9.5",
+        "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.17"
     },
@@ -105,7 +113,7 @@
         "phpcbf": "phpcbf",
         "phpcs": "phpcs",
         "phpstan": "phpstan analyse",
-        "psalm": "psalm",
+        "psalm": "psalm --no-diff",
         "phpunit": "phpunit --color=always",
         "test": [
             "@phpcs",
@@ -114,7 +122,7 @@
             "@phpunit"
         ],
         "update:baselines": "phpstan analyse --generate-baseline && psalm --set-baseline=psalm-baseline.xml",
-        "twig-lint": "php scripts/console lint:twig templates --ansi --show-deprecations"
+        "twig-lint": "php scripts/console lint:twig --ansi --show-deprecations"
     },
     "config":{
         "sort-packages": true,