/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.5 |
+ | CiviCRM version 4.6 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
* 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
* @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');
}
/**
* Constructor
*/
- function __construct() {
+ public function __construct() {
parent::__construct('CiviCRM');
$log = CRM_Core_Config::getLog();
* @param $error
* @param string $separator
*/
- static function displaySessionError(&$error, $separator = '<br />') {
+ public static function displaySessionError(&$error, $separator = '<br />') {
$message = self::getMessages($error, $separator);
if ($message) {
$status = ts("Payment Processor Error message") . "{$separator} $message";
* @param object PEAR_Error
*
* @return void
- * @access public
*/
public static function handle($pearError) {
*
* @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,
*
* @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(),
* 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) {
*
* @return string the generated output
*
- * @access public
*
* @static
*
* @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);
/**
* 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 );
*
* @param string $query
*/
- static function debug_query_result($query) {
+ public static function debug_query_result($query) {
$dao = CRM_Core_DAO::executeQuery($query);
$results = array();
while ($dao->fetch()) {
*
* @return Log
*/
- static function createDebugLogger($comp = '') {
+ public static function createDebugLogger($comp = '') {
$config = CRM_Core_Config::singleton();
if ($comp) {
* @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) {
* @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);
* @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();
* @param Exception $e
* @return string printable HTML text
*/
- static function formatHtmlException(Exception $e) {
+ public static function formatHtmlException(Exception $e) {
$msg = '';
// Exception metadata
* @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;
*
* @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;
* @param null $redirect
* @param string $title
* @return void
- * @access public
* @static
*/
public static function statusBounce($status, $redirect = NULL, $title = NULL) {
/**
* Reset the error stack
*
- * @access public
* @static
*/
public static function reset() {
*
* @param object $obj The PEAR_ERROR object
* @return object $obj
- * @access public
* @static
*/
public static function nullHandler($obj) {