Fix errors with recursion in debug()

Fixes #3102
cakephp · Aug 9, 2012 · dca050f · dca050f
1 parent 476bd80
commit dca050f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/Cake/Test/Case/Utility/DebuggerTest.php b/lib/Cake/Test/Case/Utility/DebuggerTest.php
@@ -477,6 +477,16 @@ public function testNoDbCredentials() {
 		$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
  *

diff --git a/lib/Cake/Utility/Debugger.php b/lib/Cake/Utility/Debugger.php
@@ -542,9 +542,14 @@ protected static function _array(array $var, $depth, $indent) {
 
 		if ($depth >= 0) {
 			foreach ($var as $key => $val) {
+				if ($val !== $var) {
+					$val = self::_export($val, $depth, $indent);
+				} else {
+					$val = '[recursion]';
+				}
 				$vars[] = $break . self::exportVar($key) .
 					' => ' .
-					self::_export($val, $depth, $indent);
+					$val;
 			}
 		} else {
 			$vars[] = $break . '[maximum depth reached]';