Skip to content

Commit df78bd1

Browse files
Fix example output (screen) inconsistent with code (#5600)
* Fix example output (screen) inconsistent with code Co-authored-by: Jordi Kroon <jordikroon@php.net>
1 parent 0019a7e commit df78bd1

16 files changed

Lines changed: 31 additions & 32 deletions

File tree

language/oop5/inheritance.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ class Bar extends Foo
9797
$foo = new Foo();
9898
$bar = new Bar();
9999
$foo->printItem('baz'); // Output: 'Foo: baz'
100-
$foo->printPHP(); // Output: 'PHP is great'
100+
$foo->printPHP(); // Output: 'PHP is great.'
101101
$bar->printItem('baz'); // Output: 'Bar: baz'
102-
$bar->printPHP(); // Output: 'PHP is great'
102+
$bar->printPHP(); // Output: 'PHP is great.'
103103
104104
?>
105105
]]>

reference/datetime/functions/mktime.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,11 @@ print date('c', $nextyear) . "\n";
254254
<para>
255255
<example>
256256
<title>Last day of a month</title>
257-
<para>
257+
<simpara>
258258
The last day of any given month can be expressed as the "0" day
259259
of the next month, not the -1 day. Both of the following examples
260-
will produce the string "The last day in Feb 2000 is: 29".
261-
</para>
260+
will produce the string "Last day in Feb 2000 is: 29".
261+
</simpara>
262262
<programlisting role="php">
263263
<![CDATA[
264264
<?php

reference/dom/domelement/construct.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ $dom = new DOMDocument('1.0', 'iso-8859-1');
6868
$element = $dom->appendChild(new DOMElement('root'));
6969
$element_ns = new DOMElement('pr:node1', 'thisvalue', 'http://xyz');
7070
$element->appendChild($element_ns);
71-
echo $dom->saveXML(); /* <?xml version="1.0" encoding="utf-8"?>
71+
echo $dom->saveXML(); /* <?xml version="1.0" encoding="iso-8859-1"?>
7272
<root><pr:node1 xmlns:pr="http://xyz">thisvalue</pr:node1></root> */
7373
7474
?>

reference/ds/ds/map/ksort.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<modifier>public</modifier> <type>void</type><methodname>Ds\Map::ksort</methodname>
1616
<methodparam choice="opt"><type>callable</type><parameter>comparator</parameter></methodparam>
1717
</methodsynopsis>
18-
<para>
18+
<simpara>
1919
Sorts the map in-place by key, using an optional <parameter>comparator</parameter> function.
20-
</para>
20+
</simpara>
2121

2222
</refsect1>
2323

@@ -35,9 +35,9 @@
3535

3636
<refsect1 role="returnvalues">
3737
&reftitle.returnvalues;
38-
<para>
38+
<simpara>
3939
&return.void;
40-
</para>
40+
</simpara>
4141
</refsect1>
4242

4343
<refsect1 role="examples">
@@ -101,7 +101,6 @@ print_r($map);
101101
<screen>
102102
<![CDATA[
103103
Ds\Map Object
104-
Ds\Map Object
105104
(
106105
[0] => Ds\Pair Object
107106
(

reference/ds/ds/map/ksorted.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<modifier>public</modifier> <type>Ds\Map</type><methodname>Ds\Map::ksorted</methodname>
1414
<methodparam choice="opt"><type>callable</type><parameter>comparator</parameter></methodparam>
1515
</methodsynopsis>
16-
<para>
16+
<simpara>
1717
Returns a copy sorted by key, using an optional <parameter>comparator</parameter> function.
18-
</para>
18+
</simpara>
1919

2020
</refsect1>
2121

@@ -33,9 +33,9 @@
3333

3434
<refsect1 role="returnvalues">
3535
&reftitle.returnvalues;
36-
<para>
36+
<simpara>
3737
Returns a copy of the map, sorted by key.
38-
</para>
38+
</simpara>
3939
</refsect1>
4040

4141
<refsect1 role="examples">
@@ -55,7 +55,6 @@ print_r($map->ksorted());
5555
<screen>
5656
<![CDATA[
5757
Ds\Map Object
58-
Ds\Map Object
5958
(
6059
[0] => Ds\Pair Object
6160
(
@@ -99,7 +98,6 @@ print_r($sorted);
9998
<screen>
10099
<![CDATA[
101100
Ds\Map Object
102-
Ds\Map Object
103101
(
104102
[0] => Ds\Pair Object
105103
(

reference/ds/ds/map/pairs.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var_dump($map->pairs());
4747
&example.outputs.similar;
4848
<screen>
4949
<![CDATA[
50-
object(Ds\Map)#8 (3) {
50+
object(Ds\Vector)#8 (3) {
5151
[0]=>
5252
object(Ds\Pair)#5 (2) {
5353
["key"]=>
@@ -70,7 +70,6 @@ object(Ds\Map)#8 (3) {
7070
int(3)
7171
}
7272
}
73-
p
7473
]]>
7574
</screen>
7675
</example>

reference/ds/ds/pair/clear.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ print_r($pair);
5050
<![CDATA[
5151
Ds\Pair Object
5252
(
53-
[0] => 1
54-
[1] => 2
55-
[2] => 3
53+
[key] => a
54+
[value] => 1
5655
)
5756
Ds\Pair Object
5857
(

reference/ds/ds/vector/join.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ var_dump($vector->join());
7373
&example.outputs.similar;
7474
<screen>
7575
<![CDATA[
76-
string(11) "abc123"
76+
string(6) "abc123"
7777
]]>
7878
</screen>
7979
</example>

reference/memcached/memcached/fetch.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ while ($result = $m->fetch()) {
6060
array(3) {
6161
["key"]=>
6262
string(3) "int"
63-
"value"]=>
63+
["value"]=>
6464
int(99)
6565
["cas"]=>
6666
float(2363)

reference/mongodb/functions/bson/fromphp.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ echo bin2hex($bson), "\n";
100100
&example.outputs;
101101
<screen>
102102
<![CDATA[
103-
0e00000010666f6f000100000000cat
103+
0e00000010666f6f000100000000
104104
]]>
105105
</screen>
106106
</example>

0 commit comments

Comments
 (0)