From 68aa03bd87eef819dc9c6fb2f685827b53863894 Mon Sep 17 00:00:00 2001
From: Simon Gilli <typo3@gilbertsoft.org>
Date: Thu, 11 Nov 2021 13:42:20 +0100
Subject: [PATCH] [BUGFIX] Ensure TranslateViewHelper does not fail on invalid
extension
Change #95839 introduced a regression that causes TranslateViewHelper
to fail when an invalid extension key is specified. This patch restores
the previous behavior and avoids more regressions by a new test.
Resolves: #95957
Releases: master
Change-Id: I98675f94cf367b43f4123bb981f60c35286ace7a
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72158
Tested-by: core-ci <typo3@b13.com>
Tested-by: Helmut Hummel <typo3@helhum.io>
Tested-by: Nikita Hovratov <nikita.h@live.de>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Helmut Hummel <typo3@helhum.io>
Reviewed-by: Nikita Hovratov <nikita.h@live.de>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
---
.../core/Classes/Localization/LocalizationFactory.php | 3 ++-
.../ViewHelpers/TranslateViewHelperTest.php | 11 +++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/typo3/sysext/core/Classes/Localization/LocalizationFactory.php b/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
index 65459d17fc26..b88b1f112ae2 100644
--- a/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
+++ b/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
@@ -17,6 +17,7 @@ namespace TYPO3\CMS\Core\Localization;
use TYPO3\CMS\Core\Cache\CacheManager;
use TYPO3\CMS\Core\Localization\Exception\FileNotFoundException;
+use TYPO3\CMS\Core\Package\Exception\UnknownPackagePathException;
use TYPO3\CMS\Core\SingletonInterface;
use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -83,7 +84,7 @@ class LocalizationFactory implements SingletonInterface
// @todo: this (providing an absolute file system path) likely does not work properly anyway in all cases and should rather be deprecated
$LOCAL_LANG = $parser->getParsedData($this->store->getAbsoluteFileReference($fileReference), $languageKey);
}
- } catch (FileNotFoundException $exception) {
+ } catch (FileNotFoundException | UnknownPackagePathException $exception) {
// Source localization file not found, set empty data as there could be an override
$this->store->setData($fileReference, $languageKey, []);
$LOCAL_LANG = $this->store->getData($fileReference);
diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/TranslateViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/TranslateViewHelperTest.php
index eca83fc91637..63a9c5b5cc8c 100644
--- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/TranslateViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/TranslateViewHelperTest.php
@@ -76,4 +76,15 @@ class TranslateViewHelperTest extends FunctionalTestCase
$view->setTemplateSource('<f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.goBack" />');
self::assertSame('Go back', $view->render());
}
+
+ /**
+ * @test
+ */
+ public function renderReturnsNullOnInvalidExtension(): void
+ {
+ $this->setUpBackendUserFromFixture(1);
+ $view = new StandaloneView();
+ $view->setTemplateSource('<f:translate key="LLL:EXT:invalid/Resources/Private/Language/locallang.xlf:dummy" />');
+ self::assertNull($view->render());
+ }
}
--
GitLab