[BUGFIX] Set Request in UriBuilder wherever it is used

FluidTYPO3 · Jan 24, 2025 · c84ff28 · c84ff28
1 parent 3b97202
commit c84ff28
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/Classes/ViewHelpers/Page/Header/AlternateViewHelper.php b/Classes/ViewHelpers/Page/Header/AlternateViewHelper.php
@@ -11,6 +11,7 @@
 use FluidTYPO3\Vhs\Service\PageService;
 use FluidTYPO3\Vhs\Traits\PageRendererTrait;
 use FluidTYPO3\Vhs\Utility\ContextUtility;
+use FluidTYPO3\Vhs\Utility\RequestResolver;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
@@ -103,6 +104,7 @@ public function render()
 
         /** @var UriBuilder $uriBuilder */
         $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
+        $uriBuilder->setRequest(RequestResolver::resolveRequestFromRenderingContext($this->renderingContext));
 
         $uriBuilder = $uriBuilder->reset()
             ->setTargetPageUid($pageUid)

diff --git a/Classes/ViewHelpers/Page/Header/CanonicalViewHelper.php b/Classes/ViewHelpers/Page/Header/CanonicalViewHelper.php
@@ -10,6 +10,7 @@
 
 use FluidTYPO3\Vhs\Traits\PageRendererTrait;
 use FluidTYPO3\Vhs\Utility\ContextUtility;
+use FluidTYPO3\Vhs\Utility\RequestResolver;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
@@ -73,6 +74,7 @@ public function render()
 
         /** @var UriBuilder $uriBuilder */
         $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
+        $uriBuilder->setRequest(RequestResolver::resolveRequestFromRenderingContext($this->renderingContext));
 
         $uriBuilder = $uriBuilder->reset()
             ->setTargetPageUid($pageUid)

diff --git a/Classes/ViewHelpers/Page/LinkViewHelper.php b/Classes/ViewHelpers/Page/LinkViewHelper.php
@@ -11,6 +11,7 @@
 use FluidTYPO3\Vhs\Service\PageService;
 use FluidTYPO3\Vhs\Traits\PageRecordViewHelperTrait;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
+use FluidTYPO3\Vhs\Utility\RequestResolver;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\LanguageAspect;
 use TYPO3\CMS\Core\Log\LogManager;
@@ -231,6 +232,7 @@ public function render()
 
         /** @var UriBuilder $uriBuilder */
         $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
+        $uriBuilder->setRequest(RequestResolver::resolveRequestFromRenderingContext($this->renderingContext));
         $uriBuilder->reset()
             ->setTargetPageUid($pageUid)
             ->setTargetPageType($pageType)

diff --git a/phpstan.neon b/phpstan.neon
@@ -50,6 +50,7 @@ parameters:
         - "#^Strict comparison using === between 'FE' and 'CLI' will always evaluate to false\\.$#"
         - "#^Strict comparison using === between 'BE' and 'CLI' will always evaluate to false\\.$#"
         - "#^Parameter \\#2 \\$sectionName of method TYPO3Fluid\\\\Fluid\\\\View\\\\AbstractTemplateView\\:\\:renderPartial\\(\\) expects string, string\\|null given\\.$#"
+        - "#^Parameter \\#1 \\$request of method TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Routing\\\\UriBuilder\\:\\:setRequest\\(\\) expects TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Request(Interface)?, Psr\\\\Http\\\\Message\\\\ServerRequestInterface given\\.$#"
         - "#^Access to undefined constant TYPO3\\\\CMS\\\\Core\\\\Utility\\\\GeneralUtility\\:\\:SYSLOG_SEVERITY_#"
         - "#^Call to an undefined static method TYPO3\\\\CMS\\\\Core\\\\Utility\\\\GeneralUtility\\:\\:getApplicationContext\\(\\)\\.$#"
         - "#^Call to an undefined static method TYPO3\\\\CMS\\\\Core\\\\Utility\\\\GeneralUtility\\:\\:sysLog\\(\\)\\.$#"