Skip to content

Sync pcntl_waitid and strripos function #999

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.

Sign up for GitHub

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

Merged
sy-records merged 1 commit into from
Nov 10, 2025
Merged

Sync pcntl_waitid and strripos function #999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 23 additions & 1 deletion reference/pcntl/functions/pcntl-waitid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 8e31067f1aa8fa219cc1de11abb26ab81e5a2be0 Maintainer: Luffy Status: ready -->
<!-- EN-Revision: 95d05546430b9e5db225dd42a0d285b870f0da42 Maintainer: Luffy Status: ready -->
<!-- CREDITS: mowangjuanzi -->
<refentry xml:id="function.pcntl-waitid" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -287,6 +287,28 @@
</table>
</refsect1>

<refsect1 role="changelog">
&reftitle.changelog;
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>&Version;</entry>
<entry>&Description;</entry>
</row>
</thead>
<tbody>
<row>
<entry>8.5.0</entry>
<entry>
增加了 <parameter>resource_usage</parameter>。
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</refsect1>

<refsect1 role="seealso">
&reftitle.seealso;
<para>
Expand Down
15 changes: 9 additions & 6 deletions reference/strings/functions/strripos.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 4b72b23513caa3a8bc520d459a0417defc7b3880 Maintainer: daijie Status: ready -->
<!-- EN-Revision: 95d05546430b9e5db225dd42a0d285b870f0da42 Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xml:id="function.strripos" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -68,7 +68,8 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
返回 needle 相对于 <parameter>haystack</parameter> 字符串的位置(和搜索的方向和偏移量无关)。
返回 <parameter>needle</parameter> 相对于 <parameter>haystack</parameter> 字符串的位置
（与搜索的方向或 <parameter>offset</parameter> 无关）。
<note>
<simpara>
字符串位置从 0 开始，而不是 1。
Expand Down Expand Up @@ -131,25 +132,27 @@
<programlisting role="php">
<![CDATA[
<?php

$haystack = 'ababcd';
$needle = 'aB';

$pos = strripos($haystack, $needle);

if ($pos === false) {
echo "Sorry, we did not find ($needle) in ($haystack)";
echo "Sorry, we did not find `$needle` in `$haystack`";
} else {
echo "Congratulations!\n";
echo "We found the last ($needle) in ($haystack) at position ($pos)";
echo "We found the last `$needle` in `$haystack` at position `$pos`";
}

?>
]]>
</programlisting>
&example.outputs;
<screen>
<![CDATA[
Congratulations!
We found the last (aB) in (ababcd) at position (2)
Congratulations!
We found the last `aB` in `ababcd` at position `2`
]]>
</screen>
</example>
Expand Down