tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fix stack trace on objects that don't extend the Object class

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47716 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2008-01-08 03:00:38 +00:00
parent 3ce88a07d9
commit 84a3cd29d0
2 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
core/Debug.php
View File

@ -48,26 +48,34 @@ class Debug {
}
static function text($val) {
if(is_object($val) && $val->hasMethod('debug')) {
return $val->debug();
} else {
if(is_array($val)) {
$result = "<ul>\n";
foreach($val as $k => $v) {
$result .= "<li>$k = " . Debug::text($v) . "</li>\n";
}
$val = $result . "</ul>\n";
} else if (is_object($val)) {
$val = var_export($val, true);
if(is_object($val)) {
if(method_exists($val, 'hasMethod')) {
$hasDebugMethod = $val->hasMethod('debug');
} else {
if(true || !Director::is_ajax()) {
$val = "<pre style=\"font-family: Courier new\">" . htmlentities($val) . "</pre>\n";
}
$hasDebugMethod = method_exists($val, 'debug');
}
if($hasDebugMethod) {
return $val->debug();
}
return $val;
}
if(is_array($val)) {
$result = "<ul>\n";
foreach($val as $k => $v) {
$result .= "<li>$k = " . Debug::text($v) . "</li>\n";
}
$val = $result . "</ul>\n";
} else if (is_object($val)) {
$val = var_export($val, true);
} else {
if(true || !Director::is_ajax()) {
$val = "<pre style=\"font-family: Courier new\">" . htmlentities($val) . "</pre>\n";
}
}
return $val;
}
/**
@ -144,6 +152,7 @@ class Debug {
echo "<p style=\"color: white; background-color: red; margin: 0\">FATAL ERROR: $errstr<br />\n At line $errline in $errfile<br />\n<br />\n</p>\n";
Debug::backtrace();
//Debug::show(debug_backtrace());
echo "<h2>Context</h2>\n";
Debug::show($errcontext);
@ -240,7 +249,7 @@ class Debug {
while( $bt && in_array(self::full_func_name($bt[0]), $ignoredFunctions) ) {
array_shift($bt);
}
$result = "";
foreach($bt as $item) {
if(Director::is_ajax() && !$ignoreAjax) {
@ -254,6 +263,8 @@ class Debug {
}
}
$result .= 'hi';
echo $result;
if($returnVal) return $result;
else echo $result;
}
@ -268,7 +279,16 @@ class Debug {
if(isset($item['function'])) $funcName .= $item['function'];
if($showArgs && isset($item['args'])) {
@$funcName .= "(" . implode(",", (array)$item['args']) .")";
$args = array();
foreach($item['args'] as $arg) {
if(!is_object($arg) || method_exists($arg, '__toString')) {
$args[] = (string) $arg;
} else {
$args[] = get_class($arg);
}
}
$funcName .= "(" . implode(",", $args) .")";
}
return $funcName;

2
tests/SapphireTest.php
View File

@ -167,4 +167,4 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
class SapphireTest extends Object {}
}
?>
?>