93566[TASK] Move EXT:setup into backend extension
Commit message
Review
-
Code review CR +2 Done
- Benni Mack +2
- Garvin Hicking +1
- Christian Kuhn +1
-
Verified V +2 Done
- Benni Mack +2
- Garvin Hicking +1
- Christian Kuhn +1
- core-ci +1 CI
Issues 1
Files 45
- Build/Sources/TypeScript/backend/setup-module.tsrenamed+2 −2
- Build/web-test-runner.config.mjs+0 −1
- typo3/sysext/backend/Classes/Configuration/UserSettingsTcaConfiguration.phprenamed+2 −2
- typo3/sysext/backend/Classes/Controller/MfaConfigurationController.php+1 −2
- typo3/sysext/backend/Classes/Controller/SetupModuleController.phprenamed+27 −19
- typo3/sysext/backend/Classes/Event/AddUserSettingsJavaScriptModulesEvent.phprenamed+4 −3
- typo3/sysext/backend/Classes/Form/Element/AvatarElement.phprenamed+5 −6
- typo3/sysext/backend/Classes/Form/FormDataGroup/UserSettingsDataGroup.phprenamed+2 −3
- typo3/sysext/backend/Classes/Form/FormDataProvider/UserSettingsDatabaseEditRow.phprenamed+1 −1
- typo3/sysext/backend/Classes/Form/NodeFactory.php+1 −1
- typo3/sysext/backend/Classes/Upgrades/UserSettingsMigration.phprenamed+2 −2
- typo3/sysext/backend/Classes/UserFunctions/UserSettingsItemsProcFunc.phprenamed+4 −4
- typo3/sysext/backend/Configuration/Backend/Modules.php+13 −0
- typo3/sysext/backend/Configuration/TCA/Overrides/be_users.phprenamed+19 −19
- typo3/sysext/backend/DeprecatedClasses/Setup/Event/AddJavaScriptModulesEvent.phpcopied+2 −0
- typo3/sysext/backend/Migrations/Code/ClassAliasMap.php13new+21 −0
- typo3/sysext/backend/Resources/Private/Language/Modules/user_settings.xlfrenamed+2 −2
- typo3/sysext/backend/Resources/Private/Language/user_profile.xlfrenamed+48 −57
- typo3/sysext/backend/Resources/Private/Templates/Setup/Main.fluid.htmlrenamed+1 −1
- typo3/sysext/backend/Resources/Public/JavaScript/setup-module.jsrenamed+0 −0
Show 25 more files
- typo3/sysext/backend/Tests/Functional/Upgrades/UserSettingsMigrationTest.phprenamed+2 −4
- typo3/sysext/backend/composer.json+8 −1
- typo3/sysext/backend/ext_localconf.php2+10 −0
- typo3/sysext/core/Classes/Authentication/UserSettingsSchema.php1+3 −0
- typo3/sysext/core/Configuration/DefaultConfiguration.php+65 −0
- typo3/sysext/core/Documentation/Changelog/14.3/Deprecation-109517-AddJavaScriptModulesEvent.rstnew+56 −0
- typo3/sysext/core/Documentation/Changelog/14.3/Important-109517-SetupExtensionMergedIntoBackendExtension.rstnew+129 −0
- typo3/sysext/core/Resources/Private/Php/framework-packages.php+0 −1
- typo3/sysext/core/Tests/Functional/Package/PackageStatesTest.php+1 −3
- typo3/sysext/core/Tests/Unit/Authentication/UserSettingsFactoryTest.php+1 −0
- typo3/sysext/core/Tests/Unit/Authentication/UserSettingsSchemaTest.php+3 −2
- typo3/sysext/rte_ckeditor/composer.json+1 −3
- typo3/sysext/setup/Configuration/Backend/Modules.phpdeleted+0 −21
- typo3/sysext/setup/Configuration/JavaScriptModules.phpdeleted+0 −11
- typo3/sysext/setup/Configuration/Services.yamldeleted+0 −8
- typo3/sysext/setup/Resources/Private/Language/locallang_mod.xlfdeleted+0 −17
- typo3/sysext/setup/Resources/Public/Icons/Extension.pngdeletedbinary
- typo3/sysext/setup/.gitattributesdeleted+0 −2
- typo3/sysext/setup/composer.jsondeleted+0 −56
- typo3/sysext/setup/ext_localconf.phpdeleted+0 −86
- typo3/sysext/setup/ext_tables.phpdeleted+0 −14
- typo3/sysext/setup/LICENSE.txtdeleted+0 −339
- typo3/sysext/setup/README.rstdeleted+0 −11
- composer.json+2 −3
- composer.lock+3 −3
Review log 2937
Show 712 earlier messages
-
Benni Mack uploaded patch set 1 04/08/26, 15:52
-
core-ci voted on patch set 1 V -1 04/08/26, 16:06 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/99776
-
Benni Mack uploaded patch set 2
V -104/09/26, 05:54 -
core-ci voted on patch set 2 V -1 04/09/26, 06:09 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/99814
-
Garvin Hicking uploaded patch set 3
V -104/09/26, 10:34fix extension test order -
Garvin Hicking commented on patch set 3 04/09/26, 10:35
The tests currently fail because of the new wording "User Settings" => "Profile Settings". (Personally I would prefer to keep "User Settings" because currently using "user_settings" and "user_profile" and "profile_settings" mezzo mix is adding more confusion that it solves) -
core-ci voted on patch set 3 V -1 04/09/26, 10:45 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/99838
-
Benni Mack uploaded patch set 4
V -104/09/26, 15:17 -
Benni Mack commented on patch set 4 04/09/26, 15:18
Reply
please re-review -
core-ci voted on patch set 4 V -1 04/09/26, 15:35 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/99868
-
Benni Mack uploaded patch set 5
V -104/09/26, 15:41 -
core-ci voted on patch set 5 V +1 04/09/26, 15:52 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/99871
-
Garvin Hicking commented on patch set 5 CR +1 V +1 04/09/26, 16:02
Reply
Thanks. Seems to work. -
Christian Kuhn commented on patch set 5 04/09/26, 17:40
missing verb.dieser satz kein verb.ext_localconf.php:31the array is deprecated with v14, is it? let's maybe add an @deprecated note here so we don't forget to remove it in v15? -
Christian Kuhn commented on patch set 5 04/09/26, 17:43
ClassAliasMap.php:19did you test this? i remember i struggled with a similar event rename in v14 and had to come up with a different solution since consumers run into compat issues when they want to support both v13 and v14. i'll look it up. -
Christian Kuhn commented on patch set 5 04/09/26, 18:25
ClassAliasMap.php:19Replyi did something here. https://review.typo3.org/c/Packages/TYPO3.CMS/+/76565/46/typo3/sysext/core/Documentation/Changelog/12.2/Deprecation-99120-DeprecateOldTypoScriptParser.rst#53 https://review.typo3.org/c/Packages/TYPO3.CMS/+/76565/46/typo3/sysext/core/Classes/TypoScript/IncludeTree/Event/ModifyLoadedPageTsConfigEvent.php https://review.typo3.org/c/Packages/TYPO3.CMS/+/76565/46/typo3/sysext/core/Classes/Configuration/Event/ModifyLoadedPageTsConfigEvent.php there were issues that class aliases don't work well with the event dispatcher and i had to work around. unsure if that is relevant in this case, though. feel free to just set 'resolved'. -
Garvin Hicking commented on patch set 5 V 0 CR -1 04/09/26, 19:12
Reply
Never enough. Never, never.ClassAliasMap.php:19ReplyI just tested this and you're right. It does not work with the aliased class. Also...the "AddJavaScriptModulesEvent" inside Backend\Event is IMO misleadingly large. It sounds as if it would affect the whole EXT:backend scope, when in reality it only applies to the SetupModule. So it should be named like "AddJavaScriptModulesForSetupEvent" or so... We could add a composer.json entry to provide ``` "autoload": { "psr-4": { "TYPO3\\CMS\\Backend\\": "Classes/", "TYPO3\\CMS\\Setup\\": "LegacyClasses/" } } ``` and put the old event there under the "old" namespace so that it's available "for real". Then we could even rename the new event to something more fitting, and note that in the ReST file...? -
Christian Kuhn commented on patch set 5 04/09/26, 19:29
ClassAliasMap.php:19Replyok. so: * new cleaned up event * old event moved in filesystem, but available with old namespace * dispatch both events * v15: remove old event, dispatch only new one extension v13&v14: listen to old event only. no deprecation. extension v14&v15: listen to new event only. sounds good to me. do you find time and motivation to take care and test along the way? now that you created a test bed on your side already ;) -
Garvin Hicking commented on patch set 5 04/09/26, 19:39
ClassAliasMap.php:19Replyhappily so. Can it wait until tuesday? Am a bit short on time in my vacation ;) -
Garvin Hicking commented on patch set 5 04/10/26, 06:13
on it -
Garvin Hicking uploaded patch set 6
CR -1V +104/10/26, 07:05 -
Garvin Hicking commented on patch set 6 04/10/26, 07:06
Reply
DoneReply
DoneReply
DoneClassAliasMap.php:19ReplyI added ReST files and aliasing... and... it feels kinda bad?! I wonder if we could instead make the dispatcher work with class alias maps properly instead? But I don't have the time to touch this right now.ext_localconf.php:31ReplyDone -
core-ci voted on patch set 6 V +1 04/10/26, 07:14 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/99902
-
Christian Kuhn commented on patch set 6 04/10/26, 21:25
ClassAliasMap.php:19Replyi looked that up back then: this is a symfony restriction, or something, not easy to circumvent iirc. no so, aliasing probably won't work easily and may have drawbacks, as well. -
Christian Kuhn commented on patch set 6 04/10/26, 21:28
ClassAliasMap.php:19Replyand tbh: that solution looks quite straight forward in the end, and it will be gone from main in a few weeks again ^^ -
Garvin Hicking uploaded patch set 7
V +104/11/26, 07:23 -
Garvin Hicking commented on patch set 7 CR +1 V +1 04/11/26, 07:25
ClassAliasMap.php:19ReplyI was just thinking that even DI should theoretically be able to use composer autoload classmaps so I still wonder what the root cause is (and maybe if Symfony worked around it). Anyhow, I'd be fine with this with only one teary eye. -
Christian Kuhn commented on patch set 7 04/11/26, 07:32
ClassAliasMap.php:20iirc, we need an entry for this in backend/composer.json, don't we?UserSettingsSchema.php:50thx! -
core-ci voted on patch set 7 V +1 04/11/26, 07:34 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/99954
-
Christian Kuhn uploaded patch set 8
CR +1V +104/11/26, 07:37 -
Christian Kuhn commented on patch set 7 04/11/26, 07:37
ClassAliasMap.php:20Replyin monorepo composer.json as well. -
Christian Kuhn commented on patch set 8 CR +1 V +1 04/11/26, 07:39
this looks good to me, on testing, the module comes up and saves a change. hope we didn't miss something, but i don't see anything obvious anymore. -
Garvin Hicking commented on patch set 8 V -1 04/11/26, 07:44
ClassAliasMap.php:20ReplyLet me verify with this change if the dispatching might not have worked because this was missing. -
core-ci voted on patch set 8 V +1 04/11/26, 07:47 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/99955
-
Garvin Hicking commented on patch set 8 CR +1 V +1 04/11/26, 08:44
ClassAliasMap.php:20ReplyI tested this with: https://gist.github.com/fe-hicking/30619a46a381486c7f5432edfcf3796f and I still could not get dispatching the moved event to work. So I guess we'll need this workaround with a really existing "old event" class. -
Benni Mack voted on patch set 8 CR +2 V +2 04/11/26, 10:26
-
Benni Mack merged patch set 9 04/11/26, 10:26