From 26c28061d56bcec73a1b6d511e8f59904d938df1 Mon Sep 17 00:00:00 2001
From: Adrian Mot <adrian.mot@gmail.com>
Date: Mon, 9 May 2016 18:51:58 +0300
Subject: [PATCH] [TASK] Added compatibility7 conflict specification in conf
file
This patch adds a constrain to compatibility7 extension in order to
avoid conflicts with compatibility6
Resolves: #76099
Releases: master
Change-Id: Icaf2781b31581380df97a856129a9e28dbd77bdb
Reviewed-on: https://review.typo3.org/48052
Reviewed-by: Helmut Hummel <helmut.hummel@typo3.org>
Tested-by: Helmut Hummel <helmut.hummel@typo3.org>
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
Reviewed-by: Adrian Mot <adrian.mot@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
composer.json | 1 -
composer.lock | 2 +-
typo3/sysext/compatibility7/composer.json | 5 ++++-
typo3/sysext/compatibility7/ext_emconf.php | 4 +++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/composer.json b/composer.json
index e19f90efa95f..be172b0f9e56 100644
--- a/composer.json
+++ b/composer.json
@@ -143,7 +143,6 @@
"TYPO3\\CMS\\Beuser\\": "typo3/sysext/beuser/Classes/",
"TYPO3\\CMS\\ContextHelp\\": "typo3/sysext/context_help/Classes/",
"TYPO3\\CMS\\Core\\": "typo3/sysext/core/Classes/",
- "TYPO3\\CMS\\Compatibility7\\": "typo3/sysext/compatibility7/Classes/",
"TYPO3\\CMS\\Cshmanual\\": "typo3/sysext/cshmanual/Classes/",
"TYPO3\\CMS\\CssStyledContent\\": "typo3/sysext/css_styled_content/Classes/",
"TYPO3\\CMS\\Dbal\\": "typo3/sysext/dbal/Classes/",
diff --git a/composer.lock b/composer.lock
index 30dc1f61af09..9222bc268a80 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "f5f44db11e9fb355e29c7b8417843334",
+ "hash": "ae5f998adfea86ace4c8eef8bbc9519c",
"content-hash": "9f73bd96ca33d16df039a1031db620e7",
"packages": [
{
diff --git a/typo3/sysext/compatibility7/composer.json b/typo3/sysext/compatibility7/composer.json
index 2e017d567d08..596d388fd741 100644
--- a/typo3/sysext/compatibility7/composer.json
+++ b/typo3/sysext/compatibility7/composer.json
@@ -1,6 +1,6 @@
{
"name": "typo3/cms-compatibility7",
- "type": "typo3-cms-framework",
+ "type": "typo3-cms-extension",
"description": "TYPO3 Core",
"homepage": "https://typo3.org",
"license": ["GPL-2.0+"],
@@ -11,6 +11,9 @@
"replace": {
"compatibility7": "*"
},
+ "conflict": {
+ "typo3/cms-compatibility6": "*"
+ },
"extra": {
"typo3/class-alias-loader": {
"class-alias-maps": [
diff --git a/typo3/sysext/compatibility7/ext_emconf.php b/typo3/sysext/compatibility7/ext_emconf.php
index d6fa3c813007..25ece3a3b4de 100644
--- a/typo3/sysext/compatibility7/ext_emconf.php
+++ b/typo3/sysext/compatibility7/ext_emconf.php
@@ -15,7 +15,9 @@ $EM_CONF[$_EXTKEY] = array(
'depends' => array(
'typo3' => '8.2.0-8.2.99',
),
- 'conflicts' => array(),
+ 'conflicts' => array(
+ 'compatibility6' => '0.0.0',
+ ),
'suggests' => array(
'indexed_search'
),
--
GitLab