Commit 26c28061 authored by Adrian Mot's avatar Adrian Mot Committed by Christian Kuhn
Browse files

[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: default avatarHelmut Hummel <helmut.hummel@typo3.org>
Tested-by: default avatarHelmut Hummel <helmut.hummel@typo3.org>
Reviewed-by: Nicole Cordes's avatarNicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes's avatarNicole Cordes <typo3@cordes.co>
Reviewed-by: Adrian Mot's avatarAdrian Mot <adrian.mot@gmail.com>
Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent 1bf5a17b
......@@ -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/",
......
......@@ -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": [
{
......
{
"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": [
......
......@@ -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'
),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment