Contributions are ready for review

From:	phpdoc at lists dot php dot net	Date:	Mon, 20 Apr 2015 12:00:04 +0000
Subject:	Contributions are ready for review
Groups:	php.doc
Request:	Send a blank email to phpdoc+get-969385577@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/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> @@ -1367,7 +1355,7 @@ A callback accepting two parameters. The first is the cURL resource, the second is a string with the header data to be written. The header data must - be written by this callback. Return the number of + be written when by this callback. Return the number of bytes written. </entry> </row> @@ -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/filter/filters.xml By: Lorna Jane Mitchell on 2015-02-15 07:21:28 =================================================================== --- en/reference/filter/filters.xml +++ en/reference/filter/filters.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> - + <chapter xml:id="filter.filters" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Types of filters</title> @@ -48,16 +48,7 @@ <parameter>default</parameter> </entry> <entry></entry> - <entry> - <para> - Validates whether the value is a valid e-mail address. - </para> - <para> - In general, this validates e-mail addresses against the syntax in - RFC 822, with the exceptions that comments and whitespace folding - are not supported. - </para> - </entry> + <entry>Validates value as e-mail.</entry> </row> <row> <entry><constant>FILTER_VALIDATE_FLOAT</constant></entry> @@ -103,6 +94,15 @@ </entry> </row> <row> + <entry><constant>FILTER_VALIDATE_MAC</constant></entry> + <entry>"validate_mac_address"</entry> + <entry> + <parameter>default</parameter> + </entry> + <entry></entry> + <entry>Validates value as MAC address.</entry> + </row> + <row> <entry><constant>FILTER_VALIDATE_REGEXP</constant></entry> <entry>"validate_regexp"</entry> <entry> @@ -156,6 +156,7 @@ <row> <entry>ID</entry> <entry>Name</entry> + <entry>Options</entry> <entry>Flags</entry> <entry>Description</entry> </row> @@ -165,6 +166,7 @@ <entry><constant>FILTER_SANITIZE_EMAIL</constant></entry> <entry>"email"</entry> <entry></entry> + <entry></entry> <entry> Remove all characters except letters, digits and <literal>!#$%&'*+-/=?^_`{|}~@.[]</literal>. @@ -173,6 +175,7 @@ <row> <entry><constant>FILTER_SANITIZE_ENCODED</constant></entry> <entry>"encoded"</entry> + <entry></entry> <entry> <constant>FILTER_FLAG_STRIP_LOW</constant>, <constant>FILTER_FLAG_STRIP_HIGH</constant>, @@ -185,11 +188,13 @@ <entry><constant>FILTER_SANITIZE_MAGIC_QUOTES</constant></entry> <entry>"magic_quotes"</entry> <entry></entry> + <entry></entry> <entry>Apply <function>addslashes</function>.</entry> </row> <row> <entry><constant>FILTER_SANITIZE_NUMBER_FLOAT</constant></entry> <entry>"number_float"</entry> + <entry></entry> <entry> <constant>FILTER_FLAG_ALLOW_FRACTION</constant>, <constant>FILTER_FLAG_ALLOW_THOUSAND</constant>, @@ -204,6 +209,7 @@ <entry><constant>FILTER_SANITIZE_NUMBER_INT</constant></entry> <entry>"number_int"</entry> <entry></entry> + <entry></entry> <entry> Remove all characters except digits, plus and minus sign. </entry> @@ -211,6 +217,7 @@ <row> <entry><constant>FILTER_SANITIZE_SPECIAL_CHARS</constant></entry> <entry>"special_chars"</entry> + <entry></entry> <entry> <constant>FILTER_FLAG_STRIP_LOW</constant>, <constant>FILTER_FLAG_STRIP_HIGH</constant>, @@ -225,6 +232,7 @@ <row> <entry><constant>FILTER_SANITIZE_FULL_SPECIAL_CHARS</constant></entry> <entry>"full_special_chars"</entry> + <entry></entry> <entry> <constant>FILTER_FLAG_NO_ENCODE_QUOTES</constant>, </entry> @@ -239,6 +247,7 @@ <row> <entry><constant>FILTER_SANITIZE_STRING</constant></entry> <entry>"string"</entry> + <entry></entry> <entry> <constant>FILTER_FLAG_NO_ENCODE_QUOTES</constant>, <constant>FILTER_FLAG_STRIP_LOW</constant>, @@ -253,12 +262,14 @@ <entry><constant>FILTER_SANITIZE_STRIPPED</constant></entry> <entry>"stripped"</entry> <entry></entry> + <entry></entry> <entry>Alias of "string" filter.</entry> </row> <row> <entry><constant>FILTER_SANITIZE_URL</constant></entry> <entry>"url"</entry> <entry></entry> + <entry></entry> <entry> Remove all characters except letters, digits and <literal>$-_.+!*'(),{}|\^~[]`<>#%";/?:@&=</literal>. @@ -267,6 +278,7 @@ <row> <entry><constant>FILTER_UNSAFE_RAW</constant></entry> <entry>"unsafe_raw"</entry> + <entry></entry> <entry> <constant>FILTER_FLAG_STRIP_LOW</constant>, <constant>FILTER_FLAG_STRIP_HIGH</constant>, => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60356 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60356 ------------------------------------------------------------------ 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 ------------------------------------------------------------------ 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/language/predefined/arrayaccess/offsetget.xml By: Craig Duncan on 2015-03-16 18:05:53 =================================================================== --- en/language/predefined/arrayaccess/offsetget.xml +++ en/language/predefined/arrayaccess/offsetget.xml @@ -4,7 +4,7 @@ <refentry xml:id="arrayaccess.offsetget" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>ArrayAccess::offsetGet</refname> - <refpurpose>Offset to retrieve</refpurpose> + <refpurpose>Returns the value at specified offset</refpurpose> </refnamediv> <refsect1 role="description"> @@ -14,9 +14,6 @@ <methodparam><type>mixed</type><parameter>offset</parameter></methodparam> </methodsynopsis> <para> - Returns the value at specified offset. - </para> - <para> This method is executed when checking if offset is <function>empty</function>. </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60585 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60585 ------------------------------------------------------------------ Modified: en/language/predefined/arrayaccess/offsetset.xml By: Craig Duncan on 2015-03-16 18:06:21 =================================================================== --- en/language/predefined/arrayaccess/offsetset.xml +++ en/language/predefined/arrayaccess/offsetset.xml @@ -4,7 +4,7 @@ <refentry xml:id="arrayaccess.offsetset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>ArrayAccess::offsetSet</refname> - <refpurpose>Offset to set</refpurpose> + <refpurpose>Assigns a value to the specified offset</refpurpose> </refnamediv> <refsect1 role="description"> @@ -14,9 +14,6 @@ <methodparam><type>mixed</type><parameter>offset</parameter></methodparam> <methodparam><type>mixed</type><parameter>value</parameter></methodparam> </methodsynopsis> - <para> - Assigns a value to the specified offset. - </para> </refsect1> <refsect1 role="parameters"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60586 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60586 ------------------------------------------------------------------ Modified: en/language/predefined/arrayaccess/offsetexists.xml By: Craig Duncan on 2015-03-16 18:06:25 =================================================================== --- en/language/predefined/arrayaccess/offsetexists.xml +++ en/language/predefined/arrayaccess/offsetexists.xml @@ -4,7 +4,7 @@ <refentry xml:id="arrayaccess.offsetexists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>ArrayAccess::offsetExists</refname> - <refpurpose>Whether an offset exists</refpurpose> + <refpurpose>Checks if the specified offset exists</refpurpose> </refnamediv> <refsect1 role="description"> @@ -14,9 +14,6 @@ <methodparam><type>mixed</type><parameter>offset</parameter></methodparam> </methodsynopsis> <para> - Whether or not an offset exists. - </para> - <para> This method is executed when using <function>isset</function> or <function>empty</function> on objects implementing <classname>ArrayAccess</classname>. </para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60584 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60584 ------------------------------------------------------------------ Modified: en/language/predefined/arrayaccess/offsetunset.xml By: Craig Duncan on 2015-03-16 18:06:47 =================================================================== --- en/language/predefined/arrayaccess/offsetunset.xml +++ en/language/predefined/arrayaccess/offsetunset.xml @@ -4,7 +4,7 @@ <refentry xml:id="arrayaccess.offsetunset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>ArrayAccess::offsetUnset</refname> - <refpurpose>Offset to unset</refpurpose> + <refpurpose>Unsets an offset</refpurpose> </refnamediv> <refsect1 role="description"> @@ -13,9 +13,6 @@ <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>ArrayAccess::offsetUnset</methodname> <methodparam><type>mixed</type><parameter>offset</parameter></methodparam> </methodsynopsis> - <para> - Unsets an offset. - </para> <note> <para> This method will <emphasis>not</emphasis> be called when type-casting to => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60587 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60587 ------------------------------------------------------------------ Modified: en/appendices/configure/misc.xml By: Manmohan Bishnoi on 2015-03-23 01:09:05 =================================================================== --- en/appendices/configure/misc.xml +++ en/appendices/configure/misc.xml @@ -13,6 +13,16 @@ </para> </listitem> </varlistentry> + <varlistentry xml:id="configure.enable-phpdbg"> + <term> + <option role="configure">--enable-phpdbg</option> + </term> + <listitem> + <para> + Enable phpdbg interactive debugger SAPI module support. + </para> + </listitem> + </varlistentry> <varlistentry xml:id="configure.with-layout"> <term> <option role="configure">--with-layout=TYPE</option> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60654 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60654 ------------------------------------------------------------------ Modified: en/appendices/configure/servers.xml By: Manmohan Bishnoi on 2015-03-23 01:40:49 =================================================================== --- en/appendices/configure/servers.xml +++ en/appendices/configure/servers.xml @@ -88,6 +88,17 @@ </para> </listitem> </varlistentry> + + <varlistentry xml:id="configure.enable-phpdbg"> + <term> + <option role="configure">--enable-phpdbg</option> + </term> + <listitem> + <para> + Enable phpdbg interactive debugger SAPI module support in PHP 5.6.x or later. + </para> + </listitem> + </varlistentry> <varlistentry xml:id="configure.enable-embed"> <term> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60655 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60655 ------------------------------------------------------------------ Modified: en/reference/weakref/weakref/release.xml By: anonymous on 2015-03-30 23:52:56 =================================================================== --- en/reference/weakref/weakref/release.xml +++ en/reference/weakref/weakref/release.xml @@ -5,7 +5,7 @@ <refname>Weakref::release</refname> <refpurpose>Releases a previously acquired reference</refpurpose> </refnamediv> - + <refsect1 role="description"> &reftitle.description; <methodsynopsis> @@ -13,16 +13,23 @@ <void/> </methodsynopsis> <para> - Releases a previously acquired reference. Potentially turning a strong + Releases a previously acquired reference, potentially turning a strong reference back into a weak reference. </para> + <para> + The <classname>Weakref</classname> instance maintains an internal acquired + counter to track outstanding strong references. If the call to + <methodname>Weakref::release</methodname> is successful, this counter + will be decremented by one. Once this counter reaches zero, the strong + reference is turned back into a weak reference. + </para> </refsect1> - + <refsect1 role="parameters"> &reftitle.parameters; &no.function.parameters; </refsect1> - + <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> @@ -30,7 +37,7 @@ released, &false; otherwise. </para> </refsect1> - + <refsect1 role="examples"> &reftitle.examples; <para> @@ -74,7 +81,7 @@ </example> </para> </refsect1> - + <refsect1 role="seealso"> &reftitle.seealso; <para> @@ -83,7 +90,7 @@ </simplelist> </para> </refsect1> - + </refentry>  + &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> + The parameter 'basenode' was added. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </para> + </refsect1> + </refentry> <!-- Keep this comment at the end of the file => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=61834 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=61834 ------------------------------------------------------------------ Modified: en/internals2/opcodes/declare-const.xml By: salathe on 2015-04-15 01:07:47 =================================================================== --- en/internals2/opcodes/declare-const.xml +++ en/internals2/opcodes/declare-const.xml @@ -6,13 +6,75 @@ <title>PHP code</title> <programlisting role="php"> <![CDATA[ -<?php +<?php /* * * opcode number: 143 - * No sample PHP yet */ + * Declare a constant + */ +const a = "A"; + +echo a; ?> ]]> </programlisting> </section> + <section xml:id="internals2.opcodes.declare-const.listing"> + <title>PHP opcodes</title> + <simpara>Function name: (null)</simpara> + <simpara>Compiled variables: (null) </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>7</entry> + <entry>0</entry> + <entry>DECLARE_CONST</entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry>'a', 'A'</entry> + </row> + <row> + <entry>9</entry> + <entry>1</entry> + <entry>FETCH_CONSTANT</entry> + <entry></entry> + <entry></entry> + <entry>~0</entry> + <entry>'a'</entry> + </row> + <row> + <entry></entry> + <entry>2</entry> + <entry>ECHO</entry> + <entry></entry> + <entry></entry> + <entry></entry> + <entry>~0</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=62134 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62134 ------------------------------------------------------------------ Modified: en/internals2/opcodes.xml By: salathe on 2015-04-15 03:41:19 =================================================================== --- en/internals2/opcodes.xml +++ en/internals2/opcodes.xml @@ -65,7 +65,7 @@ <row><entry>38</entry><entry><xref linkend="internals2.opcodes.assign"/></entry><entry>yes</entry></row> <row><entry>39</entry><entry><xref linkend="internals2.opcodes.assign-ref"/></entry><entry>yes</entry></row> <row><entry>40</entry><entry><xref linkend="internals2.opcodes.echo"/></entry><entry>yes</entry></row> - <row><entry>41</entry><entry><xref linkend="internals2.opcodes.print"/></entry><entry>yes</entry></row> + <row><entry>41</entry><entry><xref linkend="internals2.opcodes.print"/>(removed in PHP7)</entry><entry>yes</entry></row> <row><entry>42</entry><entry><xref linkend="internals2.opcodes.jmp"/></entry><entry>yes</entry></row> <row><entry>43</entry><entry><xref linkend="internals2.opcodes.jmpz"/></entry><entry>yes</entry></row> <row><entry>44</entry><entry><xref linkend="internals2.opcodes.jmpnz"/></entry><entry>yes</entry></row> @@ -77,7 +77,7 @@ <row><entry>50</entry><entry><xref linkend="internals2.opcodes.brk"/></entry><entry>yes</entry></row> <row><entry>51</entry><entry><xref linkend="internals2.opcodes.cont"/></entry><entry>yes</entry></row> <row><entry>52</entry><entry><xref linkend="internals2.opcodes.bool"/></entry><entry>yes</entry></row> - <row><entry>53</entry><entry><xref linkend="internals2.opcodes.init-string"/></entry><entry>yes</entry></row> + <row><entry>53</entry><entry><xref linkend="internals2.opcodes.init-string"/>(removed)</entry><entry>yes</entry></row> <row><entry>54</entry><entry><xref linkend="internals2.opcodes.add-char"/></entry><entry>yes</entry></row> <row><entry>55</entry><entry><xref linkend="internals2.opcodes.add-string"/></entry><entry>yes</entry></row> <row><entry>56</entry><entry><xref linkend="internals2.opcodes.add-var"/></entry><entry>yes</entry></row> @@ -90,7 +90,7 @@ <row><entry>63</entry><entry><xref linkend="internals2.opcodes.recv"/></entry><entry>yes</entry></row> <row><entry>64</entry><entry><xref linkend="internals2.opcodes.recv-init"/></entry><entry>yes</entry></row> <row><entry>65</entry><entry><xref linkend="internals2.opcodes.send-val"/></entry><entry>yes</entry></row> - <row><entry>66</entry><entry><xref linkend="internals2.opcodes.send-var"/></entry><entry>yes</entry></row> + <row><entry>66</entry><entry>SEND_VAR_EX</entry><entry>no</entry></row> <row><entry>67</entry><entry><xref linkend="internals2.opcodes.send-ref"/></entry><entry>yes</entry></row> <row><entry>68</entry><entry><xref linkend="internals2.opcodes.new"/></entry><entry>yes</entry></row> <row><entry>69</entry><entry><xref linkend="internals2.opcodes.init-ns-fcall-by-name"/></entry><entry>no</entry></row> @@ -101,8 +101,10 @@ <row><entry>74</entry><entry><xref linkend="internals2.opcodes.unset-var"/></entry><entry>yes</entry></row> <row><entry>75</entry><entry><xref linkend="internals2.opcodes.unset-dim"/></entry><entry>yes</entry></row> <row><entry>76</entry><entry><xref linkend="internals2.opcodes.unset-obj"/></entry><entry>yes</entry></row> - <row><entry>77</entry><entry><xref linkend="internals2.opcodes.fe-reset"/></entry><entry>yes</entry></row> - <row><entry>78</entry><entry><xref linkend="internals2.opcodes.fe-fetch"/></entry><entry>yes</entry></row> + <row><entry>77 (outdated)</entry><entry><xref linkend="internals2.opcodes.fe-reset"/></entry><entry>yes</entry></row> + <row><entry>77</entry><entry>FE_RESET_R</entry><entry>no</entry></row> + <row><entry>78 (outdate)</entry><entry><xref linkend="internals2.opcodes.fe-fetch"/></entry><entry>yes</entry></row> + <row><entry>78</entry><entry>FE_FETCH_R</entry><entry>no</entry></row> <row><entry>79</entry><entry><xref linkend="internals2.opcodes.exit"/></entry><entry>yes</entry></row> <row><entry>80</entry><entry><xref linkend="internals2.opcodes.fetch-r"/></entry><entry>yes</entry></row> <row><entry>81</entry><entry><xref linkend="internals2.opcodes.fetch-dim-r"/></entry><entry>yes</entry></row> @@ -122,7 +124,7 @@ <row><entry>95</entry><entry><xref linkend="internals2.opcodes.fetch-unset"/></entry><entry>no</entry></row> <row><entry>96</entry><entry><xref linkend="internals2.opcodes.fetch-dim-unset"/></entry><entry>no</entry></row> <row><entry>97</entry><entry><xref linkend="internals2.opcodes.fetch-obj-unset"/></entry><entry>no</entry></row> - <row><entry>98</entry><entry><xref linkend="internals2.opcodes.fetch-dim-tmp-var"/></entry><entry>yes</entry></row> + <row><entry>98 (outdated)</entry><entry><xref linkend="internals2.opcodes.fetch-dim-tmp-var"/></entry><entry>yes</entry></row> <row><entry>99</entry><entry><xref linkend="internals2.opcodes.fetch-constant"/></entry><entry>yes</entry></row> <row><entry>100</entry><entry><xref linkend="internals2.opcodes.goto"/></entry><entry>no</entry></row> <row><entry>101</entry><entry><xref linkend="internals2.opcodes.ext-stmt"/></entry><entry>yes</entry></row> @@ -140,22 +142,22 @@ <row><entry>113</entry><entry><xref linkend="internals2.opcodes.init-static-method-call"/></entry><entry>yes</entry></row> <row><entry>114</entry><entry><xref linkend="internals2.opcodes.isset-isempty-var"/></entry><entry>yes</entry></row> <row><entry>115</entry><entry><xref linkend="internals2.opcodes.isset-isempty-dim-obj"/></entry><entry>yes</entry></row> - <row><entry>116</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>117</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>118</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>119</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>120</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>121</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>122</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>123</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>124</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>125</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>126</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>127</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>128</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>129</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>130</entry><entry>not documented</entry><entry>no</entry></row> - <row><entry>131</entry><entry>not documented</entry><entry>no</entry></row> + <row><entry>116</entry><entry>SEND_VAL_EX</entry><entry>no</entry></row> + <row><entry>117</entry><entry><xref linkend="internals2.opcodes.send-var"/></entry><entry>yes</entry></row> + <row><entry>118</entry><entry>INIT_USER_CALL</entry><entry>no</entry></row> + <row><entry>119</entry><entry>SEND_ARRAY</entry><entry>no</entry></row> + <row><entry>120</entry><entry>SEND_USER</entry><entry>no</entry></row> + <row><entry>121</entry><entry>STRLEN</entry><entry>no</entry></row> + <row><entry>122</entry><entry>DEFINED</entry><entry>no</entry></row> + <row><entry>123</entry><entry>TYPE_CHECK</entry><entry>no</entry></row> + <row><entry>124</entry><entry>VERIFY_RETURN_TYPE</entry><entry>no</entry></row> + <row><entry>125</entry><entry>FE_RESET_RW</entry><entry>no</entry></row> + <row><entry>126</entry><entry>FE_FETCH_RW</entry><entry>no</entry></row> + <row><entry>127</entry><entry>FE_FREE</entry><entry>no</entry></row> + <row><entry>128</entry><entry>INIT_DYNAMIC_CALL</entry><entry>no</entry></row> + <row><entry>129</entry><entry>DO_ICALL</entry><entry>no</entry></row> + <row><entry>130</entry><entry>DO_UCALL</entry><entry>no</entry></row> + <row><entry>131</entry><entry>DO_FCALL_BY_NAME</entry><entry>no</entry></row> <row><entry>132</entry><entry><xref linkend="internals2.opcodes.pre-inc-obj"/></entry><entry>yes</entry></row> <row><entry>133</entry><entry><xref linkend="internals2.opcodes.pre-dec-obj"/></entry><entry>yes</entry></row> <row><entry>134</entry><entry><xref linkend="internals2.opcodes.post-inc-obj"/></entry><entry>yes</entry></row> @@ -175,8 +177,26 @@ <row><entry>148</entry><entry><xref linkend="internals2.opcodes.isset-isempty-prop-obj"/></entry><entry>yes</entry></row> <row><entry>149</entry><entry><xref linkend="internals2.opcodes.handle-exception"/></entry><entry>yes</entry></row> <row><entry>150</entry><entry><xref linkend="internals2.opcodes.user-opcode"/></entry><entry>no</entry></row> + <row><entry>151</entry><entry>ASSERT_CHECK</entry><entry>no</entry></row> <row><entry>152</entry><entry><xref linkend="internals2.opcodes.zend-jmp-set"/></entry><entry>no</entry></row> <row><entry>153</entry><entry><xref linkend="internals2.opcodes.zend-declare-lambda-function"/></entry><entry>no</entry></row> + <row><entry>154</entry><entry>ADD_TRAIT</entry><entry>no</entry></row> + <row><entry>155</entry><entry>BIND_TRAITS</entry><entry>no</entry></row> + <row><entry>156</entry><entry>SEPARATE</entry><entry>no</entry></row> + <row><entry>157</entry><entry>FETCH_CLASS_NAME</entry><entry>no</entry></row> + <row><entry>158</entry><entry>CALL_TRAMPOLINE</entry><entry>no</entry></row> + <row><entry>159</entry><entry>DISCARD_EXCEPTION</entry><entry>no</entry></row> + <row><entry>160</entry><entry>YIELD</entry><entry>no</entry></row> + <row><entry>161</entry><entry>GENERATOR_RETURN</entry><entry>no</entry></row> + <row><entry>162</entry><entry>FAST_CALL</entry><entry>no</entry></row> + <row><entry>163</entry><entry>FAST_RET</entry><entry>no</entry></row> + <row><entry>164</entry><entry>RECV_VARIADIC</entry><entry>no</entry></row> + <row><entry>165</entry><entry>SEND_UNPACK</entry><entry>no</entry></row> + <row><entry>166</entry><entry>POW</entry><entry>no</entry></row> + <row><entry>167</entry><entry>ASSIGN_POW</entry><entry>no</entry></row> + <row><entry>168</entry><entry>BIND_GLOBAL</entry><entry>no</entry></row> + <row><entry>169</entry><entry>COALESCE</entry><entry>no</entry></row> + <row><entry>170</entry><entry>SPACESHIP</entry><entry>no</entry></row> </tbody> </tgroup> </table> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62136 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62136 ------------------------------------------------------------------ Modified: en/language/types/string.xml By: salathe on 2015-04-15 10:43:18 =================================================================== --- en/language/types/string.xml +++ en/language/types/string.xml @@ -594,7 +594,8 @@ <type>string</type>, and then wrap it in <literal>{</literal> and <literal>}</literal>. Since <literal>{</literal> can not be escaped, this syntax will only be recognised when the <literal>$</literal> immediately - follows the <literal>{</literal>. Use <literal>{$</literal> to get a + follows the <literal>{</literal> or <literal>{</literal> immediately follows the<literal>$</literal>. + Use <literal>{$</literal> to get a literal <literal>{$</literal>. Some examples to make it clear: </simpara> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62158 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62158 ------------------------------------------------------------------ Modified: en/reference/kadm5/setup.xml By: salathe on 2015-04-15 11:18:34 =================================================================== --- en/reference/kadm5/setup.xml +++ en/reference/kadm5/setup.xml @@ -28,6 +28,11 @@ the client libraries installed by KADM5, avoiding any conflicts. </para> </note> + <note> + <para> + Kadm5 last release was 0.2.3 alpha which was on 2003-06-03. + </para> + </note> <para> &pecl.windows.download; </para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62163 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62163 ------------------------------------------------------------------ Modified: en/reference/filter/constants.xml By: salathe on 2015-04-16 06:23:28 =================================================================== --- en/reference/filter/constants.xml +++ en/reference/filter/constants.xml @@ -216,6 +216,17 @@ </simpara> </listitem> </varlistentry> + <varlistentry xml:id="constant.filter-validate-mac"> + <term> + <constant>FILTER_VALIDATE_MAC</constant> + (<type>integer</type>) + </term> + <listitem> + <simpara> + ID of "validate_mac" filter. + </simpara> + </listitem> + </varlistentry> <varlistentry xml:id="constant.filter-default"> <term> <constant>FILTER_DEFAULT</constant> @@ -250,6 +261,17 @@ </simpara> </listitem> </varlistentry> + <varlistentry xml:id="constant.filter-sanitize-full-special-chars"> + <term> + <constant>FILTER_SANITIZE_FULL_SPECIAL_CHARS</constant> + (<type>integer</type>) + </term> + <listitem> + <simpara> + ID of "full special chars" filter. + </simpara> + </listitem> + </varlistentry> <varlistentry xml:id="constant.filter-sanitize-stripped"> <term> <constant>FILTER_SANITIZE_STRIPPED</constant> @@ -548,6 +570,39 @@ </simpara> </listitem> </varlistentry> + <varlistentry xml:id="constant.filter-flag-strip-backtick"> + <term> + <constant>FILTER_FLAG_STRIP_BACKTICK</constant> + (<type>integer</type>) + </term> + <listitem> + <simpara> + Removes backticks (`) + </simpara> + </listitem> + </varlistentry> + <varlistentry xml:id="constant.filter-flag-scheme-required"> + <term> + <constant>FILTER_FLAG_SCHEME_REQUIRED</constant> + (<type>integer</type>) + </term> + <listitem> + <simpara> + Requires url scheme. + </simpara> + </listitem> + </varlistentry> + <varlistentry xml:id="constant.filter-flag-host-required"> + <term> + <constant>FILTER_FLAG_HOST_REQUIRED</constant> + (<type>integer</type>) + </term> + <listitem> + <simpara> + Requires url host. + </simpara> + </listitem> + </varlistentry> </variablelist> </appendix> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62178 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62178 ------------------------------------------------------------------ Modified: en/reference/haru/harupage/measuretext.xml By: anonymous on 2015-04-18 00:37:33 =================================================================== --- en/reference/haru/harupage/measuretext.xml +++ en/reference/haru/harupage/measuretext.xml @@ -3,7 +3,7 @@ <refentry xml:id="harupage.measuretext" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>HaruPage::measureText</refname> - <refpurpose>Calculate the number of characters which can be included within the specified width</refpurpose> + <refpurpose>Calculate the byte length of characters which can be included on one line of the specified width</refpurpose> </refnamediv> <refsect1 role="description"> @@ -15,7 +15,7 @@ <methodparam choice="opt"><type>bool</type><parameter>wordwrap</parameter><initializer>false</initializer></methodparam> </methodsynopsis> <para> - Get the number of characters which can be included within the specified width. + Get the byte length of characters which can be included on one line of the specified width. </para> </refsect1> @@ -35,7 +35,7 @@ <term><parameter>width</parameter></term> <listitem> <para> - The width of the area to put the text to. + The width of the line. </para> </listitem> </varlistentry> @@ -44,8 +44,8 @@ <listitem> <para> When this parameter is set to &true; the function "emulates" word - wrapping and doesn't include the part of the current word if reached - the end of the area. + wrapping by stopping after the last full word (delimited by whitespace) + that can fit on the line. </para> </listitem> </varlistentry> @@ -56,7 +56,9 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - Returns the number of characters which can be included within the specified width. + Returns the byte length of characters which can be included within the specified width. + For single-byte encodings, this is equal to the number of characters. For multi-byte encodings, + this is not necessarily the case. </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62242 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62242 ------------------------------------------------------------------ Modified: en/appendices/reserved.xml By: pasindu on 2015-04-19 05:39:09 =================================================================== --- en/appendices/reserved.xml +++ en/appendices/reserved.xml @@ -455,8 +455,65 @@ </sect2> </sect1> - &appendices.reserved.constants; + <sect1 xml:id="reserved.other-reserved-words"> + <title>List of other reserved words </title> + <simpara> + These words cannot be used to name a class, interface or a trait. + These words are also prohibited from being used in namespaces. + Some of the words are reserved to enable future PHP features without + breaking backward compatibility. + </simpara> + <para> + <table> + <tgroup cols="5"> + <tbody> + <row> + <entry> + int (as of PHP 7) + </entry> + <entry> + float (as of PHP 7) + </entry> + <entry> + bool (as of PHP 7) + </entry> + <entry> + string (as of PHP 7) + </entry> + </row> + <row> + <entry> + true (as of PHP 7) + </entry> + <entry> + false (as of PHP 7) + </entry> + <entry> + null (as of PHP 7) + </entry> + <entry> + resource (as of PHP 7) + </entry> + </row> + <row> + <entry> + object (as of PHP 7) + </entry> + <entry> + mixed (as of PHP 7) + </entry> + <entry> + numeric (as of PHP 7) + </entry> + <entry> + </entry> + </row> + </tbody> + </tgroup> + </table> + </para> + </sect1> </appendix> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62266 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62266 ------------------------------------------------------------------ Modified: en/language/control-structures/switch.xml By: pasindu on 2015-04-19 06:04:30 =================================================================== --- en/language/control-structures/switch.xml +++ en/language/control-structures/switch.xml @@ -28,6 +28,33 @@ </para> </note> <para> + <table> + <title>Changelogs</title> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>7.0.0</entry> + <entry> + Multiple default cases will raise a <constant>E_COMPILE_ERROR</constant> error. + </entry> + </row> + <row> + <entry>5.7.0</entry> + <entry> + Multiple default cases will raise a <constant>E_DEPRECATED</constant> error. + </entry> + </row> + </tbody> + </tgroup> + </table> + </para> + <para> The following two examples are two different ways to write the same thing, one using a series of <literal>if</literal> and <literal>elseif</literal> statements, and the other using the => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62267 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62267 ------------------------------------------------------------------ Modified: en/reference/strings/functions/wordwrap.xml By: pasindu on 2015-04-19 09:09:50 =================================================================== --- en/reference/strings/functions/wordwrap.xml +++ en/reference/strings/functions/wordwrap.xml @@ -55,9 +55,10 @@ <listitem> <para> If the <parameter>cut</parameter> is set to &true;, the string is - always wrapped at or before the specified width. So if you have + always wrapped at or before the specified <parameter>width</parameter>. So if you have a word that is larger than the given width, it is broken apart. - (See second example). + (See second example). When &false; the function dose not split the word until the end of the word + even if the <parameter>width</parameter> is smaller than the word width. </para> </listitem> </varlistentry> @@ -118,6 +119,29 @@ ]]> </screen> </example> + <example> + <title><function>wordwrap</function> example</title> + <programlisting role="php"> +<![CDATA[ +<?php +$text = "A very long woooooooooooooooooord. and something"; +$newtext = wordwrap($text, 8, "n", false); + +echo "$newtextn"; +?> +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +A very +long +woooooooooooooooooord. +and +something +]]> + </screen> + </example> </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62277 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62277 ------------------------------------------------------------------ Modified: en/reference/session/functions/session-abort.xml By: pasindu on 2015-04-20 07:04:41 =================================================================== --- en/reference/session/functions/session-abort.xml +++ en/reference/session/functions/session-abort.xml @@ -9,20 +9,19 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <type>bool</type><methodname>session_abort</methodname> + <type>void</type><methodname>session_abort</methodname> <void/> </methodsynopsis> <para> <function>session_abort</function> finishes session without saving - data. Thus original values in session data is kept. + data. Thus the original values in session data are kept. </para> </refsect1> <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - This function returns &true; if a session was successfully reinitialized, - otherwise &false;. + &return.void; </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62288 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62288 ------------------------------------------------------------------ Modified: en/reference/session/functions/session-reset.xml By: pasindu on 2015-04-20 07:06:32 =================================================================== --- en/reference/session/functions/session-reset.xml +++ en/reference/session/functions/session-reset.xml @@ -9,12 +9,12 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <type>bool</type><methodname>session_reset</methodname> + <type>void</type><methodname>session_reset</methodname> <void/> </methodsynopsis> <para> <function>session_reset</function> reinitializes a session with - original values stored in session storage. This function requires active session and + original values stored in session storage. This function requires an active session and discards changes in $_SESSION. </para> </refsect1> @@ -22,8 +22,7 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - This function returns &true; if a session was successfully reinitialized, - otherwise &false;. + &return.void; </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62289 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62289 ------------------------------------------------------------------ -- https://edit.php.net/ This email is send automatically by the Php Docbook Online Editor.