From: Jeremy Benoist <j0k3r@users.noreply.github.com>
Date: Mon, 21 Nov 2016 08:01:35 +0000 (+0100)
Subject: Merge pull request #2623 from wallabag/composer-php-5.5
X-Git-Tag: 2.1.5~2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=e839f87a1ceff1402a08c5ef1518e055eb06955f;hp=cb1a6590c0e58c56d0612066501b3a586b103ed5;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #2623 from wallabag/composer-php-5.5

Force composer to run as PHP 5.5.9
---

diff --git a/composer.json b/composer.json
index 4f7ad291..70f5fc99 100644
--- a/composer.json
+++ b/composer.json
@@ -88,7 +88,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"
@@ -125,7 +125,10 @@
         "psr-4": { "Tests\\": "tests/" }
     },
     "config": {
-        "bin-dir": "bin"
+        "bin-dir": "bin",
+        "platform": {
+            "php": "5.5.9"
+        }
     },
     "minimum-stability": "dev",
     "prefer-stable": true