Fix class names

14 files changed, 68 insertions, 68 deletions

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index be9cb575cb..968e528a75 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1614,7 +1614,7 @@ PHP_MINIT_FUNCTION(simplexml)
 {
 	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;
diff --git a/ext/simplexml/tests/001.phpt b/ext/simplexml/tests/001.phpt
index 123c91d244..cacc2d3066 100644
--- a/ext/simplexml/tests/001.phpt
+++ b/ext/simplexml/tests/001.phpt
@@ -13,21 +13,21 @@ echo "---Done---\n";
 
 ?>
 --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
                                         (
                                         )
 
diff --git a/ext/simplexml/tests/002.phpt b/ext/simplexml/tests/002.phpt
index d1f6a0621f..95d644fe71 100644
--- a/ext/simplexml/tests/002.phpt
+++ b/ext/simplexml/tests/002.phpt
@@ -32,21 +32,21 @@ echo "---Done---\n";
 
 ?>
 --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
                                         (
                                         )
 
diff --git a/ext/simplexml/tests/003.phpt b/ext/simplexml/tests/003.phpt
index 0924fd044f..96aad372da 100755
--- a/ext/simplexml/tests/003.phpt
+++ b/ext/simplexml/tests/003.phpt
@@ -34,26 +34,26 @@ echo "---Done---\n";
 
 ?>
 --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
                                         (
                                         )
 
diff --git a/ext/simplexml/tests/004.phpt b/ext/simplexml/tests/004.phpt
index b82f66567c..392b1d4981 100755
--- a/ext/simplexml/tests/004.phpt
+++ b/ext/simplexml/tests/004.phpt
@@ -34,21 +34,21 @@ var_dump(trim((string)$elem2));
 ?>
 ===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
                                         (
                                         )
 
diff --git a/ext/simplexml/tests/007.phpt b/ext/simplexml/tests/007.phpt
index 5b44b63837..b55d324966 100755
--- a/ext/simplexml/tests/007.phpt
+++ b/ext/simplexml/tests/007.phpt
@@ -48,38 +48,38 @@ var_dump($a);
 ===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"
 }
diff --git a/ext/simplexml/tests/008.phpt b/ext/simplexml/tests/008.phpt
index 68b6f39351..3554b32040 100644
--- a/ext/simplexml/tests/008.phpt
+++ b/ext/simplexml/tests/008.phpt
@@ -30,9 +30,9 @@ var_dump($sxe->xpath("***"));
 --EXPECTF--
 array(1) {
   [0]=>
-  object(simplexml_element)#%d (1) {
+  object(SimpleXMLElement)#%d (1) {
     ["test"]=>
-    object(simplexml_element)#%d (0) {
+    object(SimpleXMLElement)#%d (0) {
     }
   }
 }
diff --git a/ext/simplexml/tests/009.phpt b/ext/simplexml/tests/009.phpt
index d4543f483e..2115dd3142 100755
--- a/ext/simplexml/tests/009.phpt
+++ b/ext/simplexml/tests/009.phpt
@@ -37,9 +37,9 @@ foreach($sxe->children() as $name=>$val) {
 ===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===
diff --git a/ext/simplexml/tests/010.phpt b/ext/simplexml/tests/010.phpt
index 20e2f89a26..ea6c7fd079 100644
--- a/ext/simplexml/tests/010.phpt
+++ b/ext/simplexml/tests/010.phpt
@@ -5,7 +5,7 @@ SimpleXML: Simple Inheritance
 --FILE--
 <?php 
 
-class simplexml_inherited extends simplexml_element
+class simplexml_inherited extends SimpleXMLElement
 {
 }
 
diff --git a/ext/simplexml/tests/014.phpt b/ext/simplexml/tests/014.phpt
index 39531d971b..d1d736e7b5 100644
--- a/ext/simplexml/tests/014.phpt
+++ b/ext/simplexml/tests/014.phpt
@@ -31,16 +31,16 @@ var_dump($people->person['age']);
 ?>
 ===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 @@ object(simplexml_element)#%d (1) {
 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"
 }
diff --git a/ext/simplexml/tests/014a.phpt b/ext/simplexml/tests/014a.phpt
index dd359addac..770cb44812 100755
--- a/ext/simplexml/tests/014a.phpt
+++ b/ext/simplexml/tests/014a.phpt
@@ -30,16 +30,16 @@ var_dump($people->person[0]['age']);
 ?>
 ===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 @@ NULL
 bool(false)
 ---Unsupported---
 NULL
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
   [0]=>
   string(1) "5"
 }
diff --git a/ext/simplexml/tests/014b.phpt b/ext/simplexml/tests/014b.phpt
index 925ad39173..14bd6ce864 100755
--- a/ext/simplexml/tests/014b.phpt
+++ b/ext/simplexml/tests/014b.phpt
@@ -30,16 +30,16 @@ var_dump($people->person[1]['age']);
 ?>
 ===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 @@ object(simplexml_element)#%d (1) {
 NULL
 bool(false)
 ---Unsupported---
-object(simplexml_element)#%d (1) {
+object(SimpleXMLElement)#%d (1) {
   [0]=>
   string(1) "5"
 }
diff --git a/ext/simplexml/tests/015.phpt b/ext/simplexml/tests/015.phpt
index 0865b69f61..11e9cd55cd 100644
--- a/ext/simplexml/tests/015.phpt
+++ b/ext/simplexml/tests/015.phpt
@@ -37,19 +37,19 @@ var_dump($people->person[1]['name']);
 ?>
 ===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"
 }
diff --git a/ext/simplexml/tests/016.phpt b/ext/simplexml/tests/016.phpt
index b8dde2a48a..ab80a7a19a 100644
--- a/ext/simplexml/tests/016.phpt
+++ b/ext/simplexml/tests/016.phpt
@@ -29,28 +29,28 @@ var_dump($people->person[0]['name']);
 ?>
 ===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"
 }