[TASK] v13/v14 compatibility: Use \TYPO3\CMS\Core\Resource\FileType ENUM

benjaminkott · Nov 11, 2024 · 73e08ea · 73e08ea
1 parent c57aa69
commit 73e08ea
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 39 deletions.
diff --git a/Classes/ViewHelpers/File/IsAudioViewHelper.php b/Classes/ViewHelpers/File/IsAudioViewHelper.php
@@ -11,6 +11,7 @@
 
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\FileReference;
+use TYPO3\CMS\Core\Resource\FileType;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
@@ -25,16 +26,11 @@ public function render()
         $allowedFileExtensions = $GLOBALS['TYPO3_CONF_VARS']['SYS']['audiofile_ext'] ?? '';
         $allowedFileExtensions = GeneralUtility::trimExplode(',', $allowedFileExtensions);
 
-        if (is_object($file)
+        return is_object($file)
             && ($file instanceof FileReference || $file instanceof File)
             && (
                 in_array($file->getExtension(), $allowedFileExtensions, true)
-                || $file->getType() === File::FILETYPE_AUDIO
-            )
-        ) {
-            return true;
-        }
-
-        return false;
+                || $file->getType() === FileType::AUDIO->value
+            );
     }
 }
diff --git a/Classes/ViewHelpers/File/IsImageViewHelper.php b/Classes/ViewHelpers/File/IsImageViewHelper.php
@@ -11,6 +11,7 @@
 
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\FileReference;
+use TYPO3\CMS\Core\Resource\FileType;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
@@ -25,16 +26,11 @@ public function render()
         $allowedFileExtensions = $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'] ?? '';
         $allowedFileExtensions = GeneralUtility::trimExplode(',', $allowedFileExtensions);
 
-        if (is_object($file)
+        return is_object($file)
             && ($file instanceof FileReference || $file instanceof File)
             && (
                 in_array($file->getExtension(), $allowedFileExtensions, true)
-                || $file->getType() === File::FILETYPE_IMAGE
-            )
-        ) {
-            return true;
-        }
-
-        return false;
+                || $file->getType() === FileType::IMAGE->value
+            );
     }
 }
diff --git a/Classes/ViewHelpers/File/IsMediaViewHelper.php b/Classes/ViewHelpers/File/IsMediaViewHelper.php
@@ -11,6 +11,7 @@
 
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\FileReference;
+use TYPO3\CMS\Core\Resource\FileType;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
@@ -25,16 +26,11 @@ public function render()
         $allowedFileExtensions = $GLOBALS['TYPO3_CONF_VARS']['SYS']['mediafile_ext'] ?? '';
         $allowedFileExtensions = GeneralUtility::trimExplode(',', $allowedFileExtensions);
 
-        if (is_object($file)
+        return is_object($file)
             && ($file instanceof FileReference || $file instanceof File)
             && (
                 in_array($file->getExtension(), $allowedFileExtensions, true)
-                || $file->getType() === File::FILETYPE_VIDEO
-            )
-        ) {
-            return true;
-        }
-
-        return false;
+                || $file->getType() === FileType::VIDEO->value
+            );
     }
 }
diff --git a/Configuration/TCA/Overrides/100_pages.php b/Configuration/TCA/Overrides/100_pages.php
@@ -88,7 +88,7 @@
                 ],
                 'overrideChildTca' => [
                     'types' => [
-                        \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
+                        \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [
                             'showitem' => '--palette--;;filePalette',
                         ],
                     ],
@@ -108,7 +108,7 @@
                 'maxitems' => 1,
                 'overrideChildTca' => [
                     'types' => [
-                        \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
+                        \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [
                             'showitem' => '
                                 --palette--;;imageoverlayPalette,
                                 --palette--;;filePalette

diff --git a/Configuration/TCA/Overrides/225_content_element_texticon.php b/Configuration/TCA/Overrides/225_content_element_texticon.php
@@ -126,7 +126,7 @@
                 ],
                 'overrideChildTca' => [
                     'types' => [
-                        \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
+                        \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [
                             'showitem' => '--palette--;;filePalette',
                         ],
                     ],

diff --git a/Configuration/TCA/Overrides/300_content_general_columns.php b/Configuration/TCA/Overrides/300_content_general_columns.php
@@ -182,7 +182,7 @@
         ],
         'overrideChildTca' => [
             'types' => [
-                \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
+                \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [
                     'showitem' => 'crop,--palette--;;filePalette',
                 ],
             ],

diff --git a/Configuration/TCA/tx_bootstrappackage_accordion_item.php b/Configuration/TCA/tx_bootstrappackage_accordion_item.php
@@ -189,12 +189,12 @@
                 ],
                 'overrideChildTca' => [
                     'types' => [
-                        \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
+                        \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [
                             'showitem' => '
                                 --palette--;;imageoverlayPalette,
                                 --palette--;;filePalette',
                         ],
-                        \TYPO3\CMS\Core\Resource\File::FILETYPE_VIDEO => [
+                        \TYPO3\CMS\Core\Resource\FileType::VIDEO->value => [
                             'showitem' => '
                                 --palette--;;videoOverlayPalette,
                                 --palette--;;filePalette',

diff --git a/Configuration/TCA/tx_bootstrappackage_card_group_item.php b/Configuration/TCA/tx_bootstrappackage_card_group_item.php
@@ -197,7 +197,7 @@
                 'maxitems' => 1,
                 'overrideChildTca' => [
                     'types' => [
-                        \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
+                        \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [
                             'showitem' => '
                                 --palette--;;imageoverlayPalette,
                                 --palette--;;filePalette',
@@ -275,7 +275,7 @@
                 ],
                 'overrideChildTca' => [
                     'types' => [
-                        \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
+                        \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [
                             'showitem' => '--palette--;;filePalette',
                         ],
                     ],

diff --git a/Configuration/TCA/tx_bootstrappackage_carousel_item.php b/Configuration/TCA/tx_bootstrappackage_carousel_item.php
@@ -599,7 +599,7 @@
                 'maxitems' => 1,
                 'overrideChildTca' => [
                     'types' => [
-                        \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
+                        \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [
                             'showitem' => '
                                 --palette--;;imageoverlayPalette,
                                 --palette--;;filePalette',
@@ -641,7 +641,7 @@
                 ],
                 'overrideChildTca' => [
                     'types' => [
-                        \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
+                        \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [
                             'showitem' => 'crop,--palette--;;filePalette',
                         ],
                     ],

diff --git a/Configuration/TCA/tx_bootstrappackage_icon_group_item.php b/Configuration/TCA/tx_bootstrappackage_icon_group_item.php
@@ -228,7 +228,7 @@
                 ],
                 'overrideChildTca' => [
                     'types' => [
-                        \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
+                        \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [
                             'showitem' => '--palette--;;filePalette',
                         ],
                     ],

diff --git a/Configuration/TCA/tx_bootstrappackage_tab_item.php b/Configuration/TCA/tx_bootstrappackage_tab_item.php
@@ -189,12 +189,12 @@
                 ],
                 'overrideChildTca' => [
                     'types' => [
-                        \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
+                        \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [
                             'showitem' => '
                                 --palette--;;imageoverlayPalette,
                                 --palette--;;filePalette',
                         ],
-                        \TYPO3\CMS\Core\Resource\File::FILETYPE_VIDEO => [
+                        \TYPO3\CMS\Core\Resource\FileType::VIDEO->value => [
                             'showitem' => '
                                 --palette--;;videoOverlayPalette,
                                 --palette--;;filePalette',

diff --git a/Configuration/TCA/tx_bootstrappackage_timeline_item.php b/Configuration/TCA/tx_bootstrappackage_timeline_item.php
@@ -223,7 +223,7 @@
                 ],
                 'overrideChildTca' => [
                     'types' => [
-                        \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
+                        \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [
                             'showitem' => '--palette--;;filePalette',
                         ],
                     ],
@@ -243,7 +243,7 @@
                 'maxitems' => 1,
                 'overrideChildTca' => [
                     'types' => [
-                        \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
+                        \TYPO3\CMS\Core\Resource\FileType::IMAGE->value => [
                             'showitem' => '
                                 --palette--;;imageoverlayPalette,
                                 --palette--;;filePalette',