svn: /phpdoc/ja/trunk/reference/array/functions/ array-change-key-case.xml array-chunk.xml array-column.xml array-fill.xml array-filter.xml array-key-exists.xml array-key-first.xml array-key-last.xml array-map.xml array-pad.xml array-rand.xml array-replace-recursive.xml array-replace.xml array-search.xml array-slice.xml array-splice.xml array-unique.xml arsort.xml asort.xml compact.xml count.xml current.xml end.xml extract.xml key.xml krsort.xml ksort.xml next.xml prev.xml range.xml reset.xml rs

Modified: phpdoc/ja/trunk/reference/array/functions/array-change-key-case.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-change-key-case.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-change-key-case.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 331477 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="function.array-change-key-case" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -13,7 +13,7 @@
   <methodsynopsis>
    <type>array</type><methodname>array_change_key_case</methodname>
    <methodparam><type>array</type><parameter>array</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>case</parameter><initializer>CASE_LOWER</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>case</parameter><initializer><constant>CASE_LOWER</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    <parameter>array</parameter> のすべてのキーを小文字あるいは大文字にした配列を返します。
@@ -103,7 +103,6 @@
   </note>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-chunk.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-chunk.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-chunk.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 343899 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,shimooka -->
 <refentry xml:id="function.array-chunk" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -13,12 +13,12 @@
   <methodsynopsis>
    <type>array</type><methodname>array_chunk</methodname>
    <methodparam><type>array</type><parameter>array</parameter></methodparam>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
+   <methodparam><type>int</type><parameter>length</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>preserve_keys</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
-   配列を、要素数が <parameter>size</parameter> の配列に分割します。
-   最後の部分の要素数は <parameter>size</parameter> より小さくなることもあります。
+   配列を、要素数が <parameter>length</parameter> の配列に分割します。
+   最後の部分の要素数は <parameter>length</parameter> より小さくなることもあります。
   </para>
  </refsect1>

@@ -37,7 +37,7 @@
     </varlistentry>

     <varlistentry>
-     <term><parameter>size</parameter></term>
+     <term><parameter>length</parameter></term>
      <listitem>
       <para>
        各部分のサイズ。
@@ -63,7 +63,7 @@
   &reftitle.returnvalues;
   <para>
    数値添字の多次元配列を返します。添え字はゼロから始まり、
-   各次元の要素数が <parameter>size</parameter> となります。
+   各次元の要素数が <parameter>length</parameter> となります。
   </para>
  </refsect1>

@@ -70,7 +70,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <parameter>size</parameter> が 1 より小さい場合は
+   <parameter>length</parameter> が 1 より小さい場合は
    <constant>E_WARNING</constant> が発生し、&null; を返します。
   </para>
  </refsect1>
@@ -148,7 +148,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-column.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-column.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-column.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 346011 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: takagi Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="function.array-column" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,13 +11,13 @@
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>array_column</methodname>
-   <methodparam><type>array</type><parameter>input</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>column_key</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>index_key</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam><type>array</type><parameter>array</parameter></methodparam>
+   <methodparam><type class="union"><type>int</type><type>string</type><type>null</type></type><parameter>column_key</parameter></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>string</type><type>null</type></type><parameter>index_key</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>array_column</function> は、
-   配列 <parameter>input</parameter> の中から
+   配列 <parameter>array</parameter> の中から
    <parameter>column_key</parameter> で指定した単一のカラムの値を返します。
    オプションで <parameter>index_key</parameter> も指定できます。
    これを指定すると、
@@ -30,7 +30,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>input</parameter></term>
+     <term><parameter>array</parameter></term>
      <listitem>
       <para>
        値を取り出したい多次元配列 (あるいはオブジェクトの配列)。
@@ -89,7 +89,7 @@
       <row>
        <entry>7.0.0</entry>
        <entry>
-        <parameter>input</parameter> にオブジェクトの配列を渡せるようになりました。
+        <parameter>array</parameter> にオブジェクトの配列を渡せるようになりました。
        </entry>
       </row>
      </tbody>
@@ -287,7 +287,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-fill.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-fill.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-fill.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 335201 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <refentry xml:id="function.array-fill" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>array_fill</refname>
@@ -12,12 +12,12 @@
   <methodsynopsis>
    <type>array</type><methodname>array_fill</methodname>
    <methodparam><type>int</type><parameter>start_index</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num</parameter></methodparam>
+   <methodparam><type>int</type><parameter>count</parameter></methodparam>
    <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
    パラメータ <parameter>value</parameter> を値とする
-   <parameter>num</parameter> 個のエントリからなる配列を埋めます。
+   <parameter>count</parameter> 個のエントリからなる配列を埋めます。
    この際、キーは、<parameter>start_index</parameter>
    パラメータから開始します。
   </para>
@@ -45,7 +45,7 @@
     </varlistentry>

     <varlistentry>
-     <term><parameter>num</parameter></term>
+     <term><parameter>count</parameter></term>
      <listitem>
       <para>
        挿入する要素数。
@@ -77,7 +77,7 @@
  <refsect1 role="errors">
   &reftitle.errors;
   <para>
-   <parameter>num</parameter> がゼロより小さい場合に
+   <parameter>count</parameter> がゼロより小さい場合に
    <constant>E_WARNING</constant> が発生します。
   </para>
  </refsect1>
@@ -97,8 +97,8 @@
       <row>
        <entry>5.6.0</entry>
        <entry>
-        <parameter>num</parameter> にゼロを指定できるようになりました。これより前のバージョンでは、
-        <parameter>num</parameter> には正の数しか指定できませんでした。
+        <parameter>count</parameter> にゼロを指定できるようになりました。これより前のバージョンでは、
+        <parameter>count</parameter> には正の数しか指定できませんでした。
        </entry>
       </row>
      </tbody>
@@ -168,7 +168,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-filter.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-filter.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-filter.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350489 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,shimooka,mumumu -->
 <refentry xml:id="function.array-filter" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -15,8 +15,8 @@
   <methodsynopsis>
    <type>array</type><methodname>array_filter</methodname>
    <methodparam><type>array</type><parameter>array</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flag</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>callable</type><type>null</type></type><parameter>callback</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    <parameter>callback</parameter>
@@ -61,7 +61,7 @@
     </varlistentry>

     <varlistentry>
-     <term><parameter>flag</parameter></term>
+     <term><parameter>mode</parameter></term>
      <listitem>
       <para>
        引数として、何を <parameter>callback</parameter> に送るのかを決めるフラグ。
@@ -103,9 +103,15 @@
     </thead>
     <tbody>
      <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>callback</parameter> は、nullable になりました。
+      </entry>
+     </row>
+     <row>
       <entry>5.6.0</entry>
       <entry>
-       オプションのパラメータ <parameter>flag</parameter> と、定数
+       オプションのパラメータ <parameter>mode</parameter> と、定数
        <constant>ARRAY_FILTER_USE_KEY</constant> および
        <constant>ARRAY_FILTER_USE_BOTH</constant> が追加されました。
       </entry>
@@ -208,7 +214,7 @@
    </example>
    <example>
     <title><function>array_filter</function> で
-    <parameter>flag</parameter> を使う例</title>
+    <parameter>mode</parameter> を使う例</title>
     <programlisting role="php">
 <![CDATA[
 <?php
@@ -267,7 +273,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-key-exists.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-key-exists.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-key-exists.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 340435 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="function.array-key-exists" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>array_key_exists</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>key</parameter></methodparam>
    <methodparam><type>array</type><parameter>array</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -128,7 +128,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-key-first.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-key-first.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-key-first.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 347396 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: mumumu Status: ready -->

 <refentry xml:id="function.array-key-first" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -11,7 +11,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>mixed</type><methodname>array_key_first</methodname>
+   <type class="union"><type>int</type><type>string</type><type>null</type></type><methodname>array_key_first</methodname>
    <methodparam><type>array</type><parameter>array</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -108,7 +108,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-key-last.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-key-last.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-key-last.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345342 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: mumumu Status: ready -->

 <refentry xml:id="function.array-key-last" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -11,7 +11,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>mixed</type><methodname>array_key_last</methodname>
+   <type class="union"><type>int</type><type>string</type><type>null</type></type><methodname>array_key_last</methodname>
    <methodparam><type>array</type><parameter>array</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -52,7 +52,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-map.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-map.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-map.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 351129 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,mumumu -->
 <refentry xml:id="function.array-map" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>array_map</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
+   <methodparam><type class="union"><type>callable</type><type>null</type></type><parameter>callback</parameter></methodparam>
    <methodparam><type>array</type><parameter>array</parameter></methodparam>
    <methodparam rep="repeat"><type>array</type><parameter>arrays</parameter></methodparam>
   </methodsynopsis>
@@ -388,7 +388,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-pad.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-pad.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-pad.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 331477 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="function.array-pad" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -13,16 +13,16 @@
   <methodsynopsis>
    <type>array</type><methodname>array_pad</methodname>
    <methodparam><type>array</type><parameter>array</parameter></methodparam>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
+   <methodparam><type>int</type><parameter>length</parameter></methodparam>
    <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
-   <function>array_pad</function> は、<parameter>size</parameter>
+   <function>array_pad</function> は、<parameter>length</parameter>
    で指定した長さになるように値 <parameter>value</parameter> で埋めて
    <parameter>array</parameter> のコピーを返します。
-   <parameter>size</parameter> が正の場合、配列の右側が埋められます。
+   <parameter>length</parameter> が正の場合、配列の右側が埋められます。
    負の場合、配列の左側が埋められます。
-   <parameter>size</parameter> の絶対値が
+   <parameter>length</parameter> の絶対値が
    <parameter>array</parameter> の長さ以下の場合、埋める処理は行われません。
    一度に追加できる要素の最大数は 1048576 です。
   </para>
@@ -41,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>size</parameter></term>
+     <term><parameter>length</parameter></term>
      <listitem>
       <para>
        新しい配列のサイズ。
@@ -53,7 +53,7 @@
      <listitem>
       <para>
        <parameter>array</parameter> が
-       <parameter>size</parameter> より小さいときに、
+       <parameter>length</parameter> より小さいときに、
        埋めるために使用する値。
       </para>
      </listitem>
@@ -65,12 +65,12 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <parameter>size</parameter>
+   <parameter>length</parameter>
    で指定した長さになるように値 <parameter>value</parameter> で埋めて
    <parameter>array</parameter> のコピーを返します。
-   <parameter>size</parameter> が正の場合、配列の右側が埋められます。
+   <parameter>length</parameter> が正の場合、配列の右側が埋められます。
    負の場合、配列の左側が埋められます。
-   <parameter>size</parameter> の絶対値が
+   <parameter>length</parameter> の絶対値が
    <parameter>array</parameter> の長さ以下の場合、埋める処理は行われません。
   </para>
  </refsect1>
@@ -109,7 +109,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-rand.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-rand.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-rand.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350939 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="function.array-rand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>mixed</type><methodname>array_rand</methodname>
+   <type class="union"><type>int</type><type>string</type><type>array</type></type><methodname>array_rand</methodname>
    <methodparam><type>array</type><parameter>array</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>num</parameter><initializer>1</initializer></methodparam>
   </methodsynopsis>
@@ -114,7 +114,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-replace-recursive.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-replace-recursive.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-replace-recursive.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 351129 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: takagi Status: ready -->
 <!-- CREDITS: mumumu -->

 <refentry xml:id="function.array-replace-recursive" xmlns="http://docbook.org/ns/docbook">
@@ -13,7 +13,7 @@
   <methodsynopsis>
    <type>array</type><methodname>array_replace_recursive</methodname>
    <methodparam><type>array</type><parameter>array</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>replacements</parameter></methodparam>
+   <methodparam rep="repeat"><type>array</type><parameter>replacements</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>array_replace_recursive</function> は、
@@ -168,7 +168,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-replace.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-replace.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-replace.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 351129 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.array-replace" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>array_replace</refname>
@@ -11,7 +11,7 @@
   <methodsynopsis>
    <type>array</type><methodname>array_replace</methodname>
    <methodparam><type>array</type><parameter>array</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>replacements</parameter></methodparam>
+   <methodparam rep="repeat"><type>array</type><parameter>replacements</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>array_replace</function> は、
@@ -102,7 +102,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-search.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-search.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-search.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350655 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka,mumumu -->
 <refentry xml:id="function.array-search" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>mixed</type><methodname>array_search</methodname>
+   <type class="union"><type>int</type><type>string</type><type>false</type></type><methodname>array_search</methodname>
    <methodparam><type>mixed</type><parameter>needle</parameter></methodparam>
    <methodparam><type>array</type><parameter>haystack</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>strict</parameter><initializer>&false;</initializer></methodparam>
@@ -103,7 +103,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-slice.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-slice.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-slice.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350645 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,mumumu -->
 <refentry xml:id="function.array-slice" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -13,7 +13,7 @@
    <type>array</type><methodname>array_slice</methodname>
    <methodparam><type>array</type><parameter>array</parameter></methodparam>
    <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>length</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>preserve_keys</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -197,7 +197,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-splice.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-splice.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-splice.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 347729 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka,takagi,mumumu -->
 <refentry xml:id="function.array-splice" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,13 +11,13 @@
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>array_splice</methodname>
-   <methodparam><type>array</type><parameter role="reference">input</parameter></methodparam>
+   <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
    <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>count($input)</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>replacement</parameter><initializer>array()</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>length</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>mixed</type><parameter>replacement</parameter><initializer>[]</initializer></methodparam>
   </methodsynopsis>
   <para>
-   配列 <parameter>input</parameter>
+   配列 <parameter>array</parameter>
    から <parameter>offset</parameter> および <parameter>length</parameter>
    で指定された要素を削除し、配列 <parameter>replacement</parameter>
    でそれを置換します。
@@ -24,7 +24,7 @@
   </para>
   <note>
    <para>
-    <parameter>input</parameter> の配列の数値添字は保存されないことに注意しましょう。
+    <parameter>array</parameter> の配列の数値添字は保存されないことに注意しましょう。
    </para>
   </note>
   <note>
@@ -42,7 +42,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>input</parameter></term>
+     <term><parameter>array</parameter></term>
      <listitem>
       <para>
        入力の配列。
@@ -54,12 +54,12 @@
      <listitem>
       <para>
        <parameter>offset</parameter> が正の場合、削除される部分は
-       配列 <parameter>input</parameter> の最初から指定オフセットの
+       配列 <parameter>array</parameter> の最初から指定オフセットの
        ぶんだけ進んだ位置からとなります。
       </para>
       <para>
        <parameter>offset</parameter> が負の場合、削除される部分は、
-       <parameter>input</parameter> の末尾から数えた位置からとなります。
+       <parameter>array</parameter> の末尾から数えた位置からとなります。
       </para>
      </listitem>
     </varlistentry>
@@ -122,6 +122,29 @@
    抽出された要素を含む配列を返します。
   </para>
  </refsect1>
+
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       <parameter>length</parameter> は、nullable になりました。
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -232,7 +255,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/array-unique.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/array-unique.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/array-unique.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350654 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- Credits: mumumu -->

 <refentry xml:id="function.array-unique" xmlns="http://docbook.org/ns/docbook">
@@ -14,7 +14,7 @@
   <methodsynopsis>
    <type>array</type><methodname>array_unique</methodname>
    <methodparam><type>array</type><parameter>array</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter><initializer>SORT_STRING</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>SORT_STRING</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    <parameter>array</parameter> を入力とし、値に重複のない新規配列を返します。
@@ -21,7 +21,7 @@
   </para>
   <para>
    キーは保持されることに注意してください。
-   指定された <parameter>sort_flags</parameter> において、
+   指定された <parameter>flags</parameter> において、
    複数の要素が等しかった場合、はじめの要素のキーと値が保持されます。
   </para>
   <note>
@@ -46,10 +46,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>sort_flags</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
-       オプションの 2 番目のパラメータ <parameter>sort_flags</parameter>
+       オプションの 2 番目のパラメータ <parameter>flags</parameter>
        にこれらの値を使用して、ソートの挙動を変更します。
       </para>
       <para>
@@ -100,7 +100,7 @@
       <row>
        <entry>7.2.0</entry>
        <entry>
-        <parameter>sort_flags</parameter> が <constant>SORT_STRING</constant> の場合、
+        <parameter>flags</parameter> が <constant>SORT_STRING</constant> の場合、
         新しい配列が生成され、ユニークな要素が追加されるようになりました。
         これによって、異なった数値のインデックスが振られる可能性があります。
         これより前のバージョンでは、 <parameter>array</parameter> がコピーされ、
@@ -185,7 +185,6 @@
  </refsect1>

 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/arsort.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/arsort.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/arsort.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 339490 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="function.arsort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>arsort</methodname>
    <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter><initializer>SORT_REGULAR</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>SORT_REGULAR</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    この関数は、連想配列において各配列のキーと要素との関係を維持しつつソートを行います。
@@ -35,10 +35,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>sort_flags</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
-       オプションのパラメータ <parameter>sort_flags</parameter>
+       オプションのパラメータ <parameter>flags</parameter>
        によりソートの動作を修正可能です。詳細については、
        <function>sort</function> を参照ください。
       </para>
@@ -95,7 +95,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/asort.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/asort.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/asort.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 339490 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <refentry xml:id="function.asort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>asort</refname>
@@ -11,7 +11,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>asort</methodname>
    <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter><initializer>SORT_REGULAR</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>SORT_REGULAR</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    この関数は、
@@ -34,10 +34,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>sort_flags</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
-       オプションのパラメータ <parameter>sort_flags</parameter>
+       オプションのパラメータ <parameter>flags</parameter>
        によりソートの動作を修正可能です。
        詳細については、<function>sort</function> を参照ください。
       </para>
@@ -94,7 +94,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/compact.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/compact.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/compact.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 351129 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="function.compact" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,8 +11,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>compact</methodname>
-   <methodparam><type>mixed</type><parameter>var_name</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>var_names</parameter></methodparam>
+   <methodparam><type class="union"><type>array</type><type>string</type></type><parameter>var_name</parameter></methodparam>
+   <methodparam rep="repeat"><type class="union"><type>array</type><type>string</type></type><parameter>var_names</parameter></methodparam>
   </methodsynopsis>
   <para>
    変数名とその値から配列を作成します。
@@ -142,7 +142,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/count.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/count.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/count.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 346403 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka,mumumu -->
 <refentry xml:id="function.count" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -12,8 +12,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>count</methodname>
-   <methodparam><type>mixed</type><parameter>array_or_countable</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>COUNT_NORMAL</initializer></methodparam>
+   <methodparam><type class="union"><type>Countable</type><type>array</type></type><parameter>value</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>COUNT_NORMAL</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    変数に含まれるすべての要素、
@@ -37,7 +37,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>array_or_countable</parameter></term>
+     <term><parameter>value</parameter></term>
      <listitem>
       <para>
        配列あるいは <classname>Countable</classname> オブジェクト。
@@ -68,10 +68,10 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <parameter>array_or_countable</parameter> に含まれる要素の数を返します。
+   <parameter>value</parameter> に含まれる要素の数を返します。
    もしパラメータが配列でもなく <classname>Countable</classname> インターフェイスを
    実装したオブジェクトでもない場合、<literal>1</literal> が返されます。
-   ひとつ例外があり、<parameter>array_or_countable</parameter> が &null; の場合、
+   ひとつ例外があり、<parameter>value</parameter> が &null; の場合、
    <literal>0</literal> が返されます。
   </para>
  </refsect1>
@@ -151,7 +151,7 @@
       <entry>7.2.0</entry>
       <entry>
        <function>count</function> 関数は、
-       <parameter>array_or_countable</parameter> パラメータに、
+       <parameter>value</parameter> パラメータに、
        不正な <classname>Countable</classname> 型を渡した場合に
        警告を発生させるようになりました。
       </entry>
@@ -174,7 +174,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/current.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/current.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/current.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 351133 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka,mumumu -->
 <refentry xml:id="function.current" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>mixed</type><methodname>current</methodname>
-   <methodparam><type>array</type><parameter>array</parameter></methodparam>
+   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>array</parameter></methodparam>
   </methodsynopsis>
   <para>
    各配列は、"カレント"の要素へのポインタを有しています。
@@ -133,7 +133,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/end.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/end.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/end.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 345342 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="function.end" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>mixed</type><methodname>end</methodname>
-   <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
+   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter role="reference">array</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>end</function> は <parameter>array</parameter>
@@ -74,7 +74,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/extract.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/extract.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/extract.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 343853 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,shimooka -->
 <refentry xml:id="function.extract" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -12,8 +12,8 @@
   <methodsynopsis>
    <type>int</type><methodname>extract</methodname>
    <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>EXTR_OVERWRITE</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>prefix</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>EXTR_OVERWRITE</constant></initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>prefix</parameter><initializer>""</initializer></methodparam>
   </methodsynopsis>
   <para>
    配列からシンボルテーブルに変数をインポートします。
@@ -325,7 +325,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/key.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/key.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/key.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 342894 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="function.key" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>mixed</type><methodname>key</methodname>
-   <methodparam><type>array</type><parameter>array</parameter></methodparam>
+   <type class="union"><type>int</type><type>string</type><type>null</type></type><methodname>key</methodname>
+   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>array</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>key</function> は、
@@ -116,7 +116,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/krsort.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/krsort.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/krsort.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="function.krsort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>krsort</methodname>
    <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter><initializer>SORT_REGULAR</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>SORT_REGULAR</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    配列をキーにより逆順にソートします。キーとデータとの関係は維持されます。
@@ -32,10 +32,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>sort_flags</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
-       オプションのパラメータ <parameter>sort_flags</parameter>
+       オプションのパラメータ <parameter>flags</parameter>
        によりソートの動作を修正可能です。詳細については、
        <function>sort</function> を参照ください。
       </para>
@@ -89,7 +89,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/ksort.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/ksort.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/ksort.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 297028 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="function.ksort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>ksort</methodname>
    <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter><initializer>SORT_REGULAR</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>SORT_REGULAR</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    キーとデータの関係を維持しつつ、配列をキーでソートします。
@@ -32,10 +32,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>sort_flags</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
-       オプションのパラメータ <parameter>sort_flags</parameter>
+       オプションのパラメータ <parameter>flags</parameter>
        によりソートの動作を修正可能です。詳細については、
        <function>sort</function> を参照ください。
       </para>
@@ -88,7 +88,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/next.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/next.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/next.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 351133 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="function.next" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>mixed</type><methodname>next</methodname>
-   <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
+   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter role="reference">array</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>next</function> は、ひとつの違いを除いて
@@ -97,7 +97,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/prev.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/prev.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/prev.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 351133 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <refentry xml:id="function.prev" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>prev</refname>
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>mixed</type><methodname>prev</methodname>
-   <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
+   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter role="reference">array</parameter></methodparam>
   </methodsynopsis>
   <para>
    内部の配列ポインタをひとつ前に戻します。
@@ -88,7 +88,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/range.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/range.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/range.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 351123 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,shimooka -->
 <refentry xml:id="function.range" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,8 +11,8 @@
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>range</methodname>
-   <methodparam><type>mixed</type><parameter>start</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>end</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>int</type><type>float</type></type><parameter>start</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>int</type><type>float</type></type><parameter>end</parameter></methodparam>
    <methodparam choice="opt"><type class="union"><type>int</type><type>float</type></type><parameter>step</parameter><initializer>1</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -113,7 +113,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/reset.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/reset.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/reset.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 351133 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: takagi,mumumu -->
 <refentry xml:id="function.reset" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,7 +11,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>mixed</type><methodname>reset</methodname>
-   <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
+   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter role="reference">array</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>reset</function> は、<parameter>array</parameter>
@@ -100,7 +100,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/rsort.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/rsort.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/rsort.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 339490 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: hirokawa Status: ready -->
 <!-- CREDITS: shimooka -->
 <refentry xml:id="function.rsort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>rsort</methodname>
    <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter><initializer>SORT_REGULAR</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>SORT_REGULAR</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    この関数は、配列を逆順に(高位から低位に)ソートします。
@@ -32,10 +32,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>sort_flags</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
-       オプションのパラメータ <parameter>sort_flags</parameter>
+       オプションのパラメータ <parameter>flags</parameter>
        によりソートの動作を修正可能です。詳細については、
        <function>sort</function> を参照ください。
       </para>
@@ -96,7 +96,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/sort.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/sort.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/sort.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350645 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,shimooka,mumumu -->

 <refentry xml:id="function.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -13,7 +13,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>sort</methodname>
    <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sort_flags</parameter><initializer>SORT_REGULAR</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>SORT_REGULAR</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
    この関数は配列をソートします。この関数が正常に終了すると、
@@ -34,10 +34,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>sort_flags</parameter></term>
+     <term><parameter>flags</parameter></term>
      <listitem>
       <para>
-       オプションの 2 番目のパラメータ <parameter>sort_flags</parameter>
+       オプションの 2 番目のパラメータ <parameter>flags</parameter>
        は、以下の値によりソートの動作を修正するために使用することが可能です。
       </para>
       <para>
@@ -167,7 +167,7 @@
   </note>
   <warning>
    <simpara>
-    <parameter>sort_flags</parameter> が
+    <parameter>flags</parameter> が
     <constant>SORT_REGULAR</constant>の場合に
     複数の型が混在する配列をソートする場合には、注意してください。
     <function>sort</function> が期待しない結果を出力することがあります。
@@ -185,7 +185,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/uasort.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/uasort.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/uasort.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 339490 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa -->
 <refentry xml:id="function.uasort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -13,7 +13,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>uasort</methodname>
    <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>value_compare_func</parameter></methodparam>
+   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
   </methodsynopsis>
   <para>
    この関数は、インデックスとそれに対応する要素を関連づけた配列をソートします。
@@ -38,7 +38,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>value_compare_func</parameter></term>
+     <term><parameter>callback</parameter></term>
      <listitem>
       <para>
        ユーザー定義の比較関数の例については、
@@ -125,7 +125,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/uksort.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/uksort.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/uksort.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 339490 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,shimooka -->
 <refentry xml:id="function.uksort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>uksort</methodname>
    <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>key_compare_func</parameter></methodparam>
+   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
   </methodsynopsis>
   <para>
    <function>uksort</function> は、
@@ -35,7 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>key_compare_func</parameter></term>
+     <term><parameter>callback</parameter></term>
      <listitem>
       <para>
        &return.callbacksort;
@@ -99,7 +99,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/array/functions/usort.xml
===================================================================
--- phpdoc/ja/trunk/reference/array/functions/usort.xml	2020-12-04 00:35:15 UTC (rev 351860)
+++ phpdoc/ja/trunk/reference/array/functions/usort.xml	2020-12-04 02:22:57 UTC (rev 351861)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 351133 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351860 Maintainer: takagi Status: ready -->
 <!-- CREDITS: hirokawa,shimooka -->
 <refentry xml:id="function.usort" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>bool</type><methodname>usort</methodname>
    <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>value_compare_func</parameter></methodparam>
+   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
   </methodsynopsis>
   <para>
    この関数は、ユーザー定義の比較関数により配列をその値でソートします。
@@ -35,7 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>value_compare_func</parameter></term>
+     <term><parameter>callback</parameter></term>
      <listitem>
       <para>
        &return.callbacksort;
@@ -237,7 +237,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml