From ed15b0d744ad0d424a0d0d5f420946205d6d452a Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Thu, 31 Mar 2016 12:14:31 +0200 Subject: [PATCH 1/2] prepare 1.3 relase --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 753cb7d..d70f9c0 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ }, "require-dev": { "twig/twig": "^1.12|^2.0", - "symfony-cmf/testing": "^1.3@RC", + "symfony-cmf/testing": "^1.3", "doctrine/phpcr-odm": "^1.3", "doctrine/annotations": "^1.1.2", "jms/serializer-bundle": "^0.12|^1.0", From 43c3c66faef0e2c5d4ecce25c05d7ab97ee7657f Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Thu, 31 Mar 2016 15:17:10 +0200 Subject: [PATCH 2/2] help composer find a dev solution --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0a9ee55..7c16ac1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ env: matrix: include: - php: 5.6 - env: DEPS=dev + env: DEPS=dev SYMFONY_VERSION=2.8.* - php: 5.3 env: COMPOSER_FLAGS="--prefer-lowest" - php: 5.6