From c5e335b86a1272faf3108e2eb26e2a537fb9443b Mon Sep 17 00:00:00 2001
From: Helmut Hummel <info@helhum.io>
Date: Mon, 13 Jun 2016 15:56:51 +0200
Subject: [PATCH] [BUGFIX] Raise minimum version for
typo3/cms-composer-installers
typo3/cms-composer-installers conflicts with specific
composer/installers versions, but this conflict was unfortunately wrongly
specified. This is now fixed upstream, but we need to update
the TYPO3 core dependencies as well to require the fixed version.
Resolves: #76617
Releases: master, 7.6, 6.2
Change-Id: I7900b81fa6893d8c3b1a735682b8323efd20babd
Reviewed-on: https://review.typo3.org/48564
Reviewed-by: Mathias Brodala <mbrodala@pagemachine.de>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
composer.json | 2 +-
composer.lock | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/composer.json b/composer.json
index 6d2b60d11893..d0b20f4a6c8e 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
"symfony/finder": ">=2.7 <3.1",
"doctrine/instantiator": "~1.0.4",
"typo3/class-alias-loader": "^1.0",
- "typo3/cms-composer-installers": "^1.2.5",
+ "typo3/cms-composer-installers": "^1.2.8",
"psr/http-message": "~1.0",
"cogpowered/finediff": "~0.3.1",
"mso/idna-convert": "^0.9.1",
diff --git a/composer.lock b/composer.lock
index 049f00beffc0..7e36d4fe9d68 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "2791b57c5666dd002d6e4106043ba137",
- "content-hash": "52d0e34ccbdba3b2396fb1fadf12e21c",
+ "hash": "0616ecf9eea837d81ffc07ead3d0780d",
+ "content-hash": "c0273e54c822cd1a6d60076d1476f5fe",
"packages": [
{
"name": "cogpowered/finediff",
@@ -1170,23 +1170,23 @@
},
{
"name": "typo3/cms-composer-installers",
- "version": "1.2.7",
+ "version": "1.2.8",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/CmsComposerInstallers.git",
- "reference": "dfc242a9153a318a6f00058203a454e33e0f8d88"
+ "reference": "fbd6f65a1a6fa155f59fd3a17577663633733c62"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/CmsComposerInstallers/zipball/dfc242a9153a318a6f00058203a454e33e0f8d88",
- "reference": "dfc242a9153a318a6f00058203a454e33e0f8d88",
+ "url": "https://api.github.com/repos/TYPO3/CmsComposerInstallers/zipball/fbd6f65a1a6fa155f59fd3a17577663633733c62",
+ "reference": "fbd6f65a1a6fa155f59fd3a17577663633733c62",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.0.0"
},
"conflict": {
- "composer/installers": "<1.0.24,>1.0.24"
+ "composer/installers": "<1.0.24 || >1.0.24"
},
"replace": {
"lw/typo3cms-installers": "*",
@@ -1230,7 +1230,7 @@
"installer",
"typo3"
],
- "time": "2016-04-07 09:02:38"
+ "time": "2016-06-13 13:39:26"
},
{
"name": "typo3fluid/fluid",
--
GitLab