Review main Merged

93698[BUGFIX] Fix operator precedence in imageMagickExec

Heiko Hardt CR +2 V +2 Easy +1 −1 updated 04/17/26, 09:22

Commit message

In #108933 the imageMagick command was adjusted to evaluate
whether "+matte" needs to be used for compatibility.
The syntax for one of the conditions missed proper operator
precedence, and due to concatenation failed to utilize the
proper attribute.
This patch inserts parentheses to ensure proper ternary
operator results.

Review

  • Code review CR +2 Done
    • Garvin Hicking +2
    • Oliver Klee +1
    • André Buchmann +1
  • Verified V +2 Done
    • Garvin Hicking +2
    • André Buchmann +1

Issues 2

Files 1

Review log 1922

  1. Heiko Hardt uploaded patch set 1 04/16/26, 19:09

  2. core-ci voted on patch set 1 V +1 04/16/26, 19:18 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/100343

  3. Garvin Hicking voted on patch set 1 CR +1 V +1 04/16/26, 19:24

  4. Benjamin Kott commented on patch set 1 04/16/26, 19:54

    please see https://review.typo3.org/c/Packages/TYPO3.CMS/+/93666, this patch here only targets one of the issues and compat problems introduced in gifbuilder, see styleguide demos for comparison. having GM and IM compatible fully and to produce the same results there are more changes necessary that cannot easily be done. - emboss - edge - shear - autolevels and other effects are also impacted Aside from more logic issues in that area like unnecessary IM/GM calls here and avoid filesystem roundtrips for things that can be done in memory only and GifBuilder to GD only operations until we can target, specific IM/GM versions correctly and the processing is not mixed up. See the following for a broader picture to also tackle wrong assumptions of files can be processed or not, as well as detailed effect comparison across the 3 engines: 93628: [WIP][TASK] ALLOW GD ONLY | https://review.typo3.org/c/Packages/TYPO3.CMS/+/93628
  5. Garvin Hicking commented on patch set 1 04/17/26, 05:10

    (Please note this one affects v12 too, bu

    Reply

    Thanks! I do however think we could get this one in here before yours is merged as an interim, just because for now it is not very intrusive and fixed a very small scoped bug.
  6. André Buchmann commented on patch set 1 CR +1 V +1 04/17/26, 07:27

    Thanks for catching this syntax error
  7. Garvin Hicking commented on patch set 1 04/17/26, 07:28

    Reply

    accidentally submitted: "but v12 LTS is EOL and implementing a fix for this will be part of the ELTS decision scope"
  8. Oliver Hader commented on patch set 1 04/17/26, 07:59

    Reply

    Even if v12 is EOL at that time, this patch still should be merged to v12, since the previous change introduced a regression here (and the change is supposed to be merged prior to v12 EOL)
  9. Garvin Hicking updated the commit message in patch set 2 CR +1 V +1 04/17/26, 08:30

  10. Garvin Hicking commented on patch set 2 CR +1 V +1 04/17/26, 08:30

    Reply

    Alright; I contacted Andi yesterday already and was under the impression this would be addressed in ELTS scope. I've adjusted this backport range.
  11. Oliver Hader commented on patch set 2 04/17/26, 08:30

    Reply

    Thanks 😊
  12. André Buchmann voted on patch set 2 CR +1 V +1 04/17/26, 08:31

  13. Oliver Klee voted on patch set 2 CR +1 04/17/26, 08:35

  14. core-ci voted on patch set 2 V +1 04/17/26, 08:39 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/100367

  15. Garvin Hicking commented on patch set 2 CR +2 V +2 04/17/26, 08:40

    I will merge this under the preface that the GifBuilder might be subject to fundamental required changes in the near future, which will make the patch obsolete - however, until then, this is as good as it gets. ;)
  16. Garvin Hicking updated the commit message in patch set 3 CR +1 V +1 04/17/26, 08:44

  17. Garvin Hicking commented on patch set 3 CR +1 V +1 04/17/26, 08:44

    Reply

    Sorry, I did not research properly. v12 is actually NOT affected because concatenation there did not place.
  18. André Buchmann voted on patch set 3 CR +1 V +1 04/17/26, 08:46

  19. Oliver Klee voted on patch set 3 CR +1 04/17/26, 08:48

  20. Garvin Hicking voted on patch set 3 CR +2 V +2 04/17/26, 08:58

  21. Garvin Hicking merged patch set 4 04/17/26, 08:59

  22. core-ci voted on patch set 3 V +1 04/17/26, 09:22 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/100371