Use latest versions & small improvements

Author: wouterj

.travis.yml

@@ -15,30 +15,31 @@ cache:
     - $HOME/.composer/cache
 
 env:
-  - SYMFONY_VERSION=2.6.* PACKAGE_VERSION=high
+  - SYMFONY_VERSION=2.7.* SYMFONY_DEPRECATIONS_HELPER=weak
 
 matrix:
   include:
     - php: 5.6
-      env: SYMFONY_VERSION=2.3.* PACKAGE_VERSION=high
+      env: SYMFONY_VERSION=2.3.*
     - php: 5.6
-      env: SYMFONY_VERSION=2.5.* PACKAGE_VERSION=high
+      env: SYMFONY_VERSION=2.6.*
     - php: 5.3
-      env: SYMFONY_VERSION=2.3.* PACKAGE_VERSION=low
+      env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
   allow_failures:
     - php: 5.6
-      env: SYMFONY_VERSION=2.7.* PACKAGE_VERSION=high
+      env: SYMFONY_VERSION=2.8.*
     - php: 5.6
-      env: SYMFONY_VERSION=3.0.*@dev PACKAGE_VERSION=high
+      env: SYMFONY_VERSION=3.0.*@dev
     - php: nightly
 
-before_script:
+before_install:
   - if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
   - composer self-update
   - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
-  - if [[ "$PACKAGE_VERSION" == "high" ]]; then composer update --prefer-source; fi
-  - if [[ "$PACKAGE_VERSION" == "low" ]]; then composer update --prefer-lowest --prefer-source; fi
-  - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
+  
+install: composer update --prefer-source $COMPOSER_FLAGS
+
+before_script: vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
 
 script: phpunit --coverage-text