From db0d8d63b6ad74e18a3ac20f5a35745ed2cb3627 Mon Sep 17 00:00:00 2001 From: David Maicher Date: Wed, 4 Jan 2017 20:05:04 +0100 Subject: [PATCH] changes for 1.x branch: do not allow phpunit 6 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7ebf61a..a3b343d 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "symfony/symfony": "~2.3|~3.0", "doctrine/dbal": "~2.5", "doctrine/doctrine-bundle": "~1.4", - "phpunit/phpunit": "~4.1|~5.0|~6.0" + "phpunit/phpunit": "~4.1|~5.0" }, "autoload": { "psr-4": { @@ -27,7 +27,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.1.x-dev" } } }