Skip to content

Commit b6321d4

Browse files
committed
Fix class names
1 parent 0d0fffe commit b6321d4

14 files changed

+68
-68
lines changed

ext/simplexml/simplexml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1614,7 +1614,7 @@ PHP_MINIT_FUNCTION(simplexml)
16141614
{
16151615
zend_class_entry sxe;
16161616

1617-
INIT_CLASS_ENTRY(sxe, "simplexml_element", sxe_functions);
1617+
INIT_CLASS_ENTRY(sxe, "SimpleXMLElement", sxe_functions);
16181618
sxe.create_object = sxe_object_new;
16191619
sxe_class_entry = zend_register_internal_class(&sxe TSRMLS_CC);
16201620
sxe_class_entry->get_iterator = php_sxe_get_iterator;

ext/simplexml/tests/001.phpt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ echo "---Done---\n";
1313

1414
?>
1515
--EXPECT--
16-
simplexml_element Object
16+
SimpleXMLElement Object
1717
(
18-
[elem1] => simplexml_element Object
18+
[elem1] => SimpleXMLElement Object
1919
(
20-
[comment] => simplexml_element Object
20+
[comment] => SimpleXMLElement Object
2121
(
2222
)
2323

24-
[elem2] => simplexml_element Object
24+
[elem2] => SimpleXMLElement Object
2525
(
26-
[elem3] => simplexml_element Object
26+
[elem3] => SimpleXMLElement Object
2727
(
28-
[elem4] => simplexml_element Object
28+
[elem4] => SimpleXMLElement Object
2929
(
30-
[test] => simplexml_element Object
30+
[test] => SimpleXMLElement Object
3131
(
3232
)
3333

ext/simplexml/tests/002.phpt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@ echo "---Done---\n";
3232

3333
?>
3434
--EXPECT--
35-
simplexml_element Object
35+
SimpleXMLElement Object
3636
(
37-
[elem1] => simplexml_element Object
37+
[elem1] => SimpleXMLElement Object
3838
(
39-
[comment] => simplexml_element Object
39+
[comment] => SimpleXMLElement Object
4040
(
4141
)
4242

43-
[elem2] => simplexml_element Object
43+
[elem2] => SimpleXMLElement Object
4444
(
45-
[elem3] => simplexml_element Object
45+
[elem3] => SimpleXMLElement Object
4646
(
47-
[elem4] => simplexml_element Object
47+
[elem4] => SimpleXMLElement Object
4848
(
49-
[test] => simplexml_element Object
49+
[test] => SimpleXMLElement Object
5050
(
5151
)
5252

ext/simplexml/tests/003.phpt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,26 @@ echo "---Done---\n";
3434

3535
?>
3636
--EXPECT--
37-
simplexml_element Object
37+
SimpleXMLElement Object
3838
(
39-
[elem1] => simplexml_element Object
39+
[elem1] => SimpleXMLElement Object
4040
(
41-
[comment] => simplexml_element Object
41+
[comment] => SimpleXMLElement Object
4242
(
4343
)
4444

45-
[elem2] => simplexml_element Object
45+
[elem2] => SimpleXMLElement Object
4646
(
47-
[elem3] => simplexml_element Object
47+
[elem3] => SimpleXMLElement Object
4848
(
49-
[included-entity] => simplexml_element Object
49+
[included-entity] => SimpleXMLElement Object
5050
(
5151
[included-entity] => This is text included from an entity
5252
)
5353

54-
[elem4] => simplexml_element Object
54+
[elem4] => SimpleXMLElement Object
5555
(
56-
[test] => simplexml_element Object
56+
[test] => SimpleXMLElement Object
5757
(
5858
)
5959

ext/simplexml/tests/004.phpt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ var_dump(trim((string)$elem2));
3434
?>
3535
===DONE===
3636
--EXPECT--
37-
simplexml_element Object
37+
SimpleXMLElement Object
3838
(
39-
[elem1] => simplexml_element Object
39+
[elem1] => SimpleXMLElement Object
4040
(
41-
[comment] => simplexml_element Object
41+
[comment] => SimpleXMLElement Object
4242
(
4343
)
4444

45-
[elem2] => simplexml_element Object
45+
[elem2] => SimpleXMLElement Object
4646
(
47-
[elem3] => simplexml_element Object
47+
[elem3] => SimpleXMLElement Object
4848
(
49-
[elem4] => simplexml_element Object
49+
[elem4] => SimpleXMLElement Object
5050
(
51-
[test] => simplexml_element Object
51+
[test] => SimpleXMLElement Object
5252
(
5353
)
5454

ext/simplexml/tests/007.phpt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,38 +48,38 @@ var_dump($a);
4848
===Done===
4949
--EXPECTF--
5050
===Property===
51-
object(simplexml_element)#%d (2) {
51+
object(SimpleXMLElement)#%d (2) {
5252
["comment"]=>
53-
object(simplexml_element)#%d (0) {
53+
object(SimpleXMLElement)#%d (0) {
5454
}
5555
["elem2"]=>
56-
object(simplexml_element)#%d (1) {
56+
object(SimpleXMLElement)#%d (1) {
5757
["elem3"]=>
58-
object(simplexml_element)#%d (1) {
58+
object(SimpleXMLElement)#%d (1) {
5959
["elem4"]=>
60-
object(simplexml_element)#%d (1) {
60+
object(SimpleXMLElement)#%d (1) {
6161
["test"]=>
62-
object(simplexml_element)#%d (0) {
62+
object(SimpleXMLElement)#%d (0) {
6363
}
6464
}
6565
}
6666
}
6767
}
6868
===Array===
69-
object(simplexml_element)#%d (1) {
69+
object(SimpleXMLElement)#%d (1) {
7070
[0]=>
7171
string(5) "elem1"
7272
}
73-
object(simplexml_element)#%d (1) {
73+
object(SimpleXMLElement)#%d (1) {
7474
[0]=>
7575
string(5) "first"
7676
}
7777
===Set===
78-
object(simplexml_element)#%d (1) {
78+
object(SimpleXMLElement)#%d (1) {
7979
[0]=>
8080
string(8) "Changed1"
8181
}
82-
object(simplexml_element)#%d (1) {
82+
object(SimpleXMLElement)#%d (1) {
8383
[0]=>
8484
string(2) "12"
8585
}

ext/simplexml/tests/008.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ var_dump($sxe->xpath("***"));
3030
--EXPECTF--
3131
array(1) {
3232
[0]=>
33-
object(simplexml_element)#%d (1) {
33+
object(SimpleXMLElement)#%d (1) {
3434
["test"]=>
35-
object(simplexml_element)#%d (0) {
35+
object(SimpleXMLElement)#%d (0) {
3636
}
3737
}
3838
}

ext/simplexml/tests/009.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ foreach($sxe->children() as $name=>$val) {
3737
===DONE===
3838
--EXPECT--
3939
string(5) "elem1"
40-
string(17) "simplexml_element"
40+
string(16) "SimpleXMLElement"
4141
string(10) "Bla bla 1."
4242
string(6) "elem11"
43-
string(17) "simplexml_element"
43+
string(16) "SimpleXMLElement"
4444
string(10) "Bla bla 2."
4545
===DONE===

ext/simplexml/tests/010.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SimpleXML: Simple Inheritance
55
--FILE--
66
<?php
77

8-
class simplexml_inherited extends simplexml_element
8+
class simplexml_inherited extends SimpleXMLElement
99
{
1010
}
1111

ext/simplexml/tests/014.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ var_dump($people->person['age']);
3131
?>
3232
===DONE===
3333
--EXPECTF--
34-
object(simplexml_element)#%d (1) {
34+
object(SimpleXMLElement)#%d (1) {
3535
[0]=>
3636
string(3) "Joe"
3737
}
3838
NULL
39-
object(simplexml_element)#%d (1) {
39+
object(SimpleXMLElement)#%d (1) {
4040
[0]=>
4141
string(3) "XXX"
4242
}
43-
object(simplexml_element)#%d (1) {
43+
object(SimpleXMLElement)#%d (1) {
4444
[0]=>
4545
string(2) "30"
4646
}
@@ -49,11 +49,11 @@ object(simplexml_element)#%d (1) {
4949
NULL
5050
bool(false)
5151
---Unsupported---
52-
object(simplexml_element)#%d (1) {
52+
object(SimpleXMLElement)#%d (1) {
5353
[0]=>
5454
string(2) "30"
5555
}
56-
object(simplexml_element)#%d (1) {
56+
object(SimpleXMLElement)#%d (1) {
5757
[0]=>
5858
string(2) "35"
5959
}

ext/simplexml/tests/014a.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ var_dump($people->person[0]['age']);
3030
?>
3131
===DONE===
3232
--EXPECTF--
33-
object(simplexml_element)#%d (1) {
33+
object(SimpleXMLElement)#%d (1) {
3434
[0]=>
3535
string(3) "Joe"
3636
}
3737
NULL
38-
object(simplexml_element)#%d (1) {
38+
object(SimpleXMLElement)#%d (1) {
3939
[0]=>
4040
string(3) "XXX"
4141
}
42-
object(simplexml_element)#%d (1) {
42+
object(SimpleXMLElement)#%d (1) {
4343
[0]=>
4444
string(2) "30"
4545
}
@@ -49,7 +49,7 @@ NULL
4949
bool(false)
5050
---Unsupported---
5151
NULL
52-
object(simplexml_element)#%d (1) {
52+
object(SimpleXMLElement)#%d (1) {
5353
[0]=>
5454
string(1) "5"
5555
}

ext/simplexml/tests/014b.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ var_dump($people->person[1]['age']);
3030
?>
3131
===DONE===
3232
--EXPECTF--
33-
object(simplexml_element)#%d (1) {
33+
object(SimpleXMLElement)#%d (1) {
3434
[0]=>
3535
string(3) "Joe"
3636
}
3737
NULL
38-
object(simplexml_element)#%d (1) {
38+
object(SimpleXMLElement)#%d (1) {
3939
[0]=>
4040
string(3) "XXX"
4141
}
42-
object(simplexml_element)#%d (1) {
42+
object(SimpleXMLElement)#%d (1) {
4343
[0]=>
4444
string(2) "30"
4545
}
@@ -48,7 +48,7 @@ object(simplexml_element)#%d (1) {
4848
NULL
4949
bool(false)
5050
---Unsupported---
51-
object(simplexml_element)#%d (1) {
51+
object(SimpleXMLElement)#%d (1) {
5252
[0]=>
5353
string(1) "5"
5454
}

ext/simplexml/tests/015.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ var_dump($people->person[1]['name']);
3737
?>
3838
===DONE===
3939
--EXPECTF--
40-
object(simplexml_element)#%d (1) {
40+
object(SimpleXMLElement)#%d (1) {
4141
[0]=>
4242
string(3) "Joe"
4343
}
44-
object(simplexml_element)#%d (1) {
44+
object(SimpleXMLElement)#%d (1) {
4545
[0]=>
4646
string(3) "Joe"
4747
}
48-
object(simplexml_element)#%d (1) {
48+
object(SimpleXMLElement)#%d (1) {
4949
[0]=>
5050
string(3) "Joe"
5151
}
52-
object(simplexml_element)#%d (1) {
52+
object(SimpleXMLElement)#%d (1) {
5353
[0]=>
5454
string(3) "Boe"
5555
}

ext/simplexml/tests/016.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,28 @@ var_dump($people->person[0]['name']);
2929
?>
3030
===DONE===
3131
--EXPECTF--
32-
object(simplexml_element)#%d (1) {
32+
object(SimpleXMLElement)#%d (1) {
3333
[0]=>
3434
string(3) "Joe"
3535
}
36-
object(simplexml_element)#%d (1) {
36+
object(SimpleXMLElement)#%d (1) {
3737
[0]=>
3838
string(6) "JoeFoo"
3939
}
40-
object(simplexml_element)#%d (1) {
40+
object(SimpleXMLElement)#%d (1) {
4141
[0]=>
4242
string(9) "JoeFooBar"
4343
}
4444
---[0]---
45-
object(simplexml_element)#%d (1) {
45+
object(SimpleXMLElement)#%d (1) {
4646
[0]=>
4747
string(3) "Joe"
4848
}
49-
object(simplexml_element)#%d (1) {
49+
object(SimpleXMLElement)#%d (1) {
5050
[0]=>
5151
string(6) "JoeFoo"
5252
}
53-
object(simplexml_element)#%d (1) {
53+
object(SimpleXMLElement)#%d (1) {
5454
[0]=>
5555
string(9) "JoeFooBar"
5656
}

0 commit comments

Comments
 (0)