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 errors with recursion in debug()

Browse source 
Fixes #3102
This commit is contained in:
mark_story 2012-08-08 22:30:27 -04:00
parent 476bd80644
commit dca050fbd6
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -477,6 +477,16 @@ TEXT;
$this->assertEquals($expected, $output); $this->assertEquals($expected, $output);
} }
/**
* Test that exportVar() doesn't loop through recursive structures.
*
* @return void
*/
public function testExportVarRecursion() {
$output = Debugger::exportVar($GLOBALS);
$this->assertContains("'GLOBALS' => [recursion]", $output);
}
/** /**
* test trace exclude * test trace exclude
* *

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

@ -542,9 +542,14 @@ class Debugger {
if ($depth >= 0) { if ($depth >= 0) {
foreach ($var as $key => $val) { foreach ($var as $key => $val) {
if ($val !== $var) {
$val = self::_export($val, $depth, $indent);
} else {
$val = '[recursion]';
}
$vars[] = $break . self::exportVar($key) . $vars[] = $break . self::exportVar($key) .
' => ' . ' => ' .
self::_export($val, $depth, $indent); $val;
} }
} else { } else {
$vars[] = $break . '[maximum depth reached]'; $vars[] = $break . '[maximum depth reached]';