Review main Merged

69854[BUGFIX] Remove prefixed scriptName from urlPath in PageRouter

Stefan Bürk CR +2 V +2 Easy +27 −2 updated 08/23/21, 18:31

Commit message

Remove resolved scriptName with leading slash from url in
PageRouter matchRequest method.

This prevent to change the url to a invalid url if
PageTypeSuffix Decorator with .php is used and a page slugs
ends in index.

Review

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

Issues 1

Files 3

Review log 1623

  1. Stefan Bürk uploaded patch set 1 07/14/21, 18:24

  2. Stefan Bürk rebased onto patch set 2 07/14/21, 18:26

  3. core-ci voted on patch set 1 V +1 07/14/21, 18:36 Core CI is happy: https://gitlab.typo3.org/TYPO3/CI/cms/-/pipelines/13329

  4. Stefan Bürk updated the commit message in patch set 3 07/14/21, 18:40

  5. core-ci voted on patch set 2 V +1 07/14/21, 18:43 Core CI is happy: https://gitlab.typo3.org/TYPO3/CI/cms/-/pipelines/13330

  6. core-ci voted on patch set 3 V +1 07/14/21, 18:58 Core CI is happy: https://gitlab.typo3.org/TYPO3/CI/cms/-/pipelines/13333

  7. Stefan Bürk updated the commit message in patch set 4 07/14/21, 20:30

  8. core-ci voted on patch set 4 V +1 07/14/21, 20:42 Core CI is happy: https://gitlab.typo3.org/TYPO3/CI/cms/-/pipelines/13337

  9. Stefan Bürk uploaded patch set 5 07/24/21, 11:21

  10. core-ci voted on patch set 5 V +1 07/24/21, 11:34 Core CI is happy: https://gitlab.typo3.org/TYPO3/CI/cms/-/pipelines/13710

  11. Stefan Bürk uploaded patch set 6 08/06/21, 18:46

  12. Stefan Bürk marked it ready for review 08/06/21, 18:47

  13. core-ci voted on patch set 6 V +1 08/06/21, 19:02 Core CI is happy: https://gitlab.typo3.org/typo3/CI/cms/-/pipelines/14221

  14. Stefan Bürk rebased onto patch set 7 08/06/21, 19:03

  15. core-ci voted on patch set 7 V +1 08/06/21, 19:14 Core CI is happy: https://gitlab.typo3.org/typo3/CI/cms/-/pipelines/14222

  16. Benni Mack commented on patch set 7 08/09/21, 13:24

    PageRouter.php:149

    Should we keep the '/' and not do the ltrim?
  17. Stefan Bürk commented on patch set 7 08/09/21, 14:39

    PageRouter.php:149 Reply

    But then we have to add a further check to the condition, to check for $scriptName !== '/' .. which was obsolete through ltrim() if scriptName was simply a backslash for the empty check/check if replace should be done ? So remove the ltrim, leave the strreplace as is (simply script name) and extend the condition, right ? Can do that, if this is the right way. Remove the ltrim without extending the condition feels not right, maybe I'm wrong
  18. Benni Mack commented on patch set 7 V +1 CR +1 08/09/21, 14:42

    PageRouter.php:149 Reply

    good point. let's keep it that way.
  19. Wouter Wolters voted on patch set 7 CR +1 08/10/21, 08:58

  20. Wouter Wolters voted on patch set 7 V +1 08/12/21, 18:12

  21. Benni Mack voted on patch set 7 V +2 CR +2 08/13/21, 10:26

  22. Benni Mack merged patch set 8 08/13/21, 10:26

  23. Benni Mack wrote 08/23/21, 18:31

    Created a revert of this change as I980feb08f3a507d51ad059763748ee64752aa9a3