[BUGFIX] Revision of extension identifiers

FriendsOfTYPO3 · Apr 22, 2024 · 8257838 · 8257838
1 parent e0e79a1
commit 8257838
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/Resources/Private/CodeTemplates/Extbase/Configuration/Icons.phpt b/Resources/Private/CodeTemplates/Extbase/Configuration/Icons.phpt
@@ -1,7 +1,7 @@
 <?php
 
 return [<f:for each="{extension.plugins}" as="plugin">
-    '{extension.extensionKey}-plugin-{plugin.key}' => [
+    '{extension.shortExtensionKey}_{plugin.key}' => [
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
         'source' => 'EXT:{extension.extensionKey}/Resources/Public/Icons/user_plugin_{plugin.key}.svg'
     ],</f:for>

diff --git a/Resources/Private/CodeTemplates/Extbase/Configuration/TCA/Overrides/tt_content.phpt b/Resources/Private/CodeTemplates/Extbase/Configuration/TCA/Overrides/tt_content.phpt
@@ -4,14 +4,14 @@ defined('TYPO3') || die();
 <f:for each="{extension.Plugins}" as="plugin">
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     '{extension.extensionName}',
-    '{extension.extensionKey}_{plugin.key}',
+    '{plugin.key}',
     '{plugin.name -> k:format.quoteString()}',
-    '{extension.extensionKey}-plugin-{plugin.key}'
+    '{extension.unprefixedShortExtensionKey}_{plugin.key}'
 );
 
 
-if (!is_array($GLOBALS['TCA']['tt_content']['types']['{extension.extensionKey}_{plugin.key}'] ?? false)) {
-    $GLOBALS['TCA']['tt_content']['types']['{extension.extensionKey}_{plugin.key}'] = [];
+if (!is_array($GLOBALS['TCA']['tt_content']['types']['{extension.unprefixedShortExtensionKey}_{plugin.key}'] ?? false)) {
+    $GLOBALS['TCA']['tt_content']['types']['{extension.unprefixedShortExtensionKey}_{plugin.key}'] = [];
 }
 
 
@@ -21,8 +21,8 @@ if (!is_array($GLOBALS['TCA']['tt_content']['types']['{extension.extensionKey}_{
     'CType',
     [
         'label' => '{plugin.name -> k:format.quoteString()}',
-        'value' => '{extension.extensionKey}_{plugin.key}',
-        'icon'  => '{extension.extensionKey}-plugin-{plugin.key}',
+        'value' => '{extension.unprefixedShortExtensionKey}_{plugin.key}',
+        'icon'  => '{extension.shortExtensionKey}_{plugin.key}',
         'group' => '{extension.extensionKey}'
     ]
 );
@@ -31,10 +31,10 @@ if (!is_array($GLOBALS['TCA']['tt_content']['types']['{extension.extensionKey}_{
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
     '*',
     'FILE:EXT:{extension.extensionKey}/Configuration/FlexForms/flexform_{plugin.key}.xml',
-    '{extension.extensionKey}_{plugin.key}'
+    '{extension.unprefixedShortExtensionKey}_{plugin.key}'
 );
 
-$GLOBALS['TCA']['tt_content']['types']['{extension.extensionKey}_{plugin.key}']['showitem'] = '
+$GLOBALS['TCA']['tt_content']['types']['{extension.unprefixedShortExtensionKey}_{plugin.key}']['showitem'] = '
     --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
         --palette--;;general,
         --palette--;;headers,

diff --git a/Resources/Private/CodeTemplates/Extbase/extLocalconf.phpt b/Resources/Private/CodeTemplates/Extbase/extLocalconf.phpt
@@ -28,11 +28,11 @@ defined('TYPO3') || die();
                 after = common
                 elements {<f:for each="{extension.plugins}" as="plugin">
                     {plugin.key} <k:curlyBrackets>
-                        iconIdentifier = {extension.extensionKey}-plugin-{plugin.key}
-                        title = LLL:EXT:{extension.extensionKey}/Resources/Private/Language/locallang_db.xlf:tx_{extension.extensionKey}_{plugin.key}.name
-                        description = LLL:EXT:{extension.extensionKey}/Resources/Private/Language/locallang_db.xlf:tx_{extension.extensionKey}_{plugin.key}.description
+                        iconIdentifier = {extension.shortExtensionKey}_{plugin.key}
+                        title = LLL:EXT:{extension.extensionKey}/Resources/Private/Language/locallang_db.xlf:{extension.shortExtensionKey}_{plugin.key}.name
+                        description = LLL:EXT:{extension.extensionKey}/Resources/Private/Language/locallang_db.xlf:{extension.shortExtensionKey}_{plugin.key}.description
                         tt_content_defValues <k:curlyBrackets>
-                            CType = {extension.extensionKey}_{plugin.key}
+                            CType = {extension.unprefixedShortExtensionKey}_{plugin.key}
                         </k:curlyBrackets>
                     </k:curlyBrackets></f:for>
                 }