[RELEASE] Version 10.2.6 with bug fixes only

Releases: https://projekte.in2code.de/issues/52997
Releases: https://projekte.in2code.de/issues/52998
Releases: https://projekte.in2code.de/issues/53057
Resolves: https://projekte.in2code.de/issues/53575

Author: vertexvaar

CHANGELOG.md

@@ -1,5 +1,14 @@
 # In2publish Core Change Log
 
+10.2.6:
+- [META] Set the EM conf version number to 10.2.6
+- [BUGFIX] Use correct key "foreign" to index a row from Foreign
+- [BUGFIX] Support resolving related redirects with query URL parts
+- [BUGFIX] Show undecoded message line if it could not be decoded
+- [BUGFIX] Throw an exception if the file to retrieve does not exist
+- [BUGFIX] Do not try to publish files that neither exist on local nor foreign
+- [RELEASE] Version 10.2.5 with non-empty bulk inserts
+
 10.2.5:
 
 - [META] Set the EM conf version number to 10.2.5

Classes/Domain/Factory/FileIndexFactory.php

@@ -158,6 +158,8 @@ public function updateFileIndexInfo(
             $record->setLocalProperties($localFileInfo);
             $record->setForeignProperties($foreignFileInfo);
             $record->setDirtyProperties()->calculateState();
+        } else {
+            $record->addAdditionalProperty('fileState', 'missing');
         }
     }
 

Classes/Domain/Service/Publishing/FilePublisherService.php

@@ -148,7 +148,9 @@ protected function transferTemporaryFile(int $storage, string $fileIdentifier):
     protected function getLocalReadableFilePathForIdentifier(int $storage, string $fileIdentifier): string
     {
         $resourceStorage = $this->resourceFactory->getStorageObject($storage);
-        $file = $resourceStorage->getFile($fileIdentifier);
-        return $file->getForLocalProcessing(false);
+        if (!$resourceStorage->hasFile($fileIdentifier)) {
+            throw new FileMissingException($fileIdentifier);
+        }
+        return $resourceStorage->getFile($fileIdentifier)->getForLocalProcessing(false);
     }
 }

Classes/Features/PhysicalFilePublisher/Domain/Anomaly/PhysicalFilePublisher.php

@@ -131,6 +131,9 @@ protected function publishAuthoritativeRecord(
         string $identifier,
         string $combinedIdentifier
     ): void {
+        if ($record->getAdditionalProperty('fileState') === 'missing') {
+            return;
+        }
         switch ($record->getState()) {
             case RecordInterface::RECORD_STATE_MOVED_AND_CHANGED:
                 $result = $this->replaceFileWithChangedCopy($record, $storage, $logData);

Classes/Features/RedirectsSupport/Domain/Repository/SysRedirectRepository.php

@@ -34,13 +34,17 @@
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
+use TYPO3\CMS\Core\Http\Uri;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 use TYPO3\CMS\Extbase\Persistence\Repository;
 
 class SysRedirectRepository extends Repository
 {
+    /**
+     * @param array<Uri> $uris
+     */
     public function findRawByUris(Connection $connection, array $uris, array $exceptUid): array
     {
         $query = $connection->createQueryBuilder();
@@ -49,13 +53,18 @@ public function findRawByUris(Connection $connection, array $uris, array $except
         $predicates = [];
 
         foreach ($uris as $uri) {
+            $target = $uri->getPath();
+            $queryPart = $uri->getQuery();
+            if (!empty($queryPart)) {
+                $target .= '?' . $queryPart;
+            }
             if ($uri->getHost() === '*') {
                 // If the "parent" redirect does not have a host it does not matter which host the redirect has, which
                 // redirects to the host-less redirect. It just belongs.
-                $predicates[] = $query->expr()->eq('target', $query->createNamedParameter($uri->getPath()));
+                $predicates[] = $query->expr()->eq('target', $query->createNamedParameter($target));
             } else {
                 $predicates[] = $query->expr()->andX(
-                    $query->expr()->eq('target', $query->createNamedParameter($uri->getPath())),
+                    $query->expr()->eq('target', $query->createNamedParameter($target)),
                     $query->expr()->orX(
                         $query->expr()->eq('source_host', $query->createNamedParameter($uri->getHost())),
                         $query->expr()->eq('source_host', $query->createNamedParameter('*'))

Classes/Features/RedirectsSupport/PageRecordRedirectEnhancer.php

@@ -141,6 +141,10 @@ protected function findRedirectsByDynamicTarget(RecordInterface $record): array
         return $collected;
     }
 
+    /**
+     * @param array<Uri> $uris
+     * @param array<int, array{local?: array, foreign?: array}> $collected
+     */
     protected function collectRedirectsByUri(array $uris, array $collected, string $side, Connection $connection): array
     {
         $newRows = $this->repo->findRawByUris($connection, $uris, array_keys($collected));
@@ -152,9 +156,7 @@ protected function collectRedirectsByUri(array $uris, array $collected, string $
         $newUris = [];
         foreach ($newRows as $row) {
             $collected[$row['uid']][$side] = $row;
-            $newUris[$row['uid']] = (new Uri())
-                ->withHost($row['source_host'] ?? '')
-                ->withPath($row['source_path'] ?? '');
+            $newUris[$row['uid']] = $this->rowToUri($row);
         }
 
         return $this->collectRedirectsByUri($newUris, $collected, $side, $connection);
@@ -193,6 +195,9 @@ protected function assignRedirects(Connection $connection, array $uids, int $pid
               ->execute();
     }
 
+    /**
+     * @param array<int, array{local?: array, foreign?: array}> $redirects
+     */
     protected function findMissingRowsByUid(array $redirects): array
     {
         $missingRows = ['local' => [], 'foreign' => []];
@@ -229,14 +234,10 @@ protected function findRedirectsByUri(RecordInterface $record): array
         $redirects = $this->getExistingRedirects($record);
         foreach ($redirects as $redirect) {
             if (!empty($redirect['local'])) {
-                $row = $redirect['local'];
-                $basicUris[] = (new Uri())->withHost($row['source_host'] ?? '')
-                                          ->withPath($row['source_path'] ?? '');
+                $basicUris[] = $this->rowToUri($redirect['local']);
             }
             if (!empty($redirect['foreign'])) {
-                $row = $redirect['foreign'];
-                $basicUris[] = (new Uri())->withHost($row['source_host'] ?? '')
-                                          ->withPath($row['source_path'] ?? '');
+                $basicUris[] = $this->rowToUri($redirect['foreign']);
             }
         }
 
@@ -291,7 +292,9 @@ protected function createAndAddRecordsToRecord(RecordInterface $record, array $r
         }
     }
 
-    /** @return array<int, RecordInterface> */
+    /**
+     * @return array<int, array{local?: array, foreign?: array}>
+     */
     protected function getExistingRedirects(RecordInterface $record): array
     {
         $redirects = [];
@@ -302,10 +305,24 @@ protected function getExistingRedirects(RecordInterface $record): array
                 $row['local'] = $redirectRecord->getLocalProperties();
             }
             if ($redirectRecord->foreignRecordExists()) {
-                $row['local'] = $redirectRecord->getForeignProperties();
+                $row['foreign'] = $redirectRecord->getForeignProperties();
             }
             $redirects[$redirectRecord->getIdentifier()] = $row;
         }
         return $redirects;
     }
+
+    /**
+     * @param array{source_path?: string, source_host?: string} $row
+     * @noinspection PhpRedundantDocCommentInspection
+     * @noinspection RedundantSuppression
+     */
+    protected function rowToUri(array $row): Uri
+    {
+        $uri = new Uri($row['source_path'] ?? '');
+        if (!empty($row['source_host'])) {
+            $uri = $uri->withHost($row['source_host']);
+        }
+        return $uri;
+    }
 }

Classes/Features/SystemInformationExport/Exporter/LogsExporter.php

@@ -32,10 +32,13 @@
 use TYPO3\CMS\Core\Database\ConnectionPool;
 
 use function json_decode;
+use function json_last_error;
 use function sprintf;
 use function strftime;
 use function substr;
 
+use const JSON_ERROR_NONE;
+
 class LogsExporter implements SystemInformationExporter
 {
     /** @var ConnectionPool */
@@ -74,6 +77,9 @@ public function getInformation(): array
             $logData = $log['data'];
             $logDataJson = substr($logData, 2);
             $logsFormatted[$message] = json_decode($logDataJson, true);
+            if (json_last_error() !== JSON_ERROR_NONE) {
+                $logsFormatted[$message] = $logData;
+            }
         }
         return $logsFormatted;
     }

ext_emconf.php

@@ -9,7 +9,7 @@
     'title' => 'in2publish Core',
     'description' => 'Content publishing extension to connect stage and production server',
     'category' => 'plugin',
-    'version' => '10.2.5',
+    'version' => '10.2.6',
     'state' => 'stable',
     'uploadfolder' => 0,
     'createDirs' => '',