Skip to content

Commit aa120f3

Browse files
kocsismateGirgias
andauthored
Sync parameter type and name changes (#5073)
Co-authored-by: Gina Peter Banyard <[email protected]>
1 parent 27f559e commit aa120f3

File tree

11 files changed

+133
-37
lines changed

11 files changed

+133
-37
lines changed

reference/ldap/functions/ldap-get-option.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
&reftitle.description;
1111
<methodsynopsis>
1212
<type>bool</type><methodname>ldap_get_option</methodname>
13-
<methodparam><type>LDAP\Connection</type><parameter>ldap</parameter></methodparam>
13+
<methodparam><type class="union"><type>LDAP\Connection</type><type>null</type></type><parameter>ldap</parameter></methodparam>
1414
<methodparam><type>int</type><parameter>option</parameter></methodparam>
1515
<methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>int</type></type><parameter role="reference">value</parameter><initializer>&null;</initializer></methodparam>
1616
</methodsynopsis>
@@ -27,7 +27,9 @@
2727
<term><parameter>ldap</parameter></term>
2828
<listitem>
2929
<para>
30-
&ldap.parameter.ldap;
30+
Either an <classname>LDAP\Connection</classname> instance, returned by
31+
<function>ldap_connect</function>, to get the option for that connection,
32+
or &null; to get the global option.
3133
</para>
3234
</listitem>
3335
</varlistentry>
@@ -242,6 +244,12 @@
242244
</row>
243245
</thead>
244246
<tbody>
247+
<row>
248+
<entry>8.5.0</entry>
249+
<entry>
250+
<parameter>ldap</parameter> is now nullable.
251+
</entry>
252+
</row>
245253
&ldap.changelog.ldap-object;
246254
</tbody>
247255
</tgroup>

reference/openssl/functions/openssl-cms-encrypt.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<methodparam><type class="union"><type>array</type><type>null</type></type><parameter>headers</parameter></methodparam>
1717
<methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
1818
<methodparam choice="opt"><type>int</type><parameter>encoding</parameter><initializer><constant>OPENSSL_ENCODING_SMIME</constant></initializer></methodparam>
19-
<methodparam choice="opt"><type>int</type><parameter>cipher_algo</parameter><initializer><constant>OPENSSL_CIPHER_AES_128_CBC</constant></initializer></methodparam>
19+
<methodparam choice="opt"><type class="union"><type>string</type><type>int</type></type><parameter>cipher_algo</parameter><initializer><constant>OPENSSL_CIPHER_AES_128_CBC</constant></initializer></methodparam>
2020
</methodsynopsis>
2121
<para>
2222
This function encrypts content to one or more recipients,
@@ -80,7 +80,7 @@
8080
<term><parameter>cipher_algo</parameter></term>
8181
<listitem>
8282
<para>
83-
A cypher to use.
83+
A cipher to use.
8484
</para>
8585
</listitem>
8686
</varlistentry>
@@ -105,6 +105,13 @@
105105
</row>
106106
</thead>
107107
<tbody>
108+
<row>
109+
<entry>8.5.0</entry>
110+
<entry>
111+
<parameter>cipher_algo</parameter> is now of type <type>int</type> or <type>string</type>.
112+
Previously, it was of type <type>int</type>.
113+
</entry>
114+
</row>
108115
<row>
109116
<entry>8.1.0</entry>
110117
<entry>

reference/pcntl/functions/pcntl-getcpuaffinity.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
<refsect1 role="description">
1010
&reftitle.description;
1111
<methodsynopsis>
12-
<type class="union"><type>bool</type><type>array</type></type><methodname>pcntl_getcpuaffinity</methodname>
13-
<methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>pid</parameter><initializer>&null;</initializer></methodparam>
12+
<type class="union"><type>array</type><type>false</type></type><methodname>pcntl_getcpuaffinity</methodname>
13+
<methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>process_id</parameter><initializer>&null;</initializer></methodparam>
1414
</methodsynopsis>
1515
<simpara>
16-
Retrieve the cpu affinity of the <parameter>pid</parameter>.
16+
Retrieve the cpu affinity of the <parameter>process_id</parameter>.
1717
</simpara>
1818
</refsect1>
1919

2020
<refsect1 role="parameters">
2121
&reftitle.parameters;
2222
<variablelist>
2323
<varlistentry>
24-
<term><parameter>pid</parameter></term>
24+
<term><parameter>process_id</parameter></term>
2525
<listitem>
2626
<simpara>
2727
If &null;, the current process ID is used.
@@ -43,11 +43,11 @@
4343
&reftitle.errors;
4444
<simpara>
4545
A <classname>ValueError</classname> is thrown when
46-
<parameter>pid</parameter> is an invalid process id
46+
<parameter>process_id</parameter> is an invalid process id
4747
or the cpu mask had failed to be created.
4848
</simpara>
4949
<simpara>
50-
If <parameter>pid</parameter> is a process for which the current
50+
If <parameter>process_id</parameter> is a process for which the current
5151
user has no allowed permission, a <constant>E_WARNING</constant>
5252
is emitted.
5353
</simpara>

reference/pcntl/functions/pcntl-setcpuaffinity.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,28 @@
1010
&reftitle.description;
1111
<methodsynopsis>
1212
<type>bool</type><methodname>pcntl_setcpuaffinity</methodname>
13-
<methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>pid</parameter><initializer>&null;</initializer></methodparam>
14-
<methodparam choice="opt"><type>array</type><parameter>hmask</parameter></methodparam>
13+
<methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>process_id</parameter><initializer>&null;</initializer></methodparam>
14+
<methodparam choice="opt"><type>array</type><parameter>cpu_ids</parameter><initializer>[]</initializer></methodparam>
1515
</methodsynopsis>
1616
<simpara>
17-
Sets the cpu affinity for the <parameter>pid</parameter> with the cpu affinity mask given by
18-
<parameter>hmask</parameter>.
17+
Sets the cpu affinity for the <parameter>process_id</parameter> with the cpu affinity mask given by
18+
<parameter>cpu_ids</parameter>.
1919
</simpara>
2020
</refsect1>
2121

2222
<refsect1 role="parameters">
2323
&reftitle.parameters;
2424
<variablelist>
2525
<varlistentry>
26-
<term><parameter>pid</parameter></term>
26+
<term><parameter>process_id</parameter></term>
2727
<listitem>
2828
<simpara>
2929
If &null;, the current process ID is used.
3030
</simpara>
3131
</listitem>
3232
</varlistentry>
3333
<varlistentry>
34-
<term><parameter>hmask</parameter></term>
34+
<term><parameter>cpu_ids</parameter></term>
3535
<listitem>
3636
<simpara>
3737
The cpu affinity mask comprised of one or more cpu id for binding the process to.
@@ -53,9 +53,9 @@
5353
&reftitle.errors;
5454
<simpara>
5555
A <classname>TypeError</classname> is thrown if one
56-
of the cpu id from the <parameter>hmask</parameter> is invalid.
56+
of the cpu id from the <parameter>cpu_ids</parameter> is invalid.
5757
A <classname>ValueError</classname> is thrown if
58-
<parameter>pid</parameter> is an invalid process id
58+
<parameter>process_id</parameter> is an invalid process id
5959
or the cpu mask had failed to be created.
6060
</simpara>
6161
</refsect1>

reference/pgsql/functions/pg-copy-from.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<type>bool</type><methodname>pg_copy_from</methodname>
1616
<methodparam><type>PgSql\Connection</type><parameter>connection</parameter></methodparam>
1717
<methodparam><type>string</type><parameter>table_name</parameter></methodparam>
18-
<methodparam><type>array</type><parameter>rows</parameter></methodparam>
18+
<methodparam><type class="union"><type>array</type><type>Traversable</type></type><parameter>rows</parameter></methodparam>
1919
<methodparam choice="opt"><type>string</type><parameter>separator</parameter><initializer>"\t"</initializer></methodparam>
2020
<methodparam choice="opt"><type>string</type><parameter>null_as</parameter><initializer>"\\\\N"</initializer></methodparam>
2121
</methodsynopsis>
@@ -48,7 +48,7 @@
4848
<term><parameter>rows</parameter></term>
4949
<listitem>
5050
<para>
51-
An <type>array</type> of data to be copied into <parameter>table_name</parameter>.
51+
An <type>iterable</type> data to be copied into <parameter>table_name</parameter>.
5252
Each value in <parameter>rows</parameter> becomes a row in <parameter>table_name</parameter>.
5353
Each value in <parameter>rows</parameter> should be a delimited string of the values
5454
to insert into each field. Values should be linefeed terminated.
@@ -95,6 +95,13 @@
9595
</row>
9696
</thead>
9797
<tbody>
98+
<row>
99+
<entry>8.5.0</entry>
100+
<entry>
101+
<parameter>rows</parameter> is now of type <type>iterable</type>.
102+
Previously, it was of type <type>array</type>.
103+
</entry>
104+
</row>
98105
&pgsql.changelog.connection-object;
99106
</tbody>
100107
</tgroup>

reference/spl/splfileobject/fwrite.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<methodsynopsis role="SplFileObject">
1212
<modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>SplFileObject::fwrite</methodname>
1313
<methodparam><type>string</type><parameter>data</parameter></methodparam>
14-
<methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>0</initializer></methodparam>
14+
<methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>length</parameter><initializer>&null;</initializer></methodparam>
1515
</methodsynopsis>
1616
<para>
1717
Writes the contents of <parameter>data</parameter> to the file
@@ -34,7 +34,7 @@
3434
<term><parameter>length</parameter></term>
3535
<listitem>
3636
<para>
37-
If the <parameter>length</parameter> argument is given, writing will
37+
If the <parameter>length</parameter> argument is <type>int</type>, writing will
3838
stop after <parameter>length</parameter> bytes have been written or
3939
the end of <parameter>data</parameter> is reached, whichever comes
4040
first.
@@ -63,6 +63,12 @@
6363
</row>
6464
</thead>
6565
<tbody>
66+
<row>
67+
<entry>8.5.0</entry>
68+
<entry>
69+
<parameter>length</parameter> is now nullable.
70+
</entry>
71+
</row>
6672
<row>
6773
<entry>7.4.0</entry>
6874
<entry>

reference/zlib/functions/deflate_init.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<methodsynopsis>
1212
<type class="union"><type>DeflateContext</type><type>false</type></type><methodname>deflate_init</methodname>
1313
<methodparam><type>int</type><parameter>encoding</parameter></methodparam>
14-
<methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
14+
<methodparam choice="opt"><type class="union"><type>array</type><type>object</type></type><parameter>options</parameter><initializer>[]</initializer></methodparam>
1515
</methodsynopsis>
1616
<para>
1717
Initializes an incremental deflate context using the specified

reference/zlib/functions/gzfile.xml

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<methodsynopsis>
1111
<type class="union"><type>array</type><type>false</type></type><methodname>gzfile</methodname>
1212
<methodparam><type>string</type><parameter>filename</parameter></methodparam>
13-
<methodparam choice="opt"><type>int</type><parameter>use_include_path</parameter><initializer>0</initializer></methodparam>
13+
<methodparam choice="opt"><type>bool</type><parameter>use_include_path</parameter><initializer>&false;</initializer></methodparam>
1414
</methodsynopsis>
15-
<para>
15+
<para>
1616
This function is identical to <function>readgzfile</function>, except that
1717
it returns the file in an array.
1818
</para>
@@ -32,11 +32,9 @@
3232
<varlistentry>
3333
<term><parameter>use_include_path</parameter></term>
3434
<listitem>
35-
<para>
36-
You can set this optional parameter to <literal>1</literal>, if you
37-
want to search for the file in the <link
38-
linkend="ini.include-path">include_path</link> too.
39-
</para>
35+
<simpara>
36+
If set to &true;, files in the <link linkend="ini.include-path">include_path</link> are searched for too.
37+
</simpara>
4038
</listitem>
4139
</varlistentry>
4240
</variablelist>
@@ -49,6 +47,30 @@
4947
&return.falseforfailure;.
5048
</para>
5149
</refsect1>
50+
51+
<refsect1 role="changelog">
52+
&reftitle.changelog;
53+
<informaltable>
54+
<tgroup cols="2">
55+
<thead>
56+
<row>
57+
<entry>&Version;</entry>
58+
<entry>&Description;</entry>
59+
</row>
60+
</thead>
61+
<tbody>
62+
<row>
63+
<entry>8.5.0</entry>
64+
<entry>
65+
<parameter>use_include_path</parameter> is now of type <type>bool</type>.
66+
Previously, it was of type <type>int</type>.
67+
</entry>
68+
</row>
69+
</tbody>
70+
</tgroup>
71+
</informaltable>
72+
</refsect1>
73+
5274
<refsect1 role="examples">
5375
&reftitle.examples;
5476
<para>
@@ -67,6 +89,7 @@ foreach ($lines as $line) {
6789
</example>
6890
</para>
6991
</refsect1>
92+
7093
<refsect1 role="seealso">
7194
&reftitle.seealso;
7295
<para>

reference/zlib/functions/gzopen.xml

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<type class="union"><type>resource</type><type>false</type></type><methodname>gzopen</methodname>
1212
<methodparam><type>string</type><parameter>filename</parameter></methodparam>
1313
<methodparam><type>string</type><parameter>mode</parameter></methodparam>
14-
<methodparam choice="opt"><type>int</type><parameter>use_include_path</parameter><initializer>0</initializer></methodparam>
14+
<methodparam choice="opt"><type>bool</type><parameter>use_include_path</parameter><initializer>&false;</initializer></methodparam>
1515
</methodsynopsis>
1616
<para>
1717
Opens a gzip (.gz) file for reading or writing.
@@ -52,11 +52,9 @@
5252
<varlistentry>
5353
<term><parameter>use_include_path</parameter></term>
5454
<listitem>
55-
<para>
56-
You can set this optional parameter to <literal>1</literal>, if you
57-
want to search for the file in the <link
58-
linkend="ini.include-path">include_path</link> too.
59-
</para>
55+
<simpara>
56+
If set to &true;, files in the <link linkend="ini.include-path">include_path</link> are searched for too.
57+
</simpara>
6058
</listitem>
6159
</varlistentry>
6260
</variablelist>
@@ -73,6 +71,30 @@
7371
If the open fails, the function returns &false;.
7472
</para>
7573
</refsect1>
74+
75+
<refsect1 role="changelog">
76+
&reftitle.changelog;
77+
<informaltable>
78+
<tgroup cols="2">
79+
<thead>
80+
<row>
81+
<entry>&Version;</entry>
82+
<entry>&Description;</entry>
83+
</row>
84+
</thead>
85+
<tbody>
86+
<row>
87+
<entry>8.5.0</entry>
88+
<entry>
89+
<parameter>use_include_path</parameter> is now of type <type>bool</type>.
90+
Previously, it was of type <type>int</type>.
91+
</entry>
92+
</row>
93+
</tbody>
94+
</tgroup>
95+
</informaltable>
96+
</refsect1>
97+
7698
<refsect1 role="examples">
7799
&reftitle.examples;
78100
<para>

reference/zlib/functions/inflate_init.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<methodsynopsis>
1212
<type class="union"><type>InflateContext</type><type>false</type></type><methodname>inflate_init</methodname>
1313
<methodparam><type>int</type><parameter>encoding</parameter></methodparam>
14-
<methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
14+
<methodparam choice="opt"><type class="union"><type>array</type><type>object</type></type><parameter>options</parameter><initializer>[]</initializer></methodparam>
1515
</methodsynopsis>
1616
<para>
1717
Initialize an incremental inflate context with the specified

0 commit comments

Comments
 (0)