fixed test file

diff --git a/ext/standard/tests/array/array_intersect_1.phpt b/ext/standard/tests/array/array_intersect_1.phpt
index 41f20330fde50f3cfac6c52ac278f36d4bc64b4c..61f4859e8f8e8204eb9327c54d5dd9407ea59bf6 100644 (file)
--- a/ext/standard/tests/array/array_intersect_1.phpt
+++ b/ext/standard/tests/array/array_intersect_1.phpt
@@ -362,3 +362,303 @@ array(2) {
   }
 }
 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 --------