[prev in list] [next in list] [prev in thread] [next in thread]
List: php-doc-cvs
Subject: [DOC-CVS] [doc-en] master: MongoDB: Document upcoming type changes for 1.15
From: Andreas Braun <noreply () php ! net>
Date: 2022-08-19 8:13:20
Message-ID: uGJUiia4uuE3oeRLtOMeMEPgU99zoLBEzKDnkX2iU () main ! php ! net
[Download RAW message or body]
Author: Andreas Braun (alcaeus)
Date: 2022-08-19T10:05:27+02:00
Commit: https://github.com/php/doc-en/commit/734bafeaf071b78b15d375f9af583befddd8c2a2
Raw diff: https://github.com/php/doc-en/commit/734bafeaf071b78b15d375f9af583befddd8c2a2.diff
MongoDB: Document upcoming type changes for 1.15
Changed paths:
M language-snippets.ent
M reference/mongodb/architecture.xml
M reference/mongodb/bson/binaryinterface.xml
M reference/mongodb/bson/decimal128/construct.xml
M reference/mongodb/bson/decimal128interface.xml
M reference/mongodb/bson/javascript/construct.xml
M reference/mongodb/bson/javascriptinterface.xml
M reference/mongodb/bson/objectid/construct.xml
M reference/mongodb/bson/objectidinterface.xml
M reference/mongodb/bson/regexinterface.xml
M reference/mongodb/bson/serializable.xml
M reference/mongodb/bson/serializable/bsonserialize.xml
M reference/mongodb/bson/timestampinterface.xml
M reference/mongodb/bson/unserializable.xml
M reference/mongodb/bson/unserializable/bsonunserialize.xml
M reference/mongodb/bson/utcdatetime/construct.xml
M reference/mongodb/bson/utcdatetimeinterface.xml
M reference/mongodb/mongodb/driver/bulkwrite/construct.xml
M reference/mongodb/mongodb/driver/bulkwrite/delete.xml
M reference/mongodb/mongodb/driver/bulkwrite/update.xml
M reference/mongodb/mongodb/driver/clientencryption/createdatakey.xml
M reference/mongodb/mongodb/driver/clientencryption/encrypt.xml
M reference/mongodb/mongodb/driver/command/construct.xml
M reference/mongodb/mongodb/driver/cursor/current.xml
M reference/mongodb/mongodb/driver/cursorinterface.xml
M reference/mongodb/mongodb/driver/manager/construct.xml
M reference/mongodb/mongodb/driver/manager/executebulkwrite.xml
M reference/mongodb/mongodb/driver/manager/executecommand.xml
M reference/mongodb/mongodb/driver/manager/executequery.xml
M reference/mongodb/mongodb/driver/manager/executereadcommand.xml
M reference/mongodb/mongodb/driver/manager/executereadwritecommand.xml
M reference/mongodb/mongodb/driver/manager/executewritecommand.xml
M reference/mongodb/mongodb/driver/manager/startsession.xml
M reference/mongodb/mongodb/driver/monitoring/commandfailedevent/geterror.xml
M reference/mongodb/mongodb/driver/monitoring/commandsubscriber.xml
M reference/mongodb/mongodb/driver/monitoring/sdamsubscriber.xml
M reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/geterror.xml
M reference/mongodb/mongodb/driver/query/construct.xml
M reference/mongodb/mongodb/driver/readconcern/construct.xml
M reference/mongodb/mongodb/driver/readpreference/construct.xml
M reference/mongodb/mongodb/driver/server/executebulkwrite.xml
M reference/mongodb/mongodb/driver/server/executecommand.xml
M reference/mongodb/mongodb/driver/server/executequery.xml
M reference/mongodb/mongodb/driver/server/executereadcommand.xml
M reference/mongodb/mongodb/driver/server/executereadwritecommand.xml
M reference/mongodb/mongodb/driver/server/executewritecommand.xml
M reference/mongodb/mongodb/driver/serverapi/construct.xml
M reference/mongodb/mongodb/driver/serverdescription/getroundtriptime.xml
M reference/mongodb/mongodb/driver/session/starttransaction.xml
M reference/mongodb/mongodb/driver/writeconcern/construct.xml
M reference/mongodb/mongodb/driver/writeconcern/getwtimeout.xml
M reference/mongodb/tutorial/apm.xml
Diff:
diff --git a/language-snippets.ent b/language-snippets.ent
index c864f62fe39..391ceb77c3b 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -2693,6 +2693,18 @@ the <link linkend="set.mongodb">MongoDB</link> extension \
should be used.</para>'>
<!-- mongodb -->
+<!ENTITY mongodb.changelog.tentative-return-types '
+ <row xmlns="http://docbook.org/ns/docbook">
+ <entry>PECL mongodb 1.15.0</entry>
+ <entry>
+ Return types for methods are declared as tentative on PHP 8.0 and newer,
+ triggering deprecation notices in code that implements this interface
+ without declaring the appropriate return types. The \
<code>#[ReturnTypeWillChange]</code> + attribute can be added to silence the \
deprecation notice. + </entry>
+ </row>
+'>
+
<!ENTITY mongodb.option.collation '
<row xmlns="http://docbook.org/ns/docbook">
<entry>collation</entry>
diff --git a/reference/mongodb/architecture.xml b/reference/mongodb/architecture.xml
index 2183e95a441..1ad22493383 100644
--- a/reference/mongodb/architecture.xml
+++ b/reference/mongodb/architecture.xml
@@ -441,21 +441,21 @@ class AnotherClass1 implements MongoDB\BSON\Serializable {
public $foo = 42;
protected $prot = "wine";
private $fpr = "cheese";
- function bsonSerialize() {
+ function bsonSerialize(): array {
return [ 'foo' => $this->foo, 'prot' => $this->prot ];
}
} // => { "foo" : 42, "prot" : "wine" }
class AnotherClass2 implements MongoDB\BSON\Serializable {
public $foo = 42;
- function bsonSerialize() {
+ function bsonSerialize(): self {
return $this;
}
} // => MongoDB\Driver\Exception\UnexpectedValueException("bsonSerialize() did not \
return an array or stdClass")
class AnotherClass3 implements MongoDB\BSON\Serializable {
private $elements = [ 'foo', 'bar' ];
- function bsonSerialize() {
+ function bsonSerialize(): array {
return $this->elements;
}
} // => { "0" : "foo", "1" : "bar" }
@@ -463,11 +463,11 @@ class AnotherClass3 implements MongoDB\BSON\Serializable {
class ContainerClass implements MongoDB\BSON\Serializable {
public $things = AnotherClass4 implements MongoDB\BSON\Serializable {
private $elements = [ 0 => 'foo', 2 => 'bar' ];
- function bsonSerialize() {
+ function bsonSerialize(): array {
return $this->elements;
}
}
- function bsonSerialize() {
+ function bsonSerialize(): array {
return [ 'things' => $this->things ];
}
} // => { "things" : { "0" : "foo", "2" : "bar" } }
@@ -475,11 +475,11 @@ class ContainerClass implements MongoDB\BSON\Serializable {
class ContainerClass implements MongoDB\BSON\Serializable {
public $things = AnotherClass5 implements MongoDB\BSON\Serializable {
private $elements = [ 0 => 'foo', 2 => 'bar' ];
- function bsonSerialize() {
+ function bsonSerialize(): array {
return array_values($this->elements);
}
}
- function bsonSerialize() {
+ function bsonSerialize(): array {
return [ 'things' => $this->things ];
}
} // => { "things" : [ "foo", "bar" ] }
@@ -487,11 +487,11 @@ class ContainerClass implements MongoDB\BSON\Serializable {
class ContainerClass implements MongoDB\BSON\Serializable {
public $things = AnotherClass6 implements MongoDB\BSON\Serializable {
private $elements = [ 'foo', 'bar' ];
- function bsonSerialize() {
+ function bsonSerialize(): array {
return (object) $this->elements;
}
}
- function bsonSerialize() {
+ function bsonSerialize(): array {
return [ 'things' => $this->things ];
}
} // => { "things" : { "0" : "foo", "1" : "bar" } }
@@ -500,7 +500,7 @@ class UpperClass implements MongoDB\BSON\Persistable {
public $foo = 42;
protected $prot = "wine";
private $fpr = "cheese";
- function bsonSerialize() {
+ function bsonSerialize(): array {
return [ 'foo' => $this->foo, 'prot' => $this->prot ];
}
} // => { "foo" : 42, "prot" : "wine", "__pclass" : { "$type" : "80", "$binary" : \
"VXBwZXJDbGFzcw==" } }
diff --git a/reference/mongodb/bson/binaryinterface.xml \
b/reference/mongodb/bson/binaryinterface.xml index c768f0aa0f5..39c8f9e51f1 100644
--- a/reference/mongodb/bson/binaryinterface.xml
+++ b/reference/mongodb/bson/binaryinterface.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<phpdoc:classref xml:id="class.mongodb-bson-binaryinterface" \
xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink" \
xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -28,6 +28,25 @@
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-bson-binaryinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> </classsynopsis>
</section>
+
+ <section role="changelog">
+ &reftitle.changelog;
+ <para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ &mongodb.changelog.tentative-return-types;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
</partintro>
&reference.mongodb.bson.entities.binaryinterface;
diff --git a/reference/mongodb/bson/decimal128/construct.xml \
b/reference/mongodb/bson/decimal128/construct.xml index efde9c4237e..6d60454a4bc \
100644
--- a/reference/mongodb/bson/decimal128/construct.xml
+++ b/reference/mongodb/bson/decimal128/construct.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-bson-decimal128.construct" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<methodname>MongoDB\BSON\Decimal128::__construct</methodname>
- <methodparam choice="opt"><type>string</type><parameter>value</parameter></methodparam>
+ <methodparam><type>string</type><parameter>value</parameter></methodparam>
</methodsynopsis>
&mongodb.note.decimal128;
</refsect1>
diff --git a/reference/mongodb/bson/decimal128interface.xml \
b/reference/mongodb/bson/decimal128interface.xml index 676a6d6a91a..35c03558d38 \
100644
--- a/reference/mongodb/bson/decimal128interface.xml
+++ b/reference/mongodb/bson/decimal128interface.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<phpdoc:classref xml:id="class.mongodb-bson-decimal128interface" \
xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink" \
xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -29,6 +29,24 @@
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-bson-decimal128interface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> </classsynopsis>
</section>
+ <section role="changelog">
+ &reftitle.changelog;
+ <para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ &mongodb.changelog.tentative-return-types;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
</partintro>
&reference.mongodb.bson.entities.decimal128interface;
diff --git a/reference/mongodb/bson/javascript/construct.xml \
b/reference/mongodb/bson/javascript/construct.xml index 34b31980ed9..660a0444392 \
100644
--- a/reference/mongodb/bson/javascript/construct.xml
+++ b/reference/mongodb/bson/javascript/construct.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-bson-javascript.construct" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -12,7 +12,7 @@
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<methodname>MongoDB\BSON\Javascript::__construct</methodname> \
<methodparam><type>string</type><parameter>code</parameter></methodparam>
- <methodparam choice="opt"><type \
class="union"><type>array</type><type>object</type></type><parameter>scope</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>object</type><type>null</type></type><parameter>scope</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
</refsect1>
diff --git a/reference/mongodb/bson/javascriptinterface.xml \
b/reference/mongodb/bson/javascriptinterface.xml index 49f1638272e..3462c9bcdbb \
100644
--- a/reference/mongodb/bson/javascriptinterface.xml
+++ b/reference/mongodb/bson/javascriptinterface.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<phpdoc:classref xml:id="class.mongodb-bson-javascriptinterface" \
xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink" \
xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -29,6 +29,25 @@
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-bson-javascriptinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> </classsynopsis>
</section>
+
+ <section role="changelog">
+ &reftitle.changelog;
+ <para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ &mongodb.changelog.tentative-return-types;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
</partintro>
&reference.mongodb.bson.entities.javascriptinterface;
diff --git a/reference/mongodb/bson/objectid/construct.xml \
b/reference/mongodb/bson/objectid/construct.xml index ae032109f85..11964715440 100644
--- a/reference/mongodb/bson/objectid/construct.xml
+++ b/reference/mongodb/bson/objectid/construct.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-bson-objectid.construct" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<methodname>MongoDB\BSON\ObjectId::__construct</methodname>
- <methodparam choice="opt"><type>string</type><parameter>id</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>string</type><type>null</type></type><parameter>id</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
</refsect1>
diff --git a/reference/mongodb/bson/objectidinterface.xml \
b/reference/mongodb/bson/objectidinterface.xml index 760b4c1202d..f39720dbb93 100644
--- a/reference/mongodb/bson/objectidinterface.xml
+++ b/reference/mongodb/bson/objectidinterface.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<phpdoc:classref xml:id="class.mongodb-bson-objectidinterface" \
xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink" \
xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -29,6 +29,25 @@
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-bson-objectidinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> </classsynopsis>
</section>
+
+ <section role="changelog">
+ &reftitle.changelog;
+ <para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ &mongodb.changelog.tentative-return-types;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
</partintro>
&reference.mongodb.bson.entities.objectidinterface;
diff --git a/reference/mongodb/bson/regexinterface.xml \
b/reference/mongodb/bson/regexinterface.xml index 789fe7bdc1a..ba76709647a 100644
--- a/reference/mongodb/bson/regexinterface.xml
+++ b/reference/mongodb/bson/regexinterface.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<phpdoc:classref xml:id="class.mongodb-bson-regexinterface" \
xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink" \
xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -28,6 +28,25 @@
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-bson-regexinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> </classsynopsis>
</section>
+
+ <section role="changelog">
+ &reftitle.changelog;
+ <para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ &mongodb.changelog.tentative-return-types;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
</partintro>
&reference.mongodb.bson.entities.regexinterface;
diff --git a/reference/mongodb/bson/serializable.xml \
b/reference/mongodb/bson/serializable.xml index 9bf6e0d8f81..afd3c7204c2 100644
--- a/reference/mongodb/bson/serializable.xml
+++ b/reference/mongodb/bson/serializable.xml
@@ -30,13 +30,13 @@
<ooclass>
<classname>MongoDB\BSON\Serializable</classname>
</ooclass>
-
+
<oointerface>
<interfacename>MongoDB\BSON\Type</interfacename>
</oointerface>
</classsynopsisinfo>
<!-- }}} -->
-
+
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-bson-serializable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> </classsynopsis>
@@ -44,6 +44,24 @@
</section>
+ <section role="changelog">
+ &reftitle.changelog;
+ <para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ &mongodb.changelog.tentative-return-types;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
</partintro>
&reference.mongodb.bson.entities.serializable;
diff --git a/reference/mongodb/bson/serializable/bsonserialize.xml \
b/reference/mongodb/bson/serializable/bsonserialize.xml index \
cd60dac8c79..e779cbcb827 100644
--- a/reference/mongodb/bson/serializable/bsonserialize.xml
+++ b/reference/mongodb/bson/serializable/bsonserialize.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-bson-serializable.bsonserialize" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -67,7 +67,7 @@ class MyDocument implements MongoDB\BSON\Serializable
$this->id = new MongoDB\BSON\ObjectId;
}
- function bsonSerialize()
+ function bsonSerialize(): array
{
return ['_id' => $this->id, 'foo' => 'bar'];
}
@@ -95,7 +95,7 @@ echo MongoDB\BSON\toJSON($bson), "\n";
class MyArray implements MongoDB\BSON\Serializable
{
- function bsonSerialize()
+ function bsonSerialize(): array
{
return [1, 2, 3];
}
@@ -123,7 +123,7 @@ echo MongoDB\BSON\toJSON($bson), "\n";
class MyDocument implements MongoDB\BSON\Serializable
{
- function bsonSerialize()
+ function bsonSerialize(): array
{
return ['foo' => 'bar'];
}
@@ -152,7 +152,7 @@ echo MongoDB\BSON\toJSON($bson), "\n";
class MyArray implements MongoDB\BSON\Serializable
{
- function bsonSerialize()
+ function bsonSerialize(): array
{
return [1, 2, 3];
}
diff --git a/reference/mongodb/bson/timestampinterface.xml \
b/reference/mongodb/bson/timestampinterface.xml index 38cb0e1dad1..1e3efccd661 100644
--- a/reference/mongodb/bson/timestampinterface.xml
+++ b/reference/mongodb/bson/timestampinterface.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<phpdoc:classref xml:id="class.mongodb-bson-timestampinterface" \
xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink" \
xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -29,6 +29,25 @@
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-bson-timestampinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> </classsynopsis>
</section>
+
+ <section role="changelog">
+ &reftitle.changelog;
+ <para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ &mongodb.changelog.tentative-return-types;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
</partintro>
&reference.mongodb.bson.entities.timestampinterface;
diff --git a/reference/mongodb/bson/unserializable.xml \
b/reference/mongodb/bson/unserializable.xml index c4ae5f0d38d..d3e5bed0e10 100644
--- a/reference/mongodb/bson/unserializable.xml
+++ b/reference/mongodb/bson/unserializable.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<phpdoc:classref xml:id="class.mongodb-bson-unserializable" \
xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink" \
xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -33,7 +33,7 @@
</ooclass>
</classsynopsisinfo>
<!-- }}} -->
-
+
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-bson-unserializable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> </classsynopsis>
@@ -41,6 +41,24 @@
</section>
+ <section role="changelog">
+ &reftitle.changelog;
+ <para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ &mongodb.changelog.tentative-return-types;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
</partintro>
&reference.mongodb.bson.entities.unserializable;
diff --git a/reference/mongodb/bson/unserializable/bsonunserialize.xml \
b/reference/mongodb/bson/unserializable/bsonunserialize.xml index \
8b8f16c8518..3df7e72137b 100644
--- a/reference/mongodb/bson/unserializable/bsonunserialize.xml
+++ b/reference/mongodb/bson/unserializable/bsonunserialize.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-bson-unserializable.bsonunserialize" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -65,7 +65,7 @@ class MyDocument implements \
MongoDB\BSON\Unserializable {
private $data = [];
- function bsonUnserialize(array $data)
+ function bsonUnserialize(array $data): void
{
$this->data = $data;
}
diff --git a/reference/mongodb/bson/utcdatetime/construct.xml \
b/reference/mongodb/bson/utcdatetime/construct.xml index 2f64dad9e99..8bc36bd99ff \
100644
--- a/reference/mongodb/bson/utcdatetime/construct.xml
+++ b/reference/mongodb/bson/utcdatetime/construct.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-bson-utcdatetime.construct" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<methodname>MongoDB\BSON\UTCDateTime::__construct</methodname>
- <methodparam choice="opt"><type \
class="union"><type>int</type><type>float</type><type>string</type><type>DateTimeInter \
face</type></type><parameter>milliseconds</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>int</type><type>float</type><type>string</type><type>DateTimeInter \
face</type><type>null</type></type><parameter>milliseconds</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
</refsect1>
@@ -19,7 +19,7 @@
&reftitle.parameters;
<variablelist>
<varlistentry>
- <term><parameter>milliseconds</parameter> (<type \
class="union"><type>int</type><type>float</type><type>string</type><type>DateTimeInterface</type></type>)</term>
+ <term><parameter>milliseconds</parameter> (<type \
class="union"><type>int</type><type>float</type><type>string</type><type>DateTimeInterface</type><type>null</type></type>)</term>
<listitem>
<para>
Number of milliseconds since the Unix epoch (Jan 1, 1970). Negative values
diff --git a/reference/mongodb/bson/utcdatetimeinterface.xml \
b/reference/mongodb/bson/utcdatetimeinterface.xml index 0d4122ef985..f7ffe35f144 \
100644
--- a/reference/mongodb/bson/utcdatetimeinterface.xml
+++ b/reference/mongodb/bson/utcdatetimeinterface.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<phpdoc:classref xml:id="class.mongodb-bson-utcdatetimeinterface" \
xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink" \
xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -29,6 +29,25 @@
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-bson-utcdatetimeinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> </classsynopsis>
</section>
+
+ <section role="changelog">
+ &reftitle.changelog;
+ <para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ &mongodb.changelog.tentative-return-types;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
</partintro>
&reference.mongodb.bson.entities.utcdatetimeinterface;
diff --git a/reference/mongodb/mongodb/driver/bulkwrite/construct.xml \
b/reference/mongodb/mongodb/driver/bulkwrite/construct.xml index \
cdf93ee08d8..4a7fb9cf3f4 100644
--- a/reference/mongodb/mongodb/driver/bulkwrite/construct.xml
+++ b/reference/mongodb/mongodb/driver/bulkwrite/construct.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-bulkwrite.construct" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<modifier>public</modifier> \
<methodname>MongoDB\Driver\BulkWrite::__construct</methodname>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Constructs a new <classname>MongoDB\Driver\BulkWrite</classname>, which is a
diff --git a/reference/mongodb/mongodb/driver/bulkwrite/delete.xml \
b/reference/mongodb/mongodb/driver/bulkwrite/delete.xml index \
252d5b3e088..4f714623310 100644
--- a/reference/mongodb/mongodb/driver/bulkwrite/delete.xml
+++ b/reference/mongodb/mongodb/driver/bulkwrite/delete.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-bulkwrite.delete" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -12,7 +12,7 @@
<methodsynopsis>
<modifier>public</modifier> \
<type>void</type><methodname>MongoDB\Driver\BulkWrite::delete</methodname> \
<methodparam><type class="union"><type>array</type><type>object</type></type><parameter>filter</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>deleteOptions</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>deleteOptions</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Adds a delete operation to the
diff --git a/reference/mongodb/mongodb/driver/bulkwrite/update.xml \
b/reference/mongodb/mongodb/driver/bulkwrite/update.xml index \
3ad23cead0e..2a202f1bb0a 100644
--- a/reference/mongodb/mongodb/driver/bulkwrite/update.xml
+++ b/reference/mongodb/mongodb/driver/bulkwrite/update.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-bulkwrite.update" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -13,7 +13,7 @@
<modifier>public</modifier> \
<type>void</type><methodname>MongoDB\Driver\BulkWrite::update</methodname> \
<methodparam><type class="union"><type>array</type><type>object</type></type><parameter>filter</parameter></methodparam>
<methodparam><type \
class="union"><type>array</type><type>object</type></type><parameter>newObj</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>updateOptions</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>updateOptions</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Adds an update operation to the
diff --git a/reference/mongodb/mongodb/driver/clientencryption/createdatakey.xml \
b/reference/mongodb/mongodb/driver/clientencryption/createdatakey.xml index \
f36af3d1c62..1a50f0ab8a3 100644
--- a/reference/mongodb/mongodb/driver/clientencryption/createdatakey.xml
+++ b/reference/mongodb/mongodb/driver/clientencryption/createdatakey.xml
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344035 $ -->
+<!-- $Revision: 344035 $ -->
<refentry xml:id="mongodb-driver-clientencryption.createdatakey" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> <refname>MongoDB\Driver\ClientEncryption::createDataKey</refname>
<refpurpose>Create a new encryption data key</refpurpose>
</refnamediv>
-
+
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\BSON\Binary</type><methodname>MongoDB\Driver\ClientEncryption::createDataKey</methodname>
<methodparam><type>string</type><parameter>kmsProvider</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Creates a new key document and inserts it into the key vault collection.
</para>
</refsect1>
-
+
<refsect1 role="parameters">
&reftitle.parameters;
<variablelist>
@@ -33,7 +33,7 @@
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><parameter>options</parameter></term>
<listitem>
@@ -235,7 +235,7 @@
</informaltable>
</para>
</refsect1>
-
+
</refentry>
<!-- Keep this comment at the end of the file
diff --git a/reference/mongodb/mongodb/driver/clientencryption/encrypt.xml \
b/reference/mongodb/mongodb/driver/clientencryption/encrypt.xml index \
d94b6af9da7..96efb65c329 100644
--- a/reference/mongodb/mongodb/driver/clientencryption/encrypt.xml
+++ b/reference/mongodb/mongodb/driver/clientencryption/encrypt.xml
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344035 $ -->
+<!-- $Revision: 344035 $ -->
<refentry xml:id="mongodb-driver-clientencryption.encrypt" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> <refname>MongoDB\Driver\ClientEncryption::encrypt</refname>
<refpurpose>Encrypt a value</refpurpose>
</refnamediv>
-
+
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\BSON\Binary</type><methodname>MongoDB\Driver\ClientEncryption::encrypt</methodname>
<methodparam><type>mixed</type><parameter>value</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Encrypts the value.
</para>
</refsect1>
-
+
<refsect1 role="parameters">
&reftitle.parameters;
<variablelist>
@@ -31,7 +31,7 @@
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><parameter>options</parameter></term>
<listitem>
diff --git a/reference/mongodb/mongodb/driver/command/construct.xml \
b/reference/mongodb/mongodb/driver/command/construct.xml index \
d2436ca131c..0f3a4b222f5 100644
--- a/reference/mongodb/mongodb/driver/command/construct.xml
+++ b/reference/mongodb/mongodb/driver/command/construct.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-command.construct" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> <refname>MongoDB\Driver\Command::__construct</refname>
<refpurpose>Create a new Command</refpurpose>
</refnamediv>
-
+
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<methodname>MongoDB\Driver\Command::__construct</methodname> <methodparam><type \
class="union"><type>array</type><type>object</type></type><parameter>document</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>commandOptions</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>commandOptions</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Constructs a new <classname>MongoDB\Driver\Command</classname>, which is an
@@ -28,7 +28,7 @@
<classname>MongoDB\Driver\Cursor</classname>.
</para>
</refsect1>
-
+
<refsect1 role="parameters">
&reftitle.parameters;
<variablelist>
@@ -40,7 +40,7 @@
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><parameter>commandOptions</parameter></term>
<listitem>
@@ -85,14 +85,14 @@
</varlistentry>
</variablelist>
</refsect1>
-
+
<refsect1 role="errors">
&reftitle.errors;
<simplelist>
&mongodb.throws.argumentparsing;
</simplelist>
</refsect1>
-
+
<refsect1 role="changelog">
&reftitle.changelog;
<para>
@@ -119,7 +119,7 @@
</informaltable>
</para>
</refsect1>
-
+
<refsect1 role="examples">
&reftitle.examples;
<example>
@@ -188,7 +188,7 @@ array(13) {
]]>
</screen>
</example>
-
+
<example>
<title><function>MongoDB\Driver\Command::__construct</function> example</title>
<para>
@@ -228,8 +228,8 @@ var_dump($response);
</screen>
</example>
</refsect1>
-
-
+
+
<refsect1 role="seealso">
&reftitle.seealso;
<simplelist>
@@ -237,7 +237,7 @@ var_dump($response);
<member><classname>MongoDB\Driver\Cursor</classname></member>
</simplelist>
</refsect1>
-
+
</refentry>
<!-- Keep this comment at the end of the file
diff --git a/reference/mongodb/mongodb/driver/cursor/current.xml \
b/reference/mongodb/mongodb/driver/cursor/current.xml index 1a4d04c3c53..dd2dad4b3ef \
100644
--- a/reference/mongodb/mongodb/driver/cursor/current.xml
+++ b/reference/mongodb/mongodb/driver/cursor/current.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>public</modifier> <type \
class="union"><type>array</type><type>object</type></type><methodname>MongoDB\Driver\Cursor::current</methodname>
+ <modifier>public</modifier> <type \
class="union"><type>array</type><type>object</type><type>null</type></type><methodname>MongoDB\Driver\Cursor::current</methodname>
<void/>
</methodsynopsis>
</refsect1>
@@ -21,7 +21,7 @@
</refsect1>
<refsect1 role="returnvalues">
- &reftitle.returnvalues;
+ &reftitle.returnvalues;
<para>
Returns the current result document as an array or object, depending on the
cursor's type map. If iteration has not started or the current position
@@ -54,4 +54,4 @@ End:
vim600: syn=xml fen fdm=syntax fdl=2 si
vim: et tw=78 syn=sgml
vi: ts=1 sw=1
--->
+-->
diff --git a/reference/mongodb/mongodb/driver/cursorinterface.xml \
b/reference/mongodb/mongodb/driver/cursorinterface.xml index 4284d3dd1d3..50271ee9cc5 \
100644
--- a/reference/mongodb/mongodb/driver/cursorinterface.xml
+++ b/reference/mongodb/mongodb/driver/cursorinterface.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344505 $ -->
+<!-- $Revision: 344505 $ -->
<phpdoc:classref xml:id="class.mongodb-driver-cursorinterface" \
xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink" \
xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -37,7 +37,7 @@
</oointerface>
</classsynopsisinfo>
<!-- }}} -->
-
+
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-cursorinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> </classsynopsis>
@@ -45,6 +45,25 @@
</section>
+ <section role="changelog">
+ &reftitle.changelog;
+ <para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ &mongodb.changelog.tentative-return-types;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
+
</partintro>
&reference.mongodb.mongodb.driver.entities.cursorinterface;
diff --git a/reference/mongodb/mongodb/driver/manager/construct.xml \
b/reference/mongodb/mongodb/driver/manager/construct.xml index \
df6f3865f46..a6e8e656784 100644
--- a/reference/mongodb/mongodb/driver/manager/construct.xml
+++ b/reference/mongodb/mongodb/driver/manager/construct.xml
@@ -11,9 +11,9 @@
&reftitle.description;
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<methodname>MongoDB\Driver\Manager::__construct</methodname>
- <methodparam choice="opt"><type>string</type><parameter>uri</parameter><initializer>"mongodb://127.0.0.1/"</initializer></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>uriOptions</parameter><initializer>array()</initializer></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>driverOptions</parameter><initializer>array()</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>string</type><type>null</type></type><parameter>uri</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>uriOptions</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>driverOptions</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Constructs a new <classname>MongoDB\Driver\Manager</classname> object with the \
specified options. @@ -828,7 +828,7 @@ \
mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][ \
<note> <simpara>
Supplying an <literal>encryptedFieldsMap</literal> provides
- more security than relying on an encrypted fields
+ more security than relying on an encrypted fields
<literal>encryptedFields</literal> obtained from the server.
It protects against a malicious server advertising a false
<literal>encryptedFields</literal>.
diff --git a/reference/mongodb/mongodb/driver/manager/executebulkwrite.xml \
b/reference/mongodb/mongodb/driver/manager/executebulkwrite.xml index \
2fd29be86c4..9c8be59a25a 100644
--- a/reference/mongodb/mongodb/driver/manager/executebulkwrite.xml
+++ b/reference/mongodb/mongodb/driver/manager/executebulkwrite.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-manager.executebulkwrite" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -13,7 +13,7 @@
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\Driver\WriteResult</type><methodname>MongoDB\Driver\Manager::executeBulkWrite</methodname>
<methodparam><type>string</type><parameter>namespace</parameter></methodparam>
<methodparam><type>MongoDB\Driver\BulkWrite</type><parameter>bulk</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>MongoDB\Driver\WriteConcern</type><type>null</ty \
pe></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Executes one or more write operations on the primary server.
diff --git a/reference/mongodb/mongodb/driver/manager/executecommand.xml \
b/reference/mongodb/mongodb/driver/manager/executecommand.xml index \
1bd917115b7..2682dca79dd 100644
--- a/reference/mongodb/mongodb/driver/manager/executecommand.xml
+++ b/reference/mongodb/mongodb/driver/manager/executecommand.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-manager.executecommand" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -13,7 +13,7 @@
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Manager::executeCommand</methodname>
<methodparam><type>string</type><parameter>db</parameter></methodparam>
<methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>MongoDB\Driver\ReadPreference</type><type>null</ \
type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Selects a server according to the <literal>"readPreference"</literal> option
diff --git a/reference/mongodb/mongodb/driver/manager/executequery.xml \
b/reference/mongodb/mongodb/driver/manager/executequery.xml index \
eba4f66b4c6..445d289c50c 100644
--- a/reference/mongodb/mongodb/driver/manager/executequery.xml
+++ b/reference/mongodb/mongodb/driver/manager/executequery.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-manager.executequery" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -13,7 +13,7 @@
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Manager::executeQuery</methodname>
<methodparam><type>string</type><parameter>namespace</parameter></methodparam>
<methodparam><type>MongoDB\Driver\Query</type><parameter>query</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>MongoDB\Driver\ReadPreference</type><type>null</ \
type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Selects a server according to the <literal>"readPreference"</literal> option
diff --git a/reference/mongodb/mongodb/driver/manager/executereadcommand.xml \
b/reference/mongodb/mongodb/driver/manager/executereadcommand.xml index \
a64fe07ccd3..d539c3aedc4 100644
--- a/reference/mongodb/mongodb/driver/manager/executereadcommand.xml
+++ b/reference/mongodb/mongodb/driver/manager/executereadcommand.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-manager.executereadcommand" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -13,7 +13,7 @@
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Manager::executeReadCommand</methodname>
<methodparam><type>string</type><parameter>db</parameter></methodparam>
<methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Selects a server according to the <literal>"readPreference"</literal> option
diff --git a/reference/mongodb/mongodb/driver/manager/executereadwritecommand.xml \
b/reference/mongodb/mongodb/driver/manager/executereadwritecommand.xml index \
91e0f399b6f..c22be38b11e 100644
--- a/reference/mongodb/mongodb/driver/manager/executereadwritecommand.xml
+++ b/reference/mongodb/mongodb/driver/manager/executereadwritecommand.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-manager.executereadwritecommand" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -13,7 +13,7 @@
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Manager::executeReadWriteCommand</methodname>
<methodparam><type>string</type><parameter>db</parameter></methodparam>
<methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Executes the command on the primary server.
diff --git a/reference/mongodb/mongodb/driver/manager/executewritecommand.xml \
b/reference/mongodb/mongodb/driver/manager/executewritecommand.xml index \
7ddeb0bc4b4..f5e07a4abc4 100644
--- a/reference/mongodb/mongodb/driver/manager/executewritecommand.xml
+++ b/reference/mongodb/mongodb/driver/manager/executewritecommand.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-manager.executewritecommand" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -13,7 +13,7 @@
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Manager::executeWriteCommand</methodname>
<methodparam><type>string</type><parameter>db</parameter></methodparam>
<methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Executes the command on the primary server.
diff --git a/reference/mongodb/mongodb/driver/manager/startsession.xml \
b/reference/mongodb/mongodb/driver/manager/startsession.xml index \
54ffd324cbd..879722c3e2e 100644
--- a/reference/mongodb/mongodb/driver/manager/startsession.xml
+++ b/reference/mongodb/mongodb/driver/manager/startsession.xml
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\Driver\Session</type><methodname>MongoDB\Driver\Manager::startSession</methodname>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Creates a <classname>MongoDB\Driver\Session</classname> for the given
diff --git a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/geterror.xml \
b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/geterror.xml index \
139ff1d3d70..cdf4043eab5 100644
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/geterror.xml
+++ b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/geterror.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-monitoring-commandfailedevent.geterror" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv>
diff --git a/reference/mongodb/mongodb/driver/monitoring/commandsubscriber.xml \
b/reference/mongodb/mongodb/driver/monitoring/commandsubscriber.xml index \
7a32a6fa231..48d213c30dd 100644
--- a/reference/mongodb/mongodb/driver/monitoring/commandsubscriber.xml
+++ b/reference/mongodb/mongodb/driver/monitoring/commandsubscriber.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<phpdoc:classref xml:id="class.mongodb-driver-monitoring-commandsubscriber" \
xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink" \
xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -45,6 +45,24 @@
</section>
+ <section role="changelog">
+ &reftitle.changelog;
+ <para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ &mongodb.changelog.tentative-return-types;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
</partintro>
&reference.mongodb.mongodb.driver.monitoring.entities.commandsubscriber;
diff --git a/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber.xml \
b/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber.xml index \
97801380543..bbc9de93468 100644
--- a/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber.xml
+++ b/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<phpdoc:classref xml:id="class.mongodb-driver-monitoring-sdamsubscriber" \
xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink" \
xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -47,6 +47,24 @@
</section>
+ <section role="changelog">
+ &reftitle.changelog;
+ <para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ &mongodb.changelog.tentative-return-types;
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
</partintro>
&reference.mongodb.mongodb.driver.monitoring.entities.sdamsubscriber;
diff --git a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/geterror.xml \
b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/geterror.xml \
index f0fd25fc8ef..d85f3cf5dc5 100644
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/geterror.xml
+++ b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/geterror.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-monitoring-serverheartbeatfailedevent.geterror" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv>
diff --git a/reference/mongodb/mongodb/driver/query/construct.xml \
b/reference/mongodb/mongodb/driver/query/construct.xml index 94edeec60c0..994026926cd \
100644
--- a/reference/mongodb/mongodb/driver/query/construct.xml
+++ b/reference/mongodb/mongodb/driver/query/construct.xml
@@ -12,7 +12,7 @@
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<methodname>MongoDB\Driver\Query::__construct</methodname> <methodparam><type \
class="union"><type>array</type><type>object</type></type><parameter>filter</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>queryOptions</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>queryOptions</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Constructs a new <classname>MongoDB\Driver\Query</classname>, which is an
diff --git a/reference/mongodb/mongodb/driver/readconcern/construct.xml \
b/reference/mongodb/mongodb/driver/readconcern/construct.xml index \
0e133ab530a..b3afeafc50e 100644
--- a/reference/mongodb/mongodb/driver/readconcern/construct.xml
+++ b/reference/mongodb/mongodb/driver/readconcern/construct.xml
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<methodname>MongoDB\Driver\ReadConcern::__construct</methodname>
- <methodparam choice="opt"><type>string</type><parameter>level</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>string</type><type>null</type></type><parameter>level</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Constructs a new <classname>MongoDB\Driver\ReadConcern</classname>, which is
diff --git a/reference/mongodb/mongodb/driver/readpreference/construct.xml \
b/reference/mongodb/mongodb/driver/readpreference/construct.xml index \
a156036eaff..307b299940b 100644
--- a/reference/mongodb/mongodb/driver/readpreference/construct.xml
+++ b/reference/mongodb/mongodb/driver/readpreference/construct.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-readpreference.construct" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -12,8 +12,8 @@
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<methodname>MongoDB\Driver\ReadPreference::__construct</methodname> \
<methodparam><type class="union"><type>string</type><type>int</type></type><parameter>mode</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>tagSets</parameter><initializer>&null;</initializer></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>tagSets</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Constructs a new <classname>MongoDB\Driver\ReadPreference</classname>, which
diff --git a/reference/mongodb/mongodb/driver/server/executebulkwrite.xml \
b/reference/mongodb/mongodb/driver/server/executebulkwrite.xml index \
4cba2fe5d60..a55741175d7 100644
--- a/reference/mongodb/mongodb/driver/server/executebulkwrite.xml
+++ b/reference/mongodb/mongodb/driver/server/executebulkwrite.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-server.executebulkwrite" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -13,7 +13,7 @@
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\Driver\WriteResult</type><methodname>MongoDB\Driver\Server::executeBulkWrite</methodname>
<methodparam><type>string</type><parameter>namespace</parameter></methodparam>
<methodparam><type>MongoDB\Driver\BulkWrite</type><parameter>bulk</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>MongoDB\Driver\WriteConcern</type><type>null</ty \
pe></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Executes one or more write operations on this server.
diff --git a/reference/mongodb/mongodb/driver/server/executecommand.xml \
b/reference/mongodb/mongodb/driver/server/executecommand.xml index \
8e703553cd8..3b1a1f81da6 100644
--- a/reference/mongodb/mongodb/driver/server/executecommand.xml
+++ b/reference/mongodb/mongodb/driver/server/executecommand.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-server.executecommand" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -13,7 +13,7 @@
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Server::executeCommand</methodname>
<methodparam><type>string</type><parameter>db</parameter></methodparam>
<methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>MongoDB\Driver\ReadPreference</type><type>null</ \
type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Executes the command on this server.
diff --git a/reference/mongodb/mongodb/driver/server/executequery.xml \
b/reference/mongodb/mongodb/driver/server/executequery.xml index \
2b5b6c51eef..5f27677ee07 100644
--- a/reference/mongodb/mongodb/driver/server/executequery.xml
+++ b/reference/mongodb/mongodb/driver/server/executequery.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-server.executequery" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -13,7 +13,7 @@
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Server::executeQuery</methodname>
<methodparam><type>string</type><parameter>namespace</parameter></methodparam>
<methodparam><type>MongoDB\Driver\Query</type><parameter>query</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>MongoDB\Driver\ReadPreference</type><type>null</ \
type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Executes the query on this server.
diff --git a/reference/mongodb/mongodb/driver/server/executereadcommand.xml \
b/reference/mongodb/mongodb/driver/server/executereadcommand.xml index \
feeaf237f5c..e17350b874a 100644
--- a/reference/mongodb/mongodb/driver/server/executereadcommand.xml
+++ b/reference/mongodb/mongodb/driver/server/executereadcommand.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-server.executereadcommand" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -13,7 +13,7 @@
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Server::executeReadCommand</methodname>
<methodparam><type>string</type><parameter>db</parameter></methodparam>
<methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Executes the command on this server.
diff --git a/reference/mongodb/mongodb/driver/server/executereadwritecommand.xml \
b/reference/mongodb/mongodb/driver/server/executereadwritecommand.xml index \
192e95ac3a0..297f7f6e39d 100644
--- a/reference/mongodb/mongodb/driver/server/executereadwritecommand.xml
+++ b/reference/mongodb/mongodb/driver/server/executereadwritecommand.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-server.executereadwritecommand" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -13,7 +13,7 @@
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Server::executeReadWriteCommand</methodname>
<methodparam><type>string</type><parameter>db</parameter></methodparam>
<methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Executes the command on this server.
diff --git a/reference/mongodb/mongodb/driver/server/executewritecommand.xml \
b/reference/mongodb/mongodb/driver/server/executewritecommand.xml index \
38f655b8de0..1cf65727c14 100644
--- a/reference/mongodb/mongodb/driver/server/executewritecommand.xml
+++ b/reference/mongodb/mongodb/driver/server/executewritecommand.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-server.executewritecommand" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -13,7 +13,7 @@
<modifier>final</modifier> <modifier>public</modifier> \
<type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Server::executeWriteCommand</methodname>
<methodparam><type>string</type><parameter>db</parameter></methodparam>
<methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>array()</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Executes the command on this server.
diff --git a/reference/mongodb/mongodb/driver/serverapi/construct.xml \
b/reference/mongodb/mongodb/driver/serverapi/construct.xml index \
63e7f81d091..7c1304d915a 100644
--- a/reference/mongodb/mongodb/driver/serverapi/construct.xml
+++ b/reference/mongodb/mongodb/driver/serverapi/construct.xml
@@ -12,8 +12,8 @@
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<methodname>MongoDB\Driver\ServerApi::__construct</methodname> \
<methodparam><type>string</type><parameter>version</parameter></methodparam>
- <methodparam choice="opt"><type>bool</type><parameter>strict</parameter><initializer>&null;</initializer></methodparam>
- <methodparam choice="opt"><type>bool</type><parameter>deprecationErrors</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>bool</type><type>null</type></type><parameter>strict</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>bool</type><type>null</type></type><parameter>deprecationErrors</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
diff --git a/reference/mongodb/mongodb/driver/serverdescription/getroundtriptime.xml \
b/reference/mongodb/mongodb/driver/serverdescription/getroundtriptime.xml index \
ca11fd1d5a7..ce9231e4cd1 100644
--- a/reference/mongodb/mongodb/driver/serverdescription/getroundtriptime.xml
+++ b/reference/mongodb/mongodb/driver/serverdescription/getroundtriptime.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-serverdescription.getroundtriptime" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>final</modifier> <modifier>public</modifier> \
<type>int</type><methodname>MongoDB\Driver\ServerDescription::getRoundTripTime</methodname>
+ <modifier>final</modifier> <modifier>public</modifier> <type \
class="union"><type>int</type><type>null</type></type><methodname>MongoDB\Driver\ServerDescription::getRoundTripTime</methodname>
<void />
</methodsynopsis>
<para>
diff --git a/reference/mongodb/mongodb/driver/session/starttransaction.xml \
b/reference/mongodb/mongodb/driver/session/starttransaction.xml index \
80ea7f14e15..e18940445cc 100644
--- a/reference/mongodb/mongodb/driver/session/starttransaction.xml
+++ b/reference/mongodb/mongodb/driver/session/starttransaction.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
+<!-- $Revision$ -->
<refentry xml:id="mongodb-driver-session.starttransaction" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> \
<refnamediv> @@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<type>void</type><methodname>MongoDB\Driver\Session::startTransaction</methodname>
- <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Starts a multi-document transaction associated with the session. At any given
diff --git a/reference/mongodb/mongodb/driver/writeconcern/construct.xml \
b/reference/mongodb/mongodb/driver/writeconcern/construct.xml index \
bb2d4b4ae58..2531fce5040 100644
--- a/reference/mongodb/mongodb/driver/writeconcern/construct.xml
+++ b/reference/mongodb/mongodb/driver/writeconcern/construct.xml
@@ -12,8 +12,8 @@
<methodsynopsis>
<modifier>final</modifier> <modifier>public</modifier> \
<methodname>MongoDB\Driver\WriteConcern::__construct</methodname> <methodparam><type \
class="union"><type>string</type><type>int</type></type><parameter>w</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>wtimeout</parameter></methodparam>
- <methodparam choice="opt"><type>bool</type><parameter>journal</parameter></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>int</type><type>null</type></type><parameter>wtimeout</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type \
class="union"><type>bool</type><type>null</type></type><parameter>journal</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
Constructs a new <classname>MongoDB\Driver\WriteConcern</classname>, which is
diff --git a/reference/mongodb/mongodb/driver/writeconcern/getwtimeout.xml \
b/reference/mongodb/mongodb/driver/writeconcern/getwtimeout.xml index \
835a3f398db..ce3fba64ab1 100644
--- a/reference/mongodb/mongodb/driver/writeconcern/getwtimeout.xml
+++ b/reference/mongodb/mongodb/driver/writeconcern/getwtimeout.xml
@@ -10,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>final</modifier> <modifier>public</modifier> <type \
class="union"><type>int</type><type>MongoDB\BSON\Int64</type></type><methodname>MongoDB\Driver\WriteConcern::getWtimeout</methodname>
+ <modifier>final</modifier> <modifier>public</modifier> \
<type>int</type><methodname>MongoDB\Driver\WriteConcern::getWtimeout</methodname> \
<void /> </methodsynopsis>
</refsect1>
@@ -49,10 +49,9 @@
<row>
<entry>PECL mongodb 1.7.0</entry>
<entry>
- On 32-bit systems, this method will return a \
<classname>MongoDB\BSON\Int64</classname>
- instance if the WriteConcern object was created with a \
<literal>wTimeout</literal>
- that exceeds the 32-bit range. On 64-bit systems, this method will
- always return an integer value.
+ On 32-bit systems, this method will always truncate the \
<literal>wTimeout</literal> + value if it exceeds the 32-bit range. In that \
case, a warning will be + emitted.
</entry>
</row>
</tbody>
diff --git a/reference/mongodb/tutorial/apm.xml b/reference/mongodb/tutorial/apm.xml
index d4fe772fc04..b83e85c35cc 100644
--- a/reference/mongodb/tutorial/apm.xml
+++ b/reference/mongodb/tutorial/apm.xml
@@ -41,15 +41,15 @@
class QueryTimeCollector implements \MongoDB\Driver\Monitoring\CommandSubscriber
{
- public function commandStarted( \MongoDB\Driver\Monitoring\CommandStartedEvent \
$event ) + public function commandStarted( \
\MongoDB\Driver\Monitoring\CommandStartedEvent $event ): void {
}
- public function commandSucceeded( \
\MongoDB\Driver\Monitoring\CommandSucceededEvent $event ) + public function \
commandSucceeded( \MongoDB\Driver\Monitoring\CommandSucceededEvent $event ): void {
}
- public function commandFailed( \MongoDB\Driver\Monitoring\CommandFailedEvent \
$event ) + public function commandFailed( \
\MongoDB\Driver\Monitoring\CommandFailedEvent $event ): void {
}
}
@@ -123,7 +123,7 @@ class QueryTimeCollector implements \
\MongoDB\Driver\Monitoring\CommandSubscriber return json_encode( array_keys( $filter \
) ); }
- public function commandStarted( \MongoDB\Driver\Monitoring\CommandStartedEvent \
$event ) + public function commandStarted( \
\MongoDB\Driver\Monitoring\CommandStartedEvent $event ): void {
if ( array_key_exists( 'find', (array) $event->getCommand() ) )
{
@@ -132,7 +132,7 @@ class QueryTimeCollector implements \
\MongoDB\Driver\Monitoring\CommandSubscriber }
}
- public function commandSucceeded( \
\MongoDB\Driver\Monitoring\CommandSucceededEvent $event ) + public function \
commandSucceeded( \MongoDB\Driver\Monitoring\CommandSucceededEvent $event ): void {
$requestId = $event->getRequestId();
if ( array_key_exists( $requestId, $this->pendingCommands ) )
@@ -143,7 +143,7 @@ class QueryTimeCollector implements \
\MongoDB\Driver\Monitoring\CommandSubscriber }
}
- public function commandFailed( \MongoDB\Driver\Monitoring\CommandFailedEvent \
$event ) + public function commandFailed( \
\MongoDB\Driver\Monitoring\CommandFailedEvent $event ): void {
if ( array_key_exists( $event->getRequestId(), $this->pendingCommands ) )
{
--
PHP Documentation Commits Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic