[WIP] fix issues after merge contribution

Author: krausandre

Build/JsonSchema/SchemaSources/FieldTypes/collection.json

@@ -15,10 +15,10 @@
 		"l10n_mode": {},
 		"l10n_display": {},
 		"exclude": {},
-        "title": {
-            "type": "string",
-            "description": "Alternative title for Collection in Record Permissions view. Defaults to label."
-        },
+		"title": {
+			"type": "string",
+			"description": "Alternative title for Collection in Record Permissions view. Defaults to label."
+		},
 		"table": {
 			"type": "string",
 			"description": "The custom table name to be used for the new Record Type."

Classes/Definition/ContentType/ContentElementDefinition.php

@@ -45,6 +45,7 @@ public function __construct(
         public string $package,
         public int $priority,
         public ContentTypeIcon $typeIcon,
+        public bool $hasExplicitCollectionTitle,
         public string $languagePathLabel,
         public string $languagePathTitle,
         public string $languagePathDescription,

Classes/Definition/ContentType/ContentTypeDefinition.php

@@ -106,6 +106,11 @@ public function getTypeIcon(): ContentTypeIcon
         return $this->typeIcon;
     }
 
+    public function hasExplicitCollectionTitle(): bool
+    {
+        return $this->hasExplicitCollectionTitle;
+    }
+
     public function getLanguagePathLabel(): string
     {
         return $this->languagePathLabel;

Classes/Definition/ContentType/ContentTypeInterface.php

@@ -41,6 +41,7 @@ public function hasColumn(string $column): bool;
     /** @return string[] */
     public function getColumns(): array;
     public function getTypeIcon(): ContentTypeIcon;
+    public function hasExplicitCollectionTitle(): bool;
     public function getLanguagePathLabel(): string;
     public function getLanguagePathTitle(): string;
     public function getLanguagePathDescription(): string;

Classes/Definition/ContentType/PageTypeDefinition.php

@@ -45,6 +45,7 @@ public function __construct(
         public string $package,
         public int $priority,
         public ContentTypeIcon $typeIcon,
+        public bool $hasExplicitCollectionTitle,
         public string $languagePathLabel,
         public string $languagePathTitle,
         public string $languagePathDescription,

Classes/Definition/ContentType/RecordTypeDefinition.php

@@ -45,6 +45,7 @@ public function __construct(
         public string $package,
         public int $priority,
         public ContentTypeIcon $typeIcon,
+        public bool $hasExplicitCollectionTitle,
         public string $languagePathLabel,
         public string $languagePathTitle,
         public string $languagePathDescription,

Classes/Definition/Factory/ContentBlockCompiler.php

@@ -284,7 +284,11 @@ private function initializeContentTypeLabelAndDescription(
             $languagePathLabel = $languagePathTitle . '.label';
             $languagePathTitle = $languagePathTitle . '.title';
             $languagePathDescription = $languagePathDescription . '.description';
-            $result->contentType->title = $title;
+            // A Collection defining "title" must not be overwritten by the field label.
+            $result->contentType->hasExplicitCollectionTitle = $title !== '';
+            // Without an explicit title, the field label is the title of the Collection's table.
+            // $title itself stays empty, so no automatic language key is generated for it.
+            $result->contentType->title = $title !== '' ? $title : (string)($input->yaml['label'] ?? '');
             $result->contentType->description = $description;
         }
         $languagePathSource = new AutomaticLanguageSource($languagePathTitle, $title);
@@ -399,11 +403,6 @@ private function getFieldLabelPath(LanguagePath $languagePath): string
         return $languagePath->getCurrentPath() . '.label';
     }
 
-    private function getFieldTitlePath(LanguagePath $languagePath): string
-    {
-        return $languagePath->getCurrentPath() . '.title';
-    }
-
     private function getFieldDescriptionPath(LanguagePath $languagePath): string
     {
         return $languagePath->getCurrentPath() . '.description';
@@ -664,10 +663,6 @@ private function processCollection(ProcessingInput $input, ProcessedFieldsResult
             // Disable sorting as it is already handled in MM table.
             $field['sortable'] = false;
         }
-        // The Collection's title equals the field label.
-        if (!isset($field['title'])) {
-            $field['title'] = $field['label'];
-        }
         // Anonymous Collections can't have a type field.
         $field['typeField'] = null;
         $newInput = new ProcessingInput(

Classes/Definition/Factory/ContentTypeFactory.php

@@ -96,6 +96,7 @@ private function prepareCommonArguments(array $typeDefinition): array
         $arguments['package'] = $typeDefinition['package'] ?? '';
         $arguments['priority'] = $typeDefinition['priority'] ?? 0;
         $arguments['typeIcon'] = ContentTypeIcon::fromArray($typeDefinition['typeIcon'] ?? []);
+        $arguments['hasExplicitCollectionTitle'] = $typeDefinition['hasExplicitCollectionTitle'] ?? false;
         $arguments['languagePathLabel'] = $typeDefinition['languagePathLabel'] ?? '';
         $arguments['languagePathTitle'] = $typeDefinition['languagePathTitle'] ?? null;
         $arguments['languagePathDescription'] = $typeDefinition['languagePathDescription'] ?? null;

Classes/Definition/Factory/Processing/ProcessedContentType.php

@@ -42,6 +42,7 @@ final class ProcessedContentType
     /** @var array<TcaFieldDefinition> */
     public array $overrideColumns = [];
     public string|int $typeName = '';
+    public bool $hasExplicitCollectionTitle = false;
     public string $languagePathLabel = '';
     public string $languagePathTitle = '';
     public string $languagePathDescription = '';
@@ -61,6 +62,7 @@ public function toArray(bool $isRootTable, string $identifier, array $processedR
             'vendor' => $vendor,
             'package' => $package,
             'typeName' => $this->typeName,
+            'hasExplicitCollectionTitle' => $this->hasExplicitCollectionTitle,
             'languagePathLabel' => $this->languagePathLabel,
             'languagePathTitle' => $this->languagePathTitle,
             'languagePathDescription' => $this->languagePathDescription,

Classes/Generator/TcaGenerator.php

@@ -978,8 +978,7 @@ protected function generateBaseTableTca(TableDefinition $tableDefinition): array
         $title = $defaultTypeDefinition->getTitle();
         $languagePathTitle = $defaultTypeDefinition->getLanguagePathTitle();
         $languagePathLabel = $defaultTypeDefinition->getLanguagePathLabel();
-        $hasExplicitCollectionTitle = $languagePathTitle !== $languagePathLabel && $title !== '';
-        if (!$hasExplicitCollectionTitle) {
+        if (!$defaultTypeDefinition->hasExplicitCollectionTitle()) {
             if ($this->languageFileRegistry->isset($defaultTypeDefinition->getName(), $languagePathTitle)) {
                 $title = $languagePathTitle;
             } elseif ($this->languageFileRegistry->isset($defaultTypeDefinition->getName(), $languagePathLabel)) {