Merge remote-tracking branch 'origin/master' into 2.2

[github/wallabag/wallabag.git] / composer.json

diff --git a/composer.json b/composer.json
index 6d7a7adf5d7b69c6a3e0bbe7f5136a925a39916c..1548d6ec60db32bfcd912380e426f4e51d844326 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -89,7 +89,7 @@
         "doctrine/doctrine-fixtures-bundle": "~2.2",
         "doctrine/data-fixtures": "~1.1.1",
         "sensio/generator-bundle": "^3.0",
-        "phpunit/phpunit": "~5.0",
+        "phpunit/phpunit": "~4.0",
         "symfony/phpunit-bridge": "^3.0",
         "friendsofphp/php-cs-fixer": "~1.9",
         "m6web/redis-mock": "^2.0"
@@ -128,7 +128,10 @@
         "psr-4": { "Tests\\": "tests/" }
     },
     "config": {
-        "bin-dir": "bin"
+        "bin-dir": "bin",
+        "platform": {
+            "php": "5.5.9"
+        }
     },
     "minimum-stability": "dev",
     "prefer-stable": true