Contributions are ready for review

Hello PHP EN Documentation team, There are contributions within the online editor queue for this language. Please review, then commit or delete these patches. Patches for review : ----------------------- New file: en/reference/sqlite3/sqlite3/enableExceptions.xml By: Bill Schaller on 2015-12-17 09:26:48 =================================================================== --- en/reference/sqlite3/sqlite3/enableExceptions.xml +++ en/reference/sqlite3/sqlite3/enableExceptions.xml @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- $Revision: 299459 $ --> + +<refentry xml:id="sqlite3.enableexceptions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> + <refnamediv> + <refname>SQLite3::enableExceptions</refname> + <refpurpose> + Causes the SQLite3 instance to throw exceptions on error instead of warnings + </refpurpose> + </refnamediv> + + <refsect1 role="description"> + &reftitle.description; + <methodsynopsis role="oop"> + <type>bool</type><methodname>SQLite3::enableExceptions</methodname> + <methodparam choice="opt"><type>bool</type><parameter>enableExceptions</parameter><initializer>false</initializer></methodparam> + </methodsynopsis> + <para> + This function controls whether the SQLite3 instance will throw exceptions or + warnings on error. + </para> + </refsect1> + + <refsect1 role="parameters"> + &reftitle.parameters; + <variablelist> + <varlistentry> + <term><parameter>enableExceptions</parameter></term> + <listitem> + <para> + If true, the SQLite3 instance and SQLite3Statement and SQLite3Result + instances derived from it will throw exceptions on error. + </para> + <para> + If false, the SQLite3 instance and SQLite3Statement and SQLite3Result + instances derived from it will raise warnings on error. + </para> + <para> + For either mode, the error code and message, if any, will be available + via SQLite3::lastErrorCode and SQLite3::lastErrorMsg. + </para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + + <refsect1 role="returnvalues"> + &reftitle.returnvalues; + <para> + The return value of this method returns the value previously set. + For example, if you call this method with $enableExceptions = true, and + exceptions were previously disabled, it will return false. + </para> + <caution> + <a href="https://bugs.php.net/bug.php?id=71150">PHP bug #71150</a> is + open to address the oddities in the return value of this function. + </caution> + </refsect1> + + <refsect1 role="examples"> + &reftitle.examples; + <example xml:id="sqlite3.enableexceptions.example.basic"> + <title><methodname>SQLite3::enableExceptions</methodname> example</title> + <para> + This shows basic usage of this method. + </para> + <programlisting role="php"> +<![CDATA[ +<?php +$sqlite = new SQLite3(':memory:'); +try { + $sqlite->exec('create table foo'); + $sqlite->enableExceptions(true); + $sqlite->exec('create table bar'); +} catch (Exception $e) { + echo "Caught exception: " . $e->getMessage(); +} +?> +]]> + </programlisting> + &example.outputs; + <screen role="php"> +<![CDATA[ +Warning: SQLite3::exec(): near "foo": syntax error in sqlite3.php on line 4 + +Call Stack: + 0.0170 125744 1. {main}() sqlite3.php:0 + 0.1295 126136 2. SQLite3->exec(???) sqlite3.php:4 + +Caught exception: near "bar": syntax error +]]> + </screen> + </example> + </refsect1> + +</refentry> + +<!-- Keep this comment at the end of the file +Local variables: +mode: sgml +sgml-omittag:t +sgml-shorttag:t +sgml-minimize-attributes:nil +sgml-always-quote-attributes:t +sgml-indent-step:1 +sgml-indent-data:t +indent-tabs-mode:nil +sgml-parent-document:nil +sgml-default-dtd-file:"~/.phpdoc/manual.ced" +sgml-exposed-tags:nil +sgml-local-catalogs:nil +sgml-local-ecat-files:nil +End: +vim600: syn=xml fen fdm=syntax fdl=2 si +vim: et tw=78 syn=sgml +vi: ts=1 sw=1 +--> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65648 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65648 ------------------------------------------------------------------ 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/closure/call.xml By: mail@akirakoyasu.net on 2015-06-23 07:03:03 =================================================================== --- en/language/predefined/closure/call.xml +++ en/language/predefined/closure/call.xml @@ -1,41 +1,38 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 337372 $ --> +<!-- $Revision: 336860 $ --> <refentry xml:id="closure.call" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>Closure::call</refname> - <refpurpose>Binds and calls the closure</refpurpose> + <refpurpose>Calls the closure with the given parameters and returns the result, with $this bound to the given object $to</refpurpose> </refnamediv> <refsect1 role="description"><!-- {{{ --> &reftitle.description; <methodsynopsis> - <modifier>public</modifier> <type>mixed</type><methodname>Closure::call</methodname> - <methodparam><type>object</type><parameter>newthis</parameter></methodparam> + <modifier>public</modifier> <type>Closure</type><methodname>Closure::call</methodname> + <methodparam><type>object</type><parameter>to</parameter></methodparam> + <methodparam choice="opt"><type>mixed</type><parameter>parameter</parameter></methodparam> <methodparam choice="opt"><type>mixed</type><parameter>...</parameter></methodparam> </methodsynopsis> <para> - Temporarily binds the closure to <parameter>newthis</parameter>, and calls - it with any given parameters. + Calls the closure with the given parameters and returns the result, with $this bound to the given object + <parameter>to</parameter> </para> </refsect1><!-- }}} --> <refsect1 role="parameters"><!-- {{{ --> &reftitle.parameters; <variablelist> <varlistentry> - <term><parameter>newthis</parameter></term> + <term><parameter>to</parameter></term> <listitem> <para> - The <type>object</type> to bind the closure to for the duration of the - call. </para> </listitem> </varlistentry> <varlistentry> - <term><parameter>...</parameter></term> + <term><parameter>args</parameter></term> <listitem> <para> - Zero or more parameters, which will be given as parameters to the - closure. </para> </listitem> </varlistentry> @@ -44,9 +41,29 @@ <refsect1 role="returnvalues"><!-- {{{ --> &reftitle.returnvalues; <para> - Returns the return value of the closure. </para> </refsect1><!-- }}} --> + <refsect1 role="changelog"><!-- {{{ --> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>7.0.0</entry> + <entry> + Added Closure::call + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1><!-- }}} --> <refsect1 role="examples"> &reftitle.examples; <example> @@ -54,34 +71,12 @@ <programlisting role="php"> <![CDATA[ <?php -class Value { - protected $value; - - public function __construct($value) { - $this->value = $value; - } - - public function getValue() { - return $this->value; - } -} - -$three = new Value(3); -$four = new Value(4); - -$closure = function ($delta) { var_dump($this->getValue() + $delta); }; -$closure->call($three, 4); -$closure->call($four, 4); -?> +$foo = new StdClass; +$foo->bar = 3; +$foobar = function ($qux) { var_dump($this->bar + $qux); }; +$foobar->call($foo, 4); // prints int(7) ]]> </programlisting> - &example.outputs; - <screen> -<![CDATA[ -int(7) -int(8) -]]> - </screen> </example> </refsect1> </refentry> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=63267 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=63267 ------------------------------------------------------------------ Modified: en/reference/curl/functions/curl-setopt.xml By: François Bonzon on 2015-09-14 21:11:35 =================================================================== --- en/reference/curl/functions/curl-setopt.xml +++ en/reference/curl/functions/curl-setopt.xml @@ -1050,6 +1050,20 @@ </entry> </row> <row> + <entry valign="top"><constant>CURLOPT_PRIVATE</constant></entry> + <entry valign="top"> + Any data that should be associated with this cURL handle. This data + can subsequently be retrieved with the + <constant>CURLINFO_PRIVATE</constant> option of + <function>curl_getinfo</function>. cURL does nothing with this data. + When using a cURL multi handle, this private data is typically a + unique key to identify a standard cURL handle. + </entry> + <entry valign="top"> + Added in cURL 7.10.3. + </entry> + </row> + <row> <entry valign="top"><constant>CURLOPT_PROXY</constant></entry> <entry valign="top"> The HTTP proxy to tunnel requests through. @@ -1520,6 +1534,12 @@ </entry> </row> <row> + <entry>5.2.4</entry> + <entry> + Introduced <constant>CURLOPT_PRIVATE</constant>. + </entry> + </row> + <row> <entry>5.1.0</entry> <entry> Introduced <constant>CURLOPT_AUTOREFERER</constant>, => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=64844 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=64844 ------------------------------------------------------------------ Modified: en/reference/password/functions/password-hash.xml By: Dennis Birkholz on 2015-09-26 07:25:06 =================================================================== --- en/reference/password/functions/password-hash.xml +++ en/reference/password/functions/password-hash.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 338252 $ --> +<!-- $Revision: 337585 $ --> <refentry xml:id="function.password-hash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> @@ -41,37 +41,39 @@ create the hash. This will produce a standard <function>crypt</function> compatible hash using the "$2y$" identifier. The result will always be a 60 character string, &return.falseforfailure;. </simpara> + </listitem> + </itemizedlist> + </para> + <simpara> + Supported Options: + </simpara> + <para> + <itemizedlist> + <listitem> <para> - Supported Options: + <literal>salt</literal> - to manually provide a salt to use when hashing the password. + Note that this will override and prevent a salt from being automatically generated. + </para> + <para> + If omitted, a random salt will be generated by <function>password_hash</function> for + each password hashed. This is the intended mode of operation. + </para> + <warning> + <para> + The salt option has been deprecated as of PHP 7.0.0. It is now + preferred to simply use the salt that is generated by default. + </para> + </warning> + </listitem> + <listitem> + <para> + <literal>cost</literal> - which denotes the algorithmic cost that should be used. + Examples of these values can be found on the <function>crypt</function> page. + </para> + <para> + If omitted, a default value of <literal>10</literal> will be used. This is a good + baseline cost, but you may want to consider increasing it depending on your hardware. </para> - <itemizedlist> - <listitem> - <para> - <literal>salt</literal> - to manually provide a salt to use when hashing the password. - Note that this will override and prevent a salt from being automatically generated. - </para> - <para> - If omitted, a random salt will be generated by <function>password_hash</function> for - each password hashed. This is the intended mode of operation. - </para> - <warning> - <para> - The salt option has been deprecated as of PHP 7.0.0. It is now - preferred to simply use the salt that is generated by default. - </para> - </warning> - </listitem> - <listitem> - <para> - <literal>cost</literal> - which denotes the algorithmic cost that should be used. - Examples of these values can be found on the <function>crypt</function> page. - </para> - <para> - If omitted, a default value of <literal>10</literal> will be used. This is a good - baseline cost, but you may want to consider increasing it depending on your hardware. - </para> - </listitem> - </itemizedlist> </listitem> </itemizedlist> </para> @@ -88,8 +90,8 @@ </para> <caution> <para> - Using the <constant>PASSWORD_BCRYPT</constant> as the - algorithm, will result + Using the <constant>PASSWORD_BCRYPT</constant> for the + <parameter>algo</parameter> parameter, will result in the <parameter>password</parameter> parameter being truncated to a maximum length of 72 characters. </para> @@ -254,14 +256,8 @@ &reftitle.notes; <caution> <para> - It is strongly recommended that you do not generate your own salt for this - function. It will create a secure salt automatically for you if you do - not specify one. - </para> - <para> - As noted above, providing the <literal>salt</literal> option in PHP 7.0 - will generate a deprecation warning. Support for providing a salt manually - may be removed in a future PHP release. + It is strongly recommended that you do not generate your own salt for this function. + It will create a secure salt automatically for you if you do not specify one. </para> </caution> <note> @@ -279,19 +275,16 @@ <para> <itemizedlist> <listitem> - <simpara> - Any new algorithm must be in core for at least 1 full release of PHP - prior to becoming default. So if, for example, a new algorithm is added - in 7.5.5, it would not be eligible for default until 7.7 (since 7.6 - would be the first full release). But if a different algorithm was added - in 7.6.0, it would also be eligible for default at 7.7.0. + <simpara>Any new algorithm must be in core for at least 1 full release of PHP prior to becoming + default. So if, for example, a new algorithm is added in 5.5.5, it would not be eligible for + default until 5.7 (since 5.6 would be the first full release). But if a different algorithm was + added in 5.6.0, it would also be eligible for default at 5.7.0. </simpara> </listitem> <listitem> <simpara> - The default should only change in a full release (7.3.0, 8.0.0, etc) - and not in a revision release. The only exception to this is in an - emergency when a critical security flaw is found in the current + The default should only change on a full release (5.6.0, 6.0.0, etc) and not on a revision release. + The only exception to this is in an emergency when a critical security flaw is found in the current default. </simpara> </listitem> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65016 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65016 ------------------------------------------------------------------ Modified: en/reference/pdo/pdostatement/errorinfo.xml By: Daniel on 2015-09-27 04:13:34 =================================================================== --- en/reference/pdo/pdostatement/errorinfo.xml +++ en/reference/pdo/pdostatement/errorinfo.xml @@ -48,6 +48,14 @@ </tgroup> </informaltable> </para> + + <note> + <para> + If the SQLSTATE error code is not set or there is no driver-specific + error, the elements following element 0 will be set to &null;. + </para> + </note> + </refsect1> <refsect1 role="examples"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65020 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65020 ------------------------------------------------------------------ Modified: en/reference/curl/functions/curl-getinfo.xml By: François Bonzon on 2015-10-13 06:13:25 =================================================================== --- en/reference/curl/functions/curl-getinfo.xml +++ en/reference/curl/functions/curl-getinfo.xml @@ -148,7 +148,7 @@ </listitem> <listitem> <simpara> - <constant>CURLINFO_CONTENT_LENGTH_DOWNLOAD</constant> - content-length of download, read from <literal>Content-Length:</literal> field + <constant>CURLINFO_CONTENT_LENGTH_DOWNLOAD</constant> - Content length of download, read from <literal>Content-Length:</literal> field </simpara> </listitem> <listitem> @@ -158,7 +158,7 @@ </listitem> <listitem> <simpara> - <constant>CURLINFO_CONTENT_TYPE</constant> - <literal>Content-Type:</literal> of the requested document, NULL indicates server did not send valid <literal>Content-Type:</literal> header + <constant>CURLINFO_CONTENT_TYPE</constant> - <literal>Content-Type:</literal> of the requested document. NULL indicates server did not send valid <literal>Content-Type:</literal> header </simpara> </listitem> <listitem> @@ -375,18 +375,45 @@ <programlisting role="php"> <![CDATA[ <?php -// Create a curl handle -$ch = curl_init('http://www.yahoo.com/'); +// Create a cURL handle +$ch = curl_init('http://www.example.com/'); // Execute curl_exec($ch); // Check if any error occurred -if(!curl_errno($ch)) -{ - $info = curl_getinfo($ch); +if (!curl_errno($ch)) { + $info = curl_getinfo($ch); + echo 'Took ', $info['total_time'], ' seconds to send a request to ', $info['url'], "n"; +} + +// Close handle +curl_close($ch); +?> +]]> + </programlisting> + </example> + </para> + <para> + <example> + <title><function>curl_getinfo</function> example with <parameter>opt</parameter> parameter</title> + <programlisting role="php"> +<![CDATA[ +<?php +// Create a cURL handle +$ch = curl_init('http://www.example.com/'); + +// Execute +curl_exec($ch); - echo 'Took ' . $info['total_time'] . ' seconds to send a request to ' . $info['url']; +// Check HTTP status code +if (!curl_errno($ch)) { + switch ($http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE)) { + case 200: # OK + break; + default: + echo 'Unexpected HTTP code: ', $http_code, "n"; + } } // Close handle => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65212 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65212 ------------------------------------------------------------------ Modified: en/reference/yaml/functions/yaml-parse.xml By: bd808 on 2015-10-17 14:29:55 =================================================================== --- en/reference/yaml/functions/yaml-parse.xml +++ en/reference/yaml/functions/yaml-parse.xml @@ -14,7 +14,7 @@ <methodparam><type>string</type><parameter>input</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>pos</parameter><initializer>0</initializer></methodparam> <methodparam choice="opt"><type>int</type><parameter role="reference">ndocs</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>null</initializer></methodparam> </methodsynopsis> <para> Convert all or part of a YAML document stream to a PHP variable. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65228 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65228 ------------------------------------------------------------------ Modified: en/reference/yaml/functions/yaml-emit.xml By: bd808 on 2015-10-17 14:30:35 =================================================================== --- en/reference/yaml/functions/yaml-emit.xml +++ en/reference/yaml/functions/yaml-emit.xml @@ -14,7 +14,7 @@ <methodparam><type>mixed</type><parameter>data</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>encoding</parameter><initializer>YAML_ANY_ENCODING</initializer></methodparam> <methodparam choice="opt"><type>int</type><parameter>linebreak</parameter><initializer>YAML_ANY_BREAK</initializer></methodparam> - <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>null</initializer></methodparam> </methodsynopsis> <para> Generate a YAML representation of the provided <parameter>data</parameter>. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65229 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65229 ------------------------------------------------------------------ Modified: en/reference/yaml/functions/yaml-parse-url.xml By: bd808 on 2015-10-17 14:30:55 =================================================================== --- en/reference/yaml/functions/yaml-parse-url.xml +++ en/reference/yaml/functions/yaml-parse-url.xml @@ -14,7 +14,7 @@ <methodparam><type>string</type><parameter>url</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>pos</parameter><initializer>0</initializer></methodparam> <methodparam choice="opt"><type>int</type><parameter role="reference">ndocs</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>null</initializer></methodparam> </methodsynopsis> <para> Convert all or part of a YAML document stream read from a URL to a PHP variable. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65230 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65230 ------------------------------------------------------------------ Modified: en/reference/yaml/functions/yaml-parse-file.xml By: bd808 on 2015-10-17 14:31:15 =================================================================== --- en/reference/yaml/functions/yaml-parse-file.xml +++ en/reference/yaml/functions/yaml-parse-file.xml @@ -14,7 +14,7 @@ <methodparam><type>string</type><parameter>filename</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>pos</parameter><initializer>0</initializer></methodparam> <methodparam choice="opt"><type>int</type><parameter role="reference">ndocs</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>null</initializer></methodparam> </methodsynopsis> <para> Convert all or part of a YAML document stream read from a file to a PHP variable. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65231 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65231 ------------------------------------------------------------------ Modified: en/reference/yaml/functions/yaml-emit-file.xml By: bd808 on 2015-10-17 14:31:34 =================================================================== --- en/reference/yaml/functions/yaml-emit-file.xml +++ en/reference/yaml/functions/yaml-emit-file.xml @@ -15,7 +15,7 @@ <methodparam><type>mixed</type><parameter>data</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>encoding</parameter><initializer>YAML_ANY_ENCODING</initializer></methodparam> <methodparam choice="opt"><type>int</type><parameter>linebreak</parameter><initializer>YAML_ANY_BREAK</initializer></methodparam> - <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>null</initializer></methodparam> </methodsynopsis> <para> Generate a YAML representation of the provided <parameter>data</parameter> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65232 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65232 ------------------------------------------------------------------ Modified: en/reference/pdo/pdoexception.xml By: Daniel on 2015-10-19 00:31:06 =================================================================== --- en/reference/pdo/pdoexception.xml +++ en/reference/pdo/pdoexception.xml @@ -49,11 +49,6 @@ <type>array</type> <varname linkend="pdoexception.props.errorinfo">errorInfo</varname> </fieldsynopsis><!-- }}} --> - <fieldsynopsis><!-- {{{ code --> - <modifier>protected</modifier> - <type>string</type> - <varname linkend="pdoexception.props.code">code</varname> - </fieldsynopsis><!-- }}} --> <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo> <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" /> @@ -81,15 +76,6 @@ </para> </listitem> </varlistentry><!-- }}} --> - <varlistentry xml:id="pdoexception.props.code"><!-- {{{ --> - <term><varname>code</varname></term> - <listitem> - <para> - <literal>SQLSTATE</literal> error code. Use - <function>Exception::getCode</function> to access it. - </para> - </listitem> - </varlistentry><!-- }}} --> </variablelist> </section> <!-- }}} --> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65238 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65238 ------------------------------------------------------------------ Modified: en/appendices/migration56/new-features.xml By: Hanxue on 2015-10-25 23:30:04 =================================================================== --- en/appendices/migration56/new-features.xml +++ en/appendices/migration56/new-features.xml @@ -292,6 +292,40 @@ ]]> </programlisting> </informalexample> + <para> + The above example in PHP 5.5 or earlier: + </para> + <informalexample> + <programlisting role="php"> +<![CDATA[ +resource(6) of type (GMP integer) +resource(7) of type (GMP integer) +resource(9) of type (GMP integer) +]]> + </programlisting> + </informalexample> + <para> + The above example in PHP 5.6+: + </para> + <informalexample> + <programlisting role="php"> +<![CDATA[ +object(GMP)#3 (1) { + ["num"]=> + string(2) "59" +} +object(GMP)#3 (1) { + ["num"]=> + string(2) "59" +} +object(GMP)#3 (1) { + ["num"]=> + string(2) "59" +} +]]> + </programlisting> + </informalexample> + </sect2> <sect2 xml:id="migration56.new-features.hash-equals"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65272 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65272 ------------------------------------------------------------------ Modified: en/reference/strings/functions/htmlentities.xml By: Hans Henrik Bergan on 2015-10-26 02:52:36 =================================================================== --- en/reference/strings/functions/htmlentities.xml +++ en/reference/strings/functions/htmlentities.xml @@ -151,7 +151,7 @@ If the input <parameter>string</parameter> contains an invalid code unit sequence within the given <parameter>encoding</parameter> an empty string will be returned, unless either the <constant>ENT_IGNORE</constant> or - <constant>ENT_SUBSTITUTE</constant> flags are set. + <constant>ENT_SUBSTITUTE</constant> or <constant>ENT_DISALLOWED</constant> flags are set. </para> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65273 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65273 ------------------------------------------------------------------ Modified: en/reference/ibase/functions/ibase-prepare.xml By: DSanchez on 2015-11-14 07:45:03 =================================================================== --- en/reference/ibase/functions/ibase-prepare.xml +++ en/reference/ibase/functions/ibase-prepare.xml @@ -10,19 +10,9 @@ &reftitle.description; <methodsynopsis> <type>resource</type><methodname>ibase_prepare</methodname> - <methodparam><type>string</type><parameter>query</parameter></methodparam> - </methodsynopsis> - <methodsynopsis> - <type>resource</type><methodname>ibase_prepare</methodname> <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam> <methodparam><type>string</type><parameter>query</parameter></methodparam> </methodsynopsis> - <methodsynopsis> - <type>resource</type><methodname>ibase_prepare</methodname> - <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam> - <methodparam><type>string</type><parameter>trans</parameter></methodparam> - <methodparam><type>string</type><parameter>query</parameter></methodparam> - </methodsynopsis> <simpara> Prepare a query for later binding of parameter placeholders and execution (via <function>ibase_execute</function>). @@ -34,6 +24,14 @@ <para> <variablelist> <varlistentry> + <term><parameter>link_identifier</parameter></term> + <listitem> + <para> + An InterBase link identifier. + </para> + </listitem> + </varlistentry> + <varlistentry> <term><parameter>query</parameter></term> <listitem> <para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65435 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65435 ------------------------------------------------------------------ Modified: en/reference/pdo/pdostatement/execute.xml By: Oscar Merida on 2015-11-19 19:38:41 =================================================================== --- en/reference/pdo/pdostatement/execute.xml +++ en/reference/pdo/pdostatement/execute.xml @@ -15,7 +15,7 @@ </methodsynopsis> <para> Execute the prepared statement. If the prepared statement included - parameter markers, you must either: + parameter markers, either: <itemizedlist> <listitem><para>call <function>PDOStatement::bindParam</function> to bind PHP variables to the parameter markers: bound variables pass their value as input and receive the @@ -38,12 +38,11 @@ All values are treated as <constant>PDO::PARAM_STR</constant>. </para> <para> - You cannot bind multiple values to a single parameter; for example, - you cannot bind two values to a single named parameter in an IN() - clause. + Multiple values cannot bind to a single parameter; for example, + a single named parameter in an IN() clause cannot bind to two values. </para> <para> - You cannot bind more values than specified; if more keys exist in + Binding more values than specified is not possible; if more keys exist in <parameter>input_parameters</parameter> than in the SQL specified in the <methodname>PDO::prepare</methodname>, then the statement will fail and an error is emitted. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65473 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65473 ------------------------------------------------------------------ Modified: en/reference/misc/functions/uniqid.xml By: Scott on 2015-12-13 21:02:11 =================================================================== --- en/reference/misc/functions/uniqid.xml +++ en/reference/misc/functions/uniqid.xml @@ -108,7 +108,7 @@ in fact without being passed any additional parameters the return value is little different from <function>microtime</function>. If you need to generate cryptographically secure tokens use - <function>openssl_random_pseudo_bytes</function>. + <function>random_bytes</function>. </para> </caution> <note> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65626 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65626 ------------------------------------------------------------------ Modified: en/reference/strings/functions/str-shuffle.xml By: Scott on 2015-12-13 21:02:41 =================================================================== --- en/reference/strings/functions/str-shuffle.xml +++ en/reference/strings/functions/str-shuffle.xml @@ -16,6 +16,18 @@ <function>str_shuffle</function> shuffles a string. One permutation of all possible is created. </simpara> + + <warning> + <para> + This function does not create random nor unpredictable strings. + <emphasis>This function must not be used for security purposes.</emphasis> + Use a cryptographically secure random function/generator and + cryptographically secure hash functions to create unpredictable + secure IDs. If you need to generate cryptographically secure tokens, + use <function>random_bytes</function>. + </para> + </warning> + </refsect1> <refsect1 role="parameters"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65627 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65627 ------------------------------------------------------------------ Modified: en/reference/sqlite3/sqlite3/construct.xml By: Bill Schaller on 2015-12-17 08:24:09 =================================================================== --- en/reference/sqlite3/sqlite3/construct.xml +++ en/reference/sqlite3/sqlite3/construct.xml @@ -14,8 +14,8 @@ <methodsynopsis> <modifier>public</modifier> <methodname>SQLite3::__construct</methodname> <methodparam><type>string</type><parameter>filename</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam> - <methodparam choice="opt"><type>string</type><parameter>encryption_key</parameter></methodparam> + <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE</initializer></methodparam> + <methodparam choice="opt"><type>string</type><parameter>encryption_key</parameter><initializer>null</initializer></methodparam> </methodsynopsis> <para> Instantiates an SQLite3 object and opens a connection to an @@ -70,7 +70,8 @@ <listitem> <para> An optional encryption key used when encrypting and decrypting an - SQLite database. + SQLite database. If the SQLite encryption module is not installed, + this parameter will have no effect. </para> </listitem> </varlistentry> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65645 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65645 ------------------------------------------------------------------ Modified: en/reference/sqlite3/sqlite3/open.xml By: Bill Schaller on 2015-12-17 08:25:06 =================================================================== --- en/reference/sqlite3/sqlite3/open.xml +++ en/reference/sqlite3/sqlite3/open.xml @@ -13,7 +13,7 @@ <modifier>public</modifier> <type>void</type><methodname>SQLite3::open</methodname> <methodparam><type>string</type><parameter>filename</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE</initializer></methodparam> - <methodparam choice="opt"><type>string</type><parameter>encryption_key</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>encryption_key</parameter><initializer>null</initializer></methodparam> </methodsynopsis> <para> Opens an SQLite 3 Database. If the build includes encryption, then it will @@ -67,7 +67,8 @@ <listitem> <para> An optional encryption key used when encrypting and decrypting an - SQLite database. + SQLite database. If the SQLite encryption module is not installed, + this parameter will have no effect. </para> </listitem> </varlistentry> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65646 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65646 ------------------------------------------------------------------ Modified: en/reference/intl/book.xml By: Alexander Makarov on 2015-12-17 11:01:00 =================================================================== --- en/reference/intl/book.xml +++ en/reference/intl/book.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 338548 $ --> +<!-- $Revision: 337374 $ --> <book xml:id="book.intl" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <?phpdoc extension-membership="bundled" ?> @@ -15,7 +15,7 @@ library, enabling PHP programmers to perform various locale-aware operations including but not limited to formatting, transliteration, encoding conversion, calendar operations, <link xlink:href="&url.icu.uca;">UCA</link>-conformant collation, locating - text boundaries and working with locale identifiers, timezones and graphemes, + text boundaries and working with locale identifiers, timezones and graphemes, </para> <para> @@ -75,7 +75,7 @@ </listitem> <listitem> <simpara> - Timezone: provides a wrapper around Olson database + Timezone: provides a wrapper around <link xlink:href="&url.icu.tzdatabase;">Olson database</link> which has information about all the timezones around the world. </simpara> </listitem> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65651 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65651 ------------------------------------------------------------------ Modified: en/reference/intl/messageformatter.xml By: Alexander Makarov on 2015-12-17 11:07:41 =================================================================== --- en/reference/intl/messageformatter.xml +++ en/reference/intl/messageformatter.xml @@ -90,6 +90,9 @@ <link xlink:href="&url.icu.msgformat;">ICU message formatters</link> </member> <member> + <link xlink:href="&url.icu.datatables;">ICU data tables</link> + </member> + <member> <link xlink:href="&url.icu.choiceformat;">ICU choice formatters</link> </member> </simplelist> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65652 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65652 ------------------------------------------------------------------ Modified: en/reference/mysqli/summary.xml By: David C on 2016-01-03 10:03:49 =================================================================== --- en/reference/mysqli/summary.xml +++ en/reference/mysqli/summary.xml @@ -204,7 +204,7 @@ <entry><methodname>mysqli::get_server_info</methodname></entry> <entry><function>mysqli_get_server_info</function></entry> <entry>N/A</entry> - <entry>NOT DOCUMENTED</entry> + <entry>Returns a string representing the version of the MySQL server that the MySQLi extension is connected to</entry> </row> <row> <entry><methodname>mysqli::get_warnings</methodname></entry> @@ -509,16 +509,16 @@ <entry>NOT DOCUMENTED</entry> </row> <row> - <entry>$mysqli_stmt::more_results()</entry> - <entry>mysqli_stmt_more_results()</entry> + <entry><methodname>$mysqli_stmt::more_results</methodname></entry> + <entry><function>mysqli_stmt_more_results</function></entry> <entry>N/A</entry> - <entry>NOT DOCUMENTED &mysqli.available.mysqlnd;</entry> + <entry>Checks if there are more query results from a multiple query</entry> </row> <row> - <entry>$mysqli_stmt::next_result()</entry> - <entry>mysqli_stmt_next_result()</entry> + <entry><methodname>$mysqli_stmt::next_result</methodname></entry> + <entry><function>mysqli_stmt_next_result</function></entry> <entry>N/A</entry> - <entry>NOT DOCUMENTED &mysqli.available.mysqlnd;</entry> + <entry>Reads the next result from a multiple query</entry> </row> <row> <entry><methodname>mysqli_stmt::num_rows</methodname></entry> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65772 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65772 ------------------------------------------------------------------ Modified: en/appendices/migration53.xml By: Romel Jacinto on 2016-01-08 15:43:36 =================================================================== --- en/appendices/migration53.xml +++ en/appendices/migration53.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 338477 $ --> +<!-- $Revision: 335484 $ --> <appendix xml:id="migration53" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Migrating from PHP 5.2.x to PHP 5.3.x</title> <simpara> @@ -7,8 +7,9 @@ <link linkend="migration5">5.0.x</link>, <link linkend="migration51">5.1.x</link>, <link linkend="migration52">5.2.x</link>, - <link linkend="migration54">5.4.x</link> and - <link linkend="migration55">5.5.x</link>. + <link linkend="migration54">5.4.x</link>, + <link linkend="migration55">5.5.x</link> and + <link linkend="migration56">5.6.x</link>. </simpara> <section xml:id="migration53.changes"> @@ -652,11 +653,6 @@ </simpara> </listitem> <listitem> - <simpara> - <function>mcrypt_generic_end</function> - </simpara> - </listitem> - <listitem> <simpara> <function>set_magic_quotes_runtime</function> and its alias, <function>magic_quotes_runtime</function> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65847 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65847 ------------------------------------------------------------------ Modified: en/appendices/migration54.xml By: Romel Jacinto on 2016-01-08 15:44:04 =================================================================== --- en/appendices/migration54.xml +++ en/appendices/migration54.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 338477 $ --> +<!-- $Revision: 332745 $ --> <!-- Based on UPGRADING version 322438. Work in progess !--> <appendix xml:id="migration54" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -9,8 +9,9 @@ <link linkend="migration5">5.0.x</link>, <link linkend="migration51">5.1.x</link>, <link linkend="migration52">5.2.x</link>, - <link linkend="migration53">5.3.x</link> and - <link linkend="migration55">5.5.x</link>. + <link linkend="migration53">5.3.x</link>, + <link linkend="migration55">5.5.x</link> and + <link linkend="migration56">5.6.x</link>. </simpara> <section xml:id="migration54.changes"> @@ -337,6 +338,11 @@ <itemizedlist> <listitem> <simpara> + <function>mcrypt_generic_end</function> + </simpara> + </listitem> + <listitem> + <simpara> <function>mysql_list_dbs</function> </simpara> </listitem> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65848 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65848 ------------------------------------------------------------------ Modified: en/appendices/migration55.xml By: Romel Jacinto on 2016-01-08 15:44:31 =================================================================== --- en/appendices/migration55.xml +++ en/appendices/migration55.xml @@ -9,8 +9,9 @@ <link linkend="migration5">5.0.x</link>, <link linkend="migration51">5.1.x</link>, <link linkend="migration52">5.2.x</link>, - <link linkend="migration53">5.3.x</link> and - <link linkend="migration54">5.4.x</link>. + <link linkend="migration53">5.3.x</link>, + <link linkend="migration54">5.4.x</link> and + <link linkend="migration56">5.6.x</link>. </simpara> <sect1 xml:id="migration55.changes"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65849 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65849 ------------------------------------------------------------------ Modified: en/appendices/migration52.xml By: Romel Jacinto on 2016-01-08 15:45:25 =================================================================== --- en/appendices/migration52.xml +++ en/appendices/migration52.xml @@ -7,8 +7,9 @@ <link linkend="migration5">5.0.x</link>, <link linkend="migration51">5.1.x</link>, <link linkend="migration53">5.3.x</link>, - <link linkend="migration54">5.4.x</link> and - <link linkend="migration55">5.5.x</link>. + <link linkend="migration54">5.4.x</link>, + <link linkend="migration55">5.5.x</link> and + <link linkend="migration56">5.6.x</link>. </para> <section xml:id="migration52.changes"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65850 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65850 ------------------------------------------------------------------ Modified: en/appendices/migration51.xml By: Romel Jacinto on 2016-01-08 15:45:42 =================================================================== --- en/appendices/migration51.xml +++ en/appendices/migration51.xml @@ -7,8 +7,9 @@ <link linkend="migration5">5.0.x</link>, <link linkend="migration52">5.2.x</link>, <link linkend="migration53">5.3.x</link>, - <link linkend="migration54">5.4.x</link> and - <link linkend="migration55">5.5.x</link>. + <link linkend="migration54">5.4.x</link>, + <link linkend="migration55">5.5.x</link> and + <link linkend="migration56">5.6.x</link>. </para> <section xml:id="migration51.changes"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65851 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65851 ------------------------------------------------------------------ Modified: en/language/oop5/properties.xml By: Richard Wossal on 2016-01-18 05:29:47 =================================================================== --- en/language/oop5/properties.xml +++ en/language/oop5/properties.xml @@ -67,22 +67,23 @@ class SimpleClass { // invalid property declarations: - public $var1 = 'hello ' . 'world'; - public $var2 = <<<EOD + public $var1 = <<<EOD hello world EOD; - public $var3 = 1+2; - public $var4 = self::myStaticMethod(); - public $var5 = $myVar; + public $var2 = self::myStaticMethod(); + public $var3 = $myVar; // valid property declarations: - public $var6 = myConstant; - public $var7 = array(true, false); - - // This is allowed only in PHP 5.3.0 and later. - public $var8 = <<<'EOD' + public $var4 = 'hello'; + // valid in PHP 5.3.0 and later: + public $var5 = <<<'EOD' hello world EOD; + // valid in PHP 5.6.0 and later: + public $var6 = 'hello ' . 'world'; + public $var7 = 1+2; + public $var8 = myConstant; + public $var9 = array(true, false); } ?> ]]> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66032 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66032 ------------------------------------------------------------------ Modified: en/reference/apcu/apcuiterator/construct.xml By: Robin Appelman on 2016-01-18 10:39:45 =================================================================== --- en/reference/apcu/apcuiterator/construct.xml +++ en/reference/apcu/apcuiterator/construct.xml @@ -25,15 +25,6 @@ &reftitle.parameters; <variablelist> <varlistentry> - <term><parameter>cache</parameter></term> - <listitem> - <para> - The cache type, which will be <literal>user</literal> or - <literal>file</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> <term><parameter>search</parameter></term> <listitem> <para> @@ -90,7 +81,7 @@ <programlisting role="php"> <![CDATA[ <?php -foreach (new APCUIterator('user', '/^counter./') as $counter) { +foreach (new APCUIterator('/^counter./') as $counter) { echo "$counter[key]: $counter[value]n"; apc_dec($counter['key'], $counter['value']); } => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66034 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66034 ------------------------------------------------------------------ Modified: en/reference/mysqli/mysqli/real-connect.xml By: Joel Hutchinson on 2016-02-01 11:12:17 =================================================================== --- en/reference/mysqli/mysqli/real-connect.xml +++ en/reference/mysqli/mysqli/real-connect.xml @@ -168,6 +168,13 @@ <entry><constant>MYSQLI_CLIENT_SSL</constant></entry> <entry>Use SSL (encryption)</entry> </row> + <row> + <entry><constant>MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT</constant></entry> + <entry> + Like <constant>MYSQLI_CLIENT_SSL</constant>, but disables validation of the provided + SSL certificate. This is only for installations using MySQL Native Driver and MySQL 5.6 or later. + </entry> + </row> </tbody> </tgroup> </table> @@ -183,6 +190,30 @@ </variablelist> </para> </refsect1> + + <refsect1 role="changelog"><!-- {{{ --> + &reftitle.changelog; + <para> + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>5.6.16</entry> + <entry> + Added the <constant>MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT</constant> flag for MySQL Native Driver + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </para> + </refsect1><!-- }}} --> <refsect1 role="returnvalues"> &reftitle.returnvalues; => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65846 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65846 ------------------------------------------------------------------ Modified: en/reference/ldap/functions/ldap-sort.xml By: Andreas Heigl on 2016-02-09 13:37:35 =================================================================== --- en/reference/ldap/functions/ldap-sort.xml +++ en/reference/ldap/functions/ldap-sort.xml @@ -3,7 +3,7 @@ <refentry xml:id='function.ldap-sort' xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>ldap_sort</refname> - <refpurpose>Sort LDAP result entries</refpurpose> + <refpurpose>Sort LDAP result entries on the client side</refpurpose> </refnamediv> <refsect1 role="description"> @@ -18,6 +18,12 @@ Sort the result of a LDAP search, returned by <function>ldap_search</function>. </para> + <para> + As this function sorts the returned values on the client side it is possible that + you might not get the expected results in case you reach the <parameter>sizelimit</parameter> either of the server or + defined within <function>ldap_search</function>. + </para> + &warn.deprecated.feature-7-0-0; </refsect1> <refsect1 role="parameters"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66176 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66176 ------------------------------------------------------------------ Modified: en/reference/info/functions/assert.xml By: anonymous on 2016-02-09 17:35:03 =================================================================== --- en/reference/info/functions/assert.xml +++ en/reference/info/functions/assert.xml @@ -36,7 +36,7 @@ an assertion fails. This means that if you pass a boolean condition as <parameter>assertion</parameter> this condition will not show up as parameter to the assertion function which you may have defined with the - <function>assert_options</function> function, the condition is converted + <function>assert_options</function> function; the condition is converted to a string before calling that handler function, and the boolean &false; is converted as the empty string. </para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66177 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66177 ------------------------------------------------------------------ Modified: en/reference/pcre/pattern.syntax.xml By: Alexander Makarov on 2016-02-16 04:35:33 =================================================================== --- en/reference/pcre/pattern.syntax.xml +++ en/reference/pcre/pattern.syntax.xml @@ -301,6 +301,12 @@ </listitem> </varlistentry> <varlistentry> + <term><emphasis>R</emphasis></term> + <listitem> + <simpara>line break: matches both n, r and rn</simpara> + </listitem> + </varlistentry> + <varlistentry> <term><emphasis>t</emphasis></term> <listitem> <simpara>tab (hex 09)</simpara> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66249 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66249 ------------------------------------------------------------------ Modified: en/reference/stream/functions/stream-socket-enable-crypto.xml By: Stéphane HULARD on 2016-02-22 02:15:43 =================================================================== --- en/reference/stream/functions/stream-socket-enable-crypto.xml +++ en/reference/stream/functions/stream-socket-enable-crypto.xml @@ -57,11 +57,19 @@ <listitem><simpara><constant>STREAM_CRYPTO_METHOD_SSLv2_CLIENT</constant></simpara></listitem> <listitem><simpara><constant>STREAM_CRYPTO_METHOD_SSLv3_CLIENT</constant></simpara></listitem> <listitem><simpara><constant>STREAM_CRYPTO_METHOD_SSLv23_CLIENT</constant></simpara></listitem> + <listitem><simpara><constant>STREAM_CRYPTO_METHOD_ANY_CLIENT</constant></simpara></listitem> <listitem><simpara><constant>STREAM_CRYPTO_METHOD_TLS_CLIENT</constant></simpara></listitem> + <listitem><simpara><constant>STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT</constant></simpara></listitem> + <listitem><simpara><constant>STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT</constant></simpara></listitem> + <listitem><simpara><constant>STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT</constant></simpara></listitem> <listitem><simpara><constant>STREAM_CRYPTO_METHOD_SSLv2_SERVER</constant></simpara></listitem> <listitem><simpara><constant>STREAM_CRYPTO_METHOD_SSLv3_SERVER</constant></simpara></listitem> <listitem><simpara><constant>STREAM_CRYPTO_METHOD_SSLv23_SERVER</constant></simpara></listitem> + <listitem><simpara><constant>STREAM_CRYPTO_METHOD_ANY_SERVER</constant></simpara></listitem> <listitem><simpara><constant>STREAM_CRYPTO_METHOD_TLS_SERVER</constant></simpara></listitem> + <listitem><simpara><constant>STREAM_CRYPTO_METHOD_TLSv1_0_SERVER</constant></simpara></listitem> + <listitem><simpara><constant>STREAM_CRYPTO_METHOD_TLSv1_1_SERVER</constant></simpara></listitem> + <listitem><simpara><constant>STREAM_CRYPTO_METHOD_TLSv1_2_SERVER</constant></simpara></listitem> </itemizedlist> </para> <para> @@ -106,6 +114,12 @@ <row> <entry>5.6.0</entry> <entry> + Introduce <constant>STREAM_CRYPTO_METHOD_ANY_CLIENT</constant>, <constant>STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT</constant>, <constant>STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT</constant>, <constant>STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT</constant>, <constant>STREAM_CRYPTO_METHOD_ANY_SERVER</constant>, <constant>STREAM_CRYPTO_METHOD_TLSv1_0_SERVER</constant>, <constant>STREAM_CRYPTO_METHOD_TLSv1_1_SERVER</constant>, <constant>STREAM_CRYPTO_METHOD_TLSv1_2_SERVER</constant>. + </entry> + </row> + <row> + <entry>5.6.0</entry> + <entry> The <parameter>crypto_type</parameter> is now optional. </entry> </row> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66270 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66270 ------------------------------------------------------------------ Modified: en/language/oop5/autoload.xml By: Ishan Raychaudhuri on 2016-02-23 07:25:03 =================================================================== --- en/language/oop5/autoload.xml +++ en/language/oop5/autoload.xml @@ -11,7 +11,7 @@ <para> In PHP 5, this is no longer necessary. The <function>spl_autoload_register</function> function registers any number of - autloaders, enabling for classes and interfaces to be automatically loaded + autoloaders, enabling for classes and interfaces to be automatically loaded if they are currently not defined. By registering autoloaders, PHP is given a last chance to load the class or interface before it fails with an error. </para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66324 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66324 ------------------------------------------------------------------ Modified: en/reference/errorfunc/functions/set-error-handler.xml By: Oli Griffiths on 2016-02-26 08:43:36 =================================================================== --- en/reference/errorfunc/functions/set-error-handler.xml +++ en/reference/errorfunc/functions/set-error-handler.xml @@ -56,6 +56,16 @@ custom error handler cannot be called since it is not registered at that time. </para> + + <note> + <para> + If a custom error handler is not registered, <constant>E_RECOVERABLE</constant> errors are promoted to <constant>E_ERROR</constant> + and WILL cause the engine to stop executing. + However if a custom error handler is registered, <constant>E_RECOVERABLE</constant> (for example: typehint) errors will NOT cause the engine to stop executing, + and requires custom handling within the registered error handler. + See <link linkend="errorfunc.constants#errorfunc.constants.errorlevels.e-recoverable-error">error constants</link> + </para> + </note> </refsect1> <refsect1 role="parameters"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66342 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66342 ------------------------------------------------------------------ Modified: en/reference/bc/book.xml By: Hans Henrik Bergan on 2016-02-29 09:37:04 =================================================================== --- en/reference/bc/book.xml +++ en/reference/bc/book.xml @@ -11,7 +11,7 @@ &reftitle.intro; <para> For arbitrary precision mathematics PHP offers the Binary Calculator which - supports numbers of any size and precision, represented as strings. + supports numbers of any size and precision up to 2147483647-1 (or 0x7FFFFFFF-1) decimals, represented as strings. </para> </preface> <!-- }}} --> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66350 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66350 ------------------------------------------------------------------ Modified: en/reference/array/functions/array-map.xml By: Pierre-Chanel Gauthier on 2016-03-02 02:10:45 =================================================================== --- en/reference/array/functions/array-map.xml +++ en/reference/array/functions/array-map.xml @@ -32,9 +32,29 @@ <varlistentry> <term><parameter>callback</parameter></term> <listitem> - <para> - Callback function to run for each element in each array. - </para> + <methodsynopsis> + <type>mixed</type><methodname><replaceable>callback</replaceable></methodname> + <methodparam><type>mixed</type><parameter>item1</parameter></methodparam> + <methodparam choice="opt"><type>mixed</type><parameter>itemN</parameter></methodparam> + </methodsynopsis> + <variablelist> + <varlistentry> + <term><parameter>item1</parameter></term> + <listitem> + <para> + Holds the element of the current iteration for <parameter>array1</parameter>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>itemN</parameter></term> + <listitem> + <para> + Holds the element of the current iteration for <parameter>arrayN</parameter>. + </para> + </listitem> + </varlistentry> + </variablelist> </listitem> </varlistentry> <varlistentry> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66360 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66360 ------------------------------------------------------------------ -- https://edit.php.net/ This email is send automatically by the Php Docbook Online Editor.