Skip to content

パラメータ同期・新パラメータ追加・typo修正ほか 24 件 #355

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
Mar 16, 2026
Merged

パラメータ同期・新パラメータ追加・typo修正ほか 24 件 #355

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
4 changes: 2 additions & 2 deletions language/predefined/attribute/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: 681fd84dbdef6c0f8fe92848677d95a993b66143 Maintainer: mumumu Status: ready -->
<!-- EN-Revision: 0eb433f1dec35ba1c0daf2d8b30b47f284ad5670 Maintainer: mumumu Status: ready -->
<refentry xml:id="attribute.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>Attribute::__construct</refname>
Expand All @@ -11,7 +11,7 @@
&reftitle.description;
<constructorsynopsis role="Attribute">
<modifier>public</modifier> <methodname>Attribute::__construct</methodname>
<methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>Attribute::TARGET_ALL</initializer></methodparam>
<methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>Attribute::TARGET_ALL</constant></initializer></methodparam>
</constructorsynopsis>
<para>
新しい <classname>Attribute</classname> のインスタンスを作成します。
Expand Down
4 changes: 2 additions & 2 deletions reference/calendar/functions/jdmonthname.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: 855dd0c584224f0cee7667a3bc3dae62bace9c96 Maintainer: hirokawa Status: ready -->
<!-- EN-Revision: c6fb604f39a0fa7bf1ae872064b2a3a24f23d855 Maintainer: hirokawa Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.jdmonthname" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -71,7 +71,7 @@
<para>
<variablelist>
<varlistentry>
<term><parameter>jday</parameter></term>
<term><parameter>julian_day</parameter></term>
<listitem>
<para>
変換したいユリウス積算日。
Expand Down
4 changes: 2 additions & 2 deletions reference/funchand/functions/forward-static-call-array.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: 0c9c2dd669fe9395eaa73d487fbd160f9057429a Maintainer: takagi Status: ready -->
<!-- EN-Revision: c6fb604f39a0fa7bf1ae872064b2a3a24f23d855 Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.forward-static-call-array" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -39,7 +39,7 @@
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>parameter</parameter></term>
<term><parameter>args</parameter></term>
<listitem>
<para>
このひとつのパラメータに、メソッドに渡すすべてのパラメータを配列で指定します。
Expand Down
4 changes: 2 additions & 2 deletions reference/image/functions/imageinterlace.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: 9960a09a5705102bf4dd0ce63e03d9ec716d0015 Maintainer: hirokawa Status: ready -->
<!-- EN-Revision: c6fb604f39a0fa7bf1ae872064b2a3a24f23d855 Maintainer: hirokawa Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.imageinterlace" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -29,7 +29,7 @@
<variablelist>
&gd.image.description;
<varlistentry>
<term><parameter>interlace</parameter></term>
<term><parameter>enable</parameter></term>
<listitem>
<para>
&true; の場合はインターレース画像となり、
Expand Down
17 changes: 14 additions & 3 deletions reference/ldap/functions/ldap-get-option.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: 3ec3fa6848aae4b4535557105a42fbf8d57dcc07 Maintainer: hirokawa Status: ready -->
<!-- EN-Revision: aa120f36c5762e99f9ee121d8caf910e0a67121e Maintainer: hirokawa Status: ready -->
<!-- CREDITS: takagi,mumumu -->
<refentry xml:id="function.ldap-get-option" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand All @@ -12,7 +12,7 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>ldap_get_option</methodname>
<methodparam><type>LDAP\Connection</type><parameter>ldap</parameter></methodparam>
<methodparam><type class="union"><type>LDAP\Connection</type><type>null</type></type><parameter>ldap</parameter></methodparam>
<methodparam><type>int</type><parameter>option</parameter></methodparam>
<methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>int</type></type><parameter role="reference">value</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
Expand All @@ -29,7 +29,12 @@
<term><parameter>ldap</parameter></term>
<listitem>
<para>
&ldap.parameter.ldap;
特定の接続に対してオプションを取得する場合は、
<function>ldap_connect</function> が返す、
<classname>LDAP\Connection</classname>
クラスのインスタンス。
グローバルなオプションを取得する場合は、
&null; を指定します。
</para>
</listitem>
</varlistentry>
Expand Down Expand Up @@ -244,6 +249,12 @@
</row>
</thead>
<tbody>
<row>
<entry>8.5.0</entry>
<entry>
<parameter>ldap</parameter> は、nullable になりました。
</entry>
</row>
&ldap.changelog.ldap-object;
</tbody>
</tgroup>
Expand Down
4 changes: 2 additions & 2 deletions reference/oci8/functions/oci-free-descriptor.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: deb6ee36001e5d315c92780db3a6cf64fe4f70bf Maintainer: takagi Status: ready -->
<!-- EN-Revision: c6fb604f39a0fa7bf1ae872064b2a3a24f23d855 Maintainer: takagi Status: ready -->
<refentry xml:id="function.oci-free-descriptor" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>oci_free_descriptor</refname>
Expand All @@ -23,7 +23,7 @@
<para>
<variablelist>
<varlistentry>
<term><parameter>descriptor</parameter></term>
<term><parameter>lob</parameter></term>
<listitem>
<para>
<function>oci_new_descriptor</function> で確保したディスクリプタ。
Expand Down
11 changes: 9 additions & 2 deletions reference/openssl/functions/openssl-cms-encrypt.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: 96263b14054f0f102fcc653688ff3ed99f9df858 Maintainer: mumumu Status: ready -->
<!-- EN-Revision: aa120f36c5762e99f9ee121d8caf910e0a67121e Maintainer: mumumu Status: ready -->
<refentry xml:id="function.openssl-cms-encrypt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>openssl_cms_encrypt</refname>
Expand All @@ -17,7 +17,7 @@
<methodparam><type class="union"><type>array</type><type>null</type></type><parameter>headers</parameter></methodparam>
<methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
<methodparam choice="opt"><type>int</type><parameter>encoding</parameter><initializer><constant>OPENSSL_ENCODING_SMIME</constant></initializer></methodparam>
<methodparam choice="opt"><type>int</type><parameter>cipher_algo</parameter><initializer><constant>OPENSSL_CIPHER_AES_128_CBC</constant></initializer></methodparam>
<methodparam choice="opt"><type class="union"><type>string</type><type>int</type></type><parameter>cipher_algo</parameter><initializer><constant>OPENSSL_CIPHER_AES_128_CBC</constant></initializer></methodparam>
</methodsynopsis>
<para>
この関数は、一人以上のメッセージの受け手に向けて、
Expand Down Expand Up @@ -108,6 +108,13 @@
</row>
</thead>
<tbody>
<row>
<entry>8.5.0</entry>
<entry>
<parameter>cipher_algo</parameter> の型が <type>int</type> または <type>string</type> になりました。
これより前のバージョンでは、<type>int</type> でした。
</entry>
</row>
<row>
<entry>8.1.0</entry>
<entry>
Expand Down
17 changes: 16 additions & 1 deletion reference/openssl/functions/openssl-private-decrypt.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: 7da0f9995a1a6928523f8d910898e79d88f45d5f Maintainer: hirokawa Status: ready -->
<!-- EN-Revision: 8108ac2a62dfc6577341b13a91fe1bdbaee870e4 Maintainer: hirokawa Status: ready -->
<!-- CREDITS: takagi -->
<refentry xml:id="function.openssl-private-decrypt" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand All @@ -16,6 +16,7 @@
<methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type>string</type><parameter role="reference">decrypted_data</parameter></methodparam>
<methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>private_key</parameter></methodparam>
<methodparam choice="opt"><type>int</type><parameter>padding</parameter><initializer><constant>OPENSSL_PKCS1_PADDING</constant></initializer></methodparam>
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>digest_algo</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
<function>openssl_private_decrypt</function> は、事前に
Expand Down Expand Up @@ -67,6 +68,14 @@
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>digest_algo</parameter></term>
<listitem>
<simpara>
OAEP パディング用のダイジェストアルゴリズム。&null; の場合はデフォルトのアルゴリズムを使用します。
</simpara>
</listitem>
</varlistentry>
</variablelist>
</para>
</refsect1>
Expand All @@ -89,6 +98,12 @@
</row>
</thead>
<tbody>
<row>
<entry>8.5.0</entry>
<entry>
オプションのパラメータ <parameter>digest_algo</parameter> が追加されました。
</entry>
</row>
<row>
<entry>8.0.0</entry>
<entry>
Expand Down
18 changes: 17 additions & 1 deletion reference/openssl/functions/openssl-public-encrypt.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: 7da0f9995a1a6928523f8d910898e79d88f45d5f Maintainer: hirokawa Status: ready -->
<!-- EN-Revision: 8108ac2a62dfc6577341b13a91fe1bdbaee870e4 Maintainer: hirokawa Status: ready -->
<!-- CREDITS: takagi -->
<refentry xml:id="function.openssl-public-encrypt" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand All @@ -16,6 +16,7 @@
<methodparam><type>string</type><parameter role="reference">encrypted_data</parameter></methodparam>
<methodparam><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>public_key</parameter></methodparam>
<methodparam choice="opt"><type>int</type><parameter>padding</parameter><initializer><constant>OPENSSL_PKCS1_PADDING</constant></initializer></methodparam>
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>digest_algo</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
<function>openssl_public_encrypt</function> は、<parameter>data</parameter>
Expand Down Expand Up @@ -69,6 +70,15 @@
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>digest_algo</parameter></term>
<listitem>
<simpara>
OAEP パディング用のダイジェストアルゴリズム。
デフォルトのアルゴリズムを使用する場合は &null; を指定します。
</simpara>
</listitem>
</varlistentry>
</variablelist>
</para>
</refsect1>
Expand All @@ -91,6 +101,12 @@
</row>
</thead>
<tbody>
<row>
<entry>8.5.0</entry>
<entry>
オプションのパラメータ <parameter>digest_algo</parameter> が追加されました。
</entry>
</row>
<row>
<entry>8.0.0</entry>
<entry>
Expand Down
15 changes: 14 additions & 1 deletion reference/openssl/functions/openssl-sign.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: hirokawa Status: ready -->
<!-- EN-Revision: 9a8c593c09cf7d84085989e42f3b2b23536279db Maintainer: hirokawa Status: ready -->
<!-- CREDITS: takagi -->
<refentry xml:id="function.openssl-sign" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand All @@ -16,6 +16,7 @@
<methodparam><type>string</type><parameter role="reference">signature</parameter></methodparam>
<methodparam><modifier role="attribute">#[\SensitiveParameter]</modifier><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>private_key</parameter></methodparam>
<methodparam choice="opt"><type class="union"><type>string</type><type>int</type></type><parameter>algorithm</parameter><initializer><constant>OPENSSL_ALGO_SHA1</constant></initializer></methodparam>
<methodparam choice="opt"><type>int</type><parameter>padding</parameter><initializer>0</initializer></methodparam>
</methodsynopsis>
<para>
<function>openssl_sign</function> は、指定した
Expand Down Expand Up @@ -67,6 +68,12 @@
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>padding</parameter></term>
<listitem>
<simpara>使用する RSA PSS パディング。</simpara>
</listitem>
</varlistentry>
</variablelist>
</para>
</refsect1>
Expand All @@ -89,6 +96,12 @@
</row>
</thead>
<tbody>
<row>
<entry>8.5.0</entry>
<entry>
オプションのパラメータ <parameter>padding</parameter> が追加されました。
</entry>
</row>
<row>
<entry>8.0.0</entry>
<entry>
Expand Down
15 changes: 14 additions & 1 deletion reference/openssl/functions/openssl-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: 497c40ac164d5873fd87f622dfdeb5206392b446 Maintainer: hirokawa Status: ready -->
<!-- EN-Revision: 9a8c593c09cf7d84085989e42f3b2b23536279db Maintainer: hirokawa Status: ready -->
<!-- CREDITS: takagi,mumumu -->
<refentry xml:id="function.openssl-verify" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand All @@ -16,6 +16,7 @@
<methodparam><type>string</type><parameter>signature</parameter></methodparam>
<methodparam><type class="union"><type>OpenSSLAsymmetricKey</type><type>OpenSSLCertificate</type><type>array</type><type>string</type></type><parameter>public_key</parameter></methodparam>
<methodparam choice="opt"><type class="union"><type>string</type><type>int</type></type><parameter>algorithm</parameter><initializer><constant>OPENSSL_ALGO_SHA1</constant></initializer></methodparam>
<methodparam choice="opt"><type>int</type><parameter>padding</parameter><initializer>0</initializer></methodparam>
</methodsynopsis>
<para>
<function>openssl_verify</function> は、
Expand Down Expand Up @@ -70,6 +71,12 @@ MIIBCgK...</literal> など)。
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>padding</parameter></term>
<listitem>
<simpara>使用する RSA PSS パディング。</simpara>
</listitem>
</varlistentry>
</variablelist>
</para>
</refsect1>
Expand All @@ -93,6 +100,12 @@ MIIBCgK...</literal> など)。
</row>
</thead>
<tbody>
<row>
<entry>8.5.0</entry>
<entry>
オプションのパラメータ <parameter>padding</parameter> が追加されました。
</entry>
</row>
<row>
<entry>8.0.0</entry>
<entry>
Expand Down
14 changes: 7 additions & 7 deletions reference/pcntl/functions/pcntl-getcpuaffinity.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: 262ca5a53247283e8e927a4a52367474e7f9838a Maintainer: mumumu Status: ready -->
<!-- EN-Revision: aa120f36c5762e99f9ee121d8caf910e0a67121e Maintainer: mumumu Status: ready -->
<refentry xml:id="function.pcntl-getcpuaffinity" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>pcntl_getcpuaffinity</refname>
Expand All @@ -10,19 +10,19 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
<type class="union"><type>bool</type><type>array</type></type><methodname>pcntl_getcpuaffinity</methodname>
<methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>pid</parameter><initializer>&null;</initializer></methodparam>
<type class="union"><type>array</type><type>false</type></type><methodname>pcntl_getcpuaffinity</methodname>
<methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>process_id</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<simpara>
<parameter>pid</parameter> のCPUアフィニティを取得します。
<parameter>process_id</parameter> のCPUアフィニティを取得します。
</simpara>
</refsect1>

<refsect1 role="parameters">
&reftitle.parameters;
<variablelist>
<varlistentry>
<term><parameter>pid</parameter></term>
<term><parameter>process_id</parameter></term>
<listitem>
<simpara>
&null; を指定すると、現在のプロセスIDを使います。
Expand All @@ -44,12 +44,12 @@
<refsect1 role="errors">
&reftitle.errors;
<simpara>
<parameter>pid</parameter> が不正なプロセスIDであったり、
<parameter>process_id</parameter> が不正なプロセスIDであったり、
CPUマスクを作るのに失敗した場合、<classname>ValueError</classname>
がスローされます。
</simpara>
<simpara>
<parameter>pid</parameter> が、
<parameter>process_id</parameter> が、
現在のユーザーがパーミッションを持っていないプロセスだった場合、
<constant>E_WARNING</constant> が発生します。
</simpara>
Expand Down
Loading
Loading