From 82cd4b809a63924908b0b781868781ef352d6869 Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Wed, 30 Aug 2017 12:14:53 +0200
Subject: [PATCH] Update build matrix to include recent symfony versions

---
 .travis.yml   | 31 ++++++++++++++++++++++---------
 README.md     |  2 +-
 composer.json | 14 +++++++-------
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4866274..3031185 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,8 @@ language: php
 php:
   - 5.5
   - 5.6
-  - 7
-  - hhvm
-
-matrix:
-  allow_failures:
-    - php: hhvm
+  - 7.0
+  - 7.1
 
 sudo: false
 
@@ -17,9 +13,26 @@ cache:
     - $HOME/.composer/cache/files
 
 env:
-  - SYMFONY_VERSION='2.8.*'
-  - SYMFONY_VERSION='3.0.*'
-  - SYMFONY_VERSION='3.1.*'
+  - SYMFONY_VERSION='3.3.*'
+
+matrix:
+  include:
+    - php: 5.5
+      env:
+        - COMPOSER_FLAGS="--prefer-lowest"
+        - SYMFONY_VERSION='2.8.*'
+    - php: 7.1
+      env:
+      env:
+        - SYMFONY_VERSION='2.8.*'
+    - php: 7.1
+      env:
+        - SYMFONY_VERSION='3.1.*'
+    - php: 7.1
+      env:
+        - SYMFONY_VERSION='3.2.*'
+    - php: hhvm
+      dist: trusty
 
 before_install:
   - phpenv config-rm xdebug.ini || true
diff --git a/README.md b/README.md
index ad96208..30568ba 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # LuneticsLocaleBundle
 
-This bundle allows you to guess the Locale from different parameters in your Symfony2 applications.
+This bundle allows you to guess the Locale from different parameters in your Symfony applications.
 
 [![Build Status](https://travis-ci.org/lunetics/LocaleBundle.svg?branch=master)](https://travis-ci.org/lunetics/LocaleBundle)
 
diff --git a/composer.json b/composer.json
index 442ad7b..31c7f86 100644
--- a/composer.json
+++ b/composer.json
@@ -16,17 +16,17 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": ">=5.5.9",
-        "symfony/framework-bundle": "^2.8|^3.0",
-        "symfony/yaml": "^2.8|^3.0",
-        "symfony/intl": "^2.8|^3.0",
-        "symfony/validator": "^2.8|^3.0",
+        "php": "^5.5.9 || ^7.0",
+        "symfony/framework-bundle": "^2.8 || ^3.0",
+        "symfony/yaml": "^2.8 || ^3.0",
+        "symfony/intl": "^2.8 || ^3.0",
+        "symfony/validator": "^2.8 || ^3.0",
         "psr/log": "~1.0"
     },
     "require-dev": {
         "ext-intl": "*",
-        "twig/twig": "1.*|2.*",
-        "symfony/form": "^2.8|^3.0"
+        "twig/twig": "1.* || 2.*",
+        "symfony/form": "^2.8 || ^3.0"
     },
     "suggest": {
         "ext-intl": "Needed for displaying the country name in the locale language"