Fix wrong dimensions when the first element is false.

cakephp · Jan 6, 2017 · 072d8cf · 072d8cf
1 parent 9eb07d5
commit 072d8cf
Show file tree

Hide file tree

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

diff --git a/tests/TestCase/Utility/HashTest.php b/tests/TestCase/Utility/HashTest.php
@@ -506,6 +506,13 @@ public function testMaxDimensions()
         ];
         $result = Hash::maxDimensions($data);
         $this->assertEquals($result, 5);
+
+        $data = [
+           '1' => false,
+           '2' => ['2.1' => '2.1.1']
+        ];
+        $result = Hash::maxDimensions($data);
+        $this->assertEquals($result, 2);
     }
 
     /**