Skip to content

Sync outdated files #971

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
merged 2 commits into from
Mar 27, 2025
Merged

Sync outdated files #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6dd7ba
Sync outdated files
sy-records Mar 22, 2025
8fcb66f
Merge branch 'master' into sync/outdated
sy-records Mar 25, 2025
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
4 changes: 2 additions & 2 deletions reference/iconv/functions/iconv-strlen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: ab9a7d2e3dfa9224186abcbd7a43b3af08d1bfdb Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi -->
<!-- EN-Revision: 66eabb01bbef3a6b205b13f8a01d6b5f9460acbf Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xml:id="function.iconv-strlen" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>iconv_strlen</refname>
Expand Down
26 changes: 1 addition & 25 deletions reference/info/functions/getrusage.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: e947f2e12b1e321d67f6560c5f2884e6d885858f Maintainer: daijie Status: ready -->
<!-- EN-Revision: a277389c9d2d5a940fcd6dbe62da7e109282379d Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xml:id="function.getrusage" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -43,30 +43,6 @@
</para>
</refsect1>

<refsect1 role="changelog">
&reftitle.changelog;
<para>
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>&Version;</entry>
<entry>&Description;</entry>
</row>
</thead>
<tbody>
<row>
<entry>7.0.0</entry>
<entry>
此函数现在开始支持 Windows。
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</para>
</refsect1>

<refsect1 role="examples">
&reftitle.examples;
<para>
Expand Down
11 changes: 1 addition & 10 deletions reference/inotify/setup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 765b2d6eec7dfbaeed900b32aa91a1360d73df42 Maintainer: songmeifeng Status: ready -->
<!-- EN-Revision: 204578526607cf2e49e02782d45a93b6c1f9018b Maintainer: songmeifeng Status: ready -->
<!-- CREDITS: Luffy -->
<chapter xml:id="inotify.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
&reftitle.setup;

<!-- {{{ Requirements -->
<section xml:id="inotify.requirements">
&reftitle.required;
<para>
此扩展需要 Linux 2.6.13 或更新的版本，以及最新的 libC 库。
</para>
</section>
<!-- }}} -->

<!-- {{{ Installation -->
<section xml:id="inotify.install">
&reftitle.setup;
Expand Down
4 changes: 2 additions & 2 deletions reference/math/book.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: 48ce43fe79fa0c9f31f187ea8ec995b4cb13037e Maintainer: mowangjuanzi Status: ready -->
<!-- EN-Revision: e75557e268736a2a08a5cd17f50048e9db545e02 Maintainer: mowangjuanzi Status: ready -->
<!-- CREDITS: Luffy -->
<book xml:id="book.math" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<?phpdoc extension-membership="core" ?>
Expand Down Expand Up @@ -35,10 +35,10 @@
<!-- }}} -->

&reference.math.constants;
&reference.math.roundingmode;
&reference.math.reference;

</book>

<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Expand Down
4 changes: 2 additions & 2 deletions reference/mbstring/book.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 740eb58e8c03cfc5ac98eda13943262775b73ff2 Maintainer: daijie Status: ready -->
<!-- EN-Revision: c1f37a6c270aadbbb3da56a3973ffd62197adf2b Maintainer: daijie Status: ready -->
<!-- CREDITS: Luffy -->
<book xml:id="book.mbstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<book xml:id="book.mbstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="interactive">
<?phpdoc extension-membership="bundled" ?>
<title>多字节字符串</title>

Expand Down
4 changes: 2 additions & 2 deletions reference/mbstring/functions/mb-convert-encoding.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: 2c17cef6e71c3d85011319cde128cc4edf89a053 Maintainer: daijie Status: ready -->
<!-- EN-Revision: c1f37a6c270aadbbb3da56a3973ffd62197adf2b Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xml:id="function.mb-convert-encoding" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
Expand Down Expand Up @@ -134,7 +134,7 @@
<para>
<example>
<title><function>mb_convert_encoding</function> 示例</title>
<programlisting role="php">
<programlisting role="php" annotations="non-interactive">
<![CDATA[
<?php
/* 转换内部编码为 SJIS */
Expand Down
5 changes: 3 additions & 2 deletions reference/openssl/setup.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: d5da0808c4d6343eb8f0099307d3139102a6f4bf Maintainer: duanxiaoqiang Status: ready -->
<!-- EN-Revision: 3fa666ce023c7f5005cae5c3bf4fbef2b47ef9d1 Maintainer: duanxiaoqiang Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<chapter xml:id="openssl.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
&reftitle.setup;
Expand All @@ -11,7 +11,8 @@
<para>
要使用 Open SSL 函数，你必须安装<link xlink:href="&url.openssl;">OpenSSL</link> 库。
PHP 7.0 需要 OpenSSL &gt;= 0.9.8。PHP 7.1-8.0 需要 OpenSSL
&gt;= 1.0.1，&lt; 3.0。PHP &gt;= 8.1 支持 OpenSSL &gt;= 1.0.2，&lt; 4.0。
&gt;= 1.0.1，&lt; 3.0。PHP &gt;= 8.1 支持 OpenSSL &gt;= 1.0.2, &lt; 4.0。
PHP &gt;= 8.4 支持 OpenSSL &gt;= 1.1.1, &lt; 4.0。
</para>
<warning>
<para>
Expand Down
7 changes: 3 additions & 4 deletions reference/password/functions/password-needs-rehash.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: ff492e168a557e4dd17574023b7c3cb21b14df3b Maintainer: daijie Status: ready -->
<!-- EN-Revision: e302f07943465892db7f72469e2ce9b42c4f763f Maintainer: daijie Status: ready -->
<!-- CREDITS: Luffy -->

<refentry xml:id="function.password-needs-rehash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>password_needs_rehash</refname>
Expand Down Expand Up @@ -97,11 +96,11 @@
<?php

$password = 'rasmuslerdorf';
$hash = '$2y$10$YCFsG6elYca568hBi2pZ0.3LDL5wjgxct1N8w/oLR/jfHsiQwCqTS';
$hash = '$2y$12$4Umg0rCJwMswRw/l.SwHvuQV01coP0eWmGzd61QH2RvAOMANUBGC.';

$algorithm = PASSWORD_BCRYPT;
// bcrypt 的成本参数随着硬件的改进而可能发生变化
$options = ['cost' => 12];
$options = ['cost' => 13];

// 根据明文密码验证储存的散列
if (password_verify($password, $hash)) {
Expand Down
5 changes: 2 additions & 3 deletions reference/password/functions/password-verify.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: 5bc68add3da3cd18c40f851e944b15095d3a26aa Maintainer: daijie Status: ready -->
<!-- EN-Revision: 5baba54a67be43d689970983cfc6d24debad1ce0 Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xml:id="function.password-verify" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
Expand Down Expand Up @@ -70,7 +70,7 @@
<![CDATA[
<?php
// 想知道以下字符从哪里来，可参见 password_hash() 示例
$hash = '$2y$10$.vGA1O9wmRjrwAVXD98HNOgsNpDczlqm3Jq7KnEd1rVAGv3Fykk1a';
$hash = '$2y$12$4Umg0rCJwMswRw/l.SwHvuQV01coP0eWmGzd61QH2RvAOMANUBGC.';

if (password_verify('rasmuslerdorf', $hash)) {
echo 'Password is valid!';
Expand All @@ -96,7 +96,6 @@ Password is valid!
<simplelist>
<member><function>password_needs_rehash</function></member>
<member><function>password_hash</function></member>
<member><link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&url.password.compat;">用户级实现</link></member>
<member><function>sodium_crypto_pwhash_str_verify</function></member>
</simplelist>
</para>
Expand Down
5 changes: 3 additions & 2 deletions reference/pcntl/examples.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: aebf045bfb7f4f2350db5e1e908cf290be334075 Maintainer: mowangjuanzi Status: ready -->
<!-- EN-Revision: e91b2dd2539f6be30b7db023d880de673fa50b62 Maintainer: mowangjuanzi Status: ready -->
<!-- CREDITS: Luffy -->
<chapter xml:id="pcntl.examples" xmlns="http://docbook.org/ns/docbook">
&reftitle.examples;
<section xml:id="pcntl.example">
Expand All @@ -13,7 +14,7 @@
<programlisting role="php">
<![CDATA[
<?php
declare(ticks=1);
pcntl_async_signals(true);

$pid = pcntl_fork();
if ($pid == -1) {
Expand Down
6 changes: 3 additions & 3 deletions reference/pcre/book.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 68c2c871505aadf983f16113c5b077b335ce8d76 Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi -->
<book xml:id="book.pcre" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- EN-Revision: c1f37a6c270aadbbb3da56a3973ffd62197adf2b Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<book xml:id="book.pcre" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="interactive">
<?phpdoc extension-membership="core" ?>
<title>正则表达式(兼容 Perl)</title>
<titleabbrev>PCRE</titleabbrev>
Expand Down
6 changes: 3 additions & 3 deletions reference/pcre/functions/preg-replace-callback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 41c8533ff5a8f93ba9fdf0732d05dd5ab79864c9 Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi -->
<!-- EN-Revision: c1f37a6c270aadbbb3da56a3973ffd62197adf2b Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<refentry xml:id="function.preg-replace-callback" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>preg_replace_callback</refname>
Expand Down Expand Up @@ -64,7 +64,7 @@
<example>
<title><function>preg_replace_callback</function> 和
匿名函数</title>
<programlisting role="php">
<programlisting role="php" annotations="non-interactive">
<![CDATA[
<?php
/* 一个unix样式的命令行过滤器，用于将段落开始部分的大写字母转换为小写。 */
Expand Down
6 changes: 3 additions & 3 deletions reference/pcre/pattern.syntax.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 0e4868392a619db8f148cb4c56cd57e92f6a3d2d Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi -->
<!-- EN-Revision: bb4abab22bf0204b4dba0140ac5fc9daa6888e0f Maintainer: daijie Status: ready -->
<!-- CREDITS: mowangjuanzi, Luffy -->
<!-- splitted from ./en/functions/pcre.xml, last change in rev 1.2 -->
<chapter xml:id="reference.pcre.pattern.syntax" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>模式语法</title>
Expand Down Expand Up @@ -764,7 +764,7 @@
<row rowsep="1">
<entry><literal>So</literal></entry>
<entry>Other symbol</entry>
<entry></entry>
<entry>Includes emojis</entry>
</row>
<row>
<entry><literal>Z</literal></entry>
Expand Down