From 8336258c5fd9f6542f5ed633c40aa3f5d247b441 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Wed, 9 Nov 2022 13:18:29 +0100
Subject: [PATCH] [TASK] Avoid mentions of TypoScriptParser
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Minor patch to reduce usages of class TypoScriptParser
in comments and description.
Resolves: #99029
Related: #97816
Releases: main
Change-Id: Ic20aa9f90623590b219ef98c62ab121c42ae8fcd
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/76518
Tested-by: Jochen <rothjochen@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Jochen <rothjochen@gmail.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
---
typo3/sysext/backend/Classes/Utility/BackendUtility.php | 1 -
.../TypoScript/ConditionMatching/AbstractConditionMatcher.php | 4 ++--
.../core/Configuration/DefaultConfigurationDescription.yaml | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/typo3/sysext/backend/Classes/Utility/BackendUtility.php b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
index a9956b565d8d..07a5fefd7c26 100644
--- a/typo3/sysext/backend/Classes/Utility/BackendUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
@@ -692,7 +692,6 @@ class BackendUtility
*
* @param int $id Page uid for which to create Page TSconfig
* @return array Page TSconfig
- * @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser
*/
public static function getPagesTSconfig($id)
{
diff --git a/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php b/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
index 0a294f84fe40..e997f91d3056 100644
--- a/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
+++ b/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
@@ -197,8 +197,8 @@ abstract class AbstractConditionMatcher implements LoggerAwareInterface, Conditi
*/
protected function evaluateExpression(string $expression): bool
{
- // The TypoScript [ELSE] condition is not known by the Symfony Expression Language
- // and must not be evaluated. If/else logic is handled in TypoScriptParser.
+ // The TypoScript [ELSE] condition is not known by the Symfony Expression Language and must not be evaluated.
+ // This is handled in the TypoScript parser tree builder logic.
if (strtoupper($expression) === 'ELSE') {
return false;
}
diff --git a/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml b/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml
index 5f02d9b6fea7..c8fdb3fb57f9 100644
--- a/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml
+++ b/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml
@@ -393,7 +393,7 @@ FE:
items:
addAllowedPaths:
type: list
- description: 'Additional relative paths (comma-list) to allow TypoScript resources be in. Should be prepended with ''/''. If not, then any path where the first part is like this path will match. That is: ''myfolder/ , myarchive'' will match eg. ''myfolder/'', ''myarchive/'', ''myarchive_one/'', ''myarchive_2/'' ... No check is done to see if this directory actually exists in the root of the site. Paths are matched by simply checking if these strings equals the first part of any TypoScript resource filepath. (See class template, function init() in <code>\TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser)</code>'
+ description: 'Additional relative paths resources are allowed to be placed. Used in a couple of Frontend related places for images and TypoScript. Should be prepended with ''/''. If not, then any path where the first part is like this path will match. That is: ''myfolder/ , myarchive'' will match eg. ''myfolder/'', ''myarchive/'', ''myarchive_one/'', ''myarchive_2/''. No check is done to see if this directory actually exists in the root of the site.'
debug:
type: bool
description: 'If enabled, the total parsetime of the page is added as HTTP response header "X-TYPO3-Parsetime". This can also be enabled/disabled via the TypoScript option <code>config.debug = 0</code>.'
--
GitLab