diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c12f26838..0c1f9aad2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,17 +18,18 @@ stages: - build-doc - deploy-doc -test:php-5.6: - stage: test - image: chill/ci-image:php-5.6 - <<: *test_definition - script: phpunit test:php-7: stage: test image: chill/ci-image:php-7 <<: *test_definition - script: phpunit + script: vendor/bin/phpunit +test:php-71: + stage: test + image: chill/ci-image:php-7.1 + <<: *test_definition + script: vendor/bin/phpunit + deploy-packagist: stage: deploy image: chill/ci-image:php-7 @@ -44,10 +45,11 @@ deploy-packagist: api-doc-build: stage: build-doc environment: api-doc - image: chill/ci-image:php-7 + image: chill/ci-image:php-7.1 before_script: - mkdir api-doc - script: apigen generate --destination api-doc/$CI_BUILD_REF_NAME/$CI_PROJECT_NAME + - composer require apigen/apigen + script: vendor/bin/apigen generate --destination api-doc/$CI_BUILD_REF_NAME/$CI_PROJECT_NAME artifacts: paths: - "api-doc/" diff --git a/composer.json b/composer.json index 1267a11ff..44d167139 100644 --- a/composer.json +++ b/composer.json @@ -25,13 +25,15 @@ "twig/extensions": "~1.0", "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", - "sensio/distribution-bundle": "~3.0", + "sensio/distribution-bundle": "~5.0", "sensio/framework-extra-bundle": "~3.0", "champs-libres/composer-bundle-migration": "~1.0", "doctrine/doctrine-migrations-bundle": "~1.1", - "doctrine/migrations": "~1.0@dev", + "doctrine/migrations": "~1.0", "symfony/monolog-bundle": "^2.7", - "chill-project/main": "dev-master" + "chill-project/main": "dev-master@dev", + "phpoffice/phpspreadsheet": "dev-develop#9e835676a6a2df9f7e445a28d4d89f6bd296a7c5@dev", + "phpunit/phpunit": "^6.2" }, "require-dev": { "chill-project/person": "dev-master@dev", @@ -40,20 +42,14 @@ }, "scripts": { "post-install-cmd": [ + "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap" ], "post-update-cmd": [ + "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap" ] }, - "scripts": { - "post-install-cmd": [ - "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations" - ], - "post-update-cmd": [ - "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations" - ] - }, "extra": { "symfony-app-dir": "Tests/Fixtures/App/app", "app-migrations-dir": "Tests/Fixtures/App/app/DoctrineMigrations"