Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Enumeration deprection #651

Merged
merged 5 commits into from
Nov 16, 2024
+505 −510
Merged

Fix Enumeration deprection #651

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8967bb8
Replace TYPO3 Enumeration with PHP enums
nitori Nov 16, 2024
161b726
Fix test case. Expected value is an enum, not a string.
nitori Nov 16, 2024
123a802
Replace Tab enum
nitori Nov 16, 2024
67b1d0a
Use correct enum method to register icons
nitori Nov 16, 2024
cdc1c05
Fix silly syntax error...
nitori Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/CodeGenerator/HtmlCodeGenerator.php
View file
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ protected function generateFieldHtml(TcaFieldDefinition $field, ElementTcaDefini
if (!$field->hasFieldType($element->elementDefinition->key) || !$field->getFieldType($element->elementDefinition->key)->isRenderable()) {
return '';
}
switch ((string)$field->getFieldType($element->elementDefinition->key)) {
switch ($field->getFieldType($element->elementDefinition->key)) {
case FieldType::SELECT:
if (($field->realTca['config']['foreign_table'] ?? '') !== '') {
$html[] = $this->drawWhitespace(0 + $depth) . '<f:for each="{' . $datafield . '.' . $field->fullKey . '_items}" as="' . $datafield . '_item' . '">';
4 changes: 2 additions & 2 deletions Classes/CodeGenerator/SqlCodeGenerator.php
View file
Original file line number Diff line number Diff line change
@@ -100,7 +100,7 @@ protected function getSqlByConfiguration(): array
} catch (\InvalidArgumentException $e) {
continue;
}
if ($fieldType->equals(FieldType::INLINE) && !$tableDefinitionCollection->hasTable($column->column)) {
if ($fieldType == FieldType::INLINE && !$tableDefinitionCollection->hasTable($column->column)) {
continue;
}
if (!$tableDefinition->tca->hasField($column->column)) {
@@ -115,7 +115,7 @@ protected function getSqlByConfiguration(): array

$sql[] = 'CREATE TABLE ' . $tableDefinition->table . " (\n\t" . $column->column . ' ' . $column->sqlDefinition . "\n);\n";
// if this field is a content field, also add parent columns
if ($fieldType->equals(FieldType::CONTENT)) {
if ($fieldType == FieldType::CONTENT) {
$sql[] = 'CREATE TABLE tt_content ( tx_mask_content_parent_uid int(11) unsigned DEFAULT \'0\' NOT NULL );' . "\n";
$sql[] = 'CREATE TABLE tt_content ( tx_mask_content_role varchar(255) DEFAULT \'\' NOT NULL );' . "\n";
$sql[] = 'CREATE TABLE tt_content ( tx_mask_content_tablenames varchar(255) DEFAULT \'\' NOT NULL );' . "\n";
44 changes: 22 additions & 22 deletions Classes/CodeGenerator/TcaCodeGenerator.php
View file
Original file line number Diff line number Diff line change
@@ -197,7 +197,7 @@ public function setElementsTca(): void
$bodytext = $elementTca->tcaDefinition->getField('bodytext');
if (
!$bodytext->hasFieldType($element->key)
|| $bodytext->getFieldType($element->key)->equals(FieldType::RICHTEXT)
|| $bodytext->getFieldType($element->key) == FieldType::RICHTEXT
) {
$GLOBALS['TCA']['tt_content']['types'][$cTypeKey]['columnsOverrides']['bodytext']['config']['enableRichtext'] = 1;
}
@@ -215,7 +215,7 @@ public function getPagePalettes(string $elementKey): array
$pages = $this->tableDefinitionCollection->getTable('pages');
$element = $pages->elements->getElement($elementKey);
foreach ($element->columns as $column) {
if ($this->tableDefinitionCollection->getFieldType($column, 'pages')->equals(FieldType::PALETTE)) {
if ($this->tableDefinitionCollection->getFieldType($column, 'pages') == FieldType::PALETTE) {
$palettes[$column] = $this->generatePalettesTca($pages->palettes->getPalette($column), 'pages');
}
}
@@ -246,10 +246,10 @@ protected function generateShowItem(string $prependTabs, string $elementKey, str
try {
$fieldType = $this->tableDefinitionCollection->getFieldType($fieldKey, $table);
} catch (\InvalidArgumentException $e) {
$fieldType = new FieldType(FieldType::STRING);
$fieldType = FieldType::STRING;
}
// Check if this field is of type tab
if ($fieldType->equals(FieldType::TAB)) {
if ($fieldType == FieldType::TAB) {
$label = $this->tableDefinitionCollection->getLabel($elementKey, $fieldKey, $table);
// If a tab is in the first position then change the name of the general tab
if ($index === 0) {
@@ -258,9 +258,9 @@ protected function generateShowItem(string $prependTabs, string $elementKey, str
// Otherwise just add new tab
$fieldArray[] = '--div--;' . $label;
}
} elseif ($fieldType->equals(FieldType::PALETTE)) {
} elseif ($fieldType == FieldType::PALETTE) {
$fieldArray[] = '--palette--;;' . $fieldKey;
} elseif ($fieldType->equals(FieldType::INLINE)) {
} elseif ($fieldType == FieldType::INLINE) {
// Make sure only inline fields with at least 1 field are added.
$inlineFields = $this->tableDefinitionCollection->loadInlineFields($fieldKey, $element->key, $element);
if ($inlineFields->toArray() !== []) {
@@ -282,7 +282,7 @@ protected function generatePalettesTca(PaletteDefinition $palette, string $table
{
$showitem = [];
foreach ($palette->showitem as $item) {
if ($this->tableDefinitionCollection->getFieldType($item, $table)->equals(FieldType::LINEBREAK)) {
if ($this->tableDefinitionCollection->getFieldType($item, $table) == FieldType::LINEBREAK) {
$showitem[] = '--linebreak--';
} else {
$showitem[] = $item;
@@ -340,7 +340,7 @@ public function generateFieldsTca(string $table): array
$additionalTca[$field->fullKey] = [];

// File: Add file config.
if ($fieldType->equals(FieldType::FILE) || $fieldType->equals(FieldType::MEDIA)) {
if ($fieldType == FieldType::FILE || $fieldType == FieldType::MEDIA) {
$additionalTca[$field->fullKey]['config'] = $this->getFileTCAConfig($fieldType, $field);
}

@@ -352,12 +352,12 @@ public function generateFieldsTca(string $table): array
$field->realTca['config'] = self::reconfigureTCAConfig($field, $field->realTca['config']);

// InputLink: Add softref
if ($fieldType->equals(FieldType::LINK)) {
if ($fieldType == FieldType::LINK) {
$field->realTca['config']['softref'] = 'typolink';
}

// Content: Set foreign_field and default CType in select if restricted.
if ($fieldType->equals(FieldType::CONTENT)) {
if ($fieldType == FieldType::CONTENT) {
$field->realTca['config']['foreign_field'] = 'tx_mask_content_parent_uid';
$field->realTca['config']['foreign_table_field'] = 'tx_mask_content_tablenames';
$field->realTca['config']['foreign_match_fields'] = [
@@ -386,7 +386,7 @@ public function generateFieldsTca(string $table): array

private function getFileTCAConfig(FieldType $fieldType, TcaFieldDefinition $field, ?TcaFieldDefinition $columnsOverride = null): array
{
if ($field->imageoverlayPalette || $fieldType->equals(FieldType::MEDIA)) {
if ($field->imageoverlayPalette || $fieldType == FieldType::MEDIA) {
$customSettingOverride = [
'overrideChildTca' => [
'types' => [
@@ -440,16 +440,16 @@ private function getFileTCAConfig(FieldType $fieldType, TcaFieldDefinition $fiel
? $columnsOverride->onlineMedia
: $field->onlineMedia;

if ($fieldType->equals(FieldType::FILE) && $field->allowedFileExtensions === '') {
if ($fieldType == FieldType::FILE && $field->allowedFileExtensions === '') {
$field->allowedFileExtensions = 'common-image-types';
}

if ($fieldType->equals(FieldType::MEDIA) && $field->allowedFileExtensions === '') {
if ($fieldType == FieldType::MEDIA && $field->allowedFileExtensions === '') {
$field->allowedFileExtensions = 'common-media-types';
}

// Only allow media types the user has selected, but always include the rest.
if ($fieldType->equals(FieldType::MEDIA)) {
if ($fieldType == FieldType::MEDIA) {
$onlineMediaHelpers = $this->onlineMediaHelperRegistry->getSupportedFileExtensions();
$allowedFileExtensionList = GeneralUtility::trimExplode(',', $field->allowedFileExtensions, true);
$alwaysIncluded = array_diff($allowedFileExtensionList, $onlineMediaHelpers);
@@ -485,12 +485,12 @@ private static function reconfigureTCAConfig(TcaFieldDefinition $field, array $t
}

// Text: Set correct rendertype if format (code highlighting) is set.
if ($fieldType->equals(FieldType::TEXT) && ($tcaConfig['format'] ?? false)) {
if ($fieldType == FieldType::TEXT && ($tcaConfig['format'] ?? false)) {
$tcaConfig['renderType'] = 't3editor';
}

// RTE: Add softref
if ($fieldType->equals(FieldType::RICHTEXT)) {
if ($fieldType == FieldType::RICHTEXT) {
$tcaConfig['softref'] = 'typolink_tag,email[subst],url';
}

@@ -521,19 +521,19 @@ public function generateTCAColumnsOverrides(string $table): array
// Do not generate any overrides for empty inline fields.
if (
$fieldDefinition->hasFieldType()
&& $fieldDefinition->getFieldType()->equals(FieldType::INLINE)
&& $fieldDefinition->getFieldType() == FieldType::INLINE
&& $this->tableDefinitionCollection->loadInlineFields($fieldDefinition->fullKey, $element->key, $element)->toArray() === []
) {
continue;
}

// Do not generate any overrides for tabs.
if ($fieldDefinition->hasFieldType() && $fieldDefinition->getFieldType()->equals(FieldType::TAB)) {
if ($fieldDefinition->hasFieldType() && $fieldDefinition->getFieldType() == FieldType::TAB) {
continue;
}

// Build TCA columns overrides.
if ($fieldDefinition->hasFieldType() && $fieldDefinition->getFieldType()->equals(FieldType::PALETTE)) {
if ($fieldDefinition->hasFieldType() && $fieldDefinition->getFieldType() == FieldType::PALETTE) {
foreach ($this->tableDefinitionCollection->loadInlineFields($fieldName, $element->key, $element) as $paletteField) {
$label = $paletteField->getLabel($element->key);
if ($label !== '') {
@@ -597,15 +597,15 @@ public function processTableTca(TableDefinition $tableDefinition): array
foreach ($tableDefinition->tca as $field) {
// check if this field is of type tab
$fieldType = $this->tableDefinitionCollection->getFieldType($field->fullKey, $tableDefinition->table);
if ($fieldType->equals(FieldType::TAB)) {
if ($fieldType == FieldType::TAB) {
// if a tab is in the first position then change the name of the general tab
if ($firstField) {
$generalTab = '--div--;' . $field->label;
} else {
// otherwise just add new tab
$fields[] = '--div--;' . $field->label;
}
} elseif ($fieldType->equals(FieldType::PALETTE)) {
} elseif ($fieldType == FieldType::PALETTE) {
if ($firstField && empty($tableDefinition->palettes->getPalette($field->fullKey)->showitem)) {
$firstField = false;
continue;
@@ -654,7 +654,7 @@ public function addSearchFields(string $table): string
try {
$fieldType = $this->tableDefinitionCollection->getFieldType($field->fullKey, $table);
} catch (\InvalidArgumentException $e) {
$fieldType = new FieldType(FieldType::STRING);
$fieldType = FieldType::STRING;
}
if ($fieldType->isSearchable() && !in_array($field->fullKey, $searchFields, true)) {
$searchFields[] = $field->fullKey;
2 changes: 1 addition & 1 deletion Classes/CodeGenerator/TyposcriptCodeGenerator.php
View file
Original file line number Diff line number Diff line change
@@ -169,7 +169,7 @@ protected function generateTCEFORM(string $fieldKey, int $index, ElementDefiniti
return $TSConfig;
}
// As this is called very early, TCA for core fields might not be loaded yet. So ignore them.
if (!$fieldDefinition->isCoreField && $this->tableDefinitionCollection->getFieldType($fieldKey, $table)->equals(FieldType::PALETTE)) {
if (!$fieldDefinition->isCoreField && $this->tableDefinitionCollection->getFieldType($fieldKey, $table) == FieldType::PALETTE) {
foreach ($this->tableDefinitionCollection->loadInlineFields($fieldKey, $element->key, $element) as $field) {
// Add label from field config.
$label = $field->getLabel($element->key);
Loading