diff --git a/.circleci/config.yml b/.circleci/config.yml index e9e41c2c..d44fb607 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,7 +19,6 @@ commands: - restore_cache: keys: - *composer-cache - - run: composer global require "hirak/prestissimo:^0.3" install-dependencies: steps: - run: composer install -n --prefer-dist @@ -31,17 +30,16 @@ commands: parameters: project: type: string - default: 'drupal/recommended-project:^8.8@alpha' + default: 'drupal/recommended-project' steps: - run: composer create-project << parameters.project >> /tmp/drupal --no-interaction --prefer-dist --ignore-platform-reqs - - run: composer require zaporylie/composer-drupal-optimizations:^1.1 --dev --working-dir=/tmp/drupal local-require: steps: - run: name: Add as local command: | cd /tmp/drupal - composer require --dev drupal/core-dev:^8.8 + composer require --dev drupal/core-dev:^9.0 composer config repositories.1 '{"type": "path", "url": "'${CIRCLE_WORKING_DIRECTORY}'", "options": { "symlink": false }}' composer require --dev mglaman/phpstan-drupal "*" cat composer.json diff --git a/.travis.yml b/.travis.yml index 64d99c5a..f579ec5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,11 @@ language: php php: - - "7.2" - "7.3" - "7.4" install: - composer install --no-interaction - - COMPOSER_MEMORY_LIMIT=-1 composer create-project drupal-composer/drupal-project:8.x-dev $TRAVIS_BUILD_DIR/../drupal --no-interaction --no-progress + - COMPOSER_MEMORY_LIMIT=-1 composer create-project drupal/recommended-project $TRAVIS_BUILD_DIR/../drupal --no-interaction --no-progress script: # Inspections - ./vendor/bin/phpcs src diff --git a/composer.json b/composer.json index 274e65ed..da82d713 100644 --- a/composer.json +++ b/composer.json @@ -19,11 +19,12 @@ "require-dev": { "phpstan/phpstan-strict-rules": "^0.12.0", "squizlabs/php_codesniffer": "^3.3", - "phpunit/phpunit": "^7.5", + "phpunit/phpunit": "^8.4.1 || ^9", "phpstan/phpstan-deprecation-rules": "~0.12.0", "composer/installers": "^1.6", - "drupal/core-recommended": "^8.8@alpha", - "drush/drush": "^9.6" + "drupal/core-recommended": "^9.0", + "drupal/core-dev": "^9.0", + "drush/drush": "^10.0" }, "minimum-stability": "dev", "prefer-stable": true,