cvs: php-src /tests/basic 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 022.phpt 023.phpt 024.phpt 026.phpt 027.phpt
bug29971.phpt /tests/classes __call_001.phpt __call_003.phpt __call_004.phpt __call_005.phpt setget_001.phpt setget_004.phpt
setget_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 autoload_007.phpt autoload_008.phpt
autoload_009.phpt autoload_010.phpt autoload_011.phpt autoload_012.phpt autoload_013.phpt autoload_014.phpt autoload_015.phpt autoload_016.phpt
autoload_017.phpt autoload_018.phpt autoload_019.phpt autoload_020.phpt autoload_derived.p5c autoload_implements.p5c bug26737.phpt bug29446.phpt
class_stdclass.phpt clone_001.phpt clone_002.phpt clone_004.phpt constants_basic_001.phpt constants_basic_002.phpt constants_basic_003.phpt co!
nstants_basic_004.phpt constants_basic_005.phpt constants_basic_006.phpt ctor_dtor.phpt ctor_dtor_inheritance.phpt ctor_name_clash.phpt
destructor_and_exceptions.phpt destructor_inheritance.phpt destructor_visibility_003.phpt factory_and_singleton_006.phpt final.phpt
inheritance_002.phpt inheritance_005.phpt interface_constant_inheritance_001.phpt interface_constant_inheritance_002.phpt
interface_constant_inheritance_004.phpt interface_doubled.phpt interface_implemented.phpt interface_optional_arg.phpt interface_optional_arg_002.phpt
interfaces_001.phpt iterators_004.phpt iterators_006.phpt method_call_variation_001.phpt new_001.phpt private_005b.phpt private_006.phpt
private_006b.phpt private_007.phpt private_007b.phpt private_members.phpt property_override_privateStatic_private.phpt
property_override_privateStatic_privateStatic.phpt property_override_privateStatic_protected.phpt property_override_privateStatic_protectedStatic.phpt
property_override_privateStatic_public.ph! pt property_override_privateStatic_publicStatic.phpt property_override_private_private.phpt
property_override_private_privateStatic.phpt property_override_private_protected.phpt property_override_private_protectedStatic.phpt
property_override_private_public.phpt property_override_private_publicStatic.phpt property_override_p

From:	Steph Fox	Date:	Mon, 26 May 2008 15:52:08 +0000
Subject:	cvs: php-src /tests/basic 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 022.phpt 023.phpt 024.phpt 026.phpt 027.phpt bug29971.phpt /tests/classes __call_001.phpt __call_003.phpt __call_004.phpt __call_005.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 autoload_007.phpt autoload_008.phpt autoload_009.phpt autoload_010.phpt autoload_011.phpt autoload_012.phpt autoload_013.phpt autoload_014.phpt autoload_015.phpt autoload_016.phpt autoload_017.phpt autoload_018.phpt autoload_019.phpt autoload_020.phpt autoload_derived.p5c autoload_implements.p5c bug26737.phpt bug29446.phpt class_stdclass.phpt clone_001.phpt clone_002.phpt clone_004.phpt constants_basic_001.phpt constants_basic_002.phpt constants_basic_003.phpt co! nstants_basic_004.phpt constants_basic_005.phpt constants_basic_006.phpt ctor_dtor.phpt ctor_dtor_inheritance.phpt ctor_name_clash.phpt destructor_and_exceptions.phpt destructor_inheritance.phpt destructor_visibility_003.phpt factory_and_singleton_006.phpt final.phpt inheritance_002.phpt inheritance_005.phpt interface_constant_inheritance_001.phpt interface_constant_inheritance_002.phpt interface_constant_inheritance_004.phpt interface_doubled.phpt interface_implemented.phpt interface_optional_arg.phpt interface_optional_arg_002.phpt interfaces_001.phpt iterators_004.phpt iterators_006.phpt method_call_variation_001.phpt new_001.phpt private_005b.phpt private_006.phpt private_006b.phpt private_007.phpt private_007b.phpt private_members.phpt property_override_privateStatic_private.phpt property_override_privateStatic_privateStatic.phpt property_override_privateStatic_protected.phpt property_override_privateStatic_protectedStatic.phpt property_override_privateStatic_public.ph! pt property_override_privateStatic_publicStatic.phpt property_override_private_private.phpt property_override_private_privateStatic.phpt property_override_private_protected.phpt property_override_private_protectedStatic.phpt property_override_private_public.phpt property_override_private_publicStatic.phpt property_override_p
Groups:	php.cvs
Request:	Send a blank email to php-cvs+get-50148@lists.php.net to get a copy of this message

sfox Mon May 26 15:52:08 2008 UTC Modified files: /php-src/tests/basic 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 022.phpt 023.phpt 024.phpt 026.phpt 027.phpt bug29971.phpt /php-src/tests/classes __call_001.phpt __call_003.phpt __call_004.phpt __call_005.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 autoload_007.phpt autoload_008.phpt autoload_009.phpt autoload_010.phpt autoload_011.phpt autoload_012.phpt autoload_013.phpt autoload_014.phpt autoload_015.phpt autoload_016.phpt autoload_017.phpt autoload_018.phpt autoload_019.phpt autoload_020.phpt autoload_derived.p5c autoload_implements.p5c bug26737.phpt bug29446.phpt class_stdclass.phpt clone_001.phpt clone_002.phpt clone_004.phpt constants_basic_001.phpt constants_basic_002.phpt constants_basic_003.phpt constants_basic_004.phpt constants_basic_005.phpt constants_basic_006.phpt ctor_dtor.phpt ctor_dtor_inheritance.phpt ctor_name_clash.phpt destructor_and_exceptions.phpt destructor_inheritance.phpt destructor_visibility_003.phpt factory_and_singleton_006.phpt final.phpt inheritance_002.phpt inheritance_005.phpt interface_constant_inheritance_001.phpt interface_constant_inheritance_002.phpt interface_constant_inheritance_004.phpt interface_doubled.phpt interface_implemented.phpt interface_optional_arg.phpt interface_optional_arg_002.phpt interfaces_001.phpt iterators_004.phpt iterators_006.phpt method_call_variation_001.phpt new_001.phpt private_005b.phpt private_006.phpt private_006b.phpt private_007.phpt private_007b.phpt private_members.phpt property_override_privateStatic_private.phpt property_override_privateStatic_privateStatic.phpt property_override_privateStatic_protected.phpt property_override_privateStatic_protectedStatic.phpt property_override_privateStatic_public.phpt property_override_privateStatic_publicStatic.phpt property_override_private_private.phpt property_override_private_privateStatic.phpt property_override_private_protected.phpt property_override_private_protectedStatic.phpt property_override_private_public.phpt property_override_private_publicStatic.phpt property_override_protectedStatic_private.phpt property_override_protectedStatic_privateStatic.phpt property_override_protectedStatic_protected.phpt property_override_protectedStatic_protectedStatic.phpt property_override_protectedStatic_public.phpt property_override_protectedStatic_publicStatic.phpt property_override_protected_protected.phpt property_override_protected_public.phpt property_override_publicStatic_private.phpt property_override_publicStatic_privateStatic.phpt property_override_publicStatic_protected.phpt property_override_publicStatic_protectedStatic.phpt property_override_publicStatic_public.phpt property_override_publicStatic_publicStatic.phpt property_override_public_private.phpt property_override_public_protected.phpt property_override_public_public.phpt serialize_001.phpt static_mix_1.phpt static_mix_2.phpt static_properties_001.phpt tostring_001.phpt tostring_002.phpt tostring_004.phpt visibility_000c.phpt visibility_001c.phpt visibility_002c.phpt visibility_003a.phpt visibility_003c.phpt visibility_004a.phpt visibility_004b.phpt visibility_004c.phpt /php-src/tests/func 003.phpt 005.phpt 006.phpt 010.phpt /php-src/tests/lang 004.phpt 005.phpt 006.phpt 007.phpt 023-1.inc 023.phpt 028.phpt 032.phpt 034.phpt 035.phpt 038.phpt 039.phpt bug18872.phpt bug19943.phpt bug21094.phpt bug21600.phpt bug21961.phpt bug22231.phpt bug22592.phpt bug23624.phpt bug24573.phpt bug25145.phpt bug28800.phpt bug30638.phpt bug32828.phpt bug35382.phpt bug38579.inc catchable_error_002.phpt include_variation3.phpt type_hints_002.phpt /php-src/tests/output ob_001.phpt ob_016.phpt ob_018.phpt /php-src/tests/run-test test001.phpt test002.phpt test003.phpt test004.phpt test005.phpt test008.phpt test008a.phpt /php-src/tests/security open_basedir_chdir.phpt open_basedir_chmod.phpt open_basedir_copy.phpt open_basedir_copy_variation1.phpt open_basedir_dir.phpt open_basedir_error_log.phpt open_basedir_error_log_variation.phpt open_basedir_file.phpt open_basedir_file_exists.phpt open_basedir_file_put_contents.phpt open_basedir_fileatime.phpt open_basedir_filectime.phpt open_basedir_filegroup.phpt open_basedir_fileinode.phpt open_basedir_filemtime.phpt open_basedir_fileowner.phpt open_basedir_fileperms.phpt open_basedir_filesize.phpt open_basedir_filetype.phpt open_basedir_fopen.phpt open_basedir_glob-win32.phpt open_basedir_glob.phpt open_basedir_is_dir.phpt open_basedir_is_file.phpt open_basedir_is_link.phpt open_basedir_is_readable.phpt open_basedir_is_writable.phpt open_basedir_link.phpt open_basedir_linkinfo.phpt open_basedir_lstat.phpt open_basedir_opendir.phpt open_basedir_parse_ini_file.phpt open_basedir_readlink.phpt open_basedir_realpath.phpt open_basedir_rename.phpt open_basedir_rmdir.phpt open_basedir_scandir.phpt open_basedir_stat.phpt open_basedir_symlink.phpt open_basedir_tempnam.phpt open_basedir_touch.phpt open_basedir_unlink.phpt /php-src/tests/strings bug22592.phpt /php-src/tests/unicode autodetect-SCSU.phpt autodetect-UTF16BE.phpt autodetect-UTF16LE.phpt autodetect-UTF32BE.phpt autodetect-UTF32LE.phpt autodetect-UTF7.phpt autodetect-UTF8.phpt enc-HZ.phpt enc-ISO-2022-KR.phpt enc-JIS.phpt enc-SJIS.phpt encrt-HZ.phpt encrt-ISO-2022-KR.phpt encrt-JIS.phpt encrt-SJIS.phpt normalize_001.phpt normalize_002.phpt normalize_003.phpt normalize_004.phpt /php-src/tests/unicode/func strpos.phpt strstr.phpt Log: - killed off UEXPECT

http://cvs.php.net/viewvc.cgi/php-src/tests/basic/013.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/basic/013.phpt diff -u php-src/tests/basic/013.phpt:1.3 php-src/tests/basic/013.phpt:1.4 --- php-src/tests/basic/013.phpt:1.3 Thu May 25 10:38:01 2006 +++ php-src/tests/basic/013.phpt Mon May 26 15:52:04 2008 @@ -11,10 +11,5 @@ --EXPECT-- array(1) { [0]=> - string(1) "1" -} ---UEXPECT-- -array(1) { - [0]=> unicode(1) "1" } http://cvs.php.net/viewvc.cgi/php-src/tests/basic/014.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/basic/014.phpt diff -u php-src/tests/basic/014.phpt:1.3 php-src/tests/basic/014.phpt:1.4 --- php-src/tests/basic/014.phpt:1.3 Thu May 25 10:38:01 2006 +++ php-src/tests/basic/014.phpt Mon May 26 15:52:04 2008 @@ -11,13 +11,6 @@ --EXPECT-- array(2) { [0]=> - string(1) "1" - [1]=> - string(1) "1" -} ---UEXPECT-- -array(2) { - [0]=> unicode(1) "1" [1]=> unicode(1) "1" http://cvs.php.net/viewvc.cgi/php-src/tests/basic/015.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/basic/015.phpt diff -u php-src/tests/basic/015.phpt:1.3 php-src/tests/basic/015.phpt:1.4 --- php-src/tests/basic/015.phpt:1.3 Thu May 25 10:38:01 2006 +++ php-src/tests/basic/015.phpt Mon May 26 15:52:04 2008 @@ -11,10 +11,5 @@ --EXPECT-- array(1) { [0]=> - string(1) "5" -} ---UEXPECT-- -array(1) { - [0]=> unicode(1) "5" } http://cvs.php.net/viewvc.cgi/php-src/tests/basic/016.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/basic/016.phpt diff -u php-src/tests/basic/016.phpt:1.3 php-src/tests/basic/016.phpt:1.4 --- php-src/tests/basic/016.phpt:1.3 Thu May 25 10:38:01 2006 +++ php-src/tests/basic/016.phpt Mon May 26 15:52:04 2008 @@ -10,13 +10,6 @@ ?> --EXPECT-- array(2) { - ["a"]=> - string(1) "1" - ["b"]=> - string(1) "3" -} ---UEXPECT-- -array(2) { [u"a"]=> unicode(1) "1" [u"b"]=> http://cvs.php.net/viewvc.cgi/php-src/tests/basic/017.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/basic/017.phpt diff -u php-src/tests/basic/017.phpt:1.3 php-src/tests/basic/017.phpt:1.4 --- php-src/tests/basic/017.phpt:1.3 Thu May 25 10:38:01 2006 +++ php-src/tests/basic/017.phpt Mon May 26 15:52:04 2008 @@ -11,15 +11,6 @@ --EXPECT-- array(3) { [0]=> - string(1) "1" - ["a"]=> - string(1) "1" - ["b"]=> - string(1) "3" -} ---UEXPECT-- -array(3) { - [0]=> unicode(1) "1" [u"a"]=> unicode(1) "1" http://cvs.php.net/viewvc.cgi/php-src/tests/basic/018.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/basic/018.phpt diff -u php-src/tests/basic/018.phpt:1.3 php-src/tests/basic/018.phpt:1.4 --- php-src/tests/basic/018.phpt:1.3 Thu May 25 10:38:01 2006 +++ php-src/tests/basic/018.phpt Mon May 26 15:52:04 2008 @@ -14,31 +14,6 @@ [0]=> array(1) { [0]=> - string(1) "1" - } - [1]=> - array(1) { - [0]=> - string(1) "3" - } -} -array(1) { - ["a"]=> - array(1) { - ["b"]=> - array(2) { - ["c"]=> - string(1) "1" - ["d"]=> - string(1) "1" - } - } -} ---UEXPECT-- -array(2) { - [0]=> - array(1) { - [0]=> unicode(1) "1" } [1]=> http://cvs.php.net/viewvc.cgi/php-src/tests/basic/019.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/basic/019.phpt diff -u php-src/tests/basic/019.phpt:1.3 php-src/tests/basic/019.phpt:1.4 --- php-src/tests/basic/019.phpt:1.3 Thu May 25 10:38:01 2006 +++ php-src/tests/basic/019.phpt Mon May 26 15:52:04 2008 @@ -11,15 +11,6 @@ --EXPECT-- array(3) { [0]=> - string(1) "1" - [1]=> - string(1) "3" - ["["]=> - string(1) "4" -} ---UEXPECT-- -array(3) { - [0]=> unicode(1) "1" [1]=> unicode(1) "3" http://cvs.php.net/viewvc.cgi/php-src/tests/basic/020.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/basic/020.phpt diff -u php-src/tests/basic/020.phpt:1.3 php-src/tests/basic/020.phpt:1.4 --- php-src/tests/basic/020.phpt:1.3 Thu May 25 10:38:01 2006 +++ php-src/tests/basic/020.phpt Mon May 26 15:52:04 2008 @@ -10,13 +10,6 @@ ?> --EXPECT-- array(2) { - ["a["]=> - string(1) "1" - ["b["]=> - string(1) "3" -} ---UEXPECT-- -array(2) { [u"a["]=> unicode(1) "1" [u"b["]=> http://cvs.php.net/viewvc.cgi/php-src/tests/basic/022.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/basic/022.phpt diff -u php-src/tests/basic/022.phpt:1.2 php-src/tests/basic/022.phpt:1.3 --- php-src/tests/basic/022.phpt:1.2 Mon Feb 19 20:02:08 2007 +++ php-src/tests/basic/022.phpt Mon May 26 15:52:04 2008 @@ -1,36 +1,13 @@ --TEST-- Cookies test#1 --COOKIE-- -cookie1=val1 ; cookie2=val2%20; cookie3=val 3.; cookie 4= value 4 %3B; cookie1=bogus; %20cookie1=ignore;+cookie1=ignore;cookie1;cookie 5=%20 value; cookie%206=þæö;cookie+7=;$cookie.8;cookie-9=1;;;- & % $cookie 10=10 +cookie1=val1 ; cookie2=val2%20; cookie3=val 3.; cookie 4= value 4 %3B; cookie1=bogus; %20cookie1=ignore;+cookie1=ignore;cookie1;cookie 5=%20 value; cookie%206=Ã¾Ã¦Ã¶;cookie+7=;$cookie.8;cookie-9=1;;;- & % $cookie 10=10 --FILE-- <?php var_dump($_COOKIE); ?> --EXPECT-- array(10) { - ["cookie1"]=> - string(6) "val1 " - ["cookie2"]=> - string(5) "val2 " - ["cookie3"]=> - string(6) "val 3." - ["cookie_4"]=> - string(10) " value 4 ;" - ["cookie__5"]=> - string(7) " value" - ["cookie_6"]=> - string(3) "þæö" - ["cookie_7"]=> - string(0) "" - ["$cookie_8"]=> - string(0) "" - ["cookie-9"]=> - string(1) "1" - ["-_&_%_$cookie_10"]=> - string(2) "10" -} ---UEXPECTF-- -array(10) { [u"cookie1"]=> unicode(0) "" [u"cookie2"]=> http://cvs.php.net/viewvc.cgi/php-src/tests/basic/023.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/basic/023.phpt diff -u php-src/tests/basic/023.phpt:1.2 php-src/tests/basic/023.phpt:1.3 --- php-src/tests/basic/023.phpt:1.2 Mon Feb 19 20:02:08 2007 +++ php-src/tests/basic/023.phpt Mon May 26 15:52:04 2008 @@ -8,15 +8,6 @@ ?> --EXPECT-- array(3) { - ["c_o_o_k_i_e"]=> - string(5) "value" - ["name"]=> - string(24) ""value","value",UEhQIQ==" - ["UEhQIQ"]=> - string(4) "=foo" -} ---UEXPECT-- -array(3) { [u"c_o_o_k_i_e"]=> unicode(1) "v" [u"name"]=> http://cvs.php.net/viewvc.cgi/php-src/tests/basic/024.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/basic/024.phpt diff -u php-src/tests/basic/024.phpt:1.2 php-src/tests/basic/024.phpt:1.3 --- php-src/tests/basic/024.phpt:1.2 Tue Jun 5 11:25:21 2007 +++ php-src/tests/basic/024.phpt Mon May 26 15:52:04 2008 @@ -13,23 +13,6 @@ ?> --EXPECT-- array(3) { - ["a"]=> - string(3) "ABC" - ["y"]=> - string(3) "XYZ" - ["c"]=> - array(3) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - ["a"]=> - string(1) "3" - } -} -string(30) "a=ABC&y=XYZ&c[]=1&c[]=2&c[a]=3" ---UEXPECT-- -array(3) { [u"a"]=> unicode(3) "ABC" [u"y"]=> http://cvs.php.net/viewvc.cgi/php-src/tests/basic/026.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/basic/026.phpt diff -u php-src/tests/basic/026.phpt:1.3 php-src/tests/basic/026.phpt:1.4 --- php-src/tests/basic/026.phpt:1.3 Thu Jan 10 08:45:54 2008 +++ php-src/tests/basic/026.phpt Mon May 26 15:52:04 2008 @@ -15,8 +15,4 @@ --EXPECT-- array(0) { } -string(9) "a=1&b=ZYX" ---UEXPECT-- -array(0) { -} unicode(9) "a=1&b=ZYX" http://cvs.php.net/viewvc.cgi/php-src/tests/basic/027.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/tests/basic/027.phpt diff -u php-src/tests/basic/027.phpt:1.5 php-src/tests/basic/027.phpt:1.6 --- php-src/tests/basic/027.phpt:1.5 Tue Jun 5 11:25:21 2007 +++ php-src/tests/basic/027.phpt Mon May 26 15:52:04 2008 @@ -17,24 +17,6 @@ ?> --EXPECT-- array(4) { - ["a"]=> - string(1) "1" - ["b"]=> - string(3) "ZYX" - ["d"]=> - string(3) "123" - ["e"]=> - array(1) { - [0]=> - array(1) { - [0]=> - string(1) "3" - } - } -} -string(106) "Input variable nesting level exceeded 10. To increase the limit change max_input_nesting_level in php.ini." ---UEXPECT-- -array(4) { [u"a"]=> unicode(1) "1" [u"b"]=> http://cvs.php.net/viewvc.cgi/php-src/tests/basic/bug29971.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/basic/bug29971.phpt diff -u php-src/tests/basic/bug29971.phpt:1.4 php-src/tests/basic/bug29971.phpt:1.5 --- php-src/tests/basic/bug29971.phpt:1.4 Fri Mar 17 15:04:23 2006 +++ php-src/tests/basic/bug29971.phpt Mon May 26 15:52:04 2008 @@ -13,10 +13,4 @@ } array(0) { } -string(3) "GPC" ---UEXPECT-- -array(0) { -} -array(0) { -} unicode(3) "GPC" http://cvs.php.net/viewvc.cgi/php-src/tests/classes/__call_001.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/classes/__call_001.phpt diff -u php-src/tests/classes/__call_001.phpt:1.4 php-src/tests/classes/__call_001.phpt:1.5 --- php-src/tests/classes/__call_001.phpt:1.4 Mon Aug 15 14:37:54 2005 +++ php-src/tests/classes/__call_001.phpt Mon May 26 15:52:04 2008 @@ -26,26 +26,6 @@ [0]=> int(1) [1]=> - string(1) "2" - [2]=> - float(3.4) - [3]=> - bool(true) -} -array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) -} ---UEXPECT-- -Method test called: -array(4) { - [0]=> - int(1) - [1]=> unicode(1) "2" [2]=> float(3.4) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/__call_003.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/__call_003.phpt diff -u php-src/tests/classes/__call_003.phpt:1.2 php-src/tests/classes/__call_003.phpt:1.3 --- php-src/tests/classes/__call_003.phpt:1.2 Wed Jan 30 14:29:18 2008 +++ php-src/tests/classes/__call_003.phpt Mon May 26 15:52:04 2008 @@ -21,16 +21,7 @@ var_dump($a, $b); ?> ---EXPECTF-- -array(1) { - [0]=> - string(8) "original" -} -array(1) { - [0]=> - &string(7) "changed" -} ---UEXPECTF-- +--EXPECT-- array(1) { [0]=> unicode(8) "original" @@ -38,4 +29,4 @@ array(1) { [0]=> &unicode(7) "changed" -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/tests/classes/__call_004.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/__call_004.phpt diff -u php-src/tests/classes/__call_004.phpt:1.2 php-src/tests/classes/__call_004.phpt:1.3 --- php-src/tests/classes/__call_004.phpt:1.2 Thu Mar 6 11:07:29 2008 +++ php-src/tests/classes/__call_004.phpt Mon May 26 15:52:04 2008 @@ -26,7 +26,7 @@ $b = new B(); $b->test(); ?> ---EXPECTF-- +--EXPECT-- In B::__call(test1, array(1,a)) object(B)#1 (0) { } @@ -38,4 +38,4 @@ } In B::__call(test4, array(1,a)) object(B)#1 (0) { -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/tests/classes/__call_005.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/__call_005.phpt diff -u php-src/tests/classes/__call_005.phpt:1.2 php-src/tests/classes/__call_005.phpt:1.3 --- php-src/tests/classes/__call_005.phpt:1.2 Thu Mar 6 11:07:29 2008 +++ php-src/tests/classes/__call_005.phpt Mon May 26 15:52:04 2008 @@ -21,7 +21,7 @@ $b = new B(); $b->test(); ?> ---EXPECTF-- +--EXPECT-- In A::__call(test1, array(1,a)) object(B)#1 (0) { } @@ -33,4 +33,4 @@ } In A::__call(test4, array(1,a)) object(B)#1 (0) { -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/tests/classes/__set__get_001.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/classes/__set__get_001.phpt diff -u php-src/tests/classes/__set__get_001.phpt:1.4 php-src/tests/classes/__set__get_001.phpt:1.5 --- php-src/tests/classes/__set__get_001.phpt:1.4 Mon Aug 15 14:37:54 2005 +++ php-src/tests/classes/__set__get_001.phpt Mon May 26 15:52:04 2008 @@ -23,7 +23,7 @@ function __set($nm, $val) { echo "Setting [$nm] to $val\n"; - + if (isset($this->x[$nm])) { $this->x[$nm] = $val; echo "OK!\n"; @@ -58,30 +58,6 @@ Setting [z] to 1 Not OK! object(setter)#%d (2) { - ["n"]=> - int(1) - ["x"]=> - array(3) { - ["a"]=> - int(101) - ["b"]=> - int(2) - ["c"]=> - 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"]=> http://cvs.php.net/viewvc.cgi/php-src/tests/classes/__set__get_004.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/__set__get_004.phpt diff -u php-src/tests/classes/__set__get_004.phpt:1.2 php-src/tests/classes/__set__get_004.phpt:1.3 --- php-src/tests/classes/__set__get_004.phpt:1.2 Mon Aug 15 14:37:54 2005 +++ php-src/tests/classes/__set__get_004.phpt Mon May 26 15:52:04 2008 @@ -34,10 +34,6 @@ ?> ===DONE=== --EXPECT-- -string(5) "Check" -string(5) "Check" -===DONE=== ---UEXPECT-- unicode(5) "Check" unicode(5) "Check" ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/tests/classes/__set__get_005.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/classes/__set__get_005.phpt diff -u php-src/tests/classes/__set__get_005.phpt:1.3 php-src/tests/classes/__set__get_005.phpt:1.4 --- php-src/tests/classes/__set__get_005.phpt:1.3 Mon Aug 15 14:37:54 2005 +++ php-src/tests/classes/__set__get_005.phpt Mon May 26 15:52:04 2008 @@ -56,21 +56,6 @@ Test::__set AutoGen::__get object(Test)#%d (1) { - ["x":protected]=> - array(1) { - ["baz"]=> - string(5) "Check" - } -} -AutoGen::__get -Test::__get -string(5) "Check" -===DONE=== ---UEXPECTF-- -AutoGen::__get -Test::__set -AutoGen::__get -object(Test)#%d (1) { [u"x":protected]=> array(1) { [u"baz"]=> http://cvs.php.net/viewvc.cgi/php-src/tests/classes/array_access_001.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/tests/classes/array_access_001.phpt diff -u php-src/tests/classes/array_access_001.phpt:1.6 php-src/tests/classes/array_access_001.phpt:1.7 --- php-src/tests/classes/array_access_001.phpt:1.6 Sat Mar 8 13:01:40 2008 +++ php-src/tests/classes/array_access_001.phpt Mon May 26 15:52:04 2008 @@ -86,119 +86,6 @@ --EXPECTF-- array(4) { [0]=> - string(3) "1st" - [1]=> - int(1) - [2]=> - string(3) "3rd" - ["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) -string(3) "1st" -object::offsetGet(1) -int(1) -object::offsetGet(2) -string(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) -string(9) "Changed 1" -WRITE 2 -object::offsetSet(4th,Changed 4th) -object::offsetGet(4th) -string(11) "Changed 4th" -WRITE 3 -object::offsetSet(5th,Added 5th) -object::offsetGet(5th) -string(9) "Added 5th" -WRITE 4 -object::offsetSet(6,Added 6) -object::offsetGet(6) -string(7) "Added 6" -object::offsetGet(0) -string(3) "1st" -object::offsetGet(2) -string(3) "3rd" -object::offsetSet(6,changed 6) -object::offsetGet(6) -string(9) "changed 6" -string(9) "changed 6" -===unset=== -array(6) { - [0]=> - string(3) "1st" - [1]=> - string(9) "Changed 1" - [2]=> - string(3) "3rd" - ["4th"]=> - string(11) "Changed 4th" - ["5th"]=> - string(9) "Added 5th" - [6]=> - string(9) "changed 6" -} -object::offsetUnset(2) -object::offsetUnset(4th) -object::offsetUnset(7) -object::offsetUnset(8th) -array(4) { - [0]=> - string(3) "1st" - [1]=> - string(9) "Changed 1" - ["5th"]=> - string(9) "Added 5th" - [6]=> - string(9) "changed 6" -} -===DONE=== ---UEXPECTF-- -array(4) { - [0]=> unicode(3) "1st" [1]=> int(1) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/array_access_002.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/tests/classes/array_access_002.phpt diff -u php-src/tests/classes/array_access_002.phpt:1.6 php-src/tests/classes/array_access_002.phpt:1.7 --- php-src/tests/classes/array_access_002.phpt:1.6 Sat Mar 8 13:01:40 2008 +++ php-src/tests/classes/array_access_002.phpt Mon May 26 15:52:04 2008 @@ -86,119 +86,6 @@ --EXPECTF-- array(4) { [0]=> - string(3) "1st" - [1]=> - int(1) - [2]=> - string(3) "3rd" - ["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) -string(3) "1st" -object::offsetGet(1) -int(1) -object::offsetGet(2) -string(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) -string(9) "Changed 1" -WRITE 2 -object::offsetSet(4th,Changed 4th) -object::offsetGet(4th) -string(11) "Changed 4th" -WRITE 3 -object::offsetSet(5th,Added 5th) -object::offsetGet(5th) -string(9) "Added 5th" -WRITE 4 -object::offsetSet(6,Added 6) -object::offsetGet(6) -string(7) "Added 6" -object::offsetGet(0) -string(3) "1st" -object::offsetGet(2) -string(3) "3rd" -object::offsetSet(6,changed 6) -object::offsetGet(6) -string(9) "changed 6" -string(9) "changed 6" -===unset=== -array(6) { - [0]=> - string(3) "1st" - [1]=> - string(9) "Changed 1" - [2]=> - string(3) "3rd" - ["4th"]=> - string(11) "Changed 4th" - ["5th"]=> - string(9) "Added 5th" - [6]=> - string(9) "changed 6" -} -object::offsetUnset(2) -object::offsetUnset(4th) -object::offsetUnset(7) -object::offsetUnset(8th) -array(4) { - [0]=> - string(3) "1st" - [1]=> - string(9) "Changed 1" - ["5th"]=> - string(9) "Added 5th" - [6]=> - string(9) "changed 6" -} -===DONE=== ---UEXPECTF-- -array(4) { - [0]=> unicode(3) "1st" [1]=> int(1) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/array_access_003.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/tests/classes/array_access_003.phpt diff -u php-src/tests/classes/array_access_003.phpt:1.9 php-src/tests/classes/array_access_003.phpt:1.10 --- php-src/tests/classes/array_access_003.phpt:1.9 Fri Dec 8 16:23:04 2006 +++ php-src/tests/classes/array_access_003.phpt Mon May 26 15:52:04 2008 @@ -48,17 +48,6 @@ ===DONE=== --EXPECTF-- object::offsetGet(1) -string(6) "fooBar" -object::offsetGet(2) -int(1) -object::offsetGet(2) - -Notice: Indirect modification of overloaded element of object has no effect in %sarray_access_003.php on line 39 -object::offsetGet(2) -int(1) -===DONE=== ---UEXPECTF-- -object::offsetGet(1) unicode(6) "fooBar" object::offsetGet(2) int(1) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/array_access_004.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/tests/classes/array_access_004.phpt diff -u php-src/tests/classes/array_access_004.phpt:1.5 php-src/tests/classes/array_access_004.phpt:1.6 --- php-src/tests/classes/array_access_004.phpt:1.5 Fri Dec 8 16:23:04 2006 +++ php-src/tests/classes/array_access_004.phpt Mon May 26 15:52:04 2008 @@ -46,17 +46,6 @@ ===DONE=== --EXPECTF-- object::offsetGet(1) -string(6) "fooBar" -object::offsetGet(2) -int(1) -object::offsetGet(2) - -Notice: Indirect modification of overloaded element of object has no effect in %sarray_access_004.php on line 39 -object::offsetGet(2) -int(1) -===DONE=== ---UEXPECTF-- -object::offsetGet(1) unicode(6) "fooBar" object::offsetGet(2) int(1) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/array_access_005.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/tests/classes/array_access_005.phpt diff -u php-src/tests/classes/array_access_005.phpt:1.8 php-src/tests/classes/array_access_005.phpt:1.9 --- php-src/tests/classes/array_access_005.phpt:1.8 Fri Dec 8 16:23:04 2006 +++ php-src/tests/classes/array_access_005.phpt Mon May 26 15:52:04 2008 @@ -54,28 +54,6 @@ ?> ===DONE=== --EXPECTF-- -string(3) "Joe" -string(6) "JoeFoo" -string(9) "JoeFooBar" ----ArrayOverloading--- -array(1) { - ["name"]=> - string(3) "Joe" -} -string(3) "Joe" -string(6) "JoeFoo" -array(1) { - ["name"]=> - string(6) "JoeFoo" -} - -Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_005.php on line 46 -string(6) "JoeFoo" - -Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_005.php on line 48 -string(6) "JoeFoo" -===DONE=== ---UEXPECTF-- unicode(3) "Joe" unicode(6) "JoeFoo" unicode(9) "JoeFooBar" http://cvs.php.net/viewvc.cgi/php-src/tests/classes/array_access_008.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/tests/classes/array_access_008.phpt diff -u php-src/tests/classes/array_access_008.phpt:1.6 php-src/tests/classes/array_access_008.phpt:1.7 --- php-src/tests/classes/array_access_008.phpt:1.6 Fri Dec 8 16:23:04 2006 +++ php-src/tests/classes/array_access_008.phpt Mon May 26 15:52:04 2008 @@ -50,22 +50,6 @@ ?> ===DONE=== --EXPECTF-- -string(3) "Foo" -string(6) "FooBar" -string(9) "FooBarBaz" -===ArrayOverloading=== -string(3) "Foo" - -Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_008.php on line 40 -string(3) "Foo" - -Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_008.php on line 42 -string(3) "Foo" - -Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_008.php on line 44 -string(3) "Foo" -===DONE=== ---UEXPECTF-- unicode(3) "Foo" unicode(6) "FooBar" unicode(9) "FooBarBaz" http://cvs.php.net/viewvc.cgi/php-src/tests/classes/array_access_009.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/tests/classes/array_access_009.phpt diff -u php-src/tests/classes/array_access_009.phpt:1.5 php-src/tests/classes/array_access_009.phpt:1.6 --- php-src/tests/classes/array_access_009.phpt:1.5 Wed Mar 19 17:56:08 2008 +++ php-src/tests/classes/array_access_009.phpt Mon May 26 15:52:04 2008 @@ -124,71 +124,6 @@ ?> ===DONE=== --EXPECTF-- -string(3) "Foo" -string(6) "FooBar" -string(9) "FooBarBaz" -===ArrayOverloading=== -ArrayProxy::__construct(0) -object(ArrayProxy)#%d (2) { - ["object":"ArrayProxy":private]=> - object(Peoples)#%d (1) { - ["person"]=> - array(1) { - [0]=> - array(1) { - ["name"]=> - string(3) "Foo" - } - } - } - ["element":"ArrayProxy":private]=> - int(0) -} -ArrayProxy::__construct(0) -ArrayProxy::offsetGet(0, name) -string(3) "Foo" -ArrayProxy::__construct(0) -ArrayProxy::offsetSet(0, name, FooBar) -ArrayProxy::__construct(0) -ArrayProxy::offsetGet(0, name) -string(6) "FooBar" -ArrayProxy::__construct(0) -ArrayProxy::offsetSet(0, name, FooBarBar) -ArrayProxy::__construct(0) -ArrayProxy::offsetGet(0, name) -string(9) "FooBarBar" -ArrayProxy::__construct(0) -ArrayProxy::offsetGet(0, name) -ArrayProxy::offsetSet(0, name, FooBarBarBaz) -ArrayProxy::__construct(0) -ArrayProxy::offsetGet(0, name) -string(12) "FooBarBarBaz" -ArrayProxy::__construct(0) -ArrayProxy::offsetUnset(0, name) -ArrayProxy::__construct(0) -object(ArrayProxy)#%d (2) { - ["object":"ArrayProxy":private]=> - object(Peoples)#%d (1) { - ["person"]=> - array(1) { - [0]=> - array(0) { - } - } - } - ["element":"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) -string(6) "BlaBla" -===DONE=== ---UEXPECTF-- unicode(3) "Foo" unicode(6) "FooBar" unicode(9) "FooBarBaz" http://cvs.php.net/viewvc.cgi/php-src/tests/classes/array_access_010.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/tests/classes/array_access_010.phpt diff -u php-src/tests/classes/array_access_010.phpt:1.5 php-src/tests/classes/array_access_010.phpt:1.6 --- php-src/tests/classes/array_access_010.phpt:1.5 Wed Mar 19 17:56:08 2008 +++ php-src/tests/classes/array_access_010.phpt Mon May 26 15:52:04 2008 @@ -98,125 +98,6 @@ ===DONE=== <?php exit(0); ?> --EXPECTF-- -string(3) "Foo" -string(6) "FooBar" -string(9) "FooBarBaz" -===ArrayOverloading=== - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) -object(ArrayReferenceProxy)#%d (2) { - ["object":"ArrayReferenceProxy":private]=> - object(Peoples)#%d (1) { - ["person"]=> - array(1) { - [0]=> - &array(1) { - ["name"]=> - string(3) "Foo" - } - } - } - ["element":"ArrayReferenceProxy":private]=> - &array(1) { - ["name"]=> - string(3) "Foo" - } -} - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetGet(Array, name) -string(3) "Foo" - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetSet(Array, name, FooBar) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetGet(Array, name) -string(6) "FooBar" - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetSet(Array, name, FooBarBar) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetGet(Array, name) -string(9) "FooBarBar" - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetGet(Array, name) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetSet(Array, name, FooBarBarBaz) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetGet(Array, name) -string(12) "FooBarBarBaz" - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetUnset(Array, name) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) -object(ArrayReferenceProxy)#%d (2) { - ["object":"ArrayReferenceProxy":private]=> - object(Peoples)#%d (1) { - ["person"]=> - array(1) { - [0]=> - &array(0) { - } - } - } - ["element":"ArrayReferenceProxy":private]=> - &array(0) { - } -} - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetGet(Array, name) -NULL - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetSet(Array, name, BlaBla) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetGet(Array, name) -string(6) "BlaBla" -===DONE=== ---UEXPECTF-- unicode(3) "Foo" unicode(6) "FooBar" unicode(9) "FooBarBaz" http://cvs.php.net/viewvc.cgi/php-src/tests/classes/array_access_011.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/classes/array_access_011.phpt diff -u php-src/tests/classes/array_access_011.phpt:1.4 php-src/tests/classes/array_access_011.phpt:1.5 --- php-src/tests/classes/array_access_011.phpt:1.4 Wed Mar 19 17:56:08 2008 +++ php-src/tests/classes/array_access_011.phpt Mon May 26 15:52:04 2008 @@ -107,85 +107,6 @@ ===DONE=== <?php exit(0); ?> --EXPECTF-- -string(3) "Foo" -string(6) "FooBar" -string(9) "FooBarBaz" -===ArrayOverloading=== -ArrayAccessReferenceProxy::__construct(0) -object(ArrayAccessReferenceProxy)#%d (3) { - ["object":"ArrayAccessReferenceProxy":private]=> - object(Peoples)#%d (1) { - ["person"]=> - &array(1) { - [0]=> - array(1) { - ["name"]=> - string(3) "Foo" - } - } - } - ["oarray":"ArrayAccessReferenceProxy":private]=> - &array(1) { - [0]=> - array(1) { - ["name"]=> - string(3) "Foo" - } - } - ["element":"ArrayAccessReferenceProxy":private]=> - int(0) -} -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetGet(0, name) -string(3) "Foo" -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetSet(0, name, FooBar) -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetGet(0, name) -string(6) "FooBar" -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetSet(0, name, FooBarBar) -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetGet(0, name) -string(9) "FooBarBar" -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetGet(0, name) -ArrayAccessReferenceProxy::offsetSet(0, name, FooBarBarBaz) -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetGet(0, name) -string(12) "FooBarBarBaz" -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetUnset(0, name) -ArrayAccessReferenceProxy::__construct(0) -object(ArrayAccessReferenceProxy)#%d (3) { - ["object":"ArrayAccessReferenceProxy":private]=> - object(Peoples)#%d (1) { - ["person"]=> - &array(1) { - [0]=> - array(0) { - } - } - } - ["oarray":"ArrayAccessReferenceProxy":private]=> - &array(1) { - [0]=> - array(0) { - } - } - ["element":"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) -string(6) "BlaBla" -===DONE=== ---UEXPECTF-- unicode(3) "Foo" unicode(6) "FooBar" unicode(9) "FooBarBaz" http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_002.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/classes/autoload_002.phpt diff -u php-src/tests/classes/autoload_002.phpt:1.3 php-src/tests/classes/autoload_002.phpt:1.4 --- php-src/tests/classes/autoload_002.phpt:1.3 Mon Aug 15 14:37:54 2005 +++ php-src/tests/classes/autoload_002.phpt Mon May 26 15:52:04 2008 @@ -22,13 +22,6 @@ __autoload(autoload_root) array(1) { [0]=> - string(12) "testFunction" -} -===DONE=== ---UEXPECT-- -__autoload(autoload_root) -array(1) { - [0]=> unicode(12) "testFunction" } ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_007.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/autoload_007.phpt diff -u php-src/tests/classes/autoload_007.phpt:1.2 php-src/tests/classes/autoload_007.phpt:1.3 --- php-src/tests/classes/autoload_007.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/autoload_007.phpt Mon May 26 15:52:04 2008 @@ -11,5 +11,5 @@ $a = new stdClass; var_dump($a instanceof UndefC); ?> ---EXPECTF-- +--EXPECT-- bool(false) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_008.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/autoload_008.phpt diff -u php-src/tests/classes/autoload_008.phpt:1.2 php-src/tests/classes/autoload_008.phpt:1.3 --- php-src/tests/classes/autoload_008.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/autoload_008.phpt Mon May 26 15:52:04 2008 @@ -22,5 +22,5 @@ echo "In Exception catch block. Autoload should not have been triggered.\n"; } ?> ---EXPECTF-- +--EXPECT-- In Exception catch block. Autoload should not have been triggered. http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_009.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/autoload_009.phpt diff -u php-src/tests/classes/autoload_009.phpt:1.2 php-src/tests/classes/autoload_009.phpt:1.3 --- php-src/tests/classes/autoload_009.phpt:1.2 Wed Jan 30 14:29:18 2008 +++ php-src/tests/classes/autoload_009.phpt Mon May 26 15:52:04 2008 @@ -16,5 +16,3 @@ --EXPECTF-- Catchable fatal error: Argument 1 passed to f() must be an instance of UndefClass, instance of stdClass given, called in %s - - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_010.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/autoload_010.phpt diff -u php-src/tests/classes/autoload_010.phpt:1.2 php-src/tests/classes/autoload_010.phpt:1.3 --- php-src/tests/classes/autoload_010.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/autoload_010.phpt Mon May 26 15:52:04 2008 @@ -13,11 +13,6 @@ } ?> --EXPECTF-- -In autoload: string(6) "UndefI" - -Fatal error: Interface 'UndefI' not found in %s on line %d - ---UEXPECTF-- In autoload: unicode(6) "UndefI" Fatal error: Interface 'UndefI' not found in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_011.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/autoload_011.phpt diff -u php-src/tests/classes/autoload_011.phpt:1.2 php-src/tests/classes/autoload_011.phpt:1.3 --- php-src/tests/classes/autoload_011.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/autoload_011.phpt Mon May 26 15:52:04 2008 @@ -13,11 +13,6 @@ } ?> --EXPECTF-- -In autoload: string(9) "UndefBase" - -Fatal error: Class 'UndefBase' not found in %s on line %d - ---UEXPECTF-- In autoload: unicode(9) "UndefBase" Fatal error: Class 'UndefBase' not found in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_012.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/classes/autoload_012.phpt diff -u php-src/tests/classes/autoload_012.phpt:1.3 php-src/tests/classes/autoload_012.phpt:1.4 --- php-src/tests/classes/autoload_012.phpt:1.3 Mon Feb 4 13:56:50 2008 +++ php-src/tests/classes/autoload_012.phpt Mon May 26 15:52:04 2008 @@ -10,11 +10,6 @@ call_user_func("UndefC::test"); ?> --EXPECTF-- -In autoload: string(6) "UndefC" - -Warning: call_user_func() expects parameter 1 to be a valid callback, class 'UndefC' not found in %s on line %d - ---UEXPECTF-- In autoload: unicode(6) "UndefC" Warning: call_user_func() expects parameter 1 to be a valid callback, class 'UndefC' not found in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_013.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/autoload_013.phpt diff -u php-src/tests/classes/autoload_013.phpt:1.2 php-src/tests/classes/autoload_013.phpt:1.3 --- php-src/tests/classes/autoload_013.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/autoload_013.phpt Mon May 26 15:52:04 2008 @@ -17,9 +17,6 @@ echo $e->getMessage(); } ?> ---EXPECTF-- -In autoload: string(6) "UndefC" -Class UndefC does not exist ---UEXPECTF-- +--EXPECT-- In autoload: unicode(6) "UndefC" -Class UndefC does not exist \ No newline at end of file +Class UndefC does not exist http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_014.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/autoload_014.phpt diff -u php-src/tests/classes/autoload_014.phpt:1.2 php-src/tests/classes/autoload_014.phpt:1.3 --- php-src/tests/classes/autoload_014.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/autoload_014.phpt Mon May 26 15:52:04 2008 @@ -17,9 +17,6 @@ echo $e->getMessage(); } ?> ---EXPECTF-- -In autoload: string(6) "UndefC" -Class UndefC does not exist ---UEXPECTF-- +--EXPECT-- In autoload: unicode(6) "UndefC" -Class UndefC does not exist \ No newline at end of file +Class UndefC does not exist http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_015.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/autoload_015.phpt diff -u php-src/tests/classes/autoload_015.phpt:1.2 php-src/tests/classes/autoload_015.phpt:1.3 --- php-src/tests/classes/autoload_015.phpt:1.2 Wed Jan 30 14:29:18 2008 +++ php-src/tests/classes/autoload_015.phpt Mon May 26 15:52:04 2008 @@ -17,9 +17,6 @@ echo $e->getMessage(); } ?> ---EXPECTF-- -In autoload: string(6) "UndefC" -Class UndefC does not exist ---UEXPECTF-- +--EXPECT-- In autoload: unicode(6) "UndefC" -Class UndefC does not exist \ No newline at end of file +Class UndefC does not exist http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_016.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/autoload_016.phpt diff -u php-src/tests/classes/autoload_016.phpt:1.2 php-src/tests/classes/autoload_016.phpt:1.3 --- php-src/tests/classes/autoload_016.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/autoload_016.phpt Mon May 26 15:52:04 2008 @@ -18,9 +18,6 @@ echo $e->getMessage(); } ?> ---EXPECTF-- -In autoload: string(6) "undefc" -Class undefc does not exist ---UEXPECTF-- +--EXPECT-- In autoload: unicode(6) "undefc" -Class undefc does not exist \ No newline at end of file +Class undefc does not exist http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_017.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/autoload_017.phpt diff -u php-src/tests/classes/autoload_017.phpt:1.2 php-src/tests/classes/autoload_017.phpt:1.3 --- php-src/tests/classes/autoload_017.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/autoload_017.phpt Mon May 26 15:52:04 2008 @@ -18,9 +18,6 @@ echo $e->getMessage(); } ?> ---EXPECTF-- -In autoload: string(6) "UndefI" -Interface UndefI does not exist ---UEXPECTF-- +--EXPECT-- In autoload: unicode(6) "UndefI" -Interface UndefI does not exist \ No newline at end of file +Interface UndefI does not exist http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_018.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/autoload_018.phpt diff -u php-src/tests/classes/autoload_018.phpt:1.2 php-src/tests/classes/autoload_018.phpt:1.3 --- php-src/tests/classes/autoload_018.phpt:1.2 Wed Jan 30 14:29:18 2008 +++ php-src/tests/classes/autoload_018.phpt Mon May 26 15:52:04 2008 @@ -19,7 +19,7 @@ var_dump(class_exists('UndefinedClass0')); ?> ---EXPECTF-- +--EXPECT-- IN: __autoload(UndefinedClass0) IN: __autoload(UndefinedClass1) IN: __autoload(UndefinedClass2) @@ -45,4 +45,3 @@ OUT: __autoload(UndefinedClass1) OUT: __autoload(UndefinedClass0) bool(false) - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_019.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/autoload_019.phpt diff -u php-src/tests/classes/autoload_019.phpt:1.2 php-src/tests/classes/autoload_019.phpt:1.3 --- php-src/tests/classes/autoload_019.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/autoload_019.phpt Mon May 26 15:52:04 2008 @@ -10,5 +10,5 @@ class_exists("unDefinedClass"); ?> ---EXPECTF-- +--EXPECT-- __autoload unDefinedClass http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_020.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/autoload_020.phpt diff -u php-src/tests/classes/autoload_020.phpt:1.2 php-src/tests/classes/autoload_020.phpt:1.3 --- php-src/tests/classes/autoload_020.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/autoload_020.phpt Mon May 26 15:52:04 2008 @@ -12,12 +12,6 @@ --EXPECTF-- in autoload: C object(__PHP_Incomplete_Class)#%d (1) { - ["__PHP_Incomplete_Class_Name"]=> - string(1) "C" -} ---UEXPECTF-- -in autoload: C -object(__PHP_Incomplete_Class)#%d (1) { [u"__PHP_Incomplete_Class_Name"]=> unicode(1) "C" -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_derived.p5c?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/autoload_derived.p5c diff -u php-src/tests/classes/autoload_derived.p5c:1.1 php-src/tests/classes/autoload_derived.p5c:1.2 --- php-src/tests/classes/autoload_derived.p5c:1.1 Mon Dec 29 12:36:31 2003 +++ php-src/tests/classes/autoload_derived.p5c Mon May 26 15:52:04 2008 @@ -1,6 +1,6 @@ -<?php - -class autoload_derived extends autoload_root { -} - +<?php + +class autoload_derived extends autoload_root { +} + ?> \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/tests/classes/autoload_implements.p5c?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/autoload_implements.p5c diff -u php-src/tests/classes/autoload_implements.p5c:1.1 php-src/tests/classes/autoload_implements.p5c:1.2 --- php-src/tests/classes/autoload_implements.p5c:1.1 Sun Sep 26 18:16:33 2004 +++ php-src/tests/classes/autoload_implements.p5c Mon May 26 15:52:04 2008 @@ -1,10 +1,10 @@ -<?php - -class autoload_implements implements autoload_interface { - function testFunction() - { - return true; - } -} - +<?php + +class autoload_implements implements autoload_interface { + function testFunction() + { + return true; + } +} + ?> \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/tests/classes/bug26737.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/tests/classes/bug26737.phpt diff -u php-src/tests/classes/bug26737.phpt:1.7 php-src/tests/classes/bug26737.phpt:1.8 --- php-src/tests/classes/bug26737.phpt:1.7 Thu Apr 26 07:19:29 2007 +++ php-src/tests/classes/bug26737.phpt Mon May 26 15:52:04 2008 @@ -19,7 +19,4 @@ ?> --EXPECTF-- Notice: serialize(): "no_such" returned as member variable from __sleep() but does not exist in %s on line %d -string(130) "O:3:"foo":4:{S:12:"\0foo\0private";S:7:"private";S:12:"\0*\0protected";S:9:"protected";S:6:"public";S:6:"public";S:7:"no_such";N;}" ---UEXPECTF-- -Notice: serialize(): "no_such" returned as member variable from __sleep() but does not exist in %s on line %d unicode(130) "O:3:"foo":4:{U:12:"\0foo\0private";U:7:"private";U:12:"\0*\0protected";U:9:"protected";U:6:"public";U:6:"public";U:7:"no_such";N;}" http://cvs.php.net/viewvc.cgi/php-src/tests/classes/bug29446.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/bug29446.phpt diff -u php-src/tests/classes/bug29446.phpt:1.1 php-src/tests/classes/bug29446.phpt:1.2 --- php-src/tests/classes/bug29446.phpt:1.1 Fri Sep 10 13:55:26 2004 +++ php-src/tests/classes/bug29446.phpt Mon May 26 15:52:04 2008 @@ -16,4 +16,4 @@ ?> --EXPECTF-- -Fatal error: Cannot redefine class constant testClass::TEST_CONST in %s on line 5 \ No newline at end of file +Fatal error: Cannot redefine class constant testClass::TEST_CONST in %s on line 5 http://cvs.php.net/viewvc.cgi/php-src/tests/classes/class_stdclass.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/class_stdclass.phpt diff -u php-src/tests/classes/class_stdclass.phpt:1.1 php-src/tests/classes/class_stdclass.phpt:1.2 --- php-src/tests/classes/class_stdclass.phpt:1.1 Mon Sep 8 10:45:19 2003 +++ php-src/tests/classes/class_stdclass.phpt Mon May 26 15:52:04 2008 @@ -9,6 +9,6 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- stdClass Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/clone_001.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/classes/clone_001.phpt diff -u php-src/tests/classes/clone_001.phpt:1.4 php-src/tests/classes/clone_001.phpt:1.5 --- php-src/tests/classes/clone_001.phpt:1.4 Mon Aug 15 14:37:54 2005 +++ php-src/tests/classes/clone_001.phpt Mon May 26 15:52:04 2008 @@ -24,26 +24,6 @@ --EXPECT-- Object object(test)#1 (3) { - ["p1"]=> - int(1) - ["p2"]=> - string(1) "A" - ["p3"]=> - string(1) "B" -} -Clown -object(test)#2 (3) { - ["p1"]=> - int(1) - ["p2"]=> - string(1) "A" - ["p3"]=> - string(1) "C" -} -Done ---UEXPECT-- -Object -object(test)#1 (3) { [u"p1"]=> int(1) [u"p2"]=> http://cvs.php.net/viewvc.cgi/php-src/tests/classes/clone_002.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/tests/classes/clone_002.phpt diff -u php-src/tests/classes/clone_002.phpt:1.7 php-src/tests/classes/clone_002.phpt:1.8 --- php-src/tests/classes/clone_002.phpt:1.7 Mon Aug 15 14:37:54 2005 +++ php-src/tests/classes/clone_002.phpt Mon May 26 15:52:04 2008 @@ -26,26 +26,6 @@ --EXPECT-- Object object(test)#1 (3) { - ["p1"]=> - int(1) - ["p2"]=> - string(1) "A" - ["p3"]=> - string(1) "B" -} -Clown -object(test)#2 (3) { - ["p1"]=> - int(1) - ["p2"]=> - string(1) "A" - ["p3"]=> - string(1) "C" -} -Done ---UEXPECT-- -Object -object(test)#1 (3) { [u"p1"]=> int(1) [u"p2"]=> http://cvs.php.net/viewvc.cgi/php-src/tests/classes/clone_004.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/classes/clone_004.phpt diff -u php-src/tests/classes/clone_004.phpt:1.4 php-src/tests/classes/clone_004.phpt:1.5 --- php-src/tests/classes/clone_004.phpt:1.4 Mon Aug 15 14:37:54 2005 +++ php-src/tests/classes/clone_004.phpt Mon May 26 15:52:04 2008 @@ -40,49 +40,6 @@ --EXPECT-- Original object(test)#1 (2) { - ["b"]=> - array(2) { - [0]=> - int(3) - [1]=> - int(4) - } - ["a"]=> - array(2) { - [0]=> - int(1) - [1]=> - int(2) - } -} -Clone -object(test)#2 (2) { - ["b"]=> - array(2) { - [0]=> - int(3) - [1]=> - int(4) - } - ["a"]=> - array(2) { - [0]=> - int(1) - [1]=> - int(2) - } -} -Modify -object(test)#2 (2) { - ["b"]=> - int(6) - ["a"]=> - int(5) -} -Done ---UEXPECT-- -Original -object(test)#1 (2) { [u"b"]=> array(2) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/tests/classes/constants_basic_001.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/constants_basic_001.phpt diff -u php-src/tests/classes/constants_basic_001.phpt:1.2 php-src/tests/classes/constants_basic_001.phpt:1.3 --- php-src/tests/classes/constants_basic_001.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/constants_basic_001.phpt Mon May 26 15:52:04 2008 @@ -64,36 +64,6 @@ Attempt to access various kinds of class constants: Notice: Use of undefined constant UNDEFINED - assumed 'UNDEFINED' in %s on line %d -string(9) "UNDEFINED" -int(1) -float(1.5) -int(1) -float(1.5) -int(-1) -float(-1.5) -int(15) -string(%d) "%s" -string(1) "C" -string(1) "C" -string(0) "" -int(1234) -int(456) -NULL -string(6) "hello1" -string(6) "hello2" -string(6) "hello2" -string(6) "hello2" - -Expecting fatal error: - -Fatal error: Undefined class constant 'c19' in %s on line 53 ---UEXPECTF-- - -Notice: Undefined variable: undef in %s on line 5 - -Attempt to access various kinds of class constants: - -Notice: Use of undefined constant UNDEFINED - assumed 'UNDEFINED' in %s on line %d unicode(9) "UNDEFINED" int(1) float(1.5) @@ -116,4 +86,4 @@ Expecting fatal error: -Fatal error: Undefined class constant 'c19' in %s on line 53 \ No newline at end of file +Fatal error: Undefined class constant 'c19' in %s on line 53 http://cvs.php.net/viewvc.cgi/php-src/tests/classes/constants_basic_002.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/constants_basic_002.phpt diff -u php-src/tests/classes/constants_basic_002.phpt:1.2 php-src/tests/classes/constants_basic_002.phpt:1.3 --- php-src/tests/classes/constants_basic_002.phpt:1.2 Wed Jan 30 14:29:18 2008 +++ php-src/tests/classes/constants_basic_002.phpt Mon May 26 15:52:04 2008 @@ -18,19 +18,6 @@ var_dump($myInstance) ?> --EXPECTF-- - -Read class constant. -string(5) "hello" - -Fail to read class constant from instance. - -Notice: Undefined property: aclass::$myConst in %s on line 12 -NULL - -Class constant not visible in object var_dump. -object(aclass)#%d (0) { -} ---UEXPECTF-- Read class constant. unicode(5) "hello" @@ -41,4 +28,4 @@ Class constant not visible in object var_dump. object(aclass)#%d (0) { -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/tests/classes/constants_basic_003.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/constants_basic_003.phpt diff -u php-src/tests/classes/constants_basic_003.phpt:1.2 php-src/tests/classes/constants_basic_003.phpt:1.3 --- php-src/tests/classes/constants_basic_003.phpt:1.2 Wed Jan 30 14:29:18 2008 +++ php-src/tests/classes/constants_basic_003.phpt Mon May 26 15:52:04 2008 @@ -21,13 +21,8 @@ var_dump(B::ca); var_dump(B::cc); ?> ---EXPECTF-- -string(12) "hello from A" -string(12) "hello from C" -string(12) "hello from A" -string(12) "hello from C" ---UEXPECTF-- +--EXPECT-- unicode(12) "hello from A" unicode(12) "hello from C" unicode(12) "hello from A" -unicode(12) "hello from C" \ No newline at end of file +unicode(12) "hello from C" http://cvs.php.net/viewvc.cgi/php-src/tests/classes/constants_basic_004.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/constants_basic_004.phpt diff -u php-src/tests/classes/constants_basic_004.phpt:1.2 php-src/tests/classes/constants_basic_004.phpt:1.3 --- php-src/tests/classes/constants_basic_004.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/constants_basic_004.phpt Mon May 26 15:52:04 2008 @@ -45,61 +45,6 @@ Static properties: array(1) { - ["key"]=> - string(5) "value" -} -array(1) { - ["key"]=> - string(5) "value" -} -array(1) { - ["key"]=> - string(5) "value" -} -array(1) { - ["key"]=> - string(5) "value" -} -array(1) { - ["key"]=> - string(5) "value" -} - -Instance properties: -object(X)#%d (1) { - ["a_x"]=> - array(1) { - ["key"]=> - string(5) "value" - } -} -object(B)#%d (1) { - ["a_b"]=> - array(1) { - ["key"]=> - string(5) "value" - } -} -object(C)#%d (3) { - ["a_c_parent"]=> - array(1) { - ["key"]=> - string(5) "value" - } - ["a_c_self"]=> - array(1) { - ["key"]=> - string(5) "value" - } - ["a_b"]=> - array(1) { - ["key"]=> - string(5) "value" - } -} ---UEXPECTF-- -Static properties: -array(1) { [u"key"]=> unicode(5) "value" } @@ -151,4 +96,4 @@ [u"key"]=> unicode(5) "value" } -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/tests/classes/constants_basic_005.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/constants_basic_005.phpt diff -u php-src/tests/classes/constants_basic_005.phpt:1.2 php-src/tests/classes/constants_basic_005.phpt:1.3 --- php-src/tests/classes/constants_basic_005.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/constants_basic_005.phpt Mon May 26 15:52:04 2008 @@ -10,9 +10,6 @@ } var_dump(C::CONST_1, C::CONST_2); ?> ---EXPECTF-- -string(5) "hello" -string(5) "hello" ---UEXPECTF-- +--EXPECT-- unicode(5) "hello" unicode(5) "hello" http://cvs.php.net/viewvc.cgi/php-src/tests/classes/constants_basic_006.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/constants_basic_006.phpt diff -u php-src/tests/classes/constants_basic_006.phpt:1.2 php-src/tests/classes/constants_basic_006.phpt:1.3 --- php-src/tests/classes/constants_basic_006.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/constants_basic_006.phpt Mon May 26 15:52:04 2008 @@ -19,29 +19,7 @@ var_dump(C::X, C::$a, D::X, D::$a, E::X, E::$a); ?> ---EXPECTF-- -string(5) "hello" -array(2) { - ["nasty"]=> - string(4) "test" - ["hello"]=> - string(5) "nasty" -} -string(5) "hello" -array(2) { - ["nasty"]=> - string(4) "test" - ["hello"]=> - string(5) "nasty" -} -string(5) "hello" -array(2) { - ["nasty"]=> - string(4) "test" - ["hello"]=> - string(5) "nasty" -} ---UEXPECTF-- +--EXPECT-- unicode(5) "hello" array(2) { [u"nasty"]=> @@ -62,4 +40,4 @@ unicode(4) "test" [u"hello"]=> unicode(5) "nasty" -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/tests/classes/ctor_dtor.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/classes/ctor_dtor.phpt diff -u php-src/tests/classes/ctor_dtor.phpt:1.3 php-src/tests/classes/ctor_dtor.phpt:1.4 --- php-src/tests/classes/ctor_dtor.phpt:1.3 Fri Mar 5 12:18:16 2004 +++ php-src/tests/classes/ctor_dtor.phpt Mon May 26 15:52:04 2008 @@ -31,7 +31,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- early::early early::early early::__destruct http://cvs.php.net/viewvc.cgi/php-src/tests/classes/ctor_dtor_inheritance.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/ctor_dtor_inheritance.phpt diff -u php-src/tests/classes/ctor_dtor_inheritance.phpt:1.2 php-src/tests/classes/ctor_dtor_inheritance.phpt:1.3 --- php-src/tests/classes/ctor_dtor_inheritance.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/ctor_dtor_inheritance.phpt Mon May 26 15:52:04 2008 @@ -54,7 +54,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Testing class base base::__construct base Object http://cvs.php.net/viewvc.cgi/php-src/tests/classes/ctor_name_clash.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/ctor_name_clash.phpt diff -u php-src/tests/classes/ctor_name_clash.phpt:1.2 php-src/tests/classes/ctor_name_clash.phpt:1.3 --- php-src/tests/classes/ctor_name_clash.phpt:1.2 Thu Jun 23 11:01:08 2005 +++ php-src/tests/classes/ctor_name_clash.phpt Mon May 26 15:52:04 2008 @@ -17,6 +17,6 @@ $obj = new derived(); $obj->base(); ?> ---EXPECTF-- +--EXPECT-- base::base derived::base http://cvs.php.net/viewvc.cgi/php-src/tests/classes/destructor_and_exceptions.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/destructor_and_exceptions.phpt diff -u php-src/tests/classes/destructor_and_exceptions.phpt:1.2 php-src/tests/classes/destructor_and_exceptions.phpt:1.3 --- php-src/tests/classes/destructor_and_exceptions.phpt:1.2 Sat May 24 15:13:11 2008 +++ php-src/tests/classes/destructor_and_exceptions.phpt Mon May 26 15:52:04 2008 @@ -51,7 +51,7 @@ ?> ===DONE=== ---EXPECTF-- +--EXPECT-- FailClass::__destruct Caught: FailClass FatalException::__construct http://cvs.php.net/viewvc.cgi/php-src/tests/classes/destructor_inheritance.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/destructor_inheritance.phpt diff -u php-src/tests/classes/destructor_inheritance.phpt:1.2 php-src/tests/classes/destructor_inheritance.phpt:1.3 --- php-src/tests/classes/destructor_inheritance.phpt:1.2 Fri Oct 24 03:31:52 2003 +++ php-src/tests/classes/destructor_inheritance.phpt Mon May 26 15:52:04 2008 @@ -26,4 +26,4 @@ --EXPECT-- base::__construct base::__destruct -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/destructor_visibility_003.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/destructor_visibility_003.phpt diff -u php-src/tests/classes/destructor_visibility_003.phpt:1.2 php-src/tests/classes/destructor_visibility_003.phpt:1.3 --- php-src/tests/classes/destructor_visibility_003.phpt:1.2 Mon Aug 2 08:29:59 2004 +++ php-src/tests/classes/destructor_visibility_003.phpt Mon May 26 15:52:04 2008 @@ -23,6 +23,6 @@ ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Derived::__destruct ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/tests/classes/factory_and_singleton_006.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/tests/classes/factory_and_singleton_006.phpt diff -u php-src/tests/classes/factory_and_singleton_006.phpt:1.5 php-src/tests/classes/factory_and_singleton_006.phpt:1.6 --- php-src/tests/classes/factory_and_singleton_006.phpt:1.5 Fri Oct 24 03:31:52 2003 +++ php-src/tests/classes/factory_and_singleton_006.phpt Mon May 26 15:52:04 2008 @@ -17,4 +17,3 @@ ?> --EXPECTF-- Fatal error: Call to private test::__destruct() from context '' in %sfactory_and_singleton_006.php on line %d - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/final.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/final.phpt diff -u php-src/tests/classes/final.phpt:1.2 php-src/tests/classes/final.phpt:1.3 --- php-src/tests/classes/final.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/final.phpt Mon May 26 15:52:04 2008 @@ -25,7 +25,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Call to function first::show() Call to function second::show() -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/inheritance_002.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/tests/classes/inheritance_002.phpt diff -u php-src/tests/classes/inheritance_002.phpt:1.7 php-src/tests/classes/inheritance_002.phpt:1.8 --- php-src/tests/classes/inheritance_002.phpt:1.7 Mon Aug 15 14:37:54 2005 +++ php-src/tests/classes/inheritance_002.phpt Mon May 26 15:52:04 2008 @@ -58,19 +58,6 @@ ?> --EXPECT-- ### PHP 4 style -string(17) "Child constructor" -string(16) "Base constructor" -### PHP 5 style -string(17) "Child constructor" -string(16) "Base constructor" -### Mixed style 1 -string(17) "Child constructor" -string(16) "Base constructor" -### 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 http://cvs.php.net/viewvc.cgi/php-src/tests/classes/inheritance_005.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/classes/inheritance_005.phpt diff -u php-src/tests/classes/inheritance_005.phpt:1.3 php-src/tests/classes/inheritance_005.phpt:1.4 --- php-src/tests/classes/inheritance_005.phpt:1.3 Mon Mar 17 14:59:16 2008 +++ php-src/tests/classes/inheritance_005.phpt Mon May 26 15:52:04 2008 @@ -40,7 +40,7 @@ echo "Is C::C() callable?\n"; var_dump(is_callable(array($c, "C"))); ?> ---EXPECTF-- +--EXPECT-- About to construct new B: In A::A Is B::B() callable? http://cvs.php.net/viewvc.cgi/php-src/tests/classes/interface_constant_inheritance_001.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/interface_constant_inheritance_001.phpt diff -u php-src/tests/classes/interface_constant_inheritance_001.phpt:1.2 php-src/tests/classes/interface_constant_inheritance_001.phpt:1.3 --- php-src/tests/classes/interface_constant_inheritance_001.phpt:1.2 Thu Mar 6 11:07:29 2008 +++ php-src/tests/classes/interface_constant_inheritance_001.phpt Mon May 26 15:52:04 2008 @@ -14,4 +14,4 @@ ?> --EXPECTF-- -Fatal error: Cannot inherit previously-inherited constant FOO from interface I1 in %s on line 6 \ No newline at end of file +Fatal error: Cannot inherit previously-inherited constant FOO from interface I1 in %s on line 6 http://cvs.php.net/viewvc.cgi/php-src/tests/classes/interface_constant_inheritance_002.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/interface_constant_inheritance_002.phpt diff -u php-src/tests/classes/interface_constant_inheritance_002.phpt:1.2 php-src/tests/classes/interface_constant_inheritance_002.phpt:1.3 --- php-src/tests/classes/interface_constant_inheritance_002.phpt:1.2 Thu Mar 6 11:07:29 2008 +++ php-src/tests/classes/interface_constant_inheritance_002.phpt Mon May 26 15:52:04 2008 @@ -14,4 +14,4 @@ ?> --EXPECTF-- -Fatal error: Cannot inherit previously-inherited constant FOO from interface I in %s on line 6 \ No newline at end of file +Fatal error: Cannot inherit previously-inherited constant FOO from interface I in %s on line 6 http://cvs.php.net/viewvc.cgi/php-src/tests/classes/interface_constant_inheritance_004.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/interface_constant_inheritance_004.phpt diff -u php-src/tests/classes/interface_constant_inheritance_004.phpt:1.2 php-src/tests/classes/interface_constant_inheritance_004.phpt:1.3 --- php-src/tests/classes/interface_constant_inheritance_004.phpt:1.2 Thu Mar 6 11:07:29 2008 +++ php-src/tests/classes/interface_constant_inheritance_004.phpt Mon May 26 15:52:04 2008 @@ -14,5 +14,5 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/interface_doubled.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/tests/classes/interface_doubled.phpt diff -u php-src/tests/classes/interface_doubled.phpt:1.8 php-src/tests/classes/interface_doubled.phpt:1.9 --- php-src/tests/classes/interface_doubled.phpt:1.8 Wed Oct 20 22:13:44 2004 +++ php-src/tests/classes/interface_doubled.phpt Mon May 26 15:52:04 2008 @@ -155,7 +155,7 @@ ?> ===DONE=== ---EXPECTF-- +--EXPECT-- class_a is_a(class_a, if_a) yes is_a(class_a, if_b) no http://cvs.php.net/viewvc.cgi/php-src/tests/classes/interface_implemented.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/tests/classes/interface_implemented.phpt diff -u php-src/tests/classes/interface_implemented.phpt:1.5 php-src/tests/classes/interface_implemented.phpt:1.6 --- php-src/tests/classes/interface_implemented.phpt:1.5 Wed Oct 20 22:13:44 2004 +++ php-src/tests/classes/interface_implemented.phpt Mon May 26 15:52:04 2008 @@ -61,7 +61,7 @@ $t->test(); ?> ---EXPECTF-- +--EXPECT-- is_a(base, base) = yes is_a(base, derived_a) = no is_a(base, derived_b) = no http://cvs.php.net/viewvc.cgi/php-src/tests/classes/interface_optional_arg.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/interface_optional_arg.phpt diff -u php-src/tests/classes/interface_optional_arg.phpt:1.2 php-src/tests/classes/interface_optional_arg.phpt:1.3 --- php-src/tests/classes/interface_optional_arg.phpt:1.2 Sat May 24 15:13:11 2008 +++ php-src/tests/classes/interface_optional_arg.phpt Mon May 26 15:52:04 2008 @@ -24,4 +24,3 @@ ?> --EXPECT-- foo - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/interface_optional_arg_002.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/interface_optional_arg_002.phpt diff -u php-src/tests/classes/interface_optional_arg_002.phpt:1.1 php-src/tests/classes/interface_optional_arg_002.phpt:1.2 --- php-src/tests/classes/interface_optional_arg_002.phpt:1.1 Wed Mar 19 17:56:08 2008 +++ php-src/tests/classes/interface_optional_arg_002.phpt Mon May 26 15:52:04 2008 @@ -21,4 +21,4 @@ ?> --EXPECT-- -int(2) \ No newline at end of file +int(2) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/interfaces_001.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/interfaces_001.phpt diff -u php-src/tests/classes/interfaces_001.phpt:1.2 php-src/tests/classes/interfaces_001.phpt:1.3 --- php-src/tests/classes/interfaces_001.phpt:1.2 Fri Mar 28 18:58:18 2003 +++ php-src/tests/classes/interfaces_001.phpt Mon May 26 15:52:04 2008 @@ -23,4 +23,3 @@ ?> --EXPECT-- foo - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/iterators_004.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/classes/iterators_004.phpt diff -u php-src/tests/classes/iterators_004.phpt:1.3 php-src/tests/classes/iterators_004.phpt:1.4 --- php-src/tests/classes/iterators_004.phpt:1.3 Wed Sep 29 09:39:43 2004 +++ php-src/tests/classes/iterators_004.phpt Mon May 26 15:52:04 2008 @@ -53,7 +53,7 @@ print "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 1st try 2nd try object:max=>3 http://cvs.php.net/viewvc.cgi/php-src/tests/classes/iterators_006.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/classes/iterators_006.phpt diff -u php-src/tests/classes/iterators_006.phpt:1.3 php-src/tests/classes/iterators_006.phpt:1.4 --- php-src/tests/classes/iterators_006.phpt:1.3 Sat May 24 15:13:11 2008 +++ php-src/tests/classes/iterators_006.phpt Mon May 26 15:52:04 2008 @@ -84,4 +84,4 @@ 0: foo 1: bar 2: baz -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/tests/classes/method_call_variation_001.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/method_call_variation_001.phpt diff -u php-src/tests/classes/method_call_variation_001.phpt:1.2 php-src/tests/classes/method_call_variation_001.phpt:1.3 --- php-src/tests/classes/method_call_variation_001.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/method_call_variation_001.phpt Mon May 26 15:52:04 2008 @@ -30,7 +30,7 @@ $c->functions[0](5, 6); $c->functions[1][2][3][4](7, 8); ?> ---EXPECTF-- +--EXPECT-- Called C::foo(1, 2) Called C::foo(3, 4) Called global foo(5, 6) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/new_001.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/classes/new_001.phpt diff -u php-src/tests/classes/new_001.phpt:1.4 php-src/tests/classes/new_001.phpt:1.5 --- php-src/tests/classes/new_001.phpt:1.4 Sun Feb 24 13:10:33 2008 +++ php-src/tests/classes/new_001.phpt Mon May 26 15:52:04 2008 @@ -33,24 +33,6 @@ Compile-time strict error message should precede this. $f initially points to the first object: object(Inc)#%d (1) { - ["id"]=> - int(1) -} -Assigning new object directly to $k affects $f: -object(Inc)#%d (1) { - ["id"]=> - int(2) -} -Assigning new object by ref to $k removes it from $f's reference set, so $f is unchanged: -object(Inc)#%d (1) { - ["id"]=> - int(2) -} ---UEXPECTF-- -Deprecated: Assigning the return value of new by reference is deprecated in %s on line 23 -Compile-time strict error message should precede this. -$f initially points to the first object: -object(Inc)#%d (1) { [u"id"]=> int(1) } http://cvs.php.net/viewvc.cgi/php-src/tests/classes/private_005b.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/private_005b.phpt diff -u php-src/tests/classes/private_005b.phpt:1.2 php-src/tests/classes/private_005b.phpt:1.3 --- php-src/tests/classes/private_005b.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/private_005b.phpt Mon May 26 15:52:04 2008 @@ -32,4 +32,4 @@ --EXPECTF-- Call show() -Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d \ No newline at end of file +Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/tests/classes/private_006.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/private_006.phpt diff -u php-src/tests/classes/private_006.phpt:1.2 php-src/tests/classes/private_006.phpt:1.3 --- php-src/tests/classes/private_006.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/private_006.phpt Mon May 26 15:52:04 2008 @@ -34,7 +34,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Call show() Call show() Call show() http://cvs.php.net/viewvc.cgi/php-src/tests/classes/private_006b.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/private_006b.phpt diff -u php-src/tests/classes/private_006b.phpt:1.2 php-src/tests/classes/private_006b.phpt:1.3 --- php-src/tests/classes/private_006b.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/private_006b.phpt Mon May 26 15:52:04 2008 @@ -35,7 +35,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Call show() Call show() -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/private_007.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/private_007.phpt diff -u php-src/tests/classes/private_007.phpt:1.2 php-src/tests/classes/private_007.phpt:1.3 --- php-src/tests/classes/private_007.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/private_007.phpt Mon May 26 15:52:04 2008 @@ -24,7 +24,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Bar::priv() Foo::priv() Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/private_007b.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/private_007b.phpt diff -u php-src/tests/classes/private_007b.phpt:1.2 php-src/tests/classes/private_007b.phpt:1.3 --- php-src/tests/classes/private_007b.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/private_007b.phpt Mon May 26 15:52:04 2008 @@ -25,7 +25,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Bar::priv() Foo::priv() Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/private_members.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/classes/private_members.phpt diff -u php-src/tests/classes/private_members.phpt:1.4 php-src/tests/classes/private_members.phpt:1.5 --- php-src/tests/classes/private_members.phpt:1.4 Mon Aug 15 07:55:41 2005 +++ php-src/tests/classes/private_members.phpt Mon May 26 15:52:04 2008 @@ -53,7 +53,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- derived::__construct(begin) base::__construct(begin) base::test http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_privateStatic_private.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_privateStatic_private.phpt diff -u php-src/tests/classes/property_override_privateStatic_private.phpt:1.2 php-src/tests/classes/property_override_privateStatic_private.phpt:1.3 --- php-src/tests/classes/property_override_privateStatic_private.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_privateStatic_private.phpt Mon May 26 15:52:04 2008 @@ -27,7 +27,7 @@ $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_privateStatic_privateStatic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_privateStatic_privateStatic.phpt diff -u php-src/tests/classes/property_override_privateStatic_privateStatic.phpt:1.2 php-src/tests/classes/property_override_privateStatic_privateStatic.phpt:1.3 --- php-src/tests/classes/property_override_privateStatic_privateStatic.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_privateStatic_privateStatic.phpt Mon May 26 15:52:04 2008 @@ -26,7 +26,7 @@ B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_privateStatic_protected.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_privateStatic_protected.phpt diff -u php-src/tests/classes/property_override_privateStatic_protected.phpt:1.2 php-src/tests/classes/property_override_privateStatic_protected.phpt:1.3 --- php-src/tests/classes/property_override_privateStatic_protected.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_privateStatic_protected.phpt Mon May 26 15:52:04 2008 @@ -27,7 +27,7 @@ $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_privateStatic_protectedStatic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_privateStatic_protectedStatic.phpt diff -u php-src/tests/classes/property_override_privateStatic_protectedStatic.phpt:1.2 php-src/tests/classes/property_override_privateStatic_protectedStatic.phpt:1.3 --- php-src/tests/classes/property_override_privateStatic_protectedStatic.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_privateStatic_protectedStatic.phpt Mon May 26 15:52:04 2008 @@ -26,7 +26,7 @@ B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_privateStatic_public.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_privateStatic_public.phpt diff -u php-src/tests/classes/property_override_privateStatic_public.phpt:1.2 php-src/tests/classes/property_override_privateStatic_public.phpt:1.3 --- php-src/tests/classes/property_override_privateStatic_public.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_privateStatic_public.phpt Mon May 26 15:52:04 2008 @@ -27,7 +27,7 @@ $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_privateStatic_publicStatic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_privateStatic_publicStatic.phpt diff -u php-src/tests/classes/property_override_privateStatic_publicStatic.phpt:1.2 php-src/tests/classes/property_override_privateStatic_publicStatic.phpt:1.3 --- php-src/tests/classes/property_override_privateStatic_publicStatic.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_privateStatic_publicStatic.phpt Mon May 26 15:52:04 2008 @@ -26,7 +26,7 @@ B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_private_private.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_private_private.phpt diff -u php-src/tests/classes/property_override_private_private.phpt:1.2 php-src/tests/classes/property_override_private_private.phpt:1.3 --- php-src/tests/classes/property_override_private_private.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_private_private.phpt Mon May 26 15:52:04 2008 @@ -28,7 +28,7 @@ $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_private_privateStatic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_private_privateStatic.phpt diff -u php-src/tests/classes/property_override_private_privateStatic.phpt:1.2 php-src/tests/classes/property_override_private_privateStatic.phpt:1.3 --- php-src/tests/classes/property_override_private_privateStatic.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_private_privateStatic.phpt Mon May 26 15:52:04 2008 @@ -28,7 +28,7 @@ $b->showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p (static) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_private_protected.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_private_protected.phpt diff -u php-src/tests/classes/property_override_private_protected.phpt:1.2 php-src/tests/classes/property_override_private_protected.phpt:1.3 --- php-src/tests/classes/property_override_private_protected.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_private_protected.phpt Mon May 26 15:52:04 2008 @@ -28,7 +28,7 @@ $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_private_protectedStatic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_private_protectedStatic.phpt diff -u php-src/tests/classes/property_override_private_protectedStatic.phpt:1.2 php-src/tests/classes/property_override_private_protectedStatic.phpt:1.3 --- php-src/tests/classes/property_override_private_protectedStatic.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_private_protectedStatic.phpt Mon May 26 15:52:04 2008 @@ -28,7 +28,7 @@ $b->showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p (static) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_private_public.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_private_public.phpt diff -u php-src/tests/classes/property_override_private_public.phpt:1.2 php-src/tests/classes/property_override_private_public.phpt:1.3 --- php-src/tests/classes/property_override_private_public.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_private_public.phpt Mon May 26 15:52:04 2008 @@ -28,7 +28,7 @@ $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_private_publicStatic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_private_publicStatic.phpt diff -u php-src/tests/classes/property_override_private_publicStatic.phpt:1.2 php-src/tests/classes/property_override_private_publicStatic.phpt:1.3 --- php-src/tests/classes/property_override_private_publicStatic.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_private_publicStatic.phpt Mon May 26 15:52:04 2008 @@ -28,7 +28,7 @@ $b->showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p (static) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_protectedStatic_private.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_protectedStatic_private.phpt diff -u php-src/tests/classes/property_override_protectedStatic_private.phpt:1.2 php-src/tests/classes/property_override_protectedStatic_private.phpt:1.3 --- php-src/tests/classes/property_override_protectedStatic_private.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_protectedStatic_private.phpt Mon May 26 15:52:04 2008 @@ -30,4 +30,3 @@ --EXPECTF-- Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18 - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_protectedStatic_privateStatic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_protectedStatic_privateStatic.phpt diff -u php-src/tests/classes/property_override_protectedStatic_privateStatic.phpt:1.2 php-src/tests/classes/property_override_protectedStatic_privateStatic.phpt:1.3 --- php-src/tests/classes/property_override_protectedStatic_privateStatic.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_protectedStatic_privateStatic.phpt Mon May 26 15:52:04 2008 @@ -29,4 +29,3 @@ --EXPECTF-- Fatal error: Access level to B::$p must be protected (as in class A) or weaker in %s on line 18 - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_protectedStatic_protected.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_protectedStatic_protected.phpt diff -u php-src/tests/classes/property_override_protectedStatic_protected.phpt:1.2 php-src/tests/classes/property_override_protectedStatic_protected.phpt:1.3 --- php-src/tests/classes/property_override_protectedStatic_protected.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_protectedStatic_protected.phpt Mon May 26 15:52:04 2008 @@ -30,4 +30,3 @@ --EXPECTF-- Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18 - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_protectedStatic_protectedStatic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_protectedStatic_protectedStatic.phpt diff -u php-src/tests/classes/property_override_protectedStatic_protectedStatic.phpt:1.2 php-src/tests/classes/property_override_protectedStatic_protectedStatic.phpt:1.3 --- php-src/tests/classes/property_override_protectedStatic_protectedStatic.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_protectedStatic_protectedStatic.phpt Mon May 26 15:52:04 2008 @@ -26,7 +26,7 @@ B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_protectedStatic_public.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_protectedStatic_public.phpt diff -u php-src/tests/classes/property_override_protectedStatic_public.phpt:1.2 php-src/tests/classes/property_override_protectedStatic_public.phpt:1.3 --- php-src/tests/classes/property_override_protectedStatic_public.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_protectedStatic_public.phpt Mon May 26 15:52:04 2008 @@ -30,4 +30,3 @@ --EXPECTF-- Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18 - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_protectedStatic_publicStatic.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/classes/property_override_protectedStatic_publicStatic.phpt diff -u php-src/tests/classes/property_override_protectedStatic_publicStatic.phpt:1.3 php-src/tests/classes/property_override_protectedStatic_publicStatic.phpt:1.4 --- php-src/tests/classes/property_override_protectedStatic_publicStatic.phpt:1.3 Mon Mar 3 14:24:11 2008 +++ php-src/tests/classes/property_override_protectedStatic_publicStatic.phpt Mon May 26 15:52:04 2008 @@ -26,8 +26,7 @@ B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_protected_protected.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_protected_protected.phpt diff -u php-src/tests/classes/property_override_protected_protected.phpt:1.2 php-src/tests/classes/property_override_protected_protected.phpt:1.3 --- php-src/tests/classes/property_override_protected_protected.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_protected_protected.phpt Mon May 26 15:52:04 2008 @@ -28,7 +28,7 @@ $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p B::p B::p http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_protected_public.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_protected_public.phpt diff -u php-src/tests/classes/property_override_protected_public.phpt:1.2 php-src/tests/classes/property_override_protected_public.phpt:1.3 --- php-src/tests/classes/property_override_protected_public.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_protected_public.phpt Mon May 26 15:52:04 2008 @@ -28,7 +28,7 @@ $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p B::p B::p http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_publicStatic_private.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_publicStatic_private.phpt diff -u php-src/tests/classes/property_override_publicStatic_private.phpt:1.2 php-src/tests/classes/property_override_publicStatic_private.phpt:1.3 --- php-src/tests/classes/property_override_publicStatic_private.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_publicStatic_private.phpt Mon May 26 15:52:04 2008 @@ -30,4 +30,3 @@ --EXPECTF-- Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18 - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_publicStatic_privateStatic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_publicStatic_privateStatic.phpt diff -u php-src/tests/classes/property_override_publicStatic_privateStatic.phpt:1.2 php-src/tests/classes/property_override_publicStatic_privateStatic.phpt:1.3 --- php-src/tests/classes/property_override_publicStatic_privateStatic.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_publicStatic_privateStatic.phpt Mon May 26 15:52:04 2008 @@ -29,4 +29,3 @@ --EXPECTF-- Fatal error: Access level to B::$p must be public (as in class A) in %s on line 18 - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_publicStatic_protected.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_publicStatic_protected.phpt diff -u php-src/tests/classes/property_override_publicStatic_protected.phpt:1.2 php-src/tests/classes/property_override_publicStatic_protected.phpt:1.3 --- php-src/tests/classes/property_override_publicStatic_protected.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_publicStatic_protected.phpt Mon May 26 15:52:04 2008 @@ -30,4 +30,3 @@ --EXPECTF-- Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18 - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_publicStatic_protectedStatic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_publicStatic_protectedStatic.phpt diff -u php-src/tests/classes/property_override_publicStatic_protectedStatic.phpt:1.2 php-src/tests/classes/property_override_publicStatic_protectedStatic.phpt:1.3 --- php-src/tests/classes/property_override_publicStatic_protectedStatic.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_publicStatic_protectedStatic.phpt Mon May 26 15:52:04 2008 @@ -29,4 +29,3 @@ --EXPECTF-- Fatal error: Access level to B::$p must be public (as in class A) in %s on line 18 - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_publicStatic_public.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_publicStatic_public.phpt diff -u php-src/tests/classes/property_override_publicStatic_public.phpt:1.2 php-src/tests/classes/property_override_publicStatic_public.phpt:1.3 --- php-src/tests/classes/property_override_publicStatic_public.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_publicStatic_public.phpt Mon May 26 15:52:04 2008 @@ -30,4 +30,3 @@ --EXPECTF-- Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18 - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_publicStatic_publicStatic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_publicStatic_publicStatic.phpt diff -u php-src/tests/classes/property_override_publicStatic_publicStatic.phpt:1.2 php-src/tests/classes/property_override_publicStatic_publicStatic.phpt:1.3 --- php-src/tests/classes/property_override_publicStatic_publicStatic.phpt:1.2 Wed Jan 30 14:29:18 2008 +++ php-src/tests/classes/property_override_publicStatic_publicStatic.phpt Mon May 26 15:52:04 2008 @@ -26,7 +26,7 @@ B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_public_private.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_public_private.phpt diff -u php-src/tests/classes/property_override_public_private.phpt:1.2 php-src/tests/classes/property_override_public_private.phpt:1.3 --- php-src/tests/classes/property_override_public_private.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_public_private.phpt Mon May 26 15:52:04 2008 @@ -31,4 +31,3 @@ --EXPECTF-- Fatal error: Access level to B::$p must be public (as in class A) in %s on line 18 - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_public_protected.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_public_protected.phpt diff -u php-src/tests/classes/property_override_public_protected.phpt:1.2 php-src/tests/classes/property_override_public_protected.phpt:1.3 --- php-src/tests/classes/property_override_public_protected.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_public_protected.phpt Mon May 26 15:52:04 2008 @@ -31,4 +31,3 @@ --EXPECTF-- Fatal error: Access level to B::$p must be public (as in class A) in %s on line 18 - http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_public_public.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/property_override_public_public.phpt diff -u php-src/tests/classes/property_override_public_public.phpt:1.2 php-src/tests/classes/property_override_public_public.phpt:1.3 --- php-src/tests/classes/property_override_public_public.phpt:1.2 Wed Jan 30 14:29:19 2008 +++ php-src/tests/classes/property_override_public_public.phpt Mon May 26 15:52:04 2008 @@ -28,7 +28,7 @@ $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p B::p B::p http://cvs.php.net/viewvc.cgi/php-src/tests/classes/serialize_001.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/tests/classes/serialize_001.phpt diff -u php-src/tests/classes/serialize_001.phpt:1.6 php-src/tests/classes/serialize_001.phpt:1.7 --- php-src/tests/classes/serialize_001.phpt:1.6 Sat May 24 15:13:11 2008 +++ php-src/tests/classes/serialize_001.phpt Mon May 26 15:52:04 2008 @@ -49,36 +49,6 @@ <?php exit(0); ?> --EXPECT-- ========== -string(6) "String" -Test::__construct(String) -Test::serialize(String) -Test::unserialize(String) -object(Test)#1 (1) { - ["data"]=> - string(6) "String" -} -object(Test)#1 (1) { - ["data"]=> - string(6) "String" -} -========== -NULL -Test::__construct() -Test::serialize() -NULL -========== -int(42) -Test::__construct(42) -Test::serialize(42) -Exception: Test::serialize() must return a string or NULL -========== -bool(false) -Test::__construct() -Test::serialize() -Exception: Test::serialize() must return a string or NULL -===DONE=== ---UEXPECT-- -========== unicode(6) "String" Test::__construct(String) Test::serialize(String) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/static_mix_1.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/classes/static_mix_1.phpt diff -u php-src/tests/classes/static_mix_1.phpt:1.4 php-src/tests/classes/static_mix_1.phpt:1.5 --- php-src/tests/classes/static_mix_1.phpt:1.4 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/static_mix_1.phpt Mon May 26 15:52:04 2008 @@ -21,6 +21,6 @@ fail::show(); echo "Done\n"; // shouldn't be displayed -?> +?> --EXPECTF-- -Fatal error: Cannot make static method pass::show() non static in class fail in %s on line %d \ No newline at end of file +Fatal error: Cannot make static method pass::show() non static in class fail in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/tests/classes/static_mix_2.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/classes/static_mix_2.phpt diff -u php-src/tests/classes/static_mix_2.phpt:1.4 php-src/tests/classes/static_mix_2.phpt:1.5 --- php-src/tests/classes/static_mix_2.phpt:1.4 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/static_mix_2.phpt Mon May 26 15:52:04 2008 @@ -24,4 +24,4 @@ echo "Done\n"; // shouldn't be displayed ?> --EXPECTF-- -Fatal error: Cannot make non static method pass::show() static in class fail in %s on line %d \ No newline at end of file +Fatal error: Cannot make non static method pass::show() static in class fail in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/tests/classes/static_properties_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/static_properties_001.phpt diff -u php-src/tests/classes/static_properties_001.phpt:1.1 php-src/tests/classes/static_properties_001.phpt:1.2 --- php-src/tests/classes/static_properties_001.phpt:1.1 Thu Sep 4 16:00:01 2003 +++ php-src/tests/classes/static_properties_001.phpt Mon May 26 15:52:04 2008 @@ -17,7 +17,7 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(1) { http://cvs.php.net/viewvc.cgi/php-src/tests/classes/tostring_001.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/classes/tostring_001.phpt diff -u php-src/tests/classes/tostring_001.phpt:1.4 php-src/tests/classes/tostring_001.phpt:1.5 --- php-src/tests/classes/tostring_001.phpt:1.4 Wed Feb 22 11:44:37 2006 +++ php-src/tests/classes/tostring_001.phpt Mon May 26 15:52:04 2008 @@ -81,60 +81,6 @@ test1 Object ( ) -string(54) "Object of class test1 could not be converted to string" -string(0) "" -object(test1)#%d (0) { -} -====test2==== -test2 Object -( -) -test2::__toString() -Converted -object(test2)#%d (0) { -} -====test3==== -test2::__toString() -Converted -====test4==== -test2::__toString() -string:Converted -====test5==== -test2::__toString() -1Converted -1test2::__toString() -Converted -====test6==== -test2::__toString() -test2::__toString() -Converted -Converted -test2::__toString() -Converted -test2::__toString() -Converted -====test7==== -test2::__toString() -string(19) "Illegal offset type" -====test8==== -test2::__toString() -string(9) "Converted" -test2::__toString() -string(9) "Converted" -====test9==== -test2::__toString() -Converted -====test10==== -object(test3)#%d (0) { -} -test3::__toString() -string(53) "Method test3::__toString() must return a string value" -====DONE==== ---UEXPECTF-- -====test1==== -test1 Object -( -) unicode(54) "Object of class test1 could not be converted to string" unicode(0) "" object(test1)#%d (0) { http://cvs.php.net/viewvc.cgi/php-src/tests/classes/tostring_002.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/tostring_002.phpt diff -u php-src/tests/classes/tostring_002.phpt:1.1 php-src/tests/classes/tostring_002.phpt:1.2 --- php-src/tests/classes/tostring_002.phpt:1.1 Tue Sep 27 08:37:37 2005 +++ php-src/tests/classes/tostring_002.phpt Mon May 26 15:52:04 2008 @@ -25,7 +25,7 @@ ?> ====DONE==== ---EXPECTF-- +--EXPECT-- Hello ====DONE==== Hello http://cvs.php.net/viewvc.cgi/php-src/tests/classes/tostring_004.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/tostring_004.phpt diff -u php-src/tests/classes/tostring_004.phpt:1.2 php-src/tests/classes/tostring_004.phpt:1.3 --- php-src/tests/classes/tostring_004.phpt:1.2 Thu Mar 6 11:07:29 2008 +++ php-src/tests/classes/tostring_004.phpt Mon May 26 15:52:04 2008 @@ -34,26 +34,7 @@ printf($obj . "\n"); ?> ---EXPECTF-- -Object with no __toString(): -Try 1: -Error: 4096 - Object of class stdClass could not be converted to string -Error: 8 - Object of class stdClass to string conversion -Object - -Try 2: -Error: 4096 - Object of class stdClass could not be converted to string - - - -Object with bad __toString(): -Try 1: -Error: 4096 - Method badToString::__toString() must return a string value - - -Try 2: -Error: 4096 - Method badToString::__toString() must return a string value ---UEXPECTF-- +--EXPECT-- Object with no __toString(): Try 1: Error: 4096 - Object of class stdClass could not be converted to Unicode string http://cvs.php.net/viewvc.cgi/php-src/tests/classes/visibility_000c.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/visibility_000c.phpt diff -u php-src/tests/classes/visibility_000c.phpt:1.2 php-src/tests/classes/visibility_000c.phpt:1.3 --- php-src/tests/classes/visibility_000c.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/visibility_000c.phpt Mon May 26 15:52:04 2008 @@ -29,5 +29,5 @@ echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/visibility_001c.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/visibility_001c.phpt diff -u php-src/tests/classes/visibility_001c.phpt:1.2 php-src/tests/classes/visibility_001c.phpt:1.3 --- php-src/tests/classes/visibility_001c.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/visibility_001c.phpt Mon May 26 15:52:04 2008 @@ -29,5 +29,5 @@ echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/visibility_002c.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/visibility_002c.phpt diff -u php-src/tests/classes/visibility_002c.phpt:1.2 php-src/tests/classes/visibility_002c.phpt:1.3 --- php-src/tests/classes/visibility_002c.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/visibility_002c.phpt Mon May 26 15:52:04 2008 @@ -29,5 +29,5 @@ echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/visibility_003a.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/visibility_003a.phpt diff -u php-src/tests/classes/visibility_003a.phpt:1.2 php-src/tests/classes/visibility_003a.phpt:1.3 --- php-src/tests/classes/visibility_003a.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/visibility_003a.phpt Mon May 26 15:52:04 2008 @@ -29,5 +29,5 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/visibility_003c.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/visibility_003c.phpt diff -u php-src/tests/classes/visibility_003c.phpt:1.2 php-src/tests/classes/visibility_003c.phpt:1.3 --- php-src/tests/classes/visibility_003c.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/visibility_003c.phpt Mon May 26 15:52:04 2008 @@ -29,5 +29,5 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/visibility_004a.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/visibility_004a.phpt diff -u php-src/tests/classes/visibility_004a.phpt:1.2 php-src/tests/classes/visibility_004a.phpt:1.3 --- php-src/tests/classes/visibility_004a.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/visibility_004a.phpt Mon May 26 15:52:04 2008 @@ -29,5 +29,5 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/visibility_004b.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/visibility_004b.phpt diff -u php-src/tests/classes/visibility_004b.phpt:1.2 php-src/tests/classes/visibility_004b.phpt:1.3 --- php-src/tests/classes/visibility_004b.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/visibility_004b.phpt Mon May 26 15:52:04 2008 @@ -29,5 +29,5 @@ echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/visibility_004c.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/classes/visibility_004c.phpt diff -u php-src/tests/classes/visibility_004c.phpt:1.2 php-src/tests/classes/visibility_004c.phpt:1.3 --- php-src/tests/classes/visibility_004c.phpt:1.2 Sat Aug 9 14:48:47 2003 +++ php-src/tests/classes/visibility_004c.phpt Mon May 26 15:52:04 2008 @@ -29,5 +29,5 @@ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done http://cvs.php.net/viewvc.cgi/php-src/tests/func/003.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/func/003.phpt diff -u php-src/tests/func/003.phpt:1.3 php-src/tests/func/003.phpt:1.4 --- php-src/tests/func/003.phpt:1.3 Wed Feb 11 16:09:46 2004 +++ php-src/tests/func/003.phpt Mon May 26 15:52:05 2008 @@ -288,4 +288,3 @@ 3 4 5 - http://cvs.php.net/viewvc.cgi/php-src/tests/func/005.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/func/005.phpt diff -u php-src/tests/func/005.phpt:1.2 php-src/tests/func/005.phpt:1.3 --- php-src/tests/func/005.phpt:1.2 Fri Jan 24 05:56:55 2003 +++ php-src/tests/func/005.phpt Mon May 26 15:52:05 2008 @@ -16,4 +16,3 @@ --EXPECT-- foo() will be called on shutdown... foo - http://cvs.php.net/viewvc.cgi/php-src/tests/func/006.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/tests/func/006.phpt diff -u php-src/tests/func/006.phpt:1.6 php-src/tests/func/006.phpt:1.7 --- php-src/tests/func/006.phpt:1.6 Sat May 5 15:16:48 2007 +++ php-src/tests/func/006.phpt Mon May 26 15:52:05 2008 @@ -24,6 +24,3 @@ --EXPECT-- string(2) "2B" string(2) "1A" ---UEXPECT-- -string(2) "2B" -string(2) "1A" http://cvs.php.net/viewvc.cgi/php-src/tests/func/010.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/func/010.phpt diff -u php-src/tests/func/010.phpt:1.2 php-src/tests/func/010.phpt:1.3 --- php-src/tests/func/010.phpt:1.2 Fri Feb 8 13:49:53 2008 +++ php-src/tests/func/010.phpt Mon May 26 15:52:05 2008 @@ -8,7 +8,7 @@ $limit = $boundary+42; -function test($a,$b) +function test($a, $b) { var_dump($a === $b); test2($a,$b); http://cvs.php.net/viewvc.cgi/php-src/tests/lang/004.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/lang/004.phpt diff -u php-src/tests/lang/004.phpt:1.3 php-src/tests/lang/004.phpt:1.4 --- php-src/tests/lang/004.phpt:1.3 Wed May 19 08:45:46 2004 +++ php-src/tests/lang/004.phpt Mon May 26 15:52:05 2008 @@ -8,6 +8,6 @@ } else { echo "good"; } -?> +?> --EXPECT-- good http://cvs.php.net/viewvc.cgi/php-src/tests/lang/005.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/lang/005.phpt diff -u php-src/tests/lang/005.phpt:1.3 php-src/tests/lang/005.phpt:1.4 --- php-src/tests/lang/005.phpt:1.3 Wed May 19 08:45:46 2004 +++ php-src/tests/lang/005.phpt Mon May 26 15:52:05 2008 @@ -11,6 +11,6 @@ } else { echo "good"; } -?> +?> --EXPECT-- good http://cvs.php.net/viewvc.cgi/php-src/tests/lang/006.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/lang/006.phpt diff -u php-src/tests/lang/006.phpt:1.3 php-src/tests/lang/006.phpt:1.4 --- php-src/tests/lang/006.phpt:1.3 Wed May 19 08:45:46 2004 +++ php-src/tests/lang/006.phpt Mon May 26 15:52:05 2008 @@ -18,6 +18,6 @@ echo "bad"; } } -?> +?> --EXPECT-- good http://cvs.php.net/viewvc.cgi/php-src/tests/lang/007.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/lang/007.phpt diff -u php-src/tests/lang/007.phpt:1.3 php-src/tests/lang/007.phpt:1.4 --- php-src/tests/lang/007.phpt:1.3 Wed May 19 08:45:46 2004 +++ php-src/tests/lang/007.phpt Mon May 26 15:52:05 2008 @@ -17,9 +17,9 @@ echo "$a $c "; } -Test(); +Test(); echo "$a $b $c "; -Test(); +Test(); echo "$a $b $c "; Test(); ?> http://cvs.php.net/viewvc.cgi/php-src/tests/lang/023-1.inc?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/lang/023-1.inc diff -u php-src/tests/lang/023-1.inc:1.2 php-src/tests/lang/023-1.inc:1.3 --- php-src/tests/lang/023-1.inc:1.2 Mon Oct 23 07:40:05 2000 +++ php-src/tests/lang/023-1.inc Mon May 26 15:52:05 2008 @@ -9,7 +9,7 @@ */ ?> -*** Testing assignments and variable aliasing: *** +*** Testing assignments and variable aliasing: *** <?php /* This test tests assignments to variables using other variables as variable-names */ $a = "b"; @@ -17,85 +17,85 @@ $$$a = "blah"; ${$$$a}["associative arrays work too"] = "this is nifty"; ?> -This should read "blah": <?php echo "$test \n"; ?> -This should read "this is nifty": <?php echo $blah[$test="associative arrays work too"]." \n"; ?> -************************************************* +This should read "blah": <?php echo "$test \n"; ?> +This should read "this is nifty": <?php echo $blah[$test="associative arrays work too"]." \n"; ?> +************************************************* -*** Testing integer operators *** +*** Testing integer operators *** <?php /* test just about any operator possible on $i and $j (ints) */ $i = 5; $j = 3; ?> -Correct result - 8: <?php echo $i+$j; ?> -Correct result - 8: <?php echo $i+$j; ?> -Correct result - 2: <?php echo $i-$j; ?> -Correct result - -2: <?php echo $j-$i; ?> -Correct result - 15: <?php echo $i*$j; ?> -Correct result - 15: <?php echo $j*$i; ?> -Correct result - 2: <?php echo $i%$j; ?> -Correct result - 3: <?php echo $j%$i; ?> -********************************* +Correct result - 8: <?php echo $i+$j; ?> +Correct result - 8: <?php echo $i+$j; ?> +Correct result - 2: <?php echo $i-$j; ?> +Correct result - -2: <?php echo $j-$i; ?> +Correct result - 15: <?php echo $i*$j; ?> +Correct result - 15: <?php echo $j*$i; ?> +Correct result - 2: <?php echo $i%$j; ?> +Correct result - 3: <?php echo $j%$i; ?> +********************************* -*** Testing real operators *** +*** Testing real operators *** <?php /* test just about any operator possible on $i and $j (floats) */ $i = 5.0; $j = 3.0; ?> -Correct result - 8: <?php echo $i+$j; ?> -Correct result - 8: <?php echo $i+$j; ?> -Correct result - 2: <?php echo $i-$j; ?> -Correct result - -2: <?php echo $j-$i; ?> -Correct result - 15: <?php echo $i*$j; ?> -Correct result - 15: <?php echo $j*$i; ?> -Correct result - 2: <?php echo $i%$j; ?> -Correct result - 3: <?php echo $j%$i; ?> -********************************* +Correct result - 8: <?php echo $i+$j; ?> +Correct result - 8: <?php echo $i+$j; ?> +Correct result - 2: <?php echo $i-$j; ?> +Correct result - -2: <?php echo $j-$i; ?> +Correct result - 15: <?php echo $i*$j; ?> +Correct result - 15: <?php echo $j*$i; ?> +Correct result - 2: <?php echo $i%$j; ?> +Correct result - 3: <?php echo $j%$i; ?> +********************************* -*** Testing if/elseif/else control *** +*** Testing if/elseif/else control *** <?php /* sick if/elseif/else test by Andi :) */ $a = 5; if ($a == "4") { - echo "This "." does "." not "." work \n"; + echo "This "." does "." not "." work \n"; } elseif ($a == "5") { - echo "This "." works \n"; + echo "This "." works \n"; $a = 6; if ("andi" == ($test = "andi")) { - echo "this_still_works \n"; + echo "this_still_works \n"; } elseif (1) { - echo "should_not_print \n"; + echo "should_not_print \n"; } else { - echo "should_not_print \n"; + echo "should_not_print \n"; } if (44 == 43) { - echo "should_not_print \n"; + echo "should_not_print \n"; } else { - echo "should_print \n"; + echo "should_print \n"; } } elseif ($a == 6) { - echo "this "."broken \n"; + echo "this "."broken \n"; if (0) { - echo "this_should_not_print \n"; + echo "this_should_not_print \n"; } else { - echo "TestingDanglingElse_This_Should_not_print \n"; + echo "TestingDanglingElse_This_Should_not_print \n"; } } else { - echo "This "."does "." not"." work \n"; + echo "This "."does "." not"." work \n"; } ?> -*** Seriously nested if's test *** +*** Seriously nested if's test *** ** spelling correction by kluzz ** <?php /* yet another sick if/elseif/else test by Zeev */ $i=$j=0; -echo "Only two lines of text should follow: \n"; +echo "Only two lines of text should follow: \n"; if (0) { /* this code is not supposed to be executed */ - echo "hmm, this shouldn't be displayed #1 \n"; + echo "hmm, this shouldn't be displayed #1 \n"; $j++; if (1) { $i @@ -105,118 +105,118 @@ $j = ++$i; if (1) { $j *= $i; - echo "damn, this shouldn't be displayed \n"; + echo "damn, this shouldn't be displayed \n"; } else { $j /= $i; ++$j; - echo "this shouldn't be displayed either \n"; + echo "this shouldn't be displayed either \n"; } } elseif (1) { $i++; $j++; - echo "this isn't supposed to be displayed \n"; + echo "this isn't supposed to be displayed \n"; } } elseif (0) { $i++; - echo "this definitely shouldn't be displayed \n"; + echo "this definitely shouldn't be displayed \n"; } else { --$j; - echo "and this too shouldn't be displayed \n"; + echo "and this too shouldn't be displayed \n"; while ($j>0) { $j--; } } } elseif (2-2) { /* as long as 2-2==0, this isn't supposed to be executed either */ $i = ++$j; - echo "hmm, this shouldn't be displayed #2 \n"; + echo "hmm, this shouldn't be displayed #2 \n"; if (1) { $j = ++$i; if (0) { $j = $i*2+$j*($i++); if (1) { $i++; - echo "damn, this shouldn't be displayed \n"; + echo "damn, this shouldn't be displayed \n"; } else { $j++; - echo "this shouldn't be displayed either \n"; + echo "this shouldn't be displayed either \n"; } } else if (1) { ++$j; - echo "this isn't supposed to be displayed \n"; + echo "this isn't supposed to be displayed \n"; } } elseif (0) { $j++; - echo "this definitely shouldn't be displayed \n"; + echo "this definitely shouldn't be displayed \n"; } else { $i++; - echo "and this too shouldn't be displayed \n"; + echo "and this too shouldn't be displayed \n"; } } else { $j=$i++; /* this should set $i to 1, but shouldn't change $j (it's assigned $i's previous values, zero) */ - echo "this should be displayed. should be: \$i=1, \$j=0. is: \$i=$i, \$j=$j \n"; + echo "this should be displayed. should be: \$i=1, \$j=0. is: \$i=$i, \$j=$j \n"; if (1) { $j += ++$i; /* ++$i --> $i==2, $j += 2 --> $j==2 */ if (0) { $j += 40; if (1) { $i += 50; - echo "damn, this shouldn't be displayed \n"; + echo "damn, this shouldn't be displayed \n"; } else { $j += 20; - echo "this shouldn't be displayed either \n"; + echo "this shouldn't be displayed either \n"; } } else if (1) { $j *= $i; /* $j *= 2 --> $j == 4 */ - echo "this is supposed to be displayed. should be: \$i=2, \$j=4. is: \$i=$i, \$j=$j \n"; - echo "3 loop iterations should follow: \n"; + echo "this is supposed to be displayed. should be: \$i=2, \$j=4. is: \$i=$i, \$j=$j \n"; + echo "3 loop iterations should follow: \n"; while ($i<=$j) { - echo $i++." $j \n"; + echo $i++." $j \n"; } } } elseif (0) { - echo "this definitely shouldn't be displayed \n"; + echo "this definitely shouldn't be displayed \n"; } else { - echo "and this too shouldn't be displayed \n"; + echo "and this too shouldn't be displayed \n"; } - echo "********************************** \n"; + echo "********************************** \n"; } ?> -*** C-style else-if's *** +*** C-style else-if's *** <?php /* looks like without we even tried, C-style else-if structure works fine! */ if ($a=0) { - echo "This shouldn't be displayed \n"; + echo "This shouldn't be displayed \n"; } else if ($a++) { - echo "This shouldn't be displayed either \n"; + echo "This shouldn't be displayed either \n"; } else if (--$a) { - echo "No, this neither \n"; + echo "No, this neither \n"; } else if (++$a) { - echo "This should be displayed \n"; + echo "This should be displayed \n"; } else { - echo "This shouldn't be displayed at all \n"; + echo "This shouldn't be displayed at all \n"; } ?> -************************* +************************* -*** WHILE tests *** +*** WHILE tests *** <?php $i=0; $j=20; while ($i<(2*$j)) { if ($i>$j) { - echo "$i is greater than $j \n"; + echo "$i is greater than $j \n"; } else if ($i==$j) { - echo "$i equals $j \n"; + echo "$i equals $j \n"; } else { - echo "$i is smaller than $j \n"; + echo "$i is smaller than $j \n"; } $i++; } ?> -******************* +******************* -*** Nested WHILEs *** +*** Nested WHILEs *** <?php $arr_len=3; @@ -234,7 +234,7 @@ $i++; } -echo "Each array variable should be equal to the sum of its indices: \n"; +echo "Each array variable should be equal to the sum of its indices: \n"; $i=0; while ($i<$arr_len) { @@ -242,7 +242,7 @@ while ($j<$arr_len) { $k=0; while ($k<$arr_len) { - echo "\${test$i$j}[$k] = ".${"test$i$j"}[$k]." \n"; + echo "\${test$i$j}[$k] = ".${"test$i$j"}[$k]." \n"; $k++; } $j++; @@ -250,9 +250,9 @@ $i++; } ?> -********************* +********************* -*** hash test... *** +*** hash test... *** <?php /* $i=0; @@ -264,21 +264,21 @@ $i=0; while ($i<10000) { - echo $arr[$i++]." \n"; + echo $arr[$i++]." \n"; } */ echo "commented out..."; ?> -************************** +************************** -*** Hash resizing test *** +*** Hash resizing test *** <?php $i = 10; $a = 'b'; while ($i > 0) { $a = $a . 'a'; - echo "$a \n"; + echo "$a \n"; $resize[$a] = $i; $i--; } @@ -286,31 +286,31 @@ $a = 'b'; while ($i > 0) { $a = $a . 'a'; - echo "$a \n"; - echo $resize[$a]." \n"; + echo "$a \n"; + echo $resize[$a]." \n"; $i--; } ?> -************************** +************************** -*** break/continue test *** +*** break/continue test *** <?php $i=0; -echo "\$i should go from 0 to 2 \n"; +echo "\$i should go from 0 to 2 \n"; while ($i<5) { if ($i>2) { break; } $j=0; - echo "\$j should go from 3 to 4, and \$q should go from 3 to 4 \n"; + echo "\$j should go from 3 to 4, and \$q should go from 3 to 4 \n"; while ($j<5) { if ($j<=2) { $j++; continue; } - echo " \$j=$j \n"; + echo " \$j=$j \n"; for ($q=0; $q<=10; $q++) { if ($q<3) { continue; @@ -318,39 +318,39 @@ if ($q>4) { break; } - echo " \$q=$q \n"; + echo " \$q=$q \n"; } $j++; } $j=0; - echo "\$j should go from 0 to 2 \n"; + echo "\$j should go from 0 to 2 \n"; while ($j<5) { if ($j>2) { $k=0; - echo "\$k should go from 0 to 2 \n"; + echo "\$k should go from 0 to 2 \n"; while ($k<5) { if ($k>2) { break 2; } - echo " \$k=$k \n"; + echo " \$k=$k \n"; $k++; } } - echo " \$j=$j \n"; + echo " \$j=$j \n"; $j++; } - echo "\$i=$i \n"; + echo "\$i=$i \n"; $i++; } ?> -*********************** +*********************** -*** Nested file include test *** +*** Nested file include test *** <?php include("023-2.inc"); ?> -******************************** +******************************** <?php { - echo "Tests completed. \n"; # testing some PHP style comment... + echo "Tests completed. \n"; # testing some PHP style comment... } ?> http://cvs.php.net/viewvc.cgi/php-src/tests/lang/023.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/tests/lang/023.phpt diff -u php-src/tests/lang/023.phpt:1.6 php-src/tests/lang/023.phpt:1.7 --- php-src/tests/lang/023.phpt:1.6 Mon Jul 4 12:41:00 2005 +++ php-src/tests/lang/023.phpt Mon May 26 15:52:05 2008 @@ -30,227 +30,227 @@ <html> <head> -*** Testing assignments and variable aliasing: *** -This should read "blah": blah -This should read "this is nifty": this is nifty -************************************************* - -*** Testing integer operators *** -Correct result - 8: 8 -Correct result - 8: 8 -Correct result - 2: 2 -Correct result - -2: -2 -Correct result - 15: 15 -Correct result - 15: 15 -Correct result - 2: 2 -Correct result - 3: 3 -********************************* - -*** Testing real operators *** -Correct result - 8: 8 -Correct result - 8: 8 -Correct result - 2: 2 -Correct result - -2: -2 -Correct result - 15: 15 -Correct result - 15: 15 -Correct result - 2: 2 -Correct result - 3: 3 -********************************* - -*** Testing if/elseif/else control *** - -This works -this_still_works -should_print +*** Testing assignments and variable aliasing: *** +This should read "blah": blah +This should read "this is nifty": this is nifty +************************************************* + +*** Testing integer operators *** +Correct result - 8: 8 +Correct result - 8: 8 +Correct result - 2: 2 +Correct result - -2: -2 +Correct result - 15: 15 +Correct result - 15: 15 +Correct result - 2: 2 +Correct result - 3: 3 +********************************* + +*** Testing real operators *** +Correct result - 8: 8 +Correct result - 8: 8 +Correct result - 2: 2 +Correct result - -2: -2 +Correct result - 15: 15 +Correct result - 15: 15 +Correct result - 2: 2 +Correct result - 3: 3 +********************************* + +*** Testing if/elseif/else control *** + +This works +this_still_works +should_print -*** Seriously nested if's test *** +*** Seriously nested if's test *** ** spelling correction by kluzz ** -Only two lines of text should follow: -this should be displayed. should be: $i=1, $j=0. is: $i=1, $j=0 -this is supposed to be displayed. should be: $i=2, $j=4. is: $i=2, $j=4 -3 loop iterations should follow: -2 4 -3 4 -4 4 -********************************** - -*** C-style else-if's *** -This should be displayed -************************* - -*** WHILE tests *** -0 is smaller than 20 -1 is smaller than 20 -2 is smaller than 20 -3 is smaller than 20 -4 is smaller than 20 -5 is smaller than 20 -6 is smaller than 20 -7 is smaller than 20 -8 is smaller than 20 -9 is smaller than 20 -10 is smaller than 20 -11 is smaller than 20 -12 is smaller than 20 -13 is smaller than 20 -14 is smaller than 20 -15 is smaller than 20 -16 is smaller than 20 -17 is smaller than 20 -18 is smaller than 20 -19 is smaller than 20 -20 equals 20 -21 is greater than 20 -22 is greater than 20 -23 is greater than 20 -24 is greater than 20 -25 is greater than 20 -26 is greater than 20 -27 is greater than 20 -28 is greater than 20 -29 is greater than 20 -30 is greater than 20 -31 is greater than 20 -32 is greater than 20 -33 is greater than 20 -34 is greater than 20 -35 is greater than 20 -36 is greater than 20 -37 is greater than 20 -38 is greater than 20 -39 is greater than 20 -******************* - - -*** Nested WHILEs *** -Each array variable should be equal to the sum of its indices: -${test00}[0] = 0 -${test00}[1] = 1 -${test00}[2] = 2 -${test01}[0] = 1 -${test01}[1] = 2 -${test01}[2] = 3 -${test02}[0] = 2 -${test02}[1] = 3 -${test02}[2] = 4 -${test10}[0] = 1 -${test10}[1] = 2 -${test10}[2] = 3 -${test11}[0] = 2 -${test11}[1] = 3 -${test11}[2] = 4 -${test12}[0] = 3 -${test12}[1] = 4 -${test12}[2] = 5 -${test20}[0] = 2 -${test20}[1] = 3 -${test20}[2] = 4 -${test21}[0] = 3 -${test21}[1] = 4 -${test21}[2] = 5 -${test22}[0] = 4 -${test22}[1] = 5 -${test22}[2] = 6 -********************* +Only two lines of text should follow: +this should be displayed. should be: $i=1, $j=0. is: $i=1, $j=0 +this is supposed to be displayed. should be: $i=2, $j=4. is: $i=2, $j=4 +3 loop iterations should follow: +2 4 +3 4 +4 4 +********************************** + +*** C-style else-if's *** +This should be displayed +************************* + +*** WHILE tests *** +0 is smaller than 20 +1 is smaller than 20 +2 is smaller than 20 +3 is smaller than 20 +4 is smaller than 20 +5 is smaller than 20 +6 is smaller than 20 +7 is smaller than 20 +8 is smaller than 20 +9 is smaller than 20 +10 is smaller than 20 +11 is smaller than 20 +12 is smaller than 20 +13 is smaller than 20 +14 is smaller than 20 +15 is smaller than 20 +16 is smaller than 20 +17 is smaller than 20 +18 is smaller than 20 +19 is smaller than 20 +20 equals 20 +21 is greater than 20 +22 is greater than 20 +23 is greater than 20 +24 is greater than 20 +25 is greater than 20 +26 is greater than 20 +27 is greater than 20 +28 is greater than 20 +29 is greater than 20 +30 is greater than 20 +31 is greater than 20 +32 is greater than 20 +33 is greater than 20 +34 is greater than 20 +35 is greater than 20 +36 is greater than 20 +37 is greater than 20 +38 is greater than 20 +39 is greater than 20 +******************* + + +*** Nested WHILEs *** +Each array variable should be equal to the sum of its indices: +${test00}[0] = 0 +${test00}[1] = 1 +${test00}[2] = 2 +${test01}[0] = 1 +${test01}[1] = 2 +${test01}[2] = 3 +${test02}[0] = 2 +${test02}[1] = 3 +${test02}[2] = 4 +${test10}[0] = 1 +${test10}[1] = 2 +${test10}[2] = 3 +${test11}[0] = 2 +${test11}[1] = 3 +${test11}[2] = 4 +${test12}[0] = 3 +${test12}[1] = 4 +${test12}[2] = 5 +${test20}[0] = 2 +${test20}[1] = 3 +${test20}[2] = 4 +${test21}[0] = 3 +${test21}[1] = 4 +${test21}[2] = 5 +${test22}[0] = 4 +${test22}[1] = 5 +${test22}[2] = 6 +********************* -*** hash test... *** +*** hash test... *** commented out... -************************** +************************** -*** Hash resizing test *** -ba -baa -baaa -baaaa -baaaaa -baaaaaa -baaaaaaa -baaaaaaaa -baaaaaaaaa -baaaaaaaaaa -ba -10 -baa -9 -baaa -8 -baaaa -7 -baaaaa -6 -baaaaaa -5 -baaaaaaa -4 -baaaaaaaa -3 -baaaaaaaaa -2 -baaaaaaaaaa -1 -************************** - - -*** break/continue test *** -$i should go from 0 to 2 -$j should go from 3 to 4, and $q should go from 3 to 4 - $j=3 - $q=3 - $q=4 - $j=4 - $q=3 - $q=4 -$j should go from 0 to 2 - $j=0 - $j=1 - $j=2 -$k should go from 0 to 2 - $k=0 - $k=1 - $k=2 -$i=0 -$j should go from 3 to 4, and $q should go from 3 to 4 - $j=3 - $q=3 - $q=4 - $j=4 - $q=3 - $q=4 -$j should go from 0 to 2 - $j=0 - $j=1 - $j=2 -$k should go from 0 to 2 - $k=0 - $k=1 - $k=2 -$i=1 -$j should go from 3 to 4, and $q should go from 3 to 4 - $j=3 - $q=3 - $q=4 - $j=4 - $q=3 - $q=4 -$j should go from 0 to 2 - $j=0 - $j=1 - $j=2 -$k should go from 0 to 2 - $k=0 - $k=1 - $k=2 -$i=2 -*********************** +*** Hash resizing test *** +ba +baa +baaa +baaaa +baaaaa +baaaaaa +baaaaaaa +baaaaaaaa +baaaaaaaaa +baaaaaaaaaa +ba +10 +baa +9 +baaa +8 +baaaa +7 +baaaaa +6 +baaaaaa +5 +baaaaaaa +4 +baaaaaaaa +3 +baaaaaaaaa +2 +baaaaaaaaaa +1 +************************** + + +*** break/continue test *** +$i should go from 0 to 2 +$j should go from 3 to 4, and $q should go from 3 to 4 + $j=3 + $q=3 + $q=4 + $j=4 + $q=3 + $q=4 +$j should go from 0 to 2 + $j=0 + $j=1 + $j=2 +$k should go from 0 to 2 + $k=0 + $k=1 + $k=2 +$i=0 +$j should go from 3 to 4, and $q should go from 3 to 4 + $j=3 + $q=3 + $q=4 + $j=4 + $q=3 + $q=4 +$j should go from 0 to 2 + $j=0 + $j=1 + $j=2 +$k should go from 0 to 2 + $k=0 + $k=1 + $k=2 +$i=1 +$j should go from 3 to 4, and $q should go from 3 to 4 + $j=3 + $q=3 + $q=4 + $j=4 + $q=3 + $q=4 +$j should go from 0 to 2 + $j=0 + $j=1 + $j=2 +$k should go from 0 to 2 + $k=0 + $k=1 + $k=2 +$i=2 +*********************** -*** Nested file include test *** +*** Nested file include test *** <html> This is Finish.phtml. This file is supposed to be included from regression_test.phtml. This is normal HTML. and this is PHP code, 2+2=4 </html> -******************************** +******************************** -Tests completed. +Tests completed. Limor Ullmann is now Limor Baruch :I http://cvs.php.net/viewvc.cgi/php-src/tests/lang/028.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/tests/lang/028.phpt diff -u php-src/tests/lang/028.phpt:1.6 php-src/tests/lang/028.phpt:1.7 --- php-src/tests/lang/028.phpt:1.6 Wed May 19 08:45:46 2004 +++ php-src/tests/lang/028.phpt Mon May 26 15:52:05 2008 @@ -1055,4 +1055,3 @@ Hey there!! 199 Dafna - http://cvs.php.net/viewvc.cgi/php-src/tests/lang/032.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/lang/032.phpt diff -u php-src/tests/lang/032.phpt:1.2 php-src/tests/lang/032.phpt:1.3 --- php-src/tests/lang/032.phpt:1.2 Wed May 19 08:45:46 2004 +++ php-src/tests/lang/032.phpt Mon May 26 15:52:05 2008 @@ -33,4 +33,3 @@ ?> --EXPECT-- OK - http://cvs.php.net/viewvc.cgi/php-src/tests/lang/034.phpt?r1=1.13&r2=1.14&diff_format=u Index: php-src/tests/lang/034.phpt diff -u php-src/tests/lang/034.phpt:1.13 php-src/tests/lang/034.phpt:1.14 --- php-src/tests/lang/034.phpt:1.13 Sun Feb 24 13:10:33 2008 +++ php-src/tests/lang/034.phpt Mon May 26 15:52:05 2008 @@ -15,8 +15,6 @@ echo (float)"3.14", "\n"; ?> ---EXPECT-- -3,14 ---UEXPECTF-- -Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d +--EXPECTF-- +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s034.php on line %d 3,14 http://cvs.php.net/viewvc.cgi/php-src/tests/lang/035.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/lang/035.phpt diff -u php-src/tests/lang/035.phpt:1.4 php-src/tests/lang/035.phpt:1.5 --- php-src/tests/lang/035.phpt:1.4 Thu Feb 12 12:21:16 2004 +++ php-src/tests/lang/035.phpt Mon May 26 15:52:05 2008 @@ -28,7 +28,7 @@ } try { - ThrowException(); + ThrowException(); } catch (MyException $exception) { print "There was an exception: " . $exception->getException(); print "\n"; http://cvs.php.net/viewvc.cgi/php-src/tests/lang/038.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/tests/lang/038.phpt diff -u php-src/tests/lang/038.phpt:1.5 php-src/tests/lang/038.phpt:1.6 --- php-src/tests/lang/038.phpt:1.5 Sat May 24 15:13:11 2008 +++ php-src/tests/lang/038.phpt Mon May 26 15:52:05 2008 @@ -35,11 +35,7 @@ ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- -string(15) "Error2Exception" -string(5) "fopen" -===DONE=== ---UEXPECTF-- +--EXPECT-- unicode(15) "Error2Exception" unicode(5) "fopen" ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/tests/lang/039.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/lang/039.phpt diff -u php-src/tests/lang/039.phpt:1.3 php-src/tests/lang/039.phpt:1.4 --- php-src/tests/lang/039.phpt:1.3 Sat May 24 15:13:11 2008 +++ php-src/tests/lang/039.phpt Mon May 26 15:52:05 2008 @@ -40,6 +40,6 @@ ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Catchable ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug18872.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/lang/bug18872.phpt diff -u php-src/tests/lang/bug18872.phpt:1.1 php-src/tests/lang/bug18872.phpt:1.2 --- php-src/tests/lang/bug18872.phpt:1.1 Mon Jun 16 09:20:42 2003 +++ php-src/tests/lang/bug18872.phpt Mon May 26 15:52:05 2008 @@ -1,18 +1,18 @@ --TEST-- Bug #18872 (class constant used as default parameter) --FILE-- -<?php -class FooBar { - const BIFF = 3; -} - -function foo($biff = FooBar::BIFF) { - echo $biff . "\n"; -} - -foo(); -foo(); -?> +<?php +class FooBar { + const BIFF = 3; +} + +function foo($biff = FooBar::BIFF) { + echo $biff . "\n"; +} + +foo(); +foo(); +?> --EXPECT-- 3 3 http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug19943.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/lang/bug19943.phpt diff -u php-src/tests/lang/bug19943.phpt:1.4 php-src/tests/lang/bug19943.phpt:1.5 --- php-src/tests/lang/bug19943.phpt:1.4 Mon Aug 15 14:37:54 2005 +++ php-src/tests/lang/bug19943.phpt Mon May 26 15:52:05 2008 @@ -26,16 +26,4 @@ 7 -- 7 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/viewvc.cgi/php-src/tests/lang/bug21094.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/lang/bug21094.phpt diff -u php-src/tests/lang/bug21094.phpt:1.1 php-src/tests/lang/bug21094.phpt:1.2 --- php-src/tests/lang/bug21094.phpt:1.1 Sat Jan 18 19:44:12 2003 +++ php-src/tests/lang/bug21094.phpt Mon May 26 15:52:05 2008 @@ -14,4 +14,3 @@ ?> --EXPECTF-- [1024] errstr: test, errfile: %s, errline: %d - http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug21600.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/tests/lang/bug21600.phpt diff -u php-src/tests/lang/bug21600.phpt:1.5 php-src/tests/lang/bug21600.phpt:1.6 --- php-src/tests/lang/bug21600.phpt:1.5 Mon Aug 15 14:37:54 2005 +++ php-src/tests/lang/bug21600.phpt Mon May 26 15:52:05 2008 @@ -28,18 +28,6 @@ --EXPECTF-- Strict Standards: Only variables should be assigned by reference in %sbug21600.php on line 4 array(1) { - ["foo"]=> - string(4) "test" -} - -Strict Standards: Only variables should be assigned by reference in %sbug21600.php on line 11 -array(1) { - ["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" } http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug21961.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/tests/lang/bug21961.phpt diff -u php-src/tests/lang/bug21961.phpt:1.5 php-src/tests/lang/bug21961.phpt:1.6 --- php-src/tests/lang/bug21961.phpt:1.5 Mon Aug 15 14:37:54 2005 +++ php-src/tests/lang/bug21961.phpt Mon May 26 15:52:05 2008 @@ -55,6 +55,4 @@ var_dump($x->bars[0]->whosdrunk()); ?> --EXPECT-- -string(14) "The old Tavern" ---UEXPECT-- unicode(14) "The old Tavern" http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug22231.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/tests/lang/bug22231.phpt diff -u php-src/tests/lang/bug22231.phpt:1.8 php-src/tests/lang/bug22231.phpt:1.9 --- php-src/tests/lang/bug22231.phpt:1.8 Sun Feb 24 13:10:33 2008 +++ php-src/tests/lang/bug22231.phpt Mon May 26 15:52:05 2008 @@ -29,20 +29,6 @@ --EXPECTF-- Deprecated: Assigning the return value of new by reference is deprecated in %s on line %d object(foo)#%d (1) { - ["fubar"]=> - string(5) "fubar" -} -string(5) "fubar" -string(5) "fubar" -object(foo)#%d (1) { - ["fubar"]=> - string(5) "fubar" -} -string(5) "fubar" -string(5) "fubar" ---UEXPECTF-- -Deprecated: Assigning the return value of new by reference is deprecated in %s on line %d -object(foo)#%d (1) { [u"fubar"]=> unicode(5) "fubar" } http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug22592.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/lang/bug22592.phpt diff -u php-src/tests/lang/bug22592.phpt:1.3 php-src/tests/lang/bug22592.phpt:1.4 --- php-src/tests/lang/bug22592.phpt:1.3 Tue Mar 4 10:07:28 2008 +++ php-src/tests/lang/bug22592.phpt Mon May 26 15:52:05 2008 @@ -35,23 +35,6 @@ $result{-1} = 'a'; ?> --EXPECT-- -string(5) "* *-*" -string(7) "* *-* *" -string(7) "*4*-* *" -string(7) "*4*s* *" -string(8) "*4*s* *0" -string(8) "*-*-* *0" -string(8) "*-*s*s*0" -string(8) "4-4s4s*0" -string(9) "4-4s4s505" -string(9) "454s4s505" -string(1) "-" -string(1) "s" -string(1) "4" -string(1) "5" -string(1) "5" -[Illegal string offset: -1] ---UEXPECT-- unicode(5) "* *-*" unicode(7) "* *-* *" unicode(7) "*4*-* *" http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug23624.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/lang/bug23624.phpt diff -u php-src/tests/lang/bug23624.phpt:1.4 php-src/tests/lang/bug23624.phpt:1.5 --- php-src/tests/lang/bug23624.phpt:1.4 Mon Aug 15 14:37:54 2005 +++ php-src/tests/lang/bug23624.phpt Mon May 26 15:52:05 2008 @@ -8,8 +8,5 @@ var_dump(current($arr)); ?> --EXPECT-- -string(3) "one" -bool(false) ---UEXPECT-- unicode(3) "one" bool(false) http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug24573.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/lang/bug24573.phpt diff -u php-src/tests/lang/bug24573.phpt:1.2 php-src/tests/lang/bug24573.phpt:1.3 --- php-src/tests/lang/bug24573.phpt:1.2 Wed Feb 4 17:55:44 2004 +++ php-src/tests/lang/bug24573.phpt Mon May 26 15:52:05 2008 @@ -21,4 +21,4 @@ ?> --EXPECTF-- -Fatal error: Cannot re-assign $this in %s on line %d \ No newline at end of file +Fatal error: Cannot re-assign $this in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug25145.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/lang/bug25145.phpt diff -u php-src/tests/lang/bug25145.phpt:1.3 php-src/tests/lang/bug25145.phpt:1.4 --- php-src/tests/lang/bug25145.phpt:1.3 Mon Feb 13 10:23:59 2006 +++ php-src/tests/lang/bug25145.phpt Mon May 26 15:52:05 2008 @@ -16,17 +16,7 @@ [123]=> array(1) { [0]=> - string(4) "SEGV" - } -} -Done ---UEXPECT-- -array(1) { - [123]=> - array(1) { - [0]=> unicode(4) "SEGV" } } Done - http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug28800.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/lang/bug28800.phpt diff -u php-src/tests/lang/bug28800.phpt:1.2 php-src/tests/lang/bug28800.phpt:1.3 --- php-src/tests/lang/bug28800.phpt:1.2 Fri Jul 16 02:03:25 2004 +++ php-src/tests/lang/bug28800.phpt Mon May 26 15:52:05 2008 @@ -14,4 +14,3 @@ 0 0 0 - http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug30638.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/tests/lang/bug30638.phpt diff -u php-src/tests/lang/bug30638.phpt:1.6 php-src/tests/lang/bug30638.phpt:1.7 --- php-src/tests/lang/bug30638.phpt:1.6 Sat Mar 8 19:05:48 2008 +++ php-src/tests/lang/bug30638.phpt Mon May 26 15:52:05 2008 @@ -17,10 +17,7 @@ printf("decimal_point: %s\n", $lc['decimal_point']); printf("thousands_sep: %s\n", $lc['thousands_sep']); ?> ---EXPECT-- -decimal_point: , -thousands_sep: . ---UEXPECTF-- +--EXPECTF-- Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d Deprecated: localeconv(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug32828.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/lang/bug32828.phpt diff -u php-src/tests/lang/bug32828.phpt:1.2 php-src/tests/lang/bug32828.phpt:1.3 --- php-src/tests/lang/bug32828.phpt:1.2 Wed Jun 22 15:30:14 2005 +++ php-src/tests/lang/bug32828.phpt Mon May 26 15:52:05 2008 @@ -12,7 +12,7 @@ ob_end_clean(); ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught exception 'Exception' in %s:%d Stack trace: #0 [internal function]: output_handler('', %d) http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug35382.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/lang/bug35382.phpt diff -u php-src/tests/lang/bug35382.phpt:1.4 php-src/tests/lang/bug35382.phpt:1.5 --- php-src/tests/lang/bug35382.phpt:1.4 Sat Nov 26 16:34:37 2005 +++ php-src/tests/lang/bug35382.phpt Mon May 26 15:52:05 2008 @@ -5,5 +5,5 @@ eval("echo 'Hello'; // comment"); echo " World"; //last line comment ---EXPECTF-- +--EXPECT-- Hello World http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug38579.inc?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/lang/bug38579.inc diff -u php-src/tests/lang/bug38579.inc:1.2 php-src/tests/lang/bug38579.inc:1.3 --- php-src/tests/lang/bug38579.inc:1.2 Wed Sep 20 07:36:21 2006 +++ php-src/tests/lang/bug38579.inc Mon May 26 15:52:05 2008 @@ -1,3 +1,3 @@ -<?php -echo "ok\n"; -?> +<?php +echo "ok\n"; +?> http://cvs.php.net/viewvc.cgi/php-src/tests/lang/catchable_error_002.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/tests/lang/catchable_error_002.phpt diff -u php-src/tests/lang/catchable_error_002.phpt:1.5 php-src/tests/lang/catchable_error_002.phpt:1.6 --- php-src/tests/lang/catchable_error_002.phpt:1.5 Sun May 21 11:38:24 2006 +++ php-src/tests/lang/catchable_error_002.phpt Mon May 26 15:52:05 2008 @@ -25,21 +25,6 @@ [0]=> int(4096) [1]=> - string(%d) "Argument 1 passed to blah() must be an instance of Foo, instance of stdClass given, called in %scatchable_error_002.php on line %d and defined" - [2]=> - string(%d) "%scatchable_error_002.php" - [3]=> - int(5) - [4]=> - array(0) { - } -} -ALIVE! ---UEXPECTF-- -array(5) { - [0]=> - int(4096) - [1]=> unicode(%d) "Argument 1 passed to blah() must be an instance of Foo, instance of stdClass given, called in %scatchable_error_002.php on line %d and defined" [2]=> unicode(%d) "%scatchable_error_002.php" http://cvs.php.net/viewvc.cgi/php-src/tests/lang/include_variation3.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/lang/include_variation3.phpt diff -u php-src/tests/lang/include_variation3.phpt:1.1 php-src/tests/lang/include_variation3.phpt:1.2 --- php-src/tests/lang/include_variation3.phpt:1.1 Wed Mar 19 18:06:22 2008 +++ php-src/tests/lang/include_variation3.phpt Mon May 26 15:52:05 2008 @@ -5,4 +5,4 @@ require_once 'include_files/eval.inc'; ?> --EXPECT-- -Included! \ No newline at end of file +Included! http://cvs.php.net/viewvc.cgi/php-src/tests/lang/type_hints_002.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/lang/type_hints_002.phpt diff -u php-src/tests/lang/type_hints_002.phpt:1.1 php-src/tests/lang/type_hints_002.phpt:1.2 --- php-src/tests/lang/type_hints_002.phpt:1.1 Mon Oct 17 07:03:33 2005 +++ php-src/tests/lang/type_hints_002.phpt Mon May 26 15:52:05 2008 @@ -25,4 +25,3 @@ - NULL - - http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/output/ob_001.phpt diff -u php-src/tests/output/ob_001.phpt:1.1 php-src/tests/output/ob_001.phpt:1.2 --- php-src/tests/output/ob_001.phpt:1.1 Fri Jun 2 19:51:43 2006 +++ php-src/tests/output/ob_001.phpt Mon May 26 15:52:05 2008 @@ -4,5 +4,5 @@ <?php echo "foo\n"; ?> ---EXPECTF-- +--EXPECT-- foo http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_016.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/output/ob_016.phpt diff -u php-src/tests/output/ob_016.phpt:1.1 php-src/tests/output/ob_016.phpt:1.2 --- php-src/tests/output/ob_016.phpt:1.1 Fri Jun 2 23:45:53 2006 +++ php-src/tests/output/ob_016.phpt Mon May 26 15:52:05 2008 @@ -10,11 +10,8 @@ $s = ob_get_clean(); var_dump($s); -var_dump(unicode_decode($s, unicode_semantics()?"utf8":"latin1")); +var_dump(unicode_decode($s, "utf8")); ?> --EXPECTF-- -string(10) "%s" -unicode(10) "%s" ---UEXPECTF-- string(14) "%s" unicode(10) "%s" http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_018.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/output/ob_018.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/run-test/test001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/run-test/test001.phpt diff -u php-src/tests/run-test/test001.phpt:1.1 php-src/tests/run-test/test001.phpt:1.2 --- php-src/tests/run-test/test001.phpt:1.1 Mon Nov 4 10:43:22 2002 +++ php-src/tests/run-test/test001.phpt Mon May 26 15:52:05 2008 @@ -3,4 +3,4 @@ --FILE-- abc --EXPECT-- -abc \ No newline at end of file +abc http://cvs.php.net/viewvc.cgi/php-src/tests/run-test/test002.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/run-test/test002.phpt diff -u php-src/tests/run-test/test002.phpt:1.1 php-src/tests/run-test/test002.phpt:1.2 --- php-src/tests/run-test/test002.phpt:1.1 Mon Nov 4 10:43:22 2002 +++ php-src/tests/run-test/test002.phpt Mon May 26 15:52:05 2008 @@ -15,4 +15,4 @@ %f %s %x -%c \ No newline at end of file +%c http://cvs.php.net/viewvc.cgi/php-src/tests/run-test/test003.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/run-test/test003.phpt diff -u php-src/tests/run-test/test003.phpt:1.1 php-src/tests/run-test/test003.phpt:1.2 --- php-src/tests/run-test/test003.phpt:1.1 Mon Nov 4 10:43:22 2002 +++ php-src/tests/run-test/test003.phpt Mon May 26 15:52:05 2008 @@ -3,4 +3,4 @@ --FILE-- abcde12314235xyz34264768286abcde --EXPECTREGEX-- -[abcde]+[0-5]*xyz[2-8]+abcde \ No newline at end of file +[abcde]+[0-5]*xyz[2-8]+abcde http://cvs.php.net/viewvc.cgi/php-src/tests/run-test/test004.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/run-test/test004.phpt diff -u php-src/tests/run-test/test004.phpt:1.3 php-src/tests/run-test/test004.phpt:1.4 --- php-src/tests/run-test/test004.phpt:1.3 Mon Feb 13 10:23:59 2006 +++ php-src/tests/run-test/test004.phpt Mon May 26 15:52:05 2008 @@ -7,6 +7,4 @@ var_dump(ini_get('arg_separator.input')); ?> --EXPECT-- -string(1) "=" ---UEXPECT-- unicode(1) "=" http://cvs.php.net/viewvc.cgi/php-src/tests/run-test/test005.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/tests/run-test/test005.phpt diff -u php-src/tests/run-test/test005.phpt:1.6 php-src/tests/run-test/test005.phpt:1.7 --- php-src/tests/run-test/test005.phpt:1.6 Sun Feb 24 12:42:16 2008 +++ php-src/tests/run-test/test005.phpt Mon May 26 15:52:05 2008 @@ -23,14 +23,6 @@ var_dump($php_errormsg); ?> --EXPECTF-- -string(1) "1" -string(5) "16383" -string(1) "0" -string(1) "1" -string(1) "0" -NULL -string(%d) "%sivision by zer%s" ---UEXPECTF-- unicode(1) "1" unicode(5) "16383" unicode(1) "0" http://cvs.php.net/viewvc.cgi/php-src/tests/run-test/test008.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/run-test/test008.phpt diff -u php-src/tests/run-test/test008.phpt:1.4 php-src/tests/run-test/test008.phpt:1.5 --- php-src/tests/run-test/test008.phpt:1.4 Tue Jan 17 12:18:53 2006 +++ php-src/tests/run-test/test008.phpt Mon May 26 15:52:05 2008 @@ -24,15 +24,6 @@ ?> --EXPECTF-- %s: %sivision by zero in %s on line %d -string(1) "1" -string(4) "4095" -string(1) "0" -string(1) "1" -string(1) "0" -string(%d) "%sivision by zer%s" -string(%d) "%sivision by zer%s" ---UEXPECTF-- -%s: %sivision by zero in %s on line %d unicode(1) "1" unicode(4) "4095" unicode(1) "0" http://cvs.php.net/viewvc.cgi/php-src/tests/run-test/test008a.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/tests/run-test/test008a.phpt diff -u php-src/tests/run-test/test008a.phpt:1.5 php-src/tests/run-test/test008a.phpt:1.6 --- php-src/tests/run-test/test008a.phpt:1.5 Sun Feb 24 12:42:16 2008 +++ php-src/tests/run-test/test008a.phpt Mon May 26 15:52:05 2008 @@ -23,14 +23,6 @@ var_dump($php_errormsg); ?> --EXPECTF-- -string(1) "1" -string(5) "16383" -string(1) "0" -string(1) "1" -string(1) "0" -NULL -string(%d) "%sivision by zer%s" ---UEXPECTF-- unicode(1) "1" unicode(5) "16383" unicode(1) "0" http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_chdir.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_chdir.phpt diff -u php-src/tests/security/open_basedir_chdir.phpt:1.2 php-src/tests/security/open_basedir_chdir.phpt:1.3 --- php-src/tests/security/open_basedir_chdir.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_chdir.phpt Mon May 26 15:52:05 2008 @@ -48,4 +48,3 @@ Warning: chdir(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d bool(false) *** Finished testing open_basedir configuration [chdir] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_chmod.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_chmod.phpt diff -u php-src/tests/security/open_basedir_chmod.phpt:1.2 php-src/tests/security/open_basedir_chmod.phpt:1.3 --- php-src/tests/security/open_basedir_chmod.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_chmod.phpt Mon May 26 15:52:05 2008 @@ -68,4 +68,3 @@ bool(true) bool(true) *** Finished testing open_basedir configuration [chmod] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_copy.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_copy.phpt diff -u php-src/tests/security/open_basedir_copy.phpt:1.2 php-src/tests/security/open_basedir_copy.phpt:1.3 --- php-src/tests/security/open_basedir_copy.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_copy.phpt Mon May 26 15:52:05 2008 @@ -76,4 +76,3 @@ bool(true) bool(true) *** Finished testing open_basedir configuration [copy] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_copy_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_copy_variation1.phpt diff -u php-src/tests/security/open_basedir_copy_variation1.phpt:1.2 php-src/tests/security/open_basedir_copy_variation1.phpt:1.3 --- php-src/tests/security/open_basedir_copy_variation1.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_copy_variation1.phpt Mon May 26 15:52:05 2008 @@ -32,4 +32,3 @@ Warning: unlink(copy.txt): No such file or directory in %s on line %d bool(false) *** Finished testing open_basedir configuration [copy] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_dir.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_dir.phpt diff -u php-src/tests/security/open_basedir_dir.phpt:1.2 php-src/tests/security/open_basedir_dir.phpt:1.3 --- php-src/tests/security/open_basedir_dir.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_dir.phpt Mon May 26 15:52:05 2008 @@ -67,72 +67,6 @@ Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d bool(false) object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/test/ok/" - ["handle"]=> - resource(%d) of type (stream) -} -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/test/ok" - ["handle"]=> - resource(%d) of type (stream) -} -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/test/ok/../ok" - ["handle"]=> - resource(%d) of type (stream) -} -*** Finished testing open_basedir configuration [dir] *** ---UEXPECTF-- -*** Testing open_basedir configuration [dir] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) - -Warning: dir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(../bad): failed to open dir: Operation not permitted in %s on line %d -bool(false) - -Warning: dir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d -bool(false) - -Warning: dir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(..): failed to open dir: Operation not permitted in %s on line %d -bool(false) - -Warning: dir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(../): failed to open dir: Operation not permitted in %s on line %d -bool(false) - -Warning: dir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(/): failed to open dir: Operation not permitted in %s on line %d -bool(false) - -Warning: dir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(../bad/.): failed to open dir: Operation not permitted in %s on line %d -bool(false) - -Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d -bool(false) - -Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d -bool(false) -object(Directory)#%d (2) { [u"path"]=> unicode(%d) "%s/test/ok/" [u"handle"]=> @@ -151,4 +85,3 @@ resource(%d) of type (stream) } *** Finished testing open_basedir configuration [dir] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_error_log.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_error_log.phpt diff -u php-src/tests/security/open_basedir_error_log.phpt:1.2 php-src/tests/security/open_basedir_error_log.phpt:1.3 --- php-src/tests/security/open_basedir_error_log.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_error_log.phpt Mon May 26 15:52:05 2008 @@ -37,26 +37,6 @@ Warning: ini_set(): open_basedir restriction in effect. File(%s/bad.txt) is not within the allowed path(s): (.) in %s on line %d bool(false) -string(0) "" -string(%d) "%s/test/ok/ok.txt" -*** Finished testing open_basedir configuration [error_log] *** ---UEXPECTF-- -*** Testing open_basedir configuration [error_log] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) - -Warning: ini_set(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: ini_set(): open_basedir restriction in effect. File(%s/test/bad.txt) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: ini_set(): open_basedir restriction in effect. File(%s/bad.txt) is not within the allowed path(s): (.) in %s on line %d -bool(false) unicode(0) "" unicode(%d) "%s/test/ok/ok.txt" *** Finished testing open_basedir configuration [error_log] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_error_log_variation.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_error_log_variation.phpt diff -u php-src/tests/security/open_basedir_error_log_variation.phpt:1.2 php-src/tests/security/open_basedir_error_log_variation.phpt:1.3 --- php-src/tests/security/open_basedir_error_log_variation.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_error_log_variation.phpt Mon May 26 15:52:05 2008 @@ -45,4 +45,3 @@ bool(false) bool(true) *** Finished testing open_basedir configuration [error_log] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_file.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_file.phpt diff -u php-src/tests/security/open_basedir_file.phpt:1.2 php-src/tests/security/open_basedir_file.phpt:1.3 --- php-src/tests/security/open_basedir_file.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_file.phpt Mon May 26 15:52:05 2008 @@ -85,4 +85,3 @@ string(12) "Hello World!" } *** Finished testing open_basedir configuration [file] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_file_exists.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_file_exists.phpt diff -u php-src/tests/security/open_basedir_file_exists.phpt:1.2 php-src/tests/security/open_basedir_file_exists.phpt:1.3 --- php-src/tests/security/open_basedir_file_exists.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_file_exists.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ bool(true) bool(true) *** Finished testing open_basedir configuration [file_exists] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_file_put_contents.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_file_put_contents.phpt diff -u php-src/tests/security/open_basedir_file_put_contents.phpt:1.2 php-src/tests/security/open_basedir_file_put_contents.phpt:1.3 --- php-src/tests/security/open_basedir_file_put_contents.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_file_put_contents.phpt Mon May 26 15:52:05 2008 @@ -54,4 +54,3 @@ Warning: file_put_contents%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d bool(false) *** Finished testing open_basedir configuration [file_put_contents] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_fileatime.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_fileatime.phpt diff -u php-src/tests/security/open_basedir_fileatime.phpt:1.2 php-src/tests/security/open_basedir_fileatime.phpt:1.3 --- php-src/tests/security/open_basedir_fileatime.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_fileatime.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ int(%d) int(%d) *** Finished testing open_basedir configuration [fileatime] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_filectime.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_filectime.phpt diff -u php-src/tests/security/open_basedir_filectime.phpt:1.2 php-src/tests/security/open_basedir_filectime.phpt:1.3 --- php-src/tests/security/open_basedir_filectime.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_filectime.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ int(%d) int(%d) *** Finished testing open_basedir configuration [filectime] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_filegroup.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_filegroup.phpt diff -u php-src/tests/security/open_basedir_filegroup.phpt:1.2 php-src/tests/security/open_basedir_filegroup.phpt:1.3 --- php-src/tests/security/open_basedir_filegroup.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_filegroup.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ int(%d) int(%d) *** Finished testing open_basedir configuration [filegroup] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_fileinode.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_fileinode.phpt diff -u php-src/tests/security/open_basedir_fileinode.phpt:1.2 php-src/tests/security/open_basedir_fileinode.phpt:1.3 --- php-src/tests/security/open_basedir_fileinode.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_fileinode.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ int(%d) int(%d) *** Finished testing open_basedir configuration [fileinode] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_filemtime.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_filemtime.phpt diff -u php-src/tests/security/open_basedir_filemtime.phpt:1.2 php-src/tests/security/open_basedir_filemtime.phpt:1.3 --- php-src/tests/security/open_basedir_filemtime.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_filemtime.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ int(%d) int(%d) *** Finished testing open_basedir configuration [filemtime] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_fileowner.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_fileowner.phpt diff -u php-src/tests/security/open_basedir_fileowner.phpt:1.2 php-src/tests/security/open_basedir_fileowner.phpt:1.3 --- php-src/tests/security/open_basedir_fileowner.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_fileowner.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ int(%d) int(%d) *** Finished testing open_basedir configuration [fileowner] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_fileperms.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_fileperms.phpt diff -u php-src/tests/security/open_basedir_fileperms.phpt:1.2 php-src/tests/security/open_basedir_fileperms.phpt:1.3 --- php-src/tests/security/open_basedir_fileperms.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_fileperms.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ int(%d) int(%d) *** Finished testing open_basedir configuration [fileperms] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_filesize.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_filesize.phpt diff -u php-src/tests/security/open_basedir_filesize.phpt:1.2 php-src/tests/security/open_basedir_filesize.phpt:1.3 --- php-src/tests/security/open_basedir_filesize.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_filesize.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ int(%d) int(%d) *** Finished testing open_basedir configuration [filesize] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_filetype.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_filetype.phpt diff -u php-src/tests/security/open_basedir_filetype.phpt:1.2 php-src/tests/security/open_basedir_filetype.phpt:1.3 --- php-src/tests/security/open_basedir_filetype.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_filetype.phpt Mon May 26 15:52:05 2008 @@ -46,50 +46,9 @@ Warning: filetype(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d bool(false) -string(3) "dir" -string(4) "file" -string(4) "file" -string(4) "file" -string(4) "file" -*** Finished testing open_basedir configuration [filetype] *** ---UEXPECTF-- -*** Testing open_basedir configuration [filetype] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) - -Warning: filetype(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d -bool(false) unicode(3) "dir" unicode(4) "file" unicode(4) "file" unicode(4) "file" unicode(4) "file" *** Finished testing open_basedir configuration [filetype] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_fopen.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_fopen.phpt diff -u php-src/tests/security/open_basedir_fopen.phpt:1.2 php-src/tests/security/open_basedir_fopen.phpt:1.3 --- php-src/tests/security/open_basedir_fopen.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_fopen.phpt Mon May 26 15:52:05 2008 @@ -83,4 +83,3 @@ resource(%d) of type (stream) resource(%d) of type (stream) *** Finished testing open_basedir configuration [fopen] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_glob-win32.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_glob-win32.phpt diff -u php-src/tests/security/open_basedir_glob-win32.phpt:1.2 php-src/tests/security/open_basedir_glob-win32.phpt:1.3 --- php-src/tests/security/open_basedir_glob-win32.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_glob-win32.phpt Mon May 26 15:52:05 2008 @@ -37,44 +37,6 @@ bool(false) array(1) { [0]=> - string(5) "../ok" -} -array(1) { - [0]=> - string(6) "ok.txt" -} -array(1) { - [0]=> - string(12) "../ok/ok.txt" -} -array(1) { - [0]=> - string(%d) "%s/test/ok/ok.txt" -} -array(1) { - [0]=> - string(%d) "%s/test/ok/../ok/ok.txt" -} -*** Finished testing open_basedir configuration [glob] *** ---UEXPECTF-- -*** Testing open_basedir configuration [glob] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -bool(false) -bool(false) -bool(false) -array(0) { -} -bool(false) -bool(false) -bool(false) -bool(false) -bool(false) -array(1) { - [0]=> unicode(5) "../ok" } array(1) { @@ -94,4 +56,3 @@ unicode(%d) "%s/test/ok/../ok/ok.txt" } *** Finished testing open_basedir configuration [glob] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_glob.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_glob.phpt diff -u php-src/tests/security/open_basedir_glob.phpt:1.2 php-src/tests/security/open_basedir_glob.phpt:1.3 --- php-src/tests/security/open_basedir_glob.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_glob.phpt Mon May 26 15:52:05 2008 @@ -36,43 +36,6 @@ bool(false) array(1) { [0]=> - string(5) "../ok" -} -array(1) { - [0]=> - string(6) "ok.txt" -} -array(1) { - [0]=> - string(12) "../ok/ok.txt" -} -array(1) { - [0]=> - string(%d) "%s/test/ok/ok.txt" -} -array(1) { - [0]=> - string(%d) "%s/test/ok/../ok/ok.txt" -} -*** Finished testing open_basedir configuration [glob] *** ---UEXPECTF-- -*** Testing open_basedir configuration [glob] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -bool(false) -bool(false) -bool(false) -bool(false) -bool(false) -bool(false) -bool(false) -bool(false) -bool(false) -array(1) { - [0]=> unicode(5) "../ok" } array(1) { @@ -92,4 +55,3 @@ unicode(%d) "%s/test/ok/../ok/ok.txt" } *** Finished testing open_basedir configuration [glob] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_is_dir.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_is_dir.phpt diff -u php-src/tests/security/open_basedir_is_dir.phpt:1.2 php-src/tests/security/open_basedir_is_dir.phpt:1.3 --- php-src/tests/security/open_basedir_is_dir.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_is_dir.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ bool(false) bool(false) *** Finished testing open_basedir configuration [is_dir] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_is_file.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_is_file.phpt diff -u php-src/tests/security/open_basedir_is_file.phpt:1.2 php-src/tests/security/open_basedir_is_file.phpt:1.3 --- php-src/tests/security/open_basedir_is_file.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_is_file.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ bool(true) bool(true) *** Finished testing open_basedir configuration [is_file] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_is_link.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_is_link.phpt diff -u php-src/tests/security/open_basedir_is_link.phpt:1.2 php-src/tests/security/open_basedir_is_link.phpt:1.3 --- php-src/tests/security/open_basedir_is_link.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_is_link.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ bool(false) bool(false) *** Finished testing open_basedir configuration [is_link] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_is_readable.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_is_readable.phpt diff -u php-src/tests/security/open_basedir_is_readable.phpt:1.2 php-src/tests/security/open_basedir_is_readable.phpt:1.3 --- php-src/tests/security/open_basedir_is_readable.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_is_readable.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ bool(true) bool(true) *** Finished testing open_basedir configuration [is_readable] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_is_writable.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_is_writable.phpt diff -u php-src/tests/security/open_basedir_is_writable.phpt:1.2 php-src/tests/security/open_basedir_is_writable.phpt:1.3 --- php-src/tests/security/open_basedir_is_writable.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_is_writable.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ bool(true) bool(true) *** Finished testing open_basedir configuration [is_writable] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_link.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_link.phpt diff -u php-src/tests/security/open_basedir_link.phpt:1.2 php-src/tests/security/open_basedir_link.phpt:1.3 --- php-src/tests/security/open_basedir_link.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_link.phpt Mon May 26 15:52:05 2008 @@ -75,4 +75,3 @@ bool(true) bool(true) *** Finished testing open_basedir configuration [link] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_linkinfo.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_linkinfo.phpt diff -u php-src/tests/security/open_basedir_linkinfo.phpt:1.2 php-src/tests/security/open_basedir_linkinfo.phpt:1.3 --- php-src/tests/security/open_basedir_linkinfo.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_linkinfo.phpt Mon May 26 15:52:05 2008 @@ -61,4 +61,3 @@ Warning: unlink(): open_basedir restriction in effect. File(%s/test/ok/symlink.txt) is not within the allowed path(s): (.) in %s on line %d bool(false) *** Finished testing open_basedir configuration [linkinfo] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_lstat.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_lstat.phpt diff -u php-src/tests/security/open_basedir_lstat.phpt:1.2 php-src/tests/security/open_basedir_lstat.phpt:1.3 --- php-src/tests/security/open_basedir_lstat.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_lstat.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ bool(true) bool(true) *** Finished testing open_basedir configuration [lstat] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_opendir.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_opendir.phpt diff -u php-src/tests/security/open_basedir_opendir.phpt:1.2 php-src/tests/security/open_basedir_opendir.phpt:1.3 --- php-src/tests/security/open_basedir_opendir.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_opendir.phpt Mon May 26 15:52:05 2008 @@ -70,4 +70,3 @@ resource(%d) of type (stream) resource(%d) of type (stream) *** Finished testing open_basedir configuration [opendir] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_parse_ini_file.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_parse_ini_file.phpt diff -u php-src/tests/security/open_basedir_parse_ini_file.phpt:1.2 php-src/tests/security/open_basedir_parse_ini_file.phpt:1.3 --- php-src/tests/security/open_basedir_parse_ini_file.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_parse_ini_file.phpt Mon May 26 15:52:05 2008 @@ -79,4 +79,3 @@ array(0) { } *** Finished testing open_basedir configuration [parse_ini_file] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_readlink.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_readlink.phpt diff -u php-src/tests/security/open_basedir_readlink.phpt:1.2 php-src/tests/security/open_basedir_readlink.phpt:1.3 --- php-src/tests/security/open_basedir_readlink.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_readlink.phpt Mon May 26 15:52:05 2008 @@ -73,4 +73,3 @@ Warning: unlink(): open_basedir restriction in effect. File(%s/test/ok/symlink.txt) is not within the allowed path(s): (.) in %s on line %d bool(false) *** Finished testing open_basedir configuration [readlink] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_realpath.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_realpath.phpt diff -u php-src/tests/security/open_basedir_realpath.phpt:1.2 php-src/tests/security/open_basedir_realpath.phpt:1.3 --- php-src/tests/security/open_basedir_realpath.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_realpath.phpt Mon May 26 15:52:05 2008 @@ -25,28 +25,6 @@ bool(true) bool(true) bool(true) -string(%d) "%s\test\bad" -string(%d) "%s\test\bad\bad.txt" -string(%d) "%s\test" -string(%d) "%s\test" -string(%d) "%s" -string(%d) "%s\test\bad" -string(%d) "%s\test\bad\bad.txt" -string(%d) "%s\test\bad\bad.txt" -string(%d) "%s\test" -string(%d) "%s\test\ok" -string(%d) "%s\test\ok\ok.txt" -string(%d) "%s\test\ok\ok.txt" -string(%d) "%s\test\ok\ok.txt" -string(%d) "%s\test\ok\ok.txt" -*** Finished testing open_basedir configuration [realpath] *** ---UEXPECTF-- -*** Testing open_basedir configuration [realpath] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) unicode(%d) "%s\test\bad" unicode(%d) "%s\test\bad\bad.txt" unicode(%d) "%s\test" @@ -62,4 +40,3 @@ unicode(%d) "%s\test\ok\ok.txt" unicode(%d) "%s\test\ok\ok.txt" *** Finished testing open_basedir configuration [realpath] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_rename.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_rename.phpt diff -u php-src/tests/security/open_basedir_rename.phpt:1.2 php-src/tests/security/open_basedir_rename.phpt:1.3 --- php-src/tests/security/open_basedir_rename.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_rename.phpt Mon May 26 15:52:05 2008 @@ -44,4 +44,3 @@ Warning: rename(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d bool(false) *** Finished testing open_basedir configuration [rename] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_rmdir.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_rmdir.phpt diff -u php-src/tests/security/open_basedir_rmdir.phpt:1.2 php-src/tests/security/open_basedir_rmdir.phpt:1.3 --- php-src/tests/security/open_basedir_rmdir.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_rmdir.phpt Mon May 26 15:52:05 2008 @@ -44,4 +44,3 @@ Warning: rmdir(): open_basedir restriction in effect. File(%s/test/bad) is not within the allowed path(s): (.) in %s on line %d bool(false) *** Finished testing open_basedir configuration [rmdir] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_scandir.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_scandir.phpt diff -u php-src/tests/security/open_basedir_scandir.phpt:1.2 php-src/tests/security/open_basedir_scandir.phpt:1.3 --- php-src/tests/security/open_basedir_scandir.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_scandir.phpt Mon May 26 15:52:05 2008 @@ -84,94 +84,6 @@ bool(false) array(3) { [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(6) "ok.txt" -} -array(3) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(6) "ok.txt" -} -array(3) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(6) "ok.txt" -} -*** Finished testing open_basedir configuration [scandir] *** ---UEXPECTF-- -*** Testing open_basedir configuration [scandir] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) - -Warning: scandir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d - -Warning: scandir(../bad): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) - -Warning: scandir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d - -Warning: scandir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) - -Warning: scandir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d - -Warning: scandir(..): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) - -Warning: scandir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line 80 - -Warning: scandir(../): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) - -Warning: scandir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d - -Warning: scandir(/): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) - -Warning: scandir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d - -Warning: scandir(../bad/.): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) - -Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d - -Warning: scandir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) - -Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d - -Warning: scandir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) -array(3) { - [0]=> unicode(1) "." [1]=> unicode(2) ".." @@ -195,4 +107,3 @@ unicode(6) "ok.txt" } *** Finished testing open_basedir configuration [scandir] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_stat.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_stat.phpt diff -u php-src/tests/security/open_basedir_stat.phpt:1.2 php-src/tests/security/open_basedir_stat.phpt:1.3 --- php-src/tests/security/open_basedir_stat.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_stat.phpt Mon May 26 15:52:05 2008 @@ -52,4 +52,3 @@ bool(true) bool(true) *** Finished testing open_basedir configuration [stat] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_symlink.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_symlink.phpt diff -u php-src/tests/security/open_basedir_symlink.phpt:1.2 php-src/tests/security/open_basedir_symlink.phpt:1.3 --- php-src/tests/security/open_basedir_symlink.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_symlink.phpt Mon May 26 15:52:05 2008 @@ -75,4 +75,3 @@ bool(true) bool(true) *** Finished testing open_basedir configuration [symlink] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_tempnam.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_tempnam.phpt diff -u php-src/tests/security/open_basedir_tempnam.phpt:1.2 php-src/tests/security/open_basedir_tempnam.phpt:1.3 --- php-src/tests/security/open_basedir_tempnam.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_tempnam.phpt Mon May 26 15:52:05 2008 @@ -51,35 +51,6 @@ Warning: tempnam(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d bool(false) -string(%d) "%s" -bool(true) -*** Finished testing open_basedir configuration [tempnam] *** ---UEXPECTF-- -*** Testing open_basedir configuration [tempnam] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) - -Warning: tempnam(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: tempnam(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: tempnam(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: tempnam(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: tempnam(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: tempnam(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d -bool(false) unicode(%d) "%s" bool(true) *** Finished testing open_basedir configuration [tempnam] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_touch.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_touch.phpt diff -u php-src/tests/security/open_basedir_touch.phpt:1.2 php-src/tests/security/open_basedir_touch.phpt:1.3 --- php-src/tests/security/open_basedir_touch.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_touch.phpt Mon May 26 15:52:05 2008 @@ -67,4 +67,3 @@ bool(true) bool(true) *** Finished testing open_basedir configuration [touch] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_unlink.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/tests/security/open_basedir_unlink.phpt diff -u php-src/tests/security/open_basedir_unlink.phpt:1.2 php-src/tests/security/open_basedir_unlink.phpt:1.3 --- php-src/tests/security/open_basedir_unlink.phpt:1.2 Fri May 9 08:44:43 2008 +++ php-src/tests/security/open_basedir_unlink.phpt Mon May 26 15:52:05 2008 @@ -44,4 +44,3 @@ Warning: unlink(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d bool(false) *** Finished testing open_basedir configuration [unlink] *** - http://cvs.php.net/viewvc.cgi/php-src/tests/strings/bug22592.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/strings/bug22592.phpt diff -u php-src/tests/strings/bug22592.phpt:1.3 php-src/tests/strings/bug22592.phpt:1.4 --- php-src/tests/strings/bug22592.phpt:1.3 Sat May 24 15:13:11 2008 +++ php-src/tests/strings/bug22592.phpt Mon May 26 15:52:05 2008 @@ -21,11 +21,6 @@ ?> --EXPECT-- -string(6) "abcdef" -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*" http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/autodetect-SCSU.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/autodetect-SCSU.phpt diff -u php-src/tests/unicode/autodetect-SCSU.phpt:1.3 php-src/tests/unicode/autodetect-SCSU.phpt:1.4 --- php-src/tests/unicode/autodetect-SCSU.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/autodetect-SCSU.phpt Mon May 26 15:52:05 2008 @@ -1,7 +1,5 @@ --TEST-- Script encoding autodetection (SCSU) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/autodetect-UTF16BE.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/autodetect-UTF16BE.phpt diff -u php-src/tests/unicode/autodetect-UTF16BE.phpt:1.3 php-src/tests/unicode/autodetect-UTF16BE.phpt:1.4 --- php-src/tests/unicode/autodetect-UTF16BE.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/autodetect-UTF16BE.phpt Mon May 26 15:52:05 2008 @@ -1,7 +1,5 @@ --TEST-- Script encoding autodetection (UTF-16BE) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/autodetect-UTF16LE.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/autodetect-UTF16LE.phpt diff -u php-src/tests/unicode/autodetect-UTF16LE.phpt:1.3 php-src/tests/unicode/autodetect-UTF16LE.phpt:1.4 --- php-src/tests/unicode/autodetect-UTF16LE.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/autodetect-UTF16LE.phpt Mon May 26 15:52:05 2008 @@ -1,7 +1,5 @@ --TEST-- Script encoding autodetection (UTF-16LE) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/autodetect-UTF32BE.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/autodetect-UTF32BE.phpt diff -u php-src/tests/unicode/autodetect-UTF32BE.phpt:1.3 php-src/tests/unicode/autodetect-UTF32BE.phpt:1.4 --- php-src/tests/unicode/autodetect-UTF32BE.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/autodetect-UTF32BE.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- Script encoding autodetection (UTF-32BE) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/autodetect-UTF32LE.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/autodetect-UTF32LE.phpt diff -u php-src/tests/unicode/autodetect-UTF32LE.phpt:1.3 php-src/tests/unicode/autodetect-UTF32LE.phpt:1.4 --- php-src/tests/unicode/autodetect-UTF32LE.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/autodetect-UTF32LE.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- Script encoding autodetection (UTF-32LE) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/autodetect-UTF7.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/autodetect-UTF7.phpt diff -u php-src/tests/unicode/autodetect-UTF7.phpt:1.3 php-src/tests/unicode/autodetect-UTF7.phpt:1.4 --- php-src/tests/unicode/autodetect-UTF7.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/autodetect-UTF7.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- Script encoding autodetection (UTF7) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/autodetect-UTF8.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/autodetect-UTF8.phpt diff -u php-src/tests/unicode/autodetect-UTF8.phpt:1.3 php-src/tests/unicode/autodetect-UTF8.phpt:1.4 --- php-src/tests/unicode/autodetect-UTF8.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/autodetect-UTF8.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- Script encoding autodetection (UTF8) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/enc-HZ.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/enc-HZ.phpt diff -u php-src/tests/unicode/enc-HZ.phpt:1.3 php-src/tests/unicode/enc-HZ.phpt:1.4 --- php-src/tests/unicode/enc-HZ.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/enc-HZ.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- Script encoding (HZ) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/enc-ISO-2022-KR.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/enc-ISO-2022-KR.phpt diff -u php-src/tests/unicode/enc-ISO-2022-KR.phpt:1.3 php-src/tests/unicode/enc-ISO-2022-KR.phpt:1.4 --- php-src/tests/unicode/enc-ISO-2022-KR.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/enc-ISO-2022-KR.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- Script encoding (ISO-2022-KR) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/enc-JIS.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/enc-JIS.phpt diff -u php-src/tests/unicode/enc-JIS.phpt:1.3 php-src/tests/unicode/enc-JIS.phpt:1.4 --- php-src/tests/unicode/enc-JIS.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/enc-JIS.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- Script encoding (JIS) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/enc-SJIS.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/enc-SJIS.phpt diff -u php-src/tests/unicode/enc-SJIS.phpt:1.3 php-src/tests/unicode/enc-SJIS.phpt:1.4 --- php-src/tests/unicode/enc-SJIS.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/enc-SJIS.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- Script encoding (SJIS) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/encrt-HZ.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/encrt-HZ.phpt diff -u php-src/tests/unicode/encrt-HZ.phpt:1.3 php-src/tests/unicode/encrt-HZ.phpt:1.4 --- php-src/tests/unicode/encrt-HZ.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/encrt-HZ.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- declare script encoding (HZ) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/encrt-ISO-2022-KR.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/encrt-ISO-2022-KR.phpt diff -u php-src/tests/unicode/encrt-ISO-2022-KR.phpt:1.3 php-src/tests/unicode/encrt-ISO-2022-KR.phpt:1.4 --- php-src/tests/unicode/encrt-ISO-2022-KR.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/encrt-ISO-2022-KR.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- declare script encoding (ISO-2022-KR) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/encrt-JIS.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/encrt-JIS.phpt diff -u php-src/tests/unicode/encrt-JIS.phpt:1.3 php-src/tests/unicode/encrt-JIS.phpt:1.4 --- php-src/tests/unicode/encrt-JIS.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/encrt-JIS.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- declare script encoding (JIS) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/encrt-SJIS.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/tests/unicode/encrt-SJIS.phpt diff -u php-src/tests/unicode/encrt-SJIS.phpt:1.3 php-src/tests/unicode/encrt-SJIS.phpt:1.4 --- php-src/tests/unicode/encrt-SJIS.phpt:1.3 Tue Jul 10 10:21:08 2007 +++ php-src/tests/unicode/encrt-SJIS.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- declare script encoding (SJIS) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/normalize_001.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/unicode/normalize_001.phpt diff -u php-src/tests/unicode/normalize_001.phpt:1.4 php-src/tests/unicode/normalize_001.phpt:1.5 --- php-src/tests/unicode/normalize_001.phpt:1.4 Sat May 24 15:13:11 2008 +++ php-src/tests/unicode/normalize_001.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- Unicode identifiers normalization (${}) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --FILE-- <?php ${"\u212B"} = "ok\n"; http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/normalize_002.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/unicode/normalize_002.phpt diff -u php-src/tests/unicode/normalize_002.phpt:1.4 php-src/tests/unicode/normalize_002.phpt:1.5 --- php-src/tests/unicode/normalize_002.phpt:1.4 Sat May 24 15:13:11 2008 +++ php-src/tests/unicode/normalize_002.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- Unicode identifiers normalization ($$) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --FILE-- <?php $a = "\u212B"; http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/normalize_003.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/unicode/normalize_003.phpt diff -u php-src/tests/unicode/normalize_003.phpt:1.4 php-src/tests/unicode/normalize_003.phpt:1.5 --- php-src/tests/unicode/normalize_003.phpt:1.4 Sat May 24 15:13:11 2008 +++ php-src/tests/unicode/normalize_003.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- Unicode identifiers normalization (indirect function call) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --FILE-- <?php declare(encoding = "ISO-8859-1"); http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/normalize_004.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/unicode/normalize_004.phpt diff -u php-src/tests/unicode/normalize_004.phpt:1.4 php-src/tests/unicode/normalize_004.phpt:1.5 --- php-src/tests/unicode/normalize_004.phpt:1.4 Sat May 24 15:13:11 2008 +++ php-src/tests/unicode/normalize_004.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- Unicode identifiers normalization ($GLOBALS[]) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --FILE-- <?php $GLOBALS["\u212B"] = "ok\n"; http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/func/strpos.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/unicode/func/strpos.phpt diff -u php-src/tests/unicode/func/strpos.phpt:1.4 php-src/tests/unicode/func/strpos.phpt:1.5 --- php-src/tests/unicode/func/strpos.phpt:1.4 Tue Feb 26 16:52:10 2008 +++ php-src/tests/unicode/func/strpos.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- Unicode: strpos() function test ---INI-- -unicode.semantics=on --FILE-- <?php $a = "aâ¢á\U020021z"; http://cvs.php.net/viewvc.cgi/php-src/tests/unicode/func/strstr.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/tests/unicode/func/strstr.phpt diff -u php-src/tests/unicode/func/strstr.phpt:1.4 php-src/tests/unicode/func/strstr.phpt:1.5 --- php-src/tests/unicode/func/strstr.phpt:1.4 Tue Feb 26 16:52:10 2008 +++ php-src/tests/unicode/func/strstr.phpt Mon May 26 15:52:06 2008 @@ -1,7 +1,5 @@ --TEST-- Unicode: strpos() function test ---INI-- -unicode.semantics=on --FILE-- <?php $a = "aâ¢á\U020021z";