diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-21 15:15:30 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-21 15:15:30 +0100 |
| commit | eb2d613c3ed95d741e987917f976da349ea240eb (patch) | |
| tree | 589ebf10ebf557e6fb4d8524f08f13dacfc92ff2 /composer.json | |
| parent | a38d50e1e8a6ff509852b2fee8cd94d79aea7919 (diff) | |
| parent | 625bb561813222aea8a7a2e84e30e9f9de697017 (diff) | |
| download | wallabag-eb2d613c3ed95d741e987917f976da349ea240eb.tar.gz wallabag-eb2d613c3ed95d741e987917f976da349ea240eb.tar.zst wallabag-eb2d613c3ed95d741e987917f976da349ea240eb.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/composer.json b/composer.json index 6d7a7adf..1548d6ec 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -89,7 +89,7 @@ | |||
| 89 | "doctrine/doctrine-fixtures-bundle": "~2.2", | 89 | "doctrine/doctrine-fixtures-bundle": "~2.2", |
| 90 | "doctrine/data-fixtures": "~1.1.1", | 90 | "doctrine/data-fixtures": "~1.1.1", |
| 91 | "sensio/generator-bundle": "^3.0", | 91 | "sensio/generator-bundle": "^3.0", |
| 92 | "phpunit/phpunit": "~5.0", | 92 | "phpunit/phpunit": "~4.0", |
| 93 | "symfony/phpunit-bridge": "^3.0", | 93 | "symfony/phpunit-bridge": "^3.0", |
| 94 | "friendsofphp/php-cs-fixer": "~1.9", | 94 | "friendsofphp/php-cs-fixer": "~1.9", |
| 95 | "m6web/redis-mock": "^2.0" | 95 | "m6web/redis-mock": "^2.0" |
| @@ -128,7 +128,10 @@ | |||
| 128 | "psr-4": { "Tests\\": "tests/" } | 128 | "psr-4": { "Tests\\": "tests/" } |
| 129 | }, | 129 | }, |
| 130 | "config": { | 130 | "config": { |
| 131 | "bin-dir": "bin" | 131 | "bin-dir": "bin", |
| 132 | "platform": { | ||
| 133 | "php": "5.5.9" | ||
| 134 | } | ||
| 132 | }, | 135 | }, |
| 133 | "minimum-stability": "dev", | 136 | "minimum-stability": "dev", |
| 134 | "prefer-stable": true | 137 | "prefer-stable": true |