andrey Sat Jan 10 18:38:46 2004 EDT
Modified files:
/php-src/ext/standard/tests/array 007.phpt array_intersect_1.phpt
Log:
fixing tests after last Derick's commit that changed the behaviour of
var_export() :)
Index: php-src/ext/standard/tests/array/007.phpt
diff -u php-src/ext/standard/tests/array/007.phpt:1.7
php-src/ext/standard/tests/array/007.phpt:1.8
--- php-src/ext/standard/tests/array/007.phpt:1.7 Mon Dec 29 17:19:34 2003
+++ php-src/ext/standard/tests/array/007.phpt Sat Jan 10 18:38:45 2004
@@ -255,55 +255,55 @@
$a=array (
'0.1' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 12;
- var $public_member = 12;
+ private $priv_member = 12;
+ public $public_member = 12;
},
0 =>
class cr {
- var $ = 23;
- var $public_member = 23;
+ private $priv_member = 23;
+ public $public_member = 23;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
$b=array (
'0.2' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 22;
- var $public_member = 22;
+ private $priv_member = 22;
+ public $public_member = 22;
},
0 =>
class cr {
- var $ = 3;
- var $public_member = 3;
+ private $priv_member = 3;
+ public $public_member = 3;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
var_dump(array_udiff_uassoc($a, $b, "comp_func_cr", "comp_func"));
@@ -327,55 +327,55 @@
$a=array (
'0.1' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 12;
- var $public_member = 12;
+ private $priv_member = 12;
+ public $public_member = 12;
},
0 =>
class cr {
- var $ = 23;
- var $public_member = 23;
+ private $priv_member = 23;
+ public $public_member = 23;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
$b=array (
'0.2' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 22;
- var $public_member = 22;
+ private $priv_member = 22;
+ public $public_member = 22;
},
0 =>
class cr {
- var $ = 3;
- var $public_member = 3;
+ private $priv_member = 3;
+ public $public_member = 3;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
var_dump(array_udiff_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func"));
@@ -399,55 +399,55 @@
$a=array (
'0.1' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 12;
- var $public_member = 12;
+ private $priv_member = 12;
+ public $public_member = 12;
},
0 =>
class cr {
- var $ = 23;
- var $public_member = 23;
+ private $priv_member = 23;
+ public $public_member = 23;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
$b=array (
'0.2' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 22;
- var $public_member = 22;
+ private $priv_member = 22;
+ public $public_member = 22;
},
0 =>
class cr {
- var $ = 3;
- var $public_member = 3;
+ private $priv_member = 3;
+ public $public_member = 3;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
var_dump(array_diff_assoc($a, $b));
@@ -481,55 +481,55 @@
$a=array (
'0.1' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 12;
- var $public_member = 12;
+ private $priv_member = 12;
+ public $public_member = 12;
},
0 =>
class cr {
- var $ = 23;
- var $public_member = 23;
+ private $priv_member = 23;
+ public $public_member = 23;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
$b=array (
'0.2' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 22;
- var $public_member = 22;
+ private $priv_member = 22;
+ public $public_member = 22;
},
0 =>
class cr {
- var $ = 3;
- var $public_member = 3;
+ private $priv_member = 3;
+ public $public_member = 3;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
var_dump(array_udiff($a, $b, "comp_func_cr"));
@@ -548,55 +548,55 @@
$a=array (
'0.1' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 12;
- var $public_member = 12;
+ private $priv_member = 12;
+ public $public_member = 12;
},
0 =>
class cr {
- var $ = 23;
- var $public_member = 23;
+ private $priv_member = 23;
+ public $public_member = 23;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
$b=array (
'0.2' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 22;
- var $public_member = 22;
+ private $priv_member = 22;
+ public $public_member = 22;
},
0 =>
class cr {
- var $ = 3;
- var $public_member = 3;
+ private $priv_member = 3;
+ public $public_member = 3;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
var_dump(array_udiff_assoc($a, $b, "comp_func_cr"));
Index: php-src/ext/standard/tests/array/array_intersect_1.phpt
diff -u php-src/ext/standard/tests/array/array_intersect_1.phpt:1.3
php-src/ext/standard/tests/array/array_intersect_1.phpt:1.4
--- php-src/ext/standard/tests/array/array_intersect_1.phpt:1.3 Mon Dec 29 17:24:01
2003
+++ php-src/ext/standard/tests/array/array_intersect_1.phpt Sat Jan 10 18:38:45
2004
@@ -91,55 +91,55 @@
$a=array (
'0.1' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 12;
- var $public_member = 12;
+ private $priv_member = 12;
+ public $public_member = 12;
},
0 =>
class cr {
- var $ = 23;
- var $public_member = 23;
+ private $priv_member = 23;
+ public $public_member = 23;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
$b=array (
'0.2' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 22;
- var $public_member = 22;
+ private $priv_member = 22;
+ public $public_member = 22;
},
0 =>
class cr {
- var $ = 3;
- var $public_member = 3;
+ private $priv_member = 3;
+ public $public_member = 3;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
var_dump(array_intersect($a, $b);
@@ -150,55 +150,55 @@
$a=array (
'0.1' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 12;
- var $public_member = 12;
+ private $priv_member = 12;
+ public $public_member = 12;
},
0 =>
class cr {
- var $ = 23;
- var $public_member = 23;
+ private $priv_member = 23;
+ public $public_member = 23;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
$b=array (
'0.2' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 22;
- var $public_member = 22;
+ private $priv_member = 22;
+ public $public_member = 22;
},
0 =>
class cr {
- var $ = 3;
- var $public_member = 3;
+ private $priv_member = 3;
+ public $public_member = 3;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
var_dump(array_uintersect($a, $b, "comp_func_cr"));
@@ -224,55 +224,55 @@
$a=array (
'0.1' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 12;
- var $public_member = 12;
+ private $priv_member = 12;
+ public $public_member = 12;
},
0 =>
class cr {
- var $ = 23;
- var $public_member = 23;
+ private $priv_member = 23;
+ public $public_member = 23;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
$b=array (
'0.2' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 22;
- var $public_member = 22;
+ private $priv_member = 22;
+ public $public_member = 22;
},
0 =>
class cr {
- var $ = 3;
- var $public_member = 3;
+ private $priv_member = 3;
+ public $public_member = 3;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
var_dump(array_intersect_assoc($a, $b));
@@ -283,55 +283,55 @@
$a=array (
'0.1' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 12;
- var $public_member = 12;
+ private $priv_member = 12;
+ public $public_member = 12;
},
0 =>
class cr {
- var $ = 23;
- var $public_member = 23;
+ private $priv_member = 23;
+ public $public_member = 23;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
$b=array (
'0.2' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 22;
- var $public_member = 22;
+ private $priv_member = 22;
+ public $public_member = 22;
},
0 =>
class cr {
- var $ = 3;
- var $public_member = 3;
+ private $priv_member = 3;
+ public $public_member = 3;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
var_dump(array_uintersect_assoc($a, $b, "comp_func_cr"));
@@ -352,55 +352,55 @@
$a=array (
'0.1' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 12;
- var $public_member = 12;
+ private $priv_member = 12;
+ public $public_member = 12;
},
0 =>
class cr {
- var $ = 23;
- var $public_member = 23;
+ private $priv_member = 23;
+ public $public_member = 23;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
$b=array (
'0.2' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 22;
- var $public_member = 22;
+ private $priv_member = 22;
+ public $public_member = 22;
},
0 =>
class cr {
- var $ = 3;
- var $public_member = 3;
+ private $priv_member = 3;
+ public $public_member = 3;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
var_dump(array_intersect_uassoc($a, $b, "comp_func"));
@@ -411,55 +411,55 @@
$a=array (
'0.1' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 12;
- var $public_member = 12;
+ private $priv_member = 12;
+ public $public_member = 12;
},
0 =>
class cr {
- var $ = 23;
- var $public_member = 23;
+ private $priv_member = 23;
+ public $public_member = 23;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
$b=array (
'0.2' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 22;
- var $public_member = 22;
+ private $priv_member = 22;
+ public $public_member = 22;
},
0 =>
class cr {
- var $ = 3;
- var $public_member = 3;
+ private $priv_member = 3;
+ public $public_member = 3;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
var_dump(array_uintersect_uassoc($a, $b, "comp_func_cr", "comp_func"));
@@ -480,55 +480,55 @@
$a=array (
'0.1' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 12;
- var $public_member = 12;
+ private $priv_member = 12;
+ public $public_member = 12;
},
0 =>
class cr {
- var $ = 23;
- var $public_member = 23;
+ private $priv_member = 23;
+ public $public_member = 23;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
$b=array (
'0.2' =>
class cr {
- var $ = 9;
- var $public_member = 9;
+ private $priv_member = 9;
+ public $public_member = 9;
},
'0.5' =>
class cr {
- var $ = 22;
- var $public_member = 22;
+ private $priv_member = 22;
+ public $public_member = 22;
},
0 =>
class cr {
- var $ = 3;
- var $public_member = 3;
+ private $priv_member = 3;
+ public $public_member = 3;
},
1 =>
class cr {
- var $ = 4;
- var $public_member = 4;
+ private $priv_member = 4;
+ public $public_member = 4;
},
2 =>
class cr {
- var $ = -15;
- var $public_member = -15;
+ private $priv_member = -15;
+ public $public_member = -15;
},
);
var_dump(array_uintersect_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func"));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
