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

Modifying getInstance() to allow subclasses to work properly. Tests added. Changed __output() to protected.

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7906 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
mark_story 2008-12-07 20:44:00 +00:00
parent 8a0fb1904a
commit cf3a194807
2 changed files with 45 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cake/libs/debugger.php
View file

@ -62,9 +62,9 @@ class Debugger extends Object {
* The current output format. * The current output format.
* *
* @var string * @var string
* @access private * @access protected
*/ */
var $__outputFormat = 'js'; var $_outputFormat = 'js';
/** /**
* Holds current output data when outputFormat is false. * Holds current output data when outputFormat is false.
* *
@ -92,8 +92,17 @@ class Debugger extends Object {
* @access public * @access public
* @static * @static
*/ */
function &getInstance() { function &getInstance($class = null) {
static $instance = array(); static $instance = array();
if (!empty($class)) {
if (!$instance || strtolower($class) != strtolower(get_class($instance[0]))) {
$instance[0] = & new $class();
if (Configure::read() > 0) {
Configure::version(); // Make sure the core config is loaded
$instance[0]->helpPath = Configure::read('Cake.Debugger.HelpPath');
}
}
}
if (!$instance) { if (!$instance) {
$instance[0] =& new Debugger(); $instance[0] =& new Debugger();
@ -209,7 +218,7 @@ class Debugger extends Object {
} }
} }
echo $_this->__output($level, $error, $code, $helpCode, $description, $file, $line, $context); echo $_this->_output($level, $error, $code, $helpCode, $description, $file, $line, $context);
if (Configure::read('log')) { if (Configure::read('log')) {
CakeLog::write($level, "{$error} ({$code}): {$description} in [{$file}, line {$line}]"); CakeLog::write($level, "{$error} ({$code}): {$description} in [{$file}, line {$line}]");
@ -459,7 +468,7 @@ class Debugger extends Object {
$_this->__data = array(); $_this->__data = array();
$format = false; $format = false;
} }
$_this->__outputFormat = $format; $_this->_outputFormat = $format;
return $data; return $data;
} }
@ -469,7 +478,7 @@ class Debugger extends Object {
* @param string $var Object to convert * @param string $var Object to convert
* @access private * @access private
*/ */
function __output($level, $error, $code, $helpCode, $description, $file, $line, $kontext) { function _output($level, $error, $code, $helpCode, $description, $file, $line, $kontext) {
$files = $this->trace(array('start' => 2, 'format' => 'points')); $files = $this->trace(array('start' => 2, 'format' => 'points'));
$listing = $this->excerpt($files[0]['file'], $files[0]['line'] - 1, 1); $listing = $this->excerpt($files[0]['file'], $files[0]['line'] - 1, 1);
$trace = $this->trace(array('start' => 2, 'depth' => '20')); $trace = $this->trace(array('start' => 2, 'depth' => '20'));
@ -479,7 +488,7 @@ class Debugger extends Object {
$context[] = "\${$var}\t=\t" . $this->exportVar($value, 1); $context[] = "\${$var}\t=\t" . $this->exportVar($value, 1);
} }
switch ($this->__outputFormat) { switch ($this->_outputFormat) {
default: default:
case 'js': case 'js':
$link = "document.getElementById(\"CakeStackTrace" . count($this->errors) . "\").style.display = (document.getElementById(\"CakeStackTrace" . count($this->errors) . "\").style.display == \"none\" ? \"\" : \"none\")"; $link = "document.getElementById(\"CakeStackTrace" . count($this->errors) . "\").style.display = (document.getElementById(\"CakeStackTrace" . count($this->errors) . "\").style.display == \"none\" ? \"\" : \"none\")";

30
cake/tests/cases/libs/debugger.test.php
View file

@ -26,7 +26,16 @@
*/ */
App::import('Core', 'Debugger'); App::import('Core', 'Debugger');
/** /**
* Short description for class. * DebugggerTestCaseDebuggger
*
* @package cake.tests
* @subpackage cake.tests.cases.libs
*/
class DebuggerTestCaseDebugger extends Debugger {
}
/**
* Debugger Test Case.
* *
* @package cake.tests * @package cake.tests
* @subpackage cake.tests.cases.libs * @subpackage cake.tests.cases.libs
@ -238,6 +247,25 @@ class DebuggerTest extends CakeTestCase {
$expected = "<pre>array(\n\t\"People\" => array()\n)</pre>"; $expected = "<pre>array(\n\t\"People\" => array()\n)</pre>";
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
} }
/**
* test getInstance.
*
* @return void
**/
function testGetInstance() {
$result = Debugger::getInstance();
$this->assertIsA($result, 'Debugger');
$result = Debugger::getInstance('DebuggerTestCaseDebugger');
$this->assertIsA($result, 'DebuggerTestCaseDebugger');
$result = Debugger::getInstance();
$this->assertIsA($result, 'DebuggerTestCaseDebugger');
$result = Debugger::getInstance('Debugger');
$this->assertIsA($result, 'Debugger');
}
/** /**
* tearDown method * tearDown method
* *