adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix maxDimensions() for empty/1 dimensional arrays.

Browse source 
maxDimensions() should not emit warnings or mis-calculate an array's
dimensions.

Fixes #6224
This commit is contained in:
mark_story 2015-03-31 22:21:15 -04:00
parent 758820d7cc
commit 69971505a2
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/Test/Case/Utility/HashTest.php
View file

@ -275,6 +275,14 @@ class HashTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testMaxDimensions() { public function testMaxDimensions() {
$data = array();
$result = Hash::maxDimensions($data);
$this->assertEquals(0, $result);
$data = array('a', 'b');
$result = Hash::maxDimensions($data);
$this->assertEquals(1, $result);
$data = array('1' => '1.1', '2', '3' => array('3.1' => '3.1.1')); $data = array('1' => '1.1', '2', '3' => array('3.1' => '3.1.1'));
$result = Hash::maxDimensions($data); $result = Hash::maxDimensions($data);
$this->assertEquals($result, 2); $this->assertEquals($result, 2);

8
lib/Cake/Utility/Hash.php
View file

@ -763,10 +763,14 @@ class Hash {
$depth = array(); $depth = array();
if (is_array($data) && reset($data) !== false) { if (is_array($data) && reset($data) !== false) {
foreach ($data as $value) { foreach ($data as $value) {
$depth[] = self::dimensions((array)$value) + 1; if (is_array($value)) {
$depth[] = self::dimensions($value) + 1;
} else {
$depth[] = 1;
} }
} }
return max($depth); }
return empty($depth) ? 0 : max($depth);
} }
/** /**