[TASK] Moved icon configurations to Configuration/Icons.php and also …

…moved pageTs configuration to Configuration folder
jweiland-net · Oct 31, 2024 · 327f1a7 · 327f1a7
1 parent 91cacab
commit 327f1a7
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 31 deletions.
diff --git a/Configuration/Icons.php b/Configuration/Icons.php
@@ -1,8 +1,23 @@
 <?php
 
+use TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider;
+use TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider;
+
 return [
     'ext-weather2' => [
-        'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
+        'provider' => SvgIconProvider::class,
         'source' => 'EXT:weather2/Resources/Public/Icons/Extension.svg',
     ],
+    'ext-weather2-table-currentweather' => [
+        'provider' => BitmapIconProvider::class,
+        'source' => 'EXT:weather2/Resources/Public/Icons/tx_weather2_domain_model_currentweather.gif',
+    ],
+    'ext-weather2-table-dwdwarncell' => [
+        'provider' => BitmapIconProvider::class,
+        'source' => 'EXT:weather2/Resources/Public/Icons/tx_weather2_domain_model_dwdwarncell.gif',
+    ],
+    'ext-weather2-table-weatheralert' => [
+        'provider' => BitmapIconProvider::class,
+        'source' => 'EXT:weather2/Resources/Public/Icons/tx_weather2_domain_model_weatheralert.gif',
+    ],
 ];
diff --git a/Configuration/page.tsconfig b/Configuration/page.tsconfig
@@ -0,0 +1 @@
+@import 'EXT:weather2/Configuration/TSconfig/ContentElementWizard.tsconfig'
diff --git a/ext_localconf.php b/ext_localconf.php
@@ -4,61 +4,50 @@
     die('Access denied.');
 }
 
+use JWeiland\Weather2\Controller\CurrentWeatherController;
+use JWeiland\Weather2\Controller\WeatherAlertController;
+use JWeiland\Weather2\Task\DeutscherWetterdienstTask;
+use JWeiland\Weather2\Task\DeutscherWetterdienstTaskAdditionalFieldProvider;
+use JWeiland\Weather2\Task\DeutscherWetterdienstWarnCellTask;
+use JWeiland\Weather2\Task\OpenWeatherMapTask;
+use JWeiland\Weather2\Task\OpenWeatherMapTaskAdditionalFieldProvider;
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
 call_user_func(static function () {
-    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][JWeiland\Weather2\Task\OpenWeatherMapTask::class] = [
+    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][OpenWeatherMapTask::class] = [
         'extension' => 'weather2',
         'title' => 'Call openweathermap.org api',
         'description' => 'Calls the api of openweathermap.org and saves response into database',
-        'additionalFields' => JWeiland\Weather2\Task\OpenWeatherMapTaskAdditionalFieldProvider::class,
+        'additionalFields' => OpenWeatherMapTaskAdditionalFieldProvider::class,
     ];
 
-    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][JWeiland\Weather2\Task\DeutscherWetterdienstTask::class] = [
+    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][DeutscherWetterdienstTask::class] = [
         'extension' => 'weather2',
         'title' => 'Get weather alerts from Deutscher Wetterdienst',
         'description' => 'Calls the Deutscher Wetterdienst api and saves response in weather2 format into database',
-        'additionalFields' => JWeiland\Weather2\Task\DeutscherWetterdienstTaskAdditionalFieldProvider::class,
+        'additionalFields' => DeutscherWetterdienstTaskAdditionalFieldProvider::class,
     ];
 
-    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][JWeiland\Weather2\Task\DeutscherWetterdienstWarnCellTask::class] = [
+    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][DeutscherWetterdienstWarnCellTask::class] = [
         'extension' => 'weather2',
         'title' => 'Get warn cell records from Deutscher Wetterdienst',
         'description' => 'Calls the Deutscher Wetterdienst api and saves warn cells into database. Required before using DeutscherWetterdienstTask!',
     ];
 
-    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
+    ExtensionUtility::configurePlugin(
         'Weather2',
         'Currentweather',
         [
-            \JWeiland\Weather2\Controller\CurrentWeatherController::class => 'show',
+            CurrentWeatherController::class => 'show',
         ],
     );
 
-    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
+    ExtensionUtility::configurePlugin(
         'Weather2',
         'Weatheralert',
         [
-            \JWeiland\Weather2\Controller\WeatherAlertController::class => 'show',
+            WeatherAlertController::class => 'show',
         ],
     );
-
-    // Add weather2 plugins to new element wizard
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
-        '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:weather2/Configuration/TSconfig/ContentElementWizard.tsconfig">',
-    );
-
-    // Register Bitmap Icon Identifier
-    $bmpIcons = [
-        'ext-weather2-table-currentweather' => 'tx_weather2_domain_model_currentweather.gif',
-        'ext-weather2-table-dwdwarncell' => 'tx_weather2_domain_model_dwdwarncell.gif',
-        'ext-weather2-table-weatheralert' => 'tx_weather2_domain_model_weatheralert.gif',
-    ];
-
-    $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
-    foreach ($bmpIcons as $identifier => $fileName) {
-        $iconRegistry->registerIcon(
-            $identifier,
-            \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-            ['source' => 'EXT:weather2/Resources/Public/Icons/' . $fileName],
-        );
-    }
 });
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		@import 'EXT:weather2/Configuration/TSconfig/ContentElementWizard.tsconfig'