Review main Merged

95268[TASK] Replace deprecated SORT_LOCALE_STRING flag

Stefan Bürk CR +2 V +2 Normal +101 −2 updated 11/04/26, 20:29

Commit message

PHP 8.6 deprecates SORT_LOCALE_STRING. Use SORT_STRING for
sortByOptionLabel in the select and country-select ViewHelpers
on PHP 8.6 and newer. Keep locale-aware sorting on older PHP versions.
Preserve option keys and prioritized countries.

Frontend routing sets LC_COLLATE from the site language. Upgrading to
PHP 8.6 can therefore change option order for non-C collations, even
without custom setlocale() calls.

Tests cover numeric, mixed-case and non-ASCII labels, country codes,
priorities and sorting under a non-C locale across PHP versions.

Review

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

Issues 2

Files 4

Review log 1824

  1. Stefan Bürk uploaded patch set 1 08/11/26, 18:35

  2. core-ci voted on patch set 1 V +1 08/11/26, 18:45 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/106463

  3. Wouter Wolters uploaded patch set 2 V +1 11/01/26, 10:23

  4. core-ci voted on patch set 2 V -1 11/01/26, 10:41 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/113003

  5. Wouter Wolters uploaded patch set 3 V -1 11/01/26, 11:26

  6. core-ci voted on patch set 3 V +1 11/01/26, 11:34 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/113010

  7. Wouter Wolters updated the commit message in patch set 4 V +1 11/01/26, 12:51

  8. Wouter Wolters updated the commit message in patch set 5 11/01/26, 12:51

  9. Wouter Wolters updated the commit message in patch set 6 11/01/26, 12:52

  10. core-ci voted on patch set 6 V +1 11/01/26, 13:00 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/113017

  11. Wouter Wolters voted on patch set 6 CR +1 V +1 11/01/26, 13:37

  12. Benni Mack marked it ready for review 11/01/26, 21:11

  13. Benni Mack commented on patch set 6 11/01/26, 21:13

    we _could_ theoretically check for the PHP version and keep the old behavior for older versions
  14. Benni Mack commented on patch set 6 CR -1 11/01/26, 21:13

    The important RST has the wrong issue number
  15. Wouter Wolters commented on patch set 6 11/01/26, 21:20

    Reply

    I removed the RST in patchset 3 already.
  16. Oliver Klee voted on patch set 6 CR +1 V +1 11/01/26, 21:28

  17. Benni Mack commented on patch set 6 11/02/26, 05:39

    Reply

    Done
  18. Wouter Wolters uploaded patch set 7 CR +1 V +1 11/04/26, 18:15

  19. Wouter Wolters voted on patch set 7 CR +1 V +1 11/04/26, 18:27

  20. Oliver Klee voted on patch set 7 CR +1 V +1 11/04/26, 18:31

  21. core-ci voted on patch set 7 V -1 11/04/26, 20:00 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/113311

  22. core-ci voted on patch set 7 V +1 11/04/26, 20:10 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/113311

  23. Benni Mack commented on patch set 7 CR +2 V +2 11/04/26, 20:29

    Reply

    Done
  24. Benni Mack merged patch set 8 11/04/26, 20:29