From 17b709ef1c31f89be6be5740fac1150f80c405e7 Mon Sep 17 00:00:00 2001 From: Todd Blumenthal Date: Mon, 16 Dec 2024 08:46:23 -0500 Subject: [PATCH 1/4] USAGOV-2124-composer-installers-deprecated: replaced composer/installers with oomphinc/composer-installers-extender --- composer.json | 9 +++-- composer.lock | 102 +++++++++++++++++++++++++++++++++++++------------- 2 files changed, 82 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index c691cb717f..ba4eab1a73 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,6 @@ } ], "require": { - "composer/installers": "^1.9", "cweagans/composer-patches": "^1.7", "drupal/address": "^1.9", "drupal/admin_toolbar": "^3.4", @@ -76,6 +75,7 @@ "nyholm/psr7": "^1.4", "nyholm/psr7-server": "^1.0", "onelogin/php-saml": "^4", + "oomphinc/composer-installers-extender": "*", "wikimedia/composer-merge-plugin": "^2.0.0" }, "conflict": { @@ -85,10 +85,9 @@ "prefer-stable": true, "config": { "optimize-autoloader": true, - "process-timeout":0, + "process-timeout": 0, "sort-packages": true, "allow-plugins": { - "composer/installers": true, "drupal/console-extend-plugin": true, "drupal/core-composer-scaffold": true, "drupal/core-project-message": true, @@ -105,6 +104,9 @@ "web-root": "web/" } }, + "installer-types": [ + "drupal-module", "drupal-theme" + ], "installer-paths": { "web/core": [ "type:drupal-core" @@ -133,7 +135,6 @@ "web/themes/custom/{$name}": [ "type:drupal-custom-theme" ] - }, "patchLevel": { "drupal/core": "-p2" diff --git a/composer.lock b/composer.lock index 26b42f865d..921fe3bfa0 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": "93324a928ad5a44abbc3c4ab0c967cd6", + "content-hash": "8e1fe45300039d9ec4d206cbc1dfc83e", "packages": [ { "name": "asm89/stack-cors", @@ -401,39 +401,37 @@ }, { "name": "composer/installers", - "version": "v1.12.0", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "d20a64ed3c94748397ff5973488761b22f6d3f19" + "reference": "12fb2dfe5e16183de69e784a7b84046c43d97e8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/d20a64ed3c94748397ff5973488761b22f6d3f19", - "reference": "d20a64ed3c94748397ff5973488761b22f6d3f19", + "url": "https://api.github.com/repos/composer/installers/zipball/12fb2dfe5e16183de69e784a7b84046c43d97e8e", + "reference": "12fb2dfe5e16183de69e784a7b84046c43d97e8e", "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" + "composer/composer": "^1.10.27 || ^2.7", + "composer/semver": "^1.7.2 || ^3.4.0", + "phpstan/phpstan": "^1.11", + "phpstan/phpstan-phpunit": "^1", + "symfony/phpunit-bridge": "^7.1.1", + "symfony/process": "^5 || ^6 || ^7" }, "type": "composer-plugin", "extra": { "class": "Composer\\Installers\\Plugin", "branch-alias": { - "dev-main": "1.x-dev" - } + "dev-main": "2.x-dev" + }, + "plugin-modifies-install-path": true }, "autoload": { "psr-4": { @@ -454,7 +452,6 @@ "description": "A multi-framework Composer library installer", "homepage": "https://composer.github.io/installers/", "keywords": [ - "Craft", "Dolibarr", "Eliasis", "Hurad", @@ -475,7 +472,6 @@ "Whmcs", "WolfCMS", "agl", - "aimeos", "annotatecms", "attogram", "bitrix", @@ -484,6 +480,7 @@ "cockpit", "codeigniter", "concrete5", + "concreteCMS", "croogo", "dokuwiki", "drupal", @@ -494,7 +491,6 @@ "grav", "installer", "itop", - "joomla", "known", "kohana", "laravel", @@ -503,6 +499,7 @@ "magento", "majima", "mako", + "matomo", "mediawiki", "miaoxing", "modulework", @@ -522,9 +519,7 @@ "silverstripe", "sydes", "sylius", - "symfony", "tastyigniter", - "typo3", "wordpress", "yawik", "zend", @@ -532,7 +527,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.3.0" }, "funding": [ { @@ -548,7 +543,7 @@ "type": "tidelift" } ], - "time": "2021-09-13T08:19:44+00:00" + "time": "2024-06-24T20:46:46+00:00" }, { "name": "composer/semver", @@ -7711,6 +7706,63 @@ ], "time": "2024-05-30T15:10:40+00:00" }, + { + "name": "oomphinc/composer-installers-extender", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/oomphinc/composer-installers-extender.git", + "reference": "cbf4b6f9a24153b785d09eee755b995ba87bd5f9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/oomphinc/composer-installers-extender/zipball/cbf4b6f9a24153b785d09eee755b995ba87bd5f9", + "reference": "cbf4b6f9a24153b785d09eee755b995ba87bd5f9", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.1 || ^2.0", + "composer/installers": "^1.0 || ^2.0", + "php": ">=7.1" + }, + "require-dev": { + "composer/composer": "^2.0", + "phpunit/phpunit": "^7.2", + "squizlabs/php_codesniffer": "^3.3" + }, + "type": "composer-plugin", + "extra": { + "class": "OomphInc\\ComposerInstallersExtender\\Plugin" + }, + "autoload": { + "psr-4": { + "OomphInc\\ComposerInstallersExtender\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Stephen Beemsterboer", + "email": "stephen@oomphinc.com", + "homepage": "https://github.com/balbuf" + }, + { + "name": "Nathan Dentzau", + "email": "nate@oomphinc.com", + "homepage": "http://oomph.is/ndentzau" + } + ], + "description": "Extend the composer/installers plugin to accept any arbitrary package type.", + "homepage": "http://www.oomphinc.com/", + "support": { + "issues": "https://github.com/oomphinc/composer-installers-extender/issues", + "source": "https://github.com/oomphinc/composer-installers-extender/tree/2.0.1" + }, + "time": "2021-12-15T12:32:42+00:00" + }, { "name": "pear/archive_tar", "version": "1.5.0", From 9c55787b96934ee1e18df58a9be99f69e499ddd1 Mon Sep 17 00:00:00 2001 From: Todd Blumenthal Date: Mon, 16 Dec 2024 11:10:23 -0500 Subject: [PATCH 2/4] USAGOV-2124-composer-installers-deprecated: returned composer/installers --- composer.json | 1 + composer.lock | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ba4eab1a73..a6b6707784 100644 --- a/composer.json +++ b/composer.json @@ -88,6 +88,7 @@ "process-timeout": 0, "sort-packages": true, "allow-plugins": { + "composer/installers": true, "drupal/console-extend-plugin": true, "drupal/core-composer-scaffold": true, "drupal/core-project-message": true, diff --git a/composer.lock b/composer.lock index 921fe3bfa0..9d909a3a98 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": "8e1fe45300039d9ec4d206cbc1dfc83e", + "content-hash": "85a473a1678833471fea1f0c6d148f64", "packages": [ { "name": "asm89/stack-cors", From 0a14da6e684242c3faba3102fb2827490b0cb9fe Mon Sep 17 00:00:00 2001 From: Todd Blumenthal Date: Mon, 23 Dec 2024 10:23:56 -0500 Subject: [PATCH 3/4] USAGOV-2124-composer-installers-deprecated: blah --- composer.json | 4 +- composer.lock | 205 +------------------------------------------------- 2 files changed, 2 insertions(+), 207 deletions(-) diff --git a/composer.json b/composer.json index 9b939c743a..ce88d71db6 100644 --- a/composer.json +++ b/composer.json @@ -75,7 +75,6 @@ "nyholm/psr7": "^1.4", "nyholm/psr7-server": "^1.0", "onelogin/php-saml": "^4", - "oomphinc/composer-installers-extender": "*", "wikimedia/composer-merge-plugin": "^2.0.0" }, "conflict": { @@ -95,8 +94,7 @@ "wikimedia/composer-merge-plugin": true, "dealerdirect/phpcodesniffer-composer-installer": true, "cweagans/composer-patches": true, - "mglaman/composer-drupal-lenient": true, - "oomphinc/composer-installers-extender": true + "mglaman/composer-drupal-lenient": true } }, "extra": { diff --git a/composer.lock b/composer.lock index ed75093c55..a9b5c58315 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": "3b37ebbe063bfcfc6db14b4daa5fdd97", + "content-hash": "ea2794fe53cbe5c7375fd94afbd6bdb1", "packages": [ { "name": "asm89/stack-cors", @@ -399,152 +399,6 @@ }, "time": "2023-02-15T10:11:14+00:00" }, - { - "name": "composer/installers", - "version": "v2.3.0", - "source": { - "type": "git", - "url": "https://github.com/composer/installers.git", - "reference": "12fb2dfe5e16183de69e784a7b84046c43d97e8e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/12fb2dfe5e16183de69e784a7b84046c43d97e8e", - "reference": "12fb2dfe5e16183de69e784a7b84046c43d97e8e", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0 || ^2.0", - "php": "^7.2 || ^8.0" - }, - "require-dev": { - "composer/composer": "^1.10.27 || ^2.7", - "composer/semver": "^1.7.2 || ^3.4.0", - "phpstan/phpstan": "^1.11", - "phpstan/phpstan-phpunit": "^1", - "symfony/phpunit-bridge": "^7.1.1", - "symfony/process": "^5 || ^6 || ^7" - }, - "type": "composer-plugin", - "extra": { - "class": "Composer\\Installers\\Plugin", - "branch-alias": { - "dev-main": "2.x-dev" - }, - "plugin-modifies-install-path": true - }, - "autoload": { - "psr-4": { - "Composer\\Installers\\": "src/Composer/Installers" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kyle Robinson Young", - "email": "kyle@dontkry.com", - "homepage": "https://github.com/shama" - } - ], - "description": "A multi-framework Composer library installer", - "homepage": "https://composer.github.io/installers/", - "keywords": [ - "Dolibarr", - "Eliasis", - "Hurad", - "ImageCMS", - "Kanboard", - "Lan Management System", - "MODX Evo", - "MantisBT", - "Mautic", - "Maya", - "OXID", - "Plentymarkets", - "Porto", - "RadPHP", - "SMF", - "Starbug", - "Thelia", - "Whmcs", - "WolfCMS", - "agl", - "annotatecms", - "attogram", - "bitrix", - "cakephp", - "chef", - "cockpit", - "codeigniter", - "concrete5", - "concreteCMS", - "croogo", - "dokuwiki", - "drupal", - "eZ Platform", - "elgg", - "expressionengine", - "fuelphp", - "grav", - "installer", - "itop", - "known", - "kohana", - "laravel", - "lavalite", - "lithium", - "magento", - "majima", - "mako", - "matomo", - "mediawiki", - "miaoxing", - "modulework", - "modx", - "moodle", - "osclass", - "pantheon", - "phpbb", - "piwik", - "ppi", - "processwire", - "puppet", - "pxcms", - "reindex", - "roundcube", - "shopware", - "silverstripe", - "sydes", - "sylius", - "tastyigniter", - "wordpress", - "yawik", - "zend", - "zikula" - ], - "support": { - "issues": "https://github.com/composer/installers/issues", - "source": "https://github.com/composer/installers/tree/v2.3.0" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2024-06-24T20:46:46+00:00" - }, { "name": "composer/semver", "version": "3.4.3", @@ -7708,63 +7562,6 @@ ], "time": "2024-05-30T15:10:40+00:00" }, - { - "name": "oomphinc/composer-installers-extender", - "version": "2.0.1", - "source": { - "type": "git", - "url": "https://github.com/oomphinc/composer-installers-extender.git", - "reference": "cbf4b6f9a24153b785d09eee755b995ba87bd5f9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/oomphinc/composer-installers-extender/zipball/cbf4b6f9a24153b785d09eee755b995ba87bd5f9", - "reference": "cbf4b6f9a24153b785d09eee755b995ba87bd5f9", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.1 || ^2.0", - "composer/installers": "^1.0 || ^2.0", - "php": ">=7.1" - }, - "require-dev": { - "composer/composer": "^2.0", - "phpunit/phpunit": "^7.2", - "squizlabs/php_codesniffer": "^3.3" - }, - "type": "composer-plugin", - "extra": { - "class": "OomphInc\\ComposerInstallersExtender\\Plugin" - }, - "autoload": { - "psr-4": { - "OomphInc\\ComposerInstallersExtender\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Stephen Beemsterboer", - "email": "stephen@oomphinc.com", - "homepage": "https://github.com/balbuf" - }, - { - "name": "Nathan Dentzau", - "email": "nate@oomphinc.com", - "homepage": "http://oomph.is/ndentzau" - } - ], - "description": "Extend the composer/installers plugin to accept any arbitrary package type.", - "homepage": "http://www.oomphinc.com/", - "support": { - "issues": "https://github.com/oomphinc/composer-installers-extender/issues", - "source": "https://github.com/oomphinc/composer-installers-extender/tree/2.0.1" - }, - "time": "2021-12-15T12:32:42+00:00" - }, { "name": "pear/archive_tar", "version": "1.5.0", From b82e9a9b9d4ea85ed0f98b0af9b44d9db711c56f Mon Sep 17 00:00:00 2001 From: Todd Blumenthal Date: Mon, 23 Dec 2024 10:47:25 -0500 Subject: [PATCH 4/4] USAGOV-2124-composer-installers-deprecated: reinstalling composer/installers --- composer.json | 1 + composer.lock | 148 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 148 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ce88d71db6..a1aec6d611 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,7 @@ } ], "require": { + "composer/installers": "^2.3", "cweagans/composer-patches": "^1.7", "drupal/address": "^1.9", "drupal/admin_toolbar": "^3.4", diff --git a/composer.lock b/composer.lock index a9b5c58315..a670be3808 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": "ea2794fe53cbe5c7375fd94afbd6bdb1", + "content-hash": "f0d83968cc33c23bac1bc0397f95f19e", "packages": [ { "name": "asm89/stack-cors", @@ -399,6 +399,152 @@ }, "time": "2023-02-15T10:11:14+00:00" }, + { + "name": "composer/installers", + "version": "v2.3.0", + "source": { + "type": "git", + "url": "https://github.com/composer/installers.git", + "reference": "12fb2dfe5e16183de69e784a7b84046c43d97e8e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/installers/zipball/12fb2dfe5e16183de69e784a7b84046c43d97e8e", + "reference": "12fb2dfe5e16183de69e784a7b84046c43d97e8e", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "composer/composer": "^1.10.27 || ^2.7", + "composer/semver": "^1.7.2 || ^3.4.0", + "phpstan/phpstan": "^1.11", + "phpstan/phpstan-phpunit": "^1", + "symfony/phpunit-bridge": "^7.1.1", + "symfony/process": "^5 || ^6 || ^7" + }, + "type": "composer-plugin", + "extra": { + "class": "Composer\\Installers\\Plugin", + "branch-alias": { + "dev-main": "2.x-dev" + }, + "plugin-modifies-install-path": true + }, + "autoload": { + "psr-4": { + "Composer\\Installers\\": "src/Composer/Installers" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kyle Robinson Young", + "email": "kyle@dontkry.com", + "homepage": "https://github.com/shama" + } + ], + "description": "A multi-framework Composer library installer", + "homepage": "https://composer.github.io/installers/", + "keywords": [ + "Dolibarr", + "Eliasis", + "Hurad", + "ImageCMS", + "Kanboard", + "Lan Management System", + "MODX Evo", + "MantisBT", + "Mautic", + "Maya", + "OXID", + "Plentymarkets", + "Porto", + "RadPHP", + "SMF", + "Starbug", + "Thelia", + "Whmcs", + "WolfCMS", + "agl", + "annotatecms", + "attogram", + "bitrix", + "cakephp", + "chef", + "cockpit", + "codeigniter", + "concrete5", + "concreteCMS", + "croogo", + "dokuwiki", + "drupal", + "eZ Platform", + "elgg", + "expressionengine", + "fuelphp", + "grav", + "installer", + "itop", + "known", + "kohana", + "laravel", + "lavalite", + "lithium", + "magento", + "majima", + "mako", + "matomo", + "mediawiki", + "miaoxing", + "modulework", + "modx", + "moodle", + "osclass", + "pantheon", + "phpbb", + "piwik", + "ppi", + "processwire", + "puppet", + "pxcms", + "reindex", + "roundcube", + "shopware", + "silverstripe", + "sydes", + "sylius", + "tastyigniter", + "wordpress", + "yawik", + "zend", + "zikula" + ], + "support": { + "issues": "https://github.com/composer/installers/issues", + "source": "https://github.com/composer/installers/tree/v2.3.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-06-24T20:46:46+00:00" + }, { "name": "composer/semver", "version": "3.4.3",