Contributions are ready for review

From:	phpdoc at lists dot php dot net	Date:	Mon, 13 Apr 2015 12:00:03 +0000
Subject:	Contributions are ready for review
Groups:	php.doc
Request:	Send a blank email to phpdoc+get-969385561@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> @@ -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/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 ------------------------------------------------------------------ Modified: en/reference/pcntl/functions/pcntl-exec.xml By: anonymous on 2015-03-02 20:29:24 =================================================================== --- en/reference/pcntl/functions/pcntl-exec.xml +++ en/reference/pcntl/functions/pcntl-exec.xml @@ -9,7 +9,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <type>void</type><methodname>pcntl_exec</methodname> + <type>bool</type><methodname>pcntl_exec</methodname> <methodparam><type>string</type><parameter>path</parameter></methodparam> <methodparam choice="opt"><type>array</type><parameter>args</parameter></methodparam> <methodparam choice="opt"><type>array</type><parameter>envs</parameter></methodparam> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60474 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60474 ------------------------------------------------------------------ Modified: en/reference/ldap/functions/ldap-search.xml By: anonymous on 2015-03-08 21:17:38 =================================================================== --- en/reference/ldap/functions/ldap-search.xml +++ en/reference/ldap/functions/ldap-search.xml @@ -68,7 +68,7 @@ <para> The search filter can be simple or advanced, using boolean operators in the format described in the LDAP documentation (see the <link - xlink:href="&url.ldap.filters;">Netscape Directory SDK</link> for full + xlink:href="&url.ldap.filters;">Netscape Directory SDK</link> for full information on filters). </para> </listitem> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60526 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60526 ------------------------------------------------------------------ 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/reference/datetime/datetime/createfromformat.xml By: anonymous on 2015-04-09 07:08:19 =================================================================== --- en/reference/datetime/datetime/createfromformat.xml +++ en/reference/datetime/datetime/createfromformat.xml @@ -236,7 +236,7 @@ <entry><literal>?</literal></entry> <entry>A random byte</entry> <entry>Example: <literal>^</literal> (Be aware that for UTF-8 - characracters you might need more than one <literal>?</literal>. + characters you might need more than one <literal>?</literal>. In this case, using <literal>*</literal> is probably what you want instead)</entry> </row> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=61871 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=61871 ------------------------------------------------------------------ Modified: en/faq/html.xml By: anonymous on 2015-04-09 09:13:25 =================================================================== --- en/faq/html.xml +++ en/faq/html.xml @@ -209,7 +209,7 @@ <para> <note> <para> - Specifying an arrays key is optional in HTML. If you do not specify + Specifying array keys is optional in HTML. If you do not specify the keys, the array gets filled in the order the elements appear in the form. Our first example will contain keys 0, 1, 2 and 3. </para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=61873 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=61873 ------------------------------------------------------------------ Modified: en/reference/var/functions/serialize.xml By: cmb on 2015-04-10 16:12:57 =================================================================== --- en/reference/var/functions/serialize.xml +++ en/reference/var/functions/serialize.xml @@ -123,7 +123,7 @@ </note> <warning> <para> - When <function>serialize</function> serializes objects, the leading slash is not included in the class name of namespaced classes for maximum compatibility. + When <function>serialize</function> serializes objects, the leading backslash is not included in the class name of namespaced classes for maximum compatibility. </para> </warning> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=61917 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=61917 ------------------------------------------------------------------ Modified: en/reference/var/functions/var-export.xml By: cmb on 2015-04-10 16:13:26 =================================================================== --- en/reference/var/functions/var-export.xml +++ en/reference/var/functions/var-export.xml @@ -221,7 +221,7 @@ </note> <warning> <para> - When <function>var_export</function> exports objects, the leading slash is not included in the class name of namespaced classes for maximum compatibility. + When <function>var_export</function> exports objects, the leading backslash is not included in the class name of namespaced classes for maximum compatibility. </para> </warning> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=61918 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=61918 ------------------------------------------------------------------ Modified: en/reference/uodbc/functions/odbc-field-len.xml By: cmb on 2015-04-11 08:35:23 =================================================================== --- en/reference/uodbc/functions/odbc-field-len.xml +++ en/reference/uodbc/functions/odbc-field-len.xml @@ -43,7 +43,7 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - Returns the field name as a string, or &false; on error. + Returns the field length, or &false; on error. </para> </refsect1> <refsect1 role="seealso"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=61921 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=61921 ------------------------------------------------------------------ Modified: en/reference/json/constants.xml By: Pasindu De Silva on 2015-04-11 21:05:49 =================================================================== --- en/reference/json/constants.xml +++ en/reference/json/constants.xml @@ -263,6 +263,18 @@ </simpara> </listitem> </varlistentry> + <varlistentry xml:id="constant.json-preserve-zero-fraction"> + <term> + <constant>JSON_PRESERVE_ZERO_FRACTION</constant> + (<type>integer</type>) + </term> + <listitem> + <simpara> + Ensures that float are always <function>json_encode</function> as float. + Available since PHP 5.6.5. + </simpara> + </listitem> + </varlistentry> </variablelist> </appendix> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62049 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62049 ------------------------------------------------------------------ Modified: en/reference/url/constants.xml By: Pasindu De Silva on 2015-04-13 00:52:07 =================================================================== --- en/reference/url/constants.xml +++ en/reference/url/constants.xml @@ -26,7 +26,7 @@ </term> <listitem> <simpara> - + Outputs the hostname of the url parsed. </simpara> </listitem> </varlistentry> @@ -37,7 +37,7 @@ </term> <listitem> <simpara> - + Outputs the port of the url parsed. </simpara> </listitem> </varlistentry> @@ -48,7 +48,7 @@ </term> <listitem> <simpara> - + Outputs the user of the url parsed. </simpara> </listitem> </varlistentry> @@ -59,7 +59,7 @@ </term> <listitem> <simpara> - + Outputs the password of the url parsed. </simpara> </listitem> </varlistentry> @@ -70,7 +70,7 @@ </term> <listitem> <simpara> - + Outputs the path of the url parsed. </simpara> </listitem> </varlistentry> @@ -81,7 +81,7 @@ </term> <listitem> <simpara> - + Outputs the query string of the url parsed. </simpara> </listitem> </varlistentry> @@ -92,10 +92,16 @@ </term> <listitem> <simpara> - + Outputs the fragment (string after the hashmark #) of the url parsed. </simpara> </listitem> </varlistentry> + </variablelist> + <para> + The following constants are meant to be used with + <function>http_build_query</function>. + </para> + <variablelist> <varlistentry xml:id="constant.php-query-rfc1738"> <term> <constant>PHP_QUERY_RFC1738</constant> @@ -103,7 +109,10 @@ </term> <listitem> <simpara> - + Encoding is performed per + <link xlink:href="&url.rfc;1738">RFC 1738</link> and the + <literal>application/x-www-form-urlencoded</literal> media type, which + implies that spaces are encoded as plus (<literal>+</literal>) signs. </simpara> </listitem> </varlistentry> @@ -114,7 +123,8 @@ </term> <listitem> <simpara> - + Encoding is performed according to <link xlink:href="&url.rfc;3986">RFC 3986</link>, + and spaces will be percent encoded (<literal>%20</literal>). </simpara> </listitem> </varlistentry> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62085 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62085 ------------------------------------------------------------------ Modified: en/reference/url/functions/parse-url.xml By: Pasindu De Silva on 2015-04-13 03:47:48 =================================================================== --- en/reference/url/functions/parse-url.xml +++ en/reference/url/functions/parse-url.xml @@ -165,28 +165,49 @@ <programlisting role="php"> <![CDATA[ <?php -$url = 'http://username:password@hostname/path?arg=value#anchor'; +$url = 'http://username:password@hostname:9090/path?arg=value#anchor'; -print_r(parse_url($url)); - -echo parse_url($url, PHP_URL_PATH); +var_dump(parse_url($url)); +var_dump(parse_url($url, PHP_URL_SCHEME)); +var_dump(parse_url($url, PHP_URL_PATH)); +var_dump(parse_url($url, PHP_URL_HOST)); +var_dump(parse_url($url, PHP_URL_PORT)); +var_dump(parse_url($url, PHP_URL_USER)); +var_dump(parse_url($url, PHP_URL_PASS)); +var_dump(parse_url($url, PHP_URL_QUERY)); +var_dump(parse_url($url, PHP_URL_FRAGMENT)); ?> ]]> </programlisting> &example.outputs; <screen> <![CDATA[ -Array -( - [scheme] => http - [host] => hostname - [user] => username - [pass] => password - [path] => /path - [query] => arg=value - [fragment] => anchor -) -/path +array(8) { + ["scheme"]=> + string(4) "http" + ["host"]=> + string(8) "hostname" + ["port"]=> + int(9090) + ["user"]=> + string(8) "username" + ["pass"]=> + string(8) "password" + ["path"]=> + string(5) "/path" + ["query"]=> + string(9) "arg=value" + ["fragment"]=> + string(6) "anchor" +} +string(4) "http" +string(5) "/path" +string(8) "hostname" +int(9090) +string(8) "username" +string(8) "password" +string(9) "arg=value" +string(6) "anchor" ]]> </screen> </example> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62084 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62084 ------------------------------------------------------------------ Modified: en/reference/json/functions/json-encode.xml By: Pasindu De Silva on 2015-04-13 03:50:37 =================================================================== --- en/reference/json/functions/json-encode.xml +++ en/reference/json/functions/json-encode.xml @@ -49,6 +49,7 @@ <constant>JSON_PRETTY_PRINT</constant>, <constant>JSON_UNESCAPED_SLASHES</constant>, <constant>JSON_FORCE_OBJECT</constant>, + <constant>JSON_PRESERVE_ZERO_FRACTION</constant>, <constant>JSON_UNESCAPED_UNICODE</constant>. The behaviour of these constants is described on the <link linkend="json.constants">JSON constants</link> page. @@ -87,6 +88,12 @@ </thead> <tbody> <row> + <entry>5.6.5</entry> + <entry> + <constant>JSON_PRESERVE_ZERO_FRACTION</constant> <parameter>option</parameter> was added. + </entry> + </row> + <row> <entry>5.5.0</entry> <entry> <parameter>depth</parameter> parameter was added. @@ -310,7 +317,23 @@ ]]> </screen> </example> - + <example> + <title>JSON_PRESERVE_ZERO_FRACTION option Example</title> + <programlisting role="php"> +<![CDATA[ +<?php +var_dump(json_encode(12.0, JSON_PRESERVE_ZERO_FRACTION)); +var_dump(json_encode(12.0)); +]]> + </programlisting> + &example.outputs; + <screen> +<![CDATA[ +string(4) "12.0" +string(2) "12" +]]> + </screen> + </example> </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62050 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62050 ------------------------------------------------------------------ -- https://edit.php.net/ This email is send automatically by the Php Docbook Online Editor.