Fixed test

diff --git a/ext/simplexml/tests/033.phpt b/ext/simplexml/tests/033.phpt
index ba01b21555b0fb7349f74fdbaf71d3e49cfdc3c8..b0ee633881ae38f870314e6580373967e6b9852c 100755 (executable)
--- a/ext/simplexml/tests/033.phpt
+++ b/ext/simplexml/tests/033.phpt
@@ -135,3 +135,102 @@ object(SimpleXMLElement)#%d (1) {
   }
 }
 ===DONE===
+--UEXPECTF--
+bool(false)
+bool(true)
+int(0)
+int(0)
+float(0)
+float(0)
+unicode(0) ""
+unicode(15) "
+test
+  
+  
+  
+"
+array(0) {
+}
+array(1) {
+  [u"person"]=>
+  array(3) {
+    [0]=>
+    object(SimpleXMLElement)#%d (1) {
+      [u"@attributes"]=>
+      array(1) {
+        [u"name"]=>
+        unicode(3) "Joe"
+      }
+    }
+    [1]=>
+    object(SimpleXMLElement)#%d (2) {
+      [u"@attributes"]=>
+      array(1) {
+        [u"name"]=>
+        unicode(4) "John"
+      }
+      [u"children"]=>
+      object(SimpleXMLElement)#%d (1) {
+        [u"person"]=>
+        object(SimpleXMLElement)#%d (1) {
+          [u"@attributes"]=>
+          array(1) {
+            [u"name"]=>
+            unicode(3) "Joe"
+          }
+        }
+      }
+    }
+    [2]=>
+    object(SimpleXMLElement)#%d (1) {
+      [u"@attributes"]=>
+      array(1) {
+        [u"name"]=>
+        unicode(4) "Jane"
+      }
+    }
+  }
+}
+object(SimpleXMLElement)#%d (0) {
+}
+object(SimpleXMLElement)#%d (1) {
+  [u"person"]=>
+  array(3) {
+    [0]=>
+    object(SimpleXMLElement)#%d (1) {
+      [u"@attributes"]=>
+      array(1) {
+        [u"name"]=>
+        unicode(3) "Joe"
+      }
+    }
+    [1]=>
+    object(SimpleXMLElement)#%d (2) {
+      [u"@attributes"]=>
+      array(1) {
+        [u"name"]=>
+        unicode(4) "John"
+      }
+      [u"children"]=>
+      object(SimpleXMLElement)#%d (1) {
+        [u"person"]=>
+        object(SimpleXMLElement)#%d (1) {
+          [u"@attributes"]=>
+          array(1) {
+            [u"name"]=>
+            unicode(3) "Joe"
+          }
+        }
+      }
+    }
+    [2]=>
+    object(SimpleXMLElement)#%d (1) {
+      [u"@attributes"]=>
+      array(1) {
+        [u"name"]=>
+        unicode(4) "Jane"
+      }
+    }
+  }
+}
+===DONE===

diff --git a/ext/spl/tests/spl_autoload_008.phpt b/ext/spl/tests/spl_autoload_008.phpt
index bafd26d877bd362b41803c5947ff5a43d0be57bd..95ab6bd5991500638a110daea35a2612053f8f2a 100755 (executable)
--- a/ext/spl/tests/spl_autoload_008.phpt
+++ b/ext/spl/tests/spl_autoload_008.phpt
@@ -129,3 +129,65 @@ MyAutoLoader::dynaLoad(NoExistingTestClass)
 Exception: Bla
 int(0)
 ===DONE===
+--UEXPECTF--
+====0====
+unicode(10) "MyAutoLoad"
+registered
+MyAutoLoad(NoExistingTestClass)
+Exception: Bla
+int(0)
+====1====
+unicode(22) "MyAutoLoader::autoLoad"
+registered
+MyAutoLoader::autoLoad(NoExistingTestClass)
+Exception: Bla
+int(0)
+====2====
+unicode(22) "MyAutoLoader::dynaLoad"
+LogicException: Function 'MyAutoLoader::dynaLoad' not callable
+int(0)
+====3====
+array(2) {
+  [0]=>
+  unicode(12) "MyAutoLoader"
+  [1]=>
+  unicode(8) "autoLoad"
+}
+registered
+MyAutoLoader::autoLoad(NoExistingTestClass)
+Exception: Bla
+int(0)
+====4====
+array(2) {
+  [0]=>
+  unicode(12) "MyAutoLoader"
+  [1]=>
+  unicode(8) "dynaLoad"
+}
+LogicException: Passed array specifies a non static method but no object
+int(0)
+====5====
+array(2) {
+  [0]=>
+  object(MyAutoLoader)#%d (0) {
+  }
+  [1]=>
+  unicode(8) "autoLoad"
+}
+registered
+MyAutoLoader::autoLoad(NoExistingTestClass)
+Exception: Bla
+int(0)
+====6====
+array(2) {
+  [0]=>
+  object(MyAutoLoader)#%d (0) {
+  }
+  [1]=>
+  unicode(8) "dynaLoad"
+}
+registered
+MyAutoLoader::dynaLoad(NoExistingTestClass)
+Exception: Bla
+int(0)
+===DONE===