[PHP-CVS] cvs: php-src /ext/standard/tests/array 007.phpt

2006-02-22 Thread Dmitry Stogov
dmitry  Wed Feb 22 12:22:07 2006 UTC

  Modified files:  
/php-src/ext/standard/tests/array   007.phpt 
  Log:
  Fixed test file
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/array/007.phpt?r1=1.13&r2=1.14&diff_format=u
Index: php-src/ext/standard/tests/array/007.phpt
diff -u php-src/ext/standard/tests/array/007.phpt:1.13 
php-src/ext/standard/tests/array/007.phpt:1.14
--- php-src/ext/standard/tests/array/007.phpt:1.13  Fri Jan  6 21:21:09 2006
+++ php-src/ext/standard/tests/array/007.phpt   Wed Feb 22 12:22:07 2006
@@ -551,3 +551,434 @@
 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' => 
+  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_udiff_uassoc($a, $b, "comp_func_cr", "comp_func"));
+array(3) {
+  [u"0.1"]=>
+  object(cr)#%d (2) {
+[u"priv_member":u"cr":private]=>
+int(9)
+[u"public_member"]=>
+int(9)
+  }
+  [u"0.5"]=>
+  object(cr)#%d (2) {
+[u"priv_member":u"cr":private]=>
+int(12)
+[u"public_member"]=>
+int(12)
+  }
+  [0]=>
+  object(cr)#%d (2) {
+[u"priv_member":u"cr":private]=>
+int(23)
+[u"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_udiff_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func"));
+array(3) {
+  [u"0.1"]=>
+  object(cr)#%d (2) {
+[u"priv_member":u"cr":private]=>
+int(9)
+[u"public_member"]=>
+int(9)
+  }
+  [u"0.5"]=>
+  object(cr)#%d (2) {
+[u"priv_member":u"cr"

[PHP-CVS] cvs: php-src /ext/standard/tests/array 007.phpt array_intersect_1.phpt locale_sort.phpt

2006-01-06 Thread Antony Dovgal
tony2001Fri 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,
-

[PHP-CVS] cvs: php-src /ext/standard/tests/array 007.phpt array_intersect_1.phpt

2004-01-10 Thread Andrey Hristov
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 $ = -1

[PHP-CVS] cvs: php-src /ext/standard/tests/array 007.phpt

2003-12-29 Thread Marcus Boerger
helly   Mon Dec 29 17:19:35 2003 EDT

  Modified files:  
/php-src/ext/standard/tests/array   007.phpt 
  Log:
  No Notices here
  
Index: php-src/ext/standard/tests/array/007.phpt
diff -u php-src/ext/standard/tests/array/007.phpt:1.6 
php-src/ext/standard/tests/array/007.phpt:1.7
--- php-src/ext/standard/tests/array/007.phpt:1.6   Fri Nov 28 23:43:06 2003
+++ php-src/ext/standard/tests/array/007.phpt   Mon Dec 29 17:19:34 2003
@@ -111,7 +111,7 @@
 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));
+var_dump(@array_diff_assoc($a, $b));
 
 
 echo '$a='.var_export($a,TRUE).";\n";

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/standard/tests/array 007.phpt array_diff_1.phpt

2003-09-30 Thread Andrey Hristov
andrey  Tue Sep 30 11:22:34 2003 EDT

  Added files: 
/php-src/ext/standard/tests/array   array_diff_1.phpt 

  Modified files:  
/php-src/ext/standard/tests/array   007.phpt 
  Log:
  Move the test to new file.
  
  
Index: php-src/ext/standard/tests/array/007.phpt
diff -u php-src/ext/standard/tests/array/007.phpt:1.4 
php-src/ext/standard/tests/array/007.phpt:1.5
--- php-src/ext/standard/tests/array/007.phpt:1.4   Tue Sep 30 11:06:05 2003
+++ php-src/ext/standard/tests/array/007.phpt   Tue Sep 30 11:22:33 2003
@@ -2,12 +2,6 @@
 Test array_diff and array_diff_assoc behaviour
 --FILE--
 2,3,6,3,5,3,3,3,3,3,3,3,3,3,3);
 $b = array(2,2,3,3,3,3,3,3,3,3,3,3,3,3,3);
 $c = array(-1,1);
@@ -133,7 +127,6 @@
 
 ?>
 --EXPECTF--
-Warning: array_diff(): Argument #2 is not an array in %s
 $a=array (
   0 => 1,
   'big' => 2,

Index: php-src/ext/standard/tests/array/array_diff_1.phpt
+++ php-src/ext/standard/tests/array/array_diff_1.phpt
--TEST--
Test array_diff when non-array is passed
--FILE--

--EXPECTF--
Warning: array_diff(): Argument #2 is not an array in %s
OK!

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/standard/tests/array 007.phpt

2003-09-30 Thread Andrey Hristov
andrey  Tue Sep 30 11:06:06 2003 EDT

  Modified files:  
/php-src/ext/standard/tests/array   007.phpt 
  Log:
  fix
  
  
Index: php-src/ext/standard/tests/array/007.phpt
diff -u php-src/ext/standard/tests/array/007.phpt:1.3 
php-src/ext/standard/tests/array/007.phpt:1.4
--- php-src/ext/standard/tests/array/007.phpt:1.3   Tue Sep 23 13:40:34 2003
+++ php-src/ext/standard/tests/array/007.phpt   Tue Sep 30 11:06:05 2003
@@ -2,6 +2,12 @@
 Test array_diff and array_diff_assoc behaviour
 --FILE--
 2,3,6,3,5,3,3,3,3,3,3,3,3,3,3);
 $b = array(2,2,3,3,3,3,3,3,3,3,3,3,3,3,3);
 $c = array(-1,1);
@@ -127,6 +133,7 @@
 
 ?>
 --EXPECTF--
+Warning: array_diff(): Argument #2 is not an array in %s
 $a=array (
   0 => 1,
   'big' => 2,

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/standard/tests/array 007.phpt

2003-09-23 Thread Andrey Hristov
andrey  Tue Sep 23 13:40:35 2003 EDT

  Modified files:  
/php-src/ext/standard/tests/array   007.phpt 
  Log:
  New test cases for the new 4 functions :
  - array_udiff()
  - array_udiff_assoc()
  - array_diff_uassoc()
  - array_udiff_uassoc()
  
  Index: php-src/ext/standard/tests/array/007.phpt
diff -u php-src/ext/standard/tests/array/007.phpt:1.2 
php-src/ext/standard/tests/array/007.phpt:1.3
--- php-src/ext/standard/tests/array/007.phpt:1.2   Sat Nov 16 12:26:52 2002
+++ php-src/ext/standard/tests/array/007.phpt   Tue Sep 23 13:40:34 2003
@@ -47,8 +47,86 @@
 echo "Results:\n\n";
 var_dump(array_diff($a,$b,$c));
 var_dump(array_diff_assoc($a,$b,$c));
+
+echo "-=-=-=-=-=-=-=-=- New functionality from 5.0.0 -=-=-=-=-=-=-=-\n";
+error_reporting(E_ALL);
+class cr {
+   private $priv_member;
+   public  $public_member;
+   function cr($val) {
+   $this->priv_member = $val;
+   $this->public_member = $val;
+   }
+   static function comp_func_cr($a, $b) {
+   if ($a->priv_member === $b->priv_member) return 0;
+   return ($a->priv_member > $b->priv_member)? 1:-1;
+   }
+}
+
+function comp_func($a, $b) {
+   if ($a === $b) return 0;
+   return ($a > $b)? 1:-1;
+
+}
+
+function comp_func_cr($a, $b) {
+   if ($a->public_member === $b->public_member) return 0;
+   return ($a->public_member > $b->public_member)? 1:-1;
+}
+
+
+/*
+$a = array(1,"big"=>2,3,6,3,5,3,3,3,3,3,3,3,3,3,3);
+$b = array(2,2,3,3,3,3,3,3,3,3,3,3,3,3,3);
+$c = array(-1,1);
+echo '$a='.var_export($a,TRUE).";\n";
+echo '$b='.var_export($b,TRUE).";\n";
+echo '$c='.var_export($c,TRUE).";\n";
+var_dump(array_diff($a,$b,$c));
+var_dump(array_diff_assoc($a,$b,$c));
+var_dump(array_udiff($a, $b, $c, "comp_func"));
+var_dump(array_diff_uassoc($a,$b,$c, "comp_func"));
+*/
+
+/*
+ $a = array(new cr(9),new cr(12),new cr(23),new cr(4),new cr(-15),);
+ $b = array(new cr(9),new cr(22),new cr( 3),new cr(4),new cr(-15),);
+ var_dump(array_udiff($a, $b, "comp_func_cr"));
+*/
+$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),);
+
+echo '$a='.var_export($a,TRUE).";\n";
+echo '$b='.var_export($b,TRUE).";\n";
+echo 'var_dump(array_udiff_uassoc($a, $b, "comp_func_cr", "comp_func"));'."\n";
+var_dump(array_udiff_uassoc($a, $b, "comp_func_cr", "comp_func"));
+
+
+echo '$a='.var_export($a,TRUE).";\n";
+echo '$b='.var_export($b,TRUE).";\n";
+echo 'var_dump(array_udiff_uassoc($a, $b, array("cr", "comp_func_cr"), 
"comp_func"));'."\n";
+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";
+var_dump(array_udiff($a, $b, "comp_func_cr"));
+
+
+echo '$a='.var_export($a,TRUE).";\n";
+echo '$b='.var_export($b,TRUE).";\n";
+echo 'var_dump(array_udiff_assoc($a, $b, "comp_func_cr"));'."\n";
+var_dump(array_udiff_assoc($a, $b, "comp_func_cr"));
+
 ?>
---EXPECT--
+--EXPECTF--
 $a=array (
   0 => 1,
   'big' => 2,
@@ -172,4 +250,402 @@
   int(42)
   ["want"]=>
   string(5) "wanna"
+}
+-=-=-=-=-=-=-=-=- New functionality from 5.0.0 -=-=-=-=-=-=-=-
+$a=array (
+  '0.1' => 
+  class cr {
+var $ = 9;
+var $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+var $ = 12;
+var $public_member = 12;
+  },
+  0 => 
+  class cr {
+var $ = 23;
+var $public_member = 23;
+  },
+  1 => 
+  class cr {
+var $ = 4;
+var $public_member = 4;
+  },
+  2 => 
+  class cr {
+var $ = -15;
+var $public_member = -15;
+  },
+);
+$b=array (
+  '0.2' => 
+  class cr {
+var $ = 9;
+var $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+var $ = 22;
+var $public_member = 22;
+  },
+  0 => 
+  class cr {
+var $ = 3;
+var $public_member = 3;
+  },
+  1 => 
+  class cr {
+var $ = 4;
+var $public_member = 4;
+  },
+  2 => 
+  class cr {
+var $ = -15;
+var $public_member = -15;
+  },
+);
+var_dump(array_udiff_uassoc($a, $b, "comp_func_cr", "comp_func"));
+array(3) {
+  ["0.1"]=>
+  object(cr)#%d (%d) {
+[""]=>
+int(9)
+["public_member"]=>
+int(9)
+  }
+  ["0.5"]=>
+  object(cr)#%d (%d) {
+[""]=>
+int(12)
+["public_member"]=>
+int(12)
+  }
+  [0]=>
+  object(cr)#%d (%d) {
+[""]=>
+int(23)
+["public_member"]=>
+int(23)
+  }
+}
+$a=array (
+  '0.1' => 
+  class cr {
+var $ = 9;
+var $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+var $ = 12;
+var $public_member = 12;
+  },
+  0 => 
+  class cr {
+var $ = 23;
+var $public_member = 23;
+  },
+  1 => 
+  class cr {
+