Review main Merged

78331[BUGFIX] Support @import 'EXT:.../TypoScript/*.setup.typoscript'

Christian Kuhn CR +2 V +2 Normal +131 −14 updated 03/30/23, 15:10

Commit message

While a pattern like "@import 'EXT:.../TypoScript/*.typoscript'"
works already, "@import 'EXT:.../TypoScript/*.setup.typoscript'"
did not.

The patch adapts the wildcard resolver to deal with this, the
code is hopefully easier to follow along the way. A functional
test is added to cover above scenario.

The "TypoScript syntax changes" is tuned to clarify which
syntax for @import is supported, including a list of valid
and invalid examples.

Review

  • Code review CR +2 Done
    • Christian Kuhn +2
    • Stefan Bürk +1
    • Nikita Hovratov +1
  • Verified V +2 Done
    • Christian Kuhn +2
    • Stefan Bürk +1
    • Nikita Hovratov +1
    • core-ci +1 CI

Issues 4

Files 8

Review log 1214

  1. Christian Kuhn uploaded patch set 1 03/30/23, 11:07

  2. Christian Kuhn uploaded patch set 2 03/30/23, 11:10

  3. Christian Kuhn uploaded patch set 3 03/30/23, 11:13

  4. core-ci voted on patch set 3 V +1 03/30/23, 11:21 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/39865

  5. Christian Kuhn uploaded patch set 4 V +1 03/30/23, 11:24

  6. core-ci voted on patch set 4 V +1 03/30/23, 11:31 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/39866

  7. Stefan Bürk commented on patch set 4 03/30/23, 11:55

    Breaking-97816-TypoScriptSyntaxChanges.rst:171

    What do you think, should we make this really clear with: `path traversal (parent directories) using...` ?
  8. Stefan Bürk commented on patch set 4 03/30/23, 11:59

    TreeFromLineStreamBuilder.php:326

    nitpicking, but .. should we not avoid using "prefix" here for the variable names and instead use: ``` $leftPartFromWildcard $rightPartFromWildcard // or $rightPartFromWildcardWithFileSuffix ``` I guess this would make it easier in the future if looking into these lines. but fine keeping currently variable names.
  9. Stefan Bürk voted on patch set 4 V +1 CR +1 03/30/23, 11:59

  10. Christian Kuhn commented on patch set 4 03/30/23, 12:14

    TreeFromLineStreamBuilder.php:326 Reply

    i renamed those twice already and came back to $leftPrefix / $rightPrefix again. i think this matches the content of these variables pretty well. let's keep it.

    Breaking-97816-TypoScriptSyntaxChanges.rst:171 Reply

    i hope that's obvious enough already, and technically correct. the examples below show according scenarios.
  11. Nikita Hovratov voted on patch set 4 V +1 CR +1 03/30/23, 12:40

  12. Benni Mack commented on patch set 4 03/30/23, 13:12

    TreeFromLineStreamBuilder.php:326 Reply

    let's keep in mind to extract this logic in some more generic place at some point in our lives. Otherwise, fine by me
  13. Christian Kuhn voted on patch set 4 V +2 CR +2 03/30/23, 15:10

  14. Christian Kuhn merged patch set 5 03/30/23, 15:10