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/internals2/opcodes/add-interface.xml By: Gennady Kovshenin on 2015-03-15 18:27:32 =================================================================== --- en/internals2/opcodes/add-interface.xml +++ en/internals2/opcodes/add-interface.xml @@ -8,11 +8,64 @@ <![CDATA[ <?php /* - * + * adds an implemented interface to a class declaration * opcode number: 144 - * No sample PHP yet */ + */ +interface iA { +} + +class A implements iA { +} ?> ]]> </programlisting> </section> + <section xml:id="internals2.opcodes.add-interface.listing"> + <title>PHP opcodes</title> + <simpara>Function name: (null)</simpara> + <simpara>Compiled variables: none</simpara> + <informaltable> + <tgroup cols="7"> + <thead> + <row> + <entry>line</entry><entry>#</entry><entry>op</entry> + <entry>fetch</entry><entry>ext</entry><entry>return</entry> + <entry>operands</entry> + </row> + </thead> + <tbody> + <row> + <entry>6</entry><entry>0</entry> + <entry>NOP</entry><entry></entry> + <entry></entry><entry></entry> + <entry></entry> + </row> + <row> + <entry></entry><entry>1</entry> + <entry>DECLARE_CLASS</entry><entry></entry> + <entry></entry><entry></entry> + <entry>'a'</entry> + </row> + <row> + <entry></entry><entry>2</entry> + <entry>ADD_INTERFACE</entry><entry></entry> + <entry></entry><entry></entry> + <entry>'iA'</entry> + </row> + <row> + <entry></entry><entry>3</entry> + <entry>VERIFY_ABSTRACT_CLASS</entry><entry></entry> + <entry></entry><entry></entry> + <entry></entry> + </row> + <row> + <entry></entry><entry>3</entry> + <entry>RETURN</entry><entry></entry> + <entry></entry><entry></entry> + <entry>1</entry> + </row> + </tbody> + </tgroup> + </informaltable> + </section> </section> No newline at end of file => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60576 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60576 ------------------------------------------------------------------ Modified: en/internals2/opcodes/add-char.xml By: Gennady Kovshenin on 2015-03-15 18:29:44 =================================================================== --- en/internals2/opcodes/add-char.xml +++ en/internals2/opcodes/add-char.xml @@ -8,10 +8,10 @@ <![CDATA[ <?php /* - * add character value2 to string value1 and store in result + * add regular characters in encapsed string * opcode number: 54 */ -echo "hello world"; +echo "$a "; ?> ]]> </programlisting> @@ -19,7 +19,7 @@ <section xml:id="internals2.opcodes.add-char.listing"> <title>PHP opcodes</title> <simpara>Function name: (null)</simpara> - <simpara>Compiled variables: none </simpara> + <simpara>Compiled variables: !0=$a</simpara> <informaltable> <tgroup cols="7"> <thead> @@ -32,12 +32,24 @@ <tbody> <row> <entry>6</entry><entry>0</entry> + <entry>ADD_VAR</entry><entry></entry> + <entry></entry><entry></entry> + <entry>!0</entry> + </row> + <row> + <entry></entry><entry>1</entry> + <entry>ADD_CHAR</entry><entry></entry> + <entry></entry><entry></entry> + <entry>32</entry> + </row> + <row> + <entry></entry><entry>2</entry> <entry>ECHO</entry><entry></entry> <entry></entry><entry></entry> - <entry>'hello%5C+world'</entry> + <entry> </entry> </row> <row> - <entry>7</entry><entry>1</entry> + <entry></entry><entry>3</entry> <entry>RETURN</entry><entry></entry> <entry></entry><entry></entry> <entry>1</entry> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60575 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60575 ------------------------------------------------------------------ Modified: en/internals2/opcodes/cast.xml By: Gennady Kovshenin on 2015-03-15 18:46:59 =================================================================== --- en/internals2/opcodes/cast.xml +++ en/internals2/opcodes/cast.xml @@ -8,7 +8,7 @@ <![CDATA[ <?php /* - * casts value1 as type value2 (?? Not certain about arguments ??) + * casts value1 as type value2 (type in extended_value) * opcode number: 21 */ echo (int)1; @@ -39,7 +39,7 @@ <row> <entry></entry><entry>1</entry> <entry>ECHO</entry><entry></entry> - <entry></entry><entry></entry> + <entry></entry><entry>1</entry> <entry>~0</entry> </row> <row> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60577 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60577 ------------------------------------------------------------------ Modified: en/reference/misc/functions/eval.xml By: Thomas Punt on 2015-06-15 07:02:58 =================================================================== --- en/reference/misc/functions/eval.xml +++ en/reference/misc/functions/eval.xml @@ -37,11 +37,11 @@ Valid PHP code to be evaluated. </para> <para> - The code mustn't be wrapped in opening and closing + The code must not be wrapped in opening and closing <link linkend="language.basic-syntax.phpmode">PHP tags</link>, i.e. <literal>'echo "Hi!";'</literal> must be passed instead of - <literal>'&lt;? echo "Hi!"; &gt;'</literal>. It is still possible to leave and - reenter PHP mode though using the appropriate PHP tags, e.g. + <literal>'&lt;? echo "Hi!"; ?&gt;'</literal>. It is still possible to leave and + re-enter PHP mode though using the appropriate PHP tags, e.g. <literal>'echo "In PHP mode!"; ?&gt;In HTML mode!&lt;? echo "Back in PHP mode!";'</literal>. </para> <para> @@ -114,7 +114,8 @@ &tip.ob-capture; <note> <para> - In case of a fatal error in the evaluated code, the whole script exits. + In case of a fatal error in the evaluated code, the script being evaluated exits and + execution control returns back to the script calling <function>eval</function>. </para> </note> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=26248 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=26248 ------------------------------------------------------------------ Modified: en/language/predefined/closure/call.xml By: mail@akirakoyasu.net on 2015-06-23 07:03:03 =================================================================== --- en/language/predefined/closure/call.xml +++ en/language/predefined/closure/call.xml @@ -11,7 +11,8 @@ <methodsynopsis> <modifier>public</modifier> <type>Closure</type><methodname>Closure::call</methodname> <methodparam><type>object</type><parameter>to</parameter></methodparam> - <methodparam choice="opt"><type>mixed</type><parameter>parameters</parameter></methodparam> + <methodparam choice="opt"><type>mixed</type><parameter>parameter</parameter></methodparam> + <methodparam choice="opt"><type>mixed</type><parameter>...</parameter></methodparam> </methodsynopsis> <para> Calls the closure with the given parameters and returns the result, with $this bound to the given object @@ -29,7 +30,7 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>parameters</parameter></term> + <term><parameter>args</parameter></term> <listitem> <para> </para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=63267 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=63267 ------------------------------------------------------------------ Modified: en/reference/imap/functions/imap-fetchstructure.xml By: Krzysiek Łukasiak on 2015-06-24 05:21:58 =================================================================== --- en/reference/imap/functions/imap-fetchstructure.xml +++ en/reference/imap/functions/imap-fetchstructure.xml @@ -140,32 +140,38 @@ </para> <para> <table> - <title>Primary body type (may vary with used library)</title> - <tgroup cols="2"> - <tbody> - <row><entry>0</entry><entry>text</entry></row> - <row><entry>1</entry><entry>multipart</entry></row> - <row><entry>2</entry><entry>message</entry></row> - <row><entry>3</entry><entry>application</entry></row> - <row><entry>4</entry><entry>audio</entry></row> - <row><entry>5</entry><entry>image</entry></row> - <row><entry>6</entry><entry>video</entry></row> - <row><entry>7</entry><entry>other</entry></row> - </tbody> - </tgroup> + <title>Primary body type (value may vary with used library, use of constants is recommended)</title> + <tgroup cols="3"> + <thead> + <row><entry>Value</entry><entry>Type</entry><entry>Constant</entry></row> + </thead> + <tbody> + <row><entry>0</entry><entry>text</entry><entry>TYPETEXT</entry></row> + <row><entry>1</entry><entry>multipart</entry><entry>TYPEMULTIPART</entry></row> + <row><entry>2</entry><entry>message</entry><entry>TYPEMESSAGE</entry></row> + <row><entry>3</entry><entry>application</entry><entry>TYPEAPPLICATION</entry></row> + <row><entry>4</entry><entry>audio</entry><entry>TYPEAUDIO</entry></row> + <row><entry>5</entry><entry>image</entry><entry>TYPEIMAGE</entry></row> + <row><entry>6</entry><entry>video</entry><entry>TYPEVIDEO</entry></row> + <row><entry>7</entry><entry>other</entry><entry>TYPEOTHER</entry></row> + </tbody> + </tgroup> </table> </para> <para> <table> - <title>Transfer encodings (may vary with used library)</title> - <tgroup cols="2"> - <tbody> - <row><entry>0</entry><entry>7BIT</entry></row> - <row><entry>1</entry><entry>8BIT</entry></row> - <row><entry>2</entry><entry>BINARY</entry></row> - <row><entry>3</entry><entry>BASE64</entry></row> - <row><entry>4</entry><entry>QUOTED-PRINTABLE</entry></row> - <row><entry>5</entry><entry>OTHER</entry></row> + <title>Transfer encodings (value may vary with used library, use of constants is recommended)</title> + <tgroup cols="3"> + <thead> + <row><entry>Value</entry><entry>Type</entry><entry>Constant</entry></row> + </thead> + <tbody> + <row><entry>0</entry><entry>7bit</entry><entry>ENC7BIT</entry></row> + <row><entry>1</entry><entry>8bit</entry><entry>ENC8BIT</entry></row> + <row><entry>2</entry><entry>Binary</entry><entry>ENCBINARY</entry></row> + <row><entry>3</entry><entry>Base64</entry><entry>ENCBASE64</entry></row> + <row><entry>4</entry><entry>Quoted-Printable</entry><entry>ENCQUOTEDPRINTABLE</entry></row> + <row><entry>5</entry><entry>other</entry><entry>ENCOTHER</entry></row> </tbody> </tgroup> </table> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=63305 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=63305 ------------------------------------------------------------------ Modified: en/reference/soap/functions/use-soap-error-handler.xml By: Tomasz Sawicki on 2015-06-25 02:46:41 =================================================================== --- en/reference/soap/functions/use-soap-error-handler.xml +++ en/reference/soap/functions/use-soap-error-handler.xml @@ -19,7 +19,7 @@ in a <classname>SoapServer</classname> application will be sent to the client as a SOAP fault message. If &false;, the standard PHP error handler is used. - The default is to use the standard PHP error handler. + The default is to send error to the client as SOAP fault message. </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=63350 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=63350 ------------------------------------------------------------------ Modified: en/faq/databases.xml By: anonymous on 2015-06-26 09:06:24 =================================================================== --- en/faq/databases.xml +++ en/faq/databases.xml @@ -165,7 +165,7 @@ <para> There are three MySQL extensions, as described under the <link linkend="mysqlinfo.api.choosing">Choosing a MySQL API</link> section. The old API - should not be used, and one day it will be deprecated and eventually removed from PHP. + should not be used, it is deprecated as of PHP 5.5.0 and one day it will eventually be removed from PHP. It is a popular extension so this will be a slow process, but you are strongly encouraged to write all new code with either <link linkend="book.mysqli">mysqli</link> or <link linkend="ref.pdo-mysql">PDO_MySQL</link>. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=63363 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=63363 ------------------------------------------------------------------ Modified: en/reference/spl/iteratoriterator.xml By: anonymous on 2015-07-10 03:30:30 =================================================================== --- en/reference/spl/iteratoriterator.xml +++ en/reference/spl/iteratoriterator.xml @@ -47,7 +47,15 @@ <!-- }}} --> </section> - + + <refsect1 role="notes"><!-- {{{ --> + &reftitle.notes; + <note> + <para> + This class permits access to methods of the inner iterator via the __call magic method. + </para> + </note> + </refsect1><!-- }}} --> </partintro> &reference.spl.entities.iteratoriterator; => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=63570 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=63570 ------------------------------------------------------------------ Modified: en/reference/reflection/reflectionproperty/isdefault.xml By: James Titcumb on 2015-07-10 04:24:50 =================================================================== --- en/reference/reflection/reflectionproperty/isdefault.xml +++ en/reference/reflection/reflectionproperty/isdefault.xml @@ -14,7 +14,8 @@ <void /> </methodsynopsis> <para> - Checks whether the property is the default. + Checks whether the property was declared at compile-time, or whether the + property was dynamically declared at run-time. </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=63571 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=63571 ------------------------------------------------------------------ Modified: en/reference/image/functions/getimagesize.xml By: Boris Madzar on 2015-07-13 18:27:05 =================================================================== --- en/reference/image/functions/getimagesize.xml +++ en/reference/image/functions/getimagesize.xml @@ -273,6 +273,18 @@ <refsect1 role="notes"> &reftitle.notes; &note.gd.notrequired; + <note> + <para> + This function expects <parameter>filename</parameter> to be a valid + image file. If a non-image file is supplied, it may be incorrectly + detected as an image and the function will return successfully. + </para> + <para> + Do not use <function>getimagesize</function> to check that a given + file is a valid image. Use a purpose-built solution such as the + <link linkend="book.fileinfo">Fileinfo</link> extension instead. + </para> + </note> </refsect1> <refsect1 role="seealso"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=63623 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=63623 ------------------------------------------------------------------ Modified: en/reference/csprng/functions/random-int.xml By: rowan.collins@gmail.com on 2015-07-15 05:09:22 =================================================================== --- en/reference/csprng/functions/random-int.xml +++ en/reference/csprng/functions/random-int.xml @@ -16,7 +16,7 @@ </methodsynopsis> <para> Generates cryptographic random integers that are suitable for use where unbiased results are critical - (i.e. shuffling a Poker deck). + (e.g. shuffling a Poker deck). </para> <para> The sources of random are as follows: => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=63657 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=63657 ------------------------------------------------------------------ -- https://edit.php.net/ This email is send automatically by the Php Docbook Online Editor.