com doc/de: sync with EN: reference/classobj/functions/get-parent-class.xml reference/dba/functions/dba-close.xml reference/dba/functions/dba-delete.xml reference/dba/functions/dba-exists.xml reference/dba/functions/dba-fetch.xml reference/dba/functions/dba-firstkey.xml reference/dba/functions/dba-insert.xml reference/dba/functions/dba-key-split.xml reference/dba/functions/dba-nextkey.xml reference/dba/functions/dba-open.xml reference/dba/functio
[email protected] (Martin Samesch)
| Newsgroups | php.doc.de |
|---|---|
| Message-ID | <[email protected]> |
Commit: e5a8501166d115ae9a30dd11c4ba6253d3f8acca Author: Martin Samesch <[email protected]> Wed, 6 Jan 2021 14:42:52 +0100 Parents: 9d41673f8ed6858a6dba711969af265ab3487aee Branches: master Link: http://git.php.net/?p=doc/de.git;a=commitdiff;h=e5a8501166d115ae9a30dd11c4ba6253d3f8acca Log: sync with EN Changed paths: M reference/classobj/functions/get-parent-class.xml M reference/dba/functions/dba-close.xml M reference/dba/functions/dba-delete.xml M reference/dba/functions/dba-exists.xml M reference/dba/functions/dba-fetch.xml M reference/dba/functions/dba-firstkey.xml M reference/dba/functions/dba-insert.xml M reference/dba/functions/dba-key-split.xml M reference/dba/functions/dba-nextkey.xml M reference/dba/functions/dba-open.xml M reference/dba/functions/dba-optimize.xml M reference/dba/functions/dba-popen.xml M reference/dba/functions/dba-replace.xml M reference/dba/functions/dba-sync.xml M reference/dbase/book.xml M reference/dbase/functions/dbase-create.xml M reference/dbase/functions/dbase-get-header-info.xml M reference/dbase/functions/dbase-get-record-with-names.xml M reference/dbase/functions/dbase-get-record.xml M reference/dbase/functions/dbase-numfields.xml M reference/dbase/functions/dbase-numrecords.xml M reference/dbase/functions/dbase-open.xml M reference/dbase/functions/dbase-replace-record.xml M reference/pcre/configure.xml M reference/pcre/functions/preg-filter.xml M reference/pcre/functions/preg-grep.xml M reference/pcre/functions/preg-last-error.xml M reference/pcre/functions/preg-match-all.xml M reference/pcre/functions/preg-match.xml M reference/pcre/functions/preg-quote.xml M reference/pcre/functions/preg-replace-callback.xml M reference/pcre/functions/preg-replace.xml M reference/pcre/functions/preg-split.xml M reference/pcre/ini.xml
diff_e5a8501166d115ae9a30dd11c4ba6253d3f8acca.txt
(text/plain, 55 KB)
diff --git a/reference/classobj/functions/get-parent-class.xml b/reference/classobj/functions/get-parent-class.xml
index be6dee5e2..40bda678f 100644
--- a/reference/classobj/functions/get-parent-class.xml
+++ b/reference/classobj/functions/get-parent-class.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: be5b0f33a18415823da76389915b49aae4ee6835 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: samesch Status: ready -->
<refentry xml:id="function.get-parent-class" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>get_parent_class</refname>
diff --git a/reference/dba/functions/dba-close.xml b/reference/dba/functions/dba-close.xml
index 4798bd84c..5f84e2c5e 100644
--- a/reference/dba/functions/dba-close.xml
+++ b/reference/dba/functions/dba-close.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 9c4c9718261c2705fef2a490e3926751134aec32 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dba-close" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dba_close</refname>
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<type>void</type><methodname>dba_close</methodname>
- <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
+ <methodparam><type>resource</type><parameter>dba</parameter></methodparam>
</methodsynopsis>
<para>
<function>dba_close</function> schließt die offene Datenbank und gibt alle
@@ -24,7 +24,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>handle</parameter></term>
+ <term><parameter>dba</parameter></term>
<listitem>
<para>
Die Datenbank-Verbindungskennung, die von <function>dba_open</function>
diff --git a/reference/dba/functions/dba-delete.xml b/reference/dba/functions/dba-delete.xml
index 3cfbbe457..98e52ed2b 100644
--- a/reference/dba/functions/dba-delete.xml
+++ b/reference/dba/functions/dba-delete.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 9c4c9718261c2705fef2a490e3926751134aec32 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dba-delete" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dba_delete</refname>
@@ -11,8 +11,8 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>dba_delete</methodname>
- <methodparam><type>string</type><parameter>key</parameter></methodparam>
- <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
+ <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>key</parameter></methodparam>
+ <methodparam><type>resource</type><parameter>dba</parameter></methodparam>
</methodsynopsis>
<para>
<function>dba_delete</function> löscht den angegebenen Eintrag aus der
@@ -33,7 +33,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>handle</parameter></term>
+ <term><parameter>dba</parameter></term>
<listitem>
<para>
Die Datenbank-Verbindungskennung, die von <function>dba_open</function>
diff --git a/reference/dba/functions/dba-exists.xml b/reference/dba/functions/dba-exists.xml
index e55eee20d..b5834c3d9 100644
--- a/reference/dba/functions/dba-exists.xml
+++ b/reference/dba/functions/dba-exists.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 9c4c9718261c2705fef2a490e3926751134aec32 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dba-exists" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dba_exists</refname>
@@ -11,8 +11,8 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>dba_exists</methodname>
- <methodparam><type>string</type><parameter>key</parameter></methodparam>
- <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
+ <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>key</parameter></methodparam>
+ <methodparam><type>resource</type><parameter>dba</parameter></methodparam>
</methodsynopsis>
<para>
<function>dba_exists</function> überprüft, ob der angegebene
@@ -33,7 +33,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>handle</parameter></term>
+ <term><parameter>dba</parameter></term>
<listitem>
<para>
Die Datenbank-Verbindungskennung, die von <function>dba_open</function>
diff --git a/reference/dba/functions/dba-fetch.xml b/reference/dba/functions/dba-fetch.xml
index 0995b45bf..f5990120f 100644
--- a/reference/dba/functions/dba-fetch.xml
+++ b/reference/dba/functions/dba-fetch.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: b824e2b1086e94a1077bd071964547283616030a Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 4754397753fd79f1c846868b66a2448babab1c54 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dba-fetch" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dba_fetch</refname>
diff --git a/reference/dba/functions/dba-firstkey.xml b/reference/dba/functions/dba-firstkey.xml
index 72d48ddc6..10b1d4ca2 100644
--- a/reference/dba/functions/dba-firstkey.xml
+++ b/reference/dba/functions/dba-firstkey.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 9c4c9718261c2705fef2a490e3926751134aec32 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dba-firstkey" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dba_firstkey</refname>
@@ -10,8 +10,8 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <type>string</type><methodname>dba_firstkey</methodname>
- <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
+ <type class="union"><type>string</type><type>false</type></type><methodname>dba_firstkey</methodname>
+ <methodparam><type>resource</type><parameter>dba</parameter></methodparam>
</methodsynopsis>
<para>
<function>dba_firstkey</function> gibt den ersten Schlüssel aus der
@@ -25,7 +25,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>handle</parameter></term>
+ <term><parameter>dba</parameter></term>
<listitem>
<para>
Die Datenbank-Verbindungskennung, die von <function>dba_open</function>
diff --git a/reference/dba/functions/dba-insert.xml b/reference/dba/functions/dba-insert.xml
index 4b51d930d..fa9c12d39 100644
--- a/reference/dba/functions/dba-insert.xml
+++ b/reference/dba/functions/dba-insert.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 9c4c9718261c2705fef2a490e3926751134aec32 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dba-insert" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dba_insert</refname>
@@ -11,9 +11,9 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>dba_insert</methodname>
- <methodparam><type>string</type><parameter>key</parameter></methodparam>
+ <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>key</parameter></methodparam>
<methodparam><type>string</type><parameter>value</parameter></methodparam>
- <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
+ <methodparam><type>resource</type><parameter>dba</parameter></methodparam>
</methodsynopsis>
<para>
<function>dba_insert</function> fügt den Eintrag, der durch
@@ -46,7 +46,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>handle</parameter></term>
+ <term><parameter>dba</parameter></term>
<listitem>
<para>
Die Datenbank-Verbindungskennung, die von <function>dba_open</function>
diff --git a/reference/dba/functions/dba-key-split.xml b/reference/dba/functions/dba-key-split.xml
index 00aa0b252..270ca5ee1 100755
--- a/reference/dba/functions/dba-key-split.xml
+++ b/reference/dba/functions/dba-key-split.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 9c4c9718261c2705fef2a490e3926751134aec32 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dba-key-split" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dba_key_split</refname>
@@ -10,8 +10,8 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <type>mixed</type><methodname>dba_key_split</methodname>
- <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
+ <type class="union"><type>array</type><type>false</type></type><methodname>dba_key_split</methodname>
+ <methodparam><type class="union"><type>string</type><type>false</type><type>null</type></type><parameter>key</parameter></methodparam>
</methodsynopsis>
<para>
<function>dba_key_split</function> zerlegt einen Schlüssel, der in
diff --git a/reference/dba/functions/dba-nextkey.xml b/reference/dba/functions/dba-nextkey.xml
index 136bc77a0..6e5861070 100644
--- a/reference/dba/functions/dba-nextkey.xml
+++ b/reference/dba/functions/dba-nextkey.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 9c4c9718261c2705fef2a490e3926751134aec32 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dba-nextkey" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dba_nextkey</refname>
@@ -10,8 +10,8 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <type>string</type><methodname>dba_nextkey</methodname>
- <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
+ <type class="union"><type>string</type><type>false</type></type><methodname>dba_nextkey</methodname>
+ <methodparam><type>resource</type><parameter>dba</parameter></methodparam>
</methodsynopsis>
<para>
<function>dba_nextkey</function> gibt den nachfolgenden Schlüssel aus der
@@ -24,7 +24,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>handle</parameter></term>
+ <term><parameter>dba</parameter></term>
<listitem>
<para>
Die Datenbank-Verbindungskennung, die von <function>dba_open</function>
diff --git a/reference/dba/functions/dba-open.xml b/reference/dba/functions/dba-open.xml
index b80f2512b..418ebc5c6 100644
--- a/reference/dba/functions/dba-open.xml
+++ b/reference/dba/functions/dba-open.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 885781f948d31be164965d93fb5d3e3263aad40f Maintainer: samesch Status: ready -->
+<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dba-open" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dba_open</refname>
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <type>resource</type><methodname>dba_open</methodname>
+ <type class="union"><type>resource</type><type>false</type></type><methodname>dba_open</methodname>
<methodparam><type>string</type><parameter>path</parameter></methodparam>
<methodparam><type>string</type><parameter>mode</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>handler</parameter></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>...</parameter></methodparam>
+ <methodparam rep="repeat"><type>string</type><parameter>args</parameter></methodparam>
</methodsynopsis>
<para>
<function>dba_open</function> stellt eine Datenbankinstanz für
@@ -170,29 +170,29 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>...</parameter></term>
+ <term><parameter>args</parameter></term>
<listitem>
<para>
- Optionale &string; Parameter, die an den Treiber übergeben werden.
+ Optionale &string;-Parameter, die an den Treiber übergeben werden.
</para>
<para>
- Die <literal>cdb</literal>, <literal>cdb_make</literal>, <literal>flatfile</literal>,
- <literal>inifile</literal>, <literal>qdbm</literal> and <literal>tcadb</literal> Treiber
+ Die <literal>cdb</literal>-, <literal>cdb_make</literal>-, <literal>flatfile</literal>-,
+ <literal>inifile</literal>-, <literal>qdbm</literal>- und <literal>tcadb</literal>-Treiber
unterstützen keine zusätzlichen Parameter.
</para>
<para>
- Die <literal>db1</literal>, <literal>db2</literal>, <literal>db3</literal>,
- <literal>db4</literal>, <literal>dbm</literal>, <literal>gdbm</literal>,
- and <literal>ndbm</literal> Treiber unterstützen einen einzigen zusätzlichen Parameter <literal>$filemode</literal>,
- der dieselbe Bedeutung wie der <literal>$mode</literal> Parameter von <function>chmod</function> hat,
+ Die <literal>db1</literal>-, <literal>db2</literal>-, <literal>db3</literal>-,
+ <literal>db4</literal>-, <literal>dbm</literal>-, <literal>gdbm</literal>-
+ und <literal>ndbm</literal>-Treiber unterstützen einen einzigen zusätzlichen Parameter <literal>$filemode</literal>,
+ der dieselbe Bedeutung wie der <literal>$mode</literal>-Parameter von <function>chmod</function> hat,
und dessen Standardwert <literal>0644</literal> ist.
</para>
<para>
- Der <literal>lmdb</literal> Treiber akzeptiert zwei zusätzliche Parameter.
+ Der <literal>lmdb</literal>-Treiber akzeptiert zwei zusätzliche Parameter.
Der erste erlaubt es den <literal>$filemode</literal> anzugeben (siehe Beschreibung weiter oben),
und der zweite die <literal>$mapsize</literal>, wobei der Wert ein Vielfaches der Pagesize
des Betriebssystems sein sollte, oder Null, um die voreingestellte Mapsize zu verwenden.
- Der <literal>$mapsize</literal> Parameter wird von PHP 7.3.14 bzw. 7.4.2 an unterstützt.
+ Der <literal>$mapsize</literal>-Parameter wird von PHP 7.3.14 bzw. 7.4.2 an unterstützt.
</para>
</listitem>
</varlistentry>
diff --git a/reference/dba/functions/dba-optimize.xml b/reference/dba/functions/dba-optimize.xml
index ccbbff56f..09700a7b2 100644
--- a/reference/dba/functions/dba-optimize.xml
+++ b/reference/dba/functions/dba-optimize.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 9c4c9718261c2705fef2a490e3926751134aec32 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dba-optimize" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dba_optimize</refname>
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>dba_optimize</methodname>
- <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
+ <methodparam><type>resource</type><parameter>dba</parameter></methodparam>
</methodsynopsis>
<para>
<function>dba_optimize</function> optimiert die zugrunde liegende
@@ -24,7 +24,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>handle</parameter></term>
+ <term><parameter>dba</parameter></term>
<listitem>
<para>
Die Datenbank-Verbindungskennung, die von <function>dba_open</function>
diff --git a/reference/dba/functions/dba-popen.xml b/reference/dba/functions/dba-popen.xml
index 0230daffc..78eb65268 100644
--- a/reference/dba/functions/dba-popen.xml
+++ b/reference/dba/functions/dba-popen.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dba-popen" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dba_popen</refname>
@@ -10,11 +10,11 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <type>resource</type><methodname>dba_popen</methodname>
+ <type class="union"><type>resource</type><type>false</type></type><methodname>dba_popen</methodname>
<methodparam><type>string</type><parameter>path</parameter></methodparam>
<methodparam><type>string</type><parameter>mode</parameter></methodparam>
<methodparam choice="opt"><type>string</type><parameter>handler</parameter></methodparam>
- <methodparam choice="opt"><type>mixed</type><parameter>...</parameter></methodparam>
+ <methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
</methodsynopsis>
<para>
<function>dba_popen</function> stellt eine persistente Datenbankinstanz für
@@ -61,6 +61,39 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><parameter>args</parameter></term>
+ <listitem>
+ <para>
+ Optionale &string;-Parameter, die an den Treiber übergeben werden.
+ </para>
+ <para>
+ Die <literal>cdb</literal>-, <literal>cdb_make</literal>-,
+ <literal>flatfile</literal>-, <literal>inifile</literal>-,
+ <literal>qdbm</literal>- und <literal>tcadb</literal>-Treiber
+ unterstützen keine zusätzlichen Parameter.
+ </para>
+ <para>
+ Die <literal>db1</literal>-, <literal>db2</literal>-,
+ <literal>db3</literal>-, <literal>db4</literal>-,
+ <literal>dbm</literal>-, <literal>gdbm</literal>- und
+ <literal>ndbm</literal>-Treiber unterstützen einen zusätzlichen
+ Parameter <literal>$filemode</literal>, der die gleiche Bedeutung hat
+ wie der <literal>$mode</literal>-Parameter in
+ <function>chmod</function> und den Standardwert <literal>0644</literal>
+ hat.
+ </para>
+ <para>
+ Der <literal>lmdb</literal>-Treiber akzeptiert zwei zusätzliche
+ Parameter. Der erste erlaubt es den <literal>$filemode</literal>
+ anzugeben (siehe Beschreibung weiter oben), und der zweite die
+ <literal>$mapsize</literal>, wobei der Wert ein Vielfaches der Pagesize
+ des Betriebssystems sein sollte, oder Null, um die voreingestellte
+ Mapsize zu verwenden. Der <literal>$mapsize</literal>-Parameter wird
+ ab PHP 7.3.14 bzw. 7.4.2 unterstützt.
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</para>
</refsect1>
diff --git a/reference/dba/functions/dba-replace.xml b/reference/dba/functions/dba-replace.xml
index 31a1b8044..47ea90ea7 100644
--- a/reference/dba/functions/dba-replace.xml
+++ b/reference/dba/functions/dba-replace.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 9c4c9718261c2705fef2a490e3926751134aec32 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dba-replace" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dba_replace</refname>
@@ -11,13 +11,13 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>dba_replace</methodname>
- <methodparam><type>string</type><parameter>key</parameter></methodparam>
+ <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>key</parameter></methodparam>
<methodparam><type>string</type><parameter>value</parameter></methodparam>
- <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
+ <methodparam><type>resource</type><parameter>dba</parameter></methodparam>
</methodsynopsis>
<para>
<function>dba_replace</function> ersetzt in der durch
- <parameter>handle</parameter> spezifizierten Datenbank den
+ <parameter>dba</parameter> spezifizierten Datenbank den
Eintrag, der durch <parameter>key</parameter> und
<parameter>value</parameter> beschrieben wird, oder fügt ihn ein.
</para>
@@ -44,7 +44,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>Verbindungskennung</parameter></term>
+ <term><parameter>dba</parameter></term>
<listitem>
<para>
Die Datenbank-Verbindungskennung, die von <function>dba_open</function>
diff --git a/reference/dba/functions/dba-sync.xml b/reference/dba/functions/dba-sync.xml
index f9954f904..21c8f53eb 100644
--- a/reference/dba/functions/dba-sync.xml
+++ b/reference/dba/functions/dba-sync.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 9c4c9718261c2705fef2a490e3926751134aec32 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dba-sync" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>dba_sync</refname>
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>dba_sync</methodname>
- <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
+ <methodparam><type>resource</type><parameter>dba</parameter></methodparam>
</methodsynopsis>
<para>
<function>dba_sync</function> synchronisiert die Datenbank. Dies kann
@@ -25,7 +25,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>handle</parameter></term>
+ <term><parameter>dba</parameter></term>
<listitem>
<para>
Die Datenbank-Verbindungskennung, die von <function>dba_open</function>
diff --git a/reference/dbase/book.xml b/reference/dbase/book.xml
index 19e739b04..c1bd893a0 100644
--- a/reference/dbase/book.xml
+++ b/reference/dbase/book.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: d759f85033e0d1bb4f8ce6d35777855a6b247e5b Maintainer: samesch Status: ready -->
+<!-- EN-Revision: e443388d4249fea383d6ec2d1a338be220cf95ee Maintainer: samesch Status: ready -->
<book xml:id="book.dbase" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<?phpdoc extension-membership="pecl" ?>
@@ -36,7 +36,7 @@
so dass zwei Webserver-Prozesse, die gleichzeitig dieselbe dBase-Datei
änderten, mit hoher Wahrscheinlichkeit die Datenbank ruinierten. Dies kann
auf Systemen, die die Sperren auf Prozessebene implementieren unter multithreaded
- SAPIS, wie etwa ISAPI, auch noch mit dbase 7.0.0+ passieren.
+ SAPIS, auch noch mit dbase 7.0.0+ passieren.
</para>
</caution>
<para>
diff --git a/reference/dbase/functions/dbase-create.xml b/reference/dbase/functions/dbase-create.xml
index 564fcca30..11d34d250 100644
--- a/reference/dbase/functions/dbase-create.xml
+++ b/reference/dbase/functions/dbase-create.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: dec1f8445ab2af7fbafef012fb7907ab2cd349b5 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 4754397753fd79f1c846868b66a2448babab1c54 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dbase-create" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
diff --git a/reference/dbase/functions/dbase-get-header-info.xml b/reference/dbase/functions/dbase-get-header-info.xml
index 128b03d9f..77a926004 100644
--- a/reference/dbase/functions/dbase-get-header-info.xml
+++ b/reference/dbase/functions/dbase-get-header-info.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: ca47781c2d266003cdb8c1a939bb71a7c79a26a3 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 4754397753fd79f1c846868b66a2448babab1c54 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dbase-get-header-info" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
diff --git a/reference/dbase/functions/dbase-get-record-with-names.xml b/reference/dbase/functions/dbase-get-record-with-names.xml
index 93b831c7d..677507714 100644
--- a/reference/dbase/functions/dbase-get-record-with-names.xml
+++ b/reference/dbase/functions/dbase-get-record-with-names.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: ca47781c2d266003cdb8c1a939bb71a7c79a26a3 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: samesch Status: ready -->
<refentry xml:id="function.dbase-get-record-with-names" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
diff --git a/reference/dbase/functions/dbase-get-record.xml b/reference/dbase/functions/dbase-get-record.xml
index 1c33b05b1..fc681c065 100644
--- a/reference/dbase/functions/dbase-get-record.xml
+++ b/reference/dbase/functions/dbase-get-record.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: ca47781c2d266003cdb8c1a939bb71a7c79a26a3 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: samesch Status: ready -->
<refentry xml:id="function.dbase-get-record" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
diff --git a/reference/dbase/functions/dbase-numfields.xml b/reference/dbase/functions/dbase-numfields.xml
index 5c67ab22c..4a2bdc983 100644
--- a/reference/dbase/functions/dbase-numfields.xml
+++ b/reference/dbase/functions/dbase-numfields.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: ca47781c2d266003cdb8c1a939bb71a7c79a26a3 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 4754397753fd79f1c846868b66a2448babab1c54 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dbase-numfields" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
diff --git a/reference/dbase/functions/dbase-numrecords.xml b/reference/dbase/functions/dbase-numrecords.xml
index b704fbc28..115949427 100644
--- a/reference/dbase/functions/dbase-numrecords.xml
+++ b/reference/dbase/functions/dbase-numrecords.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: ca47781c2d266003cdb8c1a939bb71a7c79a26a3 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 4754397753fd79f1c846868b66a2448babab1c54 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dbase-numrecords" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
diff --git a/reference/dbase/functions/dbase-open.xml b/reference/dbase/functions/dbase-open.xml
index f813a7da8..6fa89367d 100644
--- a/reference/dbase/functions/dbase-open.xml
+++ b/reference/dbase/functions/dbase-open.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: dec1f8445ab2af7fbafef012fb7907ab2cd349b5 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: samesch Status: ready -->
<refentry xml:id="function.dbase-open" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -11,7 +11,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <type>resource</type><methodname>dbase_open</methodname>
+ <type class="union"><type>resource</type><type>false</type></type><methodname>dbase_open</methodname>
<methodparam><type>string</type><parameter>path</parameter></methodparam>
<methodparam><type>int</type><parameter>mode</parameter></methodparam>
</methodsynopsis>
diff --git a/reference/dbase/functions/dbase-replace-record.xml b/reference/dbase/functions/dbase-replace-record.xml
index d61818d93..4cab18966 100644
--- a/reference/dbase/functions/dbase-replace-record.xml
+++ b/reference/dbase/functions/dbase-replace-record.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: ca47781c2d266003cdb8c1a939bb71a7c79a26a3 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 86e6094e86b84a51d00ab217ac50ce8dde33d82a Maintainer: samesch Status: ready -->
<refentry xml:id="function.dbase-replace-record" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -138,7 +138,7 @@ if ($db) {
&reftitle.notes;
<note>
<para>
- Boolesche Felder ergeben einen <type>integer</type>-Elementwert
+ Boolesche Felder ergeben einen <type>int</type>-Elementwert
(<literal>0</literal> oder <literal>1</literal>), wenn sie per
<function>dbase_get_record</function> oder
<function>dbase_get_record_with_names</function> gelesen werden. Werden sie
diff --git a/reference/pcre/configure.xml b/reference/pcre/configure.xml
index 8d3f13c3c..3dc41ef1d 100644
--- a/reference/pcre/configure.xml
+++ b/reference/pcre/configure.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 51c879c1636032bbcd3413674d1ad2cab0d814b3 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 03cde96680b62495c4ad11fbe6eb36bda20a892c Maintainer: samesch Status: ready -->
<section xml:id="pcre.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
&reftitle.install;
@@ -11,23 +11,16 @@
PCRE-Bibliothek verwendet werden, indem die Konfigurationsoption
<option role="configure">--with-pcre-regex=VERZEICHNIS</option> übergeben
wird, wobei <literal>VERZEICHNIS</literal> der Speicherort der
- Include- und Bibliotheks-Dateien von PCRE ist. Für PHP 5.6 und 7.0 wird
- empfohlen, PCRE 8.10 oder neuer zu verwenden.
+ Include- und Bibliotheks-Dateien von PCRE ist. Es wird empfohlen, PCRE 8.10
+ oder neuer zu verwenden. Ab PHP 7.3.0 wird PCRE2 benötigt.
</para>
<para>
- Von PHP 7.0.0 an ist die Just-In-Time-Kompilation von PCRE standardmäßig
- aktiviert, die durch Angabe der Konfigurationsoption <option
+ Die Just-In-Time-Kompilation von PCRE ist standardmäßig aktiviert, was durch
+ Angabe der Konfigurationsoption <option
role="configure">--without-pcre-jit</option> von PHP 7.0.12 an deaktiviert
werden kann.
</para>
&windows.builtin;
- <note>
- <para>
- Vor PHP 5.3.0 konnte diese Erweiterung durch Übergabe der
- Konfigurationsoption <option role="configure">--without-pcre-regex</option>
- deaktiviert werden.
- </para>
- </note>
<para>
PCRE ist ein aktives Projekt und mit den Änderungen ändert sich auch die
davon abhängige PHP-Funktionalität. Es ist möglich, dass bestimmte Teile der
@@ -49,119 +42,39 @@
</thead>
<tbody>
<row>
- <entry>7.3.0</entry>
- <entry>10.32</entry>
- <entry></entry>
- </row>
- <row>
- <entry>7.2.0</entry>
- <entry>8.41</entry>
- <entry></entry>
- </row>
- <row>
- <entry>7.0.3 / 5.6.18 / 5.5.32</entry>
- <entry>8.38</entry>
- <entry>Siehe CVE-2015-8383, CVE-2015-8386, CVE-2015-8387, CVE-2015-8389, CVE-2015-8390, CVE-2015-8391, CVE-2015-8393, CVE-2015-8394</entry>
- </row>
- <row>
- <entry>7.0.0 / 5.6.9 / 5.5.26 / 5.4.41</entry>
- <entry>8.37</entry>
- <entry>Siehe CVE-2015-2325, CVE-2015-2326</entry>
- </row>
- <row>
- <entry>5.6.0 / 5.5.10</entry>
- <entry>8.34</entry>
- <entry></entry>
- </row>
- <row>
- <entry>5.5.0 / 5.4.14 / 5.3.24</entry>
- <entry>8.32</entry>
- <entry></entry>
- </row>
- <row>
- <entry>5.4.9 / 5.3.19</entry>
- <entry>8.31</entry>
- <entry></entry>
- </row>
- <row>
- <entry>5.3.7</entry>
- <entry>8.12</entry>
- <entry></entry>
- </row>
- <row>
- <entry>5.3.6</entry>
- <entry>8.11</entry>
- <entry></entry>
- </row>
- <row>
- <entry>5.3.4</entry>
- <entry>8.10</entry>
- <entry></entry>
- </row>
- <row>
- <entry>5.3.3 / 5.2.14</entry>
- <entry>8.02</entry>
- <entry></entry>
- </row>
- <row>
- <entry>5.3.2</entry>
- <entry>8.00</entry>
- <entry></entry>
- </row>
- <row>
- <entry>5.3.0 / 5.2.13</entry>
- <entry>7.9</entry>
- <entry></entry>
- </row>
- <row>
- <entry>5.2.7</entry>
- <entry>7.8</entry>
- <entry></entry>
- </row>
- <row>
- <entry>5.2.6</entry>
- <entry>7.6</entry>
+ <entry>7.4.12, 8.0.0</entry>
+ <entry>10.35</entry>
<entry></entry>
</row>
<row>
- <entry>5.2.5</entry>
- <entry>7.3</entry>
+ <entry>7.4.6</entry>
+ <entry>10.34</entry>
<entry></entry>
</row>
<row>
- <entry>5.2.4</entry>
- <entry>7.2</entry>
+ <entry>7.4.0</entry>
+ <entry>10.33</entry>
<entry></entry>
</row>
<row>
- <entry>5.2.2</entry>
- <entry>7.0</entry>
- <entry></entry>
- </row>
- <row>
- <entry>5.2.0</entry>
- <entry>6.7</entry>
- <entry></entry>
- </row>
- <row>
- <entry>5.1.3</entry>
- <entry>6.6</entry>
+ <entry>7.3.0</entry>
+ <entry>10.32</entry>
<entry></entry>
</row>
<row>
- <entry>5.1.0</entry>
- <entry>6.2</entry>
+ <entry>7.2.0</entry>
+ <entry>8.41</entry>
<entry></entry>
</row>
<row>
- <entry>5.0.5</entry>
- <entry>5.0</entry>
- <entry></entry>
+ <entry>7.0.3</entry>
+ <entry>8.38</entry>
+ <entry>Siehe CVE-2015-8383, CVE-2015-8386, CVE-2015-8387, CVE-2015-8389, CVE-2015-8390, CVE-2015-8391, CVE-2015-8393, CVE-2015-8394</entry>
</row>
<row>
- <entry>5.0.0</entry>
- <entry>4.5</entry>
- <entry></entry>
+ <entry>7.0.0</entry>
+ <entry>8.37</entry>
+ <entry>Siehe CVE-2015-2325, CVE-2015-2326</entry>
</row>
</tbody>
</tgroup>
diff --git a/reference/pcre/functions/preg-filter.xml b/reference/pcre/functions/preg-filter.xml
index 33033a552..a1a57d1fa 100644
--- a/reference/pcre/functions/preg-filter.xml
+++ b/reference/pcre/functions/preg-filter.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: f08a981a30c7f1871577f6908c265b798f19b33f Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 22e850b66cd9a4b8f0e002bd5850f9839caaf152 Maintainer: samesch 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>
Davon abgesehen, dass <function>preg_filter</function> nur bei
diff --git a/reference/pcre/functions/preg-grep.xml b/reference/pcre/functions/preg-grep.xml
index 5d9d9b153..80e9d9dbc 100644
--- a/reference/pcre/functions/preg-grep.xml
+++ b/reference/pcre/functions/preg-grep.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: f08a981a30c7f1871577f6908c265b798f19b33f Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 22e850b66cd9a4b8f0e002bd5850f9839caaf152 Maintainer: samesch Status: ready -->
<refentry xml:id="function.preg-grep" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>preg_grep</refname>
@@ -10,14 +10,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>
Gibt ein Array zurück, das aus den Elementen des
- <parameter>input</parameter>-Arrays besteht, die auf das angegebene
+ <parameter>array</parameter>-Arrays besteht, die auf das angegebene
Suchmuster <parameter>pattern</parameter> passen.
</para>
</refsect1>
@@ -35,7 +35,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>input</parameter></term>
+ <term><parameter>array</parameter></term>
<listitem>
<para>
Das Eingabe-Array
@@ -61,7 +61,7 @@
&reftitle.returnvalues;
<para>
Gibt ein Array zurück, das mit den Schlüsseln des
- <parameter>input</parameter>-Arrays indiziert ist.
+ <parameter>array</parameter>-Arrays indiziert ist.
</para>
</refsect1>
diff --git a/reference/pcre/functions/preg-last-error.xml b/reference/pcre/functions/preg-last-error.xml
index 09360ba59..620852c05 100644
--- a/reference/pcre/functions/preg-last-error.xml
+++ b/reference/pcre/functions/preg-last-error.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 84a87a7fa91e844c792ba31f12d226bb5b1a57a2 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 3ec7b61315855e9783e20187f457399a44dd9948 Maintainer: samesch Status: ready -->
<refentry xml:id="function.preg-last-error" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>preg_last_error</refname>
@@ -16,7 +16,7 @@
<para>Liefert den Fehlercode der letzten PCRE RegEx-Auswertung.</para>
<para>
<example>
- <title><function>preg_last_error</function> Beispiel</title>
+ <title><function>preg_last_error</function>-Beispiel</title>
<programlisting role="php">
<![CDATA[
<?php
@@ -24,7 +24,7 @@
preg_match('/(?:\D+|<\d+>)*[!?]/', 'foobar foobar foobar');
if (preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR) {
- print 'Das Backtrack-Limit wurde erreicht!';
+ echo 'Das Backtrack-Limit wurde erreicht!';
}
?>
@@ -59,6 +59,15 @@ Das Backtrack-Limit wurde erreicht!
</para>
</refsect1>
+ <refsect1 role="seealso">
+ &reftitle.seealso;
+ <para>
+ <simplelist>
+ <member><function>preg_last_error_msg</function></member>
+ </simplelist>
+ </para>
+ </refsect1>
+
</refentry>
<!-- Keep this comment at the end of the file
diff --git a/reference/pcre/functions/preg-match-all.xml b/reference/pcre/functions/preg-match-all.xml
index 4c8b22a0c..cb8274c7f 100644
--- a/reference/pcre/functions/preg-match-all.xml
+++ b/reference/pcre/functions/preg-match-all.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 6e796ded268ec18315c51536c3aa6532dbeb9f71 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 4754397753fd79f1c846868b66a2448babab1c54 Maintainer: samesch Status: ready -->
<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>
@@ -177,8 +177,8 @@ echo $ausgabe[1][0] . ", " . $ausgabe[1][1] . "\n";
<listitem>
<para>
Wenn dieses Flag gesetzt ist, wird mit jeder gefundenen
- Übereinstimmung der dazugehörige Versatz in der Zeichenkette
- zurückgegeben. Beachten Sie, dass dies den Wert von
+ Übereinstimmung der dazugehörige Versatz (in Bytes) in der
+ Zeichenkette zurückgegeben. Beachten Sie, dass dies den Wert von
<parameter>matches</parameter> in ein Array von Arrays ändert, in dem jedes
Element ein Array ist, das aus der übereinstimmenden Zeichenkette
als Element <literal>0</literal> und deren Stelle in
@@ -316,29 +316,6 @@ Array
den Parameter <parameter>$flags</parameter> unterstützt.
</entry>
</row>
- <row>
- <entry>5.4.0</entry>
- <entry>
- Der Parameter <parameter>matches</parameter> ist nun optional.
- </entry>
- </row>
- <row>
- <entry>5.3.6</entry>
- <entry>
- Gibt &false; zurück, wenn <parameter>offset</parameter>
- größer als die Länge von <parameter>subject</parameter> ist.
- </entry>
- </row>
- <row>
- <entry>5.2.2</entry>
- <entry>
- Benannte Teilsuchmuster (named subpatterns) akzeptieren nun die
- Syntaxen <literal>(?<name>)</literal> und
- <literal>(?'name')</literal> sowie
- <literal>(?P<name>)</literal>. Vorherige Versionen akzeptierten
- nur <literal>(?P<name>)</literal>.
- </entry>
- </row>
</tbody>
</tgroup>
</informaltable>
diff --git a/reference/pcre/functions/preg-match.xml b/reference/pcre/functions/preg-match.xml
index 4fbda58c7..ad1cb5b12 100644
--- a/reference/pcre/functions/preg-match.xml
+++ b/reference/pcre/functions/preg-match.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 48bac4e0ab9958bb76f8ec4c3f4d2e4277e46cdc Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 22e850b66cd9a4b8f0e002bd5850f9839caaf152 Maintainer: samesch Status: ready -->
<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>
@@ -236,10 +236,10 @@ Array
</screen>
<para>
Als Alternative um die Verwendung von <function>substr</function> zu
- vermeiden, kann die <literal>\G</literal> Assertion statt des <literal>^</literal>
- Ankers verwendet werden, oder statt dessen der <literal>A</literal>
- Modifikator; beide funktionieren in Kombination mit dem Parameter
- <parameter>offset</parameter>.
+ vermeiden, kann die <literal>\G</literal>-Assertion statt des
+ <literal>^</literal>-Ankers verwendet werden, oder statt dessen der
+ <literal>A</literal>-Modifikator; beide funktionieren in Kombination
+ mit dem Parameter <parameter>offset</parameter>.
</para>
</informalexample>
</para>
@@ -279,23 +279,6 @@ Array
den Parameter <parameter>$flags</parameter> unterstützt.
</entry>
</row>
- <row>
- <entry>5.3.6</entry>
- <entry>
- Gibt &false; zurück, wenn <parameter>offset</parameter>
- größer als die Länge von <parameter>subject</parameter> ist.
- </entry>
- </row>
- <row>
- <entry>5.2.2</entry>
- <entry>
- Benannte Teilsuchmuster akzeptieren nun sowohl die Syntaxen
- <literal>(?<name>)</literal> und
- <literal>(?'name')</literal> als auch
- <literal>(?P<name>)</literal>. Vorherige Versionen akzeptierten
- nur <literal>(?P<name>)</literal>.
- </entry>
- </row>
</tbody>
</tgroup>
</informaltable>
@@ -431,6 +414,7 @@ Array
<member><function>preg_replace</function></member>
<member><function>preg_split</function></member>
<member><function>preg_last_error</function></member>
+ <member><function>preg_last_error_msg</function></member>
</simplelist>
</para>
</refsect1>
diff --git a/reference/pcre/functions/preg-quote.xml b/reference/pcre/functions/preg-quote.xml
index 8dcf60f5e..d10f6bb06 100644
--- a/reference/pcre/functions/preg-quote.xml
+++ b/reference/pcre/functions/preg-quote.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 82cff784b0822fc8d51cd93338e2dad58732f0c8 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 22e850b66cd9a4b8f0e002bd5850f9839caaf152 Maintainer: samesch Status: ready -->
<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> setzt einen Backslash vor jedes Zeichen von
@@ -91,9 +91,9 @@
</entry>
</row>
<row>
- <entry>5.3.0</entry>
+ <entry>7.2.0</entry>
<entry>
- Das Zeichen <literal>-</literal> wird nun maskiert.
+ <parameter>delimiter</parameter> ist jetzt ein Nullable-Typ.
</entry>
</row>
</tbody>
diff --git a/reference/pcre/functions/preg-replace-callback.xml b/reference/pcre/functions/preg-replace-callback.xml
index 7d2cb5a44..38f53a895 100644
--- a/reference/pcre/functions/preg-replace-callback.xml
+++ b/reference/pcre/functions/preg-replace-callback.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 80872147aa52367137bd3d168412f70cbe2ddf9c Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 22e850b66cd9a4b8f0e002bd5850f9839caaf152 Maintainer: samesch Status: ready -->
<refentry xml:id="function.preg-replace-callback" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>preg_replace_callback</refname>
@@ -10,12 +10,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>
@@ -180,7 +180,7 @@ fclose($fp);
&reftitle.examples;
<para>
<example>
- <title><function>preg_replace_callback</function> Beispiel</title>
+ <title><function>preg_replace_callback</function>-Beispiel</title>
<programlisting role="php">
<![CDATA[
<?php
diff --git a/reference/pcre/functions/preg-replace.xml b/reference/pcre/functions/preg-replace.xml
index d52b3627f..43b80207f 100644
--- a/reference/pcre/functions/preg-replace.xml
+++ b/reference/pcre/functions/preg-replace.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 09483f34bc8bbece8699318d38b824a286505d16 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 22e850b66cd9a4b8f0e002bd5850f9839caaf152 Maintainer: samesch Status: ready -->
<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>
Durchsucht die Zeichenkette <parameter>subject</parameter> nach
@@ -162,45 +162,6 @@
</para>
</refsect1>
- <refsect1 role="changelog">
- &reftitle.changelog;
- <para>
- <informaltable>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>&Version;</entry>
- <entry>&Description;</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>7.0.0</entry>
- <entry>
- Die Unterstützung für den <literal>/e</literal> Modifikator wurde entfernt.
- Verwenden Sie statt dessen <function>preg_replace_callback</function>.
- </entry>
- </row>
- <row>
- <entry>5.5.0</entry>
- <entry>
- Der Modifikator <literal>/e</literal> ist veraltet und sollte nicht
- mehr verwendet werden. Verwenden Sie stattdessen
- <function>preg_replace_callback</function>. Für ergänzende
- Informationen über Sicherheitsrisiken
- siehe <link linkend="reference.pcre.pattern.modifiers.eval">PREG_REPLACE_EVAL</link>.
- </entry>
- </row>
- <row>
- <entry>5.1.0</entry>
- <entry>Den Parameter <parameter>count</parameter> hinzugefügt</entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- </para>
- </refsect1>
-
<refsect1 role="examples">
&reftitle.examples;
<para>
diff --git a/reference/pcre/functions/preg-split.xml b/reference/pcre/functions/preg-split.xml
index aa1d9acaf..c76d19734 100644
--- a/reference/pcre/functions/preg-split.xml
+++ b/reference/pcre/functions/preg-split.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: b7ca52647b4b9e55079959d9202f58faaf3aea0b Maintainer: samesch Status: ready -->
+<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: samesch Status: ready -->
<refentry xml:id="function.preg-split" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -11,7 +11,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <type>array</type><methodname>preg_split</methodname>
+ <type class="union"><type>array</type><type>false</type></type><methodname>preg_split</methodname>
<methodparam><type>string</type><parameter>pattern</parameter></methodparam>
<methodparam><type>string</type><parameter>subject</parameter></methodparam>
<methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>-1</initializer></methodparam>
@@ -116,7 +116,7 @@
<para>
<example>
<title>
- <function>preg_split</function> Beispiel: Eine Zeichenkette in ihre
+ <function>preg_split</function>-Beispiel: Eine Zeichenkette in ihre
Bestandteile zerlegen
</title>
<programlisting role="php">
diff --git a/reference/pcre/ini.xml b/reference/pcre/ini.xml
index 2a92c62f0..155785b52 100644
--- a/reference/pcre/ini.xml
+++ b/reference/pcre/ini.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: c0024126d1a5ed05d9e3ff83e5cbff3d8cb5e259 Maintainer: samesch Status: ready -->
+<!-- EN-Revision: 86e6094e86b84a51d00ab217ac50ce8dde33d82a Maintainer: samesch Status: ready -->
<section xml:id="pcre.configuration" xmlns="http://docbook.org/ns/docbook">
&reftitle.runtime;
&extension.runtime;
@@ -52,7 +52,7 @@
<varlistentry xml:id="ini.pcre.backtrack-limit">
<term>
<parameter>pcre.backtrack_limit</parameter>
- <type>integer</type>
+ <type>int</type>
</term>
<listitem>
<para>
@@ -63,7 +63,7 @@
<varlistentry xml:id="ini.pcre.recursion-limit">
<term>
<parameter>pcre.recursion_limit</parameter>
- <type>integer</type>
+ <type>int</type>
</term>
<listitem>
<para>
@@ -77,7 +77,7 @@
<varlistentry xml:id="ini.pcre.jit">
<term>
<parameter>pcre.jit</parameter>
- <type>boolean</type>
+ <type>bool</type>
</term>
<listitem>
<para>