Merge branch 'release/11.0.8' into master-v11

vertexvaar · vertexvaar · commit 3072411d4809 · 2023-10-17T11:05:11.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # In2publish Core Change Log
 
+11.0.8
+- [META] Set the EM conf version number to 11.0.8
+- [BUGFIX] Sort query results by language
+- [BUGFIX] Use suitable default values in SQL dumps
+- [BUGFIX] Add missing word in german translation
+- [BUGFIX] Fix DiskSpeed performance test units
+- [BUGFIX] Fix DBInit performance test units
+
+11.0.7:
+- [TASK] Raise version number in ext_emconf.php
+- Update de.locallang.xlf
+
 11.0.6:
 - [META] Set the EM conf version number to 11.0.6
 - [DOCS] Update changelog
diff --git a/Classes/Component/RecordHandling/DefaultRecordFinder.php b/Classes/Component/RecordHandling/DefaultRecordFinder.php
@@ -504,7 +504,7 @@ public function enrichRecordWithRelatedRecords(RecordInterface $record, array $e
                         'foreign_table_where' => 'AND {#sys_category}.{#sys_language_uid} IN (-1, 0)',
                         'MM' => 'sys_category_record_mm',
                         'MM_match_fields' => [
-                            'fieldname' => 'categories',
+                            'fieldname' => $propertyName,
                             'tablenames' => $recordTableName,
                         ],
                         'MM_opposite_field' => 'items',
diff --git a/Classes/Features/SimplifiedOverviewAndPublishing/Domain/Repository/SingleDatabaseRepository.php b/Classes/Features/SimplifiedOverviewAndPublishing/Domain/Repository/SingleDatabaseRepository.php
@@ -40,6 +40,10 @@ public function findByProperty(string $table, string $property, array $values):
             $query->orderBy('uid');
         }
 
+        if (!empty($GLOBALS['TCA'][$table]['ctrl']['languageField'])) {
+            $query->addOrderBy($GLOBALS['TCA'][$table]['ctrl']['languageField']);
+        }
+        
         $result = $query->execute();
         return array_column($result->fetchAllAssociative(), null, 'uid');
     }
diff --git a/Classes/Testing/Tests/Performance/DiskSpeedPerformanceTest.php b/Classes/Testing/Tests/Performance/DiskSpeedPerformanceTest.php
@@ -105,8 +105,8 @@ static function () use ($targetFile) {
         $writeTime = $readAndWriteTime - $readTime;
 
         $messages = [];
-        $messages[] = 'Read: ' . $readTime . ' msec';
-        $messages[] = 'Write: ' . $writeTime . ' msec';
+        $messages[] = 'Read: ' . round($readTime * 1e6) . ' μs';
+        $messages[] = 'Write: ' . round($writeTime * 1e6) . ' μs';
 
         $severity = TestResult::WARNING;
         if (
@@ -128,7 +128,7 @@ static function () use ($targetFile) {
             'performance.fs_io.rw_time',
             $severity,
             $messages,
-            [(string)$readAndWriteTime]
+            [(string) round($readAndWriteTime * 1e6)]
         );
     }
 
diff --git a/Classes/Testing/Tests/Performance/ForeignDbInitializationPerformanceTest.php b/Classes/Testing/Tests/Performance/ForeignDbInitializationPerformanceTest.php
@@ -68,8 +68,8 @@ public function run(): TestResult
         $median = (array_sum($times) / count($times));
         $messages = [];
         sort($times);
-        $messages[] = 'Fastest: ' . $times[0] . ' msec';
-        $messages[] = 'Slowest: ' . $times[9] . ' msec';
+        $messages[] = 'Fastest: ' . $times[0] . ' μs';
+        $messages[] = 'Slowest: ' . $times[9] . ' μs';
 
         $severity = TestResult::WARNING;
         if ($median < self::THRESHOLD[TestResult::OK]) {
diff --git a/Classes/Utility/DatabaseUtility.php b/Classes/Utility/DatabaseUtility.php
@@ -221,10 +221,19 @@ protected static function createBackup(Connection $connection, string $tableName
         $resultSet = $query->select('*')->from($tableName)->execute();
 
         while (($row = $resultSet->fetchAssociative())) {
-            $data .=
-                'INSERT INTO ' . $tableName . ' VALUES (' .
-                implode(',', array_map([$connection, 'quote'], $row)) .
-                ');' . PHP_EOL;
+            foreach ($row as $index => $value) {
+                if (!empty($value) && is_string($value)) {
+                    $row[$index] = $connection->quote($value);
+                } elseif (is_string($value)) {
+                    $row[$index] = "''";
+                } elseif (is_int($value)) {
+                    $row[$index] = (int)$value;
+                } elseif (is_null($value)) {
+                    $row[$index] = 'NULL';
+                }
+            }
+            $values = implode(',', $row);
+            $data .= "INSERT INTO $tableName VALUES ($values)" . ';' . "\n";
         }
 
         $backupWritten = false;
diff --git a/Resources/Private/Language/de.locallang.testing.xlf b/Resources/Private/Language/de.locallang.testing.xlf
@@ -621,7 +621,7 @@
 
 			<trans-unit id="performance.db_init.init_time">
 				<source>The foreign database initialization took %d microseconds on average</source>
-				<target state="translated">Die Initialisierung der entfernten benötigt im Schnitt %d Mikrosekunden</target>
+				<target state="translated">Die Initialisierung der entfernten Datenbank benötigt im Schnitt %d Mikrosekunden</target>
 			</trans-unit>
 			<trans-unit id="performance.db_init.slow_help">
 				<source>
@@ -643,8 +643,8 @@
 			<!-- \In2code\In2publishCore\Testing\Tests\Performance\DiskSpeedPerformanceTest -->
 
 			<trans-unit id="performance.fs_io.rw_time">
-				<source>Reading and writing 10 MB took %f microseconds.</source>
-				<target state="translated">Das Lesen und Schreiben von 10 MB hat %f mikrosekunden gedauert.</target>
+				<source>Reading and writing 10 MB took %d microseconds.</source>
+				<target state="translated">Das Lesen und Schreiben von 10 MB hat %d Mikrosekunden gedauert.</target>
 			</trans-unit>
 			<trans-unit id="performance.fs_io.slow_help">
 				<source>
diff --git a/Resources/Private/Language/locallang.testing.xlf b/Resources/Private/Language/locallang.testing.xlf
@@ -505,7 +505,7 @@
 			<!-- \In2code\In2publishCore\Testing\Tests\Performance\DiskSpeedPerformanceTest -->
 
 			<trans-unit id="performance.fs_io.rw_time">
-				<source>Reading and writing 10 MB took %f microseconds.</source>
+				<source>Reading and writing 10 MB took %d microseconds.</source>
 			</trans-unit>
 			<trans-unit id="performance.fs_io.slow_help">
 				<source>
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -9,7 +9,7 @@
     'title' => 'in2publish Core',
     'description' => 'Content publishing extension to connect stage and production server',
     'category' => 'plugin',
-    'version' => '11.0.7',
+    'version' => '11.0.8',
     'state' => 'stable',
     'clearCacheOnLoad' => true,
     'author' => 'Alex Kellner, Oliver Eglseder, Thomas Scheibitz, Stefan Busemann',

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,10 @@ public function findByProperty(string $table, string $property, array $values):`
`40`	`40`	`$query->orderBy('uid');`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ if (!empty($GLOBALS['TCA'][$table]['ctrl']['languageField'])) {`
	`44`	`+ $query->addOrderBy($GLOBALS['TCA'][$table]['ctrl']['languageField']);`
	`45`	`+ }`
	`46`	`+`
`43`	`47`	`$result = $query->execute();`
`44`	`48`	`return array_column($result->fetchAllAssociative(), null, 'uid');`
`45`	`49`	`}`