diff --git a/tests/basic/013.phpt b/tests/basic/013.phpt
index 703a0a13bd3..38ebd9b3f4f 100644
--- a/tests/basic/013.phpt
+++ b/tests/basic/013.phpt
@@ -9,11 +9,6 @@ a[]=1
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 e1d0da74373..f7dd4217d27 100644
--- a/tests/basic/014.phpt
+++ b/tests/basic/014.phpt
@@ -9,13 +9,6 @@ a[]=1&a[]=1
var_dump($_POST['a']);
?>
--EXPECT--
-array(2) {
- [0]=>
- string(1) "1"
- [1]=>
- string(1) "1"
-}
---UEXPECT--
array(2) {
[0]=>
unicode(1) "1"
diff --git a/tests/basic/015.phpt b/tests/basic/015.phpt
index 3429756d04b..a6ca5d66fda 100644
--- a/tests/basic/015.phpt
+++ b/tests/basic/015.phpt
@@ -9,11 +9,6 @@ a[]=1&a[0]=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 3440d85be3f..c1516340784 100644
--- a/tests/basic/016.phpt
+++ b/tests/basic/016.phpt
@@ -9,13 +9,6 @@ a[a]=1&a[b]=3
var_dump($_POST['a']);
?>
--EXPECT--
-array(2) {
- ["a"]=>
- string(1) "1"
- ["b"]=>
- string(1) "3"
-}
---UEXPECT--
array(2) {
[u"a"]=>
unicode(1) "1"
diff --git a/tests/basic/017.phpt b/tests/basic/017.phpt
index d34d28fd248..baac17889c0 100644
--- a/tests/basic/017.phpt
+++ b/tests/basic/017.phpt
@@ -9,15 +9,6 @@ a[]=1&a[a]=1&a[b]=3
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"
diff --git a/tests/basic/018.phpt b/tests/basic/018.phpt
index 1c78ddf00f1..da403b1d1ae 100644
--- a/tests/basic/018.phpt
+++ b/tests/basic/018.phpt
@@ -10,31 +10,6 @@ var_dump($_POST['a']);
var_dump($_POST['b']);
?>
--EXPECT--
-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) {
diff --git a/tests/basic/019.phpt b/tests/basic/019.phpt
index 1f1ee14b4f9..6deab514468 100644
--- a/tests/basic/019.phpt
+++ b/tests/basic/019.phpt
@@ -9,15 +9,6 @@ a[]=1&a[]]=3&a[[]=4
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"
diff --git a/tests/basic/020.phpt b/tests/basic/020.phpt
index 9091bfde806..b105818a459 100644
--- a/tests/basic/020.phpt
+++ b/tests/basic/020.phpt
@@ -9,13 +9,6 @@ a[a[]]=1&a[b[]]=3
var_dump($_POST['a']);
?>
--EXPECT--
-array(2) {
- ["a["]=>
- string(1) "1"
- ["b["]=>
- string(1) "3"
-}
---UEXPECT--
array(2) {
[u"a["]=>
unicode(1) "1"
diff --git a/tests/basic/022.phpt b/tests/basic/022.phpt
index 64e424f627b..b3cdadd571d 100644
--- a/tests/basic/022.phpt
+++ b/tests/basic/022.phpt
@@ -1,35 +1,12 @@
--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--
--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) ""
diff --git a/tests/basic/023.phpt b/tests/basic/023.phpt
index d6894b52ebd..ece28b78d28 100644
--- a/tests/basic/023.phpt
+++ b/tests/basic/023.phpt
@@ -7,15 +7,6 @@ c o o k i e=value; c o o k i e= v a l u e ;;c%20o+o k+i%20e=v;name="value","valu
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"
diff --git a/tests/basic/024.phpt b/tests/basic/024.phpt
index 19d016b9748..7484a11adbd 100644
--- a/tests/basic/024.phpt
+++ b/tests/basic/024.phpt
@@ -12,23 +12,6 @@ a=ABC&y=XYZ&c[]=1&c[]=2&c[a]=3
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"
diff --git a/tests/basic/026.phpt b/tests/basic/026.phpt
index 8666554b8ea..6f90f6a33d5 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 f4925c69e7c..a23fc494ea8 100644
--- a/tests/basic/027.phpt
+++ b/tests/basic/027.phpt
@@ -16,24 +16,6 @@ a=1&b=ZYX&c[][][][][][][][][][][][][][][][][][][][][][]=123&d=123&e[][]][]=3
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"
diff --git a/tests/basic/bug29971.phpt b/tests/basic/bug29971.phpt
index fdbee8fd469..369928f0e00 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 ecc98744bfc..f87cf91aada 100644
--- a/tests/classes/__call_001.phpt
+++ b/tests/classes/__call_001.phpt
@@ -22,26 +22,6 @@ var_dump($a);
?>
--EXPECT--
Method test called:
-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)
diff --git a/tests/classes/__call_003.phpt b/tests/classes/__call_003.phpt
index 6f6b305cf5e..b86640a66c8 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 2072112a02f..a9997bf1329 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 c82a853f726..b5b7705769a 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 105419e33e4..69968c34501 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";
@@ -57,30 +57,6 @@ Getting [z]
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)
diff --git a/tests/classes/__set__get_004.phpt b/tests/classes/__set__get_004.phpt
index b739428f33b..80a2f334d9e 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 34fd567bfd7..c169209823d 100755
--- a/tests/classes/__set__get_005.phpt
+++ b/tests/classes/__set__get_005.phpt
@@ -55,21 +55,6 @@ var_dump($foo->bar->baz);
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) {
diff --git a/tests/classes/array_access_001.phpt b/tests/classes/array_access_001.phpt
index 68263b3201c..a56e1399463 100644
--- a/tests/classes/array_access_001.phpt
+++ b/tests/classes/array_access_001.phpt
@@ -84,119 +84,6 @@ var_dump($obj->a);
?>
===DONE===
--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"
diff --git a/tests/classes/array_access_002.phpt b/tests/classes/array_access_002.phpt
index aa1fd799d60..70e51441003 100644
--- a/tests/classes/array_access_002.phpt
+++ b/tests/classes/array_access_002.phpt
@@ -84,119 +84,6 @@ var_dump($obj->a);
?>
===DONE===
--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"
diff --git a/tests/classes/array_access_003.phpt b/tests/classes/array_access_003.phpt
index ae7b3bdaa1b..ade9f205abb 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 6c324edc928..8c523921b89 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 313bf42d9d9..10d372c7db7 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 64f8d06f662..e08d3bfce4d 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 00ab8b149bf..6055c1f7385 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 3e6828dbd3a..175ac3abde9 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===
--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 8306d6cdebc..5409a52e0d3 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===
--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 dd2a3324a2c..fb71e0cfe05 100755
--- a/tests/classes/autoload_002.phpt
+++ b/tests/classes/autoload_002.phpt
@@ -20,13 +20,6 @@ var_dump(get_class_methods('autoload_root'));
===DONE===
--EXPECT--
__autoload(autoload_root)
-array(1) {
- [0]=>
- string(12) "testFunction"
-}
-===DONE===
---UEXPECT--
-__autoload(autoload_root)
array(1) {
[0]=>
unicode(12) "testFunction"
diff --git a/tests/classes/autoload_007.phpt b/tests/classes/autoload_007.phpt
index 5652c120cce..ceda4c4124b 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 75a9cd05204..d24bd6f0200 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 46f6055fefa..8766f1f0aa7 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 27e95c1058f..b0681d90330 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 8accdcefbf7..a5ba1ee2fde 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 2563f7598e7..96977a5ce8d 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 079398c9f6f..a1b9dc14d9a 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 9d11d384f43..ca6a322391f 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 37cf4675ac5..f64ab8fe92d 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 7e4d3b4c1f0..130a9a5f91c 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 82b46807b76..2da32941090 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 59e20e2a608..c69bd251ef7 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 783632013b5..82de524fc12 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 4f5dffb96c9..8f44307db31 100644
--- a/tests/classes/autoload_020.phpt
+++ b/tests/classes/autoload_020.phpt
@@ -11,13 +11,7 @@ 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 7a5a0299fd3..45da555b724 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 5e30e8e74b2..573f136ce06 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 5e3422aeae9..a8c12715e2a 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 b4554dc30de..2e40461eca4 100755
--- a/tests/classes/clone_001.phpt
+++ b/tests/classes/clone_001.phpt
@@ -23,26 +23,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)
diff --git a/tests/classes/clone_002.phpt b/tests/classes/clone_002.phpt
index 2c319ed3d27..5c51c483a61 100755
--- a/tests/classes/clone_002.phpt
+++ b/tests/classes/clone_002.phpt
@@ -25,26 +25,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)
diff --git a/tests/classes/clone_004.phpt b/tests/classes/clone_004.phpt
index 1116aa62d33..ddb7206fdcc 100755
--- a/tests/classes/clone_004.phpt
+++ b/tests/classes/clone_004.phpt
@@ -39,49 +39,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) {
diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt
index 57e303cd585..fe0929a03cf 100644
--- a/tests/classes/constants_basic_001.phpt
+++ b/tests/classes/constants_basic_001.phpt
@@ -63,36 +63,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)
@@ -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 f660ffeca7d..c42f080d280 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 39e6bd8784a..c58a93ff2e1 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 6287d807629..3da485a52eb 100644
--- a/tests/classes/constants_basic_004.phpt
+++ b/tests/classes/constants_basic_004.phpt
@@ -43,61 +43,6 @@ Test properties with array default values using class constants as keys and valu
?>
--EXPECTF--
-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"]=>
@@ -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 0d3b44c22ca..0ae07733a17 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 dcdb01bfe4c..0567998b7dc 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 ea6813cc96d..7fa99cde6b1 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 8ae2a5dec48..3cc0c039bd1 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 1a1d6fa511d..aab57de5fa8 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 8100c924656..0da6e642af0 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 b9a46659b05..868c8960c8b 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 83e3efe22e4..b1bb820bb85 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 81cf714888b..77bebf0ad54 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 b4e37a36f64..b3499c795d3 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 185a9132801..cbd62f05e56 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 8990264d920..6e080f8db29 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 ae3e71e7abb..cc76afa11fa 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 d5001baa3de..fa90dfdd52e 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 f0559295784..7f2d3e514fb 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 e1dd31fd4d8..7c478b5ab7f 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 e33a4da002d..3edc92494be 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 05f2fc41dfa..71514001abe 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 92980f65b44..9987e925e0e 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 41e1f6776d8..dcf985c4e56 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 3fe05276c3b..63173fae9da 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 47fa69087a2..e00a00afffb 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 dd43cfd1cb5..6c1a0838b70 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 48f4f6bb0e7..49b3bc41722 100644
--- a/tests/classes/new_001.phpt
+++ b/tests/classes/new_001.phpt
@@ -32,24 +32,6 @@ error_reporting=E_ALL | E_DEPRECATED
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) {
- ["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 ea3fe610d37..2d1850b519c 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 0bb2b3fe4b1..66c7aa2280f 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 950f16a3c4d..e828e19711f 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 73a38c45627..298fa689c51 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 02ddc25dece..c127f28d62d 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 a8ef9ab9202..c2c2cd3b26b 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 ddd2e5d1ac3..b2985add7db 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 d7d645fd0ac..f435516a3f3 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 d4732166c61..fac66c32bb7 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 169ff9a3774..08c0b227045 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 033eb75231f..72423710031 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 5f2b6bf4a89..1fe43fb619d 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 2b263eeb673..2d45f33430f 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 606ed21d087..1bc3c9fe52a 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 b84ed6787e8..d284272d02d 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 1bb303dab79..c7c54eab95e 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 badbe91d505..6468432d18a 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 9fc58ece4ac..4057f833909 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 18e9c78a132..0b12aef87a3 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 688621077da..265adfa72e2 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 0e5fdd301c5..7b0daff859d 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 16f11009475..d2d1c0c3797 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 63033255901..c96663d1c90 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 e437c5f30f3..1792e7eec2d 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 c4b0d438c03..096f53d5152 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 4702f9a0cff..c2db91b14c8 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 7abe92c9ffc..422c8d2f6fe 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 d41db6da38b..bd9b0834833 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 884159f9771..3e72ca23d3a 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 b022ef8049d..c36933cca6a 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 d099da04743..a4f295da7fe 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 9a868670407..8d0f9ad0793 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 c0f37ad95a1..45687fbacc6 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 68fdf8286f2..20795b58353 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 893fe5d048f..3abfe24e292 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 44d7bafadb6..27d553e3def 100755
--- a/tests/classes/serialize_001.phpt
+++ b/tests/classes/serialize_001.phpt
@@ -49,36 +49,6 @@ foreach($tests as $data)
--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 ecc9c01a282..a25df8204b5 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 bbdaedf50ae..cecb37bdaf5 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 1c34f68fc55..699f1895a9b 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 d5ec4d9c257..4f8d482bac8 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 8a4a7af3399..ecc9e25ffd8 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 a323a5bfc51..dc078a35ce3 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 064106e9796..ffa9c521433 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 bb1075aaed1..0c470f37462 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 5edae1d068d..c266f95d169 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 1693386f814..38f68d1f950 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 d94a9c116b0..4e158451003 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 6f16a09eddb..9b709270457 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 74a83185ee2..457446f7922 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 92a770374e1..6f1ff355bcb 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 d6037840763..d864c334f55 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 c4215feb498..3c8a6de9474 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 f634906d5ac..077b6f873cb 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 6778ed2f11f..ffc64a11301 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 be8ebf41552..470c68f543b 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 404a7cbbf6d..02c885104ae 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 2a2db013aba..5056b8a4eef 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 4576d4efa53..946ae9babb5 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 8d52e844c96..beec28b13a0 100755
--- a/tests/lang/023-1.inc
+++ b/tests/lang/023-1.inc
@@ -9,7 +9,7 @@
*/
?>
-*** Testing assignments and variable aliasing: ***
+*** Testing assignments and variable aliasing: ***
-This should read "blah": \n"; ?>
-This should read "this is nifty": \n"; ?>
-*************************************************
+This should read "blah": \n"; ?>
+This should read "this is nifty": \n"; ?>
+*************************************************
-*** Testing integer operators ***
+*** Testing integer operators ***
-Correct result - 8:
-Correct result - 8:
-Correct result - 2:
-Correct result - -2:
-Correct result - 15:
-Correct result - 15:
-Correct result - 2:
-Correct result - 3:
-*********************************
+Correct result - 8:
+Correct result - 8:
+Correct result - 2:
+Correct result - -2:
+Correct result - 15:
+Correct result - 15:
+Correct result - 2:
+Correct result - 3:
+*********************************
-*** Testing real operators ***
+*** Testing real operators ***
-Correct result - 8:
-Correct result - 8:
-Correct result - 2:
-Correct result - -2:
-Correct result - 15:
-Correct result - 15:
-Correct result - 2:
-Correct result - 3:
-*********************************
+Correct result - 8:
+Correct result - 8:
+Correct result - 2:
+Correct result - -2:
+Correct result - 15:
+Correct result - 15:
+Correct result - 2:
+Correct result - 3:
+*********************************
-*** Testing if/elseif/else control ***
+*** Testing if/elseif/else control ***
\n";
+ echo "This "." does "." not "." work
\n";
} elseif ($a == "5") {
- echo "This "." works
\n";
+ echo "This "." works
\n";
$a = 6;
if ("andi" == ($test = "andi")) {
- echo "this_still_works
\n";
+ echo "this_still_works
\n";
} elseif (1) {
- echo "should_not_print
\n";
+ echo "should_not_print
\n";
} else {
- echo "should_not_print
\n";
+ echo "should_not_print
\n";
}
if (44 == 43) {
- echo "should_not_print
\n";
+ echo "should_not_print
\n";
} else {
- echo "should_print
\n";
+ echo "should_print
\n";
}
} elseif ($a == 6) {
- echo "this "."broken
\n";
+ echo "this "."broken
\n";
if (0) {
- echo "this_should_not_print
\n";
+ echo "this_should_not_print
\n";
} else {
- echo "TestingDanglingElse_This_Should_not_print
\n";
+ echo "TestingDanglingElse_This_Should_not_print
\n";
}
} else {
- echo "This "."does "." not"." work
\n";
+ echo "This "."does "." not"." work
\n";
}
?>
-*** Seriously nested if's test ***
+*** Seriously nested if's test ***
** spelling correction by kluzz **
\n";
+echo "Only two lines of text should follow:
\n";
if (0) { /* this code is not supposed to be executed */
- echo "hmm, this shouldn't be displayed #1
\n";
+ echo "hmm, this shouldn't be displayed #1
\n";
$j++;
if (1) {
$i
@@ -105,118 +105,118 @@ if (0) { /* this code is not supposed to be executed */
$j = ++$i;
if (1) {
$j *= $i;
- echo "damn, this shouldn't be displayed
\n";
+ echo "damn, this shouldn't be displayed
\n";
} else {
$j /= $i;
++$j;
- echo "this shouldn't be displayed either
\n";
+ echo "this shouldn't be displayed either
\n";
}
} elseif (1) {
$i++; $j++;
- echo "this isn't supposed to be displayed
\n";
+ echo "this isn't supposed to be displayed
\n";
}
} elseif (0) {
$i++;
- echo "this definitely shouldn't be displayed
\n";
+ echo "this definitely shouldn't be displayed
\n";
} else {
--$j;
- echo "and this too shouldn't be displayed
\n";
+ echo "and this too shouldn't be displayed
\n";
while ($j>0) {
$j--;
}
}
} elseif (2-2) { /* as long as 2-2==0, this isn't supposed to be executed either */
$i = ++$j;
- echo "hmm, this shouldn't be displayed #2
\n";
+ echo "hmm, this shouldn't be displayed #2
\n";
if (1) {
$j = ++$i;
if (0) {
$j = $i*2+$j*($i++);
if (1) {
$i++;
- echo "damn, this shouldn't be displayed
\n";
+ echo "damn, this shouldn't be displayed
\n";
} else {
$j++;
- echo "this shouldn't be displayed either
\n";
+ echo "this shouldn't be displayed either
\n";
}
} else if (1) {
++$j;
- echo "this isn't supposed to be displayed
\n";
+ echo "this isn't supposed to be displayed
\n";
}
} elseif (0) {
$j++;
- echo "this definitely shouldn't be displayed
\n";
+ echo "this definitely shouldn't be displayed
\n";
} else {
$i++;
- echo "and this too shouldn't be displayed
\n";
+ echo "and this too shouldn't be displayed
\n";
}
} else {
$j=$i++; /* this should set $i to 1, but shouldn't change $j (it's assigned $i's previous values, zero) */
- echo "this should be displayed. should be: \$i=1, \$j=0. is: \$i=$i, \$j=$j
\n";
+ echo "this should be displayed. should be: \$i=1, \$j=0. is: \$i=$i, \$j=$j
\n";
if (1) {
$j += ++$i; /* ++$i --> $i==2, $j += 2 --> $j==2 */
if (0) {
$j += 40;
if (1) {
$i += 50;
- echo "damn, this shouldn't be displayed
\n";
+ echo "damn, this shouldn't be displayed
\n";
} else {
$j += 20;
- echo "this shouldn't be displayed either
\n";
+ echo "this shouldn't be displayed either
\n";
}
} else if (1) {
$j *= $i; /* $j *= 2 --> $j == 4 */
- echo "this is supposed to be displayed. should be: \$i=2, \$j=4. is: \$i=$i, \$j=$j
\n";
- echo "3 loop iterations should follow:
\n";
+ echo "this is supposed to be displayed. should be: \$i=2, \$j=4. is: \$i=$i, \$j=$j
\n";
+ echo "3 loop iterations should follow:
\n";
while ($i<=$j) {
- echo $i++." $j
\n";
+ echo $i++." $j
\n";
}
}
} elseif (0) {
- echo "this definitely shouldn't be displayed
\n";
+ echo "this definitely shouldn't be displayed
\n";
} else {
- echo "and this too shouldn't be displayed
\n";
+ echo "and this too shouldn't be displayed
\n";
}
- echo "**********************************
\n";
+ echo "**********************************
\n";
}
?>
-*** C-style else-if's ***
+*** C-style else-if's ***
\n";
+ echo "This shouldn't be displayed
\n";
} else if ($a++) {
- echo "This shouldn't be displayed either
\n";
+ echo "This shouldn't be displayed either
\n";
} else if (--$a) {
- echo "No, this neither
\n";
+ echo "No, this neither
\n";
} else if (++$a) {
- echo "This should be displayed
\n";
+ echo "This should be displayed
\n";
} else {
- echo "This shouldn't be displayed at all
\n";
+ echo "This shouldn't be displayed at all
\n";
}
?>
-*************************
+*************************
-*** WHILE tests ***
+*** WHILE tests ***
$j) {
- echo "$i is greater than $j
\n";
+ echo "$i is greater than $j
\n";
} else if ($i==$j) {
- echo "$i equals $j
\n";
+ echo "$i equals $j
\n";
} else {
- echo "$i is smaller than $j
\n";
+ echo "$i is smaller than $j
\n";
}
$i++;
}
?>
-*******************
+*******************
-*** Nested WHILEs ***
+*** Nested WHILEs ***
\n";
+echo "Each array variable should be equal to the sum of its indices:
\n";
$i=0;
while ($i<$arr_len) {
@@ -242,7 +242,7 @@ while ($i<$arr_len) {
while ($j<$arr_len) {
$k=0;
while ($k<$arr_len) {
- echo "\${test$i$j}[$k] = ".${"test$i$j"}[$k]."
\n";
+ echo "\${test$i$j}[$k] = ".${"test$i$j"}[$k]."
\n";
$k++;
}
$j++;
@@ -250,9 +250,9 @@ while ($i<$arr_len) {
$i++;
}
?>
-*********************
+*********************
-*** hash test... ***
+*** hash test... ***
\n";
+ echo $arr[$i++]."
\n";
}
*/
echo "commented out...";
?>
-**************************
+**************************
-*** Hash resizing test ***
+*** Hash resizing test ***
0) {
$a = $a . 'a';
- echo "$a
\n";
+ echo "$a
\n";
$resize[$a] = $i;
$i--;
}
@@ -286,31 +286,31 @@ $i = 10;
$a = 'b';
while ($i > 0) {
$a = $a . 'a';
- echo "$a
\n";
- echo $resize[$a]."
\n";
+ echo "$a
\n";
+ echo $resize[$a]."
\n";
$i--;
}
?>
-**************************
+**************************
-*** break/continue test ***
+*** break/continue test ***
\n";
+echo "\$i should go from 0 to 2
\n";
while ($i<5) {
if ($i>2) {
break;
}
$j=0;
- echo "\$j should go from 3 to 4, and \$q should go from 3 to 4
\n";
+ echo "\$j should go from 3 to 4, and \$q should go from 3 to 4
\n";
while ($j<5) {
if ($j<=2) {
$j++;
continue;
}
- echo " \$j=$j
\n";
+ echo " \$j=$j
\n";
for ($q=0; $q<=10; $q++) {
if ($q<3) {
continue;
@@ -318,39 +318,39 @@ while ($i<5) {
if ($q>4) {
break;
}
- echo " \$q=$q
\n";
+ echo " \$q=$q
\n";
}
$j++;
}
$j=0;
- echo "\$j should go from 0 to 2
\n";
+ echo "\$j should go from 0 to 2
\n";
while ($j<5) {
if ($j>2) {
$k=0;
- echo "\$k should go from 0 to 2
\n";
+ echo "\$k should go from 0 to 2
\n";
while ($k<5) {
if ($k>2) {
break 2;
}
- echo " \$k=$k
\n";
+ echo " \$k=$k
\n";
$k++;
}
}
- echo " \$j=$j
\n";
+ echo " \$j=$j
\n";
$j++;
}
- echo "\$i=$i
\n";
+ echo "\$i=$i
\n";
$i++;
}
?>
-***********************
+***********************
-*** Nested file include test ***
+*** Nested file include test ***
-********************************
+********************************
\n"; # testing some PHP style comment...
+ echo "Tests completed.
\n"; # testing some PHP style comment...
}
?>
diff --git a/tests/lang/023.phpt b/tests/lang/023.phpt
index 331308d01dc..87fd2b0b02a 100644
--- a/tests/lang/023.phpt
+++ b/tests/lang/023.phpt
@@ -30,227 +30,227 @@ PHP Regression Test
-*** Testing assignments and variable aliasing: ***
-This should read "blah": blah
-This should read "this is nifty": this is nifty
-*************************************************
+*** Testing assignments and variable aliasing: ***
+This should read "blah": blah
+This should read "this is nifty": this is nifty
+*************************************************
-*** Testing integer operators ***
-Correct result - 8: 8
-Correct result - 8: 8
-Correct result - 2: 2
-Correct result - -2: -2
-Correct result - 15: 15
-Correct result - 15: 15
-Correct result - 2: 2
-Correct result - 3: 3
-*********************************
+*** Testing integer operators ***
+Correct result - 8: 8
+Correct result - 8: 8
+Correct result - 2: 2
+Correct result - -2: -2
+Correct result - 15: 15
+Correct result - 15: 15
+Correct result - 2: 2
+Correct result - 3: 3
+*********************************
-*** Testing real operators ***
-Correct result - 8: 8
-Correct result - 8: 8
-Correct result - 2: 2
-Correct result - -2: -2
-Correct result - 15: 15
-Correct result - 15: 15
-Correct result - 2: 2
-Correct result - 3: 3
-*********************************
+*** Testing real operators ***
+Correct result - 8: 8
+Correct result - 8: 8
+Correct result - 2: 2
+Correct result - -2: -2
+Correct result - 15: 15
+Correct result - 15: 15
+Correct result - 2: 2
+Correct result - 3: 3
+*********************************
-*** Testing if/elseif/else control ***
+*** Testing if/elseif/else control ***
-This works
-this_still_works
-should_print
+This works
+this_still_works
+should_print
-*** Seriously nested if's test ***
+*** Seriously nested if's test ***
** spelling correction by kluzz **
-Only two lines of text should follow:
-this should be displayed. should be: $i=1, $j=0. is: $i=1, $j=0
-this is supposed to be displayed. should be: $i=2, $j=4. is: $i=2, $j=4
-3 loop iterations should follow:
-2 4
-3 4
-4 4
-**********************************
+Only two lines of text should follow:
+this should be displayed. should be: $i=1, $j=0. is: $i=1, $j=0
+this is supposed to be displayed. should be: $i=2, $j=4. is: $i=2, $j=4
+3 loop iterations should follow:
+2 4
+3 4
+4 4
+**********************************
-*** C-style else-if's ***
-This should be displayed
-*************************
+*** C-style else-if's ***
+This should be displayed
+*************************
-*** WHILE tests ***
-0 is smaller than 20
-1 is smaller than 20
-2 is smaller than 20
-3 is smaller than 20
-4 is smaller than 20
-5 is smaller than 20
-6 is smaller than 20
-7 is smaller than 20
-8 is smaller than 20
-9 is smaller than 20
-10 is smaller than 20
-11 is smaller than 20
-12 is smaller than 20
-13 is smaller than 20
-14 is smaller than 20
-15 is smaller than 20
-16 is smaller than 20
-17 is smaller than 20
-18 is smaller than 20
-19 is smaller than 20
-20 equals 20
-21 is greater than 20
-22 is greater than 20
-23 is greater than 20
-24 is greater than 20
-25 is greater than 20
-26 is greater than 20
-27 is greater than 20
-28 is greater than 20
-29 is greater than 20
-30 is greater than 20
-31 is greater than 20
-32 is greater than 20
-33 is greater than 20
-34 is greater than 20
-35 is greater than 20
-36 is greater than 20
-37 is greater than 20
-38 is greater than 20
-39 is greater than 20
-*******************
+*** WHILE tests ***
+0 is smaller than 20
+1 is smaller than 20
+2 is smaller than 20
+3 is smaller than 20
+4 is smaller than 20
+5 is smaller than 20
+6 is smaller than 20
+7 is smaller than 20
+8 is smaller than 20
+9 is smaller than 20
+10 is smaller than 20
+11 is smaller than 20
+12 is smaller than 20
+13 is smaller than 20
+14 is smaller than 20
+15 is smaller than 20
+16 is smaller than 20
+17 is smaller than 20
+18 is smaller than 20
+19 is smaller than 20
+20 equals 20
+21 is greater than 20
+22 is greater than 20
+23 is greater than 20
+24 is greater than 20
+25 is greater than 20
+26 is greater than 20
+27 is greater than 20
+28 is greater than 20
+29 is greater than 20
+30 is greater than 20
+31 is greater than 20
+32 is greater than 20
+33 is greater than 20
+34 is greater than 20
+35 is greater than 20
+36 is greater than 20
+37 is greater than 20
+38 is greater than 20
+39 is greater than 20
+*******************
-*** Nested WHILEs ***
-Each array variable should be equal to the sum of its indices:
-${test00}[0] = 0
-${test00}[1] = 1
-${test00}[2] = 2
-${test01}[0] = 1
-${test01}[1] = 2
-${test01}[2] = 3
-${test02}[0] = 2
-${test02}[1] = 3
-${test02}[2] = 4
-${test10}[0] = 1
-${test10}[1] = 2
-${test10}[2] = 3
-${test11}[0] = 2
-${test11}[1] = 3
-${test11}[2] = 4
-${test12}[0] = 3
-${test12}[1] = 4
-${test12}[2] = 5
-${test20}[0] = 2
-${test20}[1] = 3
-${test20}[2] = 4
-${test21}[0] = 3
-${test21}[1] = 4
-${test21}[2] = 5
-${test22}[0] = 4
-${test22}[1] = 5
-${test22}[2] = 6
-*********************
+*** Nested WHILEs ***
+Each array variable should be equal to the sum of its indices:
+${test00}[0] = 0
+${test00}[1] = 1
+${test00}[2] = 2
+${test01}[0] = 1
+${test01}[1] = 2
+${test01}[2] = 3
+${test02}[0] = 2
+${test02}[1] = 3
+${test02}[2] = 4
+${test10}[0] = 1
+${test10}[1] = 2
+${test10}[2] = 3
+${test11}[0] = 2
+${test11}[1] = 3
+${test11}[2] = 4
+${test12}[0] = 3
+${test12}[1] = 4
+${test12}[2] = 5
+${test20}[0] = 2
+${test20}[1] = 3
+${test20}[2] = 4
+${test21}[0] = 3
+${test21}[1] = 4
+${test21}[2] = 5
+${test22}[0] = 4
+${test22}[1] = 5
+${test22}[2] = 6
+*********************
-*** hash test... ***
+*** hash test... ***
commented out...
-**************************
+**************************
-*** Hash resizing test ***
-ba
-baa
-baaa
-baaaa
-baaaaa
-baaaaaa
-baaaaaaa
-baaaaaaaa
-baaaaaaaaa
-baaaaaaaaaa
-ba
-10
-baa
-9
-baaa
-8
-baaaa
-7
-baaaaa
-6
-baaaaaa
-5
-baaaaaaa
-4
-baaaaaaaa
-3
-baaaaaaaaa
-2
-baaaaaaaaaa
-1
-**************************
+*** Hash resizing test ***
+ba
+baa
+baaa
+baaaa
+baaaaa
+baaaaaa
+baaaaaaa
+baaaaaaaa
+baaaaaaaaa
+baaaaaaaaaa
+ba
+10
+baa
+9
+baaa
+8
+baaaa
+7
+baaaaa
+6
+baaaaaa
+5
+baaaaaaa
+4
+baaaaaaaa
+3
+baaaaaaaaa
+2
+baaaaaaaaaa
+1
+**************************
-*** break/continue test ***
-$i should go from 0 to 2
-$j should go from 3 to 4, and $q should go from 3 to 4
- $j=3
- $q=3
- $q=4
- $j=4
- $q=3
- $q=4
-$j should go from 0 to 2
- $j=0
- $j=1
- $j=2
-$k should go from 0 to 2
- $k=0
- $k=1
- $k=2
-$i=0
-$j should go from 3 to 4, and $q should go from 3 to 4
- $j=3
- $q=3
- $q=4
- $j=4
- $q=3
- $q=4
-$j should go from 0 to 2
- $j=0
- $j=1
- $j=2
-$k should go from 0 to 2
- $k=0
- $k=1
- $k=2
-$i=1
-$j should go from 3 to 4, and $q should go from 3 to 4
- $j=3
- $q=3
- $q=4
- $j=4
- $q=3
- $q=4
-$j should go from 0 to 2
- $j=0
- $j=1
- $j=2
-$k should go from 0 to 2
- $k=0
- $k=1
- $k=2
-$i=2
-***********************
+*** break/continue test ***
+$i should go from 0 to 2
+$j should go from 3 to 4, and $q should go from 3 to 4
+ $j=3
+ $q=3
+ $q=4
+ $j=4
+ $q=3
+ $q=4
+$j should go from 0 to 2
+ $j=0
+ $j=1
+ $j=2
+$k should go from 0 to 2
+ $k=0
+ $k=1
+ $k=2
+$i=0
+$j should go from 3 to 4, and $q should go from 3 to 4
+ $j=3
+ $q=3
+ $q=4
+ $j=4
+ $q=3
+ $q=4
+$j should go from 0 to 2
+ $j=0
+ $j=1
+ $j=2
+$k should go from 0 to 2
+ $k=0
+ $k=1
+ $k=2
+$i=1
+$j should go from 3 to 4, and $q should go from 3 to 4
+ $j=3
+ $q=3
+ $q=4
+ $j=4
+ $q=3
+ $q=4
+$j should go from 0 to 2
+ $j=0
+ $j=1
+ $j=2
+$k should go from 0 to 2
+ $k=0
+ $k=1
+ $k=2
+$i=2
+***********************
-*** Nested file include test ***
+*** Nested file include test ***
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
-********************************
+********************************
-Tests completed.
+Tests completed.
Limor Ullmann is now Limor Baruch :I
diff --git a/tests/lang/028.phpt b/tests/lang/028.phpt
index bd4525ee60e..a14e74cad86 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 caa4c7e4302..abc98f752d8 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 aef3f8f3526..046ae33f33a 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 9472999f471..d2d49be9880 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 ef510d22374..5ea0cd1eb9c 100755
--- a/tests/lang/038.phpt
+++ b/tests/lang/038.phpt
@@ -35,11 +35,7 @@ catch (Exception $e)
?>
===DONE===
---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 aa4b5916497..b353e0fa4b9 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 2e3dc22c582..5e5333879d7 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--
-
+
--EXPECT--
3
3
diff --git a/tests/lang/bug19943.phpt b/tests/lang/bug19943.phpt
index dae06c9c729..919c1926123 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 266a1d6c8fa..88ae0512718 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 835daaf97a4..9683408f69b 100644
--- a/tests/lang/bug21600.phpt
+++ b/tests/lang/bug21600.phpt
@@ -27,18 +27,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 75677c7473c..546e9518e57 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 2b20f986441..c1ab698118f 100644
--- a/tests/lang/bug22231.phpt
+++ b/tests/lang/bug22231.phpt
@@ -28,20 +28,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 7b3130bd834..4b6e0df11ef 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 ae9abbd2a47..3ffd86fdee9 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 e087d1fb2cb..4a088c35e8a 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 2f572df073e..98ca7def10a 100755
--- a/tests/lang/bug25145.phpt
+++ b/tests/lang/bug25145.phpt
@@ -12,15 +12,6 @@ echo "Done\n";
?>
--EXPECT--
-array(1) {
- [123]=>
- array(1) {
- [0]=>
- string(4) "SEGV"
- }
-}
-Done
---UEXPECT--
array(1) {
[123]=>
array(1) {
@@ -29,4 +20,3 @@ array(1) {
}
}
Done
-
diff --git a/tests/lang/bug28800.phpt b/tests/lang/bug28800.phpt
index f81ad7fec98..77301a66870 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 19df0123a0e..72a6b8a2c75 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 ad59646f500..f95ade3169c 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 69190d4c955..c2295c3440f 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 f81eae5d6fb..97a98395050 100644
--- a/tests/lang/catchable_error_002.phpt
+++ b/tests/lang/catchable_error_002.phpt
@@ -21,21 +21,6 @@ Catchable fatal error [2]
echo "ALIVE!\n";
?>
--EXPECTF--
-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)
diff --git a/tests/lang/include_variation3.phpt b/tests/lang/include_variation3.phpt
index 1fa80c5ab99..04709ab20e6 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 b21240a7923..d9de9dd3b90 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 09b5c222af4..ecacf0208bf 100644
--- a/tests/output/ob_001.phpt
+++ b/tests/output/ob_001.phpt
@@ -4,5 +4,5 @@ output buffering - nothing
---EXPECTF--
+--EXPECT--
foo
diff --git a/tests/output/ob_016.phpt b/tests/output/ob_016.phpt
index 3adbca17b84..9f056b2f0cd 100644
--- a/tests/output/ob_016.phpt
+++ b/tests/output/ob_016.phpt
@@ -10,11 +10,8 @@ echo "-a
$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
index db6eca8b5d1..e69b58b6ec5 100644
Binary files a/tests/output/ob_018.phpt and b/tests/output/ob_018.phpt differ
diff --git a/tests/run-test/test001.phpt b/tests/run-test/test001.phpt
index 370d09c9538..d36e72faa06 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 7b91f35c8df..316201e092a 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 c1afad15f76..6f9eb6a794f 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 4742ea36fda..0397c9a8192 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 3276acc791c..6fed9e81085 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 3954eb5d89b..1b1c2ca99eb 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 e2d59c0b8bc..ae79b6e593d 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 32ed4eb1ec9..9b3debf189a 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 02fdce5a1b8..78a44f88a22 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 8f0f7a91fd1..7a1bb4aed91 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 de532e12cb0..d49f368ccbd 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 5e3cc7aa161..026c5fdeceb 100644
--- a/tests/security/open_basedir_dir.phpt
+++ b/tests/security/open_basedir_dir.phpt
@@ -64,72 +64,6 @@ 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) {
- ["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) {
@@ -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 bb899c8adb6..97253a10537 100644
--- a/tests/security/open_basedir_error_log.phpt
+++ b/tests/security/open_basedir_error_log.phpt
@@ -35,28 +35,8 @@ 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)
-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 c0295f65067..08a6525d0c7 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 fbc841e3fe1..ef413889665 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 c249fc11654..2c90fd550bb 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 d4bd417b591..3be241b9ef8 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 02cc94f83f2..4cb7aefc394 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 542c8423edb..08c7ecd5f2f 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 5f6279aa8f5..f85f81bb7b2 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 070c2c806c3..08e378bb6f6 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 7213ddb5b9f..36e2de9ce8d 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 b363b7e0e85..7ce6cb30f89 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 a1e6511b082..944f1cd5ed9 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 a335dfd17cf..e682c2fac40 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 fa104a3679d..749aca07422 100644
--- a/tests/security/open_basedir_filetype.phpt
+++ b/tests/security/open_basedir_filetype.phpt
@@ -44,46 +44,6 @@ 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)
-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"
@@ -92,4 +52,3 @@ 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 c6c9a253f2f..0f3bc065a9c 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 bdc8d93fbd7..d1f8df551eb 100644
--- a/tests/security/open_basedir_glob-win32.phpt
+++ b/tests/security/open_basedir_glob-win32.phpt
@@ -35,44 +35,6 @@ bool(false)
bool(false)
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"
@@ -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 14bac1474e7..20834d8a2c8 100644
--- a/tests/security/open_basedir_glob.phpt
+++ b/tests/security/open_basedir_glob.phpt
@@ -34,43 +34,6 @@ bool(false)
bool(false)
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"
@@ -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 e4ad620d740..5c8967a9f45 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 51ef0a2d1f3..a3303599b55 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 5d12148d852..61485029f42 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 951a19ac76a..9a269b5c0b0 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 25ce1c63a4b..d2b70614cd1 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 a54c22f4b69..695824d3b19 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 ab12a5149d3..ed6df19ffa1 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 35e5a220197..8cd037dbd3d 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 077a5116b45..b580f15dd2e 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 ac740f073b4..cba16cea9c9 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 cbba4307e5e..51334102909 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 a107be8ffc8..bec1c12b047 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 428e7a070a7..e512e58d461 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 b4d61f8b766..8cc4f818c82 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 1c5072046d1..28e9741cb8f 100644
--- a/tests/security/open_basedir_scandir.phpt
+++ b/tests/security/open_basedir_scandir.phpt
@@ -80,94 +80,6 @@ Warning: scandir(): open_basedir restriction in effect. File(%s/test/bad/../bad/
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]=>
- 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) {
@@ -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 b80b854d6c0..2ad67d67d57 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 3b3f1d571ff..ab87e87b047 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 4a6db0ae7d5..691cae03ada 100644
--- a/tests/security/open_basedir_tempnam.phpt
+++ b/tests/security/open_basedir_tempnam.phpt
@@ -49,37 +49,8 @@ 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)
-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 b0a5aee6125..03c7b9e05f0 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 75b0f3f4a94..e2d025c18a7 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 2af793ab598..36dbac1cd20 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 64d6601924e..0409e2e2540 100755
--- a/tests/unicode/autodetect-SCSU.phpt
+++ b/tests/unicode/autodetect-SCSU.phpt
@@ -1,7 +1,5 @@
--TEST--
Script encoding autodetection (SCSU)
---SKIPIF--
-
--INI--
unicode.output_encoding=CP866
--FILE--
diff --git a/tests/unicode/autodetect-UTF16BE.phpt b/tests/unicode/autodetect-UTF16BE.phpt
index 678b2332caa..767bcf441ad 100755
--- a/tests/unicode/autodetect-UTF16BE.phpt
+++ b/tests/unicode/autodetect-UTF16BE.phpt
@@ -1,7 +1,5 @@
--TEST--
Script encoding autodetection (UTF-16BE)
---SKIPIF--
-
--INI--
unicode.output_encoding=CP866
--FILE--
diff --git a/tests/unicode/autodetect-UTF16LE.phpt b/tests/unicode/autodetect-UTF16LE.phpt
index 9c219f91196..39b4777d97b 100755
--- a/tests/unicode/autodetect-UTF16LE.phpt
+++ b/tests/unicode/autodetect-UTF16LE.phpt
@@ -1,7 +1,5 @@
--TEST--
Script encoding autodetection (UTF-16LE)
---SKIPIF--
-
--INI--
unicode.output_encoding=CP866
--FILE--
diff --git a/tests/unicode/autodetect-UTF32BE.phpt b/tests/unicode/autodetect-UTF32BE.phpt
index 2b0c5b52732..2ea73547612 100755
--- a/tests/unicode/autodetect-UTF32BE.phpt
+++ b/tests/unicode/autodetect-UTF32BE.phpt
@@ -1,7 +1,5 @@
--TEST--
Script encoding autodetection (UTF-32BE)
---SKIPIF--
-
--INI--
unicode.output_encoding=CP866
--FILE--
diff --git a/tests/unicode/autodetect-UTF32LE.phpt b/tests/unicode/autodetect-UTF32LE.phpt
index f1041c8dce0..61b6f90148e 100755
--- a/tests/unicode/autodetect-UTF32LE.phpt
+++ b/tests/unicode/autodetect-UTF32LE.phpt
@@ -1,7 +1,5 @@
--TEST--
Script encoding autodetection (UTF-32LE)
---SKIPIF--
-
--INI--
unicode.output_encoding=CP866
--FILE--
diff --git a/tests/unicode/autodetect-UTF7.phpt b/tests/unicode/autodetect-UTF7.phpt
index d9a33a47d7a..6d29e38c4c6 100755
--- a/tests/unicode/autodetect-UTF7.phpt
+++ b/tests/unicode/autodetect-UTF7.phpt
@@ -1,7 +1,5 @@
--TEST--
Script encoding autodetection (UTF7)
---SKIPIF--
-
--INI--
unicode.output_encoding=CP866
--FILE--
diff --git a/tests/unicode/autodetect-UTF8.phpt b/tests/unicode/autodetect-UTF8.phpt
index 2f91be3497a..618656b5ad9 100755
--- a/tests/unicode/autodetect-UTF8.phpt
+++ b/tests/unicode/autodetect-UTF8.phpt
@@ -1,7 +1,5 @@
--TEST--
Script encoding autodetection (UTF8)
---SKIPIF--
-
--INI--
unicode.output_encoding=CP866
--FILE--
diff --git a/tests/unicode/enc-HZ.phpt b/tests/unicode/enc-HZ.phpt
index a5aabad0c9f..21c104ae71e 100755
--- a/tests/unicode/enc-HZ.phpt
+++ b/tests/unicode/enc-HZ.phpt
@@ -1,7 +1,5 @@
--TEST--
Script encoding (HZ)
---SKIPIF--
-
--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 23fe3b903a6..53bd4f7ee7b 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--
-
--INI--
unicode.output_encoding=CP866
--FILE--
diff --git a/tests/unicode/enc-JIS.phpt b/tests/unicode/enc-JIS.phpt
index 5088a1c54fd..b466cd7e335 100755
--- a/tests/unicode/enc-JIS.phpt
+++ b/tests/unicode/enc-JIS.phpt
@@ -1,7 +1,5 @@
--TEST--
Script encoding (JIS)
---SKIPIF--
-
--INI--
unicode.output_encoding=CP866
--FILE--
diff --git a/tests/unicode/enc-SJIS.phpt b/tests/unicode/enc-SJIS.phpt
index b3661b87277..eb7b195ab61 100755
--- a/tests/unicode/enc-SJIS.phpt
+++ b/tests/unicode/enc-SJIS.phpt
@@ -1,7 +1,5 @@
--TEST--
Script encoding (SJIS)
---SKIPIF--
-
--INI--
unicode.output_encoding=CP866
--FILE--
diff --git a/tests/unicode/encrt-HZ.phpt b/tests/unicode/encrt-HZ.phpt
index e87fb606a1e..8c08a257402 100755
--- a/tests/unicode/encrt-HZ.phpt
+++ b/tests/unicode/encrt-HZ.phpt
@@ -1,7 +1,5 @@
--TEST--
declare script encoding (HZ)
---SKIPIF--
-
--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 8ef2c46a74e..3b00bfe0783 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--
-
--INI--
unicode.output_encoding=CP866
--FILE--
diff --git a/tests/unicode/encrt-JIS.phpt b/tests/unicode/encrt-JIS.phpt
index 4da9d884c92..42303e6cd2e 100755
--- a/tests/unicode/encrt-JIS.phpt
+++ b/tests/unicode/encrt-JIS.phpt
@@ -1,7 +1,5 @@
--TEST--
declare script encoding (JIS)
---SKIPIF--
-
--INI--
unicode.output_encoding=CP866
--FILE--
diff --git a/tests/unicode/encrt-SJIS.phpt b/tests/unicode/encrt-SJIS.phpt
index 73cd4a185e8..cd58ebb9cc0 100755
--- a/tests/unicode/encrt-SJIS.phpt
+++ b/tests/unicode/encrt-SJIS.phpt
@@ -1,7 +1,5 @@
--TEST--
declare script encoding (SJIS)
---SKIPIF--
-
--INI--
unicode.output_encoding=CP866
--FILE--
diff --git a/tests/unicode/func/strpos.phpt b/tests/unicode/func/strpos.phpt
index a231bec7705..0233e0df697 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--
--FILE--
--FILE--
--FILE--
--FILE--