Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3298396 by andypost, Vighneshh, ameymudras, Spokje: Upgrade composer requirement to 2.3.6 to prevent warnings on PHP 8.2 

(cherry picked from commit f3a0d34cfe)
merge-requests/2566/head
catch 2022-07-27 22:10:18 +09:00
parent ddf7d7c602
commit fe32bc3040
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -18,7 +18,7 @@
"behat/mink": "^1.10",
"behat/mink-browserkit-driver": "^2.1",
"behat/mink-selenium2-driver": "^1.4",
"composer/composer": "^2.3.5",
"composer/composer": "^2.3.6",
"drupal/coder": "^8.3.10",
"instaclick/php-webdriver": "^1.4.1",
"mglaman/phpstan-drupal": "^1.1.25",

21
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "033db7642172d9d3d614ac729ecae9d8",
"content-hash": "4220bd7bcf76fa3b8eeedb29b1e7db08",
"packages": [
{
"name": "asm89/stack-cors",
@ -4272,16 +4272,16 @@
},
{
"name": "composer/composer",
"version": "2.3.5",
"version": "2.3.10",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
"reference": "50c47b1f907cfcdb8f072b88164d22b527557ae1"
"reference": "ebac357c0a41359f3981098729042ed6dedc97ba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/composer/zipball/50c47b1f907cfcdb8f072b88164d22b527557ae1",
"reference": "50c47b1f907cfcdb8f072b88164d22b527557ae1",
"url": "https://api.github.com/repos/composer/composer/zipball/ebac357c0a41359f3981098729042ed6dedc97ba",
"reference": "ebac357c0a41359f3981098729042ed6dedc97ba",
"shasum": ""
},
"require": {
@ -4297,7 +4297,7 @@
"react/promise": "^2.8",
"seld/jsonlint": "^1.4",
"seld/phar-utils": "^1.2",
"symfony/console": "^5.4.1 || ^6.0",
"symfony/console": "^5.4.7 || ^6.0.7",
"symfony/filesystem": "^5.4 || ^6.0",
"symfony/finder": "^5.4 || ^6.0",
"symfony/polyfill-php73": "^1.24",
@ -4324,6 +4324,11 @@
"extra": {
"branch-alias": {
"dev-main": "2.3-dev"
},
"phpstan": {
"includes": [
"phpstan/rules.neon"
]
}
},
"autoload": {
@ -4357,7 +4362,7 @@
"support": {
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/composer/issues",
"source": "https://github.com/composer/composer/tree/2.3.5"
"source": "https://github.com/composer/composer/tree/2.3.10"
},
"funding": [
{
@ -4373,7 +4378,7 @@
"type": "tidelift"
}
],
"time": "2022-04-13T14:43:00+00:00"
"time": "2022-07-13T13:48:23+00:00"
},
{
"name": "composer/metadata-minifier",

4
composer/Composer.php
View File

@ -91,8 +91,8 @@ class Composer {
public static function ensureComposerVersion(): void {
$composerVersion = method_exists(ComposerApp::class, 'getVersion') ?
ComposerApp::getVersion() : ComposerApp::VERSION;
if (Comparator::lessThan($composerVersion, '2.3.5')) {
throw new \RuntimeException("Drupal core development requires Composer 2.3.5, but Composer $composerVersion is installed. Please run 'composer self-update'.");
if (Comparator::lessThan($composerVersion, '2.3.6')) {
throw new \RuntimeException("Drupal core development requires Composer 2.3.6, but Composer $composerVersion is installed. Please run 'composer self-update'.");
}
}

2
composer/Metapackage/DevDependencies/composer.json
View File

@ -10,7 +10,7 @@
"behat/mink": "^1.10",
"behat/mink-browserkit-driver": "^2.1",
"behat/mink-selenium2-driver": "^1.4",
"composer/composer": "^2.3.5",
"composer/composer": "^2.3.6",
"drupal/coder": "^8.3.10",
"easyrdf/easyrdf": "^1.0",
"instaclick/php-webdriver": "^1.4.1",

2
composer/Metapackage/PinnedDevDependencies/composer.json
View File

@ -12,7 +12,7 @@
"behat/mink-browserkit-driver": "v2.1.0",
"behat/mink-selenium2-driver": "v1.6.0",
"composer/ca-bundle": "1.3.1",
"composer/composer": "2.3.5",
"composer/composer": "2.3.10",
"composer/metadata-minifier": "1.0.0",
"composer/pcre": "3.0.0",
"composer/spdx-licenses": "1.5.6",