From 6ef92afe13024b70aa9d75a80edc19a20bb9262e Mon Sep 17 00:00:00 2001
From: Jeremy Mikola <jmikola@php.net>
Date: Thu, 26 Apr 2018 16:20:18 +0000
Subject: [PATCH] Explicit sessions cannot be used with unacknowledged write
 concerns

https://jira.mongodb.org/browse/PHPC-1163


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@344841 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../driver/manager/executebulkwrite.xml       | 11 +++++++-
 .../mongodb/driver/manager/executecommand.xml |  9 +++++++
 .../manager/executereadwritecommand.xml       | 27 +++++++++++++++++++
 .../driver/manager/executewritecommand.xml    | 27 +++++++++++++++++++
 .../driver/server/executebulkwrite.xml        | 11 +++++++-
 .../mongodb/driver/server/executecommand.xml  |  9 +++++++
 .../driver/server/executereadwritecommand.xml | 27 +++++++++++++++++++
 .../driver/server/executewritecommand.xml     | 27 +++++++++++++++++++
 8 files changed, 146 insertions(+), 2 deletions(-)

diff --git a/reference/mongodb/mongodb/driver/manager/executebulkwrite.xml b/reference/mongodb/mongodb/driver/manager/executebulkwrite.xml
index 5a000ee77d..8627491f23 100644
--- a/reference/mongodb/mongodb/driver/manager/executebulkwrite.xml
+++ b/reference/mongodb/mongodb/driver/manager/executebulkwrite.xml
@@ -66,8 +66,9 @@
   &reftitle.errors;
   <simplelist>
    <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>bulk</parameter> does not contain any write operations.</member>
-   &mongodb.throws.bulkwriteexception;
+   &mongodb.throws.session-unacknowledged;
    &mongodb.throws.std;
+   &mongodb.throws.bulkwriteexception;
    <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors.</member>
   </simplelist>
  </refsect1>
@@ -84,6 +85,14 @@
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>1.4.4</entry>
+       <entry>
+        <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
+        will be thrown if the <literal>"session"</literal> option is used in
+        combination with an unacknowledged write concern.
+       </entry>
+      </row>
       <row>
        <entry>1.4.0</entry>
        <entry>
diff --git a/reference/mongodb/mongodb/driver/manager/executecommand.xml b/reference/mongodb/mongodb/driver/manager/executecommand.xml
index 51f7bec70e..08294f0825 100644
--- a/reference/mongodb/mongodb/driver/manager/executecommand.xml
+++ b/reference/mongodb/mongodb/driver/manager/executecommand.xml
@@ -74,6 +74,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simplelist>
+   &mongodb.throws.session-unacknowledged;
    &mongodb.throws.std;
    <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid command, issuing a write command to a secondary).</member>
   </simplelist>
@@ -91,6 +92,14 @@
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>1.4.4</entry>
+       <entry>
+        <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
+        will be thrown if the <literal>"session"</literal> option is used in
+        combination with an unacknowledged write concern.
+       </entry>
+      </row>
       <row>
        <entry>1.4.0</entry>
        <entry>
diff --git a/reference/mongodb/mongodb/driver/manager/executereadwritecommand.xml b/reference/mongodb/mongodb/driver/manager/executereadwritecommand.xml
index 53a518fafb..a7714d57cd 100644
--- a/reference/mongodb/mongodb/driver/manager/executereadwritecommand.xml
+++ b/reference/mongodb/mongodb/driver/manager/executereadwritecommand.xml
@@ -70,11 +70,38 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simplelist>
+   &mongodb.throws.session-unacknowledged;
    &mongodb.throws.std;
    <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid command).</member>
   </simplelist>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>1.4.4</entry>
+       <entry>
+        <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
+        will be thrown if the <literal>"session"</literal> option is used in
+        combination with an unacknowledged write concern.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
diff --git a/reference/mongodb/mongodb/driver/manager/executewritecommand.xml b/reference/mongodb/mongodb/driver/manager/executewritecommand.xml
index 8b80b8852b..6d24da1361 100644
--- a/reference/mongodb/mongodb/driver/manager/executewritecommand.xml
+++ b/reference/mongodb/mongodb/driver/manager/executewritecommand.xml
@@ -67,11 +67,38 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simplelist>
+   &mongodb.throws.session-unacknowledged;
    &mongodb.throws.std;
    <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid command).</member>
   </simplelist>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>1.4.4</entry>
+       <entry>
+        <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
+        will be thrown if the <literal>"session"</literal> option is used in
+        combination with an unacknowledged write concern.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
diff --git a/reference/mongodb/mongodb/driver/server/executebulkwrite.xml b/reference/mongodb/mongodb/driver/server/executebulkwrite.xml
index 211516f008..844389bbe5 100644
--- a/reference/mongodb/mongodb/driver/server/executebulkwrite.xml
+++ b/reference/mongodb/mongodb/driver/server/executebulkwrite.xml
@@ -66,8 +66,9 @@
   &reftitle.errors;
   <simplelist>
    <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>bulk</parameter> does not contain any write operations.</member>
-   &mongodb.throws.bulkwriteexception;
+   &mongodb.throws.session-unacknowledged;
    &mongodb.throws.std;
+   &mongodb.throws.bulkwriteexception;
    <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors.</member>
   </simplelist>
  </refsect1>
@@ -84,6 +85,14 @@
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>1.4.4</entry>
+       <entry>
+        <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
+        will be thrown if the <literal>"session"</literal> option is used in
+        combination with an unacknowledged write concern.
+       </entry>
+      </row>
       <row>
        <entry>1.4.0</entry>
        <entry>
diff --git a/reference/mongodb/mongodb/driver/server/executecommand.xml b/reference/mongodb/mongodb/driver/server/executecommand.xml
index 72be923538..85fad063d5 100644
--- a/reference/mongodb/mongodb/driver/server/executecommand.xml
+++ b/reference/mongodb/mongodb/driver/server/executecommand.xml
@@ -72,6 +72,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simplelist>
+   &mongodb.throws.session-unacknowledged;
    &mongodb.throws.std;
    <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid command, issuing a write command to a secondary).</member>
   </simplelist>
@@ -89,6 +90,14 @@
       </row>
      </thead>
      <tbody>
+      <row>
+       <entry>1.4.4</entry>
+       <entry>
+        <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
+        will be thrown if the <literal>"session"</literal> option is used in
+        combination with an unacknowledged write concern.
+       </entry>
+      </row>
       <row>
        <entry>1.4.0</entry>
        <entry>
diff --git a/reference/mongodb/mongodb/driver/server/executereadwritecommand.xml b/reference/mongodb/mongodb/driver/server/executereadwritecommand.xml
index 0391be803f..fcd0659f8d 100644
--- a/reference/mongodb/mongodb/driver/server/executereadwritecommand.xml
+++ b/reference/mongodb/mongodb/driver/server/executereadwritecommand.xml
@@ -70,11 +70,38 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simplelist>
+   &mongodb.throws.session-unacknowledged;
    &mongodb.throws.std;
    <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid command).</member>
   </simplelist>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>1.4.4</entry>
+       <entry>
+        <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
+        will be thrown if the <literal>"session"</literal> option is used in
+        combination with an unacknowledged write concern.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   &mongodb.note.server.write;
diff --git a/reference/mongodb/mongodb/driver/server/executewritecommand.xml b/reference/mongodb/mongodb/driver/server/executewritecommand.xml
index 6ad55046d8..8854214550 100644
--- a/reference/mongodb/mongodb/driver/server/executewritecommand.xml
+++ b/reference/mongodb/mongodb/driver/server/executewritecommand.xml
@@ -67,11 +67,38 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <simplelist>
+   &mongodb.throws.session-unacknowledged;
    &mongodb.throws.std;
    <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid command).</member>
   </simplelist>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>1.4.4</entry>
+       <entry>
+        <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
+        will be thrown if the <literal>"session"</literal> option is used in
+        combination with an unacknowledged write concern.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   &mongodb.note.server.write;