FriendsOfTYPO3 · nhovratov · Dec 4, 2024
diff --git a/Classes/Builder/ContentBlockBuilder.php b/Classes/Builder/ContentBlockBuilder.php
@@ -67,22 +67,26 @@ public function create(LoadedContentBlock $contentBlock, string $skeletonPath =
         $this->initializeRegistries($contentBlock);
 
         // Create base directories for a Content Block.
+        $contentType = $contentBlock->getContentType();
         $assetsPath = $basePath . '/' . ContentBlockPathUtility::getAssetsFolder();
         $templatePath = $basePath . '/' . ContentBlockPathUtility::getTemplatesFolder();
         $languagePath = $basePath . '/' . ContentBlockPathUtility::getLanguageFolder();
-        GeneralUtility::mkdir_deep($assetsPath);
-        GeneralUtility::mkdir_deep($templatePath);
+        if ($contentType !== ContentType::FILE_TYPE) {
+            GeneralUtility::mkdir_deep($assetsPath);
+            GeneralUtility::mkdir_deep($templatePath);
+        }
         GeneralUtility::mkdir_deep($languagePath);
 
         $this->createLabelsXlf($contentBlock, $basePath);
         $this->createConfigYaml($contentBlock, $basePath);
 
-        $contentType = $contentBlock->getContentType();
         if ($contentType === ContentType::CONTENT_ELEMENT) {
             $this->createFrontendHtml($contentBlock, $basePath);
             $this->createBackendPreviewHtml($contentBlock, $basePath);
         }
-        $this->copyDefaultIcon($contentType, $basePath);
+        if ($contentType !== ContentType::FILE_TYPE) {
+            $this->copyDefaultIcon($contentType, $basePath);
+        }
         if ($contentType === ContentType::PAGE_TYPE) {
             $this->copyHideInMenuIcon($basePath);
             $this->createBackendPreviewHtml($contentBlock, $basePath);
@@ -107,7 +111,7 @@ protected function createConfigYaml(LoadedContentBlock $contentBlock, string $ba
         $yamlContent = $contentBlock->getYaml();
         unset($yamlContent['title']);
         unset($yamlContent['description']);
-        if ($contentType === ContentType::CONTENT_ELEMENT || $contentType === ContentType::PAGE_TYPE) {
+        if ($contentType !== ContentType::RECORD_TYPE) {
             unset($yamlContent['table']);
             unset($yamlContent['typeField']);
         }

diff --git a/Classes/Command/CreateContentBlockCommand.php b/Classes/Command/CreateContentBlockCommand.php
@@ -40,6 +40,7 @@
 use TYPO3\CMS\Core\Cache\CacheManager;
 use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\Package\PackageInterface;
+use TYPO3\CMS\Core\Resource\FileType;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 #[Autoconfigure(tags: [
@@ -181,6 +182,20 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             PageTypeNameValidator::validate($typeName, $vendor . '/' . $name);
             $typeName = (int)$typeName;
         }
+        if ($contentType === ContentType::FILE_TYPE) {
+            $choices = ['text', 'image', 'audio', 'video', 'application'];
+            if ($typeName === null) {
+                $whatIsTheTypeName = new ChoiceQuestion('Choose a file type.', $choices, 'image');
+                $typeName = $io->askQuestion($whatIsTheTypeName);
+            }
+            $result = FileType::tryFromMimeType($typeName);
+            if ($result === FileType::UNKNOWN) {
+                throw new \InvalidArgumentException(
+                    'Please choose a valid file type. Valid types are: ' . implode(', ', $choices),
+                    1734180384
+                );
+            }
+        }
 
         $contentBlockName = $vendor . '/' . $name;
         if ($this->contentBlockRegistry->hasContentBlock($contentBlockName)) {
@@ -191,9 +206,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return Command::INVALID;
         }
 
-        if ($input->getOption('title')) {
-            $title = $input->getOption('title');
-        } else {
+        $title = $input->getOption('title');
+        if ($contentType !== ContentType::FILE_TYPE && $title === null) {
             $defaultTitle = $vendor . '/' . $name;
             $question = new Question('Define title', $defaultTitle);
             $title = $io->askQuestion($question);
@@ -203,6 +217,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             ContentType::CONTENT_ELEMENT => $this->createContentBlockContentElementConfiguration($vendor, $name, $title, $typeName),
             ContentType::PAGE_TYPE => $this->createContentBlockPageTypeConfiguration($vendor, $name, $title, $typeName),
             ContentType::RECORD_TYPE => $this->createContentBlockRecordTypeConfiguration($vendor, $name, $title, $typeName),
+            ContentType::FILE_TYPE => $this->createContentBlockFileTypeConfiguration($vendor, $name, $typeName),
         };
 
         if ($input->getOption('extension')) {
@@ -297,7 +312,8 @@ protected function getExtPath(string $extension, ContentType $contentType): stri
         return match ($contentType) {
             ContentType::CONTENT_ELEMENT => $base . ContentBlockPathUtility::getRelativeContentElementsPath(),
             ContentType::PAGE_TYPE => $base . ContentBlockPathUtility::getRelativePageTypesPath(),
-            ContentType::RECORD_TYPE => $base . ContentBlockPathUtility::getRelativeRecordTypesPath()
+            ContentType::RECORD_TYPE => $base . ContentBlockPathUtility::getRelativeRecordTypesPath(),
+            ContentType::FILE_TYPE => $base . ContentBlockPathUtility::getRelativeFileTypesPath(),
         };
     }
 
@@ -415,4 +431,60 @@ private function createContentBlockRecordTypeConfiguration(string $vendor, strin
         ];
         return $configuration;
     }
+
+    private function createContentBlockFileTypeConfiguration(string $vendor, string $name, ?string $typeName = ''): array
+    {
+        $fullName = $vendor . '/' . $name;
+        $configuration = [
+            'name' => $fullName,
+            'table' => 'sys_file_reference',
+        ];
+        if ($typeName !== '' && $typeName !== null) {
+            $configuration['typeName'] = $typeName;
+        }
+        $configuration['fields'] = [
+            [
+                'identifier' => 'image_overlay_palette',
+                'type' => 'Palette',
+                'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette',
+                'fields' => [
+                    [
+                        'identifier' => 'alternative',
+                        'useExistingField' => true,
+                    ],
+                    [
+                        'identifier' => 'description',
+                        'useExistingField' => true,
+                    ],
+                    [
+                        'type' => 'Linebreak',
+                    ],
+                    [
+                        'identifier' => 'link',
+                        'useExistingField' => true,
+                    ],
+                    [
+                        'identifier' => 'title',
+                        'useExistingField' => true,
+                    ],
+                    [
+                        'type' => 'Linebreak',
+                    ],
+                    [
+                        'identifier' => 'example_custom_field',
+                        'type' => 'Text',
+                        'label' => 'My custom Field',
+                    ],
+                    [
+                        'type' => 'Linebreak',
+                    ],
+                    [
+                        'identifier' => 'crop',
+                        'useExistingField' => true,
+                    ],
+                ],
+            ],
+        ];
+        return $configuration;
+    }
 }
diff --git a/Classes/Command/ListContentBlocksCommand.php b/Classes/Command/ListContentBlocksCommand.php
@@ -82,8 +82,8 @@ protected function getAvailableContentBlocks(): array
         $list = [];
         foreach ($this->contentBlockRegistry->getAll() as $loadedContentBlock) {
             $table = match ($loadedContentBlock->getContentType()) {
-                ContentType::CONTENT_ELEMENT, ContentType::PAGE_TYPE => $loadedContentBlock->getContentType()->getTable(),
                 ContentType::RECORD_TYPE => $loadedContentBlock->getYaml()['table'],
+                default => $loadedContentBlock->getContentType()->getTable(),
             };
             $typeName = $loadedContentBlock->getYaml()['typeName'];
             $list[] = [

diff --git a/Classes/Definition/ContentType/ContentType.php b/Classes/Definition/ContentType/ContentType.php
@@ -24,13 +24,15 @@ enum ContentType: string
 {
     case CONTENT_ELEMENT = 'content-element';
     case PAGE_TYPE = 'page-type';
+    case FILE_TYPE = 'file-type';
     case RECORD_TYPE = 'record-type';
 
     public function getTable(): ?string
     {
         return match ($this) {
             self::CONTENT_ELEMENT => 'tt_content',
             self::PAGE_TYPE => 'pages',
+            self::FILE_TYPE => 'sys_file_reference',
             self::RECORD_TYPE => null,
         };
     }
@@ -40,7 +42,7 @@ public function getTypeField(): ?string
         return match ($this) {
             self::CONTENT_ELEMENT => 'CType',
             self::PAGE_TYPE => 'doktype',
-            self::RECORD_TYPE => null,
+            self::FILE_TYPE, self::RECORD_TYPE => null,
         };
     }
 
@@ -49,6 +51,7 @@ public static function getByTable(string $table): self
         return match ($table) {
             'tt_content' => self::CONTENT_ELEMENT,
             'pages' => self::PAGE_TYPE,
+            'sys_file_reference' => self::FILE_TYPE,
             default => self::RECORD_TYPE,
         };
     }
@@ -58,6 +61,7 @@ public function getHumanReadable(): string
         return match ($this) {
             self::CONTENT_ELEMENT => 'Content Element',
             self::PAGE_TYPE => 'Page Type',
+            self::FILE_TYPE => 'File Type',
             self::RECORD_TYPE => 'Record Type',
         };
     }
@@ -66,7 +70,7 @@ public function getDefaultGroup(): ?string
     {
         return match ($this) {
             self::CONTENT_ELEMENT, self::PAGE_TYPE => 'default',
-            self::RECORD_TYPE => null,
+            self::FILE_TYPE, self::RECORD_TYPE => null,
         };
     }
 }
diff --git a/Classes/Definition/Factory/ContentTypeFactory.php b/Classes/Definition/Factory/ContentTypeFactory.php
@@ -41,7 +41,9 @@ public function create(array $typeDefinition, string $table): ContentTypeInterfa
         return match ($contentType) {
             ContentType::CONTENT_ELEMENT => ContentElementDefinition::createFromArray($typeDefinition, $table),
             ContentType::PAGE_TYPE => PageTypeDefinition::createFromArray($typeDefinition, $table),
-            ContentType::RECORD_TYPE => RecordTypeDefinition::createFromArray($typeDefinition, $table)
+            // @todo It's not ideal that FileType reuses RecordTypeDefinition.
+            // @todo It actually only needs showItems, overrideColumns and typeName. Create new interface?
+            ContentType::FILE_TYPE, ContentType::RECORD_TYPE => RecordTypeDefinition::createFromArray($typeDefinition, $table)
         };
     }
 }
diff --git a/Classes/Definition/Factory/Processing/ProcessingInput.php b/Classes/Definition/Factory/Processing/ProcessingInput.php
@@ -82,9 +82,16 @@ private function getTypeFieldNative(SimpleTcaSchemaFactory $simpleTcaSchemaFacto
 
     private function resolveTypeName(): string|int
     {
+        if (array_key_exists('typeName', $this->yaml)) {
+            return $this->yaml['typeName'];
+        }
         if ($this->typeField === null) {
             return '1';
         }
-        return $this->yaml['typeName'];
+        // This should never happen.
+        throw new \InvalidArgumentException(
+            'Unexpected exception: Missing "typeName" detected.',
+            1734179318
+        );
     }
 }
diff --git a/Classes/Generator/TcaGenerator.php b/Classes/Generator/TcaGenerator.php
@@ -26,7 +26,6 @@
 use TYPO3\CMS\ContentBlocks\Definition\ContentType\ContentType;
 use TYPO3\CMS\ContentBlocks\Definition\ContentType\ContentTypeInterface;
 use TYPO3\CMS\ContentBlocks\Definition\ContentType\PageTypeDefinition;
-use TYPO3\CMS\ContentBlocks\Definition\ContentType\RecordTypeDefinition;
 use TYPO3\CMS\ContentBlocks\Definition\PaletteDefinition;
 use TYPO3\CMS\ContentBlocks\Definition\TableDefinition;
 use TYPO3\CMS\ContentBlocks\Definition\TableDefinitionCollection;
@@ -152,7 +151,7 @@ protected function generateTableTca(TableDefinition $tableDefinition, array $bas
                 }
                 $fieldType->setDataStructure($dataStructure);
             }
-            if ($tableDefinition->hasTypeField()) {
+            if ($tableDefinition->hasTypeField() || $tableDefinition->getContentType() === ContentType::FILE_TYPE) {
                 $tca['columns'][$column->getUniqueIdentifier()] = $this->getColumnTcaForTableWithTypeField($tableDefinition, $column, $baseTca);
                 // Ensure label exists for the standard column definition. This is used e.g. in the List module.
                 if (!$column->useExistingField()) {
@@ -300,20 +299,23 @@ protected function fillTypeFieldSelectItems(): void
     protected function processTypeDefinition(ContentTypeInterface $typeDefinition, TableDefinition $tableDefinition): array
     {
         $columnsOverrides = $this->getColumnsOverrides($typeDefinition, $tableDefinition);
-        $tca = match ($typeDefinition::class) {
-            ContentElementDefinition::class => $this->processContentElement($typeDefinition, $columnsOverrides),
-            PageTypeDefinition::class => $this->processPageType($typeDefinition, $columnsOverrides),
-            RecordTypeDefinition::class => $this->processRecordType($typeDefinition, $columnsOverrides, $tableDefinition),
-            default => throw new \InvalidArgumentException(
-                'Unsupported type definition: ' . $typeDefinition::class,
-                1714050376
-            ),
+        $tca = match ($tableDefinition->getContentType()) {
+            ContentType::CONTENT_ELEMENT => $this->processContentElement($typeDefinition, $columnsOverrides),
+            ContentType::PAGE_TYPE => $this->processPageType($typeDefinition, $columnsOverrides),
+            ContentType::FILE_TYPE => $this->processFileType($typeDefinition, $columnsOverrides),
+            ContentType::RECORD_TYPE => $this->processRecordType($typeDefinition, $columnsOverrides, $tableDefinition),
         };
         return $tca;
     }
 
-    protected function processContentElement(ContentElementDefinition $typeDefinition, array $columnsOverrides): array
+    protected function processContentElement(ContentTypeInterface $typeDefinition, array $columnsOverrides): array
     {
+        if (!$typeDefinition instanceof ContentElementDefinition) {
+            throw new \InvalidArgumentException(
+                'Expected ContentElementDefinition, got ' . get_class($typeDefinition),
+                1733344806
+            );
+        }
         $typeDefinitionArray = [
             'previewRenderer' => PreviewRenderer::class,
             'showitem' => $this->getContentElementStandardShowItem($typeDefinition),
@@ -327,7 +329,7 @@ protected function processContentElement(ContentElementDefinition $typeDefinitio
         return $typeDefinitionArray;
     }
 
-    protected function processPageType(PageTypeDefinition $typeDefinition, array $columnsOverrides): array
+    protected function processPageType(ContentTypeInterface $typeDefinition, array $columnsOverrides): array
     {
         $typeDefinitionArray = [
             'showitem' => $this->getPageTypeStandardShowItem($typeDefinition),
@@ -338,7 +340,18 @@ protected function processPageType(PageTypeDefinition $typeDefinition, array $co
         return $typeDefinitionArray;
     }
 
-    protected function processRecordType(RecordTypeDefinition $typeDefinition, array $columnsOverrides, TableDefinition $tableDefinition): array
+    protected function processFileType(ContentTypeInterface $typeDefinition, array $columnsOverrides): array
+    {
+        $typeDefinitionArray = [
+            'showitem' => $this->getFileTypeStandardShowItem($typeDefinition),
+        ];
+        if ($columnsOverrides !== []) {
+            $typeDefinitionArray['columnsOverrides'] = $columnsOverrides;
+        }
+        return $typeDefinitionArray;
+    }
+
+    protected function processRecordType(ContentTypeInterface $typeDefinition, array $columnsOverrides, TableDefinition $tableDefinition): array
     {
         $typeDefinitionArray = [
             'showitem' => $this->getRecordTypeStandardShowItem($typeDefinition, $tableDefinition),
@@ -775,6 +788,27 @@ protected function getRecordTypeStandardShowItem(ContentTypeInterface $typeDefin
         return $showItem;
     }
 
+    protected function getFileTypeStandardShowItem(ContentTypeInterface $typeDefinition): string
+    {
+        $showItemArray = $typeDefinition->getShowItems();
+        $firstItemIsTab = ($showItemArray[0] ?? null) instanceof TabDefinition;
+        $generalTab = '--div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general';
+        if ($firstItemIsTab) {
+            $tabDefinition = array_shift($showItemArray);
+            $generalTab = $this->processShowItem([$tabDefinition]);
+        }
+        $showItem = $this->processShowItem($showItemArray);
+        $parts = [];
+        $parts[] = $generalTab;
+        if ($showItem !== '') {
+            $parts[] = $showItem;
+        }
+        // Add hidden palette with system fields and uid_local.
+        $parts[] = '--palette--;;filePalette';
+        $showItem = implode(',', $parts);
+        return $showItem;
+    }
+
     protected function buildSystemFields(SystemFieldPalettesInterface $capability): array
     {
         $parts = [];