Patch removed_php_future for Documentation problem Bug #51468
Patch version 2010-04-03 05:04 UTC
Return to Bug #51468 |
Download this patch
Patch Revisions:
Developer: philip
Index: en/language/oop5/serialization.xml
===================================================================
--- en/language/oop5/serialization.xml (revision 297253)
+++ en/language/oop5/serialization.xml (working copy)
@@ -71,9 +71,8 @@
are serialized automatically at the end of each PHP page, and are
unserialized automatically on each of the following pages. This means that
these objects can show up on any of the application's pages once they become
- part of the session. However, <function>session_register</function> is
- deprecated as of PHP 5.3.0, and removed as of PHP 6.0.0. Reliance on this
- function is not recommended.
+ part of the session. However, regarding the <function>session_register</function>
+ function: &removed.php.future;
</para>
<para>
Index: en/language/control-structures/declare.xml
===================================================================
--- en/language/control-structures/declare.xml (revision 297253)
+++ en/language/control-structures/declare.xml (working copy)
@@ -176,9 +176,12 @@
</caution>
<para>
The encoding declare value is ignored in PHP 5.3 unless php is compiled with
- <literal>--enable-zend-multibyte</literal>. In PHP 6.0, the <literal>encoding</literal>
+ <literal>--enable-zend-multibyte</literal>.
+ <!-- FIXME PHP_6
+ In PHP 6.0, the <literal>encoding</literal>
directive will be used to inform the scanner what encoding the file is created in. Legal
values are encoding names such as <literal>UTF-8</literal>.
+ -->
</para>
</sect2>
</sect1>
Index: en/language/types/type-juggling.xml
===================================================================
--- en/language/types/type-juggling.xml (revision 297253)
+++ en/language/types/type-juggling.xml (working copy)
@@ -138,9 +138,11 @@
<listitem>
<simpara>(string) - cast to <type>string</type></simpara>
</listitem>
+ <!-- FIXME PHP_6
<listitem>
<simpara>(binary) - cast to binary <type>string</type> (PHP 6)</simpara>
</listitem>
+ -->
<listitem>
<simpara>(array) - cast to <type>array</type></simpara>
</listitem>
Index: en/language/types/string.xml
===================================================================
--- en/language/types/string.xml (revision 297253)
+++ en/language/types/string.xml (working copy)
@@ -3,8 +3,9 @@
<sect1 xml:id="language.types.string">
<title>Strings</title>
+ <!-- FIXME PHP_6 Likely unicode support will alter this -->
<para>
- A <type>string</type> is series of characters. Before PHP 6, a character is
+ A <type>string</type> is series of characters, therefore, a character is
the same as a byte. That is, there are exactly 256 different characters
possible. This also implies that PHP has no native support of Unicode. See
<function>utf8_encode</function> and <function>utf8_decode</function> for some
Index: en/language/variables.xml
===================================================================
--- en/language/variables.xml (revision 297253)
+++ en/language/variables.xml (working copy)
@@ -808,7 +808,8 @@
Depending on your particular setup and personal preferences, there
are many ways to access data from your HTML forms. Some examples are:
</para>
-
+
+ <!-- FIXME PHP_6 register_long_arrays removal alert -->
<para>
<example>
<title>Accessing data from a simple POST HTML form</title>
@@ -824,8 +825,7 @@
echo $p_username;
// As of PHP 5.0.0, these long predefined variables can be
-// disabled with the register_long_arrays directive. As of
-// PHP 6, they are completely unavailable.
+// disabled with the register_long_arrays directive.
echo $HTTP_POST_VARS['username'];
Index: en/reference/mysqlnd/overview.xml
===================================================================
--- en/reference/mysqlnd/overview.xml (revision 297253)
+++ en/reference/mysqlnd/overview.xml (working copy)
@@ -4,8 +4,8 @@
<title>Overview</title>
<para>
MySQL Native Driver is a replacement for the MySQL Client Library
- (libmysql). MySQL Native Driver is part of the official PHP 5.3 and
- PHP 6 branches.
+ (libmysql). MySQL Native Driver is part of the official PHP sources as
+ of PHP 5.3.0.
</para>
<para>
The MySQL database extensions MySQL extension,
Index: en/reference/intl/versions.xml
===================================================================
--- en/reference/intl/versions.xml (revision 297253)
+++ en/reference/intl/versions.xml (working copy)
@@ -136,8 +136,9 @@
<function name='intl_error_name' from='PHP 5 >= 5.3.0, PECL intl >= 1.0.0'/>
<function name='idn_to_ascii' from='PHP 5 >= 5.3.0, PECL intl >= 1.0.2'/>
<function name='idn_to_utf8' from='PHP 5 >= 5.3.0, PECL intl >= 1.0.2'/>
+ <!-- FIXME PHP_6
<function name='idn_to_unicode' from='PHP 6'/>
-
+ -->
<function name='locale_get_default' from='PHP 5 >= 5.3.0, PECL intl >= 1.0.0'/>
<function name='locale_set_default' from='PHP 5 >= 5.3.0, PECL intl >= 1.0.0'/>
<function name='locale_get_primary_language' from='PHP 5 >= 5.3.0, PECL intl >= 1.0.0'/>
Index: en/reference/mysqli/overview.xml
===================================================================
--- en/reference/mysqli/overview.xml (revision 297253)
+++ en/reference/mysqli/overview.xml (working copy)
@@ -428,12 +428,6 @@
<entry>Yes</entry>
</row>
<row>
- <entry>Comes with PHP 6.0</entry>
- <entry>Yes</entry>
- <entry>Yes</entry>
- <entry>Yes</entry>
- </row>
- <row>
<entry>MySQL development status</entry>
<entry>Active development</entry>
<entry>Active development as of PHP 5.3</entry>
Index: en/reference/session/ini.xml
===================================================================
--- en/reference/session/ini.xml (revision 297253)
+++ en/reference/session/ini.xml (working copy)
@@ -146,7 +146,7 @@
<entry><link linkend="ini.session.bug-compat-42">session.bug_compat_42</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Available since PHP 4.3.0. Removed in PHP 6.0.0.</entry>
+ <entry>Available since PHP 4.3.0. &removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.session.bug-compat-warn">session.bug_compat_warn</link></entry>
Index: en/reference/misc/ini.xml
===================================================================
--- en/reference/misc/ini.xml (revision 297253)
+++ en/reference/misc/ini.xml (working copy)
@@ -44,7 +44,7 @@
<entry>highlight.bg</entry>
<entry>"#FFFFFF"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry>highlight.default</entry>
Index: en/reference/sybase/ini.xml
===================================================================
--- en/reference/sybase/ini.xml (revision 297253)
+++ en/reference/sybase/ini.xml (working copy)
@@ -62,7 +62,7 @@
<entry><link linkend="ini.magic-quotes-sybase">magic_quotes_sybase</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Deprecated in PHP 5.3.0. Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
</tbody>
</tgroup>
Index: en/reference/unicode/versions.xml
===================================================================
--- en/reference/unicode/versions.xml (revision 297253)
+++ en/reference/unicode/versions.xml (working copy)
@@ -5,12 +5,14 @@
-->
<versions>
+<!-- FIXME PHP_6
<function name='unicode_decode' from='PHP 6 >= 6.0.0'/>
<function name='unicode_encode' from='PHP 6 >= 6.0.0'/>
<function name='unicode_get_error_mode' from='PHP 6 >= 6.0.0'/>
<function name='unicode_get_subst_char' from='PHP 6 >= 6.0.0'/>
<function name='unicode_set_error_mode' from='PHP 6 >= 6.0.0'/>
<function name='unicode_set_subst_char' from='PHP 6 >= 6.0.0'/>
+-->
</versions>
<!-- Keep this comment at the end of the file
Index: en/reference/network/ini.xml
===================================================================
--- en/reference/network/ini.xml (revision 297253)
+++ en/reference/network/ini.xml (working copy)
@@ -20,7 +20,7 @@
<entry><link linkend="ini.define-syslog-variables">define_syslog_variables</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Deprecated in PHP 5.3.0. Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
</tbody>
</tgroup>
Index: en/reference/info/ini.xml
===================================================================
--- en/reference/info/ini.xml (revision 297253)
+++ en/reference/info/ini.xml (working copy)
@@ -50,7 +50,7 @@
<entry><link linkend="ini.enable-dl">enable_dl</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.max-execution-time">max_execution_time</link></entry>
@@ -74,13 +74,13 @@
<entry><link linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_PERDIR</entry>
- <entry>PHP_INI_ALL in PHP <= 4.2.3. Removed in PHP 6.0.0.</entry>
+ <entry>PHP_INI_ALL in PHP <= 4.2.3. &removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.magic-quotes-runtime">magic_quotes_runtime</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.zend.enable-gc">zend.enable_gc</link></entry>
Index: en/reference/filesystem/functions/file-put-contents.xml
===================================================================
--- en/reference/filesystem/functions/file-put-contents.xml (revision 297253)
+++ en/reference/filesystem/functions/file-put-contents.xml (working copy)
@@ -107,6 +107,7 @@
writing. Mutually exclusive with FILE_APPEND.
</entry>
</row>
+ <!-- FIXME PHP_6
<row>
<entry>
<constant>FILE_TEXT</constant>
@@ -132,6 +133,7 @@
PHP 6.
</entry>
</row>
+ -->
</tbody>
</tgroup>
</table>
@@ -220,6 +222,8 @@
a stream resource to the <parameter>data</parameter> parameter
</entry>
</row>
+ <!--
+ FIXME PHP_6
<row>
<entry>6.0.0</entry>
<entry>
@@ -227,6 +231,7 @@
<constant>FILE_BINARY</constant> flags
</entry>
</row>
+ -->
</tbody>
</tgroup>
</informaltable>
Index: en/reference/filesystem/functions/file-get-contents.xml
===================================================================
--- en/reference/filesystem/functions/file-get-contents.xml (revision 297253)
+++ en/reference/filesystem/functions/file-get-contents.xml (working copy)
@@ -58,17 +58,16 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>flags</parameter></term>
+ <term><parameter>use_include_path</parameter></term>
<listitem>
<note>
<para>
- Prior to PHP 6, this parameter is called
- <parameter>use_include_path</parameter> and is a <type>bool</type>.
As of PHP 5 the <constant>FILE_USE_INCLUDE_PATH</constant> can be used
to trigger <link linkend="ini.include-path">include path</link>
search.
</para>
</note>
+ <!-- FIXME PHP_6
<para>
The value of <parameter>flags</parameter> can be any combination of
the following flags (with some restrictions), joined with the
@@ -121,6 +120,7 @@
</tgroup>
</table>
</para>
+ -->
</listitem>
</varlistentry>
<varlistentry>
@@ -244,6 +244,7 @@
</row>
</thead>
<tbody>
+ <!-- FIXME PHP_6
<row>
<entry>6.0.0</entry>
<entry>
@@ -251,6 +252,7 @@
the <parameter>flags</parameter> parameter.
</entry>
</row>
+ -->
<row>
<entry>5.1.0</entry>
<entry>
Index: en/reference/filesystem/constants.xml
===================================================================
--- en/reference/filesystem/constants.xml (revision 297253)
+++ en/reference/filesystem/constants.xml (working copy)
@@ -191,7 +191,8 @@
Binary mode (since PHP 5.2.7).
<note>
<para>
- This constant has no effect prior to PHP 6. It is only available for
+ <!-- FIXME PHP_6 -->
+ This constant has no effect, and is only available for
<literal>forward compatibility</literal>.
</para>
</note>
@@ -209,7 +210,8 @@
Text mode (since PHP 5.2.7).
<note>
<para>
- This constant has no effect prior to PHP 6. It is only available for
+ <!-- FIXME PHP_6 -->
+ This constant has no effect, and is only available for
<literal>forward compatibility</literal>.
</para>
</note>
Index: en/reference/image/setup.xml
===================================================================
--- en/reference/image/setup.xml (revision 297253)
+++ en/reference/image/setup.xml (working copy)
@@ -30,12 +30,14 @@
</simpara>
</note>
</para>
+ <!-- FIXME PHP_6 FIXME
<note>
<para>
Support for GD 1.x has been removed as of PHP 6.0.0, which requires GD
2.0.33 or later.
</para>
</note>
+ -->
<para>
You may wish to enhance <acronym>GD</acronym> to handle more image formats.
<table>
@@ -108,7 +110,7 @@
<row>
<entry><literal>FreeType 1.x</literal></entry>
<entry><link xlink:href="&url.freetype;">&url.freetype;</link></entry>
- <entry>Support removed as of PHP 6.0.0</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry><literal>FreeType 2</literal></entry>
Index: en/reference/sdo/limitations.xml
===================================================================
--- en/reference/sdo/limitations.xml (revision 297253)
+++ en/reference/sdo/limitations.xml (working copy)
@@ -12,8 +12,7 @@
<para>
There is no support for multi-byte character sets.
This will be considered, depending on community requirements,
- in the Unicode-enabled version of PHP.
- See <link linkend="ref.unicode">Unicode Functions</link>.
+ in a Unicode-enabled version of PHP.
</para>
</step>
</procedure>
Index: en/reference/stream/versions.xml
===================================================================
--- en/reference/stream/versions.xml (revision 297253)
+++ en/reference/stream/versions.xml (working copy)
@@ -17,7 +17,9 @@
<function name='stream_context_set_option' from='PHP 4 >= 4.3.0, PHP 5'/>
<function name='stream_context_set_params' from='PHP 4 >= 4.3.0, PHP 5'/>
<function name='stream_copy_to_stream' from='PHP 5'/>
+ <!-- FIXME PHP_6
<function name='stream_encoding' from='PHP 6'/>
+ -->
<function name='stream_filter_append' from='PHP 4 >= 4.3.0, PHP 5'/>
<function name='stream_filter_prepend' from='PHP 4 >= 4.3.0, PHP 5'/>
<function name='stream_filter_register' from='PHP 5'/>
@@ -31,7 +33,7 @@
<function name='stream_is_local' from='PHP 5 >= 5.2.4'/>
<function name='stream_notification_callback' from='PHP 5 >= 5.2.0'/>
<function name='stream_register_wrapper' from='PHP 4 >= 4.3.0, PHP 5'/>
- <function name='stream_resolve_include_path' from='PHP 5 >= 5.3.2, PHP 6'/>
+ <function name='stream_resolve_include_path' from='PHP 5 >= 5.3.2'/>
<function name='stream_select' from='PHP 4 >= 4.3.0, PHP 5'/>
<function name='stream_set_blocking' from='PHP 4 >= 4.3.0, PHP 5'/>
<function name='stream_set_timeout' from='PHP 4 >= 4.3.0, PHP 5'/>
Index: en/reference/zlib/versions.xml
===================================================================
--- en/reference/zlib/versions.xml (revision 297253)
+++ en/reference/zlib/versions.xml (working copy)
@@ -7,7 +7,9 @@
<function name='gzclose' from='PHP 4, PHP 5'/>
<function name='gzcompress' from='PHP 4 >= 4.0.1, PHP 5'/>
<function name='gzdeflate' from='PHP 4 >= 4.0.4, PHP 5'/>
+<!-- FIXME PHP_6
<function name='gzdecode' from='PHP 6 >= 6.0.0'/>
+-->
<function name='gzencode' from='PHP 4 >= 4.0.4, PHP 5'/>
<function name='gzeof' from='PHP 4, PHP 5'/>
<function name='gzfile' from='PHP 4, PHP 5'/>
Index: en/reference/errorfunc/functions/error-reporting.xml
===================================================================
--- en/reference/errorfunc/functions/error-reporting.xml (revision 297253)
+++ en/reference/errorfunc/functions/error-reporting.xml (working copy)
@@ -143,8 +143,11 @@
<tip>
<simpara>
Passing in the value <literal>-1</literal> will show every possible error,
- even when new levels and constants are added in future PHP versions. The
+ even when new levels and constants are added in future PHP versions.
+ <!-- FIXME PHP_6
+ The
<constant>E_ALL</constant> constant also behaves this way as of PHP 6.
+ -->
</simpara>
</tip>
</refsect1>
Index: en/reference/errorfunc/constants.xml
===================================================================
--- en/reference/errorfunc/constants.xml (revision 297253)
+++ en/reference/errorfunc/constants.xml (working copy)
@@ -237,10 +237,10 @@
</entry>
<entry>
All errors and warnings, as supported, except of level
- <constant>E_STRICT</constant> in PHP < 6.
+ <constant>E_STRICT</constant>.
</entry>
<entry>
- 32767 in PHP 6,
+ <!-- FIXME PHP_6 32767 in PHP 6, -->
30719 in PHP 5.3.x,
6143 in PHP 5.2.x,
2047 previously
Index: en/reference/var/versions.xml
===================================================================
--- en/reference/var/versions.xml (revision 297253)
+++ en/reference/var/versions.xml (working copy)
@@ -15,9 +15,12 @@
<function name='import_request_variables' from='PHP 4 >= 4.1.0, PHP 5'/>
<function name='intval' from='PHP 4, PHP 5'/>
<function name='is_array' from='PHP 4, PHP 5'/>
+ <function name='is_bool' from='PHP 4, PHP 5'/>
+ <!-- FIXME PHP_6
<function name='is_binary' from='PHP 6 >= 6.0.0'/>
- <function name='is_bool' from='PHP 4, PHP 5'/>
<function name='is_buffer' from='PHP 6 >= 6.0.0'/>
+ <function name='is_unicode' from='PHP 6 >= 6.0.0'/>
+ -->
<function name='is_callable' from='PHP 4 >= 4.0.6, PHP 5'/>
<function name='is_double' from='PHP 4, PHP 5'/>
<function name='is_float' from='PHP 4, PHP 5'/>
@@ -31,7 +34,6 @@
<function name='is_resource' from='PHP 4, PHP 5'/>
<function name='is_scalar' from='PHP 4 >= 4.0.5, PHP 5'/>
<function name='is_string' from='PHP 4, PHP 5'/>
- <function name='is_unicode' from='PHP 6 >= 6.0.0'/>
<function name='isset' from='PHP 4, PHP 5'/>
<function name='print_r' from='PHP 4, PHP 5'/>
<function name='serialize' from='PHP 4, PHP 5'/>
Index: en/reference/pdo_odbc/ini.xml
===================================================================
--- en/reference/pdo_odbc/ini.xml (revision 297253)
+++ en/reference/pdo_odbc/ini.xml (working copy)
@@ -26,7 +26,7 @@
<entry><link linkend="ini.pdo-odbc.db2-instance-name">pdo_odbc.db2_instance_name</link></entry>
<entry>NULL</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Available since PHP 5.1.1. Removed in PHP 6.0.0.</entry>
+ <entry>Available since PHP 5.1.1. &removed.php.future;</entry>
</row>
</tbody>
</tgroup>
Index: en/reference/array/functions/array-unique.xml
===================================================================
--- en/reference/array/functions/array-unique.xml (revision 297253)
+++ en/reference/array/functions/array-unique.xml (working copy)
@@ -71,9 +71,12 @@
<listitem>
<simpara><constant>SORT_LOCALE_STRING</constant> - compare items as
strings, based on the current locale. Added in PHP 4.4.0 and 5.0.2.
+ <!--
+ FIXME: PHP_6
Before PHP 6, it uses the system locale, which can be changed using
<function>setlocale</function>. Since PHP 6, you must use the
<function>i18n_loc_set_default</function> function.
+ -->
</simpara>
</listitem>
</itemizedlist>
Index: en/faq/using.xml
===================================================================
--- en/faq/using.xml (revision 297253)
+++ en/faq/using.xml (working copy)
@@ -160,10 +160,11 @@
]]>
</programlisting>
</para>
+ <!-- FIXME PHP_6 register_globals removal alert -->
<para>
The code above demonstrates how register_globals creates a lot of
variables. For years this type of coding has been frowned upon, and for
- years it's been disabled by default. Note that PHP 6 removes this
+ years it's been disabled by default. Note that PHP will eventually remove this
deprecated feature. So although most web hosts disable register_globals,
there are still outdated articles, tutorials, and books that require it
to be on. Plan accordingly.
Index: en/appendices/extensions.xml
===================================================================
--- en/appendices/extensions.xml (revision 297253)
+++ en/appendices/extensions.xml (working copy)
@@ -62,7 +62,6 @@
<listitem><simpara><xref linkend="book.http" /></simpara></listitem>
<listitem><simpara><xref linkend="book.hwapi" /></simpara></listitem>
<listitem><simpara><xref linkend="book.hw" /></simpara></listitem>
- <listitem><simpara><xref linkend="book.i18n" /></simpara></listitem>
<listitem><simpara><xref linkend="book.ibase" /></simpara></listitem>
<listitem><simpara><xref linkend="book.ibm-db2" /></simpara></listitem>
<listitem><simpara><xref linkend="book.iconv" /></simpara></listitem>
@@ -169,7 +168,6 @@
<listitem><simpara><xref linkend="book.tcpwrap" /></simpara></listitem>
<listitem><simpara><xref linkend="book.tidy" /></simpara></listitem>
<listitem><simpara><xref linkend="book.tokenizer" /></simpara></listitem>
- <listitem><simpara><xref linkend="book.unicode" /></simpara></listitem>
<listitem><simpara><xref linkend="book.uodbc" /></simpara></listitem>
<listitem><simpara><xref linkend="book.url" /></simpara></listitem>
<listitem><simpara><xref linkend="book.var" /></simpara></listitem>
@@ -208,7 +206,6 @@
<listitem><para><xref linkend="book.exec"/></para></listitem>
<listitem><para><xref linkend="book.filesystem"/></para></listitem>
<listitem><para><xref linkend="book.funchand"/></para></listitem>
- <listitem><para><xref linkend="book.i18n"/></para></listitem>
<listitem><para><xref linkend="book.info"/></para></listitem>
<listitem><para><xref linkend="book.mail"/></para></listitem>
<listitem><para><xref linkend="book.math"/></para></listitem>
@@ -220,7 +217,6 @@
<listitem><para><xref linkend="book.stream"/></para></listitem>
<listitem><para><xref linkend="book.strings"/></para></listitem>
<listitem><para><xref linkend="book.tokenizer"/></para></listitem>
- <listitem><para><xref linkend="book.unicode"/></para></listitem>
<listitem><para><xref linkend="book.url"/></para></listitem>
<listitem><para><xref linkend="book.var"/></para></listitem>
</itemizedlist>
@@ -333,7 +329,6 @@
<listitem><para><xref linkend="book.haru"/></para></listitem>
<listitem><para><xref linkend="book.hw"/></para></listitem>
<listitem><para><xref linkend="book.hwapi"/></para></listitem>
- <listitem><para><xref linkend="book.i18n"/></para></listitem>
<listitem><para><xref linkend="book.ibase"/></para></listitem>
<listitem><para><xref linkend="book.ibm-db2"/></para></listitem>
<listitem><para><xref linkend="book.ifx"/></para></listitem>
@@ -389,7 +384,6 @@
<listitem><para><xref linkend="book.swish"/></para></listitem>
<listitem><para><xref linkend="book.sybase"/></para></listitem>
<listitem><para><xref linkend="book.tidy"/></para></listitem>
- <listitem><para><xref linkend="book.unicode"/></para></listitem>
<listitem><para><xref linkend="book.uodbc"/></para></listitem>
<listitem><para><xref linkend="book.vpopmail"/></para></listitem>
<listitem><para><xref linkend="book.wddx"/></para></listitem>
Index: en/appendices/wrappers.xml
===================================================================
--- en/appendices/wrappers.xml (revision 297253)
+++ en/appendices/wrappers.xml (working copy)
@@ -102,9 +102,10 @@
</para>
</section>
+ <!-- FIXME PHP_6 Mentioned PHP 6, but let's explore not hard coding PHP versions like this -->
<section xml:id="wrappers.http">
<title>HTTP and HTTPS</title>
- <simpara>PHP 4, PHP 5, PHP 6. <filename>https://</filename> since PHP 4.3.0</simpara>
+ <simpara>PHP 4, PHP 5. <filename>https://</filename> since PHP 4.3.0</simpara>
<itemizedlist>
<listitem><simpara><filename>http://example.com</filename></simpara></listitem>
@@ -269,9 +270,10 @@
</para>
</section>
+ <!-- FIXME PHP_6 Mentioned PHP 6, but let's explore not hard coding PHP versions like this -->
<section xml:id="wrappers.ftp">
<title>FTP and FTPS</title>
- <simpara>PHP 4, PHP 5, PHP 6. <filename>ftps://</filename> since PHP 4.3.0</simpara>
+ <simpara>PHP 4, PHP 5. <filename>ftps://</filename> since PHP 4.3.0</simpara>
<itemizedlist>
<listitem><simpara><filename>ftp://example.com/pub/file.txt</filename></simpara></listitem>
Index: en/appendices/about.xml
===================================================================
--- en/appendices/about.xml (revision 297253)
+++ en/appendices/about.xml (working copy)
@@ -260,11 +260,12 @@
<sect1 xml:id="about.phpversions">
<title>PHP versions documented in this manual</title>
<para>
+ <!-- FIXME PHP_6 What is the latest? -->
The manual contains information about past, current, and future versions
of PHP. Changes in behaviour are documented as notes, changelogs, and
inline text within the manual pages.
The earliest documented version is PHP 4.1.0,
- whereas the latest is PHP 6.x.x.
+ whereas the latest is PHP 5.x.x.
</para>
<para>
Documentation partly exists for the SVN version of PHP, which
Index: en/appendices/ini.xml
===================================================================
--- en/appendices/ini.xml (revision 297253)
+++ en/appendices/ini.xml (working copy)
@@ -27,13 +27,13 @@
<entry><link linkend="ini.allow-call-time-pass-reference">allow_call_time_pass_reference</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_PERDIR</entry>
- <entry>PHP_INI_ALL in PHP 4.0.0. Removed in PHP 6.0.0.</entry>
+ <entry>PHP_INI_ALL in PHP 4.0.0. &removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.allow-url-fopen">allow_url_fopen</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>PHP_INI_ALL in PHP <= 4.3.4. PHP_INI_SYSTEM in PHP < 6. Available since PHP 4.0.4.</entry>
+ <entry>PHP_INI_ALL in PHP <= 4.3.4. &removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.allow-url-include">allow_url_include</link></entry>
@@ -609,13 +609,13 @@
<entry><link linkend="ini.define-syslog-variables">define_syslog_variables</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.detect-unicode">detect_unicode</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Available since PHP 5.1.0. Removed in PHP 6.0.0.</entry>
+ <entry>Available since PHP 5.1.0. &removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.disable-classes">disable_classes</link></entry>
@@ -663,7 +663,7 @@
<entry><link linkend="ini.enable-dl">enable_dl</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.engine">engine</link></entry>
@@ -951,7 +951,7 @@
<entry><link linkend="ini.syntax-highlighting">highlight.bg</link></entry>
<entry>"#FFFFFF"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.syntax-highlighting">highlight.comment</link></entry>
@@ -1569,19 +1569,19 @@
<entry><link linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_PERDIR</entry>
- <entry>PHP_INI_ALL in PHP <= 4.2.3. Deprecated in PHP 5.3.0. Removed in PHP 6.0.0.</entry>
+ <entry>PHP_INI_ALL in PHP <= 4.2.3. Deprecated in PHP 5.3.0. &removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.magic-quotes-runtime">magic_quotes_runtime</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.magic-quotes-sybase">magic_quotes_sybase</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.mail.add-x-header">mail.add_x_header</link></entry>
@@ -1890,24 +1890,28 @@
<entry>PHP_INI_ALL</entry>
<entry>Available since PHP 4.1.0.</entry>
</row>
+ <!-- FIXME PHP_6
<row>
<entry>mysql.allow_local_infile</entry>
<entry>"1"</entry>
<entry>PHP_INI_SYSTEM</entry>
<entry>Available since PHP 6.0.0.</entry>
</row>
+ -->
<row>
<entry><link linkend="ini.mysql.allow-persistent">mysql.allow_persistent</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_SYSTEM</entry>
<entry></entry>
</row>
+ <!-- FIXME PHP_6
<row>
<entry>mysql.cache_size</entry>
<entry>"2000"</entry>
<entry>PHP_INI_SYSTEM</entry>
<entry>Available since PHP 6.0.0.</entry>
</row>
+ -->
<row>
<entry><link linkend="ini.mysql.connect-timeout">mysql.connect_timeout</link></entry>
<entry>"60"</entry>
@@ -1962,6 +1966,7 @@
<entry>PHP_INI_ALL</entry>
<entry>Available since PHP 4.3.0.</entry>
</row>
+ <!-- FIXME PHP_6
<row>
<entry>mysqli.allow_local_infile</entry>
<entry>"1"</entry>
@@ -1974,6 +1979,7 @@
<entry>PHP_INI_SYSTEM</entry>
<entry>Available since PHP 6.0.0.</entry>
</row>
+ -->
<row>
<entry><link linkend="ini.mysqli.default-host">mysqli.default_host</link></entry>
<entry>NULL</entry>
@@ -2016,12 +2022,14 @@
<entry>PHP_INI_SYSTEM</entry>
<entry>Available since PHP 5.0.0.</entry>
</row>
+ <!-- FIXME PHP_6
<row>
<entry>mysqlnd.collect_statistics</entry>
<entry>"1"</entry>
<entry>PHP_INI_SYSTEM</entry>
<entry>Available since PHP 6.0.0.</entry>
</row>
+ -->
<row>
<entry>namazu.debugmode</entry>
<entry>"0"</entry>
@@ -2266,7 +2274,7 @@
<entry><link linkend="ini.pdo-odbc.db2-instance-name">pdo_odbc.db2_instance_name</link></entry>
<entry>NULL</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Available since PHP 5.1.1. Removed in PHP 6.0.0.</entry>
+ <entry>Available since PHP 5.1.1. &removed.php.future;</entry>
</row>
<row>
<entry>pfpro.defaulthost</entry>
@@ -2416,13 +2424,13 @@
<entry><link linkend="ini.register-globals">register_globals</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_PERDIR</entry>
- <entry>PHP_INI_ALL in PHP <= 4.2.3. Deprecated in 5.3.0. Removed in PHP 6.0.0.</entry>
+ <entry>PHP_INI_ALL in PHP <= 4.2.3. &removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.register-long-arrays">register_long_arrays</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_PERDIR</entry>
- <entry>Available since PHP 5.0.0. Deprecated in PHP 5.3.0. Removed in PHP 6.0.0.</entry>
+ <entry>Available since PHP 5.0.0. Deprecated in PHP 5.3.0. &removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.report-memleaks">report_memleaks</link></entry>
@@ -2458,37 +2466,37 @@
<entry><link linkend="ini.safe-mode">safe_mode</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Deprecated in PHP 5.3.0. Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.safe-mode-allowed-env-vars">safe_mode_allowed_env_vars</link></entry>
<entry>"PHP_"</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.safe-mode-exec-dir">safe_mode_exec_dir</link></entry>
<entry>""</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.safe-mode-gid">safe_mode_gid</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Available since PHP 4.1.0. Removed in PHP 6.0.0.</entry>
+ <entry>Available since PHP 4.1.0. &removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.safe-mode-include-dir">safe_mode_include_dir</link></entry>
<entry>NULL</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Available since PHP 4.1.0. Removed in PHP 6.0.0.</entry>
+ <entry>Available since PHP 4.1.0. &removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.safe-mode-protected-env-vars">safe_mode_protected_env_vars</link></entry>
<entry>"LD_LIBRARY_PATH"</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.sendmail-from">sendmail_from</link></entry>
@@ -2518,13 +2526,13 @@
<entry><link linkend="ini.session.bug-compat-42">session.bug_compat_42</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Available since PHP 4.3.0. Removed in PHP 6.0.0.</entry>
+ <entry>Available since PHP 4.3.0. &removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.session.bug-compat-warn">session.bug_compat_warn</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Available since PHP 4.3.0. Removed in PHP 6.0.0.</entry>
+ <entry>Available since PHP 4.3.0. &removed.php.future;</entry>
</row>
<row>
<entry><link linkend="ini.session.cache-expire">session.cache_expire</link></entry>
@@ -2832,12 +2840,14 @@
<entry>PHP_INI_ALL</entry>
<entry>Available since PHP 5.0.0.</entry>
</row>
+ <!-- FIXME PHP_6
<row>
<entry>sqlite.iso8859.locale</entry>
<entry>"1"</entry>
<entry>PHP_INI_ALL</entry>
<entry>Available since PHP 6.0.0.</entry>
</row>
+ -->
<row>
<entry><link linkend="ini.sybase.allow-persistent">sybase.allow_persistent</link></entry>
<entry>"1"</entry>
@@ -2994,6 +3004,7 @@
<entry>PHP_INI_ALL</entry>
<entry>Removed in PHP 4.0.3.</entry>
</row>
+ <!-- FIXME PHP_6
<row>
<entry>unicode.fallback_encoding</entry>
<entry>NULL</entry>
@@ -3036,6 +3047,7 @@
<entry>PHP_INI_ALL</entry>
<entry>Available since PHP 6.0.0.</entry>
</row>
+ -->
<row>
<entry>unserialize_callback_func</entry>
<entry>NULL</entry>
@@ -3762,7 +3774,7 @@
<entry>detect_unicode</entry>
<entry>"1"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Available since PHP 5.1.0. Removed in PHP 6.0.0.</entry>
+ <entry>Available since PHP 5.1.0. &removed.php.future;</entry>
</row>
</tbody>
</tgroup>
@@ -4165,8 +4177,7 @@
<entry>register_long_arrays</entry>
<entry>"1"</entry>
<entry>PHP_INI_PERDIR</entry>
- <entry>Available since PHP 5.0.0. Deprecated in PHP 5.3.0. Removed in
- PHP 6.0.0.</entry>
+ <entry>Available since PHP 5.0.0. Deprecated in PHP 5.3.0. &removed.php.future;</entry>
</row>
<row>
<entry>post_max_size</entry>
@@ -4297,7 +4308,7 @@
<para>
If the deprecated
<link linkend="ini.register-globals">register_globals</link>
- directive is on (removed as of PHP 6.0.0), then variables_order also
+ directive is on, then variables_order also
configures the order the <literal>ENV</literal>,
<literal>GET</literal>, <literal>POST</literal>,
<literal>COOKIE</literal> and <literal>SERVER</literal> variables
Index: en/appendices/transports.xml
===================================================================
--- en/appendices/transports.xml (revision 297253)
+++ en/appendices/transports.xml (working copy)
@@ -16,10 +16,11 @@
PHP use <function>stream_get_transports</function>.
</para>
+ <!-- FIXME PHP_6 Mentioned PHP 6, but let's explore not hard coding PHP versions like this -->
<section xml:id="transports.inet">
<title>Internet Domain: TCP, UDP, SSL, and TLS</title>
<simpara>
- PHP 4, PHP 5, PHP 6.
+ PHP 4, PHP 5.
<literal>ssl://</literal> & <literal>tls://</literal> since PHP 4.3.0
<literal>sslv2://</literal> & <literal>sslv3://</literal> since PHP 5.0.2
</simpara>
Index: en/language-snippets.ent
===================================================================
--- en/language-snippets.ent (revision 297253)
+++ en/language-snippets.ent (working copy)
@@ -155,6 +155,8 @@
<emphasis>DEPRECATED</emphasis> as of PHP 5.3.0. Relying on this feature is
highly discouraged.</simpara></warning>'>
+<!ENTITY removed.php.future 'This deprecated feature <emphasis>will</emphasis> certainly be <emphasis>removed</emphasis> in the future.'>
+
<!ENTITY warn.deprecated.function.removed-5-3-0 '<warning
xmlns="http://docbook.org/ns/docbook"><simpara>This function has been
<emphasis>DEPRECATED</emphasis> and <emphasis>REMOVED</emphasis> as of PHP 5.3.0.</simpara></warning>'>
Index: en/features/safe-mode.xml
===================================================================
--- en/features/safe-mode.xml (revision 297253)
+++ en/features/safe-mode.xml (working copy)
@@ -10,11 +10,8 @@
server and OS levels aren't very realistic, many people,
especially ISP's, use safe mode for now.
</para>
- <warning>
- <para>
- Safe Mode is deprecated in PHP 5.3.0 and is removed in PHP 6.0.0.
- </para>
- </warning>
+
+ &warn.deprecated.feature-5-3-0.removed-6-0-0;
<sect1 xml:id="ini.sect.safe-mode">
<title>Security and Safe Mode</title>
@@ -35,37 +32,37 @@
<entry>safe_mode</entry>
<entry>"0"</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry>safe_mode_gid</entry>
<entry>"0"</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Available since PHP 4.1.0. Removed in PHP 6.0.0.</entry>
+ <entry>Available since PHP 4.1.0. &removed.php.future;</entry>
</row>
<row>
<entry>safe_mode_include_dir</entry>
<entry>NULL</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Available since PHP 4.1.0. Removed in PHP 6.0.0.</entry>
+ <entry>Available since PHP 4.1.0. &removed.php.future;</entry>
</row>
<row>
<entry>safe_mode_exec_dir</entry>
<entry>""</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry>safe_mode_allowed_env_vars</entry>
<entry>"PHP_"</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
<row>
<entry>safe_mode_protected_env_vars</entry>
<entry>"LD_LIBRARY_PATH"</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Removed in PHP 6.0.0.</entry>
+ <entry>&removed.php.future;</entry>
</row>
</tbody>
</tgroup>
Index: doc-base/manual.xml.in
===================================================================
--- doc-base/manual.xml.in (revision 297253)
+++ doc-base/manual.xml.in (working copy)
@@ -262,7 +262,6 @@
&reference.enchant.book;
&reference.fribidi.book;
&reference.gettext.book;
- &reference.i18n.book;
&reference.iconv.book;
<!--
This conflicts with intl/idn which is bundled with PHP5.3
@@ -272,7 +271,10 @@
&reference.mbstring.book;
&reference.pspell.book;
&reference.recode.book;
+ <!-- FIXME PHP_6
+ &reference.i18n.book;
&reference.unicode.book;
+ -->
</set>
<set xml:id="refs.utilspec.image">
|
Copyright © 2001-2024 The PHP Group