Port Hash::maxDimension() fixes to 3.0

Port fixes from #7040 and #7041 to 3.0.
cakephp · Jul 21, 2015 · 742f85d · 742f85d
1 parent 05fa5e3
commit 742f85d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 20 deletions.
diff --git a/src/Utility/Hash.php b/src/Utility/Hash.php
@@ -803,7 +803,7 @@ public static function maxDimensions(array $data)
         if (is_array($data) && reset($data) !== false) {
             foreach ($data as $value) {
                 if (is_array($value)) {
-                    $depth[] = static::dimensions($value) + 1;
+                    $depth[] = static::maxDimensions($value) + 1;
                 } else {
                     $depth[] = 1;
                 }

diff --git a/tests/TestCase/Utility/HashTest.php b/tests/TestCase/Utility/HashTest.php
@@ -310,25 +310,16 @@ public function testMaxDimensions()
         $this->assertEquals($result, 4);
 
         $data = [
-            '1' => ['1.1' => '1.1.1'],
-            ['2' => ['2.1' => ['2.1.1' => ['2.1.1.1']]]],
-            '3' => ['3.1' => ['3.1.1' => '3.1.1.1']]
-        ];
-        $result = Hash::maxDimensions($data);
-        $this->assertEquals($result, 5);
-
-        $data = [
-            '1' => ['1.1' => '1.1.1'],
-            ['2' => ['2.1' => ['2.1.1' => ['2.1.1.1' => '2.1.1.1.1']]]],
-            '3' => ['3.1' => ['3.1.1' => '3.1.1.1']]
-        ];
-        $result = Hash::maxDimensions($data);
-        $this->assertEquals($result, 5);
-
-        $data = [
-            '1' => ['1.1' => '1.1.1'],
-            ['2' => ['2.1' => ['2.1.1' => ['2.1.1.1' => '2.1.1.1.1']]]],
-            '3' => ['3.1' => ['3.1.1' => '3.1.1.1']]
+           '1' => [
+               '1.1' => '1.1.1',
+               '1.2' => [
+                   '1.2.1' => [
+                       '1.2.1.1',
+                       ['1.2.2.1']
+                   ]
+               ]
+           ],
+           '2' => ['2.1' => '2.1.1',]
         ];
         $result = Hash::maxDimensions($data);
         $this->assertEquals($result, 5);