diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b50126097..ea2639b41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,21 +16,15 @@ stages: - build-doc - deploy-doc -test:php-7.1: +test:php-7.2: stage: test - image: chill/ci-image:php-7.1 + image: chill/ci-image:php-7.2 <<: *test_definition script: php vendor/bin/phpunit -test:php-7: - stage: test - image: chill/ci-image:php-7 - <<: *test_definition - script: php vendor/bin/phpunit - 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 @@ -43,7 +37,7 @@ deploy-packagist: 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 diff --git a/composer.json b/composer.json index 5f8613ea6..c528d89e4 100644 --- a/composer.json +++ b/composer.json @@ -19,21 +19,9 @@ } ], "require": { - "twig/extensions": "~1.0", - "symfony/assetic-bundle": "~2.3", - "symfony/framework-bundle": "~2.7", - "symfony/yaml": "~2.7", - "symfony/symfony": "~2.7", - "doctrine/dbal": "~2.5", - "doctrine/orm": "~2.4", - "doctrine/common": "~2.4", - "doctrine/doctrine-bundle": "~1.2", "chill-project/main": "dev-upgrade-sf3@dev", "chill-project/custom-fields": "dev-upgrade-sf3@dev", - "chill-project/person": "dev-upgrade-sf3@dev", - "champs-libres/composer-bundle-migration": "~1.0", - "doctrine/doctrine-migrations-bundle": "~1.1", - "doctrine/migrations": "~1.0" + "chill-project/person": "dev-upgrade-sf3@dev" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~2.2",