Skip to content

spl を原文の変更に追従 (6ファイル) #561

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
KentarouTakeda merged 1 commit into from
Oct 29, 2026
+82 −31
Merged

spl を原文の変更に追従 (6ファイル) #561

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
8 changes: 7 additions & 1 deletion reference/spl/recursiveiteratoriterator.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: 6a2ad3ecf9b77855446019ed2d74aa6f734d35a8 Maintainer: takagi Status: ready -->
<!-- EN-Revision: 60c33b2a103077ab5e30090c3380f2971c7bb787 Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<reference xml:id="class.recursiveiteratoriterator" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>RecursiveIteratorIterator クラス</title>
Expand All @@ -14,6 +14,12 @@
<para>
再帰的なイテレータの反復処理に使用します。
</para>
<simpara>
<classname>RecursiveIteratorIterator</classname> に存在しないメソッドの呼び出しは、
<methodname>RecursiveIteratorIterator::getSubIterator</methodname> が返す、
現在の深さのイテレータに転送されます。
この転送に <link linkend="object.call">__call()</link> は使われません。
</simpara>
</section>
<!-- }}} -->

Expand Down
8 changes: 4 additions & 4 deletions reference/spl/recursiveiteratoriterator/beginchildren.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: d51166ca16fda8e766849505b84f9306ef443f71 Maintainer: takagi Status: ready -->
<!-- EN-Revision: 60c33b2a103077ab5e30090c3380f2971c7bb787 Maintainer: takagi Status: ready -->
<refentry xml:id="recursiveiteratoriterator.beginchildren" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>RecursiveIteratorIterator::beginChildren</refname>
Expand All @@ -13,11 +13,11 @@
<modifier>public</modifier> <type>void</type><methodname>RecursiveIteratorIterator::beginChildren</methodname>
<void/>
</methodsynopsis>
<para>
<methodname>RecursiveIteratorIterator::getChildren</methodname> と、それに関連する
<simpara>
<methodname>RecursiveIteratorIterator::callGetChildren</methodname> と、それに関連する
<methodname>RecursiveIteratorIterator::rewind</methodname>
をコールした後でコールされます。
</para>
</simpara>

&warn.undocumented.func;

Expand Down
8 changes: 4 additions & 4 deletions reference/spl/recursiveiteratoriterator/construct.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: c62ef37e0d58067b393a6cf3a14aefed90bc0bff Maintainer: takagi Status: ready -->
<!-- EN-Revision: 60c33b2a103077ab5e30090c3380f2971c7bb787 Maintainer: takagi Status: ready -->
<refentry xml:id="recursiveiteratoriterator.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>RecursiveIteratorIterator::__construct</refname>
Expand Down Expand Up @@ -58,10 +58,10 @@
<varlistentry>
<term><parameter>flags</parameter></term>
<listitem>
<para>
<simpara>
オプションのフラグ。指定できる値は <constant>RecursiveIteratorIterator::CATCH_GET_CHILD</constant>
で、<methodname>RecursiveIteratorIterator::getChildren</methodname> のコール時にスローされた例外を無視します。
</para>
で、<methodname>RecursiveIteratorIterator::callGetChildren</methodname> のコール時にスローされた例外を無視します。
</simpara>
</listitem>
</varlistentry>
</variablelist>
Expand Down
41 changes: 29 additions & 12 deletions reference/spl/splfixedarray.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: 603435cd84951fc720eded819c62ef2466d21b5c Maintainer: takagi Status: ready -->
<!-- EN-Revision: a833060594749e44ff296fee01fd587d6395cff7 Maintainer: takagi Status: ready -->
<reference xml:id="class.splfixedarray" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>SplFixedArray クラス</title>
<titleabbrev>SplFixedArray</titleabbrev>
Expand Down Expand Up @@ -85,6 +85,14 @@
が、<classname>SplFixedArray</classname> に追加されました。
</entry>
</row>
<row>
<entry>8.1.0</entry>
<entry>
<classname>SplFixedArray</classname> で整数でないキーを使うと、
<exceptionname>RuntimeException</exceptionname> ではなく
<exceptionname>TypeError</exceptionname> がスローされるようになりました。
</entry>
</row>
<row>
<entry>8.1.0</entry>
<entry>
Expand Down Expand Up @@ -136,23 +144,25 @@ $array[9] = "asdf";
// 配列のサイズを 2 に縮めます
$array->setSize(2);

// 以下は RuntimeException: Index invalid or out of range となります
// 以下の 2 つのブロックでは RuntimeException: Index invalid or out of range がスローされます
try {
var_dump($array["non-numeric"]);
} catch(RuntimeException $re) {
echo "RuntimeException: ".$re->getMessage()."\n";
var_dump($array[-1]);
} catch(RuntimeException $e) {
echo "RuntimeException: ".$e->getMessage()."\n";
}

try {
var_dump($array[-1]);
} catch(RuntimeException $re) {
echo "RuntimeException: ".$re->getMessage()."\n";
var_dump($array[5]);
} catch(RuntimeException $e) {
echo "RuntimeException: ".$e->getMessage()."\n";
}

// PHP 8.1.0 以降では、整数でないキーを使うと TypeError がスローされます。
// PHP 8.1.0 より前のバージョンでは、RuntimeException がスローされていました。
try {
var_dump($array[5]);
} catch(RuntimeException $re) {
echo "RuntimeException: ".$re->getMessage()."\n";
var_dump($array["non-numeric"]);
} catch(TypeError $e) {
echo "TypeError: ".$e->getMessage()."\n";
}
?>
]]>
Expand All @@ -165,11 +175,18 @@ int(2)
string(3) "foo"
RuntimeException: Index invalid or out of range
RuntimeException: Index invalid or out of range
RuntimeException: Index invalid or out of range
TypeError: Illegal offset type
]]>
</screen>
</example>
</para>
<note>
<simpara>
PHP 8.1.0 より前のバージョンでは、整数でないキーで <classname>SplFixedArray</classname>
にアクセスすると、<exceptionname>TypeError</exceptionname> ではなく
<exceptionname>RuntimeException</exceptionname> がスローされていました。
</simpara>
</note>
</section>
<!-- }}} -->

Expand Down
36 changes: 27 additions & 9 deletions reference/spl/splpriorityqueue/getextractflags.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: d51166ca16fda8e766849505b84f9306ef443f71 Maintainer: mumumu Status: ready -->
<!-- EN-Revision: 75d7844c5c45e6116c223c2fcd8cc42f6eaf9eac Maintainer: mumumu Status: ready -->
<refentry xml:id="splpriorityqueue.getextractflags" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>SplPriorityQueue::getExtractFlags</refname>
Expand All @@ -13,11 +13,12 @@
<modifier>public</modifier> <type>int</type><methodname>SplPriorityQueue::getExtractFlags</methodname>
<void/>
</methodsynopsis>
<para>

</para>

&warn.undocumented.func;
<simpara>
<methodname>SplPriorityQueue::current</methodname>、
<methodname>SplPriorityQueue::top</methodname>、
<methodname>SplPriorityQueue::extract</methodname>
が何を取り出すのかを指定するフラグを取得します。
</simpara>

</refsect1>

Expand All @@ -28,11 +29,28 @@

<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
展開時のフラグを返します。
</para>
<simpara>
取り出す際のフラグを返します。次のいずれかです:
</simpara>
<itemizedlist>
<listitem><simpara><constant>SplPriorityQueue::EXTR_DATA</constant> (0x00000001): データを取り出す</simpara></listitem>
<listitem><simpara><constant>SplPriorityQueue::EXTR_PRIORITY</constant> (0x00000002): 優先順位を取り出す</simpara></listitem>
<listitem><simpara><constant>SplPriorityQueue::EXTR_BOTH</constant> (0x00000003): 両方を含む配列を取り出す</simpara></listitem>
</itemizedlist>
<simpara>
デフォルトは <constant>SplPriorityQueue::EXTR_DATA</constant> です。
</simpara>
</refsect1>

<refsect1 role="seealso">
&reftitle.seealso;
<simplelist>
<member><methodname>SplPriorityQueue::setExtractFlags</methodname></member>
<member><methodname>SplPriorityQueue::current</methodname></member>
<member><methodname>SplPriorityQueue::top</methodname></member>
<member><methodname>SplPriorityQueue::extract</methodname></member>
</simplelist>
</refsect1>

</refentry>
<!-- Keep this comment at the end of the file
Expand Down
12 changes: 11 additions & 1 deletion reference/spl/splpriorityqueue/setextractflags.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: d51166ca16fda8e766849505b84f9306ef443f71 Maintainer: takagi Status: ready -->
<!-- EN-Revision: 75d7844c5c45e6116c223c2fcd8cc42f6eaf9eac Maintainer: takagi Status: ready -->
<refentry xml:id="splpriorityqueue.setextractflags" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>SplPriorityQueue::setExtractFlags</refname>
Expand Down Expand Up @@ -48,6 +48,16 @@
</para>
</refsect1>

<refsect1 role="seealso">
&reftitle.seealso;
<simplelist>
<member><methodname>SplPriorityQueue::getExtractFlags</methodname></member>
<member><methodname>SplPriorityQueue::current</methodname></member>
<member><methodname>SplPriorityQueue::top</methodname></member>
<member><methodname>SplPriorityQueue::extract</methodname></member>
</simplelist>
</refsect1>

</refentry>
<!-- Keep this comment at the end of the file
Local variables:
Expand Down
Loading