Contributions are ready for review

From:	phpdoc at lists dot php dot net	Date:	Mon, 16 Feb 2015 13:00:04 +0000
Subject:	Contributions are ready for review
Groups:	php.doc
Request:	Send a blank email to phpdoc+get-969385383@lists.php.net to get a copy of this message

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/faq/installation.xml By: mattficken on 2014-09-04 14:39:45 =================================================================== --- en/faq/installation.xml +++ en/faq/installation.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> - + <chapter xml:id="faq.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Installation</title> <titleabbrev>Installation</titleabbrev> @@ -394,9 +394,9 @@ <function>phpinfo</function>. Near the top, there will be a listing called <literal>Configuration File (php.ini)</literal>. This will tell you where PHP is looking for &php.ini; and - whether or not it's being read. If just a directory <envar>PATH</envar> exists, + whether or not it's being read. If just a directory PATH exists, then it's not being read, and you should put your &php.ini; - in that directory. If &php.ini; is included within the <envar>PATH</envar>, + in that directory. If &php.ini; is included within the PATH, it is being read. </para> <para> @@ -413,18 +413,16 @@ <qandaentry xml:id="faq.installation.addtopath"> <question> <para> - How do I add my PHP directory to the <envar>PATH</envar> + How do I add my PHP directory to the <varname>PATH</varname> on Windows? </para> </question> <answer> <para> - On Windows NT+ and Windows Server 2000+: + On Windows 7, XP, Vista, 2008, 2012 and up <itemizedlist> <listitem><para> - Go to Control Panel and open the System icon (Start -> Settings - -> Control Panel -> System, or just Start -> Control Panel - -> System for Windows XP/2003+) + Go to Control Panel and open the System icon (Start -> Control Panel) </para></listitem> <listitem><para> Go to the Advanced tab @@ -450,107 +448,18 @@ </para></listitem> </itemizedlist> </para> - <para> - On Windows 98/Me you need to edit the <filename>autoexec.bat</filename> - file: - <itemizedlist> - <listitem><para> - Open the Notepad (Start -> Run and enter notepad) - </para></listitem> - <listitem><para> - Open the <filename>C:autoexec.bat</filename> file - </para></listitem> - <listitem><para> - Locate the line with PATH=C:WINDOWS;C:WINDOWSCOMMAND;..... and add: - <literal>;C:php</literal> to the end of the line - </para></listitem> - <listitem><para> - Save the file and restart your computer - </para></listitem> - </itemizedlist> - </para> - <note> - <simpara> - Be sure to reboot after following the steps above to ensure that the - <envar>PATH</envar> changes are applied. - </simpara> - </note> - <para> - The PHP manual used to promote the copying of files into the Windows - system directory, this is because this directory + + <para> + The PHP manual used to promote the copying of files into the Windows + system directory, this is because this directory (<filename>C:Windows</filename>, <filename>C:WINNT</filename>, etc.) - is by default in the system's <envar>PATH</envar>. Copying files into the Windows + is by default in the systems PATH. Copying files into the Windows system directory has long since been deprecated and may cause problems. </para> </answer> </qandaentry> - <qandaentry xml:id="faq.installation.phprc"> - <question> - <para> - How do I make the &php.ini; file available to PHP on windows? - </para> - </question> - <answer> - <para> - There are several ways of doing this. If you are using Apache, read - their installation specific instructions (<link - linkend="install.windows.apache1">Apache 1</link>, <link - linkend="install.windows.apache2">Apache 2</link>), otherwise you must - set the <varname>PHPRC</varname> environment variable: - </para> - <para> - On Windows NT, 2000, XP and 2003: - <itemizedlist> - <listitem><para> - Go to Control Panel and open the System icon (Start -> Settings - -> Control Panel -> System, or just Start -> Control Panel - -> System for Windows XP/2003) - </para></listitem> - <listitem><para> - Go to the Advanced tab - </para></listitem> - <listitem><para> - Click on the 'Environment Variables' button - </para></listitem> - <listitem><para> - Look into the 'System variables' pane - </para></listitem> - <listitem><para> - Click on 'New' and enter 'PHPRC' as the variable name and the - directory where &php.ini; is located as the variable value (e.g. - <literal>C:php</literal>) - </para></listitem> - <listitem><para> - Press OK and restart your computer - </para></listitem> - </itemizedlist> - </para> - <para> - On Windows 98/Me you need to edit the <filename>autoexec.bat</filename> - file: - <itemizedlist> - <listitem><para> - Open the Notepad (Start -> Run and enter notepad) - </para></listitem> - <listitem><para> - Open the <filename>C:autoexec.bat</filename> file - </para></listitem> - <listitem><para> - Add a new line to the end of the file: <literal>set - PHPRC=C:php</literal> (replace <literal>C:php</literal> with the - directory where &php.ini; is located). Please note that the path - cannot contain spaces. For instance, if you have installed PHP in - <filename>C:Program FilesPHP</filename>, you would enter - <filename>C:PROGRA~1PHP</filename> instead. - </para></listitem> - <listitem><para> - Save the file and restart your computer - </para></listitem> - </itemizedlist> - </para> - </answer> - </qandaentry> + <qandaentry xml:id="faq.installation.apache.multiviews"> <question> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=57941 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=57941 ------------------------------------------------------------------ Modified: en/reference/exec/functions/escapeshellarg.xml By: Petr Hudeček on 2014-10-08 05:00:05 =================================================================== --- en/reference/exec/functions/escapeshellarg.xml +++ en/reference/exec/functions/escapeshellarg.xml @@ -22,6 +22,11 @@ include <function>exec</function>, <function>system</function> and the <link linkend="language.operators.execution">backtick operator</link>. </para> + <para> + On Windows, <function>escapeshellarg</function> instead removes percent + signs, replaces double quotes with spaces and adds double quotes around the + string. + </para> </refsect1> <refsect1 role="parameters"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58764 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58764 ------------------------------------------------------------------ Modified: en/reference/pthreads/threaded/merge.xml By: Krzysiek Łukasiak on 2014-11-25 03:44:27 =================================================================== --- en/reference/pthreads/threaded/merge.xml +++ en/reference/pthreads/threaded/merge.xml @@ -1,134 +1,135 @@ -<?xml version="1.0" encoding="utf-8"?> - - -<refentry xml:id="threaded.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> - <refnamediv> - <refname>Threaded::merge</refname> - <refpurpose>Manipulation</refpurpose> - </refnamediv> - - <refsect1 role="description"> - &reftitle.description; - <methodsynopsis> - <modifier>public</modifier> <type>boolean</type><methodname>Threaded::merge</methodname> - <methodparam><type>mixed</type><parameter>from</parameter></methodparam> - <methodparam choice="opt"><type>mixed</type><parameter>overwrite</parameter></methodparam> - </methodsynopsis> - <para> - Merges data into the current object - </para> - </refsect1> - - <refsect1 role="parameters"> - &reftitle.parameters; - <variablelist> - <varlistentry> - <term><parameter>from</parameter></term> - <listitem> - <para> - The data to merge - </para> - </listitem> - </varlistentry> - <varlistentry> - <term><parameter>overwrite</parameter></term> - <listitem> - <para> - Overwrite existing keys, by default true - </para> - </listitem> - </varlistentry> - </variablelist> - </refsect1> - - <refsect1 role="returnvalues"> - &reftitle.returnvalues; - <para> - A boolean indication of success - </para> - </refsect1> - - <refsect1 role="examples"> - &reftitle.examples; - <para> - <example> - <title>Merging into the property table of a threaded object</title> - <programlisting role="php"> -<![CDATA[ -<?php -$array = []; - -while (count($array) < 10) - $array[] = count($array); - -$stdClass = new stdClass(); -$stdClass->foo = "foo"; -$stdClass->bar = "bar"; -$stdClass->baz = "baz"; - -$safe = new Threaded(); -$safe->merge($array); -$safe->merge($stdClass); - -var_dump($safe); -?> -]]> - </programlisting> - &example.outputs; - <screen> -<![CDATA[ -object(Threaded)#2 (13) { - ["0"]=> - int(0) - ["1"]=> - int(1) - ["2"]=> - int(2) - ["3"]=> - int(3) - ["4"]=> - int(4) - ["5"]=> - int(5) - ["6"]=> - int(6) - ["7"]=> - int(7) - ["8"]=> - int(8) - ["9"]=> - int(9) - ["foo"]=> - string(3) "foo" - ["bar"]=> - string(3) "bar" - ["baz"]=> - string(3) "baz" -} -]]> - </screen> - </example> - </para> - </refsect1> -</refentry> - - +<?xml version="1.0" encoding="utf-8"?> + + +<refentry xml:id="threaded.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> + <refnamediv> + <refname>Threaded::merge</refname> + <refpurpose>Manipulation</refpurpose> + </refnamediv> + + <refsect1 role="description"> + &reftitle.description; + <methodsynopsis> + <modifier>public</modifier> <type>boolean</type><methodname>Threaded::merge</methodname> + <methodparam><type>mixed</type><parameter>from</parameter></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter></methodparam> + </methodsynopsis> + <para> + Merges data into the current object + </para> + </refsect1> + + <refsect1 role="parameters"> + &reftitle.parameters; + <variablelist> + <varlistentry> + <term><parameter>from</parameter></term> + <listitem> + <para> + The data to merge + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>overwrite</parameter></term> + <listitem> + <para> + Overwrite existing keys, by default true + </para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + A boolean indication of success + </para> + </refsect1> + + <refsect1 role="examples"> + &reftitle.examples; + <para> + <example> + <title>Merging into the property table of a threaded object</title> + <programlisting role="php"> +<![CDATA[ +<?php +$array = []; + +while (count($array) < 10) + $array[] = count($array); + +$stdClass = new stdClass(); +$stdClass->foo = "foo"; +$stdClass->bar = "bar"; +$stdClass->baz = "baz"; + +$safe = new Threaded(); +$safe->merge($array); +$safe->foo = "bar"; +$safe->merge($stdClass, false); + +var_dump($safe); +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +object(Threaded)#2 (13) { + ["0"]=> + int(0) + ["1"]=> + int(1) + ["2"]=> + int(2) + ["3"]=> + int(3) + ["4"]=> + int(4) + ["5"]=> + int(5) + ["6"]=> + int(6) + ["7"]=> + int(7) + ["8"]=> + int(8) + ["9"]=> + int(9) + ["foo"]=> + string(3) "bar" + ["bar"]=> + string(3) "bar" + ["baz"]=> + string(3) "baz" +} +]]> + </screen> + </example> + </para> + </refsect1> +</refentry> + + => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59207 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59207 ------------------------------------------------------------------ Modified: en/language/predefined/variables/post.xml By: anonymous on 2014-12-10 04:19:32 =================================================================== --- en/language/predefined/variables/post.xml +++ en/language/predefined/variables/post.xml @@ -12,7 +12,8 @@ &reftitle.description; <para> An associative array of variables passed to the current script - via the HTTP POST method. + via the HTTP POST method when using <varname>application/x-www-form-urlencoded</varname> + or <varname>multipart/form-data</varname> as the HTTP Content-Type in the request. </para> <simpara> @@ -79,7 +80,7 @@ &reftitle.notes; &note.is-superglobal; </refsect1> - + <refsect1 role="seealso"> &reftitle.seealso; <para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59314 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59314 ------------------------------------------------------------------ Modified: en/reference/mbstring/supported-encodings.xml By: hayk on 2014-12-24 09:42:39 =================================================================== --- en/reference/mbstring/supported-encodings.xml +++ en/reference/mbstring/supported-encodings.xml @@ -88,6 +88,7 @@ <listitem><simpara>Windows-1252 (CP1252)</simpara></listitem> <listitem><simpara>CP866 (IBM866)</simpara></listitem> <listitem><simpara>KOI8-R*</simpara></listitem> + <listitem><simpara>ArmSCII-8 (ArmSCII8)</simpara></listitem> </itemizedlist> <para> * denotes encodings usable also in regular expressions. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59553 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59553 ------------------------------------------------------------------ Modified: en/reference/curl/functions/curl-setopt.xml By: Christoph M. Becker on 2015-01-08 15:16:29 =================================================================== --- en/reference/curl/functions/curl-setopt.xml +++ en/reference/curl/functions/curl-setopt.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> - + <refentry xml:id="function.curl-setopt" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>curl_setopt</refname> @@ -620,18 +620,6 @@ </entry> </row> <row> - <entry valign="top"><constant>CURLOPT_POSTREDIR</constant></entry> - <entry valign="top"> - A bitmask of 1 (301 Moved Permanently), 2 (302 Found) - and 4 (303 See Other) if the HTTP POST method should be maintained - when <constant>CURLOPT_FOLLOWLOCATION</constant> is set and a - specific type of redirect occurs. - </entry> - <entry valign="top"> - Added in cURL 7.19.1. Available since PHP 5.3.2. - </entry> - </row> - <row> <entry valign="top"><constant>CURLOPT_PROTOCOLS</constant></entry> <entry valign="top"> <para> @@ -1481,7 +1469,7 @@ <row> <entry>5.6.0</entry> <entry> - <constant>CURL_SAFE_UPLOAD</constant> is now &true; by default. + <constant>CURLOPT_SAFE_UPLOAD</constant> is now &true; by default. </entry> </row> <row> @@ -1498,6 +1486,12 @@ </entry> </row> <row> + <entry>5.5.0</entry> + <entry> + Introduced <constant>CURLOPT_SAFE_UPLOAD</constant>. + </entry> + </row> + <row> <entry>5.5.0</entry> <entry> Introduced <constant>CURLOPT_SHARE</constant>. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59979 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59979 ------------------------------------------------------------------ Modified: en/reference/var/functions/is-resource.xml By: Michael Slusarz on 2015-01-19 22:44:28 =================================================================== --- en/reference/var/functions/is-resource.xml +++ en/reference/var/functions/is-resource.xml @@ -64,6 +64,15 @@ </example> </para> </refsect1> + + <refsect1 role="notes"> + &reftitle.notes; + <note> + <para> + <function>is_resource</function> is not a strict type-checking method: it will return &false; if <parameter>var</parameter> is a resource variable but has previous been closed. + </para> + </note> + </refsect1> <refsect1 role="seealso"> &reftitle.seealso; => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60129 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60129 ------------------------------------------------------------------ Modified: en/install/windows/manual.xml By: Ladislav Kubes on 2015-01-22 01:18:31 =================================================================== --- en/install/windows/manual.xml +++ en/install/windows/manual.xml @@ -11,35 +11,8 @@ <para> Download the PHP zip binary distribution from <link xlink:href="&url.php.win.downloads;">PHP for Windows: Binaries and Sources</link>. - There are several different versions of the zip package - choose the version that is suitable for - the web server being used: - <itemizedlist spacing="compact"> - <listitem> - <para> - If PHP is used with IIS then choose PHP 5.3 <emphasis>VC9 Non Thread Safe</emphasis> or - PHP 5.2 <emphasis>VC6 Non Thread Safe</emphasis>; - </para> - </listitem> - <listitem> - <para> - If PHP is used with IIS7 or greater and PHP 5.3+, then the VC9 binaries of PHP should be used. - </para> - </listitem> - <listitem> - <para> - If PHP is used with Apache 1 or Apache 2 then choose PHP 5.3 <emphasis>VC6</emphasis> or - PHP 5.2 <emphasis>VC6</emphasis>. - </para> - </listitem> - </itemizedlist> - <note> - <para> - VC9 Versions are compiled with the Visual Studio 2008 compiler and have improvements - in performance and stability. The VC9 versions require you to have the - <link xlink:href="&url.microsoft.vc9.x86;">Microsoft 2008 C++ Runtime (x86)</link> or - the <link xlink:href="&url.microsoft.vc9.x64;">Microsoft 2008 C++ Runtime (x64)</link> installed. - </para> - </note> + There are several different versions of the zip package - to choose a right version for you, follow + detailed guide on the <link xlink:href="&url.php.win.downloads;">download page</link>. </para> </sect2> <sect2 xml:id="install.windows.manual.package"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60149 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60149 ------------------------------------------------------------------ Modified: en/reference/spl/splfixedarray.xml By: Robert Stoll on 2015-02-14 11:47:18 =================================================================== --- en/reference/spl/splfixedarray.xml +++ en/reference/spl/splfixedarray.xml @@ -13,7 +13,8 @@ The SplFixedArray class provides the main functionalities of array. The main differences between a SplFixedArray and a normal PHP array is that the SplFixedArray is of fixed length and allows only integers within - the range as indexes. The advantage is that it allows a faster array + the range as indexes and does have the normal byRef semantic as other objects instead of byVal as array. + The advantage is that it allows a faster array implementation. </para> </section> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60354 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60354 ------------------------------------------------------------------ Modified: en/reference/phar/PharData/setSignatureAlgorithm.xml By: anonymous on 2015-02-15 20:16:40 =================================================================== --- en/reference/phar/PharData/setSignatureAlgorithm.xml +++ en/reference/phar/PharData/setSignatureAlgorithm.xml @@ -3,7 +3,7 @@ <refentry xml:id="phardata.setsignaturealgorithm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>Phar::setSignatureAlgorithm</refname> - <refpurpose>set the signature algorithm for a phar and apply it. The</refpurpose> + <refpurpose>set the signature algorithm for a phar and apply it.</refpurpose> </refnamediv> <refsect1 role="description"> @@ -15,7 +15,7 @@ &phar.write; <para> - set the signature algorithm for a phar and apply it. The + Set the signature algorithm for a phar and apply it. The signature algorithm must be one of <literal>Phar::MD5</literal>, <literal>Phar::SHA1</literal>, <literal>Phar::SHA256</literal>, <literal>Phar::SHA512</literal>, or <literal>Phar::PGP</literal> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60359 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60359 ------------------------------------------------------------------ Modified: en/reference/solr/solrdismaxquery/removequeryfield.xml By: anonymous on 2015-02-15 20:19:41 =================================================================== --- en/reference/solr/solrdismaxquery/removequeryfield.xml +++ en/reference/solr/solrdismaxquery/removequeryfield.xml @@ -53,8 +53,8 @@ $dismaxQuery = new SolrDisMaxQuery('lucene'); $dismaxQuery - ->addQueryField('first', 3) - ->addQueryField('second', 0.2) + ->addQueryField('first', 3) + ->addQueryField('second', 0.2) ->addQueryField('cat'); echo $dismaxQuery . PHP_EOL; // remove field 'second' => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60360 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60360 ------------------------------------------------------------------ Modified: en/reference/solr/solrdismaxquery/removephrasefield.xml By: anonymous on 2015-02-15 20:19:46 =================================================================== --- en/reference/solr/solrdismaxquery/removephrasefield.xml +++ en/reference/solr/solrdismaxquery/removephrasefield.xml @@ -50,8 +50,8 @@ $dismaxQuery = new SolrDisMaxQuery('lucene'); $dismaxQuery ->addPhraseField('first', 3, 1) - ->addPhraseField('second', 4, 1) - ->addPhraseField('cat', 55); + ->addPhraseField('second', 4, 1) + ->addPhraseField('cat', 55); echo $dismaxQuery . PHP_EOL; echo $dismaxQuery->removePhraseField('second'); ?> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60361 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60361 ------------------------------------------------------------------ -- https://edit.php.net/ This email is send automatically by the Php Docbook Online Editor.