Contributions are ready for review

From:	phpdoc at lists dot php dot net	Date:	Mon, 23 Nov 2015 13:00:05 +0000
Subject:	Contributions are ready for review
Groups:	php.doc
Request:	Send a blank email to phpdoc+get-969385966@lists.php.net to get a copy of this message

Hello PHP EN Documentation team, There are contributions within the online editor queue for this language. Please review, then commit or delete these patches. Patches for review : ----------------------- Modified: en/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"?> - + <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/filesystem/functions/fopen.xml By: on 2015-08-07 11:40:32 =================================================================== --- en/reference/filesystem/functions/fopen.xml +++ en/reference/filesystem/functions/fopen.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> - + <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fopen"> <refnamediv> <refname>fopen</refname> @@ -133,8 +133,7 @@ <entry> Open for writing only; place the file pointer at the end of the file. If the file does not exist, attempt to create it. - In this mode, <function>fseek</function> only affects - the reading position, writes are always appended. + In this mode, <function>fseek</function> has no effect, writes are always appended. </entry> </row> <row> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=63982 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=63982 ------------------------------------------------------------------ Modified: en/appendices/migration70/changed-functions.xml By: anonymous on 2015-08-27 04:01:53 =================================================================== --- en/appendices/migration70/changed-functions.xml +++ en/appendices/migration70/changed-functions.xml @@ -33,7 +33,7 @@ <listitem> <simpara> <function>mktime</function> and <function>gmmktime</function> functions - no longer accept <parameter>is_dst</parameter> parameter. + no longer accept <parameter>is_dst</parameter> parameter. </simpara> </listitem> <listitem> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=64448 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=64448 ------------------------------------------------------------------ Modified: en/reference/apache/functions/virtual.xml By: anonymous on 2015-08-27 04:01:57 =================================================================== --- en/reference/apache/functions/virtual.xml +++ en/reference/apache/functions/virtual.xml @@ -80,8 +80,8 @@ <note> <para> This function may be used on PHP files. However, it is typically better - to use <function>include</function> or <function>require</function> for - PHP files. + to use <function>include</function> or <function>require</function> for + PHP files. </para> </note> </refsect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=64449 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=64449 ------------------------------------------------------------------ Modified: en/reference/iconv/functions/iconv.xml By: anonymous on 2015-08-27 04:02:01 =================================================================== --- en/reference/iconv/functions/iconv.xml +++ en/reference/iconv/functions/iconv.xml @@ -47,7 +47,7 @@ characters. If you append the string <literal>//IGNORE</literal>, characters that cannot be represented in the target charset are silently discarded. Otherwise, <constant>E_NOTICE</constant> is generated and the function - will return &false;. + will return &false;. </para> </listitem> </varlistentry> @@ -85,9 +85,9 @@ <row> <entry>5.4.0</entry> <entry> - Since this version, the function returns &false; on illegal characters, - unless <literal>//IGNORE</literal> is specified in output charset. - Before, it returned partial output string. + Since this version, the function returns &false; on illegal characters, + unless <literal>//IGNORE</literal> is specified in output charset. + Before, it returned partial output string. </entry> </row> </tbody> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=64450 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=64450 ------------------------------------------------------------------ Modified: en/reference/solr/solrdismaxquery/removequeryfield.xml By: anonymous on 2015-08-27 04:02:05 =================================================================== --- en/reference/solr/solrdismaxquery/removequeryfield.xml +++ en/reference/solr/solrdismaxquery/removequeryfield.xml @@ -53,8 +53,8 @@ $dismaxQuery = new SolrDisMaxQuery('lucene'); $dismaxQuery - ->addQueryField('first', 3) - ->addQueryField('second', 0.2) + ->addQueryField('first', 3) + ->addQueryField('second', 0.2) ->addQueryField('cat'); echo $dismaxQuery . PHP_EOL; // remove field 'second' => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=64451 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=64451 ------------------------------------------------------------------ Modified: en/reference/solr/solrdismaxquery/removephrasefield.xml By: anonymous on 2015-08-27 04:02:09 =================================================================== --- en/reference/solr/solrdismaxquery/removephrasefield.xml +++ en/reference/solr/solrdismaxquery/removephrasefield.xml @@ -50,8 +50,8 @@ $dismaxQuery = new SolrDisMaxQuery('lucene'); $dismaxQuery ->addPhraseField('first', 3, 1) - ->addPhraseField('second', 4, 1) - ->addPhraseField('cat', 55); + ->addPhraseField('second', 4, 1) + ->addPhraseField('cat', 55); echo $dismaxQuery . PHP_EOL; echo $dismaxQuery->removePhraseField('second'); ?> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=64452 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=64452 ------------------------------------------------------------------ Modified: en/reference/ldap/book.xml By: anonymous on 2015-08-27 04:20:37 =================================================================== --- en/reference/ldap/book.xml +++ en/reference/ldap/book.xml @@ -77,6 +77,11 @@ <link xlink:href="&url.ldap.openldap;">OpenLDAP Project</link> </para> </listitem> + <listitem> + <para> + Internet Engineering Taskforce RFCs <link xlink:href="&url.ietf.rfc;rfc4510">4510</link> through <link xlink:href="&url.ietf.rfc;rfc4519">4519</link>. + </para> + </listitem> </itemizedlist> <para> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=64453 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=64453 ------------------------------------------------------------------ Modified: en/reference/ldap/functions/ldap-search.xml By: anonymous on 2015-08-27 04:25:42 =================================================================== --- en/reference/ldap/functions/ldap-search.xml +++ en/reference/ldap/functions/ldap-search.xml @@ -68,7 +68,8 @@ <para> The search filter can be simple or advanced, using boolean operators in the format described in the LDAP documentation (see the <link - xlink:href="&url.ldap.filters;">Netscape Directory SDK</link> for full + xlink:href="&url.ldap.filters;">Netscape Directory SDK</link> or + <link xlink:href="&url.ietf.rfc;rfc4515">RFC4515</link> for full information on filters). </para> </listitem> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=64455 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=64455 ------------------------------------------------------------------ Modified: en/reference/curl/functions/curl-setopt.xml By: François Bonzon on 2015-09-14 21:11:35 =================================================================== --- en/reference/curl/functions/curl-setopt.xml +++ en/reference/curl/functions/curl-setopt.xml @@ -1050,6 +1050,20 @@ </entry> </row> <row> + <entry valign="top"><constant>CURLOPT_PRIVATE</constant></entry> + <entry valign="top"> + Any data that should be associated with this cURL handle. This data + can subsequently be retrieved with the + <constant>CURLINFO_PRIVATE</constant> option of + <function>curl_getinfo</function>. cURL does nothing with this data. + When using a cURL multi handle, this private data is typically a + unique key to identify a standard cURL handle. + </entry> + <entry valign="top"> + Added in cURL 7.10.3. + </entry> + </row> + <row> <entry valign="top"><constant>CURLOPT_PROXY</constant></entry> <entry valign="top"> The HTTP proxy to tunnel requests through. @@ -1520,6 +1534,12 @@ </entry> </row> <row> + <entry>5.2.4</entry> + <entry> + Introduced <constant>CURLOPT_PRIVATE</constant>. + </entry> + </row> + <row> <entry>5.1.0</entry> <entry> Introduced <constant>CURLOPT_AUTOREFERER</constant>, => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=64844 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=64844 ------------------------------------------------------------------ Modified: en/language-snippets.ent By: anonymous on 2015-09-16 05:19:10 =================================================================== --- en/language-snippets.ent +++ en/language-snippets.ent @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> - +  <!ENTITY changelog.randomseed '<row xmlns="http://docbook.org/ns/docbook"><entry>4.2.0</entry><entry>The random @@ -196,11 +196,6 @@ <emphasis>DEPRECATED</emphasis> as of PHP 5.6.0. Relying on this feature is highly discouraged.</simpara></warning>'> -<!ENTITY warn.deprecated.feature-7-0-0 '<warning -xmlns="http://docbook.org/ns/docbook"><simpara>This feature has been -<emphasis>DEPRECATED</emphasis> as of PHP 7.0.0. Relying on this feature -is highly discouraged.</simpara></warning>'> - <!ENTITY removed.php.future 'This deprecated feature <emphasis xmlns="http://docbook.org/ns/docbook">will</emphasis> certainly be <emphasis xmlns="http://docbook.org/ns/docbook">removed</emphasis> in the future.'> @@ -1860,7 +1855,7 @@ <!ENTITY mongo.setwriteconcern.returnvalues '<para xmlns="http://docbook.org/ns/docbook">Returns &true; on success, or &false; otherwise.</para>'> <!ENTITY mongo.setwriteconcern.errors '<para xmlns="http://docbook.org/ns/docbook">Emits <constant>E_WARNING</constant> if the <literal>w</literal> parameter is not an integer or string value.</para>'> <!ENTITY mongo.getwriteconcern.returnvalues '<para xmlns="http://docbook.org/ns/docbook">This function returns an array describing the write concern. The array contains the values <literal>w</literal> for an integer acknowledgement level or string mode, and <literal>wtimeout</literal> denoting the maximum number of milliseconds to wait for the server to satisfy the write concern.</para>'> -<!ENTITY mongo.command.parameters.maxtimems '<listitem xmlns="http://docbook.org/ns/docbook"><para><literal>"maxTimeMS"</literal></para><para>Specifies a cumulative time limit in milliseconds for processing the operation (does not include idle time). If the operation is not completed within the timeout period, a <classname>MongoExecutionTimeoutException</classname> will be thrown.</para></listitem>'> +<!ENTITY mongo.command.parameters.maxtimems '<listitem xmlns="http://docbook.org/ns/docbook"><para><literal>"maxTimeMS"</literal></para><para>Specifies a cumulative time limit in milliseconds for processing the operation on the server (does not include idle time). If the operation is not completed by the server within the timeout period, a <classname>MongoExecutionTimeoutException</classname> will be thrown.</para></listitem>'> <!ENTITY mongo.index.parameters.background '<listitem xmlns="http://docbook.org/ns/docbook"><para><literal>"background"</literal></para><para>Builds the index in the background so that building an index does <emphasis>not</emphasis> block other database activities. Specify &true; to build in the background. The default value is &false;.</para><warning xmlns="http://docbook.org/ns/docbook"><para>Prior to MongoDB 2.6.0, index builds on secondaries were executed as foreground operations, irrespective of this option. See <link xlink:href="&url.mongodb.dochub.indexes.rs;" xmlns:xlink="http://www.w3.org/1999/xlink">Building Indexes with Replica Sets</link> for more information.</para></warning></listitem>'> <!ENTITY mongo.index.parameters.dropdups '<listitem xmlns="http://docbook.org/ns/docbook"><para><literal>"dropDups"</literal></para><para>Specify &true; to force creation of a unique index where the collection may contain duplicate values for a key. MongoDB will index the first occurrence of a key and delete all subsequent documents from the collection that contain a duplicate value for that key. The default value is &false;.</para><warning xmlns="http://docbook.org/ns/docbook"><para><literal>"dropDups"</literal> may delete data from your database. Use with extreme caution.</para></warning><note xmlns="http://docbook.org/ns/docbook"><para>This option is not supported on MongoDB 2.8+. Index creation will fail if the collection contains duplicate values.</para></note></listitem>'> <!ENTITY mongo.index.parameters.expireafterseconds '<listitem xmlns="http://docbook.org/ns/docbook"><para><literal>"expireAfterSeconds"</literal></para><para>The value of this option should specify the number of seconds after which a document should be considered expired and automatically removed from the collection. This option is only compatible with single-field indexes where the field will contain <classname>MongoDate</classname> values.</para><note xmlns="http://docbook.org/ns/docbook"><para>This feature is available in MongoDB 2.2+. See <link xlink:href="&url.mongodb.docs.expire_data;" xmlns:xlink="http://www.w3.org/1999/xlink">Expire Data from Collections by Setting TTL</link> for more information.</para></note></listitem>'> @@ -1887,127 +1882,138 @@ <!ENTITY mongo.context.server ' <varlistentry xmlns="http://docbook.org/ns/docbook"> <term> <parameter>server</parameter> </term> <listitem> <para> An array containing the basic information about the server that was picked. <informaltable> <tgroup cols="2"> <thead> <row> <entry>key</entry> <entry>value</entry> </row> </thead> <tbody> <row> <entry>hash</entry> <entry>server hash, example: <literal>localhost:27017;-;X;56052</literal></entry> </row> <row> <entry>type</entry> <entry>Node type (primary/secondary/mongos/arbiter): <literal>2</literal></entry> </row> <row> <entry>max_bson_size</entry> <entry>The maximum BSON Size over the wire this node accepts: <literal>16777216</literal></entry> </row> <row> <entry>max_message_size</entry> <entry>The maximum Message Size over the wire this node accepts: <literal>48000000</literal></entry> </row> <row> <entry>request_id</entry> <entry>The request identifier for this message: <literal>42</literal></entry> </row> </tbody> </tgroup> ! </informaltable> </para> </listitem> </varlistentry>'> <!ENTITY mongo.context.writeoptions '<varlistentry xmlns="http://docbook.org/ns/docbook"> <term> <parameter>writeOptions</parameter> </term> <listitem> <para> <informaltable> <tgroup cols="2"> <thead> <row> <entry>key</entry> <entry>value</entry> </row> </thead> <tbody> <row> <entry>ordered</entry> <entry>boolean, if the operation (in case of batch operation) must be executed sequentually (ordered=true)</entry> </row> <row> <entry>writeConcern</entry> <entry>An array of writeConcern options (see below)</entry> </row> </tbody> </tgroup> </informaltable> <table> <title>writeConcern array values</title> <tgroup cols="2"> <thead> <row> <entry>key</entry> <entry>value</entry> </row> </thead> <tbody> <row> <entry>fsync</entry> <entry>boolean, force flushing to disk before returning</entry> </row> <row> <entry>j</entry> <entry>boolean, force journal write before returning</entry> </row> <row> <entry>wtimeout</entry> <entry>integer, milliseconds, maximum time the primary is allowed! to wait to verify replication</entry> </row> <row> <entry>w</entry> <entry>integer=server count, or string=replication-tag</entry> </row> </tbody> </tgroup> </table> </para> </listitem> </varlistentry>'> <!ENTITY mongo.context.protocoloptions ' <varlistentry xmlns="http://docbook.org/ns/docbook"> <term> <parameter>protocolOptions</parameter> </term> <listitem> <para> <informaltable> <tgroup cols="2"> <thead> <row> <entry>key</entry> <entry>value</entry> </row> </thead> <tbody> <row> <entry>message_length</entry> <entry>The total size (in bytes) of the encoded message being sent over the wire</entry> </row> <row> <entry>request_id</entry> <entry>The request identifier for this message: <literal>42</literal></entry> </row> <row> <entry>namespace</entry> <entry>The MongoDB namespace used for the protocol message <literal>dbname.collectionname</literal></entry> </row> </tbody> </tgroup> </informaltable> </para> </listitem> </varlistentry>'> -<!ENTITY mongo.alternative.class.note '<para -xmlns="http://docbook.org/ns/docbook">This extension that defines this class -is deprecated. Instead, the <link linkend="set.mongodb">MongoDB</link> extension should be used. -Alternatives to this class include:</para>'> -<!ENTITY mongo.alternative.method.note '<para -xmlns="http://docbook.org/ns/docbook">This extension that defines this method -is deprecated. Instead, the <link linkend="set.mongodb">MongoDB</link> extension should be used. -Alternatives to this method include:</para>'> -<!ENTITY mongo.noalternative.method.note '<para -xmlns="http://docbook.org/ns/docbook">This extension that defines this method -is deprecated. Instead, the <link linkend="set.mongodb">MongoDB</link> extension should be used. -There is no equivalent for this method in the new extension.</para>'> -<!ENTITY mongo.alternative.phplib.note '<para -xmlns="http://docbook.org/ns/docbook">This extension that defines this method -is deprecated. Instead, the <link linkend="set.mongodb">MongoDB</link> extension should be used. -There is no equivalent for this method in the new extension, but there is an -alternative in the <link linkend="mongodb.overview">PHP library</link>:</para>'> - -<!ENTITY mongo.deprecated.note '<para -xmlns="http://docbook.org/ns/docbook">This extension is deprecated. Instead, -the <link linkend="set.mongodb">MongoDB</link> extension should be -used.</para>'> -  <!ENTITY mongodb.parameter.namespace ' <varlistentry xmlns="http://docbook.org/ns/docbook"> - <term><parameter>namespace</parameter> (<type>string</type>)</term> + <term><parameter>namespace</parameter></term> <listitem> <para> - A fully qualified namespace (e.g. <literal>"databaseName.collectionName"</literal>). + A fully qualified namespace (databaseName.collectionName) </para> </listitem> </varlistentry> '> -<!ENTITY mongodb.parameter.db ' - <varlistentry xmlns="http://docbook.org/ns/docbook"> - <term><parameter>db</parameter> (<type>string</type>)</term> - <listitem> - <para> - The name of the database on which to execute the command. - </para> - </listitem> - </varlistentry> -'> -<!ENTITY mongodb.parameter.bulkwrite ' +<!ENTITY mongodb.parameter.readPreference ' <varlistentry xmlns="http://docbook.org/ns/docbook"> - <term><parameter>bulk</parameter> (<type>MongoDBDriverBulkWrite</type>)</term> + <term><parameter>readPreference</parameter></term> <listitem> <para> - The <classname>MongoDBDriverBulkWrite</classname> to execute. + Optionally, a <classname>MongoDBDriverReadPreference</classname> to route the command to. If none given, defaults to the Read Preferences set by the <link linkend="mongodb-driver-manager.construct-uri">MongoDB Connection URI</link>. </para> </listitem> </varlistentry> '> -<!ENTITY mongodb.parameter.command ' +<!ENTITY mongodb.parameter.writeConcern ' <varlistentry xmlns="http://docbook.org/ns/docbook"> - <term><parameter>command</parameter> (<type>MongoDBDriverCommand</type>)</term> + <term><parameter>writeConcern</parameter></term> <listitem> <para> - The <classname>MongoDBDriverCommand</classname> to execute. +Optionally, a <classname>MongoDBDriverWriteConcern</classname>. If none given, default to the Write Concern set by the <link linkend="mongodb-driver-manager.construct-uri">MongoDB Connection URI</link>. </para> </listitem> </varlistentry> '> -<!ENTITY mongodb.parameter.query ' +<!ENTITY mongodb.parameter.filter ' <varlistentry xmlns="http://docbook.org/ns/docbook"> - <term><parameter>query</parameter> (<type>MongoDBDriverQuery</type>)</term> + <term><parameter>filter</parameter></term> <listitem> <para> - The <classname>MongoDBDriverQuery</classname> to execute. + The search filter. </para> </listitem> </varlistentry> '> -<!ENTITY mongodb.parameter.readPreference ' +<!ENTITY mongodb.parameter.newObj ' <varlistentry xmlns="http://docbook.org/ns/docbook"> - <term><parameter>readPreference</parameter> (<type>MongoDBDriverReadPreference</type>)</term> + <term><parameter>newObj</parameter></term> <listitem> <para> - Optionally, a <classname>MongoDBDriverReadPreference</classname> to select the server for this operation. If none is given, the read preference from the <link linkend="mongodb-driver-manager.construct-uri">MongoDB Connection URI</link> will be used. + Either an array of update operators, or the full object to be replaced with </para> </listitem> </varlistentry> '> -<!ENTITY mongodb.parameter.typeMap ' +<!ENTITY mongodb.parameter.deleteOptions ' <varlistentry xmlns="http://docbook.org/ns/docbook"> - <term><parameter>typeMap</parameter> (<type>array</type>)</term> + <term><parameter>deleteOptions</parameter></term> <listitem> <para> - <link linkend="mongodb.persistence.typemaps">Type map configuration</link>. + <table> + <title>deleteOptions</title> + <tgroup cols="4"> + <thead> + <row> + <entry>Option</entry> + <entry>Type</entry> + <entry>Description</entry> + <entry>Default</entry> + </row> + </thead> + <tbody> + <row> + <entry>limit</entry> + <entry>boolean</entry> + <entry>Delete all matching documents (limit=0), or only the first matching document (limit=1)</entry> + <entry>0</entry> + </row> + </tbody> + </tgroup> + </table> </para> </listitem> </varlistentry> '> -<!ENTITY mongodb.parameter.writeConcern ' +<!ENTITY mongodb.parameter.updateOptions ' <varlistentry xmlns="http://docbook.org/ns/docbook"> - <term><parameter>writeConcern</parameter> (<type>MongoDBDriverWriteConcern</type>)</term> + <term><parameter>updateOptions</parameter></term> <listitem> <para> - Optionally, a <classname>MongoDBDriverWriteConcern</classname> to apply to the write operation. If none is given, the write concern from the <link linkend="mongodb-driver-manager.construct-uri">MongoDB Connection URI</link> will be used. + <table> + <title>updateOptions</title> + <tgroup cols="4"> + <thead> + <row> + <entry>Option</entry> + <entry>Type</entry> + <entry>Description</entry> + <entry>Default</entry> + </row> + </thead> + <tbody> + <row> + <entry>multi</entry> + <entry>boolean</entry> + <entry>Update only the first matching document (multi=false), or all matching documents (multi=true)</entry> + <entry>false</entry> + </row> + <row> + <entry>upsert</entry> + <entry>boolean</entry> + <entry>If <parameter>filter</parameter> does not match an existing document, insert the <parameter>newObj</parameter> as a new object, applying any atomic modifiers to the <parameter>filter</parameter> if applicable.</entry> + <entry>0</entry> + </row> + </tbody> + </tgroup> + </table> </para> </listitem> </varlistentry> '> -<!ENTITY mongodb.parameter.filter ' - <varlistentry xmlns="http://docbook.org/ns/docbook"> - <term><parameter>filter</parameter> (<type>array|object</type>)</term> - <listitem> - <para> - The search filter. - </para> - </listitem> - </varlistentry> +<!ENTITY mongodb.returns.WriteResult ' + <para xmlns="http://docbook.org/ns/docbook"> + Returns <classname>MongoDBDriverWriteResult</classname> on success, &mongodb.throws.onfailure;. + </para> '> -<!ENTITY mongodb.returns.cursor '<para xmlns="http://docbook.org/ns/docbook">Returns <classname>MongoDBDriverCursor</classname> on success.</para>'> -<!ENTITY mongodb.returns.writeresult '<para xmlns="http://docbook.org/ns/docbook">Returns <classname>MongoDBDriverWriteResult</classname> on success.</para>'> -<!ENTITY mongodb.throws.std '&mongodb.throws.argumentparsing;&mongodb.throws.connection;&mongodb.throws.authentication;'> -<!ENTITY mongodb.throws.bulkwriteexception '<member xmlns="http://docbook.org/ns/docbook">Throws <classname>MongoDBDriverExceptionBulkWriteException</classname> on any write failure (e.g. write error, failure to apply a write concern)</member>'> -<!ENTITY mongodb.throws.argumentparsing '<member xmlns="http://docbook.org/ns/docbook">Throws <classname>MongoDBDriverExceptionInvalidArgumentException</classname> on argument parsing errors.</member>'> -<!ENTITY mongodb.throws.authentication '<member xmlns="http://docbook.org/ns/docbook">Throws <classname>MongoDBDriverExceptionAuthenticationException</classname> if authentication is needed and fails.</member>'> -<!ENTITY mongodb.throws.connection '<member xmlns="http://docbook.org/ns/docbook">Throws <classname>MongoDBDriverExceptionConnectionException</classname> if connection to the server fails (for reasons other than authentication).</member>'> +<!ENTITY mongodb.throws.onfailure 'throws exception (instanceof <classname xmlns="http://docbook.org/ns/docbook" >MongoDBDriverException</classname>) on failure'> +<!ENTITY mongodb.throws.std '&mongodb.throws.authentication;&mongodb.throws.connection;'> +<!ENTITY mongodb.throws.executesingle '&mongodb.throws.duplicatekey;&mongodb.throws.writeexception;&mongodb.throws.writeconcernexception;'> +<!ENTITY mongodb.throws.bulkwriteexception '<member xmlns="http://docbook.org/ns/docbook">Throws <classname>MongoDBDriverBulkWriteException</classname> on any write failure (WriteError and WriteConcern failures)</member>'> +<!ENTITY mongodb.throws.argumentparsing '<member xmlns="http://docbook.org/ns/docbook">Throws <classname>MongoDBDriverInvalidArgumentException</classname> on argument parsing errors.</member>'> +<!ENTITY mongodb.throws.duplicatekey '<member xmlns="http://docbook.org/ns/docbook">Throws <classname>MongoDBDriverDuplicateKeyException</classname> if a write causes Duplicate Key error</member>'> +<!ENTITY mongodb.throws.writeexception '<member xmlns="http://docbook.org/ns/docbook">Throws <classname>MongoDBDriverWriteException</classname> on Write Error</member>'> +<!ENTITY mongodb.throws.writeconcernexception '<member xmlns="http://docbook.org/ns/docbook">Throws <classname>MongoDBDriverWriteConcernException</classname> on Write Concern failure</member>'> +<!ENTITY mongodb.throws.authentication '<member xmlns="http://docbook.org/ns/docbook">Throws <classname>MongoDBDriverAuthenticationException</classname> if authentication is needed and fails</member>'> +<!ENTITY mongodb.throws.connection '<member xmlns="http://docbook.org/ns/docbook">Throws <classname>MongoDBDriverConnectionException</classname> if connection to the server fails for other then authentication reasons</member>'> <!ENTITY mongodb.note.getwriteerrors ' <note xmlns="http://docbook.org/ns/docbook"> <para> @@ -2028,7 +2034,7 @@ </para> </note> '> - +  <!ENTITY radius.request.required '<note xmlns="http://docbook.org/ns/docbook"><para>A request must be created via <function>radius_create_request</function> before this function can be called.</para></note>'> @@ -2054,16 +2060,6 @@ </listitem> </varlistentry>'> -<!ENTITY posix.rlimits ' -<para xmlns="http://docbook.org/ns/docbook"> - Each resource has an associated soft and hard limit. The soft - limit is the value that the kernel enforces for the corresponding - resource. The hard limit acts as a ceiling for the soft limit. - An unprivileged process may only set its soft limit to a value - from 0 to the hard limit, and irreversibly lower its hard limit. -</para> -'> -  <!ENTITY strings.parameter.encoding ' <para xmlns="http://docbook.org/ns/docbook"> @@ -2118,55 +2114,6 @@ </varlistentry> '> - -<!ENTITY csprng.sources ' -<para xmlns="http://docbook.org/ns/docbook"> - The sources of randomness used for this function are as follows: -</para> -<itemizedlist xmlns="http://docbook.org/ns/docbook"> - <listitem> - <simpara> - On Windows, - <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&url.csprng.crypt-gen-random;"><function>CryptGenRandom</function></link> - will always be used. - </simpara> - </listitem> - <listitem> - <simpara> - On Linux, the - <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&url.csprng.get-random-2;">getrandom(2)</link> - syscall will be used if available. - </simpara> - </listitem> - <listitem> - <simpara> - On other platforms, <filename>/dev/urandom</filename> will be used. - </simpara> - </listitem> - <listitem> - <simpara> - If none of the aforementioned sources are available, then an - <classname>Exception</classname> will be thrown. - </simpara> - </listitem> -</itemizedlist> -'> -<!ENTITY csprng.errors ' - <listitem xmlns="http://docbook.org/ns/docbook"> - <simpara> - If an appropriate source of randomness cannot be found, - an <classname>Exception</classname> will be thrown. - </simpara> - </listitem> - <listitem xmlns="http://docbook.org/ns/docbook"> - <simpara> - If invalid parameters are given, a <classname>TypeError</classname> - will be thrown. - </simpara> - </listitem> -'> - -  <!ENTITY migration56.openssl.peer-verification ' <para xmlns="http://docbook.org/ns/docbook"> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=64872 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=64872 ------------------------------------------------------------------ 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"?> - + <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> => 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/pdo/lobs.xml By: Jan Slabon on 2015-10-09 03:07:19 =================================================================== --- en/reference/pdo/lobs.xml +++ en/reference/pdo/lobs.xml @@ -102,7 +102,7 @@ $stmt->bindParam(2, $_FILES['file']['type']); $stmt->bindParam(3, $fp, PDO::PARAM_LOB); -$stmt->beginTransaction(); +$db->beginTransaction(); $stmt->execute(); $db->commit(); ?> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65178 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65178 ------------------------------------------------------------------ Modified: en/language/oop5/basic.xml By: Dennis Birkholz on 2015-10-11 06:08:10 =================================================================== --- en/language/oop5/basic.xml +++ en/language/oop5/basic.xml @@ -380,6 +380,14 @@ </screen> </example> </para> + <note> + <para>The class name resolution using <literal>::class</literal> is a + compile time transformation. That means at the time the class name string + is created no autoloading has happened yet. As a consequence, class names + are expanded even if the class does not exist. No error is issued in + that case. + </para> + </note> </sect2> </sect1> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65203 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65203 ------------------------------------------------------------------ Modified: en/reference/curl/functions/curl-getinfo.xml By: François Bonzon on 2015-10-13 06:13:25 =================================================================== --- en/reference/curl/functions/curl-getinfo.xml +++ en/reference/curl/functions/curl-getinfo.xml @@ -148,7 +148,7 @@ </listitem> <listitem> <simpara> - <constant>CURLINFO_CONTENT_LENGTH_DOWNLOAD</constant> - content-length of download, read from <literal>Content-Length:</literal> field + <constant>CURLINFO_CONTENT_LENGTH_DOWNLOAD</constant> - Content length of download, read from <literal>Content-Length:</literal> field </simpara> </listitem> <listitem> @@ -158,7 +158,7 @@ </listitem> <listitem> <simpara> - <constant>CURLINFO_CONTENT_TYPE</constant> - <literal>Content-Type:</literal> of the requested document, NULL indicates server did not send valid <literal>Content-Type:</literal> header + <constant>CURLINFO_CONTENT_TYPE</constant> - <literal>Content-Type:</literal> of the requested document. NULL indicates server did not send valid <literal>Content-Type:</literal> header </simpara> </listitem> <listitem> @@ -375,18 +375,45 @@ <programlisting role="php"> <![CDATA[ <?php -// Create a curl handle -$ch = curl_init('http://www.yahoo.com/'); +// Create a cURL handle +$ch = curl_init('http://www.example.com/'); // Execute curl_exec($ch); // Check if any error occurred -if(!curl_errno($ch)) -{ - $info = curl_getinfo($ch); +if (!curl_errno($ch)) { + $info = curl_getinfo($ch); + echo 'Took ', $info['total_time'], ' seconds to send a request to ', $info['url'], "n"; +} + +// Close handle +curl_close($ch); +?> +]]> + </programlisting> + </example> + </para> + <para> + <example> + <title><function>curl_getinfo</function> example with <parameter>opt</parameter> parameter</title> + <programlisting role="php"> +<![CDATA[ +<?php +// Create a cURL handle +$ch = curl_init('http://www.example.com/'); + +// Execute +curl_exec($ch); - echo 'Took ' . $info['total_time'] . ' seconds to send a request to ' . $info['url']; +// Check HTTP status code +if (!curl_errno($ch)) { + switch ($http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE)) { + case 200: # OK + break; + default: + echo 'Unexpected HTTP code: ', $http_code, "n"; + } } // Close handle => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65212 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65212 ------------------------------------------------------------------ Modified: en/reference/yaml/functions/yaml-parse.xml By: bd808 on 2015-10-17 14:29:55 =================================================================== --- en/reference/yaml/functions/yaml-parse.xml +++ en/reference/yaml/functions/yaml-parse.xml @@ -14,7 +14,7 @@ <methodparam><type>string</type><parameter>input</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>pos</parameter><initializer>0</initializer></methodparam> <methodparam choice="opt"><type>int</type><parameter role="reference">ndocs</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>null</initializer></methodparam> </methodsynopsis> <para> Convert all or part of a YAML document stream to a PHP variable. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65228 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65228 ------------------------------------------------------------------ Modified: en/reference/yaml/functions/yaml-emit.xml By: bd808 on 2015-10-17 14:30:35 =================================================================== --- en/reference/yaml/functions/yaml-emit.xml +++ en/reference/yaml/functions/yaml-emit.xml @@ -14,7 +14,7 @@ <methodparam><type>mixed</type><parameter>data</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>encoding</parameter><initializer>YAML_ANY_ENCODING</initializer></methodparam> <methodparam choice="opt"><type>int</type><parameter>linebreak</parameter><initializer>YAML_ANY_BREAK</initializer></methodparam> - <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>null</initializer></methodparam> </methodsynopsis> <para> Generate a YAML representation of the provided <parameter>data</parameter>. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65229 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65229 ------------------------------------------------------------------ Modified: en/reference/yaml/functions/yaml-parse-url.xml By: bd808 on 2015-10-17 14:30:55 =================================================================== --- en/reference/yaml/functions/yaml-parse-url.xml +++ en/reference/yaml/functions/yaml-parse-url.xml @@ -14,7 +14,7 @@ <methodparam><type>string</type><parameter>url</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>pos</parameter><initializer>0</initializer></methodparam> <methodparam choice="opt"><type>int</type><parameter role="reference">ndocs</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>null</initializer></methodparam> </methodsynopsis> <para> Convert all or part of a YAML document stream read from a URL to a PHP variable. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65230 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65230 ------------------------------------------------------------------ Modified: en/reference/yaml/functions/yaml-parse-file.xml By: bd808 on 2015-10-17 14:31:15 =================================================================== --- en/reference/yaml/functions/yaml-parse-file.xml +++ en/reference/yaml/functions/yaml-parse-file.xml @@ -14,7 +14,7 @@ <methodparam><type>string</type><parameter>filename</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>pos</parameter><initializer>0</initializer></methodparam> <methodparam choice="opt"><type>int</type><parameter role="reference">ndocs</parameter></methodparam> - <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>null</initializer></methodparam> </methodsynopsis> <para> Convert all or part of a YAML document stream read from a file to a PHP variable. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65231 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65231 ------------------------------------------------------------------ Modified: en/reference/yaml/functions/yaml-emit-file.xml By: bd808 on 2015-10-17 14:31:34 =================================================================== --- en/reference/yaml/functions/yaml-emit-file.xml +++ en/reference/yaml/functions/yaml-emit-file.xml @@ -15,7 +15,7 @@ <methodparam><type>mixed</type><parameter>data</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>encoding</parameter><initializer>YAML_ANY_ENCODING</initializer></methodparam> <methodparam choice="opt"><type>int</type><parameter>linebreak</parameter><initializer>YAML_ANY_BREAK</initializer></methodparam> - <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter></methodparam> + <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>null</initializer></methodparam> </methodsynopsis> <para> Generate a YAML representation of the provided <parameter>data</parameter> => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65232 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65232 ------------------------------------------------------------------ Modified: en/reference/pdo/pdoexception.xml By: Daniel on 2015-10-19 00:31:06 =================================================================== --- en/reference/pdo/pdoexception.xml +++ en/reference/pdo/pdoexception.xml @@ -49,11 +49,6 @@ <type>array</type> <varname linkend="pdoexception.props.errorinfo">errorInfo</varname> </fieldsynopsis> - <fieldsynopsis> - <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/strings/functions/crypt.xml By: anonymous on 2015-11-02 09:56:50 =================================================================== --- en/reference/strings/functions/crypt.xml +++ en/reference/strings/functions/crypt.xml @@ -74,7 +74,7 @@ <simpara> <constant>CRYPT_BLOWFISH</constant> - Blowfish hashing with a salt as follows: "$2a$", "$2x$" or "$2y$", a two digit cost parameter, "$", and - 22 characters from the alphabet "./0-9A-Za-z". Using characters outside of + 21 characters from the alphabet "./0-9A-Za-z". Using characters outside of this range in the salt will cause crypt() to return a zero-length string. The two digit cost parameter is the base-2 logarithm of the iteration count for the underlying Blowfish-based hashing algorithmeter and must be => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65321 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65321 ------------------------------------------------------------------ Modified: en/reference/ldap/functions/ldap-connect.xml By: Andreas Heigl on 2015-11-03 13:38:36 =================================================================== --- en/reference/ldap/functions/ldap-connect.xml +++ en/reference/ldap/functions/ldap-connect.xml @@ -10,46 +10,57 @@ &reftitle.description; <methodsynopsis> <type>resource</type><methodname>ldap_connect</methodname> - <methodparam choice="opt"><type>string</type><parameter>hostname</parameter><initializer>&null;</initializer></methodparam> + <methodparam choice="opt"><type>string</type><parameter>hostname/LDAP-URI</parameter><initializer>&null;</initializer></methodparam> <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>389</initializer></methodparam> </methodsynopsis> <para> - Establishes a connection to a LDAP server on a specified - <parameter>hostname</parameter> and <parameter>port</parameter>. + Creates an LDAP link identifier and checks whether the given + <parameter>hostname/LDAP-URI</parameter> and <parameter>port</parameter> are plausible. + </para> + <para> + Note: This function does <strong>not</strong> open a connection. It checks whether the given parameters are plausibe and can be used to open a connection as soon as one is needed. </para> </refsect1> - + <refsect1 role="parameters"> &reftitle.parameters; <para> <variablelist> <varlistentry> - <term><parameter>hostname</parameter></term> + <term><parameter>hostname/LDAP-URI</parameter></term> <listitem> <para> - If you are using OpenLDAP 2.x.x you can specify a URL instead of the - hostname. To use LDAP with SSL, compile OpenLDAP 2.x.x with SSL - support, configure PHP with SSL, and set this parameter as - <literal>ldaps://hostname/</literal>. + This field supports using a hostname (without a :port specification, use the second parameter to + specify this) or with OpenLDAP 2.x.x and later a full LDAP URI, of the form <literal>ldap://hostname:port</literal> + or <literal>ldaps://hostname:port</literal> for SSL encryption. </para> + <para> + You can also provide multiple LDAP-URIs separated by a space as one string + </para> + <para> + Note that <literal>hostname:port</literal> is not a supported LDAP-URI as the schema is missing! + </para> + </listitem> </varlistentry> <varlistentry> <term><parameter>port</parameter></term> <listitem> <para> - The port to connect to. Not used when using URLs. + The port to connect to. Not used when using LDAP-URIs. </para> </listitem> </varlistentry> </variablelist> </para> </refsect1> - + <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - Returns a positive LDAP link identifier on success, or &false; on error. + Returns a positive LDAP link identifier when the provided hostname/port combination or LDAP-URI + seems plausible. It's a syntactic check of the provided parameters but the server(s) will not + be contacted! If the syntactic check fails it returns &false;. When OpenLDAP 2.x.x is used, <function>ldap_connect</function> will always return a <type>resource</type> as it does not actually connect but just initializes the connecting parameters. The actual connect happens with @@ -61,7 +72,7 @@ opened link will be returned. </para> </refsect1> - + <refsect1 role="examples"> &reftitle.examples; <para> @@ -103,7 +114,7 @@ </example> </para> </refsect1> - + <refsect1 role="seealso"> &reftitle.seealso; <para> @@ -112,7 +123,7 @@ </simplelist> </para> </refsect1> - + </refentry>  <versions> - <function name='ibase_add_user' from='PHP 5'/> - <function name='ibase_affected_rows' from='PHP 5'/> - <function name='ibase_backup' from='PHP 5'/> - <function name='ibase_blob_add' from='PHP 5'/> - <function name='ibase_blob_cancel' from='PHP 5'/> - <function name='ibase_blob_close' from='PHP 5'/> - <function name='ibase_blob_create' from='PHP 5'/> - <function name='ibase_blob_echo' from='PHP 5'/> - <function name='ibase_blob_get' from='PHP 5'/> - <function name='ibase_blob_import' from='PHP 5'/> - <function name='ibase_blob_info' from='PHP 5'/> - <function name='ibase_blob_open' from='PHP 5'/> - <function name='ibase_close' from='PHP 5'/> - <function name='ibase_commit' from='PHP 5'/> - <function name='ibase_commit_ret' from='PHP 5'/> - <function name='ibase_connect' from='PHP 5'/> - <function name='ibase_db_info' from='PHP 5'/> - <function name='ibase_delete_user' from='PHP 5'/> - <function name='ibase_drop_db' from='PHP 5'/> - <function name='ibase_errcode' from='PHP 5'/> - <function name='ibase_errmsg' from='PHP 5'/> - <function name='ibase_execute' from='PHP 5'/> - <function name='ibase_fetch_assoc' from='PHP 5'/> - <function name='ibase_fetch_object' from='PHP 5'/> - <function name='ibase_fetch_row' from='PHP 5'/> - <function name='ibase_field_info' from='PHP 5'/> - <function name='ibase_free_event_handler' from='PHP 5'/> - <function name='ibase_free_query' from='PHP 5'/> - <function name='ibase_free_result' from='PHP 5'/> - <function name='ibase_gen_id' from='PHP 5'/> - <function name='ibase_maintain_db' from='PHP 5'/> - <function name='ibase_modify_user' from='PHP 5'/> - <function name='ibase_name_result' from='PHP 5'/> - <function name='ibase_num_fields' from='PHP 5'/> - <function name='ibase_num_params' from='PHP 5'/> - <function name='ibase_num_rows' from='PHP 5'/> - <function name='ibase_param_info' from='PHP 5'/> - <function name='ibase_pconnect' from='PHP 5'/> - <function name='ibase_prepare' from='PHP 5'/> - <function name='ibase_query' from='PHP 5'/> - <function name='ibase_restore' from='PHP 5'/> - <function name='ibase_rollback' from='PHP 5'/> - <function name='ibase_rollback_ret' from='PHP 5'/> - <function name='ibase_server_info' from='PHP 5'/> - <function name='ibase_service_attach' from='PHP 5'/> - <function name='ibase_service_detach' from='PHP 5'/> - <function name='ibase_set_event_handler' from='PHP 5'/> - <function name='ibase_trans' from='PHP 5'/> - <function name='ibase_wait_event' from='PHP 5'/> + <function name='ibase_add_user' from='PHP 5, PHP 7'/> + <function name='ibase_affected_rows' from='PHP 5, PHP 7'/> + <function name='ibase_backup' from='PHP 5, PHP 7'/> + <function name='ibase_blob_add' from='PHP 5, PHP 7'/> + <function name='ibase_blob_cancel' from='PHP 5, PHP 7'/> + <function name='ibase_blob_close' from='PHP 5, PHP 7'/> + <function name='ibase_blob_create' from='PHP 5, PHP 7'/> + <function name='ibase_blob_echo' from='PHP 5, PHP 7'/> + <function name='ibase_blob_get' from='PHP 5, PHP 7'/> + <function name='ibase_blob_import' from='PHP 5, PHP 7'/> + <function name='ibase_blob_info' from='PHP 5, PHP 7'/> + <function name='ibase_blob_open' from='PHP 5, PHP 7'/> + <function name='ibase_close' from='PHP 5, PHP 7'/> + <function name='ibase_commit' from='PHP 5, PHP 7'/> + <function name='ibase_commit_ret' from='PHP 5, PHP 7'/> + <function name='ibase_connect' from='PHP 5, PHP 7'/> + <function name='ibase_db_info' from='PHP 5, PHP 7'/> + <function name='ibase_delete_user' from='PHP 5, PHP 7'/> + <function name='ibase_drop_db' from='PHP 5, PHP 7'/> + <function name='ibase_errcode' from='PHP 5, PHP 7'/> + <function name='ibase_errmsg' from='PHP 5, PHP 7'/> + <function name='ibase_execute' from='PHP 5, PHP 7'/> + <function name='ibase_fetch_assoc' from='PHP 5, PHP 7'/> + <function name='ibase_fetch_object' from='PHP 5, PHP 7'/> + <function name='ibase_fetch_row' from='PHP 5, PHP 7'/> + <function name='ibase_field_info' from='PHP 5, PHP 7'/> + <function name='ibase_free_event_handler' from='PHP 5, PHP 7'/> + <function name='ibase_free_query' from='PHP 5, PHP 7'/> + <function name='ibase_free_result' from='PHP 5, PHP 7'/> + <function name='ibase_gen_id' from='PHP 5, PHP 7'/> + <function name='ibase_maintain_db' from='PHP 5, PHP 7'/> + <function name='ibase_modify_user' from='PHP 5, PHP 7'/> + <function name='ibase_name_result' from='PHP 5, PHP 7'/> + <function name='ibase_num_fields' from='PHP 5, PHP 7'/> + <function name='ibase_num_params' from='PHP 5, PHP 7'/> + <function name='ibase_num_rows' from='PHP 5, PHP 7'/> + <function name='ibase_param_info' from='PHP 5, PHP 7'/> + <function name='ibase_pconnect' from='PHP 5, PHP 7'/> + <function name='ibase_prepare' from='PHP 5, PHP 7'/> + <function name='ibase_query' from='PHP 5, PHP 7'/> + <function name='ibase_restore' from='PHP 5, PHP 7'/> + <function name='ibase_rollback' from='PHP 5, PHP 7'/> + <function name='ibase_rollback_ret' from='PHP 5, PHP 7'/> + <function name='ibase_server_info' from='PHP 5, PHP 7'/> + <function name='ibase_service_attach' from='PHP 5, PHP 7'/> + <function name='ibase_service_detach' from='PHP 5, PHP 7'/> + <function name='ibase_set_event_handler' from='PHP 5, PHP 7'/> + <function name='ibase_trans' from='PHP 5, PHP 7'/> + <function name='ibase_wait_event' from='PHP 5, PHP 7'/> </versions> <!-- Keep this comment at the end of the file => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65438 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65438 ------------------------------------------------------------------ Modified: en/reference/pdo/pdostatement/execute.xml By: Oscar Merida on 2015-11-19 19:38:41 =================================================================== --- en/reference/pdo/pdostatement/execute.xml +++ en/reference/pdo/pdostatement/execute.xml @@ -15,7 +15,7 @@ </methodsynopsis> <para> Execute the prepared statement. If the prepared statement included - parameter markers, you must either: + parameter markers, either: <itemizedlist> <listitem><para>call <function>PDOStatement::bindParam</function> to bind PHP variables to the parameter markers: bound variables pass their value as input and receive the @@ -38,12 +38,11 @@ All values are treated as <constant>PDO::PARAM_STR</constant>. </para> <para> - You cannot bind multiple values to a single parameter; for example, - you cannot bind two values to a single named parameter in an IN() - clause. + Multiple values cannot bind to a single parameter; for example, + a single named parameter in an IN() clause cannot bind to two values. </para> <para> - You cannot bind more values than specified; if more keys exist in + Binding more values than specified is not possible; if more keys exist in <parameter>input_parameters</parameter> than in the SQL specified in the <methodname>PDO::prepare</methodname>, then the statement will fail and an error is emitted. => Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=65473 => Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=65473 ------------------------------------------------------------------ -- https://edit.php.net/ This email is send automatically by the Php Docbook Online Editor.