From 752ad0248e1ed6082b4f46ccaaf2e435d055cbde Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Fri, 4 Mar 2022 20:08:44 -0600
Subject: [PATCH] Issue #3253059 by Spokje, longwave, xjm: Upgrade to
composer/installers 2
---
composer.json | 2 +-
composer.lock | 32 +++++++------------
composer/Plugin/Scaffold/README.md | 2 +-
composer/Template/LegacyProject/composer.json | 2 +-
.../Template/RecommendedProject/composer.json | 2 +-
5 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/composer.json b/composer.json
index ef14c9c12465..1963cc604007 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
"chat": "https://www.drupal.org/node/314178"
},
"require": {
- "composer/installers": "^1.9",
+ "composer/installers": "^2.0",
"drupal/core": "self.version",
"drupal/core-project-message": "self.version",
"drupal/core-vendor-hardening": "self.version"
diff --git a/composer.lock b/composer.lock
index faa9be7fa8bb..86a01d7fe091 100644
--- a/composer.lock
+++ b/composer.lock
@@ -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": "621f45e44e9dec8320bc3027e3408b8b",
+ "content-hash": "372c247b5fd3863e5f2b21cfca703dae",
"packages": [
{
"name": "asm89/stack-cors",
@@ -64,38 +64,35 @@
},
{
"name": "composer/installers",
- "version": "v1.12.0",
+ "version": "v2.0.1",
"source": {
"type": "git",
"url": "https://github.com/composer/installers.git",
- "reference": "d20a64ed3c94748397ff5973488761b22f6d3f19"
+ "reference": "a241e78aaeb09781f5f5b92ac01ffd13ab43e5e8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/installers/zipball/d20a64ed3c94748397ff5973488761b22f6d3f19",
- "reference": "d20a64ed3c94748397ff5973488761b22f6d3f19",
+ "url": "https://api.github.com/repos/composer/installers/zipball/a241e78aaeb09781f5f5b92ac01ffd13ab43e5e8",
+ "reference": "a241e78aaeb09781f5f5b92ac01ffd13ab43e5e8",
"shasum": ""
},
"require": {
- "composer-plugin-api": "^1.0 || ^2.0"
- },
- "replace": {
- "roundcube/plugin-installer": "*",
- "shama/baton": "*"
+ "composer-plugin-api": "^1.0 || ^2.0",
+ "php": "^7.2 || ^8.0"
},
"require-dev": {
"composer/composer": "1.6.* || ^2.0",
"composer/semver": "^1 || ^3",
"phpstan/phpstan": "^0.12.55",
"phpstan/phpstan-phpunit": "^0.12.16",
- "symfony/phpunit-bridge": "^4.2 || ^5",
- "symfony/process": "^2.3"
+ "symfony/phpunit-bridge": "^5.3",
+ "symfony/process": "^5"
},
"type": "composer-plugin",
"extra": {
"class": "Composer\\Installers\\Plugin",
"branch-alias": {
- "dev-main": "1.x-dev"
+ "dev-main": "2.x-dev"
}
},
"autoload": {
@@ -117,7 +114,6 @@
"description": "A multi-framework Composer library installer",
"homepage": "https://composer.github.io/installers/",
"keywords": [
- "Craft",
"Dolibarr",
"Eliasis",
"Hurad",
@@ -138,7 +134,6 @@
"Whmcs",
"WolfCMS",
"agl",
- "aimeos",
"annotatecms",
"attogram",
"bitrix",
@@ -157,7 +152,6 @@
"grav",
"installer",
"itop",
- "joomla",
"known",
"kohana",
"laravel",
@@ -185,9 +179,7 @@
"silverstripe",
"sydes",
"sylius",
- "symfony",
"tastyigniter",
- "typo3",
"wordpress",
"yawik",
"zend",
@@ -195,7 +187,7 @@
],
"support": {
"issues": "https://github.com/composer/installers/issues",
- "source": "https://github.com/composer/installers/tree/v1.12.0"
+ "source": "https://github.com/composer/installers/tree/v2.0.1"
},
"funding": [
{
@@ -211,7 +203,7 @@
"type": "tidelift"
}
],
- "time": "2021-09-13T08:19:44+00:00"
+ "time": "2021-09-13T08:21:20+00:00"
},
{
"name": "composer/semver",
diff --git a/composer/Plugin/Scaffold/README.md b/composer/Plugin/Scaffold/README.md
index dbf42eaf9d92..4793b1aff647 100644
--- a/composer/Plugin/Scaffold/README.md
+++ b/composer/Plugin/Scaffold/README.md
@@ -383,7 +383,7 @@ Sample composer.json for a project that relies on packages that use composer-sca
"name": "my/project",
"require": {
"drupal/core-composer-scaffold": "*",
- "composer/installers": "^1.9",
+ "composer/installers": "^2.0",
"cweagans/composer-patches": "^1.6.5",
"drupal/core": "^8.8.x-dev",
"service-provider/d8-scaffold-files": "^1"
diff --git a/composer/Template/LegacyProject/composer.json b/composer/Template/LegacyProject/composer.json
index 1eace67108a6..c79a42d6ce20 100644
--- a/composer/Template/LegacyProject/composer.json
+++ b/composer/Template/LegacyProject/composer.json
@@ -15,7 +15,7 @@
}
],
"require": {
- "composer/installers": "^1.9",
+ "composer/installers": "^2.0",
"drupal/core-composer-scaffold": "^10.0",
"drupal/core-project-message": "^10.0",
"drupal/core-recommended": "^10.0",
diff --git a/composer/Template/RecommendedProject/composer.json b/composer/Template/RecommendedProject/composer.json
index 16b2c11288a7..9257e238b9b8 100644
--- a/composer/Template/RecommendedProject/composer.json
+++ b/composer/Template/RecommendedProject/composer.json
@@ -15,7 +15,7 @@
}
],
"require": {
- "composer/installers": "^1.9",
+ "composer/installers": "^2.0",
"drupal/core-composer-scaffold": "^10.0",
"drupal/core-project-message": "^10.0",
"drupal/core-recommended": "^10.0"
--
GitLab