helly Tue Feb 3 16:52:47 2004 EDT
Added files:
/php-src/tests/classes clone_006.phpt
Removed files:
/php-src/tests/classes __clone_001.phpt
Modified files:
/php-src/tests/classes clone_001.phpt clone_002.phpt clone_003.phpt
clone_004.phpt
Log:
Update tests
http://cvs.php.net/diff.php/php-src/tests/classes/clone_001.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/tests/classes/clone_001.phpt
diff -u php-src/tests/classes/clone_001.phpt:1.2
php-src/tests/classes/clone_001.phpt:1.3
--- php-src/tests/classes/clone_001.phpt:1.2 Thu Oct 23 23:31:52 2003
+++ php-src/tests/classes/clone_001.phpt Tue Feb 3 16:52:46 2004
@@ -13,7 +13,7 @@
$obj = new test;
$obj->p2 = 'A';
$obj->p3 = 'B';
-$copy = $obj->__clone();
+$copy = clone $obj;
$copy->p3 = 'C';
echo "Object\n";
var_dump($obj);
http://cvs.php.net/diff.php/php-src/tests/classes/clone_002.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/tests/classes/clone_002.phpt
diff -u php-src/tests/classes/clone_002.phpt:1.5
php-src/tests/classes/clone_002.phpt:1.6
--- php-src/tests/classes/clone_002.phpt:1.5 Thu Oct 23 23:31:52 2003
+++ php-src/tests/classes/clone_002.phpt Tue Feb 3 16:52:46 2004
@@ -15,7 +15,7 @@
$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 @@
["p1"]=>
int(1)
["p2"]=>
- int(2)
+ string(1) "A"
["p3"]=>
string(1) "C"
}
http://cvs.php.net/diff.php/php-src/tests/classes/clone_003.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/tests/classes/clone_003.phpt
diff -u php-src/tests/classes/clone_003.phpt:1.4
php-src/tests/classes/clone_003.phpt:1.5
--- php-src/tests/classes/clone_003.phpt:1.4 Thu Oct 23 23:31:52 2003
+++ php-src/tests/classes/clone_003.phpt Tue Feb 3 16:52:46 2004
@@ -27,7 +27,7 @@
$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 @@
(
[p1] => test:1
[p3] => test:3
- [p4] => test:4
+ [p4] => A
[p5] => clone:5
[p2] => base:2
[p6:private] => base:6
http://cvs.php.net/diff.php/php-src/tests/classes/clone_004.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/tests/classes/clone_004.phpt
diff -u php-src/tests/classes/clone_004.phpt:1.2
php-src/tests/classes/clone_004.phpt:1.3
--- php-src/tests/classes/clone_004.phpt:1.2 Thu Oct 23 23:31:52 2003
+++ php-src/tests/classes/clone_004.phpt Tue Feb 3 16:52:46 2004
@@ -27,7 +27,7 @@
$o1->show();
echo "Clone\n";
-$o2 = $o1->__clone();
+$o2 = clone $o1;
$o2->show();
echo "Modify\n";
@@ -58,9 +58,19 @@
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) {
http://cvs.php.net/co.php/php-src/tests/classes/clone_006.phpt?r=1.1&p=1
Index: php-src/tests/classes/clone_006.phpt
+++ php-src/tests/classes/clone_006.phpt
--TEST--
ZE2 object cloning, 6
--SKIPIF--
<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2
needed'); ?>
--FILE--
<?php
class MyCloneable {
static $id = 0;
function MyCloneable() {
$this->id = self::$id++;
}
function __clone() {
$this->address = "New York";
$this->id = self::$id++;
}
}
$original = new MyCloneable();
$original->name = "Hello";
$original->address = "Tel-Aviv";
echo $original->id . "\n";
$clone = clone $original;
echo $clone->id . "\n";
echo $clone->name . "\n";
echo $clone->address . "\n";
?>
--EXPECT--
0
1
Hello
New York
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
