From cf757e4d4b12435b8603ca151c3fd249f47b3f5e Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Tue, 17 Nov 2015 10:57:15 +0100
Subject: [PATCH] Improve the Travis setup

---
 .travis.yml   | 25 +++++++++++++------------
 composer.json | 14 ++++++--------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3bdd5dc5..5cb3e44f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ language: php
 
 cache:
     directories:
-        - $HOME/.composer/cache
+        - $HOME/.composer/cache/files
 
 php:
   - 5.3
@@ -17,25 +17,26 @@ matrix:
   fast_finish: true
   include:
     - php: 5.3
-      env: deps="low"
+      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
+    # Test against Symfony LTS versions
     - php: 5.6
-      env: SYMFONY_VERSION="2.3.x"
+      env: SYMFONY_VERSION="2.3.*"
     - php: 5.6
-      env: SYMFONY_VERSION="2.6.x"
+      env: SYMFONY_VERSION="2.7.*"
     - php: 5.6
-      env: SYMFONY_VERSION="2.7.x"
+      env: SYMFONY_VERSION="2.8.*" DEPENDENCIES=dev
+    # Test against dev versions
     - php: 5.6
-      env: SYMFONY_VERSION="2.8.x-dev"
-    - php: 5.6
-      env: SYMFONY_VERSION="3.0.x-dev"
+      env: DEPENDENCIES=dev
   allow_failures:
-    - env: SYMFONY_VERSION="3.0.x-dev"
+    - env: DEPENDENCIES=dev
 
 before_install:
-    - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony:"$SYMFONY_VERSION"; fi
     - composer self-update
+    - if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
+    - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony:"$SYMFONY_VERSION"; fi
 
 install:
-    - if [ "$deps" = "low" ]; then composer update --prefer-lowest --prefer-stable; else composer install; fi
+    - composer update $COMPOSER_FLAGS
 
-script: phpunit --coverage-text
+script: phpunit -v --coverage-text
diff --git a/composer.json b/composer.json
index 412fa764..d87302b7 100644
--- a/composer.json
+++ b/composer.json
@@ -17,18 +17,16 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/monolog-bridge": "~2.3|3.*",
-        "symfony/dependency-injection": "~2.3|3.*",
-        "symfony/config": "~2.3|3.*",
-        "symfony/http-kernel": "~2.3|3.*",
+        "symfony/monolog-bridge": "~2.3|~3.0",
+        "symfony/dependency-injection": "~2.3|~3.0",
+        "symfony/config": "~2.3|~3.0",
+        "symfony/http-kernel": "~2.3|~3.0",
         "monolog/monolog": "~1.8"
     },
     "require-dev": {
-        "symfony/yaml": "~2.3",
-        "symfony/console": "~2.3|3.*"
+        "symfony/yaml": "~2.3|~3.0",
+        "symfony/console": "~2.3|~3.0"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "autoload": {
         "psr-4": { "Symfony\\Bundle\\MonologBundle\\": "" }
     },