Skip to content

Commit 2e9161e

Browse files
mumumumumumu
committed
Change output of ArrayObject
php/doc-en@52e3799
1 parent b6906b2 commit 2e9161e

File tree

10 files changed

+219
-136
lines changed

10 files changed

+219
-136
lines changed

‎reference/spl/arrayobject/append.xml‎

Lines changed: 18 additions & 14 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: d51166ca16fda8e766849505b84f9306ef443f71 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 52e3799c4caf4a0448eea45b97c4d76a2d59c95d Maintainer: takagi Status: ready -->
44
<!-- CREDITS: shimooka -->
55
<refentry xml:id="arrayobject.append" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -48,6 +48,7 @@
4848
</para>
4949
</refsect1>
5050

51+
5152
<refsect1 role="examples">
5253
&reftitle.examples;
5354
<para>
@@ -66,21 +67,24 @@ var_dump($arrayobj);
6667
&example.outputs;
6768
<screen>
6869
<![CDATA[
69-
object(ArrayObject)#1 (5) {
70-
[0]=>
71-
string(5) "first"
72-
[1]=>
73-
string(6) "second"
74-
[2]=>
75-
string(5) "third"
76-
[3]=>
77-
string(6) "fourth"
78-
[4]=>
79-
array(2) {
70+
object(ArrayObject)#1 (1) {
71+
["storage":"ArrayObject":private]=>
72+
array(5) {
8073
[0]=>
81-
string(4) "five"
74+
string(5) "first"
8275
[1]=>
83-
string(3) "six"
76+
string(6) "second"
77+
[2]=>
78+
string(5) "third"
79+
[3]=>
80+
string(6) "fourth"
81+
[4]=>
82+
array(2) {
83+
[0]=>
84+
string(4) "five"
85+
[1]=>
86+
string(3) "six"
87+
}
8488
}
8589
}
8690
]]>

‎reference/spl/arrayobject/exchangearray.xml‎

Lines changed: 24 additions & 16 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: d51166ca16fda8e766849505b84f9306ef443f71 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 52e3799c4caf4a0448eea45b97c4d76a2d59c95d Maintainer: takagi Status: ready -->
44
<refentry xml:id="arrayobject.exchangearray" xmlns="http://docbook.org/ns/docbook">
55
<refnamediv>
66
<refname>ArrayObject::exchangeArray</refname>
@@ -57,28 +57,36 @@ $fruitsArrayObject = new ArrayObject($fruits);
5757
5858
// フルーツを都市と交換します
5959
$old = $fruitsArrayObject->exchangeArray($locations);
60-
print_r($old);
61-
print_r($fruitsArrayObject);
60+
var_dump($old);
61+
var_dump($fruitsArrayObject);
6262
6363
?>
6464
]]>
6565
</programlisting>
6666
&example.outputs;
6767
<screen>
6868
<![CDATA[
69-
Array
70-
(
71-
[lemons] => 1
72-
[oranges] => 4
73-
[bananas] => 5
74-
[apples] => 10
75-
)
76-
ArrayObject Object
77-
(
78-
[0] => Amsterdam
79-
[1] => Paris
80-
[2] => London
81-
)
69+
array(4) {
70+
["lemons"]=>
71+
int(1)
72+
["oranges"]=>
73+
int(4)
74+
["bananas"]=>
75+
int(5)
76+
["apples"]=>
77+
int(10)
78+
}
79+
object(ArrayObject)#1 (1) {
80+
["storage":"ArrayObject":private]=>
81+
array(3) {
82+
[0]=>
83+
string(9) "Amsterdam"
84+
[1]=>
85+
string(5) "Paris"
86+
[2]=>
87+
string(6) "London"
88+
}
89+
}
8290
]]>
8391
</screen>
8492
</example>

‎reference/spl/arrayobject/getarraycopy.xml‎

Lines changed: 14 additions & 10 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: d51166ca16fda8e766849505b84f9306ef443f71 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 52e3799c4caf4a0448eea45b97c4d76a2d59c95d Maintainer: takagi Status: ready -->
44
<!-- Credits: mumumu -->
55
<refentry xml:id="arrayobject.getarraycopy" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -48,22 +48,26 @@ $fruitsArrayObject['pears'] = 4;
4848
4949
// 配列のコピーを作成します
5050
$copy = $fruitsArrayObject->getArrayCopy();
51-
print_r($copy);
51+
var_dump($copy);
5252
5353
?>
5454
]]>
5555
</programlisting>
5656
&example.outputs;
5757
<screen>
5858
<![CDATA[
59-
Array
60-
(
61-
[lemons] => 1
62-
[oranges] => 4
63-
[bananas] => 5
64-
[apples] => 10
65-
[pears] => 4
66-
)
59+
array(5) {
60+
["lemons"]=>
61+
int(1)
62+
["oranges"]=>
63+
int(4)
64+
["bananas"]=>
65+
int(5)
66+
["apples"]=>
67+
int(10)
68+
["pears"]=>
69+
int(4)
70+
}
6771
]]>
6872
</screen>
6973
</example>

‎reference/spl/arrayobject/natcasesort.xml‎

Lines changed: 37 additions & 21 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: 2ca090342977839edca2f7f4e52305a1b5da6095 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 52e3799c4caf4a0448eea45b97c4d76a2d59c95d Maintainer: takagi Status: ready -->
44
<refentry xml:id="arrayobject.natcasesort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
55
<refnamediv>
66
<refname>ArrayObject::natcasesort</refname>
@@ -70,38 +70,54 @@ $arr2 = clone $arr1;
7070
7171
$arr1->asort();
7272
echo "Standard sorting\n";
73-
print_r($arr1);
73+
var_dump($arr1);
7474
7575
$arr2->natcasesort();
7676
echo "\nNatural order sorting (case-insensitive)\n";
77-
print_r($arr2);
77+
var_dump($arr2);
7878
?>
7979
]]>
8080
</programlisting>
8181
&example.outputs;
8282
<screen>
8383
<![CDATA[
8484
Standard sorting
85-
ArrayObject Object
86-
(
87-
[0] => IMG0.png
88-
[5] => IMG3.png
89-
[4] => img1.png
90-
[2] => img10.png
91-
[1] => img12.png
92-
[3] => img2.png
93-
)
85+
object(ArrayObject)#1 (1) {
86+
["storage":"ArrayObject":private]=>
87+
array(6) {
88+
[0]=>
89+
string(8) "IMG0.png"
90+
[5]=>
91+
string(8) "IMG3.png"
92+
[4]=>
93+
string(8) "img1.png"
94+
[2]=>
95+
string(9) "img10.png"
96+
[1]=>
97+
string(9) "img12.png"
98+
[3]=>
99+
string(8) "img2.png"
100+
}
101+
}
94102
95103
Natural order sorting (case-insensitive)
96-
ArrayObject Object
97-
(
98-
[0] => IMG0.png
99-
[4] => img1.png
100-
[3] => img2.png
101-
[5] => IMG3.png
102-
[2] => img10.png
103-
[1] => img12.png
104-
)
104+
object(ArrayObject)#2 (1) {
105+
["storage":"ArrayObject":private]=>
106+
array(6) {
107+
[0]=>
108+
string(8) "IMG0.png"
109+
[4]=>
110+
string(8) "img1.png"
111+
[3]=>
112+
string(8) "img2.png"
113+
[5]=>
114+
string(8) "IMG3.png"
115+
[2]=>
116+
string(9) "img10.png"
117+
[1]=>
118+
string(9) "img12.png"
119+
}
120+
}
105121
]]>
106122
</screen>
107123
<para>

‎reference/spl/arrayobject/natsort.xml‎

Lines changed: 29 additions & 17 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: 2ca090342977839edca2f7f4e52305a1b5da6095 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 52e3799c4caf4a0448eea45b97c4d76a2d59c95d Maintainer: takagi Status: ready -->
44
<refentry xml:id="arrayobject.natsort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
55
<refnamediv>
66
<refname>ArrayObject::natsort</refname>
@@ -68,34 +68,46 @@ $arr2 = clone $arr1;
6868
6969
$arr1->asort();
7070
echo "Standard sorting\n";
71-
print_r($arr1);
71+
var_dump($arr1);
7272
7373
$arr2->natsort();
7474
echo "\nNatural order sorting\n";
75-
print_r($arr2);
75+
var_dump($arr2);
7676
?>
7777
]]>
7878
</programlisting>
7979
&example.outputs;
8080
<screen>
8181
<![CDATA[
8282
Standard sorting
83-
ArrayObject Object
84-
(
85-
[3] => img1.png
86-
[1] => img10.png
87-
[0] => img12.png
88-
[2] => img2.png
89-
)
83+
object(ArrayObject)#1 (1) {
84+
["storage":"ArrayObject":private]=>
85+
array(4) {
86+
[3]=>
87+
string(8) "img1.png"
88+
[1]=>
89+
string(9) "img10.png"
90+
[0]=>
91+
string(9) "img12.png"
92+
[2]=>
93+
string(8) "img2.png"
94+
}
95+
}
9096
9197
Natural order sorting
92-
ArrayObject Object
93-
(
94-
[3] => img1.png
95-
[2] => img2.png
96-
[1] => img10.png
97-
[0] => img12.png
98-
)
98+
object(ArrayObject)#2 (1) {
99+
["storage":"ArrayObject":private]=>
100+
array(4) {
101+
[3]=>
102+
string(8) "img1.png"
103+
[2]=>
104+
string(8) "img2.png"
105+
[1]=>
106+
string(9) "img10.png"
107+
[0]=>
108+
string(9) "img12.png"
109+
}
110+
}
99111
]]>
100112
</screen>
101113
<para>

‎reference/spl/arrayobject/offsetset.xml‎

Lines changed: 24 additions & 18 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: d51166ca16fda8e766849505b84f9306ef443f71 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: 52e3799c4caf4a0448eea45b97c4d76a2d59c95d Maintainer: takagi Status: ready -->
44
<!-- CREDITS: shimooka -->
55
<refentry xml:id="arrayobject.offsetset" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -76,27 +76,33 @@ var_dump($arrayobj);
7676
&example.outputs;
7777
<screen>
7878
<![CDATA[
79-
object(ArrayObject)#1 (3) {
80-
["property"]=>
81-
string(11) "prop:public"
82-
[4]=>
83-
string(4) "four"
84-
["group"]=>
85-
array(2) {
79+
object(ArrayObject)#1 (1) {
80+
["storage":"ArrayObject":private]=>
81+
object(Example)#2 (3) {
82+
["property"]=>
83+
string(11) "prop:public"
84+
["4"]=>
85+
string(4) "four"
86+
["group"]=>
87+
array(2) {
88+
[0]=>
89+
string(2) "g1"
90+
[1]=>
91+
string(2) "g2"
92+
}
93+
}
94+
}
95+
object(ArrayObject)#3 (1) {
96+
["storage":"ArrayObject":private]=>
97+
array(3) {
8698
[0]=>
87-
string(2) "g1"
99+
string(4) "zero"
88100
[1]=>
89-
string(2) "g2"
101+
string(3) "one"
102+
[2]=>
103+
string(4) "last"
90104
}
91105
}
92-
object(ArrayObject)#3 (3) {
93-
[0]=>
94-
string(4) "zero"
95-
[1]=>
96-
string(3) "one"
97-
[2]=>
98-
string(4) "last"
99-
}
100106
]]>
101107
</screen>
102108
</example>

0 commit comments

Comments
 (0)