X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FError.php;h=a0a2d99409957f454d11353853148451f364aadf;hb=f9f40af3ba65d47c6710d450e989124d9b3e3b70;hp=380f9e17ef49c360747e45f94601b6cecef2089b;hpb=fe6a56117db7e9dada18e60f91de717a89013d86;p=civicrm-core.git
diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php
index 380f9e17ef..a0a2d99409 100644
--- a/CRM/Core/Error.php
+++ b/CRM/Core/Error.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.5 |
+ | CiviCRM version 4.6 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
@@ -76,10 +76,10 @@ class CRM_Core_Error extends PEAR_ErrorStack {
* Status code of various types of errors
* @var const
*/
- CONST FATAL_ERROR = 2;
- CONST DUPLICATE_CONTACT = 8001;
- CONST DUPLICATE_CONTRIBUTION = 8002;
- CONST DUPLICATE_PARTICIPANT = 8003;
+ const FATAL_ERROR = 2;
+ const DUPLICATE_CONTACT = 8001;
+ const DUPLICATE_CONTRIBUTION = 8002;
+ const DUPLICATE_PARTICIPANT = 8003;
/**
* We only need one instance of this object. So we use the singleton
@@ -114,7 +114,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
* @return object
* @static
*/
- static function &singleton($package = NULL, $msgCallback = FALSE, $contextCallback = FALSE, $throwPEAR_Error = FALSE, $stackClass = 'PEAR_ErrorStack') {
+ public static function &singleton($package = NULL, $msgCallback = FALSE, $contextCallback = FALSE, $throwPEAR_Error = FALSE, $stackClass = 'PEAR_ErrorStack') {
if (self::$_singleton === NULL) {
self::$_singleton = new CRM_Core_Error('CiviCRM');
}
@@ -124,7 +124,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
/**
* Constructor
*/
- function __construct() {
+ public function __construct() {
parent::__construct('CiviCRM');
$log = CRM_Core_Config::getLog();
@@ -158,7 +158,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
* @param $error
* @param string $separator
*/
- static function displaySessionError(&$error, $separator = '
') {
+ public static function displaySessionError(&$error, $separator = '
') {
$message = self::getMessages($error, $separator);
if ($message) {
$status = ts("Payment Processor Error message") . "{$separator} $message";
@@ -176,7 +176,6 @@ class CRM_Core_Error extends PEAR_ErrorStack {
* @param object PEAR_Error
*
* @return void
- * @access public
*/
public static function handle($pearError) {
@@ -300,17 +299,19 @@ class CRM_Core_Error extends PEAR_ErrorStack {
/**
* Display an error page with an error message describing what happened
*
- * @param string $message the error message
- * @param string $code the error code if any
- * @param string $email the email address to notify of this situation
+ * @param string $message
+ * The error message.
+ * @param string $code
+ * The error code if any.
+ * @param string $email
+ * The email address to notify of this situation.
*
* @throws Exception
*
* @return void
* @static
- * @access public
*/
- static function fatal($message = NULL, $code = NULL, $email = NULL) {
+ public static function fatal($message = NULL, $code = NULL, $email = NULL) {
$vars = array(
'message' => $message,
'code' => $code,
@@ -324,7 +325,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
$details = 'A fatal error was triggered';
if ($message) {
$details .= ': ' . $message;
- }
+ }
throw new Exception($details, $code);
}
@@ -355,6 +356,13 @@ class CRM_Core_Error extends PEAR_ErrorStack {
}
}
+ if ($config->backtrace) {
+ self::backtrace();
+ }
+
+ CRM_Core_Error::debug_var('Fatal Error Details', $vars);
+ CRM_Core_Error::backtrace('backTrace', TRUE);
+
// If we are in an ajax callback, format output appropriately
if (CRM_Utils_Array::value('snippet', $_REQUEST) === CRM_Core_Smarty::PRINT_JSON) {
$out = array(
@@ -370,15 +378,9 @@ class CRM_Core_Error extends PEAR_ErrorStack {
CRM_Core_Page_AJAX::returnJsonResponse($out);
}
- if ($config->backtrace) {
- self::backtrace();
- }
-
$template = CRM_Core_Smarty::singleton();
$template->assign($vars);
- CRM_Core_Error::debug_var('Fatal Error Details', $vars);
- CRM_Core_Error::backtrace('backTrace', TRUE);
$config->userSystem->outputError($template->fetch($config->fatalErrorTemplate));
self::abend(CRM_Core_Error::FATAL_ERROR);
@@ -395,9 +397,14 @@ class CRM_Core_Error extends PEAR_ErrorStack {
*
* @return void
* @static
- * @access public
*/
- static function handleUnhandledException($exception) {
+ public static function handleUnhandledException($exception) {
+ try {
+ CRM_Utils_Hook::unhandledException($exception);
+ } catch (Exception $other) {
+ // if the exception-handler generates an exception, then that sucks! oh, well. carry on.
+ CRM_Core_Error::debug_var('handleUnhandledException_nestedException', self::formatTextException($other));
+ }
$config = CRM_Core_Config::singleton();
$vars = array(
'message' => $exception->getMessage(),
@@ -461,19 +468,18 @@ class CRM_Core_Error extends PEAR_ErrorStack {
* Outputs pre-formatted debug information. Flushes the buffers
* so we can interrupt a potential POST/redirect
*
- * @param string name of debug section
- * @param mixed reference to variables that we need a trace of
- * @param bool should we log or return the output
- * @param bool whether to generate a HTML-escaped output
- * @param bool should we check permissions before displaying output
+ * @param string name of debug section
+ * @param mixed reference to variables that we need a trace of
+ * @param bool should we log or return the output
+ * @param bool whether to generate a HTML-escaped output
+ * @param bool should we check permissions before displaying output
* useful when we die during initialization and permissioning
* subsystem is not initialized - CRM-13765
*
* @return string the generated output
- * @access public
* @static
*/
- static function debug($name, $variable = NULL, $log = TRUE, $html = TRUE, $checkPermission = TRUE) {
+ public static function debug($name, $variable = NULL, $log = TRUE, $html = TRUE, $checkPermission = TRUE) {
$error = self::singleton();
if ($variable === NULL) {
@@ -512,24 +518,27 @@ class CRM_Core_Error extends PEAR_ErrorStack {
*
* @param string $variable_name
* @param mixed $variable
- * @param bool $print should we use print_r ? (else we use var_dump)
- * @param bool $log should we log or return the output
- * @param string $comp variable name
+ * @param bool $print
+ * Should we use print_r ? (else we use var_dump).
+ * @param bool $log
+ * Should we log or return the output.
+ * @param string $comp
+ * Variable name.
*
* @return string the generated output
*
- * @access public
*
* @static
*
* @see CRM_Core_Error::debug()
* @see CRM_Core_Error::debug_log_message()
*/
- static function debug_var($variable_name,
+ static function debug_var(
+ $variable_name,
$variable,
$print = TRUE,
- $log = TRUE,
- $comp = ''
+ $log = TRUE,
+ $comp = ''
) {
// check if variable is set
if (!isset($variable)) {
@@ -560,16 +569,17 @@ class CRM_Core_Error extends PEAR_ErrorStack {
* Display the error message on terminal
*
* @param $message
- * @param bool $out should we log or return the output
+ * @param bool $out
+ * Should we log or return the output.
*
- * @param string $comp message to be output
+ * @param string $comp
+ * Message to be output.
* @return string format of the backtrace
*
- * @access public
*
* @static
*/
- static function debug_log_message($message, $out = FALSE, $comp = '') {
+ public static function debug_log_message($message, $out = FALSE, $comp = '') {
$config = CRM_Core_Config::singleton();
$file_log = self::createDebugLogger($comp);
@@ -593,16 +603,30 @@ class CRM_Core_Error extends PEAR_ErrorStack {
/**
* Append to the query log (if enabled)
*/
- static function debug_query($string) {
+ public static function debug_query($string) {
if ( defined( 'CIVICRM_DEBUG_LOG_QUERY' ) ) {
if ( CIVICRM_DEBUG_LOG_QUERY == 'backtrace' ) {
- CRM_Core_Error::backtrace( $string, true );
+ CRM_Core_Error::backtrace( $string, TRUE );
} else if ( CIVICRM_DEBUG_LOG_QUERY ) {
- CRM_Core_Error::debug_var( 'Query', $string, false, true );
+ CRM_Core_Error::debug_var( 'Query', $string, FALSE, TRUE );
}
}
}
+ /**
+ * Execute a query and log the results.
+ *
+ * @param string $query
+ */
+ public static function debug_query_result($query) {
+ $dao = CRM_Core_DAO::executeQuery($query);
+ $results = array();
+ while ($dao->fetch()) {
+ $results[] = (array) $dao;
+ }
+ CRM_Core_Error::debug_var('dao result', array('query' => $query, 'results' => $results));
+ }
+
/**
* Obtain a reference to the error log
*
@@ -610,7 +634,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
*
* @return Log
*/
- static function createDebugLogger($comp = '') {
+ public static function createDebugLogger($comp = '') {
$config = CRM_Core_Config::singleton();
if ($comp) {
@@ -642,7 +666,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
* @param string $msg
* @param bool $log
*/
- static function backtrace($msg = 'backTrace', $log = FALSE) {
+ public static function backtrace($msg = 'backTrace', $log = FALSE) {
$backTrace = debug_backtrace();
$message = self::formatBacktrace($backTrace);
if (!$log) {
@@ -656,31 +680,37 @@ class CRM_Core_Error extends PEAR_ErrorStack {
/**
* Render a backtrace array as a string
*
- * @param array $backTrace array of stack frames
- * @param boolean $showArgs TRUE if we should try to display content of function arguments (which could be sensitive); FALSE to display only the type of each function argument
- * @param int $maxArgLen maximum number of characters to show from each argument string
+ * @param array $backTrace
+ * Array of stack frames.
+ * @param bool $showArgs
+ * TRUE if we should try to display content of function arguments (which could be sensitive); FALSE to display only the type of each function argument.
+ * @param int $maxArgLen
+ * Maximum number of characters to show from each argument string.
* @return string printable plain-text
*/
- static function formatBacktrace($backTrace, $showArgs = TRUE, $maxArgLen = 80) {
+ public static function formatBacktrace($backTrace, $showArgs = TRUE, $maxArgLen = 80) {
$message = '';
foreach (self::parseBacktrace($backTrace, $showArgs, $maxArgLen) as $idx => $trace) {
$message .= sprintf("#%s %s\n", $idx, $trace);
}
- $message .= sprintf("#%s {main}\n", 1+$idx);
+ $message .= sprintf("#%s {main}\n", 1 + $idx);
return $message;
}
/**
* Render a backtrace array as an array
*
- * @param array $backTrace array of stack frames
- * @param boolean $showArgs TRUE if we should try to display content of function arguments (which could be sensitive); FALSE to display only the type of each function argument
- * @param int $maxArgLen maximum number of characters to show from each argument string
+ * @param array $backTrace
+ * Array of stack frames.
+ * @param bool $showArgs
+ * TRUE if we should try to display content of function arguments (which could be sensitive); FALSE to display only the type of each function argument.
+ * @param int $maxArgLen
+ * Maximum number of characters to show from each argument string.
* @return array
* @see debug_backtrace
* @see Exception::getTrace()
*/
- static function parseBacktrace($backTrace, $showArgs = TRUE, $maxArgLen = 80) {
+ public static function parseBacktrace($backTrace, $showArgs = TRUE, $maxArgLen = 80) {
$ret = array();
foreach ($backTrace as $trace) {
$args = array();
@@ -700,25 +730,32 @@ class CRM_Core_Error extends PEAR_ErrorStack {
case 'boolean':
$args[] = $arg ? 'TRUE' : 'FALSE';
break;
+
case 'integer':
case 'double':
$args[] = $arg;
break;
+
case 'string':
$args[] = '"' . CRM_Utils_String::ellipsify(addcslashes((string) $arg, "\r\n\t\""), $maxArgLen). '"';
break;
+
case 'array':
$args[] = '(Array:'.count($arg).')';
break;
+
case 'object':
$args[] = 'Object(' . get_class($arg) . ')';
break;
+
case 'resource':
$args[] = 'Resource';
break;
+
case 'NULL':
$args[] = 'NULL';
break;
+
default:
$args[] = "($type)";
break;
@@ -744,7 +781,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
* @param Exception $e
* @return string printable HTML text
*/
- static function formatHtmlException(Exception $e) {
+ public static function formatHtmlException(Exception $e) {
$msg = '';
// Exception metadata
@@ -759,11 +796,11 @@ class CRM_Core_Error extends PEAR_ErrorStack {
$msg .= '
' . get_class($e) . ': "' . htmlentities($e->getMessage()) . '"
'; @@ -778,7 +815,7 @@ class CRM_Core_Error extends PEAR_ErrorStack { * @param Exception $e * @return string printable plain text */ - static function formatTextException(Exception $e) { + public static function formatTextException(Exception $e) { $msg = get_class($e) . ": \"" . $e->getMessage() . "\"\n"; $ei = $e; @@ -802,7 +839,7 @@ class CRM_Core_Error extends PEAR_ErrorStack { * * @return object */ - static function createError($message, $code = 8000, $level = 'Fatal', $params = NULL) { + public static function createError($message, $code = 8000, $level = 'Fatal', $params = NULL) { $error = CRM_Core_Error::singleton(); $error->push($code, $level, array($params), $message); return $error; @@ -811,12 +848,12 @@ class CRM_Core_Error extends PEAR_ErrorStack { /** * Set a status message in the session, then bounce back to the referrer. * - * @param string $status The status message to set + * @param string $status + * The status message to set. * * @param null $redirect * @param string $title * @return void - * @access public * @static */ public static function statusBounce($status, $redirect = NULL, $title = NULL) { @@ -837,7 +874,6 @@ class CRM_Core_Error extends PEAR_ErrorStack { /** * Reset the error stack * - * @access public * @static */ public static function reset() { @@ -860,9 +896,9 @@ class CRM_Core_Error extends PEAR_ErrorStack { /** * PEAR error-handler to quietly catch otherwise fatal errors. Intended for use with smtp transport. * - * @param object $obj The PEAR_ERROR object + * @param object $obj + * The PEAR_ERROR object. * @return object $obj - * @access public * @static */ public static function nullHandler($obj) {