83119[FEATURE] Add TypoScript provider for sites and sets
Commit message
Review
-
Code review CR +2 Done
- Benjamin Franzke +2
- Benjamin Kott +1
- Benni Mack +1
-
Verified V +2 Done
- Benjamin Franzke +2
- Benjamin Kott +1
- Benni Mack +1
- core-ci +1 CI
Issues 1
Files 22
- typo3/sysext/core/Classes/Configuration/SiteConfiguration.php4+41 −2
- typo3/sysext/core/Classes/Site/Entity/Site.php+9 −2
- typo3/sysext/core/Classes/Site/Entity/SiteTypoScript.phpnew+31 −0
- typo3/sysext/core/Classes/Site/Set/SetDefinition.php+1 −0
- typo3/sysext/core/Classes/Site/Set/YamlSetDefinitionProvider.php+1 −0
- typo3/sysext/core/Classes/TypoScript/IncludeTree/IncludeNode/SiteTemplateInclude.phpnew+40 −0
- typo3/sysext/core/Classes/TypoScript/IncludeTree/SysTemplateTreeBuilder.php4+98 −7
- typo3/sysext/core/Classes/TypoScript/IncludeTree/TreeFromLineStreamBuilder.php+14 −7
- typo3/sysext/core/Documentation/Changelog/13.1/Feature-103439-TypoScriptProviderForSitesAndSets.rst17new+75 −0
- typo3/sysext/frontend/Classes/Middleware/TypoScriptFrontendInitialization.php1+18 −0
- typo3/sysext/frontend/Classes/Page/PageInformationFactory.php+20 −16
- typo3/sysext/redirects/Tests/Unit/Service/RedirectServiceTest.php+5 −2
- typo3/sysext/tstemplate/Classes/Controller/AbstractTemplateModuleController.php+57 −5
- typo3/sysext/tstemplate/Classes/Controller/ActiveTypoScriptController.php+4 −2
- typo3/sysext/tstemplate/Classes/Controller/ConstantEditorController.php+3 −1
- typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerController.php+2 −2
- typo3/sysext/tstemplate/Classes/Controller/TemplateRecordsOverviewController.php+29 −2
- typo3/sysext/tstemplate/Resources/Private/Language/locallang_info.xlf+3 −0
- typo3/sysext/tstemplate/Resources/Private/Partials/ConstantEditorOptions.html+1 −1
- typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditorMain.html+25 −9
Review log 66116
Show 4991 earlier messages
-
Benjamin Franzke uploaded patch set 1 02/24/24, 07:46
-
core-ci voted on patch set 1 V -1 02/24/24, 07:52 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/53520
-
Benjamin Franzke uploaded patch set 2
V -102/24/24, 09:36 -
core-ci voted on patch set 2 V -1 02/24/24, 09:45 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/53521
-
Benjamin Franzke uploaded patch set 3
V -102/24/24, 10:04 -
core-ci voted on patch set 3 V +1 02/24/24, 10:10 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/53522
-
Benjamin Franzke uploaded patch set 4
V +102/24/24, 10:34 -
core-ci voted on patch set 4 V +1 02/24/24, 10:41 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/53527
-
Benjamin Franzke updated the commit message in patch set 5
V +102/24/24, 10:41 -
core-ci voted on patch set 5 V +1 02/24/24, 10:47 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/53529
-
Benjamin Franzke rebased onto patch set 6
V +102/24/24, 12:43 -
core-ci voted on patch set 6 V +1 02/24/24, 12:50 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/53537
-
Benjamin Franzke uploaded patch set 7
V +102/24/24, 14:12 -
core-ci voted on patch set 7 V -1 02/24/24, 14:19 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/53541
-
Benjamin Franzke uploaded patch set 8
V -102/24/24, 14:28 -
core-ci voted on patch set 8 V +1 02/24/24, 14:33 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/53542
-
Benjamin Franzke uploaded patch set 9
V +102/24/24, 14:45 -
core-ci voted on patch set 9 V +1 02/24/24, 14:50 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/53543
-
Benjamin Franzke uploaded patch set 10
V +102/24/24, 14:52 -
core-ci voted on patch set 10 V +1 02/24/24, 15:01 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/53545
-
Simon Schaufelberger commented on patch set 10 02/24/24, 21:32
SiteConfiguration.php:305why is this muted? Btw, I also prefer negated ifs and do an early `continue` instead of nestingSysTemplateTreeBuilder.php:135same here. Use `dependencies.typoscript` -
Benjamin Franzke commented on patch set 10 02/25/24, 12:31
SiteConfiguration.php:82Reply`.typoscript` is not an option as it doesn't contain valid TypoScript. This is really WIP and will not be merged in the next days, other things will need to be figured out first – as written in the commit message, there is more to think about (presets and proper dependency mechanism), therefore this is really just a first working draft.SiteConfiguration.php:305ReplySee documentation: https://www.php.net/manual/en/function.file-get-contents.php#refsect1-function.file-get-contents-errors > An E_WARNING level error is generated if filename cannot be found, length is less than zero, or if seeking to the specified offset in the stream fails. And no, `file_exists` beforehand is not sufficient because of possible race conditions if the file is deleted in between. I prefer early bail out in general as well, but not in this case. Thank you.SysTemplateTreeBuilder.php:135Replysame as above. -
Benjamin Franzke uploaded patch set 11
V +103/12/24, 06:41 -
Benjamin Franzke marked it work in progress 03/12/24, 06:42
-
core-ci voted on patch set 11 V +1 03/12/24, 06:47 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54392
-
Simon Schaufelberger wrote 03/12/24, 10:00
Removed cc Simon Schaufelberger. -
Benjamin Franzke rebased onto patch set 12
V +103/15/24, 08:13 -
core-ci voted on patch set 12 V +1 03/15/24, 08:19 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54566
-
Benjamin Franzke marked it work in progress 03/15/24, 12:54
-
Benjamin Franzke rebased onto patch set 13
V +103/15/24, 12:55 -
core-ci voted on patch set 13 V +1 03/15/24, 13:02 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54589
-
Benjamin Franzke uploaded patch set 14
V +103/19/24, 16:10 -
core-ci voted on patch set 14 V -1 03/19/24, 16:18 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54703
-
Benjamin Franzke uploaded patch set 15
V -103/19/24, 18:03 -
core-ci voted on patch set 15 V -1 03/19/24, 18:10 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54706
-
Benjamin Franzke uploaded patch set 16
V -103/20/24, 05:39 -
core-ci voted on patch set 16 V +1 03/20/24, 05:45 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54712
-
Benjamin Franzke uploaded patch set 17
V +103/20/24, 11:46 -
core-ci voted on patch set 17 V +1 03/20/24, 11:53 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54717
-
Benjamin Franzke uploaded patch set 18
V +103/20/24, 14:41 -
core-ci voted on patch set 18 V -1 03/20/24, 14:50 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54724
-
Benjamin Franzke uploaded patch set 19
V -103/20/24, 15:30 -
core-ci voted on patch set 19 V +1 03/20/24, 15:38 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54727
-
Benjamin Franzke uploaded patch set 20
V +103/20/24, 16:43 -
core-ci voted on patch set 20 V -1 03/20/24, 16:51 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54731
-
Benjamin Franzke rebased onto patch set 21
V -103/20/24, 17:19 -
core-ci voted on patch set 21 V -1 03/20/24, 17:28 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54735
-
Benjamin Franzke uploaded patch set 22
V -103/20/24, 17:51 -
core-ci voted on patch set 22 V -1 03/20/24, 17:58 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54738
-
Benjamin Franzke uploaded patch set 23
V -103/20/24, 19:02 -
core-ci voted on patch set 23 V +1 03/20/24, 19:10 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54742
-
Benjamin Franzke rebased onto patch set 24
V +103/20/24, 21:12 -
core-ci voted on patch set 24 V +1 03/20/24, 21:21 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54749
-
Benjamin Franzke rebased onto patch set 25
V +103/21/24, 07:40 -
core-ci voted on patch set 25 V -1 03/21/24, 07:49 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54765
-
Benjamin Franzke rebased onto patch set 26
V -103/21/24, 07:52 -
core-ci voted on patch set 26 V -1 03/21/24, 08:01 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54768
-
Benjamin Franzke rebased onto patch set 27
V -103/21/24, 08:09 -
core-ci voted on patch set 27 V +1 03/21/24, 08:17 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54771
-
Benjamin Franzke uploaded patch set 28
V +103/21/24, 12:44 -
core-ci voted on patch set 28 V -1 03/21/24, 12:57 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54787
-
Benjamin Franzke rebased onto patch set 29
V -103/21/24, 13:12 -
core-ci voted on patch set 29 V -1 03/21/24, 13:24 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54794
-
Benjamin Franzke rebased onto patch set 30
V -103/21/24, 13:58 -
core-ci voted on patch set 30 V +1 03/21/24, 14:06 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54802
-
Benjamin Franzke rebased onto patch set 31
V +103/22/24, 07:00 -
Benjamin Franzke uploaded patch set 32 03/25/24, 09:18
-
core-ci voted on patch set 32 V +1 03/25/24, 09:28 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54918
-
Benjamin Franzke rebased onto patch set 33
V +103/25/24, 09:34 -
core-ci voted on patch set 33 V +1 03/25/24, 09:41 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/54920
-
Benjamin Franzke uploaded patch set 34
V +103/28/24, 15:54 -
core-ci voted on patch set 34 V -1 03/28/24, 16:09 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55032
-
Benjamin Franzke uploaded patch set 35
V -103/28/24, 16:48 -
core-ci voted on patch set 35 V +1 03/28/24, 16:54 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55037
-
Benjamin Franzke rebased onto patch set 36
V +104/02/24, 12:17 -
core-ci voted on patch set 36 V +1 04/02/24, 12:25 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55160
-
Benjamin Franzke uploaded patch set 37
V +104/02/24, 13:46 -
core-ci voted on patch set 37 V +1 04/02/24, 13:54 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55171
-
Benjamin Franzke uploaded patch set 38
V +104/02/24, 14:00 -
core-ci voted on patch set 38 V +1 04/02/24, 14:10 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55177
-
Benjamin Franzke uploaded patch set 39
V +104/03/24, 09:03 -
core-ci voted on patch set 39 V +1 04/03/24, 09:11 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55213
-
Benjamin Franzke uploaded patch set 40
V +104/03/24, 20:53 -
core-ci voted on patch set 40 V +1 04/03/24, 21:05 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55278
-
Benjamin Franzke rebased onto patch set 41
V +104/04/24, 06:52 -
core-ci voted on patch set 41 V -1 04/04/24, 07:05 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55313
-
Benjamin Franzke rebased onto patch set 42
V -104/04/24, 07:16 -
core-ci voted on patch set 42 V +1 04/04/24, 07:22 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55318
-
Benjamin Franzke uploaded patch set 43
V +104/05/24, 08:45 -
core-ci voted on patch set 43 V +1 04/05/24, 08:52 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55374
-
Benjamin Franzke uploaded patch set 44
V +104/05/24, 20:39
-
core-ci voted on patch set 44 V +1 04/05/24, 20:54 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55396
-
Benjamin Franzke uploaded patch set 45
V +104/05/24, 21:04 -
core-ci voted on patch set 45 V +1 04/05/24, 21:14 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55400
-
Benjamin Franzke uploaded patch set 46
V +104/06/24, 09:02 -
core-ci voted on patch set 46 V -1 04/06/24, 09:17 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55429
-
Benjamin Franzke marked it ready for review 04/06/24, 15:01
-
core-ci voted on patch set 46 V +1 04/06/24, 15:58 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55429
-
Benjamin Franzke rebased onto patch set 47
V +104/06/24, 15:59 -
core-ci voted on patch set 47 V +1 04/06/24, 16:13 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55441
-
Benjamin Franzke uploaded patch set 48
V +104/06/24, 16:27 -
core-ci voted on patch set 48 V +1 04/06/24, 16:35 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55446
-
Garvin Hicking commented on patch set 48 04/06/24, 18:03
(minor typos, couldn't commit myself due to the merge errors when checking out, so just as comments) Looking pretty good, hope to find some time to test it, but that'll probably be post-merge - thanks for this work!Feature-103439-TypoScriptProviderForSitesAndSets.rst:46Maybe "Set-defined" to be more readable what "defined" attributes to?Feature-103439-TypoScriptProviderForSitesAndSets.rst:59DependenciesFeature-103439-TypoScriptProviderForSitesAndSets.rst:71Maybe use "(instead of loading...folder)" to make this injection more readable?Feature-103439-TypoScriptProviderForSitesAndSets.rst:71specificFeature-103439-TypoScriptProviderForSitesAndSets.rst:85specific -
Benni Mack commented on patch set 48 04/06/24, 21:27
Feature-103439-TypoScriptProviderForSitesAndSets.rst:23"after TypoScript provided by the site" is better to read IMHOFeature-103439-TypoScriptProviderForSitesAndSets.rst:29"TypoScript dependencies can be included via set dependencies. This mechanism supersedes the previous static_file_include's or manual `@import` statements (they are still fine for local includes, but should be avoided for cross-set/extensions dependencies), as sets are automatically ordered and deduplicated." better: "TypoScript dependencies can be included via set dependencies. This mechanism is much more effective than the previous static_file_include's or manual `@import` statements (they are still fine for local includes, but should be avoided for cross-set/extensions dependencies), as sets are automatically ordered and deduplicated."Feature-103439-TypoScriptProviderForSitesAndSets.rst:40overriddenFeature-103439-TypoScriptProviderForSitesAndSets.rst:46Reply+1 -
Benjamin Kott commented on patch set 48 04/06/24, 21:34
SysTemplateTreeBuilder.php:250only .typoscript please kk thx -
Benjamin Franzke commented on patch set 48 04/06/24, 22:17
SetRegistry.php:107drop (can be introduced later if really needed) -
Benjamin Franzke uploaded patch set 49
V +104/06/24, 23:40 -
Benjamin Franzke commented on patch set 49 04/06/24, 23:40
SetRegistry.php:107ReplyDoneSysTemplateTreeBuilder.php:250ReplyAcknowledgedFeature-103439-TypoScriptProviderForSitesAndSets.rst:23ReplyDoneFeature-103439-TypoScriptProviderForSitesAndSets.rst:29ReplyDoneFeature-103439-TypoScriptProviderForSitesAndSets.rst:40ReplyDoneFeature-103439-TypoScriptProviderForSitesAndSets.rst:46ReplyAcknowledgedFeature-103439-TypoScriptProviderForSitesAndSets.rst:59ReplyDoneFeature-103439-TypoScriptProviderForSitesAndSets.rst:71ReplyWe decided to drop the functionality as it can be achieved with `@import`.Feature-103439-TypoScriptProviderForSitesAndSets.rst:71ReplyWe decided to drop this functionality as it can be achieved with `@import`.Feature-103439-TypoScriptProviderForSitesAndSets.rst:85Replysee above. -
core-ci voted on patch set 49 V -1 04/06/24, 23:50 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55456
-
Benjamin Franzke uploaded patch set 50
V -104/06/24, 23:52 -
core-ci voted on patch set 50 V +1 04/06/24, 23:58 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/55459
-
Benni Mack voted on patch set 50 CR +1 V +1 04/07/24, 07:03
-
Benjamin Kott voted on patch set 50 CR +1 V +1 04/07/24, 08:30
-
Benjamin Franzke voted on patch set 50 CR +2 V +2 04/07/24, 09:18
-
Benjamin Franzke merged patch set 51 04/07/24, 09:18
-
Christian Kuhn commented on patch set 51 04/07/24, 09:32
TypoScriptFrontendInitialization.php:103Unresolvedthat's not the intended use of this exception: the exception should only be created in pageInformationFactory->create() like above. a response should be returned here.
SiteConfiguration.php:82