cvs: phd(PHD_ENTERPRISE) /include PhDErrors.php
| From: | Rudy Nappée | Date: | Fri, 01 Aug 2008 13:04:05 +0000 |
| Subject: | cvs: phd(PHD_ENTERPRISE) /include PhDErrors.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-1974@lists.php.net to get a copy of this message | ||
loudi Fri Aug 1 13:04:05 2008 UTC
Modified files: (Branch: PHD_ENTERPRISE)
/phd/include PhDErrors.php
Log:
* reverted last commit (PhDErrors flags)
http://cvs.php.net/viewvc.cgi/phd/include/PhDErrors.php?r1=1.3.4.2&r2=1.3.4.3&diff_format=u
Index: phd/include/PhDErrors.php
diff -u phd/include/PhDErrors.php:1.3.4.2 phd/include/PhDErrors.php:1.3.4.3
--- phd/include/PhDErrors.php:1.3.4.2 Fri Aug 1 12:55:17 2008
+++ phd/include/PhDErrors.php Fri Aug 1 13:04:05 2008
@@ -1,5 +1,5 @@
<?php
-/* $Id: PhDErrors.php,v 1.3.4.2 2008/08/01 12:55:17 loudi Exp $ */
+/* $Id: PhDErrors.php,v 1.3.4.3 2008/08/01 13:04:05 loudi Exp $ */
/* {{{ PhD error & message handler */
@@ -16,7 +16,7 @@
function define_error($name, $explanation) {
static $lastErrorValue = E_DEPRECATED;
-
+
define($name, $lastErrorValue <<= 1);
$GLOBALS['error_map'][$lastErrorValue] = $explanation;
}
@@ -31,9 +31,9 @@
define_error('VERBOSE_TOC_WRITING', 'PhD TOC Writer');
define_error('VERBOSE_CHUNK_WRITING', 'PhD Chunk Writer');
define_error('VERBOSE_NOVERSION', 'Missing Version Information');
-define_error('VERBOSE_ALL', 'PhD Verbose');
define_error('VERBOSE_DONE', 'PhD Processing Completion');
+define('VERBOSE_ALL', (VERBOSE_NOVERSION <<
1)-1);
define('VERBOSE_DEFAULT',
(VERBOSE_ALL^(VERBOSE_PARTIAL_CHILD_READING|VERBOSE_CHUNK_WRITING|VERBOSE_NOVERSION|VERBOSE_DONE)));
$olderrrep = error_reporting();
@@ -91,7 +91,7 @@
$output = PhDConfig::phd_info_output();
$data = $msg;
break;
-
+
// User triggered errors
case E_USER_ERROR:
case E_USER_WARNING:
@@ -100,7 +100,7 @@
$output = PhDConfig::user_error_output();
$data = sprintf("%s:%d\n\t%s", $file, $line, $msg);
break;
-
+
// PHP triggered errors
case E_DEPRECATED:
case E_RECOVERABLE_ERROR:
@@ -111,12 +111,12 @@
$output = PhDConfig::php_error_output();
$data = sprintf("%s:%d\n\t%s", $file, $line, $msg);
break;
-
+
default:
$recursive = false;
return false;
}
-
+
$timestamp = term_color(sprintf("[%s - %s]", $time,
$GLOBALS['error_map'][$errno]), $color);
fprintf($output, "%s %s\n", $timestamp, $data);