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

2016-11-21 15:15:30 +01:00
parent a38d50e1e8 625bb56181
commit eb2d613c3e
3 changed files with 14 additions and 4 deletions
--- 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