From ea2a38326ac392338b60e21d8eba9f61cdef15b0 Mon Sep 17 00:00:00 2001 From: Benni Mack Date: Sun, 29 Mar 2020 21:35:24 +0200 Subject: [PATCH] [TASK] Allow composer installers 3.0 and higher Allow installation of version 3.0 of composer installers, which will be compatible with Composer 2.0. composer req typo3/cms-composer-installers:"^2.0 || ^3.0" Resolves: #90877 Releases: 9.5, master Change-Id: I5200b64b0d6402617bb355da9c7d2c59cdd54b03 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/63973 Tested-by: TYPO3com Tested-by: Georg Ringer Tested-by: Benni Mack Reviewed-by: Oliver Klee Reviewed-by: Georg Ringer Reviewed-by: Benni Mack --- composer.json | 2 +- composer.lock | 21 +++++++++++---------- typo3/sysext/core/composer.json | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index a6570202b280..914bd3f0ec2c 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,7 @@ "symfony/yaml": "^4.1", "typo3/class-alias-loader": "^1.0", "typo3/cms-cli": "^2.0", - "typo3/cms-composer-installers": "^2.0", + "typo3/cms-composer-installers": "^2.0 || ^3.0", "typo3/phar-stream-wrapper": "^3.1.3", "typo3fluid/fluid": "^2.6.8" }, diff --git a/composer.lock b/composer.lock index bf84b5202163..2538d8774c22 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": "c65f0882b32de19ad297d617c9392d55", + "content-hash": "dbd4b9d788bd42f0a0ec653c12ca0f6e", "packages": [ { "name": "algo26-matthias/idna-convert", @@ -2359,21 +2359,21 @@ }, { "name": "typo3/cms-composer-installers", - "version": "v2.2.3", + "version": "v2.2.4", "source": { "type": "git", "url": "https://github.com/TYPO3/CmsComposerInstallers.git", - "reference": "7ecc2253e2d97a52824fcdd4e2f632bae9936810" + "reference": "17243f398bf027ba56be6507c11ab957b15bbe3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3/CmsComposerInstallers/zipball/7ecc2253e2d97a52824fcdd4e2f632bae9936810", - "reference": "7ecc2253e2d97a52824fcdd4e2f632bae9936810", + "url": "https://api.github.com/repos/TYPO3/CmsComposerInstallers/zipball/17243f398bf027ba56be6507c11ab957b15bbe3b", + "reference": "17243f398bf027ba56be6507c11ab957b15bbe3b", "shasum": "" }, "require": { "composer-plugin-api": "^1.0.0", - "php": ">=7.0.0 <=7.4" + "php": ">=7.0.0 <7.5" }, "conflict": { "composer/installers": "<1.0.24 || >1.0.24" @@ -2422,7 +2422,7 @@ "installer", "typo3" ], - "time": "2019-09-24T22:09:42+00:00" + "time": "2019-12-18T20:02:06+00:00" }, { "name": "typo3/phar-stream-wrapper", @@ -3220,12 +3220,12 @@ "version": "1.6.0", "source": { "type": "git", - "url": "https://github.com/facebook/php-webdriver.git", + "url": "https://github.com/php-webdriver/php-webdriver-archive.git", "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/bd8c740097eb9f2fc3735250fc1912bc811a954e", + "url": "https://api.github.com/repos/php-webdriver/php-webdriver-archive/zipball/bd8c740097eb9f2fc3735250fc1912bc811a954e", "reference": "bd8c740097eb9f2fc3735250fc1912bc811a954e", "shasum": "" }, @@ -5569,5 +5569,6 @@ "platform-dev": [], "platform-overrides": { "php": "7.2.5" - } + }, + "plugin-api-version": "1.1.0" } diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json index 6c0829177b45..6a7782a716e3 100644 --- a/typo3/sysext/core/composer.json +++ b/typo3/sysext/core/composer.json @@ -44,7 +44,7 @@ "symfony/yaml": "^4.1", "typo3/class-alias-loader": "^1.0", "typo3/cms-cli": "^2.0", - "typo3/cms-composer-installers": "^2.0", + "typo3/cms-composer-installers": "^2.0 || ^3.0", "typo3/phar-stream-wrapper": "^3.1.3", "typo3fluid/fluid": "^2.6.8" },