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":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($a, $b, "comp_func_cr"));
+array(2) {
+ [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_assoc($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)
+ }
+ [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)
+ }
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
