BUGFIX: Get data for ContentBlockData from processedData

Classes/DataProcessing/ResponsiveImagesProcessor.php

@@ -26,7 +26,9 @@
 use Codappix\ResponsiveImages\Domain\Factory\BreakpointFactory;
 use Codappix\ResponsiveImages\Domain\Factory\RootlineFactory;
 use RuntimeException;
+use TYPO3\CMS\ContentBlocks\DataProcessing\ContentBlockData;
 use TYPO3\CMS\Core\Resource\FileInterface;
+use TYPO3\CMS\Core\Resource\FileRepository;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3\CMS\Frontend\ContentObject\DataProcessorInterface;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
@@ -42,11 +44,13 @@ final class ResponsiveImagesProcessor implements DataProcessorInterface
 
     private array $contentElementSizes = [];
 
+    private array $processedData = [];
+
     public function __construct(
+        private readonly FileRepository $fileRepository,
         private readonly BreakpointFactory $breakpointFactory,
         private readonly RootlineFactory $rootlineFactory
-    ) {
-    }
+    ) {}
 
     public function process(
         ContentObjectRenderer $cObj,
@@ -60,6 +64,8 @@ public function process(
             return $processedData;
         }
 
+        $this->processedData = $processedData;
+
         $filesDataKey = (string) $cObj->stdWrapValue(
             'filesDataKey',
             $processorConfiguration,
@@ -70,10 +76,17 @@ public function process(
             $processorConfiguration,
             'image'
         );
-        if (isset($processedData[$filesDataKey]) && is_array($processedData[$filesDataKey])) {
-            $this->files = $processedData[$filesDataKey];
-        } else {
-            // Files key is empty or not configured.
+        $targetFieldName = (string) $cObj->stdWrapValue(
+            'as',
+            $processorConfiguration,
+            'responsiveImages'
+        );
+
+        $this->files = $this->getFiles($filesDataKey, $fieldName);
+
+        if (empty($this->files)) {
+            $processedData[$targetFieldName] = [];
+
             return $processedData;
         }
 
@@ -82,16 +95,10 @@ public function process(
             throw new RuntimeException('Could not fetch TypoScriptFrontendController from request.', 1712819889);
         }
 
-        $rootline = $this->rootlineFactory->create($processedData['data'], $fieldName, $tsfe);
+        $rootline = $this->rootlineFactory->create($this->getData(), $fieldName, $tsfe);
         $this->contentElementSizes = $rootline->getFinalSize();
         $this->calculateFileDimensions();
 
-        $targetFieldName = (string) $cObj->stdWrapValue(
-            'as',
-            $processorConfiguration,
-            'responsiveImages'
-        );
-
         $processedData[$targetFieldName] = $this->calculatedFiles;
 
         return $processedData;
@@ -128,4 +135,43 @@ private function calculateFileDimensionForBreakpoints(): array
 
         return $fileDimensions;
     }
+
+    public function getData(): array
+    {
+        if (
+            $this->processedData['data'] instanceof ContentBlockData
+        ) {
+            assert(is_array($this->processedData['data']->_raw));
+            $data = $this->processedData['data']->_raw;
+        } else {
+            assert(is_array($this->processedData['data']));
+            $data = $this->processedData['data'];
+        }
+
+        return $data;
+    }
+
+    private function getFiles(string $filesDataKey, string $fieldName): array
+    {
+        if (
+            isset($this->processedData[$filesDataKey])
+            && is_array($this->processedData[$filesDataKey])
+        ) {
+            return $this->processedData[$filesDataKey];
+        }
+
+        if ($fieldName === '') {
+            return [];
+        }
+
+        if ($this->processedData['data'] instanceof ContentBlockData) {
+            return $this->processedData['data']->{$fieldName};
+        }
+
+        return $this->fileRepository->findByRelation(
+            'tt_content',
+            $fieldName,
+            $this->processedData['data']['uid']
+        );
+    }
 }