[TASK] Improve code to avoid Scrutinizer warnings

Releases: master
Resolves: #86481
Change-Id: I87b9a07b6cc10c4379a6bf3e1c0e1695354b574a
Reviewed-on: https://review.typo3.org/58505


Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Stephan Großberndt <stephan.grossberndt@typo3.org>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Jan Stockfisch <typo3@jan-stockfisch.de>
Reviewed-by: Andreas Wolf <andreas.wolf@typo3.org>
Tested-by: Andreas Wolf <andreas.wolf@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>