Skip to content

Commit bede85b

Browse files
戻り値型 bool→true 同期・return type sync 40 件 (#357)
## 翻訳内容 ### reference/image(34件)— return type アノテーション修正 - reference/image/functions/imageresolution.xml — 戻り値型を `array|bool` から `array|true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagealphablending.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imageantialias.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagearc.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagechar.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagecharup.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagecolordeallocate.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagecolormatch.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagecopy.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagecopymerge.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagecopymergegray.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagecopyresampled.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagecopyresized.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagedashedline.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagedestroy.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imageellipse.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagefill.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagefilledarc.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagefilledellipse.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagefilledrectangle.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagefilltoborder.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imageflip.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagegammacorrect.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagelayereffect.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imageline.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagerectangle.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagesavealpha.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagesetbrush.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagesetclip.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagesetpixel.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagesetthickness.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagesettile.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagestring.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 - reference/image/functions/imagestringup.xml — 戻り値型を `bool` から `true` に修正 1. php/doc-en@fcd9214 ### 独立ファイル - reference/array/functions/array-multisort.xml — 戻り値型を `bool` から `true` に変更、8.5.0 changelog 追加 1. php/doc-en@5b76466 - reference/fileinfo/functions/finfo-close.xml — 戻り値型を `true` に変更、NOP化・非推奨の changelog 追加 1. php/doc-en@fcd9214 2. php/doc-en@34bd6f0 3. php/doc-en@5b76466 - reference/ftp/functions/ftp-set-option.xml — 戻り値型を `true` に変更、errors セクション追加、8.5.0 changelog 追加 1. php/doc-en@fcd9214 2. php/doc-en@5b76466 - reference/sem/functions/shm-detach.xml — 戻り値型を `bool` から `true` に変更、8.5.0 changelog 追加 1. php/doc-en@5b76466 - reference/pcntl/functions/pcntl-exec.xml — 戻り値型を `bool` から `false` に修正、エンティティエンコーディング修正 1. php/doc-en@fcd9214 - reference/libxml/functions/libxml-set-external-entity-loader.xml — 戻り値型を `bool` から `true` に変更、8.5.0 changelog 追加 1. php/doc-en@5b76466
1 parent 444a48a commit bede85b

40 files changed

+211
-128
lines changed

reference/array/functions/array-multisort.xml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 2e60c5134e7a847c99f81eb3f7ecee1f5efeeace Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: 5b7646656eb183ea568b8261d6d87a10a1b961c7 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: takagi,mumumu -->
55
<refentry xml:id="function.array-multisort" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -10,7 +10,7 @@
1010
<refsect1 role="description">
1111
&reftitle.description;
1212
<methodsynopsis>
13-
<type>bool</type><methodname>array_multisort</methodname>
13+
<type>true</type><methodname>array_multisort</methodname>
1414
<methodparam><type>array</type><parameter role="reference">array1</parameter></methodparam>
1515
<methodparam choice="opt"><type>mixed</type><parameter>array1_sort_order</parameter><initializer>SORT_ASC</initializer></methodparam>
1616
<methodparam choice="opt"><type>mixed</type><parameter>array1_sort_flags</parameter><initializer>SORT_REGULAR</initializer></methodparam>
@@ -118,10 +118,32 @@
118118
<refsect1 role="returnvalues">
119119
&reftitle.returnvalues;
120120
<para>
121-
&return.success;
121+
&return.true.always;
122122
</para>
123123
</refsect1>
124-
124+
125+
<refsect1 role="changelog">
126+
&reftitle.changelog;
127+
<informaltable>
128+
<tgroup cols="2">
129+
<thead>
130+
<row>
131+
<entry>&Version;</entry>
132+
<entry>&Description;</entry>
133+
</row>
134+
</thead>
135+
<tbody>
136+
<row>
137+
<entry>8.5.0</entry>
138+
<entry>
139+
戻り値の型が、&true; になりました。これより前のバージョンでは、<type>bool</type> でした。
140+
</entry>
141+
</row>
142+
</tbody>
143+
</tgroup>
144+
</informaltable>
145+
</refsect1>
146+
125147
<refsect1 role="examples">
126148
&reftitle.examples;
127149
<para>

reference/fileinfo/functions/finfo-close.xml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 82ddd2ec8ad195035dcb57dd8f97d27b83ddc126 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: fcd9214294f88b05862a538c6dd94c7872420139 Maintainer: takagi Status: ready -->
44
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.finfo-close">
55
<refnamediv>
66
<refname>finfo_close</refname>
@@ -13,12 +13,14 @@
1313
&reftitle.description;
1414
<methodsynopsis>
1515
<modifier role="attribute">#[\Deprecated]</modifier>
16-
<type>bool</type><methodname>finfo_close</methodname>
16+
<type>true</type><methodname>finfo_close</methodname>
1717
<methodparam><type>finfo</type><parameter>finfo</parameter></methodparam>
1818
</methodsynopsis>
1919

2020
<simpara>
21-
この関数は、<function>finfo_open</function> がオープンしたインスタンスを閉じます。
21+
この関数は、PHP 7.4 までは <function>finfo_open</function> がオープンしたインスタンスを閉じていましたが、
22+
PHP 8.0 で <classname>finfo</classname> がリソースからオブジェクトに変換されて以降は何もしない関数(no-op)になっており、
23+
PHP 8.5 で非推奨になりました。
2224
</simpara>
2325

2426
</refsect1>
@@ -36,7 +38,7 @@
3638
<refsect1 role="returnvalues">
3739
&reftitle.returnvalues;
3840
<simpara>
39-
&return.success;
41+
&return.true.always;
4042
</simpara>
4143
</refsect1>
4244

@@ -51,6 +53,24 @@
5153
</row>
5254
</thead>
5355
<tbody>
56+
<row>
57+
<entry>8.5.0</entry>
58+
<entry>
59+
この関数は非推奨になりました。
60+
</entry>
61+
</row>
62+
<row>
63+
<entry>8.5.0</entry>
64+
<entry>
65+
戻り値の型が、&true; になりました。これより前のバージョンでは、<type>bool</type> でした。
66+
</entry>
67+
</row>
68+
<row>
69+
<entry>8.1.0</entry>
70+
<entry>
71+
この関数は <acronym>NOP</acronym>(何もしない関数)になりました。
72+
</entry>
73+
</row>
5474
&fileinfo.changelog.finfo-object;
5575
</tbody>
5676
</tgroup>

reference/ftp/functions/ftp-set-option.xml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 4d1c34c9b7a30cfc3a59641122c707a2812cfed7 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: fcd9214294f88b05862a538c6dd94c7872420139 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: takagi,mumumu -->
55
<refentry xml:id="function.ftp-set-option" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -10,7 +10,7 @@
1010
<refsect1 role="description">
1111
&reftitle.description;
1212
<methodsynopsis>
13-
<type>bool</type><methodname>ftp_set_option</methodname>
13+
<type>true</type><methodname>ftp_set_option</methodname>
1414
<methodparam><type>FTP\Connection</type><parameter>ftp</parameter></methodparam>
1515
<methodparam><type>int</type><parameter>option</parameter></methodparam>
1616
<methodparam><type class="union"><type>int</type><type>bool</type></type><parameter>value</parameter></methodparam>
@@ -84,13 +84,22 @@
8484
</variablelist>
8585
</para>
8686
</refsect1>
87+
8788
<refsect1 role="returnvalues">
8889
&reftitle.returnvalues;
8990
<para>
90-
オプションが設定できた場合に &true; 、そうでない場合に &false; を返します。
91-
<parameter>option</parameter> がサポートされていなかった場合や
92-
<parameter>option</parameter> が想定していない値を <parameter>value</parameter>
93-
に渡した場合は警告メッセージが発生します。
91+
&return.true.always;
92+
</para>
93+
</refsect1>
94+
95+
<refsect1 role="errors">
96+
&reftitle.errors;
97+
<para>
98+
<parameter>option</parameter> がサポートされていない場合、
99+
<exceptionname>ValueError</exceptionname> がスローされます。
100+
渡された <parameter>value</parameter> が指定された <parameter>option</parameter>
101+
に対して期待される型と一致しない場合、
102+
<exceptionname>TypeError</exceptionname> がスローされます。
94103
</para>
95104
</refsect1>
96105

@@ -105,6 +114,12 @@
105114
</row>
106115
</thead>
107116
<tbody>
117+
<row>
118+
<entry>8.5.0</entry>
119+
<entry>
120+
戻り値の型が、&true; になりました。これより前のバージョンでは、<type>bool</type> でした。
121+
</entry>
122+
</row>
108123
&ftp.changelog.ftp-param;
109124
</tbody>
110125
</tgroup>

reference/image/functions/imagealphablending.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 9960a09a5705102bf4dd0ce63e03d9ec716d0015 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: fcd9214294f88b05862a538c6dd94c7872420139 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: shimooka -->
55
<refentry xml:id="function.imagealphablending" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -10,7 +10,7 @@
1010
<refsect1 role="description">
1111
&reftitle.description;
1212
<methodsynopsis>
13-
<type>bool</type><methodname>imagealphablending</methodname>
13+
<type>true</type><methodname>imagealphablending</methodname>
1414
<methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
1515
<methodparam><type>bool</type><parameter>enable</parameter></methodparam>
1616
</methodsynopsis>
@@ -46,7 +46,7 @@
4646
<refsect1 role="returnvalues">
4747
&reftitle.returnvalues;
4848
<para>
49-
&return.success;
49+
&return.true.always;
5050
</para>
5151
</refsect1>
5252

reference/image/functions/imageantialias.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 9960a09a5705102bf4dd0ce63e03d9ec716d0015 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: fcd9214294f88b05862a538c6dd94c7872420139 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: shimooka,takagi,mumumu -->
55
<refentry xml:id="function.imageantialias" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -10,7 +10,7 @@
1010
<refsect1 role="description">
1111
&reftitle.description;
1212
<methodsynopsis>
13-
<type>bool</type><methodname>imageantialias</methodname>
13+
<type>true</type><methodname>imageantialias</methodname>
1414
<methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
1515
<methodparam><type>bool</type><parameter>enable</parameter></methodparam>
1616
</methodsynopsis>
@@ -48,7 +48,7 @@
4848
<refsect1 role="returnvalues">
4949
&reftitle.returnvalues;
5050
<para>
51-
&return.success;
51+
&return.true.always;
5252
</para>
5353
</refsect1>
5454

reference/image/functions/imagearc.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 9960a09a5705102bf4dd0ce63e03d9ec716d0015 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: fcd9214294f88b05862a538c6dd94c7872420139 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: shimooka,mumumu -->
55
<refentry xml:id="function.imagearc" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -10,7 +10,7 @@
1010
<refsect1 role="description">
1111
&reftitle.description;
1212
<methodsynopsis>
13-
<type>bool</type><methodname>imagearc</methodname>
13+
<type>true</type><methodname>imagearc</methodname>
1414
<methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
1515
<methodparam><type>int</type><parameter>center_x</parameter></methodparam>
1616
<methodparam><type>int</type><parameter>center_y</parameter></methodparam>
@@ -92,7 +92,7 @@
9292
<refsect1 role="returnvalues">
9393
&reftitle.returnvalues;
9494
<para>
95-
&return.success;
95+
&return.true.always;
9696
</para>
9797
</refsect1>
9898

reference/image/functions/imagechar.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: a7e5e563d2d2269a6d7ccff506715a3e1a6f3902 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: fcd9214294f88b05862a538c6dd94c7872420139 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: shimooka,mumumu -->
55
<refentry xml:id="function.imagechar" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -10,7 +10,7 @@
1010
<refsect1 role="description">
1111
&reftitle.description;
1212
<methodsynopsis>
13-
<type>bool</type><methodname>imagechar</methodname>
13+
<type>true</type><methodname>imagechar</methodname>
1414
<methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
1515
<methodparam><type class="union"><type>GdFont</type><type>int</type></type><parameter>font</parameter></methodparam>
1616
<methodparam><type>int</type><parameter>x</parameter></methodparam>
@@ -69,7 +69,7 @@
6969
<refsect1 role="returnvalues">
7070
&reftitle.returnvalues;
7171
<para>
72-
&return.success;
72+
&return.true.always;
7373
</para>
7474
</refsect1>
7575

reference/image/functions/imagecharup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: a7e5e563d2d2269a6d7ccff506715a3e1a6f3902 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: fcd9214294f88b05862a538c6dd94c7872420139 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: shimooka,mumumu -->
55
<refentry xml:id="function.imagecharup" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -10,7 +10,7 @@
1010
<refsect1 role="description">
1111
&reftitle.description;
1212
<methodsynopsis>
13-
<type>bool</type><methodname>imagecharup</methodname>
13+
<type>true</type><methodname>imagecharup</methodname>
1414
<methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
1515
<methodparam><type class="union"><type>GdFont</type><type>int</type></type><parameter>font</parameter></methodparam>
1616
<methodparam><type>int</type><parameter>x</parameter></methodparam>
@@ -67,7 +67,7 @@
6767
<refsect1 role="returnvalues">
6868
&reftitle.returnvalues;
6969
<para>
70-
&return.success;
70+
&return.true.always;
7171
</para>
7272
</refsect1>
7373

reference/image/functions/imagecolordeallocate.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 593ea510e853ff034e03f78a4be0daa41661c9d4 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: fcd9214294f88b05862a538c6dd94c7872420139 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: shimooka,mumumu -->
55
<refentry xml:id="function.imagecolordeallocate" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -10,7 +10,7 @@
1010
<refsect1 role="description">
1111
&reftitle.description;
1212
<methodsynopsis>
13-
<type>bool</type><methodname>imagecolordeallocate</methodname>
13+
<type>true</type><methodname>imagecolordeallocate</methodname>
1414
<methodparam><type>GdImage</type><parameter>image</parameter></methodparam>
1515
<methodparam><type>int</type><parameter>color</parameter></methodparam>
1616
</methodsynopsis>
@@ -38,7 +38,7 @@
3838
<refsect1 role="returnvalues">
3939
&reftitle.returnvalues;
4040
<para>
41-
&return.success;
41+
&return.true.always;
4242
</para>
4343
</refsect1>
4444

reference/image/functions/imagecolormatch.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 9960a09a5705102bf4dd0ce63e03d9ec716d0015 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: fcd9214294f88b05862a538c6dd94c7872420139 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: shimooka,mumumu -->
55
<refentry xml:id="function.imagecolormatch" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -10,7 +10,7 @@
1010
<refsect1 role="description">
1111
&reftitle.description;
1212
<methodsynopsis>
13-
<type>bool</type><methodname>imagecolormatch</methodname>
13+
<type>true</type><methodname>imagecolormatch</methodname>
1414
<methodparam><type>GdImage</type><parameter>image1</parameter></methodparam>
1515
<methodparam><type>GdImage</type><parameter>image2</parameter></methodparam>
1616
</methodsynopsis>
@@ -45,7 +45,7 @@
4545
<refsect1 role="returnvalues">
4646
&reftitle.returnvalues;
4747
<para>
48-
&return.success;
48+
&return.true.always;
4949
</para>
5050
</refsect1>
5151

0 commit comments

Comments
 (0)