From 50e5242176e03ec04feb989008c4d4691c92c7c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 20 Jun 2017 15:21:29 +0200
Subject: [PATCH] update phpunit to last version and internal packages

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0164ffc9f..83a9d555a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,11 +19,12 @@ stages:
 test:php-5.6:
     stage: test
     <<: *test_definition
-    script: phpunit
+    script: php vendor/bin/phpunit
+    allow_failure: true
 test:php-7:
     stage: test
     <<: *test_definition
-    script: phpunit
+    script: php vendor/bin/phpunit
 
 
 deploy-packagist:    
diff --git a/composer.json b/composer.json
index 0ab304810..308b64699 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,8 @@
         "chill-project/person": "dev-master@dev",
         "champs-libres/composer-bundle-migration": "~1.0",
         "doctrine/doctrine-migrations-bundle": "~1.1",
-        "doctrine/migrations": "~1.0@dev"       
+        "doctrine/migrations": "~1.0@dev",
+        "phpunit/phpunit": "^6.2"       
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2",