fix tests

diff --git a/ext/standard/tests/array/007.phpt b/ext/standard/tests/array/007.phpt
index 7a21d3e35a76a9167482dbf786885903e776ce57..e30b8fe2c1d6892d8010b7d4d28c31a3cd06c834 100644 (file)
--- a/ext/standard/tests/array/007.phpt
+++ b/ext/standard/tests/array/007.phpt
@@ -108,12 +108,6 @@ echo 'var_dump(array_udiff_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_fun
 var_dump(array_udiff_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func"));
 
 
-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";
@@ -309,21 +303,21 @@ $b=array (
 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 @@ $b=array (
 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 @@ $b=array (
 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 @@ $b=array (
 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)
-  }
-}

diff --git a/ext/standard/tests/array/array_intersect_1.phpt b/ext/standard/tests/array/array_intersect_1.phpt
index 5aa23349e716a80f452ce00b7e94b2ffd193e894..41f20330fde50f3cfac6c52ac278f36d4bc64b4c 100644 (file)
--- a/ext/standard/tests/array/array_intersect_1.phpt
+++ b/ext/standard/tests/array/array_intersect_1.phpt
@@ -30,14 +30,6 @@ function comp_func_cr($a, $b) {
 $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 @@ echo 'var_dump(array_uintersect($a, $b, "comp_func_cr"));'."\n";
 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 @@ echo 'var_dump(array_uintersect_assoc($a, $b, "comp_func_cr"));'."\n";
 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 @@ var_dump(array_uintersect_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func
 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 @@ $b=array (
 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 @@ array(3) {
   }
 }
 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 @@ $b=array (
 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 @@ array(2) {
   }
 }
 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 @@ $b=array (
 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 @@ $b=array (
 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 @@ array(2) {
   }
 }
 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 --------

diff --git a/ext/standard/tests/array/locale_sort.phpt b/ext/standard/tests/array/locale_sort.phpt
index b99017ce41462d75cb811f01deb6f30a9dbc95e4..25ac73e6cf747e4bab20cdfe4481d550a340924c 100644 (file)
--- a/ext/standard/tests/array/locale_sort.phpt
+++ b/ext/standard/tests/array/locale_sort.phpt
@@ -5,6 +5,9 @@ Sort with SORT_LOCALE_STRING
 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