From 52b3e0547852ae3e2d3cbd11f15d4906212cf74e Mon Sep 17 00:00:00 2001 From: phenaproxima <phenaproxima@205645.no-reply.drupal.org> Date: Thu, 14 Apr 2022 15:16:58 +0000 Subject: [PATCH] Issue #3275256 by phenaproxima: Raise the minimum required version of Composer to 2.3.5 --- composer.json | 10 ++-------- drupalci.yml | 2 +- .../src/Validator/ComposerExecutableValidator.php | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 39bd124972..4e4fb70d26 100644 --- a/composer.json +++ b/composer.json @@ -14,17 +14,11 @@ "ext-json": "*", "drupal/core": "^9.2", "php-tuf/composer-stager": "0.3.0", - "composer/composer": "^2" + "composer/composer": "^2.2.12 || ^2.3.5" }, "config": { "platform": { "php": "7.3.0" } - }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/php-tuf/composer-stager" - } - ] + } } diff --git a/drupalci.yml b/drupalci.yml index 8fac0e8b1e..83aee2d764 100644 --- a/drupalci.yml +++ b/drupalci.yml @@ -43,7 +43,7 @@ build: # to work correctly, and disabling it is a known workaround. # @see pcre.ini - sudo cp modules/contrib/automatic_updates/pcre.ini /usr/local/etc/php/conf.d - - composer self-update 2.2.4 + - composer self-update 2.3.5 halt-on-fail: true # run_tests task is executed several times in order of performance speeds. # halt-on-fail can be set on the run_tests tasks in order to fail fast. diff --git a/package_manager/src/Validator/ComposerExecutableValidator.php b/package_manager/src/Validator/ComposerExecutableValidator.php index 06c7104e22..410c747b46 100644 --- a/package_manager/src/Validator/ComposerExecutableValidator.php +++ b/package_manager/src/Validator/ComposerExecutableValidator.php @@ -25,7 +25,7 @@ class ComposerExecutableValidator implements PreOperationStageValidatorInterface * * @var string */ - public const MINIMUM_COMPOSER_VERSION = '2.2.4'; + public const MINIMUM_COMPOSER_VERSION = '2.3.5'; /** * The Composer runner. -- GitLab