Update tests

diff --git a/Zend/tests/bug24884.phpt b/Zend/tests/bug24884.phpt
index 81bb3d6414f0b9702a95bd6635e51b56c53df560..b7d6eaff0a9c0b6b34d3f2c074ca3e8a85b53f23 100755 (executable)
--- a/Zend/tests/bug24884.phpt
+++ b/Zend/tests/bug24884.phpt
@@ -15,7 +15,7 @@ class Test {
         }
         else
         {
-            return $this->__clone();
+            return clone $this;
         }
     }
 }

diff --git a/ext/simplexml/tests/002.phpt b/ext/simplexml/tests/002.phpt
index 009101adb088c50e018de1c8156091a6503fdb3c..d1f6a0621f783d4f685f143c604167032c3cc446 100644 (file)
--- a/ext/simplexml/tests/002.phpt
+++ b/ext/simplexml/tests/002.phpt
@@ -24,7 +24,7 @@ EOF;
 
 $sxe = simplexml_load_string($xml);
 
-$copy = $sxe->__clone();
+$copy = clone $sxe;
 
 print_r($copy);
 

diff --git a/ext/simplexml/tests/006.phpt b/ext/simplexml/tests/006.phpt
index 9e81f20dd9c05bce5c073df6356132e97c47a52f..9360b2dff314d2ff1d19bbc912685a7843142c68 100755 (executable)
--- a/ext/simplexml/tests/006.phpt
+++ b/ext/simplexml/tests/006.phpt
@@ -40,7 +40,7 @@ foreach($sxe as $name => $data) {
 
 echo "===CLONE===\n";
 
-foreach($sxe->__clone() as $name => $data) {
+foreach(clone $sxe as $name => $data) {
        var_dump($name);
        var_dump(trim($data));
 }

diff --git a/ext/simplexml/tests/019.phpt b/ext/simplexml/tests/019.phpt
index 09f0569d7a485b37ac57912d86b96cacece71ae5..a54a1bdd52e9250792567d5ef083a180a471590c 100755 (executable)
--- a/ext/simplexml/tests/019.phpt
+++ b/ext/simplexml/tests/019.phpt
@@ -40,7 +40,7 @@ foreach($sxe->children() as $name => $data) {
 
 echo "===CLONE===\n";
 
-foreach($sxe->children()->__clone() as $name => $data) {
+foreach(clone $sxe->children() as $name => $data) {
        var_dump($name);
        var_dump(trim($data));
 }

diff --git a/tests/classes/factory_and_singleton_007.phpt b/tests/classes/factory_and_singleton_007.phpt
index 8ca8982fa334e80ab9bb80c578d83685e04eafc6..4788dbf08795d5f40cffc45e21847c792c1e3ab9 100755 (executable)
--- a/tests/classes/factory_and_singleton_007.phpt
+++ b/tests/classes/factory_and_singleton_007.phpt
@@ -11,7 +11,7 @@ class test {
 }
 
 $obj = new test;
-$clone = $obj->__clone();
+$clone = clone $obj;
 $obj = NULL;
 
 echo "Done\n";

diff --git a/tests/classes/factory_and_singleton_008.phpt b/tests/classes/factory_and_singleton_008.phpt
index b3fbf29f2eb247fbbef218a4c11d0f3cec6a8da0..750b9db340d1eaa8905eaab7665e72de1661a40a 100755 (executable)
--- a/tests/classes/factory_and_singleton_008.phpt
+++ b/tests/classes/factory_and_singleton_008.phpt
@@ -11,7 +11,7 @@ class test {
 }
 
 $obj = new test;
-$clone = $obj->__clone();
+$clone = clone $obj;
 $obj = NULL;
 
 echo "Done\n";