From 20dd519d0e1e7dfa8810f1f35d893c1755389d70 Mon Sep 17 00:00:00 2001 From: joschi127 <127.joschi@gmail.com> Date: Sat, 11 Oct 2014 08:47:51 +0000 Subject: [PATCH 1/2] Symfony 2.5 support, using ~2.4 in composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1b77fd8..11ebc24 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "minimum-stability": "dev", "require": { "php": ">=5.3.3", - "symfony/symfony": "2.4.*", + "symfony/symfony": "~2.4", "doctrine/orm": "~2.2,>=2.2.3", "doctrine/doctrine-bundle": "~1.2", "knplabs/knp-paginator-bundle": "2.4.*" From 437606b08aea603cf75ce724d39a15b313ec8aaf Mon Sep 17 00:00:00 2001 From: joschi127 <127.joschi@gmail.com> Date: Sat, 11 Oct 2014 14:41:51 +0000 Subject: [PATCH 2/2] Added "prefer-stable": true to composer.json Without this it is currently broken and I cannot successfully run the tests with Symfony 2.5. Fails on doctrine:database:create. --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 11ebc24..64cb95d 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,7 @@ } ], "minimum-stability": "dev", + "prefer-stable": true, "require": { "php": ">=5.3.3", "symfony/symfony": "~2.4",