Skip to content

Commit c8ba91f

Browse files
authored
Synchronize manual with stubs for PHP 8.4 - part 2 (#4178)
1 parent d75a541 commit c8ba91f

File tree

17 files changed

+66
-50
lines changed

17 files changed

+66
-50
lines changed

reference/datetime/dateinterval/createfromdatestring.xml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
&reftitle.description;
1111
<para>&style.oop;</para>
1212
<methodsynopsis role="DateInterval">
13-
<modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>DateInterval</type><type>false</type></type><methodname>DateInterval::createFromDateString</methodname>
13+
<modifier>public</modifier> <modifier>static</modifier> <type>DateInterval</type><methodname>DateInterval::createFromDateString</methodname>
1414
<methodparam><type>string</type><parameter>datetime</parameter></methodparam>
1515
</methodsynopsis>
1616
<para>&style.procedural;</para>
@@ -53,7 +53,16 @@
5353
<refsect1 role="returnvalues">
5454
&reftitle.returnvalues;
5555
<para>
56-
Returns a new <classname>DateInterval</classname> instance on success, &return.falseforfailure;.
56+
Returns <classname>DateTimeImmutable</classname> on success.
57+
&return.falseforfailure.style.procedural;
58+
</para>
59+
</refsect1>
60+
61+
<refsect1 role="errors">
62+
&reftitle.errors;
63+
<para>
64+
Object Oriented API only: If an invalid Date/Time string is passed,
65+
<exceptionname>DateMalformedStringException</exceptionname> is thrown.
5766
</para>
5867
</refsect1>
5968

@@ -68,6 +77,17 @@
6877
</row>
6978
</thead>
7079
<tbody>
80+
<row>
81+
<entry>8.3.0</entry>
82+
<entry>
83+
<methodname>DateInterval::createFromDateString</methodname> now throws
84+
<exceptionname>DateMalformedStringException</exceptionname> if an
85+
invalid string is passed. Previously, it returned <literal>false</literal>,
86+
and a warning was emitted.
87+
<function>date_interval_create_from_date_string</function> has not been
88+
changed.
89+
</entry>
90+
</row>
7191
<row>
7292
<entry>8.2.0</entry>
7393
<entry>

reference/datetime/datetime/modify.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
&reftitle.description;
1212
<para>&style.oop;</para>
1313
<methodsynopsis role="DateTime">
14-
<modifier>public</modifier> <type class="union"><type>DateTime</type><type>false</type></type><methodname>DateTime::modify</methodname>
14+
<modifier>public</modifier> <type>DateTime</type><methodname>DateTime::modify</methodname>
1515
<methodparam><type>string</type><parameter>modifier</parameter></methodparam>
1616
</methodsynopsis>
1717
<para>&style.procedural;</para>
@@ -42,14 +42,15 @@
4242
<refsect1 role="returnvalues">
4343
&reftitle.returnvalues;
4444
<para>
45-
&date.datetime.return.modifiedobjectorfalseforfailure;
45+
Returns <classname>DateTime</classname> on success.
46+
&return.falseforfailure.style.procedural;
4647
</para>
4748
</refsect1>
4849

4950
<refsect1 role="errors">
5051
&reftitle.errors;
5152
<para>
52-
Object Orientated API only: If an invalid Date/Time string is passed,
53+
Object Oriented API only: If an invalid Date/Time string is passed,
5354
<exceptionname>DateMalformedStringException</exceptionname> is thrown.
5455
</para>
5556
</refsect1>
@@ -68,10 +69,10 @@
6869
<row>
6970
<entry>8.3.0</entry>
7071
<entry>
71-
Now throws
72-
<exceptionname>DateMalformedStringException</exceptionname> with
73-
<methodname>DateTime::modify</methodname> if an invalid string is
74-
passed, instead of a warning.
72+
<methodname>DateTime::modify</methodname> now throws
73+
<exceptionname>DateMalformedStringException</exceptionname> if an
74+
invalid string is passed. Previously, it returned <literal>false</literal>,
75+
and a warning was emitted.
7576
<function>date_modify</function> has not been changed.
7677
</entry>
7778
</row>

reference/datetime/datetime/sub.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<refsect1 role="errors">
6565
&reftitle.errors;
6666
<para>
67-
Object Orientated API only: If an unsupported operation is attempted, such as using a
67+
Object Oriented API only: If an unsupported operation is attempted, such as using a
6868
<classname>DateInterval</classname> object representing relative time
6969
specifications such as <literal>next weekday</literal>, a
7070
<exceptionname>DateInvalidOperationException</exceptionname> is thrown.

reference/datetime/datetimeimmutable/modify.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<refsect1 role="description">
1010
&reftitle.description;
1111
<methodsynopsis role="DateTimeImmutable">
12-
<modifier>public</modifier> <type class="union"><type>DateTimeImmutable</type><type>false</type></type><methodname>DateTimeImmutable::modify</methodname>
12+
<modifier>public</modifier> <type>DateTimeImmutable</type><methodname>DateTimeImmutable::modify</methodname>
1313
<methodparam><type>string</type><parameter>modifier</parameter></methodparam>
1414
</methodsynopsis>
1515
<para>
@@ -33,7 +33,8 @@
3333
<refsect1 role="returnvalues">
3434
&reftitle.returnvalues;
3535
<para>
36-
Returns a new modified DateTimeImmutable object&return.falseforfailure;.
36+
Returns <classname>DateTimeImmutable</classname> on success.
37+
&return.falseforfailure.style.procedural;
3738
</para>
3839
</refsect1>
3940

@@ -60,9 +61,10 @@
6061
<row>
6162
<entry>8.3.0</entry>
6263
<entry>
63-
Now throws
64+
<methodname>DateTimeImmutable::modify</methodname> now throws
6465
<exceptionname>DateMalformedStringException</exceptionname> if an
65-
invalid string is passed, instead of a warning.
66+
invalid string is passed. Previously, it returned <literal>false</literal>,
67+
and a warning was emitted.
6668
</entry>
6769
</row>
6870
</tbody>

reference/mysqli/mysqli_driver/report-mode.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
&reftitle.description;
1212
<para>&style.oop;</para>
1313
<fieldsynopsis>
14-
<type>int</type><varname linkend="mysqli-driver.report-mode">mysqli_driver->report_mode</varname>
14+
<type>int</type><varname linkend="mysqli-driver.report-mode">mysqli_driver-&gt;report_mode</varname>
1515
</fieldsynopsis>
1616
<para>&style.procedural;</para>
1717
<methodsynopsis>
18-
<type>bool</type><methodname>mysqli_report</methodname>
18+
<type>true</type><methodname>mysqli_report</methodname>
1919
<methodparam><type>int</type><parameter>flags</parameter></methodparam>
2020
</methodsynopsis>
2121
<para>
@@ -83,7 +83,7 @@
8383
<refsect1 role="returnvalues">
8484
&reftitle.returnvalues;
8585
<para>
86-
Returns &true;.
86+
&return.true.always;
8787
</para>
8888
</refsect1>
8989

@@ -199,7 +199,6 @@ try {
199199
</refsect1>
200200

201201
</refentry>
202-
203202
<!-- Keep this comment at the end of the file
204203
Local variables:
205204
mode: sgml

reference/phar/Phar/copy.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<refsect1 role="description">
1010
&reftitle.description;
1111
<methodsynopsis role="Phar">
12-
<modifier>public</modifier> <type>bool</type><methodname>Phar::copy</methodname>
12+
<modifier>public</modifier> <type>true</type><methodname>Phar::copy</methodname>
1313
<methodparam><type>string</type><parameter>from</parameter></methodparam>
1414
<methodparam><type>string</type><parameter>to</parameter></methodparam>
1515
</methodsynopsis>
@@ -47,15 +47,14 @@
4747
<refsect1 role="returnvalues">
4848
&reftitle.returnvalues;
4949
<para>
50-
returns &true; on success, but it is safer to encase method call in a
51-
try/catch block and assume success if no exception is thrown.
50+
&return.true.always;
5251
</para>
5352
</refsect1>
5453

5554
<refsect1 role="errors">
5655
&reftitle.errors;
5756
<para>
58-
throws <classname>UnexpectedValueException</classname> if the source file does not
57+
Throws <classname>UnexpectedValueException</classname> if the source file does not
5958
exist, the destination file already exists, write access is disabled, opening either
6059
file fails, reading the source file fails, or a <classname>PharException</classname>
6160
if writing the changes to the phar fails.

reference/phar/Phar/decompressFiles.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<refsect1 role="description">
1010
&reftitle.description;
1111
<methodsynopsis role="Phar">
12-
<modifier>public</modifier> <type>bool</type><methodname>Phar::decompressFiles</methodname>
12+
<modifier>public</modifier> <type>true</type><methodname>Phar::decompressFiles</methodname>
1313
<void/>
1414
</methodsynopsis>
1515
&phar.write;
@@ -40,7 +40,7 @@
4040
<refsect1 role="returnvalues">
4141
&reftitle.returnvalues;
4242
<para>
43-
&return.success;
43+
&return.true.always;
4444
</para>
4545
</refsect1>
4646

reference/phar/Phar/delMetadata.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<refsect1 role="description">
1010
&reftitle.description;
1111
<methodsynopsis role="Phar">
12-
<modifier>public</modifier> <type>bool</type><methodname>Phar::delMetadata</methodname>
12+
<modifier>public</modifier> <type>true</type><methodname>Phar::delMetadata</methodname>
1313
<void/>
1414
</methodsynopsis>
1515
&phar.write;
@@ -28,8 +28,7 @@
2828
<refsect1 role="returnvalues">
2929
&reftitle.returnvalues;
3030
<para>
31-
returns &true; on success, but it is better to check for thrown exception,
32-
and assume success if none is thrown.
31+
&return.true.always;
3332
</para>
3433
</refsect1>
3534

reference/phar/Phar/delete.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<refsect1 role="description">
1010
&reftitle.description;
1111
<methodsynopsis role="Phar">
12-
<modifier>public</modifier> <type>bool</type><methodname>Phar::delete</methodname>
12+
<modifier>public</modifier> <type>true</type><methodname>Phar::delete</methodname>
1313
<methodparam><type>string</type><parameter>localName</parameter></methodparam>
1414
</methodsynopsis>
1515
&phar.write;
@@ -40,8 +40,7 @@
4040
<refsect1 role="returnvalues">
4141
&reftitle.returnvalues;
4242
<para>
43-
returns &true; on success, but it is better to check for thrown exception,
44-
and assume success if none is thrown.
43+
&return.true.always;
4544
</para>
4645
</refsect1>
4746

reference/phar/Phar/unlinkArchive.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<refsect1 role="description">
1010
&reftitle.description;
1111
<methodsynopsis role="Phar">
12-
<modifier>final</modifier> <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Phar::unlinkArchive</methodname>
12+
<modifier>final</modifier> <modifier>public</modifier> <modifier>static</modifier> <type>true</type><methodname>Phar::unlinkArchive</methodname>
1313
<methodparam><type>string</type><parameter>filename</parameter></methodparam>
1414
</methodsynopsis>
1515
<para>
@@ -37,7 +37,7 @@
3737
<refsect1 role="returnvalues">
3838
&reftitle.returnvalues;
3939
<para>
40-
&return.success;
40+
&return.true.always;
4141
</para>
4242
</refsect1>
4343

0 commit comments

Comments
 (0)