tony2001 Fri Jan 6 21:21:09 2006 UTC
Modified files:
/php-src/ext/standard/tests/array 007.phpt array_intersect_1.phpt
locale_sort.phpt
Log:
fix tests
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/array/007.phpt?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/standard/tests/array/007.phpt
diff -u php-src/ext/standard/tests/array/007.phpt:1.12
php-src/ext/standard/tests/array/007.phpt:1.13
--- php-src/ext/standard/tests/array/007.phpt:1.12 Mon Oct 17 15:03:12 2005
+++ php-src/ext/standard/tests/array/007.phpt Fri Jan 6 21:21:09 2006
@@ -110,12 +110,6 @@
echo '$a='.var_export($a,TRUE).";\n";
echo '$b='.var_export($b,TRUE).";\n";
-echo 'var_dump(array_diff_assoc($a, $b));'."\n";
-var_dump(array_diff_assoc($a, $b));
-
-
-echo '$a='.var_export($a,TRUE).";\n";
-echo '$b='.var_export($b,TRUE).";\n";
echo 'var_dump(array_udiff($a, $b, "comp_func_cr"));'."\n";
var_dump(array_udiff($a, $b, "comp_func_cr"));
@@ -309,21 +303,21 @@
var_dump(array_udiff_uassoc($a, $b, "comp_func_cr", "comp_func"));
array(3) {
["0.1"]=>
- object(cr)#1 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(9)
["public_member"]=>
int(9)
}
["0.5"]=>
- object(cr)#2 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(12)
["public_member"]=>
int(12)
}
[0]=>
- object(cr)#3 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(23)
["public_member"]=>
@@ -387,118 +381,26 @@
var_dump(array_udiff_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func"));
array(3) {
["0.1"]=>
- object(cr)#1 (2) {
- ["priv_member":"cr":private]=>
- int(9)
- ["public_member"]=>
- int(9)
- }
- ["0.5"]=>
- object(cr)#2 (2) {
- ["priv_member":"cr":private]=>
- int(12)
- ["public_member"]=>
- int(12)
- }
- [0]=>
- object(cr)#3 (2) {
- ["priv_member":"cr":private]=>
- int(23)
- ["public_member"]=>
- int(23)
- }
-}
-$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_diff_assoc($a, $b));
-array(5) {
- ["0.1"]=>
- object(cr)#1 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(9)
["public_member"]=>
int(9)
}
["0.5"]=>
- object(cr)#2 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(12)
["public_member"]=>
int(12)
}
[0]=>
- object(cr)#3 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(23)
["public_member"]=>
int(23)
}
- [1]=>
- object(cr)#4 (2) {
- ["priv_member":"cr":private]=>
- int(4)
- ["public_member"]=>
- int(4)
- }
- [2]=>
- object(cr)#5 (2) {
- ["priv_member":"cr":private]=>
- int(-15)
- ["public_member"]=>
- int(-15)
- }
}
$a=array (
'0.1' =>
@@ -557,14 +459,14 @@
var_dump(array_udiff($a, $b, "comp_func_cr"));
array(2) {
["0.5"]=>
- object(cr)#2 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(12)
["public_member"]=>
int(12)
}
[0]=>
- object(cr)#3 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(23)
["public_member"]=>
@@ -628,547 +530,24 @@
var_dump(array_udiff_assoc($a, $b, "comp_func_cr"));
array(3) {
["0.1"]=>
- object(cr)#1 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(9)
["public_member"]=>
int(9)
}
["0.5"]=>
- object(cr)#2 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(12)
["public_member"]=>
int(12)
}
[0]=>
- object(cr)#3 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(23)
["public_member"]=>
int(23)
}
}
---UEXPECTF--
-$a=array (
- 0 => 1,
- 'big' => 2,
- 1 => 3,
- 2 => 6,
- 3 => 3,
- 4 => 5,
- 5 => 3,
- 6 => 3,
- 7 => 3,
- 8 => 3,
- 9 => 3,
- 10 => 3,
- 11 => 3,
- 12 => 3,
- 13 => 3,
- 14 => 3,
-);
-$b=array (
- 0 => 2,
- 1 => 2,
- 2 => 3,
- 3 => 3,
- 4 => 3,
- 5 => 3,
- 6 => 3,
- 7 => 3,
- 8 => 3,
- 9 => 3,
- 10 => 3,
- 11 => 3,
- 12 => 3,
- 13 => 3,
- 14 => 3,
-);
-$c=array (
- 0 => -1,
- 1 => 1,
-);
-array(2) {
- [2]=>
- int(6)
- [4]=>
- int(5)
-}
-array(5) {
- [0]=>
- int(1)
- [u"big"]=>
- int(2)
- [1]=>
- int(3)
- [2]=>
- int(6)
- [4]=>
- int(5)
-}
-$a=array (
- 'a' => 2,
- 'b' => 'some',
- 'c' => 'done',
- 'z' => 'foo',
- 'f' => 5,
- 'fan' => 'fen',
- 7 => 18,
- 9 => 25,
- 11 => 42,
- 12 => 42,
- 45 => 42,
- 73 => 'foo',
- 95 => 'some',
- 'som3' => 'some',
- 'want' => 'wanna',
-);
-$b=array (
- 'a' => 7,
- 7 => 18,
- 9 => 13,
- 11 => 42,
- 45 => 46,
- 'som3' => 'some',
- 'foo' => 'some',
- 'goo' => 'foo',
- 'f' => 5,
- 'z' => 'equal',
-);
-$c=array (
- 73 => 'foo',
- 95 => 'some',
-);
-Results:
-
-array(5) {
- [u"a"]=>
- int(2)
- [u"c"]=>
- unicode(4) "done"
- [u"fan"]=>
- unicode(3) "fen"
- [9]=>
- int(25)
- [u"want"]=>
- unicode(5) "wanna"
-}
-array(9) {
- [u"a"]=>
- int(2)
- [u"b"]=>
- unicode(4) "some"
- [u"c"]=>
- unicode(4) "done"
- [u"z"]=>
- unicode(3) "foo"
- [u"fan"]=>
- unicode(3) "fen"
- [9]=>
- int(25)
- [12]=>
- int(42)
- [45]=>
- int(42)
- [u"want"]=>
- unicode(5) "wanna"
-}
--=-=-=-=-=-=-=-=- New functionality from 5.0.0 -=-=-=-=-=-=-=-
-$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;
- },
-);
-$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;
- },
-);
-var_dump(array_udiff_uassoc($a, $b, "comp_func_cr", "comp_func"));
-array(3) {
- [u"0.1"]=>
- object(cr)#1 (2) {
- [u"priv_member":u"cr":private]=>
- int(9)
- [u"public_member"]=>
- int(9)
- }
- [u"0.5"]=>
- object(cr)#2 (2) {
- [u"priv_member":u"cr":private]=>
- int(12)
- [u"public_member"]=>
- int(12)
- }
- [0]=>
- object(cr)#3 (2) {
- [u"priv_member":u"cr":private]=>
- int(23)
- [u"public_member"]=>
- int(23)
- }
-}
-$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;
- },
-);
-$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;
- },
-);
-var_dump(array_udiff_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func"));
-array(3) {
- [u"0.1"]=>
- object(cr)#1 (2) {
- [u"priv_member":u"cr":private]=>
- int(9)
- [u"public_member"]=>
- int(9)
- }
- [u"0.5"]=>
- object(cr)#2 (2) {
- [u"priv_member":u"cr":private]=>
- int(12)
- [u"public_member"]=>
- int(12)
- }
- [0]=>
- object(cr)#3 (2) {
- [u"priv_member":u"cr":private]=>
- int(23)
- [u"public_member"]=>
- int(23)
- }
-}
-$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;
- },
-);
-$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;
- },
-);
-var_dump(array_diff_assoc($a, $b));
-array(5) {
- [u"0.1"]=>
- object(cr)#1 (2) {
- [u"priv_member":u"cr":private]=>
- int(9)
- [u"public_member"]=>
- int(9)
- }
- [u"0.5"]=>
- object(cr)#2 (2) {
- [u"priv_member":u"cr":private]=>
- int(12)
- [u"public_member"]=>
- int(12)
- }
- [0]=>
- object(cr)#3 (2) {
- [u"priv_member":u"cr":private]=>
- int(23)
- [u"public_member"]=>
- int(23)
- }
- [1]=>
- object(cr)#4 (2) {
- [u"priv_member":u"cr":private]=>
- int(4)
- [u"public_member"]=>
- int(4)
- }
- [2]=>
- object(cr)#5 (2) {
- [u"priv_member":u"cr":private]=>
- int(-15)
- [u"public_member"]=>
- int(-15)
- }
-}
-$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;
- },
-);
-$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;
- },
-);
-var_dump(array_udiff($a, $b, "comp_func_cr"));
-array(2) {
- [u"0.5"]=>
- object(cr)#2 (2) {
- [u"priv_member":u"cr":private]=>
- int(12)
- [u"public_member"]=>
- int(12)
- }
- [0]=>
- object(cr)#3 (2) {
- [u"priv_member":u"cr":private]=>
- int(23)
- [u"public_member"]=>
- int(23)
- }
-}
-$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;
- },
-);
-$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;
- },
-);
-var_dump(array_udiff_assoc($a, $b, "comp_func_cr"));
-array(3) {
- [u"0.1"]=>
- object(cr)#1 (2) {
- [u"priv_member":u"cr":private]=>
- int(9)
- [u"public_member"]=>
- int(9)
- }
- [u"0.5"]=>
- object(cr)#2 (2) {
- [u"priv_member":u"cr":private]=>
- int(12)
- [u"public_member"]=>
- int(12)
- }
- [0]=>
- object(cr)#3 (2) {
- [u"priv_member":u"cr":private]=>
- int(23)
- [u"public_member"]=>
- int(23)
- }
-}
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/array/array_intersect_1.phpt?r1=1.8&r2=1.9&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.8
php-src/ext/standard/tests/array/array_intersect_1.phpt:1.9
--- php-src/ext/standard/tests/array/array_intersect_1.phpt:1.8 Mon Oct 17
15:03:12 2005
+++ php-src/ext/standard/tests/array/array_intersect_1.phpt Fri Jan 6
21:21:09 2006
@@ -30,14 +30,6 @@
$a = array("0.1" => new cr(9), "0.5" => new cr(12), 0 => new cr(23), 1=> new
cr(4), 2 => new cr(-15),);
$b = array("0.2" => new cr(9), "0.5" => new cr(22), 0 => new cr( 3), 1=> new
cr(4), 2 => new cr(-15),);
-/* array_intersect() */
-echo "begin ------------ array_intersect() ----------------------------\n";
-echo '$a='.var_export($a,TRUE).";\n";
-echo '$b='.var_export($b,TRUE).";\n";
-echo 'var_dump(array_intersect($a, $b);'."\n";
-var_dump(array_intersect($a, $b));
-echo "end ------------ array_intersect() ----------------------------\n";
-
/* array_uintersect() */
echo "begin ------------ array_uintersect() ---------------------------\n";
echo '$a='.var_export($a,TRUE).";\n";
@@ -46,14 +38,6 @@
var_dump(array_uintersect($a, $b, "comp_func_cr"));
echo "end ------------ array_uintersect() ---------------------------\n";
-/* array_intersect_assoc() */
-echo "begin ------------ array_intersect_assoc() ----------------------\n";
-echo '$a='.var_export($a,TRUE).";\n";
-echo '$b='.var_export($b,TRUE).";\n";
-echo 'var_dump(array_intersect_assoc($a, $b));'."\n";
-var_dump(array_intersect_assoc($a, $b));
-echo "end ------------ array_intersect_assoc() ----------------------\n";
-
/* array_uintersect_assoc() */
echo "begin ------------ array_uintersect_assoc() ---------------------\n";
echo '$a='.var_export($a,TRUE).";\n";
@@ -62,14 +46,6 @@
var_dump(array_uintersect_assoc($a, $b, "comp_func_cr"));
echo "end ------------ array_uintersect_assoc() ---------------------\n";
-/* array_intersect_uassoc() */
-echo "begin ------------ array_intersect_uassoc() ---------------------\n";
-echo '$a='.var_export($a,TRUE).";\n";
-echo '$b='.var_export($b,TRUE).";\n";
-echo 'var_dump(array_intersect_uassoc($a, $b, "comp_func"));'."\n";
-var_dump(array_intersect_uassoc($a, $b, "comp_func"));
-echo "end ------------ array_intersect_uassoc() ---------------------\n";
-
/* array_uintersect_uassoc() - with ordinary function */
echo "begin ------------ array_uintersect_uassoc() with ordinary func -\n";
echo '$a='.var_export($a,TRUE).";\n";
@@ -87,65 +63,6 @@
echo "end ------------ array_uintersect_uassoc() with method --------\n";
?>
--EXPECTF--
-begin ------------ array_intersect() ----------------------------
-$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_intersect($a, $b);
-array(0) {
-}
-end ------------ array_intersect() ----------------------------
begin ------------ array_uintersect() ---------------------------
$a=array (
'0.1' =>
@@ -204,21 +121,21 @@
var_dump(array_uintersect($a, $b, "comp_func_cr"));
array(3) {
["0.1"]=>
- object(cr)#1 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(9)
["public_member"]=>
int(9)
}
[1]=>
- object(cr)#4 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(4)
["public_member"]=>
int(4)
}
[2]=>
- object(cr)#5 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(-15)
["public_member"]=>
@@ -226,65 +143,6 @@
}
}
end ------------ array_uintersect() ---------------------------
-begin ------------ array_intersect_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_intersect_assoc($a, $b));
-array(0) {
-}
-end ------------ array_intersect_assoc() ----------------------
begin ------------ array_uintersect_assoc() ---------------------
$a=array (
'0.1' =>
@@ -343,14 +201,14 @@
var_dump(array_uintersect_assoc($a, $b, "comp_func_cr"));
array(2) {
[1]=>
- object(cr)#4 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(4)
["public_member"]=>
int(4)
}
[2]=>
- object(cr)#5 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(-15)
["public_member"]=>
@@ -358,65 +216,6 @@
}
}
end ------------ array_uintersect_assoc() ---------------------
-begin ------------ array_intersect_uassoc() ---------------------
-$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_intersect_uassoc($a, $b, "comp_func"));
-array(0) {
-}
-end ------------ array_intersect_uassoc() ---------------------
begin ------------ array_uintersect_uassoc() with ordinary func -
$a=array (
'0.1' =>
@@ -475,14 +274,14 @@
var_dump(array_uintersect_uassoc($a, $b, "comp_func_cr", "comp_func"));
array(2) {
[1]=>
- object(cr)#4 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(4)
["public_member"]=>
int(4)
}
[2]=>
- object(cr)#5 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(-15)
["public_member"]=>
@@ -548,14 +347,14 @@
var_dump(array_uintersect_uassoc($a, $b, array("cr", "comp_func_cr"),
"comp_func"));
array(2) {
[1]=>
- object(cr)#4 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(4)
["public_member"]=>
int(4)
}
[2]=>
- object(cr)#5 (2) {
+ object(cr)#%d (2) {
["priv_member":"cr":private]=>
int(-15)
["public_member"]=>
@@ -563,480 +362,3 @@
}
}
end ------------ array_uintersect_uassoc() with method --------
---UEXPECTF--
-begin ------------ array_intersect() ----------------------------
-$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_intersect($a, $b);
-array(0) {
-}
-end ------------ array_intersect() ----------------------------
-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)#1 (2) {
- [u"priv_member":u"cr":private]=>
- int(9)
- [u"public_member"]=>
- int(9)
- }
- [1]=>
- object(cr)#4 (2) {
- [u"priv_member":u"cr":private]=>
- int(4)
- [u"public_member"]=>
- int(4)
- }
- [2]=>
- object(cr)#5 (2) {
- [u"priv_member":u"cr":private]=>
- int(-15)
- [u"public_member"]=>
- int(-15)
- }
-}
-end ------------ array_uintersect() ---------------------------
-begin ------------ array_intersect_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_intersect_assoc($a, $b));
-array(0) {
-}
-end ------------ array_intersect_assoc() ----------------------
-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)#4 (2) {
- [u"priv_member":u"cr":private]=>
- int(4)
- [u"public_member"]=>
- int(4)
- }
- [2]=>
- object(cr)#5 (2) {
- [u"priv_member":u"cr":private]=>
- int(-15)
- [u"public_member"]=>
- int(-15)
- }
-}
-end ------------ array_uintersect_assoc() ---------------------
-begin ------------ array_intersect_uassoc() ---------------------
-$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_intersect_uassoc($a, $b, "comp_func"));
-array(0) {
-}
-end ------------ array_intersect_uassoc() ---------------------
-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)#4 (2) {
- [u"priv_member":u"cr":private]=>
- int(4)
- [u"public_member"]=>
- int(4)
- }
- [2]=>
- object(cr)#5 (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)#4 (2) {
- [u"priv_member":u"cr":private]=>
- int(4)
- [u"public_member"]=>
- int(4)
- }
- [2]=>
- object(cr)#5 (2) {
- [u"priv_member":u"cr":private]=>
- int(-15)
- [u"public_member"]=>
- int(-15)
- }
-}
-end ------------ array_uintersect_uassoc() with method --------
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/array/locale_sort.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/standard/tests/array/locale_sort.phpt
diff -u php-src/ext/standard/tests/array/locale_sort.phpt:1.4
php-src/ext/standard/tests/array/locale_sort.phpt:1.5
--- php-src/ext/standard/tests/array/locale_sort.phpt:1.4 Mon Sep 12
09:53:23 2005
+++ php-src/ext/standard/tests/array/locale_sort.phpt Fri Jan 6 21:21:09 2006
@@ -5,6 +5,9 @@
if ("fr_FR" != setlocale(LC_CTYPE, "fr_FR")) {
die("skip setlocale() failed\n");
}
+if (!function_exists("i18n_loc_set_default")) {
+ die("skip no i18n_loc_set_default() function\n");
+}
?>
--INI--
unicode.script_encoding=UTF-8
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
