svn: /phpdoc/ja/trunk/reference/pcre/functions/ preg-filter.xml preg-grep.xml preg-match-all.xml preg-match.xml preg-quote.xml preg-replace-callback-array.xml preg-replace-callback.xml preg-replace.xml

[email protected] (Yoshinari Takaoka)
Newsgroups php.doc.ja
Message-ID <[email protected]> 
mumumu                                   Sun, 22 Nov 2020 13:08:47 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=351493

Log:
Generate pcre methodsynopses based on stubs

Based on a patch contributed by Máté Kocsis <[email protected]>.

Changed paths:
    U   phpdoc/ja/trunk/reference/pcre/functions/preg-filter.xml
    U   phpdoc/ja/trunk/reference/pcre/functions/preg-grep.xml
    U   phpdoc/ja/trunk/reference/pcre/functions/preg-match-all.xml
    U   phpdoc/ja/trunk/reference/pcre/functions/preg-match.xml
    U   phpdoc/ja/trunk/reference/pcre/functions/preg-quote.xml
    U   phpdoc/ja/trunk/reference/pcre/functions/preg-replace-callback-array.xml
    U   phpdoc/ja/trunk/reference/pcre/functions/preg-replace-callback.xml
    U   phpdoc/ja/trunk/reference/pcre/functions/preg-replace.xml
svn-diffs-351493.txt (text/x-diff, 15.8 KB) 
Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-filter.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-filter.xml	2020-11-22 12:59:50 UTC (rev 351492)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-filter.xml	2020-11-22 13:08:47 UTC (rev 351493)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 335337 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: takagi Status: ready -->
 <refentry xml:id="function.preg-filter" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>preg_filter</refname>
@@ -10,12 +10,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>mixed</type><methodname>preg_filter</methodname>
-   <methodparam><type>mixed</type><parameter>pattern</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>replacement</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>subject</parameter></methodparam>
+   <type class="union"><type>string</type><type>array</type><type>null</type></type><methodname>preg_filter</methodname>
+   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>pattern</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>replacement</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>subject</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">count</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter role="reference">count</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>preg_filter</function> は <function>preg_replace</function>
@@ -106,7 +106,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-grep.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-grep.xml	2020-11-22 12:59:50 UTC (rev 351492)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-grep.xml	2020-11-22 13:08:47 UTC (rev 351493)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 335337 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: hirokawa Status: ready -->
 <!-- Credits: haruki -->
 <refentry xml:id="function.preg-grep" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,13 +11,13 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>array</type><methodname>preg_grep</methodname>
+   <type class="union"><type>array</type><type>false</type></type><methodname>preg_grep</methodname>
    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-   <methodparam><type>array</type><parameter>input</parameter></methodparam>
+   <methodparam><type>array</type><parameter>array</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
-   <parameter>input</parameter> 配列の要素のうち、
+   <parameter>array</parameter> 配列の要素のうち、
    指定した <parameter>pattern</parameter> にマッチするものを要素とする配列を返します。
   </para>
  </refsect1>
@@ -35,7 +35,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>input</parameter></term>
+     <term><parameter>array</parameter></term>
      <listitem>
       <para>
        入力の配列。
@@ -60,7 +60,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <parameter>input</parameter> 配列のキーを使用した配列を返します。
+   <parameter>array</parameter> 配列のキーを使用した配列を返します。
   </para>
  </refsect1>

@@ -96,7 +96,6 @@
  </refsect1>

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

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-match-all.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-match-all.xml	2020-11-22 12:59:50 UTC (rev 351492)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-match-all.xml	2020-11-22 13:08:47 UTC (rev 351493)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350739 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: hirokawa Status: ready -->
 <!-- Credits: haruki,mumumu -->
 <refentry xml:id="function.preg-match-all" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,10 +11,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>preg_match_all</methodname>
+   <type class="union"><type>int</type><type>false</type><type>null</type></type><methodname>preg_match_all</methodname>
    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
    <methodparam><type>string</type><parameter>subject</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">matches</parameter></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter role="reference">matches</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>PREG_PATTERN_ORDER</constant></initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
@@ -460,7 +460,6 @@
  </refsect1>

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

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-match.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-match.xml	2020-11-22 12:59:50 UTC (rev 351492)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-match.xml	2020-11-22 13:08:47 UTC (rev 351493)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350809 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: hirokawa Status: ready -->
 <!-- Credits: haruki,mumumu -->
 <refentry xml:id="function.preg-match" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,10 +11,10 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>int</type><methodname>preg_match</methodname>
+   <type class="union"><type>int</type><type>false</type></type><methodname>preg_match</methodname>
    <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
    <methodparam><type>string</type><parameter>subject</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">matches</parameter></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter role="reference">matches</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
@@ -414,7 +414,6 @@
  </refsect1>

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

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-quote.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-quote.xml	2020-11-22 12:59:50 UTC (rev 351492)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-quote.xml	2020-11-22 13:08:47 UTC (rev 351493)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350655 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: hirokawa Status: ready -->
 <!-- Credits: haruki,mumumu -->
 <refentry xml:id="function.preg-quote" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -13,7 +13,7 @@
   <methodsynopsis>
    <type>string</type><methodname>preg_quote</methodname>
    <methodparam><type>string</type><parameter>str</parameter></methodparam>
-  <methodparam choice="opt"><type>string</type><parameter>delimiter</parameter><initializer>&null;</initializer></methodparam>
+   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>delimiter</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    <function>preg_quote</function> は、<parameter>str</parameter>
@@ -89,6 +89,12 @@
         <literal>#</literal> 文字がクォートされるようになりました。
        </entry>
       </row>
+      <row>
+       <entry>7.2.0</entry>
+       <entry>
+        <parameter>delimiter</parameter> は、nullable になりました。
+       </entry>
+      </row>
      </tbody>
     </tgroup>
    </informaltable>
@@ -148,7 +154,6 @@
  </refsect1>

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

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-replace-callback-array.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-replace-callback-array.xml	2020-11-22 12:59:50 UTC (rev 351492)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-replace-callback-array.xml	2020-11-22 13:08:47 UTC (rev 351493)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350788 Maintainer: satoruyoshida Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: satoruyoshida Status: ready -->
 <!-- Credits: mumumu -->
 <refentry xml:id="function.preg-replace-callback-array" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,11 +11,11 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>mixed</type><methodname>preg_replace_callback_array</methodname>
-   <methodparam><type>array</type><parameter>patterns_and_callbacks</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>subject</parameter></methodparam>
+   <type class="union"><type>string</type><type>array</type><type>null</type></type><methodname>preg_replace_callback_array</methodname>
+   <methodparam><type>array</type><parameter>pattern</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>subject</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">count</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter role="reference">count</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -29,7 +29,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>patterns_and_callbacks</parameter></term>
+     <term><parameter>pattern</parameter></term>
      <listitem>
       <para>
        パターンをキーとし、<type>callable</type> を値とする連想配列です。

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-replace-callback.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-replace-callback.xml	2020-11-22 12:59:50 UTC (rev 351492)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-replace-callback.xml	2020-11-22 13:08:47 UTC (rev 351493)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350788 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: takagi Status: ready -->
 <!-- Credits: hirokawa,haruki,mumumu -->
 <refentry xml:id="function.preg-replace-callback" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,12 +11,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>mixed</type><methodname>preg_replace_callback</methodname>
-   <methodparam><type>mixed</type><parameter>pattern</parameter></methodparam>
+   <type class="union"><type>string</type><type>array</type><type>null</type></type><methodname>preg_replace_callback</methodname>
+   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>pattern</parameter></methodparam>
    <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>subject</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>subject</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">count</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter role="reference">count</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -262,7 +262,6 @@
  </refsect1>

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

Modified: phpdoc/ja/trunk/reference/pcre/functions/preg-replace.xml
===================================================================
--- phpdoc/ja/trunk/reference/pcre/functions/preg-replace.xml	2020-11-22 12:59:50 UTC (rev 351492)
+++ phpdoc/ja/trunk/reference/pcre/functions/preg-replace.xml	2020-11-22 13:08:47 UTC (rev 351493)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350645 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: takagi Status: ready -->
 <!-- Credits: hirokawa,haruki,shimooka,mumumu -->
 <refentry xml:id="function.preg-replace" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
@@ -11,12 +11,12 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>mixed</type><methodname>preg_replace</methodname>
-   <methodparam><type>mixed</type><parameter>pattern</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>replacement</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>subject</parameter></methodparam>
+   <type class="union"><type>string</type><type>array</type><type>null</type></type><methodname>preg_replace</methodname>
+   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>pattern</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>replacement</parameter></methodparam>
+   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>subject</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">count</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter role="reference">count</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
    <parameter>subject</parameter> に関して
@@ -314,7 +314,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.