diff options
Diffstat (limited to 'tests')
236 files changed, 420 insertions, 2162 deletions
diff --git a/tests/basic/013.phpt b/tests/basic/013.phpt index 703a0a13bd..38ebd9b3f4 100644 --- a/tests/basic/013.phpt +++ b/tests/basic/013.phpt @@ -11,10 +11,5 @@ var_dump($_POST['a']); --EXPECT-- array(1) { [0]=> - string(1) "1" -} ---UEXPECT-- -array(1) { - [0]=> unicode(1) "1" } diff --git a/tests/basic/014.phpt b/tests/basic/014.phpt index e1d0da7437..f7dd4217d2 100644 --- a/tests/basic/014.phpt +++ b/tests/basic/014.phpt @@ -11,13 +11,6 @@ var_dump($_POST['a']); --EXPECT-- array(2) { [0]=> - string(1) "1" - [1]=> - string(1) "1" -} ---UEXPECT-- -array(2) { - [0]=> unicode(1) "1" [1]=> unicode(1) "1" diff --git a/tests/basic/015.phpt b/tests/basic/015.phpt index 3429756d04..a6ca5d66fd 100644 --- a/tests/basic/015.phpt +++ b/tests/basic/015.phpt @@ -11,10 +11,5 @@ var_dump($_POST['a']); --EXPECT-- array(1) { [0]=> - string(1) "5" -} ---UEXPECT-- -array(1) { - [0]=> unicode(1) "5" } diff --git a/tests/basic/016.phpt b/tests/basic/016.phpt index 3440d85be3..c151634078 100644 --- a/tests/basic/016.phpt +++ b/tests/basic/016.phpt @@ -10,13 +10,6 @@ var_dump($_POST['a']); ?> --EXPECT-- array(2) { - ["a"]=> - string(1) "1" - ["b"]=> - string(1) "3" -} ---UEXPECT-- -array(2) { [u"a"]=> unicode(1) "1" [u"b"]=> diff --git a/tests/basic/017.phpt b/tests/basic/017.phpt index d34d28fd24..baac17889c 100644 --- a/tests/basic/017.phpt +++ b/tests/basic/017.phpt @@ -11,15 +11,6 @@ var_dump($_POST['a']); --EXPECT-- array(3) { [0]=> - string(1) "1" - ["a"]=> - string(1) "1" - ["b"]=> - string(1) "3" -} ---UEXPECT-- -array(3) { - [0]=> unicode(1) "1" [u"a"]=> unicode(1) "1" diff --git a/tests/basic/018.phpt b/tests/basic/018.phpt index 1c78ddf00f..da403b1d1a 100644 --- a/tests/basic/018.phpt +++ b/tests/basic/018.phpt @@ -14,31 +14,6 @@ array(2) { [0]=> array(1) { [0]=> - string(1) "1" - } - [1]=> - array(1) { - [0]=> - string(1) "3" - } -} -array(1) { - ["a"]=> - array(1) { - ["b"]=> - array(2) { - ["c"]=> - string(1) "1" - ["d"]=> - string(1) "1" - } - } -} ---UEXPECT-- -array(2) { - [0]=> - array(1) { - [0]=> unicode(1) "1" } [1]=> diff --git a/tests/basic/019.phpt b/tests/basic/019.phpt index 1f1ee14b4f..6deab51446 100644 --- a/tests/basic/019.phpt +++ b/tests/basic/019.phpt @@ -11,15 +11,6 @@ var_dump($_POST['a']); --EXPECT-- array(3) { [0]=> - string(1) "1" - [1]=> - string(1) "3" - ["["]=> - string(1) "4" -} ---UEXPECT-- -array(3) { - [0]=> unicode(1) "1" [1]=> unicode(1) "3" diff --git a/tests/basic/020.phpt b/tests/basic/020.phpt index 9091bfde80..b105818a45 100644 --- a/tests/basic/020.phpt +++ b/tests/basic/020.phpt @@ -10,13 +10,6 @@ var_dump($_POST['a']); ?> --EXPECT-- array(2) { - ["a["]=> - string(1) "1" - ["b["]=> - string(1) "3" -} ---UEXPECT-- -array(2) { [u"a["]=> unicode(1) "1" [u"b["]=> diff --git a/tests/basic/022.phpt b/tests/basic/022.phpt index 64e424f627..b3cdadd571 100644 --- a/tests/basic/022.phpt +++ b/tests/basic/022.phpt @@ -1,36 +1,13 @@ --TEST-- Cookies test#1 --COOKIE-- -cookie1=val1 ; cookie2=val2%20; cookie3=val 3.; cookie 4= value 4 %3B; cookie1=bogus; %20cookie1=ignore;+cookie1=ignore;cookie1;cookie 5=%20 value; cookie%206=þæö;cookie+7=;$cookie.8;cookie-9=1;;;- & % $cookie 10=10 +cookie1=val1 ; cookie2=val2%20; cookie3=val 3.; cookie 4= value 4 %3B; cookie1=bogus; %20cookie1=ignore;+cookie1=ignore;cookie1;cookie 5=%20 value; cookie%206=þæö;cookie+7=;$cookie.8;cookie-9=1;;;- & % $cookie 10=10 --FILE-- <?php var_dump($_COOKIE); ?> --EXPECT-- array(10) { - ["cookie1"]=> - string(6) "val1 " - ["cookie2"]=> - string(5) "val2 " - ["cookie3"]=> - string(6) "val 3." - ["cookie_4"]=> - string(10) " value 4 ;" - ["cookie__5"]=> - string(7) " value" - ["cookie_6"]=> - string(3) "þæö" - ["cookie_7"]=> - string(0) "" - ["$cookie_8"]=> - string(0) "" - ["cookie-9"]=> - string(1) "1" - ["-_&_%_$cookie_10"]=> - string(2) "10" -} ---UEXPECTF-- -array(10) { [u"cookie1"]=> unicode(0) "" [u"cookie2"]=> diff --git a/tests/basic/023.phpt b/tests/basic/023.phpt index d6894b52eb..ece28b78d2 100644 --- a/tests/basic/023.phpt +++ b/tests/basic/023.phpt @@ -8,15 +8,6 @@ var_dump($_COOKIE); ?> --EXPECT-- array(3) { - ["c_o_o_k_i_e"]=> - string(5) "value" - ["name"]=> - string(24) ""value","value",UEhQIQ==" - ["UEhQIQ"]=> - string(4) "=foo" -} ---UEXPECT-- -array(3) { [u"c_o_o_k_i_e"]=> unicode(1) "v" [u"name"]=> diff --git a/tests/basic/024.phpt b/tests/basic/024.phpt index 19d016b974..7484a11adb 100644 --- a/tests/basic/024.phpt +++ b/tests/basic/024.phpt @@ -13,23 +13,6 @@ var_dump($_POST, $HTTP_RAW_POST_DATA); ?> --EXPECT-- array(3) { - ["a"]=> - string(3) "ABC" - ["y"]=> - string(3) "XYZ" - ["c"]=> - array(3) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - ["a"]=> - string(1) "3" - } -} -string(30) "a=ABC&y=XYZ&c[]=1&c[]=2&c[a]=3" ---UEXPECT-- -array(3) { [u"a"]=> unicode(3) "ABC" [u"y"]=> diff --git a/tests/basic/026.phpt b/tests/basic/026.phpt index 8666554b8e..6f90f6a33d 100644 --- a/tests/basic/026.phpt +++ b/tests/basic/026.phpt @@ -15,8 +15,4 @@ var_dump($_POST, $HTTP_RAW_POST_DATA); --EXPECT-- array(0) { } -string(9) "a=1&b=ZYX" ---UEXPECT-- -array(0) { -} unicode(9) "a=1&b=ZYX" diff --git a/tests/basic/027.phpt b/tests/basic/027.phpt index f4925c69e7..a23fc494ea 100644 --- a/tests/basic/027.phpt +++ b/tests/basic/027.phpt @@ -17,24 +17,6 @@ var_dump($_POST, $php_errormsg); ?> --EXPECT-- array(4) { - ["a"]=> - string(1) "1" - ["b"]=> - string(3) "ZYX" - ["d"]=> - string(3) "123" - ["e"]=> - array(1) { - [0]=> - array(1) { - [0]=> - string(1) "3" - } - } -} -string(106) "Input variable nesting level exceeded 10. To increase the limit change max_input_nesting_level in php.ini." ---UEXPECT-- -array(4) { [u"a"]=> unicode(1) "1" [u"b"]=> diff --git a/tests/basic/bug29971.phpt b/tests/basic/bug29971.phpt index fdbee8fd46..369928f0e0 100755 --- a/tests/basic/bug29971.phpt +++ b/tests/basic/bug29971.phpt @@ -13,10 +13,4 @@ array(0) { } array(0) { } -string(3) "GPC" ---UEXPECT-- -array(0) { -} -array(0) { -} unicode(3) "GPC" diff --git a/tests/classes/__call_001.phpt b/tests/classes/__call_001.phpt index ecc98744bf..f87cf91aad 100644 --- a/tests/classes/__call_001.phpt +++ b/tests/classes/__call_001.phpt @@ -26,26 +26,6 @@ array(4) { [0]=> int(1) [1]=> - string(1) "2" - [2]=> - float(3.4) - [3]=> - bool(true) -} -array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) -} ---UEXPECT-- -Method test called: -array(4) { - [0]=> - int(1) - [1]=> unicode(1) "2" [2]=> float(3.4) diff --git a/tests/classes/__call_003.phpt b/tests/classes/__call_003.phpt index 6f6b305cf5..b86640a66c 100644 --- a/tests/classes/__call_003.phpt +++ b/tests/classes/__call_003.phpt @@ -21,16 +21,7 @@ Force pass-by-reference to __call var_dump($a, $b); ?> ---EXPECTF-- -array(1) { - [0]=> - string(8) "original" -} -array(1) { - [0]=> - &string(7) "changed" -} ---UEXPECTF-- +--EXPECT-- array(1) { [0]=> unicode(8) "original" @@ -38,4 +29,4 @@ array(1) { array(1) { [0]=> &unicode(7) "changed" -}
\ No newline at end of file +} diff --git a/tests/classes/__call_004.phpt b/tests/classes/__call_004.phpt index 2072112a02..a9997bf132 100644 --- a/tests/classes/__call_004.phpt +++ b/tests/classes/__call_004.phpt @@ -26,7 +26,7 @@ class B extends A { $b = new B(); $b->test(); ?> ---EXPECTF-- +--EXPECT-- In B::__call(test1, array(1,a)) object(B)#1 (0) { } @@ -38,4 +38,4 @@ object(B)#1 (0) { } In B::__call(test4, array(1,a)) object(B)#1 (0) { -}
\ No newline at end of file +} diff --git a/tests/classes/__call_005.phpt b/tests/classes/__call_005.phpt index c82a853f72..b5b7705769 100644 --- a/tests/classes/__call_005.phpt +++ b/tests/classes/__call_005.phpt @@ -21,7 +21,7 @@ class B extends A { $b = new B(); $b->test(); ?> ---EXPECTF-- +--EXPECT-- In A::__call(test1, array(1,a)) object(B)#1 (0) { } @@ -33,4 +33,4 @@ object(B)#1 (0) { } In A::__call(test4, array(1,a)) object(B)#1 (0) { -}
\ No newline at end of file +} diff --git a/tests/classes/__set__get_001.phpt b/tests/classes/__set__get_001.phpt index 105419e33e..69968c3450 100644 --- a/tests/classes/__set__get_001.phpt +++ b/tests/classes/__set__get_001.phpt @@ -23,7 +23,7 @@ class setter { function __set($nm, $val) { echo "Setting [$nm] to $val\n"; - + if (isset($this->x[$nm])) { $this->x[$nm] = $val; echo "OK!\n"; @@ -58,30 +58,6 @@ Nothing! Setting [z] to 1 Not OK! object(setter)#%d (2) { - ["n"]=> - int(1) - ["x"]=> - array(3) { - ["a"]=> - int(101) - ["b"]=> - int(2) - ["c"]=> - int(3) - } -} ---UEXPECTF-- -Setting [a] to 100 -OK! -Getting [a] -Returning: 100 -Setting [a] to 101 -OK! -Getting [z] -Nothing! -Setting [z] to 1 -Not OK! -object(setter)#%d (2) { [u"n"]=> int(1) [u"x"]=> diff --git a/tests/classes/__set__get_004.phpt b/tests/classes/__set__get_004.phpt index b739428f33..80a2f334d9 100755 --- a/tests/classes/__set__get_004.phpt +++ b/tests/classes/__set__get_004.phpt @@ -34,10 +34,6 @@ var_dump($foo->bar->baz); ?> ===DONE=== --EXPECT-- -string(5) "Check" -string(5) "Check" -===DONE=== ---UEXPECT-- unicode(5) "Check" unicode(5) "Check" ===DONE=== diff --git a/tests/classes/__set__get_005.phpt b/tests/classes/__set__get_005.phpt index 34fd567bfd..c169209823 100755 --- a/tests/classes/__set__get_005.phpt +++ b/tests/classes/__set__get_005.phpt @@ -56,21 +56,6 @@ AutoGen::__get Test::__set AutoGen::__get object(Test)#%d (1) { - ["x":protected]=> - array(1) { - ["baz"]=> - string(5) "Check" - } -} -AutoGen::__get -Test::__get -string(5) "Check" -===DONE=== ---UEXPECTF-- -AutoGen::__get -Test::__set -AutoGen::__get -object(Test)#%d (1) { [u"x":protected]=> array(1) { [u"baz"]=> diff --git a/tests/classes/array_access_001.phpt b/tests/classes/array_access_001.phpt index 68263b3201..a56e139946 100644 --- a/tests/classes/array_access_001.phpt +++ b/tests/classes/array_access_001.phpt @@ -86,119 +86,6 @@ var_dump($obj->a); --EXPECTF-- array(4) { [0]=> - string(3) "1st" - [1]=> - int(1) - [2]=> - string(3) "3rd" - ["4th"]=> - int(4) -} -===EMPTY=== -object::offsetExists(0) -object::offsetGet(0) -bool(false) -object::offsetExists(1) -object::offsetGet(1) -bool(false) -object::offsetExists(2) -object::offsetGet(2) -bool(false) -object::offsetExists(4th) -object::offsetGet(4th) -bool(false) -object::offsetExists(5th) -bool(true) -object::offsetExists(6) -bool(true) -===isset=== -object::offsetExists(0) -bool(true) -object::offsetExists(1) -bool(true) -object::offsetExists(2) -bool(true) -object::offsetExists(4th) -bool(true) -object::offsetExists(5th) -bool(false) -object::offsetExists(6) -bool(false) -===offsetGet=== -object::offsetGet(0) -string(3) "1st" -object::offsetGet(1) -int(1) -object::offsetGet(2) -string(3) "3rd" -object::offsetGet(4th) -int(4) -object::offsetGet(5th) - -Notice: Undefined index: 5th in %sarray_access_001.php on line %d -NULL -object::offsetGet(6) - -Notice: Undefined offset: 6 in %sarray_access_001.php on line %d -NULL -===offsetSet=== -WRITE 1 -object::offsetSet(1,Changed 1) -object::offsetGet(1) -string(9) "Changed 1" -WRITE 2 -object::offsetSet(4th,Changed 4th) -object::offsetGet(4th) -string(11) "Changed 4th" -WRITE 3 -object::offsetSet(5th,Added 5th) -object::offsetGet(5th) -string(9) "Added 5th" -WRITE 4 -object::offsetSet(6,Added 6) -object::offsetGet(6) -string(7) "Added 6" -object::offsetGet(0) -string(3) "1st" -object::offsetGet(2) -string(3) "3rd" -object::offsetSet(6,changed 6) -object::offsetGet(6) -string(9) "changed 6" -string(9) "changed 6" -===unset=== -array(6) { - [0]=> - string(3) "1st" - [1]=> - string(9) "Changed 1" - [2]=> - string(3) "3rd" - ["4th"]=> - string(11) "Changed 4th" - ["5th"]=> - string(9) "Added 5th" - [6]=> - string(9) "changed 6" -} -object::offsetUnset(2) -object::offsetUnset(4th) -object::offsetUnset(7) -object::offsetUnset(8th) -array(4) { - [0]=> - string(3) "1st" - [1]=> - string(9) "Changed 1" - ["5th"]=> - string(9) "Added 5th" - [6]=> - string(9) "changed 6" -} -===DONE=== ---UEXPECTF-- -array(4) { - [0]=> unicode(3) "1st" [1]=> int(1) diff --git a/tests/classes/array_access_002.phpt b/tests/classes/array_access_002.phpt index aa1fd799d6..70e5144100 100644 --- a/tests/classes/array_access_002.phpt +++ b/tests/classes/array_access_002.phpt @@ -86,119 +86,6 @@ var_dump($obj->a); --EXPECTF-- array(4) { [0]=> - string(3) "1st" - [1]=> - int(1) - [2]=> - string(3) "3rd" - ["4th"]=> - int(4) -} -===EMPTY=== -object::offsetExists(0) -object::offsetGet(0) -bool(false) -object::offsetExists(1) -object::offsetGet(1) -bool(false) -object::offsetExists(2) -object::offsetGet(2) -bool(false) -object::offsetExists(4th) -object::offsetGet(4th) -bool(false) -object::offsetExists(5th) -bool(true) -object::offsetExists(6) -bool(true) -===isset=== -object::offsetExists(0) -bool(true) -object::offsetExists(1) -bool(true) -object::offsetExists(2) -bool(true) -object::offsetExists(4th) -bool(true) -object::offsetExists(5th) -bool(false) -object::offsetExists(6) -bool(false) -===offsetGet=== -object::offsetGet(0) -string(3) "1st" -object::offsetGet(1) -int(1) -object::offsetGet(2) -string(3) "3rd" -object::offsetGet(4th) -int(4) -object::offsetGet(5th) - -Notice: Undefined index: 5th in %sarray_access_002.php on line %d -NULL -object::offsetGet(6) - -Notice: Undefined offset: 6 in %sarray_access_002.php on line %d -NULL -===offsetSet=== -WRITE 1 -object::offsetSet(1,Changed 1) -object::offsetGet(1) -string(9) "Changed 1" -WRITE 2 -object::offsetSet(4th,Changed 4th) -object::offsetGet(4th) -string(11) "Changed 4th" -WRITE 3 -object::offsetSet(5th,Added 5th) -object::offsetGet(5th) -string(9) "Added 5th" -WRITE 4 -object::offsetSet(6,Added 6) -object::offsetGet(6) -string(7) "Added 6" -object::offsetGet(0) -string(3) "1st" -object::offsetGet(2) -string(3) "3rd" -object::offsetSet(6,changed 6) -object::offsetGet(6) -string(9) "changed 6" -string(9) "changed 6" -===unset=== -array(6) { - [0]=> - string(3) "1st" - [1]=> - string(9) "Changed 1" - [2]=> - string(3) "3rd" - ["4th"]=> - string(11) "Changed 4th" - ["5th"]=> - string(9) "Added 5th" - [6]=> - string(9) "changed 6" -} -object::offsetUnset(2) -object::offsetUnset(4th) -object::offsetUnset(7) -object::offsetUnset(8th) -array(4) { - [0]=> - string(3) "1st" - [1]=> - string(9) "Changed 1" - ["5th"]=> - string(9) "Added 5th" - [6]=> - string(9) "changed 6" -} -===DONE=== ---UEXPECTF-- -array(4) { - [0]=> unicode(3) "1st" [1]=> int(1) diff --git a/tests/classes/array_access_003.phpt b/tests/classes/array_access_003.phpt index ae7b3bdaa1..ade9f205ab 100644 --- a/tests/classes/array_access_003.phpt +++ b/tests/classes/array_access_003.phpt @@ -48,17 +48,6 @@ var_dump($obj[2]); ===DONE=== --EXPECTF-- object::offsetGet(1) -string(6) "fooBar" -object::offsetGet(2) -int(1) -object::offsetGet(2) - -Notice: Indirect modification of overloaded element of object has no effect in %sarray_access_003.php on line 39 -object::offsetGet(2) -int(1) -===DONE=== ---UEXPECTF-- -object::offsetGet(1) unicode(6) "fooBar" object::offsetGet(2) int(1) diff --git a/tests/classes/array_access_004.phpt b/tests/classes/array_access_004.phpt index 6c324edc92..8c523921b8 100644 --- a/tests/classes/array_access_004.phpt +++ b/tests/classes/array_access_004.phpt @@ -46,17 +46,6 @@ var_dump($obj[2]); ===DONE=== --EXPECTF-- object::offsetGet(1) -string(6) "fooBar" -object::offsetGet(2) -int(1) -object::offsetGet(2) - -Notice: Indirect modification of overloaded element of object has no effect in %sarray_access_004.php on line 39 -object::offsetGet(2) -int(1) -===DONE=== ---UEXPECTF-- -object::offsetGet(1) unicode(6) "fooBar" object::offsetGet(2) int(1) diff --git a/tests/classes/array_access_005.phpt b/tests/classes/array_access_005.phpt index 313bf42d9d..10d372c7db 100755 --- a/tests/classes/array_access_005.phpt +++ b/tests/classes/array_access_005.phpt @@ -54,28 +54,6 @@ var_dump($people[0]['name']); ?> ===DONE=== --EXPECTF-- -string(3) "Joe" -string(6) "JoeFoo" -string(9) "JoeFooBar" ----ArrayOverloading--- -array(1) { - ["name"]=> - string(3) "Joe" -} -string(3) "Joe" -string(6) "JoeFoo" -array(1) { - ["name"]=> - string(6) "JoeFoo" -} - -Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_005.php on line 46 -string(6) "JoeFoo" - -Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_005.php on line 48 -string(6) "JoeFoo" -===DONE=== ---UEXPECTF-- unicode(3) "Joe" unicode(6) "JoeFoo" unicode(9) "JoeFooBar" diff --git a/tests/classes/array_access_008.phpt b/tests/classes/array_access_008.phpt index 64f8d06f66..e08d3bfce4 100755 --- a/tests/classes/array_access_008.phpt +++ b/tests/classes/array_access_008.phpt @@ -50,22 +50,6 @@ var_dump($people[0]['name']); ?> ===DONE=== --EXPECTF-- -string(3) "Foo" -string(6) "FooBar" -string(9) "FooBarBaz" -===ArrayOverloading=== -string(3) "Foo" - -Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_008.php on line 40 -string(3) "Foo" - -Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_008.php on line 42 -string(3) "Foo" - -Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_008.php on line 44 -string(3) "Foo" -===DONE=== ---UEXPECTF-- unicode(3) "Foo" unicode(6) "FooBar" unicode(9) "FooBarBaz" diff --git a/tests/classes/array_access_009.phpt b/tests/classes/array_access_009.phpt index 00ab8b149b..6055c1f738 100755 --- a/tests/classes/array_access_009.phpt +++ b/tests/classes/array_access_009.phpt @@ -124,71 +124,6 @@ var_dump($people[0]['name']); ?> ===DONE=== --EXPECTF-- -string(3) "Foo" -string(6) "FooBar" -string(9) "FooBarBaz" -===ArrayOverloading=== -ArrayProxy::__construct(0) -object(ArrayProxy)#%d (2) { - ["object":"ArrayProxy":private]=> - object(Peoples)#%d (1) { - ["person"]=> - array(1) { - [0]=> - array(1) { - ["name"]=> - string(3) "Foo" - } - } - } - ["element":"ArrayProxy":private]=> - int(0) -} -ArrayProxy::__construct(0) -ArrayProxy::offsetGet(0, name) -string(3) "Foo" -ArrayProxy::__construct(0) -ArrayProxy::offsetSet(0, name, FooBar) -ArrayProxy::__construct(0) -ArrayProxy::offsetGet(0, name) -string(6) "FooBar" -ArrayProxy::__construct(0) -ArrayProxy::offsetSet(0, name, FooBarBar) -ArrayProxy::__construct(0) -ArrayProxy::offsetGet(0, name) -string(9) "FooBarBar" -ArrayProxy::__construct(0) -ArrayProxy::offsetGet(0, name) -ArrayProxy::offsetSet(0, name, FooBarBarBaz) -ArrayProxy::__construct(0) -ArrayProxy::offsetGet(0, name) -string(12) "FooBarBarBaz" -ArrayProxy::__construct(0) -ArrayProxy::offsetUnset(0, name) -ArrayProxy::__construct(0) -object(ArrayProxy)#%d (2) { - ["object":"ArrayProxy":private]=> - object(Peoples)#%d (1) { - ["person"]=> - array(1) { - [0]=> - array(0) { - } - } - } - ["element":"ArrayProxy":private]=> - int(0) -} -ArrayProxy::__construct(0) -ArrayProxy::offsetGet(0, name) -NULL -ArrayProxy::__construct(0) -ArrayProxy::offsetSet(0, name, BlaBla) -ArrayProxy::__construct(0) -ArrayProxy::offsetGet(0, name) -string(6) "BlaBla" -===DONE=== ---UEXPECTF-- unicode(3) "Foo" unicode(6) "FooBar" unicode(9) "FooBarBaz" diff --git a/tests/classes/array_access_010.phpt b/tests/classes/array_access_010.phpt index 3e6828dbd3..175ac3abde 100755 --- a/tests/classes/array_access_010.phpt +++ b/tests/classes/array_access_010.phpt @@ -98,125 +98,6 @@ var_dump($people[0]['name']); ===DONE=== <?php exit(0); ?> --EXPECTF-- -string(3) "Foo" -string(6) "FooBar" -string(9) "FooBarBaz" -===ArrayOverloading=== - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) -object(ArrayReferenceProxy)#%d (2) { - ["object":"ArrayReferenceProxy":private]=> - object(Peoples)#%d (1) { - ["person"]=> - array(1) { - [0]=> - &array(1) { - ["name"]=> - string(3) "Foo" - } - } - } - ["element":"ArrayReferenceProxy":private]=> - &array(1) { - ["name"]=> - string(3) "Foo" - } -} - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetGet(Array, name) -string(3) "Foo" - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetSet(Array, name, FooBar) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetGet(Array, name) -string(6) "FooBar" - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetSet(Array, name, FooBarBar) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetGet(Array, name) -string(9) "FooBarBar" - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetGet(Array, name) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetSet(Array, name, FooBarBarBaz) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetGet(Array, name) -string(12) "FooBarBarBaz" - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetUnset(Array, name) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) -object(ArrayReferenceProxy)#%d (2) { - ["object":"ArrayReferenceProxy":private]=> - object(Peoples)#%d (1) { - ["person"]=> - array(1) { - [0]=> - &array(0) { - } - } - } - ["element":"ArrayReferenceProxy":private]=> - &array(0) { - } -} - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetGet(Array, name) -NULL - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetSet(Array, name, BlaBla) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::__construct(Array) - -Notice: Array to string conversion in %s on line %d -ArrayReferenceProxy::offsetGet(Array, name) -string(6) "BlaBla" -===DONE=== ---UEXPECTF-- unicode(3) "Foo" unicode(6) "FooBar" unicode(9) "FooBarBaz" diff --git a/tests/classes/array_access_011.phpt b/tests/classes/array_access_011.phpt index 8306d6cdeb..5409a52e0d 100755 --- a/tests/classes/array_access_011.phpt +++ b/tests/classes/array_access_011.phpt @@ -107,85 +107,6 @@ var_dump($people[0]['name']); ===DONE=== <?php exit(0); ?> --EXPECTF-- -string(3) "Foo" -string(6) "FooBar" -string(9) "FooBarBaz" -===ArrayOverloading=== -ArrayAccessReferenceProxy::__construct(0) -object(ArrayAccessReferenceProxy)#%d (3) { - ["object":"ArrayAccessReferenceProxy":private]=> - object(Peoples)#%d (1) { - ["person"]=> - &array(1) { - [0]=> - array(1) { - ["name"]=> - string(3) "Foo" - } - } - } - ["oarray":"ArrayAccessReferenceProxy":private]=> - &array(1) { - [0]=> - array(1) { - ["name"]=> - string(3) "Foo" - } - } - ["element":"ArrayAccessReferenceProxy":private]=> - int(0) -} -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetGet(0, name) -string(3) "Foo" -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetSet(0, name, FooBar) -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetGet(0, name) -string(6) "FooBar" -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetSet(0, name, FooBarBar) -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetGet(0, name) -string(9) "FooBarBar" -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetGet(0, name) -ArrayAccessReferenceProxy::offsetSet(0, name, FooBarBarBaz) -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetGet(0, name) -string(12) "FooBarBarBaz" -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetUnset(0, name) -ArrayAccessReferenceProxy::__construct(0) -object(ArrayAccessReferenceProxy)#%d (3) { - ["object":"ArrayAccessReferenceProxy":private]=> - object(Peoples)#%d (1) { - ["person"]=> - &array(1) { - [0]=> - array(0) { - } - } - } - ["oarray":"ArrayAccessReferenceProxy":private]=> - &array(1) { - [0]=> - array(0) { - } - } - ["element":"ArrayAccessReferenceProxy":private]=> - int(0) -} -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetGet(0, name) -NULL -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetSet(0, name, BlaBla) -ArrayAccessReferenceProxy::__construct(0) -ArrayAccessReferenceProxy::offsetGet(0, name) -string(6) "BlaBla" -===DONE=== ---UEXPECTF-- unicode(3) "Foo" unicode(6) "FooBar" unicode(9) "FooBarBaz" diff --git a/tests/classes/autoload_002.phpt b/tests/classes/autoload_002.phpt index dd2a3324a2..fb71e0cfe0 100755 --- a/tests/classes/autoload_002.phpt +++ b/tests/classes/autoload_002.phpt @@ -22,13 +22,6 @@ var_dump(get_class_methods('autoload_root')); __autoload(autoload_root) array(1) { [0]=> - string(12) "testFunction" -} -===DONE=== ---UEXPECT-- -__autoload(autoload_root) -array(1) { - [0]=> unicode(12) "testFunction" } ===DONE=== diff --git a/tests/classes/autoload_007.phpt b/tests/classes/autoload_007.phpt index 5652c120cc..ceda4c4124 100644 --- a/tests/classes/autoload_007.phpt +++ b/tests/classes/autoload_007.phpt @@ -11,5 +11,5 @@ Ensure instanceof does not trigger autoload. $a = new stdClass; var_dump($a instanceof UndefC); ?> ---EXPECTF-- +--EXPECT-- bool(false) diff --git a/tests/classes/autoload_008.phpt b/tests/classes/autoload_008.phpt index 75a9cd0520..d24bd6f020 100644 --- a/tests/classes/autoload_008.phpt +++ b/tests/classes/autoload_008.phpt @@ -22,5 +22,5 @@ Ensure catch blocks for unknown exception types do not trigger autoload. echo "In Exception catch block. Autoload should not have been triggered.\n"; } ?> ---EXPECTF-- +--EXPECT-- In Exception catch block. Autoload should not have been triggered. diff --git a/tests/classes/autoload_009.phpt b/tests/classes/autoload_009.phpt index 46f6055fef..8766f1f0aa 100644 --- a/tests/classes/autoload_009.phpt +++ b/tests/classes/autoload_009.phpt @@ -16,5 +16,3 @@ Ensure type hints for unknown types do not trigger autoload. --EXPECTF-- Catchable fatal error: Argument 1 passed to f() must be an instance of UndefClass, instance of stdClass given, called in %s - - diff --git a/tests/classes/autoload_010.phpt b/tests/classes/autoload_010.phpt index 27e95c1058..b0681d9033 100644 --- a/tests/classes/autoload_010.phpt +++ b/tests/classes/autoload_010.phpt @@ -13,11 +13,6 @@ Ensure implements does trigger autoload. } ?> --EXPECTF-- -In autoload: string(6) "UndefI" - -Fatal error: Interface 'UndefI' not found in %s on line %d - ---UEXPECTF-- In autoload: unicode(6) "UndefI" Fatal error: Interface 'UndefI' not found in %s on line %d diff --git a/tests/classes/autoload_011.phpt b/tests/classes/autoload_011.phpt index 8accdcefbf..a5ba1ee2fd 100644 --- a/tests/classes/autoload_011.phpt +++ b/tests/classes/autoload_011.phpt @@ -13,11 +13,6 @@ Ensure extends does trigger autoload. } ?> --EXPECTF-- -In autoload: string(9) "UndefBase" - -Fatal error: Class 'UndefBase' not found in %s on line %d - ---UEXPECTF-- In autoload: unicode(9) "UndefBase" Fatal error: Class 'UndefBase' not found in %s on line %d diff --git a/tests/classes/autoload_012.phpt b/tests/classes/autoload_012.phpt index 2563f7598e..96977a5ce8 100644 --- a/tests/classes/autoload_012.phpt +++ b/tests/classes/autoload_012.phpt @@ -10,11 +10,6 @@ Ensure callback methods in unknown classes trigger autoload. call_user_func("UndefC::test"); ?> --EXPECTF-- -In autoload: string(6) "UndefC" - -Warning: call_user_func() expects parameter 1 to be a valid callback, class 'UndefC' not found in %s on line %d - ---UEXPECTF-- In autoload: unicode(6) "UndefC" Warning: call_user_func() expects parameter 1 to be a valid callback, class 'UndefC' not found in %s on line %d diff --git a/tests/classes/autoload_013.phpt b/tests/classes/autoload_013.phpt index 079398c9f6..a1b9dc14d9 100644 --- a/tests/classes/autoload_013.phpt +++ b/tests/classes/autoload_013.phpt @@ -17,9 +17,6 @@ Ensure the ReflectionClass constructor triggers autoload. echo $e->getMessage(); } ?> ---EXPECTF-- -In autoload: string(6) "UndefC" -Class UndefC does not exist ---UEXPECTF-- +--EXPECT-- In autoload: unicode(6) "UndefC" -Class UndefC does not exist
\ No newline at end of file +Class UndefC does not exist diff --git a/tests/classes/autoload_014.phpt b/tests/classes/autoload_014.phpt index 9d11d384f4..ca6a322391 100644 --- a/tests/classes/autoload_014.phpt +++ b/tests/classes/autoload_014.phpt @@ -17,9 +17,6 @@ Ensure the ReflectionMethod constructor triggers autoload. echo $e->getMessage(); } ?> ---EXPECTF-- -In autoload: string(6) "UndefC" -Class UndefC does not exist ---UEXPECTF-- +--EXPECT-- In autoload: unicode(6) "UndefC" -Class UndefC does not exist
\ No newline at end of file +Class UndefC does not exist diff --git a/tests/classes/autoload_015.phpt b/tests/classes/autoload_015.phpt index 37cf4675ac..f64ab8fe92 100644 --- a/tests/classes/autoload_015.phpt +++ b/tests/classes/autoload_015.phpt @@ -17,9 +17,6 @@ Ensure the ReflectionProperty constructor triggers autoload. echo $e->getMessage(); } ?> ---EXPECTF-- -In autoload: string(6) "UndefC" -Class UndefC does not exist ---UEXPECTF-- +--EXPECT-- In autoload: unicode(6) "UndefC" -Class UndefC does not exist
\ No newline at end of file +Class UndefC does not exist diff --git a/tests/classes/autoload_016.phpt b/tests/classes/autoload_016.phpt index 7e4d3b4c1f..130a9a5f91 100644 --- a/tests/classes/autoload_016.phpt +++ b/tests/classes/autoload_016.phpt @@ -18,9 +18,6 @@ Ensure ReflectionClass::getProperty() triggers autoload echo $e->getMessage(); } ?> ---EXPECTF-- -In autoload: string(6) "undefc" -Class undefc does not exist ---UEXPECTF-- +--EXPECT-- In autoload: unicode(6) "undefc" -Class undefc does not exist
\ No newline at end of file +Class undefc does not exist diff --git a/tests/classes/autoload_017.phpt b/tests/classes/autoload_017.phpt index 82b46807b7..2da3294109 100644 --- a/tests/classes/autoload_017.phpt +++ b/tests/classes/autoload_017.phpt @@ -18,9 +18,6 @@ Ensure ReflectionClass::implementsInterface triggers autoload. echo $e->getMessage(); } ?> ---EXPECTF-- -In autoload: string(6) "UndefI" -Interface UndefI does not exist ---UEXPECTF-- +--EXPECT-- In autoload: unicode(6) "UndefI" -Interface UndefI does not exist
\ No newline at end of file +Interface UndefI does not exist diff --git a/tests/classes/autoload_018.phpt b/tests/classes/autoload_018.phpt index 59e20e2a60..c69bd251ef 100644 --- a/tests/classes/autoload_018.phpt +++ b/tests/classes/autoload_018.phpt @@ -19,7 +19,7 @@ Ensure __autoload() allows for recursive calls if the class name differs. var_dump(class_exists('UndefinedClass0')); ?> ---EXPECTF-- +--EXPECT-- IN: __autoload(UndefinedClass0) IN: __autoload(UndefinedClass1) IN: __autoload(UndefinedClass2) @@ -45,4 +45,3 @@ OUT: __autoload(UndefinedClass2) OUT: __autoload(UndefinedClass1) OUT: __autoload(UndefinedClass0) bool(false) - diff --git a/tests/classes/autoload_019.phpt b/tests/classes/autoload_019.phpt index 783632013b..82de524fc1 100644 --- a/tests/classes/autoload_019.phpt +++ b/tests/classes/autoload_019.phpt @@ -10,5 +10,5 @@ Ensure __autoload() recursion is guarded for multiple lookups of same class usin class_exists("unDefinedClass"); ?> ---EXPECTF-- +--EXPECT-- __autoload unDefinedClass diff --git a/tests/classes/autoload_020.phpt b/tests/classes/autoload_020.phpt index 4f5dffb96c..8f44307db3 100644 --- a/tests/classes/autoload_020.phpt +++ b/tests/classes/autoload_020.phpt @@ -12,12 +12,6 @@ Ensure __autoload() is triggered during unserialization. --EXPECTF-- in autoload: C object(__PHP_Incomplete_Class)#%d (1) { - ["__PHP_Incomplete_Class_Name"]=> - string(1) "C" -} ---UEXPECTF-- -in autoload: C -object(__PHP_Incomplete_Class)#%d (1) { [u"__PHP_Incomplete_Class_Name"]=> unicode(1) "C" -}
\ No newline at end of file +} diff --git a/tests/classes/bug26737.phpt b/tests/classes/bug26737.phpt index 7a5a0299fd..45da555b72 100644 --- a/tests/classes/bug26737.phpt +++ b/tests/classes/bug26737.phpt @@ -19,7 +19,4 @@ var_dump(str_replace("\0", '\0', $data)); ?> --EXPECTF-- Notice: serialize(): "no_such" returned as member variable from __sleep() but does not exist in %s on line %d -string(130) "O:3:"foo":4:{S:12:"\0foo\0private";S:7:"private";S:12:"\0*\0protected";S:9:"protected";S:6:"public";S:6:"public";S:7:"no_such";N;}" ---UEXPECTF-- -Notice: serialize(): "no_such" returned as member variable from __sleep() but does not exist in %s on line %d unicode(130) "O:3:"foo":4:{U:12:"\0foo\0private";U:7:"private";U:12:"\0*\0protected";U:9:"protected";U:6:"public";U:6:"public";U:7:"no_such";N;}" diff --git a/tests/classes/bug29446.phpt b/tests/classes/bug29446.phpt index 5e30e8e74b..573f136ce0 100644 --- a/tests/classes/bug29446.phpt +++ b/tests/classes/bug29446.phpt @@ -16,4 +16,4 @@ $test = new testClass; ?> --EXPECTF-- -Fatal error: Cannot redefine class constant testClass::TEST_CONST in %s on line 5
\ No newline at end of file +Fatal error: Cannot redefine class constant testClass::TEST_CONST in %s on line 5 diff --git a/tests/classes/class_stdclass.phpt b/tests/classes/class_stdclass.phpt index 5e3422aeae..a8c12715e2 100755 --- a/tests/classes/class_stdclass.phpt +++ b/tests/classes/class_stdclass.phpt @@ -9,6 +9,6 @@ echo get_class($obj)."\n"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- stdClass Done diff --git a/tests/classes/clone_001.phpt b/tests/classes/clone_001.phpt index b4554dc30d..2e40461eca 100755 --- a/tests/classes/clone_001.phpt +++ b/tests/classes/clone_001.phpt @@ -24,26 +24,6 @@ echo "Done\n"; --EXPECT-- Object object(test)#1 (3) { - ["p1"]=> - int(1) - ["p2"]=> - string(1) "A" - ["p3"]=> - string(1) "B" -} -Clown -object(test)#2 (3) { - ["p1"]=> - int(1) - ["p2"]=> - string(1) "A" - ["p3"]=> - string(1) "C" -} -Done ---UEXPECT-- -Object -object(test)#1 (3) { [u"p1"]=> int(1) [u"p2"]=> diff --git a/tests/classes/clone_002.phpt b/tests/classes/clone_002.phpt index 2c319ed3d2..5c51c483a6 100755 --- a/tests/classes/clone_002.phpt +++ b/tests/classes/clone_002.phpt @@ -26,26 +26,6 @@ echo "Done\n"; --EXPECT-- Object object(test)#1 (3) { - ["p1"]=> - int(1) - ["p2"]=> - string(1) "A" - ["p3"]=> - string(1) "B" -} -Clown -object(test)#2 (3) { - ["p1"]=> - int(1) - ["p2"]=> - string(1) "A" - ["p3"]=> - string(1) "C" -} -Done ---UEXPECT-- -Object -object(test)#1 (3) { [u"p1"]=> int(1) [u"p2"]=> diff --git a/tests/classes/clone_004.phpt b/tests/classes/clone_004.phpt index 1116aa62d3..ddb7206fdc 100755 --- a/tests/classes/clone_004.phpt +++ b/tests/classes/clone_004.phpt @@ -40,49 +40,6 @@ echo "Done\n"; --EXPECT-- Original object(test)#1 (2) { - ["b"]=> - array(2) { - [0]=> - int(3) - [1]=> - int(4) - } - ["a"]=> - array(2) { - [0]=> - int(1) - [1]=> - int(2) - } -} -Clone -object(test)#2 (2) { - ["b"]=> - array(2) { - [0]=> - int(3) - [1]=> - int(4) - } - ["a"]=> - array(2) { - [0]=> - int(1) - [1]=> - int(2) - } -} -Modify -object(test)#2 (2) { - ["b"]=> - int(6) - ["a"]=> - int(5) -} -Done ---UEXPECT-- -Original -object(test)#1 (2) { [u"b"]=> array(2) { [0]=> diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt index 57e303cd58..fe0929a03c 100644 --- a/tests/classes/constants_basic_001.phpt +++ b/tests/classes/constants_basic_001.phpt @@ -64,36 +64,6 @@ Notice: Undefined variable: undef in %s on line 5 Attempt to access various kinds of class constants: Notice: Use of undefined constant UNDEFINED - assumed 'UNDEFINED' in %s on line %d -string(9) "UNDEFINED" -int(1) -float(1.5) -int(1) -float(1.5) -int(-1) -float(-1.5) -int(15) -string(%d) "%s" -string(1) "C" -string(1) "C" -string(0) "" -int(1234) -int(456) -NULL -string(6) "hello1" -string(6) "hello2" -string(6) "hello2" -string(6) "hello2" - -Expecting fatal error: - -Fatal error: Undefined class constant 'c19' in %s on line 53 ---UEXPECTF-- - -Notice: Undefined variable: undef in %s on line 5 - -Attempt to access various kinds of class constants: - -Notice: Use of undefined constant UNDEFINED - assumed 'UNDEFINED' in %s on line %d unicode(9) "UNDEFINED" int(1) float(1.5) @@ -116,4 +86,4 @@ unicode(6) "hello2" Expecting fatal error: -Fatal error: Undefined class constant 'c19' in %s on line 53
\ No newline at end of file +Fatal error: Undefined class constant 'c19' in %s on line 53 diff --git a/tests/classes/constants_basic_002.phpt b/tests/classes/constants_basic_002.phpt index f660ffeca7..c42f080d28 100644 --- a/tests/classes/constants_basic_002.phpt +++ b/tests/classes/constants_basic_002.phpt @@ -18,19 +18,6 @@ Basic class support - defining and reading a class constant. var_dump($myInstance) ?> --EXPECTF-- - -Read class constant. -string(5) "hello" - -Fail to read class constant from instance. - -Notice: Undefined property: aclass::$myConst in %s on line 12 -NULL - -Class constant not visible in object var_dump. -object(aclass)#%d (0) { -} ---UEXPECTF-- Read class constant. unicode(5) "hello" @@ -41,4 +28,4 @@ NULL Class constant not visible in object var_dump. object(aclass)#%d (0) { -}
\ No newline at end of file +} diff --git a/tests/classes/constants_basic_003.phpt b/tests/classes/constants_basic_003.phpt index 39e6bd8784..c58a93ff2e 100644 --- a/tests/classes/constants_basic_003.phpt +++ b/tests/classes/constants_basic_003.phpt @@ -21,13 +21,8 @@ Ensure class properties and constants can be defined in terms of constants that var_dump(B::ca); var_dump(B::cc); ?> ---EXPECTF-- -string(12) "hello from A" -string(12) "hello from C" -string(12) "hello from A" -string(12) "hello from C" ---UEXPECTF-- +--EXPECT-- unicode(12) "hello from A" unicode(12) "hello from C" unicode(12) "hello from A" -unicode(12) "hello from C"
\ No newline at end of file +unicode(12) "hello from C" diff --git a/tests/classes/constants_basic_004.phpt b/tests/classes/constants_basic_004.phpt index 6287d80762..3da485a52e 100644 --- a/tests/classes/constants_basic_004.phpt +++ b/tests/classes/constants_basic_004.phpt @@ -45,61 +45,6 @@ Test properties with array default values using class constants as keys and valu Static properties: array(1) { - ["key"]=> - string(5) "value" -} -array(1) { - ["key"]=> - string(5) "value" -} -array(1) { - ["key"]=> - string(5) "value" -} -array(1) { - ["key"]=> - string(5) "value" -} -array(1) { - ["key"]=> - string(5) "value" -} - -Instance properties: -object(X)#%d (1) { - ["a_x"]=> - array(1) { - ["key"]=> - string(5) "value" - } -} -object(B)#%d (1) { - ["a_b"]=> - array(1) { - ["key"]=> - string(5) "value" - } -} -object(C)#%d (3) { - ["a_c_parent"]=> - array(1) { - ["key"]=> - string(5) "value" - } - ["a_c_self"]=> - array(1) { - ["key"]=> - string(5) "value" - } - ["a_b"]=> - array(1) { - ["key"]=> - string(5) "value" - } -} ---UEXPECTF-- -Static properties: -array(1) { [u"key"]=> unicode(5) "value" } @@ -151,4 +96,4 @@ object(C)#%d (3) { [u"key"]=> unicode(5) "value" } -}
\ No newline at end of file +} diff --git a/tests/classes/constants_basic_005.phpt b/tests/classes/constants_basic_005.phpt index 0d3b44c22c..0ae07733a1 100644 --- a/tests/classes/constants_basic_005.phpt +++ b/tests/classes/constants_basic_005.phpt @@ -10,9 +10,6 @@ Test constants with default values based on other constants. } var_dump(C::CONST_1, C::CONST_2); ?> ---EXPECTF-- -string(5) "hello" -string(5) "hello" ---UEXPECTF-- +--EXPECT-- unicode(5) "hello" unicode(5) "hello" diff --git a/tests/classes/constants_basic_006.phpt b/tests/classes/constants_basic_006.phpt index dcdb01bfe4..0567998b7d 100644 --- a/tests/classes/constants_basic_006.phpt +++ b/tests/classes/constants_basic_006.phpt @@ -19,29 +19,7 @@ Ensure class constants are not evaluated when a class is looked up to resolve in var_dump(C::X, C::$a, D::X, D::$a, E::X, E::$a); ?> ---EXPECTF-- -string(5) "hello" -array(2) { - ["nasty"]=> - string(4) "test" - ["hello"]=> - string(5) "nasty" -} -string(5) "hello" -array(2) { - ["nasty"]=> - string(4) "test" - ["hello"]=> - string(5) "nasty" -} -string(5) "hello" -array(2) { - ["nasty"]=> - string(4) "test" - ["hello"]=> - string(5) "nasty" -} ---UEXPECTF-- +--EXPECT-- unicode(5) "hello" array(2) { [u"nasty"]=> @@ -62,4 +40,4 @@ array(2) { unicode(4) "test" [u"hello"]=> unicode(5) "nasty" -}
\ No newline at end of file +} diff --git a/tests/classes/ctor_dtor.phpt b/tests/classes/ctor_dtor.phpt index ea6813cc96..7fa99cde6b 100644 --- a/tests/classes/ctor_dtor.phpt +++ b/tests/classes/ctor_dtor.phpt @@ -31,7 +31,7 @@ $t = new late(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- early::early early::early early::__destruct diff --git a/tests/classes/ctor_dtor_inheritance.phpt b/tests/classes/ctor_dtor_inheritance.phpt index 8ae2a5dec4..3cc0c039bd 100644 --- a/tests/classes/ctor_dtor_inheritance.phpt +++ b/tests/classes/ctor_dtor_inheritance.phpt @@ -54,7 +54,7 @@ unset($t); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Testing class base base::__construct base Object diff --git a/tests/classes/ctor_name_clash.phpt b/tests/classes/ctor_name_clash.phpt index 1a1d6fa511..aab57de5fa 100644 --- a/tests/classes/ctor_name_clash.phpt +++ b/tests/classes/ctor_name_clash.phpt @@ -17,6 +17,6 @@ class derived extends base { $obj = new derived(); $obj->base(); ?> ---EXPECTF-- +--EXPECT-- base::base derived::base diff --git a/tests/classes/destructor_and_exceptions.phpt b/tests/classes/destructor_and_exceptions.phpt index 8100c92465..0da6e642af 100755 --- a/tests/classes/destructor_and_exceptions.phpt +++ b/tests/classes/destructor_and_exceptions.phpt @@ -51,7 +51,7 @@ catch(FatalException $e) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- FailClass::__destruct Caught: FailClass FatalException::__construct diff --git a/tests/classes/destructor_inheritance.phpt b/tests/classes/destructor_inheritance.phpt index b9a46659b0..868c8960c8 100755 --- a/tests/classes/destructor_inheritance.phpt +++ b/tests/classes/destructor_inheritance.phpt @@ -26,4 +26,4 @@ echo 'Done'; --EXPECT-- base::__construct base::__destruct -Done
\ No newline at end of file +Done diff --git a/tests/classes/destructor_visibility_003.phpt b/tests/classes/destructor_visibility_003.phpt index 83e3efe22e..b1bb820bb8 100755 --- a/tests/classes/destructor_visibility_003.phpt +++ b/tests/classes/destructor_visibility_003.phpt @@ -23,6 +23,6 @@ unset($obj); // Derived::__destruct is being called not Base::__destruct ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Derived::__destruct ===DONE=== diff --git a/tests/classes/factory_and_singleton_006.phpt b/tests/classes/factory_and_singleton_006.phpt index 81cf714888..77bebf0ad5 100755 --- a/tests/classes/factory_and_singleton_006.phpt +++ b/tests/classes/factory_and_singleton_006.phpt @@ -17,4 +17,3 @@ echo "Done\n"; ?> --EXPECTF-- Fatal error: Call to private test::__destruct() from context '' in %sfactory_and_singleton_006.php on line %d - diff --git a/tests/classes/final.phpt b/tests/classes/final.phpt index b4e37a36f6..b3499c795d 100644 --- a/tests/classes/final.phpt +++ b/tests/classes/final.phpt @@ -25,7 +25,7 @@ $t2->show(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Call to function first::show() Call to function second::show() -Done
\ No newline at end of file +Done diff --git a/tests/classes/inheritance_002.phpt b/tests/classes/inheritance_002.phpt index 185a913280..cbd62f05e5 100755 --- a/tests/classes/inheritance_002.phpt +++ b/tests/classes/inheritance_002.phpt @@ -58,19 +58,6 @@ $cm= new Child_mx2(); ?> --EXPECT-- ### PHP 4 style -string(17) "Child constructor" -string(16) "Base constructor" -### PHP 5 style -string(17) "Child constructor" -string(16) "Base constructor" -### Mixed style 1 -string(17) "Child constructor" -string(16) "Base constructor" -### Mixed style 2 -string(17) "Child constructor" -string(16) "Base constructor" ---UEXPECT-- -### PHP 4 style unicode(17) "Child constructor" unicode(16) "Base constructor" ### PHP 5 style diff --git a/tests/classes/inheritance_005.phpt b/tests/classes/inheritance_005.phpt index 8990264d92..6e080f8db2 100644 --- a/tests/classes/inheritance_005.phpt +++ b/tests/classes/inheritance_005.phpt @@ -40,7 +40,7 @@ Check for inherited old-style constructor. echo "Is C::C() callable?\n"; var_dump(is_callable(array($c, "C"))); ?> ---EXPECTF-- +--EXPECT-- About to construct new B: In A::A Is B::B() callable? diff --git a/tests/classes/interface_constant_inheritance_001.phpt b/tests/classes/interface_constant_inheritance_001.phpt index ae3e71e7ab..cc76afa11f 100644 --- a/tests/classes/interface_constant_inheritance_001.phpt +++ b/tests/classes/interface_constant_inheritance_001.phpt @@ -14,4 +14,4 @@ echo "Done\n"; ?> --EXPECTF-- -Fatal error: Cannot inherit previously-inherited constant FOO from interface I1 in %s on line 6
\ No newline at end of file +Fatal error: Cannot inherit previously-inherited constant FOO from interface I1 in %s on line 6 diff --git a/tests/classes/interface_constant_inheritance_002.phpt b/tests/classes/interface_constant_inheritance_002.phpt index d5001baa3d..fa90dfdd52 100644 --- a/tests/classes/interface_constant_inheritance_002.phpt +++ b/tests/classes/interface_constant_inheritance_002.phpt @@ -14,4 +14,4 @@ echo "Done\n"; ?> --EXPECTF-- -Fatal error: Cannot inherit previously-inherited constant FOO from interface I in %s on line 6
\ No newline at end of file +Fatal error: Cannot inherit previously-inherited constant FOO from interface I in %s on line 6 diff --git a/tests/classes/interface_constant_inheritance_004.phpt b/tests/classes/interface_constant_inheritance_004.phpt index f055929578..7f2d3e514f 100644 --- a/tests/classes/interface_constant_inheritance_004.phpt +++ b/tests/classes/interface_constant_inheritance_004.phpt @@ -14,5 +14,5 @@ class C implements IA, IB { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/interface_doubled.phpt b/tests/classes/interface_doubled.phpt index e1dd31fd4d..7c478b5ab7 100644 --- a/tests/classes/interface_doubled.phpt +++ b/tests/classes/interface_doubled.phpt @@ -155,7 +155,7 @@ echo $t->test('if_e'); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- class_a is_a(class_a, if_a) yes is_a(class_a, if_b) no diff --git a/tests/classes/interface_implemented.phpt b/tests/classes/interface_implemented.phpt index e33a4da002..3edc92494b 100644 --- a/tests/classes/interface_implemented.phpt +++ b/tests/classes/interface_implemented.phpt @@ -61,7 +61,7 @@ $t = new derived_d(); $t->test(); ?> ---EXPECTF-- +--EXPECT-- is_a(base, base) = yes is_a(base, derived_a) = no is_a(base, derived_b) = no diff --git a/tests/classes/interface_optional_arg.phpt b/tests/classes/interface_optional_arg.phpt index 05f2fc41df..71514001ab 100755 --- a/tests/classes/interface_optional_arg.phpt +++ b/tests/classes/interface_optional_arg.phpt @@ -24,4 +24,3 @@ $foo->bar(); ?> --EXPECT-- foo - diff --git a/tests/classes/interface_optional_arg_002.phpt b/tests/classes/interface_optional_arg_002.phpt index 92980f65b4..9987e925e0 100644 --- a/tests/classes/interface_optional_arg_002.phpt +++ b/tests/classes/interface_optional_arg_002.phpt @@ -21,4 +21,4 @@ $foo->bar(); ?> --EXPECT-- -int(2)
\ No newline at end of file +int(2) diff --git a/tests/classes/interfaces_001.phpt b/tests/classes/interfaces_001.phpt index 41e1f6776d..dcf985c4e5 100644 --- a/tests/classes/interfaces_001.phpt +++ b/tests/classes/interfaces_001.phpt @@ -23,4 +23,3 @@ echo $foo->getMessage() . "\n"; ?> --EXPECT-- foo - diff --git a/tests/classes/iterators_004.phpt b/tests/classes/iterators_004.phpt index 3fe05276c3..63173fae9d 100755 --- a/tests/classes/iterators_004.phpt +++ b/tests/classes/iterators_004.phpt @@ -53,7 +53,7 @@ foreach($obj as $v => $w) { print "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 1st try 2nd try object:max=>3 diff --git a/tests/classes/iterators_006.phpt b/tests/classes/iterators_006.phpt index 47fa69087a..e00a00afff 100644 --- a/tests/classes/iterators_006.phpt +++ b/tests/classes/iterators_006.phpt @@ -84,4 +84,4 @@ foreach ($array as $property => $value) { 0: foo 1: bar 2: baz -===DONE===
\ No newline at end of file +===DONE=== diff --git a/tests/classes/method_call_variation_001.phpt b/tests/classes/method_call_variation_001.phpt index dd43cfd1cb..6c1a0838b7 100644 --- a/tests/classes/method_call_variation_001.phpt +++ b/tests/classes/method_call_variation_001.phpt @@ -30,7 +30,7 @@ In $a->$b[Y](), $b[Y] represents a method name on $a. But in $a->X[Y](), $a->X[Y $c->functions[0](5, 6); $c->functions[1][2][3][4](7, 8); ?> ---EXPECTF-- +--EXPECT-- Called C::foo(1, 2) Called C::foo(3, 4) Called global foo(5, 6) diff --git a/tests/classes/new_001.phpt b/tests/classes/new_001.phpt index 48f4f6bb0e..49b3bc4172 100644 --- a/tests/classes/new_001.phpt +++ b/tests/classes/new_001.phpt @@ -33,24 +33,6 @@ Deprecated: Assigning the return value of new by reference is deprecated in %s o Compile-time strict error message should precede this. $f initially points to the first object: object(Inc)#%d (1) { - ["id"]=> - int(1) -} -Assigning new object directly to $k affects $f: -object(Inc)#%d (1) { - ["id"]=> - int(2) -} -Assigning new object by ref to $k removes it from $f's reference set, so $f is unchanged: -object(Inc)#%d (1) { - ["id"]=> - int(2) -} ---UEXPECTF-- -Deprecated: Assigning the return value of new by reference is deprecated in %s on line 23 -Compile-time strict error message should precede this. -$f initially points to the first object: -object(Inc)#%d (1) { [u"id"]=> int(1) } diff --git a/tests/classes/private_005b.phpt b/tests/classes/private_005b.phpt index ea3fe610d3..2d1850b519 100644 --- a/tests/classes/private_005b.phpt +++ b/tests/classes/private_005b.phpt @@ -32,4 +32,4 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call show() -Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d
\ No newline at end of file +Fatal error: Call to private method pass::show() from context 'fail' in %s on line %d diff --git a/tests/classes/private_006.phpt b/tests/classes/private_006.phpt index 0bb2b3fe4b..66c7aa2280 100644 --- a/tests/classes/private_006.phpt +++ b/tests/classes/private_006.phpt @@ -34,7 +34,7 @@ class fail extends third { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Call show() Call show() Call show() diff --git a/tests/classes/private_006b.phpt b/tests/classes/private_006b.phpt index 950f16a3c4..e828e19711 100644 --- a/tests/classes/private_006b.phpt +++ b/tests/classes/private_006b.phpt @@ -35,7 +35,7 @@ $t3->do_show(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Call show() Call show() -Done
\ No newline at end of file +Done diff --git a/tests/classes/private_007.phpt b/tests/classes/private_007.phpt index 73a38c4562..298fa689c5 100644 --- a/tests/classes/private_007.phpt +++ b/tests/classes/private_007.phpt @@ -24,7 +24,7 @@ Foo::priv(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Bar::priv() Foo::priv() Done diff --git a/tests/classes/private_007b.phpt b/tests/classes/private_007b.phpt index 02ddc25dec..c127f28d62 100644 --- a/tests/classes/private_007b.phpt +++ b/tests/classes/private_007b.phpt @@ -25,7 +25,7 @@ $obj->priv(); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Bar::priv() Foo::priv() Done diff --git a/tests/classes/private_members.phpt b/tests/classes/private_members.phpt index a8ef9ab920..c2c2cd3b26 100755 --- a/tests/classes/private_members.phpt +++ b/tests/classes/private_members.phpt @@ -53,7 +53,7 @@ unset($t); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- derived::__construct(begin) base::__construct(begin) base::test diff --git a/tests/classes/property_override_privateStatic_private.phpt b/tests/classes/property_override_privateStatic_private.phpt index ddd2e5d1ac..b2985add7d 100644 --- a/tests/classes/property_override_privateStatic_private.phpt +++ b/tests/classes/property_override_privateStatic_private.phpt @@ -27,7 +27,7 @@ Redeclare inherited private static property as private. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p diff --git a/tests/classes/property_override_privateStatic_privateStatic.phpt b/tests/classes/property_override_privateStatic_privateStatic.phpt index d7d645fd0a..f435516a3f 100644 --- a/tests/classes/property_override_privateStatic_privateStatic.phpt +++ b/tests/classes/property_override_privateStatic_privateStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited private static property as private static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_privateStatic_protected.phpt b/tests/classes/property_override_privateStatic_protected.phpt index d4732166c6..fac66c32bb 100644 --- a/tests/classes/property_override_privateStatic_protected.phpt +++ b/tests/classes/property_override_privateStatic_protected.phpt @@ -27,7 +27,7 @@ Redeclare inherited private static property as protected. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p diff --git a/tests/classes/property_override_privateStatic_protectedStatic.phpt b/tests/classes/property_override_privateStatic_protectedStatic.phpt index 169ff9a377..08c0b22704 100644 --- a/tests/classes/property_override_privateStatic_protectedStatic.phpt +++ b/tests/classes/property_override_privateStatic_protectedStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited private static property as protected static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_privateStatic_public.phpt b/tests/classes/property_override_privateStatic_public.phpt index 033eb75231..7242371003 100644 --- a/tests/classes/property_override_privateStatic_public.phpt +++ b/tests/classes/property_override_privateStatic_public.phpt @@ -27,7 +27,7 @@ Redeclare inherited private static property as public. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p diff --git a/tests/classes/property_override_privateStatic_publicStatic.phpt b/tests/classes/property_override_privateStatic_publicStatic.phpt index 5f2b6bf4a8..1fe43fb619 100644 --- a/tests/classes/property_override_privateStatic_publicStatic.phpt +++ b/tests/classes/property_override_privateStatic_publicStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited private static property as public static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_private_private.phpt b/tests/classes/property_override_private_private.phpt index 2b263eeb67..2d45f33430 100644 --- a/tests/classes/property_override_private_private.phpt +++ b/tests/classes/property_override_private_private.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as private. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p diff --git a/tests/classes/property_override_private_privateStatic.phpt b/tests/classes/property_override_private_privateStatic.phpt index 606ed21d08..1bc3c9fe52 100644 --- a/tests/classes/property_override_private_privateStatic.phpt +++ b/tests/classes/property_override_private_privateStatic.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as private static. $b->showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p (static) diff --git a/tests/classes/property_override_private_protected.phpt b/tests/classes/property_override_private_protected.phpt index b84ed6787e..d284272d02 100644 --- a/tests/classes/property_override_private_protected.phpt +++ b/tests/classes/property_override_private_protected.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as protected. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p diff --git a/tests/classes/property_override_private_protectedStatic.phpt b/tests/classes/property_override_private_protectedStatic.phpt index 1bb303dab7..c7c54eab95 100644 --- a/tests/classes/property_override_private_protectedStatic.phpt +++ b/tests/classes/property_override_private_protectedStatic.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as protected static. $b->showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p (static) diff --git a/tests/classes/property_override_private_public.phpt b/tests/classes/property_override_private_public.phpt index badbe91d50..6468432d18 100644 --- a/tests/classes/property_override_private_public.phpt +++ b/tests/classes/property_override_private_public.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as public. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p diff --git a/tests/classes/property_override_private_publicStatic.phpt b/tests/classes/property_override_private_publicStatic.phpt index 9fc58ece4a..4057f83390 100644 --- a/tests/classes/property_override_private_publicStatic.phpt +++ b/tests/classes/property_override_private_publicStatic.phpt @@ -28,7 +28,7 @@ Redeclare inherited private property as public static. $b->showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p A::p B::p (static) diff --git a/tests/classes/property_override_protectedStatic_private.phpt b/tests/classes/property_override_protectedStatic_private.phpt index 18e9c78a13..0b12aef87a 100644 --- a/tests/classes/property_override_protectedStatic_private.phpt +++ b/tests/classes/property_override_protectedStatic_private.phpt @@ -30,4 +30,3 @@ Redeclare inherited protected static property as private. --EXPECTF-- Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18 - diff --git a/tests/classes/property_override_protectedStatic_privateStatic.phpt b/tests/classes/property_override_protectedStatic_privateStatic.phpt index 688621077d..265adfa72e 100644 --- a/tests/classes/property_override_protectedStatic_privateStatic.phpt +++ b/tests/classes/property_override_protectedStatic_privateStatic.phpt @@ -29,4 +29,3 @@ Redeclare inherited protected static property as private static. --EXPECTF-- Fatal error: Access level to B::$p must be protected (as in class A) or weaker in %s on line 18 - diff --git a/tests/classes/property_override_protectedStatic_protected.phpt b/tests/classes/property_override_protectedStatic_protected.phpt index 0e5fdd301c..7b0daff859 100644 --- a/tests/classes/property_override_protectedStatic_protected.phpt +++ b/tests/classes/property_override_protectedStatic_protected.phpt @@ -30,4 +30,3 @@ Redeclare inherited protected static property as protected. --EXPECTF-- Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18 - diff --git a/tests/classes/property_override_protectedStatic_protectedStatic.phpt b/tests/classes/property_override_protectedStatic_protectedStatic.phpt index 16f1100947..d2d1c0c379 100644 --- a/tests/classes/property_override_protectedStatic_protectedStatic.phpt +++ b/tests/classes/property_override_protectedStatic_protectedStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited protected static property as protected static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_protectedStatic_public.phpt b/tests/classes/property_override_protectedStatic_public.phpt index 6303325590..c96663d1c9 100644 --- a/tests/classes/property_override_protectedStatic_public.phpt +++ b/tests/classes/property_override_protectedStatic_public.phpt @@ -30,4 +30,3 @@ Redeclare inherited protected static property as public. --EXPECTF-- Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18 - diff --git a/tests/classes/property_override_protectedStatic_publicStatic.phpt b/tests/classes/property_override_protectedStatic_publicStatic.phpt index e437c5f30f..1792e7eec2 100644 --- a/tests/classes/property_override_protectedStatic_publicStatic.phpt +++ b/tests/classes/property_override_protectedStatic_publicStatic.phpt @@ -26,8 +26,7 @@ Redeclare inherited protected static property as public static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) - diff --git a/tests/classes/property_override_protected_protected.phpt b/tests/classes/property_override_protected_protected.phpt index c4b0d438c0..096f53d515 100644 --- a/tests/classes/property_override_protected_protected.phpt +++ b/tests/classes/property_override_protected_protected.phpt @@ -28,7 +28,7 @@ Redeclare inherited protected property as protected. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p B::p B::p diff --git a/tests/classes/property_override_protected_public.phpt b/tests/classes/property_override_protected_public.phpt index 4702f9a0cf..c2db91b14c 100644 --- a/tests/classes/property_override_protected_public.phpt +++ b/tests/classes/property_override_protected_public.phpt @@ -28,7 +28,7 @@ Redeclare inherited protected property as public. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p B::p B::p diff --git a/tests/classes/property_override_publicStatic_private.phpt b/tests/classes/property_override_publicStatic_private.phpt index 7abe92c9ff..422c8d2f6f 100644 --- a/tests/classes/property_override_publicStatic_private.phpt +++ b/tests/classes/property_override_publicStatic_private.phpt @@ -30,4 +30,3 @@ Redeclare inherited public static property as private. --EXPECTF-- Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18 - diff --git a/tests/classes/property_override_publicStatic_privateStatic.phpt b/tests/classes/property_override_publicStatic_privateStatic.phpt index d41db6da38..bd9b083483 100644 --- a/tests/classes/property_override_publicStatic_privateStatic.phpt +++ b/tests/classes/property_override_publicStatic_privateStatic.phpt @@ -29,4 +29,3 @@ Redeclare inherited public static property as private static. --EXPECTF-- Fatal error: Access level to B::$p must be public (as in class A) in %s on line 18 - diff --git a/tests/classes/property_override_publicStatic_protected.phpt b/tests/classes/property_override_publicStatic_protected.phpt index 884159f977..3e72ca23d3 100644 --- a/tests/classes/property_override_publicStatic_protected.phpt +++ b/tests/classes/property_override_publicStatic_protected.phpt @@ -30,4 +30,3 @@ Redeclare inherited public static property as protected. --EXPECTF-- Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18 - diff --git a/tests/classes/property_override_publicStatic_protectedStatic.phpt b/tests/classes/property_override_publicStatic_protectedStatic.phpt index b022ef8049..c36933cca6 100644 --- a/tests/classes/property_override_publicStatic_protectedStatic.phpt +++ b/tests/classes/property_override_publicStatic_protectedStatic.phpt @@ -29,4 +29,3 @@ Redeclare inherited public static property as protected static. --EXPECTF-- Fatal error: Access level to B::$p must be public (as in class A) in %s on line 18 - diff --git a/tests/classes/property_override_publicStatic_public.phpt b/tests/classes/property_override_publicStatic_public.phpt index d099da0474..a4f295da7f 100644 --- a/tests/classes/property_override_publicStatic_public.phpt +++ b/tests/classes/property_override_publicStatic_public.phpt @@ -30,4 +30,3 @@ Redeclare inherited public static property as public. --EXPECTF-- Fatal error: Cannot redeclare static A::$p as non static B::$p in %s on line 18 - diff --git a/tests/classes/property_override_publicStatic_publicStatic.phpt b/tests/classes/property_override_publicStatic_publicStatic.phpt index 9a86867040..8d0f9ad079 100644 --- a/tests/classes/property_override_publicStatic_publicStatic.phpt +++ b/tests/classes/property_override_publicStatic_publicStatic.phpt @@ -26,7 +26,7 @@ Redeclare inherited public static property as public static. B::showA(); B::showB(); ?> ---EXPECTF-- +--EXPECT-- A::p (static) A::p (static) B::p (static) diff --git a/tests/classes/property_override_public_private.phpt b/tests/classes/property_override_public_private.phpt index c0f37ad95a..45687fbacc 100644 --- a/tests/classes/property_override_public_private.phpt +++ b/tests/classes/property_override_public_private.phpt @@ -31,4 +31,3 @@ Redeclare inherited public property as private. --EXPECTF-- Fatal error: Access level to B::$p must be public (as in class A) in %s on line 18 - diff --git a/tests/classes/property_override_public_protected.phpt b/tests/classes/property_override_public_protected.phpt index 68fdf8286f..20795b5835 100644 --- a/tests/classes/property_override_public_protected.phpt +++ b/tests/classes/property_override_public_protected.phpt @@ -31,4 +31,3 @@ Redeclare inherited public property as protected. --EXPECTF-- Fatal error: Access level to B::$p must be public (as in class A) in %s on line 18 - diff --git a/tests/classes/property_override_public_public.phpt b/tests/classes/property_override_public_public.phpt index 893fe5d048..3abfe24e29 100644 --- a/tests/classes/property_override_public_public.phpt +++ b/tests/classes/property_override_public_public.phpt @@ -28,7 +28,7 @@ Redeclare inherited public property as public. $b->showA(); $b->showB(); ?> ---EXPECTF-- +--EXPECT-- A::p B::p B::p diff --git a/tests/classes/serialize_001.phpt b/tests/classes/serialize_001.phpt index 44d7bafadb..27d553e3de 100755 --- a/tests/classes/serialize_001.phpt +++ b/tests/classes/serialize_001.phpt @@ -49,36 +49,6 @@ foreach($tests as $data) <?php exit(0); ?> --EXPECT-- ========== -string(6) "String" -Test::__construct(String) -Test::serialize(String) -Test::unserialize(String) -object(Test)#1 (1) { - ["data"]=> - string(6) "String" -} -object(Test)#1 (1) { - ["data"]=> - string(6) "String" -} -========== -NULL -Test::__construct() -Test::serialize() -NULL -========== -int(42) -Test::__construct(42) -Test::serialize(42) -Exception: Test::serialize() must return a string or NULL -========== -bool(false) -Test::__construct() -Test::serialize() -Exception: Test::serialize() must return a string or NULL -===DONE=== ---UEXPECT-- -========== unicode(6) "String" Test::__construct(String) Test::serialize(String) diff --git a/tests/classes/static_mix_1.phpt b/tests/classes/static_mix_1.phpt index ecc9c01a28..a25df8204b 100644 --- a/tests/classes/static_mix_1.phpt +++ b/tests/classes/static_mix_1.phpt @@ -21,6 +21,6 @@ pass::show(); fail::show(); echo "Done\n"; // shouldn't be displayed -?> +?> --EXPECTF-- -Fatal error: Cannot make static method pass::show() non static in class fail in %s on line %d
\ No newline at end of file +Fatal error: Cannot make static method pass::show() non static in class fail in %s on line %d diff --git a/tests/classes/static_mix_2.phpt b/tests/classes/static_mix_2.phpt index bbdaedf50a..cecb37bdaf 100644 --- a/tests/classes/static_mix_2.phpt +++ b/tests/classes/static_mix_2.phpt @@ -24,4 +24,4 @@ fail::show(); echo "Done\n"; // shouldn't be displayed ?> --EXPECTF-- -Fatal error: Cannot make non static method pass::show() static in class fail in %s on line %d
\ No newline at end of file +Fatal error: Cannot make non static method pass::show() static in class fail in %s on line %d diff --git a/tests/classes/static_properties_001.phpt b/tests/classes/static_properties_001.phpt index 1c34f68fc5..699f1895a9 100755 --- a/tests/classes/static_properties_001.phpt +++ b/tests/classes/static_properties_001.phpt @@ -17,7 +17,7 @@ var_dump(test::$ar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(1) { diff --git a/tests/classes/tostring_001.phpt b/tests/classes/tostring_001.phpt index d5ec4d9c25..4f8d482bac 100755 --- a/tests/classes/tostring_001.phpt +++ b/tests/classes/tostring_001.phpt @@ -81,60 +81,6 @@ echo $o; test1 Object ( ) -string(54) "Object of class test1 could not be converted to string" -string(0) "" -object(test1)#%d (0) { -} -====test2==== -test2 Object -( -) -test2::__toString() -Converted -object(test2)#%d (0) { -} -====test3==== -test2::__toString() -Converted -====test4==== -test2::__toString() -string:Converted -====test5==== -test2::__toString() -1Converted -1test2::__toString() -Converted -====test6==== -test2::__toString() -test2::__toString() -Converted -Converted -test2::__toString() -Converted -test2::__toString() -Converted -====test7==== -test2::__toString() -string(19) "Illegal offset type" -====test8==== -test2::__toString() -string(9) "Converted" -test2::__toString() -string(9) "Converted" -====test9==== -test2::__toString() -Converted -====test10==== -object(test3)#%d (0) { -} -test3::__toString() -string(53) "Method test3::__toString() must return a string value" -====DONE==== ---UEXPECTF-- -====test1==== -test1 Object -( -) unicode(54) "Object of class test1 could not be converted to string" unicode(0) "" object(test1)#%d (0) { diff --git a/tests/classes/tostring_002.phpt b/tests/classes/tostring_002.phpt index 8a4a7af339..ecc9e25ffd 100755 --- a/tests/classes/tostring_002.phpt +++ b/tests/classes/tostring_002.phpt @@ -25,7 +25,7 @@ $o = new Test; ?> ====DONE==== ---EXPECTF-- +--EXPECT-- Hello ====DONE==== Hello diff --git a/tests/classes/tostring_004.phpt b/tests/classes/tostring_004.phpt index a323a5bfc5..dc078a35ce 100644 --- a/tests/classes/tostring_004.phpt +++ b/tests/classes/tostring_004.phpt @@ -34,26 +34,7 @@ echo "\nTry 2:\n"; printf($obj . "\n"); ?> ---EXPECTF-- -Object with no __toString(): -Try 1: -Error: 4096 - Object of class stdClass could not be converted to string -Error: 8 - Object of class stdClass to string conversion -Object - -Try 2: -Error: 4096 - Object of class stdClass could not be converted to string - - - -Object with bad __toString(): -Try 1: -Error: 4096 - Method badToString::__toString() must return a string value - - -Try 2: -Error: 4096 - Method badToString::__toString() must return a string value ---UEXPECTF-- +--EXPECT-- Object with no __toString(): Try 1: Error: 4096 - Object of class stdClass could not be converted to Unicode string diff --git a/tests/classes/visibility_000c.phpt b/tests/classes/visibility_000c.phpt index 064106e979..ffa9c52143 100644 --- a/tests/classes/visibility_000c.phpt +++ b/tests/classes/visibility_000c.phpt @@ -29,5 +29,5 @@ class fail extends same { echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_001c.phpt b/tests/classes/visibility_001c.phpt index bb1075aaed..0c470f3746 100644 --- a/tests/classes/visibility_001c.phpt +++ b/tests/classes/visibility_001c.phpt @@ -29,5 +29,5 @@ class fail extends same { echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_002c.phpt b/tests/classes/visibility_002c.phpt index 5edae1d068..c266f95d16 100644 --- a/tests/classes/visibility_002c.phpt +++ b/tests/classes/visibility_002c.phpt @@ -29,5 +29,5 @@ class fail extends same { echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_003a.phpt b/tests/classes/visibility_003a.phpt index 1693386f81..38f68d1f95 100644 --- a/tests/classes/visibility_003a.phpt +++ b/tests/classes/visibility_003a.phpt @@ -29,5 +29,5 @@ class fail extends same { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_003c.phpt b/tests/classes/visibility_003c.phpt index d94a9c116b..4e15845100 100644 --- a/tests/classes/visibility_003c.phpt +++ b/tests/classes/visibility_003c.phpt @@ -29,5 +29,5 @@ class fail extends same { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_004a.phpt b/tests/classes/visibility_004a.phpt index 6f16a09edd..9b70927045 100644 --- a/tests/classes/visibility_004a.phpt +++ b/tests/classes/visibility_004a.phpt @@ -29,5 +29,5 @@ class fail extends same { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_004b.phpt b/tests/classes/visibility_004b.phpt index 74a83185ee..457446f792 100644 --- a/tests/classes/visibility_004b.phpt +++ b/tests/classes/visibility_004b.phpt @@ -29,5 +29,5 @@ class fail extends same { echo "Done\n"; // shouldn't be displayed ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/classes/visibility_004c.phpt b/tests/classes/visibility_004c.phpt index 92a770374e..6f1ff355bc 100644 --- a/tests/classes/visibility_004c.phpt +++ b/tests/classes/visibility_004c.phpt @@ -29,5 +29,5 @@ class fail extends same { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/tests/func/003.phpt b/tests/func/003.phpt index d603784076..d864c334f5 100644 --- a/tests/func/003.phpt +++ b/tests/func/003.phpt @@ -288,4 +288,3 @@ factorial(4) = 24 3 4 5 - diff --git a/tests/func/005.phpt b/tests/func/005.phpt index c4215feb49..3c8a6de947 100644 --- a/tests/func/005.phpt +++ b/tests/func/005.phpt @@ -16,4 +16,3 @@ print "foo() will be called on shutdown...\n"; --EXPECT-- foo() will be called on shutdown... foo - diff --git a/tests/func/006.phpt b/tests/func/006.phpt index f634906d5a..077b6f873c 100644 --- a/tests/func/006.phpt +++ b/tests/func/006.phpt @@ -24,6 +24,3 @@ var_dump( $a ); // 1A --EXPECT-- string(2) "2B" string(2) "1A" ---UEXPECT-- -string(2) "2B" -string(2) "1A" diff --git a/tests/func/010.phpt b/tests/func/010.phpt index 6778ed2f11..ffc64a1130 100644 --- a/tests/func/010.phpt +++ b/tests/func/010.phpt @@ -8,7 +8,7 @@ $boundary = 64*1024; $limit = $boundary+42; -function test($a,$b) +function test($a, $b) { var_dump($a === $b); test2($a,$b); diff --git a/tests/lang/004.phpt b/tests/lang/004.phpt index be8ebf4155..470c68f543 100644 --- a/tests/lang/004.phpt +++ b/tests/lang/004.phpt @@ -8,6 +8,6 @@ if($a==0) { } else { echo "good"; } -?> +?> --EXPECT-- good diff --git a/tests/lang/005.phpt b/tests/lang/005.phpt index 404a7cbbf6..02c885104a 100644 --- a/tests/lang/005.phpt +++ b/tests/lang/005.phpt @@ -11,6 +11,6 @@ if($a==0) { } else { echo "good"; } -?> +?> --EXPECT-- good diff --git a/tests/lang/006.phpt b/tests/lang/006.phpt index 2a2db013ab..5056b8a4ee 100644 --- a/tests/lang/006.phpt +++ b/tests/lang/006.phpt @@ -18,6 +18,6 @@ if($a==0) { echo "bad"; } } -?> +?> --EXPECT-- good diff --git a/tests/lang/007.phpt b/tests/lang/007.phpt index 4576d4efa5..946ae9babb 100644 --- a/tests/lang/007.phpt +++ b/tests/lang/007.phpt @@ -17,9 +17,9 @@ function Test() echo "$a $c "; } -Test(); +Test(); echo "$a $b $c "; -Test(); +Test(); echo "$a $b $c "; Test(); ?> diff --git a/tests/lang/023-1.inc b/tests/lang/023-1.inc index 8d52e844c9..beec28b13a 100755 --- a/tests/lang/023-1.inc +++ b/tests/lang/023-1.inc @@ -9,7 +9,7 @@ */ ?> -*** Testing assignments and variable aliasing: ***<br> +*** Testing assignments and variable aliasing: ***<br /> <?php /* This test tests assignments to variables using other variables as variable-names */ $a = "b"; @@ -17,85 +17,85 @@ $$$a = "blah"; ${$$$a}["associative arrays work too"] = "this is nifty"; ?> -This should read "blah": <?php echo "$test<br>\n"; ?> -This should read "this is nifty": <?php echo $blah[$test="associative arrays work too"]."<br>\n"; ?> -*************************************************<br> +This should read "blah": <?php echo "$test<br />\n"; ?> +This should read "this is nifty": <?php echo $blah[$test="associative arrays work too"]."<br />\n"; ?> +*************************************************<br /> -*** Testing integer operators ***<br> +*** Testing integer operators ***<br /> <?php /* test just about any operator possible on $i and $j (ints) */ $i = 5; $j = 3; ?> -Correct result - 8: <?php echo $i+$j; ?><br> -Correct result - 8: <?php echo $i+$j; ?><br> -Correct result - 2: <?php echo $i-$j; ?><br> -Correct result - -2: <?php echo $j-$i; ?><br> -Correct result - 15: <?php echo $i*$j; ?><br> -Correct result - 15: <?php echo $j*$i; ?><br> -Correct result - 2: <?php echo $i%$j; ?><br> -Correct result - 3: <?php echo $j%$i; ?><br> -*********************************<br> +Correct result - 8: <?php echo $i+$j; ?><br /> +Correct result - 8: <?php echo $i+$j; ?><br /> +Correct result - 2: <?php echo $i-$j; ?><br /> +Correct result - -2: <?php echo $j-$i; ?><br /> +Correct result - 15: <?php echo $i*$j; ?><br /> +Correct result - 15: <?php echo $j*$i; ?><br /> +Correct result - 2: <?php echo $i%$j; ?><br /> +Correct result - 3: <?php echo $j%$i; ?><br /> +*********************************<br /> -*** Testing real operators ***<br> +*** Testing real operators ***<br /> <?php /* test just about any operator possible on $i and $j (floats) */ $i = 5.0; $j = 3.0; ?> -Correct result - 8: <?php echo $i+$j; ?><br> -Correct result - 8: <?php echo $i+$j; ?><br> -Correct result - 2: <?php echo $i-$j; ?><br> -Correct result - -2: <?php echo $j-$i; ?><br> -Correct result - 15: <?php echo $i*$j; ?><br> -Correct result - 15: <?php echo $j*$i; ?><br> -Correct result - 2: <?php echo $i%$j; ?><br> -Correct result - 3: <?php echo $j%$i; ?><br> -*********************************<br> +Correct result - 8: <?php echo $i+$j; ?><br /> +Correct result - 8: <?php echo $i+$j; ?><br /> +Correct result - 2: <?php echo $i-$j; ?><br /> +Correct result - -2: <?php echo $j-$i; ?><br /> +Correct result - 15: <?php echo $i*$j; ?><br /> +Correct result - 15: <?php echo $j*$i; ?><br /> +Correct result - 2: <?php echo $i%$j; ?><br /> +Correct result - 3: <?php echo $j%$i; ?><br /> +*********************************<br /> -*** Testing if/elseif/else control ***<br> +*** Testing if/elseif/else control ***<br /> <?php /* sick if/elseif/else test by Andi :) */ $a = 5; if ($a == "4") { - echo "This "." does "." not "." work<br>\n"; + echo "This "." does "." not "." work<br />\n"; } elseif ($a == "5") { - echo "This "." works<br>\n"; + echo "This "." works<br />\n"; $a = 6; if ("andi" == ($test = "andi")) { - echo "this_still_works<br>\n"; + echo "this_still_works<br />\n"; } elseif (1) { - echo "should_not_print<br>\n"; + echo "should_not_print<br />\n"; } else { - echo "should_not_print<br>\n"; + echo "should_not_print<br />\n"; } if (44 == 43) { - echo "should_not_print<br>\n"; + echo "should_not_print<br />\n"; } else { - echo "should_print<br>\n"; + echo "should_print<br />\n"; } } elseif ($a == 6) { - echo "this "."broken<br>\n"; + echo "this "."broken<br />\n"; if (0) { - echo "this_should_not_print<br>\n"; + echo "this_should_not_print<br />\n"; } else { - echo "TestingDanglingElse_This_Should_not_print<br>\n"; + echo "TestingDanglingElse_This_Should_not_print<br />\n"; } } else { - echo "This "."does "." not"." work<br>\n"; + echo "This "."does "." not"." work<br />\n"; } ?> -*** Seriously nested if's test ***<br> +*** Seriously nested if's test ***<br /> ** spelling correction by kluzz ** <?php /* yet another sick if/elseif/else test by Zeev */ $i=$j=0; -echo "Only two lines of text should follow:<br>\n"; +echo "Only two lines of text should follow:<br />\n"; if (0) { /* this code is not supposed to be executed */ - echo "hmm, this shouldn't be displayed #1<br>\n"; + echo "hmm, this shouldn't be displayed #1<br />\n"; $j++; if (1) { $i @@ -105,118 +105,118 @@ if (0) { /* this code is not supposed to be executed */ $j = ++$i; if (1) { $j *= $i; - echo "damn, this shouldn't be displayed<br>\n"; + echo "damn, this shouldn't be displayed<br />\n"; } else { $j /= $i; ++$j; - echo "this shouldn't be displayed either<br>\n"; + echo "this shouldn't be displayed either<br />\n"; } } elseif (1) { $i++; $j++; - echo "this isn't supposed to be displayed<br>\n"; + echo "this isn't supposed to be displayed<br />\n"; } } elseif (0) { $i++; - echo "this definitely shouldn't be displayed<br>\n"; + echo "this definitely shouldn't be displayed<br />\n"; } else { --$j; - echo "and this too shouldn't be displayed<br>\n"; + echo "and this too shouldn't be displayed<br />\n"; while ($j>0) { $j--; } } } elseif (2-2) { /* as long as 2-2==0, this isn't supposed to be executed either */ $i = ++$j; - echo "hmm, this shouldn't be displayed #2<br>\n"; + echo "hmm, this shouldn't be displayed #2<br />\n"; if (1) { $j = ++$i; if (0) { $j = $i*2+$j*($i++); if (1) { $i++; - echo "damn, this shouldn't be displayed<br>\n"; + echo "damn, this shouldn't be displayed<br />\n"; } else { $j++; - echo "this shouldn't be displayed either<br>\n"; + echo "this shouldn't be displayed either<br />\n"; } } else if (1) { ++$j; - echo "this isn't supposed to be displayed<br>\n"; + echo "this isn't supposed to be displayed<br />\n"; } } elseif (0) { $j++; - echo "this definitely shouldn't be displayed<br>\n"; + echo "this definitely shouldn't be displayed<br />\n"; } else { $i++; - echo "and this too shouldn't be displayed<br>\n"; + echo "and this too shouldn't be displayed<br />\n"; } } else { $j=$i++; /* this should set $i to 1, but shouldn't change $j (it's assigned $i's previous values, zero) */ - echo "this should be displayed. should be: \$i=1, \$j=0. is: \$i=$i, \$j=$j<br>\n"; + echo "this should be displayed. should be: \$i=1, \$j=0. is: \$i=$i, \$j=$j<br />\n"; if (1) { $j += ++$i; /* ++$i --> $i==2, $j += 2 --> $j==2 */ if (0) { $j += 40; if (1) { $i += 50; - echo "damn, this shouldn't be displayed<br>\n"; + echo "damn, this shouldn't be displayed<br />\n"; } else { $j += 20; - echo "this shouldn't be displayed either<br>\n"; + echo "this shouldn't be displayed either<br />\n"; } } else if (1) { $j *= $i; /* $j *= 2 --> $j == 4 */ - echo "this is supposed to be displayed. should be: \$i=2, \$j=4. is: \$i=$i, \$j=$j<br>\n"; - echo "3 loop iterations should follow:<br>\n"; + echo "this is supposed to be displayed. should be: \$i=2, \$j=4. is: \$i=$i, \$j=$j<br />\n"; + echo "3 loop iterations should follow:<br />\n"; while ($i<=$j) { - echo $i++." $j<br>\n"; + echo $i++." $j<br />\n"; } } } elseif (0) { - echo "this definitely shouldn't be displayed<br>\n"; + echo "this definitely shouldn't be displayed<br />\n"; } else { - echo "and this too shouldn't be displayed<br>\n"; + echo "and this too shouldn't be displayed<br />\n"; } - echo "**********************************<br>\n"; + echo "**********************************<br />\n"; } ?> -*** C-style else-if's ***<br> +*** C-style else-if's ***<br /> <?php /* looks like without we even tried, C-style else-if structure works fine! */ if ($a=0) { - echo "This shouldn't be displayed<br>\n"; + echo "This shouldn't be displayed<br />\n"; } else if ($a++) { - echo "This shouldn't be displayed either<br>\n"; + echo "This shouldn't be displayed either<br />\n"; } else if (--$a) { - echo "No, this neither<br>\n"; + echo "No, this neither<br />\n"; } else if (++$a) { - echo "This should be displayed<br>\n"; + echo "This should be displayed<br />\n"; } else { - echo "This shouldn't be displayed at all<br>\n"; + echo "This shouldn't be displayed at all<br />\n"; } ?> -*************************<br> +*************************<br /> -*** WHILE tests ***<br> +*** WHILE tests ***<br /> <?php $i=0; $j=20; while ($i<(2*$j)) { if ($i>$j) { - echo "$i is greater than $j<br>\n"; + echo "$i is greater than $j<br />\n"; } else if ($i==$j) { - echo "$i equals $j<br>\n"; + echo "$i equals $j<br />\n"; } else { - echo "$i is smaller than $j<br>\n"; + echo "$i is smaller than $j<br />\n"; } $i++; } ?> -*******************<br> +*******************<br /> -*** Nested WHILEs ***<br> +*** Nested WHILEs ***<br /> <?php $arr_len=3; @@ -234,7 +234,7 @@ while ($i<$arr_len) { $i++; } -echo "Each array variable should be equal to the sum of its indices:<br>\n"; +echo "Each array variable should be equal to the sum of its indices:<br />\n"; $i=0; while ($i<$arr_len) { @@ -242,7 +242,7 @@ while ($i<$arr_len) { while ($j<$arr_len) { $k=0; while ($k<$arr_len) { - echo "\${test$i$j}[$k] = ".${"test$i$j"}[$k]."<br>\n"; + echo "\${test$i$j}[$k] = ".${"test$i$j"}[$k]."<br />\n"; $k++; } $j++; @@ -250,9 +250,9 @@ while ($i<$arr_len) { $i++; } ?> -*********************<br> +*********************<br /> -*** hash test... ***<br> +*** hash test... ***<br /> <?php /* $i=0; @@ -264,21 +264,21 @@ while ($i<10000) { $i=0; while ($i<10000) { - echo $arr[$i++]."<br>\n"; + echo $arr[$i++]."<br />\n"; } */ echo "commented out..."; ?> -**************************<br> +**************************<br /> -*** Hash resizing test ***<br> +*** Hash resizing test ***<br /> <?php $i = 10; $a = 'b'; while ($i > 0) { $a = $a . 'a'; - echo "$a<br>\n"; + echo "$a<br />\n"; $resize[$a] = $i; $i--; } @@ -286,31 +286,31 @@ $i = 10; $a = 'b'; while ($i > 0) { $a = $a . 'a'; - echo "$a<br>\n"; - echo $resize[$a]."<br>\n"; + echo "$a<br />\n"; + echo $resize[$a]."<br />\n"; $i--; } ?> -**************************<br> +**************************<br /> -*** break/continue test ***<br> +*** break/continue test ***<br /> <?php $i=0; -echo "\$i should go from 0 to 2<br>\n"; +echo "\$i should go from 0 to 2<br />\n"; while ($i<5) { if ($i>2) { break; } $j=0; - echo "\$j should go from 3 to 4, and \$q should go from 3 to 4<br>\n"; + echo "\$j should go from 3 to 4, and \$q should go from 3 to 4<br />\n"; while ($j<5) { if ($j<=2) { $j++; continue; } - echo " \$j=$j<br>\n"; + echo " \$j=$j<br />\n"; for ($q=0; $q<=10; $q++) { if ($q<3) { continue; @@ -318,39 +318,39 @@ while ($i<5) { if ($q>4) { break; } - echo " \$q=$q<br>\n"; + echo " \$q=$q<br />\n"; } $j++; } $j=0; - echo "\$j should go from 0 to 2<br>\n"; + echo "\$j should go from 0 to 2<br />\n"; while ($j<5) { if ($j>2) { $k=0; - echo "\$k should go from 0 to 2<br>\n"; + echo "\$k should go from 0 to 2<br />\n"; while ($k<5) { if ($k>2) { break 2; } - echo " \$k=$k<br>\n"; + echo " \$k=$k<br />\n"; $k++; } } - echo " \$j=$j<br>\n"; + echo " \$j=$j<br />\n"; $j++; } - echo "\$i=$i<br>\n"; + echo "\$i=$i<br />\n"; $i++; } ?> -***********************<br> +***********************<br /> -*** Nested file include test ***<br> +*** Nested file include test ***<br /> <?php include("023-2.inc"); ?> -********************************<br> +********************************<br /> <?php { - echo "Tests completed.<br>\n"; # testing some PHP style comment... + echo "Tests completed.<br />\n"; # testing some PHP style comment... } ?> diff --git a/tests/lang/023.phpt b/tests/lang/023.phpt index 331308d01d..87fd2b0b02 100644 --- a/tests/lang/023.phpt +++ b/tests/lang/023.phpt @@ -30,227 +30,227 @@ PHP Regression Test <html> <head> -*** Testing assignments and variable aliasing: ***<br> -This should read "blah": blah<br> -This should read "this is nifty": this is nifty<br> -*************************************************<br> +*** Testing assignments and variable aliasing: ***<br /> +This should read "blah": blah<br /> +This should read "this is nifty": this is nifty<br /> +*************************************************<br /> -*** Testing integer operators ***<br> -Correct result - 8: 8<br> -Correct result - 8: 8<br> -Correct result - 2: 2<br> -Correct result - -2: -2<br> -Correct result - 15: 15<br> -Correct result - 15: 15<br> -Correct result - 2: 2<br> -Correct result - 3: 3<br> -*********************************<br> +*** Testing integer operators ***<br /> +Correct result - 8: 8<br /> +Correct result - 8: 8<br /> +Correct result - 2: 2<br /> +Correct result - -2: -2<br /> +Correct result - 15: 15<br /> +Correct result - 15: 15<br /> +Correct result - 2: 2<br /> +Correct result - 3: 3<br /> +*********************************<br /> -*** Testing real operators ***<br> -Correct result - 8: 8<br> -Correct result - 8: 8<br> -Correct result - 2: 2<br> -Correct result - -2: -2<br> -Correct result - 15: 15<br> -Correct result - 15: 15<br> -Correct result - 2: 2<br> -Correct result - 3: 3<br> -*********************************<br> +*** Testing real operators ***<br /> +Correct result - 8: 8<br /> +Correct result - 8: 8<br /> +Correct result - 2: 2<br /> +Correct result - -2: -2<br /> +Correct result - 15: 15<br /> +Correct result - 15: 15<br /> +Correct result - 2: 2<br /> +Correct result - 3: 3<br /> +*********************************<br /> -*** Testing if/elseif/else control ***<br> +*** Testing if/elseif/else control ***<br /> -This works<br> -this_still_works<br> -should_print<br> +This works<br /> +this_still_works<br /> +should_print<br /> -*** Seriously nested if's test ***<br> +*** Seriously nested if's test ***<br /> ** spelling correction by kluzz ** -Only two lines of text should follow:<br> -this should be displayed. should be: $i=1, $j=0. is: $i=1, $j=0<br> -this is supposed to be displayed. should be: $i=2, $j=4. is: $i=2, $j=4<br> -3 loop iterations should follow:<br> -2 4<br> -3 4<br> -4 4<br> -**********************************<br> +Only two lines of text should follow:<br /> +this should be displayed. should be: $i=1, $j=0. is: $i=1, $j=0<br /> +this is supposed to be displayed. should be: $i=2, $j=4. is: $i=2, $j=4<br /> +3 loop iterations should follow:<br /> +2 4<br /> +3 4<br /> +4 4<br /> +**********************************<br /> -*** C-style else-if's ***<br> -This should be displayed<br> -*************************<br> +*** C-style else-if's ***<br /> +This should be displayed<br /> +*************************<br /> -*** WHILE tests ***<br> -0 is smaller than 20<br> -1 is smaller than 20<br> -2 is smaller than 20<br> -3 is smaller than 20<br> -4 is smaller than 20<br> -5 is smaller than 20<br> -6 is smaller than 20<br> -7 is smaller than 20<br> -8 is smaller than 20<br> -9 is smaller than 20<br> -10 is smaller than 20<br> -11 is smaller than 20<br> -12 is smaller than 20<br> -13 is smaller than 20<br> -14 is smaller than 20<br> -15 is smaller than 20<br> -16 is smaller than 20<br> -17 is smaller than 20<br> -18 is smaller than 20<br> -19 is smaller than 20<br> -20 equals 20<br> -21 is greater than 20<br> -22 is greater than 20<br> -23 is greater than 20<br> -24 is greater than 20<br> -25 is greater than 20<br> -26 is greater than 20<br> -27 is greater than 20<br> -28 is greater than 20<br> -29 is greater than 20<br> -30 is greater than 20<br> -31 is greater than 20<br> -32 is greater than 20<br> -33 is greater than 20<br> -34 is greater than 20<br> -35 is greater than 20<br> -36 is greater than 20<br> -37 is greater than 20<br> -38 is greater than 20<br> -39 is greater than 20<br> -*******************<br> +*** WHILE tests ***<br /> +0 is smaller than 20<br /> +1 is smaller than 20<br /> +2 is smaller than 20<br /> +3 is smaller than 20<br /> +4 is smaller than 20<br /> +5 is smaller than 20<br /> +6 is smaller than 20<br /> +7 is smaller than 20<br /> +8 is smaller than 20<br /> +9 is smaller than 20<br /> +10 is smaller than 20<br /> +11 is smaller than 20<br /> +12 is smaller than 20<br /> +13 is smaller than 20<br /> +14 is smaller than 20<br /> +15 is smaller than 20<br /> +16 is smaller than 20<br /> +17 is smaller than 20<br /> +18 is smaller than 20<br /> +19 is smaller than 20<br /> +20 equals 20<br /> +21 is greater than 20<br /> +22 is greater than 20<br /> +23 is greater than 20<br /> +24 is greater than 20<br /> +25 is greater than 20<br /> +26 is greater than 20<br /> +27 is greater than 20<br /> +28 is greater than 20<br /> +29 is greater than 20<br /> +30 is greater than 20<br /> +31 is greater than 20<br /> +32 is greater than 20<br /> +33 is greater than 20<br /> +34 is greater than 20<br /> +35 is greater than 20<br /> +36 is greater than 20<br /> +37 is greater than 20<br /> +38 is greater than 20<br /> +39 is greater than 20<br /> +*******************<br /> -*** Nested WHILEs ***<br> -Each array variable should be equal to the sum of its indices:<br> -${test00}[0] = 0<br> -${test00}[1] = 1<br> -${test00}[2] = 2<br> -${test01}[0] = 1<br> -${test01}[1] = 2<br> -${test01}[2] = 3<br> -${test02}[0] = 2<br> -${test02}[1] = 3<br> -${test02}[2] = 4<br> -${test10}[0] = 1<br> -${test10}[1] = 2<br> -${test10}[2] = 3<br> -${test11}[0] = 2<br> -${test11}[1] = 3<br> -${test11}[2] = 4<br> -${test12}[0] = 3<br> -${test12}[1] = 4<br> -${test12}[2] = 5<br> -${test20}[0] = 2<br> -${test20}[1] = 3<br> -${test20}[2] = 4<br> -${test21}[0] = 3<br> -${test21}[1] = 4<br> -${test21}[2] = 5<br> -${test22}[0] = 4<br> -${test22}[1] = 5<br> -${test22}[2] = 6<br> -*********************<br> +*** Nested WHILEs ***<br /> +Each array variable should be equal to the sum of its indices:<br /> +${test00}[0] = 0<br /> +${test00}[1] = 1<br /> +${test00}[2] = 2<br /> +${test01}[0] = 1<br /> +${test01}[1] = 2<br /> +${test01}[2] = 3<br /> +${test02}[0] = 2<br /> +${test02}[1] = 3<br /> +${test02}[2] = 4<br /> +${test10}[0] = 1<br /> +${test10}[1] = 2<br /> +${test10}[2] = 3<br /> +${test11}[0] = 2<br /> +${test11}[1] = 3<br /> +${test11}[2] = 4<br /> +${test12}[0] = 3<br /> +${test12}[1] = 4<br /> +${test12}[2] = 5<br /> +${test20}[0] = 2<br /> +${test20}[1] = 3<br /> +${test20}[2] = 4<br /> +${test21}[0] = 3<br /> +${test21}[1] = 4<br /> +${test21}[2] = 5<br /> +${test22}[0] = 4<br /> +${test22}[1] = 5<br /> +${test22}[2] = 6<br /> +*********************<br /> -*** hash test... ***<br> +*** hash test... ***<br /> commented out... -**************************<br> +**************************<br /> -*** Hash resizing test ***<br> -ba<br> -baa<br> -baaa<br> -baaaa<br> -baaaaa<br> -baaaaaa<br> -baaaaaaa<br> -baaaaaaaa<br> -baaaaaaaaa<br> -baaaaaaaaaa<br> -ba<br> -10<br> -baa<br> -9<br> -baaa<br> -8<br> -baaaa<br> -7<br> -baaaaa<br> -6<br> -baaaaaa<br> -5<br> -baaaaaaa<br> -4<br> -baaaaaaaa<br> -3<br> -baaaaaaaaa<br> -2<br> -baaaaaaaaaa<br> -1<br> -**************************<br> +*** Hash resizing test ***<br /> +ba<br /> +baa<br /> +baaa<br /> +baaaa<br /> +baaaaa<br /> +baaaaaa<br /> +baaaaaaa<br /> +baaaaaaaa<br /> +baaaaaaaaa<br /> +baaaaaaaaaa<br /> +ba<br /> +10<br /> +baa<br /> +9<br /> +baaa<br /> +8<br /> +baaaa<br /> +7<br /> +baaaaa<br /> +6<br /> +baaaaaa<br /> +5<br /> +baaaaaaa<br /> +4<br /> +baaaaaaaa<br /> +3<br /> +baaaaaaaaa<br /> +2<br /> +baaaaaaaaaa<br /> +1<br /> +**************************<br /> -*** break/continue test ***<br> -$i should go from 0 to 2<br> -$j should go from 3 to 4, and $q should go from 3 to 4<br> - $j=3<br> - $q=3<br> - $q=4<br> - $j=4<br> - $q=3<br> - $q=4<br> -$j should go from 0 to 2<br> - $j=0<br> - $j=1<br> - $j=2<br> -$k should go from 0 to 2<br> - $k=0<br> - $k=1<br> - $k=2<br> -$i=0<br> -$j should go from 3 to 4, and $q should go from 3 to 4<br> - $j=3<br> - $q=3<br> - $q=4<br> - $j=4<br> - $q=3<br> - $q=4<br> -$j should go from 0 to 2<br> - $j=0<br> - $j=1<br> - $j=2<br> -$k should go from 0 to 2<br> - $k=0<br> - $k=1<br> - $k=2<br> -$i=1<br> -$j should go from 3 to 4, and $q should go from 3 to 4<br> - $j=3<br> - $q=3<br> - $q=4<br> - $j=4<br> - $q=3<br> - $q=4<br> -$j should go from 0 to 2<br> - $j=0<br> - $j=1<br> - $j=2<br> -$k should go from 0 to 2<br> - $k=0<br> - $k=1<br> - $k=2<br> -$i=2<br> -***********************<br> +*** break/continue test ***<br /> +$i should go from 0 to 2<br /> +$j should go from 3 to 4, and $q should go from 3 to 4<br /> + $j=3<br /> + $q=3<br /> + $q=4<br /> + $j=4<br /> + $q=3<br /> + $q=4<br /> +$j should go from 0 to 2<br /> + $j=0<br /> + $j=1<br /> + $j=2<br /> +$k should go from 0 to 2<br /> + $k=0<br /> + $k=1<br /> + $k=2<br /> +$i=0<br /> +$j should go from 3 to 4, and $q should go from 3 to 4<br /> + $j=3<br /> + $q=3<br /> + $q=4<br /> + $j=4<br /> + $q=3<br /> + $q=4<br /> +$j should go from 0 to 2<br /> + $j=0<br /> + $j=1<br /> + $j=2<br /> +$k should go from 0 to 2<br /> + $k=0<br /> + $k=1<br /> + $k=2<br /> +$i=1<br /> +$j should go from 3 to 4, and $q should go from 3 to 4<br /> + $j=3<br /> + $q=3<br /> + $q=4<br /> + $j=4<br /> + $q=3<br /> + $q=4<br /> +$j should go from 0 to 2<br /> + $j=0<br /> + $j=1<br /> + $j=2<br /> +$k should go from 0 to 2<br /> + $k=0<br /> + $k=1<br /> + $k=2<br /> +$i=2<br /> +***********************<br /> -*** Nested file include test ***<br> +*** Nested file include test ***<br /> <html> This is Finish.phtml. This file is supposed to be included from regression_test.phtml. This is normal HTML. and this is PHP code, 2+2=4 </html> -********************************<br> +********************************<br /> -Tests completed.<br> +Tests completed.<br /> Limor Ullmann is now Limor Baruch :I diff --git a/tests/lang/028.phpt b/tests/lang/028.phpt index bd4525ee60..a14e74cad8 100644 --- a/tests/lang/028.phpt +++ b/tests/lang/028.phpt @@ -1055,4 +1055,3 @@ I'm still alive Hey there!! 199 Dafna - diff --git a/tests/lang/032.phpt b/tests/lang/032.phpt index caa4c7e430..abc98f752d 100644 --- a/tests/lang/032.phpt +++ b/tests/lang/032.phpt @@ -33,4 +33,3 @@ echo "OK\n"; ?> --EXPECT-- OK - diff --git a/tests/lang/034.phpt b/tests/lang/034.phpt index aef3f8f352..046ae33f33 100644 --- a/tests/lang/034.phpt +++ b/tests/lang/034.phpt @@ -15,8 +15,6 @@ setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1"); echo (float)"3.14", "\n"; ?> ---EXPECT-- -3,14 ---UEXPECTF-- -Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d +--EXPECTF-- +Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s034.php on line %d 3,14 diff --git a/tests/lang/035.phpt b/tests/lang/035.phpt index 9472999f47..d2d49be988 100644 --- a/tests/lang/035.phpt +++ b/tests/lang/035.phpt @@ -28,7 +28,7 @@ try { } try { - ThrowException(); + ThrowException(); } catch (MyException $exception) { print "There was an exception: " . $exception->getException(); print "\n"; diff --git a/tests/lang/038.phpt b/tests/lang/038.phpt index ef510d2237..5ea0cd1eb9 100755 --- a/tests/lang/038.phpt +++ b/tests/lang/038.phpt @@ -35,11 +35,7 @@ catch (Exception $e) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- -string(15) "Error2Exception" -string(5) "fopen" -===DONE=== ---UEXPECTF-- +--EXPECT-- unicode(15) "Error2Exception" unicode(5) "fopen" ===DONE=== diff --git a/tests/lang/039.phpt b/tests/lang/039.phpt index aa4b591649..b353e0fa4b 100755 --- a/tests/lang/039.phpt +++ b/tests/lang/039.phpt @@ -40,6 +40,6 @@ catch (Exception $e) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Catchable ===DONE=== diff --git a/tests/lang/bug18872.phpt b/tests/lang/bug18872.phpt index 2e3dc22c58..5e5333879d 100644 --- a/tests/lang/bug18872.phpt +++ b/tests/lang/bug18872.phpt @@ -1,18 +1,18 @@ --TEST-- Bug #18872 (class constant used as default parameter) --FILE-- -<?php -class FooBar { - const BIFF = 3; -} - -function foo($biff = FooBar::BIFF) { - echo $biff . "\n"; -} - -foo(); -foo(); -?> +<?php +class FooBar { + const BIFF = 3; +} + +function foo($biff = FooBar::BIFF) { + echo $biff . "\n"; +} + +foo(); +foo(); +?> --EXPECT-- 3 3 diff --git a/tests/lang/bug19943.phpt b/tests/lang/bug19943.phpt index dae06c9c72..919c192612 100644 --- a/tests/lang/bug19943.phpt +++ b/tests/lang/bug19943.phpt @@ -26,16 +26,4 @@ Bug #19943 (memleaks) 7 -- 7 8 -- 8 9 -- 9 -string(10) "0123456780" ---UEXPECT-- -0 -- 0 -1 -- 1 -2 -- 2 -3 -- 3 -4 -- 4 -5 -- 5 -6 -- 6 -7 -- 7 -8 -- 8 -9 -- 9 unicode(10) "0123456780" diff --git a/tests/lang/bug21094.phpt b/tests/lang/bug21094.phpt index 266a1d6c8f..88ae051271 100644 --- a/tests/lang/bug21094.phpt +++ b/tests/lang/bug21094.phpt @@ -14,4 +14,3 @@ trigger_error("test"); ?> --EXPECTF-- [1024] errstr: test, errfile: %s, errline: %d - diff --git a/tests/lang/bug21600.phpt b/tests/lang/bug21600.phpt index 835daaf97a..9683408f69 100644 --- a/tests/lang/bug21600.phpt +++ b/tests/lang/bug21600.phpt @@ -28,18 +28,6 @@ function fubar($text){ --EXPECTF-- Strict Standards: Only variables should be assigned by reference in %sbug21600.php on line 4 array(1) { - ["foo"]=> - string(4) "test" -} - -Strict Standards: Only variables should be assigned by reference in %sbug21600.php on line 11 -array(1) { - ["foo"]=> - string(4) "test" -} ---UEXPECTF-- -Strict Standards: Only variables should be assigned by reference in %sbug21600.php on line 4 -array(1) { [u"foo"]=> unicode(4) "test" } diff --git a/tests/lang/bug21961.phpt b/tests/lang/bug21961.phpt index 75677c7473..546e9518e5 100644 --- a/tests/lang/bug21961.phpt +++ b/tests/lang/bug21961.phpt @@ -55,6 +55,4 @@ $x->getdrunk('The old Tavern'); var_dump($x->bars[0]->whosdrunk()); ?> --EXPECT-- -string(14) "The old Tavern" ---UEXPECT-- unicode(14) "The old Tavern" diff --git a/tests/lang/bug22231.phpt b/tests/lang/bug22231.phpt index 2b20f98644..c1ab698118 100644 --- a/tests/lang/bug22231.phpt +++ b/tests/lang/bug22231.phpt @@ -29,20 +29,6 @@ var_dump($foo->fubar); --EXPECTF-- Deprecated: Assigning the return value of new by reference is deprecated in %s on line %d object(foo)#%d (1) { - ["fubar"]=> - string(5) "fubar" -} -string(5) "fubar" -string(5) "fubar" -object(foo)#%d (1) { - ["fubar"]=> - string(5) "fubar" -} -string(5) "fubar" -string(5) "fubar" ---UEXPECTF-- -Deprecated: Assigning the return value of new by reference is deprecated in %s on line %d -object(foo)#%d (1) { [u"fubar"]=> unicode(5) "fubar" } diff --git a/tests/lang/bug22592.phpt b/tests/lang/bug22592.phpt index 7b3130bd83..4b6e0df11e 100644 --- a/tests/lang/bug22592.phpt +++ b/tests/lang/bug22592.phpt @@ -35,23 +35,6 @@ var_dump($a, $b, $c, $d, $e); $result{-1} = 'a'; ?> --EXPECT-- -string(5) "* *-*" -string(7) "* *-* *" -string(7) "*4*-* *" -string(7) "*4*s* *" -string(8) "*4*s* *0" -string(8) "*-*-* *0" -string(8) "*-*s*s*0" -string(8) "4-4s4s*0" -string(9) "4-4s4s505" -string(9) "454s4s505" -string(1) "-" -string(1) "s" -string(1) "4" -string(1) "5" -string(1) "5" -[Illegal string offset: -1] ---UEXPECT-- unicode(5) "* *-*" unicode(7) "* *-* *" unicode(7) "*4*-* *" diff --git a/tests/lang/bug23624.phpt b/tests/lang/bug23624.phpt index ae9abbd2a4..3ffd86fdee 100644 --- a/tests/lang/bug23624.phpt +++ b/tests/lang/bug23624.phpt @@ -8,8 +8,5 @@ Bug #23624 (foreach leaves current array key as null) var_dump(current($arr)); ?> --EXPECT-- -string(3) "one" -bool(false) ---UEXPECT-- unicode(3) "one" bool(false) diff --git a/tests/lang/bug24573.phpt b/tests/lang/bug24573.phpt index e087d1fb2c..4a088c35e8 100644 --- a/tests/lang/bug24573.phpt +++ b/tests/lang/bug24573.phpt @@ -21,4 +21,4 @@ echo "OK\n"; ?> --EXPECTF-- -Fatal error: Cannot re-assign $this in %s on line %d
\ No newline at end of file +Fatal error: Cannot re-assign $this in %s on line %d diff --git a/tests/lang/bug25145.phpt b/tests/lang/bug25145.phpt index 2f572df073..98ca7def10 100755 --- a/tests/lang/bug25145.phpt +++ b/tests/lang/bug25145.phpt @@ -16,17 +16,7 @@ array(1) { [123]=> array(1) { [0]=> - string(4) "SEGV" - } -} -Done ---UEXPECT-- -array(1) { - [123]=> - array(1) { - [0]=> unicode(4) "SEGV" } } Done - diff --git a/tests/lang/bug28800.phpt b/tests/lang/bug28800.phpt index f81ad7fec9..77301a6687 100644 --- a/tests/lang/bug28800.phpt +++ b/tests/lang/bug28800.phpt @@ -14,4 +14,3 @@ Bug #28800 (Incorrect string to number conversion for strings starting with 'inf 0 0 0 - diff --git a/tests/lang/bug30638.phpt b/tests/lang/bug30638.phpt index 19df0123a0..72a6b8a2c7 100644 --- a/tests/lang/bug30638.phpt +++ b/tests/lang/bug30638.phpt @@ -17,10 +17,7 @@ $lc = localeconv(); printf("decimal_point: %s\n", $lc['decimal_point']); printf("thousands_sep: %s\n", $lc['thousands_sep']); ?> ---EXPECT-- -decimal_point: , -thousands_sep: . ---UEXPECTF-- +--EXPECTF-- Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d Deprecated: localeconv(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d diff --git a/tests/lang/bug32828.phpt b/tests/lang/bug32828.phpt index ad59646f50..f95ade3169 100644 --- a/tests/lang/bug32828.phpt +++ b/tests/lang/bug32828.phpt @@ -12,7 +12,7 @@ ob_start('output_handler'); ob_end_clean(); ?> ---EXPECTF-- +--EXPECTF-- Fatal error: Uncaught exception 'Exception' in %s:%d Stack trace: #0 [internal function]: output_handler('', %d) diff --git a/tests/lang/bug35382.phpt b/tests/lang/bug35382.phpt index 69190d4c95..c2295c3440 100755 --- a/tests/lang/bug35382.phpt +++ b/tests/lang/bug35382.phpt @@ -5,5 +5,5 @@ Bug #35382 (Comment in end of file produces fatal error) eval("echo 'Hello'; // comment"); echo " World"; //last line comment ---EXPECTF-- +--EXPECT-- Hello World diff --git a/tests/lang/catchable_error_002.phpt b/tests/lang/catchable_error_002.phpt index f81eae5d6f..97a9839505 100644 --- a/tests/lang/catchable_error_002.phpt +++ b/tests/lang/catchable_error_002.phpt @@ -25,21 +25,6 @@ array(5) { [0]=> int(4096) [1]=> - string(%d) "Argument 1 passed to blah() must be an instance of Foo, instance of stdClass given, called in %scatchable_error_002.php on line %d and defined" - [2]=> - string(%d) "%scatchable_error_002.php" - [3]=> - int(5) - [4]=> - array(0) { - } -} -ALIVE! ---UEXPECTF-- -array(5) { - [0]=> - int(4096) - [1]=> unicode(%d) "Argument 1 passed to blah() must be an instance of Foo, instance of stdClass given, called in %scatchable_error_002.php on line %d and defined" [2]=> unicode(%d) "%scatchable_error_002.php" diff --git a/tests/lang/include_variation3.phpt b/tests/lang/include_variation3.phpt index 1fa80c5ab9..04709ab20e 100644 --- a/tests/lang/include_variation3.phpt +++ b/tests/lang/include_variation3.phpt @@ -5,4 +5,4 @@ Including a file in the current script directory from eval'd code require_once 'include_files/eval.inc'; ?> --EXPECT-- -Included!
\ No newline at end of file +Included! diff --git a/tests/lang/type_hints_002.phpt b/tests/lang/type_hints_002.phpt index b21240a792..d9de9dd3b9 100644 --- a/tests/lang/type_hints_002.phpt +++ b/tests/lang/type_hints_002.phpt @@ -25,4 +25,3 @@ NULL - NULL - - diff --git a/tests/output/ob_001.phpt b/tests/output/ob_001.phpt index 09b5c222af..ecacf0208b 100644 --- a/tests/output/ob_001.phpt +++ b/tests/output/ob_001.phpt @@ -4,5 +4,5 @@ output buffering - nothing <?php echo "foo\n"; ?> ---EXPECTF-- +--EXPECT-- foo diff --git a/tests/output/ob_016.phpt b/tests/output/ob_016.phpt index 3adbca17b8..9f056b2f0c 100644 --- a/tests/output/ob_016.phpt +++ b/tests/output/ob_016.phpt @@ -10,11 +10,8 @@ echo "-aäoöuüsß-"; $s = ob_get_clean(); var_dump($s); -var_dump(unicode_decode($s, unicode_semantics()?"utf8":"latin1")); +var_dump(unicode_decode($s, "utf8")); ?> --EXPECTF-- -string(10) "%s" -unicode(10) "%s" ---UEXPECTF-- string(14) "%s" unicode(10) "%s" diff --git a/tests/output/ob_018.phpt b/tests/output/ob_018.phpt Binary files differindex db6eca8b5d..e69b58b6ec 100644 --- a/tests/output/ob_018.phpt +++ b/tests/output/ob_018.phpt diff --git a/tests/run-test/test001.phpt b/tests/run-test/test001.phpt index 370d09c953..d36e72faa0 100644 --- a/tests/run-test/test001.phpt +++ b/tests/run-test/test001.phpt @@ -3,4 +3,4 @@ EXPECT --FILE-- abc --EXPECT-- -abc
\ No newline at end of file +abc diff --git a/tests/run-test/test002.phpt b/tests/run-test/test002.phpt index 7b91f35c8d..316201e092 100644 --- a/tests/run-test/test002.phpt +++ b/tests/run-test/test002.phpt @@ -15,4 +15,4 @@ x %f %s %x -%c
\ No newline at end of file +%c diff --git a/tests/run-test/test003.phpt b/tests/run-test/test003.phpt index c1afad15f7..6f9eb6a794 100644 --- a/tests/run-test/test003.phpt +++ b/tests/run-test/test003.phpt @@ -3,4 +3,4 @@ EXPECTREGEX --FILE-- abcde12314235xyz34264768286abcde --EXPECTREGEX-- -[abcde]+[0-5]*xyz[2-8]+abcde
\ No newline at end of file +[abcde]+[0-5]*xyz[2-8]+abcde diff --git a/tests/run-test/test004.phpt b/tests/run-test/test004.phpt index 4742ea36fd..0397c9a819 100644 --- a/tests/run-test/test004.phpt +++ b/tests/run-test/test004.phpt @@ -7,6 +7,4 @@ arg_separator.input="=" var_dump(ini_get('arg_separator.input')); ?> --EXPECT-- -string(1) "=" ---UEXPECT-- unicode(1) "=" diff --git a/tests/run-test/test005.phpt b/tests/run-test/test005.phpt index 3276acc791..6fed9e8108 100644 --- a/tests/run-test/test005.phpt +++ b/tests/run-test/test005.phpt @@ -23,14 +23,6 @@ $error = 1 / 0; var_dump($php_errormsg); ?> --EXPECTF-- -string(1) "1" -string(5) "16383" -string(1) "0" -string(1) "1" -string(1) "0" -NULL -string(%d) "%sivision by zer%s" ---UEXPECTF-- unicode(1) "1" unicode(5) "16383" unicode(1) "0" diff --git a/tests/run-test/test008.phpt b/tests/run-test/test008.phpt index 3954eb5d89..1b1c2ca99e 100644 --- a/tests/run-test/test008.phpt +++ b/tests/run-test/test008.phpt @@ -24,15 +24,6 @@ var_dump($php_errormsg); ?> --EXPECTF-- %s: %sivision by zero in %s on line %d -string(1) "1" -string(4) "4095" -string(1) "0" -string(1) "1" -string(1) "0" -string(%d) "%sivision by zer%s" -string(%d) "%sivision by zer%s" ---UEXPECTF-- -%s: %sivision by zero in %s on line %d unicode(1) "1" unicode(4) "4095" unicode(1) "0" diff --git a/tests/run-test/test008a.phpt b/tests/run-test/test008a.phpt index e2d59c0b8b..ae79b6e593 100644 --- a/tests/run-test/test008a.phpt +++ b/tests/run-test/test008a.phpt @@ -23,14 +23,6 @@ $error = 1 / 0; var_dump($php_errormsg); ?> --EXPECTF-- -string(1) "1" -string(5) "16383" -string(1) "0" -string(1) "1" -string(1) "0" -NULL -string(%d) "%sivision by zer%s" ---UEXPECTF-- unicode(1) "1" unicode(5) "16383" unicode(1) "0" diff --git a/tests/security/open_basedir_chdir.phpt b/tests/security/open_basedir_chdir.phpt index 32ed4eb1ec..9b3debf189 100644 --- a/tests/security/open_basedir_chdir.phpt +++ b/tests/security/open_basedir_chdir.phpt @@ -48,4 +48,3 @@ bool(false) Warning: chdir(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d bool(false) *** Finished testing open_basedir configuration [chdir] *** - diff --git a/tests/security/open_basedir_chmod.phpt b/tests/security/open_basedir_chmod.phpt index 02fdce5a1b..78a44f88a2 100644 --- a/tests/security/open_basedir_chmod.phpt +++ b/tests/security/open_basedir_chmod.phpt @@ -68,4 +68,3 @@ bool(true) bool(true) bool(true) *** Finished testing open_basedir configuration [chmod] *** - diff --git a/tests/security/open_basedir_copy.phpt b/tests/security/open_basedir_copy.phpt index 8f0f7a91fd..7a1bb4aed9 100644 --- a/tests/security/open_basedir_copy.phpt +++ b/tests/security/open_basedir_copy.phpt @@ -76,4 +76,3 @@ bool(false) bool(true) bool(true) *** Finished testing open_basedir configuration [copy] *** - diff --git a/tests/security/open_basedir_copy_variation1.phpt b/tests/security/open_basedir_copy_variation1.phpt index de532e12cb..d49f368ccb 100644 --- a/tests/security/open_basedir_copy_variation1.phpt +++ b/tests/security/open_basedir_copy_variation1.phpt @@ -32,4 +32,3 @@ bool(false) Warning: unlink(copy.txt): No such file or directory in %s on line %d bool(false) *** Finished testing open_basedir configuration [copy] *** - diff --git a/tests/security/open_basedir_dir.phpt b/tests/security/open_basedir_dir.phpt index 5e3cc7aa16..026c5fdece 100644 --- a/tests/security/open_basedir_dir.phpt +++ b/tests/security/open_basedir_dir.phpt @@ -67,72 +67,6 @@ Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad. Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d bool(false) object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/test/ok/" - ["handle"]=> - resource(%d) of type (stream) -} -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/test/ok" - ["handle"]=> - resource(%d) of type (stream) -} -object(Directory)#%d (2) { - ["path"]=> - string(%d) "%s/test/ok/../ok" - ["handle"]=> - resource(%d) of type (stream) -} -*** Finished testing open_basedir configuration [dir] *** ---UEXPECTF-- -*** Testing open_basedir configuration [dir] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) - -Warning: dir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(../bad): failed to open dir: Operation not permitted in %s on line %d -bool(false) - -Warning: dir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d -bool(false) - -Warning: dir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(..): failed to open dir: Operation not permitted in %s on line %d -bool(false) - -Warning: dir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(../): failed to open dir: Operation not permitted in %s on line %d -bool(false) - -Warning: dir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(/): failed to open dir: Operation not permitted in %s on line %d -bool(false) - -Warning: dir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(../bad/.): failed to open dir: Operation not permitted in %s on line %d -bool(false) - -Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d -bool(false) - -Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d - -Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d -bool(false) -object(Directory)#%d (2) { [u"path"]=> unicode(%d) "%s/test/ok/" [u"handle"]=> @@ -151,4 +85,3 @@ object(Directory)#%d (2) { resource(%d) of type (stream) } *** Finished testing open_basedir configuration [dir] *** - diff --git a/tests/security/open_basedir_error_log.phpt b/tests/security/open_basedir_error_log.phpt index bb899c8adb..97253a1053 100644 --- a/tests/security/open_basedir_error_log.phpt +++ b/tests/security/open_basedir_error_log.phpt @@ -37,26 +37,6 @@ bool(false) Warning: ini_set(): open_basedir restriction in effect. File(%s/bad.txt) is not within the allowed path(s): (.) in %s on line %d bool(false) -string(0) "" -string(%d) "%s/test/ok/ok.txt" -*** Finished testing open_basedir configuration [error_log] *** ---UEXPECTF-- -*** Testing open_basedir configuration [error_log] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) - -Warning: ini_set(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: ini_set(): open_basedir restriction in effect. File(%s/test/bad.txt) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: ini_set(): open_basedir restriction in effect. File(%s/bad.txt) is not within the allowed path(s): (.) in %s on line %d -bool(false) unicode(0) "" unicode(%d) "%s/test/ok/ok.txt" *** Finished testing open_basedir configuration [error_log] *** - diff --git a/tests/security/open_basedir_error_log_variation.phpt b/tests/security/open_basedir_error_log_variation.phpt index c0295f6506..08a6525d0c 100644 --- a/tests/security/open_basedir_error_log_variation.phpt +++ b/tests/security/open_basedir_error_log_variation.phpt @@ -45,4 +45,3 @@ Warning: error_log(%s/bad.txt): failed to open stream: Operation not permitted i bool(false) bool(true) *** Finished testing open_basedir configuration [error_log] *** - diff --git a/tests/security/open_basedir_file.phpt b/tests/security/open_basedir_file.phpt index fbc841e3fe..ef41388966 100644 --- a/tests/security/open_basedir_file.phpt +++ b/tests/security/open_basedir_file.phpt @@ -85,4 +85,3 @@ array(1) { string(12) "Hello World!" } *** Finished testing open_basedir configuration [file] *** - diff --git a/tests/security/open_basedir_file_exists.phpt b/tests/security/open_basedir_file_exists.phpt index c249fc1165..2c90fd550b 100644 --- a/tests/security/open_basedir_file_exists.phpt +++ b/tests/security/open_basedir_file_exists.phpt @@ -52,4 +52,3 @@ bool(true) bool(true) bool(true) *** Finished testing open_basedir configuration [file_exists] *** - diff --git a/tests/security/open_basedir_file_put_contents.phpt b/tests/security/open_basedir_file_put_contents.phpt index d4bd417b59..3be241b9ef 100644 --- a/tests/security/open_basedir_file_put_contents.phpt +++ b/tests/security/open_basedir_file_put_contents.phpt @@ -54,4 +54,3 @@ Warning: file_put_contents(): open_basedir restriction in effect. File%s/test/ba Warning: file_put_contents%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d bool(false) *** Finished testing open_basedir configuration [file_put_contents] *** - diff --git a/tests/security/open_basedir_fileatime.phpt b/tests/security/open_basedir_fileatime.phpt index 02cc94f83f..4cb7aefc39 100644 --- a/tests/security/open_basedir_fileatime.phpt +++ b/tests/security/open_basedir_fileatime.phpt @@ -52,4 +52,3 @@ int(%d) int(%d) int(%d) *** Finished testing open_basedir configuration [fileatime] *** - diff --git a/tests/security/open_basedir_filectime.phpt b/tests/security/open_basedir_filectime.phpt index 542c8423ed..08c7ecd5f2 100644 --- a/tests/security/open_basedir_filectime.phpt +++ b/tests/security/open_basedir_filectime.phpt @@ -52,4 +52,3 @@ int(%d) int(%d) int(%d) *** Finished testing open_basedir configuration [filectime] *** - diff --git a/tests/security/open_basedir_filegroup.phpt b/tests/security/open_basedir_filegroup.phpt index 5f6279aa8f..f85f81bb7b 100644 --- a/tests/security/open_basedir_filegroup.phpt +++ b/tests/security/open_basedir_filegroup.phpt @@ -52,4 +52,3 @@ int(%d) int(%d) int(%d) *** Finished testing open_basedir configuration [filegroup] *** - diff --git a/tests/security/open_basedir_fileinode.phpt b/tests/security/open_basedir_fileinode.phpt index 070c2c806c..08e378bb6f 100644 --- a/tests/security/open_basedir_fileinode.phpt +++ b/tests/security/open_basedir_fileinode.phpt @@ -52,4 +52,3 @@ int(%d) int(%d) int(%d) *** Finished testing open_basedir configuration [fileinode] *** - diff --git a/tests/security/open_basedir_filemtime.phpt b/tests/security/open_basedir_filemtime.phpt index 7213ddb5b9..36e2de9ce8 100644 --- a/tests/security/open_basedir_filemtime.phpt +++ b/tests/security/open_basedir_filemtime.phpt @@ -52,4 +52,3 @@ int(%d) int(%d) int(%d) *** Finished testing open_basedir configuration [filemtime] *** - diff --git a/tests/security/open_basedir_fileowner.phpt b/tests/security/open_basedir_fileowner.phpt index b363b7e0e8..7ce6cb30f8 100644 --- a/tests/security/open_basedir_fileowner.phpt +++ b/tests/security/open_basedir_fileowner.phpt @@ -52,4 +52,3 @@ int(%d) int(%d) int(%d) *** Finished testing open_basedir configuration [fileowner] *** - diff --git a/tests/security/open_basedir_fileperms.phpt b/tests/security/open_basedir_fileperms.phpt index a1e6511b08..944f1cd5ed 100644 --- a/tests/security/open_basedir_fileperms.phpt +++ b/tests/security/open_basedir_fileperms.phpt @@ -52,4 +52,3 @@ int(%d) int(%d) int(%d) *** Finished testing open_basedir configuration [fileperms] *** - diff --git a/tests/security/open_basedir_filesize.phpt b/tests/security/open_basedir_filesize.phpt index a335dfd17c..e682c2fac4 100644 --- a/tests/security/open_basedir_filesize.phpt +++ b/tests/security/open_basedir_filesize.phpt @@ -52,4 +52,3 @@ int(%d) int(%d) int(%d) *** Finished testing open_basedir configuration [filesize] *** - diff --git a/tests/security/open_basedir_filetype.phpt b/tests/security/open_basedir_filetype.phpt index fa104a3679..749aca0742 100644 --- a/tests/security/open_basedir_filetype.phpt +++ b/tests/security/open_basedir_filetype.phpt @@ -46,50 +46,9 @@ bool(false) Warning: filetype(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d bool(false) -string(3) "dir" -string(4) "file" -string(4) "file" -string(4) "file" -string(4) "file" -*** Finished testing open_basedir configuration [filetype] *** ---UEXPECTF-- -*** Testing open_basedir configuration [filetype] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) - -Warning: filetype(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: filetype(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d -bool(false) unicode(3) "dir" unicode(4) "file" unicode(4) "file" unicode(4) "file" unicode(4) "file" *** Finished testing open_basedir configuration [filetype] *** - diff --git a/tests/security/open_basedir_fopen.phpt b/tests/security/open_basedir_fopen.phpt index c6c9a253f2..0f3bc065a9 100644 --- a/tests/security/open_basedir_fopen.phpt +++ b/tests/security/open_basedir_fopen.phpt @@ -83,4 +83,3 @@ resource(%d) of type (stream) resource(%d) of type (stream) resource(%d) of type (stream) *** Finished testing open_basedir configuration [fopen] *** - diff --git a/tests/security/open_basedir_glob-win32.phpt b/tests/security/open_basedir_glob-win32.phpt index bdc8d93fbd..d1f8df551e 100644 --- a/tests/security/open_basedir_glob-win32.phpt +++ b/tests/security/open_basedir_glob-win32.phpt @@ -37,44 +37,6 @@ bool(false) bool(false) array(1) { [0]=> - string(5) "../ok" -} -array(1) { - [0]=> - string(6) "ok.txt" -} -array(1) { - [0]=> - string(12) "../ok/ok.txt" -} -array(1) { - [0]=> - string(%d) "%s/test/ok/ok.txt" -} -array(1) { - [0]=> - string(%d) "%s/test/ok/../ok/ok.txt" -} -*** Finished testing open_basedir configuration [glob] *** ---UEXPECTF-- -*** Testing open_basedir configuration [glob] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -bool(false) -bool(false) -bool(false) -array(0) { -} -bool(false) -bool(false) -bool(false) -bool(false) -bool(false) -array(1) { - [0]=> unicode(5) "../ok" } array(1) { @@ -94,4 +56,3 @@ array(1) { unicode(%d) "%s/test/ok/../ok/ok.txt" } *** Finished testing open_basedir configuration [glob] *** - diff --git a/tests/security/open_basedir_glob.phpt b/tests/security/open_basedir_glob.phpt index 14bac1474e..20834d8a2c 100644 --- a/tests/security/open_basedir_glob.phpt +++ b/tests/security/open_basedir_glob.phpt @@ -36,43 +36,6 @@ bool(false) bool(false) array(1) { [0]=> - string(5) "../ok" -} -array(1) { - [0]=> - string(6) "ok.txt" -} -array(1) { - [0]=> - string(12) "../ok/ok.txt" -} -array(1) { - [0]=> - string(%d) "%s/test/ok/ok.txt" -} -array(1) { - [0]=> - string(%d) "%s/test/ok/../ok/ok.txt" -} -*** Finished testing open_basedir configuration [glob] *** ---UEXPECTF-- -*** Testing open_basedir configuration [glob] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -bool(false) -bool(false) -bool(false) -bool(false) -bool(false) -bool(false) -bool(false) -bool(false) -bool(false) -array(1) { - [0]=> unicode(5) "../ok" } array(1) { @@ -92,4 +55,3 @@ array(1) { unicode(%d) "%s/test/ok/../ok/ok.txt" } *** Finished testing open_basedir configuration [glob] *** - diff --git a/tests/security/open_basedir_is_dir.phpt b/tests/security/open_basedir_is_dir.phpt index e4ad620d74..5c8967a9f4 100644 --- a/tests/security/open_basedir_is_dir.phpt +++ b/tests/security/open_basedir_is_dir.phpt @@ -52,4 +52,3 @@ bool(false) bool(false) bool(false) *** Finished testing open_basedir configuration [is_dir] *** - diff --git a/tests/security/open_basedir_is_file.phpt b/tests/security/open_basedir_is_file.phpt index 51ef0a2d1f..a3303599b5 100644 --- a/tests/security/open_basedir_is_file.phpt +++ b/tests/security/open_basedir_is_file.phpt @@ -52,4 +52,3 @@ bool(true) bool(true) bool(true) *** Finished testing open_basedir configuration [is_file] *** - diff --git a/tests/security/open_basedir_is_link.phpt b/tests/security/open_basedir_is_link.phpt index 5d12148d85..61485029f4 100644 --- a/tests/security/open_basedir_is_link.phpt +++ b/tests/security/open_basedir_is_link.phpt @@ -52,4 +52,3 @@ bool(false) bool(false) bool(false) *** Finished testing open_basedir configuration [is_link] *** - diff --git a/tests/security/open_basedir_is_readable.phpt b/tests/security/open_basedir_is_readable.phpt index 951a19ac76..9a269b5c0b 100644 --- a/tests/security/open_basedir_is_readable.phpt +++ b/tests/security/open_basedir_is_readable.phpt @@ -52,4 +52,3 @@ bool(true) bool(true) bool(true) *** Finished testing open_basedir configuration [is_readable] *** - diff --git a/tests/security/open_basedir_is_writable.phpt b/tests/security/open_basedir_is_writable.phpt index 25ce1c63a4..d2b70614cd 100644 --- a/tests/security/open_basedir_is_writable.phpt +++ b/tests/security/open_basedir_is_writable.phpt @@ -52,4 +52,3 @@ bool(true) bool(true) bool(true) *** Finished testing open_basedir configuration [is_writable] *** - diff --git a/tests/security/open_basedir_link.phpt b/tests/security/open_basedir_link.phpt index a54c22f4b6..695824d3b1 100644 --- a/tests/security/open_basedir_link.phpt +++ b/tests/security/open_basedir_link.phpt @@ -75,4 +75,3 @@ bool(false) bool(true) bool(true) *** Finished testing open_basedir configuration [link] *** - diff --git a/tests/security/open_basedir_linkinfo.phpt b/tests/security/open_basedir_linkinfo.phpt index ab12a5149d..ed6df19ffa 100644 --- a/tests/security/open_basedir_linkinfo.phpt +++ b/tests/security/open_basedir_linkinfo.phpt @@ -61,4 +61,3 @@ int(%d) Warning: unlink(): open_basedir restriction in effect. File(%s/test/ok/symlink.txt) is not within the allowed path(s): (.) in %s on line %d bool(false) *** Finished testing open_basedir configuration [linkinfo] *** - diff --git a/tests/security/open_basedir_lstat.phpt b/tests/security/open_basedir_lstat.phpt index 35e5a22019..8cd037dbd3 100644 --- a/tests/security/open_basedir_lstat.phpt +++ b/tests/security/open_basedir_lstat.phpt @@ -52,4 +52,3 @@ bool(true) bool(true) bool(true) *** Finished testing open_basedir configuration [lstat] *** - diff --git a/tests/security/open_basedir_opendir.phpt b/tests/security/open_basedir_opendir.phpt index 077a5116b4..b580f15dd2 100644 --- a/tests/security/open_basedir_opendir.phpt +++ b/tests/security/open_basedir_opendir.phpt @@ -70,4 +70,3 @@ resource(%d) of type (stream) resource(%d) of type (stream) resource(%d) of type (stream) *** Finished testing open_basedir configuration [opendir] *** - diff --git a/tests/security/open_basedir_parse_ini_file.phpt b/tests/security/open_basedir_parse_ini_file.phpt index ac740f073b..cba16cea9c 100644 --- a/tests/security/open_basedir_parse_ini_file.phpt +++ b/tests/security/open_basedir_parse_ini_file.phpt @@ -79,4 +79,3 @@ Warning: parse_ini_file(%s\test): failed to open stream: Operation not permitted array(0) { } *** Finished testing open_basedir configuration [parse_ini_file] *** - diff --git a/tests/security/open_basedir_readlink.phpt b/tests/security/open_basedir_readlink.phpt index cbba4307e5..5133410290 100644 --- a/tests/security/open_basedir_readlink.phpt +++ b/tests/security/open_basedir_readlink.phpt @@ -73,4 +73,3 @@ bool(false) Warning: unlink(): open_basedir restriction in effect. File(%s/test/ok/symlink.txt) is not within the allowed path(s): (.) in %s on line %d bool(false) *** Finished testing open_basedir configuration [readlink] *** - diff --git a/tests/security/open_basedir_realpath.phpt b/tests/security/open_basedir_realpath.phpt index a107be8ffc..bec1c12b04 100644 --- a/tests/security/open_basedir_realpath.phpt +++ b/tests/security/open_basedir_realpath.phpt @@ -25,28 +25,6 @@ bool(true) bool(true) bool(true) bool(true) -string(%d) "%s\test\bad" -string(%d) "%s\test\bad\bad.txt" -string(%d) "%s\test" -string(%d) "%s\test" -string(%d) "%s" -string(%d) "%s\test\bad" -string(%d) "%s\test\bad\bad.txt" -string(%d) "%s\test\bad\bad.txt" -string(%d) "%s\test" -string(%d) "%s\test\ok" -string(%d) "%s\test\ok\ok.txt" -string(%d) "%s\test\ok\ok.txt" -string(%d) "%s\test\ok\ok.txt" -string(%d) "%s\test\ok\ok.txt" -*** Finished testing open_basedir configuration [realpath] *** ---UEXPECTF-- -*** Testing open_basedir configuration [realpath] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) unicode(%d) "%s\test\bad" unicode(%d) "%s\test\bad\bad.txt" unicode(%d) "%s\test" @@ -62,4 +40,3 @@ unicode(%d) "%s\test\ok\ok.txt" unicode(%d) "%s\test\ok\ok.txt" unicode(%d) "%s\test\ok\ok.txt" *** Finished testing open_basedir configuration [realpath] *** - diff --git a/tests/security/open_basedir_rename.phpt b/tests/security/open_basedir_rename.phpt index 428e7a070a..e512e58d46 100644 --- a/tests/security/open_basedir_rename.phpt +++ b/tests/security/open_basedir_rename.phpt @@ -44,4 +44,3 @@ bool(false) Warning: rename(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d bool(false) *** Finished testing open_basedir configuration [rename] *** - diff --git a/tests/security/open_basedir_rmdir.phpt b/tests/security/open_basedir_rmdir.phpt index b4d61f8b76..8cc4f818c8 100644 --- a/tests/security/open_basedir_rmdir.phpt +++ b/tests/security/open_basedir_rmdir.phpt @@ -44,4 +44,3 @@ bool(false) Warning: rmdir(): open_basedir restriction in effect. File(%s/test/bad) is not within the allowed path(s): (.) in %s on line %d bool(false) *** Finished testing open_basedir configuration [rmdir] *** - diff --git a/tests/security/open_basedir_scandir.phpt b/tests/security/open_basedir_scandir.phpt index 1c5072046d..28e9741cb8 100644 --- a/tests/security/open_basedir_scandir.phpt +++ b/tests/security/open_basedir_scandir.phpt @@ -84,94 +84,6 @@ Warning: scandir(): (errno 1): Operation not permitted in %s on line %d bool(false) array(3) { [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(6) "ok.txt" -} -array(3) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(6) "ok.txt" -} -array(3) { - [0]=> - string(1) "." - [1]=> - string(2) ".." - [2]=> - string(6) "ok.txt" -} -*** Finished testing open_basedir configuration [scandir] *** ---UEXPECTF-- -*** Testing open_basedir configuration [scandir] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) - -Warning: scandir(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d - -Warning: scandir(../bad): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) - -Warning: scandir(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d - -Warning: scandir(../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) - -Warning: scandir(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d - -Warning: scandir(..): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) - -Warning: scandir(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line 80 - -Warning: scandir(../): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) - -Warning: scandir(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d - -Warning: scandir(/): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) - -Warning: scandir(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d - -Warning: scandir(../bad/.): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) - -Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d - -Warning: scandir(%s/test/bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) - -Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d - -Warning: scandir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d - -Warning: scandir(): (errno 1): Operation not permitted in %s on line %d -bool(false) -array(3) { - [0]=> unicode(1) "." [1]=> unicode(2) ".." @@ -195,4 +107,3 @@ array(3) { unicode(6) "ok.txt" } *** Finished testing open_basedir configuration [scandir] *** - diff --git a/tests/security/open_basedir_stat.phpt b/tests/security/open_basedir_stat.phpt index b80b854d6c..2ad67d67d5 100644 --- a/tests/security/open_basedir_stat.phpt +++ b/tests/security/open_basedir_stat.phpt @@ -52,4 +52,3 @@ bool(true) bool(true) bool(true) *** Finished testing open_basedir configuration [stat] *** - diff --git a/tests/security/open_basedir_symlink.phpt b/tests/security/open_basedir_symlink.phpt index 3b3f1d571f..ab87e87b04 100644 --- a/tests/security/open_basedir_symlink.phpt +++ b/tests/security/open_basedir_symlink.phpt @@ -75,4 +75,3 @@ bool(false) bool(true) bool(true) *** Finished testing open_basedir configuration [symlink] *** - diff --git a/tests/security/open_basedir_tempnam.phpt b/tests/security/open_basedir_tempnam.phpt index 4a6db0ae7d..691cae03ad 100644 --- a/tests/security/open_basedir_tempnam.phpt +++ b/tests/security/open_basedir_tempnam.phpt @@ -51,35 +51,6 @@ bool(false) Warning: tempnam(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d bool(false) -string(%d) "%s" -bool(true) -*** Finished testing open_basedir configuration [tempnam] *** ---UEXPECTF-- -*** Testing open_basedir configuration [tempnam] *** -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) - -Warning: tempnam(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: tempnam(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: tempnam(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: tempnam(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: tempnam(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d -bool(false) - -Warning: tempnam(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d -bool(false) unicode(%d) "%s" bool(true) *** Finished testing open_basedir configuration [tempnam] *** - diff --git a/tests/security/open_basedir_touch.phpt b/tests/security/open_basedir_touch.phpt index b0a5aee612..03c7b9e05f 100644 --- a/tests/security/open_basedir_touch.phpt +++ b/tests/security/open_basedir_touch.phpt @@ -67,4 +67,3 @@ bool(true) bool(true) bool(true) *** Finished testing open_basedir configuration [touch] *** - diff --git a/tests/security/open_basedir_unlink.phpt b/tests/security/open_basedir_unlink.phpt index 75b0f3f4a9..e2d025c18a 100644 --- a/tests/security/open_basedir_unlink.phpt +++ b/tests/security/open_basedir_unlink.phpt @@ -44,4 +44,3 @@ bool(false) Warning: unlink(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d bool(false) *** Finished testing open_basedir configuration [unlink] *** - diff --git a/tests/strings/bug22592.phpt b/tests/strings/bug22592.phpt index 2af793ab59..36dbac1cd2 100755 --- a/tests/strings/bug22592.phpt +++ b/tests/strings/bug22592.phpt @@ -21,11 +21,6 @@ var_dump($wrong); ?> --EXPECT-- -string(6) "abcdef" -string(6) "abcdef" -string(6) "a*c*e*" -string(6) "a*c*e*" ---UEXPECT-- unicode(6) "abcdef" unicode(6) "abcdef" unicode(6) "a*c*e*" diff --git a/tests/unicode/autodetect-SCSU.phpt b/tests/unicode/autodetect-SCSU.phpt index 64d6601924..0409e2e254 100755 --- a/tests/unicode/autodetect-SCSU.phpt +++ b/tests/unicode/autodetect-SCSU.phpt @@ -1,7 +1,5 @@ --TEST-- Script encoding autodetection (SCSU) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/autodetect-UTF16BE.phpt b/tests/unicode/autodetect-UTF16BE.phpt index 678b2332ca..767bcf441a 100755 --- a/tests/unicode/autodetect-UTF16BE.phpt +++ b/tests/unicode/autodetect-UTF16BE.phpt @@ -1,7 +1,5 @@ --TEST-- Script encoding autodetection (UTF-16BE) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/autodetect-UTF16LE.phpt b/tests/unicode/autodetect-UTF16LE.phpt index 9c219f9119..39b4777d97 100755 --- a/tests/unicode/autodetect-UTF16LE.phpt +++ b/tests/unicode/autodetect-UTF16LE.phpt @@ -1,7 +1,5 @@ --TEST-- Script encoding autodetection (UTF-16LE) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/autodetect-UTF32BE.phpt b/tests/unicode/autodetect-UTF32BE.phpt index 2b0c5b5273..2ea7354761 100755 --- a/tests/unicode/autodetect-UTF32BE.phpt +++ b/tests/unicode/autodetect-UTF32BE.phpt @@ -1,7 +1,5 @@ --TEST-- Script encoding autodetection (UTF-32BE) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/autodetect-UTF32LE.phpt b/tests/unicode/autodetect-UTF32LE.phpt index f1041c8dce..61b6f90148 100755 --- a/tests/unicode/autodetect-UTF32LE.phpt +++ b/tests/unicode/autodetect-UTF32LE.phpt @@ -1,7 +1,5 @@ --TEST-- Script encoding autodetection (UTF-32LE) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/autodetect-UTF7.phpt b/tests/unicode/autodetect-UTF7.phpt index d9a33a47d7..6d29e38c4c 100755 --- a/tests/unicode/autodetect-UTF7.phpt +++ b/tests/unicode/autodetect-UTF7.phpt @@ -1,7 +1,5 @@ --TEST-- Script encoding autodetection (UTF7) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/autodetect-UTF8.phpt b/tests/unicode/autodetect-UTF8.phpt index 2f91be3497..618656b5ad 100755 --- a/tests/unicode/autodetect-UTF8.phpt +++ b/tests/unicode/autodetect-UTF8.phpt @@ -1,7 +1,5 @@ --TEST-- Script encoding autodetection (UTF8) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/enc-HZ.phpt b/tests/unicode/enc-HZ.phpt index a5aabad0c9..21c104ae71 100755 --- a/tests/unicode/enc-HZ.phpt +++ b/tests/unicode/enc-HZ.phpt @@ -1,7 +1,5 @@ --TEST-- Script encoding (HZ) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/enc-ISO-2022-KR.phpt b/tests/unicode/enc-ISO-2022-KR.phpt index 23fe3b903a..53bd4f7ee7 100755 --- a/tests/unicode/enc-ISO-2022-KR.phpt +++ b/tests/unicode/enc-ISO-2022-KR.phpt @@ -1,7 +1,5 @@ --TEST-- Script encoding (ISO-2022-KR) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/enc-JIS.phpt b/tests/unicode/enc-JIS.phpt index 5088a1c54f..b466cd7e33 100755 --- a/tests/unicode/enc-JIS.phpt +++ b/tests/unicode/enc-JIS.phpt @@ -1,7 +1,5 @@ --TEST-- Script encoding (JIS) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/enc-SJIS.phpt b/tests/unicode/enc-SJIS.phpt index b3661b8727..eb7b195ab6 100755 --- a/tests/unicode/enc-SJIS.phpt +++ b/tests/unicode/enc-SJIS.phpt @@ -1,7 +1,5 @@ --TEST-- Script encoding (SJIS) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/encrt-HZ.phpt b/tests/unicode/encrt-HZ.phpt index e87fb606a1..8c08a25740 100755 --- a/tests/unicode/encrt-HZ.phpt +++ b/tests/unicode/encrt-HZ.phpt @@ -1,7 +1,5 @@ --TEST-- declare script encoding (HZ) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/encrt-ISO-2022-KR.phpt b/tests/unicode/encrt-ISO-2022-KR.phpt index 8ef2c46a74..3b00bfe078 100755 --- a/tests/unicode/encrt-ISO-2022-KR.phpt +++ b/tests/unicode/encrt-ISO-2022-KR.phpt @@ -1,7 +1,5 @@ --TEST-- declare script encoding (ISO-2022-KR) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/encrt-JIS.phpt b/tests/unicode/encrt-JIS.phpt index 4da9d884c9..42303e6cd2 100755 --- a/tests/unicode/encrt-JIS.phpt +++ b/tests/unicode/encrt-JIS.phpt @@ -1,7 +1,5 @@ --TEST-- declare script encoding (JIS) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/encrt-SJIS.phpt b/tests/unicode/encrt-SJIS.phpt index 73cd4a185e..cd58ebb9cc 100755 --- a/tests/unicode/encrt-SJIS.phpt +++ b/tests/unicode/encrt-SJIS.phpt @@ -1,7 +1,5 @@ --TEST-- declare script encoding (SJIS) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --INI-- unicode.output_encoding=CP866 --FILE-- diff --git a/tests/unicode/func/strpos.phpt b/tests/unicode/func/strpos.phpt index a231bec770..0233e0df69 100644 --- a/tests/unicode/func/strpos.phpt +++ b/tests/unicode/func/strpos.phpt @@ -1,7 +1,5 @@ --TEST-- Unicode: strpos() function test ---INI-- -unicode.semantics=on --FILE-- <?php $a = "a™ᄒ\U020021z"; diff --git a/tests/unicode/func/strstr.phpt b/tests/unicode/func/strstr.phpt index 42495bc1c6..39806f46a2 100644 --- a/tests/unicode/func/strstr.phpt +++ b/tests/unicode/func/strstr.phpt @@ -1,7 +1,5 @@ --TEST-- Unicode: strpos() function test ---INI-- -unicode.semantics=on --FILE-- <?php $a = "a™ᄒ\U020021z"; diff --git a/tests/unicode/normalize_001.phpt b/tests/unicode/normalize_001.phpt index ae6ced7c97..c6a5d96b16 100755 --- a/tests/unicode/normalize_001.phpt +++ b/tests/unicode/normalize_001.phpt @@ -1,7 +1,5 @@ --TEST-- Unicode identifiers normalization (${}) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --FILE-- <?php ${"\u212B"} = "ok\n"; diff --git a/tests/unicode/normalize_002.phpt b/tests/unicode/normalize_002.phpt index cf8976f413..adea8a6f5e 100755 --- a/tests/unicode/normalize_002.phpt +++ b/tests/unicode/normalize_002.phpt @@ -1,7 +1,5 @@ --TEST-- Unicode identifiers normalization ($$) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --FILE-- <?php $a = "\u212B"; diff --git a/tests/unicode/normalize_003.phpt b/tests/unicode/normalize_003.phpt index 6bbfdecaa0..ef022fea14 100755 --- a/tests/unicode/normalize_003.phpt +++ b/tests/unicode/normalize_003.phpt @@ -1,7 +1,5 @@ --TEST-- Unicode identifiers normalization (indirect function call) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --FILE-- <?php declare(encoding = "ISO-8859-1"); diff --git a/tests/unicode/normalize_004.phpt b/tests/unicode/normalize_004.phpt index 9df79953e9..c9a25d31a8 100755 --- a/tests/unicode/normalize_004.phpt +++ b/tests/unicode/normalize_004.phpt @@ -1,7 +1,5 @@ --TEST-- Unicode identifiers normalization ($GLOBALS[]) ---SKIPIF-- -<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?> --FILE-- <?php $GLOBALS["\u212B"] = "ok\n"; |