Fix class names

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index be9cb575cb55434f5ee26e124b0c6be2e6b6e4c0..968e528a755a5a234b7d573584c333986c60cab2 100644 (file)
--- 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 123c91d24493d46f4ce8d7fcff305f13ba12c25b..cacc2d30663793924e70d9c223917fbdf3102644 100644 (file)
--- 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 d1f6a0621f783d4f685f143c604167032c3cc446..95d644fe7142371950b72094209cb261c9b0e6f6 100644 (file)
--- 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 0924fd044fbc48c672f4101732a72fab2918c8af..96aad372dac0d9e51701d2fa5b1dbee9e008464f 100755 (executable)
--- 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 b82f66567cea1414be454d46f93342265e48b87e..392b1d4981ec38ecfd85955226537e2aab20a3af 100755 (executable)
--- 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 5b44b638376aeba700256b839c3297ccd4efec25..b55d324966dbb361a04717aa497b0f6cf4de8689 100755 (executable)
--- 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 68b6f39351cd85ee177fe7527178e41b77d274df..3554b32040463123b2c19e6b57c1f9c651855f3f 100644 (file)
--- 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 d4543f483e93c50c075fcc81750c3f33986aff53..2115dd31424f9ef93994d64db7466fdb5a4ac390 100755 (executable)
--- 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 20e2f89a268175492a87c54af9ca57b347780bd6..ea6c7fd079194d2c53f21ecfbe65ef0184a92f8d 100644 (file)
--- 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 39531d971b56a199dd15e0b402058fca5b95676d..d1d736e7b59ce1874ddee303388da5296f447d95 100644 (file)
--- 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 dd359addac0f715b275e84d1f562566ca795ca2b..770cb448126c0cddaf1a0c3a5901a055fe167e64 100755 (executable)
--- 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 925ad391733bc3531827e2eaa84963259914b64c..14bd6ce864a867b001c3eeb929cdd307357115c3 100755 (executable)
--- 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 0865b69f61a8440745eaa8ddf9e00ca9ed879430..11e9cd55cda2ad1eda0fcd7a9722a42936f0d149 100644 (file)
--- 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 b8dde2a48a7dd4fecd31231826873e83683ad142..ab80a7a19aa100d839d17c6916e4941a7ebca9f9 100644 (file)
--- 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"
 }