diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-12-15 22:18:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-15 22:18:45 +0100 |
| commit | 24becc9717423748e6ef06c6cf1c499435af66b9 (patch) | |
| tree | 9d6feb77e78d8318ebccc807356ff2d414892486 /composer.json | |
| parent | 15cc1838501955638f3ac6e0fb3235bb6ac4e26c (diff) | |
| parent | 6ad8aabb83581fdc978d0cea81be8e776a3b7198 (diff) | |
| download | wallabag-24becc9717423748e6ef06c6cf1c499435af66b9.tar.gz wallabag-24becc9717423748e6ef06c6cf1c499435af66b9.tar.zst wallabag-24becc9717423748e6ef06c6cf1c499435af66b9.zip | |
Merge pull request #2667 from wallabag/upgrade-symfony-32
Upgrade to Symfony 3.2
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/composer.json b/composer.json index a5ef9529..fb6bed5b 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | "ext-iconv": "*", | 43 | "ext-iconv": "*", |
| 44 | "ext-tokenizer": "*", | 44 | "ext-tokenizer": "*", |
| 45 | "ext-pdo": "*", | 45 | "ext-pdo": "*", |
| 46 | "symfony/symfony": "3.1.*", | 46 | "symfony/symfony": "3.2.*", |
| 47 | "doctrine/orm": "^2.5", | 47 | "doctrine/orm": "^2.5", |
| 48 | "doctrine/doctrine-bundle": "^1.6", | 48 | "doctrine/doctrine-bundle": "^1.6", |
| 49 | "doctrine/doctrine-cache-bundle": "^1.2", | 49 | "doctrine/doctrine-cache-bundle": "^1.2", |
| @@ -90,7 +90,6 @@ | |||
| 90 | "doctrine/doctrine-fixtures-bundle": "~2.2", | 90 | "doctrine/doctrine-fixtures-bundle": "~2.2", |
| 91 | "doctrine/data-fixtures": "~1.1.1", | 91 | "doctrine/data-fixtures": "~1.1.1", |
| 92 | "sensio/generator-bundle": "^3.0", | 92 | "sensio/generator-bundle": "^3.0", |
| 93 | "phpunit/phpunit": "~4.0", | ||
| 94 | "symfony/phpunit-bridge": "^3.0", | 93 | "symfony/phpunit-bridge": "^3.0", |
| 95 | "friendsofphp/php-cs-fixer": "~1.9", | 94 | "friendsofphp/php-cs-fixer": "~1.9", |
| 96 | "m6web/redis-mock": "^2.0" | 95 | "m6web/redis-mock": "^2.0" |