Merge pull request #431 from KaiGrosz/master

[BUGFIX] Create contentRecordRenderer via API

Author: achimfritz

Build/phpstan10.neon

@@ -36,15 +36,6 @@ parameters:
     - '#Constant LF not found.#'
     - '#Cannot call method fetchAllAssociative\(\) on Doctrine\\DBAL\\Driver\\ResultStatement\|int.#'
     - '#Cannot call method fetchAssociative\(\) on Doctrine\\DBAL\\Driver\\ResultStatement\|int.#'
-    -
-      message: '#Call to an undefined method TYPO3\\CMS\\Frontend\\ContentObject\\RecordsContentObject::setRequest\(\).#'
-      path: %currentWorkingDirectory%/Classes/DataProcessing/ContainerProcessor.php
-    -
-      message: '#Class TYPO3\\CMS\\Frontend\\ContentObject\\RecordsContentObject constructor invoked with 0 parameters, 1 required.#'
-      path: %currentWorkingDirectory%/Classes/DataProcessing/ContainerProcessor.php
-    -
-      message: '#Call to an undefined method TYPO3\\CMS\\Frontend\\ContentObject\\RecordsContentObject::setContentObjectRenderer\(\).#'
-      path: %currentWorkingDirectory%/Classes/DataProcessing/ContainerProcessor.php
     -
       message: '#Call to protected method getTypoScriptFrontendController\(\) of class TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer.#'
-      path: %currentWorkingDirectory%/Classes/DataProcessing/ContainerProcessor.php
+      path: %currentWorkingDirectory%/Classes/DataProcessing/ContainerProcessor.php

Build/phpstan11.neon

@@ -42,6 +42,3 @@ parameters:
       message: '#Property TYPO3\\TestingFramework\\Core\\Acceptance\\Helper\\AbstractPageTree::.*tester .*#'
       path: %currentWorkingDirectory%/Tests/Acceptance/Support/PageTree.php
     - '#Constant LF not found.#'
-    -
-      message: '#Class TYPO3\\CMS\\Frontend\\ContentObject\\RecordsContentObject constructor invoked with 0 parameters, 1 required.#'
-      path: %currentWorkingDirectory%/Classes/DataProcessing/ContainerProcessor.php

Build/phpstan12.neon

@@ -23,9 +23,6 @@ parameters:
     -
       message: '#Method TYPO3\\CMS\\Backend\\View\\PageLayoutView::__construct\(\).* invoked with 1 parameter, 0 required.#'
       path: %currentWorkingDirectory%/Classes/View/ContainerLayoutView.php
-    -
-      message: '#Class TYPO3\\CMS\\Frontend\\ContentObject\\RecordsContentObject does not have a constructor and must be instantiated without any parameters.#'
-      path: %currentWorkingDirectory%/Classes/DataProcessing/ContainerProcessor.php
     -
       message: '#Constant ORIGINAL_ROOT not found.#'
       path: %currentWorkingDirectory%/Tests

Classes/DataProcessing/ContainerDataProcessingFailedException.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace B13\Container\DataProcessing;
+
+/*
+ * This file is part of TYPO3 CMS-based extension "container" by b13.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ */
+
+class ContainerDataProcessingFailedException extends \B13\Container\Exception
+{
+}

Classes/DataProcessing/ContainerProcessor.php

@@ -22,7 +22,6 @@
 use TYPO3\CMS\Frontend\ContentObject\ContentDataProcessor;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3\CMS\Frontend\ContentObject\DataProcessorInterface;
-use TYPO3\CMS\Frontend\ContentObject\RecordsContentObject;
 
 class ContainerProcessor implements DataProcessorInterface
 {
@@ -103,18 +102,15 @@ protected function processColPos(
     ): array {
         $children = $container->getChildrenByColPos($colPos);
 
-        $typo3Version = GeneralUtility::makeInstance(Typo3Version::class);
-        if ($typo3Version->getMajorVersion() < 12) {
-            $contentRecordRenderer = new RecordsContentObject($cObj);
-        } else {
-            $contentRecordRenderer = new RecordsContentObject();
-            $contentRecordRenderer->setContentObjectRenderer($cObj);
-            $contentRecordRenderer->setRequest($this->getRequest());
+        $contentRecordRenderer = $cObj->getContentObject('RECORDS');
+        if ($contentRecordRenderer === null) {
+            throw new ContainerDataProcessingFailedException('RECORDS content object not available.', 1691483526);
         }
+
         $conf = [
             'tables' => 'tt_content',
         ];
-        if ($typo3Version->getMajorVersion() < 11) {
+        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 11) {
             /** @var LanguageAspect $languageAspect */
             $languageAspect = $GLOBALS['TSFE']->getContext()->getAspect('language');
         } else {