Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion appendices/migration85/incompatible.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: 87d781c7710702181b0d0669cf2c4d0f5c9d3037 Maintainer: mowangjuanzi Status: ready -->
<!-- EN-Revision: ec01a42be50e84f192c0b19fc6e9cf40a0f7ac31 Maintainer: mowangjuanzi Status: ready -->
<!-- CREDITS: Luffy -->
<sect1 xml:id="migration85.incompatible" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>不向后兼容的变更</title>

Expand Down Expand Up @@ -375,6 +376,11 @@
<exceptionname>TypeError</exceptionname>。
</simpara>

<simpara>
将整数 <literal>0</literal> 作为 <parameter>locales</parameter> 参数传递给
<function>setlocale</function> 不再受支持,现会抛出 <exceptionname>TypeError</exceptionname>。
</simpara>

</sect2>

<sect2 xml:id="migration85.incompatible.simplexml">
Expand Down
5 changes: 2 additions & 3 deletions language-snippets.ent
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 9a8c593c09cf7d84085989e42f3b2b23536279db Maintainer: Gregory Status: ready -->
<!-- EN-Revision: 6860e0623be035595330d876de43ef07c74399b5 Maintainer: Gregory Status: ready -->
<!-- CREDITS: dallas, mowangjuanzi, Luffy -->
<!-- 请保持此文件与英文文件中相应的每个 ENTITY 行号一一对应以便于对照,修改与更新! -->

Expand Down Expand Up @@ -1951,8 +1951,7 @@ It is strongly recommended to avoid timezone abbreviations.
</entry>
</row>'>

<!ENTITY odbc.changelog.connection-return '&odbc.changelog.connection-param;
<row xmlns="http://docbook.org/ns/docbook">
<!ENTITY odbc.changelog.connection-return '<row xmlns="http://docbook.org/ns/docbook">
<entry>8.4.0</entry>
<entry>
此函数现在返回 <classname>Odbc\Connection</classname> 实例;之前返回
Expand Down
8 changes: 4 additions & 4 deletions reference/datetime/constants.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 130701dd4e64351d38da565ab3043a8f795698f8 Maintainer: yuanyuqiang Status: ready -->
<!-- CREDITS: mowangjuanzi -->
<!-- EN-Revision: 6bbb5b9685d27ac9df744702e06525047a163d4b Maintainer: yuanyuqiang Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<appendix xml:id="datetime.constants" xmlns="http://docbook.org/ns/docbook">
&reftitle.constants;
<para>
Expand Down Expand Up @@ -66,7 +66,7 @@
</term>
<listitem>
<simpara>
Atom(示例:<literal>2005-08-15T15:52:01+00:00</literal>)
Atom(示例:<literal>2005-08-15T15:52:01+00:00</literal>);兼容 ISO-8601、RFC 3339 和 XML Schema
</simpara>
</listitem>
</varlistentry>
Expand All @@ -90,7 +90,7 @@
</term>
<listitem>
<simpara>
ISO-8601(示例:<literal>2005-08-15T15:52:01+0000</literal>)
类似 ISO-8601 格式(示例:<literal>2005-08-15T15:52:01+0000</literal>)
</simpara>
<note>
<simpara>
Expand Down
72 changes: 36 additions & 36 deletions reference/datetime/datetimeinterface.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 130701dd4e64351d38da565ab3043a8f795698f8 Maintainer: daijie Status: ready -->
<!-- EN-Revision: 6bbb5b9685d27ac9df744702e06525047a163d4b Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<reference xml:id="class.datetimeinterface" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">

Expand Down Expand Up @@ -155,7 +155,7 @@
<term><constant>DATE_ATOM</constant></term>
<listitem>
<simpara>
Atom 格式(示例:2005-08-15T15:52:01+00:00)
Atom 格式(示例:2005-08-15T15:52:01+00:00);兼容 ISO-8601、RFC 3339 和 XML Schema
</simpara>
</listitem>
</varlistentry>
Expand All @@ -181,7 +181,7 @@
<term><constant>DATE_ISO8601</constant></term>
<listitem>
<simpara>
ISO-8601 格式(示例:2005-08-15T15:52:01+0000)
类似 ISO-8601 格式(示例:2005-08-15T15:52:01+0000)
</simpara>
<note>
<simpara>
Expand Down Expand Up @@ -349,39 +349,39 @@
</section>
<!-- }}} -->

<section role="changelog" xml:id="datetimeinterface.changelog"><!-- {{{ -->
&reftitle.changelog;
<para>
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>&Version;</entry>
<entry>&Description;</entry>
</row>
</thead>
<tbody>
<row>
<entry>8.4.0</entry>
<entry>类常量现已类型化。</entry>
</row>
<row>
<entry>8.2.0</entry>
<entry>
新增常量 <constant linkend="datetimeinterface.constants.iso8601-expanded">DateTimeInterface::ISO8601_EXPANDED</constant>。
</entry>
</row>
<row>
<entry>7.2.0</entry>
<entry>
<classname>DateTime</classname> 的类常量现在定义在了 <classname>DateTimeInterface</classname> 上。
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</para>
</section><!-- }}} -->
<section role="changelog" xml:id="datetimeinterface.changelog"><!-- {{{ -->
&reftitle.changelog;
<para>
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>&Version;</entry>
<entry>&Description;</entry>
</row>
</thead>
<tbody>
<row>
<entry>8.4.0</entry>
<entry>类常量现已类型化。</entry>
</row>
<row>
<entry>8.2.0</entry>
<entry>
新增常量 <constant linkend="datetimeinterface.constants.iso8601-expanded">DateTimeInterface::ISO8601_EXPANDED</constant>。
</entry>
</row>
<row>
<entry>7.2.0</entry>
<entry>
<classname>DateTime</classname> 的类常量现在定义在了 <classname>DateTimeInterface</classname> 上。
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</para>
</section><!-- }}} -->

</partintro>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 3c36a56c9e6875fbe3295827a15747d6eae9572e Maintainer: mowangjuanzi Status: ready -->
<!-- EN-Revision: 5a33c90d38ae2ef33b8096b7356faf7013847ee4 Maintainer: mowangjuanzi Status: ready -->
<refentry xml:id="function.opcache-is-script-cached-in-file-cache" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>opcache_is_script_cached_in_file_cache</refname>
Expand Down