[RELEASE] Version 10.2.2 with minor bug fixes

Author: vertexvaar

CHANGELOG.md

@@ -1,5 +1,17 @@
 # In2publish Core Change Log
 
+10.2.2:
+
+- [META] Set the EM conf version number to 10.2.2
+- [BUGFIX] Show the actual key for differences in site configs
+- [BUGFIX] Check the actual delete field of a table to determine if the record is deleted
+- [BUGFIX] Prevent access on undefined array key
+- [BUGFIX] Include array key existence check when looking for group/db MM tables
+- [BUGFIX] Format arrays as strings before comparing them with array_diff
+- [BUGFIX] Check if deprecated config values are set before evaluation
+- [TYPO] Fix message when there are no envelopes to flush
+- [RELEASE] Version 10.2.1 with a lot of bugfixes
+
 10.2.1:
 
 - [META] Set the EM conf version number to 10.2.1

Classes/Component/RecordHandling/DefaultRecordFinder.php

@@ -1201,7 +1201,7 @@ protected function fetchRelatedRecordsByGroupTypeDb(
             if (in_array($tableName, $excludedTableNames)) {
                 return $records;
             }
-            if ($columnConfiguration['MM']) {
+            if (!empty($columnConfiguration['MM'])) {
                 // skip if this record is not the owning side of the relation
                 if (!empty($columnConfiguration['MM_oppositeUsage'])) {
                     return $records;
@@ -1797,7 +1797,7 @@ protected function fetchOriginalRecordsForInlineRecord(
      */
     protected function isIgnoredRecord(array $localProperties, array $foreignProperties, string $tableName): bool
     {
-        if ($this->isDeletedAndUnchangedRecord($localProperties, $foreignProperties)) {
+        if ($this->isDeletedAndUnchangedRecord($localProperties, $foreignProperties, $tableName)) {
             return true;
         }
 
@@ -1844,12 +1844,20 @@ protected function isRemovedAndDeletedRecord(array $localProps, array $foreignPr
      *
      * @param array $localProperties
      * @param array $foreignProperties
+     * @param string $tableName
      *
      * @return bool
      */
-    protected function isDeletedAndUnchangedRecord(array $localProperties, array $foreignProperties): bool
-    {
-        return $localProperties['deleted'] === '1' && !count(array_diff($localProperties, $foreignProperties));
+    protected function isDeletedAndUnchangedRecord(
+        array $localProperties,
+        array $foreignProperties,
+        string $tableName
+    ): bool {
+        $deleteField = $GLOBALS['TCA'][$tableName]['ctrl']['delete'] ?? null;
+        return null !== $deleteField
+               && array_key_exists($deleteField, $localProperties)
+               && $localProperties[$deleteField]
+               && !count(array_diff($localProperties, $foreignProperties));
     }
 
     /**

Classes/Features/SimplifiedOverviewAndPublishing/Config/Migration/SimplifiedOverviewAndPublishingMigration.php

@@ -43,11 +43,17 @@ class SimplifiedOverviewAndPublishingMigration extends AbstractMigration
     public function migrate(array $config): array
     {
         $enable = false;
-        if ($config['factory']['simpleOverviewAndAjax']) {
+        if (
+            isset($config['factory']['simpleOverviewAndAjax'])
+            && $config['factory']['simpleOverviewAndAjax']
+        ) {
             $this->addMessage(sprintf(self::MESSAGE, 'factory.simpleOverviewAndAjax'));
             $enable = true;
         }
-        if ($config['features']['simplePublishing']['enable']) {
+        if (
+            isset($config['features']['simplePublishing']['enable'])
+            && $config['features']['simplePublishing']['enable']
+        ) {
             $this->addMessage(sprintf(self::MESSAGE, 'features.simplePublishing.enable'));
             $enable = true;
         }

Classes/Testing/Tests/Application/SiteConfigurationTest.php

@@ -42,6 +42,7 @@
 use function array_keys;
 use function array_merge;
 use function array_unique;
+use function json_encode;
 use function sprintf;
 
 class SiteConfigurationTest implements TestCaseInterface
@@ -110,7 +111,7 @@ public function run(): TestResult
                             'direction' => $localLanguage->getDirection(),
                             'typo3Language' => $localLanguage->getTypo3Language(),
                             'fallbackType' => $localLanguage->getFallbackType(),
-                            'fallbackLanguageIds' => $localLanguage->getFallbackLanguageIds(),
+                            'fallbackLanguageIds' => json_encode($localLanguage->getFallbackLanguageIds()),
                             'enabled' => $localLanguage->isEnabled(),
                         ];
 
@@ -123,15 +124,16 @@ public function run(): TestResult
                             'direction' => $foreignLanguage->getDirection(),
                             'typo3Language' => $foreignLanguage->getTypo3Language(),
                             'fallbackType' => $foreignLanguage->getFallbackType(),
-                            'fallbackLanguageIds' => $foreignLanguage->getFallbackLanguageIds(),
+                            'fallbackLanguageIds' => json_encode($foreignLanguage->getFallbackLanguageIds()),
                             'enabled' => $foreignLanguage->isEnabled(),
                         ];
 
                         $differences = array_keys(array_diff($localLanguageArray, $foreignLanguageArray));
                         foreach ($differences as $difference) {
                             $siteErrors[] = sprintf(
-                                'Site %s differences: %s <> %s',
+                                'Site %s differences in %s: %s <> %s',
                                 $siteIdentifier,
+                                $difference,
                                 $localLanguageArray[$difference],
                                 $foreignLanguageArray[$difference]
                             );

Classes/Utility/UriUtility.php

@@ -40,10 +40,9 @@ public static function normalizeUri(UriInterface $uri): UriInterface
         }
         if (empty($uri->getHost())) {
             $path = $uri->getPath();
-            [$host, $path] = explode('/', $path, 2);
-            if (empty($path)) {
-                $path = '';
-            }
+            $parts = explode('/', $path, 2);
+            $host = $parts[0];
+            $path = $parts[1] ?? '';
             $uri = $uri->withHost($host)->withPath($path);
         }
         return $uri;

Classes/ViewHelpers/Tca/FormatPropertyByTcaDefinitionViewHelper.php

@@ -79,15 +79,20 @@ public function render(): string
 
     protected function changeValueForTypeInput(&$value): void
     {
+        $eval = $this->tableConfiguration['config']['eval'] ?? null;
+        if (null === $eval) {
+            return;
+        }
+
         if (
-            GeneralUtility::inList($this->tableConfiguration['config']['eval'], 'datetime')
-            || GeneralUtility::inList($this->tableConfiguration['config']['eval'], 'date')
+            GeneralUtility::inList($eval, 'datetime')
+            || GeneralUtility::inList($eval, 'date')
         ) {
             if ($value !== '0') {
                 $value = strftime('%d.%m.%Y', (int)$value);
             }
         }
-        if (GeneralUtility::inList($this->tableConfiguration['config']['eval'], 'password')) {
+        if (GeneralUtility::inList($eval, 'password')) {
             $value = '*******';
         }
     }

Resources/Private/Language/de.locallang.xlf

@@ -350,7 +350,7 @@
 				<target state="translated">Überflüssigen Envelopes löschen.</target>
 			</trans-unit>
 			<trans-unit id="module.m4.nothing_to_flush">
-				<source>There are not envelopes to flush.</source>
+				<source>There are no envelopes to flush.</source>
 				<target state="translated">Es gibt keine Envelopes zum löschen.</target>
 			</trans-unit>
 			<trans-unit id="module.m4.flush_registry">

Resources/Private/Language/locallang.xlf

@@ -265,7 +265,7 @@
 				<source>Flush superfluous envelopes.</source>
 			</trans-unit>
 			<trans-unit id="module.m4.nothing_to_flush">
-				<source>There are not envelopes to flush.</source>
+				<source>There are no envelopes to flush.</source>
 			</trans-unit>
 			<trans-unit id="module.m4.flush_registry">
 				<source>Clear registry entries.</source>

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