From ed66452e66b052e10b6056d2aa4ffca58f30efb2 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 12 Sep 2019 16:49:00 +0200
Subject: - update to 5.0.0alpha1 - raise dependency on PHP 7.1.3 - raise
 dependency on phpmyadmin/sql-parser 5.0 - raise dependency on twig 2.1 - add
 dependency on pragmarx/google2fa-qrcode - drop dependency on
 pragmarx/google2fa and bacon/bacon-qr-code - drop dependency on psr/container

---
 composer.json | 67 ++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 26 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 4489c40..dc1edc4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "phpmyadmin/phpmyadmin",
     "type": "project",
-    "description": "MySQL web administration tool",
+    "description": "A web interface for MySQL and MariaDB",
     "keywords": ["phpmyadmin","mysql","web"],
     "homepage": "https://www.phpmyadmin.net/",
     "support": {
@@ -22,8 +22,7 @@
     "non-feature-branches": ["RELEASE_.*"],
     "autoload": {
         "psr-4": {
-            "PhpMyAdmin\\": "libraries/classes",
-            "PhpMyAdmin\\Setup\\": "setup/lib"
+            "PhpMyAdmin\\": "libraries/classes"
         }
     },
     "autoload-dev": {
@@ -39,29 +38,32 @@
         }
     ],
     "require": {
-        "php": ">=5.5.0",
+        "php": "^7.1.3",
+        "ext-hash": "*",
+        "ext-iconv": "*",
+        "ext-json": "*",
         "ext-mysqli": "*",
-        "ext-xml": "*",
         "ext-pcre": "*",
-        "ext-json": "*",
-        "ext-ctype": "*",
-        "ext-hash": "*",
-        "phpmyadmin/sql-parser": "^4.3.2",
+        "ext-xml": "*",
+        "google/recaptcha": "^1.1",
         "phpmyadmin/motranslator": "^4.0",
         "phpmyadmin/shapefile": "^2.0",
+        "phpmyadmin/sql-parser": "^5.0",
         "phpseclib/phpseclib": "^2.0",
-        "google/recaptcha": "^1.1",
-        "psr/container": "^1.0",
-        "twig/twig": "^1.34",
+        "symfony/config": "^4.2.8",
+        "symfony/dependency-injection": "^4.2.8",
+        "symfony/expression-language": "^4.2",
+        "symfony/polyfill-ctype": "^1.8",
+        "symfony/polyfill-mbstring": "^1.3",
+        "symfony/yaml": "^4.2.8",
         "twig/extensions": "~1.5.1",
-        "symfony/expression-language": "^3.2 || ^2.8",
-        "symfony/polyfill-mbstring": "^1.3"
+        "twig/twig": "^2.4",
+        "williamdes/mariadb-mysql-kbs": "^1.2"
     },
     "conflict": {
         "phpseclib/phpseclib": "2.0.8",
         "tecnickcom/tcpdf": "<6.2",
-        "pragmarx/google2fa": "<3.0.1",
-        "bacon/bacon-qr-code": "<1.0",
+        "pragmarx/google2fa-qrcode": "<1.0.1",
         "samyoul/u2f-php-server": "<1.1"
     },
     "suggest": {
@@ -74,24 +76,37 @@
         "ext-gd2": "For image transformations",
         "ext-mbstring": "For best performance",
         "tecnickcom/tcpdf": "For PDF support",
-        "pragmarx/google2fa": "For 2FA authentication",
-        "bacon/bacon-qr-code": "For 2FA authentication",
+        "pragmarx/google2fa-qrcode": "For 2FA authentication",
         "samyoul/u2f-php-server": "For FIDO U2F authentication"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36 || ^5.7",
         "codacy/coverage": "^1.3.0",
-        "phpunit/phpunit-selenium": "~1.2 || ^3.0",
-        "squizlabs/php_codesniffer": "^3.0",
-        "tecnickcom/tcpdf": "^6.2",
-        "pragmarx/google2fa": "^3.0",
-        "bacon/bacon-qr-code": "^1.0",
+        "facebook/webdriver": "^1.7.1",
+        "phpmyadmin/coding-standard": "^1.0",
+        "phpstan/phpstan": "^0.11.5",
+        "phpunit/phpunit": "^7.5 || ^8.0",
+        "pragmarx/google2fa-qrcode": "^1.0.1",
         "samyoul/u2f-php-server": "^1.1",
-        "phpmyadmin/coding-standard": "^0.3"
+        "squizlabs/php_codesniffer": "^3.0",
+        "tecnickcom/tcpdf": "^6.2"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "4.8.x-dev"
+            "dev-master": "5.0.x-dev"
         }
+    },
+    "scripts": {
+        "phpcbf": "phpcbf",
+        "phpcs": "phpcs",
+        "phpstan": "phpstan analyse",
+        "phpunit": "phpunit",
+        "test": [
+            "@phpcs",
+            "@phpstan",
+            "@phpunit"
+        ]
+    },
+    "config":{
+        "sort-packages": true
     }
 }
-- 
cgit