[PHP-DOC] cvs: phpdoc /en/reference/errorfunc/functions restore-error-handler.xml

[Jakub Vrana]

vrana           Tue Apr  5 03:16:49 2005 EDT

  Modified files:              
    /phpdoc/en/reference/errorfunc/functions    restore-error-handler.xml 
  Log:
  Remove confusing constants, fix WS
  
http://cvs.php.net/diff.php/phpdoc/en/reference/errorfunc/functions/restore-error-handler.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/reference/errorfunc/functions/restore-error-handler.xml
diff -u phpdoc/en/reference/errorfunc/functions/restore-error-handler.xml:1.6 
phpdoc/en/reference/errorfunc/functions/restore-error-handler.xml:1.7
--- phpdoc/en/reference/errorfunc/functions/restore-error-handler.xml:1.6       
Mon Apr  4 14:00:21 2005
+++ phpdoc/en/reference/errorfunc/functions/restore-error-handler.xml   Tue Apr 
 5 03:16:48 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/errorfunc.xml, last change in rev 1.1 -->
   <refentry id="function.restore-error-handler">
    <refnamediv>
@@ -39,42 +39,37 @@
       <programlisting role="php">
 <![CDATA[
 <?php
-// redefine the user error constants - PHP 4 only
-define("FATAL", E_USER_ERROR);
-define("ERROR", E_USER_WARNING);
-define("WARNING", E_USER_NOTICE);
-
 // set the error reporting level for this script
-error_reporting(FATAL | ERROR | WARNING);
+error_reporting(E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE);
 
 // error handler function
 function myErrorHandler($errno, $errstr, $errfile, $errline) 
 {
-  switch ($errno) {
-  case FATAL:
-    echo "<b>My FATAL</b> [$errno] $errstr<br />\n";
-    echo "  Fatal error in line $errline of file $errfile";
-    echo ", PHP " . PHP_VERSION . " (" . PHP_OS . ")<br />\n";
-    echo "Aborting...<br />\n";
-    exit(1);
-    break;
-  case ERROR:
-    echo "<b>My ERROR</b> [$errno] $errstr<br />\n";
-    break;
-  case WARNING:
-    echo "<b>My WARNING</b> [$errno] $errstr<br />\n";
-    break;
-  default:
-    echo "My unkown error type: [$errno] $errstr<br />\n";
-    break;
-  }
+    switch ($errno) {
+    case E_USER_ERROR:
+        echo "<b>My FATAL</b> [$errno] $errstr<br />\n";
+        echo "  Fatal error in line $errline of file $errfile";
+        echo ", PHP " . PHP_VERSION . " (" . PHP_OS . ")<br />\n";
+        echo "Aborting...<br />\n";
+        exit(1);
+        break;
+    case E_USER_WARNING:
+        echo "<b>My ERROR</b> [$errno] $errstr<br />\n";
+        break;
+    case E_USER_NOTICE:
+        echo "<b>My WARNING</b> [$errno] $errstr<br />\n";
+        break;
+    default:
+        echo "My unkown error type: [$errno] $errstr<br />\n";
+        break;
+    }
 }
 
 set_error_handler("myErrorHandler");
-trigger_error('Test error', ERROR);
+trigger_error('Test error', E_USER_WARNING);
 
 restore_error_handler(); // Will restore standard PHP handler
-trigger_error('Test error', ERROR);
+trigger_error('Test error', E_USER_WARNING);
 ?>
 ]]>
       </programlisting>