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
28 changes: 2 additions & 26 deletions reference/filesystem/functions/dirname.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: dallas Status: ready -->
<!-- CREDITS: mowangjuanzi -->
<!-- EN-Revision: 21cd3a942724400765125b657d24f8c8c4d623e9 Maintainer: dallas Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xml:id="function.dirname" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dirname</refname>
Expand Down Expand Up @@ -96,30 +96,6 @@ dirname('C:\\'); // Will return 'C:\' on Windows and '.' on *nix systems.
</para>
</caution>
</refsect1>

<refsect1 role="changelog">
&reftitle.changelog;
<para>
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>&Version;</entry>
<entry>&Description;</entry>
</row>
</thead>
<tbody>
<row>
<entry>7.0.0</entry>
<entry>
添加可选的 <parameter>levels</parameter> 参数。
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</para>
</refsect1>

<refsect1 role="examples">
&reftitle.examples;
Expand Down
8 changes: 4 additions & 4 deletions reference/filesystem/functions/file.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: e3ae86b439c1963f0cd6d262712e2d3f7e85bc37 Maintainer: HonestQiao Status: ready -->
<!-- EN-Revision: 89b506b5b654f9eac45d9fc65bfe78ad89254c2b Maintainer: HonestQiao Status: ready -->
<!-- CREDITS: Luffy, mowangjuanzi -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.file">
<refnamediv>
Expand Down Expand Up @@ -62,7 +62,7 @@
</term>
<listitem>
<simpara>
省略数组中每个元素末尾的换行符
省略数组中每个元素末尾的换行符
</simpara>
</listitem>
</varlistentry>
Expand All @@ -72,7 +72,7 @@
</term>
<listitem>
<simpara>
跳过空行
跳过空行
</simpara>
</listitem>
</varlistentry>
Expand All @@ -82,7 +82,7 @@
</term>
<listitem>
<simpara>
不使用默认的上下文
不使用默认的上下文
</simpara>
</listitem>
</varlistentry>
Expand Down
8 changes: 7 additions & 1 deletion reference/filesystem/functions/glob.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: 5fb1bb4a70dc9cf2538d9a78f423579b805137b4 Maintainer: HonestQiao Status: ready -->
<!-- EN-Revision: bb9bfdfc5a4a8ffe27ab4edcfe0d8747a375e2f2 Maintainer: HonestQiao Status: ready -->
<!-- CREDITS: Luffy, mowangjuanzi -->
<refentry xml:id="function.glob" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
<refnamediv>
Expand Down Expand Up @@ -57,6 +57,12 @@
即匹配不在这组字符中的任意字符。
</simpara>
</listitem>
<listitem>
<simpara>
<literal>{a,b,c}</literal> - 当使用 <constant>GLOB_BRACE</constant>
标志时,匹配以逗号分隔的字符串组中的一个字符串。
</simpara>
</listitem>
<listitem>
<simpara>
<literal>\</literal> - 只要没有使用 <constant>GLOB_NOESCAPE</constant> 标记,该字符会转义后面的字符。
Expand Down
3 changes: 2 additions & 1 deletion reference/filesystem/functions/is-link.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: 7c9f1adb4b7d55a7a37b0503ec895412a6ecc656 Maintainer: HonestQiao Status: ready -->
<!-- EN-Revision: d5f735c7bcbf2ae62a875171b2ec3b9f98c28ee5 Maintainer: HonestQiao Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xml:id="function.is-link" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -81,6 +81,7 @@ if (is_link($link)) {
<member><function>is_dir</function></member>
<member><function>is_file</function></member>
<member><function>readlink</function></member>
<member><function>symlink</function></member>
</simplelist>
</para>
</refsect1>
Expand Down
5 changes: 3 additions & 2 deletions reference/filesystem/functions/symlink.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: 46a0d3708e3c428ad8fa2e1dd38e4755863dc5c2 Maintainer: HonestQiao Status: ready -->
<!-- CREDITS: mowangjuanzi -->
<!-- EN-Revision: d5f735c7bcbf2ae62a875171b2ec3b9f98c28ee5 Maintainer: HonestQiao Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xml:id="function.symlink" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>symlink</refname>
Expand Down Expand Up @@ -86,6 +86,7 @@ echo readlink($link);
&reftitle.seealso;
<para>
<simplelist>
<member><function>is_link</function></member>
<member><function>link</function></member>
<member><function>readlink</function></member>
<member><function>linkinfo</function></member>
Expand Down
4 changes: 2 additions & 2 deletions reference/filter/functions/filter-has-var.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: 6e4ac10da6c9456f413316677a29d5296bdc5fb4 Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi -->
<!-- EN-Revision: 12bc0b7e22bba24b2630951483fa1baf7f80d340 Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.filter-has-var" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down
6 changes: 3 additions & 3 deletions reference/hash/functions/hash-file.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: 539a9823a805ac29cab7fa4baf3ae3a28116a2f5 Maintainer: yuanyuqiang Status: ready -->
<!-- EN-Revision: 05b26e8d7aa7f3c6830efe4961b2c0e4b28fe450 Maintainer: yuanyuqiang Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
<refentry xml:id="function.hash-file" xmlns="http://docbook.org/ns/docbook">
Expand Down Expand Up @@ -65,8 +65,8 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
如果 <parameter>binary</parameter> 设置为 true, 则返回原始二进制数据表示的信息摘要
否则返回十六进制小写字符串格式表示的信息摘要
返回的字符串包含计算出的消息摘要,默认为小写十六进制字符串
如果 <parameter>binary</parameter> 设置为 true,则返回原始二进制表示,&return.falseforfailure;
</para>
</refsect1>

Expand Down
3 changes: 2 additions & 1 deletion reference/image/functions/imagewebp.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: 9960a09a5705102bf4dd0ce63e03d9ec716d0015 Maintainer: yuanyuqiang Status: ready -->
<!-- EN-Revision: 8f76f001f7ab39f2ecf0766b9158f05111d6c99d Maintainer: yuanyuqiang Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xml:id="function.imagewebp" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -37,6 +37,7 @@
<listitem>
<para>
<parameter>quality</parameter> 范围从 0(最低质量,最小文件体积)到 100(最好质量, 最大文件体积)。
如果设置为 <literal>-1</literal>,则使用默认值 <literal>80</literal>。
</para>
</listitem>
</varlistentry>
Expand Down
7 changes: 3 additions & 4 deletions reference/lua/lua/construct.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: d8b968e63cba67a082e6e37aee1ebe7821b41258 Maintainer: 邹松 Status: ready -->
<!-- Reviewed: no -->

<!-- EN-Revision: cf2b279980fc54b7f2602a0687652c170a906930 Maintainer: 邹松 Status: ready -->
<!-- CREDITS: Luffy -->
<refentry xml:id="lua.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>Lua::__construct</refname>
Expand All @@ -13,7 +12,7 @@
&reftitle.description;
<methodsynopsis>
<modifier>public</modifier> <methodname>Lua::__construct</methodname>
<methodparam><type>string</type><parameter>lua_script_file</parameter><initializer>NULL</initializer></methodparam>
<methodparam choice="opt"><type>string</type><parameter>lua_script_file</parameter><initializer>NULL</initializer></methodparam>
</methodsynopsis>
<para>

Expand Down
25 changes: 21 additions & 4 deletions reference/random/functions/mt-rand.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: 0b6c76516a299395a3703e6df44f8ea4cb4549a8 Maintainer: HonestQiao Status: ready -->
<!-- EN-Revision: 0a5e7b12546b62a611a0cbc7105e617ab96fbcbd Maintainer: HonestQiao Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xml:id="function.mt-rand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
Expand Down Expand Up @@ -60,11 +60,21 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
返回 <parameter>min</parameter>(或者 0)到 <parameter>max</parameter>(或者是到
<function>mt_getrandmax</function>,包含这个值)之间的随机整数,如果
<parameter>max</parameter> 小于 <parameter>min</parameter> 则返回 &false;。
返回的随机整数值介于 <parameter>min</parameter>(或 0)和
<parameter>max</parameter>(或 <function>mt_getrandmax</function>,包括两端)。
</para>
</refsect1>
<refsect1 role="errors">
&reftitle.errors;
<itemizedlist>
<listitem>
<simpara>
如果 <parameter>max</parameter> 小于 <parameter>min</parameter>,则会抛出
<classname>ValueError</classname> 异常。
</simpara>
</listitem>
</itemizedlist>
</refsect1>
<refsect1 role="changelog">
&reftitle.changelog;
<para>
Expand All @@ -77,6 +87,13 @@
</row>
</thead>
<tbody>
<row>
<entry>8.0.0</entry>
<entry>
如果 <parameter>max</parameter> 小于 <parameter>min</parameter>,则会抛出
<classname>ValueError</classname> 异常。之前会抛出 <constant>E_WARNING</constant> 错误,并且函数返回 &false;。
</entry>
</row>
<row>
<entry>7.2.0</entry>
<entry>
Expand Down
6 changes: 3 additions & 3 deletions reference/random/functions/rand.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: 826073522514072830b63bee2b6135dc675ea45d Maintainer: HonestQiao Status: ready -->
<!-- EN-Revision: bf672f5f2402ee78264a130c52defeed37fe44bf Maintainer: HonestQiao Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xml:id="function.rand" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -28,8 +28,8 @@
&caution.cryptographically-insecure;
<note>
<simpara>
在某些平台下(例如 Windows)<function>getrandmax</function>
只有 32767。如果需要的范围大于 32767,那么指定 <parameter>min</parameter>
在 PHP 7.1.0 之前,<function>getrandmax</function>
在某些平台(如 Windows)上仅为 32767。如果需要的范围大于 32767,那么指定 <parameter>min</parameter>
和 <parameter>max</parameter> 参数就可以生成更大的数了,或者考虑用
<function>mt_rand</function> 来替代之。
</simpara>
Expand Down
4 changes: 2 additions & 2 deletions reference/strings/book.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 523a0692f739594aaea8aa3f226f0f4e78b5ae67 Maintainer: daijie Status: ready -->
<!-- EN-Revision: 45042fef652f1b4e904e809fcbfcf31f6c60670b Maintainer: daijie Status: ready -->
<!-- CREDITS: Luffy -->
<book xml:id="book.strings" xmlns="http://docbook.org/ns/docbook">
<book xml:id="book.strings" xmlns="http://docbook.org/ns/docbook" annotations="interactive">
<?phpdoc extension-membership="core" ?>
<title>字符串</title>

Expand Down