[TASK] Add proper replaces for merged core extensions 08/57208/6
authorHelmut Hummel <typo3@helhum.io>
Wed, 13 Jun 2018 11:46:36 +0000 (13:46 +0200)
committerHelmut Hummel <typo3@helhum.io>
Fri, 15 Jun 2018 07:05:27 +0000 (09:05 +0200)
If we merge a core extension into another one, it means
that the remaining extension technically replaces the
removed one.

To ease upgrades for composer based installations, we now
declare these replacements properly.

Resolves: #85250
Related: #81225
Related: #81787
Related: #81768
Related: #82896
Related: #82505
Related: #84680
Related: #81735
Related: #83631
Releases: master
Change-Id: I977a008de8b13fe61b5a7c091ad8d12cd45f6e4d
Reviewed-on: https://review.typo3.org/57208
Reviewed-by: Mathias Brodala <mbrodala@pagemachine.de>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Helmut Hummel <typo3@helhum.io>
Tested-by: Helmut Hummel <typo3@helhum.io>
composer.json
composer.lock
typo3/sysext/backend/composer.json
typo3/sysext/core/composer.json
typo3/sysext/documentation/composer.json
typo3/sysext/info/composer.json
typo3/sysext/workspaces/composer.json

index 0c27f33..d890882 100644 (file)
                "typo3/cms-backend": "self.version",
                "typo3/cms-belog": "self.version",
                "typo3/cms-beuser": "self.version",
-               "typo3/cms-context-help": "self.version",
                "typo3/cms-core": "self.version",
                "typo3/cms-documentation": "self.version",
                "typo3/cms-extbase": "self.version",
                "typo3/cms-indexed-search": "self.version",
                "typo3/cms-info": "self.version",
                "typo3/cms-install": "self.version",
-               "typo3/cms-lang": "self.version",
                "typo3/cms-linkvalidator": "self.version",
                "typo3/cms-lowlevel": "self.version",
                "typo3/cms-opendocs": "self.version",
                "typo3/cms-recordlist": "self.version",
                "typo3/cms-recycler": "self.version",
+               "typo3/cms-redirects": "self.version",
                "typo3/cms-reports": "self.version",
                "typo3/cms-rsaauth": "self.version",
                "typo3/cms-rte-ckeditor": "self.version",
                "typo3/cms-t3editor": "self.version",
                "typo3/cms-taskcenter": "self.version",
                "typo3/cms-tstemplate": "self.version",
-               "typo3/cms-typo3db-legacy": "self.version",
-               "typo3/cms-version": "self.version",
                "typo3/cms-viewpage": "self.version",
                "typo3/cms-workspaces": "self.version"
        },
                        "TYPO3\\CMS\\Rsaauth\\": "typo3/sysext/rsaauth/Classes/",
                        "TYPO3\\CMS\\RteCKEditor\\": "typo3/sysext/rte_ckeditor/Classes/",
                        "TYPO3\\CMS\\Saltedpasswords\\": "typo3/sysext/saltedpasswords/Classes/",
-                       "TYPO3\\CMS\\Seo\\": "typo3/sysext/seo/Classes/",
                        "TYPO3\\CMS\\Scheduler\\": "typo3/sysext/scheduler/Classes/",
+                       "TYPO3\\CMS\\Seo\\": "typo3/sysext/seo/Classes/",
                        "TYPO3\\CMS\\Setup\\": "typo3/sysext/setup/Classes/",
                        "TYPO3\\CMS\\SysAction\\": "typo3/sysext/sys_action/Classes/",
                        "TYPO3\\CMS\\SysNote\\": "typo3/sysext/sys_note/Classes/",
index 8a73e57..6280149 100644 (file)
@@ -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": "1f43a0302080cbd28f381130f2df42bb",
+    "content-hash": "683d28133ccb5f63b5fae9553b9eb8ef",
     "packages": [
         {
             "name": "cogpowered/finediff",
index 43d4961..b647654 100644 (file)
                "typo3/cms": "*"
        },
        "replace": {
-               "backend": "*"
+               "backend": "*",
+               "typo3/cms-context-help": "*",
+               "typo3/cms-func-wizards": "*",
+               "typo3/cms-wizard-crpages": "*",
+               "typo3/cms-wizard-sortpages": "*"
        },
        "extra": {
                "branch-alias": {
index 47bf39c..8e00a25 100644 (file)
@@ -62,7 +62,9 @@
                "typo3/cms": "*"
        },
        "replace": {
-               "core": "*"
+               "core": "*",
+               "typo3/cms-lang": "*",
+               "typo3/cms-sv": "*"
        },
        "extra": {
                "branch-alias": {
index ef7515e..ca14f39 100644 (file)
@@ -20,7 +20,6 @@
        },
        "replace": {
                "documentation": "*",
-               "csh_manual": "*",
                "typo3/cms-cshmanual": "*"
        },
        "extra": {
index 9b8c07d..f27836d 100644 (file)
@@ -19,7 +19,8 @@
                "typo3/cms": "*"
        },
        "replace": {
-               "info": "*"
+               "info": "*",
+               "typo3/cms-info-pagetsconfig": "*"
        },
        "extra": {
                "branch-alias": {
index 504f113..9841881 100644 (file)
@@ -19,7 +19,8 @@
                "typo3/cms": "*"
        },
        "replace": {
-               "workspaces": "*"
+               "workspaces": "*",
+               "typo3/cms-version": "*"
        },
        "extra": {
                "branch-alias": {