Contributions are ready for review

Hello PHP EN Documentation team, There are contributions within the online editor queue for this language. Please review, then commit or delete these patches. Patches for review : ----------------------- Modified: en/reference/strings/functions/htmlentities.xml By: Hans Henrik Bergan on 2015-10-26 02:52:36 =================================================================== --- en/reference/strings/functions/htmlentities.xml +++ en/reference/strings/functions/htmlentities.xml @@ -151,7 +151,7 @@ If the input <parameter>string</parameter> contains an invalid code unit sequence within the given <parameter>encoding</parameter> an empty string will be returned, unless either the <constant>ENT_IGNORE</constant> or - <constant>ENT_SUBSTITUTE</constant> flags are set. + <constant>ENT_SUBSTITUTE</constant> or <constant>ENT_DISALLOWED</constant> flags are set. </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65273 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65273 ------------------------------------------------------------------ Modified: en/reference/array/functions/array-filter.xml By: Jesse Donat on 2016-04-04 10:13:45 =================================================================== --- en/reference/array/functions/array-filter.xml +++ en/reference/array/functions/array-filter.xml @@ -240,6 +240,12 @@ added, deleted or unset) the behavior of this function is undefined. </para> </caution> + + <caution> + <para> + As of PHP7 the value of the callback may no longer be used by reference. + </para> + </caution> </refsect1> <refsect1 role="seealso"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66717 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66717 ------------------------------------------------------------------ Modified: en/reference/apcu/apcuiterator/gettotalhits.xml By: Walt Sorensen on 2016-10-10 08:53:27 =================================================================== --- en/reference/apcu/apcuiterator/gettotalhits.xml +++ en/reference/apcu/apcuiterator/gettotalhits.xml @@ -38,7 +38,7 @@ <simplelist> <member><methodname>APCUIterator::getTotalCount</methodname></member> <member><methodname>APCUIterator::getTotalSize</methodname></member> - <member><function>apc_cache_info</function></member> + <member><function>apcu_cache_info</function></member> </simplelist> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=69090 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=69090 ------------------------------------------------------------------ Modified: en/reference/apcu/apcuiterator/gettotalcount.xml By: Walt Sorensen on 2016-10-10 08:54:02 =================================================================== --- en/reference/apcu/apcuiterator/gettotalcount.xml +++ en/reference/apcu/apcuiterator/gettotalcount.xml @@ -38,7 +38,7 @@ <simplelist> <member><methodname>APCUIterator::getTotalHits</methodname></member> <member><methodname>APCUIterator::getTotalSize</methodname></member> - <member><function>apc_cache_info</function></member> + <member><function>apcu_cache_info</function></member> </simplelist> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=69091 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=69091 ------------------------------------------------------------------ Modified: en/reference/apcu/constants.xml By: Walt Sorensen on 2016-10-10 09:14:09 =================================================================== --- en/reference/apcu/constants.xml +++ en/reference/apcu/constants.xml @@ -5,6 +5,21 @@ &reftitle.constants; &extension.constants; + <title>The APCu Constants</title> + <titleabbrev>APCu Constants</titleabbrev> + + <partintro> + +<!-- {{{ APCu Constants intro --> + <section xml:id="apcu.constants.intro"> + &reftitle.intro; + <para> + The APCu Constants below are the same as defined in the APC extension, and will only be available when the extension has either been compiled into PHP or dynamically loaded at runtime. + </para> + </section> +<!-- }}} --> + </partintro> + <para> <variablelist> <varlistentry xml:id="constant.apcu-iter-all"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=69094 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=69094 ------------------------------------------------------------------ Modified: en/install/windows/manual.xml By: Walt Sorensen on 2016-10-10 14:17:12 =================================================================== --- en/install/windows/manual.xml +++ en/install/windows/manual.xml @@ -6,8 +6,8 @@ <title>Choose Web Server</title> <para> <itemizedlist spacing="compact"> - <listitem> - <para> + <listitem> + <para> IIS is builtin to Windows. On Windows Server, use Server Manager to add the IIS role. Be sure to include the CGI Role Feature. @@ -78,17 +78,17 @@ There are 4 types of PHP builds: <itemizedlist spacing="compact"> <listitem> - <para>Thread-Safe(TS) - use for single process web serves, like Apache with mod_php</para> + <para>Thread-Safe(TS) - use for single process web serves, like Apache with mod_php</para> </listitem> <listitem> - <para>Non-Thread-Safe(NTS) - use for IIS and other FastCGI web servers (Apache with mod_fastcgi) and recommended for command-line scripts</para> + <para>Non-Thread-Safe(NTS) - use for IIS and other FastCGI web servers (Apache with mod_fastcgi) and recommended for command-line scripts</para> </listitem> <listitem> - <para>x86 - production use of PHP 5.5 or 5.6 or 7.0.</para> + <para>x86 - production use of PHP 5.5 or 5.6 or 7.0.</para> </listitem> <listitem> - <para>x64 - production use of PHP 7.0+ unless its a 32-bit only version of Windows. 5.5 and 5.6 x64 are expiremental.</para> - </listitem> + <para>x64 - production use of PHP 7.0+ unless its a 32-bit only version of Windows. 5.5 and 5.6 x64 are expiremental.</para> + </listitem> </itemizedlist> </para> </sect2> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=69107 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=69107 ------------------------------------------------------------------ Modified: en/reference/gearman/gearmanclient/setcompletecallback.xml By: Michael Moussa on 2016-10-15 10:06:36 =================================================================== --- en/reference/gearman/gearmanclient/setcompletecallback.xml +++ en/reference/gearman/gearmanclient/setcompletecallback.xml @@ -14,9 +14,14 @@ <methodparam><type>callable</type><parameter>callback</parameter></methodparam> </methodsynopsis> <para> - Use to set a function to be called when a task is completed. The callback function should - accept a single argument, a <classname>GearmanTask</classname> object. + Use to set a function to be called when a <classname>GearmanTask</classname> is completed, or + when <methodname>GearmanJob::sendComplete</methodname> is invoked by a worker (whichever happens + first). </para> + <para> + This callback executes only when executing a <classname>GearmanTask</classname> using + <methodname>GearmanClient::runTasks</methodname>. It is not used for individual jobs. + </para> </refsect1> <refsect1 role="parameters"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=69463 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=69463 ------------------------------------------------------------------ Modified: en/reference/spl/recursivearrayiterator.xml By: John Flatness on 2016-10-24 18:10:15 =================================================================== --- en/reference/spl/recursivearrayiterator.xml +++ en/reference/spl/recursivearrayiterator.xml @@ -40,6 +40,13 @@ </oointerface> </classsynopsisinfo> + <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo> + <fieldsynopsis> + <modifier>const</modifier> + <type>integer</type> + <varname linkend="recursivearrayiterator.constants.child-arrays-only">CHILD_ARRAYS_ONLY</varname> + <initializer>4</initializer> + </fieldsynopsis> <!-- }}} --> <!-- {{{ If the property is documented below (xml:id=recursivearrayiterator.props) use this @@ -59,6 +66,45 @@ </section> + <section xml:id="recursivearrayiterator.constants"> + &reftitle.constants; + <section xml:id="recursivearrayiterator.constants.flags"> + <title>RecursiveArrayIterator Flags</title> + <variablelist> + <varlistentry xml:id="recursivearrayiterator.constants.child-arrays-only"> + <term><constant>RecursiveArrayIterator::CHILD_ARRAYS_ONLY</constant></term> + <listitem> + <para>Treat only arrays (not objects) as having children for recursive iteration.</para> + </listitem> + </varlistentry> + </variablelist> + </section> + </section> + + <section role="changelog"> + &reftitle.changelog; + <para> + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>5.3.0</entry> + <entry> + <constant>CHILD_ARRAYS_ONLY</constant> flag was added. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </para> + </section> + <!-- {{{ RecursiveArrayIterator properties <section xml:id="recursivearrayiterator.props"> &reftitle.properties; => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=69697 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=69697 ------------------------------------------------------------------ Modified: en/reference/classobj/functions/get-class.xml By: Amo Chohan on 2016-10-25 10:14:46 =================================================================== --- en/reference/classobj/functions/get-class.xml +++ en/reference/classobj/functions/get-class.xml @@ -41,6 +41,10 @@ If <parameter>object</parameter> is omitted when inside a class, the name of that class is returned. </para> + <para> + If the <parameter>object</parameter> is an instance of a class which exists + in a namespace, the qualified namespaced name of that class is returned. + </para> </refsect1> <refsect1 role="errors"> &reftitle.errors; @@ -140,6 +144,34 @@ ]]> </screen> </example> + <example> + <title>Using <function>get_class</function> with namespaced classes</title> + <programlisting role="php"> +<![CDATA[ +<?php + +namespace FooBar; + +class Baz { + public function __construct() + { + + } +} + +$baz = new FooBarBaz; + +var_dump(get_class($baz)); +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +string(11) "FooBarBaz" +]]> + </screen> + </example> </para> </refsect1> <refsect1 role="seealso"> @@ -174,4 +206,4 @@ vim600: syn=xml fen fdm=syntax fdl=2 si vim: et tw=78 syn=sgml vi: ts=1 sw=1 ---> +--> No newline at end of file => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=69710 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=69710 ------------------------------------------------------------------ Modified: en/reference/opcache/ini.xml By: Arnout Boks on 2016-11-09 23:22:04 =================================================================== --- en/reference/opcache/ini.xml +++ en/reference/opcache/ini.xml @@ -524,7 +524,7 @@ <para> If <link linkend="ini.opcache.log-verbosity-level">opcache.log_verbosity_level</link> - is set to 3 or above, an error will be recorded in the error log when + is set to 2 or above, a warning will be recorded in the error log when this occurs. </para> </listitem> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=69887 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=69887 ------------------------------------------------------------------ Modified: en/language/types/type-juggling.xml By: Pedro Magalhães on 2016-11-10 10:43:59 =================================================================== --- en/language/types/type-juggling.xml +++ en/language/types/type-juggling.xml @@ -150,10 +150,6 @@ </itemizedlist> <para> - (binary) casting and b prefix forward support was added in PHP 5.2.1 - </para> - - <para> Note that tabs and spaces are allowed inside the parentheses, so the following are functionally equivalent: </para> @@ -167,20 +163,6 @@ ?> ]]> </programlisting> - - <para> - Casting literal <type>string</type>s and variables to binary - <type>string</type>s: - </para> - - <programlisting role="php"> -<![CDATA[ -<?php -$binary = (binary) $string; -$binary = b"binary string"; -?> -]]> - </programlisting> </informalexample> <note> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=69890 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=69890 ------------------------------------------------------------------ Modified: en/reference/strings/functions/sha1.xml By: Joel Hutchinson on 2016-11-17 08:12:07 =================================================================== --- en/reference/strings/functions/sha1.xml +++ en/reference/strings/functions/sha1.xml @@ -6,6 +6,15 @@ <refpurpose>Calculate the sha1 hash of a string</refpurpose> </refnamediv> + <refsynopsisdiv> + <warning> + &note.passwordhashing; + <simplelist role="alternatives"> + <member><function>password_hash</function></member> + </simplelist> + </warning> + </refsynopsisdiv> + <refsect1 role="description"> &reftitle.description; <methodsynopsis> @@ -72,11 +81,6 @@ </example> </para> </refsect1> - - <refsect1 role="notes"> - &reftitle.notes; - &note.passwordhashing; - </refsect1> <refsect1 role="seealso"> &reftitle.seealso; => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=70048 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=70048 ------------------------------------------------------------------ Modified: en/reference/strings/functions/md5.xml By: Joel Hutchinson on 2016-11-17 08:12:18 =================================================================== --- en/reference/strings/functions/md5.xml +++ en/reference/strings/functions/md5.xml @@ -6,6 +6,15 @@ <refpurpose>Calculate the md5 hash of a string</refpurpose> </refnamediv> + <refsynopsisdiv> + <warning> + &note.passwordhashing; + <simplelist role="alternatives"> + <member><function>password_hash</function></member> + </simplelist> + </warning> + </refsynopsisdiv> + <refsect1 role="description"> &reftitle.description; <methodsynopsis> @@ -72,11 +81,6 @@ </example> </para> </refsect1> - - <refsect1 role="notes"> - &reftitle.notes; - &note.passwordhashing; - </refsect1> <refsect1 role="seealso"> &reftitle.seealso; => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=70045 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=70045 ------------------------------------------------------------------ Modified: en/reference/mongodb/security.xml By: anonymous on 2016-11-23 11:58:49 =================================================================== --- en/reference/mongodb/security.xml +++ en/reference/mongodb/security.xml @@ -35,7 +35,7 @@ </para> <para> - Note that this type of attack can be used with any databases interation that + Note that this type of attack can be used with any database interaction that locates a document, including updates, upserts, deletes, and findAndModify commands. </para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=70243 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=70243 ------------------------------------------------------------------ Modified: en/install/fpm/configuration.xml By: Adrien Crivelli on 2016-11-30 00:50:31 =================================================================== --- en/install/fpm/configuration.xml +++ en/install/fpm/configuration.xml @@ -425,6 +425,20 @@ </para> </listitem> </varlistentry> + <varlistentry xml:id="pm.process-idle-timeout"> + <term> + <parameter>pm.process_idle_timeout</parameter> + <type>mixed</type> + </term> + <listitem> + <para> + The number of seconds after which an idle process will be killed. + Used only when <literal>pm</literal> is set to <literal>ondemand</literal>. + Available units: s(econds)(default), m(inutes), h(ours), or d(ays). + Default value: 10s. + </para> + </listitem> + </varlistentry> <varlistentry xml:id="pm.max-requests"> <term> <parameter>pm.max_requests</parameter> @@ -609,6 +623,30 @@ </para> </listitem> </varlistentry> + <varlistentry xml:id="access-log"> + <term> + <parameter>access.log</parameter> + <type>string</type> + </term> + <listitem> + <para> + The access log file. + Default value: not set + </para> + </listitem> + </varlistentry> + <varlistentry xml:id="access-format"> + <term> + <parameter>access.format</parameter> + <type>string</type> + </term> + <listitem> + <para> + The access log format. + Default value: "%R - %u %t "%m %r" %s" + </para> + </listitem> + </varlistentry> </variablelist> <para> It's possible to pass additional environment variables and update PHP settings of a certain pool. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=70593 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=70593 ------------------------------------------------------------------ Modified: en/reference/strings/functions/sprintf.xml By: Jos Ahrens on 2016-12-01 09:32:00 =================================================================== --- en/reference/strings/functions/sprintf.xml +++ en/reference/strings/functions/sprintf.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 341282 $ --> +<!-- $Revision: 339444 $ --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.sprintf"> <refnamediv> <refname>sprintf</refname> @@ -45,7 +45,7 @@ An optional <emphasis>sign specifier</emphasis> that forces a sign (- or +) to be used on a number. By default, only the - sign is used on a number if it's negative. This specifier forces positive numbers - to have the + sign attached as well. + to have the + sign attached as well, and was added in PHP 4.3.0. </simpara> </listitem> <listitem> @@ -126,7 +126,7 @@ <member> <literal>F</literal> - the argument is treated as a float, and presented as a floating-point number (non-locale aware). - Available since PHP 5.0.3. + Available since PHP 4.3.10 and PHP 5.0.3. </member> <member> <literal>g</literal> - shorter of <literal>%e</literal> and @@ -350,6 +350,8 @@ <para> Returns a string produced according to the formatting string <parameter>format</parameter>. + + Returns FALSE if a warning was triggered. </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=70657 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=70657 ------------------------------------------------------------------ Modified: en/reference/openssl/functions/openssl-encrypt.xml By: Jiří Pudil on 2016-12-06 07:22:51 =================================================================== --- en/reference/openssl/functions/openssl-encrypt.xml +++ en/reference/openssl/functions/openssl-encrypt.xml @@ -16,6 +16,9 @@ <methodparam><type>string</type><parameter>password</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam> <methodparam choice="opt"><type>string</type><parameter>iv</parameter><initializer>""</initializer></methodparam> + <methodparam choice="opt"><type>string</type><parameter role="reference">tag</parameter><initializer>NULL</initializer></methodparam> + <methodparam choice="opt"><type>string</type><parameter>aad</parameter><initializer>""</initializer></methodparam> + <methodparam choice="opt"><type>int</type><parameter>tag_length</parameter><initializer>16</initializer></methodparam> </methodsynopsis> <para> Encrypts given data with given method and key, returns a raw @@ -69,6 +72,30 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><parameter>tag</parameter></term> + <listitem> + <para> + The authentication tag passed by reference when using AEAD cipher mode (GCM or CCM). + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>aad</parameter></term> + <listitem> + <para> + Additional authentication data. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>tag_length</parameter></term> + <listitem> + <para> + The length of the authentication <parameter>tag</parameter>. Its value can be between 4 and 16 for GCM mode. + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -115,6 +142,10 @@ The <parameter>raw_output</parameter> was changed to <parameter>options</parameter>. </entry> </row> + <row> + <entry>7.1.0</entry> + <entry>The <parameter>tag</parameter>, <parameter>aad</parameter> and <parameter>tag_length</parameter> parameters were added.</entry> + </row> </tbody> </tgroup> </informaltable> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=70832 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=70832 ------------------------------------------------------------------ Modified: en/reference/openssl/functions/openssl-decrypt.xml By: Jiří Pudil on 2016-12-06 07:23:22 =================================================================== --- en/reference/openssl/functions/openssl-decrypt.xml +++ en/reference/openssl/functions/openssl-decrypt.xml @@ -16,6 +16,8 @@ <methodparam><type>string</type><parameter>password</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam> <methodparam choice="opt"><type>string</type><parameter>iv</parameter><initializer>""</initializer></methodparam> + <methodparam choice="opt"><type>string</type><parameter>tag</parameter><initializer>""</initializer></methodparam> + <methodparam choice="opt"><type>string</type><parameter>aad</parameter><initializer>""</initializer></methodparam> </methodsynopsis> <para> Takes a raw or base64 encoded string and decrypts it using a given method and key. @@ -71,6 +73,22 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><parameter>tag</parameter></term> + <listitem> + <para> + The authentication tag in AEAD cipher mode. If it is incorrect, the authentication fails and the function returns &false;. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>aad</parameter></term> + <listitem> + <para> + Additional authentication data. + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -117,6 +135,10 @@ The <parameter>raw_output</parameter> was changed to <parameter>options</parameter>. </entry> </row> + <row> + <entry>7.1.0</entry> + <entry>The <parameter>tag</parameter> and <parameter>aad</parameter> parameters were added.</entry> + </row> </tbody> </tgroup> </informaltable> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=70838 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=70838 ------------------------------------------------------------------ Modified: en/reference/array/functions/array-search.xml By: anonymous on 2016-12-09 05:03:57 =================================================================== --- en/reference/array/functions/array-search.xml +++ en/reference/array/functions/array-search.xml @@ -50,8 +50,8 @@ If the third parameter <parameter>strict</parameter> is set to &true; then the <function>array_search</function> function will search for <emphasis>identical</emphasis> elements in the - <parameter>haystack</parameter>. This means it will also check the - <link linkend="language.types">types</link> of the + <parameter>haystack</parameter>. This means it will also perform a + <link linkend="language.types">strict type comparison</link> of the <parameter>needle</parameter> in the <parameter>haystack</parameter>, and objects must be the same instance. </para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=70939 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=70939 ------------------------------------------------------------------ -- https://edit.php.net/ This email is send automatically by the Php Docbook Online Editor.