Bugfix release

[TASK] Set version to 1.2.3. [BUGFIX] Apply translation arguments only when a translation exists. [BUGFIX] Fix "undefined array key" in TypoScript condition for page types. [BUGFIX] Fix "undefined array key" when checking if TypoScript is available in contexts other than Frontend. [BUGFIX] Load general EarlyAccessConstants also when there is a context specific file.
phantasie-schmiede · Oct 14, 2022 · 8707a33 · 8707a33
1 parent 3c90b3a
commit 8707a33
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 deletions.
diff --git a/Classes/Service/GlobalVariableProviders/EarlyAccessConstantsProvider.php b/Classes/Service/GlobalVariableProviders/EarlyAccessConstantsProvider.php
@@ -62,18 +62,20 @@ public function getGlobalVariables(): array
         $contextParts = explode('/', Environment::getContext()->__toString());
         $lastIndex = count($contextParts) - 1;
         $contextParts[$lastIndex] = lcfirst($contextParts[$lastIndex]);
-        $filePath = self::DIRECTORY . implode('/', $contextParts) . '.yaml';
+        $contextSpecificFilePath = self::DIRECTORY . implode('/', $contextParts) . '.yaml';
 
         foreach ($allExtensionInformation as $extensionInformation) {
-            $yamlFile = GeneralUtility::getFileAbsFileName('EXT:' . $extensionInformation->getExtensionKey() . $filePath);
+            $basePath = 'EXT:' . $extensionInformation->getExtensionKey();
+            $yamlFiles = [
+                GeneralUtility::getFileAbsFileName($basePath . self::DIRECTORY . 'constants.yaml'),
+                GeneralUtility::getFileAbsFileName($basePath . $contextSpecificFilePath),
+            ];
 
-            if (!file_exists($yamlFile)) {
-                $yamlFile = GeneralUtility::getFileAbsFileName('EXT:' . $extensionInformation->getExtensionKey() . self::DIRECTORY . 'constants.yaml');
-            }
-
-            if (file_exists($yamlFile)) {
-                $constants = Yaml::parseFile($yamlFile) ?? [];
-                ArrayUtility::mergeRecursiveWithOverrule($mergedConstants, $constants);
+            foreach ($yamlFiles as $yamlFile) {
+                if (file_exists($yamlFile)) {
+                    $constants = Yaml::parseFile($yamlFile) ?? [];
+                    ArrayUtility::mergeRecursiveWithOverrule($mergedConstants, $constants);
+                }
             }
         }
 

diff --git a/Classes/Utility/ContextUtility.php b/Classes/Utility/ContextUtility.php
@@ -109,7 +109,7 @@ public static function isFrontend(): bool
      */
     public static function isTypoScriptAvailable(): bool
     {
-        if (null !== $GLOBALS['TSFE'] && self::isFrontend()) {
+        if (isset($GLOBALS['TSFE']) && self::isFrontend()) {
             return true;
         }
 

diff --git a/Classes/Utility/TypoScript/TypoScriptUtility.php b/Classes/Utility/TypoScript/TypoScriptUtility.php
@@ -102,7 +102,7 @@ public static function registerPageType(PageObjectConfiguration $pageTypeConfigu
                 [
                     'userFunc' => $pageTypeConfiguration->getUserFunc(),
                 ],
-                $pageTypeConfiguration->getUserFuncParameters()
+                $pageTypeConfiguration->getUserFuncParameters(),
             );
         } else {
             $contentConfiguration = [
@@ -127,7 +127,7 @@ public static function registerPageType(PageObjectConfiguration $pageTypeConfigu
         $contentConfiguration[self::TYPO_SCRIPT_KEYS['OBJECT_TYPE']] = $internalContentType;
 
         $typoScript = [
-            self::TYPO_SCRIPT_KEYS['CONDITION']               => 'request.getQueryParams()[\'type\'] == ' . $pageTypeConfiguration->getTypeNum(),
+            self::TYPO_SCRIPT_KEYS['CONDITION']               => $pageTypeConfiguration->getTypeNum() . ' == traverse(request.getQueryParams(), \'type\')',
             $pageTypeConfiguration->getTypoScriptObjectName() => [
                 self::TYPO_SCRIPT_KEYS['OBJECT_TYPE'] => 'PAGE',
                 10                                    => $contentConfiguration,
@@ -160,7 +160,7 @@ public static function registerPageType(PageObjectConfiguration $pageTypeConfigu
     public static function registerTypoScript(
         ExtensionInformationInterface $extensionInformation,
         string $path,
-        string $title
+        string $title,
     ): void {
         ExtensionManagementUtility::addStaticFile($extensionInformation->getExtensionKey(), $path, $title);
     }

diff --git a/Classes/ViewHelpers/TranslateViewHelper.php b/Classes/ViewHelpers/TranslateViewHelper.php
@@ -48,7 +48,7 @@ class TranslateViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\TranslateViewHelp
     public static function renderStatic(
         array $arguments,
         Closure $renderChildrenClosure,
-        RenderingContextInterface $renderingContext
+        RenderingContextInterface $renderingContext,
     ): ?string {
         [
             'arguments'     => $translateArguments,
@@ -77,16 +77,16 @@ public static function renderStatic(
         try {
             $value = static::translate($id, $extensionName, $translateArguments, $arguments['languageKey'],
                 $arguments['alternativeLanguageKeys']);
-        } catch (InvalidArgumentException $e) {
+        } catch (InvalidArgumentException) {
             $value = null;
         }
 
         if (null === $value) {
             $value = $default ?? $renderChildrenClosure();
+        }
 
-            if (!empty($translateArguments)) {
-                $value = vsprintf($value, $translateArguments);
-            }
+        if (null !== $value && !empty($translateArguments)) {
+            $value = vsprintf($value, $translateArguments);
         }
 
         return $value;
@@ -110,7 +110,7 @@ protected static function translate(
         $extensionName,
         $arguments,
         $languageKey,
-        $alternativeLanguageKeys
+        $alternativeLanguageKeys,
     ): ?string {
         return GeneralUtility::makeInstance(LocalizationService::class)
             ->translate($id, $extensionName, $arguments, $languageKey, $alternativeLanguageKeys);

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -18,5 +18,5 @@
     'description'      => 'Configuration framework for TYPO3 extension development',
     'state'            => 'stable',
     'title'            => 'PSbits | Foundation',
-    'version'          => '1.2.2',
+    'version'          => '1.2.3',
 ];