71913[BUGFIX] Consider language in redirects:checkintegrity
Commit message
Review
-
Code review CR +2 Done
- Benni Mack +2
- Sybille Peters +1
- Stefan Bürk +1
-
Verified V +2 Done
- Benni Mack +2
- Sybille Peters +1
- Stefan Bürk +1
- core-ci +1 CI
Issues 1
Files 5
- typo3/sysext/redirects/Classes/Service/IntegrityService.php+82 −50
- typo3/sysext/redirects/Tests/Functional/Service/Fixtures/IntegrityServiceTest_sourcePathWithMatchingSlugInLocalizedPageIsNotReportedAsConflict.xmlnew+38 −0
- typo3/sysext/redirects/Tests/Functional/Service/Fixtures/LocalizedPages.csv+10 −9
- typo3/sysext/redirects/Tests/Functional/Service/Fixtures/sys_redirect.csv+2 −0
- typo3/sysext/redirects/Tests/Functional/Service/IntegrityServiceTest.php+54 −4
Review log 911
-
Benni Mack commented on patch set 1 10/21/21, 10:27
Cherry Picked from branch master. The following files contain Git conflicts: * typo3/sysext/redirects/Classes/Service/IntegrityService.php * typo3/sysext/redirects/Tests/Functional/Service/IntegrityServiceTest.php -
core-ci voted on patch set 1 V -1 10/21/21, 10:28 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/18397
-
Benni Mack marked it ready for review 10/21/21, 10:35
-
Sybille Peters commented on patch set 1 10/21/21, 11:04
There are still merge conflicts in the file. When I tested the patch for 10.4, I had a lot of merge conflicts too. I then copied the entire file IntegrityService from 11 and just replaced fetchAssociative() with fetch() in 2 places. I guess that is a little unorthodox to do. But streamlining 10 and 11 would be helpful in the future to backport the other changes - if needed. -
Stefan Bürk uploaded patch set 2 10/21/21, 11:15
-
Stefan Bürk commented on patch set 2 10/21/21, 11:19
Reply
Not that hard. Locally tests where okay. Let's see what Core CI has to say now. Basicly solving merge conflict cleanly. Manually changes: * replace 'fetchAssociative()' with 'fetch()' * removed 2 tailing slashes for where() constraints, to be keep php7.2 compatibility (parsing error) -
core-ci voted on patch set 2 V +1 10/21/21, 11:23 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/18399
-
Stefan Bürk commented on patch set 2 V +1 CR +1 10/21/21, 11:24
Sybille, do you want to retry the exact patchset in your instance ? -
Sybille Peters commented on patch set 2 V +1 CR +1 10/21/21, 12:58
Thank you 😊 -
Benni Mack voted on patch set 2 V +2 CR +2 10/21/21, 13:44
-
Benni Mack merged patch set 3 10/21/21, 13:44