Sync strings and xml functions

reference/strings/functions/levenshtein.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: a484d5d2bbad7e385a8864370b5280c4e05add8c Maintainer: daijie Status: ready -->
-<!-- CREDITS: mowangjuanzi -->
+<!-- EN-Revision: 873f4a3d5027bd1b584f1d1e590e22cd4a08ae84 Maintainer: daijie Status: ready -->
+<!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.levenshtein" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>levenshtein</refname>
   <refpurpose>计算两个字符串之间的 Levenshtein 距离</refpurpose>
  </refnamediv>
- 
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -78,7 +78,7 @@
    </variablelist>
   </para>
  </refsect1>
- 
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>

reference/strings/functions/similar-text.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: e095023e408c8cb6378ae16bb6870343a3946919 Maintainer: daijie Status: ready -->
-<!-- CREDITS: mowangjuanzi -->
+<!-- EN-Revision: 873f4a3d5027bd1b584f1d1e590e22cd4a08ae84 Maintainer: daijie Status: ready -->
+<!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.similar-text" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>similar_text</refname>
   <refpurpose>计算两个字符串的相似度</refpurpose>
  </refnamediv>
- 
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -104,6 +104,7 @@ similarity: 3 (42.857142857143 %)
   <para>
    <simplelist>
     <member><function>levenshtein</function></member>
+    <member><function>metaphone</function></member>
     <member><function>soundex</function></member>
    </simplelist>
   </para>

reference/strings/functions/strcmp.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9b68bf2b63200534e022bc65e800cae6c75abf26 Maintainer: daijie Status: ready -->
+<!-- EN-Revision: 873f4a3d5027bd1b584f1d1e590e22cd4a08ae84 Maintainer: daijie Status: ready -->
 <!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.strcmp">
  <refnamediv>
   <refname>strcmp</refname>
   <refpurpose>二进制安全字符串比较</refpurpose>
  </refnamediv>
- 
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -17,6 +17,11 @@
   </methodsynopsis>
   <simpara>
    注意该比较区分大小写。
+   对于不区分大小写的比较，请参见 <function>strcasecmp</function>。
+  </simpara>
+  <simpara>
+   注意该比较不支持区域设置。如需支持区域设置的比较，请参见
+   <function>strcoll</function> 或 <methodname>Collator::compare</methodname>
   </simpara>
  </refsect1>
 
@@ -85,18 +90,38 @@ if (strcmp($var1, $var2) !== 0) {
    </example>   
   </para>
  </refsect1>
- 
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
-   <simplelist>
-    <member><function>strcasecmp</function></member>
-    <member><function>preg_match</function></member>
-    <member><function>substr_compare</function></member>
-    <member><function>strncmp</function></member>
-    <member><function>strstr</function></member>
-    <member><function>substr</function></member>
-   </simplelist>
+   <itemizedlist>
+    <listitem>
+     <simpara>完整字符串比较</simpara>
+     <simplelist>
+      <member><function>strcasecmp</function></member>
+      <member><methodname>Collator::compare</methodname></member>
+      <member><function>strcoll</function></member>
+     </simplelist>
+    </listitem>
+    <listitem>
+     <simpara>部分字符串比较</simpara>
+     <simplelist>
+      <member><function>substr_compare</function></member>
+      <member><function>strncmp</function></member>
+      <member><function>strstr</function></member>
+     </simplelist>
+    </listitem>
+    <listitem>
+     <simpara>相似/其他字符串比较</simpara>
+     <simplelist>
+      <member><function>preg_match</function></member>
+      <member><function>levenshtein</function></member>
+      <member><function>metaphone</function></member>
+      <member><function>similar_text</function></member>
+      <member><function>soundex</function></member>
+     </simplelist>
+    </listitem>
+   </itemizedlist>
   </para>
  </refsect1>
 

reference/strings/functions/stripos.xml

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

reference/strings/functions/substr.xml

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

reference/xml/examples.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 802374deda550dfb866348d41a019315cb1f9840 Maintainer: Luffy Status: ready -->
+<!-- EN-Revision: 00a8ae0c879a70f4bc96a707212482f0fcbd9ac6 Maintainer: Luffy Status: ready -->
 <chapter xml:id="xml.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.examples;
  <section xml:id="example.xml-structure">
@@ -45,7 +45,6 @@ while ($data = fread($fp, 4096)) {
                     xml_get_current_line_number($xml_parser)));
     }
 }
-xml_parser_free($xml_parser);
 ?>
 ]]>
     </programlisting>
@@ -110,7 +109,6 @@ while ($data = fread($fp, 4096)) {
                     xml_get_current_line_number($xml_parser)));
     }
 }
-xml_parser_free($xml_parser);
 ?>
 ]]>
     </programlisting>
@@ -208,11 +206,9 @@ function externalEntityRefHandler($parser, $openEntityNames, $base, $systemId,
                 printf("XML error: %s at line %d while parsing entity %s\n",
                        xml_error_string(xml_get_error_code($parser)),
                        xml_get_current_line_number($parser), $openEntityNames);
-                xml_parser_free($parser);
                 return false;
             }
         }
-        xml_parser_free($parser);
         return true;
     }
     return false;
@@ -254,7 +250,6 @@ while ($data = fread($fp, 4096)) {
 }
 echo "</pre>";
 echo "parse complete\n";
-xml_parser_free($xml_parser);
 
 ?>
 ]]>
@@ -419,4 +414,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
 vim: et tw=78 syn=sgml
 vi: ts=1 sw=1
 -->
-

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 18aa2012f6fa1e5b09733147e02911d16e06d4a1 Maintainer: class007 Status: ready -->
+<!-- EN-Revision: 00a8ae0c879a70f4bc96a707212482f0fcbd9ac6 Maintainer: class007 Status: ready -->
 <!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.xml-parse-into-struct" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -99,7 +99,6 @@
 $simple = "<para><note>simple note</note></para>";
 $p = xml_parser_create();
 xml_parse_into_struct($p, $simple, $vals, $index);
-xml_parser_free($p);
 echo "Index array\n";
 print_r($index);
 echo "\nVals array\n";
@@ -215,7 +214,7 @@ function readDatabase($filename)
     xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
     xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
     xml_parse_into_struct($parser, $data, $values, $tags);
-    xml_parser_free($parser);
+    unset($parser);
 
     // loop through the structures
     foreach ($tags as $key=>$val) {

reference/xml/functions/xml-parse.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: c1f37a6c270aadbbb3da56a3973ffd62197adf2b Maintainer: HonestQiao Status: ready -->
+<!-- EN-Revision: 00a8ae0c879a70f4bc96a707212482f0fcbd9ac6 Maintainer: HonestQiao Status: ready -->
 <!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.xml-parse" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -109,7 +109,6 @@ while (($data = fread($stream, 16384))) {
     xml_parse($parser, $data); // parse the current chunk
 }
 xml_parse($parser, '', true); // finalize parsing
-xml_parser_free($parser);
 fclose($stream);
 ]]>
    </programlisting>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: f9c4a68ef4f89e51e6d9b905ad3ddb6492386dd3 Maintainer: class007 Status: ready -->
-<!-- CREDITS: mowangjuanzi -->
+<!-- EN-Revision: 00a8ae0c879a70f4bc96a707212482f0fcbd9ac6 Maintainer: class007 Status: ready -->
+<!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.xml-parser-create-ns" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>xml_parser_create_ns</refname>
@@ -85,7 +85,6 @@
   <para>
    <simplelist>
     <member><function>xml_parser_create</function></member>
-    <member><function>xml_parser_free</function></member>
    </simplelist>
   </para>
  </refsect1>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 8cdc6621f9826d04abc3e50438c010804d7e8683 Maintainer: class007 Status: ready -->
-<!-- CREDITS: mowangjuanzi -->
+<!-- EN-Revision: 00a8ae0c879a70f4bc96a707212482f0fcbd9ac6 Maintainer: class007 Status: ready -->
+<!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.xml-parser-create" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>xml_parser_create</refname>
@@ -76,7 +76,6 @@
   <para>
    <simplelist>
     <member><function>xml_parser_create_ns</function></member>
-    <member><function>xml_parser_free</function></member>
    </simplelist>
   </para>
  </refsect1>

reference/xml/functions/xml-parser-free.xml

@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 239683eb0b1d6163da56a604d3ae1ecac0373bdd Maintainer: Gregory Status: ready -->
+<!-- EN-Revision: 00a8ae0c879a70f4bc96a707212482f0fcbd9ac6 Maintainer: Gregory Status: ready -->
 <!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.xml-parser-free" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>xml_parser_free</refname>
   <refpurpose>释放 XML 解析器</refpurpose>
  </refnamediv>
 
+ <refsynopsisdiv>
+  &warn.deprecated.function-8-5-0;
+ </refsynopsisdiv>
+
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
+   <modifier role="attribute">#[\Deprecated]</modifier>
    <type>bool</type><methodname>xml_parser_free</methodname>
    <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
   </methodsynopsis>