From c8077ac575cbc306f7aa3aae0d09b41c539c4a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 5 Jan 2016 14:04:45 +0100
Subject: [PATCH] allow php 7 a force symfony 2.8

---
 .gitlab-ci.yml | 4 +++-
 composer.json  | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7cbda4176..eeec0d2a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,9 @@ before_script:
 
 test:php-5.6:
    stage: test
+   image: chill/ci-image:php-5.6
    script: phpunit --testdox
 test:php-7:
    stage: test
-   script: phpunit --testdox
\ No newline at end of file
+   image: chill/ci-image:php-7
+   script: phpunit --testdox
diff --git a/composer.json b/composer.json
index b468d2762..bc7fff30e 100644
--- a/composer.json
+++ b/composer.json
@@ -22,11 +22,11 @@
         }
     ],
     "require": {
-        "php": "~5.5",
+        "php": "~5.5|~7.0",
         "twig/extensions": "~1.0",
         "symfony/assetic-bundle": "~2.3",
         "symfony/monolog-bundle": "~2.4",
-        "symfony/framework-bundle": "~2.7",
+        "symfony/framework-bundle": "~2.8",
         "symfony/yaml": "~2.7",
         "symfony/symfony": "~2.7",
         "doctrine/dbal": "~2.5",