summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json49
1 files changed, 39 insertions, 10 deletions
diff --git a/composer.json b/composer.json
index 11e4343..65be479 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,14 @@
"non-feature-branches": ["RELEASE_.*"],
"autoload": {
"psr-4": {
- "PMA\\": "./"
+ "PhpMyAdmin\\": "libraries/classes",
+ "PhpMyAdmin\\Setup\\": "setup/lib"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "PhpMyAdmin\\Tests\\": "test/classes",
+ "PhpMyAdmin\\Tests\\Selenium\\": "test/selenium/"
}
},
"repositories": [
@@ -33,20 +40,29 @@
],
"require": {
"php": ">=5.5.0",
- "ext-mbstring": "*",
"ext-mysqli": "*",
"ext-xml": "*",
"ext-pcre": "*",
"ext-json": "*",
+ "ext-ctype": "*",
+ "ext-hash": "*",
"phpmyadmin/sql-parser": "^4.2.3",
"phpmyadmin/motranslator": "^4.0",
"phpmyadmin/shapefile": "^2.0",
- "tecnickcom/tcpdf": "^6.2",
"phpseclib/phpseclib": "^2.0",
- "google/recaptcha": "^1.1"
+ "google/recaptcha": "^1.1",
+ "psr/container": "^1.0",
+ "twig/twig": "^1.34",
+ "twig/extensions": "~1.5.1",
+ "symfony/expression-language": "^3.2 || ^2.8",
+ "symfony/polyfill-mbstring": "^1.3"
},
"conflict": {
- "phpseclib/phpseclib": "2.0.8"
+ "phpseclib/phpseclib": "2.0.8",
+ "tecnickcom/tcpdf": "<6.2",
+ "pragmarx/google2fa": "<2.0",
+ "bacon/bacon-qr-code": "<1.0",
+ "samyoul/u2f-php-server": "<1.1"
},
"suggest": {
"ext-openssl": "Cookie encryption",
@@ -56,13 +72,26 @@
"ext-bz2": "For bzip2 import and export",
"ext-zip": "For zip import and export",
"ext-gd2": "For image transformations",
- "tecnickcom/tcpdf": "For PDF support"
+ "ext-mbstring": "For best performance",
+ "tecnickcom/tcpdf": "For PDF support",
+ "pragmarx/google2fa": "For 2FA authentication",
+ "bacon/bacon-qr-code": "For 2FA authentication",
+ "samyoul/u2f-php-server": "For FIDO U2F authentication"
},
"require-dev": {
- "phpunit/phpunit": "~4.1",
+ "phpunit/phpunit": "^4.8.36 || ^5.7",
"codacy/coverage": "^1.3.0",
- "phpunit/phpunit-selenium": "~1.2",
- "squizlabs/php_codesniffer": "2.*",
- "phpmyadmin/coding-standard": ">=0.1.0"
+ "phpunit/phpunit-selenium": "~1.2 || ^3.0",
+ "squizlabs/php_codesniffer": "^3.0",
+ "tecnickcom/tcpdf": "^6.2",
+ "pragmarx/google2fa": "^2.0",
+ "bacon/bacon-qr-code": "^1.0",
+ "samyoul/u2f-php-server": "^1.1",
+ "phpmyadmin/coding-standard": "^0.3"
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.8.x-dev"
+ }
}
}