From ade07ed6dac28e2089c0266ff76db4e7fc1feb75 Mon Sep 17 00:00:00 2001 From: Matthias Adrowski <matthias.adrowski@sgalinski.de> Date: Wed, 4 May 2022 11:50:13 +0200 Subject: [PATCH] [TASK] Add forward and general Response for v11 --- Classes/Controller/OverviewController.php | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Classes/Controller/OverviewController.php b/Classes/Controller/OverviewController.php index 5b00281..a8e4476 100644 --- a/Classes/Controller/OverviewController.php +++ b/Classes/Controller/OverviewController.php @@ -118,9 +118,19 @@ class OverviewController extends AbstractController { * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException * @throws \TYPO3\CMS\Extbase\Configuration\Exception\InvalidConfigurationTypeException */ - public function overviewAction(array $newsFilter = [], int $currentPageBrowserPage = 0) { + public function overviewAction(array $newsFilter = [], int $currentPageBrowserPage = 0): ?\Psr\Http\Message\ResponseInterface { if ((int) $this->settings['groupBy'] === 0 && (bool) $this->settings['enableFilter'] === FALSE) { - $this->forward('overviewWithoutCategories', NULL, NULL, $this->request->getArguments()); + if (version_compare( + \TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<' + )) { + $this->forward('overviewWithoutCategories', NULL, NULL, $this->request->getArguments()); + } + else { + return (new \TYPO3\CMS\Extbase\Http\ForwardResponse( + 'overviewWithoutCategories' + )) + ->withArguments($this->request->getArguments()); + } } // Setup settings @@ -312,6 +322,12 @@ class OverviewController extends AbstractController { default: $this->view->assign('groupBy', 'none'); } + + if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '11.0.0', '<')) { + return NULL; + } else { + return $this->htmlResponse(); + } } /** -- GitLab