From 5ef69f643dc8b8d005ae88bdb94447e675507cd6 Mon Sep 17 00:00:00 2001
From: Benjamin Kott <benjamin.kott@outlook.com>
Date: Mon, 4 Nov 2024 06:43:38 +0100
Subject: [PATCH] [TASK] Drop request fallbacks in viewhelpers

---
 Classes/ViewHelpers/Data/PaginateViewHelper.php       | 3 ---
 Classes/ViewHelpers/FrameViewHelper.php               | 3 ---
 Classes/ViewHelpers/Link/PaginateViewHelper.php       | 3 ---
 Classes/ViewHelpers/TypoScript/ConstantViewHelper.php | 3 ---
 4 files changed, 12 deletions(-)

diff --git a/Classes/ViewHelpers/Data/PaginateViewHelper.php b/Classes/ViewHelpers/Data/PaginateViewHelper.php
index 732d700ac..6c61231b8 100644
--- a/Classes/ViewHelpers/Data/PaginateViewHelper.php
+++ b/Classes/ViewHelpers/Data/PaginateViewHelper.php
@@ -159,9 +159,6 @@ protected function getRequestFromRenderingContext(RenderingContextInterface $ren
     {
         if ($renderingContext->hasAttribute(ServerRequestInterface::class)) {
             return $renderingContext->getAttribute(ServerRequestInterface::class);
-        } elseif ($renderingContext instanceof RenderingContext) {
-            /** @phpstan-ignore-next-line */
-            return $renderingContext->getRequest();
         }
 
         return null;
diff --git a/Classes/ViewHelpers/FrameViewHelper.php b/Classes/ViewHelpers/FrameViewHelper.php
index bd6dcc6d8..1323f2da4 100644
--- a/Classes/ViewHelpers/FrameViewHelper.php
+++ b/Classes/ViewHelpers/FrameViewHelper.php
@@ -221,9 +221,6 @@ protected function getRequestFromRenderingContext(RenderingContextInterface $ren
     {
         if ($renderingContext->hasAttribute(ServerRequestInterface::class)) {
             return $renderingContext->getAttribute(ServerRequestInterface::class);
-        } elseif ($renderingContext instanceof RenderingContext) {
-            /** @phpstan-ignore-next-line */
-            return $renderingContext->getRequest();
         }
 
         return null;
diff --git a/Classes/ViewHelpers/Link/PaginateViewHelper.php b/Classes/ViewHelpers/Link/PaginateViewHelper.php
index 8bb959255..36d6bc68f 100644
--- a/Classes/ViewHelpers/Link/PaginateViewHelper.php
+++ b/Classes/ViewHelpers/Link/PaginateViewHelper.php
@@ -95,9 +95,6 @@ protected function getRequestFromRenderingContext(RenderingContextInterface $ren
     {
         if ($renderingContext->hasAttribute(ServerRequestInterface::class)) {
             return $renderingContext->getAttribute(ServerRequestInterface::class);
-        } elseif ($renderingContext instanceof RenderingContext) {
-            /** @phpstan-ignore-next-line */
-            return $renderingContext->getRequest();
         }
 
         return null;
diff --git a/Classes/ViewHelpers/TypoScript/ConstantViewHelper.php b/Classes/ViewHelpers/TypoScript/ConstantViewHelper.php
index e1189a835..4fbd1acfb 100644
--- a/Classes/ViewHelpers/TypoScript/ConstantViewHelper.php
+++ b/Classes/ViewHelpers/TypoScript/ConstantViewHelper.php
@@ -53,9 +53,6 @@ protected function getRequestFromRenderingContext(RenderingContextInterface $ren
     {
         if ($renderingContext->hasAttribute(ServerRequestInterface::class)) {
             return $renderingContext->getAttribute(ServerRequestInterface::class);
-        } elseif ($renderingContext instanceof RenderingContext) {
-            /** @phpstan-ignore-next-line */
-            return $renderingContext->getRequest();
         }
 
         return null;