cvs: php-src / run-tests.php /ext/pdo/tests pdo_001.phpt pdo_002.phpt pdo_003.phpt pdo_004.phpt pdo_005.phpt pdo_006.phpt pdo_007.phpt pdo_008.phpt
pdo_009.phpt pdo_010.phpt pdo_011.phpt pdo_012.phpt pdo_013.phpt pdo_014.phpt pdo_015.phpt pdo_016.phpt pdo_016a.phpt pdo_018.phpt pdo_019.phpt
pdo_023.phpt pdo_025.phpt pdo_026.phpt /ext/simplexml/tests 005.phpt 006.phpt 007.phpt 009.phpt 014.phpt 014a.phpt 014b.phpt 016.phpt 016a.phpt
019.phpt /ext/spl/tests array_001.phpt array_002.phpt array_010.phpt array_011.phpt array_017.phpt bug31926.phpt bug32134.phpt bug33136.phpt
/ext/standard/tests/array 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt array_change_key_case.phpt array_chunk.phpt
array_count_values.phpt array_intersect_1.phpt bug20381.phpt bug21182.phpt bug21918.phpt bug21998.phpt bug22088.phpt bug24198.phpt bug24220.phpt
bug24980.phpt bug25359.phpt bug25708.phpt bug28739.phpt bug29253.phpt bug29493.phpt bug30833.phpt bug31213.phpt /ext/standard/tests/general_functions
getopt.phpt /ext/standard/tests/strings bug24208.phpt bug27278.phpt /tests/classes __call_001.phpt __set__get_001.phpt __set__get_004.phpt
__set__get_005.phpt array_access_001.phpt array_access_002.phpt array_access_003.phpt array_access_004.phpt array_access_005.phpt
array_access_008.phpt array_access_009.phpt array_access_010.phpt array_access_011.phpt autoload_002.phpt clone_001.phpt clone_002.phpt clone_004.phpt
inheritance_002.phpt /tests/lang 038.phpt bug19943.phpt bug21600.phpt bug21961.phpt bug22231.phpt bug22592.phpt bug23624.phpt /tests/reflection
001.phpt 002.phpt 006.phpt bug30209.phpt /tests/strings bug22592.phpt ZendEngine2/tests bug22836.phpt bug23104.phpt bug26010.phpt bug26695.phpt
bug27798.phpt bug28442.phpt bug28444.phpt bug29505.phpt bug29674.phpt bug30140.phpt bug30162.phpt bug30407.phpt bug30702.phpt bug30856.phpt
bug31683.phpt bug32799.phpt bug32981.phpt bug33243.phpt bug33999.phpt bug34064.phpt unset_cv11.phpt

dmitry Mon Aug 15 10:37:57 2005 EDT Modified files: /php-src run-tests.php /ZendEngine2/tests bug22836.phpt bug23104.phpt bug26010.phpt bug26695.phpt bug27798.phpt bug28442.phpt bug28444.phpt bug29505.phpt bug29674.phpt bug30140.phpt bug30162.phpt bug30407.phpt bug30702.phpt bug30856.phpt bug31683.phpt bug32799.phpt bug32981.phpt bug33243.phpt bug33999.phpt bug34064.phpt unset_cv11.phpt /php-src/tests/classes __call_001.phpt __set__get_001.phpt __set__get_004.phpt __set__get_005.phpt array_access_001.phpt array_access_002.phpt array_access_003.phpt array_access_004.phpt array_access_005.phpt array_access_008.phpt array_access_009.phpt array_access_010.phpt array_access_011.phpt autoload_002.phpt clone_001.phpt clone_002.phpt clone_004.phpt inheritance_002.phpt /php-src/tests/lang 038.phpt bug19943.phpt bug21600.phpt bug21961.phpt bug22231.phpt bug22592.phpt bug23624.phpt /php-src/tests/reflection 001.phpt 002.phpt 006.phpt bug30209.phpt /php-src/tests/strings bug22592.phpt /php-src/ext/pdo/tests pdo_001.phpt pdo_002.phpt pdo_003.phpt pdo_004.phpt pdo_005.phpt pdo_006.phpt pdo_007.phpt pdo_008.phpt pdo_009.phpt pdo_010.phpt pdo_011.phpt pdo_012.phpt pdo_013.phpt pdo_014.phpt pdo_015.phpt pdo_016.phpt pdo_016a.phpt pdo_018.phpt pdo_019.phpt pdo_023.phpt pdo_025.phpt pdo_026.phpt /php-src/ext/simplexml/tests 005.phpt 006.phpt 007.phpt 009.phpt 014.phpt 014a.phpt 014b.phpt 016.phpt 016a.phpt 019.phpt /php-src/ext/spl/tests array_001.phpt array_002.phpt array_010.phpt array_011.phpt array_017.phpt bug31926.phpt bug32134.phpt bug33136.phpt /php-src/ext/standard/tests/array 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt array_change_key_case.phpt array_chunk.phpt array_count_values.phpt array_intersect_1.phpt bug20381.phpt bug21182.phpt bug21918.phpt bug21998.phpt bug22088.phpt bug24198.phpt bug24220.phpt bug24980.phpt bug25359.phpt bug25708.phpt bug28739.phpt bug29253.phpt bug29493.phpt bug30833.phpt bug31213.phpt /php-src/ext/standard/tests/general_functions getopt.phpt /php-src/ext/standard/tests/strings bug24208.phpt bug27278.phpt Log: Test engine is improved to support unicode mode

http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.227&r2=1.228&ty=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.227 php-src/run-tests.php:1.228 --- php-src/run-tests.php:1.227 Thu Aug 11 19:35:53 2005 +++ php-src/run-tests.php Mon Aug 15 10:37:53 2005 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.227 2005/08/11 23:35:53 andrei Exp $ */ +/* $Id: run-tests.php,v 1.228 2005/08/15 14:37:53 dmitry Exp $ */ /* * TODO: @@ -142,17 +142,6 @@ $user_tests = array(); } -// Get info from php -$info_file = realpath(dirname(__FILE__)) . '/run-test-info.php'; -@unlink($info_file); -$php_info = '<?php echo " -PHP_SAPI : " . PHP_SAPI . " -PHP_VERSION : " . phpversion() . " -ZEND_VERSION: " . zend_version() . " -PHP_OS : " . PHP_OS . " - " . php_uname() . " -INI actual : " . realpath(get_cfg_var("cfg_file_path")) . " -More .INIs : " . (function_exists(\'php_ini_scanned_files\') ? str_replace("\n","", php_ini_scanned_files()) : "** not determined **"); ?>'; -save_text($info_file, $php_info); $ini_overwrites = array( 'output_handler=', 'open_basedir=', @@ -174,17 +163,36 @@ 'auto_append_file=', 'magic_quotes_runtime=0', ); + +function write_information() +{ + global $cwd, $php, $php_info, $user_tests, $ini_overwrites, $pass_options; + +// Get info from php +$info_file = realpath(dirname(__FILE__)) . '/run-test-info.php'; +@unlink($info_file); +$php_info = '<?php echo " +PHP_SAPI : " . PHP_SAPI . " +PHP_VERSION : " . phpversion() . " +ZEND_VERSION: " . zend_version() . " +PHP_OS : " . PHP_OS . " - " . php_uname() . " +INI actual : " . realpath(get_cfg_var("cfg_file_path")) . " +More .INIs : " . (function_exists(\'php_ini_scanned_files\') ? str_replace("\n","", php_ini_scanned_files()) : "** not determined **"); ?>'; +save_text($info_file, $php_info); $info_params = array(); settings2array($ini_overwrites,$info_params); settings2params($info_params); -$php_info = `$php $info_params $info_file`; +$php_info = `$php $pass_options $info_params $info_file`; @unlink($info_file); define('TESTED_PHP_VERSION', `$php -r 'echo PHP_VERSION;'`); +$unicode = `$php $pass_options $info_params -r 'echo ini_get("unicode_semantics");'`; +define('TESTED_UNICODE', strcasecmp($unicode,"on") == 0 || $unicode == 1); + // check for extensions that need special handling and regenerate $php_extensions = '<?php echo join(",",get_loaded_extensions()); ?>'; save_text($info_file, $php_extensions); -$php_extensions = explode(',',`$php $info_params $info_file`); +$php_extensions = explode(',',`$php $pass_options $info_params $info_file`); $info_params_ex = array( 'session' => array('session.auto_start=0'), 'zlib' => array('zlib.output_compression=Off'), @@ -198,10 +206,6 @@ @unlink($info_file); // Write test context information. -function write_information() -{ - global $cwd, $php, $php_info, $user_tests; - echo " ===================================================================== CWD : $cwd @@ -750,6 +754,11 @@ $borked = true; print_r($section_text); } + if ((@count($section_text['UEXPECT']) + @count($section_text['UEXPECTF']) + @count($section_text['UEXPECTREGEX'])) > 1) { + $bork_info = "missing section --UEXPECT--, --UEXPECTF-- or --UEXPECTREGEX-- [$file]"; + $borked = true; + print_r($section_text); + } } fclose($fp); @@ -920,7 +929,37 @@ // these may overwrite the test defaults... if (array_key_exists('INI', $section_text)) { settings2array(preg_split( "/[\n\r]+/", $section_text['INI']), $ini_settings); + if (isset($ini_settings["unicode_semantics"])) { + $unicode_test = strcasecmp($ini_settings["unicode_semantics"],"on") == 0 || $ini_settings["unicode_semantics"] == 1; + } else { + $unicode_test = TESTED_UNICODE; + } + } else { + $unicode_test = TESTED_UNICODE; } + + if ($unicode_test) { + if (isset($section_text['UEXPECT'])) { + unset($section_text['EXPECT']); + unset($section_text['EXPECTF']); + unset($section_text['EXPECTREGEX']); + $section_text['EXPECT'] = $section_text['UEXPECT']; + unset($section_text['UEXPECT']); + } else if (isset($section_text['UEXPECTF'])) { + unset($section_text['EXPECT']); + unset($section_text['EXPECTF']); + unset($section_text['EXPECTREGEX']); + $section_text['EXPECTF'] = $section_text['UEXPECTF']; + unset($section_text['UEXPECTF']); + } else if (isset($section_text['UEXPECTREGEX'])) { + unset($section_text['EXPECT']); + unset($section_text['EXPECTF']); + unset($section_text['EXPECTREGEX']); + $section_text['EXPECTREGEX'] = $section_text['UEXPECTREGEX']; + unset($section_text['UEXPECTREGEX']); + } + } + settings2params($ini_settings); // We've satisfied the preconditions - run the test! http://cvs.php.net/diff.php/ZendEngine2/tests/bug22836.phpt?r1=1.6&r2=1.7&ty=u Index: ZendEngine2/tests/bug22836.phpt diff -u ZendEngine2/tests/bug22836.phpt:1.6 ZendEngine2/tests/bug22836.phpt:1.7 --- ZendEngine2/tests/bug22836.phpt:1.6 Fri May 27 12:18:07 2005 +++ ZendEngine2/tests/bug22836.phpt Mon Aug 15 10:37:54 2005 @@ -32,3 +32,20 @@ 'foo' string(3) "foo" 'foo' +--UEXPECTF-- +unicode(3) "foo" +'foo' +unicode(3) "foo" +'foo' +unicode(3) "foo" +'foo' +unicode(3) "foo" +'foo' +unicode(3) "foo" +'foo' +unicode(3) "foo" +'foo' +unicode(3) "foo" +'foo' +unicode(3) "foo" +'foo' http://cvs.php.net/diff.php/ZendEngine2/tests/bug23104.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/bug23104.phpt diff -u ZendEngine2/tests/bug23104.phpt:1.1 ZendEngine2/tests/bug23104.phpt:1.2 --- ZendEngine2/tests/bug23104.phpt:1.1 Mon Aug 4 13:10:52 2003 +++ ZendEngine2/tests/bug23104.phpt Mon Aug 15 10:37:54 2005 @@ -10,3 +10,5 @@ ?> --EXPECT-- string(1) "a" +--UEXPECT-- +unicode(1) "a" http://cvs.php.net/diff.php/ZendEngine2/tests/bug26010.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/bug26010.phpt diff -u ZendEngine2/tests/bug26010.phpt:1.2 ZendEngine2/tests/bug26010.phpt:1.3 --- ZendEngine2/tests/bug26010.phpt:1.2 Tue Nov 4 12:14:07 2003 +++ ZendEngine2/tests/bug26010.phpt Mon Aug 15 10:37:54 2005 @@ -16,4 +16,8 @@ ["public"]=> string(6) "public" } - +--UEXPECT-- +array(1) { + [u"public"]=> + unicode(6) "public" +} http://cvs.php.net/diff.php/ZendEngine2/tests/bug26695.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/bug26695.phpt diff -u ZendEngine2/tests/bug26695.phpt:1.2 ZendEngine2/tests/bug26695.phpt:1.3 --- ZendEngine2/tests/bug26695.phpt:1.2 Tue Mar 30 16:13:05 2004 +++ ZendEngine2/tests/bug26695.phpt Mon Aug 15 10:37:54 2005 @@ -22,4 +22,7 @@ ===DONE=== --EXPECT-- string(3) "Foo" -===DONE=== \ No newline at end of file +===DONE=== +--UEXPECT-- +unicode(3) "Foo" +===DONE=== http://cvs.php.net/diff.php/ZendEngine2/tests/bug27798.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/bug27798.phpt diff -u ZendEngine2/tests/bug27798.phpt:1.1 ZendEngine2/tests/bug27798.phpt:1.2 --- ZendEngine2/tests/bug27798.phpt:1.1 Mon Oct 4 04:58:47 2004 +++ ZendEngine2/tests/bug27798.phpt Mon Aug 15 10:37:54 2005 @@ -70,3 +70,40 @@ int(1) } ===DONE=== +--UEXPECT-- +Base::__construct +array(3) { + [u"Foo"]=> + int(1) + [u"Bar"]=> + int(2) + [u"Baz"]=> + int(3) +} +array(1) { + [u"Foo"]=> + int(1) +} +Base::__construct +array(3) { + [u"Baz"]=> + int(4) + [u"Foo"]=> + int(1) + [u"Bar"]=> + int(2) +} +Child::__construct +array(3) { + [u"Baz"]=> + int(4) + [u"Foo"]=> + int(1) + [u"Bar"]=> + int(2) +} +array(1) { + [u"Foo"]=> + int(1) +} +===DONE=== http://cvs.php.net/diff.php/ZendEngine2/tests/bug28442.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/bug28442.phpt diff -u ZendEngine2/tests/bug28442.phpt:1.1 ZendEngine2/tests/bug28442.phpt:1.2 --- ZendEngine2/tests/bug28442.phpt:1.1 Thu Mar 10 08:20:26 2005 +++ ZendEngine2/tests/bug28442.phpt Mon Aug 15 10:37:54 2005 @@ -63,3 +63,21 @@ string(2) "C2" string(2) "C2" ===DONE=== +--UEXPECTF-- +===INIT=== +unicode(1) "A" +unicode(1) "C" +unicode(1) "C" +===SetA=== +unicode(2) "A2" +unicode(1) "C" +unicode(1) "C" +===SetB=== +unicode(2) "A2" +unicode(2) "B2" +unicode(2) "B2" +===SetC=== +unicode(2) "A2" +unicode(2) "C2" +unicode(2) "C2" +===DONE=== http://cvs.php.net/diff.php/ZendEngine2/tests/bug28444.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/bug28444.phpt diff -u ZendEngine2/tests/bug28444.phpt:1.1 ZendEngine2/tests/bug28444.phpt:1.2 --- ZendEngine2/tests/bug28444.phpt:1.1 Sat Oct 2 10:22:52 2004 +++ ZendEngine2/tests/bug28444.phpt Mon Aug 15 10:37:54 2005 @@ -72,3 +72,26 @@ Overloaded::__get(z) int(6) ===DONE=== +--UEXPECTF-- +object(Object)#%d (1) { + [u"x"]=> + int(2) +} +int(2) +int(3) +Overloaded::__set(y,3) +int(3) +Overloaded::__get(y) +int(3) +Overloaded::__set(z,Object id #3) +object(Object)#%d (1) { + [u"x"]=> + int(4) +} +Overloaded::__get(z) +int(4) +Overloaded::__get(z) +int(5) +Overloaded::__get(z) +int(6) +===DONE=== http://cvs.php.net/diff.php/ZendEngine2/tests/bug29505.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/bug29505.phpt diff -u ZendEngine2/tests/bug29505.phpt:1.1 ZendEngine2/tests/bug29505.phpt:1.2 --- ZendEngine2/tests/bug29505.phpt:1.1 Tue Aug 3 12:59:53 2004 +++ ZendEngine2/tests/bug29505.phpt Mon Aug 15 10:37:54 2005 @@ -29,3 +29,20 @@ } } ===DONE=== +--UEXPECT-- +array(2) { + [u"empty"]=> + array(0) { + } + [u"three"]=> + array(3) { + [0]=> + int(1) + [u"b"]=> + unicode(1) "c" + [3]=> + array(0) { + } + } +} +===DONE=== http://cvs.php.net/diff.php/ZendEngine2/tests/bug29674.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/bug29674.phpt diff -u ZendEngine2/tests/bug29674.phpt:1.1 ZendEngine2/tests/bug29674.phpt:1.2 --- ZendEngine2/tests/bug29674.phpt:1.1 Sat Apr 23 11:20:09 2005 +++ ZendEngine2/tests/bug29674.phpt Mon Aug 15 10:37:54 2005 @@ -39,3 +39,13 @@ string(4) "Base" Fatal error: Cannot access private property ChildClass::$private_child in %sbug29674.php on line %d +--UEXPECTF-- +===BASE=== +unicode(4) "Base" + +Notice: Undefined property: BaseClass::$private_child in %sbug29674.php on line %d +NULL +===CHILD=== +unicode(4) "Base" + +Fatal error: Cannot access private property ChildClass::$private_child in %sbug29674.php on line %d http://cvs.php.net/diff.php/ZendEngine2/tests/bug30140.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/bug30140.phpt diff -u ZendEngine2/tests/bug30140.phpt:1.2 ZendEngine2/tests/bug30140.phpt:1.3 --- ZendEngine2/tests/bug30140.phpt:1.2 Wed Jun 8 09:21:28 2005 +++ ZendEngine2/tests/bug30140.phpt Mon Aug 15 10:37:54 2005 @@ -28,3 +28,10 @@ string(1) "x" string(1) "y" string(1) "z" +--UEXPECT-- +unicode(1) "x" +unicode(1) "y" +unicode(1) "z" +unicode(1) "x" +unicode(1) "y" +unicode(1) "z" http://cvs.php.net/diff.php/ZendEngine2/tests/bug30162.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/bug30162.phpt diff -u ZendEngine2/tests/bug30162.phpt:1.2 ZendEngine2/tests/bug30162.phpt:1.3 --- ZendEngine2/tests/bug30162.phpt:1.2 Fri Jun 10 06:46:04 2005 +++ ZendEngine2/tests/bug30162.phpt Mon Aug 15 10:37:54 2005 @@ -50,3 +50,12 @@ ["y"]=> string(1) "y" } +--UEXPECTF-- +Notice: Undefined variable: db in %sbug30162.php on line 35 +NULL +object(hariCow)#1 (2) { + [u"x"]=> + unicode(1) "x" + [u"y"]=> + unicode(1) "y" +} http://cvs.php.net/diff.php/ZendEngine2/tests/bug30407.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/bug30407.phpt diff -u ZendEngine2/tests/bug30407.phpt:1.1 ZendEngine2/tests/bug30407.phpt:1.2 --- ZendEngine2/tests/bug30407.phpt:1.1 Thu Feb 10 06:45:24 2005 +++ ZendEngine2/tests/bug30407.phpt Mon Aug 15 10:37:54 2005 @@ -16,3 +16,7 @@ string(3) "one" string(3) "one" ===DONE=== +--UEXPECT-- +unicode(3) "one" +unicode(3) "one" +===DONE=== http://cvs.php.net/diff.php/ZendEngine2/tests/bug30702.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/bug30702.phpt diff -u ZendEngine2/tests/bug30702.phpt:1.2 ZendEngine2/tests/bug30702.phpt:1.3 --- ZendEngine2/tests/bug30702.phpt:1.2 Tue Apr 26 05:27:28 2005 +++ ZendEngine2/tests/bug30702.phpt Mon Aug 15 10:37:54 2005 @@ -37,3 +37,18 @@ ["c6"]=> int(1) } +--UEXPECT-- +object(bar)#1 (6) { + [u"c1"]=> + int(1) + [u"c2"]=> + int(2) + [u"c3"]=> + int(1) + [u"c4"]=> + int(2) + [u"c5"]=> + int(1) + [u"c6"]=> + int(1) +} http://cvs.php.net/diff.php/ZendEngine2/tests/bug30856.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/bug30856.phpt diff -u ZendEngine2/tests/bug30856.phpt:1.2 ZendEngine2/tests/bug30856.phpt:1.3 --- ZendEngine2/tests/bug30856.phpt:1.2 Fri Jun 17 12:40:05 2005 +++ ZendEngine2/tests/bug30856.phpt Mon Aug 15 10:37:54 2005 @@ -18,3 +18,9 @@ string(4) "test" } ===DONE=== +--UEXPECT-- +array(1) { + [u"a"]=> + unicode(4) "test" +} +===DONE=== http://cvs.php.net/diff.php/ZendEngine2/tests/bug31683.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/bug31683.phpt diff -u ZendEngine2/tests/bug31683.phpt:1.2 ZendEngine2/tests/bug31683.phpt:1.3 --- ZendEngine2/tests/bug31683.phpt:1.2 Wed Feb 2 02:19:22 2005 +++ ZendEngine2/tests/bug31683.phpt Mon Aug 15 10:37:54 2005 @@ -95,3 +95,30 @@ string(2) "ok" string(2) "ok" --- +--UEXPECT-- +unicode(2) "ok" +unicode(2) "ok" +unicode(2) "ok" +unicode(2) "ok" +unicode(2) "ok" +unicode(2) "ok" +unicode(2) "ok" +unicode(2) "ok" +unicode(2) "ok" +NULL +unicode(2) "ok" +unicode(2) "ok" +--- +unicode(2) "ok" +unicode(2) "ok" +unicode(2) "ok" +unicode(2) "ok" +unicode(2) "ok" +unicode(2) "ok" +unicode(2) "ok" +unicode(2) "ok" +unicode(2) "ok" +NULL +unicode(2) "ok" +unicode(2) "ok" +--- http://cvs.php.net/diff.php/ZendEngine2/tests/bug32799.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/bug32799.phpt diff -u ZendEngine2/tests/bug32799.phpt:1.2 ZendEngine2/tests/bug32799.phpt:1.3 --- ZendEngine2/tests/bug32799.phpt:1.2 Mon Jun 6 06:38:43 2005 +++ ZendEngine2/tests/bug32799.phpt Mon Aug 15 10:37:54 2005 @@ -19,3 +19,9 @@ ["c"]=> int(2) } +--UEXPECT-- +2 +object(test)#1 (1) { + [u"c"]=> + int(2) +} http://cvs.php.net/diff.php/ZendEngine2/tests/bug32981.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/bug32981.phpt diff -u ZendEngine2/tests/bug32981.phpt:1.1 ZendEngine2/tests/bug32981.phpt:1.2 --- ZendEngine2/tests/bug32981.phpt:1.1 Thu May 26 08:22:18 2005 +++ ZendEngine2/tests/bug32981.phpt Mon Aug 15 10:37:54 2005 @@ -28,7 +28,17 @@ [0]=> array(1) { ["enabled"]=> - UNKNOWN:0 + UNKNOWN:0 /* FIXME */ + } +} +===DONE=== +--UEXPECT-- +unicode(4) "test" +array(1) { + [0]=> + array(1) { + [u"enabled"]=> + UNKNOWN:0 /* FIXME */ } } ===DONE=== http://cvs.php.net/diff.php/ZendEngine2/tests/bug33243.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/bug33243.phpt diff -u ZendEngine2/tests/bug33243.phpt:1.2 ZendEngine2/tests/bug33243.phpt:1.3 --- ZendEngine2/tests/bug33243.phpt:1.2 Tue Jun 7 03:03:28 2005 +++ ZendEngine2/tests/bug33243.phpt Mon Aug 15 10:37:54 2005 @@ -23,3 +23,16 @@ int(0) } } +--UEXPECTF-- +Strict Standards: Creating default object from empty value in %sbug33243.php on line 2 + +Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug33243.php on line 3 + +Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug33243.php on line 5 +object(stdClass)#%d (1) { + [u"y"]=> + object(stdClass)#%d (1) { + [u"z"]=> + int(0) + } +} http://cvs.php.net/diff.php/ZendEngine2/tests/bug33999.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/bug33999.phpt diff -u ZendEngine2/tests/bug33999.phpt:1.1 ZendEngine2/tests/bug33999.phpt:1.2 --- ZendEngine2/tests/bug33999.phpt:1.1 Fri Aug 5 05:02:14 2005 +++ ZendEngine2/tests/bug33999.phpt Mon Aug 15 10:37:54 2005 @@ -28,3 +28,14 @@ Notice: Object of class Foo could not be converted to double in %sbug33999.php on line 12 float(1) +--UEXPECTF-- +object(Foo)#1 (1) { + [u"bar"]=> + unicode(3) "bat" +} + +Notice: Object of class Foo could not be converted to int in %sbug33999.php on line 9 +int(1) + +Notice: Object of class Foo could not be converted to double in %sbug33999.php on line 12 +float(1) http://cvs.php.net/diff.php/ZendEngine2/tests/bug34064.phpt?r1=1.2&r2=1.3&ty=u Index: ZendEngine2/tests/bug34064.phpt diff -u ZendEngine2/tests/bug34064.phpt:1.2 ZendEngine2/tests/bug34064.phpt:1.3 --- ZendEngine2/tests/bug34064.phpt:1.2 Wed Aug 10 06:39:28 2005 +++ ZendEngine2/tests/bug34064.phpt Mon Aug 15 10:37:54 2005 @@ -32,4 +32,10 @@ } Fatal error: Cannot use [] for reading in %sbug34064.php on line 18 +--UEXPECTF-- +array(1) { + [0]=> + unicode(2) "ok" +} +Fatal error: Cannot use [] for reading in %sbug34064.php on line 18 http://cvs.php.net/diff.php/ZendEngine2/tests/unset_cv11.phpt?r1=1.1&r2=1.2&ty=u Index: ZendEngine2/tests/unset_cv11.phpt diff -u ZendEngine2/tests/unset_cv11.phpt:1.1 ZendEngine2/tests/unset_cv11.phpt:1.2 --- ZendEngine2/tests/unset_cv11.phpt:1.1 Tue Oct 5 05:09:18 2004 +++ ZendEngine2/tests/unset_cv11.phpt Mon Aug 15 10:37:54 2005 @@ -19,3 +19,13 @@ string(2) "ok" } ok +--UEXPECT-- +array(1) { + [u"default"]=> + unicode(2) "ok" +} +array(1) { + [u"default"]=> + unicode(2) "ok" +} +ok http://cvs.php.net/diff.php/php-src/tests/classes/__call_001.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/tests/classes/__call_001.phpt diff -u php-src/tests/classes/__call_001.phpt:1.3 php-src/tests/classes/__call_001.phpt:1.4 --- php-src/tests/classes/__call_001.phpt:1.3 Sun Nov 30 08:57:18 2003 +++ php-src/tests/classes/__call_001.phpt Mon Aug 15 10:37:54 2005 @@ -40,3 +40,23 @@ [2]=> int(3) } +--UEXPECT-- +Method test called: +array(4) { + [0]=> + int(1) + [1]=> + unicode(1) "2" + [2]=> + float(3.4) + [3]=> + bool(true) +} +array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) +} http://cvs.php.net/diff.php/php-src/tests/classes/__set__get_001.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/tests/classes/__set__get_001.phpt diff -u php-src/tests/classes/__set__get_001.phpt:1.3 php-src/tests/classes/__set__get_001.phpt:1.4 --- php-src/tests/classes/__set__get_001.phpt:1.3 Mon Dec 22 17:50:00 2003 +++ php-src/tests/classes/__set__get_001.phpt Mon Aug 15 10:37:54 2005 @@ -70,3 +70,27 @@ int(3) } } +--UEXPECTF-- +Setting [a] to 100 +OK! +Getting [a] +Returning: 100 +Setting [a] to 101 +OK! +Getting [z] +Nothing! +Setting [z] to 1 +Not OK! +object(setter)#%d (2) { + [u"n"]=> + int(1) + [u"x"]=> + array(3) { + [u"a"]=> + int(101) + [u"b"]=> + int(2) + [u"c"]=> + int(3) + } +} http://cvs.php.net/diff.php/php-src/tests/classes/__set__get_004.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/tests/classes/__set__get_004.phpt diff -u php-src/tests/classes/__set__get_004.phpt:1.1 php-src/tests/classes/__set__get_004.phpt:1.2 --- php-src/tests/classes/__set__get_004.phpt:1.1 Sat Apr 23 11:21:07 2005 +++ php-src/tests/classes/__set__get_004.phpt Mon Aug 15 10:37:54 2005 @@ -33,7 +33,11 @@ ?> ===DONE=== ---EXPECTF-- +--EXPECT-- string(5) "Check" string(5) "Check" ===DONE=== +--UEXPECT-- +unicode(5) "Check" +unicode(5) "Check" +===DONE=== http://cvs.php.net/diff.php/php-src/tests/classes/__set__get_005.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/tests/classes/__set__get_005.phpt diff -u php-src/tests/classes/__set__get_005.phpt:1.2 php-src/tests/classes/__set__get_005.phpt:1.3 --- php-src/tests/classes/__set__get_005.phpt:1.2 Mon Aug 15 03:55:40 2005 +++ php-src/tests/classes/__set__get_005.phpt Mon Aug 15 10:37:54 2005 @@ -66,3 +66,18 @@ Test::__get string(5) "Check" ===DONE=== +--UEXPECTF-- +AutoGen::__get +Test::__set +AutoGen::__get +object(Test)#%d (1) { + [u"x":protected]=> + array(1) { + [u"baz"]=> + unicode(5) "Check" + } +} +AutoGen::__get +Test::__get +unicode(5) "Check" +===DONE=== http://cvs.php.net/diff.php/php-src/tests/classes/array_access_001.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/tests/classes/array_access_001.phpt diff -u php-src/tests/classes/array_access_001.phpt:1.4 php-src/tests/classes/array_access_001.phpt:1.5 --- php-src/tests/classes/array_access_001.phpt:1.4 Thu Jul 7 12:09:55 2005 +++ php-src/tests/classes/array_access_001.phpt Mon Aug 15 10:37:54 2005 @@ -196,3 +196,116 @@ string(9) "changed 6" } ===DONE=== +--UEXPECTF-- +array(4) { + [0]=> + unicode(3) "1st" + [1]=> + int(1) + [2]=> + unicode(3) "3rd" + [u"4th"]=> + int(4) +} +===EMPTY=== +object::offsetExists(0) +object::offsetGet(0) +bool(false) +object::offsetExists(1) +object::offsetGet(1) +bool(false) +object::offsetExists(2) +object::offsetGet(2) +bool(false) +object::offsetExists(4th) +object::offsetGet(4th) +bool(false) +object::offsetExists(5th) +bool(true) +object::offsetExists(6) +bool(true) +===isset=== +object::offsetExists(0) +bool(true) +object::offsetExists(1) +bool(true) +object::offsetExists(2) +bool(true) +object::offsetExists(4th) +bool(true) +object::offsetExists(5th) +bool(false) +object::offsetExists(6) +bool(false) +===offsetGet=== +object::offsetGet(0) +unicode(3) "1st" +object::offsetGet(1) +int(1) +object::offsetGet(2) +unicode(3) "3rd" +object::offsetGet(4th) +int(4) +object::offsetGet(5th) + +Notice: Undefined index: 5th in %sarray_access_001.php on line %d +NULL +object::offsetGet(6) + +Notice: Undefined offset: 6 in %sarray_access_001.php on line %d +NULL +===offsetSet=== +WRITE 1 +object::offsetSet(1,Changed 1) +object::offsetGet(1) +unicode(9) "Changed 1" +WRITE 2 +object::offsetSet(4th,Changed 4th) +object::offsetGet(4th) +unicode(11) "Changed 4th" +WRITE 3 +object::offsetSet(5th,Added 5th) +object::offsetGet(5th) +unicode(9) "Added 5th" +WRITE 4 +object::offsetSet(6,Added 6) +object::offsetGet(6) +unicode(7) "Added 6" +object::offsetGet(0) +unicode(3) "1st" +object::offsetGet(2) +unicode(3) "3rd" +object::offsetSet(6,changed 6) +object::offsetGet(6) +unicode(9) "changed 6" +unicode(9) "changed 6" +===unset=== +array(6) { + [0]=> + unicode(3) "1st" + [1]=> + unicode(9) "Changed 1" + [2]=> + unicode(3) "3rd" + [u"4th"]=> + unicode(11) "Changed 4th" + [u"5th"]=> + unicode(9) "Added 5th" + [6]=> + unicode(9) "changed 6" +} +object::offsetUnset(2) +object::offsetUnset(4th) +object::offsetUnset(7) +object::offsetUnset(8th) +array(4) { + [0]=> + unicode(3) "1st" + [1]=> + unicode(9) "Changed 1" + [u"5th"]=> + unicode(9) "Added 5th" + [6]=> + unicode(9) "changed 6" +} +===DONE=== http://cvs.php.net/diff.php/php-src/tests/classes/array_access_002.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/tests/classes/array_access_002.phpt diff -u php-src/tests/classes/array_access_002.phpt:1.4 php-src/tests/classes/array_access_002.phpt:1.5 --- php-src/tests/classes/array_access_002.phpt:1.4 Thu Jul 7 12:09:55 2005 +++ php-src/tests/classes/array_access_002.phpt Mon Aug 15 10:37:54 2005 @@ -196,3 +196,116 @@ string(9) "changed 6" } ===DONE=== +--UEXPECTF-- +array(4) { + [0]=> + unicode(3) "1st" + [1]=> + int(1) + [2]=> + unicode(3) "3rd" + [u"4th"]=> + int(4) +} +===EMPTY=== +object::offsetExists(0) +object::offsetGet(0) +bool(false) +object::offsetExists(1) +object::offsetGet(1) +bool(false) +object::offsetExists(2) +object::offsetGet(2) +bool(false) +object::offsetExists(4th) +object::offsetGet(4th) +bool(false) +object::offsetExists(5th) +bool(true) +object::offsetExists(6) +bool(true) +===isset=== +object::offsetExists(0) +bool(true) +object::offsetExists(1) +bool(true) +object::offsetExists(2) +bool(true) +object::offsetExists(4th) +bool(true) +object::offsetExists(5th) +bool(false) +object::offsetExists(6) +bool(false) +===offsetGet=== +object::offsetGet(0) +unicode(3) "1st" +object::offsetGet(1) +int(1) +object::offsetGet(2) +unicode(3) "3rd" +object::offsetGet(4th) +int(4) +object::offsetGet(5th) + +Notice: Undefined index: 5th in %sarray_access_002.php on line %d +NULL +object::offsetGet(6) + +Notice: Undefined offset: 6 in %sarray_access_002.php on line %d +NULL +===offsetSet=== +WRITE 1 +object::offsetSet(1,Changed 1) +object::offsetGet(1) +unicode(9) "Changed 1" +WRITE 2 +object::offsetSet(4th,Changed 4th) +object::offsetGet(4th) +unicode(11) "Changed 4th" +WRITE 3 +object::offsetSet(5th,Added 5th) +object::offsetGet(5th) +unicode(9) "Added 5th" +WRITE 4 +object::offsetSet(6,Added 6) +object::offsetGet(6) +unicode(7) "Added 6" +object::offsetGet(0) +unicode(3) "1st" +object::offsetGet(2) +unicode(3) "3rd" +object::offsetSet(6,changed 6) +object::offsetGet(6) +unicode(9) "changed 6" +unicode(9) "changed 6" +===unset=== +array(6) { + [0]=> + unicode(3) "1st" + [1]=> + unicode(9) "Changed 1" + [2]=> + unicode(3) "3rd" + [u"4th"]=> + unicode(11) "Changed 4th" + [u"5th"]=> + unicode(9) "Added 5th" + [6]=> + unicode(9) "changed 6" +} +object::offsetUnset(2) +object::offsetUnset(4th) +object::offsetUnset(7) +object::offsetUnset(8th) +array(4) { + [0]=> + unicode(3) "1st" + [1]=> + unicode(9) "Changed 1" + [u"5th"]=> + unicode(9) "Added 5th" + [6]=> + unicode(9) "changed 6" +} +===DONE=== http://cvs.php.net/diff.php/php-src/tests/classes/array_access_003.phpt?r1=1.6&r2=1.7&ty=u Index: php-src/tests/classes/array_access_003.phpt diff -u php-src/tests/classes/array_access_003.phpt:1.6 php-src/tests/classes/array_access_003.phpt:1.7 --- php-src/tests/classes/array_access_003.phpt:1.6 Sun Jun 19 16:49:17 2005 +++ php-src/tests/classes/array_access_003.phpt Mon Aug 15 10:37:54 2005 @@ -54,3 +54,11 @@ object::offsetGet(2) Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_003.php on line %d +--UEXPECTF-- +object::offsetGet(1) +unicode(6) "fooBar" +object::offsetGet(2) +int(1) +object::offsetGet(2) + +Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_003.php on line %d http://cvs.php.net/diff.php/php-src/tests/classes/array_access_004.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/tests/classes/array_access_004.phpt diff -u php-src/tests/classes/array_access_004.phpt:1.3 php-src/tests/classes/array_access_004.phpt:1.4 --- php-src/tests/classes/array_access_004.phpt:1.3 Wed Sep 29 05:36:56 2004 +++ php-src/tests/classes/array_access_004.phpt Mon Aug 15 10:37:54 2005 @@ -52,3 +52,11 @@ object::offsetGet(2) Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_004.php on line %d +--UEXPECTF-- +object::offsetGet(1) +unicode(6) "fooBar" +object::offsetGet(2) +int(1) +object::offsetGet(2) + +Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_004.php on line %d http://cvs.php.net/diff.php/php-src/tests/classes/array_access_005.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/tests/classes/array_access_005.phpt diff -u php-src/tests/classes/array_access_005.phpt:1.4 php-src/tests/classes/array_access_005.phpt:1.5 --- php-src/tests/classes/array_access_005.phpt:1.4 Sun Jun 19 16:49:17 2005 +++ php-src/tests/classes/array_access_005.phpt Mon Aug 15 10:37:54 2005 @@ -70,3 +70,20 @@ } Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_005.php on line %d +--UEXPECTF-- +unicode(3) "Joe" +unicode(6) "JoeFoo" +unicode(9) "JoeFooBar" +---ArrayOverloading--- +array(1) { + [u"name"]=> + unicode(3) "Joe" +} +unicode(3) "Joe" +unicode(6) "JoeFoo" +array(1) { + [u"name"]=> + unicode(6) "JoeFoo" +} + +Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_005.php on line %d http://cvs.php.net/diff.php/php-src/tests/classes/array_access_008.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/tests/classes/array_access_008.phpt diff -u php-src/tests/classes/array_access_008.phpt:1.2 php-src/tests/classes/array_access_008.phpt:1.3 --- php-src/tests/classes/array_access_008.phpt:1.2 Sun Jun 19 16:49:17 2005 +++ php-src/tests/classes/array_access_008.phpt Mon Aug 15 10:37:54 2005 @@ -57,3 +57,11 @@ string(3) "Foo" Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_008.php on line %d +--UEXPECTF-- +unicode(3) "Foo" +unicode(6) "FooBar" +unicode(9) "FooBarBaz" +===ArrayOverloading=== +unicode(3) "Foo" + +Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_008.php on line %d http://cvs.php.net/diff.php/php-src/tests/classes/array_access_009.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/tests/classes/array_access_009.phpt diff -u php-src/tests/classes/array_access_009.phpt:1.3 php-src/tests/classes/array_access_009.phpt:1.4 --- php-src/tests/classes/array_access_009.phpt:1.3 Mon Aug 15 03:55:40 2005 +++ php-src/tests/classes/array_access_009.phpt Mon Aug 15 10:37:54 2005 @@ -188,3 +188,68 @@ ArrayProxy::offsetGet(0, name) string(6) "BlaBla" ===DONE=== +--UEXPECTF-- +unicode(3) "Foo" +unicode(6) "FooBar" +unicode(9) "FooBarBaz" +===ArrayOverloading=== +ArrayProxy::__construct(0) +object(ArrayProxy)#1 (2) { + [u"object":u"ArrayProxy":private]=> + object(Peoples)#2 (1) { + [u"person"]=> + array(1) { + [0]=> + array(1) { + [u"name"]=> + unicode(3) "Foo" + } + } + } + [u"element":u"ArrayProxy":private]=> + int(0) +} +ArrayProxy::__construct(0) +ArrayProxy::offsetGet(0, name) +unicode(3) "Foo" +ArrayProxy::__construct(0) +ArrayProxy::offsetSet(0, name, FooBar) +ArrayProxy::__construct(0) +ArrayProxy::offsetGet(0, name) +unicode(6) "FooBar" +ArrayProxy::__construct(0) +ArrayProxy::offsetSet(0, name, FooBarBar) +ArrayProxy::__construct(0) +ArrayProxy::offsetGet(0, name) +unicode(9) "FooBarBar" +ArrayProxy::__construct(0) +ArrayProxy::offsetGet(0, name) +ArrayProxy::offsetSet(0, name, FooBarBarBaz) +ArrayProxy::__construct(0) +ArrayProxy::offsetGet(0, name) +unicode(12) "FooBarBarBaz" +ArrayProxy::__construct(0) +ArrayProxy::offsetUnset(0, name) +ArrayProxy::__construct(0) +object(ArrayProxy)#1 (2) { + [u"object":u"ArrayProxy":private]=> + object(Peoples)#2 (1) { + [u"person"]=> + array(1) { + [0]=> + array(0) { + } + } + } + [u"element":u"ArrayProxy":private]=> + int(0) +} +ArrayProxy::__construct(0) +ArrayProxy::offsetGet(0, name) +NULL +ArrayProxy::__construct(0) +ArrayProxy::offsetSet(0, name, BlaBla) +ArrayProxy::__construct(0) +ArrayProxy::offsetGet(0, name) +unicode(6) "BlaBla" +===DONE=== http://cvs.php.net/diff.php/php-src/tests/classes/array_access_010.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/tests/classes/array_access_010.phpt diff -u php-src/tests/classes/array_access_010.phpt:1.2 php-src/tests/classes/array_access_010.phpt:1.3 --- php-src/tests/classes/array_access_010.phpt:1.2 Mon Aug 15 03:55:41 2005 +++ php-src/tests/classes/array_access_010.phpt Mon Aug 15 10:37:54 2005 @@ -166,3 +166,72 @@ ArrayReferenceProxy::offsetGet(Array, name) string(6) "BlaBla" ===DONE=== +--UEXPECTF-- +unicode(3) "Foo" +unicode(6) "FooBar" +unicode(9) "FooBarBaz" +===ArrayOverloading=== +ArrayReferenceProxy::__construct(Array) +object(ArrayReferenceProxy)#1 (2) { + [u"object":u"ArrayReferenceProxy":private]=> + object(Peoples)#2 (1) { + [u"person"]=> + array(1) { + [0]=> + &array(1) { + [u"name"]=> + unicode(3) "Foo" + } + } + } + [u"element":u"ArrayReferenceProxy":private]=> + &array(1) { + [u"name"]=> + unicode(3) "Foo" + } +} +ArrayReferenceProxy::__construct(Array) +ArrayReferenceProxy::offsetGet(Array, name) +unicode(3) "Foo" +ArrayReferenceProxy::__construct(Array) +ArrayReferenceProxy::offsetSet(Array, name, FooBar) +ArrayReferenceProxy::__construct(Array) +ArrayReferenceProxy::offsetGet(Array, name) +unicode(6) "FooBar" +ArrayReferenceProxy::__construct(Array) +ArrayReferenceProxy::offsetSet(Array, name, FooBarBar) +ArrayReferenceProxy::__construct(Array) +ArrayReferenceProxy::offsetGet(Array, name) +unicode(9) "FooBarBar" +ArrayReferenceProxy::__construct(Array) +ArrayReferenceProxy::offsetGet(Array, name) +ArrayReferenceProxy::offsetSet(Array, name, FooBarBarBaz) +ArrayReferenceProxy::__construct(Array) +ArrayReferenceProxy::offsetGet(Array, name) +unicode(12) "FooBarBarBaz" +ArrayReferenceProxy::__construct(Array) +ArrayReferenceProxy::offsetUnset(Array, name) +ArrayReferenceProxy::__construct(Array) +object(ArrayReferenceProxy)#1 (2) { + [u"object":u"ArrayReferenceProxy":private]=> + object(Peoples)#2 (1) { + [u"person"]=> + array(1) { + [0]=> + &array(0) { + } + } + } + [u"element":u"ArrayReferenceProxy":private]=> + &array(0) { + } +} +ArrayReferenceProxy::__construct(Array) +ArrayReferenceProxy::offsetGet(Array, name) +NULL +ArrayReferenceProxy::__construct(Array) +ArrayReferenceProxy::offsetSet(Array, name, BlaBla) +ArrayReferenceProxy::__construct(Array) +ArrayReferenceProxy::offsetGet(Array, name) +unicode(6) "BlaBla" +===DONE=== http://cvs.php.net/diff.php/php-src/tests/classes/array_access_011.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/tests/classes/array_access_011.phpt diff -u php-src/tests/classes/array_access_011.phpt:1.2 php-src/tests/classes/array_access_011.phpt:1.3 --- php-src/tests/classes/array_access_011.phpt:1.2 Mon Aug 15 03:55:41 2005 +++ php-src/tests/classes/array_access_011.phpt Mon Aug 15 10:37:54 2005 @@ -185,3 +185,82 @@ ArrayAccessReferenceProxy::offsetGet(0, name) string(6) "BlaBla" ===DONE=== +--UEXPECTF-- +unicode(3) "Foo" +unicode(6) "FooBar" +unicode(9) "FooBarBaz" +===ArrayOverloading=== +ArrayAccessReferenceProxy::__construct(0) +object(ArrayAccessReferenceProxy)#1 (3) { + [u"object":u"ArrayAccessReferenceProxy":private]=> + object(Peoples)#2 (1) { + [u"person"]=> + &array(1) { + [0]=> + array(1) { + [u"name"]=> + unicode(3) "Foo" + } + } + } + [u"oarray":u"ArrayAccessReferenceProxy":private]=> + &array(1) { + [0]=> + array(1) { + [u"name"]=> + unicode(3) "Foo" + } + } + [u"element":u"ArrayAccessReferenceProxy":private]=> + int(0) +} +ArrayAccessReferenceProxy::__construct(0) +ArrayAccessReferenceProxy::offsetGet(0, name) +unicode(3) "Foo" +ArrayAccessReferenceProxy::__construct(0) +ArrayAccessReferenceProxy::offsetSet(0, name, FooBar) +ArrayAccessReferenceProxy::__construct(0) +ArrayAccessReferenceProxy::offsetGet(0, name) +unicode(6) "FooBar" +ArrayAccessReferenceProxy::__construct(0) +ArrayAccessReferenceProxy::offsetSet(0, name, FooBarBar) +ArrayAccessReferenceProxy::__construct(0) +ArrayAccessReferenceProxy::offsetGet(0, name) +unicode(9) "FooBarBar" +ArrayAccessReferenceProxy::__construct(0) +ArrayAccessReferenceProxy::offsetGet(0, name) +ArrayAccessReferenceProxy::offsetSet(0, name, FooBarBarBaz) +ArrayAccessReferenceProxy::__construct(0) +ArrayAccessReferenceProxy::offsetGet(0, name) +unicode(12) "FooBarBarBaz" +ArrayAccessReferenceProxy::__construct(0) +ArrayAccessReferenceProxy::offsetUnset(0, name) +ArrayAccessReferenceProxy::__construct(0) +object(ArrayAccessReferenceProxy)#1 (3) { + [u"object":u"ArrayAccessReferenceProxy":private]=> + object(Peoples)#2 (1) { + [u"person"]=> + &array(1) { + [0]=> + array(0) { + } + } + } + [u"oarray":u"ArrayAccessReferenceProxy":private]=> + &array(1) { + [0]=> + array(0) { + } + } + [u"element":u"ArrayAccessReferenceProxy":private]=> + int(0) +} +ArrayAccessReferenceProxy::__construct(0) +ArrayAccessReferenceProxy::offsetGet(0, name) +NULL +ArrayAccessReferenceProxy::__construct(0) +ArrayAccessReferenceProxy::offsetSet(0, name, BlaBla) +ArrayAccessReferenceProxy::__construct(0) +ArrayAccessReferenceProxy::offsetGet(0, name) +unicode(6) "BlaBla" +===DONE=== http://cvs.php.net/diff.php/php-src/tests/classes/autoload_002.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/tests/classes/autoload_002.phpt diff -u php-src/tests/classes/autoload_002.phpt:1.2 php-src/tests/classes/autoload_002.phpt:1.3 --- php-src/tests/classes/autoload_002.phpt:1.2 Sun Jul 25 15:23:17 2004 +++ php-src/tests/classes/autoload_002.phpt Mon Aug 15 10:37:54 2005 @@ -25,3 +25,10 @@ string(12) "testFunction" } ===DONE=== +--UEXPECT-- +__autoload(autoload_root) +array(1) { + [0]=> + unicode(12) "testFunction" +} +===DONE=== http://cvs.php.net/diff.php/php-src/tests/classes/clone_001.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/tests/classes/clone_001.phpt diff -u php-src/tests/classes/clone_001.phpt:1.3 php-src/tests/classes/clone_001.phpt:1.4 --- php-src/tests/classes/clone_001.phpt:1.3 Tue Feb 3 16:52:46 2004 +++ php-src/tests/classes/clone_001.phpt Mon Aug 15 10:37:54 2005 @@ -41,3 +41,23 @@ string(1) "C" } Done +--UEXPECT-- +Object +object(test)#1 (3) { + [u"p1"]=> + int(1) + [u"p2"]=> + unicode(1) "A" + [u"p3"]=> + unicode(1) "B" +} +Clown +object(test)#2 (3) { + [u"p1"]=> + int(1) + [u"p2"]=> + unicode(1) "A" + [u"p3"]=> + unicode(1) "C" +} +Done http://cvs.php.net/diff.php/php-src/tests/classes/clone_002.phpt?r1=1.6&r2=1.7&ty=u Index: php-src/tests/classes/clone_002.phpt diff -u php-src/tests/classes/clone_002.phpt:1.6 php-src/tests/classes/clone_002.phpt:1.7 --- php-src/tests/classes/clone_002.phpt:1.6 Tue Feb 3 16:52:46 2004 +++ php-src/tests/classes/clone_002.phpt Mon Aug 15 10:37:54 2005 @@ -43,3 +43,23 @@ string(1) "C" } Done +--UEXPECT-- +Object +object(test)#1 (3) { + [u"p1"]=> + int(1) + [u"p2"]=> + unicode(1) "A" + [u"p3"]=> + unicode(1) "B" +} +Clown +object(test)#2 (3) { + [u"p1"]=> + int(1) + [u"p2"]=> + unicode(1) "A" + [u"p3"]=> + unicode(1) "C" +} +Done http://cvs.php.net/diff.php/php-src/tests/classes/clone_004.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/tests/classes/clone_004.phpt diff -u php-src/tests/classes/clone_004.phpt:1.3 php-src/tests/classes/clone_004.phpt:1.4 --- php-src/tests/classes/clone_004.phpt:1.3 Tue Feb 3 16:52:46 2004 +++ php-src/tests/classes/clone_004.phpt Mon Aug 15 10:37:54 2005 @@ -80,3 +80,46 @@ int(5) } Done +--UEXPECT-- +Original +object(test)#1 (2) { + [u"b"]=> + array(2) { + [0]=> + int(3) + [1]=> + int(4) + } + [u"a"]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } +} +Clone +object(test)#2 (2) { + [u"b"]=> + array(2) { + [0]=> + int(3) + [1]=> + int(4) + } + [u"a"]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } +} +Modify +object(test)#2 (2) { + [u"b"]=> + int(6) + [u"a"]=> + int(5) +} +Done http://cvs.php.net/diff.php/php-src/tests/classes/inheritance_002.phpt?r1=1.6&r2=1.7&ty=u Index: php-src/tests/classes/inheritance_002.phpt diff -u php-src/tests/classes/inheritance_002.phpt:1.6 php-src/tests/classes/inheritance_002.phpt:1.7 --- php-src/tests/classes/inheritance_002.phpt:1.6 Fri Mar 5 07:18:16 2004 +++ php-src/tests/classes/inheritance_002.phpt Mon Aug 15 10:37:54 2005 @@ -69,3 +69,16 @@ ### Mixed style 2 string(17) "Child constructor" string(16) "Base constructor" +--UEXPECT-- +### PHP 4 style +unicode(17) "Child constructor" +unicode(16) "Base constructor" +### PHP 5 style +unicode(17) "Child constructor" +unicode(16) "Base constructor" +### Mixed style 1 +unicode(17) "Child constructor" +unicode(16) "Base constructor" +### Mixed style 2 +unicode(17) "Child constructor" +unicode(16) "Base constructor" http://cvs.php.net/diff.php/php-src/tests/lang/038.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/tests/lang/038.phpt diff -u php-src/tests/lang/038.phpt:1.3 php-src/tests/lang/038.phpt:1.4 --- php-src/tests/lang/038.phpt:1.3 Tue Jul 13 07:30:50 2004 +++ php-src/tests/lang/038.phpt Mon Aug 15 10:37:54 2005 @@ -39,3 +39,7 @@ string(15) "Error2Exception" string(5) "fopen" ===DONE=== +--UEXPECTF-- +unicode(15) "Error2Exception" +unicode(5) "fopen" +===DONE=== http://cvs.php.net/diff.php/php-src/tests/lang/bug19943.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/tests/lang/bug19943.phpt diff -u php-src/tests/lang/bug19943.phpt:1.3 php-src/tests/lang/bug19943.phpt:1.4 --- php-src/tests/lang/bug19943.phpt:1.3 Fri Mar 14 12:12:24 2003 +++ php-src/tests/lang/bug19943.phpt Mon Aug 15 10:37:54 2005 @@ -27,3 +27,15 @@ 8 -- 8 9 -- 9 string(10) "0123456780" +--UEXPECT-- +0 -- 0 +1 -- 1 +2 -- 2 +3 -- 3 +4 -- 4 +5 -- 5 +6 -- 6 +7 -- 7 +8 -- 8 +9 -- 9 +unicode(10) "0123456780" http://cvs.php.net/diff.php/php-src/tests/lang/bug21600.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/tests/lang/bug21600.phpt diff -u php-src/tests/lang/bug21600.phpt:1.4 php-src/tests/lang/bug21600.phpt:1.5 --- php-src/tests/lang/bug21600.phpt:1.4 Thu May 5 13:37:25 2005 +++ php-src/tests/lang/bug21600.phpt Mon Aug 15 10:37:54 2005 @@ -37,3 +37,15 @@ ["foo"]=> string(4) "test" } +--UEXPECTF-- +Strict Standards: Only variables should be assigned by reference in %sbug21600.php on line 4 +array(1) { + [u"foo"]=> + unicode(4) "test" +} + +Strict Standards: Only variables should be assigned by reference in %sbug21600.php on line 11 +array(1) { + [u"foo"]=> + unicode(4) "test" +} http://cvs.php.net/diff.php/php-src/tests/lang/bug21961.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/tests/lang/bug21961.phpt diff -u php-src/tests/lang/bug21961.phpt:1.4 php-src/tests/lang/bug21961.phpt:1.5 --- php-src/tests/lang/bug21961.phpt:1.4 Sun Nov 30 08:57:19 2003 +++ php-src/tests/lang/bug21961.phpt Mon Aug 15 10:37:54 2005 @@ -56,3 +56,5 @@ ?> --EXPECT-- string(14) "The old Tavern" +--UEXPECT-- +unicode(14) "The old Tavern" http://cvs.php.net/diff.php/php-src/tests/lang/bug22231.phpt?r1=1.5&r2=1.6&ty=u Index: php-src/tests/lang/bug22231.phpt diff -u php-src/tests/lang/bug22231.phpt:1.5 php-src/tests/lang/bug22231.phpt:1.6 --- php-src/tests/lang/bug22231.phpt:1.5 Thu Apr 28 21:18:41 2005 +++ php-src/tests/lang/bug22231.phpt Mon Aug 15 10:37:54 2005 @@ -40,3 +40,17 @@ } string(5) "fubar" string(5) "fubar" +--UEXPECTF-- +Strict Standards: Assigning the return value of new by reference is deprecated in %s on line %d +object(foo)#%d (1) { + [u"fubar"]=> + unicode(5) "fubar" +} +unicode(5) "fubar" +unicode(5) "fubar" +object(foo)#%d (1) { + [u"fubar"]=> + unicode(5) "fubar" +} +unicode(5) "fubar" +unicode(5) "fubar" http://cvs.php.net/diff.php/php-src/tests/lang/bug22592.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/tests/lang/bug22592.phpt diff -u php-src/tests/lang/bug22592.phpt:1.1 php-src/tests/lang/bug22592.phpt:1.2 --- php-src/tests/lang/bug22592.phpt:1.1 Sat Mar 15 18:37:17 2003 +++ php-src/tests/lang/bug22592.phpt Mon Aug 15 10:37:54 2005 @@ -51,3 +51,20 @@ int(5) string(1) "5" [Illegal string offset: -1] +--UEXPECT-- +unicode(5) "* *-*" +unicode(7) "* *-* *" +unicode(7) "*4*-* *" +unicode(7) "*4*s* *" +unicode(8) "*4*s* *0" +unicode(8) "*-*-* *0" +unicode(8) "*-*s*s*0" +unicode(8) "4-4s4s*0" +unicode(9) "4-4s4s505" +unicode(9) "454s4s505" +unicode(1) "-" +unicode(6) "string" +int(4) +int(5) +unicode(1) "5" +[Illegal string offset: -1] http://cvs.php.net/diff.php/php-src/tests/lang/bug23624.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/tests/lang/bug23624.phpt diff -u php-src/tests/lang/bug23624.phpt:1.3 php-src/tests/lang/bug23624.phpt:1.4 --- php-src/tests/lang/bug23624.phpt:1.3 Tue Jul 1 15:06:04 2003 +++ php-src/tests/lang/bug23624.phpt Mon Aug 15 10:37:54 2005 @@ -10,3 +10,6 @@ --EXPECT-- string(3) "one" bool(false) +--UEXPECT-- +unicode(3) "one" +bool(false) http://cvs.php.net/diff.php/php-src/tests/reflection/001.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/tests/reflection/001.phpt diff -u php-src/tests/reflection/001.phpt:1.1 php-src/tests/reflection/001.phpt:1.2 --- php-src/tests/reflection/001.phpt:1.1 Mon Sep 27 17:24:45 2004 +++ php-src/tests/reflection/001.phpt Mon Aug 15 10:37:54 2005 @@ -87,3 +87,14 @@ } string(17) "ReflectionClassEx" ===DONE=== +--UEXPECT-- +array(0) { +} +array(2) { + [0]=> + unicode(3) "bla" + [1]=> + unicode(4) "name" +} +unicode(17) "ReflectionClassEx" +===DONE=== http://cvs.php.net/diff.php/php-src/tests/reflection/002.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/tests/reflection/002.phpt diff -u php-src/tests/reflection/002.phpt:1.1 php-src/tests/reflection/002.phpt:1.2 --- php-src/tests/reflection/002.phpt:1.1 Mon Sep 27 18:23:31 2004 +++ php-src/tests/reflection/002.phpt Mon Aug 15 10:37:54 2005 @@ -61,3 +61,16 @@ string(3) "bar" string(3) "baz" ===DONE=== +--UEXPECTF-- +ReflectionMethodEx::__construct +unicode(18) "ReflectionMethodEx" +unicode(7) "getName" +unicode(3) "xyz" +NULL +Cannot set read-only property ReflectionMethodEx::$class +Cannot set read-only property ReflectionMethodEx::$name +unicode(18) "ReflectionMethodEx" +unicode(7) "getName" +unicode(3) "bar" +unicode(3) "baz" +===DONE=== http://cvs.php.net/diff.php/php-src/tests/reflection/006.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/tests/reflection/006.phpt diff -u php-src/tests/reflection/006.phpt:1.3 php-src/tests/reflection/006.phpt:1.4 --- php-src/tests/reflection/006.phpt:1.3 Sun Jun 19 13:06:48 2005 +++ php-src/tests/reflection/006.phpt Mon Aug 15 10:37:54 2005 @@ -101,3 +101,20 @@ EXCEPTION EXCEPTION ===DONE=== +--UEXPECT-- +unicode(3) "pub" +unicode(3) "pub" +unicode(7) "updated" +EXCEPTION +EXCEPTION +unicode(7) "updated" +unicode(7) "updated" +unicede(7) "updated" +EXCEPTION +EXCEPTION +unicode(7) "updated" +unicode(7) "updated" +unicode(7) "updated" +EXCEPTION +EXCEPTION +===DONE=== http://cvs.php.net/diff.php/php-src/tests/reflection/bug30209.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/tests/reflection/bug30209.phpt diff -u php-src/tests/reflection/bug30209.phpt:1.2 php-src/tests/reflection/bug30209.phpt:1.3 --- php-src/tests/reflection/bug30209.phpt:1.2 Thu Sep 23 14:43:21 2004 +++ php-src/tests/reflection/bug30209.phpt Mon Aug 15 10:37:54 2005 @@ -29,3 +29,7 @@ string(7) "testBAR" string(7) "testBAR" ===DONE=== +--UEXPECTF-- +unicode(7) "testBAR" +unicode(7) "testBAR" +===DONE=== http://cvs.php.net/diff.php/php-src/tests/strings/bug22592.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/tests/strings/bug22592.phpt diff -u php-src/tests/strings/bug22592.phpt:1.1 php-src/tests/strings/bug22592.phpt:1.2 --- php-src/tests/strings/bug22592.phpt:1.1 Mon Dec 22 17:53:47 2003 +++ php-src/tests/strings/bug22592.phpt Mon Aug 15 10:37:54 2005 @@ -25,3 +25,8 @@ string(6) "abcdef" string(6) "a*c*e*" string(6) "a*c*e*" +--UEXPECT-- +unicode(6) "abcdef" +unicode(6) "abcdef" +unicode(6) "a*c*e*" +unicode(6) "a*c*e*" http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_001.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/pdo/tests/pdo_001.phpt diff -u php-src/ext/pdo/tests/pdo_001.phpt:1.4 php-src/ext/pdo/tests/pdo_001.phpt:1.5 --- php-src/ext/pdo/tests/pdo_001.phpt:1.4 Thu Jul 7 11:32:31 2005 +++ php-src/ext/pdo/tests/pdo_001.phpt Mon Aug 15 10:37:54 2005 @@ -47,3 +47,27 @@ string(1) "C" } } +--UEXPECT-- +array(3) { + [0]=> + array(2) { + [u"id"]=> + unicode(1) "1" + [u"val"]=> + unicode(1) "A" + } + [1]=> + array(2) { + [u"id"]=> + unicode(1) "2" + [u"val"]=> + unicode(1) "B" + } + [2]=> + array(2) { + [u"id"]=> + unicode(1) "3" + [u"val"]=> + unicode(1) "C" + } +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_002.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/pdo/tests/pdo_002.phpt diff -u php-src/ext/pdo/tests/pdo_002.phpt:1.4 php-src/ext/pdo/tests/pdo_002.phpt:1.5 --- php-src/ext/pdo/tests/pdo_002.phpt:1.4 Thu Jul 7 11:32:31 2005 +++ php-src/ext/pdo/tests/pdo_002.phpt Mon Aug 15 10:37:54 2005 @@ -47,3 +47,27 @@ string(1) "C" } } +--UEXPECT-- +array(3) { + [0]=> + array(2) { + [0]=> + unicode(1) "1" + [1]=> + unicode(1) "A" + } + [1]=> + array(2) { + [0]=> + unicode(1) "2" + [1]=> + unicode(1) "B" + } + [2]=> + array(2) { + [0]=> + unicode(1) "3" + [1]=> + unicode(1) "C" + } +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_003.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/pdo/tests/pdo_003.phpt diff -u php-src/ext/pdo/tests/pdo_003.phpt:1.4 php-src/ext/pdo/tests/pdo_003.phpt:1.5 --- php-src/ext/pdo/tests/pdo_003.phpt:1.4 Thu Jul 7 11:32:31 2005 +++ php-src/ext/pdo/tests/pdo_003.phpt Mon Aug 15 10:37:54 2005 @@ -59,3 +59,39 @@ string(1) "C" } } +--UEXPECT-- +array(3) { + [0]=> + array(4) { + [u"id"]=> + unicode(1) "1" + [0]=> + unicode(1) "1" + [u"val"]=> + unicode(1) "A" + [1]=> + unicode(1) "A" + } + [1]=> + array(4) { + [u"id"]=> + unicode(1) "2" + [0]=> + unicode(1) "2" + [u"val"]=> + unicode(1) "B" + [1]=> + unicode(1) "B" + } + [2]=> + array(4) { + [u"id"]=> + unicode(1) "3" + [0]=> + unicode(1) "3" + [u"val"]=> + unicode(1) "C" + [1]=> + unicode(1) "C" + } +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_004.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/pdo/tests/pdo_004.phpt diff -u php-src/ext/pdo/tests/pdo_004.phpt:1.4 php-src/ext/pdo/tests/pdo_004.phpt:1.5 --- php-src/ext/pdo/tests/pdo_004.phpt:1.4 Thu Jul 7 11:32:31 2005 +++ php-src/ext/pdo/tests/pdo_004.phpt Mon Aug 15 10:37:54 2005 @@ -47,3 +47,27 @@ string(1) "C" } } +--UEXPECTF-- +array(3) { + [0]=> + object(stdClass)#%d (2) { + [u"id"]=> + unicode(1) "1" + [u"val"]=> + unicode(1) "A" + } + [1]=> + object(stdClass)#%d (2) { + [u"id"]=> + unicode(1) "2" + [u"val"]=> + unicode(1) "B" + } + [2]=> + object(stdClass)#%d (2) { + [u"id"]=> + unicode(1) "3" + [u"val"]=> + unicode(1) "C" + } +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_005.phpt?r1=1.5&r2=1.6&ty=u Index: php-src/ext/pdo/tests/pdo_005.phpt diff -u php-src/ext/pdo/tests/pdo_005.phpt:1.5 php-src/ext/pdo/tests/pdo_005.phpt:1.6 --- php-src/ext/pdo/tests/pdo_005.phpt:1.5 Mon Aug 15 03:55:38 2005 +++ php-src/ext/pdo/tests/pdo_005.phpt Mon Aug 15 10:37:54 2005 @@ -151,3 +151,106 @@ string(2) "CC" } } +--UEXPECTF-- +array(3) { + [0]=> + object(stdClass)#%d (3) { + [u"id"]=> + unicode(1) "1" + [u"val"]=> + unicode(1) "A" + [u"val2"]=> + unicode(2) "AA" + } + [1]=> + object(stdClass)#%d (3) { + [u"id"]=> + unicode(1) "2" + [u"val"]=> + unicode(1) "B" + [u"val2"]=> + unicode(2) "BB" + } + [2]=> + object(stdClass)#%d (3) { + [u"id"]=> + unicode(1) "3" + [u"val"]=> + unicode(1) "C" + [u"val2"]=> + unicode(2) "CC" + } +} +array(3) { + [0]=> + object(TestBase)#%d (3) { + [u"id"]=> + unicode(1) "1" + [u"val":protected]=> + unicode(1) "A" + [u"val2":u"TestBase":private]=> + unicode(2) "AA" + } + [1]=> + object(TestBase)#%d (3) { + [u"id"]=> + unicode(1) "2" + [u"val":protected]=> + unicode(1) "B" + [u"val2":u"TestBase":private]=> + unicode(2) "BB" + } + [2]=> + object(TestBase)#%d (3) { + [u"id"]=> + unicode(1) "3" + [u"val":protected]=> + unicode(1) "C" + [u"val2":u"TestBase":private]=> + unicode(2) "CC" + } +} +TestDerived::__construct(0,1) +TestDerived::__construct(1,2) +TestDerived::__construct(2,3) +array(3) { + [0]=> + object(TestDerived)#%d (5) { + [u"row":protected]=> + int(0) + [u"id"]=> + unicode(1) "1" + [u"val":protected]=> + unicode(1) "A" + [u"val2":u"TestBase":private]=> + NULL + [u"val2"]=> + unicode(2) "AA" + } + [1]=> + object(TestDerived)#%d (5) { + [u"row":protected]=> + int(1) + [u"id"]=> + unicode(1) "2" + [u"val":protected]=> + unicode(1) "B" + [u"val2":u"TestBase":private]=> + NULL + [u"val2"]=> + unicode(2) "BB" + } + [2]=> + object(TestDerived)#%d (5) { + [u"row":protected]=> + int(2) + [u"id"]=> + unicode(1) "3" + [u"val":protected]=> + unicode(1) "C" + [u"val2":u"TestBase":private]=> + NULL + [u"val2"]=> + unicode(2) "CC" + } +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_006.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/pdo/tests/pdo_006.phpt diff -u php-src/ext/pdo/tests/pdo_006.phpt:1.4 php-src/ext/pdo/tests/pdo_006.phpt:1.5 --- php-src/ext/pdo/tests/pdo_006.phpt:1.4 Thu Jul 7 11:32:31 2005 +++ php-src/ext/pdo/tests/pdo_006.phpt Mon Aug 15 10:37:54 2005 @@ -74,3 +74,50 @@ } } } +--UEXPECT-- +array(2) { + [u"A"]=> + array(2) { + [0]=> + array(1) { + [0]=> + unicode(1) "1" + } + [1]=> + array(1) { + [0]=> + unicode(1) "2" + } + } + [u"C"]=> + array(1) { + [0]=> + array(1) { + [0]=> + unicode(1) "3" + } + } +} +array(2) { + [u"A"]=> + array(2) { + [0]=> + array(1) { + [u"id"]=> + unicode(1) "1" + } + [1]=> + array(1) { + [u"id"]=> + unicode(1) "2" + } + } + [u"C"]=> + array(1) { + [0]=> + array(1) { + [u"id"]=> + unicode(1) "3" + } + } +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_007.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/pdo/tests/pdo_007.phpt diff -u php-src/ext/pdo/tests/pdo_007.phpt:1.4 php-src/ext/pdo/tests/pdo_007.phpt:1.5 --- php-src/ext/pdo/tests/pdo_007.phpt:1.4 Thu Jul 7 11:32:31 2005 +++ php-src/ext/pdo/tests/pdo_007.phpt Mon Aug 15 10:37:54 2005 @@ -62,3 +62,38 @@ string(1) "C" } } +--UEXPECT-- +array(3) { + [u"A"]=> + array(1) { + [0]=> + unicode(1) "A" + } + [u"B"]=> + array(1) { + [0]=> + unicode(1) "A" + } + [u"C"]=> + array(1) { + [0]=> + unicode(1) "C" + } +} +array(3) { + [u"A"]=> + array(1) { + [u"val"]=> + unicode(1) "A" + } + [u"B"]=> + array(1) { + [u"val"]=> + unicode(1) "A" + } + [u"C"]=> + array(1) { + [u"val"]=> + unicode(1) "C" + } +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_008.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/pdo/tests/pdo_008.phpt diff -u php-src/ext/pdo/tests/pdo_008.phpt:1.4 php-src/ext/pdo/tests/pdo_008.phpt:1.5 --- php-src/ext/pdo/tests/pdo_008.phpt:1.4 Thu Jul 7 11:32:31 2005 +++ php-src/ext/pdo/tests/pdo_008.phpt Mon Aug 15 10:37:54 2005 @@ -37,3 +37,16 @@ string(1) "C" } } +--UEXPECT-- +array(2) { + [u"A"]=> + array(1) { + [0]=> + unicode(1) "B" + } + [u"C"]=> + array(1) { + [0]=> + unicode(1) "C" + } +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_009.phpt?r1=1.5&r2=1.6&ty=u Index: php-src/ext/pdo/tests/pdo_009.phpt diff -u php-src/ext/pdo/tests/pdo_009.phpt:1.5 php-src/ext/pdo/tests/pdo_009.phpt:1.6 --- php-src/ext/pdo/tests/pdo_009.phpt:1.5 Thu Jul 7 11:32:31 2005 +++ php-src/ext/pdo/tests/pdo_009.phpt Mon Aug 15 10:37:54 2005 @@ -128,3 +128,75 @@ string(1) "D" } } +--UEXPECTF-- +array(4) { + [0]=> + array(3) { + [0]=> + unicode(8) "stdClass" + [1]=> + unicode(1) "1" + [2]=> + unicode(1) "A" + } + [1]=> + array(3) { + [0]=> + unicode(5) "Test1" + [1]=> + unicode(1) "2" + [2]=> + unicode(1) "B" + } + [2]=> + array(3) { + [0]=> + unicode(5) "Test2" + [1]=> + unicode(1) "3" + [2]=> + unicode(1) "C" + } + [3]=> + array(3) { + [0]=> + NULL + [1]=> + unicode(1) "4" + [2]=> + unicode(1) "D" + } +} +Test1::__construct() +Test2::__construct() +Test3::__construct() +array(4) { + [0]=> + object(stdClass)#%d (2) { + [u"id"]=> + unicode(1) "1" + [u"val"]=> + unicode(1) "A" + } + [1]=> + object(Test1)#%d (2) { + [u"id"]=> + unicode(1) "2" + [u"val"]=> + unicode(1) "B" + } + [2]=> + object(Test2)#%d (2) { + [u"id"]=> + unicode(1) "3" + [u"val"]=> + unicode(1) "C" + } + [3]=> + object(Test3)#%d (2) { + [u"id"]=> + unicode(1) "4" + [u"val"]=> + unicode(1) "D" + } +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_010.phpt?r1=1.5&r2=1.6&ty=u Index: php-src/ext/pdo/tests/pdo_010.phpt diff -u php-src/ext/pdo/tests/pdo_010.phpt:1.5 php-src/ext/pdo/tests/pdo_010.phpt:1.6 --- php-src/ext/pdo/tests/pdo_010.phpt:1.5 Thu Jul 7 11:32:31 2005 +++ php-src/ext/pdo/tests/pdo_010.phpt Mon Aug 15 10:37:54 2005 @@ -116,3 +116,62 @@ string(1) "D" } } +--UEXPECTF-- +Test1::__construct() +Test2::__construct() +Test3::__construct() +array(2) { + [u"Group1"]=> + array(2) { + [0]=> + object(stdClass)#%d (2) { + [u"id"]=> + unicode(1) "1" + [u"val"]=> + unicode(1) "A" + } + [1]=> + object(Test1)#%d (2) { + [u"id"]=> + unicode(1) "2" + [u"val"]=> + unicode(1) "B" + } + } + [u"Group2"]=> + array(2) { + [0]=> + object(Test2)#%d (2) { + [u"id"]=> + unicode(1) "3" + [u"val"]=> + unicode(1) "C" + } + [1]=> + object(Test3)#%d (2) { + [u"id"]=> + unicode(1) "4" + [u"val"]=> + unicode(1) "D" + } + } +} +Test1::__construct() +Test2::__construct() +Test3::__construct() +array(2) { + [u"Group1"]=> + object(Test1)#%d (2) { + [u"id"]=> + unicode(1) "2" + [u"val"]=> + unicode(1) "B" + } + [u"Group2"]=> + object(Test3)#%d (2) { + [u"id"]=> + unicode(1) "4" + [u"val"]=> + unicode(1) "D" + } +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_011.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/pdo/tests/pdo_011.phpt diff -u php-src/ext/pdo/tests/pdo_011.phpt:1.4 php-src/ext/pdo/tests/pdo_011.phpt:1.5 --- php-src/ext/pdo/tests/pdo_011.phpt:1.4 Thu Jul 7 11:32:31 2005 +++ php-src/ext/pdo/tests/pdo_011.phpt Mon Aug 15 10:37:54 2005 @@ -242,3 +242,167 @@ string(1) "D" } } +--UEXPECTF-- +DerivedStatement::__construct(Overloaded) +Test1::__construct(0,0) +test(1,N/A) +test(2,N/A) +test(3,N/A) +test(4,N/A) +array(2) { + [u"Group1"]=> + array(2) { + [0]=> + array(1) { + [1]=> + unicode(3) "N/A" + } + [1]=> + array(1) { + [2]=> + unicode(3) "N/A" + } + } + [u"Group2"]=> + array(2) { + [0]=> + array(1) { + [3]=> + unicode(3) "N/A" + } + [1]=> + array(1) { + [4]=> + unicode(3) "N/A" + } + } +} +test(1,A) +test(2,B) +test(3,C) +test(4,D) +array(4) { + [0]=> + array(1) { + [1]=> + unicode(1) "A" + } + [1]=> + array(1) { + [2]=> + unicode(1) "B" + } + [2]=> + array(1) { + [3]=> + unicode(1) "C" + } + [3]=> + array(1) { + [4]=> + unicode(1) "D" + } +} +Test1::factory(1,A) +Test1::__construct(1,A) +Test1::factory(2,B) +Test1::__construct(2,B) +Test1::factory(3,C) +Test1::__construct(3,C) +Test1::factory(4,D) +Test1::__construct(4,D) +array(4) { + [0]=> + object(Test1)#%d (2) { + [u"id"]=> + unicode(1) "1" + [u"val"]=> + unicode(1) "A" + } + [1]=> + object(Test1)#%d (2) { + [u"id"]=> + unicode(1) "2" + [u"val"]=> + unicode(1) "B" + } + [2]=> + object(Test1)#%d (2) { + [u"id"]=> + unicode(1) "3" + [u"val"]=> + unicode(1) "C" + } + [3]=> + object(Test1)#%d (2) { + [u"id"]=> + unicode(1) "4" + [u"val"]=> + unicode(1) "D" + } +} +Test1::factory(1,A) +Test1::__construct(1,A) +Test1::factory(2,B) +Test1::__construct(2,B) +Test1::factory(3,C) +Test1::__construct(3,C) +Test1::factory(4,D) +Test1::__construct(4,D) +array(4) { + [0]=> + object(Test1)#%d (2) { + [u"id"]=> + unicode(1) "1" + [u"val"]=> + unicode(1) "A" + } + [1]=> + object(Test1)#%d (2) { + [u"id"]=> + unicode(1) "2" + [u"val"]=> + unicode(1) "B" + } + [2]=> + object(Test1)#%d (2) { + [u"id"]=> + unicode(1) "3" + [u"val"]=> + unicode(1) "C" + } + [3]=> + object(Test1)#%d (2) { + [u"id"]=> + unicode(1) "4" + [u"val"]=> + unicode(1) "D" + } +} +unicode(16) "DerivedStatement" +DerivedStatement::retrieve(1,A) +DerivedStatement::retrieve(2,B) +DerivedStatement::retrieve(3,C) +DerivedStatement::retrieve(4,D) +array(4) { + [0]=> + array(1) { + [1]=> + unicode(1) "A" + } + [1]=> + array(1) { + [2]=> + unicode(1) "B" + } + [2]=> + array(1) { + [3]=> + unicode(1) "C" + } + [3]=> + array(1) { + [4]=> + unicode(1) "D" + } +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_012.phpt?r1=1.5&r2=1.6&ty=u Index: php-src/ext/pdo/tests/pdo_012.phpt diff -u php-src/ext/pdo/tests/pdo_012.phpt:1.5 php-src/ext/pdo/tests/pdo_012.phpt:1.6 --- php-src/ext/pdo/tests/pdo_012.phpt:1.5 Thu Jul 7 14:49:58 2005 +++ php-src/ext/pdo/tests/pdo_012.phpt Mon Aug 15 10:37:54 2005 @@ -95,3 +95,56 @@ string(6) "Group2" } } +--UEXPECTF-- +array(2) { + [0]=> + array(2) { + [0]=> + unicode(1) "A" + [1]=> + unicode(6) "Group1" + } + [1]=> + array(2) { + [0]=> + unicode(1) "B" + [1]=> + unicode(6) "Group2" + } +} +Test::__construct(N/A) +Test::__construct(N/A) +array(2) { + [0]=> + object(Test)#%d (2) { + [u"val"]=> + unicode(1) "A" + [u"grp"]=> + unicode(6) "Group1" + } + [1]=> + object(Test)#%d (2) { + [u"val"]=> + unicode(1) "B" + [u"grp"]=> + unicode(6) "Group2" + } +} +Test::__construct(Changed) +Test::__construct(Changed) +array(2) { + [0]=> + object(Test)#%d (2) { + [u"val"]=> + unicode(1) "A" + [u"grp"]=> + unicode(6) "Group1" + } + [1]=> + object(Test)#%d (2) { + [u"val"]=> + unicode(1) "B" + [u"grp"]=> + unicode(6) "Group2" + } +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_013.phpt?r1=1.5&r2=1.6&ty=u Index: php-src/ext/pdo/tests/pdo_013.phpt diff -u php-src/ext/pdo/tests/pdo_013.phpt:1.5 php-src/ext/pdo/tests/pdo_013.phpt:1.6 --- php-src/ext/pdo/tests/pdo_013.phpt:1.5 Thu Jul 7 14:49:58 2005 +++ php-src/ext/pdo/tests/pdo_013.phpt Mon Aug 15 10:37:54 2005 @@ -93,3 +93,44 @@ ["grp"]=> string(6) "Group2" } +--UEXPECTF-- +array(2) { + [0]=> + unicode(1) "A" + [1]=> + unicode(6) "Group1" +} +array(2) { + [0]=> + unicode(1) "B" + [1]=> + unicode(6) "Group2" +} +Test::__construct(N/A) +object(Test)#%d (2) { + [u"val"]=> + unicode(1) "A" + [u"grp"]=> + unicode(6) "Group1" +} +Test::__construct(N/A) +object(Test)#%d (2) { + [u"val"]=> + unicode(1) "B" + [u"grp"]=> + unicode(6) "Group2" +} +Test::__construct(WOW) +object(Test)#%d (2) { + [u"val"]=> + unicode(1) "A" + [u"grp"]=> + unicode(6) "Group1" +} +Test::__construct(WOW) +object(Test)#%d (2) { + [u"val"]=> + unicode(1) "B" + [u"grp"]=> + unicode(6) "Group2" +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_014.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/pdo/tests/pdo_014.phpt diff -u php-src/ext/pdo/tests/pdo_014.phpt:1.4 php-src/ext/pdo/tests/pdo_014.phpt:1.5 --- php-src/ext/pdo/tests/pdo_014.phpt:1.4 Thu Jul 7 11:32:31 2005 +++ php-src/ext/pdo/tests/pdo_014.phpt Mon Aug 15 10:37:54 2005 @@ -99,3 +99,34 @@ [1]=> string(6) "Group2" } +--UEXPECTF-- +Test::__construct(WOW) +object(Test)#4 (2) { + [u"val"]=> + unicode(1) "A" + [u"grp"]=> + unicode(6) "Group1" +} +Test::__construct(WOW) +object(Test)#6 (2) { + [u"val"]=> + unicode(1) "B" + [u"grp"]=> + unicode(6) "Group2" +} +NULL +bool(false) +PDOStatementAggregate::__construct +PDOStatementAggregate::getIterator +array(2) { + [0]=> + unicode(1) "A" + [1]=> + unicode(6) "Group1" +} +array(2) { + [0]=> + unicode(1) "B" + [1]=> + unicode(6) "Group2" +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_015.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/pdo/tests/pdo_015.phpt diff -u php-src/ext/pdo/tests/pdo_015.phpt:1.4 php-src/ext/pdo/tests/pdo_015.phpt:1.5 --- php-src/ext/pdo/tests/pdo_015.phpt:1.4 Thu Jul 7 11:32:31 2005 +++ php-src/ext/pdo/tests/pdo_015.phpt Mon Aug 15 10:37:54 2005 @@ -97,3 +97,61 @@ string(2) "B2" } } +--UEXPECT-- +array(2) { + [0]=> + unicode(1) "1" + [1]=> + unicode(1) "2" +} +array(2) { + [0]=> + unicode(2) "A2" + [1]=> + unicode(2) "B2" +} +array(2) { + [1]=> + array(1) { + [0]=> + unicode(1) "A" + } + [2]=> + array(1) { + [0]=> + unicode(1) "A" + } +} +array(2) { + [1]=> + unicode(1) "A" + [2]=> + unicode(1) "A" +} +array(2) { + [1]=> + unicode(1) "1" + [2]=> + unicode(1) "2" +} +array(2) { + [1]=> + unicode(1) "A" + [2]=> + unicode(1) "A" +} +array(2) { + [1]=> + unicode(2) "A2" + [2]=> + unicode(2) "B2" +} +array(1) { + [u"A"]=> + array(2) { + [0]=> + unicode(2) "A2" + [1]=> + unicode(2) "B2" + } +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_016.phpt?r1=1.8&r2=1.9&ty=u Index: php-src/ext/pdo/tests/pdo_016.phpt diff -u php-src/ext/pdo/tests/pdo_016.phpt:1.8 php-src/ext/pdo/tests/pdo_016.phpt:1.9 --- php-src/ext/pdo/tests/pdo_016.phpt:1.8 Fri Jul 8 23:52:41 2005 +++ php-src/ext/pdo/tests/pdo_016.phpt Mon Aug 15 10:37:54 2005 @@ -196,3 +196,98 @@ string(7) "String0" string(7) "String1" string(7) "String2" +--UXPECT-- +unicode(1) "3" +array(3) { + [0]=> + unicode(7) "String0" + [1]=> + unicode(7) "String1" + [2]=> + unicode(7) "String2" +} +===WHILE=== +array(1) { + [0]=> + unicode(7) "String0" +} +array(1) { + [1]=> + unicode(7) "String1" +} +array(1) { + [2]=> + unicode(7) "String2" +} +===ALONE=== +array(1) { + [0]=> + unicode(7) "String0" +} +bool(true) +bool(true) +bool(true) +bool(true) +array(1) { + [0]=> + unicode(7) "String0" +} +array(1) { + [1]=> + unicode(7) "String1" +} +bool(true) +bool(true) +bool(true) +bool(true) +array(1) { + [1]=> + unicode(7) "String1" +} +array(1) { + [2]=> + unicode(7) "String2" +} +bool(true) +bool(true) +bool(true) +bool(true) +array(1) { + [2]=> + unicode(7) "String2" +} +===REBIND/SAME=== +array(1) { + [0]=> + unicode(7) "String0" +} +bool(true) +bool(true) +unicode(7) "String0" +bool(true) +bool(true) +unicode(1) "0" +array(1) { + [1]=> + unicode(7) "String1" +} +bool(true) +bool(true) +unicode(7) "String1" +bool(true) +bool(true) +unicode(1) "1" +array(1) { + [2]=> + unicode(7) "String2" +} +bool(true) +bool(true) +unicode(7) "String2" +bool(true) +bool(true) +unicode(1) "2" +===REBIND/CONFLICT=== +unicode(7) "String0" +unicode(7) "String1" +unicode(7) "String2" http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_016a.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/pdo/tests/pdo_016a.phpt diff -u php-src/ext/pdo/tests/pdo_016a.phpt:1.1 php-src/ext/pdo/tests/pdo_016a.phpt:1.2 --- php-src/ext/pdo/tests/pdo_016a.phpt:1.1 Fri Jul 22 10:27:35 2005 +++ php-src/ext/pdo/tests/pdo_016a.phpt Mon Aug 15 10:37:54 2005 @@ -196,3 +196,98 @@ string(7) "String0" string(7) "String1" string(7) "String2" +--UEXPECT-- +unicode(1) "3" +array(3) { + [0]=> + unicode(7) "String0" + [1]=> + unicode(7) "String1" + [2]=> + unicode(7) "String2" +} +===WHILE=== +array(1) { + [0]=> + unicode(7) "String0" +} +array(1) { + [1]=> + unicode(7) "String1" +} +array(1) { + [2]=> + unicode(7) "String2" +} +===ALONE=== +array(1) { + [0]=> + unicode(7) "String0" +} +bool(true) +bool(true) +bool(true) +bool(true) +array(1) { + [0]=> + unicode(7) "String0" +} +array(1) { + [1]=> + unicode(7) "String1" +} +bool(true) +bool(true) +bool(true) +bool(true) +array(1) { + [1]=> + unicode(7) "String1" +} +array(1) { + [2]=> + unicode(7) "String2" +} +bool(true) +bool(true) +bool(true) +bool(true) +array(1) { + [2]=> + unicode(7) "String2" +} +===REBIND/SAME=== +array(1) { + [0]=> + unicode(7) "String0" +} +bool(true) +bool(true) +unicode(7) "String0" +bool(true) +bool(true) +unicode(1) "0" +array(1) { + [1]=> + unicode(7) "String1" +} +bool(true) +bool(true) +unicode(7) "String1" +bool(true) +bool(true) +unicode(1) "1" +array(1) { + [2]=> + unicode(7) "String2" +} +bool(true) +bool(true) +unicode(7) "String2" +bool(true) +bool(true) +unicode(1) "2" +===REBIND/CONFLICT=== +unicode(7) "String0" +unicode(7) "String1" +unicode(7) "String2" http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_018.phpt?r1=1.12&r2=1.13&ty=u Index: php-src/ext/pdo/tests/pdo_018.phpt diff -u php-src/ext/pdo/tests/pdo_018.phpt:1.12 php-src/ext/pdo/tests/pdo_018.phpt:1.13 --- php-src/ext/pdo/tests/pdo_018.phpt:1.12 Mon Aug 15 03:55:38 2005 +++ php-src/ext/pdo/tests/pdo_018.phpt Mon Aug 15 10:37:54 2005 @@ -267,3 +267,116 @@ string(7) "Private" } } +--UEXPECTF-- +unicode(1) "3" +array(3) { + [0]=> + unicode(8) "stdClass" + [1]=> + unicode(8) "TestBase" + [2]=> + unicode(11) "TestDerived" +} +===TYPES=== +array(4) { + [u"stdClass"]=> + unicode(1) "0" + [u"TestBase"]=> + unicode(1) "1" + [u"TestDerived"]=> + unicode(1) "2" + [u"TestLeaf"]=> + NULL +} +===INSERT=== +TestBase::serialize() = 'a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}' +TestDerived::serialize() +TestBase::serialize() = 'a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}' +TestDerived::serialize() +TestBase::serialize() = 'a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}' +===DATA=== +array(4) { + [0]=> + unicode(0) "" + [1]=> + unicode(91) "a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}" + [2]=> + unicode(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" + [3]=> + unicode(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" +} +===FAILURE=== +Exception:SQLSTATE[HY000]: General error: cannot unserialize class +===COUNT=== +unicode(1) "3" +===DATABASE=== +array(3) { + [0]=> + array(2) { + [u"name"]=> + unicode(8) "TestBase" + [u"val"]=> + unicode(91) "a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}" + } + [1]=> + array(2) { + [u"name"]=> + unicode(11) "TestDerived" + [u"val"]=> + unicode(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" + } + [2]=> + array(2) { + [u"name"]=> + NULL + [u"val"]=> + unicode(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}" + } +} +===FETCHCLASS=== +TestBase::unserialize(a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}) +TestDerived::unserialize() +TestBase::unserialize(a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}) +TestDerived::unserialize() +TestBase::unserialize(a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}) +array(3) { + [0]=> + object(TestBase)#%d (3) { + [u"BasePub"]=> + unicode(7) "#Public" + [u"BasePro":protected]=> + unicode(10) "#Protected" + [u"BasePri":u"TestBase":private]=> + unicode(8) "#Private" + } + [1]=> + object(TestDerived)#%d (6) { + [u"BasePub"]=> + unicode(14) "#DerivedPublic" + [u"BasePro":protected]=> + unicode(17) "#DerivdeProtected" + [u"DerivedPub"]=> + unicode(7) "#Public" + [u"DerivedPro":protected]=> + unicode(10) "#Protected" + [u"DerivedPri":u"TestDerived":private]=> + unicode(7) "Private" + [u"BasePri":u"TestBase":private]=> + unicode(7) "Private" + } + [2]=> + object(TestLeaf)#%d (6) { + [u"BasePub"]=> + unicode(14) "#DerivedPublic" + [u"BasePro":protected]=> + unicode(17) "#DerivdeProtected" + [u"DerivedPub"]=> + unicode(7) "#Public" + [u"DerivedPro":protected]=> + unicode(10) "#Protected" + [u"DerivedPri":u"TestDerived":private]=> + unicode(7) "Private" + [u"BasePri":u"TestBase":private]=> + unicode(7) "Private" + } +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_019.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/pdo/tests/pdo_019.phpt diff -u php-src/ext/pdo/tests/pdo_019.phpt:1.4 php-src/ext/pdo/tests/pdo_019.phpt:1.5 --- php-src/ext/pdo/tests/pdo_019.phpt:1.4 Thu Jul 7 11:32:32 2005 +++ php-src/ext/pdo/tests/pdo_019.phpt Mon Aug 15 10:37:54 2005 @@ -68,3 +68,32 @@ [3]=> string(7) "String3" } +--UEXPECT-- +unicode(1) "4" +array(4) { + [0]=> + unicode(7) "String0" + [1]=> + unicode(7) "String1" + [2]=> + unicode(7) "String2" + [3]=> + unicode(7) "String3" +} +===WHILE=== +array(1) { + [0]=> + unicode(7) "String0" +} +array(1) { + [1]=> + unicode(7) "String1" +} +array(1) { + [2]=> + unicode(7) "String2" +} +array(1) { + [3]=> + unicode(7) "String3" +} http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_023.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/pdo/tests/pdo_023.phpt diff -u php-src/ext/pdo/tests/pdo_023.phpt:1.4 php-src/ext/pdo/tests/pdo_023.phpt:1.5 --- php-src/ext/pdo/tests/pdo_023.phpt:1.4 Thu Jul 7 11:32:32 2005 +++ php-src/ext/pdo/tests/pdo_023.phpt Mon Aug 15 10:37:54 2005 @@ -109,3 +109,39 @@ } PDOStatementX::__destruct() PDODatabaseX::__destruct() +--UEXPECTF-- +int(1) +int(2) +object(PDODatabaseX)#%d (2) { + [u"test1"]=> + int(1) + [u"test2"]=> + int(22) +} +PDODatabaseX::query() +PDOStatementX::__construct() +PDOStatementX::__destruct() +PDODatabaseX::query() +PDOStatementX::__construct() +PDOStatementX::__destruct() +PDODatabaseX::query() +PDOStatementX::__construct() +PDOStatementX::__destruct() +PDODatabaseX::query() +PDOStatementX::__construct() +object(PDOStatementX)#%d (3) { + [u"test1"]=> + int(1) + [u"queryString"]=> + unicode(24) "SELECT val, id FROM test" + [u"test2"]=> + int(22) +} +array(2) { + [u"A"]=> + unicode(1) "0" + [u"B"]=> + unicode(1) "1" +} +PDOStatementX::__destruct() +PDODatabaseX::__destruct() http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_025.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/pdo/tests/pdo_025.phpt diff -u php-src/ext/pdo/tests/pdo_025.phpt:1.4 php-src/ext/pdo/tests/pdo_025.phpt:1.5 --- php-src/ext/pdo/tests/pdo_025.phpt:1.4 Thu Jul 7 11:32:32 2005 +++ php-src/ext/pdo/tests/pdo_025.phpt Mon Aug 15 10:37:54 2005 @@ -110,3 +110,55 @@ ===FAIL=== Fatal error: Cannot access protected property Fail::$id in %spdo_025.php on line %d +--UEXPECTF-- +object(Test)#%d (3) { + [u"id"]=> + unicode(2) "10" + [u"val"]=> + unicode(3) "Abc" + [u"val2"]=> + unicode(3) "zxy" +} +object(Test)#%d (3) { + [u"id"]=> + unicode(2) "20" + [u"val"]=> + unicode(3) "Def" + [u"val2"]=> + unicode(3) "wvu" +} +object(Test)#%d (3) { + [u"id"]=> + unicode(2) "30" + [u"val"]=> + unicode(3) "Ghi" + [u"val2"]=> + unicode(3) "tsr" +} +object(Test)#%d (3) { + [u"id"]=> + unicode(2) "40" + [u"val"]=> + unicode(3) "Jkl" + [u"val2"]=> + unicode(3) "qpo" +} +object(Test)#%d (3) { + [u"id"]=> + unicode(2) "50" + [u"val"]=> + unicode(3) "Mno" + [u"val2"]=> + unicode(3) "nml" +} +object(Test)#%d (3) { + [u"id"]=> + unicode(2) "60" + [u"val"]=> + unicode(3) "Pqr" + [u"val2"]=> + unicode(3) "kji" +} +===FAIL=== + +Fatal error: Cannot access protected property Fail::$id in %spdo_025.php on line %d http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_026.phpt?r1=1.5&r2=1.6&ty=u Index: php-src/ext/pdo/tests/pdo_026.phpt diff -u php-src/ext/pdo/tests/pdo_026.phpt:1.5 php-src/ext/pdo/tests/pdo_026.phpt:1.6 --- php-src/ext/pdo/tests/pdo_026.phpt:1.5 Thu Jul 7 14:49:58 2005 +++ php-src/ext/pdo/tests/pdo_026.phpt Mon Aug 15 10:37:54 2005 @@ -108,3 +108,37 @@ ===DONE=== PDODatabase::__destruct() PDOStatementX::__destruct() +--UEXPECT-- +unicode(11) "PDODatabase" +unicode(12) "PDOStatement" +PDODatabase::query() +PDOStatementX::__construct() +unicode(13) "PDOStatementX" +unicode(11) "PDODatabase" +array(3) { + [u"id"]=> + unicode(2) "10" + [u"val"]=> + unicode(3) "Abc" + [u"val2"]=> + unicode(3) "zxy" +} +array(3) { + [u"id"]=> + unicode(2) "20" + [u"val"]=> + unicode(3) "Def" + [u"val2"]=> + unicode(3) "wvu" +} +array(3) { + [u"id"]=> + unicode(2) "30" + [u"val"]=> + unicode(3) "Ghi" + [u"val2"]=> + unicode(3) "tsr" +} +===DONE=== +PDODatabase::__destruct() +PDOStatementX::__destruct() http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/005.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/simplexml/tests/005.phpt diff -u php-src/ext/simplexml/tests/005.phpt:1.2 php-src/ext/simplexml/tests/005.phpt:1.3 --- php-src/ext/simplexml/tests/005.phpt:1.2 Sat Jan 17 12:33:10 2004 +++ php-src/ext/simplexml/tests/005.phpt Mon Aug 15 10:37:55 2005 @@ -38,3 +38,8 @@ string(19) "And here some more." string(15) "Wow once again." ---Done--- +--UEXPECT-- +unicode(28) "Here we have some text data." +unicode(19) "And here some more." +unicode(15) "Wow once again." +---Done--- http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/006.phpt?r1=1.5&r2=1.6&ty=u Index: php-src/ext/simplexml/tests/006.phpt diff -u php-src/ext/simplexml/tests/006.phpt:1.5 php-src/ext/simplexml/tests/006.phpt:1.6 --- php-src/ext/simplexml/tests/006.phpt:1.5 Tue Feb 3 17:03:03 2004 +++ php-src/ext/simplexml/tests/006.phpt Mon Aug 15 10:37:55 2005 @@ -78,3 +78,20 @@ string(5) "elem1" string(10) "Bla bla 1." ===DONE=== +--UEXPECT-- +unicode(5) "elem1" +unicode(10) "Bla bla 1." +unicode(6) "elem11" +unicode(10) "Bla bla 2." +===CLONE=== +unicode(5) "elem1" +unicode(10) "Bla bla 1." +unicode(6) "elem11" +unicode(10) "Bla bla 2." +===ELEMENT=== +unicode(6) "elem11" +unicode(10) "Bla bla 2." +===COMMENT=== +unicode(5) "elem1" +unicode(10) "Bla bla 1." +===DONE=== http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/007.phpt?r1=1.8&r2=1.9&ty=u Index: php-src/ext/simplexml/tests/007.phpt diff -u php-src/ext/simplexml/tests/007.phpt:1.8 php-src/ext/simplexml/tests/007.phpt:1.9 --- php-src/ext/simplexml/tests/007.phpt:1.8 Mon Mar 29 14:58:01 2004 +++ php-src/ext/simplexml/tests/007.phpt Mon Aug 15 10:37:55 2005 @@ -90,3 +90,47 @@ int(4) int(4) ===Done=== +--UEXPECTF-- +===Property=== +object(SimpleXMLElement)#%d (2) { + [u"comment"]=> + object(SimpleXMLElement)#%d (0) { + } + [u"elem2"]=> + object(SimpleXMLElement)#%d (1) { + [u"elem3"]=> + object(SimpleXMLElement)#%d (1) { + [u"elem4"]=> + object(SimpleXMLElement)#%d (1) { + [u"test"]=> + object(SimpleXMLElement)#%d (0) { + } + } + } + } +} +===Array=== +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(5) "elem1" +} +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(5) "first" +} +===Set=== +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(8) "Changed1" +} +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(2) "12" +} +===Unset=== +NULL +NULL +===Misc.=== +int(4) +int(4) +===Done=== http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/009.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/simplexml/tests/009.phpt diff -u php-src/ext/simplexml/tests/009.phpt:1.4 php-src/ext/simplexml/tests/009.phpt:1.5 --- php-src/ext/simplexml/tests/009.phpt:1.4 Mon Mar 29 14:58:01 2004 +++ php-src/ext/simplexml/tests/009.phpt Mon Aug 15 10:37:55 2005 @@ -43,3 +43,11 @@ string(16) "SimpleXMLElement" string(10) "Bla bla 2." ===DONE=== +--UEXPECT-- +unicode(5) "elem1" +unicode(16) "SimpleXMLElement" +unicode(10) "Bla bla 1." +unicode(6) "elem11" +unicode(16) "SimpleXMLElement" +unicode(10) "Bla bla 2." +===DONE=== http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/014.phpt?r1=1.7&r2=1.8&ty=u Index: php-src/ext/simplexml/tests/014.phpt diff -u php-src/ext/simplexml/tests/014.phpt:1.7 php-src/ext/simplexml/tests/014.phpt:1.8 --- php-src/ext/simplexml/tests/014.phpt:1.7 Mon Mar 29 14:58:01 2004 +++ php-src/ext/simplexml/tests/014.phpt Mon Aug 15 10:37:55 2005 @@ -58,3 +58,31 @@ string(2) "35" } ===DONE=== +--UEXPECTF-- +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(3) "Joe" +} +NULL +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(3) "XXX" +} +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(2) "30" +} +---Unset:--- +---Unset?--- +NULL +bool(false) +---Unsupported--- +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(2) "30" +} +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(2) "35" +} +===DONE=== http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/014a.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/simplexml/tests/014a.phpt diff -u php-src/ext/simplexml/tests/014a.phpt:1.4 php-src/ext/simplexml/tests/014a.phpt:1.5 --- php-src/ext/simplexml/tests/014a.phpt:1.4 Mon Mar 29 14:58:01 2004 +++ php-src/ext/simplexml/tests/014a.phpt Mon Aug 15 10:37:55 2005 @@ -53,4 +53,29 @@ [0]=> string(1) "5" } -===DONE=== \ No newline at end of file +===DONE=== +--UEXPECTF-- +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(3) "Joe" +} +NULL +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(3) "XXX" +} +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(2) "30" +} +---Unset:--- +---Unset?--- +NULL +bool(false) +---Unsupported--- +NULL +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(1) "5" +} +===DONE=== http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/014b.phpt?r1=1.4&r2=1.5&ty=u Index: php-src/ext/simplexml/tests/014b.phpt diff -u php-src/ext/simplexml/tests/014b.phpt:1.4 php-src/ext/simplexml/tests/014b.phpt:1.5 --- php-src/ext/simplexml/tests/014b.phpt:1.4 Mon Mar 29 14:58:01 2004 +++ php-src/ext/simplexml/tests/014b.phpt Mon Aug 15 10:37:55 2005 @@ -52,4 +52,28 @@ [0]=> string(1) "5" } -===DONE=== \ No newline at end of file +===DONE=== +--UEXPECTF-- +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(3) "Joe" +} +NULL +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(3) "XXX" +} +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(2) "30" +} +---Unset:--- +---Unset?--- +NULL +bool(false) +---Unsupported--- +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(1) "5" +} +===DONE=== http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/016.phpt?r1=1.7&r2=1.8&ty=u Index: php-src/ext/simplexml/tests/016.phpt diff -u php-src/ext/simplexml/tests/016.phpt:1.7 php-src/ext/simplexml/tests/016.phpt:1.8 --- php-src/ext/simplexml/tests/016.phpt:1.7 Mon Mar 29 14:58:01 2004 +++ php-src/ext/simplexml/tests/016.phpt Mon Aug 15 10:37:55 2005 @@ -55,3 +55,30 @@ string(9) "JoeFooBar" } ===DONE=== +--UEXPECTF-- +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(3) "Joe" +} +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(6) "JoeFoo" +} +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(9) "JoeFooBar" +} +---[0]--- +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(3) "Joe" +} +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(6) "JoeFoo" +} +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(9) "JoeFooBar" +} +===DONE=== http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/016a.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/simplexml/tests/016a.phpt diff -u php-src/ext/simplexml/tests/016a.phpt:1.1 php-src/ext/simplexml/tests/016a.phpt:1.2 --- php-src/ext/simplexml/tests/016a.phpt:1.1 Sun Feb 27 18:15:52 2005 +++ php-src/ext/simplexml/tests/016a.phpt Mon Aug 15 10:37:55 2005 @@ -27,3 +27,13 @@ string(6) "FooBar" } ===DONE=== +--UEXPECTF-- +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(3) "Foo" +} +object(SimpleXMLElement)#%d (1) { + [0]=> + unicode(6) "FooBar" +} +===DONE=== http://cvs.php.net/diff.php/php-src/ext/simplexml/tests/019.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/simplexml/tests/019.phpt diff -u php-src/ext/simplexml/tests/019.phpt:1.2 php-src/ext/simplexml/tests/019.phpt:1.3 --- php-src/ext/simplexml/tests/019.phpt:1.2 Tue Feb 3 17:03:03 2004 +++ php-src/ext/simplexml/tests/019.phpt Mon Aug 15 10:37:55 2005 @@ -78,3 +78,20 @@ string(5) "elem2" string(28) "Here we have some text data." ===DONE=== +--UEXPECT-- +unicode(5) "elem1" +unicode(10) "Bla bla 1." +unicode(6) "elem11" +unicode(10) "Bla bla 2." +===CLONE=== +unicode(5) "elem1" +unicode(10) "Bla bla 1." +unicode(6) "elem11" +unicode(10) "Bla bla 2." +===ELEMENT=== +unicode(7) "elem111" +unicode(7) "Foo Bar" +===COMMENT=== +unicode(5) "elem2" +unicode(28) "Here we have some text data." +===DONE=== http://cvs.php.net/diff.php/php-src/ext/spl/tests/array_001.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/spl/tests/array_001.phpt diff -u php-src/ext/spl/tests/array_001.phpt:1.2 php-src/ext/spl/tests/array_001.phpt:1.3 --- php-src/ext/spl/tests/array_001.phpt:1.2 Tue Apr 13 15:08:54 2004 +++ php-src/ext/spl/tests/array_001.phpt Mon Aug 15 10:37:55 2005 @@ -101,3 +101,67 @@ int(4) } ===DONE=== +--UEXPECTF-- +object(ArrayObject)#1 (2) { + [0]=> + int(0) + [1]=> + int(1) +} +int(2) +int(3) +array(6) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) +} +unicode(1) "a" +object(ArrayObject)#1 (5) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [u"a"]=> + unicode(1) "a" +} +int(0) + +Notice: Undefined offset: 6 in %sarray_001.php on line %d +NULL + +Notice: Undefined index: b in %sarray_001.php on line %d +NULL + +Notice: Undefined offset: 7 in %sarray_001.php on line %d + +Notice: Undefined index: c in %sarray_001.php on line %d +object(ArrayObject)#1 (2) { + [0]=> + int(0) + [2]=> + int(2) +} +object(ArrayObject)#1 (4) { + [0]=> + int(0) + [2]=> + int(2) + [4]=> + unicode(1) "3" + [5]=> + int(4) +} +===DONE=== http://cvs.php.net/diff.php/php-src/ext/spl/tests/array_002.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/spl/tests/array_002.phpt diff -u php-src/ext/spl/tests/array_002.phpt:1.1 php-src/ext/spl/tests/array_002.phpt:1.2 --- php-src/ext/spl/tests/array_002.phpt:1.1 Tue Apr 13 15:06:39 2004 +++ php-src/ext/spl/tests/array_002.phpt Mon Aug 15 10:37:55 2005 @@ -35,3 +35,17 @@ string(4) "five" } ===DONE=== +--UEXPECTF-- +object(ArrayObject)#%d (5) { + [1]=> + unicode(3) "one" + [2]=> + unicode(3) "two" + [3]=> + unicode(5) "three" + [4]=> + unicode(4) "four" + [5]=> + unicode(4) "five" +} +===DONE=== http://cvs.php.net/diff.php/php-src/ext/spl/tests/array_010.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/ext/spl/tests/array_010.phpt diff -u php-src/ext/spl/tests/array_010.phpt:1.3 php-src/ext/spl/tests/array_010.phpt:1.4 --- php-src/ext/spl/tests/array_010.phpt:1.3 Wed Sep 29 16:10:12 2004 +++ php-src/ext/spl/tests/array_010.phpt Mon Aug 15 10:37:55 2005 @@ -144,3 +144,82 @@ string(9) "changed 6" } ===DONE=== +--UEXPECTF-- +array(4) { + [0]=> + unicode(3) "1st" + [1]=> + int(1) + [2]=> + unicode(3) "3rd" + [u"4th"]=> + int(4) +} +===EMPTY=== +bool(false) +bool(false) +bool(false) +bool(false) +bool(true) +bool(true) +===isset=== +bool(true) +bool(true) +bool(true) +bool(true) +bool(false) +bool(false) +===offsetGet=== +unicode(3) "1st" +int(1) +unicode(3) "3rd" +int(4) + +Notice: Undefined index: 5th in %sarray_010.php on line %d +NULL + +Notice: Undefined offset: 6 in %sarray_010.php on line %d +NULL +===offsetSet=== +WRITE 1 +unicode(9) "Changed 1" +WRITE 2 +unicode(11) "Changed 4th" +WRITE 3 +unicode(9) "Added 5th" +WRITE 4 +unicode(7) "Added 6" +unicode(3) "1st" +unicode(3) "3rd" +unicode(9) "changed 6" +unicode(9) "changed 6" +===unset=== +array(6) { + [0]=> + unicode(3) "1st" + [1]=> + unicode(9) "Changed 1" + [2]=> + unicode(3) "3rd" + [u"4th"]=> + unicode(11) "Changed 4th" + [u"5th"]=> + unicode(9) "Added 5th" + [6]=> + unicode(9) "changed 6" +} + +Notice: Undefined offset: 7 in %sarray_010.php on line %d + +Notice: Undefined index: 8th in %sarray_010.php on line %d +array(4) { + [0]=> + unicode(3) "1st" + [1]=> + unicode(9) "Changed 1" + [u"5th"]=> + unicode(9) "Added 5th" + [6]=> + unicode(9) "changed 6" +} +===DONE=== http://cvs.php.net/diff.php/php-src/ext/spl/tests/array_011.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/spl/tests/array_011.phpt diff -u php-src/ext/spl/tests/array_011.phpt:1.2 php-src/ext/spl/tests/array_011.phpt:1.3 --- php-src/ext/spl/tests/array_011.phpt:1.2 Wed Apr 28 15:58:47 2004 +++ php-src/ext/spl/tests/array_011.phpt Mon Aug 15 10:37:55 2005 @@ -35,3 +35,23 @@ int(3) } ===DONE=== +--UEXPECT-- +array(2) { + [0]=> + unicode(3) "one" + [1]=> + int(1) +} +array(2) { + [0]=> + unicode(3) "two" + [1]=> + int(2) +} +array(2) { + [0]=> + unicode(5) "three" + [1]=> + int(3) +} +===DONE=== http://cvs.php.net/diff.php/php-src/ext/spl/tests/array_017.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/spl/tests/array_017.phpt diff -u php-src/ext/spl/tests/array_017.phpt:1.2 php-src/ext/spl/tests/array_017.phpt:1.3 --- php-src/ext/spl/tests/array_017.phpt:1.2 Mon Aug 15 03:55:39 2005 +++ php-src/ext/spl/tests/array_017.phpt Mon Aug 15 10:37:55 2005 @@ -647,3 +647,518 @@ int(1) bool(true) ===DONE=== +--UEXPECTF-- +ArrayObjectEx::__construct() +===CHECK=== +ArrayObjectEx::setFlags(0) +ArrayObjectEx::dump() +array(3) { + [u"Flags"]=> + int(0) + [u"OVars"]=> + array(2) { + [u"a"]=> + int(25) + [u"pub1"]=> + int(42) + } + [u"$this"]=> + object(ArrayObjectEx)#1 (3) { + [0]=> + int(1) + [u"a"]=> + int(25) + [u"pub1"]=> + int(42) + } +} +ArrayObjectEx::show() +ArrayObjectEx::getIterator() +ArrayIteratorEx::__construct() +ArrayIteratorEx::dump() +array(3) { + [u"Flags"]=> + int(0) + [u"OVars"]=> + array(2) { + [u"a"]=> + int(25) + [u"pub1"]=> + int(42) + } + [u"$this"]=> + object(ArrayIteratorEx)#2 (3) { + [0]=> + int(1) + [u"a"]=> + int(25) + [u"pub1"]=> + int(42) + } +} +array(1) { + [0]=> + int(1) +} +array(1) { + [u"a"]=> + int(25) +} +array(1) { + [u"pub1"]=> + int(42) +} +===FOREACH=== +ArrayObjectEx::getIterator() +ArrayIteratorEx::__construct() +ArrayIteratorEx::dump() +array(3) { + [u"Flags"]=> + int(0) + [u"OVars"]=> + array(2) { + [u"a"]=> + int(25) + [u"pub1"]=> + int(42) + } + [u"$this"]=> + object(ArrayIteratorEx)#3 (3) { + [0]=> + int(1) + [u"a"]=> + int(25) + [u"pub1"]=> + int(42) + } +} +array(1) { + [0]=> + int(1) +} +array(1) { + [u"a"]=> + int(25) +} +array(1) { + [u"pub1"]=> + int(42) +} +===PROPERTY=== +int(1) +bool(false) +ArrayObjectEx::setFlags(2) +int(1) +bool(true) +int(1) +bool(false) +ArrayIteratorEx::setFlags(2) +int(1) +bool(true) +===CHECK=== +ArrayObjectEx::setFlags(1) +ArrayObjectEx::dump() +array(3) { + [u"Flags"]=> + int(1) + [u"OVars"]=> + array(5) { + [u"pub1"]=> + int(1) + [u"pro1"]=> + int(2) + [u"pri1"]=> + int(3) + [u"imp1"]=> + int(4) + [u"dyn1"]=> + int(5) + } + [u"$this"]=> + object(ArrayObjectEx)#1 (5) { + [u"pub1"]=> + int(1) + [u"pro1":protected]=> + int(2) + [u"pri1":u"ArrayObjectEx":private]=> + int(3) + [u"imp1"]=> + int(4) + [u"dyn1"]=> + int(5) + } +} +ArrayObjectEx::show() +ArrayObjectEx::getIterator() +ArrayIteratorEx::__construct() +ArrayIteratorEx::dump() +array(3) { + [u"Flags"]=> + int(1) + [u"OVars"]=> + array(5) { + [u"pub2"]=> + int(1) + [u"pro2"]=> + int(2) + [u"pri2"]=> + int(3) + [u"imp2"]=> + int(4) + [u"dyn2"]=> + int(5) + } + [u"$this"]=> + object(ArrayIteratorEx)#3 (5) { + [u"pub2"]=> + int(1) + [u"pro2":protected]=> + int(2) + [u"pri2":u"ArrayIteratorEx":private]=> + int(3) + [u"imp2"]=> + int(4) + [u"dyn2"]=> + int(5) + } +} +array(1) { + [0]=> + int(1) +} +array(1) { + [u"a"]=> + int(25) +} +array(1) { + [u"pub1"]=> + int(42) +} +===FOREACH=== +ArrayObjectEx::getIterator() +ArrayIteratorEx::__construct() +ArrayIteratorEx::dump() +array(3) { + [u"Flags"]=> + int(1) + [u"OVars"]=> + array(5) { + [u"pub2"]=> + int(1) + [u"pro2"]=> + int(2) + [u"pri2"]=> + int(3) + [u"imp2"]=> + int(4) + [u"dyn2"]=> + int(5) + } + [u"$this"]=> + object(ArrayIteratorEx)#2 (5) { + [u"pub2"]=> + int(1) + [u"pro2":protected]=> + int(2) + [u"pri2":u"ArrayIteratorEx":private]=> + int(3) + [u"imp2"]=> + int(4) + [u"dyn2"]=> + int(5) + } +} +array(1) { + [0]=> + int(1) +} +array(1) { + [u"a"]=> + int(25) +} +array(1) { + [u"pub1"]=> + int(42) +} +===PROPERTY=== +int(1) +bool(false) +ArrayObjectEx::setFlags(3) +int(1) +bool(true) +int(1) +bool(false) +ArrayIteratorEx::setFlags(3) +int(1) +bool(true) +#####EXCHANGE##### +ArrayObjectEx::exchange() +===CHECK=== +ArrayObjectEx::setFlags(0) +ArrayObjectEx::dump() +array(3) { + [u"Flags"]=> + int(0) + [u"OVars"]=> + array(5) { + [u"pub1"]=> + int(1) + [u"pro1"]=> + int(2) + [u"pri1"]=> + int(3) + [u"imp1"]=> + int(4) + [u"dyn1"]=> + int(5) + } + [u"$this"]=> + object(ArrayObjectEx)#1 (5) { + [u"pub1"]=> + int(1) + [u"pro1":protected]=> + int(2) + [u"pri1":u"ArrayObjectEx":private]=> + int(3) + [u"imp1"]=> + int(4) + [u"dyn1"]=> + int(5) + } +} +ArrayObjectEx::show() +ArrayObjectEx::getIterator() +ArrayIteratorEx::__construct() +ArrayIteratorEx::dump() +array(3) { + [u"Flags"]=> + int(0) + [u"OVars"]=> + array(4) { + [u"pub1"]=> + int(1) + [u"pro1"]=> + int(2) + [u"imp1"]=> + int(4) + [u"dyn1"]=> + int(5) + } + [u"$this"]=> + object(ArrayIteratorEx)#2 (5) { + [u"pub1"]=> + int(1) + [u"pro1":protected]=> + int(2) + [u"pri1":u"ArrayObjectEx":private]=> + int(3) + [u"imp1"]=> + int(4) + [u"dyn1"]=> + int(5) + } +} +array(1) { + [u"pub1"]=> + int(1) +} +array(1) { + [u"imp1"]=> + int(4) +} +array(1) { + [u"dyn1"]=> + int(5) +} +===FOREACH=== +ArrayObjectEx::getIterator() +ArrayIteratorEx::__construct() +ArrayIteratorEx::dump() +array(3) { + [u"Flags"]=> + int(0) + [u"OVars"]=> + array(4) { + [u"pub1"]=> + int(1) + [u"pro1"]=> + int(2) + [u"imp1"]=> + int(4) + [u"dyn1"]=> + int(5) + } + [u"$this"]=> + object(ArrayIteratorEx)#3 (5) { + [u"pub1"]=> + int(1) + [u"pro1":protected]=> + int(2) + [u"pri1":u"ArrayObjectEx":private]=> + int(3) + [u"imp1"]=> + int(4) + [u"dyn1"]=> + int(5) + } +} +array(1) { + [u"pub1"]=> + int(1) +} +array(1) { + [u"imp1"]=> + int(4) +} +array(1) { + [u"dyn1"]=> + int(5) +} +===PROPERTY=== +int(1) +bool(false) +ArrayObjectEx::setFlags(2) +int(1) +bool(false) +int(1) +bool(false) +ArrayIteratorEx::setFlags(2) +int(1) +bool(true) +===CHECK=== +ArrayObjectEx::setFlags(1) +ArrayObjectEx::dump() +array(3) { + [u"Flags"]=> + int(1) + [u"OVars"]=> + array(5) { + [u"pub1"]=> + int(1) + [u"pro1"]=> + int(2) + [u"pri1"]=> + int(3) + [u"imp1"]=> + int(4) + [u"dyn1"]=> + int(5) + } + [u"$this"]=> + object(ArrayObjectEx)#1 (5) { + [u"pub1"]=> + int(1) + [u"pro1":protected]=> + int(2) + [u"pri1":u"ArrayObjectEx":private]=> + int(3) + [u"imp1"]=> + int(4) + [u"dyn1"]=> + int(5) + } +} +ArrayObjectEx::show() +ArrayObjectEx::getIterator() +ArrayIteratorEx::__construct() +ArrayIteratorEx::dump() +array(3) { + [u"Flags"]=> + int(1) + [u"OVars"]=> + array(5) { + [u"pub2"]=> + int(1) + [u"pro2"]=> + int(2) + [u"pri2"]=> + int(3) + [u"imp2"]=> + int(4) + [u"dyn2"]=> + int(5) + } + [u"$this"]=> + object(ArrayIteratorEx)#3 (5) { + [u"pub2"]=> + int(1) + [u"pro2":protected]=> + int(2) + [u"pri2":u"ArrayIteratorEx":private]=> + int(3) + [u"imp2"]=> + int(4) + [u"dyn2"]=> + int(5) + } +} +array(1) { + [u"pub1"]=> + int(1) +} +array(1) { + [u"imp1"]=> + int(4) +} +array(1) { + [u"dyn1"]=> + int(5) +} +===FOREACH=== +ArrayObjectEx::getIterator() +ArrayIteratorEx::__construct() +ArrayIteratorEx::dump() +array(3) { + [u"Flags"]=> + int(1) + [u"OVars"]=> + array(5) { + [u"pub2"]=> + int(1) + [u"pro2"]=> + int(2) + [u"pri2"]=> + int(3) + [u"imp2"]=> + int(4) + [u"dyn2"]=> + int(5) + } + [u"$this"]=> + object(ArrayIteratorEx)#2 (5) { + [u"pub2"]=> + int(1) + [u"pro2":protected]=> + int(2) + [u"pri2":u"ArrayIteratorEx":private]=> + int(3) + [u"imp2"]=> + int(4) + [u"dyn2"]=> + int(5) + } +} +array(1) { + [u"pub1"]=> + int(1) +} +array(1) { + [u"imp1"]=> + int(4) +} +array(1) { + [u"dyn1"]=> + int(5) +} +===PROPERTY=== +int(1) +bool(false) +ArrayObjectEx::setFlags(3) +int(1) +bool(false) +int(1) +bool(false) +ArrayIteratorEx::setFlags(3) +int(1) +bool(true) +===DONE=== http://cvs.php.net/diff.php/php-src/ext/spl/tests/bug31926.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/spl/tests/bug31926.phpt diff -u php-src/ext/spl/tests/bug31926.phpt:1.1 php-src/ext/spl/tests/bug31926.phpt:1.2 --- php-src/ext/spl/tests/bug31926.phpt:1.1 Sat Feb 12 13:40:19 2005 +++ php-src/ext/spl/tests/bug31926.phpt Mon Aug 15 10:37:55 2005 @@ -25,3 +25,6 @@ --EXPECT-- int(0) string(5) "world" +--UEXPECT-- +int(0) +unicode(5) "world" http://cvs.php.net/diff.php/php-src/ext/spl/tests/bug32134.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/spl/tests/bug32134.phpt diff -u php-src/ext/spl/tests/bug32134.phpt:1.1 php-src/ext/spl/tests/bug32134.phpt:1.2 --- php-src/ext/spl/tests/bug32134.phpt:1.1 Thu Mar 3 05:35:34 2005 +++ php-src/ext/spl/tests/bug32134.phpt Mon Aug 15 10:37:55 2005 @@ -46,3 +46,11 @@ myArray::offsetGet(two) string(3) "two" ===DONE=== +--UEXPECT-- +myArray::offsetSet(one,one) +myArray::offsetGet(one) +unicode(3) "one" +myArray::offsetSet(two,two) +myArray::offsetGet(two) +unicode(3) "two" +===DONE=== http://cvs.php.net/diff.php/php-src/ext/spl/tests/bug33136.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/spl/tests/bug33136.phpt diff -u php-src/ext/spl/tests/bug33136.phpt:1.1 php-src/ext/spl/tests/bug33136.phpt:1.2 --- php-src/ext/spl/tests/bug33136.phpt:1.1 Sun Jun 19 23:02:52 2005 +++ php-src/ext/spl/tests/bug33136.phpt Mon Aug 15 10:37:55 2005 @@ -70,3 +70,25 @@ ) int(3) ===DONE=== +--UEXPECT-- +Initiate Obj +Assign values +Collection::offsetSet(NULL,foo) +Collection::offsetGet(0) +unicode(3) "foo" +Collection::offsetSet(NULL,bar) +Collection::offsetGet(0) +unicode(3) "foo" +Collection::offsetGet(1) +unicode(3) "bar" +Collection::offsetSet(foo,baz) +Collection::offsetGet(foo) +unicode(3) "baz" +Collection Object +( + [0] => foo + [1] => bar + [foo] => baz +) +int(3) +===DONE=== http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/001.phpt?r1=1.9&r2=1.10&ty=u Index: php-src/ext/standard/tests/array/001.phpt diff -u php-src/ext/standard/tests/array/001.phpt:1.9 php-src/ext/standard/tests/array/001.phpt:1.10 --- php-src/ext/standard/tests/array/001.phpt:1.9 Wed May 19 04:54:50 2004 +++ php-src/ext/standard/tests/array/001.phpt Mon Aug 15 10:37:55 2005 @@ -155,3 +155,115 @@ } } } +--UEXPECT-- +array(11) { + [0]=> + unicode(3) "PHP" + [1]=> + unicode(27) "PHP: Hypertext Preprocessor" + [2]=> + unicode(4) "Test" + [u"test"]=> + int(27) + [3]=> + unicode(4) "test" + [4]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [5]=> + unicode(6) "monkey" + [6]=> + float(-0.33333333333333) + [7]=> + array(1) { + [0]=> + array(1) { + [0]=> + array(1) { + [0]=> + int(0) + } + } + } + [8]=> + array(1) { + [0]=> + array(1) { + [0]=> + array(1) { + [0]=> + int(0) + } + } + } + [9]=> + array(1) { + [0]=> + array(1) { + [0]=> + array(1) { + [0]=> + int(0) + } + } + } +} + -- Testing array_walk() -- +int(0) +unicode(3) "PHP" +int(1) +unicode(27) "PHP: Hypertext Preprocessor" +int(2) +unicode(4) "Test" +unicode(4) "test" +int(27) +int(3) +unicode(4) "test" +int(4) +array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" +} +int(5) +unicode(6) "monkey" +int(6) +float(-0.33333333333333) +int(7) +array(1) { + [0]=> + array(1) { + [0]=> + array(1) { + [0]=> + int(0) + } + } +} +int(8) +array(1) { + [0]=> + array(1) { + [0]=> + array(1) { + [0]=> + int(0) + } + } +} +int(9) +array(1) { + [0]=> + array(1) { + [0]=> + array(1) { + [0]=> + int(0) + } + } +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/002.phpt?r1=1.6&r2=1.7&ty=u Index: php-src/ext/standard/tests/array/002.phpt diff -u php-src/ext/standard/tests/array/002.phpt:1.6 php-src/ext/standard/tests/array/002.phpt:1.7 --- php-src/ext/standard/tests/array/002.phpt:1.6 Mon Aug 18 18:57:49 2003 +++ php-src/ext/standard/tests/array/002.phpt Mon Aug 15 10:37:55 2005 @@ -642,3 +642,616 @@ [7]=> string(4) "test" } +--UEXPECT-- +Unsorted data: +array(8) { + [0]=> + unicode(3) "PHP" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [5]=> + unicode(4) "Test" + [u"test"]=> + int(27) + [1000]=> + unicode(4) "test" + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [1001]=> + unicode(6) "monkey" + [16777216]=> + float(-0.33333333333333) +} + + -- Testing arsort() -- +No second argument: +array(8) { + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [u"test"]=> + int(27) + [1000]=> + unicode(4) "test" + [1001]=> + unicode(6) "monkey" + [5]=> + unicode(4) "Test" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [0]=> + unicode(3) "PHP" + [16777216]=> + float(-0.33333333333333) +} +Using SORT_REGULAR: +array(8) { + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [u"test"]=> + int(27) + [1000]=> + unicode(4) "test" + [1001]=> + unicode(6) "monkey" + [5]=> + unicode(4) "Test" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [0]=> + unicode(3) "PHP" + [16777216]=> + float(-0.33333333333333) +} +Using SORT_NUMERIC: +array(8) { + [u"test"]=> + int(27) + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [0]=> + unicode(3) "PHP" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [1001]=> + unicode(6) "monkey" + [5]=> + unicode(4) "Test" + [1000]=> + unicode(4) "test" + [16777216]=> + float(-0.33333333333333) +} +Using SORT_STRING +array(8) { + [1000]=> + unicode(4) "test" + [1001]=> + unicode(6) "monkey" + [5]=> + unicode(4) "Test" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [0]=> + unicode(3) "PHP" + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [u"test"]=> + int(27) + [16777216]=> + float(-0.33333333333333) +} + + -- Testing asort() -- +No second argument: +array(8) { + [16777216]=> + float(-0.33333333333333) + [0]=> + unicode(3) "PHP" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [5]=> + unicode(4) "Test" + [1001]=> + unicode(6) "monkey" + [1000]=> + unicode(4) "test" + [u"test"]=> + int(27) + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } +} +Using SORT_REGULAR: +array(8) { + [16777216]=> + float(-0.33333333333333) + [0]=> + unicode(3) "PHP" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [5]=> + unicode(4) "Test" + [1001]=> + unicode(6) "monkey" + [1000]=> + unicode(4) "test" + [u"test"]=> + int(27) + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } +} +Using SORT_NUMERIC: +array(8) { + [16777216]=> + float(-0.33333333333333) + [1001]=> + unicode(6) "monkey" + [1000]=> + unicode(4) "test" + [5]=> + unicode(4) "Test" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [0]=> + unicode(3) "PHP" + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [u"test"]=> + int(27) +} +Using SORT_STRING +array(8) { + [16777216]=> + float(-0.33333333333333) + [u"test"]=> + int(27) + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [0]=> + unicode(3) "PHP" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [5]=> + unicode(4) "Test" + [1001]=> + unicode(6) "monkey" + [1000]=> + unicode(4) "test" +} + + -- Testing krsort() -- +No second argument: +array(8) { + [16777216]=> + float(-0.33333333333333) + [1001]=> + unicode(6) "monkey" + [1000]=> + unicode(4) "test" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [5]=> + unicode(4) "Test" + [u"test"]=> + int(27) + [0]=> + unicode(3) "PHP" + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } +} +Using SORT_REGULAR: +array(8) { + [16777216]=> + float(-0.33333333333333) + [1001]=> + unicode(6) "monkey" + [1000]=> + unicode(4) "test" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [5]=> + unicode(4) "Test" + [0]=> + unicode(3) "PHP" + [u"test"]=> + int(27) + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } +} +Using SORT_NUMERIC: +array(8) { + [16777216]=> + float(-0.33333333333333) + [1001]=> + unicode(6) "monkey" + [1000]=> + unicode(4) "test" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [5]=> + unicode(4) "Test" + [u"test"]=> + int(27) + [0]=> + unicode(3) "PHP" + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } +} +Using SORT_STRING +array(8) { + [u"test"]=> + int(27) + [5]=> + unicode(4) "Test" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [16777216]=> + float(-0.33333333333333) + [1001]=> + unicode(6) "monkey" + [1000]=> + unicode(4) "test" + [0]=> + unicode(3) "PHP" + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } +} + + -- Testing ksort() -- +No second argument: +array(8) { + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [0]=> + unicode(3) "PHP" + [u"test"]=> + int(27) + [5]=> + unicode(4) "Test" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [1000]=> + unicode(4) "test" + [1001]=> + unicode(6) "monkey" + [16777216]=> + float(-0.33333333333333) +} +Using SORT_REGULAR: +array(8) { + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [u"test"]=> + int(27) + [0]=> + unicode(3) "PHP" + [5]=> + unicode(4) "Test" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [1000]=> + unicode(4) "test" + [1001]=> + unicode(6) "monkey" + [16777216]=> + float(-0.33333333333333) +} +Using SORT_NUMERIC: +array(8) { + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [0]=> + unicode(3) "PHP" + [u"test"]=> + int(27) + [5]=> + unicode(4) "Test" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [1000]=> + unicode(4) "test" + [1001]=> + unicode(6) "monkey" + [16777216]=> + float(-0.33333333333333) +} +Using SORT_STRING +array(8) { + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [0]=> + unicode(3) "PHP" + [1000]=> + unicode(4) "test" + [1001]=> + unicode(6) "monkey" + [16777216]=> + float(-0.33333333333333) + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [5]=> + unicode(4) "Test" + [u"test"]=> + int(27) +} + + -- Testing rsort() -- +No second argument: +array(8) { + [0]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [1]=> + int(27) + [2]=> + unicode(4) "test" + [3]=> + unicode(6) "monkey" + [4]=> + unicode(4) "Test" + [5]=> + unicode(27) "PHP: Hypertext Preprocessor" + [6]=> + unicode(3) "PHP" + [7]=> + float(-0.33333333333333) +} +Using SORT_REGULAR: +array(8) { + [0]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [1]=> + int(27) + [2]=> + unicode(4) "test" + [3]=> + unicode(6) "monkey" + [4]=> + unicode(4) "Test" + [5]=> + unicode(27) "PHP: Hypertext Preprocessor" + [6]=> + unicode(3) "PHP" + [7]=> + float(-0.33333333333333) +} +Using SORT_NUMERIC: +array(8) { + [0]=> + int(27) + [1]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [2]=> + unicode(3) "PHP" + [3]=> + unicode(27) "PHP: Hypertext Preprocessor" + [4]=> + unicode(6) "monkey" + [5]=> + unicode(4) "Test" + [6]=> + unicode(4) "test" + [7]=> + float(-0.33333333333333) +} +Using SORT_STRING +array(8) { + [0]=> + unicode(4) "test" + [1]=> + unicode(6) "monkey" + [2]=> + unicode(4) "Test" + [3]=> + unicode(27) "PHP: Hypertext Preprocessor" + [4]=> + unicode(3) "PHP" + [5]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [6]=> + int(27) + [7]=> + float(-0.33333333333333) +} + + -- Testing sort() -- +No second argument: +array(8) { + [0]=> + float(-0.33333333333333) + [1]=> + unicode(3) "PHP" + [2]=> + unicode(27) "PHP: Hypertext Preprocessor" + [3]=> + unicode(4) "Test" + [4]=> + unicode(6) "monkey" + [5]=> + unicode(4) "test" + [6]=> + int(27) + [7]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } +} +Using SORT_REGULAR: +array(8) { + [0]=> + float(-0.33333333333333) + [1]=> + unicode(3) "PHP" + [2]=> + unicode(27) "PHP: Hypertext Preprocessor" + [3]=> + unicode(4) "Test" + [4]=> + unicode(6) "monkey" + [5]=> + unicode(4) "test" + [6]=> + int(27) + [7]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } +} +Using SORT_NUMERIC: +array(8) { + [0]=> + float(-0.33333333333333) + [1]=> + unicode(6) "monkey" + [2]=> + unicode(4) "test" + [3]=> + unicode(4) "Test" + [4]=> + unicode(27) "PHP: Hypertext Preprocessor" + [5]=> + unicode(3) "PHP" + [6]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [7]=> + int(27) +} +Using SORT_STRING +array(8) { + [0]=> + float(-0.33333333333333) + [1]=> + int(27) + [2]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [3]=> + unicode(3) "PHP" + [4]=> + unicode(27) "PHP: Hypertext Preprocessor" + [5]=> + unicode(4) "Test" + [6]=> + unicode(6) "monkey" + [7]=> + unicode(4) "test" +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/003.phpt?r1=1.7&r2=1.8&ty=u Index: php-src/ext/standard/tests/array/003.phpt diff -u php-src/ext/standard/tests/array/003.phpt:1.7 php-src/ext/standard/tests/array/003.phpt:1.8 --- php-src/ext/standard/tests/array/003.phpt:1.7 Mon Aug 18 18:57:49 2003 +++ php-src/ext/standard/tests/array/003.phpt Mon Aug 15 10:37:55 2005 @@ -102,3 +102,78 @@ [7]=> string(4) "test" } +--UEXPECT-- +-- Testing uasort() -- +array(8) { + [16777216]=> + float(-0.33333333333333) + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [u"test"]=> + int(27) + [0]=> + unicode(3) "PHP" + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [5]=> + unicode(4) "Test" + [1001]=> + unicode(6) "monkey" + [1000]=> + unicode(4) "test" +} + + -- Testing uksort() -- +array(8) { + [-1000]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [0]=> + unicode(3) "PHP" + [1000]=> + unicode(4) "test" + [1001]=> + unicode(6) "monkey" + [16777216]=> + float(-0.33333333333333) + [17]=> + unicode(27) "PHP: Hypertext Preprocessor" + [5]=> + unicode(4) "Test" + [u"test"]=> + int(27) +} + + -- Testing usort() -- +array(8) { + [0]=> + float(-0.33333333333333) + [1]=> + array(2) { + [0]=> + unicode(6) "banana" + [1]=> + unicode(6) "orange" + } + [2]=> + int(27) + [3]=> + unicode(3) "PHP" + [4]=> + unicode(27) "PHP: Hypertext Preprocessor" + [5]=> + unicode(4) "Test" + [6]=> + unicode(6) "monkey" + [7]=> + unicode(4) "test" +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/004.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/ext/standard/tests/array/004.phpt diff -u php-src/ext/standard/tests/array/004.phpt:1.3 php-src/ext/standard/tests/array/004.phpt:1.4 --- php-src/ext/standard/tests/array/004.phpt:1.3 Sat Nov 16 12:26:52 2002 +++ php-src/ext/standard/tests/array/004.phpt Mon Aug 15 10:37:55 2005 @@ -56,4 +56,41 @@ string(6) "test10" [6]=> string(6) "test21" +} +--UEXPECT-- +array(5) { + [0]=> + unicode(5) "Test1" + [u"teST2"]=> + int(0) + [5]=> + unicode(5) "test2" + [u"abc"]=> + unicode(6) "test10" + [6]=> + unicode(6) "test21" +} +array(5) { + [u"teST2"]=> + int(0) + [0]=> + unicode(5) "Test1" + [5]=> + unicode(5) "test2" + [u"abc"]=> + unicode(6) "test10" + [6]=> + unicode(6) "test21" +} +array(5) { + [u"teST2"]=> + int(0) + [0]=> + unicode(5) "Test1" + [5]=> + unicode(5) "test2" + [u"abc"]=> + unicode(6) "test10" + [6]=> + unicode(6) "test21" } \ No newline at end of file http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/005.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/standard/tests/array/005.phpt diff -u php-src/ext/standard/tests/array/005.phpt:1.2 php-src/ext/standard/tests/array/005.phpt:1.3 --- php-src/ext/standard/tests/array/005.phpt:1.2 Sat Nov 16 12:26:52 2002 +++ php-src/ext/standard/tests/array/005.phpt Mon Aug 15 10:37:55 2005 @@ -44,3 +44,25 @@ ["c"]=> string(5) "fubar" } +--UEXPECT-- +foo +array(2) { + [0]=> + unicode(3) "bar" + [1]=> + unicode(5) "fubar" +} +foo +array(2) { + [0]=> + unicode(3) "bar" + [1]=> + unicode(5) "fubar" +} +foo +array(2) { + [u"b"]=> + unicode(3) "bar" + [u"c"]=> + unicode(5) "fubar" +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/006.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/ext/standard/tests/array/006.phpt diff -u php-src/ext/standard/tests/array/006.phpt:1.3 php-src/ext/standard/tests/array/006.phpt:1.4 --- php-src/ext/standard/tests/array/006.phpt:1.3 Sat Nov 16 12:26:52 2002 +++ php-src/ext/standard/tests/array/006.phpt Mon Aug 15 10:37:55 2005 @@ -47,3 +47,27 @@ ["b"]=> string(3) "bar" } +--UEXPECT-- +fubar +array(3) { + [0]=> + unicode(3) "foo" + [1]=> + unicode(3) "bar" + [2]=> + unicode(6) "foobar" +} +fubar +array(2) { + [3]=> + unicode(3) "foo" + [4]=> + unicode(3) "bar" +} +fubar +array(2) { + [u"a"]=> + unicode(3) "foo" + [u"b"]=> + unicode(3) "bar" +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/007.phpt?r1=1.10&r2=1.11&ty=u Index: php-src/ext/standard/tests/array/007.phpt diff -u php-src/ext/standard/tests/array/007.phpt:1.10 php-src/ext/standard/tests/array/007.phpt:1.11 --- php-src/ext/standard/tests/array/007.phpt:1.10 Mon Aug 15 03:55:39 2005 +++ php-src/ext/standard/tests/array/007.phpt Mon Aug 15 10:37:55 2005 @@ -649,3 +649,526 @@ 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/diff.php/php-src/ext/standard/tests/array/008.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/standard/tests/array/008.phpt diff -u php-src/ext/standard/tests/array/008.phpt:1.2 php-src/ext/standard/tests/array/008.phpt:1.3 --- php-src/ext/standard/tests/array/008.phpt:1.2 Sat Nov 16 12:26:52 2002 +++ php-src/ext/standard/tests/array/008.phpt Mon Aug 15 10:37:55 2005 @@ -308,3 +308,230 @@ ["som3"]=> string(4) "some" } +--UEXPECT-- +-=-=-=-=-=-=-=-=-=-= TEST 1 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +$a=array ( + 0 => 1, + 'big' => 2, + 1 => 2, + 2 => 6, + 3 => 3, + 4 => 5, + 5 => 3, + 6 => 3, + 7 => 454, + 8 => 'some_string', + 9 => 3, + 10 => 3, + 11 => 3, + 12 => 3, + 13 => 3, + 14 => 3, + 15 => 3, + 16 => 3, + 17 => 17, +); +$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, + 15 => 17, + 16 => 25, + 17 => 'some_string', + 18 => 7, + 19 => 8, + 20 => 9, + 21 => 109, + 22 => 78, + 23 => 17, +); +$c=array ( + 0 => -1, + 1 => 2, + 2 => 1, + 3 => 15, + 4 => 25, + 5 => 17, +); +array_intersect($a,$b,$c); +array(3) { + [u"big"]=> + int(2) + [1]=> + int(2) + [17]=> + int(17) +} +array_intersect_assoc($a,$b,$c); +array(1) { + [1]=> + int(2) +} +array_intersect($a,$b); +array(15) { + [u"big"]=> + int(2) + [1]=> + int(2) + [3]=> + int(3) + [5]=> + int(3) + [6]=> + int(3) + [8]=> + unicode(11) "some_string" + [9]=> + int(3) + [10]=> + int(3) + [11]=> + int(3) + [12]=> + int(3) + [13]=> + int(3) + [14]=> + int(3) + [15]=> + int(3) + [16]=> + int(3) + [17]=> + int(17) +} +array_intersect_assoc($a,$b); +array(10) { + [1]=> + int(2) + [3]=> + int(3) + [5]=> + int(3) + [6]=> + int(3) + [9]=> + int(3) + [10]=> + int(3) + [11]=> + int(3) + [12]=> + int(3) + [13]=> + int(3) + [14]=> + int(3) +} +-=-=-=-=-=-=-=-=-=-= TEST 2 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +$a=array ( + 'a' => 2, + 'b' => 'some', + 'c' => 'done', + 'z' => 'foo', + 'f' => 5, + 'fan' => 'fen', + 'bad' => 'bed', + 'gate' => 'web', + 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', + 'gate' => 'web', +); +$c=array ( + 'gate' => 'web', + 73 => 'foo', + 95 => 'some', +); + + +Results: + +array_intersect($a,$b,$c); +array(6) { + [u"b"]=> + unicode(4) "some" + [u"z"]=> + unicode(3) "foo" + [u"gate"]=> + unicode(3) "web" + [73]=> + unicode(3) "foo" + [95]=> + unicode(4) "some" + [u"som3"]=> + unicode(4) "some" +} +array_intersect_assoc($a,$b,$c); +array(1) { + [u"gate"]=> + unicode(3) "web" +} +array_intersect($a,$b); +array(11) { + [u"b"]=> + unicode(4) "some" + [u"z"]=> + unicode(3) "foo" + [u"f"]=> + int(5) + [u"gate"]=> + unicode(3) "web" + [7]=> + int(18) + [11]=> + int(42) + [12]=> + int(42) + [45]=> + int(42) + [73]=> + unicode(3) "foo" + [95]=> + unicode(4) "some" + [u"som3"]=> + unicode(4) "some" +} +array_intersect_assoc($a,$b); +array(5) { + [u"f"]=> + int(5) + [u"gate"]=> + unicode(3) "web" + [7]=> + int(18) + [11]=> + int(42) + [u"som3"]=> + unicode(4) "some" +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/array_change_key_case.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/standard/tests/array/array_change_key_case.phpt diff -u php-src/ext/standard/tests/array/array_change_key_case.phpt:1.2 php-src/ext/standard/tests/array/array_change_key_case.phpt:1.3 --- php-src/ext/standard/tests/array/array_change_key_case.phpt:1.2 Sat Nov 16 12:26:52 2002 +++ php-src/ext/standard/tests/array/array_change_key_case.phpt Mon Aug 15 10:37:55 2005 @@ -767,3 +767,720 @@ } end +--UEXPECT-- +array(0) { +} +array(0) { +} +array(0) { +} + +array(1) { + [0]=> + int(0) +} +array(1) { + [0]=> + int(0) +} +array(1) { + [0]=> + int(0) +} + +array(1) { + [0]=> + int(1) +} +array(1) { + [0]=> + int(1) +} +array(1) { + [0]=> + int(1) +} + +array(1) { + [0]=> + int(-1) +} +array(1) { + [0]=> + int(-1) +} +array(1) { + [0]=> + int(-1) +} + +array(5) { + [0]=> + int(0) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) +} +array(5) { + [0]=> + int(0) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) +} +array(5) { + [0]=> + int(0) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) +} + +array(5) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) +} +array(5) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) +} +array(5) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) +} + +array(1) { + [u""]=> + int(1) +} +array(1) { + [u""]=> + int(1) +} +array(1) { + [u""]=> + int(1) +} + +array(1) { + [u"a"]=> + int(1) +} +array(1) { + [u"A"]=> + int(1) +} +array(1) { + [u"a"]=> + int(1) +} + +array(1) { + [u"z"]=> + int(1) +} +array(1) { + [u"Z"]=> + int(1) +} +array(1) { + [u"z"]=> + int(1) +} + +array(1) { + [u"one"]=> + int(1) +} +array(1) { + [u"ONE"]=> + int(1) +} +array(1) { + [u"one"]=> + int(1) +} + +array(1) { + [u"one"]=> + int(1) +} +array(1) { + [u"ONE"]=> + int(1) +} +array(1) { + [u"one"]=> + int(1) +} + +array(1) { + [u"one"]=> + int(1) +} +array(1) { + [u"ONE"]=> + int(1) +} +array(1) { + [u"one"]=> + int(1) +} + +array(1) { + [u"one"]=> + int(1) +} +array(1) { + [u"ONE"]=> + int(1) +} +array(1) { + [u"one"]=> + int(1) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [0]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [0]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [0]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [0]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [0]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [0]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [0]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [0]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [0]=> + int(2) +} + +array(2) { + [u"one"]=> + int(1) + [0]=> + int(2) +} +array(2) { + [u"ONE"]=> + int(1) + [0]=> + int(2) +} +array(2) { + [u"one"]=> + int(1) + [0]=> + int(2) +} + +array(4) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) + [u"three"]=> + int(3) + [u"four"]=> + unicode(4) "four" +} +array(4) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) + [u"THREE"]=> + int(3) + [u"FOUR"]=> + unicode(4) "four" +} +array(4) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) + [u"three"]=> + int(3) + [u"four"]=> + unicode(4) "four" +} + +array(4) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) + [u"three"]=> + int(3) + [u"four"]=> + unicode(4) "FOUR" +} +array(4) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) + [u"THREE"]=> + int(3) + [u"FOUR"]=> + unicode(4) "FOUR" +} +array(4) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) + [u"three"]=> + int(3) + [u"four"]=> + unicode(4) "FOUR" +} + +array(4) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) + [u"three"]=> + int(3) + [u"four"]=> + unicode(4) "FOUR" +} +array(4) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) + [u"THREE"]=> + int(3) + [u"FOUR"]=> + unicode(4) "FOUR" +} +array(4) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) + [u"three"]=> + int(3) + [u"four"]=> + unicode(4) "FOUR" +} + +array(4) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) + [u"three"]=> + int(3) + [u"four"]=> + unicode(4) "four" +} +array(4) { + [u"ONE"]=> + int(1) + [u"TWO"]=> + int(2) + [u"THREE"]=> + int(3) + [u"FOUR"]=> + unicode(4) "four" +} +array(4) { + [u"one"]=> + int(1) + [u"two"]=> + int(2) + [u"three"]=> + int(3) + [u"four"]=> + unicode(4) "four" +} + +end http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/array_chunk.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/standard/tests/array/array_chunk.phpt diff -u php-src/ext/standard/tests/array/array_chunk.phpt:1.2 php-src/ext/standard/tests/array/array_chunk.phpt:1.3 --- php-src/ext/standard/tests/array/array_chunk.phpt:1.2 Sat Nov 16 12:26:52 2002 +++ php-src/ext/standard/tests/array/array_chunk.phpt Mon Aug 15 10:37:55 2005 @@ -5324,3 +5324,5276 @@ end +--UEXPECT-- +=========================================== +array(0) { +} +------------------------------------------- +[0] +NULL +NULL +NULL + + +=========================================== +array(1) { + [0]=> + int(0) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(1) { + [0]=> + array(1) { + [0]=> + int(0) + } +} +array(1) { + [0]=> + array(1) { + [0]=> + int(0) + } +} +array(1) { + [0]=> + array(1) { + [0]=> + int(0) + } +} + + +=========================================== +array(1) { + [0]=> + int(1) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(1) { + [0]=> + array(1) { + [0]=> + int(1) + } +} +array(1) { + [0]=> + array(1) { + [0]=> + int(1) + } +} +array(1) { + [0]=> + array(1) { + [0]=> + int(1) + } +} + + +=========================================== +array(1) { + [0]=> + int(-1) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(1) { + [0]=> + array(1) { + [0]=> + int(-1) + } +} +array(1) { + [0]=> + array(1) { + [0]=> + int(-1) + } +} +array(1) { + [0]=> + array(1) { + [0]=> + int(-1) + } +} + + +=========================================== +array(2) { + [0]=> + int(0) + [1]=> + int(2) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(2) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [0]=> + int(2) + } +} +array(2) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [1]=> + int(2) + } +} +array(2) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [0]=> + int(2) + } +} + +[2] +array(1) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(2) + } +} +array(1) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(2) + } +} +array(1) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(2) + } +} + + +=========================================== +array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(3) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } + [2]=> + array(1) { + [0]=> + int(3) + } +} +array(3) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [1]=> + int(2) + } + [2]=> + array(1) { + [2]=> + int(3) + } +} +array(3) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } + [2]=> + array(1) { + [0]=> + int(3) + } +} + +[2] +array(2) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(1) { + [0]=> + int(3) + } +} +array(2) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(1) { + [2]=> + int(3) + } +} +array(2) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(1) { + [0]=> + int(3) + } +} + +[3] +array(1) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } +} +array(1) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } +} +array(1) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } +} + + +=========================================== +array(1) { + [1]=> + int(0) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(1) { + [0]=> + array(1) { + [0]=> + int(0) + } +} +array(1) { + [0]=> + array(1) { + [1]=> + int(0) + } +} +array(1) { + [0]=> + array(1) { + [0]=> + int(0) + } +} + + +=========================================== +array(1) { + [2]=> + int(1) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(1) { + [0]=> + array(1) { + [0]=> + int(1) + } +} +array(1) { + [0]=> + array(1) { + [2]=> + int(1) + } +} +array(1) { + [0]=> + array(1) { + [0]=> + int(1) + } +} + + +=========================================== +array(1) { + [3]=> + int(-1) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(1) { + [0]=> + array(1) { + [0]=> + int(-1) + } +} +array(1) { + [0]=> + array(1) { + [3]=> + int(-1) + } +} +array(1) { + [0]=> + array(1) { + [0]=> + int(-1) + } +} + + +=========================================== +array(2) { + [1]=> + int(0) + [2]=> + int(2) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(2) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [0]=> + int(2) + } +} +array(2) { + [0]=> + array(1) { + [1]=> + int(0) + } + [1]=> + array(1) { + [2]=> + int(2) + } +} +array(2) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [0]=> + int(2) + } +} + +[2] +array(1) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(2) + } +} +array(1) { + [0]=> + array(2) { + [1]=> + int(0) + [2]=> + int(2) + } +} +array(1) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(2) + } +} + + +=========================================== +array(3) { + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(3) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } + [2]=> + array(1) { + [0]=> + int(3) + } +} +array(3) { + [0]=> + array(1) { + [1]=> + int(1) + } + [1]=> + array(1) { + [2]=> + int(2) + } + [2]=> + array(1) { + [3]=> + int(3) + } +} +array(3) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } + [2]=> + array(1) { + [0]=> + int(3) + } +} + +[2] +array(2) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(1) { + [0]=> + int(3) + } +} +array(2) { + [0]=> + array(2) { + [1]=> + int(1) + [2]=> + int(2) + } + [1]=> + array(1) { + [3]=> + int(3) + } +} +array(2) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(1) { + [0]=> + int(3) + } +} + +[3] +array(1) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } +} +array(1) { + [0]=> + array(3) { + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + } +} +array(1) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } +} + + +=========================================== +array(2) { + [0]=> + int(0) + [3]=> + int(2) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(2) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [0]=> + int(2) + } +} +array(2) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [3]=> + int(2) + } +} +array(2) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [0]=> + int(2) + } +} + +[2] +array(1) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(2) + } +} +array(1) { + [0]=> + array(2) { + [0]=> + int(0) + [3]=> + int(2) + } +} +array(1) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(2) + } +} + + +=========================================== +array(3) { + [1]=> + int(1) + [5]=> + int(2) + [8]=> + int(3) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(3) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } + [2]=> + array(1) { + [0]=> + int(3) + } +} +array(3) { + [0]=> + array(1) { + [1]=> + int(1) + } + [1]=> + array(1) { + [5]=> + int(2) + } + [2]=> + array(1) { + [8]=> + int(3) + } +} +array(3) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } + [2]=> + array(1) { + [0]=> + int(3) + } +} + +[2] +array(2) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(1) { + [0]=> + int(3) + } +} +array(2) { + [0]=> + array(2) { + [1]=> + int(1) + [5]=> + int(2) + } + [1]=> + array(1) { + [8]=> + int(3) + } +} +array(2) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(1) { + [0]=> + int(3) + } +} + +[3] +array(1) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } +} +array(1) { + [0]=> + array(3) { + [1]=> + int(1) + [5]=> + int(2) + [8]=> + int(3) + } +} +array(1) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } +} + + +=========================================== +array(2) { + [0]=> + int(1) + [1]=> + int(2) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(2) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } +} +array(2) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [1]=> + int(2) + } +} +array(2) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } +} + +[2] +array(1) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } +} +array(1) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } +} +array(1) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } +} + + +=========================================== +array(3) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(3) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [0]=> + int(1) + } + [2]=> + array(1) { + [0]=> + int(2) + } +} +array(3) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [1]=> + int(1) + } + [2]=> + array(1) { + [2]=> + int(2) + } +} +array(3) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [0]=> + int(1) + } + [2]=> + array(1) { + [0]=> + int(2) + } +} + +[2] +array(2) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } +} +array(2) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(1) + } + [1]=> + array(1) { + [2]=> + int(2) + } +} +array(2) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } +} + +[3] +array(1) { + [0]=> + array(3) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + } +} +array(1) { + [0]=> + array(3) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + } +} +array(1) { + [0]=> + array(3) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + } +} + + +=========================================== +array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(3) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } + [2]=> + array(1) { + [0]=> + int(3) + } +} +array(3) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [1]=> + int(2) + } + [2]=> + array(1) { + [2]=> + int(3) + } +} +array(3) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } + [2]=> + array(1) { + [0]=> + int(3) + } +} + +[2] +array(2) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(1) { + [0]=> + int(3) + } +} +array(2) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(1) { + [2]=> + int(3) + } +} +array(2) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(1) { + [0]=> + int(3) + } +} + +[3] +array(1) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } +} +array(1) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } +} +array(1) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } +} + + +=========================================== +array(4) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(4) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [0]=> + int(1) + } + [2]=> + array(1) { + [0]=> + int(2) + } + [3]=> + array(1) { + [0]=> + int(3) + } +} +array(4) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [1]=> + int(1) + } + [2]=> + array(1) { + [2]=> + int(2) + } + [3]=> + array(1) { + [3]=> + int(3) + } +} +array(4) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [0]=> + int(1) + } + [2]=> + array(1) { + [0]=> + int(2) + } + [3]=> + array(1) { + [0]=> + int(3) + } +} + +[2] +array(2) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(1) + } + [1]=> + array(2) { + [0]=> + int(2) + [1]=> + int(3) + } +} +array(2) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(1) + } + [1]=> + array(2) { + [2]=> + int(2) + [3]=> + int(3) + } +} +array(2) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(1) + } + [1]=> + array(2) { + [0]=> + int(2) + [1]=> + int(3) + } +} + +[3] +array(2) { + [0]=> + array(3) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + } + [1]=> + array(1) { + [0]=> + int(3) + } +} +array(2) { + [0]=> + array(3) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + } + [1]=> + array(1) { + [3]=> + int(3) + } +} +array(2) { + [0]=> + array(3) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + } + [1]=> + array(1) { + [0]=> + int(3) + } +} + +[4] +array(1) { + [0]=> + array(4) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + } +} +array(1) { + [0]=> + array(4) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + } +} +array(1) { + [0]=> + array(4) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + } +} + + +=========================================== +array(4) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(4) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } + [2]=> + array(1) { + [0]=> + int(3) + } + [3]=> + array(1) { + [0]=> + int(4) + } +} +array(4) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [1]=> + int(2) + } + [2]=> + array(1) { + [2]=> + int(3) + } + [3]=> + array(1) { + [3]=> + int(4) + } +} +array(4) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } + [2]=> + array(1) { + [0]=> + int(3) + } + [3]=> + array(1) { + [0]=> + int(4) + } +} + +[2] +array(2) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(2) { + [0]=> + int(3) + [1]=> + int(4) + } +} +array(2) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(2) { + [2]=> + int(3) + [3]=> + int(4) + } +} +array(2) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(2) { + [0]=> + int(3) + [1]=> + int(4) + } +} + +[3] +array(2) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } + [1]=> + array(1) { + [0]=> + int(4) + } +} +array(2) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } + [1]=> + array(1) { + [3]=> + int(4) + } +} +array(2) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } + [1]=> + array(1) { + [0]=> + int(4) + } +} + +[4] +array(1) { + [0]=> + array(4) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + } +} +array(1) { + [0]=> + array(4) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + } +} +array(1) { + [0]=> + array(4) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + } +} + + +=========================================== +array(5) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(5) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [0]=> + int(1) + } + [2]=> + array(1) { + [0]=> + int(2) + } + [3]=> + array(1) { + [0]=> + int(3) + } + [4]=> + array(1) { + [0]=> + int(4) + } +} +array(5) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [1]=> + int(1) + } + [2]=> + array(1) { + [2]=> + int(2) + } + [3]=> + array(1) { + [3]=> + int(3) + } + [4]=> + array(1) { + [4]=> + int(4) + } +} +array(5) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [0]=> + int(1) + } + [2]=> + array(1) { + [0]=> + int(2) + } + [3]=> + array(1) { + [0]=> + int(3) + } + [4]=> + array(1) { + [0]=> + int(4) + } +} + +[2] +array(3) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(1) + } + [1]=> + array(2) { + [0]=> + int(2) + [1]=> + int(3) + } + [2]=> + array(1) { + [0]=> + int(4) + } +} +array(3) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(1) + } + [1]=> + array(2) { + [2]=> + int(2) + [3]=> + int(3) + } + [2]=> + array(1) { + [4]=> + int(4) + } +} +array(3) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(1) + } + [1]=> + array(2) { + [0]=> + int(2) + [1]=> + int(3) + } + [2]=> + array(1) { + [0]=> + int(4) + } +} + +[3] +array(2) { + [0]=> + array(3) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + } + [1]=> + array(2) { + [0]=> + int(3) + [1]=> + int(4) + } +} +array(2) { + [0]=> + array(3) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + } + [1]=> + array(2) { + [3]=> + int(3) + [4]=> + int(4) + } +} +array(2) { + [0]=> + array(3) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + } + [1]=> + array(2) { + [0]=> + int(3) + [1]=> + int(4) + } +} + +[4] +array(2) { + [0]=> + array(4) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + } + [1]=> + array(1) { + [0]=> + int(4) + } +} +array(2) { + [0]=> + array(4) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + } + [1]=> + array(1) { + [4]=> + int(4) + } +} +array(2) { + [0]=> + array(4) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + } + [1]=> + array(1) { + [0]=> + int(4) + } +} + +[5] +array(1) { + [0]=> + array(5) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + } +} +array(1) { + [0]=> + array(5) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + } +} +array(1) { + [0]=> + array(5) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + } +} + + +=========================================== +array(10) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + [7]=> + int(8) + [8]=> + int(9) + [9]=> + int(10) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(10) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } + [2]=> + array(1) { + [0]=> + int(3) + } + [3]=> + array(1) { + [0]=> + int(4) + } + [4]=> + array(1) { + [0]=> + int(5) + } + [5]=> + array(1) { + [0]=> + int(6) + } + [6]=> + array(1) { + [0]=> + int(7) + } + [7]=> + array(1) { + [0]=> + int(8) + } + [8]=> + array(1) { + [0]=> + int(9) + } + [9]=> + array(1) { + [0]=> + int(10) + } +} +array(10) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [1]=> + int(2) + } + [2]=> + array(1) { + [2]=> + int(3) + } + [3]=> + array(1) { + [3]=> + int(4) + } + [4]=> + array(1) { + [4]=> + int(5) + } + [5]=> + array(1) { + [5]=> + int(6) + } + [6]=> + array(1) { + [6]=> + int(7) + } + [7]=> + array(1) { + [7]=> + int(8) + } + [8]=> + array(1) { + [8]=> + int(9) + } + [9]=> + array(1) { + [9]=> + int(10) + } +} +array(10) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } + [2]=> + array(1) { + [0]=> + int(3) + } + [3]=> + array(1) { + [0]=> + int(4) + } + [4]=> + array(1) { + [0]=> + int(5) + } + [5]=> + array(1) { + [0]=> + int(6) + } + [6]=> + array(1) { + [0]=> + int(7) + } + [7]=> + array(1) { + [0]=> + int(8) + } + [8]=> + array(1) { + [0]=> + int(9) + } + [9]=> + array(1) { + [0]=> + int(10) + } +} + +[2] +array(5) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(2) { + [0]=> + int(3) + [1]=> + int(4) + } + [2]=> + array(2) { + [0]=> + int(5) + [1]=> + int(6) + } + [3]=> + array(2) { + [0]=> + int(7) + [1]=> + int(8) + } + [4]=> + array(2) { + [0]=> + int(9) + [1]=> + int(10) + } +} +array(5) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(2) { + [2]=> + int(3) + [3]=> + int(4) + } + [2]=> + array(2) { + [4]=> + int(5) + [5]=> + int(6) + } + [3]=> + array(2) { + [6]=> + int(7) + [7]=> + int(8) + } + [4]=> + array(2) { + [8]=> + int(9) + [9]=> + int(10) + } +} +array(5) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(2) { + [0]=> + int(3) + [1]=> + int(4) + } + [2]=> + array(2) { + [0]=> + int(5) + [1]=> + int(6) + } + [3]=> + array(2) { + [0]=> + int(7) + [1]=> + int(8) + } + [4]=> + array(2) { + [0]=> + int(9) + [1]=> + int(10) + } +} + +[3] +array(4) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } + [1]=> + array(3) { + [0]=> + int(4) + [1]=> + int(5) + [2]=> + int(6) + } + [2]=> + array(3) { + [0]=> + int(7) + [1]=> + int(8) + [2]=> + int(9) + } + [3]=> + array(1) { + [0]=> + int(10) + } +} +array(4) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } + [1]=> + array(3) { + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + } + [2]=> + array(3) { + [6]=> + int(7) + [7]=> + int(8) + [8]=> + int(9) + } + [3]=> + array(1) { + [9]=> + int(10) + } +} +array(4) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } + [1]=> + array(3) { + [0]=> + int(4) + [1]=> + int(5) + [2]=> + int(6) + } + [2]=> + array(3) { + [0]=> + int(7) + [1]=> + int(8) + [2]=> + int(9) + } + [3]=> + array(1) { + [0]=> + int(10) + } +} + +[4] +array(3) { + [0]=> + array(4) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + } + [1]=> + array(4) { + [0]=> + int(5) + [1]=> + int(6) + [2]=> + int(7) + [3]=> + int(8) + } + [2]=> + array(2) { + [0]=> + int(9) + [1]=> + int(10) + } +} +array(3) { + [0]=> + array(4) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + } + [1]=> + array(4) { + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + [7]=> + int(8) + } + [2]=> + array(2) { + [8]=> + int(9) + [9]=> + int(10) + } +} +array(3) { + [0]=> + array(4) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + } + [1]=> + array(4) { + [0]=> + int(5) + [1]=> + int(6) + [2]=> + int(7) + [3]=> + int(8) + } + [2]=> + array(2) { + [0]=> + int(9) + [1]=> + int(10) + } +} + +[5] +array(2) { + [0]=> + array(5) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + } + [1]=> + array(5) { + [0]=> + int(6) + [1]=> + int(7) + [2]=> + int(8) + [3]=> + int(9) + [4]=> + int(10) + } +} +array(2) { + [0]=> + array(5) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + } + [1]=> + array(5) { + [5]=> + int(6) + [6]=> + int(7) + [7]=> + int(8) + [8]=> + int(9) + [9]=> + int(10) + } +} +array(2) { + [0]=> + array(5) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + } + [1]=> + array(5) { + [0]=> + int(6) + [1]=> + int(7) + [2]=> + int(8) + [3]=> + int(9) + [4]=> + int(10) + } +} + +[6] +array(2) { + [0]=> + array(6) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + } + [1]=> + array(4) { + [0]=> + int(7) + [1]=> + int(8) + [2]=> + int(9) + [3]=> + int(10) + } +} +array(2) { + [0]=> + array(6) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + } + [1]=> + array(4) { + [6]=> + int(7) + [7]=> + int(8) + [8]=> + int(9) + [9]=> + int(10) + } +} +array(2) { + [0]=> + array(6) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + } + [1]=> + array(4) { + [0]=> + int(7) + [1]=> + int(8) + [2]=> + int(9) + [3]=> + int(10) + } +} + +[7] +array(2) { + [0]=> + array(7) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + } + [1]=> + array(3) { + [0]=> + int(8) + [1]=> + int(9) + [2]=> + int(10) + } +} +array(2) { + [0]=> + array(7) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + } + [1]=> + array(3) { + [7]=> + int(8) + [8]=> + int(9) + [9]=> + int(10) + } +} +array(2) { + [0]=> + array(7) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + } + [1]=> + array(3) { + [0]=> + int(8) + [1]=> + int(9) + [2]=> + int(10) + } +} + +[8] +array(2) { + [0]=> + array(8) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + [7]=> + int(8) + } + [1]=> + array(2) { + [0]=> + int(9) + [1]=> + int(10) + } +} +array(2) { + [0]=> + array(8) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + [7]=> + int(8) + } + [1]=> + array(2) { + [8]=> + int(9) + [9]=> + int(10) + } +} +array(2) { + [0]=> + array(8) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + [7]=> + int(8) + } + [1]=> + array(2) { + [0]=> + int(9) + [1]=> + int(10) + } +} + +[9] +array(2) { + [0]=> + array(9) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + [7]=> + int(8) + [8]=> + int(9) + } + [1]=> + array(1) { + [0]=> + int(10) + } +} +array(2) { + [0]=> + array(9) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + [7]=> + int(8) + [8]=> + int(9) + } + [1]=> + array(1) { + [9]=> + int(10) + } +} +array(2) { + [0]=> + array(9) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + [7]=> + int(8) + [8]=> + int(9) + } + [1]=> + array(1) { + [0]=> + int(10) + } +} + +[10] +array(1) { + [0]=> + array(10) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + [7]=> + int(8) + [8]=> + int(9) + [9]=> + int(10) + } +} +array(1) { + [0]=> + array(10) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + [7]=> + int(8) + [8]=> + int(9) + [9]=> + int(10) + } +} +array(1) { + [0]=> + array(10) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + [7]=> + int(8) + [8]=> + int(9) + [9]=> + int(10) + } +} + + +=========================================== +array(11) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + [8]=> + int(8) + [9]=> + int(9) + [10]=> + int(10) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(11) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [0]=> + int(1) + } + [2]=> + array(1) { + [0]=> + int(2) + } + [3]=> + array(1) { + [0]=> + int(3) + } + [4]=> + array(1) { + [0]=> + int(4) + } + [5]=> + array(1) { + [0]=> + int(5) + } + [6]=> + array(1) { + [0]=> + int(6) + } + [7]=> + array(1) { + [0]=> + int(7) + } + [8]=> + array(1) { + [0]=> + int(8) + } + [9]=> + array(1) { + [0]=> + int(9) + } + [10]=> + array(1) { + [0]=> + int(10) + } +} +array(11) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [1]=> + int(1) + } + [2]=> + array(1) { + [2]=> + int(2) + } + [3]=> + array(1) { + [3]=> + int(3) + } + [4]=> + array(1) { + [4]=> + int(4) + } + [5]=> + array(1) { + [5]=> + int(5) + } + [6]=> + array(1) { + [6]=> + int(6) + } + [7]=> + array(1) { + [7]=> + int(7) + } + [8]=> + array(1) { + [8]=> + int(8) + } + [9]=> + array(1) { + [9]=> + int(9) + } + [10]=> + array(1) { + [10]=> + int(10) + } +} +array(11) { + [0]=> + array(1) { + [0]=> + int(0) + } + [1]=> + array(1) { + [0]=> + int(1) + } + [2]=> + array(1) { + [0]=> + int(2) + } + [3]=> + array(1) { + [0]=> + int(3) + } + [4]=> + array(1) { + [0]=> + int(4) + } + [5]=> + array(1) { + [0]=> + int(5) + } + [6]=> + array(1) { + [0]=> + int(6) + } + [7]=> + array(1) { + [0]=> + int(7) + } + [8]=> + array(1) { + [0]=> + int(8) + } + [9]=> + array(1) { + [0]=> + int(9) + } + [10]=> + array(1) { + [0]=> + int(10) + } +} + +[2] +array(6) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(1) + } + [1]=> + array(2) { + [0]=> + int(2) + [1]=> + int(3) + } + [2]=> + array(2) { + [0]=> + int(4) + [1]=> + int(5) + } + [3]=> + array(2) { + [0]=> + int(6) + [1]=> + int(7) + } + [4]=> + array(2) { + [0]=> + int(8) + [1]=> + int(9) + } + [5]=> + array(1) { + [0]=> + int(10) + } +} +array(6) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(1) + } + [1]=> + array(2) { + [2]=> + int(2) + [3]=> + int(3) + } + [2]=> + array(2) { + [4]=> + int(4) + [5]=> + int(5) + } + [3]=> + array(2) { + [6]=> + int(6) + [7]=> + int(7) + } + [4]=> + array(2) { + [8]=> + int(8) + [9]=> + int(9) + } + [5]=> + array(1) { + [10]=> + int(10) + } +} +array(6) { + [0]=> + array(2) { + [0]=> + int(0) + [1]=> + int(1) + } + [1]=> + array(2) { + [0]=> + int(2) + [1]=> + int(3) + } + [2]=> + array(2) { + [0]=> + int(4) + [1]=> + int(5) + } + [3]=> + array(2) { + [0]=> + int(6) + [1]=> + int(7) + } + [4]=> + array(2) { + [0]=> + int(8) + [1]=> + int(9) + } + [5]=> + array(1) { + [0]=> + int(10) + } +} + +[3] +array(4) { + [0]=> + array(3) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + } + [1]=> + array(3) { + [0]=> + int(3) + [1]=> + int(4) + [2]=> + int(5) + } + [2]=> + array(3) { + [0]=> + int(6) + [1]=> + int(7) + [2]=> + int(8) + } + [3]=> + array(2) { + [0]=> + int(9) + [1]=> + int(10) + } +} +array(4) { + [0]=> + array(3) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + } + [1]=> + array(3) { + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + } + [2]=> + array(3) { + [6]=> + int(6) + [7]=> + int(7) + [8]=> + int(8) + } + [3]=> + array(2) { + [9]=> + int(9) + [10]=> + int(10) + } +} +array(4) { + [0]=> + array(3) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + } + [1]=> + array(3) { + [0]=> + int(3) + [1]=> + int(4) + [2]=> + int(5) + } + [2]=> + array(3) { + [0]=> + int(6) + [1]=> + int(7) + [2]=> + int(8) + } + [3]=> + array(2) { + [0]=> + int(9) + [1]=> + int(10) + } +} + +[4] +array(3) { + [0]=> + array(4) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + } + [1]=> + array(4) { + [0]=> + int(4) + [1]=> + int(5) + [2]=> + int(6) + [3]=> + int(7) + } + [2]=> + array(3) { + [0]=> + int(8) + [1]=> + int(9) + [2]=> + int(10) + } +} +array(3) { + [0]=> + array(4) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + } + [1]=> + array(4) { + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + } + [2]=> + array(3) { + [8]=> + int(8) + [9]=> + int(9) + [10]=> + int(10) + } +} +array(3) { + [0]=> + array(4) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + } + [1]=> + array(4) { + [0]=> + int(4) + [1]=> + int(5) + [2]=> + int(6) + [3]=> + int(7) + } + [2]=> + array(3) { + [0]=> + int(8) + [1]=> + int(9) + [2]=> + int(10) + } +} + +[5] +array(3) { + [0]=> + array(5) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + } + [1]=> + array(5) { + [0]=> + int(5) + [1]=> + int(6) + [2]=> + int(7) + [3]=> + int(8) + [4]=> + int(9) + } + [2]=> + array(1) { + [0]=> + int(10) + } +} +array(3) { + [0]=> + array(5) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + } + [1]=> + array(5) { + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + [8]=> + int(8) + [9]=> + int(9) + } + [2]=> + array(1) { + [10]=> + int(10) + } +} +array(3) { + [0]=> + array(5) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + } + [1]=> + array(5) { + [0]=> + int(5) + [1]=> + int(6) + [2]=> + int(7) + [3]=> + int(8) + [4]=> + int(9) + } + [2]=> + array(1) { + [0]=> + int(10) + } +} + +[6] +array(2) { + [0]=> + array(6) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + } + [1]=> + array(5) { + [0]=> + int(6) + [1]=> + int(7) + [2]=> + int(8) + [3]=> + int(9) + [4]=> + int(10) + } +} +array(2) { + [0]=> + array(6) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + } + [1]=> + array(5) { + [6]=> + int(6) + [7]=> + int(7) + [8]=> + int(8) + [9]=> + int(9) + [10]=> + int(10) + } +} +array(2) { + [0]=> + array(6) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + } + [1]=> + array(5) { + [0]=> + int(6) + [1]=> + int(7) + [2]=> + int(8) + [3]=> + int(9) + [4]=> + int(10) + } +} + +[7] +array(2) { + [0]=> + array(7) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + } + [1]=> + array(4) { + [0]=> + int(7) + [1]=> + int(8) + [2]=> + int(9) + [3]=> + int(10) + } +} +array(2) { + [0]=> + array(7) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + } + [1]=> + array(4) { + [7]=> + int(7) + [8]=> + int(8) + [9]=> + int(9) + [10]=> + int(10) + } +} +array(2) { + [0]=> + array(7) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + } + [1]=> + array(4) { + [0]=> + int(7) + [1]=> + int(8) + [2]=> + int(9) + [3]=> + int(10) + } +} + +[8] +array(2) { + [0]=> + array(8) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + } + [1]=> + array(3) { + [0]=> + int(8) + [1]=> + int(9) + [2]=> + int(10) + } +} +array(2) { + [0]=> + array(8) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + } + [1]=> + array(3) { + [8]=> + int(8) + [9]=> + int(9) + [10]=> + int(10) + } +} +array(2) { + [0]=> + array(8) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + } + [1]=> + array(3) { + [0]=> + int(8) + [1]=> + int(9) + [2]=> + int(10) + } +} + +[9] +array(2) { + [0]=> + array(9) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + [8]=> + int(8) + } + [1]=> + array(2) { + [0]=> + int(9) + [1]=> + int(10) + } +} +array(2) { + [0]=> + array(9) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + [8]=> + int(8) + } + [1]=> + array(2) { + [9]=> + int(9) + [10]=> + int(10) + } +} +array(2) { + [0]=> + array(9) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + [8]=> + int(8) + } + [1]=> + array(2) { + [0]=> + int(9) + [1]=> + int(10) + } +} + +[10] +array(2) { + [0]=> + array(10) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + [8]=> + int(8) + [9]=> + int(9) + } + [1]=> + array(1) { + [0]=> + int(10) + } +} +array(2) { + [0]=> + array(10) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + [8]=> + int(8) + [9]=> + int(9) + } + [1]=> + array(1) { + [10]=> + int(10) + } +} +array(2) { + [0]=> + array(10) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + [8]=> + int(8) + [9]=> + int(9) + } + [1]=> + array(1) { + [0]=> + int(10) + } +} + +[11] +array(1) { + [0]=> + array(11) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + [8]=> + int(8) + [9]=> + int(9) + [10]=> + int(10) + } +} +array(1) { + [0]=> + array(11) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + [8]=> + int(8) + [9]=> + int(9) + [10]=> + int(10) + } +} +array(1) { + [0]=> + array(11) { + [0]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [3]=> + int(3) + [4]=> + int(4) + [5]=> + int(5) + [6]=> + int(6) + [7]=> + int(7) + [8]=> + int(8) + [9]=> + int(9) + [10]=> + int(10) + } +} + + +=========================================== +array(1) { + [u"a"]=> + int(1) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(1) { + [0]=> + array(1) { + [0]=> + int(1) + } +} +array(1) { + [0]=> + array(1) { + [u"a"]=> + int(1) + } +} +array(1) { + [0]=> + array(1) { + [0]=> + int(1) + } +} + + +=========================================== +array(2) { + [u"b"]=> + int(1) + [u"c"]=> + int(2) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(2) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } +} +array(2) { + [0]=> + array(1) { + [u"b"]=> + int(1) + } + [1]=> + array(1) { + [u"c"]=> + int(2) + } +} +array(2) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } +} + +[2] +array(1) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } +} +array(1) { + [0]=> + array(2) { + [u"b"]=> + int(1) + [u"c"]=> + int(2) + } +} +array(1) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } +} + + +=========================================== +array(6) { + [u"p"]=> + int(1) + [u"q"]=> + int(2) + [u"r"]=> + int(3) + [u"s"]=> + int(4) + [u"u"]=> + int(5) + [u"v"]=> + int(6) +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(6) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } + [2]=> + array(1) { + [0]=> + int(3) + } + [3]=> + array(1) { + [0]=> + int(4) + } + [4]=> + array(1) { + [0]=> + int(5) + } + [5]=> + array(1) { + [0]=> + int(6) + } +} +array(6) { + [0]=> + array(1) { + [u"p"]=> + int(1) + } + [1]=> + array(1) { + [u"q"]=> + int(2) + } + [2]=> + array(1) { + [u"r"]=> + int(3) + } + [3]=> + array(1) { + [u"s"]=> + int(4) + } + [4]=> + array(1) { + [u"u"]=> + int(5) + } + [5]=> + array(1) { + [u"v"]=> + int(6) + } +} +array(6) { + [0]=> + array(1) { + [0]=> + int(1) + } + [1]=> + array(1) { + [0]=> + int(2) + } + [2]=> + array(1) { + [0]=> + int(3) + } + [3]=> + array(1) { + [0]=> + int(4) + } + [4]=> + array(1) { + [0]=> + int(5) + } + [5]=> + array(1) { + [0]=> + int(6) + } +} + +[2] +array(3) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(2) { + [0]=> + int(3) + [1]=> + int(4) + } + [2]=> + array(2) { + [0]=> + int(5) + [1]=> + int(6) + } +} +array(3) { + [0]=> + array(2) { + [u"p"]=> + int(1) + [u"q"]=> + int(2) + } + [1]=> + array(2) { + [u"r"]=> + int(3) + [u"s"]=> + int(4) + } + [2]=> + array(2) { + [u"u"]=> + int(5) + [u"v"]=> + int(6) + } +} +array(3) { + [0]=> + array(2) { + [0]=> + int(1) + [1]=> + int(2) + } + [1]=> + array(2) { + [0]=> + int(3) + [1]=> + int(4) + } + [2]=> + array(2) { + [0]=> + int(5) + [1]=> + int(6) + } +} + +[3] +array(2) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } + [1]=> + array(3) { + [0]=> + int(4) + [1]=> + int(5) + [2]=> + int(6) + } +} +array(2) { + [0]=> + array(3) { + [u"p"]=> + int(1) + [u"q"]=> + int(2) + [u"r"]=> + int(3) + } + [1]=> + array(3) { + [u"s"]=> + int(4) + [u"u"]=> + int(5) + [u"v"]=> + int(6) + } +} +array(2) { + [0]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } + [1]=> + array(3) { + [0]=> + int(4) + [1]=> + int(5) + [2]=> + int(6) + } +} + +[4] +array(2) { + [0]=> + array(4) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + } + [1]=> + array(2) { + [0]=> + int(5) + [1]=> + int(6) + } +} +array(2) { + [0]=> + array(4) { + [u"p"]=> + int(1) + [u"q"]=> + int(2) + [u"r"]=> + int(3) + [u"s"]=> + int(4) + } + [1]=> + array(2) { + [u"u"]=> + int(5) + [u"v"]=> + int(6) + } +} +array(2) { + [0]=> + array(4) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + } + [1]=> + array(2) { + [0]=> + int(5) + [1]=> + int(6) + } +} + +[5] +array(2) { + [0]=> + array(5) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + } + [1]=> + array(1) { + [0]=> + int(6) + } +} +array(2) { + [0]=> + array(5) { + [u"p"]=> + int(1) + [u"q"]=> + int(2) + [u"r"]=> + int(3) + [u"s"]=> + int(4) + [u"u"]=> + int(5) + } + [1]=> + array(1) { + [u"v"]=> + int(6) + } +} +array(2) { + [0]=> + array(5) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + } + [1]=> + array(1) { + [0]=> + int(6) + } +} + +[6] +array(1) { + [0]=> + array(6) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + } +} +array(1) { + [0]=> + array(6) { + [u"p"]=> + int(1) + [u"q"]=> + int(2) + [u"r"]=> + int(3) + [u"s"]=> + int(4) + [u"u"]=> + int(5) + [u"v"]=> + int(6) + } +} +array(1) { + [0]=> + array(6) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + } +} + + +=========================================== +array(1) { + [u"a"]=> + unicode(1) "A" +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(1) { + [0]=> + array(1) { + [0]=> + unicode(1) "A" + } +} +array(1) { + [0]=> + array(1) { + [u"a"]=> + unicode(1) "A" + } +} +array(1) { + [0]=> + array(1) { + [0]=> + unicode(1) "A" + } +} + + +=========================================== +array(6) { + [u"p"]=> + unicode(1) "A" + [u"q"]=> + unicode(1) "B" + [u"r"]=> + unicode(1) "C" + [u"s"]=> + unicode(1) "D" + [u"u"]=> + unicode(1) "E" + [u"v"]=> + unicode(1) "F" +} +------------------------------------------- +[0] +NULL +NULL +NULL + +[1] +array(6) { + [0]=> + array(1) { + [0]=> + unicode(1) "A" + } + [1]=> + array(1) { + [0]=> + unicode(1) "B" + } + [2]=> + array(1) { + [0]=> + unicode(1) "C" + } + [3]=> + array(1) { + [0]=> + unicode(1) "D" + } + [4]=> + array(1) { + [0]=> + unicode(1) "E" + } + [5]=> + array(1) { + [0]=> + unicode(1) "F" + } +} +array(6) { + [0]=> + array(1) { + [u"p"]=> + unicode(1) "A" + } + [1]=> + array(1) { + [u"q"]=> + unicode(1) "B" + } + [2]=> + array(1) { + [u"r"]=> + unicode(1) "C" + } + [3]=> + array(1) { + [u"s"]=> + unicode(1) "D" + } + [4]=> + array(1) { + [u"u"]=> + unicode(1) "E" + } + [5]=> + array(1) { + [u"v"]=> + unicode(1) "F" + } +} +array(6) { + [0]=> + array(1) { + [0]=> + unicode(1) "A" + } + [1]=> + array(1) { + [0]=> + unicode(1) "B" + } + [2]=> + array(1) { + [0]=> + unicode(1) "C" + } + [3]=> + array(1) { + [0]=> + unicode(1) "D" + } + [4]=> + array(1) { + [0]=> + unicode(1) "E" + } + [5]=> + array(1) { + [0]=> + unicode(1) "F" + } +} + +[2] +array(3) { + [0]=> + array(2) { + [0]=> + unicode(1) "A" + [1]=> + unicode(1) "B" + } + [1]=> + array(2) { + [0]=> + unicode(1) "C" + [1]=> + unicode(1) "D" + } + [2]=> + array(2) { + [0]=> + unicode(1) "E" + [1]=> + unicode(1) "F" + } +} +array(3) { + [0]=> + array(2) { + [u"p"]=> + unicode(1) "A" + [u"q"]=> + unicode(1) "B" + } + [1]=> + array(2) { + [u"r"]=> + unicode(1) "C" + [u"s"]=> + unicode(1) "D" + } + [2]=> + array(2) { + [u"u"]=> + unicode(1) "E" + [u"v"]=> + unicode(1) "F" + } +} +array(3) { + [0]=> + array(2) { + [0]=> + unicode(1) "A" + [1]=> + unicode(1) "B" + } + [1]=> + array(2) { + [0]=> + unicode(1) "C" + [1]=> + unicode(1) "D" + } + [2]=> + array(2) { + [0]=> + unicode(1) "E" + [1]=> + unicode(1) "F" + } +} + +[3] +array(2) { + [0]=> + array(3) { + [0]=> + unicode(1) "A" + [1]=> + unicode(1) "B" + [2]=> + unicode(1) "C" + } + [1]=> + array(3) { + [0]=> + unicode(1) "D" + [1]=> + unicode(1) "E" + [2]=> + unicode(1) "F" + } +} +array(2) { + [0]=> + array(3) { + [u"p"]=> + unicode(1) "A" + [u"q"]=> + unicode(1) "B" + [u"r"]=> + unicode(1) "C" + } + [1]=> + array(3) { + [u"s"]=> + unicode(1) "D" + [u"u"]=> + unicode(1) "E" + [u"v"]=> + unicode(1) "F" + } +} +array(2) { + [0]=> + array(3) { + [0]=> + unicode(1) "A" + [1]=> + unicode(1) "B" + [2]=> + unicode(1) "C" + } + [1]=> + array(3) { + [0]=> + unicode(1) "D" + [1]=> + unicode(1) "E" + [2]=> + unicode(1) "F" + } +} + +[4] +array(2) { + [0]=> + array(4) { + [0]=> + unicode(1) "A" + [1]=> + unicode(1) "B" + [2]=> + unicode(1) "C" + [3]=> + unicode(1) "D" + } + [1]=> + array(2) { + [0]=> + unicode(1) "E" + [1]=> + unicode(1) "F" + } +} +array(2) { + [0]=> + array(4) { + [u"p"]=> + unicode(1) "A" + [u"q"]=> + unicode(1) "B" + [u"r"]=> + unicode(1) "C" + [u"s"]=> + unicode(1) "D" + } + [1]=> + array(2) { + [u"u"]=> + unicode(1) "E" + [u"v"]=> + unicode(1) "F" + } +} +array(2) { + [0]=> + array(4) { + [0]=> + unicode(1) "A" + [1]=> + unicode(1) "B" + [2]=> + unicode(1) "C" + [3]=> + unicode(1) "D" + } + [1]=> + array(2) { + [0]=> + unicode(1) "E" + [1]=> + unicode(1) "F" + } +} + +[5] +array(2) { + [0]=> + array(5) { + [0]=> + unicode(1) "A" + [1]=> + unicode(1) "B" + [2]=> + unicode(1) "C" + [3]=> + unicode(1) "D" + [4]=> + unicode(1) "E" + } + [1]=> + array(1) { + [0]=> + unicode(1) "F" + } +} +array(2) { + [0]=> + array(5) { + [u"p"]=> + unicode(1) "A" + [u"q"]=> + unicode(1) "B" + [u"r"]=> + unicode(1) "C" + [u"s"]=> + unicode(1) "D" + [u"u"]=> + unicode(1) "E" + } + [1]=> + array(1) { + [u"v"]=> + unicode(1) "F" + } +} +array(2) { + [0]=> + array(5) { + [0]=> + unicode(1) "A" + [1]=> + unicode(1) "B" + [2]=> + unicode(1) "C" + [3]=> + unicode(1) "D" + [4]=> + unicode(1) "E" + } + [1]=> + array(1) { + [0]=> + unicode(1) "F" + } +} + +[6] +array(1) { + [0]=> + array(6) { + [0]=> + unicode(1) "A" + [1]=> + unicode(1) "B" + [2]=> + unicode(1) "C" + [3]=> + unicode(1) "D" + [4]=> + unicode(1) "E" + [5]=> + unicode(1) "F" + } +} +array(1) { + [0]=> + array(6) { + [u"p"]=> + unicode(1) "A" + [u"q"]=> + unicode(1) "B" + [u"r"]=> + unicode(1) "C" + [u"s"]=> + unicode(1) "D" + [u"u"]=> + unicode(1) "E" + [u"v"]=> + unicode(1) "F" + } +} +array(1) { + [0]=> + array(6) { + [0]=> + unicode(1) "A" + [1]=> + unicode(1) "B" + [2]=> + unicode(1) "C" + [3]=> + unicode(1) "D" + [4]=> + unicode(1) "E" + [5]=> + unicode(1) "F" + } +} + + +end http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/array_count_values.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/standard/tests/array/array_count_values.phpt diff -u php-src/ext/standard/tests/array/array_count_values.phpt:1.2 php-src/ext/standard/tests/array/array_count_values.phpt:1.3 --- php-src/ext/standard/tests/array/array_count_values.phpt:1.2 Sat Nov 16 12:26:52 2002 +++ php-src/ext/standard/tests/array/array_count_values.phpt Mon Aug 15 10:37:55 2005 @@ -92,4 +92,73 @@ [1]=> int(1) } +--UEXPECT-- +array(0) { +} +array(1) { + [0]=> + int(1) +} + +array(1) { + [1]=> + int(1) +} + +array(1) { + [-1]=> + int(1) +} + +array(1) { + [0]=> + int(2) +} + +array(2) { + [0]=> + int(1) + [1]=> + int(1) +} + +array(1) { + [1]=> + int(2) +} + +array(3) { + [1]=> + int(2) + [u"hello"]=> + int(2) + [u"world"]=> + int(1) +} + +array(2) { + [u"hello"]=> + int(2) + [u"world"]=> + int(1) +} + +array(3) { + [u""]=> + int(2) + [u"world"]=> + int(3) + [u"hello"]=> + int(4) +} + +array(1) { + [0]=> + int(1) +} + +array(1) { + [1]=> + int(1) +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/array_intersect_1.phpt?r1=1.6&r2=1.7&ty=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.6 php-src/ext/standard/tests/array/array_intersect_1.phpt:1.7 --- php-src/ext/standard/tests/array/array_intersect_1.phpt:1.6 Mon Aug 15 03:55:40 2005 +++ php-src/ext/standard/tests/array/array_intersect_1.phpt Mon Aug 15 10:37:55 2005 @@ -563,3 +563,480 @@ } } end ------------ array_uintersect_uassoc() with method -------- +--UEXPECTF-- +begin ------------ array_intersect() ---------------------------- +$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_intersect($a, $b); +array(0) { +} +end ------------ array_intersect() ---------------------------- +begin ------------ array_uintersect() --------------------------- +$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_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' => + 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_intersect_assoc($a, $b)); +array(0) { +} +end ------------ array_intersect_assoc() ---------------------- +begin ------------ array_uintersect_assoc() --------------------- +$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_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' => + 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_intersect_uassoc($a, $b, "comp_func")); +array(0) { +} +end ------------ array_intersect_uassoc() --------------------- +begin ------------ array_uintersect_uassoc() with ordinary func - +$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_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' => + 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_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/diff.php/php-src/ext/standard/tests/array/bug20381.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/standard/tests/array/bug20381.phpt diff -u php-src/ext/standard/tests/array/bug20381.phpt:1.1 php-src/ext/standard/tests/array/bug20381.phpt:1.2 --- php-src/ext/standard/tests/array/bug20381.phpt:1.1 Thu Nov 14 21:11:23 2002 +++ php-src/ext/standard/tests/array/bug20381.phpt Mon Aug 15 10:37:55 2005 @@ -77,3 +77,58 @@ string(1) "b" } } +--UEXPECT-- +array(3) { + [u"a1"]=> + int(1) + [u"a2"]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } + [u"a3"]=> + array(2) { + [u"a"]=> + array(3) { + [0]=> + int(10) + [1]=> + int(20) + [2]=> + int(30) + } + [u"b"]=> + unicode(1) "b" + } +} +array(3) { + [u"a1"]=> + int(1) + [u"a2"]=> + array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + } + [u"a3"]=> + array(2) { + [u"a"]=> + array(3) { + [0]=> + int(10) + [1]=> + int(20) + [2]=> + int(30) + } + [u"b"]=> + unicode(1) "b" + } +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug21182.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/standard/tests/array/bug21182.phpt diff -u php-src/ext/standard/tests/array/bug21182.phpt:1.1 php-src/ext/standard/tests/array/bug21182.phpt:1.2 --- php-src/ext/standard/tests/array/bug21182.phpt:1.1 Wed Dec 25 15:08:36 2002 +++ php-src/ext/standard/tests/array/bug21182.phpt Mon Aug 15 10:37:55 2005 @@ -10,3 +10,6 @@ --EXPECT-- a1: 20 a2: 20 : type : string +--UEXPECT-- +a1: 20 +a2: 20 : type : unicode http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug21918.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/standard/tests/array/bug21918.phpt diff -u php-src/ext/standard/tests/array/bug21918.phpt:1.2 php-src/ext/standard/tests/array/bug21918.phpt:1.3 --- php-src/ext/standard/tests/array/bug21918.phpt:1.2 Wed Aug 13 05:48:20 2003 +++ php-src/ext/standard/tests/array/bug21918.phpt Mon Aug 15 10:37:55 2005 @@ -53,3 +53,26 @@ int(-2) string(1) "a" ==Done== +--UEXPECT-- +==Mixed== +int(-1) +unicode(1) "a" +int(-2) +unicode(1) "b" +int(3) +unicode(1) "c" +int(4) +unicode(1) "d" +int(5) +unicode(1) "e" +int(6001) +unicode(1) "f" +unicode(2) "07" +unicode(1) "g" +==Normal== +int(0) +unicode(1) "a" +==Negative== +int(-2) +unicode(1) "a" +==Done== http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug21998.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/standard/tests/array/bug21998.phpt diff -u php-src/ext/standard/tests/array/bug21998.phpt:1.2 php-src/ext/standard/tests/array/bug21998.phpt:1.3 --- php-src/ext/standard/tests/array/bug21998.phpt:1.2 Mon Feb 3 11:52:04 2003 +++ php-src/ext/standard/tests/array/bug21998.phpt Mon Aug 15 10:37:55 2005 @@ -22,3 +22,11 @@ int(0) string(1) "a" NULL +--UEXPECT-- +int(0) +unicode(1) "c" +int(0) +unicode(1) "b" +int(0) +unicode(1) "a" +NULL http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug22088.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/standard/tests/array/bug22088.phpt diff -u php-src/ext/standard/tests/array/bug22088.phpt:1.2 php-src/ext/standard/tests/array/bug22088.phpt:1.3 --- php-src/ext/standard/tests/array/bug22088.phpt:1.2 Thu Feb 6 10:22:41 2003 +++ php-src/ext/standard/tests/array/bug22088.phpt Mon Aug 15 10:37:55 2005 @@ -31,3 +31,20 @@ [0]=> string(1) "a" } +--UEXPECT-- +array(3) { + [0]=> + unicode(1) "b" + [1]=> + unicode(1) "c" + [2]=> + unicode(1) "a" +} +array(3) { + [u"b"]=> + int(2) + [u"c"]=> + int(3) + [0]=> + unicode(1) "a" +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug24198.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/standard/tests/array/bug24198.phpt diff -u php-src/ext/standard/tests/array/bug24198.phpt:1.1 php-src/ext/standard/tests/array/bug24198.phpt:1.2 --- php-src/ext/standard/tests/array/bug24198.phpt:1.1 Mon Jun 16 13:35:16 2003 +++ php-src/ext/standard/tests/array/bug24198.phpt Mon Aug 15 10:37:55 2005 @@ -23,3 +23,20 @@ string(2) "bb" } } +--UEXPECT-- +array(2) { + [u"a"]=> + array(2) { + [0]=> + unicode(2) "aa" + [1]=> + unicode(2) "aa" + } + [u"b"]=> + array(2) { + [0]=> + unicode(2) "bb" + [1]=> + unicode(2) "bb" + } +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug24220.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/standard/tests/array/bug24220.phpt diff -u php-src/ext/standard/tests/array/bug24220.phpt:1.1 php-src/ext/standard/tests/array/bug24220.phpt:1.2 --- php-src/ext/standard/tests/array/bug24220.phpt:1.1 Tue Jun 17 09:19:20 2003 +++ php-src/ext/standard/tests/array/bug24220.phpt Mon Aug 15 10:37:55 2005 @@ -89,3 +89,86 @@ [9]=> int(10) } +--UEXPECT-- +array(2) { + [0]=> + int(2003) + [1]=> + int(2004) +} +array(26) { + [0]=> + unicode(1) "a" + [1]=> + unicode(1) "b" + [2]=> + unicode(1) "c" + [3]=> + unicode(1) "d" + [4]=> + unicode(1) "e" + [5]=> + unicode(1) "f" + [6]=> + unicode(1) "g" + [7]=> + unicode(1) "h" + [8]=> + unicode(1) "i" + [9]=> + unicode(1) "j" + [10]=> + unicode(1) "k" + [11]=> + unicode(1) "l" + [12]=> + unicode(1) "m" + [13]=> + unicode(1) "n" + [14]=> + unicode(1) "o" + [15]=> + unicode(1) "p" + [16]=> + unicode(1) "q" + [17]=> + unicode(1) "r" + [18]=> + unicode(1) "s" + [19]=> + unicode(1) "t" + [20]=> + unicode(1) "u" + [21]=> + unicode(1) "v" + [22]=> + unicode(1) "w" + [23]=> + unicode(1) "x" + [24]=> + unicode(1) "y" + [25]=> + unicode(1) "z" +} +array(10) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) + [5]=> + int(6) + [6]=> + int(7) + [7]=> + int(8) + [8]=> + int(9) + [9]=> + int(10) +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug24980.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/standard/tests/array/bug24980.phpt diff -u php-src/ext/standard/tests/array/bug24980.phpt:1.1 php-src/ext/standard/tests/array/bug24980.phpt:1.2 --- php-src/ext/standard/tests/array/bug24980.phpt:1.1 Sat Aug 9 12:44:33 2003 +++ php-src/ext/standard/tests/array/bug24980.phpt Mon Aug 15 10:37:55 2005 @@ -51,3 +51,13 @@ int(15) int(1200) int(1) +--UEXPECT-- +running_total is 0, current_value is 2 +running_total is 4, current_value is 3 +running_total is 13, current_value is 5 +running_total is 38, current_value is 7 +Total is 87 +unicode(3) "abc" +int(15) +int(1200) +int(1) http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug25359.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/standard/tests/array/bug25359.phpt diff -u php-src/ext/standard/tests/array/bug25359.phpt:1.1 php-src/ext/standard/tests/array/bug25359.phpt:1.2 --- php-src/ext/standard/tests/array/bug25359.phpt:1.1 Sat Jul 30 09:37:57 2005 +++ php-src/ext/standard/tests/array/bug25359.phpt Mon Aug 15 10:37:55 2005 @@ -30,3 +30,16 @@ [4]=> string(5) "fifth" } +--UEXPECT-- +array(5) { + [0]=> + unicode(5) "first" + [1]=> + unicode(6) "second" + [2]=> + unicode(5) "third" + [3]=> + unicode(5) "forth" + [4]=> + unicode(5) "fifth" +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug25708.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/standard/tests/array/bug25708.phpt diff -u php-src/ext/standard/tests/array/bug25708.phpt:1.1 php-src/ext/standard/tests/array/bug25708.phpt:1.2 --- php-src/ext/standard/tests/array/bug25708.phpt:1.1 Thu Oct 2 18:50:28 2003 +++ php-src/ext/standard/tests/array/bug25708.phpt Mon Aug 15 10:37:55 2005 @@ -221,3 +221,158 @@ ----r string(2) "ok" refcount(2) string(2) "ok" refcount(2) +--UEXPECT-- +NULL refcount(2) +NULL refcount(2) +long(1) refcount(3) +long(2) refcount(3) +-- +long(1) refcount(1) +long(2) refcount(1) +long(1) refcount(1) +long(2) refcount(1) +-- +long(1) refcount(1) +long(2) refcount(1) +long(1) refcount(1) +long(2) refcount(1) +-- +long(1) refcount(1) +long(3) refcount(1) +long(1) refcount(1) +long(3) refcount(1) +-- +long(4) refcount(1) +long(3) refcount(1) +long(4) refcount(1) +long(3) refcount(1) +-- +long(3) refcount(1) +long(3) refcount(1) +long(3) refcount(2) +-- +long(4) refcount(1) +unicode(1) "x" refcount(1) +long(4) refcount(1) +unicode(1) "x" refcount(1) +long(3) refcount(2) +-- +long(1) refcount(2) +long(2) refcount(2) +----a +long(1) refcount(1) +long(2) refcount(1) +long(1) refcount(1) +long(2) refcount(1) +-- +long(1) refcount(1) +long(2) refcount(1) +long(1) refcount(1) +long(2) refcount(1) +-- +long(1) refcount(1) +long(2) refcount(1) +long(1) refcount(1) +long(2) refcount(1) +-- +long(1) refcount(1) +long(3) refcount(1) +long(1) refcount(1) +long(3) refcount(1) +-- +long(4) refcount(1) +long(3) refcount(1) +long(4) refcount(1) +long(3) refcount(1) +-- +long(3) refcount(1) +long(3) refcount(1) +long(3) refcount(2) +-- +long(4) refcount(1) +unicode(1) "x" refcount(1) +long(4) refcount(1) +unicode(1) "x" refcount(1) +long(3) refcount(2) +-- +long(1) refcount(2) +long(2) refcount(2) +----ra +NULL refcount(2) +NULL refcount(2) +long(1) refcount(3) +long(2) refcount(3) +-- +long(1) refcount(1) +long(2) refcount(1) +long(1) refcount(1) +long(2) refcount(1) +-- +long(1) refcount(1) +long(2) refcount(1) +long(1) refcount(1) +long(2) refcount(1) +-- +long(1) refcount(1) +long(3) refcount(1) +long(1) refcount(1) +long(3) refcount(1) +-- +long(4) refcount(1) +long(3) refcount(1) +long(4) refcount(1) +long(3) refcount(1) +-- +long(3) refcount(1) +long(3) refcount(1) +long(3) refcount(2) +-- +long(4) refcount(1) +unicode(1) "x" refcount(1) +long(4) refcount(1) +unicode(1) "x" refcount(1) +long(3) refcount(2) +-- +long(1) refcount(2) +long(2) refcount(2) +---- +long(1) refcount(1) +long(2) refcount(1) +long(1) refcount(1) +long(2) refcount(1) +-- +long(1) refcount(1) +long(2) refcount(1) +long(1) refcount(1) +long(2) refcount(1) +-- +long(1) refcount(1) +long(2) refcount(1) +long(1) refcount(1) +long(2) refcount(1) +-- +long(1) refcount(1) +long(3) refcount(1) +long(1) refcount(1) +long(3) refcount(1) +-- +long(4) refcount(1) +long(3) refcount(1) +long(4) refcount(1) +long(3) refcount(1) +-- +long(3) refcount(1) +long(3) refcount(1) +long(3) refcount(2) +-- +long(4) refcount(1) +unicode(1) "x" refcount(1) +long(4) refcount(1) +unicode(1) "x" refcount(1) +long(3) refcount(2) +-- +long(1) refcount(2) +long(2) refcount(2) +----r +unicode(2) "ok" refcount(2) +unicode(2) "ok" refcount(2) http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug28739.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/standard/tests/array/bug28739.phpt diff -u php-src/ext/standard/tests/array/bug28739.phpt:1.1 php-src/ext/standard/tests/array/bug28739.phpt:1.2 --- php-src/ext/standard/tests/array/bug28739.phpt:1.1 Sun Jul 11 15:20:05 2004 +++ php-src/ext/standard/tests/array/bug28739.phpt Mon Aug 15 10:37:55 2005 @@ -55,4 +55,43 @@ [x] => 1 ) +) +--UEXPECT-- +unicode(1) "a" +unicode(1) "a" +Array +( + [2] => p Object + ( + [x] => 0 + ) + + [1] => p Object + ( + [x] => 1 + ) + + [0] => p Object + ( + [x] => 2 + ) + +) +Now diffing: +unicode(1) "b" +unicode(1) "b" +unicode(1) "b" +unicode(1) "b" +unicode(1) "b" +unicode(1) "b" +unicode(1) "b" +unicode(1) "b" +unicode(1) "b" +Array +( + [1] => p Object + ( + [x] => 1 + ) + ) \ No newline at end of file http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug29253.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/standard/tests/array/bug29253.phpt diff -u php-src/ext/standard/tests/array/bug29253.phpt:1.2 php-src/ext/standard/tests/array/bug29253.phpt:1.3 --- php-src/ext/standard/tests/array/bug29253.phpt:1.2 Wed Aug 10 03:43:16 2005 +++ php-src/ext/standard/tests/array/bug29253.phpt Mon Aug 15 10:37:55 2005 @@ -11,3 +11,7 @@ array(0) { } string(4) "afad" +--UEXPECT-- +array(0) { +} +unicode(4) "afad" http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug29493.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/standard/tests/array/bug29493.phpt diff -u php-src/ext/standard/tests/array/bug29493.phpt:1.1 php-src/ext/standard/tests/array/bug29493.phpt:1.2 --- php-src/ext/standard/tests/array/bug29493.phpt:1.1 Sun Jan 2 01:51:03 2005 +++ php-src/ext/standard/tests/array/bug29493.phpt Mon Aug 15 10:37:55 2005 @@ -113,3 +113,44 @@ ["foo"]=> &string(3) "noo" } +--UEXPECT-- +array(1) { + [u"foo"]=> + unicode(3) "aaa" +} +array(1) { + [u"foo"]=> + unicode(3) "bbb" +} +array(1) { + [u"foo"]=> + &unicode(3) "noo" +} +array(1) { + [u"foo"]=> + unicode(3) "bbb" +} +array(1) { + [u"foo"]=> + unicode(3) "bbb" +} +array(1) { + [u"foo"]=> + unicode(3) "bbb" +} +array(1) { + [u"foo"]=> + &unicode(3) "noo" +} +array(1) { + [u"foo"]=> + &unicode(3) "noo" +} +array(1) { + [u"foo"]=> + unicode(3) "aaa" +} +array(1) { + [u"foo"]=> + &unicode(3) "noo" +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug30833.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/standard/tests/array/bug30833.phpt diff -u php-src/ext/standard/tests/array/bug30833.phpt:1.1 php-src/ext/standard/tests/array/bug30833.phpt:1.2 --- php-src/ext/standard/tests/array/bug30833.phpt:1.1 Wed Apr 13 04:23:39 2005 +++ php-src/ext/standard/tests/array/bug30833.phpt Mon Aug 15 10:37:55 2005 @@ -33,3 +33,23 @@ string(4) "0000" } Done +--UEXPECT-- +array(2) { + [0]=> + unicode(3) "abc" + [1]=> + unicode(4) "0000" +} +array(2) { + [u"abc"]=> + int(1) + [0]=> + int(1) +} +array(2) { + [0]=> + unicode(3) "abc" + [1]=> + unicode(4) "0000" +} +Done http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/bug31213.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/standard/tests/array/bug31213.phpt diff -u php-src/ext/standard/tests/array/bug31213.phpt:1.2 php-src/ext/standard/tests/array/bug31213.phpt:1.3 --- php-src/ext/standard/tests/array/bug31213.phpt:1.2 Tue Jun 7 17:39:54 2005 +++ php-src/ext/standard/tests/array/bug31213.phpt Mon Aug 15 10:37:55 2005 @@ -55,3 +55,28 @@ ["_b"]=> &int(2) } +--UEXPECT-- +int(1) +int(1) +int(1) +int(2) +int(2) +int(2) +array(2) { + [u"_a"]=> + &int(2) + [u"_b"]=> + &int(2) +} +int(1) +int(1) +int(1) +int(2) +int(2) +int(2) +array(2) { + [u"_a"]=> + &int(2) + [u"_b"]=> + &int(2) +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/general_functions/getopt.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/ext/standard/tests/general_functions/getopt.phpt diff -u php-src/ext/standard/tests/general_functions/getopt.phpt:1.3 php-src/ext/standard/tests/general_functions/getopt.phpt:1.4 --- php-src/ext/standard/tests/general_functions/getopt.phpt:1.3 Mon Jun 30 14:22:52 2003 +++ php-src/ext/standard/tests/general_functions/getopt.phpt Mon Aug 15 10:37:55 2005 @@ -28,3 +28,16 @@ ["t"]=> bool(false) } +--UEXPECT-- +array(5) { + [u"v"]=> + bool(false) + [u"h"]=> + bool(false) + [u"d"]=> + unicode(4) "test" + [u"m"]=> + unicode(4) "1234" + [u"t"]=> + bool(false) +} http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/bug24208.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/standard/tests/strings/bug24208.phpt diff -u php-src/ext/standard/tests/strings/bug24208.phpt:1.1 php-src/ext/standard/tests/strings/bug24208.phpt:1.2 --- php-src/ext/standard/tests/strings/bug24208.phpt:1.1 Mon Jun 16 15:10:12 2003 +++ php-src/ext/standard/tests/strings/bug24208.phpt Mon Aug 15 10:37:55 2005 @@ -10,3 +10,7 @@ string(1) "1" string(1) "2" string(1) "3" +--UEXPECT-- +unicode(1) "1" +unicode(1) "2" +unicode(1) "3" http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/bug27278.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/ext/standard/tests/strings/bug27278.phpt diff -u php-src/ext/standard/tests/strings/bug27278.phpt:1.3 php-src/ext/standard/tests/strings/bug27278.phpt:1.4 --- php-src/ext/standard/tests/strings/bug27278.phpt:1.3 Mon Feb 16 12:44:27 2004 +++ php-src/ext/standard/tests/strings/bug27278.phpt Mon Aug 15 10:37:55 2005 @@ -19,3 +19,7 @@ string(2) "02" string(2) "02" string(2) "02" +--UEXPECT-- +unicode(2) "02" +unicode(2) "02" +unicode(2) "02"