Skip to content

Commit e51eb6f

Browse files
sy-recordssy-records
authored
Sync strings and xml functions (#996)
1 parent 0beea4f commit e51eb6f

File tree

11 files changed

+62
-41
lines changed

11 files changed

+62
-41
lines changed

‎reference/strings/functions/levenshtein.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: a484d5d2bbad7e385a8864370b5280c4e05add8c Maintainer: daijie Status: ready -->
4-
<!-- CREDITS: mowangjuanzi -->
3+
<!-- EN-Revision: 873f4a3d5027bd1b584f1d1e590e22cd4a08ae84 Maintainer: daijie Status: ready -->
4+
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.levenshtein" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
<refnamediv>
77
<refname>levenshtein</refname>
88
<refpurpose>计算两个字符串之间的 Levenshtein 距离</refpurpose>
99
</refnamediv>
10-
10+
1111
<refsect1 role="description">
1212
&reftitle.description;
1313
<methodsynopsis>
@@ -78,7 +78,7 @@
7878
</variablelist>
7979
</para>
8080
</refsect1>
81-
81+
8282
<refsect1 role="returnvalues">
8383
&reftitle.returnvalues;
8484
<para>

‎reference/strings/functions/similar-text.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: e095023e408c8cb6378ae16bb6870343a3946919 Maintainer: daijie Status: ready -->
4-
<!-- CREDITS: mowangjuanzi -->
3+
<!-- EN-Revision: 873f4a3d5027bd1b584f1d1e590e22cd4a08ae84 Maintainer: daijie Status: ready -->
4+
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.similar-text" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
77
<refname>similar_text</refname>
88
<refpurpose>计算两个字符串的相似度</refpurpose>
99
</refnamediv>
10-
10+
1111
<refsect1 role="description">
1212
&reftitle.description;
1313
<methodsynopsis>
@@ -104,6 +104,7 @@ similarity: 3 (42.857142857143 %)
104104
<para>
105105
<simplelist>
106106
<member><function>levenshtein</function></member>
107+
<member><function>metaphone</function></member>
107108
<member><function>soundex</function></member>
108109
</simplelist>
109110
</para>

‎reference/strings/functions/strcmp.xml‎

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 9b68bf2b63200534e022bc65e800cae6c75abf26 Maintainer: daijie Status: ready -->
3+
<!-- EN-Revision: 873f4a3d5027bd1b584f1d1e590e22cd4a08ae84 Maintainer: daijie Status: ready -->
44
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.strcmp">
66
<refnamediv>
77
<refname>strcmp</refname>
88
<refpurpose>二进制安全字符串比较</refpurpose>
99
</refnamediv>
10-
10+
1111
<refsect1 role="description">
1212
&reftitle.description;
1313
<methodsynopsis>
@@ -17,6 +17,11 @@
1717
</methodsynopsis>
1818
<simpara>
1919
注意该比较区分大小写。
20+
对于不区分大小写的比较，请参见 <function>strcasecmp</function>。
21+
</simpara>
22+
<simpara>
23+
注意该比较不支持区域设置。如需支持区域设置的比较，请参见
24+
<function>strcoll</function> 或 <methodname>Collator::compare</methodname>
2025
</simpara>
2126
</refsect1>
2227

@@ -85,18 +90,38 @@ if (strcmp($var1, $var2) !== 0) {
8590
</example>
8691
</para>
8792
</refsect1>
88-
93+
8994
<refsect1 role="seealso">
9095
&reftitle.seealso;
9196
<para>
92-
<simplelist>
93-
<member><function>strcasecmp</function></member>
94-
<member><function>preg_match</function></member>
95-
<member><function>substr_compare</function></member>
96-
<member><function>strncmp</function></member>
97-
<member><function>strstr</function></member>
98-
<member><function>substr</function></member>
99-
</simplelist>
97+
<itemizedlist>
98+
<listitem>
99+
<simpara>完整字符串比较</simpara>
100+
<simplelist>
101+
<member><function>strcasecmp</function></member>
102+
<member><methodname>Collator::compare</methodname></member>
103+
<member><function>strcoll</function></member>
104+
</simplelist>
105+
</listitem>
106+
<listitem>
107+
<simpara>部分字符串比较</simpara>
108+
<simplelist>
109+
<member><function>substr_compare</function></member>
110+
<member><function>strncmp</function></member>
111+
<member><function>strstr</function></member>
112+
</simplelist>
113+
</listitem>
114+
<listitem>
115+
<simpara>相似/其他字符串比较</simpara>
116+
<simplelist>
117+
<member><function>preg_match</function></member>
118+
<member><function>levenshtein</function></member>
119+
<member><function>metaphone</function></member>
120+
<member><function>similar_text</function></member>
121+
<member><function>soundex</function></member>
122+
</simplelist>
123+
</listitem>
124+
</itemizedlist>
100125
</para>
101126
</refsect1>
102127

‎reference/strings/functions/stripos.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 45042fef652f1b4e904e809fcbfcf31f6c60670b Maintainer: daijie Status: ready -->
3+
<!-- EN-Revision: 004fb3136a8ed6dd1065e0eca256d1e4edafcb2c Maintainer: daijie Status: ready -->
44
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.stripos" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -125,7 +125,7 @@ if ($pos1 === false) {
125125
echo "The string '$findme' was not found in the string '$mystring1'", PHP_EOL;
126126
}
127127
128-
// 注意这里使用的是 ===。简单的 == 不能像我们期望的那样工作，
128+
// 注意这里使用的是 !==。简单的 != 不能像我们期望的那样工作，
129129
// 因为 'a' 的位置是 0（第一个字符）。
130130
if ($pos2 !== false) {
131131
echo "We found '$findme' in '$mystring2' at position $pos2", PHP_EOL;

‎reference/strings/functions/substr.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 45042fef652f1b4e904e809fcbfcf31f6c60670b Maintainer: HonestQiao Status: ready -->
3+
<!-- EN-Revision: 71166b721ba6bb7dd3110da86efa3b723e1f7651 Maintainer: HonestQiao Status: ready -->
44
<!-- CREDITS: Luffy, mowangjuanzi -->
55
<refentry xml:id="function.substr" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -68,7 +68,7 @@ echo substr("abcdef", -3, 1), PHP_EOL; // 返回 "d"
6868
如果提供了正数的 <parameter>length</parameter>，返回的字符串将从 <parameter>offset</parameter> 处开始最多包括 <parameter>length</parameter> 个字符（取决于 <parameter>string</parameter> 的长度）。
6969
</para>
7070
<para>
71-
如果提供了负数的 <parameter>length</parameter>，那么 <parameter>string</parameter> 末尾处的 <parameter>length</parameter> 个字符将会被省略（若 <parameter>offset</parameter> 是负数则从字符串尾部算起）。如果 <parameter>offset</parameter> 不在这段文本中，那么将返回空字符串。
71+
如果提供了负数的 <parameter>length</parameter>，那么 <parameter>string</parameter> 末尾处的 <parameter>length</parameter> 个字符将会被省略。如果 <parameter>offset</parameter> 不在这段文本中，那么将返回空字符串。
7272
</para>
7373
<para>
7474
如果提供了值为 <literal>0</literal> 的 <parameter>length</parameter>，那么将返回一个空字符串。

‎reference/xml/examples.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 802374deda550dfb866348d41a019315cb1f9840 Maintainer: Luffy Status: ready -->
3+
<!-- EN-Revision: 00a8ae0c879a70f4bc96a707212482f0fcbd9ac6 Maintainer: Luffy Status: ready -->
44
<chapter xml:id="xml.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
55
&reftitle.examples;
66
<section xml:id="example.xml-structure">
@@ -45,7 +45,6 @@ while ($data = fread($fp, 4096)) {
4545
xml_get_current_line_number($xml_parser)));
4646
}
4747
}
48-
xml_parser_free($xml_parser);
4948
?>
5049
]]>
5150
</programlisting>
@@ -110,7 +109,6 @@ while ($data = fread($fp, 4096)) {
110109
xml_get_current_line_number($xml_parser)));
111110
}
112111
}
113-
xml_parser_free($xml_parser);
114112
?>
115113
]]>
116114
</programlisting>
@@ -208,11 +206,9 @@ function externalEntityRefHandler($parser, $openEntityNames, $base, $systemId,
208206
printf("XML error: %s at line %d while parsing entity %s\n",
209207
xml_error_string(xml_get_error_code($parser)),
210208
xml_get_current_line_number($parser), $openEntityNames);
211-
xml_parser_free($parser);
212209
return false;
213210
}
214211
}
215-
xml_parser_free($parser);
216212
return true;
217213
}
218214
return false;
@@ -254,7 +250,6 @@ while ($data = fread($fp, 4096)) {
254250
}
255251
echo "</pre>";
256252
echo "parse complete\n";
257-
xml_parser_free($xml_parser);
258253
259254
?>
260255
]]>
@@ -419,4 +414,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
419414
vim: et tw=78 syn=sgml
420415
vi: ts=1 sw=1
421416
-->
422-

‎reference/xml/functions/xml-parse-into-struct.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 18aa2012f6fa1e5b09733147e02911d16e06d4a1 Maintainer: class007 Status: ready -->
3+
<!-- EN-Revision: 00a8ae0c879a70f4bc96a707212482f0fcbd9ac6 Maintainer: class007 Status: ready -->
44
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.xml-parse-into-struct" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -99,7 +99,6 @@
9999
$simple = "<para><note>simple note</note></para>";
100100
$p = xml_parser_create();
101101
xml_parse_into_struct($p, $simple, $vals, $index);
102-
xml_parser_free($p);
103102
echo "Index array\n";
104103
print_r($index);
105104
echo "\nVals array\n";
@@ -215,7 +214,7 @@ function readDatabase($filename)
215214
xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
216215
xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
217216
xml_parse_into_struct($parser, $data, $values, $tags);
218-
xml_parser_free($parser);
217+
unset($parser);
219218
220219
// loop through the structures
221220
foreach ($tags as $key=>$val) {

‎reference/xml/functions/xml-parse.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: c1f37a6c270aadbbb3da56a3973ffd62197adf2b Maintainer: HonestQiao Status: ready -->
3+
<!-- EN-Revision: 00a8ae0c879a70f4bc96a707212482f0fcbd9ac6 Maintainer: HonestQiao Status: ready -->
44
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.xml-parse" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -109,7 +109,6 @@ while (($data = fread($stream, 16384))) {
109109
xml_parse($parser, $data); // parse the current chunk
110110
}
111111
xml_parse($parser, '', true); // finalize parsing
112-
xml_parser_free($parser);
113112
fclose($stream);
114113
]]>
115114
</programlisting>

‎reference/xml/functions/xml-parser-create-ns.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: f9c4a68ef4f89e51e6d9b905ad3ddb6492386dd3 Maintainer: class007 Status: ready -->
4-
<!-- CREDITS: mowangjuanzi -->
3+
<!-- EN-Revision: 00a8ae0c879a70f4bc96a707212482f0fcbd9ac6 Maintainer: class007 Status: ready -->
4+
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.xml-parser-create-ns" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
77
<refname>xml_parser_create_ns</refname>
@@ -85,7 +85,6 @@
8585
<para>
8686
<simplelist>
8787
<member><function>xml_parser_create</function></member>
88-
<member><function>xml_parser_free</function></member>
8988
</simplelist>
9089
</para>
9190
</refsect1>

‎reference/xml/functions/xml-parser-create.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 8cdc6621f9826d04abc3e50438c010804d7e8683 Maintainer: class007 Status: ready -->
4-
<!-- CREDITS: mowangjuanzi -->
3+
<!-- EN-Revision: 00a8ae0c879a70f4bc96a707212482f0fcbd9ac6 Maintainer: class007 Status: ready -->
4+
<!-- CREDITS: mowangjuanzi, Luffy -->
55
<refentry xml:id="function.xml-parser-create" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
77
<refname>xml_parser_create</refname>
@@ -76,7 +76,6 @@
7676
<para>
7777
<simplelist>
7878
<member><function>xml_parser_create_ns</function></member>
79-
<member><function>xml_parser_free</function></member>
8079
</simplelist>
8180
</para>
8281
</refsect1>

0 commit comments

Comments
 (0)