From 38a3531306b83ba9c6ad7e1feeb5b884fbf497f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <bburnichon@alchemy.fr>
Date: Mon, 30 Nov 2015 15:58:47 +0100
Subject: [PATCH] Update travis environment and bump composer.lock

---
 .travis.yml   | 6 ++++++
 composer.lock | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 36be727185..563afcf4bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,25 @@
 language: php
+sudo: require
 env:
   - SETUP_MODE=update TEST_SUITE=1
   - SETUP_MODE=update TEST_SUITE=2
   - SETUP_MODE=install TEST_SUITE=1
   - SETUP_MODE=install TEST_SUITE=2
+
 php:
   - 5.5
   - 5.6
+  - 7.0
 matrix:
   fast_finish: true
+  allow_failures:
+    - php: 7.0
 services:
   - mysql
   - memcached
   - redis
 before_install:
+  - phpenv config-rm xdebug.ini
   - composer self-update --no-progress --no-interaction
   - sudo apt-get purge elasticsearch
   - curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.6.0.deb && sudo dpkg -i --force-confnew elasticsearch-1.6.0.deb
diff --git a/composer.lock b/composer.lock
index 11d66c50ad..8c4ad61525 100644
--- a/composer.lock
+++ b/composer.lock
@@ -480,7 +480,7 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/alchemy-fr/symfony-cors",
-                "reference": "072bfac17eb9a25b8a4d6ddafef8823e2b8df0fd"
+                "reference": "8aafaff26e29fdd57358062d20724109a349def5"
             },
             "require": {
                 "symfony/http-kernel": "^2.3.0|^3.0.0"
@@ -517,7 +517,7 @@
                 }
             ],
             "description": "A library that adds CORS services to Silex/Symfony Applications",
-            "time": "2015-11-20 14:57:34"
+            "time": "2015-11-20 17:55:08"
         },
         {
             "name": "alchemy/task-manager",