Skip to content

Commit 816a8b9

Browse files
GirgiasGirgias
committed
Review comments + fix GH-1392 
1 parent 5810c08 commit 816a8b9

File tree

2 files changed

+55
-24
lines changed

2 files changed

+55
-24
lines changed

‎reference/pdo_mysql/constants.xml‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,19 @@
2929
<varlistentry xml:id="pdo.constants.mysql-attr-local-infile-directory">
3030
<term>
3131
<constant>PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY</constant>
32-
(<type>string</type>)
32+
(<type>int</type>)
3333
</term>
3434
<listitem>
3535
<simpara>
36-
&Alias; <constant>Pdo\Mysql::ATTR_LOCAL_INFILE_DIRECTORY</constant>
36+
&Alias; <constant>Pdo\Mysql::ATTR_LOCAL_INFILE_DIRECTORY</constant>.
37+
Available as of PHP 8.1.0.
3738
</simpara>
3839
</listitem>
3940
</varlistentry>
4041
<varlistentry xml:id="pdo.constants.mysql-attr-init-command">
4142
<term>
4243
<constant>PDO::MYSQL_ATTR_INIT_COMMAND</constant>
43-
(<type>string</type>)
44+
(<type>int</type>)
4445
</term>
4546
<listitem>
4647
<simpara>
@@ -88,7 +89,7 @@
8889
</term>
8990
<listitem>
9091
<simpara>
91-
&Alias; <constant>Pdo\Mysql::ATTR_DIRECT_QUERY</constant>
92+
&Alias; <constant>PDO::ATTR_EMULATE_PREPARES</constant>
9293
</simpara>
9394
</listitem>
9495
</varlistentry>
@@ -126,6 +127,18 @@
126127
</listitem>
127128
</varlistentry>
128129

130+
<varlistentry xml:id="pdo.constants.mysql-attr-server-public-key">
131+
<term>
132+
<constant>PDO::MYSQL_ATTR_SERVER_PUBLIC_KEY</constant>
133+
(<type>int</type>)
134+
</term>
135+
<listitem>
136+
<simpara>
137+
&Alias; <constant>Pdo\Mysql::ATTR_SERVER_PUBLIC_KEY</constant>
138+
</simpara>
139+
</listitem>
140+
</varlistentry>
141+
129142
<varlistentry xml:id="pdo.constants.mysql-attr-ssl-ca">
130143
<term>
131144
<constant>PDO::MYSQL_ATTR_SSL_CA</constant>

‎reference/pdo_mysql/pdo-mysql.xml‎

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,9 @@ foreach ($unbufferedResult as $row) {
240240
designated directory.
241241
Available as of PHP 8.1.0.
242242
</simpara>
243-
<note>
244-
<simpara>
245-
Can only be used in the <parameter>driver_options</parameter>
246-
array when constructing a new database handle.
247-
</simpara>
248-
</note>
243+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
244+
<xi:fallback/>
245+
</xi:include>
249246
</listitem>
250247
</varlistentry>
251248
<varlistentry xml:id="pdo-mysql.constants.attr-init-command">
@@ -255,12 +252,9 @@ foreach ($unbufferedResult as $row) {
255252
Command to execute when connecting to the MySQL server.
256253
Will automatically be re-executed when reconnecting.
257254
</simpara>
258-
<note>
259-
<simpara>
260-
Can only be used in the <parameter>driver_options</parameter>
261-
array when constructing a new database handle.
262-
</simpara>
263-
</note>
255+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
256+
<xi:fallback/>
257+
</xi:include>
264258
</listitem>
265259
</varlistentry>
266260
<varlistentry xml:id="pdo-mysql.constants.attr-read-default-file">
@@ -306,7 +300,7 @@ foreach ($unbufferedResult as $row) {
306300
<term><constant>Pdo\Mysql::ATTR_DIRECT_QUERY</constant></term>
307301
<listitem>
308302
<simpara>
309-
Perform direct queries, don't use prepared statements.
303+
&Alias; <constant>PDO::ATTR_EMULATE_PREPARES</constant>.
310304
</simpara>
311305
</listitem>
312306
</varlistentry>
@@ -317,6 +311,9 @@ foreach ($unbufferedResult as $row) {
317311
Return the number of found (matched) rows,
318312
not the number of changed rows.
319313
</simpara>
314+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
315+
<xi:fallback/>
316+
</xi:include>
320317
</listitem>
321318
</varlistentry>
322319
<varlistentry xml:id="pdo-mysql.constants.attr-ignore-space">
@@ -326,6 +323,9 @@ foreach ($unbufferedResult as $row) {
326323
Permit spaces after SQL function names.
327324
Makes all SQL functions names reserved words.
328325
</simpara>
326+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
327+
<xi:fallback/>
328+
</xi:include>
329329
</listitem>
330330
</varlistentry>
331331
<varlistentry xml:id="pdo-mysql.constants.attr-max-buffer-size">
@@ -349,20 +349,20 @@ foreach ($unbufferedResult as $row) {
349349
<methodname>PDO::prepare</methodname> and
350350
<methodname>PDO::query</methodname> when set to &false;.
351351
</simpara>
352-
<note>
353-
<simpara>
354-
Can only be used in the <parameter>driver_options</parameter>
355-
array when constructing a new database handle.
356-
</simpara>
357-
</note>
352+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
353+
<xi:fallback/>
354+
</xi:include>
358355
</listitem>
359356
</varlistentry>
360357
<varlistentry xml:id="pdo-mysql.constants.attr-server-public-key">
361358
<term><constant>Pdo\Mysql::ATTR_SERVER_PUBLIC_KEY</constant></term>
362359
<listitem>
363360
<simpara>
364-
TODO, Available since when?
361+
<acronym>RSA</acronym> public key file used with the SHA-256 based authentication.
365362
</simpara>
363+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
364+
<xi:fallback/>
365+
</xi:include>
366366
</listitem>
367367
</varlistentry>
368368
<varlistentry xml:id="pdo-mysql.constants.attr-ssl-key">
@@ -371,6 +371,9 @@ foreach ($unbufferedResult as $row) {
371371
<simpara>
372372
The file path to the <acronym>SSL</acronym> key.
373373
</simpara>
374+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
375+
<xi:fallback/>
376+
</xi:include>
374377
</listitem>
375378
</varlistentry>
376379
<varlistentry xml:id="pdo-mysql.constants.attr-ssl-cert">
@@ -379,6 +382,9 @@ foreach ($unbufferedResult as $row) {
379382
<simpara>
380383
The file path to the <acronym>SSL</acronym> certificate.
381384
</simpara>
385+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
386+
<xi:fallback/>
387+
</xi:include>
382388
</listitem>
383389
</varlistentry>
384390
<varlistentry xml:id="pdo-mysql.constants.attr-ssl-ca">
@@ -387,6 +393,9 @@ foreach ($unbufferedResult as $row) {
387393
<simpara>
388394
The file path to the <acronym>SSL</acronym> certificate authority.
389395
</simpara>
396+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
397+
<xi:fallback/>
398+
</xi:include>
390399
</listitem>
391400
</varlistentry>
392401
<varlistentry xml:id="pdo-mysql.constants.attr-ssl-capath">
@@ -397,6 +406,9 @@ foreach ($unbufferedResult as $row) {
397406
<acronym>SSL</acronym> <acronym>CA</acronym> certificates,
398407
which are stored in <acronym>PEM</acronym> format.
399408
</simpara>
409+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
410+
<xi:fallback/>
411+
</xi:include>
400412
</listitem>
401413
</varlistentry>
402414
<varlistentry xml:id="pdo-mysql.constants.attr-ssl-cipher">
@@ -407,6 +419,9 @@ foreach ($unbufferedResult as $row) {
407419
<acronym>SSL</acronym> encryption, in a format understood by OpenSSL.
408420
For example: <literal>DHE-RSA-AES256-SHA:AES128-SHA</literal>
409421
</simpara>
422+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
423+
<xi:fallback/>
424+
</xi:include>
410425
</listitem>
411426
</varlistentry>
412427
<varlistentry xml:id="pdo-mysql.constants.attr-ssl-verify-server-cert">
@@ -421,6 +436,9 @@ foreach ($unbufferedResult as $row) {
421436
This option is available only with mysqlnd.
422437
</simpara>
423438
</note>
439+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('pdo-mysql.constants.attr-local-infile')//db:note/.)">
440+
<xi:fallback/>
441+
</xi:include>
424442
</listitem>
425443
</varlistentry>
426444
</variablelist>

0 commit comments

Comments
 (0)