[BUGFIX] Always call GU::trimExplode with string in extbase/fluid

This avoids problem when GU::trimExplode is switched to native type declarations. Also fix some possible invalid array accesses. Resolves: #97960 Relates: #97602 Releases: main Change-Id: I6a08b7a20f12475fbee7a5a817f1618e9466087c Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/75210 Tested-by: core-ci <typo3@b13.com> Tested-by: Stefan Bürk <stefan@buerk.tech> Tested-by: Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by: Stefan Bürk <stefan@buerk.tech> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
TYPO3 · Jul 27, 2022 · 03f0b01 · 03f0b01
1 parent af3f188
commit 03f0b01
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/typo3/sysext/extbase/Classes/DependencyInjection/TypeConverterPass.php b/typo3/sysext/extbase/Classes/DependencyInjection/TypeConverterPass.php
@@ -63,7 +63,7 @@ public function process(ContainerBuilder $container): void
                     );
                 }
 
-                $sources = GeneralUtility::trimExplode(',', $attributes['sources'], true);
+                $sources = GeneralUtility::trimExplode(',', (string)$attributes['sources'], true);
 
                 if ($sources === []) {
                     throw new InvalidTypeConverterConfigurationException(

diff --git a/typo3/sysext/extbase/Classes/Service/CacheService.php b/typo3/sysext/extbase/Classes/Service/CacheService.php
@@ -173,7 +173,7 @@ protected function clearPageCacheForGivenRecord(string $tableName, int $uid): vo
 
         $pageTS = BackendUtility::getPagesTSconfig($storagePage);
         if (isset($pageTS['TCEMAIN.']['clearCacheCmd'])) {
-            $clearCacheCommands = GeneralUtility::trimExplode(',', strtolower($pageTS['TCEMAIN.']['clearCacheCmd']), true);
+            $clearCacheCommands = GeneralUtility::trimExplode(',', strtolower((string)$pageTS['TCEMAIN.']['clearCacheCmd']), true);
             $clearCacheCommands = array_unique($clearCacheCommands);
             foreach ($clearCacheCommands as $clearCacheCommand) {
                 if (MathUtility::canBeInterpretedAsInteger($clearCacheCommand)) {

diff --git a/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php b/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php
@@ -61,14 +61,12 @@ public static function configurePlugin($extensionName, $pluginName, array $contr
             $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['extbase']['extensions'][$extensionName]['plugins'][$pluginName]['controllers'][$controllerClassName] = [
                 'className' => $controllerClassName,
                 'alias' => $controllerAlias,
-                'actions' => GeneralUtility::trimExplode(',', $actionsList),
+                'actions' => GeneralUtility::trimExplode(',', (string)$actionsList),
             ];
 
-            if (isset($nonCacheableControllerActions[$controllerClassName]) && !empty($nonCacheableControllerActions[$controllerClassName])) {
-                $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['extbase']['extensions'][$extensionName]['plugins'][$pluginName]['controllers'][$controllerClassName]['nonCacheableActions'] = GeneralUtility::trimExplode(
-                    ',',
-                    $nonCacheableControllerActions[$controllerClassName]
-                );
+            if (!empty($nonCacheableControllerActions[$controllerClassName])) {
+                $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['extbase']['extensions'][$extensionName]['plugins'][$pluginName]['controllers'][$controllerClassName]['nonCacheableActions']
+                    = GeneralUtility::trimExplode(',', (string)$nonCacheableControllerActions[$controllerClassName]);
             }
         }
 

diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
@@ -121,7 +121,7 @@ public function initializeArguments(): void
     public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext): string
     {
         $data = $renderChildrenClosure();
-        $typoscriptObjectPath = $arguments['typoscriptObjectPath'];
+        $typoscriptObjectPath = (string)$arguments['typoscriptObjectPath'];
         $currentValueKey = $arguments['currentValueKey'];
         $table = $arguments['table'];
         $contentObjectRenderer = self::getContentObjectRenderer($renderingContext->getRequest());

diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php
@@ -91,7 +91,7 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
         } else {
             $units = LocalizationUtility::translate('viewhelper.format.bytes.units', 'fluid');
         }
-        $units = GeneralUtility::trimExplode(',', $units, true);
+        $units = GeneralUtility::trimExplode(',', (string)$units, true);
 
         $value = $renderChildrenClosure();