From 2e5a0f9700f243c193d782fd416d28c9786a257c Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Thu, 25 Jul 2024 01:57:47 +0200
Subject: [PATCH] [TASK] Reduce extbase magic in FluidTemplateContentObject
FluidTemplateContentObject has some magic to adapt
the given request *if* the request is an extbase
request already.
This code is relatively obviously obsolete: Only
extbase bootstrap creates extbase requests (and
actually, the code *below* the lines changed by
this patch in FluidTemplateContentObject, those
will see a separate deprecation or removal patch,
soon).
So, when FluidTemplateContentObject is called
for whatever reason with an extbase request, it
has been created by a proper extbase bootstrap
call, wich created a "correct" extbase request
already. There is no need to tamper with this
in FluidTemplateContentObject again. Note this
wasn't the case with earlier TYPO3 versions where
extbase requests were created within StandaloneView,
a misuse we got rid off in v12.
The patch removes these extbase request
manipulations from FluidTemplateContentObject.
Resolves: #104473
Related: #104472
Related: #104471
Related: #98377
Releases: main
Change-Id: Id4fc202f140fe270e35259251ed052752c2c6ed0
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/85348
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Simon Praetorius <simon@praetorius.me>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Simon Praetorius <simon@praetorius.me>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../FluidTemplateContentObject.php | 25 -------------------
1 file changed, 25 deletions(-)
diff --git a/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
index 5a44913d946f..80c2f01af4af 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
@@ -18,7 +18,6 @@ namespace TYPO3\CMS\Frontend\ContentObject;
use TYPO3\CMS\Core\TypoScript\TypoScriptService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
-use TYPO3\CMS\Extbase\Mvc\RequestInterface;
use TYPO3\CMS\Extbase\Mvc\Web\RequestBuilder;
use TYPO3\CMS\Fluid\View\StandaloneView;
use TYPO3\CMS\Frontend\ContentObject\Exception\ContentRenderingException;
@@ -202,34 +201,10 @@ class FluidTemplateContentObject extends AbstractContentObject
*/
protected function setExtbaseVariables(array $conf)
{
- // @todo: It is currently unclear if the if's below can happen at all: An extbase request has been
- // prepared, but the setup of plugin name, controller extension name and friends
- // did not happen? Maybe these four if's are useless and the main if that
- // tests for all four properties is fine? Maybe the main if below is obsolete, too?
- // This comment was added when StandaloneView still had a default constructor that actively
- // creates a request by default. It might be more possible to resolve this when this is gone.
- $request = $this->request;
$requestPluginName = (string)$this->cObj->stdWrapValue('pluginName', $conf['extbase.'] ?? []);
- if ($requestPluginName && $request instanceof RequestInterface) {
- $request = $request->withPluginName($requestPluginName);
- $this->view->setRequest($request);
- }
$requestControllerExtensionName = (string)$this->cObj->stdWrapValue('controllerExtensionName', $conf['extbase.'] ?? []);
- if ($requestControllerExtensionName && $request instanceof RequestInterface) {
- $request = $request->withControllerExtensionName($requestControllerExtensionName);
- $this->view->setRequest($request);
- }
$requestControllerName = (string)$this->cObj->stdWrapValue('controllerName', $conf['extbase.'] ?? []);
- if ($requestControllerName && $request instanceof RequestInterface) {
- $request = $request->withControllerName($requestControllerName);
- $this->view->setRequest($request);
- }
$requestControllerActionName = (string)$this->cObj->stdWrapValue('controllerActionName', $conf['extbase.'] ?? []);
- if ($requestControllerActionName && $request instanceof RequestInterface) {
- $request = $request->withControllerActionName($requestControllerActionName);
- $this->view->setRequest($request);
- }
-
if ($requestPluginName && $requestControllerExtensionName && $requestControllerName && $requestControllerActionName) {
// @todo: Yep, ugly. Having all four properties indicates an extbase plugin and then starts
// extbase configuration manager. See https://forge.typo3.org/issues/78842 and investigate
--
GitLab