[RELEASE] Version 10.2.5 with non-empty bulk inserts

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

Author: vertexvaar

.gitattributes

@@ -1,6 +1,7 @@
 # .gitattributes
 
-Build                          export-ignore
+/.github                       export-ignore
+/Build                         export-ignore
 .gitkeep                       export-ignore
 /.editorconfig                 export-ignore
 /.gitattributes                export-ignore

CHANGELOG.md

@@ -1,5 +1,14 @@
 # In2publish Core Change Log
 
+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/Domain/Repository/RunningRequestRepository.php

@@ -63,8 +63,10 @@ public function add(string $recordId, string $tableName, string $token): void
 
     public function flush(): void
     {
-        $this->connection->bulkInsert(self::RUNNING_REQUEST_TABLE_NAME, $this->inserts);
-        $this->inserts = [];
+        if (!empty($this->inserts)) {
+            $this->connection->bulkInsert(self::RUNNING_REQUEST_TABLE_NAME, $this->inserts);
+            $this->inserts = [];
+        }
     }
 
     /**

Classes/Features/RedirectsSupport/PageRecordRedirectEnhancer.php

@@ -112,7 +112,7 @@ public function run(RecordInterface $record): void
     }
 
     /**
-     * @return array<RecordInterface>
+     * @return array<array{local?: mixed, foreign?: mixed}>
      */
     protected function findRedirectsByDynamicTarget(RecordInterface $record): array
     {

Classes/Utility/DatabaseUtility.php

@@ -310,7 +310,7 @@ public static function copyTableContents(Connection $fromDatabase, Connection $t
             $query = $fromDatabase->createQueryBuilder();
             $query->getRestrictions()->removeAll();
             $queryResult = $query->select('*')->from($tableName)->execute();
-            $rows = $queryResult->rowCount();
+            $rows = (int)$queryResult->rowCount();
             while ($row = $queryResult->fetch()) {
                 if (1 !== static::insertRow($toDatabase, $tableName, $row)) {
                     throw new In2publishCoreException('Failed to import row into "' . $tableName . '"', 1562570305);

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.4',
+    'version' => '10.2.5',
     'state' => 'stable',
     'uploadfolder' => 0,
     'createDirs' => '',