[BUGFIX] Fix return type in RequestWrapper

In case TypoScript conditions are evaluated in the backend, e.g. in extbase modules, usage of `getPageArguments()` might led to exceptions, because in backend context, no PageArguments object is available. This is now fixed and a corresponding example is adjusted. Resolves: #100567 Related: #100405 Releases: main Change-Id: Ibee0fa8b509b1552bdcf003ff154e70229215d08 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/78602 Reviewed-by: Stefan Bürk <stefan@buerk.tech> Tested-by: core-ci <typo3@b13.com> Tested-by: Christian Kuhn <lolli@schwarzbu.ch> Tested-by: Stefan Bürk <stefan@buerk.tech> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
TYPO3 · Apr 12, 2023 · c4d7c4d · c4d7c4d
1 parent 7357c91
commit c4d7c4d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/typo3/sysext/core/Classes/ExpressionLanguage/DeprecatingRequestWrapper.php b/typo3/sysext/core/Classes/ExpressionLanguage/DeprecatingRequestWrapper.php
@@ -20,7 +20,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Http\NormalizedParams;
 use TYPO3\CMS\Core\Http\ServerRequest;
-use TYPO3\CMS\Core\Routing\RouteResultInterface;
+use TYPO3\CMS\Core\Routing\PageArguments;
 use TYPO3\CMS\Core\Site\Entity\SiteInterface;
 use TYPO3\CMS\Core\Site\Entity\SiteLanguage;
 
@@ -127,7 +127,7 @@ public function getNormalizedParams(): ?NormalizedParams
         return $this->request->getAttribute('normalizedParams');
     }
 
-    public function getPageArguments(): ?RouteResultInterface
+    public function getPageArguments(): ?PageArguments
     {
         trigger_error(
             'Using conditions based on request data within page TSconfig or user TSconfig has been deprecated' .

diff --git a/typo3/sysext/core/Classes/ExpressionLanguage/RequestWrapper.php b/typo3/sysext/core/Classes/ExpressionLanguage/RequestWrapper.php
@@ -20,7 +20,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Http\NormalizedParams;
 use TYPO3\CMS\Core\Http\ServerRequest;
-use TYPO3\CMS\Core\Routing\RouteResultInterface;
+use TYPO3\CMS\Core\Routing\PageArguments;
 use TYPO3\CMS\Core\Site\Entity\SiteInterface;
 use TYPO3\CMS\Core\Site\Entity\SiteLanguage;
 
@@ -81,8 +81,8 @@ public function getNormalizedParams(): ?NormalizedParams
         return $this->request->getAttribute('normalizedParams');
     }
 
-    public function getPageArguments(): ?RouteResultInterface
+    public function getPageArguments(): ?PageArguments
     {
-        return $this->request->getAttribute('routing');
+        return ($routing = $this->request->getAttribute('routing')) instanceof PageArguments ? $routing : null;
     }
 }
diff --git a/...Changelog/12.4/Deprecation-100405-PropertyTypoScriptFrontendController-type.rst b/...Changelog/12.4/Deprecation-100405-PropertyTypoScriptFrontendController-type.rst
@@ -47,7 +47,7 @@ the request object is not available.
 Within TypoScript, conditions and getData properties need to be adapted:
 
 Before: :typoscript:`[getTSFE() && getTSFE().type == 13]`
-After: :typoscript:`[request.getPageArguments().getPageType() == 13]`
+After: :typoscript:`[request.getPageArguments()?.getPageType() == 13]`
 
 In Typoscript getData attributes: