From 391ccd0b51ee902ba49ea59f76f973a02431d297 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Fri, 27 Nov 2020 09:44:40 +0100 Subject: [PATCH 1/5] fix: use drupal/recommended-project instead of drupal-composer/drupal-project --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 64d99c5a..92520698 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ php: 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 From f2dd153bdd5e18a90bfe8357035fa60065678b01 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Fri, 27 Nov 2020 09:52:47 +0100 Subject: [PATCH 2/5] fix: skip php7.2 --- .circleci/config.yml | 1 - .travis.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e9e41c2c..7ad65d3e 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 diff --git a/.travis.yml b/.travis.yml index 92520698..f579ec5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: php php: - - "7.2" - "7.3" - "7.4" From 91518517d0bdd9a51f81be70e97945b5a85f4b75 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Fri, 27 Nov 2020 09:59:29 +0100 Subject: [PATCH 3/5] fix: use drupal 9 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7ad65d3e..ae0107f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ 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 @@ -40,7 +40,7 @@ commands: 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 From ce938df63f5b4bf0a5cf1336ddc97522b088b300 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Fri, 27 Nov 2020 10:05:16 +0100 Subject: [PATCH 4/5] fix: newer drupal --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 274e65ed..156e7d7f 100644 --- a/composer.json +++ b/composer.json @@ -19,11 +19,11 @@ "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", + "drush/drush": "^10.0" }, "minimum-stability": "dev", "prefer-stable": true, From 5092e0a8d78f840671fa76686944f474863cc15e Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Fri, 27 Nov 2020 10:10:47 +0100 Subject: [PATCH 5/5] fix: add dev deps --- .circleci/config.yml | 1 - composer.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ae0107f9..d44fb607 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,6 @@ commands: 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: diff --git a/composer.json b/composer.json index 156e7d7f..da82d713 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "phpstan/phpstan-deprecation-rules": "~0.12.0", "composer/installers": "^1.6", "drupal/core-recommended": "^9.0", + "drupal/core-dev": "^9.0", "drush/drush": "^10.0" }, "minimum-stability": "dev",