svn: /phpdoc/zh/trunk/ language-snippets.ent reference/datetime/datetime/modify.xml reference/datetime/datetime/setdate.xml reference/datetime/datetime/setisodate.xml reference/datetime/datetime/settime.xml reference/datetime/datetime/settimezone.xml
[email protected] (Dai Jie) Tue, 01 Dec 2020 05:39:34 +0000
| Newsgroups | php.doc.zh |
|---|---|
| Message-ID | <[email protected]> |
daijie Tue, 01 Dec 2020 05:39:34 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=351811
Log:
Sync with en
Changed paths:
U phpdoc/zh/trunk/language-snippets.ent
U phpdoc/zh/trunk/reference/datetime/datetime/modify.xml
U phpdoc/zh/trunk/reference/datetime/datetime/setdate.xml
U phpdoc/zh/trunk/reference/datetime/datetime/setisodate.xml
U phpdoc/zh/trunk/reference/datetime/datetime/settime.xml
U phpdoc/zh/trunk/reference/datetime/datetime/settimezone.xml
svn-diffs-351811.txt
(text/x-diff, 33.1 KB)
Modified: phpdoc/zh/trunk/language-snippets.ent
===================================================================
--- phpdoc/zh/trunk/language-snippets.ent 2020-12-01 04:47:06 UTC (rev 351810)
+++ phpdoc/zh/trunk/language-snippets.ent 2020-12-01 05:39:34 UTC (rev 351811)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 350657 Maintainer: Gregory Status: ready -->
+<!-- EN-Revision: 351794 Maintainer: Gregory Status: ready -->
<!-- Reviewed: yes -->
<!-- CREDITS: dallas -->
<!-- 请保持此文件与英文文件中相应的每个 ENTITY 行号一一对应以便于对照，修改与更新！ -->
@@ -306,18 +306,21 @@
<emphasis>DEPRECATED</emphasis> in PHP 5.3.0, and <emphasis>REMOVED</emphasis> as of PHP 7.0.0.</simpara></warning>'>
<!ENTITY warn.deprecated.feature-5-6-0.removed-7-0-0 '<warning
-xmlns="http://docbook.org/ns/docbook"><simpara>This feature was
-<emphasis>DEPRECATED</emphasis> in PHP 5.6.0, and
-<emphasis>REMOVED</emphasis> as of PHP 7.0.0.</simpara></warning>'>
+xmlns="http://docbook.org/ns/docbook"><simpara>该功能已在 PHP 5.6.0 中
+<emphasis>废弃</emphasis> ，并在 PHP 7.0.0 中
+<emphasis>移除</emphasis>。</simpara></warning>'>
<!ENTITY warn.removed.function-7-0-0 '<warning
-xmlns="http://docbook.org/ns/docbook"><simpara>This function was
-<emphasis>REMOVED</emphasis> in PHP 7.0.0.</simpara></warning>'>
+xmlns="http://docbook.org/ns/docbook"><simpara>该函数已在 PHP 7.0.0 中
+<emphasis>移除</emphasis>。</simpara></warning>'>
<!ENTITY warn.removed.function-7-4-0 '<warning
-xmlns="http://docbook.org/ns/docbook"><simpara>This function was
-<emphasis>REMOVED</emphasis> in PHP 7.4.0.</simpara></warning>'>
+xmlns="http://docbook.org/ns/docbook"><simpara>该函数已在 PHP 7.4.0 中
+<emphasis>移除</emphasis>。</simpara></warning>'>
+<!ENTITY warn.deprecated.alias-7-4-0.removed-8-0-0 '<warning xmlns="http://docbook.org/ns/docbook"><simpara>This alias was
+<emphasis>DEPRECATED</emphasis> in PHP 7.4.0, and <emphasis>REMOVED</emphasis> as of PHP 8.0.0.</simpara></warning>'>
+
<!ENTITY warn.experimental.func '<warning xmlns="http://docbook.org/ns/docbook"><simpara>此函数是<emphasis>实验性</emphasis>的。此函数的表象，包括名称及其相关文档都可能在未来的
PHP 发布版本中未通知就被修改。使用本函数风险自担。</simpara></warning>'>
@@ -488,6 +491,10 @@
<!ENTITY example.outputs.73 '<para xmlns="http://docbook.org/ns/docbook">以上例程在 PHP 7.3 中的输出：</para>'>
+<!ENTITY example.outputs.8 '<para xmlns="http://docbook.org/ns/docbook">以上例程在 PHP 8 中的输出：</para>'>
+
+<!ENTITY example.outputs.80 '<para xmlns="http://docbook.org/ns/docbook">以上例程在 PHP 8.0 中的输出：</para>'>
+
<!ENTITY example.outputs.32bit '<para xmlns="http://docbook.org/ns/docbook">以上例程在 32 位机器上的输出:</para>'>
<!ENTITY example.outputs.64bit '<para xmlns="http://docbook.org/ns/docbook">以上例程在 64 位机器上的输出:</para>'>
@@ -504,9 +511,6 @@
<!ENTITY examples.outputs.similar '<para xmlns="http://docbook.org/ns/docbook">以上例程的输出类似于：</para>'>
-
-
-
<!ENTITY array.resetspointer '<note xmlns="http://docbook.org/ns/docbook"><simpara>使用此函数后会重置（<function>reset</function>）<type>array</type>
指针。</simpara></note>'>
@@ -519,7 +523,7 @@
-<!ENTITY ini.shorthandbytes '<simpara xmlns="http://docbook.org/ns/docbook">当使用 <type>integer</type>
+<!ENTITY ini.shorthandbytes '<simpara xmlns="http://docbook.org/ns/docbook">当使用 <type>int</type>
时, 其值以字节来衡量。还可以使用在<link linkend="faq.using.shorthandbytes">FAQ</link>中描述的速记符。</simpara>'>
@@ -576,8 +580,7 @@
<!ENTITY return.void '没有返回值。'>
-<!ENTITY return.callbacksort '在第一个参数小于，等于或大于第二个参数时，该比较函数必须相应地返回一个小于，等于或大于 0 的整数。注意：在
-PHP 7.0.0 之前的版本中，整数的区间为 -2147483648 to 2147483647。'>
+<!ENTITY return.callbacksort '在第一个参数小于，等于或大于第二个参数时，该比较函数必须相应地返回一个小于，等于或大于 0 的整数。'>
<!ENTITY return.falseproblem '<warning xmlns="http://docbook.org/ns/docbook"><simpara>此函数可能返回布尔值
&false;，但也可能返回等同于 &false; 的非布尔值。请阅读 <link
@@ -793,14 +796,42 @@
<!-- cURL notes -->
-<!ENTITY curl.ch.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>ch</parameter>
+<!ENTITY curl.ch.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>handle</parameter>
</term><listitem><para>由 <function>curl_init</function> 返回的 cURL 句柄。</para></listitem></varlistentry>'>
-<!ENTITY curl.mh.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>mh</parameter>
-</term><listitem><para>由 <function>curl_multi_init</function> 返回的 cURL 多个句柄。</para></listitem></varlistentry>'>
+<!ENTITY curl.mh.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>multi_handle</parameter>
+</term><listitem><para>由
+<function>curl_multi_init</function> 返回的 cURL 多个句柄。</para></listitem></varlistentry>'>
+<!ENTITY curl.sh.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>share_handle</parameter>
+</term><listitem><para>A cURL share handle returned by
+<function>curl_share_init</function>.</para></listitem></varlistentry>'>
+<!ENTITY curl.changelog.handle-param '<row xmlns="http://docbook.org/ns/docbook">
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>handle</parameter> expects a <classname>CurlHandle</classname>
+ instance now; previously, a <type>resource</type> was expected.
+ </entry>
+</row>'>
+
+<!ENTITY curl.changelog.multi-handle-param '<row xmlns="http://docbook.org/ns/docbook">
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>multi_handle</parameter> expects a <classname>CurlMultiHandle</classname>
+ instance now; previously, a <type>resource</type> was expected.
+ </entry>
+</row>'>
+
+<!ENTITY curl.changelog.share-handle-param '<row xmlns="http://docbook.org/ns/docbook">
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>share_handle</parameter> expects a <classname>CurlShareHandle</classname>
+ instance now; previously, a <type>resource</type> was expected.
+ </entry>
+</row>'>
+
<!-- dbase notes -->
<!ENTITY dbase.type-conversion '<para xmlns="http://docbook.org/ns/docbook">
@@ -832,6 +863,43 @@
</para>'>
+<!-- enchant entities -->
+
+<!ENTITY enchant.param.broker '<varlistentry xmlns="http://docbook.org/ns/docbook">
+ <term><parameter>broker</parameter></term>
+ <listitem>
+ <para>
+ An Enchant broker returned by <function>enchant_broker_init</function>.
+ </para>
+ </listitem>
+ </varlistentry>'>
+
+<!ENTITY enchant.param.dictionary '<varlistentry xmlns="http://docbook.org/ns/docbook">
+ <term><parameter>dictionary</parameter></term>
+ <listitem>
+ <para>
+ An Enchant dictionary returned by <function>enchant_broker_request_dict</function>
+ or <function>enchant_broker_request_pwl_dict</function>.
+ </para>
+ </listitem>
+ </varlistentry>'>
+
+<!ENTITY enchant.changelog.broker-param '<row xmlns="http://docbook.org/ns/docbook">
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>broker</parameter> expects an <classname>EnchantBroker</classname> instance now;
+ previoulsy, a &resource; was expected.
+ </entry>
+</row>'>
+
+<!ENTITY enchant.changelog.dictionary-param '<row xmlns="http://docbook.org/ns/docbook">
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>dictionary</parameter> expects an <classname>EnchantDictionary</classname> instance now;
+ previoulsy, a &resource; was expected.
+ </entry>
+</row>'>
+
<!-- IMAP notes -->
<!ENTITY imap.imap-stream.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>
@@ -858,9 +926,9 @@
<!-- intl notes -->
-<!ENTITY intl.codepoint.parameter '<para xmlns="http://docbook.org/ns/docbook">The <type>integer</type> codepoint value (e.g. <literal>0x2603</literal> for <emphasis>U+2603 SNOWMAN</emphasis>), or the character encoded as a UTF-8 <type>string</type> (e.g. <literal>"\u{2603}"</literal>)</para>'>
+<!ENTITY intl.codepoint.parameter '<para xmlns="http://docbook.org/ns/docbook">The <type>int</type> codepoint value (e.g. <literal>0x2603</literal> for <emphasis>U+2603 SNOWMAN</emphasis>), or the character encoded as a UTF-8 <type>string</type> (e.g. <literal>"\u{2603}"</literal>)</para>'>
-<!ENTITY intl.codepoint.return '<para xmlns="http://docbook.org/ns/docbook">The return type will be <type>integer</type> unless the code point was passed as a UTF-8 <type>string</type>, in which case a <type>string</type> will be returned.</para>'>
+<!ENTITY intl.codepoint.return '<para xmlns="http://docbook.org/ns/docbook">The return type will be <type>int</type> unless the code point was passed as a UTF-8 <type>string</type>, in which case a <type>string</type> will be returned.</para>'>
<!ENTITY intl.codepoint.example 'Testing different code points'>
@@ -994,7 +1062,7 @@
时区错误。</para></entry></row>'>
<!ENTITY date.timestamp.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>timestamp</parameter></term><listitem><para>
-可选的 <parameter>timestamp</parameter> 参数是一个 <type>integer</type> 的 Unix
+可选的 <parameter>timestamp</parameter> 参数是一个 <type>int</type> 的 Unix
时间戳，如未指定，参数值默认为当前本地时间。也就是说，其值默认为
<function>time</function> 的返回值。</para></listitem></varlistentry>'>
@@ -1014,9 +1082,6 @@
object</parameter></term><listitem><para>仅过程化风格：由 <function>timezone_open</function> 返回的
<classname>DateTimeZone</classname> 对象。</para></listitem></varlistentry>'>
-<!ENTITY date.datetime.retval.changelog '<row xmlns="http://docbook.org/ns/docbook"><entry>5.3.0</entry><entry>将返回值从&null;改为 <classname>DateTime</classname> 类型。</entry></row>'>
-
-
<!ENTITY date.datetime.return.modifiedobjectorfalseforfailure '返回被修改的 DateTime 对象，&return.falseforfailure;.'>
<!ENTITY date.timezone.dbversion '基于时区数据库版本的列表'>
@@ -1093,11 +1158,11 @@
失败时抛出<constant>E_WARNING</constant>警告。
</para>'>
-<!-- FileSystem entities -->
<!ENTITY fs.validfp.all '<para xmlns="http://docbook.org/ns/docbook">文件指针必须是有效的，必须指向由
<function>fopen</function> 或 <function>fsockopen</function> 成功打开的文件(并还未由 <function>fclose</function> 关闭)。</para>'>
+
<!ENTITY fs.file.pointer '<para xmlns="http://docbook.org/ns/docbook">文件系统指针，是典型地由
<function>fopen</function> 创建的 <type>resource</type>(资源)。</para>'>
@@ -1129,9 +1194,16 @@
<!ENTITY odbc.connection.id '<para xmlns="http://docbook.org/ns/docbook">ODBC 连接标识符，详见
<function>odbc_connect</function>。</para>'>
-<!ENTITY odbc.parameter.search '此参数接受下列查询模式："%" 来匹配零到多个字符，"_" 来匹配单个字符。'>
+<!ENTITY odbc.parameter.catalog 'The catalog ('qualifier' in ODBC 2 parlance).'>
+<!ENTITY odbc.parameter.schema 'The schema ('owner' in ODBC 2 parlance).'>
+<!ENTITY odbc.parameter.search '此参数接受下列查询模式：
+<literal xmlns="http://docbook.org/ns/docbook">%</literal> 来匹配零到多个字符，
+<literal xmlns="http://docbook.org/ns/docbook">_</literal> 来匹配单个字符。'>
+
+<!ENTITY odbc.result.driver-specific 'Drivers can report additional columns.'>
+
<!-- OAUTH -->
<!ENTITY oauth.callback.error '如回调函数无法被调用或未被指定，会引发一个
<constant xmlns="http://docbook.org/ns/docbook">E_ERROR</constant> 级别的错误。'>
@@ -1145,19 +1217,28 @@
<literal>Oracle 实例</literal>。可以是 <link xlink:href='&url.oracle.oic.connect;'>Easy Connect 串</link>，或是
<filename>tnsnames.ora</filename> 文件中的连接名，或是本地 Oracle 实例名。
</para>
+
<para xmlns='http://docbook.org/ns/docbook'>
如果不指定，PHP 使用环境变量来确定连接的 <literal>Oracle 实例</literal>，诸如
<constant>TWO_TASK</constant>（Linux 下）或 <constant>LOCAL</constant>（Windows 下）与 <constant>ORACLE_SID</constant> 等。
</para>
+
+
<para xmlns='http://docbook.org/ns/docbook'>
要使用 Easy Connect 命名方法，PHP 必须与 Oracle 10<emphasis>g</emphasis> 或更高版本的客户端库进行链接。Oracle 10<emphasis>g</emphasis> 的 Easy Connect
串格式：<emphasis>[//]host_name[:port][/service_name]</emphasis>。Oracle
- 11<emphasis>g</emphasis> 则为：<emphasis>[//]host_name[:port][/service_name][:server_type][/instance_name]</emphasis>。服务名可在数据库服务器机器上运行
+ 11<emphasis>g</emphasis> 则为：<emphasis>[//]host_name[:port][/service_name][:server_type][/instance_name]</emphasis>。
+ 在 Oracle 19c 加入类更多选项，例如 timeout 和 keep-alive 设置。
+ 请参考 Oracle 文档。
+ 服务名可在数据库服务器机器上运行
Oracle 实用程序 <literal>lsnrctl status</literal> 找到。
</para>
+
+
+
<para xmlns='http://docbook.org/ns/docbook'>
- <filename>tnsnames.ora</filename> 文件可在 Oracle Net 查找路径中，此路径包括 <filename>$ORACLE_HOME/network/admin</filename>
- 和 <filename>/etc</filename>。 另一种方法是设置 <literal>TNS_ADMIN</literal> 以便通过 <filename>$TNS_ADMIN/tnsnames.ora</filename>
+ <filename>tnsnames.ora</filename> 文件可在 Oracle Net 查找路径中，此路径包括 <filename>/your/path/to/instantclient/network/admin</filename>、<filename>$ORACLE_HOME/network/admin</filename>
+ 、<filename>/etc</filename>。 另一种方法是设置 <literal>TNS_ADMIN</literal> 以便通过 <filename>$TNS_ADMIN/tnsnames.ora</filename>
来读取。表确认 web 守护进程可读取此文件。
</para>">
@@ -1164,30 +1245,21 @@
-
-
-
-
-
-
-
-
-
<!ENTITY oci.charset "<para xmlns='http://docbook.org/ns/docbook'>
使用 Oracle
客户端库来确定字符集。字符集不需要与数据库的字符集相匹配。如果不匹配，Oracle
会尽可能地将数据从数据库字符集进行转换。因为依赖于字符集，可能不能给出可用的结果。转换也增加一些时间开销。
</para>
+
+
<para xmlns='http://docbook.org/ns/docbook'>
如果不指定，Oracle 客户端用 <constant>NLS_LANG</constant> 环境变量来决定字符集。
</para>
+
<para xmlns='http://docbook.org/ns/docbook'>
传递此参数可减少连接时间。
</para>">
-
-
-
<!ENTITY oci.sessionmode '<para xmlns="http://docbook.org/ns/docbook">
此参数在 PHP 5（PECL OCI8
1.1）版本开始可用，并收受下列值：<constant>OCI_DEFAULT</constant>，<constant>OCI_SYSOPER</constant>
@@ -1197,6 +1269,8 @@
<link linkend="ini.oci8.privileged-connect">oci8.privileged_connect</link>
设为 <literal>On</literal> 来启用。
</para>
+
+
<para xmlns="http://docbook.org/ns/docbook">
PHP 5.3（PECL OCI8 1.3.4）引进了
<constant>OCI_CRED_EXT</constant> 模式值。使用外部或操作系统认证必需在 Oracle
@@ -1205,6 +1279,7 @@
linkend="ini.oci8.privileged-connect">oci8.privileged_connect</link>
可为 <literal>On</literal> 或 <literal>Off</literal>。
</para>
+
<para xmlns="http://docbook.org/ns/docbook">
<constant>OCI_CRED_EXT</constant> 可与
<constant>OCI_SYSOPER</constant> 或
@@ -1215,9 +1290,6 @@
</para>'>
-
-
-
<!ENTITY oci.datatypes '<para xmlns="http://docbook.org/ns/docbook">要获取 OCI8
扩展进行数据类型映射的细节，请参见<link linkend="oci8.datatypes">驱动所支持的数据类型</link>。</para>'>
@@ -1265,13 +1337,17 @@
<!-- Notes for safe-mode limited functions: -->
+
+<!-- Not used in EN anymore -->
<!ENTITY note.sm.disabled '<note xmlns="http://docbook.org/ns/docbook"><simpara>&sm.disabled;</simpara></note>'>
+<!-- Not used in EN anymore -->
<!ENTITY note.sm.uidcheck '<note xmlns="http://docbook.org/ns/docbook"><simpara>当启用
<link linkend="features.safe-mode">安全模式</link>时，
PHP 会检查被操作的文件或目录是否与被执行的脚本有相同的 UID（所有者）。</simpara></note>'>
+<!-- Not used in EN anymore -->
<!ENTITY note.sm.uidcheck.dir '<note xmlns="http://docbook.org/ns/docbook"><simpara>当启用
<link linkend="features.safe-mode">安全模式</link>时，
PHP 会在执行脚本时检查被脚本操作的目录是否与被执行的脚本有相同的 UID（所有者）。</simpara></note>'>
@@ -1289,13 +1365,17 @@
<!-- Common pieces in features/safe-mode.xml
Jade doesn't allow in-line entities, so I put them here... Though they
should have been inline in safe-mode.xml -->
+
+<!-- Not used in EN anymore -->
<!ENTITY sm.uidcheck '检查被操作的文件或目录是否与被执行的脚本有相同的 UID（所有者）。'>
+<!-- Not used in EN anymore -->
<!ENTITY warn.sm.exec '<warning xmlns="http://docbook.org/ns/docbook"><simpara><link linkend="features.safe-mode">安全模式</link> 启用时，命令字符串会被
<function>escapeshellcmd</function> 转换。因此，<literal>echo y | echo x</literal> 会变成
<literal>echo y \| echo x</literal>。</simpara></warning>'>
+<!-- Not used in EN anymore -->
<!ENTITY note.exec-path '<note xmlns="http://docbook.org/ns/docbook"><simpara><link linkend="features.safe-mode">安全模式</link> 启用时，可仅可用
<link linkend="ini.safe-mode-exec-dir">safe_mode_exec_dir</link> 执行文件。实际上，现在不允许在到可执行的路径中存在 <literal>..</literal> 组件。</simpara></note>'>
@@ -1302,10 +1382,12 @@
+<!-- Not used in EN anymore -->
<!ENTITY sm.uidcheck.dir '检查被操作的目录是否与被执行的脚本有相同的 UID（所有者）。'>
+<!-- Not used in EN anymore -->
<!ENTITY sm.disabled '当 PHP 运行在 <link xmlns="http://docbook.org/ns/docbook" linkend="features.safe-mode">安全模式</link> 时，不能使用此函数。'>
@@ -1427,9 +1509,10 @@
<function>bcscale</function> 来设置全局默认的小数位数，用于所有函数。如果未设置，则默认为 <literal>0</literal>。
</para></listitem></varlistentry>'>
+
<!-- CTYPE Notes -->
<!ENTITY note.ctype.parameter.integer '<note xmlns="http://docbook.org/ns/docbook"><para>
-如果给出一个 -128 到 255 之间(含)的整数, 将会被解释为该值对应的ASCII字符 (负值将加上 256 以支持扩展ASCII字符).
+如果给出一个 -128 到 255 之间(含)的<type>int</type>, 将会被解释为该值对应的ASCII字符 (负值将加上 256 以支持扩展ASCII字符).
其它整数将会被解释为该值对应的十进制字符串.</para></note>'>
@@ -1449,9 +1532,8 @@
或 <function>fbsql_db_query</function> 返回的结果标识符。</para></listitem></varlistentry>'>
-
<!-- GMP Notes -->
-<!ENTITY gmp.return 'PHP 5.5 之前，返回 GMP 数值<type xmlns="http://docbook.org/ns/docbook">资源</type>，PHP 5.6 之后，返回 <classname xmlns="http://docbook.org/ns/docbook">GMP</classname> 对象。'>
+<!ENTITY gmp.return '<classname xmlns="http://docbook.org/ns/docbook">GMP</classname> 对象。'>
<!ENTITY gmp.parameter '<para xmlns="http://docbook.org/ns/docbook">PHP 5.5 之前为 GMP 数值<type>资源</type>，PHP 5.6 之后为 <classname>GMP</classname> 对象或数字，或可以转为数字的字符串。</para>'>
<!-- MySQLi Notes -->
@@ -1757,9 +1839,17 @@
<!-- XMLWriter Notes -->
<!ENTITY xmlwriter.xmlwriter.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>
-xmlwriter</parameter></term><listitem><para>仅用于过程调用。被修改的 XMLWriter <type>resource</type>。此资源来自于对 <function>xmlwriter_open_uri</function> 或
+xmlwriter</parameter></term><listitem><para>仅用于过程调用。被修改的 <classname>XMLWriter</classname> 实例对象。此资源来自于对 <function>xmlwriter_open_uri</function> 或
<function>xmlwriter_open_memory</function> 的调用。</para></listitem></varlistentry>'>
+<!ENTITY xmlwriter.changelog.writer-param '<row xmlns="http://docbook.org/ns/docbook">
+ <entry>8.0.0</entry>
+ <entry>
+ 现在 <parameter>writer</parameter> 需要 <classname>XMLWriter</classname> 实例，
+ 之前需要的是 <type>resource</type>。
+ </entry>
+</row>'>
+
<!-- SOAP notes -->
<!ENTITY soap.wsdl.mode.only "<note xmlns='http://docbook.org/ns/docbook'><para>此函数仅在 WSDL 模式下生效。</para></note>">
@@ -1782,6 +1872,7 @@
<!ENTITY fann.return.bool '<para xmlns="http://docbook.org/ns/docbook">成功时返回 &true;，其它情况下返回 &false;。</para>'>
<!ENTITY fann.return.ann '<para xmlns="http://docbook.org/ns/docbook"> 成功时返回神经网络 <type>资源</type>，发生错误返回 &false;。</para>'>
<!ENTITY fann.return.train '<para xmlns="http://docbook.org/ns/docbook"> 成功时返回训练数据 <type>资源</type>，发生错误返回 &false;。</para>'>
+<!ENTITY fann.note.function.fann-2.2 '<note xmlns="http://docbook.org/ns/docbook"><para>This function is only available if the fann extension has been build against libfann >= 2.2.</para></note>'>
<!-- Imagick generic return types -->
<!ENTITY imagick.return.success '成功时返回 &true;。'>
@@ -2184,7 +2275,7 @@
<!ENTITY mongodb.option.collation '
<row xmlns="http://docbook.org/ns/docbook">
<entry>collation</entry>
- <entry><type>array|object</type></entry>
+ <entry><type class="union"><type>array</type><type>object</type></type></entry>
<entry>
<para>
<link xlink:href="&url.mongodb.docs.collation;" xmlns:xlink="http://www.w3.org/1999/xlink">Collation</link> allows users to specify language-specific rules for string comparison, such as rules for lettercase and accent marks. When specifying collation, the <literal>"locale"</literal> field is mandatory; all other collation fields are optional. For descriptions of the fields, see <link xlink:href="&url.mongodb.docs.collation;#collation-document" xmlns:xlink="http://www.w3.org/1999/xlink">Collation Document</link>.
@@ -2385,7 +2476,7 @@
'>
<!ENTITY mongodb.parameter.filter '
<varlistentry xmlns="http://docbook.org/ns/docbook">
- <term><parameter>filter</parameter> (<type>array|object</type>)</term>
+ <term><parameter>filter</parameter> (<type class="union"><type>array</type><type>object</type></type>)</term>
<listitem>
<para>
The <link xlink:href="&url.mongodb.docs;tutorial/query-documents/" xmlns:xlink="http://www.w3.org/1999/xlink">query predicate</link>.
@@ -2492,7 +2583,7 @@
<listitem>
<para>
The file descriptor, which is expected to be either a file
- <type>resource</type> or an <type>integer</type>. An <type>integer</type>
+ <type>resource</type> or an <type>int</type>. An <type>int</type>
will be assumed to be a file descriptor that can be passed directly to
the underlying system call.
</para>
@@ -2963,7 +3054,16 @@
xmlns="http://docbook.org/ns/docbook"><simpara>This function has been
<emphasis>REMOVED</emphasis> in PECL uopz 5.0.0.</simpara></warning>'>
+<!-- XML snippets -->
+<!ENTITY xml.changelog.parser-param '<row xmlns="http://docbook.org/ns/docbook">
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>parser</parameter> expects an <classname>XMLParser</classname>
+ instance now; previously, a <type>resource</type> was expected.
+ </entry>
+</row>'>
+
<!-- Migration Guide snippets -->
<!ENTITY migration56.openssl.peer-verification '
<para xmlns="http://docbook.org/ns/docbook">
Modified: phpdoc/zh/trunk/reference/datetime/datetime/modify.xml
===================================================================
--- phpdoc/zh/trunk/reference/datetime/datetime/modify.xml 2020-12-01 04:47:06 UTC (rev 351810)
+++ phpdoc/zh/trunk/reference/datetime/datetime/modify.xml 2020-12-01 05:39:34 UTC (rev 351811)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 312463 Maintainer: yuanyuqiang Status: ready -->
+<!-- EN-Revision: 350655 Maintainer: yuanyuqiang Status: ready -->
<!-- Reviewed: no -->
<refentry xml:id="datetime.modify" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -15,17 +15,17 @@
<para>&style.oop;</para>
<methodsynopsis role="oop">
<modifier>public</modifier> <type>DateTime</type><methodname>DateTime::modify</methodname>
- <methodparam><type>string</type><parameter>modify</parameter></methodparam>
+ <methodparam><type>string</type><parameter>modifier</parameter></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
<methodsynopsis role="procedural">
<type>DateTime</type><methodname>date_modify</methodname>
<methodparam><type>DateTime</type><parameter>object</parameter></methodparam>
- <methodparam><type>string</type><parameter>modify</parameter></methodparam>
+ <methodparam><type>string</type><parameter>modifier</parameter></methodparam>
</methodsynopsis>
<para>
修改一个日期时间对象的值。
- 支持 <function>strtotime</function> 函数所允许的字符串。
+ 支持 <function>DateTimeImmutable::__construct</function> 函数所允许的字符串。
</para>
</refsect1>
@@ -34,7 +34,7 @@
<variablelist>
&date.datetime.description.modified;
<varlistentry>
- <term><parameter>modify</parameter></term>
+ <term><parameter>modifier</parameter></term>
<listitem>
<para>&date.formats.parameter;</para>
</listitem>
@@ -49,30 +49,6 @@
</para>
</refsect1>
- <refsect1 role="changelog">
- &reftitle.changelog;
- <informaltable>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>&Version;</entry>
- <entry>&Description;</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>5.3.6</entry>
- <entry>
- 支持绝对的日期时间作为变化量，
- 在之前的版本中，仅支持相对变化量。
- </entry>
- </row>
- &date.datetime.retval.changelog;
- </tbody>
- </tgroup>
- </informaltable>
- </refsect1>
-
<refsect1 role="examples">
&reftitle.examples;
<example>
Modified: phpdoc/zh/trunk/reference/datetime/datetime/setdate.xml
===================================================================
--- phpdoc/zh/trunk/reference/datetime/datetime/setdate.xml 2020-12-01 04:47:06 UTC (rev 351810)
+++ phpdoc/zh/trunk/reference/datetime/datetime/setdate.xml 2020-12-01 05:39:34 UTC (rev 351811)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 312463 Maintainer: yuanyuqiang Status: ready -->
+<!-- EN-Revision: 350655 Maintainer: yuanyuqiang Status: ready -->
<!-- Reviewed: no -->
<refentry xml:id="datetime.setdate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -70,23 +70,6 @@
</para>
</refsect1>
- <refsect1 role="changelog">
- &reftitle.changelog;
- <informaltable>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>&Version;</entry>
- <entry>&Description;</entry>
- </row>
- </thead>
- <tbody>
- &date.datetime.retval.changelog;
- </tbody>
- </tgroup>
- </informaltable>
- </refsect1>
-
<refsect1 role="examples">
&reftitle.examples;
<example>
Modified: phpdoc/zh/trunk/reference/datetime/datetime/setisodate.xml
===================================================================
--- phpdoc/zh/trunk/reference/datetime/datetime/setisodate.xml 2020-12-01 04:47:06 UTC (rev 351810)
+++ phpdoc/zh/trunk/reference/datetime/datetime/setisodate.xml 2020-12-01 05:39:34 UTC (rev 351811)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 312463 Maintainer: yuanyuqiang Status: ready -->
+<!-- EN-Revision: 350655 Maintainer: yuanyuqiang Status: ready -->
<!-- Reviewed: no -->
<refentry xml:id="datetime.setisodate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -17,7 +17,7 @@
<modifier>public</modifier> <type>DateTime</type><methodname>DateTime::setISODate</methodname>
<methodparam><type>int</type><parameter>year</parameter></methodparam>
<methodparam><type>int</type><parameter>week</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>day</parameter><initializer>1</initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>dayOfWeek</parameter><initializer>1</initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
<methodsynopsis role="procedural">
@@ -25,7 +25,7 @@
<methodparam><type>DateTime</type><parameter>object</parameter></methodparam>
<methodparam><type>int</type><parameter>year</parameter></methodparam>
<methodparam><type>int</type><parameter>week</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>day</parameter><initializer>1</initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>dayOfWeek</parameter><initializer>1</initializer></methodparam>
</methodsynopsis>
<para>
以 ISO 8601 规范的格式设置日期，
@@ -54,7 +54,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>day</parameter></term>
+ <term><parameter>dayOfWeek</parameter></term>
<listitem>
<para>
从周的第一天计算，日在一周内的偏移量。
@@ -71,23 +71,6 @@
</para>
</refsect1>
- <refsect1 role="changelog">
- &reftitle.changelog;
- <informaltable>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>&Version;</entry>
- <entry>&Description;</entry>
- </row>
- </thead>
- <tbody>
- &date.datetime.retval.changelog;
- </tbody>
- </tgroup>
- </informaltable>
- </refsect1>
-
<refsect1 role="examples">
&reftitle.examples;
<example>
Modified: phpdoc/zh/trunk/reference/datetime/datetime/settime.xml
===================================================================
--- phpdoc/zh/trunk/reference/datetime/datetime/settime.xml 2020-12-01 04:47:06 UTC (rev 351810)
+++ phpdoc/zh/trunk/reference/datetime/datetime/settime.xml 2020-12-01 05:39:34 UTC (rev 351811)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 342854 Maintainer: yuanyuqiang Status: ready -->
+<!-- EN-Revision: 350655 Maintainer: yuanyuqiang Status: ready -->
<!-- Reviewed: no -->
<refentry xml:id="datetime.settime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -18,7 +18,7 @@
<methodparam><type>int</type><parameter>hour</parameter></methodparam>
<methodparam><type>int</type><parameter>minute</parameter></methodparam>
<methodparam choice="opt"><type>int</type><parameter>second</parameter><initializer>0</initializer></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>microseconds</parameter><initializer>0</initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>microsecond</parameter><initializer>0</initializer></methodparam>
</methodsynopsis>
<para>&style.procedural;</para>
<methodsynopsis role="procedural">
@@ -27,7 +27,7 @@
<methodparam><type>int</type><parameter>hour</parameter></methodparam>
<methodparam><type>int</type><parameter>minute</parameter></methodparam>
<methodparam choice="opt"><type>int</type><parameter>second</parameter><initializer>0</initializer></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>microseconds</parameter><initializer>0</initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>microsecond</parameter><initializer>0</initializer></methodparam>
</methodsynopsis>
<para>
设置 DateTime 对象的时间。
@@ -63,7 +63,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>microseconds</parameter></term>
+ <term><parameter>microsecond</parameter></term>
<listitem>
<para>
微秒。
@@ -93,9 +93,8 @@
<tbody>
<row>
<entry>7.1.0</entry>
- <entry>新增 <parameter>microseconds</parameter> 参数。</entry>
+ <entry>新增 <parameter>microsecond</parameter> 参数。</entry>
</row>
- &date.datetime.retval.changelog;
</tbody>
</tgroup>
</informaltable>
Modified: phpdoc/zh/trunk/reference/datetime/datetime/settimezone.xml
===================================================================
--- phpdoc/zh/trunk/reference/datetime/datetime/settimezone.xml 2020-12-01 04:47:06 UTC (rev 351810)
+++ phpdoc/zh/trunk/reference/datetime/datetime/settimezone.xml 2020-12-01 05:39:34 UTC (rev 351811)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 332231 Maintainer: yuanyuqiang Status: ready -->
+<!-- EN-Revision: 350655 Maintainer: yuanyuqiang Status: ready -->
<!-- Reviewed: no -->
<refentry xml:id="datetime.settimezone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -51,23 +51,6 @@
</para>
</refsect1>
- <refsect1 role="changelog">
- &reftitle.changelog;
- <informaltable>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>&Version;</entry>
- <entry>&Description;</entry>
- </row>
- </thead>
- <tbody>
- &date.datetime.retval.changelog;
- </tbody>
- </tgroup>
- </informaltable>
- </refsect1>
-
<refsect1 role="examples">
&reftitle.examples;
<example>