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
4 changes: 3 additions & 1 deletion language/control-structures/foreach.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: b8147b7f03506e41f01631c32a907b955593525a Maintainer: mumumu Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: mumumu Status: ready -->
<sect1 xml:id="control-structures.foreach" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>foreach</title>
<?phpdoc print-version-for="foreach"?>
Expand Down Expand Up @@ -179,6 +179,8 @@ foreach ($array as list($a, $b)) {
<![CDATA[
A: 1; B: 2
A: 3; B: 4
A: 1; B: 2
A: 3; B: 4
]]>
</screen>
</informalexample>
Expand Down
4 changes: 2 additions & 2 deletions language/control-structures/goto.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: b8147b7f03506e41f01631c32a907b955593525a Maintainer: takagi Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->

<sect1 xml:id="control-structures.goto" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
Expand Down Expand Up @@ -96,7 +96,7 @@ for ($i = 0, $j = 50; $i < 100; $i++) {
echo "$i = $i";
]]>
</programlisting>
&example.outputs;
&example.outputs.similar;
<screen>
<![CDATA[
Fatal error: 'goto' into loop or switch statement is disallowed in script on line 2
Expand Down
4 changes: 2 additions & 2 deletions language/control-structures/match.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: b8147b7f03506e41f01631c32a907b955593525a Maintainer: mumumu Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: mumumu Status: ready -->

<sect1 xml:id="control-structures.match" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>match</title>
Expand Down Expand Up @@ -226,7 +226,7 @@ object(UnhandledMatchError)#1 (7) {
["file":protected]=>
string(6) "script"
["line":protected]=>
int(6)
int(5)
["trace":"Error":private]=>
array(0) {
}
Expand Down
7 changes: 4 additions & 3 deletions language/control-structures/switch.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: b8147b7f03506e41f01631c32a907b955593525a Maintainer: takagi Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->

<sect1 xml:id="control-structures.switch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
Expand Down Expand Up @@ -343,14 +343,15 @@ switch($beer)
&example.outputs;
<screen>
<![CDATA[

Deprecated: Case statements followed by a semicolon (;) are deprecated, use a colon (:) instead in script on line 6

Deprecated: Case statements followed by a semicolon (;) are deprecated, use a colon (:) instead in script on line 7

Deprecated: Case statements followed by a semicolon (;) are deprecated, use a colon (:) instead in script on line 8

Deprecated: Case statements followed by a semicolon (;) are deprecated, use a colon (:) instead in script on line 11
Deprecated: Case statements followed by a semicolon (;) are deprecated, use a colon (:) instead in script on line 9

Deprecated: Case statements followed by a semicolon (;) are deprecated, use a colon (:) instead in script on line 12
ほかのを選んでみませんか?
]]>
</screen>
Expand Down
8 changes: 4 additions & 4 deletions language/oop5/basic.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: fc068b4857342eb409efeafe6723058f39ab1045 Maintainer: takagi Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: takagi Status: ready -->
<!-- CREDITS: hirokawa,mumumu,jdkfx -->

<sect1 xml:id="language.oop5.basic" xmlns="http://docbook.org/ns/docbook">
Expand Down Expand Up @@ -334,8 +334,8 @@ var_dump($assigned);
NULL
NULL
object(SimpleClass)#1 (1) {
["var"]=>
string(30) "$assigned will have this value"
["var"]=>
string(30) "$assigned will have this value"
}
]]>
</screen>
Expand Down Expand Up @@ -541,7 +541,7 @@ $extended->displayVar();
<screen>
<![CDATA[
Extending class
Parent Class
Parent class
]]>
</screen>
</example>
Expand Down
6 changes: 3 additions & 3 deletions language/oop5/lazy-objects.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: ee1ce6a0e1875b6851274f8c373ca2bd48630fa0 Maintainer: KentarouTakeda Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: KentarouTakeda Status: ready -->
<!-- Credits: KentarouTakeda -->
<sect1 xml:id="language.oop5.lazy-objects" xmlns="http://docbook.org/ns/docbook">
<title>レイジーオブジェクト</title>
Expand Down Expand Up @@ -82,8 +82,8 @@ var_dump($lazyObject->prop);
<screen>
<![CDATA[
lazy ghost object(Example)#3 (0) {
["prop"]=>
uninitialized(int)
["prop"]=>
uninitialized(int)
}
string(7) "Example"
Example::__construct
Expand Down
5 changes: 2 additions & 3 deletions language/oop5/overloading.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: 911fe79de766ef4475bf22446903667a0f3a24d3 Maintainer: takagi Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: takagi Status: ready -->
<!-- CREDITS: hirokawa,shimooka,mumumu -->

<sect1 xml:id="language.oop5.overloading" xmlns="http://docbook.org/ns/docbook">
Expand Down Expand Up @@ -234,8 +234,7 @@ Privates are visible inside the class, so __get() not used...
Privates not visible outside of class, so __get() is used...
Getting 'hidden'


Notice: Undefined property via __get(): hidden in <file> on line 70 in <file> on line 29
Notice: Undefined property via __get(): hidden in script on line 71 in script on line 27
]]>
</screen>

Expand Down
17 changes: 15 additions & 2 deletions language/types/array.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: 911fe79de766ef4475bf22446903667a0f3a24d3 Maintainer: takagi Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: takagi Status: ready -->
<!-- CREDITS: hirokawa,shimooka,mumumu -->
<sect1 xml:id="language.types.array">
<title>配列</title>
Expand Down Expand Up @@ -1149,7 +1149,7 @@ var_dump((array) new B());
?>
]]>
</programlisting>
&example.outputs;
&example.outputs.80;
<screen>
<![CDATA[
array(3) {
Expand All @@ -1160,6 +1160,19 @@ array(3) {
["AA"]=>
NULL
}
]]>
</screen>
&example.outputs.81;
<screen>
<![CDATA[
array(3) {
["AA"]=>
NULL
["BA"]=>
NULL
["AA"]=>
NULL
}
]]>
</screen>
</example>
Expand Down
4 changes: 2 additions & 2 deletions language/types/callable.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: 312c0c7b39d0722c419f6784cbda24823220dfb3 Maintainer: mumumu Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: mumumu Status: ready -->

<sect1 xml:id="language.types.callable">
<title>コールバック / Callable</title>
Expand Down Expand Up @@ -279,7 +279,7 @@ Hello World!
Hello World!
Hello World!

Deprecated: Callables of the form ["B", "parent::who"] are deprecated in script on line 41
Deprecated: Callables of the form ["B", "parent::who"] are deprecated in script on line 44
A
Hello PHP!
]]>
Expand Down
12 changes: 6 additions & 6 deletions reference/array/functions/array-fill.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: 2e60c5134e7a847c99f81eb3f7ecee1f5efeeace Maintainer: hirokawa Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: hirokawa Status: ready -->
<refentry xml:id="function.array-fill" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>array_fill</refname>
Expand Down Expand Up @@ -130,11 +130,11 @@ print_r($a);
<![CDATA[
Array
(
[5] => banana
[6] => banana
[7] => banana
[8] => banana
[9] => banana
[5] => banana
[6] => banana
[7] => banana
[8] => banana
[9] => banana
[10] => banana
)
]]>
Expand Down
10 changes: 9 additions & 1 deletion reference/array/functions/array-map.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: 1f5bcc30ee06e452b98362460ea7b7bf2b20f4a1 Maintainer: takagi Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: takagi Status: ready -->
<!-- CREDITS: hirokawa,mumumu -->
<refentry xml:id="function.array-map" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -166,6 +166,14 @@ Array
[3] => 8
[4] => 10
)
Array
(
[0] => 2
[1] => 4
[2] => 6
[3] => 8
[4] => 10
)
]]>
</screen>
</example>
Expand Down
9 changes: 5 additions & 4 deletions reference/array/functions/array-udiff-assoc.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: 56509d07ae636f076057f55bbb2572ab7b7a39eb Maintainer: takagi Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: takagi Status: ready -->
<refentry xml:id="function.array-udiff-assoc" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>array_udiff_assoc</refname>
Expand Down Expand Up @@ -107,18 +107,19 @@ Array
(
[0.1] => cr Object
(
[priv_member:private] => 9
[priv_member:cr:private] => 9
)

[0.5] => cr Object
(
[priv_member:private] => 12
[priv_member:cr:private] => 12
)

[0] => cr Object
(
[priv_member:private] => 23
[priv_member:cr:private] => 23
)

)
]]>
</screen>
Expand Down
8 changes: 5 additions & 3 deletions reference/array/functions/array-unique.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: 651fad6c6677036edd2871bb78199e17586a3acd Maintainer: hirokawa Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: hirokawa Status: ready -->
<!-- Credits: mumumu -->

<refentry xml:id="function.array-unique" xmlns="http://docbook.org/ns/docbook">
Expand Down Expand Up @@ -160,8 +160,10 @@ var_dump($result);
<screen role="php">
<![CDATA[
array(2) {
[0] => int(4)
[2] => string(1) "3"
[0]=>
int(4)
[2]=>
string(1) "3"
}
]]>
</screen>
Expand Down
10 changes: 5 additions & 5 deletions reference/array/functions/array-unshift.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: 0987e913fcaed76897aeb239c6ed83d765a895e1 Maintainer: hirokawa Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: hirokawa Status: ready -->
<refentry xml:id="function.array-unshift" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>array_unshift</refname>
Expand Down Expand Up @@ -102,13 +102,13 @@ var_dump($queue);
<screen role="php">
<![CDATA[
array(4) {
[0] =>
[0]=>
string(5) "apple"
[1] =>
[1]=>
string(9) "raspberry"
[2] =>
[2]=>
string(6) "orange"
[3] =>
[3]=>
string(6) "banana"
}
]]>
Expand Down
5 changes: 2 additions & 3 deletions reference/array/functions/natsort.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: f781803449007bb0e3a96c693e0eee067f7eb466 Maintainer: hirokawa Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: hirokawa Status: ready -->
<!-- CREDITS: shimooka,mumumu -->
<refentry xml:id="function.natsort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
Expand Down Expand Up @@ -153,7 +153,6 @@ Array
[1] => 3
[5] => 9
)

ゼロ埋め
Array
(
Expand All @@ -168,8 +167,8 @@ Array
(
[5] => 0
[1] => 8
[3] => 009
[0] => 09
[3] => 009
[2] => 10
[4] => 011
)
Expand Down
4 changes: 2 additions & 2 deletions reference/datetime/formats.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: 3a8c3e77df070a046c9d5b56b68926ca2d7e5ee3 Maintainer: takagi Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: takagi Status: ready -->
<!-- CREDITS: hnw,mumumu -->
<chapter xml:id="datetime.formats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>サポートする日付と時刻の書式</title>
Expand Down Expand Up @@ -99,7 +99,7 @@ var_dump($res["warnings"]);
<screen>
<![CDATA[
array(1) {
[11] =>
[11]=>
string(27) "The parsed date was invalid"
}
]]>
Expand Down
5 changes: 3 additions & 2 deletions reference/datetime/functions/date-default-timezone-get.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: 3a8c3e77df070a046c9d5b56b68926ca2d7e5ee3 Maintainer: takagi Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.date-default-timezone-get" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -85,7 +85,8 @@ date.timezone: Europe/London
<![CDATA[
<?php
date_default_timezone_set('America/Los_Angeles');
echo date_default_timezone_get() . ' => ' . date('e') . ' => ' . date('T');
$ts = mktime(0, 0, 0, 1, 1, 2024);
echo date_default_timezone_get() . ' => ' . date('e') . ' => ' . date('T', $ts);
]]>
</programlisting>
&example.outputs;
Expand Down
4 changes: 2 additions & 2 deletions reference/datetime/functions/date-sun-info.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: 3a8c3e77df070a046c9d5b56b68926ca2d7e5ee3 Maintainer: takagi Status: ready -->
<!-- EN-Revision: 17c238517825dfb7ec3edfef5972acd944ffbc1e Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.date-sun-info" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
Expand Down Expand Up @@ -285,7 +285,7 @@ echo "Length of day: ",
&example.outputs;
<screen>
<![CDATA[
Length of day: 13h 56s
Length of day: 13h 53s
]]>
</screen>
</example>
Expand Down
Loading
Loading