TASK: Add ContentBlocks Support

Classes/DataProcessing/ResponsiveImagesProcessor.php

@@ -23,28 +23,21 @@
  * 02110-1301, USA.
  */
 
-use Codappix\ResponsiveImages\Domain\Factory\BreakpointFactory;
-use Codappix\ResponsiveImages\Domain\Factory\RootlineFactory;
+use Codappix\ResponsiveImages\Service\ResponsiveImageService;
 use RuntimeException;
-use TYPO3\CMS\Core\Resource\FileInterface;
+use TYPO3\CMS\ContentBlocks\DataProcessing\ContentBlockData;
+use TYPO3\CMS\Core\Resource\FileRepository;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3\CMS\Frontend\ContentObject\DataProcessorInterface;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 final class ResponsiveImagesProcessor implements DataProcessorInterface
 {
-    /**
-     * @var FileInterface[]
-     */
-    private array $files = [];
-
-    private array $calculatedFiles = [];
-
-    private array $contentElementSizes = [];
+    private array $processedData;
 
     public function __construct(
-        private readonly BreakpointFactory $breakpointFactory,
-        private readonly RootlineFactory $rootlineFactory
+        private readonly ResponsiveImageService $responsiveImageService,
+        private readonly FileRepository $fileRepository
     ) {
     }
 
@@ -58,6 +51,8 @@ public function process(
             return $processedData;
         }
 
+        $this->processedData = $processedData;
+
         $filesDataKey = (string) $cObj->stdWrapValue(
             'filesDataKey',
             $processorConfiguration,
@@ -68,10 +63,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'
+        );
+
+        $files = $this->getFiles($filesDataKey, $fieldName);
+
+        if (empty($files)) {
+            $processedData[$targetFieldName] = [];
+
             return $processedData;
         }
 
@@ -80,50 +82,41 @@ public function process(
             throw new RuntimeException('Could not fetch TypoScriptFrontendController from request.', 1712819889);
         }
 
-        $rootline = $this->rootlineFactory->create($processedData['data'], $fieldName, $tsfe);
-        $this->contentElementSizes = $rootline->getFinalSize();
-        $this->calculateFileDimensions();
-
-        $targetFieldName = (string) $cObj->stdWrapValue(
-            'as',
-            $processorConfiguration,
-            'responsiveImages'
-        );
+        if (
+            $this->processedData['data'] instanceof ContentBlockData
+        ) {
+            assert(is_array($this->processedData['data']->_raw));
+            $data = $this->processedData['data']->_raw;
+        } else {
+            $data = $this->processedData['data'];
+        }
 
-        $processedData[$targetFieldName] = $this->calculatedFiles;
+        $processedData[$targetFieldName] = $this->responsiveImageService->getCalculatedFiles($files, $data, $fieldName, $tsfe);
 
         return $processedData;
     }
 
-    private function calculateFileDimensions(): void
+    private function getFiles(string $filesDataKey, string $fieldName): array
     {
-        foreach ($this->files as $file) {
-            $calculatedFile = [
-                'media' => $file,
-                'sizes' => $this->calculateFileDimensionForBreakpoints(),
-            ];
-
-            $this->calculatedFiles[] = $calculatedFile;
+        if (
+            isset($this->processedData[$filesDataKey])
+            && is_array($this->processedData[$filesDataKey])
+        ) {
+            return $this->processedData[$filesDataKey];
         }
-    }
-
-    private function calculateFileDimensionForBreakpoints(): array
-    {
-        $fileDimensions = [];
 
-        $breakpoints = $this->breakpointFactory->getByConfigurationPath(['breakpoints']);
-
-        foreach ($breakpoints as $breakpoint) {
-            if (isset($this->contentElementSizes[$breakpoint->getIdentifier()]) === false) {
-                continue;
-            }
+        if ($fieldName === '') {
+            return [];
+        }
 
-            $fileDimensions[$breakpoint->getIdentifier()] = [
-                'breakpoint' => $breakpoint,
-                'size' => $this->contentElementSizes[$breakpoint->getIdentifier()],
-            ];
+        if ($this->processedData['data'] instanceof ContentBlockData) {
+            return $this->processedData['data']->{$fieldName};
         }
 
-        return $fileDimensions;
+        return $this->fileRepository->findByRelation(
+            'tt_content',
+            $fieldName,
+            $this->processedData['data']['uid']
+        );
     }
 }

Classes/Service/ResponsiveImageService.php

@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Codappix\ResponsiveImages\Service;
+
+use Codappix\ResponsiveImages\Domain\Factory\BreakpointFactory;
+use Codappix\ResponsiveImages\Domain\Factory\RootlineFactory;
+use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
+
+final class ResponsiveImageService
+{
+    private array $files = [];
+
+    private array $contentElementSizes = [];
+
+    public function __construct(
+        private readonly BreakpointFactory $breakpointFactory,
+        private readonly RootlineFactory $rootlineFactory
+    ) {
+    }
+
+    public function getCalculatedFiles(
+        array $files,
+        array $data,
+        string $fieldName,
+        TypoScriptFrontendController $tsfe
+    ): array {
+        $this->files = $files;
+
+        $rootline = $this->rootlineFactory->create($data, $fieldName, $tsfe);
+        $this->contentElementSizes = $rootline->getFinalSize();
+
+        return $this->calculateFileDimensions();
+    }
+
+    private function calculateFileDimensions(): array
+    {
+        $calculatedFiles = [];
+
+        foreach ($this->files as $file) {
+            $calculatedFiles[] = [
+                'media' => $file,
+                'sizes' => $this->calculateFileDimensionForBreakpoints(),
+            ];
+        }
+
+        return $calculatedFiles;
+    }
+
+    private function calculateFileDimensionForBreakpoints(): array
+    {
+        $fileDimensions = [];
+
+        $breakpoints = $this->breakpointFactory->getByConfigurationPath(['breakpoints']);
+
+        foreach ($breakpoints as $breakpoint) {
+            if (isset($this->contentElementSizes[$breakpoint->getIdentifier()]) === false) {
+                continue;
+            }
+
+            $fileDimensions[$breakpoint->getIdentifier()] = [
+                'breakpoint' => $breakpoint,
+                'size' => $this->contentElementSizes[$breakpoint->getIdentifier()],
+            ];
+        }
+
+        return $fileDimensions;
+    }
+}

Configuration/Services.yaml

@@ -28,6 +28,10 @@ services:
 
     Codappix\ResponsiveImages\DataProcessing\ResponsiveImagesProcessor:
         public: true
+        tags:
+            -
+                name: 'data.processor'
+                identifier: 'responsive-images'
 
     Codappix\ResponsiveImages\Configuration\ConfigurationManager:
         arguments:

Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/0colDatabase.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$pathinfo = pathinfo(__FILE__);
+$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+$configuration = include $path;
+
+$configuration['tt_content'][1]['CType'] = 'codappix_image';
+
+return $configuration;

Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/0colImageFixWidthDatabase.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$pathinfo = pathinfo(__FILE__);
+$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+$configuration = include $path;
+
+$configuration['tt_content'][1]['CType'] = 'codappix_imagefixedwidth';
+
+return $configuration;

Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/1col2colDatabase.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$pathinfo = pathinfo(__FILE__);
+$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+$configuration = include $path;
+
+$configuration['tt_content'][2]['CType'] = 'codappix_image';
+
+return $configuration;

Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/1col2colFullWidthDatabase.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$pathinfo = pathinfo(__FILE__);
+$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+$configuration = include $path;
+
+$configuration['tt_content'][2]['CType'] = 'codappix_image';
+
+return $configuration;

Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/1col2colWidthContainerMultiplierDatabase.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$pathinfo = pathinfo(__FILE__);
+$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+$configuration = include $path;
+
+$configuration['tt_content'][2]['CType'] = 'codappix_image';
+
+return $configuration;

Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/1col2colWidthContainerSizeDatabase.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$pathinfo = pathinfo(__FILE__);
+$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+$configuration = include $path;
+
+$configuration['tt_content'][2]['CType'] = 'codappix_image';
+
+return $configuration;

Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/1colDatabase.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$pathinfo = pathinfo(__FILE__);
+$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+$configuration = include $path;
+
+$configuration['tt_content'][1]['CType'] = 'codappix_image';
+
+return $configuration;

Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/1colFullWidthDatabase.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$pathinfo = pathinfo(__FILE__);
+$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+$configuration = include $path;
+
+$configuration['tt_content'][1]['CType'] = 'codappix_image';
+
+return $configuration;

Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/2col2colDatabase.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$pathinfo = pathinfo(__FILE__);
+$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+$configuration = include $path;
+
+$configuration['tt_content'][2]['CType'] = 'codappix_image';
+
+return $configuration;

Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/2col_50_50_Database.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$pathinfo = pathinfo(__FILE__);
+$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+$configuration = include $path;
+
+$configuration['tt_content'][1]['CType'] = 'codappix_image';
+
+return $configuration;

Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/2col_66_33_ImageLeft_Database.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$pathinfo = pathinfo(__FILE__);
+$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+$configuration = include $path;
+
+$configuration['tt_content'][1]['CType'] = 'codappix_image';
+
+return $configuration;

Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/2col_66_33_ImageRight_Database.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$pathinfo = pathinfo(__FILE__);
+$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+$configuration = include $path;
+
+$configuration['tt_content'][1]['CType'] = 'codappix_image';
+
+return $configuration;

Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/3colDatabase.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$pathinfo = pathinfo(__FILE__);
+$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+$configuration = include $path;
+
+$configuration['tt_content'][1]['CType'] = 'codappix_image';
+
+return $configuration;

Tests/Fixtures/container_example/Test/Fixtures/ContentBlocks/3colImageFixWidthDatabase.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+$pathinfo = pathinfo(__FILE__);
+$path = $pathinfo['dirname'] . '/../Content/' . $pathinfo['basename'];
+$configuration = include $path;
+
+$configuration['tt_content'][2]['CType'] = 'codappix_imagefixedwidth';
+
+return $configuration;