Skip to content

Commit 2e92331

Browse files
committed
[TASK] prepare v2
1 parent 8e45e40 commit 2e92331

4 files changed

Lines changed: 9 additions & 39 deletions

File tree

Build/phpstan-baseline.neon

Lines changed: 0 additions & 21 deletions
This file was deleted.

Build/phpstan.neon

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
includes:
2-
- phpstan-baseline.neon
31
parameters:
42
level: 5
53
paths:
64
- %currentWorkingDirectory%/Classes
75
excludePaths:
8-
- %currentWorkingDirectory%/Classes/Hooks/DrawItem.php
6+
- %currentWorkingDirectory%/Classes/Listener/PageContentPreviewRendering.php

Build/phpstan13.neon

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
parameters:
22
level: 5
33
paths:
4-
- %currentWorkingDirectory%/Classes
5-
excludePaths:
6-
- %currentWorkingDirectory%/Classes/Hooks/DrawItem.php
4+
- %currentWorkingDirectory%/Classes

Classes/Service/ListService.php

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use TYPO3\CMS\Core\Database\ConnectionPool;
1818
use TYPO3\CMS\Core\Database\RelationHandler;
1919
use TYPO3\CMS\Core\Domain\Repository\PageRepository;
20-
use TYPO3\CMS\Core\Information\Typo3Version;
2120
use TYPO3\CMS\Core\Resource\FileRepository;
2221
use TYPO3\CMS\Core\Utility\GeneralUtility;
2322
use TYPO3\CMS\Core\Versioning\VersionState;
@@ -87,18 +86,14 @@ public function resolveItemsForFrontend(int $uid, string $table = 'tt_content',
8786
$pageRepository = GeneralUtility::makeInstance(PageRepository::class);
8887
$relationHandler = GeneralUtility::makeInstance(RelationHandler::class);
8988
$relationHandler->setWorkspaceId($workspaceId);
90-
if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
91-
$additionalWhere = $pageRepository->enableFields(self::TABLE);
89+
$constraints = $pageRepository->getDefaultConstraints(self::TABLE);
90+
if ($constraints === []) {
91+
$additionalWhere = '';
9292
} else {
93-
$constraints = $pageRepository->getDefaultConstraints(self::TABLE);
94-
if ($constraints === []) {
95-
$additionalWhere = '';
96-
} else {
97-
$expressionBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
98-
->getQueryBuilderForTable($table)
99-
->expr();
100-
$additionalWhere = ' AND ' . $expressionBuilder->and(...$constraints);
101-
}
93+
$expressionBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
94+
->getQueryBuilderForTable($table)
95+
->expr();
96+
$additionalWhere = ' AND ' . $expressionBuilder->and(...$constraints);
10297
}
10398
$relationHandler->additionalWhere[self::TABLE] = $additionalWhere;
10499
$relationHandler->start(

0 commit comments

Comments
 (0)