From ef60f173820b0455bdc00827f6e6a5fa7b38d8b5 Mon Sep 17 00:00:00 2001 From: William DURAND Date: Fri, 11 Jan 2013 19:13:11 +0100 Subject: [PATCH 1/2] Adjust composer constraints --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 6f4e847..ff0049a 100644 --- a/composer.json +++ b/composer.json @@ -9,11 +9,11 @@ "email": "william.durand1@gmail.com" }], "require": { - "symfony/symfony": ">=2.1,<2.3-dev", - "propel/propel1": "1.6.*" + "symfony/symfony": "~2.1.0", + "propel/propel1": "~1.6.0" }, "require-dev": { - "sensio/framework-extra-bundle": ">=2.1", + "sensio/framework-extra-bundle": "~2.1.0", "fzaninotto/faker": "dev-master" }, "autoload": { From 81c940b4e6c2ddc24ea4cbc1cc2041dd1f31ed8c Mon Sep 17 00:00:00 2001 From: William DURAND Date: Fri, 11 Jan 2013 21:47:45 +0100 Subject: [PATCH 2/2] Remove useless env variable in travis config --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06fd4a5..f46c985 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,6 @@ matrix: allow_failures: - php: 5.5 -env: - - SYMFONY_VERSION=origin/master - before_script: - curl -s http://getcomposer.org/installer | php - php composer.phar --dev install