From 47849ec863c3950db0dec42f4ca784b4a33b4817 Mon Sep 17 00:00:00 2001
From: Friedhelm Betz <betz@php.net>
Date: Mon, 1 Dec 2003 11:52:54 +0000
Subject: [PATCH] bugfix #26472 E_STRICT added default values for
 error_reporting bitmask allows xor  in php.ini

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@145291 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/errorfunc/constants.xml | 21 ++++++++++++++++++---
 reference/errorfunc/ini.xml       | 13 ++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/reference/errorfunc/constants.xml b/reference/errorfunc/constants.xml
index 3fc748a6f3..05140e3908 100644
--- a/reference/errorfunc/constants.xml
+++ b/reference/errorfunc/constants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <section id="errorfunc.constants">
  &reftitle.constants;
  &extension.constants.core;
@@ -172,8 +172,22 @@
      <entry>PHP 4 only</entry>
     </row>
 
+    <row id="e-strict">
+     <entry>2048</entry>
+     <entry>
+      <constant>E_STRICT</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 compatability of your code.
+     </entry>
+     <entry>PHP 5 only</entry>
+    </row>
+
     <row id="e-all">
-     <entry>2047</entry>
+     <entry>4095</entry>
      <entry>
       <constant>E_ALL</constant> 
       (<type>integer</type>)
@@ -181,6 +195,7 @@
      <entry>
       All errors and warnings, as supported.
      </entry>
+     <entry>With PHP &gt;= 5.0.0 the value changed from 2047 to 4095.</entry>
     </row>
 
    </tbody>
@@ -192,7 +207,7 @@
   up a bitmask that specifies which errors to report. You can use the
   <link linkend="language.operators.bitwise">bitwise operators</link>
   to combine these values or mask out certain types of errors. Note
-  that only '|', '~', '!', and '&amp;' will be understood within
+  that only '|', '~', '!', ^ and '&amp;' will be understood within
   &php.ini;, however, and that no bitwise
   operators will be understood within <filename>php3.ini</filename>.
  </para>
diff --git a/reference/errorfunc/ini.xml b/reference/errorfunc/ini.xml
index acfc37728f..63adf322a3 100644
--- a/reference/errorfunc/ini.xml
+++ b/reference/errorfunc/ini.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 <section id="errorfunc.configuration">
  &reftitle.runtime;
  &extension.runtime;
@@ -17,7 +17,7 @@
     <tbody>
     <row>
      <entry>error_reporting</entry>
-     <entry>E_ALL &amp; ~E_NOTICE</entry>
+     <entry>E_ALL &amp; ~E_NOTICE &amp; ~E_STRICT</entry>
      <entry>PHP_INI_ALL</entry>
     </row>
     <row>
@@ -122,7 +122,14 @@
       <link linkend="ini.display-errors">display_errors</link> directive.
      </para>
      <para>
-      In PHP 4 the default value does not show <constant>E_NOTICE</constant>
+      In PHP 4 the default value is E_ALL &amp; ~E_NOTICE. This setting does
+      not show <constant>E_NOTICE</constant> level errors. You may want to
+      show them during development.
+     </para>
+     <para>
+      In PHP 5 <constant>E_STRICT</constant> is introduced. The default value
+      is E_ALL &amp; ~E_NOTICE &amp; ~E_STRICT. This setting does not show
+      errors <constant>E_NOTICE</constant> and <constant>E_STRICT</constant>
       level errors. You may want to show them during development.
      </para>
      <note>