From 92d299764f176799ea24fad5cc09bbcd00e6dc33 Mon Sep 17 00:00:00 2001 From: EdwinLove Date: Tue, 6 May 2014 12:14:44 +0100 Subject: [PATCH 1/2] Update allowed symphony process version so it will work with admin --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 34ad67c..ee3ffaf 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/process": "2.2.*" + "symfony/process": ">=2.2,<=2.4" }, "suggest": { "symfony/filesystem": "Allows using Symfony Filesystem" From 27b2a383d2bd4c286fca23bdd1cc26ac1d49f729 Mon Sep 17 00:00:00 2001 From: EdwinLove Date: Tue, 6 May 2014 12:16:59 +0100 Subject: [PATCH 2/2] Update travis to allow for symfony 2.4 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7e87e36..1c9d215 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ php: env: - SYMFONY_VERSION="2.2.*" - SYMFONY_VERSION="2.3.*" + - SYMFONY_VERSION="2.4.*" before_script: - curl -s http://getcomposer.org/installer | php