Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Synchronize manual with stubs for PHP 8.4 - part 8 #4227

Merged
merged 5 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions reference/intl/numberformatter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,25 +134,25 @@
<modifier>public</modifier>
<modifier>const</modifier>
<type>int</type>
<varname linkend="numberformatter.constants.round-away-from-zero">NumberFormatter::ROUND_AWAY_FROM_ZERO</varname>
<varname linkend="numberformatter.constants.round-ceiling">NumberFormatter::ROUND_CEILING</varname>
</fieldsynopsis>
<fieldsynopsis>
<modifier>public</modifier>
<modifier>const</modifier>
<type>int</type>
<varname linkend="numberformatter.constants.round-ceiling">NumberFormatter::ROUND_CEILING</varname>
<varname linkend="numberformatter.constants.round-floor">NumberFormatter::ROUND_FLOOR</varname>
</fieldsynopsis>
<fieldsynopsis>
<modifier>public</modifier>
<modifier>const</modifier>
<type>int</type>
<varname linkend="numberformatter.constants.round-floor">NumberFormatter::ROUND_FLOOR</varname>
<varname linkend="numberformatter.constants.round-down">NumberFormatter::ROUND_DOWN</varname>
</fieldsynopsis>
<fieldsynopsis>
<modifier>public</modifier>
<modifier>const</modifier>
<type>int</type>
<varname linkend="numberformatter.constants.round-down">NumberFormatter::ROUND_DOWN</varname>
<varname linkend="numberformatter.constants.round-up">NumberFormatter::ROUND_UP</varname>
</fieldsynopsis>
<fieldsynopsis>
<modifier>public</modifier>
Expand All @@ -164,7 +164,7 @@
<modifier>public</modifier>
<modifier>const</modifier>
<type>int</type>
<varname linkend="numberformatter.constants.round-up">NumberFormatter::ROUND_UP</varname>
<varname linkend="numberformatter.constants.round-away-from-zero">NumberFormatter::ROUND_AWAY_FROM_ZERO</varname>
</fieldsynopsis>
<fieldsynopsis>
<modifier>public</modifier>
Expand All @@ -176,13 +176,13 @@
<modifier>public</modifier>
<modifier>const</modifier>
<type>int</type>
<varname linkend="numberformatter.constants.round-halfdown">NumberFormatter::ROUND_HALFDOWN</varname>
<varname linkend="numberformatter.constants.round-halfodd">NumberFormatter::ROUND_HALFODD</varname>
</fieldsynopsis>
<fieldsynopsis>
<modifier>public</modifier>
<modifier>const</modifier>
<type>int</type>
<varname linkend="numberformatter.constants.round-halfodd">NumberFormatter::ROUND_HALFODD</varname>
<varname linkend="numberformatter.constants.round-halfdown">NumberFormatter::ROUND_HALFDOWN</varname>
</fieldsynopsis>
<fieldsynopsis>
<modifier>public</modifier>
Expand Down
6 changes: 3 additions & 3 deletions reference/pcntl/functions/pcntl-waitid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>pcntl_waitid</methodname>
<methodparam choice="opt"><type>int</type><parameter>idtype</parameter><initializer>P_ALL</initializer></methodparam>
<methodparam choice="opt"><type>int</type><parameter>id</parameter><initializer>null</initializer></methodparam>
<methodparam choice="opt"><type>int</type><parameter>idtype</parameter><initializer><constant>P_ALL</constant></initializer></methodparam>
<methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>id</parameter><initializer>&null;</initializer></methodparam>
<methodparam choice="opt"><type>array</type><parameter role="reference">info</parameter><initializer>[]</initializer></methodparam>
<methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>WEXITED</initializer></methodparam>
<methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>WEXITED</constant></initializer></methodparam>
</methodsynopsis>
<para>
Obtains status information pertaining to termination, stop, and/or continue
Expand Down
12 changes: 10 additions & 2 deletions reference/pgsql/functions/pg-select.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<type class="union"><type>array</type><type>string</type><type>false</type></type><methodname>pg_select</methodname>
<methodparam><type>PgSql\Connection</type><parameter>connection</parameter></methodparam>
<methodparam><type>string</type><parameter>table_name</parameter></methodparam>
<methodparam><type>array</type><parameter>conditions</parameter></methodparam>
<methodparam choice="opt"><type>array</type><parameter>conditions</parameter><initializer>[]</initializer></methodparam>
<methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>PGSQL_DML_EXEC</constant></initializer></methodparam>
<methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer><constant>PGSQL_ASSOC</constant></initializer></methodparam>
</methodsynopsis>
Expand Down Expand Up @@ -75,7 +75,9 @@
<listitem>
<para>
An <type>array</type> whose keys are field names in the table <parameter>table_name</parameter>,
and whose values are the conditions that a row must meet to be retrieved.
and whose values are the conditions that a row must meet to be retrieved. As of PHP 8.4.0,
if an empty array is provided, no conditions will apply. Previously, the function failed with
an empty <parameter>conditions</parameter> argument.
Girgias marked this conversation as resolved.
Show resolved Hide resolved
</para>
</listitem>
</varlistentry>
Expand Down Expand Up @@ -132,6 +134,12 @@
</row>
</thead>
<tbody>
<row>
<entry>8.4.0</entry>
<entry>
<parameter>conditions</parameter> is now optional.
</entry>
</row>
&pgsql.changelog.connection-object;
<row>
<entry>7.1.0</entry>
Expand Down
2 changes: 1 addition & 1 deletion reference/xml/functions/xml-parse-into-struct.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
<type>int</type><methodname>xml_parse_into_struct</methodname>
<type class="union"><type>int</type><type>false</type></type><methodname>xml_parse_into_struct</methodname>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These signatures were forgotten to be updated when the relevant parameter descriptions were changed.

<methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
<methodparam><type>string</type><parameter>data</parameter></methodparam>
<methodparam><type>array</type><parameter role="reference">values</parameter></methodparam>
Expand Down
2 changes: 1 addition & 1 deletion reference/xml/functions/xml-set-character-data-handler.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<methodsynopsis>
<type>true</type><methodname>xml_set_character_data_handler</methodname>
<methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
<methodparam><type>callable</type><parameter>handler</parameter></methodparam>
<methodparam><type class="union"><type>callable</type><type>string</type><type>null</type></type><parameter>handler</parameter></methodparam>
</methodsynopsis>
<para>
Sets the character data handler function for the XML parser
Expand Down
2 changes: 1 addition & 1 deletion reference/xml/functions/xml-set-default-handler.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<methodsynopsis>
<type>true</type><methodname>xml_set_default_handler</methodname>
<methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
<methodparam><type>callable</type><parameter>handler</parameter></methodparam>
<methodparam><type class="union"><type>callable</type><type>string</type><type>null</type></type><parameter>handler</parameter></methodparam>
</methodsynopsis>
<para>
Sets the default handler function for the XML parser
Expand Down
4 changes: 2 additions & 2 deletions reference/xml/functions/xml-set-element-handler.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<methodsynopsis>
<type>true</type><methodname>xml_set_element_handler</methodname>
<methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
<methodparam><type>callable</type><parameter>start_handler</parameter></methodparam>
<methodparam><type>callable</type><parameter>end_handler</parameter></methodparam>
<methodparam><type class="union"><type>callable</type><type>string</type><type>null</type></type><parameter>start_handler</parameter></methodparam>
<methodparam><type class="union"><type>callable</type><type>string</type><type>null</type></type><parameter>end_handler</parameter></methodparam>
</methodsynopsis>
<para>
Sets the element handler functions for the XML <parameter>parser</parameter>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<methodsynopsis>
<type>true</type><methodname>xml_set_end_namespace_decl_handler</methodname>
<methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
<methodparam><type>callable</type><parameter>handler</parameter></methodparam>
<methodparam><type class="union"><type>callable</type><type>string</type><type>null</type></type><parameter>handler</parameter></methodparam>
</methodsynopsis>
<para>
Set a handler to be called when leaving the scope of a namespace
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<methodsynopsis>
<type>true</type><methodname>xml_set_external_entity_ref_handler</methodname>
<methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
<methodparam><type>callable</type><parameter>handler</parameter></methodparam>
<methodparam><type class="union"><type>callable</type><type>string</type><type>null</type></type><parameter>handler</parameter></methodparam>
</methodsynopsis>
<para>
Sets the external entity reference handler function for the XML parser
Expand Down
2 changes: 1 addition & 1 deletion reference/xml/functions/xml-set-notation-decl-handler.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<methodsynopsis>
<type>true</type><methodname>xml_set_notation_decl_handler</methodname>
<methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
<methodparam><type>callable</type><parameter>handler</parameter></methodparam>
<methodparam><type class="union"><type>callable</type><type>string</type><type>null</type></type><parameter>handler</parameter></methodparam>
</methodsynopsis>
<para>
Sets the notation declaration handler function for the XML parser
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<methodsynopsis>
<type>true</type><methodname>xml_set_processing_instruction_handler</methodname>
<methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
<methodparam><type>callable</type><parameter>handler</parameter></methodparam>
<methodparam><type class="union"><type>callable</type><type>string</type><type>null</type></type><parameter>handler</parameter></methodparam>
</methodsynopsis>
<para>
Sets the processing instruction (PI) handler function for the XML parser
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<methodsynopsis>
<type>true</type><methodname>xml_set_start_namespace_decl_handler</methodname>
<methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
<methodparam><type>callable</type><parameter>handler</parameter></methodparam>
<methodparam><type class="union"><type>callable</type><type>string</type><type>null</type></type><parameter>handler</parameter></methodparam>
</methodsynopsis>
<para>
Set a handler to be called when a namespace is declared. Namespace
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<methodsynopsis>
<type>true</type><methodname>xml_set_unparsed_entity_decl_handler</methodname>
<methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
<methodparam><type>callable</type><parameter>handler</parameter></methodparam>
<methodparam><type class="union"><type>callable</type><type>string</type><type>null</type></type><parameter>handler</parameter></methodparam>
</methodsynopsis>
<para>
Sets the unparsed entity declaration handler function for the XML parser
Expand Down
Loading