Update tests

diff --git a/tests/classes/clone_001.phpt b/tests/classes/clone_001.phpt
index c116f7397395bf3845f2f4b59d05a6b90378b26c..eb06c1f5206a2563a8a128e5201cf9be39669e85 100755 (executable)
--- a/tests/classes/clone_001.phpt
+++ b/tests/classes/clone_001.phpt
@@ -13,7 +13,7 @@ class test {
 $obj = new test;
 $obj->p2 = 'A';
 $obj->p3 = 'B';
-$copy = $obj->__clone();
+$copy = clone $obj;
 $copy->p3 = 'C';
 echo "Object\n";
 var_dump($obj);

diff --git a/tests/classes/clone_002.phpt b/tests/classes/clone_002.phpt
index 5773b5f2732b1e11a87c73973068e6d6fac8d4bc..4430a2cab4d5699a27baf1dce16f6cb37dcee150 100755 (executable)
--- a/tests/classes/clone_002.phpt
+++ b/tests/classes/clone_002.phpt
@@ -15,7 +15,7 @@ class test {
 $obj = new test;
 $obj->p2 = 'A';
 $obj->p3 = 'B';
-$copy = $obj->__clone();
+$copy = clone $obj;
 $copy->p3 = 'C';
 echo "Object\n";
 var_dump($obj);
@@ -38,7 +38,7 @@ object(test)#2 (3) {
   ["p1"]=>
   int(1)
   ["p2"]=>
-  int(2)
+  string(1) "A"
   ["p3"]=>
   string(1) "C"
 }

diff --git a/tests/classes/clone_003.phpt b/tests/classes/clone_003.phpt
index 148204c04d46ae2fcb7f582d44b818c461e436d0..658810825cf7b77edf925f114ab42acc02116df6 100755 (executable)
--- a/tests/classes/clone_003.phpt
+++ b/tests/classes/clone_003.phpt
@@ -27,7 +27,7 @@ class test extends base {
 
 $obj = new test;
 $obj->p4 = 'A';
-$copy = $obj->__clone();
+$copy = clone $obj;
 echo "Object\n";
 print_r($obj);
 echo "Clown\n";
@@ -50,7 +50,7 @@ test Object
 (
     [p1] => test:1
     [p3] => test:3
-    [p4] => test:4
+    [p4] => A
     [p5] => clone:5
     [p2] => base:2
     [p6:private] => base:6

diff --git a/tests/classes/clone_004.phpt b/tests/classes/clone_004.phpt
index ca1a9fc272f2b2211c0e0f3f097d3ea526a6743a..2059103bc5aa0d93a228270e75b559ba9d63d85f 100755 (executable)
--- a/tests/classes/clone_004.phpt
+++ b/tests/classes/clone_004.phpt
@@ -27,7 +27,7 @@ $o1->b = array(3,4);
 $o1->show();
 
 echo "Clone\n";
-$o2 = $o1->__clone();
+$o2 = clone $o1;
 $o2->show();
 
 echo "Modify\n";
@@ -58,9 +58,19 @@ object(test)#1 (2) {
 Clone
 object(test)#2 (2) {
   ["b"]=>
-  string(4) "test"
+  array(2) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(4)
+  }
   ["a"]=>
-  string(4) "base"
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
 }
 Modify
 object(test)#2 (2) {

diff --git a/tests/classes/__clone_001.phpt b/tests/classes/clone_006.phpt
old mode 100644 (file)
new mode 100755 (executable)
similarity index 88%
rename from tests/classes/__clone_001.phpt
rename to tests/classes/clone_006.phpt
index fe320df..346911a
--- a/tests/classes/__clone_001.phpt
+++ b/tests/classes/clone_006.phpt
@@ -1,5 +1,5 @@
 --TEST--
-ZE2 __clone()
+ZE2 object cloning, 6
 --SKIPIF--
 <?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
@@ -13,7 +13,6 @@ class MyCloneable {
        }
 
        function __clone() {
-               $this->name = $that->name;
                $this->address = "New York";
                $this->id = self::$id++;
        }
@@ -26,7 +25,7 @@ $original->address = "Tel-Aviv";
 
 echo $original->id . "\n";
 
-$clone = $original->__clone();
+$clone = clone $original;
 
 echo $clone->id . "\n";
 echo $clone->name . "\n";