derick Mon Oct 17 10:38:15 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/standard/tests/array var_export3.phpt
Modified files:
/php-src NEWS
/php-src/ext/standard var.c
/php-src/ext/standard/tests/array 007.phpt array_intersect_1.phpt
var_export.phpt
Log:
- Fixed bug #29361 (var_export() producing invalid code). (Derick)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.133&r2=1.2027.2.134&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.133 php-src/NEWS:1.2027.2.134
--- php-src/NEWS:1.2027.2.133 Mon Oct 17 10:30:33 2005
+++ php-src/NEWS Mon Oct 17 10:38:07 2005
@@ -3,7 +3,8 @@
?? Oct 2005, PHP 5.1 Release Candidate 3
- Fixed bug #34873 (Segmentation Fault on foreach in object). (Dmitry)
- Fixed bug #34884 (Possible crash in ext/sqlite when sqlite.assoc_case is
- being used). (Tony,Ilia)
+ being used). (Tony, Ilia)
+- Fixed bug #29361 (var_export() producing invalid code). (Derick)
14 Oct 2005, PHP 5.1 Release Candidate 2
- Changed SQLite extension to be a shared module in Windows distribution.
http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.203.2.3&r2=1.203.2.4&ty=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.203.2.3
php-src/ext/standard/var.c:1.203.2.4
--- php-src/ext/standard/var.c:1.203.2.3 Fri Sep 16 13:10:58 2005
+++ php-src/ext/standard/var.c Mon Oct 17 10:38:09 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.203.2.3 2005/09/16 17:10:58 tony2001 Exp $ */
+/* $Id: var.c,v 1.203.2.4 2005/10/17 14:38:09 derick Exp $ */
@@ -352,18 +352,9 @@
if (hash_key->nKeyLength != 0) {
php_printf("%*c", level + 1, ' ');
zend_unmangle_property_name_ex(hash_key->arKey,
hash_key->nKeyLength, &class_name, &prop_name);
- if (class_name) {
- if (class_name[0] == '*') {
- php_printf("protected");
- } else {
- php_printf("private");
- }
- } else {
- php_printf("public");
- }
- php_printf(" $%s = ", prop_name);
+ php_printf(" '%s' => ", prop_name);
php_var_export(zv, level + 2 TSRMLS_CC);
- PUTS (";\n");
+ PUTS (",\n");
}
return 0;
}
@@ -414,7 +405,7 @@
php_printf("\n%*c", level - 1, ' ');
}
Z_OBJ_HANDLER(**struc, get_class_name)(*struc, &class_name,
&class_name_len, 0 TSRMLS_CC);
- php_printf ("class %s {\n", class_name);
+ php_printf ("%s::__set_state(array(\n", class_name);
efree(class_name);
if (myht) {
zend_hash_apply_with_arguments(myht,
(apply_func_args_t) php_object_element_export, 1, level);
@@ -422,7 +413,7 @@
if (level > 1) {
php_printf("%*c", level - 1, ' ');
}
- PUTS("}");
+ php_printf ("))");
break;
default:
PUTS ("NULL");
http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/007.phpt?r1=1.9&r2=1.9.4.1&ty=u
Index: php-src/ext/standard/tests/array/007.phpt
diff -u php-src/ext/standard/tests/array/007.phpt:1.9
php-src/ext/standard/tests/array/007.phpt:1.9.4.1
--- php-src/ext/standard/tests/array/007.phpt:1.9 Thu May 20 17:13:14 2004
+++ php-src/ext/standard/tests/array/007.phpt Mon Oct 17 10:38:10 2005
@@ -254,57 +254,57 @@
-=-=-=-=-=-=-=-=- New functionality from 5.0.0 -=-=-=-=-=-=-=-
$a=array (
'0.1' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
'0.5' =>
- class cr {
- private $priv_member = 12;
- public $public_member = 12;
- },
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
0 =>
- class cr {
- private $priv_member = 23;
- public $public_member = 23;
- },
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
$b=array (
'0.2' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
'0.5' =>
- class cr {
- private $priv_member = 22;
- public $public_member = 22;
- },
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
0 =>
- class cr {
- private $priv_member = 3;
- public $public_member = 3;
- },
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
var_dump(array_udiff_uassoc($a, $b, "comp_func_cr", "comp_func"));
array(3) {
@@ -332,57 +332,57 @@
}
$a=array (
'0.1' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
'0.5' =>
- class cr {
- private $priv_member = 12;
- public $public_member = 12;
- },
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
0 =>
- class cr {
- private $priv_member = 23;
- public $public_member = 23;
- },
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
$b=array (
'0.2' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
'0.5' =>
- class cr {
- private $priv_member = 22;
- public $public_member = 22;
- },
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
0 =>
- class cr {
- private $priv_member = 3;
- public $public_member = 3;
- },
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
var_dump(array_udiff_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func"));
array(3) {
@@ -410,57 +410,57 @@
}
$a=array (
'0.1' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
'0.5' =>
- class cr {
- private $priv_member = 12;
- public $public_member = 12;
- },
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
0 =>
- class cr {
- private $priv_member = 23;
- public $public_member = 23;
- },
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
$b=array (
'0.2' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
'0.5' =>
- class cr {
- private $priv_member = 22;
- public $public_member = 22;
- },
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
0 =>
- class cr {
- private $priv_member = 3;
- public $public_member = 3;
- },
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
var_dump(array_diff_assoc($a, $b));
array(5) {
@@ -502,57 +502,57 @@
}
$a=array (
'0.1' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
'0.5' =>
- class cr {
- private $priv_member = 12;
- public $public_member = 12;
- },
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
0 =>
- class cr {
- private $priv_member = 23;
- public $public_member = 23;
- },
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
$b=array (
'0.2' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
'0.5' =>
- class cr {
- private $priv_member = 22;
- public $public_member = 22;
- },
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
0 =>
- class cr {
- private $priv_member = 3;
- public $public_member = 3;
- },
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
var_dump(array_udiff($a, $b, "comp_func_cr"));
array(2) {
@@ -573,57 +573,57 @@
}
$a=array (
'0.1' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
'0.5' =>
- class cr {
- private $priv_member = 12;
- public $public_member = 12;
- },
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
0 =>
- class cr {
- private $priv_member = 23;
- public $public_member = 23;
- },
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
$b=array (
'0.2' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
'0.5' =>
- class cr {
- private $priv_member = 22;
- public $public_member = 22;
- },
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
0 =>
- class cr {
- private $priv_member = 3;
- public $public_member = 3;
- },
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
var_dump(array_udiff_assoc($a, $b, "comp_func_cr"));
array(3) {
http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/array_intersect_1.phpt?r1=1.5&r2=1.5.4.1&ty=u
Index: php-src/ext/standard/tests/array/array_intersect_1.phpt
diff -u php-src/ext/standard/tests/array/array_intersect_1.phpt:1.5
php-src/ext/standard/tests/array/array_intersect_1.phpt:1.5.4.1
--- php-src/ext/standard/tests/array/array_intersect_1.phpt:1.5 Thu May 20
17:13:14 2004
+++ php-src/ext/standard/tests/array/array_intersect_1.phpt Mon Oct 17
10:38:11 2005
@@ -90,57 +90,57 @@
begin ------------ array_intersect() ----------------------------
$a=array (
'0.1' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
- '0.5' =>
- class cr {
- private $priv_member = 12;
- public $public_member = 12;
- },
- 0 =>
- class cr {
- private $priv_member = 23;
- public $public_member = 23;
- },
- 1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
- 2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
$b=array (
'0.2' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
- '0.5' =>
- class cr {
- private $priv_member = 22;
- public $public_member = 22;
- },
- 0 =>
- class cr {
- private $priv_member = 3;
- public $public_member = 3;
- },
- 1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
- 2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
var_dump(array_intersect($a, $b);
array(0) {
@@ -149,57 +149,57 @@
begin ------------ array_uintersect() ---------------------------
$a=array (
'0.1' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
- '0.5' =>
- class cr {
- private $priv_member = 12;
- public $public_member = 12;
- },
- 0 =>
- class cr {
- private $priv_member = 23;
- public $public_member = 23;
- },
- 1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
- 2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
$b=array (
'0.2' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
- '0.5' =>
- class cr {
- private $priv_member = 22;
- public $public_member = 22;
- },
- 0 =>
- class cr {
- private $priv_member = 3;
- public $public_member = 3;
- },
- 1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
- 2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
var_dump(array_uintersect($a, $b, "comp_func_cr"));
array(3) {
@@ -229,57 +229,57 @@
begin ------------ array_intersect_assoc() ----------------------
$a=array (
'0.1' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
- '0.5' =>
- class cr {
- private $priv_member = 12;
- public $public_member = 12;
- },
- 0 =>
- class cr {
- private $priv_member = 23;
- public $public_member = 23;
- },
- 1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
- 2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
$b=array (
'0.2' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
- '0.5' =>
- class cr {
- private $priv_member = 22;
- public $public_member = 22;
- },
- 0 =>
- class cr {
- private $priv_member = 3;
- public $public_member = 3;
- },
- 1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
- 2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
var_dump(array_intersect_assoc($a, $b));
array(0) {
@@ -288,57 +288,57 @@
begin ------------ array_uintersect_assoc() ---------------------
$a=array (
'0.1' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
- '0.5' =>
- class cr {
- private $priv_member = 12;
- public $public_member = 12;
- },
- 0 =>
- class cr {
- private $priv_member = 23;
- public $public_member = 23;
- },
- 1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
- 2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
$b=array (
'0.2' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
- '0.5' =>
- class cr {
- private $priv_member = 22;
- public $public_member = 22;
- },
- 0 =>
- class cr {
- private $priv_member = 3;
- public $public_member = 3;
- },
- 1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
- 2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
var_dump(array_uintersect_assoc($a, $b, "comp_func_cr"));
array(2) {
@@ -361,57 +361,57 @@
begin ------------ array_intersect_uassoc() ---------------------
$a=array (
'0.1' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
- '0.5' =>
- class cr {
- private $priv_member = 12;
- public $public_member = 12;
- },
- 0 =>
- class cr {
- private $priv_member = 23;
- public $public_member = 23;
- },
- 1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
- 2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
$b=array (
'0.2' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
- '0.5' =>
- class cr {
- private $priv_member = 22;
- public $public_member = 22;
- },
- 0 =>
- class cr {
- private $priv_member = 3;
- public $public_member = 3;
- },
- 1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
- 2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
var_dump(array_intersect_uassoc($a, $b, "comp_func"));
array(0) {
@@ -420,57 +420,57 @@
begin ------------ array_uintersect_uassoc() with ordinary func -
$a=array (
'0.1' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
- '0.5' =>
- class cr {
- private $priv_member = 12;
- public $public_member = 12;
- },
- 0 =>
- class cr {
- private $priv_member = 23;
- public $public_member = 23;
- },
- 1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
- 2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
$b=array (
'0.2' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
- '0.5' =>
- class cr {
- private $priv_member = 22;
- public $public_member = 22;
- },
- 0 =>
- class cr {
- private $priv_member = 3;
- public $public_member = 3;
- },
- 1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
- 2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
var_dump(array_uintersect_uassoc($a, $b, "comp_func_cr", "comp_func"));
array(2) {
@@ -493,57 +493,57 @@
begin ------------ array_uintersect_uassoc() with method --------
$a=array (
'0.1' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
- '0.5' =>
- class cr {
- private $priv_member = 12;
- public $public_member = 12;
- },
- 0 =>
- class cr {
- private $priv_member = 23;
- public $public_member = 23;
- },
- 1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
- 2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
$b=array (
'0.2' =>
- class cr {
- private $priv_member = 9;
- public $public_member = 9;
- },
- '0.5' =>
- class cr {
- private $priv_member = 22;
- public $public_member = 22;
- },
- 0 =>
- class cr {
- private $priv_member = 3;
- public $public_member = 3;
- },
- 1 =>
- class cr {
- private $priv_member = 4;
- public $public_member = 4;
- },
- 2 =>
- class cr {
- private $priv_member = -15;
- public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
);
var_dump(array_uintersect_uassoc($a, $b, array("cr", "comp_func_cr"),
"comp_func"));
array(2) {
http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/var_export.phpt?r1=1.3&r2=1.3.4.1&ty=u
Index: php-src/ext/standard/tests/array/var_export.phpt
diff -u php-src/ext/standard/tests/array/var_export.phpt:1.3
php-src/ext/standard/tests/array/var_export.phpt:1.3.4.1
--- php-src/ext/standard/tests/array/var_export.phpt:1.3 Sun Jan 11
06:55:33 2004
+++ php-src/ext/standard/tests/array/var_export.phpt Mon Oct 17 10:38:11 2005
@@ -6,6 +6,6 @@
var_export($a);
?>
--EXPECT--
-class stdClass {
- public $foo = 'bar';
-}
+stdClass::__set_state(array(
+ 'foo' => 'bar',
+))
http://cvs.php.net/co.php/php-src/ext/standard/tests/array/var_export3.phpt?r=1.1&p=1
Index: php-src/ext/standard/tests/array/var_export3.phpt
+++ php-src/ext/standard/tests/array/var_export3.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
