[TASK] Moved Icons registration to Configuration/Icons.php

jweiland-net · Apr 10, 2024 · 0818427 · 0818427
1 parent 198f249
commit 0818427
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/Configuration/Icons.php b/Configuration/Icons.php
@@ -0,0 +1,21 @@
+<?php
+
+use TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider;
+
+$iconsRegistered = [
+    'ext-reserve-wizard-icon' => [
+        'provider' => SvgIconProvider::class,
+        'source' => 'EXT:reserve/Resources/Public/Icons/Extension.svg',
+    ],
+];
+
+$modelIcons = ['facility', 'order', 'order_1', 'period', 'reservation', 'email'];
+foreach ($modelIcons as $modelIcon) {
+    $identifier = 'tx_reserve_domain_model_' . $modelIcon;
+    $iconsRegistered[$identifier] = [
+        'provider' => SvgIconProvider::class,
+        'source' => 'EXT:reserve/Resources/Public/Icons/' . $identifier . '.svg',
+    ];
+}
+
+return $iconsRegistered;
diff --git a/ext_localconf.php b/ext_localconf.php
@@ -36,25 +36,6 @@
         'class' => \JWeiland\Reserve\Form\Element\QrCodePreviewElement::class,
     ];
 
-    // ToDo: Migrate to Configuration/Icons.php while removing TYPO3 10 compatibility
-    $icons = ['facility', 'order', 'order_1', 'period', 'reservation', 'email'];
-    $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-        \TYPO3\CMS\Core\Imaging\IconRegistry::class
-    );
-    foreach ($icons as $model) {
-        $identifier = 'tx_reserve_domain_model_' . $model;
-        $iconRegistry->registerIcon(
-            $identifier,
-            \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
-            ['source' => 'EXT:reserve/Resources/Public/Icons/' . $identifier . '.svg']
-        );
-    }
-    $iconRegistry->registerIcon(
-        'ext-reserve-wizard-icon',
-        \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
-        ['source' => 'EXT:reserve/Resources/Public/Icons/Extension.svg']
-    );
-
     // Add reserve plugin to new element wizard
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
         '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:reserve/Configuration/TSconfig/ContentElementWizard.tsconfig">'