Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions appendices/migration74/new-features.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: e150cc645a17588282e5e6b5e43e600a2f345549 Maintainer: mumumu Status: ready -->
<!-- EN-Revision: 8e2cfbdce0cd028a6521c6e073f148e0f7efac7c Maintainer: mumumu Status: ready -->

<sect1 xml:id="migration74.new-features" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>新機能</title>
Expand Down Expand Up @@ -90,8 +90,8 @@ class A
class B extends A
{
// Fatal error: Could not check compatibility between B::method():C and
// A::method(): A, because class С is not available
public function method(): С {}
// A::method(): A, because class C is not available
public function method(): C {}
}

class C extends B {}
Expand Down
6 changes: 4 additions & 2 deletions appendices/migration84/new-features.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 525aa5f198d482c0d03be54ddee5af13b376ab99 Maintainer: KentarouTakeda Status: ready -->
<!-- EN-Revision: d7efc67559999c1dda0f65c90617b60c6872a61b Maintainer: KentarouTakeda Status: ready -->
<!-- Credits: KentarouTakeda -->
<sect1 xml:id="migration84.new-features">
<title>新機能</title>
Expand All @@ -27,7 +27,7 @@
<?php
class Person
{
// 「仮想」プロパティ。明示的に設定されることはありません
// 「仮想」プロパティ。明示的に設定することはできません
public string $fullName {
get => $this->firstName . ' ' . $this->lastName;
}
Expand Down Expand Up @@ -56,6 +56,8 @@ $p->firstName = 'peter';
print $p->firstName; // Prints "Peter"
$p->lastName = 'Peterson';
print $p->fullName; // Prints "Peter Peterson"

$p->fullName = "Peter 'Pete' Peterson"; // Throws Error: "Property Person::$fullName is read-only"
]]>
</programlisting>
</informalexample>
Expand Down
6 changes: 5 additions & 1 deletion language/types/boolean.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 4657c1173e6b3852cdc8db4fc64f380d10ebae0c Maintainer: takagi Status: ready -->
<!-- EN-Revision: ee66d210fb1dd5799fbca9881c6ac2560a19579d Maintainer: takagi Status: ready -->
<!-- CREDITS: hirokawa,shimooka,mumumu -->
<sect1 xml:id="language.types.boolean">
<title>論理型 (boolean) </title>
Expand All @@ -22,7 +22,10 @@
<programlisting role="php">
<![CDATA[
<?php

$foo = True; // 値TRUEを$fooに代入する

var_dump($foo); // bool(true)
?>
]]>
</programlisting>
Expand All @@ -38,6 +41,7 @@ $foo = True; // 値TRUEを$fooに代入する
<programlisting role="php">
<![CDATA[
<?php

$action = "show_version";
$show_separators = true;

Expand Down
10 changes: 5 additions & 5 deletions reference/exec/functions/proc-close.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: ef623ccf442df416da4e5bc254b4c5d4f6df9475 Maintainer: hirokawa Status: ready -->
<!-- EN-Revision: 970d3aa7fdf5c714b584cbe67ebf9e32a1e8b0d3 Maintainer: hirokawa Status: ready -->
<!-- CREDITS: shimooka,mumumu -->
<!-- splitted from ./en/functions/exec.xml, last change in rev 1.28 -->
<refentry xml:id='function.proc-close' xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>proc_close</refname>
<refpurpose><function>proc_open</function> で開かれたプロセスを閉じ
そのプロセスの終了コードを返す</refpurpose>
<refpurpose><function>proc_open</function> で開かれたプロセスへのパイプを閉じ
プロセスの終了を待ち、その終了コードを返す</refpurpose>
</refnamediv>

<refsect1 role="description">
Expand Down Expand Up @@ -45,10 +45,10 @@

<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
<simpara>
実行していたプロセスの終了状態を返します。
エラーが発生した場合は <literal>-1</literal> を返します。
</para>
</simpara>
&note.sigchild;
</refsect1>
<refsect1 role="changelog">
Expand Down
7 changes: 4 additions & 3 deletions reference/exec/functions/proc-open.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 6667724b8a42ba501172bc874dd1644a6744be0f Maintainer: hirokawa Status: ready -->
<!-- EN-Revision: f50098447455250c9f92eed119248aaa30920100 Maintainer: hirokawa Status: ready -->
<!-- CREDITS: takagi,mumumu -->
<refentry xml:id="function.proc-open" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -96,11 +96,12 @@
<simplelist>
<member>
プロセスに渡すパイプをあらわす配列。
最初の要素はディスクリプタの型で、2 番目の要素がその型に対応するオプションとなります
最初の要素はディスクリプタの型で、2 番目以降の要素がその型に対応するオプションとなります
使用できる型は <literal>pipe</literal> (2 番目の要素は、
プロセスにパイプの読み込み側を渡すのなら <literal>r</literal>、
書き込み側を渡すのなら <literal>w</literal>)
および <literal>file</literal> (2 番目の要素はファイル名)
および <literal>file</literal> (2 番目の要素はファイル名、
3 番目の要素は <function>fopen</function> と同じファイルモード)
です。
<literal>w</literal> 以外に何を指定しても、
<literal>r</literal> のように扱われるので注意して下さい。
Expand Down
4 changes: 2 additions & 2 deletions reference/imagick/imagick/mergeimagelayers.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 976425d4f6eec32448be3cc22ec063015921b753 Maintainer: takagi Status: ready -->
<!-- EN-Revision: 8e2cfbdce0cd028a6521c6e073f148e0f7efac7c Maintainer: takagi Status: ready -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.mergeimagelayers">
<refnamediv>
<refname>Imagick::mergeImageLayers</refname>
Expand Down Expand Up @@ -60,7 +60,7 @@
<?php
function mergeImageLayers($layerMethodType, $imagePath1, $imagePath2) {

$imagick = new \Imagick(realpath($imagePath));
$imagick = new \Imagick(realpath($imagePath1));

$imagick2 = new \Imagick(realpath($imagePath2));
$imagick->addImage($imagick2);
Expand Down
2 changes: 1 addition & 1 deletion reference/rar/rarentry/getunpackedsize.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: ee741f54f831af19f135d1d9894a41477ab896c3 Maintainer: takagi Status: ready -->
<!-- EN-Revision: 8e2cfbdce0cd028a6521c6e073f148e0f7efac7c Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.getunpackedsize">
<refnamediv>
Expand Down
6 changes: 3 additions & 3 deletions reference/reflection/reflectionfunction/construct.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 525aa5f198d482c0d03be54ddee5af13b376ab99 Maintainer: takagi Status: ready -->
<!-- EN-Revision: 629dfc9ec496d66c49b626dfc72a4981e74d6250 Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->

<refentry xml:id="reflectionfunction.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
Expand Down Expand Up @@ -90,12 +90,12 @@ function dumpReflectionFunction($func)
);

// ドキュメントコメントを表示します
printf("---> Documentation:\n %s\n", var_export($func->getDocComment(), 1));
printf("---> Documentation:\n %s\n", var_export($func->getDocComment(), true));

// static変数が存在すれば表示します
if ($statics = $func->getStaticVariables())
{
printf("---> Static variables: %s\n", var_export($statics, 1));
printf("---> Static variables: %s\n", var_export($statics, true));
}
}

Expand Down
4 changes: 2 additions & 2 deletions reference/spl/splfileinfo/getgroup.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 84d643420e0a5b43f34238aff8bde6dce168825b Maintainer: takagi Status: ready -->
<!-- EN-Revision: 8e2cfbdce0cd028a6521c6e073f148e0f7efac7c Maintainer: takagi Status: ready -->
<refentry xml:id="splfileinfo.getgroup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>SplFileInfo::getGroup</refname>
Expand Down Expand Up @@ -47,7 +47,7 @@
<![CDATA[
<?php
$info = new SplFileInfo('example.jpg');
echo info->getFilename() . ' belongs to group id ' . $info->getGroup() . "\n";
echo $info->getFilename() . ' belongs to group id ' . $info->getGroup() . "\n";
print_r(posix_getgrgid($info->getGroup()));
?>
]]>
Expand Down
4 changes: 2 additions & 2 deletions reference/spl/splfileinfo/getowner.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 84d643420e0a5b43f34238aff8bde6dce168825b Maintainer: takagi Status: ready -->
<!-- EN-Revision: 8e2cfbdce0cd028a6521c6e073f148e0f7efac7c Maintainer: takagi Status: ready -->
<refentry xml:id="splfileinfo.getowner" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>SplFileInfo::getOwner</refname>
Expand Down Expand Up @@ -47,7 +47,7 @@
<![CDATA[
<?php
$info = new SplFileInfo('example.jpg');
echo info->getFilename() . ' belongs to owner id ' . $info->getOwner() . "\n";
echo $info->getFilename() . ' belongs to owner id ' . $info->getOwner() . "\n";
print_r(posix_getpwuid($info->getOwner()));
?>
]]>
Expand Down
4 changes: 2 additions & 2 deletions reference/spl/splfileinfo/getsize.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 84d643420e0a5b43f34238aff8bde6dce168825b Maintainer: takagi Status: ready -->
<!-- EN-Revision: 8e2cfbdce0cd028a6521c6e073f148e0f7efac7c Maintainer: takagi Status: ready -->
<refentry xml:id="splfileinfo.getsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>SplFileInfo::getSize</refname>
Expand Down Expand Up @@ -47,7 +47,7 @@
<![CDATA[
<?php
$info = new SplFileInfo('example.jpg');
echo $fileinfo->getFilename() . " " . $fileinfo->getSize();
echo $info->getFilename() . " " . $info->getSize();
?>
]]>
</programlisting>
Expand Down
3 changes: 2 additions & 1 deletion reference/stream/book.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 98d4a70aac9e7e3663282507f2f9ce014227e39d Maintainer: takagi Status: ready -->
<!-- EN-Revision: 564bdc2db8f4c01ba36f64e24356756442b74bc5 Maintainer: takagi Status: ready -->
<!-- CREDITS: shimooka,hirokawa -->

<book xml:id="book.stream" xmlns="http://docbook.org/ns/docbook">
Expand Down Expand Up @@ -76,6 +76,7 @@
&reference.stream.examples;
&reference.stream.php-user-filter;
&reference.stream.streamwrapper;
&reference.stream.streambucket;
&reference.stream.reference;

</book>
Expand Down
6 changes: 2 additions & 4 deletions reference/stream/streambucket.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: a7be7e9abb82bfd0c69ea341d74fb9456e93f6f6 Maintainer: KentarouTakeda Status: ready -->
<!-- EN-Revision: 564bdc2db8f4c01ba36f64e24356756442b74bc5 Maintainer: KentarouTakeda Status: ready -->
<reference xml:id="class.streambucket" 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>StreamBucket クラス</title>
Expand Down Expand Up @@ -76,7 +76,7 @@
</simpara>
</listitem>
</varlistentry>
<varlistentry xml:id="streambucket.props.dataLength">
<varlistentry xml:id="streambucket.props.datalength">
<term>int <varname>dataLength</varname></term>
<listitem>
<simpara>バケット内の文字列の長さ。</simpara>
Expand All @@ -97,8 +97,6 @@

</partintro>

&reference.stream.entities.streambucket;

</reference>
<!-- Keep this comment at the end of the file
Local variables:
Expand Down
4 changes: 2 additions & 2 deletions reference/uri/uri/rfc3986/uri/parse.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
<!-- EN-Revision: 8e2cfbdce0cd028a6521c6e073f148e0f7efac7c Maintainer: KentarouTakeda Status: ready -->
<refentry xml:id="uri-rfc3986-uri.parse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>Uri\Rfc3986\Uri::parse</refname>
Expand Down Expand Up @@ -63,7 +63,7 @@ $uri = \Uri\Rfc3986\Uri::parse("https://example.com");
if ($uri !== null) {
echo "Valid URI: " . $uri->toString();
} else {
echo "Invalid URI"
echo "Invalid URI";
}
?>
]]>
Expand Down
4 changes: 2 additions & 2 deletions reference/uri/uri/whatwg/url/parse.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 39596f1226fd3b502bfbba09068ad6701235426f Maintainer: KentarouTakeda Status: ready -->
<!-- EN-Revision: 8e2cfbdce0cd028a6521c6e073f148e0f7efac7c Maintainer: KentarouTakeda Status: ready -->
<refentry xml:id="uri-whatwg-url.parse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>Uri\WhatWg\Url::parse</refname>
Expand Down Expand Up @@ -73,7 +73,7 @@ $url = \Uri\WhatWg\Url::parse("https://example.com");
if ($url !== null) {
echo "Valid URL: " . $url->toAsciiString();
} else {
echo "Invalid URL"
echo "Invalid URL";
}
?>
]]>
Expand Down
4 changes: 2 additions & 2 deletions reference/xattr/functions/xattr-list.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: 14af302c9c0e561fa6f9cdd956268758ba9a89c5 Maintainer: takagi Status: ready -->
<!-- EN-Revision: 8e2cfbdce0cd028a6521c6e073f148e0f7efac7c Maintainer: takagi Status: ready -->
<refentry xml:id="function.xattr-list" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>xattr_list</refname>
Expand Down Expand Up @@ -81,7 +81,7 @@ foreach ($root_attributes as $attr_name) {
}

echo "\n User 属性: \n";
foreach ($attributes as $attr_name) {
foreach ($user_attributes as $attr_name) {
printf("%s\n", $attr_name);
}

Expand Down
4 changes: 2 additions & 2 deletions reference/yaf/yaf_route_rewrite/assemble.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<!-- EN-Revision: c9389e4a0e96801fd14d91336ff3f12e45929a73 Maintainer: mumumu Status: ready -->
<!-- EN-Revision: 8e2cfbdce0cd028a6521c6e073f148e0f7efac7c Maintainer: mumumu Status: ready -->

<refentry xml:id="yaf-route-rewrite.assemble" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
Expand Down Expand Up @@ -55,7 +55,7 @@
<title><function>Yaf_Route_Rewrite::assemble</function> の例</title>
<programlisting role="php">
<![CDATA[
router = new Yaf_Router();
$router = new Yaf_Router();

$route = new Yaf_Route_Rewrite(
"/product/:name/:id/*",
Expand Down
Loading