diff --git a/composer.json b/composer.json index 675d9d8da..a030c47c9 100644 --- a/composer.json +++ b/composer.json @@ -19,19 +19,17 @@ "php": ">=7.3", "ext-json": "*", "acquia/drupal-environment-detector": "*", - "composer-plugin-api": "^1.1.0", + "composer-plugin-api": "^1.1.0 || ^2.0", "composer/semver": "^1.4", "consolidation/comments": "^1.0", "consolidation/config": "^1.0.0", "consolidation/robo": "^1.4.12 || ^2", - "cweagans/composer-patches": "^1.6.5", "dflydev/dot-access-data": "^1.1.0", "doctrine/common": "^2.5", "drupal/coder": "^8.3.1", "drupal/core": "^9.0.0-alpha1", "drupol/phposinfo": "^1.6", "drush/drush": "^10.2.2", - "grasmash/drupal-security-warning": "^1.0.0", "grasmash/yaml-cli": "^2.0.0", "grasmash/yaml-expander": "^1.2.0", "sensiolabs/security-checker": "^5.0.0", @@ -39,7 +37,6 @@ "symfony/console": "^4.4.6", "symfony/twig-bridge": "^3.3", "symfony/yaml": "^4.4", - "zaporylie/composer-drupal-optimizations": "^1.0", "zumba/amplitude-php": "^1.0" }, "conflict": { @@ -48,7 +45,7 @@ "require-dev": { "acquia/coding-standards": "^0.4.0", "composer/composer": "^1.6.4", - "composer/installers": "^1.2.0", + "composer/installers": "^1.9.0", "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0", "drupal/core-dev": "^9.0.0-alpha1", "knplabs/github-api": "^2.6", @@ -73,7 +70,6 @@ "10.x-dev": "10.0.x-dev" }, "class": "Acquia\\Blt\\Composer\\Plugin", - "composer-exit-on-patch-failure": true, "installer-paths": { "vendor/drupal/core": [ "type:drupal-core" diff --git a/composer.lock b/composer.lock index 09ae0b865..401b5ba13 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": "852e4fcce5df834aa9445a96a68a5e56", + "content-hash": "2fd077301868ad5b2a9d36d7f0915568", "packages": [ { "name": "acquia/drupal-environment-detector", @@ -998,50 +998,6 @@ "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, - { - "name": "cweagans/composer-patches", - "version": "1.6.7", - "source": { - "type": "git", - "url": "https://github.com/cweagans/composer-patches.git", - "reference": "2e6f72a2ad8d59cd7e2b729f218bf42adb14f590" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/2e6f72a2ad8d59cd7e2b729f218bf42adb14f590", - "reference": "2e6f72a2ad8d59cd7e2b729f218bf42adb14f590", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0", - "php": ">=5.3.0" - }, - "require-dev": { - "composer/composer": "~1.0", - "phpunit/phpunit": "~4.6" - }, - "type": "composer-plugin", - "extra": { - "class": "cweagans\\Composer\\Patches" - }, - "autoload": { - "psr-4": { - "cweagans\\Composer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Cameron Eagans", - "email": "me@cweagans.net" - } - ], - "description": "Provides a way to patch Composer packages.", - "time": "2019-08-29T20:11:49+00:00" - }, { "name": "dflydev/dot-access-data", "version": "v1.1.0", @@ -2401,58 +2357,6 @@ }, "time": "2020-02-13T22:36:52+00:00" }, - { - "name": "grasmash/drupal-security-warning", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/grasmash/drupal-security-warning.git", - "reference": "cfc5424c84df02be9d094f491e5b57063c15cd72" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/grasmash/drupal-security-warning/zipball/cfc5424c84df02be9d094f491e5b57063c15cd72", - "reference": "cfc5424c84df02be9d094f491e5b57063c15cd72", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0" - }, - "require-dev": { - "composer/composer": "^1.0", - "phpunit/phpunit": "^5.7.0", - "squizlabs/php_codesniffer": "^2.7", - "symfony/filesystem": "^3.2.0", - "symfony/process": "^3.2.0" - }, - "type": "composer-plugin", - "extra": { - "class": "grasmash\\DrupalSecurityWarning\\Composer\\Plugin", - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "grasmash\\DrupalSecurityWarning\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0" - ], - "authors": [ - { - "name": "Matthew Grasmick" - } - ], - "description": "Warns users installing Drupal project versions not supported by Security Team.", - "keywords": [ - "drupal", - "security" - ], - "time": "2017-10-10T14:47:08+00:00" - }, { "name": "grasmash/expander", "version": "1.0.0", @@ -6670,49 +6574,6 @@ }, "time": "2015-12-17T08:42:14+00:00" }, - { - "name": "zaporylie/composer-drupal-optimizations", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/zaporylie/composer-drupal-optimizations.git", - "reference": "fb231d92adc862a2c9276bccbc90f684816dc75d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zaporylie/composer-drupal-optimizations/zipball/fb231d92adc862a2c9276bccbc90f684816dc75d", - "reference": "fb231d92adc862a2c9276bccbc90f684816dc75d", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.1" - }, - "require-dev": { - "composer/composer": "^1.6", - "phpunit/phpunit": "^6" - }, - "type": "composer-plugin", - "extra": { - "class": "zaporylie\\ComposerDrupalOptimizations\\Plugin" - }, - "autoload": { - "psr-4": { - "zaporylie\\ComposerDrupalOptimizations\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "Jakub Piasecki", - "email": "jakub@piaseccy.pl" - } - ], - "description": "Composer plugin to improve composer performance for Drupal projects", - "time": "2019-10-02T17:01:11+00:00" - }, { "name": "zumba/amplitude-php", "version": "1.0.1", @@ -10753,7 +10614,7 @@ "platform": { "php": ">=7.3", "ext-json": "*", - "composer-plugin-api": "^1.1.0" + "composer-plugin-api": "^1.1.0 || ^2.0" }, "platform-dev": [], "plugin-api-version": "1.1.0"