Review main Merged

92563[BUGFIX] Allow extensions to self-handle localization files in custom directories

Ayke Halder CR +2 V +2 Normal +56 −3 updated 01/29/26, 11:22

Commit message

Extensions like Content Blocks can now self-handle their own
localization files in their custom directories like:

* `EXT:example/ContentBlocks/ContentElements/foo/language/labels.xlf`
* `EXT:example/ContentBlocks/ContentElements/bar/language/labels.xlf`

Before these two file names from the example above resulted in the
generation of an identical cache key and thereby only one of these
files was loaded.

Review

  • Code review CR +2 Done
    • Georg Ringer +2
    • Benni Mack +1
  • Verified V +2 Done
    • Georg Ringer +2
    • Oliver Klee +1
    • Benni Mack +1
    • core-ci +1 CI

Issues 2

Files 4

Review log 1317

  1. Ayke Halder uploaded patch set 1 01/28/26, 18:46

  2. core-ci voted on patch set 1 V +1 01/28/26, 18:54 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/94527

  3. Benni Mack uploaded patch set 2 V +1 01/28/26, 21:05

  4. core-ci voted on patch set 2 V -1 01/28/26, 21:16 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/94534

  5. Georg Ringer commented on patch set 2 CR +1 V +1 01/29/26, 07:54

    works in my project!
  6. Nikita Hovratov uploaded patch set 3 CR +1 V +1 01/29/26, 08:27

  7. Nikita Hovratov voted on patch set 3 CR +1 V +1 01/29/26, 08:28

  8. core-ci voted on patch set 3 V +1 01/29/26, 08:36 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/94555

  9. Oliver Klee voted on patch set 3 V +1 01/29/26, 08:42

  10. Ayke Halder uploaded patch set 4 CR +1 V +1 01/29/26, 08:43

  11. Ayke Halder commented on patch set 4 01/29/26, 08:50

    Ready for re-vote: @georg.ringer@gmail.com @nikita.h@live.de @typo3-coding@oliverklee.de ---- Running first ``` self::assertNotSame($fooDomain, $barDomain, '…') ``` and afterwards ``` self::assertSame('fixed-value-A', $fooDomain); self::assertSame('fixed-value-B', $barDomain); ``` did the trick to please phpstan. Old phpstan failure: ``` 530 Call to static method PHPUnit\Framework\Assert::assertNotSame() with arguments 'test_translation…', 'test_translation…' and 'Files with the same…' will always evaluate to true. 🪪 staticMethod.alreadyNarrowedType ```
  12. core-ci voted on patch set 4 V +1 01/29/26, 08:50 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/94556

  13. Benni Mack voted on patch set 4 CR +1 V +1 01/29/26, 08:54

  14. Oliver Klee voted on patch set 4 V +1 01/29/26, 08:54

  15. Georg Ringer voted on patch set 4 CR +2 V +2 01/29/26, 09:39

  16. Georg Ringer merged patch set 5 01/29/26, 09:39

  17. Nikita Hovratov commented on patch set 5 01/29/26, 11:22

    Reply

    ack