Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 13:24:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'upgrade-sf3' of https://framagit.org/Chill-project/Chill-Main into upgrade-sf3

Browse Source 
merge...
This commit is contained in:
nobohan 2018-04-03 17:30:58 +02:00
commit 0ed17d7b8f
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitlab-ci.yml
View File

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

2
Export/Formatter/SpreadSheetFormatter.php
View File

@ -23,7 +23,7 @@ use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Chill\MainBundle\Export\ExportManager; use Chill\MainBundle\Export\ExportManager;
use Symfony\Component\Form\Extension\Core\Type\FormType; 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; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
/** /**

2
composer.json
View File

@ -39,7 +39,7 @@
"champs-libres/composer-bundle-migration": "~1.0", "champs-libres/composer-bundle-migration": "~1.0",
"doctrine/doctrine-migrations-bundle": "~1.1", "doctrine/doctrine-migrations-bundle": "~1.1",
"doctrine/migrations": "~1.0", "doctrine/migrations": "~1.0",
"phpoffice/phpspreadsheet": "dev-develop#9e835676a6a2df9f7e445a28d4d89f6bd296a7c5@dev", "phpoffice/phpspreadsheet": "~1.2",
"sensio/distribution-bundle": "^5.0" "sensio/distribution-bundle": "^5.0"
}, },
"require-dev": { "require-dev": {