update V5-dev

.github/workflows/nightly-main.yml

@@ -20,9 +20,3 @@ jobs:
  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  run: |
  gh workflow run ci.yml --ref main
-
- - name: Execute multi-version tests on 'main'
- env:
- GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: |
- gh workflow run typo3-multi-version-tests.yml --ref main -f force_full_test=true

Classes/DataHandler/ProcessCmdmap.php

@@ -86,7 +86,7 @@ public function execute_processCmdmap(
 
  $clipBoard = $queryParams['CB'] ??= null;
  if (!empty($clipBoard)) {
- $updateArray = $clipBoard['update'];
+ $updateArray = $clipBoard['update']; // false positive of #99586 / #100963 in Extension Scanner
  if (!empty($updateArray)) {
  $dataArray = array_merge($dataArray, $updateArray);
  }

Classes/Domain/Repository/TtContentRepository.php

@@ -29,6 +29,7 @@
 use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Exception\DriverException as DBALDriverException;
 use EHAERER\PasteReference\Helper\BackendHelper;
+use TYPO3\CMS\Backend\Domain\Repository\Localization\LocalizationRepository;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Database\Connection;
@@ -52,13 +53,15 @@ class TtContentRepository implements SingletonInterface
  protected bool $showHidden = true;
  protected BackendHelper $backendHelper;
  protected string $table = 'tt_content';
+ protected LocalizationRepository $localizationRepository;
 
  public function __construct()
  {
  /** @var array<non-empty-string, string|int|float|bool|null> $emConf */
  $emConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('paste_reference') ?? [];
  $this->extensionConfiguration = $emConf;
  $this->backendHelper = GeneralUtility::makeInstance(BackendHelper::class);
+ $this->localizationRepository = GeneralUtility::makeInstance(LocalizationRepository::class);
  }
 
  /**
@@ -69,15 +72,15 @@ public function __construct()
  * @param string $shortcutItem The single page to be used as the tree root
  * @param-out array $collectedItems The collected item data rows ordered by parent position, column position and sorting
  * @param int $parentUid uid of the referencing tt_content record
- * @param int $language sys_language_uid of the referencing tt_content record
+ * @param int $languageId sys_language_uid of the referencing tt_content record
  * @param int $recursive The number of levels for the recursion
  * @throws DBALException
  */
  public function collectContentDataFromPages(
  string $shortcutItem,
  array &$collectedItems,
  int $parentUid = 0,
- int $language = 0,
+ int $languageId = 0,
  int $recursive = 0 // TODO: $recursive never seems being used
  ): void {
  $itemList = str_replace('pages_', '', $shortcutItem);
@@ -113,11 +116,8 @@ public function collectContentDataFromPages(
 
  /** @ var array<string,mixed>|false $item */
  while ($item = $result->fetchAssociative()) {
- if (!empty($this->extensionConfiguration['overlayShortcutTranslation']) && $language > 0) {
- $translatedItem = BackendUtility::getRecordLocalization('tt_content', (int)($item['uid'] ?? 0), $language) ?: [];
- if (is_array($translatedItem) && $translatedItem !== []) {
- $item = array_shift($translatedItem);
- }
+ if (!empty($this->extensionConfiguration['overlayShortcutTranslation']) && (int)$languageId > 0) {
+ $translatedItem = $this->localizationRepository->getRecordTranslation($this->table, (int)($item['uid'] ?? 0), (int)$languageId);
  }
  if ($this->backendHelper->getBackendUser()->workspace > 0) {
  unset($item['inSet']);
@@ -137,14 +137,14 @@ public function collectContentDataFromPages(
  * @param string $shortcutItem The tt_content element to fetch the data fromom
  * @param-out array $collectedItems The collected item data row
  * @param int $parentUid uid of the referencing tt_content record
- * @param int $language sys_language_uid of the referencing tt_content record
+ * @param int $languageId sys_language_uid of the referencing tt_content record
  * @throws DBALException
  */
  public function collectContentData(
  string $shortcutItem,
  array &$collectedItems,
  int $parentUid,
- int $language
+ int $languageId
  ): void {
  $shortcutItem = str_replace('tt_content_', '', $shortcutItem);
  if ((int)$shortcutItem !== $parentUid) {
@@ -167,11 +167,8 @@ public function collectContentData(
  ->setMaxResults(1)
  ->executeQuery()
  ->fetchAssociative();
- if (!empty($this->extensionConfiguration['overlayShortcutTranslation']) && $language > 0) {
- $translatedItem = BackendUtility::getRecordLocalization('tt_content', (int)($item['uid'] ?? 0), $language) ?: [];
- if (is_array($translatedItem) && $translatedItem !== []) {
- $item = array_shift($translatedItem);
- }
+ if (!empty($this->extensionConfiguration['overlayShortcutTranslation']) && (int)$languageId > 0) {
+ $translatedItem = $this->localizationRepository->getRecordTranslation($this->table, (int)($item['uid'] ?? 0), (int)$languageId);
  }
 
  if ($this->backendHelper->getBackendUser()->workspace > 0) {
@@ -235,10 +232,6 @@ public function cleanupWorkspacesAfterFinalizing(): void
  ->executeStatement();
  }
 
- /**
- * @param string $table
- * @return QueryBuilder
- */
  public function getQueryBuilder(string $table = 'tt_content'): QueryBuilder
  {
  $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)

Classes/PageLayoutView/ShortcutPreviewRenderer.php

@@ -103,7 +103,7 @@ public function renderPageModulePreviewContent(GridColumnItem $gridColumnItem):
  foreach ($shortCutRenderItems as $shortcutRecord) {
  $shortcutItem = GeneralUtility::makeInstance(
  GridColumnItem::class,
- $gridColumnItem->getContext(),
+ $gridColumnItem->getContext(), // false positive of #102621 in Extension Scanner
  $gridColumnItem->getColumn(),
  $shortcutRecord
  );
@@ -172,8 +172,8 @@ protected function addShortcutRenderItems(GridColumnItem $gridColumnItem): array
  $dataRow['shortcutItems'] = [];
  foreach ($collectedItems as $item) {
  if ($item) {
- $itemObj = $this->recordFactory->createFromDatabaseRow('tt_content', $item);
- $renderItems[] = $itemObj; // $this->prepareRecord($itemObj);
+ $itemObj = $this->recordFactory->createResolvedRecordFromDatabaseRow('tt_content', $item);
+ $renderItems[] = $itemObj;
  }
  }
  }
@@ -251,9 +251,8 @@ protected function getFakeItemForPreview(GridColumnItem $gridColumnItem): GridCo
  $rawRecord->getComputedProperties(),
  $rawRecord->getFullType()
  );
- $fakeRecord = GeneralUtility::makeInstance(
- Record::class,
- $rawFakeRecord,
+ $fakeRecord = $this->recordFactory->createResolvedRecordFromDatabaseRow(
+ 'tt_content',
  $fakeRecordDataRow
  );
  $gridColumnItem->setRecord($fakeRecord);

README.md

@@ -68,29 +68,32 @@ Paste reference uses [**semantic versioning**][5], which means, that
 
 #### 4.3.1 Releases
 
-* for TYPO3 v13: [4.0.3](https://github.com/Kephson/paste_reference/releases/tag/4.0.3)
+* for TYPO3 v14: [5.0.0](https://github.com/Kephson/paste_reference/releases/tag/5.0.0)
+* for TYPO3 v13: [4.0.5](https://github.com/Kephson/paste_reference/releases/tag/4.0.5)
 * for TYPO3 v12: [3.0.5](https://github.com/Kephson/paste_reference/releases/tag/3.0.5)
 * for TYPO3 v11: [2.0.5](https://github.com/Kephson/paste_reference/releases/tag/2.0.5)
 * for TYPO3 v10: [1.0.3](https://github.com/Kephson/paste_reference/releases/tag/1.0.3)
 
 To get the most recent development for the branch 4, consider installing the
 branch instead of the release. The branch
 [v4-dev](https://github.com/Kephson/paste_reference/tree/v4-dev) supports also
-TYPO3 v14 up to v14.1 and includes unreleased bug-fixes.
+TYPO3 v14 up to v14.1 and includes unreleased bug-fixes. 
+The sub-versions above might not be always the newest, so please check the
+[RELEASES](https://github.com/Kephson/paste_reference/releases) instead of relying on the list above.
 
 #### 4.3.2 Branches
 
 The following branches are of interest:
 
-* for TYPO3 v13 and v14: [v4-dev](https://github.com/Kephson/paste_reference/tree/v4-dev)
+* for TYPO3 v14: [v5-dev](https://github.com/Kephson/paste_reference/tree/v5-dev)
+* for TYPO3 v13: [v4-dev](https://github.com/Kephson/paste_reference/tree/v4-dev)
 + for TYPO3 v12: [TYPO3_12](https://github.com/Kephson/paste_reference/tree/TYPO3_12)
 * for TYPO3 v11: [TYPO3_11-5](https://github.com/Kephson/paste_reference/tree/TYPO3_11-5)
 * for TYPO3 v10: [TYPO3_10-4](https://github.com/Kephson/paste_reference/tree/TYPO3_10-4)
 
 Note, that releases are usually to prefer, if possible.
-The branch [v4-dev](https://github.com/Kephson/paste_reference/tree/v4-dev) is
-ahead of the releases currently, so in this case using the branch is better and
-gives you most recent development changes.
+If it's advisable to install a branch instead of a release, according info can be found in
+the issues of the repository.
 
 ### 4.4 Contribution
 

Tests/Extensions/test_sitepackage/Classes/Controller/IrreController.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the package test/sitepackage.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Test\Sitepackage\Controller;
+
+use Psr\Http\Message\ResponseInterface;
+use Test\Sitepackage\Domain\Repository\IrreRepository;
+use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
+
+class IrreController extends ActionController
+{
+ public function __construct(
+ private readonly IrreRepository $irreRepository
+ ) {}
+
+ public function indexAction(): ResponseInterface
+ {
+ // $pageId = $this->request->getAttributes()['routing']->getPageId();
+ $cObj = $this->request->getAttribute('currentContentObject');
+ $data = $cObj->data; // false positive of #101995 in Extension Scanner
+ $currentRecord = $this->irreRepository->findByUid((int)$data['uid']);
+ $childRecords = $this->irreRepository->getChildRecords((int)$data['uid']);
+ $this->view->assign('data', $data);
+ $this->view->assign('childRecords', $childRecords);
+ return $this->htmlResponse();
+ }
+
+ public function showAction(): ResponseInterface
+ {
+ // $pageId = $this->request->getAttributes()['routing']->getPageId();
+ $cObj = $this->request->getAttribute('currentContentObject');
+ $data = $cObj->data; // false positive of #101995 in Extension Scanner
+ $currentRecord = $this->irreRepository->findByUid((int)$data['uid']);
+ $childRecords = $this->irreRepository->getChildRecords((int)$data['uid']);
+ $this->view->assign('data', $data);
+ $this->view->assign('childRecords', $childRecords);
+ return $this->htmlResponse();
+ }
+
+ public function listAction(): ResponseInterface
+ {
+ // $pageId = $this->request->getAttributes()['routing']->getPageId();
+ $cObj = $this->request->getAttribute('currentContentObject');
+ $data = $cObj->data; // false positive of #101995 in Extension Scanner
+ $currentRecord = $this->irreRepository->findByUid((int)$data['uid']);
+ $childRecords = $this->irreRepository->getChildRecords((int)$data['uid']);
+ $this->view->assign('data', $data);
+ $this->view->assign('childRecords', $childRecords);
+ return $this->htmlResponse();
+ }
+}