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/imagick/imagick/colorizeimage.xml By: rjhdby on 2016-06-01 10:03:58 =================================================================== --- en/reference/imagick/imagick/colorizeimage.xml +++ en/reference/imagick/imagick/colorizeimage.xml @@ -12,6 +12,7 @@ <type>bool</type><methodname>Imagick::colorizeImage</methodname> <methodparam><type>mixed</type><parameter>colorize</parameter></methodparam> <methodparam><type>mixed</type><parameter>opacity</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>legacy</parameter><initializer>false</initializer></methodparam> </methodsynopsis> <para> Blends the fill color with each pixel in the image. @@ -39,6 +40,15 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><parameter>legacy</parameter></term> + <listitem> + <para> + Bool containing the legacy value. + Compatibility before 3.4.0RC3: Set to true + </para> + </listitem> + </varlistentry> </variablelist> </para> @@ -77,6 +87,12 @@ Previous versions allow only an ImagickPixel objects. </entry> </row> + <row> + <entry>3.4.0RC3</entry> + <entry> + add 3th parameter for legacy behaviour. + </entry> + </row> </tbody> </tgroup> </informaltable> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=67338 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=67338 ------------------------------------------------------------------ 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/apcuiterator/gettotalsize.xml By: Walt Sorensen on 2016-10-10 08:54:30 =================================================================== --- en/reference/apcu/apcuiterator/gettotalsize.xml +++ en/reference/apcu/apcuiterator/gettotalsize.xml @@ -38,7 +38,7 @@ <simplelist> <member><methodname>APCUIterator::getTotalCount</methodname></member> <member><methodname>APCUIterator::getTotalHits</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=69092 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=69092 ------------------------------------------------------------------ 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/recommended.xml By: Walt Sorensen on 2016-10-10 14:17:00 =================================================================== --- en/install/windows/recommended.xml +++ en/install/windows/recommended.xml @@ -2,10 +2,10 @@ <!-- $Revision: 339300 $ --> <sect1 xml:id="install.windows.recommended" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Recommended Configuration on Windows systems</title> - + <sect2> <title>OpCache</title> - + <para> Highly Recommended that you enable OpCache. This extension is included with PHP for Windows. It compiles and optimizes PHP scripts and caches them in memory so that they aren't compiled every time the page is loaded. </para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=69106 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=69106 ------------------------------------------------------------------ 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 ------------------------------------------------------------------ -- https://edit.php.net/ This email is send automatically by the Php Docbook Online Editor.