From 52c0057c63ebfde722c79e1db1d72327ceffb098 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Tue, 27 May 2008 12:17:40 +0000 Subject: [PATCH] - Removed UEXPECT(F) --- ext/posix/tests/posix_getgrgid_variation.phpt | 102 --- ext/posix/tests/posix_getpgid_variation.phpt | 102 --- ext/posix/tests/posix_getpwuid_variation.phpt | 102 --- ext/posix/tests/posix_kill_variation1.phpt | 102 --- ext/posix/tests/posix_kill_variation2.phpt | 102 --- .../tests/posix_strerror_variation1.phpt | 102 --- ext/session/tests/001.phpt | 2 - ext/session/tests/003.phpt | 16 - ext/session/tests/004.phpt | 37 -- ext/session/tests/005.phpt | 60 -- ext/session/tests/006.phpt | 25 - ext/session/tests/009.phpt | 15 - ext/session/tests/bug24592.phpt | 14 - ext/session/tests/bug32330.phpt | 16 - .../tests/session_cache_expire_error.phpt | 77 --- .../session_cache_expire_variation3.phpt | 14 - .../tests/session_cache_limiter_basic.phpt | 23 - .../tests/session_cache_limiter_error.phpt | 77 --- .../session_cache_limiter_variation1.phpt | 10 - .../session_cache_limiter_variation2.phpt | 10 - .../session_cache_limiter_variation3.phpt | 10 - ext/session/tests/session_decode_basic.phpt | 174 ------ ext/session/tests/session_decode_error.phpt | 127 ---- ext/session/tests/session_decode_error2.phpt | 584 ------------------ .../tests/session_decode_variation1.phpt | 155 ----- .../tests/session_decode_variation2.phpt | 47 -- .../tests/session_decode_variation3.phpt | 28 - .../tests/session_decode_variation4.phpt | 24 - ext/session/tests/session_encode_basic.phpt | 77 --- ext/session/tests/session_encode_error2.phpt | 127 ---- .../tests/session_encode_variation3.phpt | 6 - .../tests/session_encode_variation4.phpt | 6 - .../tests/session_encode_variation5.phpt | 6 - .../tests/session_encode_variation7.phpt | 6 - .../session_get_cookie_params_basic.phpt | 41 -- .../session_get_cookie_params_variation1.phpt | 75 --- ext/session/tests/session_id_error3.phpt | 13 - ext/session/tests/session_id_error4.phpt | 8 - ext/session/tests/session_id_variation1.phpt | 13 - ext/session/tests/session_id_variation2.phpt | 17 - .../tests/session_module_name_basic.phpt | 9 - .../tests/session_module_name_error.phpt | 123 ---- .../tests/session_module_name_variation1.phpt | 10 - .../tests/session_module_name_variation2.phpt | 4 - .../tests/session_module_name_variation3.phpt | 11 - .../tests/session_module_name_variation4.phpt | 24 - ext/session/tests/session_name_basic.phpt | 9 - ext/session/tests/session_name_error.phpt | 77 --- .../tests/session_name_variation1.phpt | 18 - .../tests/session_name_variation2.phpt | 9 - .../tests/session_save_path_basic.phpt | 6 - .../tests/session_save_path_error.phpt | 77 --- .../tests/session_save_path_variation1.phpt | 10 - .../tests/session_save_path_variation2.phpt | 10 - .../tests/session_save_path_variation3.phpt | 10 - .../tests/session_save_path_variation4.phpt | 11 - .../tests/session_save_path_variation5.phpt | 13 - .../session_set_cookie_params_error.phpt | 209 ------- .../session_set_cookie_params_variation1.phpt | 14 - .../session_set_cookie_params_variation2.phpt | 14 - .../session_set_cookie_params_variation3.phpt | 14 - .../session_set_cookie_params_variation4.phpt | 14 - .../session_set_cookie_params_variation5.phpt | 14 - .../tests/session_set_save_handler_basic.phpt | 46 -- .../session_set_save_handler_error2.phpt | 20 - .../session_set_save_handler_variation1.phpt | 13 - .../session_set_save_handler_variation4.phpt | 33 - .../tests/session_start_variation4.phpt | 9 - .../tests/session_start_variation5.phpt | 24 - .../tests/session_start_variation6.phpt | 34 - .../tests/session_start_variation7.phpt | 26 - ext/session/tests/session_unset_basic.phpt | 14 - .../tests/session_unset_variation1.phpt | 17 - ext/simplexml/tests/000.phpt | 215 ------- ext/simplexml/tests/001.phpt | 32 - ext/simplexml/tests/002.phpt | 32 - ext/simplexml/tests/003.phpt | 37 -- ext/simplexml/tests/004.phpt | 33 - ext/simplexml/tests/005.phpt | 5 - ext/simplexml/tests/006.phpt | 17 - ext/simplexml/tests/007.phpt | 49 -- ext/simplexml/tests/008.phpt | 10 - ext/simplexml/tests/009.phpt | 8 - ext/simplexml/tests/009b.phpt | 13 - ext/simplexml/tests/010.phpt | 32 - ext/simplexml/tests/013.phpt | 3 - ext/simplexml/tests/014.phpt | 28 - ext/simplexml/tests/014a.phpt | 25 - ext/simplexml/tests/014b.phpt | 24 - ext/simplexml/tests/015.phpt | 18 - ext/simplexml/tests/016.phpt | 27 - ext/simplexml/tests/016a.phpt | 10 - ext/simplexml/tests/019.phpt | 17 - ext/simplexml/tests/022.phpt | 33 - ext/simplexml/tests/023.phpt | 13 - ext/simplexml/tests/024.phpt | 142 ----- ext/simplexml/tests/025.phpt | 42 -- ext/simplexml/tests/029.phpt | 11 - ext/simplexml/tests/031.phpt | 11 - ext/simplexml/tests/033.phpt | 99 --- ext/simplexml/tests/bug36611.phpt | 6 - ext/simplexml/tests/bug38406.phpt | 14 - ext/simplexml/tests/bug39662.phpt | 17 - ext/simplexml/tests/bug39760.phpt | 15 - ext/simplexml/tests/profile11.phpt | 14 - ext/simplexml/tests/profile12.phpt | 41 -- ext/simplexml/tests/profile13.phpt | 42 -- 107 files changed, 4633 deletions(-) diff --git a/ext/posix/tests/posix_getgrgid_variation.phpt b/ext/posix/tests/posix_getgrgid_variation.phpt index b02e76e3f8..94d85c61d4 100644 --- a/ext/posix/tests/posix_getgrgid_variation.phpt +++ b/ext/posix/tests/posix_getgrgid_variation.phpt @@ -158,108 +158,6 @@ valid output Arg value -Warning: posix_getgrgid() expects parameter 1 to be long, string given in %s on line %d -valid output - -Arg value - -Warning: posix_getgrgid() expects parameter 1 to be long, string given in %s on line %d -valid output - -Arg value string - -Warning: posix_getgrgid() expects parameter 1 to be long, string given in %s on line %d -valid output - -Arg value string - -Warning: posix_getgrgid() expects parameter 1 to be long, string given in %s on line %d -valid output - -Arg value -valid output - -Arg value -valid output - -Catchable fatal error: Object of class stdClass could not be converted to string in %s on line %d ---UEXPECTF-- -*** Testing posix_getgrgid() : usage variations *** - -Notice: Undefined variable: undefined_var in %s on line %d - -Notice: Undefined variable: unset_var in %s on line %d - -Arg value 10.5 -valid output - -Arg value -10.5 -valid output - -Arg value 101234567000 -valid output - -Arg value 1.07654321E-9 -valid output - -Arg value 0.5 -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getgrgid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getgrgid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getgrgid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getgrgid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getgrgid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Arg value -valid output - -Arg value -valid output - -Arg value 1 -valid output - -Arg value -valid output - -Arg value 1 -valid output - -Arg value -valid output - -Arg value - Warning: posix_getgrgid() expects parameter 1 to be long, Unicode string given in %s on line %d valid output diff --git a/ext/posix/tests/posix_getpgid_variation.phpt b/ext/posix/tests/posix_getpgid_variation.phpt index b7be7bf613..0a66a8f850 100644 --- a/ext/posix/tests/posix_getpgid_variation.phpt +++ b/ext/posix/tests/posix_getpgid_variation.phpt @@ -158,108 +158,6 @@ valid output Arg value -Warning: posix_getpgid() expects parameter 1 to be long, string given in %s on line %d -valid output - -Arg value - -Warning: posix_getpgid() expects parameter 1 to be long, string given in %s on line %d -valid output - -Arg value string - -Warning: posix_getpgid() expects parameter 1 to be long, string given in %s on line %d -valid output - -Arg value string - -Warning: posix_getpgid() expects parameter 1 to be long, string given in %s on line %d -valid output - -Arg value -valid output - -Arg value -valid output - -Catchable fatal error: Object of class stdClass could not be converted to string in %s on line %d ---UEXPECTF-- -*** Testing posix_getpgid() : usage variations *** - -Notice: Undefined variable: undefined_var in %s on line %d - -Notice: Undefined variable: unset_var in %s on line %d - -Arg value 10.5 -valid output - -Arg value -10.5 -valid output - -Arg value 101234567000 -valid output - -Arg value 1.07654321E-9 -valid output - -Arg value 0.5 -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getpgid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getpgid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getpgid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getpgid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getpgid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Arg value -valid output - -Arg value -valid output - -Arg value 1 -valid output - -Arg value -valid output - -Arg value 1 -valid output - -Arg value -valid output - -Arg value - Warning: posix_getpgid() expects parameter 1 to be long, Unicode string given in %s on line %d valid output diff --git a/ext/posix/tests/posix_getpwuid_variation.phpt b/ext/posix/tests/posix_getpwuid_variation.phpt index 262dbc5455..95b6e8badf 100644 --- a/ext/posix/tests/posix_getpwuid_variation.phpt +++ b/ext/posix/tests/posix_getpwuid_variation.phpt @@ -158,108 +158,6 @@ valid output Arg value -Warning: posix_getpwuid() expects parameter 1 to be long, string given in %s on line %d -valid output - -Arg value - -Warning: posix_getpwuid() expects parameter 1 to be long, string given in %s on line %d -valid output - -Arg value string - -Warning: posix_getpwuid() expects parameter 1 to be long, string given in %s on line %d -valid output - -Arg value string - -Warning: posix_getpwuid() expects parameter 1 to be long, string given in %s on line %d -valid output - -Arg value -valid output - -Arg value -valid output - -Catchable fatal error: Object of class stdClass could not be converted to string in %s on line %d ---UEXPECTF-- -*** Testing posix_getpwuid() : usage variations *** - -Notice: Undefined variable: undefined_var in %s on line %d - -Notice: Undefined variable: unset_var in %s on line %d - -Arg value 10.5 -valid output - -Arg value -10.5 -valid output - -Arg value 101234567000 -valid output - -Arg value 1.07654321E-9 -valid output - -Arg value 0.5 -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getpwuid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getpwuid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getpwuid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getpwuid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_getpwuid() expects parameter 1 to be long, array given in %s on line %d -valid output - -Arg value -valid output - -Arg value -valid output - -Arg value 1 -valid output - -Arg value -valid output - -Arg value 1 -valid output - -Arg value -valid output - -Arg value - Warning: posix_getpwuid() expects parameter 1 to be long, Unicode string given in %s on line %d valid output diff --git a/ext/posix/tests/posix_kill_variation1.phpt b/ext/posix/tests/posix_kill_variation1.phpt index b9605723a9..1e578da3b8 100644 --- a/ext/posix/tests/posix_kill_variation1.phpt +++ b/ext/posix/tests/posix_kill_variation1.phpt @@ -156,108 +156,6 @@ bool(false) Arg value -Warning: posix_kill() expects parameter 1 to be long, string given in %s on line %d -bool(false) - -Arg value - -Warning: posix_kill() expects parameter 1 to be long, string given in %s on line %d -bool(false) - -Arg value string - -Warning: posix_kill() expects parameter 1 to be long, string given in %s on line %d -bool(false) - -Arg value string - -Warning: posix_kill() expects parameter 1 to be long, string given in %s on line %d -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) - -Catchable fatal error: Object of class stdClass could not be converted to string in %s on line %d ---UEXPECTF-- -*** Testing posix_kill() : usage variations *** - -Notice: Undefined variable: undefined_var in %s on line %d - -Notice: Undefined variable: unset_var in %s on line %d - -Arg value 10.5 -bool(false) - -Arg value -10.5 -bool(false) - -Arg value 101234567000 -bool(false) - -Arg value 1.07654321E-9 -bool(false) - -Arg value 0.5 -bool(false) - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_kill() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_kill() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_kill() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_kill() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_kill() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) - -Arg value 1 -bool(false) - -Arg value -bool(false) - -Arg value 1 -bool(false) - -Arg value -bool(false) - -Arg value - Warning: posix_kill() expects parameter 1 to be long, Unicode string given in %s on line %d bool(false) diff --git a/ext/posix/tests/posix_kill_variation2.phpt b/ext/posix/tests/posix_kill_variation2.phpt index 127196b636..a57a691f98 100644 --- a/ext/posix/tests/posix_kill_variation2.phpt +++ b/ext/posix/tests/posix_kill_variation2.phpt @@ -156,108 +156,6 @@ bool(false) Arg value -Warning: posix_kill() expects parameter 2 to be long, string given in %s on line %d -bool(false) - -Arg value - -Warning: posix_kill() expects parameter 2 to be long, string given in %s on line %d -bool(false) - -Arg value string - -Warning: posix_kill() expects parameter 2 to be long, string given in %s on line %d -bool(false) - -Arg value string - -Warning: posix_kill() expects parameter 2 to be long, string given in %s on line %d -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) - -Catchable fatal error: Object of class stdClass could not be converted to string in %s on line %d ---UEXPECTF-- -*** Testing posix_kill() : usage variations *** - -Notice: Undefined variable: undefined_var in %s on line %d - -Notice: Undefined variable: unset_var in %s on line %d - -Arg value 10.5 -bool(false) - -Arg value -10.5 -bool(false) - -Arg value 101234567000 -bool(false) - -Arg value 1.07654321E-9 -bool(false) - -Arg value 0.5 -bool(false) - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_kill() expects parameter 2 to be long, array given in %s on line %d -bool(false) - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_kill() expects parameter 2 to be long, array given in %s on line %d -bool(false) - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_kill() expects parameter 2 to be long, array given in %s on line %d -bool(false) - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_kill() expects parameter 2 to be long, array given in %s on line %d -bool(false) - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_kill() expects parameter 2 to be long, array given in %s on line %d -bool(false) - -Arg value -bool(false) - -Arg value -bool(false) - -Arg value 1 -bool(false) - -Arg value -bool(false) - -Arg value 1 -bool(false) - -Arg value -bool(false) - -Arg value - Warning: posix_kill() expects parameter 2 to be long, Unicode string given in %s on line %d bool(false) diff --git a/ext/posix/tests/posix_strerror_variation1.phpt b/ext/posix/tests/posix_strerror_variation1.phpt index 2677576a0f..84c332de6c 100644 --- a/ext/posix/tests/posix_strerror_variation1.phpt +++ b/ext/posix/tests/posix_strerror_variation1.phpt @@ -155,108 +155,6 @@ string(7) "Success" Arg value -Warning: posix_strerror() expects parameter 1 to be long, string given in %s on line %d -bool(false) - -Arg value - -Warning: posix_strerror() expects parameter 1 to be long, string given in %s on line %d -bool(false) - -Arg value string - -Warning: posix_strerror() expects parameter 1 to be long, string given in %s on line %d -bool(false) - -Arg value string - -Warning: posix_strerror() expects parameter 1 to be long, string given in %s on line %d -bool(false) - -Arg value -string(7) "Success" - -Arg value -string(7) "Success" - -Catchable fatal error: Object of class stdClass could not be converted to string in %s on line %d ---UEXPECTF-- -*** Testing posix_strerror() : usage variations *** - -Notice: Undefined variable: undefined_var in %s on line %d - -Notice: Undefined variable: unset_var in %s on line %d - -Arg value 10.5 -string(18) "No child processes" - -Arg value -10.5 -string(%d) "Unknown error %d" - -Arg value 101234567000 -string(%d) "Unknown error %d" - -Arg value 1.07654321E-9 -string(7) "Success" - -Arg value 0.5 -string(7) "Success" - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_strerror() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_strerror() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_strerror() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_strerror() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Notice: Array to string conversion in %s on line %d - -Arg value Array - -Warning: posix_strerror() expects parameter 1 to be long, array given in %s on line %d -bool(false) - -Arg value -string(7) "Success" - -Arg value -string(7) "Success" - -Arg value 1 -string(23) "Operation not permitted" - -Arg value -string(7) "Success" - -Arg value 1 -string(23) "Operation not permitted" - -Arg value -string(7) "Success" - -Arg value - Warning: posix_strerror() expects parameter 1 to be long, Unicode string given in %s on line %d bool(false) diff --git a/ext/session/tests/001.phpt b/ext/session/tests/001.phpt index 17703055ef..3c0a3bdd90 100644 --- a/ext/session/tests/001.phpt +++ b/ext/session/tests/001.phpt @@ -29,7 +29,5 @@ var_dump(session_encode()); session_destroy(); ?> --EXPECT-- -string(126) "baz|O:3:"foo":2:{S:3:"bar";S:2:"ok";S:3:"yes";S:4:"done";}arr|a:1:{i:3;O:3:"foo":2:{S:3:"bar";S:2:"ok";S:3:"yes";S:4:"done";}}" ---UEXPECT-- unicode(126) "baz|O:3:"foo":2:{U:3:"bar";U:2:"ok";U:3:"yes";U:4:"done";}arr|a:1:{i:3;O:3:"foo":2:{U:3:"bar";U:2:"ok";U:3:"yes";U:4:"done";}}" diff --git a/ext/session/tests/003.phpt b/ext/session/tests/003.phpt index 94008257e6..d1e9de9572 100644 --- a/ext/session/tests/003.phpt +++ b/ext/session/tests/003.phpt @@ -33,22 +33,6 @@ var_dump($baz); var_dump($arr); session_destroy(); --EXPECT-- -object(foo)#1 (2) { - ["bar"]=> - string(2) "ok" - ["yes"]=> - int(2) -} -array(1) { - [3]=> - object(foo)#2 (2) { - ["bar"]=> - string(2) "ok" - ["yes"]=> - int(2) - } -} ---UEXPECT-- object(foo)#1 (2) { [u"bar"]=> unicode(2) "ok" diff --git a/ext/session/tests/004.phpt b/ext/session/tests/004.phpt index 668ab715b0..49a6964e79 100644 --- a/ext/session/tests/004.phpt +++ b/ext/session/tests/004.phpt @@ -86,43 +86,6 @@ session_destroy(); --EXPECTF-- OPEN: PHPSESSID READ: abtest -object(foo)#%d (2) { - ["bar"]=> - string(2) "ok" - ["yes"]=> - int(2) -} -array(1) { - [3]=> - object(foo)#%d (2) { - ["bar"]=> - string(2) "ok" - ["yes"]=> - int(2) - } -} -WRITE: abtest, baz|O:3:"foo":2:{S:3:"bar";S:2:"ok";S:3:"yes";i:2;}arr|a:1:{i:3;O:3:"foo":2:{S:3:"bar";S:2:"ok";S:3:"yes";i:2;}} -OPEN: PHPSESSID -READ: abtest -object(foo)#%d (2) { - ["bar"]=> - string(2) "ok" - ["yes"]=> - int(2) -} -array(1) { - [3]=> - object(foo)#%d (2) { - ["bar"]=> - string(2) "ok" - ["yes"]=> - int(2) - } -} -DESTROY: abtest ---UEXPECTF-- -OPEN: PHPSESSID -READ: abtest object(foo)#%d (2) { [u"bar"]=> unicode(2) "ok" diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt index fa1ecf45d8..31c5364843 100644 --- a/ext/session/tests/005.phpt +++ b/ext/session/tests/005.phpt @@ -100,66 +100,6 @@ session_destroy(); --EXPECTF-- OPEN: PHPSESSID READ: abtest -object(foo)#%d (2) { - ["bar"]=> - string(2) "ok" - ["yes"]=> - int(2) -} -array(1) { - [3]=> - object(foo)#%d (2) { - ["bar"]=> - string(2) "ok" - ["yes"]=> - int(2) - } -} -WRITE: abtest, baz|O:3:"foo":2:{S:3:"bar";S:2:"ok";S:3:"yes";i:2;}arr|a:1:{i:3;O:3:"foo":2:{S:3:"bar";S:2:"ok";S:3:"yes";i:2;}} -CLOSE -OPEN: PHPSESSID -READ: abtest -object(foo)#%d (2) { - ["bar"]=> - string(2) "ok" - ["yes"]=> - int(3) -} -array(1) { - [3]=> - object(foo)#%d (2) { - ["bar"]=> - string(2) "ok" - ["yes"]=> - int(3) - } -} -int(123) -WRITE: abtest, baz|O:3:"foo":2:{S:3:"bar";S:2:"ok";S:3:"yes";i:3;}arr|a:1:{i:3;O:3:"foo":2:{S:3:"bar";S:2:"ok";S:3:"yes";i:3;}}c|i:123; -CLOSE -OPEN: PHPSESSID -READ: abtest -object(foo)#%d (2) { - ["bar"]=> - string(2) "ok" - ["yes"]=> - int(3) -} -array(1) { - [3]=> - object(foo)#%d (2) { - ["bar"]=> - string(2) "ok" - ["yes"]=> - int(3) - } -} -int(123) -DESTROY: abtest -CLOSE ---UEXPECTF-- -OPEN: PHPSESSID -READ: abtest object(foo)#%d (2) { [u"bar"]=> unicode(2) "ok" diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt index 5466a30c9f..da1d9bf704 100644 --- a/ext/session/tests/006.phpt +++ b/ext/session/tests/006.phpt @@ -46,31 +46,6 @@ var_dump($a,$b); ?> --EXPECTF-- original values: -object(a)#%d (1) { - ["test"]=> - string(5) "hallo" -} -object(b)#%d (1) { - ["a"]=> - &object(a)#%d (1) { - ["test"]=> - string(5) "hallo" - } -} -values after session: -object(a)#%d (1) { - ["test"]=> - string(5) "hallo" -} -object(b)#%d (1) { - ["a"]=> - &object(a)#%d (1) { - ["test"]=> - string(5) "hallo" - } -} ---UEXPECTF-- -original values: object(a)#%d (1) { [u"test"]=> unicode(5) "hallo" diff --git a/ext/session/tests/009.phpt b/ext/session/tests/009.phpt index c251de2aad..f2dd60d4f7 100644 --- a/ext/session/tests/009.phpt +++ b/ext/session/tests/009.phpt @@ -41,21 +41,6 @@ session_destroy(); --EXPECT-- array(0) { } -array(1) { - ["name"]=> - string(3) "foo" -} -array(1) { - ["name"]=> - string(3) "foo" -} -array(0) { -} -array(0) { -} ---UEXPECT-- -array(0) { -} array(1) { [u"name"]=> unicode(3) "foo" diff --git a/ext/session/tests/bug24592.phpt b/ext/session/tests/bug24592.phpt index 0473bce1d5..1a05d0d6bd 100644 --- a/ext/session/tests/bug24592.phpt +++ b/ext/session/tests/bug24592.phpt @@ -22,20 +22,6 @@ var_dump($_SESSION); --EXPECTF-- Notice: Undefined index: foo in %s on line %d -Notice: Undefined index: bar in %s on line %d -NULL -NULL -array(0) { -} -array(2) { - ["foo"]=> - NULL - ["bar"]=> - NULL -} ---UEXPECTF-- -Notice: Undefined index: foo in %s on line %d - Notice: Undefined index: bar in %s on line %d NULL NULL diff --git a/ext/session/tests/bug32330.phpt b/ext/session/tests/bug32330.phpt index 8ee9563f56..2f9bb62a25 100644 --- a/ext/session/tests/bug32330.phpt +++ b/ext/session/tests/bug32330.phpt @@ -71,22 +71,6 @@ $_SESSION['E'] = 'F'; open: path = /, name = sid read: id = %s gc: maxlifetime = %d -write: id = %s, data = A|S:1:"B"; -close -open: path = /, name = sid -read: id = %s -gc: maxlifetime = %d -destroy: id = %s -close -open: path = /, name = sid -read: id = %s -gc: maxlifetime = %d -write: id = %s, data = E|S:1:"F"; -close ---UEXPECTF-- -open: path = /, name = sid -read: id = %s -gc: maxlifetime = %d write: id = %s, data = A|U:1:"B"; close open: path = /, name = sid diff --git a/ext/session/tests/session_cache_expire_error.phpt b/ext/session/tests/session_cache_expire_error.phpt index cdfce72787..876f0638b6 100644 --- a/ext/session/tests/session_cache_expire_error.phpt +++ b/ext/session/tests/session_cache_expire_error.phpt @@ -166,83 +166,6 @@ int(0) -- Iteration 24 -- -Warning: session_cache_expire() expects parameter 1 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing session_cache_expire() : error functionality *** - --- Iteration 1 -- -int(180) - --- Iteration 2 -- -int(0) - --- Iteration 3 -- -int(1) - --- Iteration 4 -- -int(12345) - --- Iteration 5 -- -int(-2345) - --- Iteration 6 -- -int(10) - --- Iteration 7 -- -int(-10) - --- Iteration 8 -- -int(%s) - --- Iteration 9 -- -int(1) - --- Iteration 10 -- -int(0) - --- Iteration 11 -- -int(0) - --- Iteration 12 -- -int(0) - --- Iteration 13 -- -int(1) - --- Iteration 14 -- -int(0) - --- Iteration 15 -- -int(1) - --- Iteration 16 -- -int(0) - --- Iteration 17 -- -int(0) - --- Iteration 18 -- -int(0) - --- Iteration 19 -- -int(0) - --- Iteration 20 -- -int(0) - --- Iteration 21 -- -int(0) - --- Iteration 22 -- -int(0) - --- Iteration 23 -- -int(0) - --- Iteration 24 -- - Warning: session_cache_expire() expects parameter 1 to be binary string, resource given in %s on line %d NULL Done diff --git a/ext/session/tests/session_cache_expire_variation3.phpt b/ext/session/tests/session_cache_expire_variation3.phpt index 2c15a605f2..599a69ee20 100644 --- a/ext/session/tests/session_cache_expire_variation3.phpt +++ b/ext/session/tests/session_cache_expire_variation3.phpt @@ -32,20 +32,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_cache_expire() : variation *** -string(3) "180" -int(180) -string(3) "180" -int(180) -string(3) "999" -bool(true) -int(999) -string(3) "999" -bool(true) -int(999) -string(3) "999" -Done ---UEXPECTF-- -*** Testing session_cache_expire() : variation *** unicode(3) "180" int(180) unicode(3) "180" diff --git a/ext/session/tests/session_cache_limiter_basic.phpt b/ext/session/tests/session_cache_limiter_basic.phpt index 115394a127..6d129b816c 100644 --- a/ext/session/tests/session_cache_limiter_basic.phpt +++ b/ext/session/tests/session_cache_limiter_basic.phpt @@ -45,29 +45,6 @@ ob_end_flush(); --EXPECTF-- *** Testing session_cache_limiter() : basic functionality *** bool(true) -string(7) "nocache" -string(7) "nocache" -string(6) "public" -bool(true) -bool(true) -string(6) "public" -string(6) "public" -string(7) "private" -bool(true) -bool(true) -string(7) "private" -string(7) "private" -string(7) "nocache" -bool(true) -bool(true) -string(7) "nocache" -string(7) "nocache" -string(17) "private_no_expire" -bool(true) -Done ---UEXPECTF-- -*** Testing session_cache_limiter() : basic functionality *** -bool(true) unicode(7) "nocache" unicode(7) "nocache" unicode(6) "public" diff --git a/ext/session/tests/session_cache_limiter_error.phpt b/ext/session/tests/session_cache_limiter_error.phpt index cadec5dbe3..33ca17f119 100644 --- a/ext/session/tests/session_cache_limiter_error.phpt +++ b/ext/session/tests/session_cache_limiter_error.phpt @@ -95,83 +95,6 @@ ob_end_flush(); --EXPECTF-- *** Testing session_cache_limiter() : error functionality *** --- Iteration 1 -- -string(7) "nocache" - --- Iteration 2 -- -string(1) "0" - --- Iteration 3 -- -string(1) "1" - --- Iteration 4 -- -string(5) "12345" - --- Iteration 5 -- -string(5) "-2345" - --- Iteration 6 -- -string(4) "10.5" - --- Iteration 7 -- -string(5) "-10.5" - --- Iteration 8 -- -string(12) "123456789000" - --- Iteration 9 -- -string(13) "1.23456789E-9" - --- Iteration 10 -- -string(3) "0.5" - --- Iteration 11 -- -string(0) "" - --- Iteration 12 -- -string(0) "" - --- Iteration 13 -- -string(1) "1" - --- Iteration 14 -- -string(0) "" - --- Iteration 15 -- -string(1) "1" - --- Iteration 16 -- -string(0) "" - --- Iteration 17 -- -string(0) "" - --- Iteration 18 -- -string(0) "" - --- Iteration 19 -- -string(7) "Nothing" - --- Iteration 20 -- -string(7) "Nothing" - --- Iteration 21 -- -string(12) "Hello World!" - --- Iteration 22 -- -string(12) "Hello World!" - --- Iteration 23 -- -string(0) "" - --- Iteration 24 -- - -Warning: session_cache_limiter() expects parameter 1 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing session_cache_limiter() : error functionality *** - -- Iteration 1 -- unicode(7) "nocache" diff --git a/ext/session/tests/session_cache_limiter_variation1.phpt b/ext/session/tests/session_cache_limiter_variation1.phpt index 25e0c906b6..f214536e03 100644 --- a/ext/session/tests/session_cache_limiter_variation1.phpt +++ b/ext/session/tests/session_cache_limiter_variation1.phpt @@ -30,16 +30,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_cache_limiter() : variation *** -string(7) "nocache" -bool(true) -string(7) "nocache" -string(7) "nocache" -string(6) "public" -bool(true) -string(6) "public" -Done ---UEXPECTF-- -*** Testing session_cache_limiter() : variation *** unicode(7) "nocache" bool(true) unicode(7) "nocache" diff --git a/ext/session/tests/session_cache_limiter_variation2.phpt b/ext/session/tests/session_cache_limiter_variation2.phpt index 28ff7fa88d..a03574725d 100644 --- a/ext/session/tests/session_cache_limiter_variation2.phpt +++ b/ext/session/tests/session_cache_limiter_variation2.phpt @@ -29,16 +29,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_cache_limiter() : variation *** -string(7) "nocache" -bool(true) -string(7) "nocache" -string(7) "nocache" -string(6) "public" -bool(true) -string(6) "public" -Done ---UEXPECTF-- -*** Testing session_cache_limiter() : variation *** unicode(7) "nocache" bool(true) unicode(7) "nocache" diff --git a/ext/session/tests/session_cache_limiter_variation3.phpt b/ext/session/tests/session_cache_limiter_variation3.phpt index fd652f120d..bd014fe9e6 100644 --- a/ext/session/tests/session_cache_limiter_variation3.phpt +++ b/ext/session/tests/session_cache_limiter_variation3.phpt @@ -28,16 +28,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_cache_limiter() : variation *** -string(7) "nocache" -bool(true) -string(7) "nocache" -string(7) "nocache" -string(6) "public" -bool(true) -string(6) "public" -Done ---UEXPECTF-- -*** Testing session_cache_limiter() : variation *** unicode(7) "nocache" bool(true) unicode(7) "nocache" diff --git a/ext/session/tests/session_decode_basic.phpt b/ext/session/tests/session_decode_basic.phpt index 41fe6eb29e..d9b57ff75d 100644 --- a/ext/session/tests/session_decode_basic.phpt +++ b/ext/session/tests/session_decode_basic.phpt @@ -100,180 +100,6 @@ ob_end_flush(); *** Testing session_decode() : basic functionality *** bool(true) --- Iteration 1 -- -bool(true) -array(1) { - ["data"]=> - int(0) -} - --- Iteration 2 -- -bool(true) -array(1) { - ["data"]=> - int(1) -} - --- Iteration 3 -- -bool(true) -array(1) { - ["data"]=> - int(12345) -} - --- Iteration 4 -- -bool(true) -array(1) { - ["data"]=> - int(-2345) -} - --- Iteration 5 -- -bool(true) -array(1) { - ["data"]=> - float(10.5) -} - --- Iteration 6 -- -bool(true) -array(1) { - ["data"]=> - float(-10.5) -} - --- Iteration 7 -- -bool(true) -array(1) { - ["data"]=> - float(123456789000) -} - --- Iteration 8 -- -bool(true) -array(1) { - ["data"]=> - float(1.23456789E-9) -} - --- Iteration 9 -- -bool(true) -array(1) { - ["data"]=> - float(0.5) -} - --- Iteration 10 -- -bool(true) -array(1) { - ["data"]=> - NULL -} - --- Iteration 11 -- -bool(true) -array(1) { - ["data"]=> - NULL -} - --- Iteration 12 -- -bool(true) -array(1) { - ["data"]=> - bool(true) -} - --- Iteration 13 -- -bool(true) -array(1) { - ["data"]=> - bool(false) -} - --- Iteration 14 -- -bool(true) -array(1) { - ["data"]=> - bool(true) -} - --- Iteration 15 -- -bool(true) -array(1) { - ["data"]=> - bool(false) -} - --- Iteration 16 -- -bool(true) -array(1) { - ["data"]=> - string(0) "" -} - --- Iteration 17 -- -bool(true) -array(1) { - ["data"]=> - string(0) "" -} - --- Iteration 18 -- -bool(true) -array(1) { - ["data"]=> - string(7) "Nothing" -} - --- Iteration 19 -- -bool(true) -array(1) { - ["data"]=> - string(7) "Nothing" -} - --- Iteration 20 -- -bool(true) -array(1) { - ["data"]=> - string(12) "Hello World!" -} - --- Iteration 21 -- -bool(true) -array(1) { - ["data"]=> - object(classA)#2 (0) { - } -} - --- Iteration 22 -- -bool(true) -array(1) { - ["data"]=> - NULL -} - --- Iteration 23 -- -bool(true) -array(1) { - ["data"]=> - NULL -} - --- Iteration 24 -- -bool(true) -array(1) { - ["data"]=> - int(0) -} -bool(true) -Done ---UEXPECTF-- -*** Testing session_decode() : basic functionality *** -bool(true) - -- Iteration 1 -- bool(true) array(1) { diff --git a/ext/session/tests/session_decode_error.phpt b/ext/session/tests/session_decode_error.phpt index eeff36b09b..8f7b8e0488 100644 --- a/ext/session/tests/session_decode_error.phpt +++ b/ext/session/tests/session_decode_error.phpt @@ -215,133 +215,6 @@ array(0) { -- Iteration 24 -- -Warning: session_decode() expects parameter 1 to be string, resource given in %s on line %d -NULL -array(0) { -} -bool(true) -Done ---UEXPECTF-- -*** Testing session_decode() : error functionality *** -bool(true) - --- Iteration 1 -- -bool(true) -array(0) { -} - --- Iteration 2 -- -bool(true) -array(0) { -} - --- Iteration 3 -- -bool(true) -array(0) { -} - --- Iteration 4 -- -bool(true) -array(0) { -} - --- Iteration 5 -- -bool(true) -array(0) { -} - --- Iteration 6 -- -bool(true) -array(0) { -} - --- Iteration 7 -- -bool(true) -array(0) { -} - --- Iteration 8 -- -bool(true) -array(0) { -} - --- Iteration 9 -- -bool(true) -array(0) { -} - --- Iteration 10 -- -bool(true) -array(0) { -} - --- Iteration 11 -- -bool(true) -array(0) { -} - --- Iteration 12 -- -bool(true) -array(0) { -} - --- Iteration 13 -- -bool(true) -array(0) { -} - --- Iteration 14 -- -bool(true) -array(0) { -} - --- Iteration 15 -- -bool(true) -array(0) { -} - --- Iteration 16 -- -bool(true) -array(0) { -} - --- Iteration 17 -- -bool(true) -array(0) { -} - --- Iteration 18 -- -bool(true) -array(0) { -} - --- Iteration 19 -- -bool(true) -array(0) { -} - --- Iteration 20 -- -bool(true) -array(0) { -} - --- Iteration 21 -- -bool(true) -array(0) { -} - --- Iteration 22 -- -bool(true) -array(0) { -} - --- Iteration 23 -- -bool(true) -array(0) { -} - --- Iteration 24 -- - Warning: session_decode() expects parameter 1 to be binary string, resource given in %s on line %d NULL array(0) { diff --git a/ext/session/tests/session_decode_error2.phpt b/ext/session/tests/session_decode_error2.phpt index 6a98c6df7f..aa492bba1c 100644 --- a/ext/session/tests/session_decode_error2.phpt +++ b/ext/session/tests/session_decode_error2.phpt @@ -52,590 +52,6 @@ bool(true) array(0) { } --- Iteration 4 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 5 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 6 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 7 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 8 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 9 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 10 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 11 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 12 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 13 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 14 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 15 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 16 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 17 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 18 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 19 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 20 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 21 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 22 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 23 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 24 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 25 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 26 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 27 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 28 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 29 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 30 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 31 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 32 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 33 -- -bool(true) -array(1) { - ["foo"]=> - NULL -} - --- Iteration 34 -- -bool(true) -array(1) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} - --- Iteration 35 -- -bool(true) -array(1) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} - --- Iteration 36 -- -bool(true) -array(1) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} - --- Iteration 37 -- -bool(true) -array(1) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} - --- Iteration 38 -- -bool(true) -array(1) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} - --- Iteration 39 -- -bool(true) -array(2) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - NULL -} - --- Iteration 40 -- -bool(true) -array(2) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - NULL -} - --- Iteration 41 -- -bool(true) -array(2) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - NULL -} - --- Iteration 42 -- -bool(true) -array(2) { - ["foo"]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - NULL -} - --- Iteration 43 -- -bool(true) -array(2) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} - --- Iteration 44 -- -bool(true) -array(2) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} - --- Iteration 45 -- -bool(true) -array(2) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} - --- Iteration 46 -- -bool(true) -array(2) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} - --- Iteration 47 -- -bool(true) -array(2) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} - --- Iteration 48 -- -bool(true) -array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - NULL -} - --- Iteration 49 -- -bool(true) -array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - NULL -} - --- Iteration 50 -- -bool(true) -array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - NULL -} - --- Iteration 51 -- -bool(true) -array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - NULL -} -bool(true) -Done ---UEXPECTF-- -*** Testing session_decode() : error functionality *** -bool(true) - --- Iteration 0 -- -bool(true) -array(0) { -} - --- Iteration 1 -- -bool(true) -array(0) { -} - --- Iteration 2 -- -bool(true) -array(0) { -} - --- Iteration 3 -- -bool(true) -array(0) { -} - -- Iteration 4 -- bool(true) array(1) { diff --git a/ext/session/tests/session_decode_variation1.phpt b/ext/session/tests/session_decode_variation1.phpt index 74c722f594..86fa8ae029 100644 --- a/ext/session/tests/session_decode_variation1.phpt +++ b/ext/session/tests/session_decode_variation1.phpt @@ -35,161 +35,6 @@ ob_end_flush(); *** Testing session_decode() : variation *** bool(true) bool(true) -array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} -bool(true) -array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} -bool(true) -array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} -bool(true) -array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} -bool(true) -array(3) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} -bool(true) -Done ---UEXPECTF-- -*** Testing session_decode() : variation *** -bool(true) -bool(true) array(3) { [u"foo"]=> &array(3) { diff --git a/ext/session/tests/session_decode_variation2.phpt b/ext/session/tests/session_decode_variation2.phpt index 1dc7c88435..2120ddf724 100644 --- a/ext/session/tests/session_decode_variation2.phpt +++ b/ext/session/tests/session_decode_variation2.phpt @@ -33,53 +33,6 @@ ob_end_flush(); bool(true) array(0) { } -array(3) { - ["foo"]=> - int(1234567890) - ["bar"]=> - string(12) "Hello World!" - ["guff"]=> - float(123.456) -} -bool(true) -array(4) { - ["foo"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["bar"]=> - string(12) "Hello World!" - ["guff"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - ["blah"]=> - &array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } -} -bool(true) -Done ---UEXPECTF-- -*** Testing session_decode() : variation *** -bool(true) -array(0) { -} array(3) { [u"foo"]=> int(1234567890) diff --git a/ext/session/tests/session_decode_variation3.phpt b/ext/session/tests/session_decode_variation3.phpt index 10b6851cac..020723c8d3 100644 --- a/ext/session/tests/session_decode_variation3.phpt +++ b/ext/session/tests/session_decode_variation3.phpt @@ -34,34 +34,6 @@ ob_end_flush(); --EXPECTF-- *** Testing session_decode() : variation *** -Warning: session_start(): Unknown session.serialize_handler. Failed to decode session object in %s on line %d -bool(true) -array(0) { -} -array(3) { - ["foo"]=> - int(1234567890) - ["bar"]=> - string(5) "Blah!" - ["guff"]=> - float(123.456) -} - -Warning: session_decode(): Unknown session.serialize_handler. Failed to decode session object in %s on line %d -bool(true) -array(3) { - ["foo"]=> - int(1234567890) - ["bar"]=> - string(5) "Blah!" - ["guff"]=> - float(123.456) -} -bool(true) -Done ---UEXPECTF-- -*** Testing session_decode() : variation *** - Warning: session_start(): Unknown session.serialize_handler. Failed to decode session object in %s on line %d bool(true) array(0) { diff --git a/ext/session/tests/session_decode_variation4.phpt b/ext/session/tests/session_decode_variation4.phpt index 62c4535f79..ca2ce8bd7b 100644 --- a/ext/session/tests/session_decode_variation4.phpt +++ b/ext/session/tests/session_decode_variation4.phpt @@ -34,30 +34,6 @@ ob_end_flush(); bool(true) array(0) { } -array(3) { - ["foo"]=> - int(1234567890) - ["bar"]=> - string(5) "Blah!" - ["guff"]=> - float(123.456) -} -bool(true) -array(3) { - ["foo"]=> - int(1234567890) - ["bar"]=> - string(5) "Blah!" - ["guff"]=> - float(123.456) -} -bool(true) -Done ---UEXPECTF-- -*** Testing session_decode() : variation *** -bool(true) -array(0) { -} array(3) { [u"foo"]=> int(1234567890) diff --git a/ext/session/tests/session_encode_basic.phpt b/ext/session/tests/session_encode_basic.phpt index 7035ed8e5c..1aff1e5e75 100644 --- a/ext/session/tests/session_encode_basic.phpt +++ b/ext/session/tests/session_encode_basic.phpt @@ -98,83 +98,6 @@ ob_end_flush(); *** Testing session_encode() : basic functionality *** bool(true) --- Iteration 1 -- -string(9) "data|i:0;" - --- Iteration 2 -- -string(9) "data|i:1;" - --- Iteration 3 -- -string(13) "data|i:12345;" - --- Iteration 4 -- -string(13) "data|i:-2345;" - --- Iteration 5 -- -string(12) "data|d:10.5;" - --- Iteration 6 -- -string(13) "data|d:-10.5;" - --- Iteration 7 -- -string(20) "data|d:123456789000;" - --- Iteration 8 -- -string(86) "data|d:1.2345678899999999145113427164344339914681114578343112953007221221923828125E-9;" - --- Iteration 9 -- -string(11) "data|d:0.5;" - --- Iteration 10 -- -string(7) "data|N;" - --- Iteration 11 -- -string(7) "data|N;" - --- Iteration 12 -- -string(9) "data|b:1;" - --- Iteration 13 -- -string(9) "data|b:0;" - --- Iteration 14 -- -string(9) "data|b:1;" - --- Iteration 15 -- -string(9) "data|b:0;" - --- Iteration 16 -- -string(12) "data|S:0:"";" - --- Iteration 17 -- -string(12) "data|S:0:"";" - --- Iteration 18 -- -string(19) "data|S:7:"Nothing";" - --- Iteration 19 -- -string(19) "data|S:7:"Nothing";" - --- Iteration 20 -- -string(25) "data|S:12:"Hello World!";" - --- Iteration 21 -- -string(22) "data|O:6:"classA":0:{}" - --- Iteration 22 -- -string(7) "data|N;" - --- Iteration 23 -- -string(7) "data|N;" - --- Iteration 24 -- -string(9) "data|i:0;" -bool(true) -Done ---UEXPECTF-- -*** Testing session_encode() : basic functionality *** -bool(true) - -- Iteration 1 -- unicode(9) "data|i:0;" diff --git a/ext/session/tests/session_encode_error2.phpt b/ext/session/tests/session_encode_error2.phpt index 6df0a570a4..b7bfee0aff 100644 --- a/ext/session/tests/session_encode_error2.phpt +++ b/ext/session/tests/session_encode_error2.phpt @@ -142,133 +142,6 @@ bool(true) bool(false) bool(true) --- Iteration 10 -- -bool(true) -string(21) "|S:12:"Hello World!";" -bool(true) - --- Iteration 11 -- -bool(true) -string(21) "|S:12:"Hello World!";" -bool(true) - --- Iteration 12 -- -bool(true) -bool(false) -bool(true) - --- Iteration 13 -- -bool(true) -bool(false) -bool(true) - --- Iteration 14 -- -bool(true) -bool(false) -bool(true) - --- Iteration 15 -- -bool(true) -bool(false) -bool(true) - --- Iteration 16 -- -bool(true) -string(21) "|S:12:"Hello World!";" -bool(true) - --- Iteration 17 -- -bool(true) -string(21) "|S:12:"Hello World!";" -bool(true) - --- Iteration 18 -- -bool(true) -string(28) "Nothing|S:12:"Hello World!";" -bool(true) - --- Iteration 19 -- -bool(true) -string(28) "Nothing|S:12:"Hello World!";" -bool(true) - --- Iteration 20 -- -bool(true) -string(33) "Hello World!|S:12:"Hello World!";" -bool(true) - --- Iteration 21 -- -bool(true) - -Warning: Illegal offset type in %s on line %d -bool(false) -bool(true) - --- Iteration 22 -- -bool(true) -string(21) "|S:12:"Hello World!";" -bool(true) - --- Iteration 23 -- -bool(true) -string(21) "|S:12:"Hello World!";" -bool(true) - --- Iteration 24 -- -bool(true) - -Strict Standards: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -bool(false) -bool(true) -Done ---UEXPECTF-- -*** Testing session_encode() : error functionality *** - --- Iteration 1 -- -bool(true) -bool(false) -bool(true) - --- Iteration 2 -- -bool(true) -bool(false) -bool(true) - --- Iteration 3 -- -bool(true) -bool(false) -bool(true) - --- Iteration 4 -- -bool(true) -bool(false) -bool(true) - --- Iteration 5 -- -bool(true) -bool(false) -bool(true) - --- Iteration 6 -- -bool(true) -bool(false) -bool(true) - --- Iteration 7 -- -bool(true) -bool(false) -bool(true) - --- Iteration 8 -- -bool(true) -bool(false) -bool(true) - --- Iteration 9 -- -bool(true) -bool(false) -bool(true) - -- Iteration 10 -- bool(true) unicode(21) "|U:12:"Hello World!";" diff --git a/ext/session/tests/session_encode_variation3.phpt b/ext/session/tests/session_encode_variation3.phpt index 659148bd1d..3166041a1a 100644 --- a/ext/session/tests/session_encode_variation3.phpt +++ b/ext/session/tests/session_encode_variation3.phpt @@ -28,12 +28,6 @@ ob_end_flush(); --EXPECTF-- *** Testing session_encode() : variation *** bool(true) -string(34) "foo|a:3:{i:0;i:1;i:1;i:2;i:2;i:3;}" -bool(true) -Done ---UEXPECTF-- -*** Testing session_encode() : variation *** -bool(true) unicode(34) "foo|a:3:{i:0;i:1;i:1;i:2;i:2;i:3;}" bool(true) Done diff --git a/ext/session/tests/session_encode_variation4.phpt b/ext/session/tests/session_encode_variation4.phpt index 9bc3dd7261..c2eb7d2ba2 100644 --- a/ext/session/tests/session_encode_variation4.phpt +++ b/ext/session/tests/session_encode_variation4.phpt @@ -30,12 +30,6 @@ ob_end_flush(); --EXPECTF-- *** Testing session_encode() : variation *** bool(true) -string(52) "foo|a:3:{i:0;i:1;i:1;i:2;i:2;i:3;}guff|R:1;blah|R:1;" -bool(true) -Done ---UEXPECTF-- -*** Testing session_encode() : variation *** -bool(true) unicode(52) "foo|a:3:{i:0;i:1;i:1;i:2;i:2;i:3;}guff|R:1;blah|R:1;" bool(true) Done diff --git a/ext/session/tests/session_encode_variation5.phpt b/ext/session/tests/session_encode_variation5.phpt index 52edaf576e..4eefa8fcf5 100644 --- a/ext/session/tests/session_encode_variation5.phpt +++ b/ext/session/tests/session_encode_variation5.phpt @@ -30,12 +30,6 @@ ob_end_flush(); --EXPECTF-- *** Testing session_encode() : variation *** bool(true) -string(64) "data|a:5:{i:0;i:1;i:1;i:2;i:2;i:3;S:3:"foo";R:1;S:4:"blah";R:1;}" -bool(true) -Done ---UEXPECTF-- -*** Testing session_encode() : variation *** -bool(true) unicode(64) "data|a:5:{i:0;i:1;i:1;i:2;i:2;i:3;U:3:"foo";R:1;U:4:"blah";R:1;}" bool(true) Done diff --git a/ext/session/tests/session_encode_variation7.phpt b/ext/session/tests/session_encode_variation7.phpt index aefec954fc..21f9974043 100644 --- a/ext/session/tests/session_encode_variation7.phpt +++ b/ext/session/tests/session_encode_variation7.phpt @@ -29,12 +29,6 @@ ob_end_flush(); --EXPECTF-- *** Testing session_encode() : variation *** bool(true) -string(24) "A2Zvb2k6MTIzNDU2Nzg5MDs=" -bool(true) -Done ---UEXPECTF-- -*** Testing session_encode() : variation *** -bool(true) string(0) "" bool(true) Done diff --git a/ext/session/tests/session_get_cookie_params_basic.phpt b/ext/session/tests/session_get_cookie_params_basic.phpt index 225c69accf..c4da3b8987 100644 --- a/ext/session/tests/session_get_cookie_params_basic.phpt +++ b/ext/session/tests/session_get_cookie_params_basic.phpt @@ -26,47 +26,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_get_cookie_params() : basic functionality *** -array(5) { - ["lifetime"]=> - int(0) - ["path"]=> - string(1) "/" - ["domain"]=> - string(0) "" - ["secure"]=> - bool(false) - ["httponly"]=> - bool(false) -} -NULL -array(5) { - ["lifetime"]=> - int(3600) - ["path"]=> - string(5) "/path" - ["domain"]=> - string(4) "blah" - ["secure"]=> - bool(false) - ["httponly"]=> - bool(false) -} -NULL -array(5) { - ["lifetime"]=> - int(1234567890) - ["path"]=> - string(5) "/guff" - ["domain"]=> - string(3) "foo" - ["secure"]=> - bool(true) - ["httponly"]=> - bool(true) -} -Done ---UEXPECTF-- -*** Testing session_get_cookie_params() : basic functionality *** array(5) { [u"lifetime"]=> int(0) diff --git a/ext/session/tests/session_get_cookie_params_variation1.phpt b/ext/session/tests/session_get_cookie_params_variation1.phpt index 9807e3be09..b7cc6dce01 100644 --- a/ext/session/tests/session_get_cookie_params_variation1.phpt +++ b/ext/session/tests/session_get_cookie_params_variation1.phpt @@ -32,81 +32,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_get_cookie_params() : variation *** -array(5) { - ["lifetime"]=> - int(0) - ["path"]=> - string(1) "/" - ["domain"]=> - string(0) "" - ["secure"]=> - bool(false) - ["httponly"]=> - bool(false) -} -array(5) { - ["lifetime"]=> - int(3600) - ["path"]=> - string(1) "/" - ["domain"]=> - string(0) "" - ["secure"]=> - bool(false) - ["httponly"]=> - bool(false) -} -array(5) { - ["lifetime"]=> - int(3600) - ["path"]=> - string(5) "/path" - ["domain"]=> - string(0) "" - ["secure"]=> - bool(false) - ["httponly"]=> - bool(false) -} -array(5) { - ["lifetime"]=> - int(3600) - ["path"]=> - string(5) "/path" - ["domain"]=> - string(3) "foo" - ["secure"]=> - bool(false) - ["httponly"]=> - bool(false) -} -array(5) { - ["lifetime"]=> - int(3600) - ["path"]=> - string(5) "/path" - ["domain"]=> - string(3) "foo" - ["secure"]=> - bool(true) - ["httponly"]=> - bool(false) -} -array(5) { - ["lifetime"]=> - int(3600) - ["path"]=> - string(5) "/path" - ["domain"]=> - string(3) "foo" - ["secure"]=> - bool(true) - ["httponly"]=> - bool(true) -} -Done ---UEXPECTF-- -*** Testing session_get_cookie_params() : variation *** array(5) { [u"lifetime"]=> int(0) diff --git a/ext/session/tests/session_id_error3.phpt b/ext/session/tests/session_id_error3.phpt index 44629ca039..db8e780d49 100644 --- a/ext/session/tests/session_id_error3.phpt +++ b/ext/session/tests/session_id_error3.phpt @@ -49,17 +49,4 @@ string(32) "%s" string(2) " " Done ---UEXPECTF-- -*** Testing session_id() : error functionality *** -string(32) "%s" -string(32) "%s" -string(1) "!" -string(32) "%s" -string(32) "%s" -string(3) "?><" -string(32) "%s" -string(32) "%s" -string(2) " -" -Done diff --git a/ext/session/tests/session_id_error4.phpt b/ext/session/tests/session_id_error4.phpt index e67597e4f1..07e73fbe62 100644 --- a/ext/session/tests/session_id_error4.phpt +++ b/ext/session/tests/session_id_error4.phpt @@ -26,14 +26,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_id() : error functionality *** -string(1) "0" -string(0) "" -bool(true) -string(40) "%s" -bool(true) -Done ---UEXPECTF-- -*** Testing session_id() : error functionality *** unicode(1) "0" string(0) "" bool(true) diff --git a/ext/session/tests/session_id_variation1.phpt b/ext/session/tests/session_id_variation1.phpt index 777751e054..d9878de8a6 100644 --- a/ext/session/tests/session_id_variation1.phpt +++ b/ext/session/tests/session_id_variation1.phpt @@ -32,19 +32,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_id() : variation *** -string(1) "0" -string(0) "" -bool(true) -string(%d) "%s" -bool(true) -string(1) "0" -string(0) "" -bool(true) -string(%d) "%s" -bool(true) -Done ---UEXPECTF-- -*** Testing session_id() : variation *** unicode(1) "0" string(0) "" bool(true) diff --git a/ext/session/tests/session_id_variation2.phpt b/ext/session/tests/session_id_variation2.phpt index f1ea34e7e1..f53ef7e0f4 100644 --- a/ext/session/tests/session_id_variation2.phpt +++ b/ext/session/tests/session_id_variation2.phpt @@ -39,23 +39,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_id() : variation *** -string(0) "" -int(12) -string(1) "0" -string(1) "0" -string(0) "" -bool(true) -string(%d) "%s" -bool(true) -string(1) "0" -string(0) "" -bool(true) -string(%d) "%s" -bool(true) -bool(true) -Done ---UEXPECTF-- -*** Testing session_id() : variation *** unicode(0) "" int(12) unicode(1) "0" diff --git a/ext/session/tests/session_module_name_basic.phpt b/ext/session/tests/session_module_name_basic.phpt index 7bc6170c0c..77569d86d0 100644 --- a/ext/session/tests/session_module_name_basic.phpt +++ b/ext/session/tests/session_module_name_basic.phpt @@ -26,15 +26,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_module_name() : basic functionality *** -string(%d) "%s" -string(5) "files" -bool(true) -string(5) "files" -bool(true) -string(5) "files" -Done ---UEXPECTF-- -*** Testing session_module_name() : basic functionality *** unicode(5) "files" unicode(5) "files" bool(true) diff --git a/ext/session/tests/session_module_name_error.phpt b/ext/session/tests/session_module_name_error.phpt index 7310f87ee3..4dc9f4e24f 100644 --- a/ext/session/tests/session_module_name_error.phpt +++ b/ext/session/tests/session_module_name_error.phpt @@ -211,129 +211,6 @@ bool(false) -- Iteration 24 -- -Warning: session_module_name() expects parameter 1 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing session_module_name() : error functionality *** - --- Iteration 1 -- - -Warning: session_module_name(): Cannot find named PHP session module (0) in %s on line %d -bool(false) - --- Iteration 2 -- - -Warning: session_module_name(): Cannot find named PHP session module (1) in %s on line %d -bool(false) - --- Iteration 3 -- - -Warning: session_module_name(): Cannot find named PHP session module (12345) in %s on line %d -bool(false) - --- Iteration 4 -- - -Warning: session_module_name(): Cannot find named PHP session module (-2345) in %s on line %d -bool(false) - --- Iteration 5 -- - -Warning: session_module_name(): Cannot find named PHP session module (10.5) in %s on line %d -bool(false) - --- Iteration 6 -- - -Warning: session_module_name(): Cannot find named PHP session module (-10.5) in %s on line %d -bool(false) - --- Iteration 7 -- - -Warning: session_module_name(): Cannot find named PHP session module (123456789000) in %s on line %d -bool(false) - --- Iteration 8 -- - -Warning: session_module_name(): Cannot find named PHP session module (1.23456789E-9) in %s on line %d -bool(false) - --- Iteration 9 -- - -Warning: session_module_name(): Cannot find named PHP session module (0.5) in %s on line %d -bool(false) - --- Iteration 10 -- - -Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d -bool(false) - --- Iteration 11 -- - -Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d -bool(false) - --- Iteration 12 -- - -Warning: session_module_name(): Cannot find named PHP session module (1) in %s on line %d -bool(false) - --- Iteration 13 -- - -Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d -bool(false) - --- Iteration 14 -- - -Warning: session_module_name(): Cannot find named PHP session module (1) in %s on line %d -bool(false) - --- Iteration 15 -- - -Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d -bool(false) - --- Iteration 16 -- - -Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d -bool(false) - --- Iteration 17 -- - -Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d -bool(false) - --- Iteration 18 -- - -Warning: session_module_name(): Cannot find named PHP session module (Nothing) in %s on line %d -bool(false) - --- Iteration 19 -- - -Warning: session_module_name(): Cannot find named PHP session module (Nothing) in %s on line %d -bool(false) - --- Iteration 20 -- - -Warning: session_module_name(): Cannot find named PHP session module (Hello World!) in %s on line %d -bool(false) - --- Iteration 21 -- - -Warning: session_module_name(): Cannot find named PHP session module (Hello World!) in %s on line %d -bool(false) - --- Iteration 22 -- - -Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d -bool(false) - --- Iteration 23 -- - -Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d -bool(false) - --- Iteration 24 -- - Warning: session_module_name() expects parameter 1 to be binary string, resource given in %s on line %d NULL Done diff --git a/ext/session/tests/session_module_name_variation1.phpt b/ext/session/tests/session_module_name_variation1.phpt index 0e53ee95cb..e610416358 100644 --- a/ext/session/tests/session_module_name_variation1.phpt +++ b/ext/session/tests/session_module_name_variation1.phpt @@ -26,16 +26,6 @@ ob_end_flush(); --EXPECTF-- *** Testing session_module_name() : variation *** -Warning: session_module_name(): Cannot find named PHP session module (blah) in %s on line %d -bool(false) -bool(true) -string(%d) "%s" -bool(true) -string(%d) "%s" -Done ---UEXPECTF-- -*** Testing session_module_name() : variation *** - Warning: session_module_name(): Cannot find named PHP session module (blah) in %s on line %d bool(false) bool(true) diff --git a/ext/session/tests/session_module_name_variation2.phpt b/ext/session/tests/session_module_name_variation2.phpt index 2ddf93137a..2ac83a8ee5 100644 --- a/ext/session/tests/session_module_name_variation2.phpt +++ b/ext/session/tests/session_module_name_variation2.phpt @@ -30,10 +30,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_module_name() : variation *** -string(%d) "%s" -string(4) "user" ---UEXPECTF-- -*** Testing session_module_name() : variation *** unicode(5) "files" unicode(4) "user" diff --git a/ext/session/tests/session_module_name_variation3.phpt b/ext/session/tests/session_module_name_variation3.phpt index 11b6e57627..1306cf3ec7 100644 --- a/ext/session/tests/session_module_name_variation3.phpt +++ b/ext/session/tests/session_module_name_variation3.phpt @@ -38,17 +38,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_module_name() : variation *** -string(%d) "%s" -string(4) "user" - -Fatal error: Uncaught exception 'Exception' with message 'Stop...!' in %s:%d -Stack trace: -#0 [internal function]: open('', 'PHPSESSID') -#1 %s(%d): session_start() -#2 {main} - thrown in %s on line %d ---UEXPECTF-- -*** Testing session_module_name() : variation *** unicode(5) "files" unicode(4) "user" diff --git a/ext/session/tests/session_module_name_variation4.phpt b/ext/session/tests/session_module_name_variation4.phpt index 54c42e086f..bd2d57fcfc 100644 --- a/ext/session/tests/session_module_name_variation4.phpt +++ b/ext/session/tests/session_module_name_variation4.phpt @@ -43,30 +43,6 @@ ob_end_flush(); --EXPECTF-- *** Testing session_module_name() : variation *** -array(3) { - ["Blah"]=> - string(12) "Hello World!" - ["Foo"]=> - bool(false) - ["Guff"]=> - int(1234567890) -} -NULL -array(3) { - ["Blah"]=> - string(12) "Hello World!" - ["Foo"]=> - bool(false) - ["Guff"]=> - int(1234567890) -} -bool(true) -array(0) { -} -bool(true) ---UEXPECTF-- -*** Testing session_module_name() : variation *** - array(3) { [u"Blah"]=> unicode(12) "Hello World!" diff --git a/ext/session/tests/session_name_basic.phpt b/ext/session/tests/session_name_basic.phpt index 4866caa4a8..7834b74788 100644 --- a/ext/session/tests/session_name_basic.phpt +++ b/ext/session/tests/session_name_basic.phpt @@ -30,15 +30,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_name() : error functionality *** -string(9) "PHPSESSID" -string(9) "PHPSESSID" -bool(true) -string(4) "blah" -bool(true) -string(4) "blah" -Done ---UEXPECTF-- -*** Testing session_name() : error functionality *** unicode(9) "PHPSESSID" unicode(9) "PHPSESSID" bool(true) diff --git a/ext/session/tests/session_name_error.phpt b/ext/session/tests/session_name_error.phpt index ca01e9bb59..d6cb78c746 100644 --- a/ext/session/tests/session_name_error.phpt +++ b/ext/session/tests/session_name_error.phpt @@ -97,83 +97,6 @@ ob_end_flush(); --EXPECTF-- *** Testing session_name() : error functionality *** --- Iteration 1 -- -string(9) "PHPSESSID" - --- Iteration 2 -- -string(1) "0" - --- Iteration 3 -- -string(1) "1" - --- Iteration 4 -- -string(5) "12345" - --- Iteration 5 -- -string(5) "-2345" - --- Iteration 6 -- -string(4) "10.5" - --- Iteration 7 -- -string(5) "-10.5" - --- Iteration 8 -- -string(12) "123456789000" - --- Iteration 9 -- -string(13) "1.23456789E-9" - --- Iteration 10 -- -string(3) "0.5" - --- Iteration 11 -- -string(0) "" - --- Iteration 12 -- -string(0) "" - --- Iteration 13 -- -string(1) "1" - --- Iteration 14 -- -string(0) "" - --- Iteration 15 -- -string(1) "1" - --- Iteration 16 -- -string(0) "" - --- Iteration 17 -- -string(0) "" - --- Iteration 18 -- -string(0) "" - --- Iteration 19 -- -string(7) "Nothing" - --- Iteration 20 -- -string(7) "Nothing" - --- Iteration 21 -- -string(12) "Hello World!" - --- Iteration 22 -- -string(12) "Hello World!" - --- Iteration 23 -- -string(0) "" - --- Iteration 24 -- - -Warning: session_name() expects parameter 1 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing session_name() : error functionality *** - -- Iteration 1 -- unicode(9) "PHPSESSID" diff --git a/ext/session/tests/session_name_variation1.phpt b/ext/session/tests/session_name_variation1.phpt index 289d6ca3c7..930541e102 100644 --- a/ext/session/tests/session_name_variation1.phpt +++ b/ext/session/tests/session_name_variation1.phpt @@ -41,24 +41,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_name() : variation *** -string(9) "PHPSESSID" -bool(true) -string(0) "" -bool(true) -string(0) "" -string(0) "" -bool(true) -string(1) " " -bool(true) -string(1) " " -string(1) " " -bool(true) -string(0) "" -bool(true) -string(0) "" -Done ---UEXPECTF-- -*** Testing session_name() : variation *** unicode(9) "PHPSESSID" bool(true) unicode(0) "" diff --git a/ext/session/tests/session_name_variation2.phpt b/ext/session/tests/session_name_variation2.phpt index 8a00e94a52..b6a821df12 100644 --- a/ext/session/tests/session_name_variation2.phpt +++ b/ext/session/tests/session_name_variation2.phpt @@ -29,15 +29,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_name() : variation *** -string(4) "blah" -string(4) "blah" -bool(true) -string(4) "blah" -bool(true) -string(4) "blah" -Done ---UEXPECTF-- -*** Testing session_name() : variation *** unicode(4) "blah" unicode(4) "blah" bool(true) diff --git a/ext/session/tests/session_save_path_basic.phpt b/ext/session/tests/session_save_path_basic.phpt index 47258f17a7..c7663f4a3e 100644 --- a/ext/session/tests/session_save_path_basic.phpt +++ b/ext/session/tests/session_save_path_basic.phpt @@ -29,12 +29,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_save_path() : error functionality *** -string(0) "" -string(0) "" -string(%d) "%s" -Done ---UEXPECTF-- -*** Testing session_save_path() : error functionality *** unicode(0) "" unicode(0) "" unicode(%d) "%s" diff --git a/ext/session/tests/session_save_path_error.phpt b/ext/session/tests/session_save_path_error.phpt index 3e92597877..f2d19128e0 100644 --- a/ext/session/tests/session_save_path_error.phpt +++ b/ext/session/tests/session_save_path_error.phpt @@ -101,83 +101,6 @@ ob_end_flush(); --EXPECTF-- *** Testing session_save_path() : error functionality *** --- Iteration 1 -- -string(0) "" - --- Iteration 2 -- -string(1) "0" - --- Iteration 3 -- -string(1) "1" - --- Iteration 4 -- -string(5) "12345" - --- Iteration 5 -- -string(5) "-2345" - --- Iteration 6 -- -string(4) "10.5" - --- Iteration 7 -- -string(5) "-10.5" - --- Iteration 8 -- -string(12) "123456789000" - --- Iteration 9 -- -string(13) "1.23456789E-9" - --- Iteration 10 -- -string(3) "0.5" - --- Iteration 11 -- -string(0) "" - --- Iteration 12 -- -string(0) "" - --- Iteration 13 -- -string(1) "1" - --- Iteration 14 -- -string(0) "" - --- Iteration 15 -- -string(1) "1" - --- Iteration 16 -- -string(0) "" - --- Iteration 17 -- -string(0) "" - --- Iteration 18 -- -string(0) "" - --- Iteration 19 -- -string(7) "Nothing" - --- Iteration 20 -- -string(7) "Nothing" - --- Iteration 21 -- -string(12) "Hello World!" - --- Iteration 22 -- -string(12) "Hello World!" - --- Iteration 23 -- -string(0) "" - --- Iteration 24 -- - -Warning: session_save_path() expects parameter 1 to be string, resource given in %s on line %d -NULL -Done ---UEXPECTF-- -*** Testing session_save_path() : error functionality *** - -- Iteration 1 -- unicode(0) "" diff --git a/ext/session/tests/session_save_path_variation1.phpt b/ext/session/tests/session_save_path_variation1.phpt index b79902c347..a53a9b204d 100644 --- a/ext/session/tests/session_save_path_variation1.phpt +++ b/ext/session/tests/session_save_path_variation1.phpt @@ -33,16 +33,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_save_path() : variation *** -string(0) "" -bool(true) -string(0) "" -string(0) "" -string(%d) "%s" -bool(true) -string(%d) "%s" -Done ---UEXPECTF-- -*** Testing session_save_path() : variation *** unicode(0) "" bool(true) unicode(0) "" diff --git a/ext/session/tests/session_save_path_variation2.phpt b/ext/session/tests/session_save_path_variation2.phpt index 5918c07532..264517b592 100644 --- a/ext/session/tests/session_save_path_variation2.phpt +++ b/ext/session/tests/session_save_path_variation2.phpt @@ -30,16 +30,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_save_path() : variation *** -string(5) "/blah" - -Warning: session_start(): open(%s, O_RDWR) failed: No such file or directory (2) in %s on line %d -bool(true) -string(5) "/blah" -bool(true) -string(5) "/blah" -Done ---UEXPECTF-- -*** Testing session_save_path() : variation *** unicode(5) "/blah" Warning: session_start(): open(%s, O_RDWR) failed: No such file or directory (2) in %s on line %d diff --git a/ext/session/tests/session_save_path_variation3.phpt b/ext/session/tests/session_save_path_variation3.phpt index 6da6fe08b1..b55c663715 100644 --- a/ext/session/tests/session_save_path_variation3.phpt +++ b/ext/session/tests/session_save_path_variation3.phpt @@ -30,16 +30,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_save_path() : variation *** -string(5) "/blah" - -Warning: session_start(): open(%s, O_RDWR) failed: No such file or directory (2) in %s on line %d -bool(true) -string(5) "/blah" -bool(true) -string(5) "/blah" -Done ---UEXPECTF-- -*** Testing session_save_path() : variation *** unicode(5) "/blah" Warning: session_start(): open(%s, O_RDWR) failed: No such file or directory (2) in %s on line %d diff --git a/ext/session/tests/session_save_path_variation4.phpt b/ext/session/tests/session_save_path_variation4.phpt index 4d5398dde6..933653e0f7 100644 --- a/ext/session/tests/session_save_path_variation4.phpt +++ b/ext/session/tests/session_save_path_variation4.phpt @@ -54,17 +54,6 @@ var_dump(rmdir($sessions)); bool(true) bool(true) -Warning: ini_set(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d -string(0) "" - -Warning: session_start(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d - -Fatal error: session_start(): Failed to initialize storage module: files (path: ) in %s on line %d ---UEXPECTF-- -*** Testing session_save_path() : variation *** -bool(true) -bool(true) - Warning: ini_set(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d unicode(0) "" diff --git a/ext/session/tests/session_save_path_variation5.phpt b/ext/session/tests/session_save_path_variation5.phpt index bff2e14f77..6bddc9cf37 100644 --- a/ext/session/tests/session_save_path_variation5.phpt +++ b/ext/session/tests/session_save_path_variation5.phpt @@ -54,19 +54,6 @@ var_dump(rmdir($sessions)); bool(true) bool(true) -Warning: ini_set(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d -string(0) "" -bool(true) -string(0) "" -bool(true) -string(0) "" -bool(true) -Done ---UEXPECTF-- -*** Testing session_save_path() : variation *** -bool(true) -bool(true) - Warning: ini_set(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d unicode(0) "" bool(true) diff --git a/ext/session/tests/session_set_cookie_params_error.phpt b/ext/session/tests/session_set_cookie_params_error.phpt index 0adc9edd10..07f40e8216 100644 --- a/ext/session/tests/session_set_cookie_params_error.phpt +++ b/ext/session/tests/session_set_cookie_params_error.phpt @@ -289,215 +289,6 @@ NULL -- Iteration 24 -- -Warning: session_set_cookie_params() expects parameter 1 to be string, resource given in %s on line %d -NULL - -Warning: session_set_cookie_params() expects parameter 2 to be string, resource given in %s on line %d -NULL - -Warning: session_set_cookie_params() expects parameter 3 to be string, resource given in %s on line %d -NULL - -Warning: session_set_cookie_params() expects parameter 4 to be boolean, resource given in %s on line %d -NULL - -Warning: session_set_cookie_params() expects parameter 5 to be boolean, resource given in %s on line %d -NULL -NULL -Done ---UEXPECTF-- -*** Testing session_set_cookie_params() : error functionality *** - --- Iteration 1 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 2 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 3 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 4 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 5 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 6 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 7 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 8 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 9 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 10 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 11 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 12 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 13 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 14 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 15 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 16 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 17 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 18 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 19 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 20 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 21 -- -NULL -NULL -NULL - -Warning: session_set_cookie_params() expects parameter 4 to be boolean, object given in %s on line %d -NULL - -Warning: session_set_cookie_params() expects parameter 5 to be boolean, object given in %s on line %d -NULL -NULL - --- Iteration 22 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 23 -- -NULL -NULL -NULL -NULL -NULL -NULL - --- Iteration 24 -- - Warning: session_set_cookie_params() expects parameter 1 to be binary string, resource given in %s on line %d NULL diff --git a/ext/session/tests/session_set_cookie_params_variation1.phpt b/ext/session/tests/session_set_cookie_params_variation1.phpt index ce1033d46b..7a2714accb 100644 --- a/ext/session/tests/session_set_cookie_params_variation1.phpt +++ b/ext/session/tests/session_set_cookie_params_variation1.phpt @@ -34,20 +34,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_set_cookie_params() : variation *** -string(4) "3600" -NULL -string(4) "3600" -bool(true) -string(4) "3600" -NULL -string(4) "1800" -bool(true) -string(4) "1800" -NULL -string(10) "1234567890" -Done ---UEXPECTF-- -*** Testing session_set_cookie_params() : variation *** unicode(4) "3600" NULL unicode(4) "3600" diff --git a/ext/session/tests/session_set_cookie_params_variation2.phpt b/ext/session/tests/session_set_cookie_params_variation2.phpt index f2fefea9a8..e106c24757 100644 --- a/ext/session/tests/session_set_cookie_params_variation2.phpt +++ b/ext/session/tests/session_set_cookie_params_variation2.phpt @@ -34,20 +34,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_set_cookie_params() : variation *** -string(5) "/path" -NULL -string(4) "/foo" -bool(true) -string(4) "/foo" -NULL -string(5) "/blah" -bool(true) -string(5) "/blah" -NULL -string(5) "/guff" -Done ---UEXPECTF-- -*** Testing session_set_cookie_params() : variation *** unicode(5) "/path" NULL unicode(4) "/foo" diff --git a/ext/session/tests/session_set_cookie_params_variation3.phpt b/ext/session/tests/session_set_cookie_params_variation3.phpt index 146111b575..eea1dd55fb 100644 --- a/ext/session/tests/session_set_cookie_params_variation3.phpt +++ b/ext/session/tests/session_set_cookie_params_variation3.phpt @@ -34,20 +34,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_set_cookie_params() : variation *** -string(3) "foo" -NULL -string(4) "blah" -bool(true) -string(4) "blah" -NULL -string(4) "guff" -bool(true) -string(4) "guff" -NULL -string(3) "foo" -Done ---UEXPECTF-- -*** Testing session_set_cookie_params() : variation *** unicode(3) "foo" NULL unicode(4) "blah" diff --git a/ext/session/tests/session_set_cookie_params_variation4.phpt b/ext/session/tests/session_set_cookie_params_variation4.phpt index 0fd2d2861d..e51ee0da24 100644 --- a/ext/session/tests/session_set_cookie_params_variation4.phpt +++ b/ext/session/tests/session_set_cookie_params_variation4.phpt @@ -34,20 +34,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_set_cookie_params() : variation *** -string(1) "1" -NULL -string(1) "0" -bool(true) -string(1) "0" -NULL -string(1) "1" -bool(true) -string(1) "1" -NULL -string(1) "0" -Done ---UEXPECTF-- -*** Testing session_set_cookie_params() : variation *** unicode(1) "1" NULL unicode(1) "0" diff --git a/ext/session/tests/session_set_cookie_params_variation5.phpt b/ext/session/tests/session_set_cookie_params_variation5.phpt index 4fe501ad9f..f75f43f760 100644 --- a/ext/session/tests/session_set_cookie_params_variation5.phpt +++ b/ext/session/tests/session_set_cookie_params_variation5.phpt @@ -34,20 +34,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_set_cookie_params() : variation *** -string(1) "1" -NULL -string(1) "0" -bool(true) -string(1) "0" -NULL -string(1) "1" -bool(true) -string(1) "1" -NULL -string(1) "0" -Done ---UEXPECTF-- -*** Testing session_set_cookie_params() : variation *** unicode(1) "1" NULL unicode(1) "0" diff --git a/ext/session/tests/session_set_save_handler_basic.phpt b/ext/session/tests/session_set_save_handler_basic.phpt index 366f9dc80c..4893e61854 100644 --- a/ext/session/tests/session_set_save_handler_basic.phpt +++ b/ext/session/tests/session_set_save_handler_basic.phpt @@ -50,52 +50,6 @@ ob_end_flush(); --EXPECTF-- *** Testing session_set_save_handler() : basic functionality *** -string(5) "files" - -Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d -bool(false) - -Warning: session_module_name(): Cannot find named PHP session module (blah) in %s on line %d -bool(false) - -Warning: session_module_name(): Cannot find named PHP session module (foo) in %s on line %d -bool(false) -Open [%s,PHPSESSID] -Read [%s,%s] -array(3) { - ["Blah"]=> - string(12) "Hello World!" - ["Foo"]=> - bool(false) - ["Guff"]=> - int(1234567890) -} -Write [%s,%s,Blah|S:12:"Hello World!";Foo|b:0;Guff|i:1234567890;] -Close [%s,PHPSESSID] -array(3) { - ["Blah"]=> - string(12) "Hello World!" - ["Foo"]=> - bool(false) - ["Guff"]=> - int(1234567890) -} -Starting session again..! -Open [%s,PHPSESSID] -Read [%s,%s] -array(3) { - ["Blah"]=> - string(12) "Hello World!" - ["Foo"]=> - bool(false) - ["Guff"]=> - int(1234567890) -} -Write [%s,%s,Blah|S:12:"Hello World!";Foo|b:0;Guff|i:1234567890;] -Close [%s,PHPSESSID] ---UEXPECTF-- -*** Testing session_set_save_handler() : basic functionality *** - unicode(5) "files" Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d diff --git a/ext/session/tests/session_set_save_handler_error2.phpt b/ext/session/tests/session_set_save_handler_error2.phpt index 1cc2fb5797..a936b94333 100644 --- a/ext/session/tests/session_set_save_handler_error2.phpt +++ b/ext/session/tests/session_set_save_handler_error2.phpt @@ -41,26 +41,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_set_save_handler() : error functionality *** -array(3) { - ["Blah"]=> - string(12) "Hello World!" - ["Foo"]=> - bool(false) - ["Guff"]=> - int(1234567890) -} -array(3) { - ["Blah"]=> - string(12) "Hello World!" - ["Foo"]=> - bool(false) - ["Guff"]=> - int(1234567890) -} -array(0) { -} ---UEXPECTF-- -*** Testing session_set_save_handler() : error functionality *** array(3) { [u"Blah"]=> unicode(12) "Hello World!" diff --git a/ext/session/tests/session_set_save_handler_variation1.phpt b/ext/session/tests/session_set_save_handler_variation1.phpt index 26d9d7b7d2..a89a76afb4 100644 --- a/ext/session/tests/session_set_save_handler_variation1.phpt +++ b/ext/session/tests/session_set_save_handler_variation1.phpt @@ -27,19 +27,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_set_save_handler() : variation *** -string(%d) "%s" - -Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d -bool(false) -string(%d) "%s" - -Warning: session_module_name(): Cannot find named PHP session module (blah) in %s on line %d -bool(false) -string(%d) "%s" -string(%d) "%s" -string(5) "files" ---UEXPECTF-- -*** Testing session_set_save_handler() : variation *** unicode(5) "files" Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d diff --git a/ext/session/tests/session_set_save_handler_variation4.phpt b/ext/session/tests/session_set_save_handler_variation4.phpt index e4c5eee9ac..b47bd21dc8 100644 --- a/ext/session/tests/session_set_save_handler_variation4.phpt +++ b/ext/session/tests/session_set_save_handler_variation4.phpt @@ -50,39 +50,6 @@ ob_end_flush(); --EXPECTF-- *** Testing session_set_save_handler() : variation *** -Open [%s,PHPSESSID] -Read [%s,%s] -GC [0] -array(3) { - ["Blah"]=> - string(12) "Hello World!" - ["Foo"]=> - bool(false) - ["Guff"]=> - int(1234567890) -} -Write [%s,%s,Blah|S:12:"Hello World!";Foo|b:0;Guff|i:1234567890;] -Close [%s,PHPSESSID] -NULL -Open [%s,PHPSESSID] -Read [%s,%s] -GC [0] -array(3) { - ["Blah"]=> - string(12) "Hello World!" - ["Foo"]=> - bool(false) - ["Guff"]=> - int(1234567890) -} -Destroy [%s,%s] - -Warning: unlink(%s): No such file or directory in %s on line %d -Close [%s,PHPSESSID] -bool(true) ---UEXPECTF-- -*** Testing session_set_save_handler() : variation *** - Open [%s,PHPSESSID] Read [%s,%s] GC [0] diff --git a/ext/session/tests/session_start_variation4.phpt b/ext/session/tests/session_start_variation4.phpt index c92bfda067..a797eafb96 100644 --- a/ext/session/tests/session_start_variation4.phpt +++ b/ext/session/tests/session_start_variation4.phpt @@ -27,15 +27,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_start() : variation *** -array(1) { - ["blah"]=> - string(3) "foo" -} -array(0) { -} -Done ---UEXPECTF-- -*** Testing session_start() : variation *** array(1) { [u"blah"]=> unicode(3) "foo" diff --git a/ext/session/tests/session_start_variation5.phpt b/ext/session/tests/session_start_variation5.phpt index a3ed21e975..447d09a071 100644 --- a/ext/session/tests/session_start_variation5.phpt +++ b/ext/session/tests/session_start_variation5.phpt @@ -33,30 +33,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_start() : variation *** -array(4) { - ["colour"]=> - string(5) "green" - ["animal"]=> - string(3) "cat" - ["person"]=> - string(5) "julia" - ["age"]=> - int(6) -} -NULL -array(4) { - ["colour"]=> - string(5) "green" - ["animal"]=> - string(3) "cat" - ["person"]=> - string(5) "julia" - ["age"]=> - int(6) -} -Done ---UEXPECTF-- -*** Testing session_start() : variation *** array(4) { [u"colour"]=> unicode(5) "green" diff --git a/ext/session/tests/session_start_variation6.phpt b/ext/session/tests/session_start_variation6.phpt index 12f817b4c1..f02243d693 100644 --- a/ext/session/tests/session_start_variation6.phpt +++ b/ext/session/tests/session_start_variation6.phpt @@ -34,40 +34,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_start() : variation *** -array(4) { - ["colour"]=> - string(5) "green" - ["animal"]=> - string(3) "cat" - ["person"]=> - string(5) "julia" - ["age"]=> - int(6) -} -NULL -array(4) { - ["colour"]=> - string(5) "green" - ["animal"]=> - string(3) "cat" - ["person"]=> - string(5) "julia" - ["age"]=> - int(6) -} -array(4) { - ["colour"]=> - string(5) "green" - ["animal"]=> - string(3) "cat" - ["person"]=> - string(5) "julia" - ["age"]=> - int(6) -} -Done ---UEXPECTF-- -*** Testing session_start() : variation *** array(4) { [u"colour"]=> unicode(5) "green" diff --git a/ext/session/tests/session_start_variation7.phpt b/ext/session/tests/session_start_variation7.phpt index d7b7785563..f41f3852fa 100644 --- a/ext/session/tests/session_start_variation7.phpt +++ b/ext/session/tests/session_start_variation7.phpt @@ -34,32 +34,6 @@ ob_end_flush(); ?> --EXPECTF-- *** Testing session_start() : variation *** -array(4) { - ["colour"]=> - string(5) "green" - ["animal"]=> - string(3) "cat" - ["person"]=> - string(5) "julia" - ["age"]=> - int(6) -} -bool(true) -array(4) { - ["colour"]=> - string(5) "green" - ["animal"]=> - string(3) "cat" - ["person"]=> - string(5) "julia" - ["age"]=> - int(6) -} -array(0) { -} -Done ---UEXPECTF-- -*** Testing session_start() : variation *** array(4) { [u"colour"]=> unicode(5) "green" diff --git a/ext/session/tests/session_unset_basic.phpt b/ext/session/tests/session_unset_basic.phpt index db95d51de9..1202205fc8 100644 --- a/ext/session/tests/session_unset_basic.phpt +++ b/ext/session/tests/session_unset_basic.phpt @@ -29,20 +29,6 @@ ob_end_flush(); --EXPECTF-- *** Testing session_unset() : basic functionality *** bool(true) -array(1) { - ["foo"]=> - string(12) "Hello World!" -} -NULL -array(0) { -} -bool(true) -array(0) { -} -Done ---UEXPECTF-- -*** Testing session_unset() : basic functionality *** -bool(true) array(1) { [u"foo"]=> unicode(12) "Hello World!" diff --git a/ext/session/tests/session_unset_variation1.phpt b/ext/session/tests/session_unset_variation1.phpt index f9346f6332..7c7883540b 100644 --- a/ext/session/tests/session_unset_variation1.phpt +++ b/ext/session/tests/session_unset_variation1.phpt @@ -33,23 +33,6 @@ ob_end_flush(); bool(false) bool(true) NULL -array(1) { - ["foo"]=> - string(12) "Hello World!" -} -bool(true) -bool(false) -array(1) { - ["foo"]=> - string(12) "Hello World!" -} -bool(false) -Done ---UEXPECTF-- -*** Testing session_unset() : variation *** -bool(false) -bool(true) -NULL array(1) { [u"foo"]=> unicode(12) "Hello World!" diff --git a/ext/simplexml/tests/000.phpt b/ext/simplexml/tests/000.phpt index 7f9d87a592..af11cbdebd 100755 --- a/ext/simplexml/tests/000.phpt +++ b/ext/simplexml/tests/000.phpt @@ -42,221 +42,6 @@ test('sxe->elem22["attr22"]'); bool(true) bool(true) int(3) -object(SimpleXMLElement)#%d (3) { - ["@attributes"]=> - array(1) { - ["id"]=> - string(3) "123" - } - ["elem1"]=> - array(2) { - [0]=> - string(36) "There is some text.Here is some more" - [1]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(2) { - ["attr1"]=> - string(2) "11" - ["attr2"]=> - string(2) "12" - } - } - } - ["elem11"]=> - object(SimpleXMLElement)#%d (1) { - ["elem111"]=> - object(SimpleXMLElement)#%d (1) { - ["elem1111"]=> - object(SimpleXMLElement)#%d (0) { - } - } - } -} -===sxe->elem1 -bool(true) -bool(true) -int(2) -object(SimpleXMLElement)#%d (3) { - ["@attributes"]=> - array(2) { - ["attr1"]=> - string(5) "first" - ["attr2"]=> - string(6) "second" - } - ["comment"]=> - object(SimpleXMLElement)#%d (0) { - } - ["elem2"]=> - object(SimpleXMLElement)#%d (2) { - ["@attributes"]=> - array(2) { - ["att25"]=> - string(2) "25" - ["att42"]=> - string(2) "42" - } - ["elem3"]=> - object(SimpleXMLElement)#%d (1) { - ["elem4"]=> - object(SimpleXMLElement)#%d (1) { - ["test"]=> - object(SimpleXMLElement)#%d (0) { - } - } - } - } -} -===sxe->elem1[0] -bool(true) -bool(true) -int(1) -object(SimpleXMLElement)#%d (3) { - ["@attributes"]=> - array(2) { - ["attr1"]=> - string(5) "first" - ["attr2"]=> - string(6) "second" - } - ["comment"]=> - object(SimpleXMLElement)#%d (0) { - } - ["elem2"]=> - object(SimpleXMLElement)#%d (2) { - ["@attributes"]=> - array(2) { - ["att25"]=> - string(2) "25" - ["att42"]=> - string(2) "42" - } - ["elem3"]=> - object(SimpleXMLElement)#%d (1) { - ["elem4"]=> - object(SimpleXMLElement)#%d (1) { - ["test"]=> - object(SimpleXMLElement)#%d (0) { - } - } - } - } -} -===sxe->elem1[0]->elem2 -bool(true) -bool(true) -int(1) -object(SimpleXMLElement)#%d (2) { - ["@attributes"]=> - array(2) { - ["att25"]=> - string(2) "25" - ["att42"]=> - string(2) "42" - } - ["elem3"]=> - object(SimpleXMLElement)#%d (1) { - ["elem4"]=> - object(SimpleXMLElement)#%d (1) { - ["test"]=> - object(SimpleXMLElement)#%d (0) { - } - } - } -} -===sxe->elem1[0]->elem2->bla -bool(false) -bool(false) -int(0) -object(SimpleXMLElement)#%d (0) { -} -===sxe->elem1[0]["attr1"] -bool(true) -bool(true) -int(0) -object(SimpleXMLElement)#%d (1) { - [0]=> - string(5) "first" -} -===sxe->elem1[0]->attr1 -bool(false) -bool(false) -int(0) -object(SimpleXMLElement)#%d (0) { -} -===sxe->elem1[1] -bool(true) -bool(true) -int(0) -object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(2) { - ["attr1"]=> - string(2) "11" - ["attr2"]=> - string(2) "12" - } -} -===sxe->elem1[2] -bool(false) -bool(false) -int(0) -NULL -===sxe->elem11 -bool(true) -bool(true) -int(1) -object(SimpleXMLElement)#%d (1) { - ["elem111"]=> - object(SimpleXMLElement)#%d (1) { - ["elem1111"]=> - object(SimpleXMLElement)#%d (0) { - } - } -} -===sxe->elem11->elem111 -bool(true) -bool(true) -int(1) -object(SimpleXMLElement)#%d (1) { - ["elem1111"]=> - object(SimpleXMLElement)#%d (0) { - } -} -===sxe->elem11->elem111->elem1111 -bool(true) -bool(true) -int(1) -object(SimpleXMLElement)#%d (0) { -} -===sxe->elem22 -bool(false) -bool(false) -int(0) -object(SimpleXMLElement)#%d (0) { -} -===sxe->elem22->elem222 -bool(false) -bool(false) -int(0) -NULL -===sxe->elem22->attr22 -bool(false) -bool(false) -int(0) -NULL -===sxe->elem22["attr22"] -bool(false) -bool(false) -int(0) -NULL -===DONE=== ---UEXPECTF-- -===sxe -bool(true) -bool(true) -int(3) object(SimpleXMLElement)#%d (3) { [u"@attributes"]=> array(1) { diff --git a/ext/simplexml/tests/001.phpt b/ext/simplexml/tests/001.phpt index b5c51ff960..993c8d5966 100644 --- a/ext/simplexml/tests/001.phpt +++ b/ext/simplexml/tests/001.phpt @@ -10,38 +10,6 @@ var_dump(simplexml_load_file(dirname(__FILE__).'/sxe.xml')); ?> ===DONE=== --EXPECTF-- -object(SimpleXMLElement)#%d (2) { - ["@attributes"]=> - array(1) { - ["id"]=> - string(5) "elem1" - } - ["elem1"]=> - object(SimpleXMLElement)#%d (3) { - ["@attributes"]=> - array(1) { - ["attr1"]=> - string(5) "first" - } - ["comment"]=> - object(SimpleXMLElement)#%d (0) { - } - ["elem2"]=> - object(SimpleXMLElement)#%d (1) { - ["elem3"]=> - object(SimpleXMLElement)#%d (1) { - ["elem4"]=> - object(SimpleXMLElement)#%d (1) { - ["test"]=> - object(SimpleXMLElement)#%d (0) { - } - } - } - } - } -} -===DONE=== ---UEXPECTF-- object(SimpleXMLElement)#%d (2) { [u"@attributes"]=> array(1) { diff --git a/ext/simplexml/tests/002.phpt b/ext/simplexml/tests/002.phpt index f761f3740b..74c90b63b9 100644 --- a/ext/simplexml/tests/002.phpt +++ b/ext/simplexml/tests/002.phpt @@ -31,38 +31,6 @@ var_dump($copy); ?> ===DONE=== --EXPECTF-- -object(SimpleXMLElement)#%d (2) { - ["@attributes"]=> - array(1) { - ["id"]=> - string(5) "elem1" - } - ["elem1"]=> - object(SimpleXMLElement)#%d (3) { - ["@attributes"]=> - array(1) { - ["attr1"]=> - string(5) "first" - } - ["comment"]=> - object(SimpleXMLElement)#%d (0) { - } - ["elem2"]=> - object(SimpleXMLElement)#%d (1) { - ["elem3"]=> - object(SimpleXMLElement)#%d (1) { - ["elem4"]=> - object(SimpleXMLElement)#%d (1) { - ["test"]=> - object(SimpleXMLElement)#%d (0) { - } - } - } - } - } -} -===DONE=== ---UEXPECTF-- object(SimpleXMLElement)#%d (2) { [u"@attributes"]=> array(1) { diff --git a/ext/simplexml/tests/003.phpt b/ext/simplexml/tests/003.phpt index 75376a1538..299b909582 100755 --- a/ext/simplexml/tests/003.phpt +++ b/ext/simplexml/tests/003.phpt @@ -31,43 +31,6 @@ var_dump(simplexml_load_string($xml)); ?> ===DONE=== --EXPECTF-- -object(SimpleXMLElement)#%d (2) { - ["@attributes"]=> - array(1) { - ["id"]=> - string(5) "elem1" - } - ["elem1"]=> - object(SimpleXMLElement)#%d (3) { - ["@attributes"]=> - array(1) { - ["attr1"]=> - string(5) "first" - } - ["comment"]=> - object(SimpleXMLElement)#%d (0) { - } - ["elem2"]=> - object(SimpleXMLElement)#%d (1) { - ["elem3"]=> - object(SimpleXMLElement)#%d (2) { - ["included-entity"]=> - object(SimpleXMLElement)#%d (1) { - ["included-entity"]=> - string(36) "This is text included from an entity" - } - ["elem4"]=> - object(SimpleXMLElement)#%d (1) { - ["test"]=> - object(SimpleXMLElement)#%d (0) { - } - } - } - } - } -} -===DONE=== ---UEXPECTF-- object(SimpleXMLElement)#%d (2) { [u"@attributes"]=> array(1) { diff --git a/ext/simplexml/tests/004.phpt b/ext/simplexml/tests/004.phpt index a94003422c..7776649090 100755 --- a/ext/simplexml/tests/004.phpt +++ b/ext/simplexml/tests/004.phpt @@ -34,39 +34,6 @@ var_dump(trim((string)$elem2)); ?> ===DONE=== --EXPECTF-- -object(SimpleXMLElement)#%d (2) { - ["@attributes"]=> - array(1) { - ["id"]=> - string(5) "elem1" - } - ["elem1"]=> - object(SimpleXMLElement)#%d (3) { - ["@attributes"]=> - array(1) { - ["attr1"]=> - string(5) "first" - } - ["comment"]=> - object(SimpleXMLElement)#%d (0) { - } - ["elem2"]=> - object(SimpleXMLElement)#%d (1) { - ["elem3"]=> - object(SimpleXMLElement)#%d (1) { - ["elem4"]=> - object(SimpleXMLElement)#%d (1) { - ["test"]=> - object(SimpleXMLElement)#%d (0) { - } - } - } - } - } -} -string(11) "CDATA block" -===DONE=== ---UEXPECTF-- object(SimpleXMLElement)#%d (2) { [u"@attributes"]=> array(1) { diff --git a/ext/simplexml/tests/005.phpt b/ext/simplexml/tests/005.phpt index 035d66b545..dc9bee84a3 100755 --- a/ext/simplexml/tests/005.phpt +++ b/ext/simplexml/tests/005.phpt @@ -34,11 +34,6 @@ echo "---Done---\n"; ?> --EXPECT-- -string(28) "Here we have some text data." -string(19) "And here some more." -string(15) "Wow once again." ----Done--- ---UEXPECT-- unicode(28) "Here we have some text data." unicode(19) "And here some more." unicode(15) "Wow once again." diff --git a/ext/simplexml/tests/006.phpt b/ext/simplexml/tests/006.phpt index b97b71f845..3700520afe 100755 --- a/ext/simplexml/tests/006.phpt +++ b/ext/simplexml/tests/006.phpt @@ -63,23 +63,6 @@ foreach($sxe->elem1 as $name => $data) { ===DONE=== --EXPECT-- -string(5) "elem1" -string(10) "Bla bla 1." -string(6) "elem11" -string(10) "Bla bla 2." -===CLONE=== -string(5) "elem1" -string(10) "Bla bla 1." -string(6) "elem11" -string(10) "Bla bla 2." -===ELEMENT=== -string(6) "elem11" -string(10) "Bla bla 2." -===COMMENT=== -string(5) "elem1" -string(10) "Bla bla 1." -===DONE=== ---UEXPECT-- unicode(5) "elem1" unicode(10) "Bla bla 1." unicode(6) "elem11" diff --git a/ext/simplexml/tests/007.phpt b/ext/simplexml/tests/007.phpt index 6708947790..ab9556cb4d 100755 --- a/ext/simplexml/tests/007.phpt +++ b/ext/simplexml/tests/007.phpt @@ -48,55 +48,6 @@ var_dump($a); ===Done=== --EXPECTF-- ===Property=== -object(SimpleXMLElement)#%d (3) { - ["@attributes"]=> - array(1) { - ["attr1"]=> - string(5) "first" - } - ["comment"]=> - object(SimpleXMLElement)#%d (0) { - } - ["elem2"]=> - object(SimpleXMLElement)#%d (1) { - ["elem3"]=> - object(SimpleXMLElement)#%d (1) { - ["elem4"]=> - object(SimpleXMLElement)#%d (1) { - ["test"]=> - object(SimpleXMLElement)#%d (0) { - } - } - } - } -} -===Array=== -object(SimpleXMLElement)#%d (1) { - [0]=> - string(5) "elem1" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(5) "first" -} -===Set=== -object(SimpleXMLElement)#%d (1) { - [0]=> - string(8) "Changed1" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(2) "12" -} -===Unset=== -NULL -NULL -===Misc.=== -int(4) -int(4) -===Done=== ---UEXPECTF-- -===Property=== object(SimpleXMLElement)#%d (3) { [u"@attributes"]=> array(1) { diff --git a/ext/simplexml/tests/008.phpt b/ext/simplexml/tests/008.phpt index 82dc783276..abc379053f 100644 --- a/ext/simplexml/tests/008.phpt +++ b/ext/simplexml/tests/008.phpt @@ -28,16 +28,6 @@ var_dump($sxe->xpath("elem1/elem2/elem3/elem4")); var_dump($sxe->xpath("***")); ?> --EXPECTF-- -array(1) { - [0]=> - object(SimpleXMLElement)#%d (1) { - ["test"]=> - object(SimpleXMLElement)#%d (0) { - } - } -} -bool(false) ---UEXPECTF-- array(1) { [0]=> object(SimpleXMLElement)#%d (1) { diff --git a/ext/simplexml/tests/009.phpt b/ext/simplexml/tests/009.phpt index d5cd99910e..6b71ccccfd 100755 --- a/ext/simplexml/tests/009.phpt +++ b/ext/simplexml/tests/009.phpt @@ -36,14 +36,6 @@ foreach($sxe->children() as $name=>$val) { ?> ===DONE=== --EXPECT-- -string(5) "elem1" -string(16) "SimpleXMLElement" -string(10) "Bla bla 1." -string(6) "elem11" -string(16) "SimpleXMLElement" -string(10) "Bla bla 2." -===DONE=== ---UEXPECT-- unicode(5) "elem1" unicode(16) "SimpleXMLElement" unicode(10) "Bla bla 1." diff --git a/ext/simplexml/tests/009b.phpt b/ext/simplexml/tests/009b.phpt index de3c522d3a..1d24da9cdd 100755 --- a/ext/simplexml/tests/009b.phpt +++ b/ext/simplexml/tests/009b.phpt @@ -21,19 +21,6 @@ var_dump($sxe->children()); ===DONE=== --EXPECTF-- -object(SimpleXMLElement)#%d (3) { - ["@attributes"]=> - array(1) { - ["id"]=> - string(5) "elem1" - } - ["elem1"]=> - string(10) "Bla bla 1." - ["elem11"]=> - string(10) "Bla bla 2." -} -===DONE=== ---UEXPECTF-- object(SimpleXMLElement)#%d (3) { [u"@attributes"]=> array(1) { diff --git a/ext/simplexml/tests/010.phpt b/ext/simplexml/tests/010.phpt index 0b4da340fc..eb28d7aab8 100644 --- a/ext/simplexml/tests/010.phpt +++ b/ext/simplexml/tests/010.phpt @@ -31,38 +31,6 @@ var_dump(simplexml_load_string($xml, 'simplexml_inherited')); ?> ===DONE=== --EXPECTF-- -object(simplexml_inherited)#%d (2) { - ["@attributes"]=> - array(1) { - ["id"]=> - string(5) "elem1" - } - ["elem1"]=> - object(simplexml_inherited)#%d (3) { - ["@attributes"]=> - array(1) { - ["attr1"]=> - string(5) "first" - } - ["comment"]=> - object(simplexml_inherited)#%d (0) { - } - ["elem2"]=> - object(simplexml_inherited)#%d (1) { - ["elem3"]=> - object(simplexml_inherited)#%d (1) { - ["elem4"]=> - object(simplexml_inherited)#%d (1) { - ["test"]=> - object(simplexml_inherited)#%d (0) { - } - } - } - } - } -} -===DONE=== ---UEXPECTF-- object(simplexml_inherited)#%d (2) { [u"@attributes"]=> array(1) { diff --git a/ext/simplexml/tests/013.phpt b/ext/simplexml/tests/013.phpt index 1ce464766c..ee100616d2 100755 --- a/ext/simplexml/tests/013.phpt +++ b/ext/simplexml/tests/013.phpt @@ -19,8 +19,5 @@ var_dump((string)$sxe); ?> ===DONE=== --EXPECT-- -string(6) "barbar" -===DONE=== ---UEXPECT-- unicode(6) "barbar" ===DONE=== diff --git a/ext/simplexml/tests/014.phpt b/ext/simplexml/tests/014.phpt index 0342ee972b..12196657b5 100644 --- a/ext/simplexml/tests/014.phpt +++ b/ext/simplexml/tests/014.phpt @@ -31,34 +31,6 @@ var_dump($people->person['age']); ?> ===DONE=== --EXPECTF-- -object(SimpleXMLElement)#%d (1) { - [0]=> - string(3) "Joe" -} -NULL -object(SimpleXMLElement)#%d (1) { - [0]=> - string(3) "XXX" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(2) "30" -} ----Unset:--- ----Unset?--- -NULL -bool(false) ----Unsupported--- -object(SimpleXMLElement)#%d (1) { - [0]=> - string(2) "30" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(2) "35" -} -===DONE=== ---UEXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> unicode(3) "Joe" diff --git a/ext/simplexml/tests/014a.phpt b/ext/simplexml/tests/014a.phpt index aa4eaa4ffb..4257c20a9a 100755 --- a/ext/simplexml/tests/014a.phpt +++ b/ext/simplexml/tests/014a.phpt @@ -30,31 +30,6 @@ var_dump($people->person[0]['age']); ?> ===DONE=== --EXPECTF-- -object(SimpleXMLElement)#%d (1) { - [0]=> - string(3) "Joe" -} -NULL -object(SimpleXMLElement)#%d (1) { - [0]=> - string(3) "XXX" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(2) "30" -} ----Unset:--- ----Unset?--- -NULL -bool(false) ----Unsupported--- -NULL -object(SimpleXMLElement)#%d (1) { - [0]=> - string(1) "5" -} -===DONE=== ---UEXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> unicode(3) "Joe" diff --git a/ext/simplexml/tests/014b.phpt b/ext/simplexml/tests/014b.phpt index 155dfa6db1..cd705973a1 100755 --- a/ext/simplexml/tests/014b.phpt +++ b/ext/simplexml/tests/014b.phpt @@ -30,30 +30,6 @@ var_dump($people->person[1]['age']); ?> ===DONE=== --EXPECTF-- -object(SimpleXMLElement)#%d (1) { - [0]=> - string(3) "Joe" -} -NULL -object(SimpleXMLElement)#%d (1) { - [0]=> - string(3) "XXX" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(2) "30" -} ----Unset:--- ----Unset?--- -NULL -bool(false) ----Unsupported--- -object(SimpleXMLElement)#%d (1) { - [0]=> - string(1) "5" -} -===DONE=== ---UEXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> unicode(3) "Joe" diff --git a/ext/simplexml/tests/015.phpt b/ext/simplexml/tests/015.phpt index 2b3f7d18ae..c26a014d74 100644 --- a/ext/simplexml/tests/015.phpt +++ b/ext/simplexml/tests/015.phpt @@ -37,24 +37,6 @@ var_dump($people->person[1]['name']); ?> ===DONE=== --EXPECTF-- -object(SimpleXMLElement)#%d (1) { - [0]=> - string(3) "Joe" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(3) "Joe" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(3) "Joe" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(3) "Boe" -} -===DONE=== ---UEXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> unicode(3) "Joe" diff --git a/ext/simplexml/tests/016.phpt b/ext/simplexml/tests/016.phpt index 529f515d0b..2ad0fe2462 100644 --- a/ext/simplexml/tests/016.phpt +++ b/ext/simplexml/tests/016.phpt @@ -29,33 +29,6 @@ var_dump($people->person[0]['name']); ?> ===DONE=== --EXPECTF-- -object(SimpleXMLElement)#%d (1) { - [0]=> - string(3) "Joe" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(6) "JoeFoo" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(9) "JoeFooBar" -} ----[0]--- -object(SimpleXMLElement)#%d (1) { - [0]=> - string(3) "Joe" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(6) "JoeFoo" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(9) "JoeFooBar" -} -===DONE=== ---UEXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> unicode(3) "Joe" diff --git a/ext/simplexml/tests/016a.phpt b/ext/simplexml/tests/016a.phpt index 6ef8d917d9..f67c7bd225 100755 --- a/ext/simplexml/tests/016a.phpt +++ b/ext/simplexml/tests/016a.phpt @@ -18,16 +18,6 @@ var_dump($people->person['name']); ?> ===DONE=== --EXPECTF-- -object(SimpleXMLElement)#%d (1) { - [0]=> - string(3) "Foo" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(6) "FooBar" -} -===DONE=== ---UEXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> unicode(3) "Foo" diff --git a/ext/simplexml/tests/019.phpt b/ext/simplexml/tests/019.phpt index d69ba5f658..43c3ef467b 100755 --- a/ext/simplexml/tests/019.phpt +++ b/ext/simplexml/tests/019.phpt @@ -62,23 +62,6 @@ foreach($sxe->elem1->children() as $name => $data) { ?> ===DONE=== --EXPECT-- -string(5) "elem1" -string(10) "Bla bla 1." -string(6) "elem11" -string(10) "Bla bla 2." -===CLONE=== -string(5) "elem1" -string(10) "Bla bla 1." -string(6) "elem11" -string(10) "Bla bla 2." -===ELEMENT=== -string(7) "elem111" -string(7) "Foo Bar" -===COMMENT=== -string(5) "elem2" -string(28) "Here we have some text data." -===DONE=== ---UEXPECT-- unicode(5) "elem1" unicode(10) "Bla bla 1." unicode(6) "elem11" diff --git a/ext/simplexml/tests/022.phpt b/ext/simplexml/tests/022.phpt index a3586f1b39..13427e229d 100755 --- a/ext/simplexml/tests/022.phpt +++ b/ext/simplexml/tests/022.phpt @@ -29,39 +29,6 @@ foreach($sxe->content->file as $file) ===DONE=== --EXPECTF-- ===CONTENT=== -object(SimpleXMLElement)#%d (1) { - ["file"]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["glob"]=> - string(11) "slide_*.xml" - } - } -} -===FILE=== -object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["glob"]=> - string(11) "slide_*.xml" - } -} -===FOREACH=== -object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["glob"]=> - string(11) "slide_*.xml" - } -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(11) "slide_*.xml" -} -===DONE=== ---UEXPECTF-- -===CONTENT=== object(SimpleXMLElement)#%d (1) { [u"file"]=> object(SimpleXMLElement)#%d (1) { diff --git a/ext/simplexml/tests/023.phpt b/ext/simplexml/tests/023.phpt index 1aa47b3be4..5c2af8ba46 100755 --- a/ext/simplexml/tests/023.phpt +++ b/ext/simplexml/tests/023.phpt @@ -22,19 +22,6 @@ var_dump($sxe['attr']); ?> ===DONE=== --EXPECTF-- -object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr"]=> - string(%d) "foo%sbar%sbaz" - } -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(%d) "foo%sbar%sbaz" -} -===DONE=== ---UEXPECTF-- object(SimpleXMLElement)#%d (1) { [u"@attributes"]=> array(1) { diff --git a/ext/simplexml/tests/024.phpt b/ext/simplexml/tests/024.phpt index 7cbe3d43e1..0fef858804 100755 --- a/ext/simplexml/tests/024.phpt +++ b/ext/simplexml/tests/024.phpt @@ -33,148 +33,6 @@ test('elem[2]/@attr2'); ===DONE=== --EXPECTF-- ===elem/@attr2=== -array(3) { - [0]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr2"]=> - string(2) "12" - } - } - [1]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr2"]=> - string(2) "22" - } - } - [2]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr2"]=> - string(2) "32" - } - } -} -===//@attr2=== -array(3) { - [0]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr2"]=> - string(2) "12" - } - } - [1]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr2"]=> - string(2) "22" - } - } - [2]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr2"]=> - string(2) "32" - } - } -} -===//@*=== -array(9) { - [0]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr1"]=> - string(2) "11" - } - } - [1]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr2"]=> - string(2) "12" - } - } - [2]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr3"]=> - string(2) "13" - } - } - [3]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr1"]=> - string(2) "21" - } - } - [4]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr2"]=> - string(2) "22" - } - } - [5]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr3"]=> - string(2) "23" - } - } - [6]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr1"]=> - string(2) "31" - } - } - [7]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr2"]=> - string(2) "32" - } - } - [8]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr3"]=> - string(2) "33" - } - } -} -===elem[2]/@attr2=== -array(1) { - [0]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["attr2"]=> - string(2) "22" - } - } -} -===DONE=== ---UEXPECTF-- -===elem/@attr2=== array(3) { [0]=> object(SimpleXMLElement)#%d (1) { diff --git a/ext/simplexml/tests/025.phpt b/ext/simplexml/tests/025.phpt index e763d6e22e..119cb76b0b 100755 --- a/ext/simplexml/tests/025.phpt +++ b/ext/simplexml/tests/025.phpt @@ -49,48 +49,6 @@ var_dump($sxe->getDocNamespaces()); ===DONE=== --EXPECTF-- -array(1) { - ["xhtml"]=> - string(31) "http://www.w3.org/TR/REC-html40" -} -array(3) { - ["xhtml"]=> - string(31) "http://www.w3.org/TR/REC-html40" - ["html"]=> - string(28) "http://www.w3.org/1999/xhtml" - ["foo"]=> - string(6) "foobar" -} -array(2) { - ["html"]=> - string(28) "http://www.w3.org/1999/xhtml" - ["xhtml"]=> - string(31) "http://www.w3.org/TR/REC-html40" -} -array(4) { - ["html"]=> - string(28) "http://www.w3.org/1999/xhtml" - ["xhtml"]=> - string(31) "http://www.w3.org/TR/REC-html40" - ["foo"]=> - string(6) "foobar" - ["baz"]=> - string(9) "foobarbaz" -} -array(1) { - [""]=> - string(28) "http://www.w3.org/1999/xhtml" -} -array(1) { - [""]=> - string(28) "http://www.w3.org/1999/xhtml" -} -array(0) { -} -array(0) { -} -===DONE=== ---UEXPECTF-- array(1) { [u"xhtml"]=> unicode(31) "http://www.w3.org/TR/REC-html40" diff --git a/ext/simplexml/tests/029.phpt b/ext/simplexml/tests/029.phpt index 0a2fe0e429..f1c5844eda 100755 --- a/ext/simplexml/tests/029.phpt +++ b/ext/simplexml/tests/029.phpt @@ -28,17 +28,6 @@ foreach($people as $person) ?> ===DONE=== --EXPECTF-- -string(3) "Joe" -int(3) -int(0) -string(4) "John" -int(3) -int(1) -string(4) "Jane" -int(3) -int(0) -===DONE=== ---UEXPECTF-- unicode(3) "Joe" int(3) int(0) diff --git a/ext/simplexml/tests/031.phpt b/ext/simplexml/tests/031.phpt index e2816fa207..bc5a897f86 100644 --- a/ext/simplexml/tests/031.phpt +++ b/ext/simplexml/tests/031.phpt @@ -45,17 +45,6 @@ echo $sxe->asXML(); ?> ===DONE=== --EXPECTF-- -Warning: SimpleXMLElement::addAttribute(): Attribute already exists in %s031.php on line %d - -Warning: SimpleXMLElement::addChild(): Cannot add element to attributes in %s031.php on line %d - - - test - test 2 - -myvalmyvalmyvalmyvalmyval -===DONE=== ---UEXPECTF-- Warning: SimpleXMLElement::addAttribute(): Attribute already exists in %s on line %d Warning: SimpleXMLElement::addChild(): Cannot add element to attributes in %s on line %d diff --git a/ext/simplexml/tests/033.phpt b/ext/simplexml/tests/033.phpt index 761374424b..5078a4b1e0 100755 --- a/ext/simplexml/tests/033.phpt +++ b/ext/simplexml/tests/033.phpt @@ -43,105 +43,6 @@ int(0) int(0) float(0) float(0) -string(0) "" -string(15) " -test - - - -" -array(0) { -} -array(1) { - ["person"]=> - array(3) { - [0]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["name"]=> - string(3) "Joe" - } - } - [1]=> - object(SimpleXMLElement)#%d (2) { - ["@attributes"]=> - array(1) { - ["name"]=> - string(4) "John" - } - ["children"]=> - object(SimpleXMLElement)#%d (1) { - ["person"]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["name"]=> - string(3) "Joe" - } - } - } - } - [2]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["name"]=> - string(4) "Jane" - } - } - } -} -object(SimpleXMLElement)#%d (0) { -} -object(SimpleXMLElement)#%d (1) { - ["person"]=> - array(3) { - [0]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["name"]=> - string(3) "Joe" - } - } - [1]=> - object(SimpleXMLElement)#%d (2) { - ["@attributes"]=> - array(1) { - ["name"]=> - string(4) "John" - } - ["children"]=> - object(SimpleXMLElement)#%d (1) { - ["person"]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["name"]=> - string(3) "Joe" - } - } - } - } - [2]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["name"]=> - string(4) "Jane" - } - } - } -} -===DONE=== ---UEXPECTF-- -bool(false) -bool(true) -int(0) -int(0) -float(0) -float(0) unicode(0) "" unicode(15) " test diff --git a/ext/simplexml/tests/bug36611.phpt b/ext/simplexml/tests/bug36611.phpt index 23ff73204c..a13847c43a 100644 --- a/ext/simplexml/tests/bug36611.phpt +++ b/ext/simplexml/tests/bug36611.phpt @@ -30,9 +30,3 @@ int(1) Strict Standards: Creating default object from empty value in %s on line %d int(1) Done ---UEXPECTF-- -int(1) - -Strict Standards: Creating default object from empty value in %s on line %d -int(1) -Done diff --git a/ext/simplexml/tests/bug38406.phpt b/ext/simplexml/tests/bug38406.phpt index b449b82955..399b724592 100644 --- a/ext/simplexml/tests/bug38406.phpt +++ b/ext/simplexml/tests/bug38406.phpt @@ -18,20 +18,6 @@ $item->$a = new stdclass; echo "Done\n"; ?> --EXPECTF-- -object(SimpleXMLElement)#%d (1) { - [0]=> - string(9) "something" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(9) "something" -} - -Notice: Array to string conversion in %s on line %d - -Warning: It is not yet possible to assign complex types to properties in %s on line %d -Done ---UEXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> unicode(9) "something" diff --git a/ext/simplexml/tests/bug39662.phpt b/ext/simplexml/tests/bug39662.phpt index b3ef25c89f..b4ab97d5a4 100644 --- a/ext/simplexml/tests/bug39662.phpt +++ b/ext/simplexml/tests/bug39662.phpt @@ -19,23 +19,6 @@ var_dump($clone->asXML()); echo "Done\n"; ?> --EXPECTF-- -object(SimpleXMLElement)#%d (1) { - [0]=> - string(2) " - -" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(2) " - -" -} -string(15) " - -" -Done ---UEXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> unicode(2) " diff --git a/ext/simplexml/tests/bug39760.phpt b/ext/simplexml/tests/bug39760.phpt index c91e29c999..bf4f329823 100644 --- a/ext/simplexml/tests/bug39760.phpt +++ b/ext/simplexml/tests/bug39760.phpt @@ -25,21 +25,6 @@ var_dump($test3); echo "Done\n"; ?> --EXPECTF-- -object(SimpleXMLElement)#%d (1) { - [0]=> - string(5) "text1" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(5) "text1" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(5) "text1" -} -Done - ---UEXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> unicode(5) "text1" diff --git a/ext/simplexml/tests/profile11.phpt b/ext/simplexml/tests/profile11.phpt index adad1b6783..5370c45520 100644 --- a/ext/simplexml/tests/profile11.phpt +++ b/ext/simplexml/tests/profile11.phpt @@ -20,20 +20,6 @@ var_dump($root->child); ?> ===DONE=== --EXPECTF-- -object(SimpleXMLElement)#%d (1) { - [0]=> - string(5) "Hello" -} -object(SimpleXMLElement)#%d (1) { - [0]=> - string(5) "World" -} -string(5) "Hello" -string(5) "World" -object(SimpleXMLElement)#%d (0) { -} -===DONE=== ---UEXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> unicode(5) "Hello" diff --git a/ext/simplexml/tests/profile12.phpt b/ext/simplexml/tests/profile12.phpt index 607aa6aa5d..d3bfb8ef3a 100755 --- a/ext/simplexml/tests/profile12.phpt +++ b/ext/simplexml/tests/profile12.phpt @@ -32,47 +32,6 @@ var_dump($sxe->Body->children('')->businessList); ?> ===DONE=== --EXPECTF-- -array(1) { - ["soap"]=> - string(41) "http://schemas.xmlsoap.org/soap/envelope/" -} -object(SimpleXMLElement)#%s (0) { -} -object(SimpleXMLElement)#%s (1) { - ["businessList"]=> - object(SimpleXMLElement)#%s (2) { - ["@attributes"]=> - array(1) { - ["foo"]=> - string(3) "bar" - } - ["businessInfo"]=> - object(SimpleXMLElement)#%s (1) { - ["@attributes"]=> - array(1) { - ["businessKey"]=> - string(3) "bla" - } - } - } -} -object(SimpleXMLElement)#%s (2) { - ["@attributes"]=> - array(1) { - ["foo"]=> - string(3) "bar" - } - ["businessInfo"]=> - object(SimpleXMLElement)#%s (1) { - ["@attributes"]=> - array(1) { - ["businessKey"]=> - string(3) "bla" - } - } -} -===DONE=== ---UEXPECTF-- array(1) { [u"soap"]=> unicode(41) "http://schemas.xmlsoap.org/soap/envelope/" diff --git a/ext/simplexml/tests/profile13.phpt b/ext/simplexml/tests/profile13.phpt index bbea002984..f9fa8f2fb1 100755 --- a/ext/simplexml/tests/profile13.phpt +++ b/ext/simplexml/tests/profile13.phpt @@ -32,48 +32,6 @@ var_dump($sxe->Body->children('')->businessList); ===DONE=== --EXPECTF-- -object(SimpleXMLElement)#%d (1) { - ["Body"]=> - object(SimpleXMLElement)#%d (0) { - } -} -object(SimpleXMLElement)#%d (0) { -} -object(SimpleXMLElement)#%d (1) { - ["businessList"]=> - object(SimpleXMLElement)#%d (2) { - ["@attributes"]=> - array(1) { - ["foo"]=> - string(3) "bar" - } - ["businessInfo"]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["businessKey"]=> - string(3) "bla" - } - } - } -} -object(SimpleXMLElement)#%d (2) { - ["@attributes"]=> - array(1) { - ["foo"]=> - string(3) "bar" - } - ["businessInfo"]=> - object(SimpleXMLElement)#%d (1) { - ["@attributes"]=> - array(1) { - ["businessKey"]=> - string(3) "bla" - } - } -} -===DONE=== ---UEXPECTF-- object(SimpleXMLElement)#%d (1) { [u"Body"]=> object(SimpleXMLElement)#%d (0) { -- 2.40.0