Grokbase Groups PHP php-doc May 2016
FAQ
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/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/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
@@ -1,5 +1,5 @@
  <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 338832 $ -->
+<!-- $Revision: 334762 $ -->
  <refentry xml:id="pdostatement.execute" xmlns="http://docbook.org/ns/docbook">
   <refnamediv>
    <refname>PDOStatement::execute</refname>
@@ -14,18 +14,13 @@
     <methodparam choice="opt"><type>array</type><parameter>input_parameters</parameter></methodparam>
    </methodsynopsis>
    <para>
- Execute the <link linkend="pdo.prepared-statements">prepared
- statement</link>. If the prepared statement included parameter markers, you
- must either:
+ Execute the prepared statement. If the prepared statement included
+ parameter markers, either:
     <itemizedlist>
- <listitem><para>call <function>PDOStatement::bindParam</function> and/or
- <function>PDOStatement::bindValue</function> to bind either variables or
- values (respectively) to the parameter markers. Bound variables pass
- their value as input and receive the output value, if any, of their
- associated parameter markers</para></listitem>
- <listitem>
- <para>or pass an array of input-only parameter values</para>
- </listitem>
+ <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
+ output value, if any, of their associated parameter markers</para></listitem>
+ <listitem><para>or pass an array of input-only parameter values</para></listitem>
     </itemizedlist>
    </para>
   </refsect1>
@@ -43,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.
@@ -93,18 +87,18 @@

   <refsect1 role="examples">
    &reftitle.examples;
- <example><title>Execute a prepared statement with a bound variable and value</title>
+ <example><title>Execute a prepared statement with bound variables</title>
     <programlisting role="php">
  <![CDATA[
  <?php
-/* Execute a prepared statement by binding a variable and value */
+/* Execute a prepared statement by binding PHP variables */
  $calories = 150;
-$colour = 'gre';
+$colour = 'red';
  $sth = $dbh->prepare('SELECT name, colour, calories
      FROM fruit
- WHERE calories < :calories AND colour LIKE :colour');
+ WHERE calories < :calories AND colour = :colour');
  $sth->bindParam(':calories', $calories, PDO::PARAM_INT);
-$sth->bindValue(':colour', "%{$colour}%");
+$sth->bindParam(':colour', $colour, PDO::PARAM_STR, 12);
  $sth->execute();
  ?>
  ]]>


             => 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/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/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/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

                                           ------------------------------------------------------------------

Modified: en/install/unix/openbsd.xml
By: anonymous on 2016-03-09 06:37:43
===================================================================
--- en/install/unix/openbsd.xml
+++ en/install/unix/openbsd.xml
@@ -4,7 +4,7 @@
   <title>OpenBSD installation notes</title>
   <para>
   This section contains notes and hints specific to installing
- PHP on <link xlink:href="&url.openbsd;">OpenBSD 3.6</link>.
+ PHP on <link xlink:href="&url.openbsd;">OpenBSD 5.8</link>.
   </para>
   <sect2 xml:id="install.unix.openbsd.packages">
    <title>Using Binary Packages</title>
@@ -15,30 +15,29 @@
      The files you need can be found on your OpenBSD CD or on the FTP site.
     </simpara>
     <simpara>
- The main package you need to install is <filename>php4-core-4.3.8.tgz</filename>,
+ The main package you need to install is <filename>php</filename>,
      which contains the basic engine (plus gettext and iconv). Next, take a look
- at the module packages, such as <filename>php4-mysql-4.3.8.tgz</filename>
- or <filename>php4-imap-4.3.8.tgz</filename>. You need to use the <command>phpxs</command>
+ at the module packages, such as <filename>php-mysql</filename>
+ or <filename>php-imap</filename>. You need to use the <command>phpxs</command>
      command to activate and deactivate these modules in your &php.ini;.
     </simpara>
     <example xml:id="install.unix.openbsd.ports.example">
      <title>OpenBSD Package Install Example</title>
      <programlisting role="shell">
  <![CDATA[
-# pkg_add php4-core-4.3.8.tgz
-# /usr/local/sbin/phpxs -s
-# cp /usr/local/share/doc/php4/php.ini-recommended /var/www/conf/php.ini
- (add in mysql)
-# pkg_add php4-mysql-4.3.8.tgz
-# /usr/local/sbin/phpxs -a mysql
- (add in imap)
-# pkg_add php4-imap-4.3.8.tgz
-# /usr/local/sbin/phpxs -a imap
- (remove mysql as a test)
-# pkg_delete php4-mysql-4.3.8
-# /usr/local/sbin/phpxs -r mysql
+# pkg_add php
+# pkg_add php-fpm
+# pkg_add php-mysql
    (install the PEAR libraries)
-# pkg_add php4-pear-4.3.8.tgz
+# pkg_add pear
+
+Follow the instructions shown with each package!
+
+ (to remove packages)
+# pkg_delete php
+# pkg_delete php-fpm
+# pkg_delete php-mysql
+# pkg_delete pear
  ]]>
      </programlisting>
     </example>
@@ -63,7 +62,12 @@
    <title>Common Problems</title>
    <itemizedlist>
     <listitem>
- <simpara>The default install of Apache runs inside a
+ <simpara>Apache and Nginx are no longer the default server on OpenBSD, but they can both be easily
+ found in ports and packages. The new default server is also called 'httpd'.
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>The default install of httpd runs inside a
      <link xlink:href="&url.openbsd.chroot;">chroot(2) jail</link>, which will restrict PHP scripts to
      accessing files under <filename>/var/www</filename>. You will therefore need to create a
      <filename>/var/www/tmp</filename> directory for PHP session files to be stored, or use an
@@ -71,16 +75,14 @@
      jail or listen on the <filename>localhost</filename> interface. If you use network functions,
      some files from <filename>/etc</filename> such as <filename>/etc/resolv.conf</filename> and
      <filename>/etc/services</filename> will need to be moved into <filename>/var/www/etc</filename>.
- The OpenBSD PEAR package automatically installs into the correct chroot directories, so
- no special modification is needed there. More information on the OpenBSD Apache is available
- in the <link xlink:href="&url.openbsd.apachefaq;">OpenBSD FAQ</link>.
+ The OpenBSD PEAR package automatically installs into the correct chroot directories.
      </simpara>
     </listitem>
     <listitem>
      <simpara>
- The OpenBSD 3.6 package for the <link xlink:href="&url.gd;">gd</link> extension requires
- XFree86 to be installed. If you do not wish to use some of the font features that
- require X11, install the <filename>php4-gd-4.3.8-no_x11.tgz</filename> package instead.
+ The OpenBSD 5.7+ package for the <link xlink:href="&url.gd;">gd</link> extension requires
+ XFree86 to be installed. This can be added post-installation (See OpenBSD FAQ#4) by adding
+ the <filename>xbase.tgz</filename> file set.
      </simpara>
     </listitem>
    </itemizedlist>


             => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66393
             => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66393

                                           ------------------------------------------------------------------

Modified: en/appendices/migration70/incompatible/other.xml
By: Matthieu Napoli on 2016-03-21 02:47:47
===================================================================
--- en/appendices/migration70/incompatible/other.xml
+++ en/appendices/migration70/incompatible/other.xml
@@ -278,13 +278,14 @@
    <title>JSON extension replaced with JSOND</title>

    <para>
- The JSON extension has been replaced with JSOND, causing two minor BC
+ The JSON extension has been replaced with JSOND, causing 3 minor BC
     breaks. Firstly, a number must not end in a decimal point (i.e.
     <literal>34.</literal> must be changed to either <literal>34.0</literal> or
     <literal>34</literal>). Secondly, when using scientific notation, the
     <literal>e</literal> exponent must not immediately follow a decimal point
     (i.e. <literal>3.e3</literal> must be changed to either
- <literal>3.0e3</literal> or <literal>3e3</literal>).
+ <literal>3.0e3</literal> or <literal>3e3</literal>). Finally an empty
+ string is no longer considered as valid JSON.
    </para>
   </sect3>



             => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66508
             => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66508

                                           ------------------------------------------------------------------

Modified: en/reference/strings/functions/explode.xml
By: Jay Paroline on 2016-03-23 17:21:38
===================================================================
--- en/reference/strings/functions/explode.xml
+++ en/reference/strings/functions/explode.xml
@@ -150,8 +150,10 @@
  */
  $input1 = "hello";
  $input2 = "hello,there";
+$input3 = ',';
  var_dump( explode( ',', $input1 ) );
  var_dump( explode( ',', $input2 ) );
+var_dump( explode( ',', $input3 ) );

  ?>
  ]]>
@@ -168,6 +170,11 @@
      [0] => string(5) "hello"
      [1] => string(5) "there"
  )
+array(2)
+(
+ [0] => string(0) ""
+ [1] => string(0) ""
+)
  ]]>
      </screen>
     </example>


             => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66522
             => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66522

                                           ------------------------------------------------------------------

Modified: en/reference/solr/solrquery/sethighlightregexslop.xml
By: gunbei on 2016-03-28 09:00:17
===================================================================
--- en/reference/solr/solrquery/sethighlightregexslop.xml
+++ en/reference/solr/solrquery/sethighlightregexslop.xml
@@ -14,7 +14,7 @@
     <methodparam><type>float</type><parameter>factor</parameter></methodparam>
    </methodsynopsis>
    <para>
- The factor by which the regex fragmenter can stray from the ideal fragment size ( specfied by SolrQuery::setHighlightFragsize )to accomodate the regular expression
+ The factor by which the regex fragmenter can stray from the ideal fragment size ( specfied by SolrQuery::setHighlightFragsize )to accommodate the regular expression
    </para>

   </refsect1>


             => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66612
             => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66612

                                           ------------------------------------------------------------------

Modified: en/reference/session/functions/session-encode.xml
By: on 2016-03-31 17:04:33
===================================================================
--- en/reference/session/functions/session-encode.xml
+++ en/reference/session/functions/session-encode.xml
@@ -17,8 +17,8 @@
     contents of the current session data stored in the $_SESSION superglobal.
    </para>
    <para>
- Please note, the serialization method is not the same as <function>serialize</function>.
- The serialization method is internal to PHP and can be set using <link linkend="ini.session.serialize-handler">session.serialize_handler</link>.
+ By default, the serialization method used is internal to PHP, and is not the same as <function>serialize</function>.
+ The serialization method can be set using <link linkend="ini.session.serialize-handler">session.serialize_handler</link>.
    </para>
   </refsect1>



             => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66654
             => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66654

                                           ------------------------------------------------------------------

Modified: en/reference/session/functions/session-decode.xml
By: on 2016-03-31 17:07:31
===================================================================
--- en/reference/session/functions/session-decode.xml
+++ en/reference/session/functions/session-decode.xml
@@ -18,9 +18,8 @@
     with the result.
    </para>
    <para>
- Please note the unserialization method is not the same as <function>unserialize</function>.
- The serialization method is internal to PHP and can be set using
- <link linkend="ini.session.serialize-handler">session.serialize_handler</link>.
+ By default, the unserialization method used is internal to PHP, and is not the same as <function>unserialize</function>.
+ The serialization method can be set using <link linkend="ini.session.serialize-handler">session.serialize_handler</link>.
    </para>
   </refsect1>



             => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66655
             => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66655

                                           ------------------------------------------------------------------

Modified: en/reference/array/functions/array-filter.xml
By: Jesse Donat on 2016-04-04 10:13:45
===================================================================
--- en/reference/array/functions/array-filter.xml
+++ en/reference/array/functions/array-filter.xml
@@ -240,6 +240,12 @@
      added, deleted or unset) the behavior of this function is undefined.
     </para>
    </caution>
+
+ <caution>
+ <para>
+ As of PHP7 the value of the callback may no longer be used by reference.
+ </para>
+ </caution>
   </refsect1>

   <refsect1 role="seealso">


             => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66717
             => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66717

                                           ------------------------------------------------------------------

Modified: en/reference/array/functions/array-key-exists.xml
By: Nikolay Labinskiy on 2016-04-09 00:54:42
===================================================================
--- en/reference/array/functions/array-key-exists.xml
+++ en/reference/array/functions/array-key-exists.xml
@@ -50,6 +50,12 @@
    <para>
     &return.success;
    </para>
+ <caution>
+ <para>
+ <function>array_key_exists</function> will search for the kyes in first dimention only.
+ Nested kyes in multidimensional arrays will not be found.
+ </para>
+ </caution>
   </refsect1>

   <refsect1 role="examples">


             => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66777
             => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66777

                                           ------------------------------------------------------------------

Modified: en/reference/array/functions/array-multisort.xml
By: Juris on 2016-04-09 13:33:47
===================================================================
--- en/reference/array/functions/array-multisort.xml
+++ en/reference/array/functions/array-multisort.xml
@@ -262,7 +262,7 @@
      </screen>
      <para>
       The data as an array, called <varname>data</varname>. This would usually,
- for example, be obtained by looping with <function>mysql_fetch_assoc</function>.
+ for example, be obtained by looping with <function>mysqli_fetch_assoc</function>.
      </para>
      <programlisting role="php">
  <![CDATA[


             => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66788
             => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66788

                                           ------------------------------------------------------------------

Modified: en/language/oop5/interfaces.xml
By: Roscius on 2016-04-12 14:14:10
===================================================================
--- en/language/oop5/interfaces.xml
+++ en/language/oop5/interfaces.xml
@@ -8,9 +8,9 @@
     handled.
    </para>
    <para>
- Interfaces are defined using the <literal>interface</literal> keyword, in the same way as a
- standard class, but without any of the methods having their contents
- defined.
+ Interfaces are defined in the same was as a class, but with the <literal>interface</literal>
+ keyword replacing the <literal>class</literal> keyword and without any of the methods having
+ their contents defined.
    </para>
    <para>
     All methods declared in an interface must be public; this is the nature of an


             => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66859
             => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66859

                                           ------------------------------------------------------------------

Modified: en/reference/gmagick/gmagick/write.xml
By: Dan Brooks on 2016-04-12 20:19:29
===================================================================
--- en/reference/gmagick/gmagick/write.xml
+++ en/reference/gmagick/gmagick/write.xml
@@ -2,54 +2,17 @@
  <!-- $Revision: 288721 $ -->

  <refentry xml:id="gmagick.write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+
   <refnamediv>
    <refname>Gmagick::write</refname>
- <refpurpose>Writes an image to the specified filename</refpurpose>
+ <refpurpose>&Alias; <methodname>Gmagick::writeimage</methodname></refpurpose>
   </refnamediv>

   <refsect1 role="description">
    &reftitle.description;
- <methodsynopsis>
- <modifier>public</modifier> <type>void</type><methodname>Gmagick::write</methodname>
- <methodparam><type>string</type><parameter>filename</parameter></methodparam>
- </methodsynopsis>
- <para>
- Writes an image to the specified filename. If the filename parameter is NULL,
-the image is written to the filename set by Gmagick::ReadImage() or Gmagick::SetImageFilename().
- </para>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <para>
- <variablelist>
- <varlistentry>
- <term><parameter>filename</parameter></term>
- <listitem>
- <para>
- The image filename.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
- &reftitle.returnvalues;
- <para>
- The Gmagick object
- </para>
- </refsect1>
-
- <refsect1 role="errors">
- &reftitle.errors;
- <para>
- &gmagick.gmagickexception.throw;
- </para>
+ <simpara>
+ This method is an alias of <methodname>Gmagick::writeimage</methodname>.
+ </simpara>
   </refsect1>

  </refentry>


             => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66863
             => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66863

                                           ------------------------------------------------------------------

Modified: en/reference/sockets/functions/socket-sendmsg.xml
By: mekras on 2016-04-18 05:48:21
===================================================================
--- en/reference/sockets/functions/socket-sendmsg.xml
+++ en/reference/sockets/functions/socket-sendmsg.xml
@@ -8,7 +8,7 @@
   <refsect1 role="description">
    &reftitle.description;
    <methodsynopsis>
- <type>int</type><methodname>socket_sendmsg</methodname>
+ <type>mixed</type><methodname>socket_sendmsg</methodname>
     <methodparam><type>resource</type><parameter>socket</parameter></methodparam>
     <methodparam><type>array</type><parameter>message</parameter></methodparam>
     <methodparam><type>int</type><parameter>flags</parameter></methodparam>
@@ -50,6 +50,7 @@
   <refsect1 role="returnvalues">
    &reftitle.returnvalues;
    <para>
+ Returns the number of characters sent, or &false; on failure.
    </para>
   </refsect1>



             => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66964
             => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66964

                                           ------------------------------------------------------------------




--
https://edit.php.net/
This email is send automatically by the Php Docbook Online Editor.

Search Discussions

  • Phpdoc at May 9, 2016 at 3:17 pm
    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/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/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
    @@ -1,5 +1,5 @@
      <?xml version="1.0" encoding="utf-8"?>
    -<!-- $Revision: 338832 $ -->
    +<!-- $Revision: 334762 $ -->
      <refentry xml:id="pdostatement.execute" xmlns="http://docbook.org/ns/docbook">
       <refnamediv>
        <refname>PDOStatement::execute</refname>
    @@ -14,18 +14,13 @@
         <methodparam choice="opt"><type>array</type><parameter>input_parameters</parameter></methodparam>
        </methodsynopsis>
        <para>
    - Execute the <link linkend="pdo.prepared-statements">prepared
    - statement</link>. If the prepared statement included parameter markers, you
    - must either:
    + Execute the prepared statement. If the prepared statement included
    + parameter markers, either:
         <itemizedlist>
    - <listitem><para>call <function>PDOStatement::bindParam</function> and/or
    - <function>PDOStatement::bindValue</function> to bind either variables or
    - values (respectively) to the parameter markers. Bound variables pass
    - their value as input and receive the output value, if any, of their
    - associated parameter markers</para></listitem>
    - <listitem>
    - <para>or pass an array of input-only parameter values</para>
    - </listitem>
    + <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
    + output value, if any, of their associated parameter markers</para></listitem>
    + <listitem><para>or pass an array of input-only parameter values</para></listitem>
         </itemizedlist>
        </para>
       </refsect1>
    @@ -43,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.
    @@ -93,18 +87,18 @@

       <refsect1 role="examples">
        &reftitle.examples;
    - <example><title>Execute a prepared statement with a bound variable and value</title>
    + <example><title>Execute a prepared statement with bound variables</title>
         <programlisting role="php">
      <![CDATA[
      <?php
    -/* Execute a prepared statement by binding a variable and value */
    +/* Execute a prepared statement by binding PHP variables */
      $calories = 150;
    -$colour = 'gre';
    +$colour = 'red';
      $sth = $dbh->prepare('SELECT name, colour, calories
          FROM fruit
    - WHERE calories < :calories AND colour LIKE :colour');
    + WHERE calories < :calories AND colour = :colour');
      $sth->bindParam(':calories', $calories, PDO::PARAM_INT);
    -$sth->bindValue(':colour', "%{$colour}%");
    +$sth->bindParam(':colour', $colour, PDO::PARAM_STR, 12);
      $sth->execute();
      ?>
      ]]>


                 => 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/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/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/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

                                               ------------------------------------------------------------------

    Modified: en/install/unix/openbsd.xml
    By: anonymous on 2016-03-09 06:37:43
    ===================================================================
    --- en/install/unix/openbsd.xml
    +++ en/install/unix/openbsd.xml
    @@ -4,7 +4,7 @@
       <title>OpenBSD installation notes</title>
       <para>
       This section contains notes and hints specific to installing
    - PHP on <link xlink:href="&url.openbsd;">OpenBSD 3.6</link>.
    + PHP on <link xlink:href="&url.openbsd;">OpenBSD 5.8</link>.
       </para>
       <sect2 xml:id="install.unix.openbsd.packages">
        <title>Using Binary Packages</title>
    @@ -15,30 +15,29 @@
          The files you need can be found on your OpenBSD CD or on the FTP site.
         </simpara>
         <simpara>
    - The main package you need to install is <filename>php4-core-4.3.8.tgz</filename>,
    + The main package you need to install is <filename>php</filename>,
          which contains the basic engine (plus gettext and iconv). Next, take a look
    - at the module packages, such as <filename>php4-mysql-4.3.8.tgz</filename>
    - or <filename>php4-imap-4.3.8.tgz</filename>. You need to use the <command>phpxs</command>
    + at the module packages, such as <filename>php-mysql</filename>
    + or <filename>php-imap</filename>. You need to use the <command>phpxs</command>
          command to activate and deactivate these modules in your &php.ini;.
         </simpara>
         <example xml:id="install.unix.openbsd.ports.example">
          <title>OpenBSD Package Install Example</title>
          <programlisting role="shell">
      <![CDATA[
    -# pkg_add php4-core-4.3.8.tgz
    -# /usr/local/sbin/phpxs -s
    -# cp /usr/local/share/doc/php4/php.ini-recommended /var/www/conf/php.ini
    - (add in mysql)
    -# pkg_add php4-mysql-4.3.8.tgz
    -# /usr/local/sbin/phpxs -a mysql
    - (add in imap)
    -# pkg_add php4-imap-4.3.8.tgz
    -# /usr/local/sbin/phpxs -a imap
    - (remove mysql as a test)
    -# pkg_delete php4-mysql-4.3.8
    -# /usr/local/sbin/phpxs -r mysql
    +# pkg_add php
    +# pkg_add php-fpm
    +# pkg_add php-mysql
        (install the PEAR libraries)
    -# pkg_add php4-pear-4.3.8.tgz
    +# pkg_add pear
    +
    +Follow the instructions shown with each package!
    +
    + (to remove packages)
    +# pkg_delete php
    +# pkg_delete php-fpm
    +# pkg_delete php-mysql
    +# pkg_delete pear
      ]]>
          </programlisting>
         </example>
    @@ -63,7 +62,12 @@
        <title>Common Problems</title>
        <itemizedlist>
         <listitem>
    - <simpara>The default install of Apache runs inside a
    + <simpara>Apache and Nginx are no longer the default server on OpenBSD, but they can both be easily
    + found in ports and packages. The new default server is also called 'httpd'.
    + </simpara>
    + </listitem>
    + <listitem>
    + <simpara>The default install of httpd runs inside a
          <link xlink:href="&url.openbsd.chroot;">chroot(2) jail</link>, which will restrict PHP scripts to
          accessing files under <filename>/var/www</filename>. You will therefore need to create a
          <filename>/var/www/tmp</filename> directory for PHP session files to be stored, or use an
    @@ -71,16 +75,14 @@
          jail or listen on the <filename>localhost</filename> interface. If you use network functions,
          some files from <filename>/etc</filename> such as <filename>/etc/resolv.conf</filename> and
          <filename>/etc/services</filename> will need to be moved into <filename>/var/www/etc</filename>.
    - The OpenBSD PEAR package automatically installs into the correct chroot directories, so
    - no special modification is needed there. More information on the OpenBSD Apache is available
    - in the <link xlink:href="&url.openbsd.apachefaq;">OpenBSD FAQ</link>.
    + The OpenBSD PEAR package automatically installs into the correct chroot directories.
          </simpara>
         </listitem>
         <listitem>
          <simpara>
    - The OpenBSD 3.6 package for the <link xlink:href="&url.gd;">gd</link> extension requires
    - XFree86 to be installed. If you do not wish to use some of the font features that
    - require X11, install the <filename>php4-gd-4.3.8-no_x11.tgz</filename> package instead.
    + The OpenBSD 5.7+ package for the <link xlink:href="&url.gd;">gd</link> extension requires
    + XFree86 to be installed. This can be added post-installation (See OpenBSD FAQ#4) by adding
    + the <filename>xbase.tgz</filename> file set.
          </simpara>
         </listitem>
        </itemizedlist>


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66393
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66393

                                               ------------------------------------------------------------------

    Modified: en/appendices/migration70/incompatible/other.xml
    By: Matthieu Napoli on 2016-03-21 02:47:47
    ===================================================================
    --- en/appendices/migration70/incompatible/other.xml
    +++ en/appendices/migration70/incompatible/other.xml
    @@ -278,13 +278,14 @@
        <title>JSON extension replaced with JSOND</title>

        <para>
    - The JSON extension has been replaced with JSOND, causing two minor BC
    + The JSON extension has been replaced with JSOND, causing 3 minor BC
         breaks. Firstly, a number must not end in a decimal point (i.e.
         <literal>34.</literal> must be changed to either <literal>34.0</literal> or
         <literal>34</literal>). Secondly, when using scientific notation, the
         <literal>e</literal> exponent must not immediately follow a decimal point
         (i.e. <literal>3.e3</literal> must be changed to either
    - <literal>3.0e3</literal> or <literal>3e3</literal>).
    + <literal>3.0e3</literal> or <literal>3e3</literal>). Finally an empty
    + string is no longer considered as valid JSON.
        </para>
       </sect3>



                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66508
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66508

                                               ------------------------------------------------------------------

    Modified: en/reference/strings/functions/explode.xml
    By: Jay Paroline on 2016-03-23 17:21:38
    ===================================================================
    --- en/reference/strings/functions/explode.xml
    +++ en/reference/strings/functions/explode.xml
    @@ -150,8 +150,10 @@
      */
      $input1 = "hello";
      $input2 = "hello,there";
    +$input3 = ',';
      var_dump( explode( ',', $input1 ) );
      var_dump( explode( ',', $input2 ) );
    +var_dump( explode( ',', $input3 ) );

      ?>
      ]]>
    @@ -168,6 +170,11 @@
          [0] => string(5) "hello"
          [1] => string(5) "there"
      )
    +array(2)
    +(
    + [0] => string(0) ""
    + [1] => string(0) ""
    +)
      ]]>
          </screen>
         </example>


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66522
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66522

                                               ------------------------------------------------------------------

    Modified: en/reference/solr/solrquery/sethighlightregexslop.xml
    By: gunbei on 2016-03-28 09:00:17
    ===================================================================
    --- en/reference/solr/solrquery/sethighlightregexslop.xml
    +++ en/reference/solr/solrquery/sethighlightregexslop.xml
    @@ -14,7 +14,7 @@
         <methodparam><type>float</type><parameter>factor</parameter></methodparam>
        </methodsynopsis>
        <para>
    - The factor by which the regex fragmenter can stray from the ideal fragment size ( specfied by SolrQuery::setHighlightFragsize )to accomodate the regular expression
    + The factor by which the regex fragmenter can stray from the ideal fragment size ( specfied by SolrQuery::setHighlightFragsize )to accommodate the regular expression
        </para>

       </refsect1>


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66612
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66612

                                               ------------------------------------------------------------------

    Modified: en/reference/session/functions/session-encode.xml
    By: on 2016-03-31 17:04:33
    ===================================================================
    --- en/reference/session/functions/session-encode.xml
    +++ en/reference/session/functions/session-encode.xml
    @@ -17,8 +17,8 @@
         contents of the current session data stored in the $_SESSION superglobal.
        </para>
        <para>
    - Please note, the serialization method is not the same as <function>serialize</function>.
    - The serialization method is internal to PHP and can be set using <link linkend="ini.session.serialize-handler">session.serialize_handler</link>.
    + By default, the serialization method used is internal to PHP, and is not the same as <function>serialize</function>.
    + The serialization method can be set using <link linkend="ini.session.serialize-handler">session.serialize_handler</link>.
        </para>
       </refsect1>



                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66654
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66654

                                               ------------------------------------------------------------------

    Modified: en/reference/session/functions/session-decode.xml
    By: on 2016-03-31 17:07:31
    ===================================================================
    --- en/reference/session/functions/session-decode.xml
    +++ en/reference/session/functions/session-decode.xml
    @@ -18,9 +18,8 @@
         with the result.
        </para>
        <para>
    - Please note the unserialization method is not the same as <function>unserialize</function>.
    - The serialization method is internal to PHP and can be set using
    - <link linkend="ini.session.serialize-handler">session.serialize_handler</link>.
    + By default, the unserialization method used is internal to PHP, and is not the same as <function>unserialize</function>.
    + The serialization method can be set using <link linkend="ini.session.serialize-handler">session.serialize_handler</link>.
        </para>
       </refsect1>



                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66655
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66655

                                               ------------------------------------------------------------------

    Modified: en/reference/array/functions/array-filter.xml
    By: Jesse Donat on 2016-04-04 10:13:45
    ===================================================================
    --- en/reference/array/functions/array-filter.xml
    +++ en/reference/array/functions/array-filter.xml
    @@ -240,6 +240,12 @@
          added, deleted or unset) the behavior of this function is undefined.
         </para>
        </caution>
    +
    + <caution>
    + <para>
    + As of PHP7 the value of the callback may no longer be used by reference.
    + </para>
    + </caution>
       </refsect1>

       <refsect1 role="seealso">


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66717
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66717

                                               ------------------------------------------------------------------

    Modified: en/reference/array/functions/array-key-exists.xml
    By: Nikolay Labinskiy on 2016-04-09 00:54:42
    ===================================================================
    --- en/reference/array/functions/array-key-exists.xml
    +++ en/reference/array/functions/array-key-exists.xml
    @@ -50,6 +50,12 @@
        <para>
         &return.success;
        </para>
    + <caution>
    + <para>
    + <function>array_key_exists</function> will search for the kyes in first dimention only.
    + Nested kyes in multidimensional arrays will not be found.
    + </para>
    + </caution>
       </refsect1>

       <refsect1 role="examples">


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66777
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66777

                                               ------------------------------------------------------------------

    Modified: en/reference/array/functions/array-multisort.xml
    By: Juris on 2016-04-09 13:33:47
    ===================================================================
    --- en/reference/array/functions/array-multisort.xml
    +++ en/reference/array/functions/array-multisort.xml
    @@ -262,7 +262,7 @@
          </screen>
          <para>
           The data as an array, called <varname>data</varname>. This would usually,
    - for example, be obtained by looping with <function>mysql_fetch_assoc</function>.
    + for example, be obtained by looping with <function>mysqli_fetch_assoc</function>.
          </para>
          <programlisting role="php">
      <![CDATA[


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66788
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66788

                                               ------------------------------------------------------------------

    Modified: en/language/oop5/interfaces.xml
    By: Roscius on 2016-04-12 14:14:10
    ===================================================================
    --- en/language/oop5/interfaces.xml
    +++ en/language/oop5/interfaces.xml
    @@ -8,9 +8,9 @@
         handled.
        </para>
        <para>
    - Interfaces are defined using the <literal>interface</literal> keyword, in the same way as a
    - standard class, but without any of the methods having their contents
    - defined.
    + Interfaces are defined in the same was as a class, but with the <literal>interface</literal>
    + keyword replacing the <literal>class</literal> keyword and without any of the methods having
    + their contents defined.
        </para>
        <para>
         All methods declared in an interface must be public; this is the nature of an


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66859
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66859

                                               ------------------------------------------------------------------

    Modified: en/reference/gmagick/gmagick/write.xml
    By: Dan Brooks on 2016-04-12 20:19:29
    ===================================================================
    --- en/reference/gmagick/gmagick/write.xml
    +++ en/reference/gmagick/gmagick/write.xml
    @@ -2,54 +2,17 @@
      <!-- $Revision: 288721 $ -->

      <refentry xml:id="gmagick.write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
    +
       <refnamediv>
        <refname>Gmagick::write</refname>
    - <refpurpose>Writes an image to the specified filename</refpurpose>
    + <refpurpose>&Alias; <methodname>Gmagick::writeimage</methodname></refpurpose>
       </refnamediv>

       <refsect1 role="description">
        &reftitle.description;
    - <methodsynopsis>
    - <modifier>public</modifier> <type>void</type><methodname>Gmagick::write</methodname>
    - <methodparam><type>string</type><parameter>filename</parameter></methodparam>
    - </methodsynopsis>
    - <para>
    - Writes an image to the specified filename. If the filename parameter is NULL,
    -the image is written to the filename set by Gmagick::ReadImage() or Gmagick::SetImageFilename().
    - </para>
    -
    -
    -
    - </refsect1>
    -
    - <refsect1 role="parameters">
    - &reftitle.parameters;
    - <para>
    - <variablelist>
    - <varlistentry>
    - <term><parameter>filename</parameter></term>
    - <listitem>
    - <para>
    - The image filename.
    - </para>
    - </listitem>
    - </varlistentry>
    - </variablelist>
    - </para>
    - </refsect1>
    -
    - <refsect1 role="returnvalues">
    - &reftitle.returnvalues;
    - <para>
    - The Gmagick object
    - </para>
    - </refsect1>
    -
    - <refsect1 role="errors">
    - &reftitle.errors;
    - <para>
    - &gmagick.gmagickexception.throw;
    - </para>
    + <simpara>
    + This method is an alias of <methodname>Gmagick::writeimage</methodname>.
    + </simpara>
       </refsect1>

      </refentry>


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66863
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66863

                                               ------------------------------------------------------------------

    Modified: en/reference/sockets/functions/socket-sendmsg.xml
    By: mekras on 2016-04-18 05:48:21
    ===================================================================
    --- en/reference/sockets/functions/socket-sendmsg.xml
    +++ en/reference/sockets/functions/socket-sendmsg.xml
    @@ -8,7 +8,7 @@
       <refsect1 role="description">
        &reftitle.description;
        <methodsynopsis>
    - <type>int</type><methodname>socket_sendmsg</methodname>
    + <type>mixed</type><methodname>socket_sendmsg</methodname>
         <methodparam><type>resource</type><parameter>socket</parameter></methodparam>
         <methodparam><type>array</type><parameter>message</parameter></methodparam>
         <methodparam><type>int</type><parameter>flags</parameter></methodparam>
    @@ -50,6 +50,7 @@
       <refsect1 role="returnvalues">
        &reftitle.returnvalues;
        <para>
    + Returns the number of characters sent, or &false; on failure.
        </para>
       </refsect1>



                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66964
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66964

                                               ------------------------------------------------------------------




    --
    https://edit.php.net/
    This email is send automatically by the Php Docbook Online Editor.
  • Phpdoc at May 16, 2016 at 2:48 pm
    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/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/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
    @@ -1,5 +1,5 @@
      <?xml version="1.0" encoding="utf-8"?>
    -<!-- $Revision: 338832 $ -->
    +<!-- $Revision: 334762 $ -->
      <refentry xml:id="pdostatement.execute" xmlns="http://docbook.org/ns/docbook">
       <refnamediv>
        <refname>PDOStatement::execute</refname>
    @@ -14,18 +14,13 @@
         <methodparam choice="opt"><type>array</type><parameter>input_parameters</parameter></methodparam>
        </methodsynopsis>
        <para>
    - Execute the <link linkend="pdo.prepared-statements">prepared
    - statement</link>. If the prepared statement included parameter markers, you
    - must either:
    + Execute the prepared statement. If the prepared statement included
    + parameter markers, either:
         <itemizedlist>
    - <listitem><para>call <function>PDOStatement::bindParam</function> and/or
    - <function>PDOStatement::bindValue</function> to bind either variables or
    - values (respectively) to the parameter markers. Bound variables pass
    - their value as input and receive the output value, if any, of their
    - associated parameter markers</para></listitem>
    - <listitem>
    - <para>or pass an array of input-only parameter values</para>
    - </listitem>
    + <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
    + output value, if any, of their associated parameter markers</para></listitem>
    + <listitem><para>or pass an array of input-only parameter values</para></listitem>
         </itemizedlist>
        </para>
       </refsect1>
    @@ -43,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.
    @@ -93,18 +87,18 @@

       <refsect1 role="examples">
        &reftitle.examples;
    - <example><title>Execute a prepared statement with a bound variable and value</title>
    + <example><title>Execute a prepared statement with bound variables</title>
         <programlisting role="php">
      <![CDATA[
      <?php
    -/* Execute a prepared statement by binding a variable and value */
    +/* Execute a prepared statement by binding PHP variables */
      $calories = 150;
    -$colour = 'gre';
    +$colour = 'red';
      $sth = $dbh->prepare('SELECT name, colour, calories
          FROM fruit
    - WHERE calories < :calories AND colour LIKE :colour');
    + WHERE calories < :calories AND colour = :colour');
      $sth->bindParam(':calories', $calories, PDO::PARAM_INT);
    -$sth->bindValue(':colour', "%{$colour}%");
    +$sth->bindParam(':colour', $colour, PDO::PARAM_STR, 12);
      $sth->execute();
      ?>
      ]]>


                 => 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/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/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/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

                                               ------------------------------------------------------------------

    Modified: en/appendices/migration70/incompatible/other.xml
    By: Matthieu Napoli on 2016-03-21 02:47:47
    ===================================================================
    --- en/appendices/migration70/incompatible/other.xml
    +++ en/appendices/migration70/incompatible/other.xml
    @@ -278,13 +278,14 @@
        <title>JSON extension replaced with JSOND</title>

        <para>
    - The JSON extension has been replaced with JSOND, causing two minor BC
    + The JSON extension has been replaced with JSOND, causing 3 minor BC
         breaks. Firstly, a number must not end in a decimal point (i.e.
         <literal>34.</literal> must be changed to either <literal>34.0</literal> or
         <literal>34</literal>). Secondly, when using scientific notation, the
         <literal>e</literal> exponent must not immediately follow a decimal point
         (i.e. <literal>3.e3</literal> must be changed to either
    - <literal>3.0e3</literal> or <literal>3e3</literal>).
    + <literal>3.0e3</literal> or <literal>3e3</literal>). Finally an empty
    + string is no longer considered as valid JSON.
        </para>
       </sect3>



                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66508
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66508

                                               ------------------------------------------------------------------

    Modified: en/reference/strings/functions/explode.xml
    By: Jay Paroline on 2016-03-23 17:21:38
    ===================================================================
    --- en/reference/strings/functions/explode.xml
    +++ en/reference/strings/functions/explode.xml
    @@ -150,8 +150,10 @@
      */
      $input1 = "hello";
      $input2 = "hello,there";
    +$input3 = ',';
      var_dump( explode( ',', $input1 ) );
      var_dump( explode( ',', $input2 ) );
    +var_dump( explode( ',', $input3 ) );

      ?>
      ]]>
    @@ -168,6 +170,11 @@
          [0] => string(5) "hello"
          [1] => string(5) "there"
      )
    +array(2)
    +(
    + [0] => string(0) ""
    + [1] => string(0) ""
    +)
      ]]>
          </screen>
         </example>


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66522
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66522

                                               ------------------------------------------------------------------

    Modified: en/reference/solr/solrquery/sethighlightregexslop.xml
    By: gunbei on 2016-03-28 09:00:17
    ===================================================================
    --- en/reference/solr/solrquery/sethighlightregexslop.xml
    +++ en/reference/solr/solrquery/sethighlightregexslop.xml
    @@ -14,7 +14,7 @@
         <methodparam><type>float</type><parameter>factor</parameter></methodparam>
        </methodsynopsis>
        <para>
    - The factor by which the regex fragmenter can stray from the ideal fragment size ( specfied by SolrQuery::setHighlightFragsize )to accomodate the regular expression
    + The factor by which the regex fragmenter can stray from the ideal fragment size ( specfied by SolrQuery::setHighlightFragsize )to accommodate the regular expression
        </para>

       </refsect1>


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66612
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66612

                                               ------------------------------------------------------------------

    Modified: en/reference/session/functions/session-encode.xml
    By: on 2016-03-31 17:04:33
    ===================================================================
    --- en/reference/session/functions/session-encode.xml
    +++ en/reference/session/functions/session-encode.xml
    @@ -17,8 +17,8 @@
         contents of the current session data stored in the $_SESSION superglobal.
        </para>
        <para>
    - Please note, the serialization method is not the same as <function>serialize</function>.
    - The serialization method is internal to PHP and can be set using <link linkend="ini.session.serialize-handler">session.serialize_handler</link>.
    + By default, the serialization method used is internal to PHP, and is not the same as <function>serialize</function>.
    + The serialization method can be set using <link linkend="ini.session.serialize-handler">session.serialize_handler</link>.
        </para>
       </refsect1>



                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66654
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66654

                                               ------------------------------------------------------------------

    Modified: en/reference/session/functions/session-decode.xml
    By: on 2016-03-31 17:07:31
    ===================================================================
    --- en/reference/session/functions/session-decode.xml
    +++ en/reference/session/functions/session-decode.xml
    @@ -18,9 +18,8 @@
         with the result.
        </para>
        <para>
    - Please note the unserialization method is not the same as <function>unserialize</function>.
    - The serialization method is internal to PHP and can be set using
    - <link linkend="ini.session.serialize-handler">session.serialize_handler</link>.
    + By default, the unserialization method used is internal to PHP, and is not the same as <function>unserialize</function>.
    + The serialization method can be set using <link linkend="ini.session.serialize-handler">session.serialize_handler</link>.
        </para>
       </refsect1>



                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66655
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66655

                                               ------------------------------------------------------------------

    Modified: en/reference/array/functions/array-filter.xml
    By: Jesse Donat on 2016-04-04 10:13:45
    ===================================================================
    --- en/reference/array/functions/array-filter.xml
    +++ en/reference/array/functions/array-filter.xml
    @@ -240,6 +240,12 @@
          added, deleted or unset) the behavior of this function is undefined.
         </para>
        </caution>
    +
    + <caution>
    + <para>
    + As of PHP7 the value of the callback may no longer be used by reference.
    + </para>
    + </caution>
       </refsect1>

       <refsect1 role="seealso">


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66717
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66717

                                               ------------------------------------------------------------------

    Modified: en/reference/array/functions/array-key-exists.xml
    By: Nikolay Labinskiy on 2016-04-09 00:54:42
    ===================================================================
    --- en/reference/array/functions/array-key-exists.xml
    +++ en/reference/array/functions/array-key-exists.xml
    @@ -50,6 +50,12 @@
        <para>
         &return.success;
        </para>
    + <caution>
    + <para>
    + <function>array_key_exists</function> will search for the kyes in first dimention only.
    + Nested kyes in multidimensional arrays will not be found.
    + </para>
    + </caution>
       </refsect1>

       <refsect1 role="examples">


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66777
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66777

                                               ------------------------------------------------------------------

    Modified: en/reference/array/functions/array-multisort.xml
    By: Juris on 2016-04-09 13:33:47
    ===================================================================
    --- en/reference/array/functions/array-multisort.xml
    +++ en/reference/array/functions/array-multisort.xml
    @@ -262,7 +262,7 @@
          </screen>
          <para>
           The data as an array, called <varname>data</varname>. This would usually,
    - for example, be obtained by looping with <function>mysql_fetch_assoc</function>.
    + for example, be obtained by looping with <function>mysqli_fetch_assoc</function>.
          </para>
          <programlisting role="php">
      <![CDATA[


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66788
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66788

                                               ------------------------------------------------------------------

    Modified: en/language/oop5/interfaces.xml
    By: Roscius on 2016-04-12 14:14:10
    ===================================================================
    --- en/language/oop5/interfaces.xml
    +++ en/language/oop5/interfaces.xml
    @@ -8,9 +8,9 @@
         handled.
        </para>
        <para>
    - Interfaces are defined using the <literal>interface</literal> keyword, in the same way as a
    - standard class, but without any of the methods having their contents
    - defined.
    + Interfaces are defined in the same was as a class, but with the <literal>interface</literal>
    + keyword replacing the <literal>class</literal> keyword and without any of the methods having
    + their contents defined.
        </para>
        <para>
         All methods declared in an interface must be public; this is the nature of an


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66859
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66859

                                               ------------------------------------------------------------------

    Modified: en/reference/gmagick/gmagick/write.xml
    By: Dan Brooks on 2016-04-12 20:19:29
    ===================================================================
    --- en/reference/gmagick/gmagick/write.xml
    +++ en/reference/gmagick/gmagick/write.xml
    @@ -2,54 +2,17 @@
      <!-- $Revision: 288721 $ -->

      <refentry xml:id="gmagick.write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
    +
       <refnamediv>
        <refname>Gmagick::write</refname>
    - <refpurpose>Writes an image to the specified filename</refpurpose>
    + <refpurpose>&Alias; <methodname>Gmagick::writeimage</methodname></refpurpose>
       </refnamediv>

       <refsect1 role="description">
        &reftitle.description;
    - <methodsynopsis>
    - <modifier>public</modifier> <type>void</type><methodname>Gmagick::write</methodname>
    - <methodparam><type>string</type><parameter>filename</parameter></methodparam>
    - </methodsynopsis>
    - <para>
    - Writes an image to the specified filename. If the filename parameter is NULL,
    -the image is written to the filename set by Gmagick::ReadImage() or Gmagick::SetImageFilename().
    - </para>
    -
    -
    -
    - </refsect1>
    -
    - <refsect1 role="parameters">
    - &reftitle.parameters;
    - <para>
    - <variablelist>
    - <varlistentry>
    - <term><parameter>filename</parameter></term>
    - <listitem>
    - <para>
    - The image filename.
    - </para>
    - </listitem>
    - </varlistentry>
    - </variablelist>
    - </para>
    - </refsect1>
    -
    - <refsect1 role="returnvalues">
    - &reftitle.returnvalues;
    - <para>
    - The Gmagick object
    - </para>
    - </refsect1>
    -
    - <refsect1 role="errors">
    - &reftitle.errors;
    - <para>
    - &gmagick.gmagickexception.throw;
    - </para>
    + <simpara>
    + This method is an alias of <methodname>Gmagick::writeimage</methodname>.
    + </simpara>
       </refsect1>

      </refentry>


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66863
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66863

                                               ------------------------------------------------------------------

    Modified: en/reference/sockets/functions/socket-sendmsg.xml
    By: mekras on 2016-04-18 05:48:21
    ===================================================================
    --- en/reference/sockets/functions/socket-sendmsg.xml
    +++ en/reference/sockets/functions/socket-sendmsg.xml
    @@ -8,7 +8,7 @@
       <refsect1 role="description">
        &reftitle.description;
        <methodsynopsis>
    - <type>int</type><methodname>socket_sendmsg</methodname>
    + <type>mixed</type><methodname>socket_sendmsg</methodname>
         <methodparam><type>resource</type><parameter>socket</parameter></methodparam>
         <methodparam><type>array</type><parameter>message</parameter></methodparam>
         <methodparam><type>int</type><parameter>flags</parameter></methodparam>
    @@ -50,6 +50,7 @@
       <refsect1 role="returnvalues">
        &reftitle.returnvalues;
        <para>
    + Returns the number of characters sent, or &false; on failure.
        </para>
       </refsect1>



                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66964
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66964

                                               ------------------------------------------------------------------

    Modified: en/reference/pdo/pdo/rollback.xml
    By: anonymous on 2016-05-13 07:27:14
    ===================================================================
    --- en/reference/pdo/pdo/rollback.xml
    +++ en/reference/pdo/pdo/rollback.xml
    @@ -39,7 +39,14 @@
         &return.success;
        </para>
       </refsect1>
    -
    +
    + <refsect1 role="errors">
    + &reftitle.errors;
    + <para>
    + <function>PDO::rollback</function> throws a <classname>PDOException</classname> if there is no active transaction regardless of the PDO error mode that is set.
    + </para>
    + </refsect1>
    +
       <refsect1 role="examples">
        &reftitle.examples;
        <para>


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=67145
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=67145

                                               ------------------------------------------------------------------

    Modified: en/reference/pdo/pdo/commit.xml
    By: anonymous on 2016-05-13 07:27:37
    ===================================================================
    --- en/reference/pdo/pdo/commit.xml
    +++ en/reference/pdo/pdo/commit.xml
    @@ -27,6 +27,13 @@
         &return.success;
        </para>
       </refsect1>
    +
    + <refsect1 role="errors">
    + &reftitle.errors;
    + <para>
    + <function>PDO::commit</function> throws a <classname>PDOException</classname> if there is no active transaction regardless of the PDO error mode that is set.
    + </para>
    + </refsect1>

       <refsect1 role="examples">
        &reftitle.examples;


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=67146
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=67146

                                               ------------------------------------------------------------------

    Modified: en/reference/pdo/pdo/begintransaction.xml
    By: anonymous on 2016-05-13 07:34:19
    ===================================================================
    --- en/reference/pdo/pdo/begintransaction.xml
    +++ en/reference/pdo/pdo/begintransaction.xml
    @@ -38,6 +38,13 @@
        </para>
       </refsect1>

    + <refsect1 role="errors">
    + &reftitle.errors;
    + <para>
    + <function>PDO::begintransaction</function> throws a <classname>PDOException</classname> if there is already a transaction started or the driver does not support transactions regardless of the PDO error mode that is set.
    + </para>
    + </refsect1>
    +
       <refsect1 role="examples">
        &reftitle.examples;
        <para>


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=67148
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=67148

                                               ------------------------------------------------------------------

    Modified: en/reference/url/functions/parse-url.xml
    By: leigh on 2016-05-16 03:36:37
    ===================================================================
    --- en/reference/url/functions/parse-url.xml
    +++ en/reference/url/functions/parse-url.xml
    @@ -266,7 +266,6 @@
          <member><function>pathinfo</function></member>
          <member><function>parse_str</function></member>
          <member><function>http_build_query</function></member>
    - <member><function>http_build_url</function></member>
          <member><function>dirname</function></member>
          <member><function>basename</function></member>
          <member><link xlink:href="&url.rfc;3986">RFC 3986</link></member>


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=67155
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=67155

                                               ------------------------------------------------------------------




    --
    https://edit.php.net/
    This email is send automatically by the Php Docbook Online Editor.
  • Phpdoc at May 23, 2016 at 3:20 pm
    Hello PHP EN Documentation team,

    There are contributions within the online editor queue for this language.
    Please review, then commit or delete these patches.

         Patches for review :
         -----------------------

    Modified: en/internals2/opcodes/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/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/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
    @@ -1,5 +1,5 @@
      <?xml version="1.0" encoding="utf-8"?>
    -<!-- $Revision: 338832 $ -->
    +<!-- $Revision: 334762 $ -->
      <refentry xml:id="pdostatement.execute" xmlns="http://docbook.org/ns/docbook">
       <refnamediv>
        <refname>PDOStatement::execute</refname>
    @@ -14,18 +14,13 @@
         <methodparam choice="opt"><type>array</type><parameter>input_parameters</parameter></methodparam>
        </methodsynopsis>
        <para>
    - Execute the <link linkend="pdo.prepared-statements">prepared
    - statement</link>. If the prepared statement included parameter markers, you
    - must either:
    + Execute the prepared statement. If the prepared statement included
    + parameter markers, either:
         <itemizedlist>
    - <listitem><para>call <function>PDOStatement::bindParam</function> and/or
    - <function>PDOStatement::bindValue</function> to bind either variables or
    - values (respectively) to the parameter markers. Bound variables pass
    - their value as input and receive the output value, if any, of their
    - associated parameter markers</para></listitem>
    - <listitem>
    - <para>or pass an array of input-only parameter values</para>
    - </listitem>
    + <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
    + output value, if any, of their associated parameter markers</para></listitem>
    + <listitem><para>or pass an array of input-only parameter values</para></listitem>
         </itemizedlist>
        </para>
       </refsect1>
    @@ -43,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.
    @@ -93,18 +87,18 @@

       <refsect1 role="examples">
        &reftitle.examples;
    - <example><title>Execute a prepared statement with a bound variable and value</title>
    + <example><title>Execute a prepared statement with bound variables</title>
         <programlisting role="php">
      <![CDATA[
      <?php
    -/* Execute a prepared statement by binding a variable and value */
    +/* Execute a prepared statement by binding PHP variables */
      $calories = 150;
    -$colour = 'gre';
    +$colour = 'red';
      $sth = $dbh->prepare('SELECT name, colour, calories
          FROM fruit
    - WHERE calories < :calories AND colour LIKE :colour');
    + WHERE calories < :calories AND colour = :colour');
      $sth->bindParam(':calories', $calories, PDO::PARAM_INT);
    -$sth->bindValue(':colour', "%{$colour}%");
    +$sth->bindParam(':colour', $colour, PDO::PARAM_STR, 12);
      $sth->execute();
      ?>
      ]]>


                 => 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/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/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/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

                                               ------------------------------------------------------------------

    Modified: en/appendices/migration70/incompatible/other.xml
    By: Matthieu Napoli on 2016-03-21 02:47:47
    ===================================================================
    --- en/appendices/migration70/incompatible/other.xml
    +++ en/appendices/migration70/incompatible/other.xml
    @@ -278,13 +278,14 @@
        <title>JSON extension replaced with JSOND</title>

        <para>
    - The JSON extension has been replaced with JSOND, causing two minor BC
    + The JSON extension has been replaced with JSOND, causing 3 minor BC
         breaks. Firstly, a number must not end in a decimal point (i.e.
         <literal>34.</literal> must be changed to either <literal>34.0</literal> or
         <literal>34</literal>). Secondly, when using scientific notation, the
         <literal>e</literal> exponent must not immediately follow a decimal point
         (i.e. <literal>3.e3</literal> must be changed to either
    - <literal>3.0e3</literal> or <literal>3e3</literal>).
    + <literal>3.0e3</literal> or <literal>3e3</literal>). Finally an empty
    + string is no longer considered as valid JSON.
        </para>
       </sect3>



                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66508
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66508

                                               ------------------------------------------------------------------

    Modified: en/reference/strings/functions/explode.xml
    By: Jay Paroline on 2016-03-23 17:21:38
    ===================================================================
    --- en/reference/strings/functions/explode.xml
    +++ en/reference/strings/functions/explode.xml
    @@ -150,8 +150,10 @@
      */
      $input1 = "hello";
      $input2 = "hello,there";
    +$input3 = ',';
      var_dump( explode( ',', $input1 ) );
      var_dump( explode( ',', $input2 ) );
    +var_dump( explode( ',', $input3 ) );

      ?>
      ]]>
    @@ -168,6 +170,11 @@
          [0] => string(5) "hello"
          [1] => string(5) "there"
      )
    +array(2)
    +(
    + [0] => string(0) ""
    + [1] => string(0) ""
    +)
      ]]>
          </screen>
         </example>


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66522
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66522

                                               ------------------------------------------------------------------

    Modified: en/reference/solr/solrquery/sethighlightregexslop.xml
    By: gunbei on 2016-03-28 09:00:17
    ===================================================================
    --- en/reference/solr/solrquery/sethighlightregexslop.xml
    +++ en/reference/solr/solrquery/sethighlightregexslop.xml
    @@ -14,7 +14,7 @@
         <methodparam><type>float</type><parameter>factor</parameter></methodparam>
        </methodsynopsis>
        <para>
    - The factor by which the regex fragmenter can stray from the ideal fragment size ( specfied by SolrQuery::setHighlightFragsize )to accomodate the regular expression
    + The factor by which the regex fragmenter can stray from the ideal fragment size ( specfied by SolrQuery::setHighlightFragsize )to accommodate the regular expression
        </para>

       </refsect1>


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66612
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66612

                                               ------------------------------------------------------------------

    Modified: en/reference/array/functions/array-filter.xml
    By: Jesse Donat on 2016-04-04 10:13:45
    ===================================================================
    --- en/reference/array/functions/array-filter.xml
    +++ en/reference/array/functions/array-filter.xml
    @@ -240,6 +240,12 @@
          added, deleted or unset) the behavior of this function is undefined.
         </para>
        </caution>
    +
    + <caution>
    + <para>
    + As of PHP7 the value of the callback may no longer be used by reference.
    + </para>
    + </caution>
       </refsect1>

       <refsect1 role="seealso">


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66717
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66717

                                               ------------------------------------------------------------------

    Modified: en/reference/array/functions/array-key-exists.xml
    By: Nikolay Labinskiy on 2016-04-09 00:54:42
    ===================================================================
    --- en/reference/array/functions/array-key-exists.xml
    +++ en/reference/array/functions/array-key-exists.xml
    @@ -50,6 +50,12 @@
        <para>
         &return.success;
        </para>
    + <caution>
    + <para>
    + <function>array_key_exists</function> will search for the kyes in first dimention only.
    + Nested kyes in multidimensional arrays will not be found.
    + </para>
    + </caution>
       </refsect1>

       <refsect1 role="examples">


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66777
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66777

                                               ------------------------------------------------------------------

    Modified: en/reference/array/functions/array-multisort.xml
    By: Juris on 2016-04-09 13:33:47
    ===================================================================
    --- en/reference/array/functions/array-multisort.xml
    +++ en/reference/array/functions/array-multisort.xml
    @@ -262,7 +262,7 @@
          </screen>
          <para>
           The data as an array, called <varname>data</varname>. This would usually,
    - for example, be obtained by looping with <function>mysql_fetch_assoc</function>.
    + for example, be obtained by looping with <function>mysqli_fetch_assoc</function>.
          </para>
          <programlisting role="php">
      <![CDATA[


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66788
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66788

                                               ------------------------------------------------------------------

    Modified: en/language/oop5/interfaces.xml
    By: Roscius on 2016-04-12 14:14:10
    ===================================================================
    --- en/language/oop5/interfaces.xml
    +++ en/language/oop5/interfaces.xml
    @@ -8,9 +8,9 @@
         handled.
        </para>
        <para>
    - Interfaces are defined using the <literal>interface</literal> keyword, in the same way as a
    - standard class, but without any of the methods having their contents
    - defined.
    + Interfaces are defined in the same was as a class, but with the <literal>interface</literal>
    + keyword replacing the <literal>class</literal> keyword and without any of the methods having
    + their contents defined.
        </para>
        <para>
         All methods declared in an interface must be public; this is the nature of an


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66859
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66859

                                               ------------------------------------------------------------------

    Modified: en/reference/gmagick/gmagick/write.xml
    By: Dan Brooks on 2016-04-12 20:19:29
    ===================================================================
    --- en/reference/gmagick/gmagick/write.xml
    +++ en/reference/gmagick/gmagick/write.xml
    @@ -2,54 +2,17 @@
      <!-- $Revision: 288721 $ -->

      <refentry xml:id="gmagick.write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
    +
       <refnamediv>
        <refname>Gmagick::write</refname>
    - <refpurpose>Writes an image to the specified filename</refpurpose>
    + <refpurpose>&Alias; <methodname>Gmagick::writeimage</methodname></refpurpose>
       </refnamediv>

       <refsect1 role="description">
        &reftitle.description;
    - <methodsynopsis>
    - <modifier>public</modifier> <type>void</type><methodname>Gmagick::write</methodname>
    - <methodparam><type>string</type><parameter>filename</parameter></methodparam>
    - </methodsynopsis>
    - <para>
    - Writes an image to the specified filename. If the filename parameter is NULL,
    -the image is written to the filename set by Gmagick::ReadImage() or Gmagick::SetImageFilename().
    - </para>
    -
    -
    -
    - </refsect1>
    -
    - <refsect1 role="parameters">
    - &reftitle.parameters;
    - <para>
    - <variablelist>
    - <varlistentry>
    - <term><parameter>filename</parameter></term>
    - <listitem>
    - <para>
    - The image filename.
    - </para>
    - </listitem>
    - </varlistentry>
    - </variablelist>
    - </para>
    - </refsect1>
    -
    - <refsect1 role="returnvalues">
    - &reftitle.returnvalues;
    - <para>
    - The Gmagick object
    - </para>
    - </refsect1>
    -
    - <refsect1 role="errors">
    - &reftitle.errors;
    - <para>
    - &gmagick.gmagickexception.throw;
    - </para>
    + <simpara>
    + This method is an alias of <methodname>Gmagick::writeimage</methodname>.
    + </simpara>
       </refsect1>

      </refentry>


                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66863
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66863

                                               ------------------------------------------------------------------

    Modified: en/reference/sockets/functions/socket-sendmsg.xml
    By: mekras on 2016-04-18 05:48:21
    ===================================================================
    --- en/reference/sockets/functions/socket-sendmsg.xml
    +++ en/reference/sockets/functions/socket-sendmsg.xml
    @@ -8,7 +8,7 @@
       <refsect1 role="description">
        &reftitle.description;
        <methodsynopsis>
    - <type>int</type><methodname>socket_sendmsg</methodname>
    + <type>mixed</type><methodname>socket_sendmsg</methodname>
         <methodparam><type>resource</type><parameter>socket</parameter></methodparam>
         <methodparam><type>array</type><parameter>message</parameter></methodparam>
         <methodparam><type>int</type><parameter>flags</parameter></methodparam>
    @@ -50,6 +50,7 @@
       <refsect1 role="returnvalues">
        &reftitle.returnvalues;
        <para>
    + Returns the number of characters sent, or &false; on failure.
        </para>
       </refsect1>



                 => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=66964
                 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=66964

                                               ------------------------------------------------------------------




    --
    https://edit.php.net/
    This email is send automatically by the Php Docbook Online Editor.

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupphp-doc @
categoriesphp
postedMay 2, '16 at 2:45p
activeMay 23, '16 at 3:20p
posts4
users1
websitedoc.php.net

1 user in discussion

Phpdoc: 4 posts

People

Translate

site design / logo © 2019 Grokbase