Skip to content

Commit 1dc3cfa

Browse files
kocsismatekocsismate
committed
Review round 2
1 parent 3ddf0ad commit 1dc3cfa

File tree

5 files changed

+36
-43
lines changed

5 files changed

+36
-43
lines changed

‎reference/pdo/constants.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,17 @@
118118
</simpara>
119119
</listitem>
120120
</varlistentry>
121+
<varlistentry xml:id="pdo.constants.fetch-default">
122+
<term>
123+
<constant>PDO::FETCH_DEFAULT</constant>
124+
(<type>int</type>)
125+
</term>
126+
<listitem>
127+
<simpara>
128+
Specifies that the default fetch method shall be used.
129+
</simpara>
130+
</listitem>
131+
</varlistentry>
121132
<varlistentry xml:id="pdo.constants.fetch-lazy">
122133
<term>
123134
<constant>PDO::FETCH_LAZY</constant>

‎reference/pdo/pdo/query.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,29 @@
1111
&reftitle.description;
1212
<methodsynopsis>
1313
<modifier>public</modifier> <type class="union"><type>PDOStatement</type><type>false</type></type><methodname>PDO::query</methodname>
14-
<methodparam><type>string</type><parameter>query</parameter></methodparam>
15-
<methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>fetchMode</parameter><initializer>&null;</initializer></methodparam>
16-
<methodparam rep="repeat"><type>mixed</type><parameter>fetchModeArgs</parameter></methodparam>
14+
<methodparam><type>string</type><parameter>query</parameter></methodparam>ű<methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>fetchMode</parameter><initializer>&null;</initializer></methodparam>
1715
</methodsynopsis>
1816

1917
<methodsynopsis>
2018
<modifier>public</modifier> <type class="union"><type>PDOStatement</type><type>false</type></type><methodname>PDO::query</methodname>
2119
<methodparam><type>string</type><parameter>query</parameter></methodparam>
2220
<methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>fetchMode</parameter><initializer>&null;</initializer></methodparam>
23-
<methodparam rep="repeat"><type>mixed</type><parameter>fetchModeArgs</parameter></methodparam>
21+
<methodparam><type>int</type><parameter>colno</parameter></methodparam>
2422
</methodsynopsis>
2523

2624
<methodsynopsis>
2725
<modifier>public</modifier> <type class="union"><type>PDOStatement</type><type>false</type></type><methodname>PDO::query</methodname>
2826
<methodparam><type>string</type><parameter>query</parameter></methodparam>
2927
<methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>fetchMode</parameter><initializer>&null;</initializer></methodparam>
30-
<methodparam rep="repeat"><type>mixed</type><parameter>fetchModeArgs</parameter></methodparam>
28+
<methodparam><type>string</type><parameter>classname</parameter></methodparam>
29+
<methodparam><type>array</type><parameter>ctorargs</parameter></methodparam>
3130
</methodsynopsis>
3231

3332
<methodsynopsis>
3433
<modifier>public</modifier> <type class="union"><type>PDOStatement</type><type>false</type></type><methodname>PDO::query</methodname>
3534
<methodparam><type>string</type><parameter>query</parameter></methodparam>
3635
<methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>fetchMode</parameter><initializer>&null;</initializer></methodparam>
37-
<methodparam rep="repeat"><type>mixed</type><parameter>fetchModeArgs</parameter></methodparam>
36+
<methodparam><type>object</type><parameter>object</parameter></methodparam>
3837
</methodsynopsis>
3938

4039
<para>

‎reference/pdo/pdostatement/debugdumpparams.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<refsect1 role="returnvalues">
3838
&reftitle.returnvalues;
3939
<para>
40-
&return.void;
40+
Returns &null;, or &false; in case of an error.
4141
</para>
4242
</refsect1>
4343

‎reference/pdo/pdostatement/fetchall.xml‎

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,16 @@
1111
&reftitle.description;
1212
<methodsynopsis>
1313
<modifier>public</modifier> <type>array</type><methodname>PDOStatement::fetchAll</methodname>
14-
<methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_BOTH</initializer></methodparam>
15-
<methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
14+
<methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_DEFAULT</initializer></methodparam>
15+
<methodparam rep="opt"><type>mixed</type><parameter>args</parameter></methodparam>
1616
</methodsynopsis>
1717

18+
<methodsynopsis>
19+
<modifier>public</modifier> <type>array</type><methodname>PDOStatement::fetchAll</methodname>
20+
<methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_DEFAULT</initializer></methodparam>
21+
<methodparam rep="opt"><type>mixed</type><parameter>args</parameter></methodparam>
22+
<methodparam rep="opt"><type>array</type><parameter>ctor_args</parameter><initializer>[]</initializer></methodparam>
23+
</methodsynopsis>
1824
</refsect1>
1925

2026
<refsect1 role="parameters">
@@ -28,7 +34,7 @@
2834
Controls the contents of the returned array as documented in
2935
<function>PDOStatement::fetch</function>.
3036
Defaults to value of <constant>PDO::ATTR_DEFAULT_FETCH_MODE</constant>
31-
(which defaults to <constant>PDO::FETCH_BOTH</constant>)
37+
(which defaults to <constant>PDO::FETCH_DEFAULT</constant>)
3238
</para>
3339
<para>
3440
To return an array consisting of all values of a single column from
@@ -78,7 +84,7 @@
7884
</listitem>
7985
</varlistentry>
8086
<varlistentry>
81-
<term><parameter>args</parameter></term>
87+
<term><parameter>ctor_args</parameter></term>
8288
<listitem>
8389
<para>
8490
Arguments of custom class constructor when the <parameter>mode</parameter>
@@ -109,30 +115,6 @@
109115
</para>
110116
</refsect1>
111117

112-
<refsect1 role="changelog">
113-
&reftitle.changelog;
114-
<para>
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-
<row>
125-
<entry>8.0.0</entry>
126-
<entry>
127-
<parameter>args</parameter> is now a variadic parameter.
128-
</entry>
129-
</row>
130-
</tbody>
131-
</tgroup>
132-
</informaltable>
133-
</para>
134-
</refsect1>
135-
136118
<refsect1 role="examples">
137119
&reftitle.examples;
138120
<para>

‎reference/pdo/pdostatement/setfetchmode.xml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,29 @@
99
</refnamediv>
1010
<refsect1 role="description">
1111
&reftitle.description;
12+
1213
<methodsynopsis>
1314
<modifier>public</modifier> <type>bool</type><methodname>PDOStatement::setFetchMode</methodname>
1415
<methodparam><type>int</type><parameter>mode</parameter></methodparam>
15-
<methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
1616
</methodsynopsis>
1717

1818
<methodsynopsis>
1919
<modifier>public</modifier> <type>bool</type><methodname>PDOStatement::setFetchMode</methodname>
20-
<methodparam><type>int</type><parameter>mode</parameter></methodparam>
21-
<methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
20+
<methodparam><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_COLUMN</initializer></methodparam>
21+
<methodparam><type>int</type><parameter>colno</parameter></methodparam>
2222
</methodsynopsis>
2323

2424
<methodsynopsis>
2525
<modifier>public</modifier> <type>bool</type><methodname>PDOStatement::setFetchMode</methodname>
26-
<methodparam><type>int</type><parameter>mode</parameter></methodparam>
27-
<methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
26+
<methodparam><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_CLASS</initializer></methodparam>
27+
<methodparam><type>string</type><parameter>class</parameter></methodparam>
28+
<methodparam><type>array</type><parameter>ctor_args</parameter></methodparam>
2829
</methodsynopsis>
2930

3031
<methodsynopsis>
3132
<modifier>public</modifier> <type>bool</type><methodname>PDOStatement::setFetchMode</methodname>
32-
<methodparam><type>int</type><parameter>mode</parameter></methodparam>
33-
<methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
33+
<methodparam><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_INTO</initializer></methodparam>
34+
<methodparam><type>object</type><parameter>object</parameter></methodparam>
3435
</methodsynopsis>
3536

3637
</refsect1>
@@ -63,7 +64,7 @@
6364
</listitem>
6465
</varlistentry>
6566
<varlistentry>
66-
<term><parameter>ctorargs</parameter></term>
67+
<term><parameter>ctor_args</parameter></term>
6768
<listitem>
6869
<para>
6970
Constructor arguments.

0 commit comments

Comments
 (0)