[prev in list] [next in list] [prev in thread] [next in thread]
List: php-doc-cvs
Subject: [DOC-CVS] =?utf-8?q?svn:_/phpdoc/_doc-base/trunk/entities/global.ent_en/trunk/reference/mongodb/mong
From: Derick_Rethans <derick () php ! net>
Date: 2018-07-18 10:06:24
Message-ID: svn-derick-1531908384-345343-1893262341 () svn ! php ! net
[Download RAW message or body]
derick Wed, 18 Jul 2018 10:06:24 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=345343
Log:
Document new hasErrorLabels() method and errorLabels property, and sort out \
inheritence of exception classes
Changed paths:
U phpdoc/doc-base/trunk/entities/global.ent
U phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/authenticationexception.xml
U phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/bulkwriteexception.xml
U phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/commandexception.xml
U phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/connectionexception.xml
U phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/connectiontimeoutexception.xml
U phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/executiontimeoutexception.xml
A phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/runtimeexception/
A phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/runtimeexception/haserrorlabel.xml
U phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/runtimeexception.xml
U phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/serverexception.xml
U phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/sslconnectionexception.xml
U phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/writeexception.xml
U phpdoc/en/trunk/reference/mongodb/mongodb/driver/session/committransaction.xml
U phpdoc/en/trunk/reference/mongodb/versions.xml
["svn-diffs-345343.txt" (text/x-diff)]
Modified: phpdoc/doc-base/trunk/entities/global.ent
===================================================================
--- phpdoc/doc-base/trunk/entities/global.ent 2018-07-17 11:41:17 UTC (rev 345342)
+++ phpdoc/doc-base/trunk/entities/global.ent 2018-07-18 10:06:24 UTC (rev 345343)
@@ -292,6 +292,7 @@
<!ENTITY url.mongodb.docs.objectid \
"https://docs.mongodb.com/manual/reference/object-id/"> <!ENTITY \
url.mongodb.docs.readconcern \
"https://docs.mongodb.com/manual/reference/read-concern/"> <!ENTITY \
url.mongodb.docs.readpreference \
"https://docs.mongodb.com/manual/core/read-preference/"> +<!ENTITY \
url.mongodb.docs.transactions "https://docs.mongodb.com/manual/core/transactions/"> \
<!ENTITY url.mongodb.docs.writeconcern \
"https://docs.mongodb.com/manual/reference/write-concern/"> <!ENTITY \
url.mongodb.wiki.crud \
"https://en.wikipedia.org/wiki/Create,_read,_update_and_delete"> <!ENTITY \
url.mongodb.wiki.decimal128 \
"https://en.wikipedia.org/wiki/Decimal128_floating-point_format">
Modified: phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/authenticationexception.xml
===================================================================
--- phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/authenticationexception.xml 2018-07-17 \
11:41:17 UTC (rev 345342)
+++ phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/authenticationexception.xml 2018-07-18 \
10:06:24 UTC (rev 345343) @@ -41,10 +41,14 @@
</classsynopsisinfo>
<!-- }}} -->
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" /> + <xi:include \
xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-connectionexception.synopsis')/descendant::db:fieldsynopsis)" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-connectionexception.synopsis')/descendant::db:fieldsynopsis)" \
/>
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-connectionexception')/db:refentry/db:refse \
ct1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> \
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.https://docs.mongodb.com/manual/core/transactions/index.html')/db:r \
efentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/>
</classsynopsis>
<!-- }}} -->
Modified: phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/bulkwriteexception.xml
===================================================================
--- phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/bulkwriteexception.xml 2018-07-17 \
11:41:17 UTC (rev 345342)
+++ phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/bulkwriteexception.xml 2018-07-18 \
10:06:24 UTC (rev 345343) @@ -42,10 +42,14 @@
<!-- }}} -->
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-writeexception.synopsis')/descendant::db:fieldsynopsis)" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-serverexception.synopsis')/descendant::db:fieldsynopsis)" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" \
/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-writeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-serverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/>
</classsynopsis>
Modified: phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/commandexception.xml
===================================================================
--- phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/commandexception.xml 2018-07-17 \
11:41:17 UTC (rev 345342)
+++ phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/commandexception.xml 2018-07-18 \
10:06:24 UTC (rev 345343) @@ -48,6 +48,8 @@
</fieldsynopsis>
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-serverexception.synopsis')/descendant::db:fieldsynopsis)" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" \
/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
@@ -54,6 +56,8 @@
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-commandexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/>
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-serverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/>
</classsynopsis>
Modified: phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/connectionexception.xml
===================================================================
--- phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/connectionexception.xml 2018-07-17 \
11:41:17 UTC (rev 345342)
+++ phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/connectionexception.xml 2018-07-18 \
10:06:24 UTC (rev 345343) @@ -42,9 +42,11 @@
</classsynopsisinfo>
<!-- }}} -->
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" \
/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/>
</classsynopsis>
Modified: phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/connectiontimeoutexception.xml
===================================================================
--- phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/connectiontimeoutexception.xml 2018-07-17 \
11:41:17 UTC (rev 345342)
+++ phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/connectiontimeoutexception.xml 2018-07-18 \
10:06:24 UTC (rev 345343) @@ -46,9 +46,13 @@
</classsynopsisinfo>
<!-- }}} -->
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-connectionexception.synopsis')/descendant::db:fieldsynopsis)" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" \
/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-connectionexception')/db:refentry/db:refse \
ct1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> \
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/>
</classsynopsis>
Modified: phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/executiontimeoutexception.xml
===================================================================
--- phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/executiontimeoutexception.xml 2018-07-17 \
11:41:17 UTC (rev 345342)
+++ phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/executiontimeoutexception.xml 2018-07-18 \
10:06:24 UTC (rev 345343) @@ -44,9 +44,13 @@
</classsynopsisinfo>
<!-- }}} -->
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-serverexception.synopsis')/descendant::db:fieldsynopsis)" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" \
/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-serverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/>
</classsynopsis>
Added: phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/runtimeexception/haserrorlabel.xml
===================================================================
--- phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/runtimeexception/haserrorlabel.xml \
(rev 0)
+++ phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/runtimeexception/haserrorlabel.xml 2018-07-18 \
10:06:24 UTC (rev 345343) @@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 344571 $ -->
+
+<refentry xml:id="mongodb-driver-runtimeexception.haserrorlabel" \
xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> + \
<refnamediv> + <refname>MongoDB\Driver\Exception\RuntimeException::hasErrorLabel</refname>
+ <refpurpose>Returns whether an error label is associated with an \
exception</refpurpose> + </refnamediv>
+
+ <refsect1 role="description">
+ &reftitle.description;
+ <methodsynopsis>
+ <modifier>final</modifier> <modifier>public</modifier> \
<type>bool</type><methodname>MongoDB\Driver\Exception\RuntimeException::hasErrorLabel</methodname>
+ <methodparam><type>string</type><parameter>errorLabel</parameter></methodparam>
+ </methodsynopsis>
+ <para>
+ Returns whether the <parameter>errorLabel</parameter> has been set for this
+ exception. Error labels are set by either the server or the driver to
+ indicated specific situations on which you might want to decide on how you
+ want to handle a specific exception. A common situation might be to find
+ out whether you can safely retry a transaction that failed due to a
+ transient error (like a networking issue, or a transaction conflict).
+ Examples of error labels are <literal>TransientTransactionError</literal>
+ and <literal>UnknownTransactionCommitResult</literal>.
+ </para>
+
+ </refsect1>
+
+ <refsect1 role="parameters">
+ &reftitle.parameters;
+ <variablelist>
+ <varlistentry>
+ <term><parameter>errorLabel</parameter></term>
+ <listitem>
+ <para>The name of the <literal>errorLabel</literal> to test for.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+ &reftitle.returnvalues;
+ <para>
+ Whether the given <literal>errorLabel</literal> is associated with this
+ exception.
+ </para>
+ </refsect1>
+
+ <refsect1 role="seealso">
+ &reftitle.seealso;
+ <simplelist>
+ <member><function>MongoDB\Driver\Session::commitTransaction</function></member>
+ <member><link xlink:href="&url.mongodb.docs.transactions;">MongoDB documentation \
on transactions</link></member> + </simplelist>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
Modified: phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/runtimeexception.xml
===================================================================
--- phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/runtimeexception.xml 2018-07-17 \
11:41:17 UTC (rev 345342)
+++ phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/runtimeexception.xml 2018-07-18 \
10:06:24 UTC (rev 345343) @@ -41,11 +41,21 @@
</oointerface>
</classsynopsisinfo>
<!-- }}} -->
+ <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
+ <fieldsynopsis>
+ <modifier>protected</modifier>
+ <type>bool</type>
+ <varname linkend="mongodb-driver-exception-runtimeexception.props.errorlabels">errorLabels</varname>
+ </fieldsynopsis>
+
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" /> + <xi:include \
xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
+ <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> +
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/>
</classsynopsis>
<!-- }}} -->
@@ -52,8 +62,63 @@
</section>
+<!-- {{{ MongoDB\Driver\Exception\RuntimeException properties -->
+ <section xml:id="mongodb-driver-exception-runtimeexception.props">
+ &reftitle.properties;
+ <variablelist>
+ <varlistentry xml:id="mongodb-driver-exception-runtimeexception.props.errorlabels">
+ <term><varname>errorLabels</varname></term>
+ <listitem>
+ <para>
+ Contains an array of error labels to go with an exception. For example,
+ error labels can be used to detect whether a transaction can be retried
+ safely if the <literal>TransientTransactionError</literal> label is
+ present. The existence of a specific error label should be tested for
+ with the
+ <methodname>MongoDB\Driver\Exception\RuntimeException::hasErrorLabel</methodname>,
+ instead of interpreting this <literal>errorLabels</literal> property
+ manually.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </section>
+<!-- }}} -->
+
+ <section role="changelog">
+ &reftitle.changelog;
+ <para>
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>1.6.0</entry>
+ <entry>
+ <para>
+ The
+ <methodname>MongoDB\Driver\Exception\RuntimeException::hasErrorLabel</methodname>
+ method and
+ <link linkend="mongodb-driver-exception-runtimeexception.props.errorlabels">MongoDB\Driver\Exception\RuntimeException::errorLabels</link>
+ property have been added.
+ </para>
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
+
</partintro>
+ &reference.mongodb.mongodb.driver.exception.entities.runtimeexception;
+
</phpdoc:classref>
<!-- Keep this comment at the end of the file
Modified: phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/serverexception.xml
===================================================================
--- phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/serverexception.xml 2018-07-17 \
11:41:17 UTC (rev 345342)
+++ phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/serverexception.xml 2018-07-18 \
10:06:24 UTC (rev 345343) @@ -41,10 +41,10 @@
</classsynopsisinfo>
<!-- }}} -->
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" /> + <xi:include \
xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" \
/>
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/>
</classsynopsis>
<!-- }}} -->
Modified: phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/sslconnectionexception.xml
===================================================================
--- phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/sslconnectionexception.xml 2018-07-17 \
11:41:17 UTC (rev 345342)
+++ phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/sslconnectionexception.xml 2018-07-18 \
10:06:24 UTC (rev 345343) @@ -48,9 +48,13 @@
</classsynopsisinfo>
<!-- }}} -->
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-connectionexception.synopsis')/descendant::db:fieldsynopsis)" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" \
/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-connectionexception')/db:refentry/db:refse \
ct1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> \
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/>
</classsynopsis>
Modified: phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/writeexception.xml
===================================================================
--- phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/writeexception.xml 2018-07-17 \
11:41:17 UTC (rev 345342)
+++ phpdoc/en/trunk/reference/mongodb/mongodb/driver/exception/writeexception.xml 2018-07-18 \
10:06:24 UTC (rev 345343) @@ -50,6 +50,8 @@
</fieldsynopsis>
<classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-serverexception.synopsis')/descendant::db:fieldsynopsis)" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" \
/>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('exception.synopsis')/descendant::db:fieldsynopsis)" />
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
@@ -56,6 +58,8 @@
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-writeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/>
<classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+ <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-serverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> + <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/> <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) \
xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" \
/>
</classsynopsis>
Modified: phpdoc/en/trunk/reference/mongodb/mongodb/driver/session/committransaction.xml
===================================================================
--- phpdoc/en/trunk/reference/mongodb/mongodb/driver/session/committransaction.xml 2018-07-17 \
11:41:17 UTC (rev 345342)
+++ phpdoc/en/trunk/reference/mongodb/mongodb/driver/session/committransaction.xml 2018-07-18 \
10:06:24 UTC (rev 345343) @@ -41,9 +41,16 @@
issues). In case the exception's
<methodname>MongoDB\Driver\Exception\CommandException::getResultDocument</methodname>
has a <literal>"errorLabels"</literal> element, and this array contains a
- <literal>"TransientTransactionError"</literal> value, it is safe to re-try
- the <emphasis>whole</emphasis> transaction.</member>
- <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> \
if the transaction could not be commited (e.g. a transaction was not \
started).</member> + <literal>"TransientTransactionError"</literal> or
+ <literal>"UnUnknownTransactionCommitResult"</literal> value, it is safe to re-try
+ the <emphasis>whole</emphasis> transaction. In newer versions of the
+ driver,
+ <methodname>MongoDB\Driver\Exception\RuntimeException::hasErrorLabel</methodname>
+ should be used to test for this situation instead.</member>
+ <member>Throws
+ <classname>MongoDB\Driver\Exception\RuntimeException</classname> if the
+ transaction could not be commited (e.g. a transaction was not
+ started).</member>
</simplelist>
</refsect1>
@@ -51,8 +58,9 @@
&reftitle.seealso;
<simplelist>
<member><methodname>MongoDB\Driver\Manager::startSession</methodname></member>
- <member><methodname>MongoDB\Driver\Session::commitTransaction</methodname></member>
+ <member><methodname>MongoDB\Driver\Session::abortTransaction</methodname></member>
<member><methodname>MongoDB\Driver\Session::startTransaction</methodname></member>
+ <member><methodname>MongoDB\Driver\Exception\RuntimeException::hasErrorLabel</methodname></member>
</simplelist>
</refsect1>
Modified: phpdoc/en/trunk/reference/mongodb/versions.xml
===================================================================
--- phpdoc/en/trunk/reference/mongodb/versions.xml 2018-07-17 11:41:17 UTC (rev \
345342)
+++ phpdoc/en/trunk/reference/mongodb/versions.xml 2018-07-18 10:06:24 UTC (rev \
345343) @@ -146,6 +146,7 @@
<function name='mongodb\driver\exception\invalidargumentexception' from='mongodb \
>= 1.0.0'/> <function name='mongodb\driver\exception\logicexception' \
from='mongodb >= 1.0.0'/> <function \
name='mongodb\driver\exception\runtimeexception' from='mongodb >= 1.0.0'/> + \
<function name='mongodb\driver\exception\runtimeexception::hasErrorLabel' \
from='mongodb >= 1.6.0'/> <function \
name='mongodb\driver\exception\serverexception' from='mongodb >= 1.5.0'/> \
<function name='mongodb\driver\exception\sslconnectionexception' from='mongodb >= \
1.0.0'/> <function name='mongodb\driver\exception\unexpectedvalueexception' \
from='mongodb >= 1.0.0'/>
--
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