From 5b4dcb90133acb147f44828736ad16deedf214ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 3 Apr 2018 12:45:59 +0200
Subject: [PATCH 1/2] upgrade php-office to last stable version

---
 Export/Formatter/SpreadSheetFormatter.php | 2 +-
 composer.json                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Export/Formatter/SpreadSheetFormatter.php b/Export/Formatter/SpreadSheetFormatter.php
index 45cd35d66..fcd7e8ad6 100644
--- a/Export/Formatter/SpreadSheetFormatter.php
+++ b/Export/Formatter/SpreadSheetFormatter.php
@@ -23,7 +23,7 @@ use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Export\ExportManager;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
-use PhpOffice\PhpSpreadsheet\Worksheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
 /**
diff --git a/composer.json b/composer.json
index fbeab3497..5dea8e5f2 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
         "champs-libres/composer-bundle-migration": "~1.0",
         "doctrine/doctrine-migrations-bundle": "~1.1",
         "doctrine/migrations": "~1.0",
-        "phpoffice/phpspreadsheet": "dev-develop#9e835676a6a2df9f7e445a28d4d89f6bd296a7c5@dev",
+        "phpoffice/phpspreadsheet": "~1.2",
         "sensio/distribution-bundle": "^5.0"
     },
     "require-dev": {

From 08141fddeef107fa32b8e1955e4dd591967e0469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 3 Apr 2018 12:49:08 +0200
Subject: [PATCH 2/2] upgrade gitlab-ci to run test only on php 7.2

---
 .gitlab-ci.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 840991582..b1af21fb0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,11 +17,6 @@ stages:
    - deploy-doc
  
     
-test:php-7:
-    stage: test
-    <<: *test_definition
-    image: chill/ci-image:php-7
-    script: vendor/bin/phpunit
 
 test:php-7.1:
     stage: test
@@ -29,11 +24,17 @@ test:php-7.1:
     image: chill/ci-image:php-7.1
     script: vendor/bin/phpunit
 
+test:php-7.2:
+    stage: test
+    <<: *test_definition
+    image: chill/ci-image:php-7.2
+    script: vendor/bin/phpunit
+
 # deploy documentation
 api-doc-build:
    stage: build-doc
    environment: api-doc
-   image: chill/ci-image:php-7
+   image: chill/ci-image:php-7.2
    before_script:
       - mkdir api-doc
    script: apigen generate --destination api-doc/$CI_BUILD_REF_NAME/$CI_PROJECT_NAME
@@ -62,7 +63,7 @@ api-doc-deploy:
       
 deploy-packagist:    
     stage: deploy    
-    image: chill/ci-image:php-7    
+    image: chill/ci-image:php-7.2    
     before_script:        
         # test that PACKAGIST USERNAME and PACKAGIST_TOKEN variable are set        
         - if [ -z ${PACKAGIST_USERNAME+x} ]; then echo "Please set PACKAGIST_USERNAME variable"; exit -1;  fi