Skip to content

Commit 4286a59

Browse files
mumumumumumu
committed
Synchronize manual with stubs for PHP 8.4 - part 4
php/doc-en@ed1aff1
1 parent 467658c commit 4286a59

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+748
-149
lines changed

‎reference/uodbc/functions/odbc-autocommit.xml‎

Lines changed: 3 additions & 2 deletions
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: db22a7cfcbc3af221f67e228336ac3e2d62aaf2c Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: ed1aff13602c94f86344bdd7c4fbc31f5a71bf84 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: takagi,mumumu -->
55
<refentry xml:id="function.odbc-autocommit" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -11,7 +11,7 @@
1111
&reftitle.description;
1212
<methodsynopsis>
1313
<type class="union"><type>int</type><type>bool</type></type><methodname>odbc_autocommit</methodname>
14-
<methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
14+
<methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
1515
<methodparam choice="opt"><type class="union"><type>bool</type><type>null</type></type><parameter>enable</parameter><initializer>&null;</initializer></methodparam>
1616
</methodsynopsis>
1717
<para>
@@ -72,6 +72,7 @@
7272
</row>
7373
</thead>
7474
<tbody>
75+
&odbc.changelog.connection-param;
7576
<row>
7677
<entry>8.3.0</entry>
7778
<entry>

‎reference/uodbc/functions/odbc-binmode.xml‎

Lines changed: 20 additions & 7 deletions
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: db22a7cfcbc3af221f67e228336ac3e2d62aaf2c Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: ed1aff13602c94f86344bdd7c4fbc31f5a71bf84 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: takagi,mumumu -->
55
<refentry xml:id="function.odbc-binmode" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -11,7 +11,7 @@
1111
&reftitle.description;
1212
<methodsynopsis>
1313
<type>true</type><methodname>odbc_binmode</methodname>
14-
<methodparam><type>resource</type><parameter>statement</parameter></methodparam>
14+
<methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
1515
<methodparam><type>int</type><parameter>mode</parameter></methodparam>
1616
</methodsynopsis>
1717
<para>
@@ -91,11 +91,7 @@
9191
<term><parameter>statement</parameter></term>
9292
<listitem>
9393
<para>
94-
結果 ID。
95-
</para>
96-
<para>
97-
<parameter>statement</parameter> に <literal>0</literal> を指定した場合、
98-
ここで設定した値は、新規の結果に関するデフォルト値として用いられます。
94+
&odbc.result.object;
9995
</para>
10096
</listitem>
10197
</varlistentry>
@@ -139,6 +135,23 @@
139135
&return.true.always;
140136
</para>
141137
</refsect1>
138+
139+
<refsect1 role="changelog">
140+
&reftitle.changelog;
141+
<informaltable>
142+
<tgroup cols="2">
143+
<thead>
144+
<row>
145+
<entry>&Version;</entry>
146+
<entry>&Description;</entry>
147+
</row>
148+
</thead>
149+
<tbody>
150+
&odbc.changelog.result-param;
151+
</tbody>
152+
</tgroup>
153+
</informaltable>
154+
</refsect1>
142155
</refentry>
143156
<!-- Keep this comment at the end of the file
144157
Local variables:

‎reference/uodbc/functions/odbc-close.xml‎

Lines changed: 20 additions & 2 deletions
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: 902c2b77f827e8d0ecccf4f62fb90065d2f6ef79 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: ed1aff13602c94f86344bdd7c4fbc31f5a71bf84 Maintainer: hirokawa Status: ready -->
44
<refentry xml:id="function.odbc-close" xmlns="http://docbook.org/ns/docbook">
55
<refnamediv>
66
<refname>odbc_close</refname>
@@ -10,7 +10,7 @@
1010
&reftitle.description;
1111
<methodsynopsis>
1212
<type>void</type><methodname>odbc_close</methodname>
13-
<methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
13+
<methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
1414
</methodsynopsis>
1515
<para>
1616
指定された接続 ID が指すデータベースサーバーへの接続を閉じます。
@@ -35,6 +35,24 @@
3535
&return.void;
3636
</para>
3737
</refsect1>
38+
39+
<refsect1 role="changelog">
40+
&reftitle.changelog;
41+
<informaltable>
42+
<tgroup cols="2">
43+
<thead>
44+
<row>
45+
<entry>&Version;</entry>
46+
<entry>&Description;</entry>
47+
</row>
48+
</thead>
49+
<tbody>
50+
&odbc.changelog.connection-param;
51+
</tbody>
52+
</tgroup>
53+
</informaltable>
54+
</refsect1>
55+
3856
<refsect1 role="notes">
3957
&reftitle.notes;
4058
<note>

‎reference/uodbc/functions/odbc-columnprivileges.xml‎

Lines changed: 22 additions & 5 deletions
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: 902c2b77f827e8d0ecccf4f62fb90065d2f6ef79 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: ed1aff13602c94f86344bdd7c4fbc31f5a71bf84 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: takagi,mumumu -->
55
<refentry xml:id="function.odbc-columnprivileges" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -10,8 +10,8 @@
1010
<refsect1 role="description">
1111
&reftitle.description;
1212
<methodsynopsis>
13-
<type class="union"><type>resource</type><type>false</type></type><methodname>odbc_columnprivileges</methodname>
14-
<methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
13+
<type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_columnprivileges</methodname>
14+
<methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
1515
<methodparam><type class="union"><type>string</type><type>null</type></type><parameter>catalog</parameter></methodparam>
1616
<methodparam><type>string</type><parameter>schema</parameter></methodparam>
1717
<methodparam><type>string</type><parameter>table</parameter></methodparam>
@@ -72,8 +72,8 @@
7272
<refsect1 role="returnvalues">
7373
&reftitle.returnvalues;
7474
<para>
75-
ODBC 結果 ID を返します。&return.falseforfailure;。
76-
この結果 ID を使用して、カラムや関連する権限の一覧を取得します。
75+
&odbc.result.object-return-falseforfailure;
76+
この結果オブジェクトを使用して、カラムや関連する権限の一覧を取得します。
7777
</para>
7878
<para>
7979
結果は以下のカラムを有します。
@@ -95,6 +95,23 @@
9595
</simpara>
9696
</refsect1>
9797

98+
<refsect1 role="changelog">
99+
&reftitle.changelog;
100+
<informaltable>
101+
<tgroup cols="2">
102+
<thead>
103+
<row>
104+
<entry>&Version;</entry>
105+
<entry>&Description;</entry>
106+
</row>
107+
</thead>
108+
<tbody>
109+
&odbc.changelog.connection-param;
110+
</tbody>
111+
</tgroup>
112+
</informaltable>
113+
</refsect1>
114+
98115
<refsect1 role="examples">
99116
&reftitle.examples;
100117
<example xml:id="odbc-columnprivileges.example.basic">

‎reference/uodbc/functions/odbc-columns.xml‎

Lines changed: 5 additions & 4 deletions
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: 902c2b77f827e8d0ecccf4f62fb90065d2f6ef79 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: ed1aff13602c94f86344bdd7c4fbc31f5a71bf84 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: takagi,mumumu -->
55
<refentry xml:id="function.odbc-columns" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -10,8 +10,8 @@
1010
<refsect1 role="description">
1111
&reftitle.description;
1212
<methodsynopsis>
13-
<type class="union"><type>resource</type><type>false</type></type><methodname>odbc_columns</methodname>
14-
<methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
13+
<type class="union"><type>Odbc\Result</type><type>false</type></type><methodname>odbc_columns</methodname>
14+
<methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
1515
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>catalog</parameter><initializer>&null;</initializer></methodparam>
1616
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter><initializer>&null;</initializer></methodparam>
1717
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>table</parameter><initializer>&null;</initializer></methodparam>
@@ -72,7 +72,7 @@
7272
<refsect1 role="returnvalues">
7373
&reftitle.returnvalues;
7474
<para>
75-
ODBC 結果 ID を返します。&return.falseforfailure;。
75+
&odbc.result.object-return-falseforfailure;
7676
</para>
7777
<para>
7878
結果セットは以下のカラムを有しています。
@@ -115,6 +115,7 @@
115115
</row>
116116
</thead>
117117
<tbody>
118+
&odbc.changelog.connection-param;
118119
<row>
119120
<entry>8.0.0</entry>
120121
<entry>

‎reference/uodbc/functions/odbc-commit.xml‎

Lines changed: 19 additions & 2 deletions
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: 902c2b77f827e8d0ecccf4f62fb90065d2f6ef79 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: ed1aff13602c94f86344bdd7c4fbc31f5a71bf84 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: takagi -->
55
<refentry xml:id="function.odbc-commit" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -11,7 +11,7 @@
1111
&reftitle.description;
1212
<methodsynopsis>
1313
<type>bool</type><methodname>odbc_commit</methodname>
14-
<methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
14+
<methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
1515
</methodsynopsis>
1616
<para>
1717
その接続におけるすべての実行中のトランザクションをコミットします。
@@ -36,6 +36,23 @@
3636
&return.success;
3737
</para>
3838
</refsect1>
39+
40+
<refsect1 role="changelog">
41+
&reftitle.changelog;
42+
<informaltable>
43+
<tgroup cols="2">
44+
<thead>
45+
<row>
46+
<entry>&Version;</entry>
47+
<entry>&Description;</entry>
48+
</row>
49+
</thead>
50+
<tbody>
51+
&odbc.changelog.connection-param;
52+
</tbody>
53+
</tgroup>
54+
</informaltable>
55+
</refsect1>
3956
</refentry>
4057
<!-- Keep this comment at the end of the file
4158
Local variables:

‎reference/uodbc/functions/odbc-connect.xml‎

Lines changed: 19 additions & 2 deletions
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: 902c2b77f827e8d0ecccf4f62fb90065d2f6ef79 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: ed1aff13602c94f86344bdd7c4fbc31f5a71bf84 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: takagi,mumumu -->
55
<refentry xml:id="function.odbc-connect" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -11,7 +11,7 @@
1111
<refsect1 role="description">
1212
&reftitle.description;
1313
<methodsynopsis>
14-
<type class="union"><type>resource</type><type>false</type></type><methodname>odbc_connect</methodname>
14+
<type class="union"><type>Odbc\Connection</type><type>false</type></type><methodname>odbc_connect</methodname>
1515
<methodparam><type>string</type><parameter>dsn</parameter></methodparam>
1616
<methodparam><type>string</type><parameter>user</parameter></methodparam>
1717
<methodparam><type>string</type><parameter>password</parameter></methodparam>
@@ -110,6 +110,23 @@
110110
</para>
111111
</refsect1>
112112

113+
<refsect1 role="changelog">
114+
&reftitle.changelog;
115+
<informaltable>
116+
<tgroup cols="2">
117+
<thead>
118+
<row>
119+
<entry>&Version;</entry>
120+
<entry>&Description;</entry>
121+
</row>
122+
</thead>
123+
<tbody>
124+
&odbc.changelog.connection-return;
125+
</tbody>
126+
</tgroup>
127+
</informaltable>
128+
</refsect1>
129+
113130
<refsect1 role="examples">
114131
&reftitle.examples;
115132
<para>

‎reference/uodbc/functions/odbc-cursor.xml‎

Lines changed: 20 additions & 3 deletions
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: 902c2b77f827e8d0ecccf4f62fb90065d2f6ef79 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: ed1aff13602c94f86344bdd7c4fbc31f5a71bf84 Maintainer: hirokawa Status: ready -->
44
<!-- Credits: mumumu -->
55
<refentry xml:id="function.odbc-cursor" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -11,7 +11,7 @@
1111
&reftitle.description;
1212
<methodsynopsis>
1313
<type class="union"><type>string</type><type>false</type></type><methodname>odbc_cursor</methodname>
14-
<methodparam><type>resource</type><parameter>statement</parameter></methodparam>
14+
<methodparam><type>Odbc\Result</type><parameter>statement</parameter></methodparam>
1515
</methodsynopsis>
1616
<para>
1717
指定された接続 ID
@@ -27,7 +27,7 @@
2727
<term><parameter>statement</parameter></term>
2828
<listitem>
2929
<para>
30-
結果 ID。
30+
&odbc.result.object;
3131
</para>
3232
</listitem>
3333
</varlistentry>
@@ -41,6 +41,23 @@
4141
&return.falseforfailure;
4242
</para>
4343
</refsect1>
44+
45+
<refsect1 role="changelog">
46+
&reftitle.changelog;
47+
<informaltable>
48+
<tgroup cols="2">
49+
<thead>
50+
<row>
51+
<entry>&Version;</entry>
52+
<entry>&Description;</entry>
53+
</row>
54+
</thead>
55+
<tbody>
56+
&odbc.changelog.result-param;
57+
</tbody>
58+
</tgroup>
59+
</informaltable>
60+
</refsect1>
4461
</refentry>
4562

4663
<!-- Keep this comment at the end of the file

‎reference/uodbc/functions/odbc-data-source.xml‎

Lines changed: 19 additions & 2 deletions
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: db22a7cfcbc3af221f67e228336ac3e2d62aaf2c Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: ed1aff13602c94f86344bdd7c4fbc31f5a71bf84 Maintainer: takagi Status: ready -->
44
<!-- Credits: mumumu -->
55
<refentry xml:id="function.odbc-data-source" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -11,7 +11,7 @@
1111
&reftitle.description;
1212
<methodsynopsis>
1313
<type class="union"><type>array</type><type>null</type><type>false</type></type><methodname>odbc_data_source</methodname>
14-
<methodparam><type>resource</type><parameter>odbc</parameter></methodparam>
14+
<methodparam><type>Odbc\Connection</type><parameter>odbc</parameter></methodparam>
1515
<methodparam><type>int</type><parameter>fetch_type</parameter></methodparam>
1616
</methodsynopsis>
1717
<para>
@@ -52,6 +52,23 @@
5252
</para>
5353
</refsect1>
5454

55+
<refsect1 role="changelog">
56+
&reftitle.changelog;
57+
<informaltable>
58+
<tgroup cols="2">
59+
<thead>
60+
<row>
61+
<entry>&Version;</entry>
62+
<entry>&Description;</entry>
63+
</row>
64+
</thead>
65+
<tbody>
66+
&odbc.changelog.connection-param;
67+
</tbody>
68+
</tgroup>
69+
</informaltable>
70+
</refsect1>
71+
5572
<refsect1 role="examples">
5673
&reftitle.examples;
5774
<example xml:id="odbc-data-source.example.basic">

0 commit comments

Comments
 (0)