From 6ec3889fadddf663a27e41e74e017d0c9857fb44 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Tue, 23 May 2023 09:40:00 +0100
Subject: [PATCH] Issue #3361983 by effulgentsia, smustgrave: Remove
psr/http-message from drupal/core-recommended
(cherry picked from commit 0afc34853c3255db6cfe243930afefb5542421d6)
---
.../Generator/Builder/DrupalCoreRecommendedBuilder.php | 10 +++++++++-
composer/Metapackage/CoreRecommended/composer.json | 1 -
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/composer/Generator/Builder/DrupalCoreRecommendedBuilder.php b/composer/Generator/Builder/DrupalCoreRecommendedBuilder.php
index 216550f05de7..28d543a44a07 100644
--- a/composer/Generator/Builder/DrupalCoreRecommendedBuilder.php
+++ b/composer/Generator/Builder/DrupalCoreRecommendedBuilder.php
@@ -30,7 +30,15 @@ public function getPackage() {
}
// Make a list of packages we do not want to put in the 'require' section.
- $remove_list = ['drupal/core', 'wikimedia/composer-merge-plugin', 'composer/installers'];
+ $remove_list = [
+ 'drupal/core',
+ 'wikimedia/composer-merge-plugin',
+ 'composer/installers',
+ // This package contains no code other than interfaces, so allow sites
+ // to use any compatible version without needing to switch off of
+ // drupal/core-recommended.
+ 'psr/http-message',
+ ];
// Copy the 'packages' section from the Composer lock into our 'require'
// section. There is also a 'packages-dev' section, but we do not need
diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json
index f25354b81006..0feecd23bb75 100644
--- a/composer/Metapackage/CoreRecommended/composer.json
+++ b/composer/Metapackage/CoreRecommended/composer.json
@@ -28,7 +28,6 @@
"psr/event-dispatcher": "~1.0.0",
"psr/http-client": "~1.0.2",
"psr/http-factory": "~1.0.2",
- "psr/http-message": "~2.0",
"psr/log": "~3.0.0",
"ralouphie/getallheaders": "~3.0.3",
"sebastian/diff": "~4.0.4",
--
GitLab