diff --git a/src/Error/Debugger.php b/src/Error/Debugger.php index 86cbc65df96..591fd5c1eef 100644 --- a/src/Error/Debugger.php +++ b/src/Error/Debugger.php @@ -801,7 +801,7 @@ public static function getType($var) * data in a browser-friendly way. * @return void */ - public static function print($var, $location = [], $showHtml = null) + public static function printVar($var, $location = [], $showHtml = null) { $location += ['file' => null, 'line' => null]; $file = $location['file']; diff --git a/src/basics.php b/src/basics.php index 2bfc1e39a0e..2bd9e0b8e2b 100644 --- a/src/basics.php +++ b/src/basics.php @@ -55,7 +55,7 @@ function debug($var, $showHtml = null, $showFrom = true) ]; } - Debugger::print($var, $location, $showHtml); + Debugger::printVar($var, $location, $showHtml); return $var; } @@ -136,7 +136,7 @@ function dd($var, $showHtml = null) 'file' => $trace[0]['file'] ]; - Debugger::print($var, $location); + Debugger::printVar($var, $location); die(1); } } diff --git a/tests/TestCase/Error/DebuggerTest.php b/tests/TestCase/Error/DebuggerTest.php index 776dcb7eeac..792eec99a9e 100644 --- a/tests/TestCase/Error/DebuggerTest.php +++ b/tests/TestCase/Error/DebuggerTest.php @@ -587,14 +587,14 @@ public function testDebugInfo() } /** - * test testPrint() + * test testPrintVar() * * @return void */ - public function testPrint() + public function testPrintVar() { ob_start(); - Debugger::print('this-is-a-test', ['file' => __FILE__, 'line' => __LINE__], false); + Debugger::printVar('this-is-a-test', ['file' => __FILE__, 'line' => __LINE__], false); $result = ob_get_clean(); $expectedText = << __FILE__, 'line' => __LINE__], true); + Debugger::printVar($value, ['file' => __FILE__, 'line' => __LINE__], true); $result = ob_get_clean(); $expectedHtml = << @@ -623,7 +623,7 @@ public function testPrint() $this->assertEquals($expected, $result); ob_start(); - Debugger::print('
this-is-a-test
', ['file' => __FILE__, 'line' => __LINE__], true); + Debugger::printVar('
this-is-a-test
', ['file' => __FILE__, 'line' => __LINE__], true); $result = ob_get_clean(); $expected = << @@ -637,7 +637,7 @@ public function testPrint() $this->assertEquals($expected, $result); ob_start(); - Debugger::print('
this-is-a-test
', [], true); + Debugger::printVar('
this-is-a-test
', [], true); $result = ob_get_clean(); $expected = << @@ -651,7 +651,7 @@ public function testPrint() $this->assertEquals($expected, $result); ob_start(); - Debugger::print('
this-is-a-test
', ['file' => __FILE__, 'line' => __LINE__]); + Debugger::printVar('
this-is-a-test
', ['file' => __FILE__, 'line' => __LINE__]); $result = ob_get_clean(); $expectedHtml = << @@ -676,7 +676,7 @@ public function testPrint() $this->assertEquals($expected, $result); ob_start(); - Debugger::print('
this-is-a-test
'); + Debugger::printVar('
this-is-a-test
'); $result = ob_get_clean(); $expectedHtml = << @@ -701,7 +701,7 @@ public function testPrint() $this->assertEquals($expected, $result); ob_start(); - Debugger::print('
this-is-a-test
', ['file' => __FILE__, 'line' => __LINE__], false); + Debugger::printVar('
this-is-a-test
', ['file' => __FILE__, 'line' => __LINE__], false); $result = ob_get_clean(); $expected = <<assertEquals($expected, $result); ob_start(); - Debugger::print('
this-is-a-test
', ['file' => __FILE__, 'line' => __LINE__], false); + Debugger::printVar('
this-is-a-test
', ['file' => __FILE__, 'line' => __LINE__], false); $result = ob_get_clean(); $expected = <<assertEquals($expected, $result); ob_start(); - Debugger::print('
this-is-a-test
', [], false); + Debugger::printVar('
this-is-a-test
', [], false); $result = ob_get_clean(); $expected = <<assertEquals($expected, $result); ob_start(); - Debugger::print(false, [], false); + Debugger::printVar(false, [], false); $result = ob_get_clean(); $expected = <<