From 6f865ea857a21476eda4991296a99d77e3034b4d Mon Sep 17 00:00:00 2001 From: Alexander Stehlik Date: Sat, 16 Oct 2021 14:26:54 +0200 Subject: [PATCH] [BUGFIX] Prevent PHP 8 warning in FLUIDTEMPLATE variable resolving Prevent PHP 8 undefined array key warning when resolving a FLUIDTEMPLATE variable value from a TypoScript reference: 10 = FLUIDTEMPLATE 10 { variables { myvar =< lib.some.cobject } } Resolves: #95672 Releases: master Change-Id: I641a6522805c770c3242ea93673961c6201ff9f7 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/71838 Tested-by: core-ci Tested-by: Wouter Wolters Tested-by: Christian Kuhn Reviewed-by: Wouter Wolters Reviewed-by: Oliver Klee Reviewed-by: Christian Kuhn --- .../Classes/ContentObject/FluidTemplateContentObject.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php index 0221b88bd477..2bc050d5cd98 100644 --- a/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php +++ b/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php @@ -301,7 +301,8 @@ protected function getContentObjectVariables(array $conf) continue; } if (!in_array($variableName, $reservedVariables)) { - $variables[$variableName] = $this->cObj->cObjGetSingle($cObjType, $variablesToProcess[$variableName . '.'], 'variables.' . $variableName); + $cObjConf = $variablesToProcess[$variableName . '.'] ?? []; + $variables[$variableName] = $this->cObj->cObjGetSingle($cObjType, $cObjConf, 'variables.' . $variableName); } else { throw new \InvalidArgumentException( 'Cannot use reserved name "' . $variableName . '" as variable name in FLUIDTEMPLATE.',