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 $depth being decremented by 2.

Browse source 
$depth should only be decremented once for each step-in.
Add special text when values are being elided by maximum nesting level.

Fixes #2946
This commit is contained in:
mark_story 2012-06-10 20:00:34 -04:00
parent 454fae9bd0
commit 0a182b918f
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/Cake/Test/Case/Utility/DebuggerTest.php
View file

@ -343,6 +343,21 @@ array(
(int) 1 => 'Index one', (int) 1 => 'Index one',
(int) 5 => 'Index five' (int) 5 => 'Index five'
) )
TEXT;
$this->assertTextEquals($expected, $result);
$data = array(
'key' => array(
'value'
)
);
$result = Debugger::exportVar($data, 1);
$expected = <<<TEXT
array(
'key' => array(
[maximum depth reached]
)
)
TEXT; TEXT;
$this->assertTextEquals($expected, $result); $this->assertTextEquals($expected, $result);
} }
@ -398,8 +413,14 @@ TEXT;
<pre>array( <pre>array(
'People' => array( 'People' => array(
(int) 0 => array( (int) 0 => array(
'name' => 'joeseph',
'coat' => 'technicolor',
'hair_color' => 'brown'
), ),
(int) 1 => array( (int) 1 => array(
'name' => 'Shaft',
'coat' => 'black',
'hair' => 'black'
) )
) )
)</pre> )</pre>

4
lib/Cake/Utility/Debugger.php
View file

@ -544,8 +544,10 @@ class Debugger {
foreach ($var as $key => $val) { foreach ($var as $key => $val) {
$vars[] = $break . self::exportVar($key) . $vars[] = $break . self::exportVar($key) .
' => ' . ' => ' .
self::_export($val, $depth - 1, $indent); self::_export($val, $depth, $indent);
} }
} else {
$vars[] = $break . '[maximum depth reached]';
} }
return $out . implode(',', $vars) . $end . ')'; return $out . implode(',', $vars) . $end . ')';
} }