From 855f4de961b7f2ba2b2415e7dac19a6128bfe52c Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Mon, 1 Feb 2016 14:56:00 +0100
Subject: [PATCH] Calling composer with "update" instead of "install" should
 update the versions referenced in the composer.lock file, instead of blindly
 trying to install them, leading to conflicts.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index af3b7c41e..cd14b9d88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ php:
 matrix:
   allow_failures:
   - php: hhvm
-before_script: composer install --dev
+before_script: composer update --dev
 script: phpunit --configuration tools/phpunit
 after_script:
 - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/bin/coveralls -v; fi
-- 
GitLab