Review main Merged

88060[BUGFIX] Fix site set typoscript loading on windows

Steffen Mächtel CR +2 V +2 Easy +2 −1 updated 02/07/25, 21:27

Commit message

The site set paths obtained by symfony finder
contain platform specific directory separators, while
downstream services like the TypoScript include-processor
imply normalized filenames to be provided – for operations
like `rtrim(…, '/')`.

The site set filenames are now normalized early on
to allow subsequent operations to imply forward slashes.

Review

  • Code review CR +2 Done
    • Benjamin Franzke +2
    • Christian Kuhn +1
    • Benjamin Kott +1
    • Steffen Mächtel +1
  • Verified V +2 Done
    • Benjamin Franzke +2
    • Benjamin Kott +1
    • Steffen Mächtel +1
    • core-ci +1 CI

Issues 1

Files 1

Review log 1214

  1. Steffen Mächtel uploaded patch set 1 02/06/25, 21:59

  2. core-ci voted on patch set 1 V +1 02/06/25, 22:05 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/73677

  3. Christian Kuhn voted on patch set 1 CR +1 02/06/25, 22:45

  4. Garvin Hicking commented on patch set 1 CR +1 02/07/25, 06:01

    Sadly I don't have a windows setup to properly verify this, but this "should work"
  5. Benjamin Franzke uploaded patch set 2 CR +1 V +1 02/07/25, 11:33

  6. Benjamin Franzke commented on patch set 2 02/07/25, 11:33

    Verified the issue and fix on Windows 11 with native PHP Development server.

    YamlSetDefinitionProvider.php:64

    It does not make sense to apply this after the `dirname` invocation. (The issue is not realted to this dirname, but to `rtrim(…, '/')` in the TypoScript include processor. We should do this normalization early on.
  7. Benjamin Kott voted on patch set 2 CR +1 V +1 02/07/25, 11:44

  8. Benjamin Franzke voted on patch set 2 CR +2 V +2 02/07/25, 11:44

  9. core-ci voted on patch set 2 V +1 02/07/25, 11:44 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/73717

  10. Christian Kuhn voted on patch set 2 CR +1 02/07/25, 11:45

  11. Benjamin Franzke merged patch set 3 02/07/25, 12:03

  12. Benjamin Franzke commented on patch set 2 CR +2 V +2 02/07/25, 12:23

    There is another issue with labels, but I'll fix that in a separate patch.
  13. Steffen Mächtel commented on patch set 3 CR +1 V +1 02/07/25, 21:24

    tested the new version of patch on windows 10. i can confirm it works.
  14. Steffen Mächtel commented on patch set 3 02/07/25, 21:27

    YamlSetDefinitionProvider.php:64 Reply

    Good finding. I thought it was "dirname". But its correct, its "$fileInfo->getPathname()" earlier on.