nlopess Thu Jun 8 11:19:12 2006 UTC
Modified files:
/phpdoc/en/reference/errorfunc constants.xml examples.xml
/phpdoc/en/reference/errorfunc/functions error-reporting.xml
Log:
add E_RECOVERABLE_ERROR
add E_STRICT to E_ALL in PHP 6
http://cvs.php.net/viewcvs.cgi/phpdoc/en/reference/errorfunc/constants.xml?r1=1.13&r2=1.14&diff_format=u
Index: phpdoc/en/reference/errorfunc/constants.xml
diff -u phpdoc/en/reference/errorfunc/constants.xml:1.13
phpdoc/en/reference/errorfunc/constants.xml:1.14
--- phpdoc/en/reference/errorfunc/constants.xml:1.13 Tue Mar 2 15:22:06 2004
+++ phpdoc/en/reference/errorfunc/constants.xml Thu Jun 8 11:19:12 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
<section id="errorfunc.constants">
&reftitle.constants;
&extension.constants.core;
@@ -172,32 +172,47 @@
<entry>since PHP 4</entry>
</row>
- <row id="e-all">
- <entry>2047</entry>
+ <row id="e-strict">
+ <entry>2048</entry>
<entry>
- <constant>E_ALL</constant>
+ <constant>E_STRICT</constant>
(<type>integer</type>)
</entry>
<entry>
- All errors and warnings, as supported, except of level
- <constant>E_STRICT</constant>.
+ Run-time notices. Enable to have PHP suggest changes
+ to your code which will ensure the best interoperability
+ and forward compatibility of your code.
</entry>
- <entry></entry>
+ <entry>since PHP 5</entry>
</row>
+ <row id="e-recoverable-error">
+ <entry>4096</entry>
+ <entry>
+ <constant>E_RECOVERABLE_ERROR</constant>
+ (<type>integer</type>)
+ </entry>
+ <entry>
+ Catchable fatal error. It indicates that a probably dangerous error
+ occured, but did not leave the Engine in an unstable state. If the error
+ is not caught by a user defined handle (see also
+ <function>set_error_handler</function>), the application aborts as it
+ was an <constant>E_ERROR</constant>.
+ </entry>
+ <entry>since PHP 5.2</entry>
+ </row>
- <row id="e-strict">
- <entry>2048</entry>
+ <row id="e-all">
+ <entry>8191</entry>
<entry>
- <constant>E_STRICT</constant>
+ <constant>E_ALL</constant>
(<type>integer</type>)
</entry>
<entry>
- Run-time notices. Enable to have PHP suggest changes
- to your code which will ensure the best interoperability
- and forward compatibility of your code.
+ All errors and warnings, as supported, except of level
+ <constant>E_STRICT</constant> in PHP < 6.
</entry>
- <entry>since PHP 5</entry>
+ <entry>6143 in PHP 5.2 and 2047 previously</entry>
</row>
</tbody>
http://cvs.php.net/viewcvs.cgi/phpdoc/en/reference/errorfunc/examples.xml?r1=1.7&r2=1.8&diff_format=u
Index: phpdoc/en/reference/errorfunc/examples.xml
diff -u phpdoc/en/reference/errorfunc/examples.xml:1.7
phpdoc/en/reference/errorfunc/examples.xml:1.8
--- phpdoc/en/reference/errorfunc/examples.xml:1.7 Mon May 10 10:39:08 2004
+++ phpdoc/en/reference/errorfunc/examples.xml Thu Jun 8 11:19:12 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<section id="errorfunc.examples">
&reftitle.examples;
<para>
@@ -26,18 +26,19 @@
// consider are E_WARNING, E_NOTICE, E_USER_ERROR,
// E_USER_WARNING and E_USER_NOTICE
$errortype = array (
- E_ERROR => "Error",
- E_WARNING => "Warning",
- E_PARSE => "Parsing Error",
- E_NOTICE => "Notice",
- E_CORE_ERROR => "Core Error",
- E_CORE_WARNING => "Core Warning",
- E_COMPILE_ERROR => "Compile Error",
- E_COMPILE_WARNING => "Compile Warning",
- E_USER_ERROR => "User Error",
- E_USER_WARNING => "User Warning",
- E_USER_NOTICE => "User Notice",
- E_STRICT => "Runtime Notice"
+ E_ERROR => 'Error',
+ E_WARNING => 'Warning',
+ E_PARSE => 'Parsing Error',
+ E_NOTICE => 'Notice',
+ E_CORE_ERROR => 'Core Error',
+ E_CORE_WARNING => 'Core Warning',
+ E_COMPILE_ERROR => 'Compile Error',
+ E_COMPILE_WARNING => 'Compile Warning',
+ E_USER_ERROR => 'User Error',
+ E_USER_WARNING => 'User Warning',
+ E_USER_NOTICE => 'User Notice',
+ E_STRICT => 'Runtime Notice',
+ E_RECOVERABLE_ERRROR => 'Catchable Fatal Error'
);
// set of errors for which a var trace will be saved
$user_errors = array(E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE);
http://cvs.php.net/viewcvs.cgi/phpdoc/en/reference/errorfunc/functions/error-reporting.xml?r1=1.14&r2=1.15&diff_format=u
Index: phpdoc/en/reference/errorfunc/functions/error-reporting.xml
diff -u phpdoc/en/reference/errorfunc/functions/error-reporting.xml:1.14
phpdoc/en/reference/errorfunc/functions/error-reporting.xml:1.15
--- phpdoc/en/reference/errorfunc/functions/error-reporting.xml:1.14 Sun Apr
24 23:19:35 2005
+++ phpdoc/en/reference/errorfunc/functions/error-reporting.xml Thu Jun 8
11:19:12 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
<!-- splitted from ./en/functions/errorfunc.xml, last change in rev 1.1 -->
<refentry id="function.error-reporting">
<refnamediv>
@@ -128,6 +128,12 @@
<link linkend="e-strict">E_STRICT</link>
</entry>
</row>
+ <row>
+ <entry>4096</entry>
+ <entry>
+ <link linkend="e-recoverable-error">E_RECOVERABLE_ERROR</link>
+ </entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -188,7 +194,8 @@
<simpara>
With PHP > 5.0.0 <constant>E_STRICT</constant> with value 2048 is
available. <constant>E_ALL</constant> does <emphasis>NOT</emphasis>
- include error level <constant>E_STRICT</constant>.
+ include error level <constant>E_STRICT</constant> (but in PHP 6 it does
+ though).
Most of <constant>E_STRICT</constant> errors are evaluated at the
compile time thus such errors are not reported in the file where
<link linkend="ini.error-reporting">error_reporting</link> is enhanced