Review main Merged

89660[BUGFIX] Prevent attaching non-object values in ObjectStorageConverter

Stefan Froemken CR +2 V +2 Normal +225 −4 updated 09/02/26, 14:31

Commit message

Ensure that only objects are attached to ObjectStorage by adding an
explicit is_object check when iterating over $convertedChildProperties
in the ObjectStorageConverter. This avoids potential runtime errors
when $convertedChildProperties may contain non-object entries.

This issue became evident when processing data via
PersistentObjectConverter, where non-object values could be present in
the child properties, in contrast to handling via ObjectConverter. To
ensure both converters behave consistently and handle edge cases
correctly, extended functional tests have been implemented for both
PersistentObjectConverter and ObjectConverter.

Review

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

Issues 1

Files 4

Review log 1524

  1. Stefan Froemken uploaded patch set 1 06/06/25, 10:23

  2. core-ci voted on patch set 1 V -1 06/06/25, 10:29 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/79981

  3. Stefan Froemken uploaded patch set 2 V -1 06/06/25, 10:45

  4. Mathias Brodala commented on patch set 1 CR -1 06/06/25, 10:49

    ObjectStorageConverter.php:44

    This should be an early "continue" instead. Also it looks like this is handled inconsistently within ObjectStorage. Some locations have an "is_object" check some don't. If is_object() is used, it guards said spl_object_hash() call. So I'd vote for fixing this in ObjectStorage instead.
  5. core-ci voted on patch set 2 V +1 06/06/25, 10:51 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/79982

  6. Stefan Froemken uploaded patch set 3 V +1 06/06/25, 11:31

  7. Stefan Froemken commented on patch set 3 06/06/25, 11:34

    ObjectStorageConverter.php:44 Reply

    It's not solvable within ObjectStorage. Since TYPO3 13 attach() expects $object to be of type "object". null is not allowed as argument. But I have changed code to use "continue"
  8. Stefan Froemken updated the commit message in patch set 4 06/06/25, 11:37

  9. core-ci voted on patch set 3 V +1 06/06/25, 11:39 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/79985

  10. Benni Mack updated the commit message in patch set 5 04/22/26, 06:34

  11. core-ci voted on patch set 5 V -1 04/22/26, 07:23 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/100736

  12. core-ci commented on patch set 5 05/03/26, 08:35 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/100736

  13. core-ci commented on patch set 5 05/03/26, 08:36 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/100736

  14. core-ci commented on patch set 5 05/03/26, 08:39 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/100736

  15. Oliver Klee updated the commit message in patch set 6 V -1 05/03/26, 08:40

  16. core-ci voted on patch set 6 V -1 05/03/26, 08:42 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/101431

  17. Oliver Klee commented on patch set 6 05/04/26, 06:38

    Needs a rebase to at least update `runTests.sh` and get the CI build running again.
  18. Georg Ringer rebased onto patch set 7 V -1 09/02/26, 13:42

  19. core-ci voted on patch set 7 V +1 09/02/26, 13:48 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/107636

  20. Georg Ringer voted on patch set 7 CR +1 V +1 09/02/26, 13:53

  21. Oliver Klee voted on patch set 7 CR +1 V +1 09/02/26, 13:57

  22. Georg Ringer voted on patch set 7 CR +2 V +2 09/02/26, 14:21

  23. Benni Mack voted on patch set 7 CR +1 V +1 09/02/26, 14:22

  24. Georg Ringer merged patch set 8 09/02/26, 14:31