diff --git a/composer.json b/composer.json index e16e6a0886..a1aec6d611 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "composer/installers": "^1.9", + "composer/installers": "^2.3", "cweagans/composer-patches": "^1.7", "drupal/address": "^1.9", "drupal/admin_toolbar": "^3.4", @@ -85,7 +85,7 @@ "prefer-stable": true, "config": { "optimize-autoloader": true, - "process-timeout":0, + "process-timeout": 0, "sort-packages": true, "allow-plugins": { "composer/installers": true, @@ -95,8 +95,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": { @@ -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 8cf213b5e2..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": "750e25aca453a5fccca5ae752bbcd6e3", + "content-hash": "f0d83968cc33c23bac1bc0397f95f19e", "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", @@ -12102,7 +12097,7 @@ }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], - "plugin-api-version": "2.2.0" + "platform": {}, + "platform-dev": {}, + "plugin-api-version": "2.6.0" }