helly Mon Mar 29 14:58:01 2004 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
/php-src/ext/simplexml/tests 001.phpt 002.phpt 003.phpt 004.phpt
007.phpt 008.phpt 009.phpt 010.phpt
014.phpt 014a.phpt 014b.phpt 015.phpt
016.phpt
Log:
Fix class names
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.137&r2=1.138&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.137 php-src/ext/simplexml/simplexml.c:1.138
--- php-src/ext/simplexml/simplexml.c:1.137 Sun Mar 28 15:27:18 2004
+++ php-src/ext/simplexml/simplexml.c Mon Mar 29 14:58:01 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.137 2004/03/28 20:27:18 helly Exp $ */
+/* $Id: simplexml.c,v 1.138 2004/03/29 19:58:01 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1614,7 +1614,7 @@
{
zend_class_entry sxe;
- INIT_CLASS_ENTRY(sxe, "simplexml_element", sxe_functions);
+ INIT_CLASS_ENTRY(sxe, "SimpleXMLElement", sxe_functions);
sxe.create_object = sxe_object_new;
sxe_class_entry = zend_register_internal_class(&sxe TSRMLS_CC);
sxe_class_entry->get_iterator = php_sxe_get_iterator;
@@ -1650,7 +1650,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.137 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.138 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/001.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/simplexml/tests/001.phpt
diff -u php-src/ext/simplexml/tests/001.phpt:1.3
php-src/ext/simplexml/tests/001.phpt:1.4
--- php-src/ext/simplexml/tests/001.phpt:1.3 Sat Oct 25 17:07:36 2003
+++ php-src/ext/simplexml/tests/001.phpt Mon Mar 29 14:58:01 2004
@@ -13,21 +13,21 @@
?>
--EXPECT--
-simplexml_element Object
+SimpleXMLElement Object
(
- [elem1] => simplexml_element Object
+ [elem1] => SimpleXMLElement Object
(
- [comment] => simplexml_element Object
+ [comment] => SimpleXMLElement Object
(
)
- [elem2] => simplexml_element Object
+ [elem2] => SimpleXMLElement Object
(
- [elem3] => simplexml_element Object
+ [elem3] => SimpleXMLElement Object
(
- [elem4] => simplexml_element Object
+ [elem4] => SimpleXMLElement Object
(
- [test] => simplexml_element Object
+ [test] => SimpleXMLElement Object
(
)
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/002.phpt?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/simplexml/tests/002.phpt
diff -u php-src/ext/simplexml/tests/002.phpt:1.7
php-src/ext/simplexml/tests/002.phpt:1.8
--- php-src/ext/simplexml/tests/002.phpt:1.7 Tue Feb 3 17:03:03 2004
+++ php-src/ext/simplexml/tests/002.phpt Mon Mar 29 14:58:01 2004
@@ -32,21 +32,21 @@
?>
--EXPECT--
-simplexml_element Object
+SimpleXMLElement Object
(
- [elem1] => simplexml_element Object
+ [elem1] => SimpleXMLElement Object
(
- [comment] => simplexml_element Object
+ [comment] => SimpleXMLElement Object
(
)
- [elem2] => simplexml_element Object
+ [elem2] => SimpleXMLElement Object
(
- [elem3] => simplexml_element Object
+ [elem3] => SimpleXMLElement Object
(
- [elem4] => simplexml_element Object
+ [elem4] => SimpleXMLElement Object
(
- [test] => simplexml_element Object
+ [test] => SimpleXMLElement Object
(
)
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/003.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/simplexml/tests/003.phpt
diff -u php-src/ext/simplexml/tests/003.phpt:1.2
php-src/ext/simplexml/tests/003.phpt:1.3
--- php-src/ext/simplexml/tests/003.phpt:1.2 Sun Jan 18 10:14:03 2004
+++ php-src/ext/simplexml/tests/003.phpt Mon Mar 29 14:58:01 2004
@@ -34,26 +34,26 @@
?>
--EXPECT--
-simplexml_element Object
+SimpleXMLElement Object
(
- [elem1] => simplexml_element Object
+ [elem1] => SimpleXMLElement Object
(
- [comment] => simplexml_element Object
+ [comment] => SimpleXMLElement Object
(
)
- [elem2] => simplexml_element Object
+ [elem2] => SimpleXMLElement Object
(
- [elem3] => simplexml_element Object
+ [elem3] => SimpleXMLElement Object
(
- [included-entity] => simplexml_element Object
+ [included-entity] => SimpleXMLElement Object
(
[included-entity] => This is text included from
an entity
)
- [elem4] => simplexml_element Object
+ [elem4] => SimpleXMLElement Object
(
- [test] => simplexml_element Object
+ [test] => SimpleXMLElement Object
(
)
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/004.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/simplexml/tests/004.phpt
diff -u php-src/ext/simplexml/tests/004.phpt:1.5
php-src/ext/simplexml/tests/004.phpt:1.6
--- php-src/ext/simplexml/tests/004.phpt:1.5 Sat Jan 17 12:24:58 2004
+++ php-src/ext/simplexml/tests/004.phpt Mon Mar 29 14:58:01 2004
@@ -34,21 +34,21 @@
?>
===DONE===
--EXPECT--
-simplexml_element Object
+SimpleXMLElement Object
(
- [elem1] => simplexml_element Object
+ [elem1] => SimpleXMLElement Object
(
- [comment] => simplexml_element Object
+ [comment] => SimpleXMLElement Object
(
)
- [elem2] => simplexml_element Object
+ [elem2] => SimpleXMLElement Object
(
- [elem3] => simplexml_element Object
+ [elem3] => SimpleXMLElement Object
(
- [elem4] => simplexml_element Object
+ [elem4] => SimpleXMLElement Object
(
- [test] => simplexml_element Object
+ [test] => SimpleXMLElement Object
(
)
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/007.phpt?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/simplexml/tests/007.phpt
diff -u php-src/ext/simplexml/tests/007.phpt:1.7
php-src/ext/simplexml/tests/007.phpt:1.8
--- php-src/ext/simplexml/tests/007.phpt:1.7 Thu Jan 22 16:47:54 2004
+++ php-src/ext/simplexml/tests/007.phpt Mon Mar 29 14:58:01 2004
@@ -48,38 +48,38 @@
===Done===
--EXPECTF--
===Property===
-object(simplexml_element)#%d (2) {
+object(SimpleXMLElement)#%d (2) {
["comment"]=>
- object(simplexml_element)#%d (0) {
+ object(SimpleXMLElement)#%d (0) {
}
["elem2"]=>
- object(simplexml_element)#%d (1) {
+ object(SimpleXMLElement)#%d (1) {
["elem3"]=>
- object(simplexml_element)#%d (1) {
+ object(SimpleXMLElement)#%d (1) {
["elem4"]=>
- object(simplexml_element)#%d (1) {
+ object(SimpleXMLElement)#%d (1) {
["test"]=>
- object(simplexml_element)#%d (0) {
+ object(SimpleXMLElement)#%d (0) {
}
}
}
}
}
===Array===
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(5) "elem1"
}
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(5) "first"
}
===Set===
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(8) "Changed1"
}
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(2) "12"
}
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/008.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/simplexml/tests/008.phpt
diff -u php-src/ext/simplexml/tests/008.phpt:1.3
php-src/ext/simplexml/tests/008.phpt:1.4
--- php-src/ext/simplexml/tests/008.phpt:1.3 Sun Jan 18 10:14:03 2004
+++ php-src/ext/simplexml/tests/008.phpt Mon Mar 29 14:58:01 2004
@@ -30,9 +30,9 @@
--EXPECTF--
array(1) {
[0]=>
- object(simplexml_element)#%d (1) {
+ object(SimpleXMLElement)#%d (1) {
["test"]=>
- object(simplexml_element)#%d (0) {
+ object(SimpleXMLElement)#%d (0) {
}
}
}
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/009.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/simplexml/tests/009.phpt
diff -u php-src/ext/simplexml/tests/009.phpt:1.3
php-src/ext/simplexml/tests/009.phpt:1.4
--- php-src/ext/simplexml/tests/009.phpt:1.3 Sat Jan 17 12:33:10 2004
+++ php-src/ext/simplexml/tests/009.phpt Mon Mar 29 14:58:01 2004
@@ -37,9 +37,9 @@
===DONE===
--EXPECT--
string(5) "elem1"
-string(17) "simplexml_element"
+string(16) "SimpleXMLElement"
string(10) "Bla bla 1."
string(6) "elem11"
-string(17) "simplexml_element"
+string(16) "SimpleXMLElement"
string(10) "Bla bla 2."
===DONE===
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/010.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/simplexml/tests/010.phpt
diff -u php-src/ext/simplexml/tests/010.phpt:1.4
php-src/ext/simplexml/tests/010.phpt:1.5
--- php-src/ext/simplexml/tests/010.phpt:1.4 Sun Jan 18 10:14:03 2004
+++ php-src/ext/simplexml/tests/010.phpt Mon Mar 29 14:58:01 2004
@@ -5,7 +5,7 @@
--FILE--
<?php
-class simplexml_inherited extends simplexml_element
+class simplexml_inherited extends SimpleXMLElement
{
}
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/014.phpt?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/simplexml/tests/014.phpt
diff -u php-src/ext/simplexml/tests/014.phpt:1.6
php-src/ext/simplexml/tests/014.phpt:1.7
--- php-src/ext/simplexml/tests/014.phpt:1.6 Wed Feb 11 08:00:19 2004
+++ php-src/ext/simplexml/tests/014.phpt Mon Mar 29 14:58:01 2004
@@ -31,16 +31,16 @@
?>
===DONE===
--EXPECTF--
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(3) "Joe"
}
NULL
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(3) "XXX"
}
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(2) "30"
}
@@ -49,11 +49,11 @@
NULL
bool(false)
---Unsupported---
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(2) "30"
}
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(2) "35"
}
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/014a.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/simplexml/tests/014a.phpt
diff -u php-src/ext/simplexml/tests/014a.phpt:1.3
php-src/ext/simplexml/tests/014a.phpt:1.4
--- php-src/ext/simplexml/tests/014a.phpt:1.3 Wed Feb 11 07:19:26 2004
+++ php-src/ext/simplexml/tests/014a.phpt Mon Mar 29 14:58:01 2004
@@ -30,16 +30,16 @@
?>
===DONE===
--EXPECTF--
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(3) "Joe"
}
NULL
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(3) "XXX"
}
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(2) "30"
}
@@ -49,7 +49,7 @@
bool(false)
---Unsupported---
NULL
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(1) "5"
}
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/014b.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/simplexml/tests/014b.phpt
diff -u php-src/ext/simplexml/tests/014b.phpt:1.3
php-src/ext/simplexml/tests/014b.phpt:1.4
--- php-src/ext/simplexml/tests/014b.phpt:1.3 Wed Feb 11 07:19:26 2004
+++ php-src/ext/simplexml/tests/014b.phpt Mon Mar 29 14:58:01 2004
@@ -30,16 +30,16 @@
?>
===DONE===
--EXPECTF--
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(3) "Joe"
}
NULL
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(3) "XXX"
}
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(2) "30"
}
@@ -48,7 +48,7 @@
NULL
bool(false)
---Unsupported---
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(1) "5"
}
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/015.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/simplexml/tests/015.phpt
diff -u php-src/ext/simplexml/tests/015.phpt:1.5
php-src/ext/simplexml/tests/015.phpt:1.6
--- php-src/ext/simplexml/tests/015.phpt:1.5 Thu Jan 22 16:47:54 2004
+++ php-src/ext/simplexml/tests/015.phpt Mon Mar 29 14:58:01 2004
@@ -37,19 +37,19 @@
?>
===DONE===
--EXPECTF--
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(3) "Joe"
}
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(3) "Joe"
}
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(3) "Joe"
}
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(3) "Boe"
}
http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/016.phpt?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/simplexml/tests/016.phpt
diff -u php-src/ext/simplexml/tests/016.phpt:1.6
php-src/ext/simplexml/tests/016.phpt:1.7
--- php-src/ext/simplexml/tests/016.phpt:1.6 Wed Feb 11 07:19:26 2004
+++ php-src/ext/simplexml/tests/016.phpt Mon Mar 29 14:58:01 2004
@@ -29,28 +29,28 @@
?>
===DONE===
--EXPECTF--
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(3) "Joe"
}
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(6) "JoeFoo"
}
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(9) "JoeFooBar"
}
---[0]---
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(3) "Joe"
}
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(6) "JoeFoo"
}
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
[0]=>
string(9) "JoeFooBar"
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
