[RELEASE] Version 11.0.4

Resolves: https://projekte.in2code.de/issues/53575

Author: vertexvaar

.gitattributes

@@ -1,17 +1,20 @@
 # .gitattributes
 
-Build                          export-ignore
+/.github                       export-ignore
+/.project                      export-ignore
+/Build                         export-ignore
 .gitkeep                       export-ignore
 /.editorconfig                 export-ignore
 /.gitattributes                export-ignore
 /.gitignore                    export-ignore
 /.eslintrc                     export-ignore
 /.travis.yml                   export-ignore
-/phpunit.xml.dist              export-ignore
-/Tests                         export-ignore
 /Resources/Private/Sass        export-ignore
 /Resources/Private/config.rb   export-ignore
 /Resources/Private/Clickdummy  export-ignore
+/Tests                         export-ignore
+/Makefile                      export-ignore
+/phive.xml                     export-ignore
 
 # Handle line endings automatically for files detected as text
 # and leave all files detected as binary untouched.

Build/UnitTests.xml

@@ -1,6 +1,6 @@
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
     backupGlobals="true"
     bootstrap="UnitTestsBootstrap.php"
     colors="true"
@@ -22,6 +22,11 @@
             <directory>../Tests/Unit/</directory>
         </testsuite>
     </testsuites>
+    <coverage>
+        <include>
+            <directory suffix=".php">../Classes</directory>
+        </include>
+    </coverage>
     <php>
         <const name="TYPO3_MODE" value="BE" />
         <ini name="display_errors" value="1" />

CHANGELOG.md

@@ -1,48 +1,30 @@
 # In2publish Core Change Log
 
+11.0.4:
+- **Everything included in the 10.2.5 release**
+- [META] Set the EM conf version number to 11.0.4
+- [DOCS] Update changelog
+- [TESTS] Configure Code Coverage and add missing coversDefaultClass
+- [META] Mark as compatible with PHP 8.1
+- [RELEASE] Version 11.0.3 with bug fixes
+
 11.0.3:
 
+- **Everything included in the 10.2.4 release**
 - [META] Set the EM conf version number to 11.0.3
 - [CLEANUP] Remove useless parentheses
 - [QA] Update QA tools
 - [BUGFIX] Set the correct return type for FileController::getRecordToPublish
 - [COMMENT] Update rFALd::getFoldersInFolder return annotation
 - [BUGFIX] Call the correct (renamed) method rebuildAll for TYPO3 v11
-- [COMMENT] Update the return annotation of findRedirectsByDynamicTarget
-- [BUGFIX] Ensure the rowCount is always an integer
-- [BUGFIX] Don't try to bulkInsert an empty data set
 - [REFACTOR] Reduce cyclomatic and npath complexity
 - [QA] Force installation of unsigned phars (like phpmd) and add all phars to PATH
 - [TESTS] Remove duplicate import of RuntimeException
 - [TESTS] Remove duplicate import of Testbase
-- [BUGFIX] Prevent infinite recursion when collecting records that are going to be published
-- [BUGFIX] Remove the HostNameValidator
-- [BUGFIX] Override database state if sys_file records have been changed
-- [BUGFIX] Early fail the UniqueStorageTargetTest when EXT:scheduler is not installed
-- [BUGFIX] Remove duplicate line which should have been removed
-- [BUGFIX] Prevent undefined array key access in DatabaseUtility
 - [BUGFIX] Set correct flash message severity when file publishing fails and show collected failures
 - [DOCS] Add UPGRADING for v10 to v11 and some publish files module screenshots
-- [TASK] Fix TestLabelLocalizer error
 - [BUGFIX] Add missing slash in combined folder identifier
-- [BUGFIX] Allow input fields with renderType inputLink
-- [BUGFIX] Do not exclude columns which have an itemsProcFunc
-- [BUGFIX] Do not ignore MM-records to excluded tables
-- [BUGFIX] Use the group MM tablenames field instead of true/false
-- [BUGFIX] Fix type error in FileEdgeCacheInvalidationService class
-- [BUGFIX] Fallback to the foreignUid if localUid is null
-- [BUGFIX] Add conditions to not break resetting backend user preferences
-- [BUGFIX] Update the list of required tables
 - [BUGFIX] Fetch all RPC rows instead of just the first
-- [BUGFIX] Allow envelopes to grow arbitrarily huge
-- [TESTS] Add missing ticket annotations for command tests
-- [TESTS] Add functional test to assert that MM records can be marked as publishing
-- [BUGFIX] Allow MM records to be marked as running
-- [BUGFIX] Make RunTasksInQueueCommand compatible with symfony/console 4.4 and add test
-- [TESTS] Fix tests for different dbal and TYPO3 versions
-- [TESTS] Mock Result class which exists in composerMinInstall
-- [TESTS] Fix DbConfigTestCommandTest, remove BackupCommandTest
-- [BUGFIX] Ensure all (testable) commands are executable
 
 11.0.2:
 
@@ -180,6 +162,24 @@
 - [CLEANUP] Remove outdated compatibility class SignalSlotReplacement
 - [!!!][UPDATE] Require TYPO3 v11
 
+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
+- [GIT] Ignore the .github folder when creating a production dist
+- [COMMENT] Update the return annotation of findRedirectsByDynamicTarget
+- [BUGFIX] Ensure the rowCount is always an integer
+- [BUGFIX] Don't try to bulkInsert an empty data set
+- [RELEASE] Version 10.2.4 with bug fixes
+
 10.2.4:
 
 - [META] Set the EM conf version number to 10.2.4

Classes/Component/FalHandling/Finder/Factory/FileIndexFactory.php

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

Classes/Domain/Service/Publishing/FilePublisherService.php

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

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

@@ -127,6 +127,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,14 +53,19 @@ 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 {
                 /** @psalm-suppress ImplicitToStringCast */
                 $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

@@ -138,6 +138,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));
@@ -149,9 +153,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);
@@ -191,6 +193,7 @@ protected function assignRedirects(Connection $connection, array $uids, int $pid
     }
 
     /**
+     * @param array<int, array{local?: array, foreign?: array}> $redirects
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function findMissingRowsByUid(array $redirects): array
@@ -232,14 +235,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']);
             }
         }
 
@@ -295,9 +294,7 @@ protected function createAndAddRecordsToRecord(RecordInterface $record, array $r
     }
 
     /**
-     * @return array[][]
-     *
-     * @psalm-return array<int|string, array{local?: array}>
+     * @return array<int, array{local?: array, foreign?: array}>
      */
     protected function getExistingRedirects(RecordInterface $record): array
     {
@@ -309,10 +306,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

@@ -29,13 +29,16 @@
  * This copyright notice MUST APPEAR in all copies of the script!
  */
 
+use JsonException;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 
 use function json_decode;
 use function sprintf;
 use function strftime;
 use function substr;
 
+use const JSON_THROW_ON_ERROR;
+
 class LogsExporter implements SystemInformationExporter
 {
     protected ConnectionPool $connectionPool;
@@ -72,7 +75,11 @@ public function getInformation(): array
             );
             $logData = $log['data'];
             $logDataJson = substr($logData, 2);
-            $logsFormatted[$message] = json_decode($logDataJson, true, 512, JSON_THROW_ON_ERROR);
+            try {
+                $logsFormatted[$message] = json_decode($logDataJson, true, 512, JSON_THROW_ON_ERROR);
+            } catch (JsonException $e) {
+                $logsFormatted[$message] = $logData;
+            }
         }
         return $logsFormatted;
     }

Tests/Unit/Domain/Model/RecordTest.php

@@ -14,6 +14,7 @@
 
 /**
  * @SuppressWarnings(PHPMD)
+ * @coversDefaultClass \In2code\In2publishCore\Domain\Model\Record
  */
 class RecordTest extends UnitTestCase
 {
@@ -737,7 +738,7 @@ public function testParentRecordCanBeSetAgainAfterParentRecordWasUnlocked()
 
     /**
      * @covers ::getBreadcrumb
-     * @covers ::getRecordPath
+     * @covers ::getParentRecord
      * @depends testSetParentRecordSetsParentRecord
      */
     public function testGetBreadcrumbReturnsSlashImplodedStringToRootRecord()

composer.json

@@ -10,7 +10,7 @@
 	"type": "typo3-cms-extension",
 	"license": "GPL-3.0-or-later",
 	"require": {
-		"php": "^7.4 || ^8.0 <8.1",
+		"php": "^7.4 || ^8.0",
 		"ext-json": "*",
 		"ext-pdo": "*",
 		"ext-zip": "*",

ext_emconf.php

@@ -9,15 +9,15 @@
     'title' => 'in2publish Core',
     'description' => 'Content publishing extension to connect stage and production server',
     'category' => 'plugin',
-    'version' => '11.0.3',
+    'version' => '11.0.4',
     'state' => 'stable',
     'clearCacheOnLoad' => true,
     'author' => 'Alex Kellner, Oliver Eglseder, Thomas Scheibitz, Stefan Busemann',
     'author_email' => '[email protected]',
     'author_company' => 'in2code.de',
     'constraints' => [
         'depends' => [
-            'php' => '7.4.0-8.0.99',
+            'php' => '7.4.0-8.99.99',
             'typo3' => '11.5.0-11.99.99',
         ],
         'conflicts' => [],