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/simplexml/simplexmlelement/construct.xml By: anonymous on 2012-11-13 18:49:24 =================================================================== --- en/reference/simplexml/simplexmlelement/construct.xml +++ en/reference/simplexml/simplexmlelement/construct.xml @@ -83,6 +83,30 @@ </para> </refsect1> + + +<refsect1 role="changelog"> + &reftitle.changelog; + <para> + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>5.2.0</entry> + <entry>Added the <parameter>ns</parameter> and <parameter>is_prefix</parameter> parameters.</entry> + </row> + </tbody> + </tgroup> + </informaltable> + </para> +</refsect1> + <refsect1 role="errors"> &reftitle.errors; <para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=42883 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=42883 ------------------------------------------------------------------ Modified: en/reference/filesystem/functions/parse-ini-file.xml By: anonymous on 2012-11-15 02:08:50 =================================================================== --- en/reference/filesystem/functions/parse-ini-file.xml +++ en/reference/filesystem/functions/parse-ini-file.xml @@ -287,7 +287,7 @@ There are reserved words which must not be used as keys for ini files. These include: null, yes, no, true, false, on, off, none. Values null, no and false results in "", yes and true results in "1". - Characters <literal>?{}|&amp;~![()^"</literal> must not be used anywhere in + Characters <literal>?{}|&amp;~!()^"</literal> must not be used anywhere in the key and have a special meaning in the value. </simpara> </note> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=42913 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=42913 ------------------------------------------------------------------ Modified: en/reference/phar/Phar/webPhar.xml By: anonymous on 2012-11-15 04:04:08 =================================================================== --- en/reference/phar/Phar/webPhar.xml +++ en/reference/phar/Phar/webPhar.xml @@ -14,7 +14,7 @@ <methodparam choice="opt"><type>string</type><parameter>index</parameter><initializer>"index.php"</initializer></methodparam> <methodparam choice="opt"><type>string</type><parameter>f404</parameter></methodparam> <methodparam choice="opt"><type>array</type><parameter>mimetypes</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>rewrites</parameter></methodparam> + <methodparam choice="opt"><type>callable</type><parameter>rewrites</parameter></methodparam> </methodsynopsis> <para> <function>Phar::mapPhar</function> for web-based phars. This method parses @@ -125,21 +125,12 @@ <term><parameter>rewrites</parameter></term> <listitem> <para> - An array mapping URI to internal file, simulating mod_rewrite of apache. - For example: - <programlisting role="php"> - <![CDATA[ -<?php -array( - 'myinfo' => 'myinfo.php' -); -?> - ]]> - </programlisting> - would route calls to <literal>http://&lt;host&gt;/myphar.phar/myinfo</literal> - to the file <literal>phar:///path/to/myphar.phar/myinfo.php</literal>, preserving - GET/POST. This does not quite work like mod_rewrite in that it would not - match <literal>http://&lt;host&gt;/myphar.phar/myinfo/another</literal>. + The rewrites function is passed a string as its only parameter and must return a <type>string</type> or a <type>bool</type>. + </para> + <para> + If you are using fast-cgi or cgi then the parameter passed to the function is the value of the <varname>$_SERVER['PATH_INFO']</varname> variable. Otherwise, the parameter passed to the function is the value of the <varname>$_SERVER['REQUEST_URI']</varname> variable. + </para> + <para>If a string is returned it is used as the internal file path. If a bool is returned then webPhar() will send a HTTP 403 Denied Code. </para> </listitem> </varlistentry> @@ -160,7 +151,7 @@ Throws <classname>PharException</classname> when unable to open the internal file to output, or if called from a non-stub. If an invalid array value is passed into - <parameter>mimetypes</parameter> or to <parameter>rewrites</parameter>, then + <parameter>mimetypes</parameter> or an invalid callback is passed into <parameter>rewrites</parameter>, then <classname>UnexpectedValueException</classname> is thrown. </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=42897 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=42897 ------------------------------------------------------------------ Modified: en/install/macos/bundled.xml By: anonymous on 2012-11-16 04:13:38 =================================================================== --- en/install/macos/bundled.xml +++ en/install/macos/bundled.xml @@ -166,7 +166,7 @@ <simpara> Restart Apache, and load the PHP file created above </simpara> - <simpara> + <para> To restart, either execute <literal>sudo apachectl graceful</literal> in the shell or stop/start the "Personal Web Server" option in the OS X System Preferences. By default, loading local files in the browser @@ -174,7 +174,7 @@ <filename>http://localhost/info.php</filename> Or using the DocumentRoot in the user directory is another option and would end up looking like: <filename>http://localhost/~yourusername/info.php</filename> - </simpara> + </para> </listitem> </orderedlist> </para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=42954 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=42954 ------------------------------------------------------------------ Modified: en/reference/imagick/imagick/getimagetype.xml By: Ben Kuhl on 2012-11-20 05:25:01 =================================================================== --- en/reference/imagick/imagick/getimagetype.xml +++ en/reference/imagick/imagick/getimagetype.xml @@ -20,7 +20,65 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - Returns the potential image type. + Returns the potential image type. One of: + + <itemizedlist> + <listitem> + <simpara> + <constant>imagick::IMGTYPE_UNDEFINED</constant> + </simpara> + </listitem> + <listitem> + <simpara> + <constant>imagick::IMGTYPE_BILEVEL</constant> + </simpara> + </listitem> + <listitem> + <simpara> + <constant>imagick::IMGTYPE_GRAYSCALE</constant> + </simpara> + </listitem> + <listitem> + <simpara> + <constant>imagick::IMGTYPE_GRAYSCALEMATTE</constant> + </simpara> + </listitem> + <listitem> + <simpara> + <constant>imagick::IMGTYPE_PALETTE</constant> + </simpara> + </listitem> + <listitem> + <simpara> + <constant>imagick::IMGTYPE_PALETTEMATTE</constant> + </simpara> + </listitem> + <listitem> + <simpara> + <constant>imagick::IMGTYPE_TRUECOLOR</constant> + </simpara> + </listitem> + <listitem> + <simpara> + <constant>imagick::IMGTYPE_TRUECOLORMATTE</constant> + </simpara> + </listitem> + <listitem> + <simpara> + <constant>imagick::IMGTYPE_COLORSEPARATION</constant> + </simpara> + </listitem> + <listitem> + <simpara> + <constant>imagick::IMGTYPE_COLORSEPARATIONMATTE</constant> + </simpara> + </listitem> + <listitem> + <simpara> + <constant>imagick::IMGTYPE_OPTIMIZE</constant> + </simpara> + </listitem> + </itemizedlist> </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=43225 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=43225 ------------------------------------------------------------------ Modified: en/reference/math/functions/round.xml By: anonymous on 2012-11-21 14:26:57 =================================================================== --- en/reference/math/functions/round.xml +++ en/reference/math/functions/round.xml @@ -69,10 +69,37 @@ <term><parameter>mode</parameter></term> <listitem> <para> - One of <constant>PHP_ROUND_HALF_UP</constant>, - <constant>PHP_ROUND_HALF_DOWN</constant>, - <constant>PHP_ROUND_HALF_EVEN</constant>, or - <constant>PHP_ROUND_HALF_ODD</constant>. + Controls how ties are broken, such as whether 1.5 rounds to 1 (down/odd) or 2 (up/even). + </para> + <para> + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>Constant</entry> + <entry>Effect</entry> + </row> + </thead> + <tbody> + <row> + <entry><constant>PHP_ROUND_HALF_UP</constant></entry> + <entry>Rounds away from zero (default)</entry> + </row> + <row> + <entry><constant>PHP_ROUND_HALF_DOWN</constant></entry> + <entry>Rounds towards zero</entry> + </row> + <row> + <entry><constant>PHP_ROUND_HALF_EVEN</constant></entry> + <entry>Rounds so the last digit is even</entry> + </row> + <row> + <entry><constant>PHP_ROUND_HALF_ODD</constant></entry> + <entry>Rounds so the last digit is odd</entry> + </row> + </tbody> + </tgroup> + </informaltable> </para> </listitem> </varlistentry> @@ -112,15 +139,15 @@ <programlisting role="php"> <![CDATA[ <?php -echo round(9.5, 0, PHP_ROUND_HALF_UP); // 10 -echo round(9.5, 0, PHP_ROUND_HALF_DOWN); // 9 -echo round(9.5, 0, PHP_ROUND_HALF_EVEN); // 10 -echo round(9.5, 0, PHP_ROUND_HALF_ODD); // 9 +echo round(9.5, 0, PHP_ROUND_HALF_UP); // 10 - away from zero +echo round(9.5, 0, PHP_ROUND_HALF_DOWN); // 9 - towards zero +echo round(9.5, 0, PHP_ROUND_HALF_EVEN); // 10 - even +echo round(9.5, 0, PHP_ROUND_HALF_ODD); // 9 - odd -echo round(8.5, 0, PHP_ROUND_HALF_UP); // 9 -echo round(8.5, 0, PHP_ROUND_HALF_DOWN); // 8 -echo round(8.5, 0, PHP_ROUND_HALF_EVEN); // 8 -echo round(8.5, 0, PHP_ROUND_HALF_ODD); // 9 +echo round(-8.5, 0, PHP_ROUND_HALF_UP); // -9 - away from zero +echo round(-8.5, 0, PHP_ROUND_HALF_DOWN); // -8 - towards zero +echo round(-8.5, 0, PHP_ROUND_HALF_EVEN); // -8 - even +echo round(-8.5, 0, PHP_ROUND_HALF_ODD); // -9 - odd ?> ]]> </programlisting> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=43242 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=43242 ------------------------------------------------------------------ -- https://edit.php.net/ This email is send automatically by the Php Docbook Online Editor.