svn: /phpdoc/ru/trunk/reference/ filesystem/functions/tmpfile.xml mongodb/bson/binary.xml mongodb/mongodb/driver/bulkwrite/update.xml mongodb/mongodb/driver/cursorid.xml mongodb/mongodb/driver/manager/construct.xml mongodb/mongodb/driver/readconcern.xml mongodb/mongodb/driver/readpreference/getmode.xml mongodb/mongodb/driver/readpreference.xml mongodb/mongodb/driver/session.xml mongodb/mongodb/driver/writeconcern/construct.xml mongodb/mongodb/driver/writeconcern/getwtimeout.xml mongodb/mongodb/d
[email protected] (Sergey Panteleev)
| Newsgroups | php.doc.ru |
|---|---|
| Message-ID | <[email protected]> |
sergey Tue, 04 Feb 2020 03:41:45 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=349115
Log:
docs(ru): Updated to English revision
Changed paths:
U phpdoc/ru/trunk/reference/filesystem/functions/tmpfile.xml
U phpdoc/ru/trunk/reference/mongodb/bson/binary.xml
U phpdoc/ru/trunk/reference/mongodb/mongodb/driver/bulkwrite/update.xml
U phpdoc/ru/trunk/reference/mongodb/mongodb/driver/cursorid.xml
U phpdoc/ru/trunk/reference/mongodb/mongodb/driver/manager/construct.xml
U phpdoc/ru/trunk/reference/mongodb/mongodb/driver/readconcern.xml
U phpdoc/ru/trunk/reference/mongodb/mongodb/driver/readpreference/getmode.xml
U phpdoc/ru/trunk/reference/mongodb/mongodb/driver/readpreference.xml
U phpdoc/ru/trunk/reference/mongodb/mongodb/driver/session.xml
U phpdoc/ru/trunk/reference/mongodb/mongodb/driver/writeconcern/construct.xml
U phpdoc/ru/trunk/reference/mongodb/mongodb/driver/writeconcern/getwtimeout.xml
U phpdoc/ru/trunk/reference/mongodb/mongodb/driver/writeconcern.xml
U phpdoc/ru/trunk/reference/zip/constants.xml
svn-diffs-349115.txt
(text/x-diff, 39.6 KB)
Modified: phpdoc/ru/trunk/reference/filesystem/functions/tmpfile.xml
===================================================================
--- phpdoc/ru/trunk/reference/filesystem/functions/tmpfile.xml 2020-02-03 21:12:57 UTC (rev 349114)
+++ phpdoc/ru/trunk/reference/filesystem/functions/tmpfile.xml 2020-02-04 03:41:45 UTC (rev 349115)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 346471 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 349109 Maintainer: shein Status: ready -->
<!-- Reviewed: yes -->
<!-- $Revision$ -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.tmpfile">
Modified: phpdoc/ru/trunk/reference/mongodb/bson/binary.xml
===================================================================
--- phpdoc/ru/trunk/reference/mongodb/bson/binary.xml 2020-02-03 21:12:57 UTC (rev 349114)
+++ phpdoc/ru/trunk/reference/mongodb/bson/binary.xml 2020-02-04 03:41:45 UTC (rev 349115)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 347937 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 349108 Maintainer: rjhdby Status: ready -->
<!-- Reviewed: yes Maintainer: sergey -->
<!-- $Revision$ -->
<phpdoc:classref xml:id="class.mongodb-bson-binary" 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">
@@ -92,6 +92,12 @@
<fieldsynopsis>
<modifier>const</modifier>
<type>integer</type>
+ <varname linkend="mongodb-bson-binary.constants.type-encrypted">MongoDB\BSON\Binary::TYPE_ENCRYPTED</varname>
+ <initializer>6</initializer>
+ </fieldsynopsis>
+ <fieldsynopsis>
+ <modifier>const</modifier>
+ <type>integer</type>
<varname linkend="mongodb-bson-binary.constants.type-user-defined">MongoDB\BSON\Binary::TYPE_USER_DEFINED</varname>
<initializer>128</initializer>
</fieldsynopsis>
@@ -160,10 +166,17 @@
</listitem>
</varlistentry>
+ <varlistentry xml:id="mongodb-bson-binary.constants.type-encrypted">
+ <term><constant>MongoDB\BSON\Binary::TYPE_ENCRYPTED</constant></term>
+ <listitem>
+ <para>Зашифрованное значение. Этот подтип используется для шифрования на стороне клиента.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry xml:id="mongodb-bson-binary.constants.type-user-defined">
<term><constant>MongoDB\BSON\Binary::TYPE_USER_DEFINED</constant></term>
<listitem>
- <para>Пользовательсий тип. В то вроемя как типы с 0 по 127 преопределены, либо
+ <para>Пользовательсий тип. В то время как типы с 0 по 127 преопределены, либо
зарезервированы, типы со 128 по 255 могут использоваться для чего угодно.</para>
</listitem>
</varlistentry>
Modified: phpdoc/ru/trunk/reference/mongodb/mongodb/driver/bulkwrite/update.xml
===================================================================
--- phpdoc/ru/trunk/reference/mongodb/mongodb/driver/bulkwrite/update.xml 2020-02-03 21:12:57 UTC (rev 349114)
+++ phpdoc/ru/trunk/reference/mongodb/mongodb/driver/bulkwrite/update.xml 2020-02-04 03:41:45 UTC (rev 349115)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 349044 Maintainer: lex Status: ready -->
+<!-- EN-Revision: 349110 Maintainer: lex Status: ready -->
<!-- Reviewed: no -->
<refentry xml:id="mongodb-driver-bulkwrite.update" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -73,6 +73,17 @@
</row>
&mongodb.option.collation;
<row>
+ <entry>hint</entry>
+ <entry><type>string|array|object</type></entry>
+ <entry>
+ <para>
+ Индекс спецификации. Укажите либо имя индекса в виде строки,
+ либо шаблон ключа индекса. Если указано, то система запросов будет рассматривать
+ планы только с использованием индекса подсказок.
+ </para>
+ </entry>
+ </row>
+ <row>
<entry>multi</entry>
<entry><type>boolean</type></entry>
<entry>
Modified: phpdoc/ru/trunk/reference/mongodb/mongodb/driver/cursorid.xml
===================================================================
--- phpdoc/ru/trunk/reference/mongodb/mongodb/driver/cursorid.xml 2020-02-03 21:12:57 UTC (rev 349114)
+++ phpdoc/ru/trunk/reference/mongodb/mongodb/driver/cursorid.xml 2020-02-04 03:41:45 UTC (rev 349115)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 342970 Maintainer: lex Status: ready -->
-<!-- Reviewed: no -->
+<!-- EN-Revision: 349110 Maintainer: lex Status: ready -->
+<!-- Reviewed: yes Maintainer: sergey -->
<phpdoc:classref xml:id="class.mongodb-driver-cursorid" 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">
-
+
<title>Класс MongoDB\Driver\CursorId</title>
<titleabbrev>MongoDB\Driver\CursorId</titleabbrev>
-
+
<partintro>
-
-<!-- {{{ MongoDB\Driver\CursorId intro -->
+
+ <!-- {{{ MongoDB\Driver\CursorId intro -->
<section xml:id="mongodb-driver-cursorid.intro">
&reftitle.intro;
<para>
@@ -19,35 +19,63 @@
<function>MongoDB\Driver\Cursor::getId</function>.
</para>
</section>
-<!-- }}} -->
-
+ <!-- }}} -->
+
<section xml:id="mongodb-driver-cursorid.synopsis">
&reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
+
+ <!-- {{{ Synopsis -->
<classsynopsis>
<ooclass><classname>MongoDB\Driver\CursorId</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
+
+ <!-- {{{ Class synopsis -->
<classsynopsisinfo>
<modifier>final</modifier>
<ooclass>
<classname>MongoDB\Driver\CursorId</classname>
</ooclass>
+
+ <oointerface>
+ <interfacename>Serializable</interfacename>
+ </oointerface>
</classsynopsisinfo>
-<!-- }}} -->
+ <!-- }}} -->
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-cursorid')/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>
+ <row>
+ <entry>1.7.0</entry>
+ <entry>
+ Реализует <interfacename>Serializable</interfacename>.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
+
</partintro>
-
+
&reference.mongodb.mongodb.driver.entities.cursorid;
-
+
</phpdoc:classref>
<!-- Keep this comment at the end of the file
Modified: phpdoc/ru/trunk/reference/mongodb/mongodb/driver/manager/construct.xml
===================================================================
--- phpdoc/ru/trunk/reference/mongodb/mongodb/driver/manager/construct.xml 2020-02-03 21:12:57 UTC (rev 349114)
+++ phpdoc/ru/trunk/reference/mongodb/mongodb/driver/manager/construct.xml 2020-02-04 03:41:45 UTC (rev 349115)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 349045 Maintainer: lex Status: ready -->
+<!-- EN-Revision: 349110 Maintainer: lex Status: ready -->
<!-- Reviewed: no -->
<refentry xml:id="mongodb-driver-manager.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -882,6 +882,19 @@
</thead>
<tbody>
<row>
+ <entry>1.7.0</entry>
+ <entry>
+ <para>
+ Добавлена опция драйвера <literal>"autoEncryption"</literal>.
+ </para>
+ <para>
+ Указание любой опции SSL или TLS в
+ параметре <parameter>driverOptions</parameter> теперь неявно включает TLS, как это делается для
+ соответствующих опций URI.
+ </para>
+ </entry>
+ </row>
+ <row>
<entry>1.6.0</entry>
<entry>
<para>
Modified: phpdoc/ru/trunk/reference/mongodb/mongodb/driver/readconcern.xml
===================================================================
--- phpdoc/ru/trunk/reference/mongodb/mongodb/driver/readconcern.xml 2020-02-03 21:12:57 UTC (rev 349114)
+++ phpdoc/ru/trunk/reference/mongodb/mongodb/driver/readconcern.xml 2020-02-04 03:41:45 UTC (rev 349115)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 343866 Maintainer: sergey Status: ready -->
+<!-- EN-Revision: 349110 Maintainer: sergey Status: ready -->
<!-- Reviewed: no -->
<phpdoc:classref xml:id="class.mongodb-driver-readconcern" 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">
-
+
<title>Класс MongoDB\Driver\ReadConcern</title>
<titleabbrev>MongoDB\Driver\ReadConcern</titleabbrev>
-
+
<partintro>
-
-<!-- {{{ MongoDB\Driver\ReadConcern intro -->
+
+ <!-- {{{ MongoDB\Driver\ReadConcern intro -->
<section xml:id="mongodb-driver-readconcern.intro">
&reftitle.intro;
<para>
@@ -19,27 +19,31 @@
опция требует MongoDB 3.2 или новее.
</para>
</section>
-<!-- }}} -->
-
+ <!-- }}} -->
+
<section xml:id="mongodb-driver-readconcern.synopsis">
&reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
+
+ <!-- {{{ Synopsis -->
<classsynopsis>
<ooclass><classname>MongoDB\Driver\ReadConcern</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
+
+ <!-- {{{ Class synopsis -->
<classsynopsisinfo>
<modifier>final</modifier>
<ooclass>
<classname>MongoDB\Driver\ReadConcern</classname>
</ooclass>
-
+
<oointerface>
<interfacename>MongoDB\BSON\Serializable</interfacename>
</oointerface>
+
+ <oointerface>
+ <interfacename>Serializable</interfacename>
+ </oointerface>
</classsynopsisinfo>
-<!-- }}} -->
+ <!-- }}} -->
<classsynopsisinfo role="comment">Константы</classsynopsisinfo>
<fieldsynopsis>
<modifier>const</modifier>
@@ -69,15 +73,15 @@
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-readconcern')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
</classsynopsis>
-<!-- }}} -->
-
+ <!-- }}} -->
+
</section>
-<!-- {{{ MongoDB\Driver\ReadConcern constants -->
+ <!-- {{{ MongoDB\Driver\ReadConcern constants -->
<section xml:id="mongodb-driver-readconcern.constants">
&reftitle.constants;
<variablelist>
-
+
<varlistentry xml:id="mongodb-driver-readconcern.constants.available">
<term><constant>MongoDB\Driver\ReadConcern::AVAILABLE</constant></term>
<listitem>
@@ -108,7 +112,7 @@
</para>
</listitem>
</varlistentry>
-
+
<varlistentry xml:id="mongodb-driver-readconcern.constants.linearizable">
<term><constant>MongoDB\Driver\ReadConcern::LINEARIZABLE</constant></term>
<listitem>
@@ -150,7 +154,7 @@
</para>
</listitem>
</varlistentry>
-
+
<varlistentry xml:id="mongodb-driver-readconcern.constants.local">
<term><constant>MongoDB\Driver\ReadConcern::LOCAL</constant></term>
<listitem>
@@ -166,7 +170,7 @@
</para>
</listitem>
</varlistentry>
-
+
<varlistentry xml:id="mongodb-driver-readconcern.constants.majority">
<term><constant>MongoDB\Driver\ReadConcern::MAJORITY</constant></term>
<listitem>
@@ -180,11 +184,11 @@
</para>
</listitem>
</varlistentry>
-
+
</variablelist>
</section>
-<!-- }}} -->
-
+ <!-- }}} -->
+
<section role="changelog">
&reftitle.changelog;
<para>
@@ -198,6 +202,12 @@
</thead>
<tbody>
<row>
+ <entry>1.7.0</entry>
+ <entry>
+ Реализует <interfacename>Serializable</interfacename>.
+ </entry>
+ </row>
+ <row>
<entry>1.4.0</entry>
<entry>
<para>
@@ -222,18 +232,18 @@
</informaltable>
</para>
</section>
-
+
<section xml:id="mongodb-driver-readconcern.seealso">
&reftitle.seealso;
- <simplelist>
- <member><link xlink:href="&url.mongodb.docs.readconcern;">Справка по гарантиям чтения</link></member>
- </simplelist>
+ <simplelist>
+ <member><link xlink:href="&url.mongodb.docs.readconcern;">Справка по гарантиям чтения</link></member>
+ </simplelist>
</section>
-
+
</partintro>
-
+
&reference.mongodb.mongodb.driver.entities.readconcern;
-
+
</phpdoc:classref>
<!-- Keep this comment at the end of the file
Modified: phpdoc/ru/trunk/reference/mongodb/mongodb/driver/readpreference/getmode.xml
===================================================================
--- phpdoc/ru/trunk/reference/mongodb/mongodb/driver/readpreference/getmode.xml 2020-02-03 21:12:57 UTC (rev 349114)
+++ phpdoc/ru/trunk/reference/mongodb/mongodb/driver/readpreference/getmode.xml 2020-02-04 03:41:45 UTC (rev 349115)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 343892 Maintainer: lex Status: ready -->
+<!-- EN-Revision: 349106 Maintainer: lex Status: ready -->
<!-- Reviewed: no -->
<refentry xml:id="mongodb-driver-readpreference.getmode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -8,20 +8,20 @@
<refname>MongoDB\Driver\ReadPreference::getMode</refname>
<refpurpose>Возвращает параметр "mode" ReadPreference</refpurpose>
</refnamediv>
-
+
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
-<modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\ReadPreference::getMode</methodname>
+ <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\ReadPreference::getMode</methodname>
<void />
</methodsynopsis>
</refsect1>
-
+
<refsect1 role="parameters">
&reftitle.parameters;
&no.function.parameters;
</refsect1>
-
+
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
@@ -28,7 +28,7 @@
Возвращает параметр "mode" ReadPreference
</para>
</refsect1>
-
+
<refsect1 role="errors">
&reftitle.errors;
<simplelist>
@@ -35,8 +35,8 @@
&mongodb.throws.argumentparsing;
</simplelist>
</refsect1>
-
-
+
+
<refsect1 role="examples">
&reftitle.examples;
<example>
@@ -75,15 +75,16 @@
</screen>
</example>
</refsect1>
-
-
+
+
<refsect1 role="seealso">
&reftitle.seealso;
<simplelist>
+ <member><methodname>MongoDB\Driver\ReadPreference::getModeString</methodname></member>
<member><link xlink:href="&url.mongodb.docs.readpreference;">Read Preference reference</link></member>
</simplelist>
</refsect1>
-
+
</refentry>
<!-- Keep this comment at the end of the file
Modified: phpdoc/ru/trunk/reference/mongodb/mongodb/driver/readpreference.xml
===================================================================
--- phpdoc/ru/trunk/reference/mongodb/mongodb/driver/readpreference.xml 2020-02-03 21:12:57 UTC (rev 349114)
+++ phpdoc/ru/trunk/reference/mongodb/mongodb/driver/readpreference.xml 2020-02-04 03:41:45 UTC (rev 349115)
@@ -1,44 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 342815 Maintainer: lex Status: ready -->
-<!-- Reviewed: no -->
+<!-- EN-Revision: 349110 Maintainer: lex Status: ready -->
+<!-- Reviewed: yes Maintainer: sergey -->
<phpdoc:classref xml:id="class.mongodb-driver-readpreference" 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">
-
- <title>The MongoDB\Driver\ReadPreference class</title>
+
+ <title>Класс MongoDB\Driver\ReadPreference</title>
<titleabbrev>MongoDB\Driver\ReadPreference</titleabbrev>
-
+
<partintro>
-
-<!-- {{{ MongoDB\Driver\ReadPreference intro -->
+
+ <!-- {{{ MongoDB\Driver\ReadPreference intro -->
<section xml:id="mongodb-driver-readpreference.intro">
&reftitle.intro;
<para>
-
+
</para>
</section>
-<!-- }}} -->
-
+ <!-- }}} -->
+
<section xml:id="mongodb-driver-readpreference.synopsis">
&reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
+
+ <!-- {{{ Synopsis -->
<classsynopsis>
<ooclass><classname>MongoDB\Driver\ReadPreference</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
+
+ <!-- {{{ Class synopsis -->
<classsynopsisinfo>
<modifier>final</modifier>
<ooclass>
<classname>MongoDB\Driver\ReadPreference</classname>
</ooclass>
-
+
<oointerface>
<interfacename>MongoDB\BSON\Serializable</interfacename>
</oointerface>
+
+ <oointerface>
+ <interfacename>Serializable</interfacename>
+ </oointerface>
</classsynopsisinfo>
-<!-- }}} -->
- <classsynopsisinfo role="comment">Constants</classsynopsisinfo>
+ <!-- }}} -->
+ <classsynopsisinfo role="comment">Константы</classsynopsisinfo>
<fieldsynopsis>
<modifier>const</modifier>
<type>integer</type>
@@ -71,6 +75,36 @@
</fieldsynopsis>
<fieldsynopsis>
<modifier>const</modifier>
+ <type>string</type>
+ <varname linkend="mongodb-driver-readpreference.constants.primary">MongoDB\Driver\ReadPreference::PRIMARY</varname>
+ <initializer>primary</initializer>
+ </fieldsynopsis>
+ <fieldsynopsis>
+ <modifier>const</modifier>
+ <type>string</type>
+ <varname linkend="mongodb-driver-readpreference.constants.primary-preferred">MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED</varname>
+ <initializer>primaryPreferred</initializer>
+ </fieldsynopsis>
+ <fieldsynopsis>
+ <modifier>const</modifier>
+ <type>string</type>
+ <varname linkend="mongodb-driver-readpreference.constants.secondary">MongoDB\Driver\ReadPreference::SECONDARY</varname>
+ <initializer>secondary</initializer>
+ </fieldsynopsis>
+ <fieldsynopsis>
+ <modifier>const</modifier>
+ <type>string</type>
+ <varname linkend="mongodb-driver-readpreference.constants.secondary-preferred">MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED</varname>
+ <initializer>secondaryPreferred</initializer>
+ </fieldsynopsis>
+ <fieldsynopsis>
+ <modifier>const</modifier>
+ <type>string</type>
+ <varname linkend="mongodb-driver-readpreference.constants.nearest">MongoDB\Driver\ReadPreference::NEAREST</varname>
+ <initializer>nearest</initializer>
+ </fieldsynopsis>
+ <fieldsynopsis>
+ <modifier>const</modifier>
<type>integer</type>
<varname linkend="mongodb-driver-readpreference.constants.no-max-staleness">MongoDB\Driver\ReadPreference::NO_MAX_STALENESS</varname>
<initializer>-1</initializer>
@@ -81,19 +115,19 @@
<varname linkend="mongodb-driver-readpreference.constants.smallest-max-staleness-seconds">MongoDB\Driver\ReadPreference::SMALLEST_MAX_STALENESS_SECONDS</varname>
<initializer>90</initializer>
</fieldsynopsis>
-
+
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-readpreference')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
</classsynopsis>
-<!-- }}} -->
-
+ <!-- }}} -->
+
</section>
-<!-- {{{ MongoDB\Driver\ReadPreference constants -->
+ <!-- {{{ MongoDB\Driver\ReadPreference constants -->
<section xml:id="mongodb-driver-readpreference.constants">
&reftitle.constants;
<variablelist>
-
+
<varlistentry xml:id="mongodb-driver-readpreference.constants.rp-primary">
<term><constant>MongoDB\Driver\ReadPreference::RP_PRIMARY</constant></term>
<listitem>
@@ -103,7 +137,7 @@
</para>
</listitem>
</varlistentry>
-
+
<varlistentry xml:id="mongodb-driver-readpreference.constants.rp-primary-preferred">
<term><constant>MongoDB\Driver\ReadPreference::RP_PRIMARY_PREFERRED</constant></term>
<listitem>
@@ -113,7 +147,7 @@
</para>
</listitem>
</varlistentry>
-
+
<varlistentry xml:id="mongodb-driver-readpreference.constants.rp-secondary">
<term><constant>MongoDB\Driver\ReadPreference::RP_SECONDARY</constant></term>
<listitem>
@@ -122,17 +156,17 @@
</para>
</listitem>
</varlistentry>
-
+
<varlistentry xml:id="mongodb-driver-readpreference.constants.rp-secondary-preferred">
<term><constant>MongoDB\Driver\ReadPreference::RP_SECONDARY_PREFERRED</constant></term>
<listitem>
<para>
- В большинстве ситуация операции считываются из вторичных членов, но если
- вторичные члены недоступны, операции считываются из первичного узла.
+ В большинстве ситуация операции считываются из вторичных узлов, но если
+ они недоступны, операции считываются из первичного узла.
</para>
</listitem>
</varlistentry>
-
+
<varlistentry xml:id="mongodb-driver-readpreference.constants.rp-nearest">
<term><constant>MongoDB\Driver\ReadPreference::RP_NEAREST</constant></term>
<listitem>
@@ -142,7 +176,56 @@
</para>
</listitem>
</varlistentry>
-
+
+ <varlistentry xml:id="mongodb-driver-readpreference.constants.primary">
+ <term><constant>MongoDB\Driver\ReadPreference::PRIMARY</constant></term>
+ <listitem>
+ <para>
+ Все операции чтения из текущей реплики установлены первичными. Это
+ предпочтение чтения по умолчанию для MongoDB.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="mongodb-driver-readpreference.constants.primary-preferred">
+ <term><constant>MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED</constant></term>
+ <listitem>
+ <para>
+ В большинстве случаев операции читаются из первичного узла, но
+ если он недоступен, операции читаются с вторичных узлов.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="mongodb-driver-readpreference.constants.secondary">
+ <term><constant>MongoDB\Driver\ReadPreference::SECONDARY</constant></term>
+ <listitem>
+ <para>
+ Все операции читаются из вторичных узлов набора реплик.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="mongodb-driver-readpreference.constants.secondary-preferred">
+ <term><constant>MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED</constant></term>
+ <listitem>
+ <para>
+ В большинстве случаев операции читаются из вторичных узлов, но если они недоступны,
+ операции читаются с первичного.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="mongodb-driver-readpreference.constants.nearest">
+ <term><constant>MongoDB\Driver\ReadPreference::NEAREST</constant></term>
+ <listitem>
+ <para>
+ Операции считываются из узла набора реплик с наименьшей задержкой в сети,
+ независимо от типа.
+ </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry xml:id="mongodb-driver-readpreference.constants.no-max-staleness">
<term><constant>MongoDB\Driver\ReadPreference::NO_MAX_STALENESS</constant></term>
<listitem>
@@ -154,7 +237,7 @@
</para>
</listitem>
</varlistentry>
-
+
<varlistentry xml:id="mongodb-driver-readpreference.constants.smallest-max-staleness-seconds">
<term><constant>MongoDB\Driver\ReadPreference::SMALLEST_MAX_STALENESS_SECONDS</constant></term>
<listitem>
@@ -167,11 +250,11 @@
</para>
</listitem>
</varlistentry>
-
+
</variablelist>
</section>
-<!-- }}} -->
-
+ <!-- }}} -->
+
<section role="changelog">
&reftitle.changelog;
<para>
@@ -185,6 +268,22 @@
</thead>
<tbody>
<row>
+ <entry>1.7.0</entry>
+ <entry>
+ <para>
+ Добавлены константы
+ <constant>MongoDB\Driver\ReadPreference::PRIMARY</constant>,
+ <constant>MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED</constant>,
+ <constant>MongoDB\Driver\ReadPreference::SECONDARY</constant>,
+ <constant>MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED</constant>,
+ <constant>MongoDB\Driver\ReadPreference::NEAREST</constant>.
+ </para>
+ <para>
+ Реализует <interfacename>Serializable</interfacename>.
+ </para>
+ </entry>
+ </row>
+ <row>
<entry>1.2.0</entry>
<entry>
<para>
@@ -202,11 +301,11 @@
</informaltable>
</para>
</section>
-
+
</partintro>
-
+
&reference.mongodb.mongodb.driver.entities.readpreference;
-
+
</phpdoc:classref>
<!-- Keep this comment at the end of the file
Modified: phpdoc/ru/trunk/reference/mongodb/mongodb/driver/session.xml
===================================================================
--- phpdoc/ru/trunk/reference/mongodb/mongodb/driver/session.xml 2020-02-03 21:12:57 UTC (rev 349114)
+++ phpdoc/ru/trunk/reference/mongodb/mongodb/driver/session.xml 2020-02-04 03:41:45 UTC (rev 349115)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 344522 Maintainer: sergey Status: ready -->
+<!-- EN-Revision: 349106 Maintainer: sergey Status: ready -->
<!-- Reviewed: no -->
<phpdoc:classref xml:id="class.mongodb-driver-session" 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">
@@ -38,6 +38,38 @@
</classsynopsisinfo>
<!-- }}} -->
+ <classsynopsisinfo role="comment">Константы</classsynopsisinfo>
+ <fieldsynopsis>
+ <modifier>const</modifier>
+ <type>string</type>
+ <varname linkend="mongodb-driver-session.constants.transaction-none">MongoDB\Driver\Session::TRANSACTION_NONE</varname>
+ <initializer>none</initializer>
+ </fieldsynopsis>
+ <fieldsynopsis>
+ <modifier>const</modifier>
+ <type>string</type>
+ <varname linkend="mongodb-driver-session.constants.transaction-starting">MongoDB\Driver\Session::TRANSACTION_STARTING</varname>
+ <initializer>starting</initializer>
+ </fieldsynopsis>
+ <fieldsynopsis>
+ <modifier>const</modifier>
+ <type>string</type>
+ <varname linkend="mongodb-driver-session.constants.transaction-in-progress">MongoDB\Driver\Session::TRANSACTION_IN_PROGRESS</varname>
+ <initializer>in_progress</initializer>
+ </fieldsynopsis>
+ <fieldsynopsis>
+ <modifier>const</modifier>
+ <type>string</type>
+ <varname linkend="mongodb-driver-session.constants.transaction-committed">MongoDB\Driver\Session::TRANSACTION_COMMITTED</varname>
+ <initializer>committed</initializer>
+ </fieldsynopsis>
+ <fieldsynopsis>
+ <modifier>const</modifier>
+ <type>string</type>
+ <varname linkend="mongodb-driver-session.constants.transaction-aborted">MongoDB\Driver\Session::TRANSACTION_ABORTED</varname>
+ <initializer>aborted</initializer>
+ </fieldsynopsis>
+
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-session')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
</classsynopsis>
@@ -44,6 +76,60 @@
<!-- }}} -->
</section>
+
+ <!-- {{{ MongoDB\Driver\Session constants -->
+ <section xml:id="mongodb-driver-session.constants">
+ &reftitle.constants;
+ <variablelist>
+
+ <varlistentry xml:id="mongodb-driver-session.constants.transaction-none">
+ <term><constant>MongoDB\Driver\Session::TRANSACTION_NONE</constant></term>
+ <listitem>
+ <para>
+ Нет транзакции в процессе.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="mongodb-driver-session.constants.transaction-starting">
+ <term><constant>MongoDB\Driver\Session::TRANSACTION_STARTING</constant></term>
+ <listitem>
+ <para>
+ Транзакция была начата, но на сервер не было отправлено ни одной операции.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="mongodb-driver-session.constants.transaction-in-progress">
+ <term><constant>MongoDB\Driver\Session::TRANSACTION_IN_PROGRESS</constant></term>
+ <listitem>
+ <para>
+ Транзакция в процессе.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="mongodb-driver-session.constants.transaction-committed">
+ <term><constant>MongoDB\Driver\Session::TRANSACTION_COMMITTED</constant></term>
+ <listitem>
+ <para>
+ Транзакция была зафиксирована.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="mongodb-driver-session.constants.transaction-aborted">
+ <term><constant>MongoDB\Driver\Session::TRANSACTION_ABORTED</constant></term>
+ <listitem>
+ <para>
+ Транзакция была прервана.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+ </section>
+ <!-- }}} -->
</partintro>
&reference.mongodb.mongodb.driver.entities.session;
Modified: phpdoc/ru/trunk/reference/mongodb/mongodb/driver/writeconcern/construct.xml
===================================================================
--- phpdoc/ru/trunk/reference/mongodb/mongodb/driver/writeconcern/construct.xml 2020-02-03 21:12:57 UTC (rev 349114)
+++ phpdoc/ru/trunk/reference/mongodb/mongodb/driver/writeconcern/construct.xml 2020-02-04 03:41:45 UTC (rev 349115)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 345215 Maintainer: lex Status: ready -->
+<!-- EN-Revision: 349110 Maintainer: lex Status: ready -->
<!-- Reviewed: no -->
<refentry xml:id="mongodb-driver-writeconcern.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -104,7 +104,7 @@
выполненные до того, как гарантия записи превысила временной лимит <literal>wtimeout</literal>
</para>
<para>
- Если указано, <literal>wtimeout</literal> должен быть 32-битным целым числом со знаком,
+ Если указано, <literal>wtimeout</literal> должен быть 64-битным целым числом со знаком,
больше или равен нулю.
</para>
<para>
@@ -155,6 +155,30 @@
</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.7.0</entry>
+ <entry>
+ Параметр <parameter>wTimeout</parameter> теперь принимает 64-битные значения.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </refsect1>
<refsect1 role="examples">
Modified: phpdoc/ru/trunk/reference/mongodb/mongodb/driver/writeconcern/getwtimeout.xml
===================================================================
--- phpdoc/ru/trunk/reference/mongodb/mongodb/driver/writeconcern/getwtimeout.xml 2020-02-03 21:12:57 UTC (rev 349114)
+++ phpdoc/ru/trunk/reference/mongodb/mongodb/driver/writeconcern/getwtimeout.xml 2020-02-04 03:41:45 UTC (rev 349115)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 343892 Maintainer: lex Status: ready -->
+<!-- EN-Revision: 349110 Maintainer: lex Status: ready -->
<!-- Reviewed: no -->
<refentry xml:id="mongodb-driver-writeconcern.getwtimeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -12,7 +12,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
-<modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\WriteConcern::getWtimeout</methodname>
+ <modifier>final</modifier> <modifier>public</modifier> <type>int|MongoDB\BSON\Int64</type><methodname>MongoDB\Driver\WriteConcern::getWtimeout</methodname>
<void />
</methodsynopsis>
</refsect1>
@@ -35,12 +35,39 @@
&mongodb.throws.argumentparsing;
</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.7.0</entry>
+ <entry>
+ В 32-разрядных системах этот метод будет возвращать экземпляр <classname>MongoDB\BSON\Int64</classname>,
+ если объект WriteConcern был создан с <literal>wTimeout</literal>,
+ который превышает 32-разрядный диапазон. В 64-разрядных системах этот метод
+ всегда возвращает целочисленное значение.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </refsect1>
<refsect1 role="examples">
&reftitle.examples;
<example>
- <title>Пример выполнения <function>MongoDB\Driver\WriteConcern::getWtimeout</function></title>
+ <title>Пример использования <function>MongoDB\Driver\WriteConcern::getWtimeout</function></title>
<programlisting role="php">
<![CDATA[
<?php
Modified: phpdoc/ru/trunk/reference/mongodb/mongodb/driver/writeconcern.xml
===================================================================
--- phpdoc/ru/trunk/reference/mongodb/mongodb/driver/writeconcern.xml 2020-02-03 21:12:57 UTC (rev 349114)
+++ phpdoc/ru/trunk/reference/mongodb/mongodb/driver/writeconcern.xml 2020-02-04 03:41:45 UTC (rev 349115)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 342815 Maintainer: lex Status: ready -->
-<!-- Reviewed: no -->
+<!-- EN-Revision: 349110 Maintainer: lex Status: ready -->
+<!-- Reviewed: yes Maintainer: sergey -->
<phpdoc:classref xml:id="class.mongodb-driver-writeconcern" 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">
-
+
<title>Класс MongoDB\Driver\WriteConcern</title>
<titleabbrev>MongoDB\Driver\WriteConcern</titleabbrev>
-
+
<partintro>
-
-<!-- {{{ MongoDB\Driver\WriteConcern intro -->
+
+ <!-- {{{ MongoDB\Driver\WriteConcern intro -->
<section xml:id="mongodb-driver-writeconcern.intro">
&reftitle.intro;
<para>
@@ -21,27 +21,31 @@
гарантии записи на сегменты.
</para>
</section>
-<!-- }}} -->
-
+ <!-- }}} -->
+
<section xml:id="mongodb-driver-writeconcern.synopsis">
&reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
+
+ <!-- {{{ Synopsis -->
<classsynopsis>
<ooclass><classname>MongoDB\Driver\WriteConcern</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
+
+ <!-- {{{ Class synopsis -->
<classsynopsisinfo>
<modifier>final</modifier>
<ooclass>
<classname>MongoDB\Driver\WriteConcern</classname>
</ooclass>
-
+
<oointerface>
<interfacename>MongoDB\BSON\Serializable</interfacename>
</oointerface>
+
+ <oointerface>
+ <interfacename>Serializable</interfacename>
+ </oointerface>
</classsynopsisinfo>
-<!-- }}} -->
+ <!-- }}} -->
<classsynopsisinfo role="comment">Константы</classsynopsisinfo>
<fieldsynopsis>
<modifier>const</modifier>
@@ -53,15 +57,15 @@
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-writeconcern')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
</classsynopsis>
-<!-- }}} -->
-
+ <!-- }}} -->
+
</section>
-<!-- {{{ MongoDB\Driver\WriteConcern constants -->
+ <!-- {{{ MongoDB\Driver\WriteConcern constants -->
<section xml:id="mongodb-driver-writeconcern.constants">
&reftitle.constants;
<variablelist>
-
+
<varlistentry xml:id="mongodb-driver-writeconcern.constants.majority">
<term><constant>MongoDB\Driver\WriteConcern::MAJORITY</constant></term>
<listitem>
@@ -72,11 +76,11 @@
</para>
</listitem>
</varlistentry>
-
+
</variablelist>
</section>
-<!-- }}} -->
-
+ <!-- }}} -->
+
<section role="changelog">
&reftitle.changelog;
<para>
@@ -90,6 +94,12 @@
</thead>
<tbody>
<row>
+ <entry>1.7.0</entry>
+ <entry>
+ Реализует <interfacename>Serializable</interfacename>.
+ </entry>
+ </row>
+ <row>
<entry>1.2.0</entry>
<entry>
Реализует <interfacename>MongoDB\BSON\Serializable</interfacename>.
@@ -100,11 +110,11 @@
</informaltable>
</para>
</section>
-
+
</partintro>
-
+
&reference.mongodb.mongodb.driver.entities.writeconcern;
-
+
</phpdoc:classref>
<!-- Keep this comment at the end of the file
Modified: phpdoc/ru/trunk/reference/zip/constants.xml
===================================================================
--- phpdoc/ru/trunk/reference/zip/constants.xml 2020-02-03 21:12:57 UTC (rev 349114)
+++ phpdoc/ru/trunk/reference/zip/constants.xml 2020-02-04 03:41:45 UTC (rev 349115)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 349093 Maintainer: irker Status: ready -->
+<!-- EN-Revision: 349107 Maintainer: irker Status: ready -->
<!-- Reviewed: yes -->
<!-- $Revision$ -->
<appendix xml:id="zip.constants" xmlns="http://docbook.org/ns/docbook">
@@ -50,6 +50,21 @@
</simpara>
</listitem>
</varlistentry>
+
+ <varlistentry xml:id="ziparchive.constants.rdonly">
+ <term>
+ <constant>ZipArchive::RDONLY</constant>
+ (<type>integer</type>)
+ </term>
+ <listitem>
+ <simpara>
+ Открыть архив в режиме только для чтения.
+ Доступно с PHP 7.4.3 и PECL zip 1.17.1, соответственно,
+ если скомпилировано с использованием libzip ≥ 1.0.0.
+ </simpara>
+ </listitem>
+ </varlistentry>
+
<varlistentry xml:id="ziparchive.constants.checkcons">
<term>
<constant>ZipArchive::CHECKCONS</constant>