svn: /phpdoc/fr/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] (George Peter Banyard)
Newsgroups php.doc.fr
Message-ID <[email protected]> 
girgias                                  Tue, 24 Nov 2020 22:02:13 +0000

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

Log:
Apply SVN revision 351490 onto French docs

Changed paths:
    U   phpdoc/fr/trunk/reference/pcre/functions/preg-filter.xml
    U   phpdoc/fr/trunk/reference/pcre/functions/preg-grep.xml
    U   phpdoc/fr/trunk/reference/pcre/functions/preg-match-all.xml
    U   phpdoc/fr/trunk/reference/pcre/functions/preg-match.xml
    U   phpdoc/fr/trunk/reference/pcre/functions/preg-quote.xml
    U   phpdoc/fr/trunk/reference/pcre/functions/preg-replace-callback-array.xml
    U   phpdoc/fr/trunk/reference/pcre/functions/preg-replace-callback.xml
    U   phpdoc/fr/trunk/reference/pcre/functions/preg-replace.xml
svn-diffs-351605.txt (text/x-diff, 16.1 KB) 
Modified: phpdoc/fr/trunk/reference/pcre/functions/preg-filter.xml
===================================================================
--- phpdoc/fr/trunk/reference/pcre/functions/preg-filter.xml	2020-11-24 21:49:10 UTC (rev 351604)
+++ phpdoc/fr/trunk/reference/pcre/functions/preg-filter.xml	2020-11-24 22:02:13 UTC (rev 351605)
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 335337 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.preg-filter" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>preg_filter</refname>
@@ -12,12 +11,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> est identique à
@@ -108,7 +107,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

Modified: phpdoc/fr/trunk/reference/pcre/functions/preg-grep.xml
===================================================================
--- phpdoc/fr/trunk/reference/pcre/functions/preg-grep.xml	2020-11-24 21:49:10 UTC (rev 351604)
+++ phpdoc/fr/trunk/reference/pcre/functions/preg-grep.xml	2020-11-24 22:02:13 UTC (rev 351605)
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 335337 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.preg-grep" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>preg_grep</refname>
@@ -12,14 +11,14 @@
  <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>
    <function>preg_grep</function> retourne un &array; qui contient
-   les éléments de <parameter>input</parameter>
+   les éléments de <parameter>array</parameter>
    qui satisfont le masque <parameter>pattern</parameter>.
   </para>
  </refsect1>
@@ -37,7 +36,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>input</parameter></term>
+     <term><parameter>array</parameter></term>
      <listitem>
       <para>
        Le tableau d'entrée.
@@ -64,7 +63,7 @@
   &reftitle.returnvalues;
   <para>
    Retourne un &array; indexé, en utilisant les clés du
-   tableau <parameter>input</parameter> d'entrée.
+   tableau <parameter>array</parameter> d'entrée.
   </para>
  </refsect1>

@@ -99,7 +98,6 @@
  </refsect1>

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

Modified: phpdoc/fr/trunk/reference/pcre/functions/preg-match-all.xml
===================================================================
--- phpdoc/fr/trunk/reference/pcre/functions/preg-match-all.xml	2020-11-24 21:49:10 UTC (rev 351604)
+++ phpdoc/fr/trunk/reference/pcre/functions/preg-match-all.xml	2020-11-24 22:02:13 UTC (rev 351605)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350739 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->

 <refentry xml:id="function.preg-match-all" xmlns="http://docbook.org/ns/docbook">
@@ -12,10 +12,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>
@@ -465,7 +465,6 @@
  </refsect1>

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

Modified: phpdoc/fr/trunk/reference/pcre/functions/preg-match.xml
===================================================================
--- phpdoc/fr/trunk/reference/pcre/functions/preg-match.xml	2020-11-24 21:49:10 UTC (rev 351604)
+++ phpdoc/fr/trunk/reference/pcre/functions/preg-match.xml	2020-11-24 22:02:13 UTC (rev 351605)
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350809 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.preg-match" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>preg_match</refname>
@@ -12,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>
@@ -420,7 +419,6 @@
  </refsect1>

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

Modified: phpdoc/fr/trunk/reference/pcre/functions/preg-quote.xml
===================================================================
--- phpdoc/fr/trunk/reference/pcre/functions/preg-quote.xml	2020-11-24 21:49:10 UTC (rev 351604)
+++ phpdoc/fr/trunk/reference/pcre/functions/preg-quote.xml	2020-11-24 22:02:13 UTC (rev 351605)
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350655 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.preg-quote" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>preg_quote</refname>
@@ -14,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> ajoute un antislash devant chaque caractère de la chaîne <parameter>str</parameter> faisant partie de la syntaxe des expressions régulières.
@@ -89,6 +88,12 @@
         Le caractère <literal>#</literal> est maintenant protégé
        </entry>
       </row>
+      <row>
+       <entry>7.2.0</entry>
+       <entry>
+        <parameter>delimiter</parameter> est désormais nullable.
+       </entry>
+      </row>
      </tbody>
     </tgroup>
    </informaltable>
@@ -148,7 +153,6 @@
  </refsect1>

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

Modified: phpdoc/fr/trunk/reference/pcre/functions/preg-replace-callback-array.xml
===================================================================
--- phpdoc/fr/trunk/reference/pcre/functions/preg-replace-callback-array.xml	2020-11-24 21:49:10 UTC (rev 351604)
+++ phpdoc/fr/trunk/reference/pcre/functions/preg-replace-callback-array.xml	2020-11-24 22:02:13 UTC (rev 351605)
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350788 Maintainer: girgias Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: girgias Status: ready -->
 <!-- Reviewed: no -->
-
 <refentry xml:id="function.preg-replace-callback-array" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>preg_replace_callback_array</refname>
@@ -12,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>
@@ -31,7 +30,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>patterns_and_callbacks</parameter></term>
+     <term><parameter>pattern</parameter></term>
      <listitem>
       <para>
        Un tableau associatif qui établie une relation entre les masques (clés)
@@ -169,7 +168,6 @@
  </refsect1>

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

Modified: phpdoc/fr/trunk/reference/pcre/functions/preg-replace-callback.xml
===================================================================
--- phpdoc/fr/trunk/reference/pcre/functions/preg-replace-callback.xml	2020-11-24 21:49:10 UTC (rev 351604)
+++ phpdoc/fr/trunk/reference/pcre/functions/preg-replace-callback.xml	2020-11-24 22:02:13 UTC (rev 351605)
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350788 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.preg-replace-callback" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>preg_replace_callback</refname>
@@ -12,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>
@@ -260,7 +259,6 @@
  </refsect1>

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

Modified: phpdoc/fr/trunk/reference/pcre/functions/preg-replace.xml
===================================================================
--- phpdoc/fr/trunk/reference/pcre/functions/preg-replace.xml	2020-11-24 21:49:10 UTC (rev 351604)
+++ phpdoc/fr/trunk/reference/pcre/functions/preg-replace.xml	2020-11-24 22:02:13 UTC (rev 351605)
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 350645 Maintainer: yannick Status: ready -->
+<!-- EN-Revision: 351490 Maintainer: yannick Status: ready -->
 <!-- Reviewed: yes -->
-
 <refentry xml:id="function.preg-replace" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>preg_replace</refname>
@@ -12,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>
    Analyse <parameter>subject</parameter> pour trouver l'expression
@@ -317,7 +316,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.