[BUGFIX] Correctly handle identical arrays in arrayDiffAssocRecursive

Add a new test to make sure that identical input arrays also deliver an empty result as difference. Resolves: #84067 Releases: master, 8.7, 7.6 Change-Id: Ia16ca9560094c4ae42eb69cac9e09cd4bef7dc4e Reviewed-on: https://review.typo3.org/55923 Reviewed-by: Johannes Kasberger <johannes.kasberger@reelworx.at> Tested-by: Johannes Kasberger <johannes.kasberger@reelworx.at> Reviewed-by: Mathias Brodala <mbrodala@pagemachine.de> Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Georg Ringer <georg.ringer@gmail.com> Tested-by: Georg Ringer <georg.ringer@gmail.com>
TYPO3 · Feb 27, 2018 · 17fcf20 · 17fcf20
1 parent 9a5643f
commit 17fcf20
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/typo3/sysext/core/Classes/Utility/ArrayUtility.php b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
@@ -733,7 +733,10 @@ public static function arrayDiffAssocRecursive(array $array1, array $array2)
                 $differenceArray[$key] = $value;
             } elseif (is_array($value)) {
                 if (is_array($array2[$key])) {
-                    $differenceArray[$key] = self::arrayDiffAssocRecursive($value, $array2[$key]);
+                    $recursiveResult = self::arrayDiffAssocRecursive($value, $array2[$key]);
+                    if (!empty($recursiveResult)) {
+                        $differenceArray[$key] = $recursiveResult;
+                    }
                 }
             }
         }

diff --git a/typo3/sysext/core/Tests/Unit/Utility/ArrayUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/ArrayUtilityTest.php
@@ -2102,7 +2102,7 @@ public function arrayDiffAssocRecursiveHandlesMultiDimensionalArrays()
             ]
         ];
         $array2 = [
-            'key1' => 'value1',
+            'key1' => 'valueDoesNotMatter',
             'key2' => [
                 'key21' => 'value21',
                 'key23' => [
@@ -2138,7 +2138,7 @@ public function arrayDiffAssocRecursiveHandlesMixedArrays()
         $array2 = [
             'key1' => 'value1',
             'key2' => [
-                'key21' => 'value21'
+                'key21' => 'valueDoesNotMatter'
             ]
         ];
         $expectedResult = [
@@ -2148,6 +2148,32 @@ public function arrayDiffAssocRecursiveHandlesMixedArrays()
         $this->assertEquals($expectedResult, $actualResult);
     }
 
+    /**
+     * @test
+     */
+    public function arrayDiffAssocRecursiveReturnsEmptyIfEqual()
+    {
+        $array1 = [
+            'key1' => [
+                'key11' => 'value11',
+                'key12' => 'value12'
+            ],
+            'key2' => 'value2',
+            'key3' => 'value3'
+        ];
+        $array2 = [
+            'key1' => [
+                'key11' => 'valueDoesNotMatter',
+                'key12' => 'value12'
+            ],
+            'key2' => 'value2',
+            'key3' => 'value3'
+        ];
+        $expectedResult = [];
+        $actualResult = ArrayUtility::arrayDiffAssocRecursive($array1, $array2);
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+
     //////////////////////////////////////
     // Tests concerning naturalKeySortRecursive
     //////////////////////////////////////