diff options
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 45 |
1 files changed, 27 insertions, 18 deletions
diff --git a/composer.json b/composer.json index 6716ab9..d4e4c94 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ } ], "require": { - "php": "^7.1.3", + "php": "^7.1.3 || ^8.0", "ext-hash": "*", "ext-iconv": "*", "ext-json": "*", @@ -46,24 +46,24 @@ "ext-pcre": "*", "ext-xml": "*", "google/recaptcha": "^1.1", - "phpmyadmin/motranslator": "^4.0", + "nikic/fast-route": "^1.3", + "phpmyadmin/motranslator": "~5.0.0", "phpmyadmin/shapefile": "^2.0", "phpmyadmin/sql-parser": "^5.0", - "phpmyadmin/twig-i18n-extension": "^2.0 || ^3.0", + "phpmyadmin/twig-i18n-extension": "^3.0", "phpseclib/phpseclib": "^2.0", - "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", + "symfony/config": "^4.4.9", + "symfony/dependency-injection": "^4.4.9", + "symfony/expression-language": "^4.4.9", + "symfony/polyfill-ctype": "^1.17.0", + "symfony/polyfill-mbstring": "^1.17.0", "twig/twig": "^2.9 || ^3", "williamdes/mariadb-mysql-kbs": "^1.2" }, "conflict": { "phpseclib/phpseclib": "2.0.8", "tecnickcom/tcpdf": "<6.2", - "pragmarx/google2fa": ">=6.1", + "pragmarx/google2fa": "<6.1.0 || >8.0", "pragmarx/google2fa-qrcode": "<1.0.1", "samyoul/u2f-php-server": "<1.1" }, @@ -81,30 +81,39 @@ "samyoul/u2f-php-server": "For FIDO U2F authentication" }, "require-dev": { - "php-webdriver/webdriver": "^1.7.1", - "phpmyadmin/coding-standard": "^1.0", - "phpstan/phpstan": "^0.11.5", + "php-webdriver/webdriver": "^1.8", + "phpmyadmin/coding-standard": "^2.1.1", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^0.12.61", + "phpstan/phpstan-phpunit": "^0.12.17", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0", "pragmarx/google2fa-qrcode": "^1.0.1", "samyoul/u2f-php-server": "^1.1", - "squizlabs/php_codesniffer": "^3.0", - "tecnickcom/tcpdf": "^6.3" + "symfony/console": "^4.4", + "symfony/finder": "^4.4", + "symfony/twig-bridge": "^4.4", + "tecnickcom/tcpdf": "^6.3", + "vimeo/psalm": "^4.1.1" }, "extra": { "branch-alias": { - "dev-master": "5.0.x-dev" + "dev-master": "5.1.x-dev" } }, "scripts": { "phpcbf": "phpcbf", "phpcs": "phpcs", "phpstan": "phpstan analyse", - "phpunit": "phpunit", + "psalm": "psalm", + "phpunit": "phpunit --color=always", "test": [ "@phpcs", "@phpstan", + "@psalm", "@phpunit" - ] + ], + "update:baselines": "phpstan analyse --generate-baseline && psalm --set-baseline=psalm-baseline.xml", + "twig-lint": "php scripts/console lint:twig templates --ansi --show-deprecations" }, "config":{ "sort-packages": true |