dmitry Wed Feb 22 12:24:02 2006 UTC
Modified files:
/php-src/ext/standard/tests/array array_intersect_1.phpt
Log:
fixed test file
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/array/array_intersect_1.phpt?r1=1.9&r2=1.10&diff_format=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.9
php-src/ext/standard/tests/array/array_intersect_1.phpt:1.10
--- php-src/ext/standard/tests/array/array_intersect_1.phpt:1.9 Fri Jan 6
21:21:09 2006
+++ php-src/ext/standard/tests/array/array_intersect_1.phpt Wed Feb 22
12:24:02 2006
@@ -362,3 +362,303 @@
}
}
end ------------ array_uintersect_uassoc() with method --------
+--UEXPECTF--
+begin ------------ array_uintersect() ---------------------------
+$a=array (
+ '0.1' =>
+ 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' =>
+ 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) {
+ [u"0.1"]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(9)
+ [u"public_member"]=>
+ int(9)
+ }
+ [1]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(4)
+ [u"public_member"]=>
+ int(4)
+ }
+ [2]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(-15)
+ [u"public_member"]=>
+ int(-15)
+ }
+}
+end ------------ array_uintersect() ---------------------------
+begin ------------ array_uintersect_assoc() ---------------------
+$a=array (
+ '0.1' =>
+ 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' =>
+ 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) {
+ [1]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(4)
+ [u"public_member"]=>
+ int(4)
+ }
+ [2]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(-15)
+ [u"public_member"]=>
+ int(-15)
+ }
+}
+end ------------ array_uintersect_assoc() ---------------------
+begin ------------ array_uintersect_uassoc() with ordinary func -
+$a=array (
+ '0.1' =>
+ 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' =>
+ 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) {
+ [1]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(4)
+ [u"public_member"]=>
+ int(4)
+ }
+ [2]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(-15)
+ [u"public_member"]=>
+ int(-15)
+ }
+}
+end ------------ array_uintersect_uassoc() with ordinary func -
+begin ------------ array_uintersect_uassoc() with method --------
+$a=array (
+ '0.1' =>
+ 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' =>
+ 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) {
+ [1]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(4)
+ [u"public_member"]=>
+ int(4)
+ }
+ [2]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(-15)
+ [u"public_member"]=>
+ int(-15)
+ }
+}
+end ------------ array_uintersect_uassoc() with method --------
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php