Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion Build/phpstan-baseline-11-7.4.neon
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,17 @@ parameters:
-
message: "#^Call to an undefined static method TYPO3\\\\CMS\\\\Core\\\\Versioning\\\\VersionState\\:\\:tryFrom\\(\\)\\.$#"
count: 2
path: ../Classes/Domain/Factory/PageView/Backend/ContentStorage.php
path: ../Classes/Domain/Factory/PageView/Backend/ContentStorage.php
-
message: "#^Cannot call method getRecordType\\(\\) on array\\.$#"
count: 1
path: ../Classes/Listener/PageContentPreviewRendering.php

-
message: "#^Cannot call method toArray\\(\\) on array\\.$#"
count: 1
path: ../Classes/Listener/PageContentPreviewRendering.php
-
message: "#^Class TYPO3\\\\CMS\\\\Core\\\\Domain\\\\RecordFactory not found\\.$#"
count: 1
path: ../Classes/Backend/Grid/ContainerGridColumnItem.php
15 changes: 14 additions & 1 deletion Build/phpstan-baseline-11.neon
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,17 @@ parameters:
-
message: "#^Call to an undefined static method TYPO3\\\\CMS\\\\Core\\\\Versioning\\\\VersionState\\:\\:tryFrom\\(\\)\\.$#"
count: 2
path: ../Classes/Domain/Factory/PageView/Backend/ContentStorage.php
path: ../Classes/Domain/Factory/PageView/Backend/ContentStorage.php
-
message: "#^Cannot call method getRecordType\\(\\) on array\\.$#"
count: 1
path: ../Classes/Listener/PageContentPreviewRendering.php

-
message: "#^Cannot call method toArray\\(\\) on array\\.$#"
count: 1
path: ../Classes/Listener/PageContentPreviewRendering.php
-
message: "#^Class TYPO3\\\\CMS\\\\Core\\\\Domain\\\\RecordFactory not found\\.$#"
count: 1
path: ../Classes/Backend/Grid/ContainerGridColumnItem.php
20 changes: 19 additions & 1 deletion Build/phpstan-baseline-12.neon
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,22 @@ parameters:
-
message: "#^Call to an undefined static method TYPO3\\\\CMS\\\\Core\\\\Versioning\\\\VersionState\\:\\:tryFrom\\(\\)\\.$#"
count: 2
path: ../Classes/Domain/Factory/PageView/Backend/ContentStorage.php
path: ../Classes/Domain/Factory/PageView/Backend/ContentStorage.php
-
message: "#^Cannot call method getRecordType\\(\\) on array\\.$#"
count: 1
path: ../Classes/Listener/PageContentPreviewRendering.php

-
message: "#^Cannot call method toArray\\(\\) on array\\.$#"
count: 1
path: ../Classes/Listener/PageContentPreviewRendering.php
-
message: "#^Call to method createFromDatabaseRow\\(\\) on an unknown class TYPO3\\\\CMS\\\\Core\\\\Domain\\\\RecordFactory\\.$#"
count: 1
path: ../Classes/Backend/Grid/ContainerGridColumnItem.php

-
message: "#^Class TYPO3\\\\CMS\\\\Core\\\\Domain\\\\RecordFactory not found\\.$#"
count: 1
path: ../Classes/Backend/Grid/ContainerGridColumnItem.php
11 changes: 10 additions & 1 deletion Build/phpstan-baseline-13.neon
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,13 @@ parameters:
-
message: "#^Class TYPO3\\\\CMS\\\\Backend\\\\View\\\\PageLayoutContext constructor invoked with 2 parameters, 5 required\\.$#"
count: 1
path: ../Tests/Functional/Integrity/IntegrityTest.php
path: ../Tests/Functional/Integrity/IntegrityTest.php
-
message: "#^Cannot call method getRecordType\\(\\) on array\\.$#"
count: 1
path: ../Classes/Listener/PageContentPreviewRendering.php

-
message: "#^Cannot call method toArray\\(\\) on array\\.$#"
count: 1
path: ../Classes/Listener/PageContentPreviewRendering.php
11 changes: 10 additions & 1 deletion Build/phpstan-baseline-14.neon
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,13 @@ parameters:
-
message: "#^Call to an undefined static method TYPO3\\\\CMS\\\\Core\\\\Versioning\\\\VersionState\\:\\:cast\\(\\)\\.$#"
count: 2
path: ../Classes/Domain/Factory/PageView/Backend/ContentStorage.php
path: ../Classes/Domain/Factory/PageView/Backend/ContentStorage.php
-
message: "#^Parameter \\#1 \\$record of method B13\\\\Container\\\\Backend\\\\Preview\\\\GridRenderer\\:\\:renderGrid\\(\\) expects array, TYPO3\\\\CMS\\\\Core\\\\Domain\\\\RecordInterface given\\.$#"
count: 1
path: ../Classes/Backend/Preview/ContainerPreviewRenderer.php

-
message: "#^Parameter \\#1 \\$record of method B13\\\\Container\\\\Backend\\\\Preview\\\\GridRenderer\\:\\:renderGrid\\(\\) expects array, TYPO3\\\\CMS\\\\Core\\\\Domain\\\\RecordInterface given\\.$#"
count: 1
path: ../Classes/Listener/PageContentPreviewRendering.php
7 changes: 7 additions & 0 deletions Classes/Backend/Grid/ContainerGridColumnItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
use B13\Container\Domain\Model\Container;
use TYPO3\CMS\Backend\View\BackendLayout\Grid\GridColumnItem;
use TYPO3\CMS\Backend\View\PageLayoutContext;
use TYPO3\CMS\Core\Domain\RecordFactory;
use TYPO3\CMS\Core\Information\Typo3Version;
use TYPO3\CMS\Core\Utility\GeneralUtility;

class ContainerGridColumnItem extends GridColumnItem
{
Expand All @@ -23,6 +26,10 @@ class ContainerGridColumnItem extends GridColumnItem

public function __construct(PageLayoutContext $context, ContainerGridColumn $column, array $record, Container $container, ?string $newContentUrl)
{
if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() > 13) {
$recordFactory = GeneralUtility::makeInstance(RecordFactory::class);
$record = $recordFactory->createFromDatabaseRow('tt_content', $record);
}
parent::__construct($context, $column, $record);
$this->container = $container;
$this->newContentUrl = $newContentUrl;
Expand Down
19 changes: 16 additions & 3 deletions Classes/Listener/PageContentPreviewRendering.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
use B13\Container\Backend\Preview\GridRenderer;
use B13\Container\Tca\Registry;
use TYPO3\CMS\Backend\View\Event\PageContentPreviewRenderingEvent;
use TYPO3\CMS\Core\Information\Typo3Version;
use TYPO3\CMS\Core\Utility\GeneralUtility;

class PageContentPreviewRendering
{
Expand All @@ -34,10 +36,21 @@ public function __invoke(PageContentPreviewRenderingEvent $event): void
}

$record = $event->getRecord();
if (!$this->tcaRegistry->isContainerElement((string)$record['CType'])) {

if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() > 13) {
$recordType = $record->getRecordType();
} else {
$recordType = $record['CType'];
}
if (!$this->tcaRegistry->isContainerElement($recordType)) {
return;
}
$record['tx_container_grid'] = $this->gridRenderer->renderGrid($record, $event->getPageLayoutContext());
$event->setRecord($record);
if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() > 13) {
$previewContent = $this->gridRenderer->renderGrid($record->toArray(), $event->getPageLayoutContext());
$event->setPreviewContent($previewContent);
} else {
$record['tx_container_grid'] = $this->gridRenderer->renderGrid($record, $event->getPageLayoutContext());
$event->setRecord($record);
}
}
}
Loading