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

ENHANCEMENT: Include the caller of the deprecated method in the notice that it throws.

Browse Source
This commit is contained in:
Sam Minnee 2011-10-29 12:00:45 +13:00
parent 4c93c3be19
commit ad9bc59d10
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dev/Deprecation.php
View File

@ -85,10 +85,13 @@ class Deprecation {
*
* @static
* @param $backtrace array - a backtrace as returned from debug_backtrace
* @param $level - 1 (default) will return immediate caller, 2 will return caller's caller, etc.
* @return string - the name of the method
*/
protected static function get_called_method_from_trace($backtrace) {
$called = $backtrace[1];
protected static function get_called_method_from_trace($backtrace, $level = 1) {
$level = (int)$level;
if(!$level) $level = 1;
$called = $backtrace[$level];
if (isset($called['class'])) {
return $called['class'] . $called['type'] . $called['function'];
@ -133,6 +136,10 @@ class Deprecation {
if (!$level) $level = defined(E_USER_DEPRECATED) ? E_USER_DEPRECATED : E_USER_NOTICE;
// Then raise the notice
if(substr($string,-1) != '.') $string .= ".";
$string .= " Called from " . self::get_called_method_from_trace($backtrace, 2) . '.';
user_error($caller.' is deprecated.'.($string ? ' '.$string : ''), $level);
}
}