Merge branch '1.1.x'

doctrine · Apr 18, 2014 · f0574f7 · f0574f7
2 parents 9079d56 + f57b098
commit f0574f7
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,14 +4,21 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
+
+matrix:
+  allow_failures:
+    - php: 5.6
 
 env:
   - MONGO_VERSION=1.2.12
   - MONGO_VERSION=1.3.2
-  - MONGO_VERSION=1.4.4
+  - MONGO_VERSION=1.3.7
+  - MONGO_VERSION=1.4.5
+  - MONGO_VERSION=1.5.1
 
 services: mongodb
 
 before_script:
-  - pecl -q install -f mongo-${MONGO_VERSION} && echo "extension=mongo.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+  - yes '' | pecl -q install -f mongo-${MONGO_VERSION} && echo "extension=mongo.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
   - composer install --dev --no-interaction --prefer-source