X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=composer.json;h=fb6bed5b1db1125c6ea97bfca7fcb350c410892c;hb=bb2934d47638c913579b18d66b72687bc508fdfa;hp=e2aeb424cf59aa2d71322a443f9499abe9adc618;hpb=176e0ea3caee9f4eccc1ddda5f84b14da2cca034;p=github%2Fwallabag%2Fwallabag.git diff --git a/composer.json b/composer.json index e2aeb424..fb6bed5b 100644 --- a/composer.json +++ b/composer.json @@ -43,13 +43,13 @@ "ext-iconv": "*", "ext-tokenizer": "*", "ext-pdo": "*", - "symfony/symfony": "3.1.*", + "symfony/symfony": "3.2.*", "doctrine/orm": "^2.5", "doctrine/doctrine-bundle": "^1.6", "doctrine/doctrine-cache-bundle": "^1.2", "twig/extensions": "~1.0", "symfony/swiftmailer-bundle": "^2.3", - "symfony/monolog-bundle": "^2.8", + "symfony/monolog-bundle": "^3.0", "sensio/distribution-bundle": "^5.0", "sensio/framework-extra-bundle": "^3.0.2", "incenteev/composer-parameter-handler": "^2.0", @@ -65,7 +65,7 @@ "liip/theme-bundle": "~1.1", "lexik/form-filter-bundle": "~5.0", "j0k3r/graby": "~1.0", - "friendsofsymfony/user-bundle": "dev-master#e168ed64629d034cb9cbbffb9d4350f62ef04fab as 2.0.x-dev", + "friendsofsymfony/user-bundle": "2.0.x-dev", "friendsofsymfony/oauth-server-bundle": "^1.5", "stof/doctrine-extensions-bundle": "^1.2", "scheb/two-factor-bundle": "~2.0", @@ -90,7 +90,6 @@ "doctrine/doctrine-fixtures-bundle": "~2.2", "doctrine/data-fixtures": "~1.1.1", "sensio/generator-bundle": "^3.0", - "phpunit/phpunit": "~4.0", "symfony/phpunit-bridge": "^3.0", "friendsofphp/php-cs-fixer": "~1.9", "m6web/redis-mock": "^2.0"