Merge pull request #45 from sitegeist/upgradePhp8

bugfix for PHP 8.1 compatibility
sitegeist · Mar 10, 2023 · 63665d4 · 63665d4
2 parents 8610d1e + 45c3416
commit 63665d4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/Classes/Adminpanel/Modules/TranslateLabel/TranslateLabel.php b/Classes/Adminpanel/Modules/TranslateLabel/TranslateLabel.php
@@ -66,7 +66,7 @@ public function getDataToStore(ServerRequestInterface $request): ModuleData
         $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
         return new ModuleData(
             [
-                'labels' => $GLOBALS['TRANSLATELABELS'],
+                'labels' => $GLOBALS['TRANSLATELABELS'] ?? [],
                 'showTranslateLabels' => $this->configurationService->getConfigurationOption('translatelabels', 'showTranslationLabels'),
                 'saveUrl' => $this->generateBackendUrl('ajax_translatelabels_translate'),
                 'sysLanguageUid' => $this->context->getPropertyFromAspect('language', 'id'),

diff --git a/Classes/Adminpanel/Modules/TranslateLabel/TranslateLabelInfo.php b/Classes/Adminpanel/Modules/TranslateLabel/TranslateLabelInfo.php
@@ -87,7 +87,7 @@ public function getDataToStore(ServerRequestInterface $request): ModuleData
         $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
         return new ModuleData(
             [
-                'labels' => $GLOBALS['TRANSLATELABELS'],
+                'labels' => $GLOBALS['TRANSLATELABELS'] ?? [],
                 'showTranslateLabels' => $this->configurationService->getConfigurationOption('translatelabels', 'showTranslationLabels'),
                 'editIcon' => $iconFactory->getIcon('actions-open', Icon::SIZE_SMALL)->render()
             ]

diff --git a/Classes/Renderer/FrontendRenderer.php b/Classes/Renderer/FrontendRenderer.php
@@ -222,14 +222,15 @@ protected function getOverrides(int $pid, string $labelKey, string $extensionNam
             }
         }
         $pluginName = (strpos($extensionName, 'tx_') === 0) ? $extensionName : 'tx_' . strtolower($extensionName);
+        $typoScriptOverride = [];
         if (isset($GLOBALS['TSFE']->tmpl->setup['plugin.'][$pluginName . '.']['_LOCAL_LANG.'][$languageKey . '.']) &&
             is_array($GLOBALS['TSFE']->tmpl->setup['plugin.'][$pluginName . '.']['_LOCAL_LANG.'][$languageKey . '.'])) {
             $typoScriptOverride = ArrayUtility::flatten(
                 $GLOBALS['TSFE']->tmpl->setup['plugin.'][$pluginName . '.']['_LOCAL_LANG.'][$languageKey . '.'],
                 '.'
             );
         }
-        if ($typoScriptOverride['.' . $labelName]) {
+        if (!empty($typoScriptOverride['.' . $labelName])) {
             $overrides[] = ['TypoScript' , 'plugin.' . $pluginName . '._LOCAL_LANG.' . $languageKey . '.' . $labelName];
         }
         if (TranslationLabelUtility::getLabelFromDatabase($labelKey, $pid) !== null) {

diff --git a/Classes/Utility/TranslationLabelUtility.php b/Classes/Utility/TranslationLabelUtility.php
@@ -185,7 +185,7 @@ public static function getDefaultLanguageFile($extensionName)
     public static function getExtendLabelKeyWithLanguageFilePath($labelKey, $extensionName)
     {
         $reversedParts = explode(':', strrev($labelKey), 2);
-        $languageFile = strrev($reversedParts[1]);
+        $languageFile = strrev($reversedParts[1] ?? '');
         $extendedLabelKey = $labelKey;
         if ($languageFile === '') {
             // $extendedLabelKey = 'LLL:EXT:' . self::getDefaultLanguageFile($extensionName) . ':' . $labelKey;

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -7,7 +7,7 @@
     'author' => 'Alexander Bohndorf',
     'author_email' => '[email protected]',
     'state' => 'beta',
-    'version' => '2.2.1',
+    'version' => '2.3.0',
     'constraints' => [
         'depends' => [
             'typo3' => '10.0.0-11.5.99',