From 2c488fd3a12915f4083ca0e34c7e90917dc09ccb Mon Sep 17 00:00:00 2001 From: Florian Weber Date: Mon, 24 Jan 2022 23:20:45 +0100 Subject: [PATCH 1/5] Update composer.json for composer 2.x with allow-plugins and remove zaporylie/composer-drupal-optimizations --- composer.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 3c6ae9111b..4b7218a714 100644 --- a/composer.json +++ b/composer.json @@ -26,8 +26,7 @@ "webflo/drupal-finder": "^1.2" }, "require-dev": { - "drupal/core-dev": "^9.3", - "zaporylie/composer-drupal-optimizations": "^1.2" + "drupal/core-dev": "^9.3" }, "conflict": { "drupal/drupal": "*" @@ -36,7 +35,12 @@ "prefer-stable": true, "config": { "discard-changes": true, - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "composer/installers": true, + "cweagans/composer-patches": true, + "drupal/core-composer-scaffold": true + } }, "autoload": { "classmap": [ From beb4dd96f9d3a0d12cbb0541292ad8c8d8d6823c Mon Sep 17 00:00:00 2001 From: Florian Weber Date: Fri, 1 Jul 2022 10:16:33 +0200 Subject: [PATCH 2/5] Bump to Drupal 9.4 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 4b7218a714..715a35e94e 100644 --- a/composer.json +++ b/composer.json @@ -19,14 +19,14 @@ "php": ">=7.4", "composer/installers": "^1.9", "cweagans/composer-patches": "^1.7", - "drupal/core-composer-scaffold": "^9.3", - "drupal/core-recommended": "^9.3", - "drush/drush": "^10.6", + "drupal/core-composer-scaffold": "^9.4", + "drupal/core-recommended": "^9.4", + "drush/drush": "^11.0", "vlucas/phpdotenv": "^5.1", "webflo/drupal-finder": "^1.2" }, "require-dev": { - "drupal/core-dev": "^9.3" + "drupal/core-dev": "^9.4" }, "conflict": { "drupal/drupal": "*" From 61d1e8bb202a4c1e076a1e4b3d042ae86c280e0b Mon Sep 17 00:00:00 2001 From: Florian Weber Date: Fri, 1 Jul 2022 10:18:13 +0200 Subject: [PATCH 3/5] Allow dealerdirect/phpcodesniffer-composer-installer by default --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 715a35e94e..15561eea1b 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,8 @@ "allow-plugins": { "composer/installers": true, "cweagans/composer-patches": true, - "drupal/core-composer-scaffold": true + "drupal/core-composer-scaffold": true, + "dealerdirect/phpcodesniffer-composer-installer": true } }, "autoload": { From 7ed1e4f3006375cc4918ad24ad8b1ec16d61434e Mon Sep 17 00:00:00 2001 From: Florian Weber Date: Fri, 1 Jul 2022 10:20:19 +0200 Subject: [PATCH 4/5] Test PHP 7.4 and 8.1 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f83c0f4c06..669bb18ef4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,14 +13,14 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['7.4', '8.0'] + php-versions: ['7.4', '8.1'] drupal-release: ['stable'] composer-channel: ['stable'] include: - - php-versions: '8.0' + - php-versions: '8.1' drupal-release: dev composer-channel: stable - - php-versions: '8.0' + - php-versions: '8.1' drupal-release: stable composer-channel: snapshot steps: @@ -64,7 +64,7 @@ jobs: # https://www.drupal.org/project/drupal/issues/3182653 # https://www.drupal.org/node/3176567 - - if: ${{ matrix.php-versions == '7.4' }} || ${{ matrix.php-versions == '8.0' }} + - if: ${{ matrix.php-versions == '7.4' }} || ${{ matrix.php-versions == '8.1' }} run: composer require phpspec/prophecy-phpunit:^2 - name: Run a single unit test to verfiy the testing setup. From 137b38fa130fe801dafaac91114b3c30bd9c02c0 Mon Sep 17 00:00:00 2001 From: Vincent Leduc Date: Wed, 6 Jul 2022 07:49:21 -0400 Subject: [PATCH 5/5] Update php requirements in README.md php 7.4 is minimum required version of php with respect to Drupal 9.4 and drush 11. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 93c66aea64..2425542697 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ section of composer.json: ### How do I specify a PHP version ? -This project supports PHP 7.3 as minimum version (see [Environment requirements of Drupal 9](https://www.drupal.org/docs/understanding-drupal/how-drupal-9-was-made-and-what-is-included/environment-requirements-of)), however it's possible that a `composer update` will upgrade some package that will then require PHP 7.3+. +This project supports PHP 7.4 as minimum version (see Drupal 9.4 [PHP requirements](https://www.drupal.org/docs/system-requirements/php-requirements#versions)) and [Drop official PHP 7.3 support in Drupal 9.4](https://www.drupal.org/project/drupal/issues/2917655), however it's possible that a `composer update` will upgrade some package that will then require PHP 7.4+. To prevent this you can add this code to specify the PHP version you want to use in the `config` section of `composer.json`: @@ -131,7 +131,7 @@ To prevent this you can add this code to specify the PHP version you want to use "config": { "sort-packages": true, "platform": { - "php": "7.3.19" + "php": "7.4.30" } }, ```