Skip to content

Commit ae807aa

Browse files
committed
Add explicit warning about CSV function's escape parameterName
php/doc-en@cef78b0
1 parent bd5ae18 commit ae807aa

File tree

7 files changed

+25
-7
lines changed

7 files changed

+25
-7
lines changed

language-snippets.ent

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 1cdefe36cdfc0e3acaff6a0db918d4b037081aa8 Maintainer: takagi Status: working -->
3+
<!-- EN-Revision: cef78b0fbe0fbe02003699b027ab50200097e949 Maintainer: takagi Status: working -->
44
<!-- Credits: hirokawa,haruki,shimooka,mumumu -->
55

66
<!ENTITY installation.enabled.disable 'この拡張モジュールはデフォルトで有効になっています。無効にしたい場合は、次のオプションを指定してコンパイルします。'>
@@ -1028,6 +1028,18 @@ $font = 'SomeFont';
10281028
</entry>
10291029
</row>'>
10301030

1031+
<!-- CSV -->
1032+
<!ENTITY warning.csv.escape-parameter '<warning xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"><simpara>
1033+
<parameter>escape</parameter>
1034+
が空の文字列(<literal>""</literal>)以外に設定されているとき、
1035+
<link xlink:href="&url.rfc;4180">RFC 4180</link>
1036+
に準拠しない CSV が生成されたり、PHP の CSV
1037+
関数を介してラウンドトリップ(往復変換)でデータが壊れる可能性があります。
1038+
<parameter>escape</parameter>のデフォルト値は<literal>"\\"</literal>
1039+
なので、明示的に空の文字列を指定すること推奨します。デフォルト値は、PHP 9.0
1040+
以降の将来のバージョンで変更予定です。
1041+
</simpara></warning>'>
1042+
10311043
<!-- DBM notes -->
10321044

10331045
<!ENTITY dbm.dbm-identifier.description '<varlistentry xmlns="http://docbook.org/ns/docbook"><term><parameter>dbm_identifier</parameter></term><listitem><para><function>dbmopen</function> が返す DBM リンク識別子。</para></listitem></varlistentry>'>

reference/filesystem/functions/fgetcsv.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 61374bbe228e8e9c55a24aba59a1e2bb2a871148 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: cef78b0fbe0fbe02003699b027ab50200097e949 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: shimooka,mumumu -->
55
<refentry xml:id="function.fgetcsv" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -104,6 +104,7 @@
104104
</varlistentry>
105105
</variablelist>
106106
</para>
107+
&warning.csv.escape-parameter;
107108
</refsect1>
108109

109110
<refsect1 role="returnvalues">

reference/filesystem/functions/fputcsv.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 291d60430d25f2b508bebb5720b41cc68f9a6ec1 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: cef78b0fbe0fbe02003699b027ab50200097e949 Maintainer: takagi Status: ready -->
44
<!-- Credits: mumumu -->
55
<refentry xml:id="function.fputcsv" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -84,6 +84,7 @@
8484
</varlistentry>
8585
</variablelist>
8686
</para>
87+
&warning.csv.escape-parameter;
8788
<note>
8889
<para>
8990
<parameter>enclosure</parameter> がフィールド内に含まれる場合は、同じ文字を二度続けることでエスケープします。

reference/spl/splfileobject/fgetcsv.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 61374bbe228e8e9c55a24aba59a1e2bb2a871148 Maintainer: masakielastic Status: ready -->
3+
<!-- EN-Revision: cef78b0fbe0fbe02003699b027ab50200097e949 Maintainer: masakielastic Status: ready -->
44
<!-- Credits: mumumu -->
55
<refentry xml:id="splfileobject.fgetcsv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
<refnamediv>
@@ -78,6 +78,7 @@
7878
</varlistentry>
7979
</variablelist>
8080
</para>
81+
&warning.csv.escape-parameter;
8182
</refsect1>
8283

8384
<refsect1 role="returnvalues">

reference/spl/splfileobject/fputcsv.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: d51166ca16fda8e766849505b84f9306ef443f71 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: cef78b0fbe0fbe02003699b027ab50200097e949 Maintainer: takagi Status: ready -->
44
<!-- Credits: mumumu -->
55
<refentry xml:id="splfileobject.fputcsv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
<refnamediv>
@@ -78,6 +78,7 @@
7878
ただし、その直前に <parameter>escape</parameter> がある場合は別です。
7979
</para>
8080
</note>
81+
&warning.csv.escape-parameter;
8182
</refsect1>
8283

8384
<refsect1 role="returnvalues">

reference/spl/splfileobject/setcsvcontrol.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: d51166ca16fda8e766849505b84f9306ef443f71 Maintainer: masakielastic Status: ready -->
3+
<!-- EN-Revision: cef78b0fbe0fbe02003699b027ab50200097e949 Maintainer: masakielastic Status: ready -->
44
<!-- Credits: mumumu -->
55
<refentry xml:id="splfileobject.setcsvcontrol" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
<refnamediv>
@@ -52,6 +52,7 @@
5252
</varlistentry>
5353
</variablelist>
5454
</para>
55+
&warning.csv.escape-parameter;
5556
</refsect1>
5657

5758
<refsect1 role="returnvalues">

reference/strings/functions/str-getcsv.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 61374bbe228e8e9c55a24aba59a1e2bb2a871148 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: cef78b0fbe0fbe02003699b027ab50200097e949 Maintainer: takagi Status: ready -->
44
<!-- Credits: mumumu -->
55
<refentry xml:id="function.str-getcsv" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -86,6 +86,7 @@
8686
</varlistentry>
8787
</variablelist>
8888
</para>
89+
&warning.csv.escape-parameter;
8990
</refsect1>
9091

9192
<refsect1 role="returnvalues">

0 commit comments

Comments
 (0)