summaryrefslogtreecommitdiff
path: root/ext/standard/tests/general_functions
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard/tests/general_functions')
-rw-r--r--ext/standard/tests/general_functions/005.phpt1
-rw-r--r--ext/standard/tests/general_functions/008.phpt2
-rw-r--r--ext/standard/tests/general_functions/bug31190.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug43293_1.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug43293_2.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug43293_3.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug44461.phpt2
-rw-r--r--ext/standard/tests/general_functions/bug47857.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug49847.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug60227_1.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug60227_2.phpt1
-rw-r--r--ext/standard/tests/general_functions/bug69646.phpt1
-rw-r--r--ext/standard/tests/general_functions/debug_zval_dump_e.phpt1
-rw-r--r--ext/standard/tests/general_functions/debug_zval_dump_v.phpt1
-rw-r--r--ext/standard/tests/general_functions/dl-cve-2007-4887.phpt1
-rw-r--r--ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt2
-rw-r--r--ext/standard/tests/general_functions/escapeshellarg_basic.phpt2
-rw-r--r--ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt2
-rw-r--r--ext/standard/tests/general_functions/floatval_basic.phpt2
-rw-r--r--ext/standard/tests/general_functions/floatval_error.phpt2
-rw-r--r--ext/standard/tests/general_functions/floatval_variation1.phpt1
-rw-r--r--ext/standard/tests/general_functions/get_defined_constants_basic.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_defined_constants_error.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_defined_vars_basic.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_include_path_basic.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_included_files.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_loaded_extensions_error.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_resource_type_error.phpt2
-rw-r--r--ext/standard/tests/general_functions/get_resource_type_variation1.phpt2
-rw-r--r--ext/standard/tests/general_functions/getmypid_basic.phpt2
-rw-r--r--ext/standard/tests/general_functions/getopt_002.phpt2
-rw-r--r--ext/standard/tests/general_functions/getopt_003.phpt2
-rw-r--r--ext/standard/tests/general_functions/getopt_004.phpt2
-rw-r--r--ext/standard/tests/general_functions/getopt_005.phpt2
-rw-r--r--ext/standard/tests/general_functions/is_resource_error.phpt2
-rw-r--r--ext/standard/tests/general_functions/isset_basic1.phpt2
-rw-r--r--ext/standard/tests/general_functions/isset_basic2.phpt2
-rw-r--r--ext/standard/tests/general_functions/output_add_rewrite_var_basic1.phpt1
-rw-r--r--ext/standard/tests/general_functions/output_add_rewrite_var_basic2.phpt1
-rw-r--r--ext/standard/tests/general_functions/output_add_rewrite_var_basic3.phpt1
-rw-r--r--ext/standard/tests/general_functions/output_add_rewrite_var_basic4.phpt1
-rw-r--r--ext/standard/tests/general_functions/php_uname_error.phpt2
-rw-r--r--ext/standard/tests/general_functions/php_uname_variation1.phpt2
-rw-r--r--ext/standard/tests/general_functions/print_r_64bit.phpt1
-rw-r--r--ext/standard/tests/general_functions/sys_getloadavg.phpt1
-rw-r--r--ext/standard/tests/general_functions/uniqid_error.phpt2
-rw-r--r--ext/standard/tests/general_functions/var_dump.phpt1
-rw-r--r--ext/standard/tests/general_functions/var_dump_64bit.phpt1
-rw-r--r--ext/standard/tests/general_functions/var_export_basic2.phpt2
-rw-r--r--ext/standard/tests/general_functions/var_export_basic4.phpt2
-rw-r--r--ext/standard/tests/general_functions/var_export_error2.phpt1
-rw-r--r--ext/standard/tests/general_functions/var_export_error3.phpt1
53 files changed, 25 insertions, 57 deletions
diff --git a/ext/standard/tests/general_functions/005.phpt b/ext/standard/tests/general_functions/005.phpt
index 027d124add..fa90adf1b8 100644
--- a/ext/standard/tests/general_functions/005.phpt
+++ b/ext/standard/tests/general_functions/005.phpt
@@ -21,4 +21,3 @@ bool(false)
bool(false)
bool(false)
bool(false)
-
diff --git a/ext/standard/tests/general_functions/008.phpt b/ext/standard/tests/general_functions/008.phpt
index f76c73572b..1148f777f4 100644
--- a/ext/standard/tests/general_functions/008.phpt
+++ b/ext/standard/tests/general_functions/008.phpt
@@ -37,4 +37,4 @@ array(14) {
float(1.23456789012E+12)
[13]=>
float(1.23456789012E+19)
-} \ No newline at end of file
+}
diff --git a/ext/standard/tests/general_functions/bug31190.phpt b/ext/standard/tests/general_functions/bug31190.phpt
index 12776448b3..1a7917d47e 100644
--- a/ext/standard/tests/general_functions/bug31190.phpt
+++ b/ext/standard/tests/general_functions/bug31190.phpt
@@ -23,4 +23,3 @@ try {
--EXPECT--
Hello World!
Hello World!
-
diff --git a/ext/standard/tests/general_functions/bug43293_1.phpt b/ext/standard/tests/general_functions/bug43293_1.phpt
index 34eb2f855c..c1f618f2bd 100644
--- a/ext/standard/tests/general_functions/bug43293_1.phpt
+++ b/ext/standard/tests/general_functions/bug43293_1.phpt
@@ -22,4 +22,3 @@ array(3) {
int(3)
}
bool(false)
-
diff --git a/ext/standard/tests/general_functions/bug43293_2.phpt b/ext/standard/tests/general_functions/bug43293_2.phpt
index 76a5956af0..2cb511eaf4 100644
--- a/ext/standard/tests/general_functions/bug43293_2.phpt
+++ b/ext/standard/tests/general_functions/bug43293_2.phpt
@@ -10,4 +10,3 @@ var_dump(getopt("abcd"));
--EXPECT--
array(0) {
}
-
diff --git a/ext/standard/tests/general_functions/bug43293_3.phpt b/ext/standard/tests/general_functions/bug43293_3.phpt
index 6cf6529820..7fa00fc2b1 100644
--- a/ext/standard/tests/general_functions/bug43293_3.phpt
+++ b/ext/standard/tests/general_functions/bug43293_3.phpt
@@ -27,4 +27,3 @@ array(3) {
[2]=>
string(1) "f"
}
-
diff --git a/ext/standard/tests/general_functions/bug44461.phpt b/ext/standard/tests/general_functions/bug44461.phpt
index 6fa73ee27f..31dba0a6ec 100644
--- a/ext/standard/tests/general_functions/bug44461.phpt
+++ b/ext/standard/tests/general_functions/bug44461.phpt
@@ -15,4 +15,4 @@ parse_ini_file(__DIR__ . 'bug44461.ini', true);
unlink(__DIR__ . 'bug44461.ini');
?>
--EXPECT--
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/bug47857.phpt b/ext/standard/tests/general_functions/bug47857.phpt
index 8bf04a39aa..d19eca7248 100644
--- a/ext/standard/tests/general_functions/bug47857.phpt
+++ b/ext/standard/tests/general_functions/bug47857.phpt
@@ -23,4 +23,3 @@ Fatal error: Uncaught Error: Non-static method Exception::getMessage() cannot be
Stack trace:
#0 {main}
thrown in %sbug47857.php on line %d
-
diff --git a/ext/standard/tests/general_functions/bug49847.phpt b/ext/standard/tests/general_functions/bug49847.phpt
index 112592d6ed..b7fbded2fc 100644
--- a/ext/standard/tests/general_functions/bug49847.phpt
+++ b/ext/standard/tests/general_functions/bug49847.phpt
@@ -23,4 +23,3 @@ array(1) {
[0]=>
string(4098) "%s 1"
}
-
diff --git a/ext/standard/tests/general_functions/bug60227_1.phpt b/ext/standard/tests/general_functions/bug60227_1.phpt
index 8efe222ada..748d15357c 100644
--- a/ext/standard/tests/general_functions/bug60227_1.phpt
+++ b/ext/standard/tests/general_functions/bug60227_1.phpt
@@ -17,4 +17,3 @@ X-Foo1: a
X-Foo2: b
X-Foo3: c
X-Foo4: d
-
diff --git a/ext/standard/tests/general_functions/bug60227_2.phpt b/ext/standard/tests/general_functions/bug60227_2.phpt
index 23bc8b1937..1c92aaaefa 100644
--- a/ext/standard/tests/general_functions/bug60227_2.phpt
+++ b/ext/standard/tests/general_functions/bug60227_2.phpt
@@ -9,7 +9,6 @@ header("X-foo: e\n foo");
echo 'foo';
?>
--EXPECTF--
-
Warning: Header may not contain more than a single header, new line detected in %s on line %d
foo
--EXPECTHEADERS--
diff --git a/ext/standard/tests/general_functions/bug69646.phpt b/ext/standard/tests/general_functions/bug69646.phpt
index b077c67319..4c897516c8 100644
--- a/ext/standard/tests/general_functions/bug69646.phpt
+++ b/ext/standard/tests/general_functions/bug69646.phpt
@@ -44,4 +44,3 @@ array(3) {
[2]=>
string(7) "b -c d\"
}
-
diff --git a/ext/standard/tests/general_functions/debug_zval_dump_e.phpt b/ext/standard/tests/general_functions/debug_zval_dump_e.phpt
index 4f82039e2d..8d1947e194 100644
--- a/ext/standard/tests/general_functions/debug_zval_dump_e.phpt
+++ b/ext/standard/tests/general_functions/debug_zval_dump_e.phpt
@@ -15,7 +15,6 @@ debug_zval_dump();
echo "Done\n";
?>
-
--EXPECTF--
*** Testing error conditions ***
diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
index f637bfc2e9..b1dce294ab 100644
--- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
+++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
@@ -118,7 +118,6 @@ foreach( $misc_values as $value ) {
echo "Done\n";
?>
-
--EXPECTF--
*** Testing debug_zval_dump() on functions ***
--- Variation 1: global variable inside a function ---
diff --git a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
index 57115a2b72..263c9a6def 100644
--- a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
+++ b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
@@ -14,6 +14,5 @@ enable_dl=1
var_dump(dl(str_repeat("a", 8376757)));
?>
--EXPECTF--
-
Warning: dl(): File name exceeds the maximum allowed length of %d characters in %s on line %d
bool(false)
diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt
index 7ee46ea9a2..b3a4c13502 100644
--- a/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt
+++ b/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt
@@ -30,4 +30,4 @@ string(12) ""Mr O\'Neil""
string(11) "" FILENAME""
string(11) "" FILENAME""
string(2) """"
-Done \ No newline at end of file
+Done
diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic.phpt
index 1efa72d992..d7d1fc64e3 100644
--- a/ext/standard/tests/general_functions/escapeshellarg_basic.phpt
+++ b/ext/standard/tests/general_functions/escapeshellarg_basic.phpt
@@ -28,4 +28,4 @@ string(14) "'Mr O'\''Neil'"
string(15) "'Mr O\'\''Neil'"
string(11) "'%FILENAME'"
string(2) "''"
-Done \ No newline at end of file
+Done
diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt
index f4e9439b14..aa264cce37 100644
--- a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt
+++ b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt
@@ -137,4 +137,4 @@ string(2) """"
-- Iteration 20 --
string(2) """"
-===Done=== \ No newline at end of file
+===Done===
diff --git a/ext/standard/tests/general_functions/floatval_basic.phpt b/ext/standard/tests/general_functions/floatval_basic.phpt
index 71f4e0d139..8ad628b4f0 100644
--- a/ext/standard/tests/general_functions/floatval_basic.phpt
+++ b/ext/standard/tests/general_functions/floatval_basic.phpt
@@ -169,4 +169,4 @@ float(5000000)
-- Iteration : -.5e+7 --
float(-5000000)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/floatval_error.phpt b/ext/standard/tests/general_functions/floatval_error.phpt
index 178713abe9..3f6fca4076 100644
--- a/ext/standard/tests/general_functions/floatval_error.phpt
+++ b/ext/standard/tests/general_functions/floatval_error.phpt
@@ -37,4 +37,4 @@ NULL
Warning: doubleval() expects exactly 1 parameter, 2 given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/floatval_variation1.phpt b/ext/standard/tests/general_functions/floatval_variation1.phpt
index 2aafa0684c..0bb11e95c4 100644
--- a/ext/standard/tests/general_functions/floatval_variation1.phpt
+++ b/ext/standard/tests/general_functions/floatval_variation1.phpt
@@ -52,7 +52,6 @@ foreach ($not_float_types as $key => $type ) {
?>
===DONE===
--EXPECTF--
-
Notice: A non well formed numeric value encountered in %s on line %d
Notice: A non well formed numeric value encountered in %s on line %d
diff --git a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt
index ec982bd55b..1d9ca4a277 100644
--- a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt
+++ b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt
@@ -36,4 +36,4 @@ string(5) "array"
array(0) {
}
TEST PASSED
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/get_defined_constants_error.phpt b/ext/standard/tests/general_functions/get_defined_constants_error.phpt
index b093ed1e0c..c9eb22e256 100644
--- a/ext/standard/tests/general_functions/get_defined_constants_error.phpt
+++ b/ext/standard/tests/general_functions/get_defined_constants_error.phpt
@@ -22,4 +22,4 @@ var_dump( get_defined_constants(true, $extra_arg) );
Warning: get_defined_constants() expects at most 1 parameter, 2 given in %s on line 11
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/get_defined_vars_basic.phpt b/ext/standard/tests/general_functions/get_defined_vars_basic.phpt
index b809dc9d55..6e9494509a 100644
--- a/ext/standard/tests/general_functions/get_defined_vars_basic.phpt
+++ b/ext/standard/tests/general_functions/get_defined_vars_basic.phpt
@@ -149,4 +149,4 @@ array(9) {
["b1"]=>
bool(true)
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/get_include_path_basic.phpt b/ext/standard/tests/general_functions/get_include_path_basic.phpt
index b777a2a44d..2017bf697a 100644
--- a/ext/standard/tests/general_functions/get_include_path_basic.phpt
+++ b/ext/standard/tests/general_functions/get_include_path_basic.phpt
@@ -34,4 +34,4 @@ Error cases:
Warning: get_include_path() expects exactly 0 parameters, 1 given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/get_included_files.phpt b/ext/standard/tests/general_functions/get_included_files.phpt
index e7e1ed5219..e6d00a56a1 100644
--- a/ext/standard/tests/general_functions/get_included_files.phpt
+++ b/ext/standard/tests/general_functions/get_included_files.phpt
@@ -60,4 +60,4 @@ array(4) {
Warning: get_included_files() expects exactly 0 parameters, 1 given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt b/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt
index 8ce2323a39..c72a88de13 100644
--- a/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt
+++ b/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt
@@ -20,4 +20,4 @@ Get loaded extensions
array(%d) {
%a
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt b/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt
index 1728dea23f..8bb782fc79 100644
--- a/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt
+++ b/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt
@@ -23,4 +23,4 @@ var_dump( get_resource_type(true, $extra_arg) );
Warning: get_resource_type() expects exactly 1 parameter, 2 given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/get_resource_type_error.phpt b/ext/standard/tests/general_functions/get_resource_type_error.phpt
index a010f7eba4..fd8fce6e53 100644
--- a/ext/standard/tests/general_functions/get_resource_type_error.phpt
+++ b/ext/standard/tests/general_functions/get_resource_type_error.phpt
@@ -31,4 +31,4 @@ NULL
Warning: get_resource_type() expects exactly 1 parameter, 2 given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt
index 499581c05b..b5f33e1830 100644
--- a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt
+++ b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt
@@ -71,4 +71,4 @@ NULL
Warning: get_resource_type() expects parameter 1 to be resource, object given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/getmypid_basic.phpt b/ext/standard/tests/general_functions/getmypid_basic.phpt
index 3f4d9cd5cf..ec52ee927d 100644
--- a/ext/standard/tests/general_functions/getmypid_basic.phpt
+++ b/ext/standard/tests/general_functions/getmypid_basic.phpt
@@ -17,4 +17,4 @@ echo "Done\n";
--EXPECTF--
Simple testcase for getmypid() function
int(%d)
-Done \ No newline at end of file
+Done
diff --git a/ext/standard/tests/general_functions/getopt_002.phpt b/ext/standard/tests/general_functions/getopt_002.phpt
index 3912ec87c7..1bf65e70ab 100644
--- a/ext/standard/tests/general_functions/getopt_002.phpt
+++ b/ext/standard/tests/general_functions/getopt_002.phpt
@@ -38,5 +38,3 @@ array(4) {
[2]=>
bool(false)
}
-
-
diff --git a/ext/standard/tests/general_functions/getopt_003.phpt b/ext/standard/tests/general_functions/getopt_003.phpt
index fbb39b0e55..e1a5146065 100644
--- a/ext/standard/tests/general_functions/getopt_003.phpt
+++ b/ext/standard/tests/general_functions/getopt_003.phpt
@@ -53,5 +53,3 @@ array(7) {
bool(false)
}
}
-
-
diff --git a/ext/standard/tests/general_functions/getopt_004.phpt b/ext/standard/tests/general_functions/getopt_004.phpt
index 193bd40f4d..ac0aafe27b 100644
--- a/ext/standard/tests/general_functions/getopt_004.phpt
+++ b/ext/standard/tests/general_functions/getopt_004.phpt
@@ -25,5 +25,3 @@ array(1) {
string(3) "100"
}
}
-
-
diff --git a/ext/standard/tests/general_functions/getopt_005.phpt b/ext/standard/tests/general_functions/getopt_005.phpt
index fe43a025e9..3fa1791eab 100644
--- a/ext/standard/tests/general_functions/getopt_005.phpt
+++ b/ext/standard/tests/general_functions/getopt_005.phpt
@@ -28,5 +28,3 @@ array(2) {
string(5) "value"
}
}
-
-
diff --git a/ext/standard/tests/general_functions/is_resource_error.phpt b/ext/standard/tests/general_functions/is_resource_error.phpt
index f7168737cd..b90f8a26e1 100644
--- a/ext/standard/tests/general_functions/is_resource_error.phpt
+++ b/ext/standard/tests/general_functions/is_resource_error.phpt
@@ -31,4 +31,4 @@ bool(false)
Warning: is_resource() expects exactly 1 parameter, 2 given in %s on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/isset_basic1.phpt b/ext/standard/tests/general_functions/isset_basic1.phpt
index fd3f5be6a0..bdaf1eb46d 100644
--- a/ext/standard/tests/general_functions/isset_basic1.phpt
+++ b/ext/standard/tests/general_functions/isset_basic1.phpt
@@ -63,4 +63,4 @@ Boolean test: NO
Null test: NO
Object test: NO
Resource test: NO
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/isset_basic2.phpt b/ext/standard/tests/general_functions/isset_basic2.phpt
index 5f0432b594..925b19a2c0 100644
--- a/ext/standard/tests/general_functions/isset_basic2.phpt
+++ b/ext/standard/tests/general_functions/isset_basic2.phpt
@@ -57,4 +57,4 @@ bool(false)
bool(true)
bool(true)
bool(true)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/output_add_rewrite_var_basic1.phpt b/ext/standard/tests/general_functions/output_add_rewrite_var_basic1.phpt
index 60bc61395f..58b6f19f5c 100644
--- a/ext/standard/tests/general_functions/output_add_rewrite_var_basic1.phpt
+++ b/ext/standard/tests/general_functions/output_add_rewrite_var_basic1.phpt
@@ -74,7 +74,6 @@ Test use_trans_sid=1
<form action="http://php.net/bar.php" method="get"> </form>
<form action="bad://php.net/bar.php" method="get"> </form>
<form action="//www.php.net/bar.php" method="get"> </form>
-
--EXPECT--
Without session
<a href="?%3CNAME%3E=%3CVALUE%3E"> </a>
diff --git a/ext/standard/tests/general_functions/output_add_rewrite_var_basic2.phpt b/ext/standard/tests/general_functions/output_add_rewrite_var_basic2.phpt
index 94c79b8a14..6b0c4e85a9 100644
--- a/ext/standard/tests/general_functions/output_add_rewrite_var_basic2.phpt
+++ b/ext/standard/tests/general_functions/output_add_rewrite_var_basic2.phpt
@@ -74,7 +74,6 @@ Test use_trans_sid=1
<form action="http://php.net/bar.php" method="get"> </a>
<form action="bad://php.net/bar.php" method="get"> </a>
<form action="//www.php.net/bar.php" method="get"> </a>
-
--EXPECT--
Without session
<a href="?%3CNAME%3E=%3CVALUE%3E"> </a>
diff --git a/ext/standard/tests/general_functions/output_add_rewrite_var_basic3.phpt b/ext/standard/tests/general_functions/output_add_rewrite_var_basic3.phpt
index a7a4a94378..9e35f967f0 100644
--- a/ext/standard/tests/general_functions/output_add_rewrite_var_basic3.phpt
+++ b/ext/standard/tests/general_functions/output_add_rewrite_var_basic3.phpt
@@ -73,7 +73,6 @@ Test use_trans_sid=1
<form action="http://php.net/bar.php" method="get"> </a>
<form action="bad://php.net/bar.php" method="get"> </a>
<form action="//www.php.net/bar.php" method="get"> </a>
-
--EXPECT--
Without session
<a href="?%3CNAME%3E=%3CVALUE%3E"> </a>
diff --git a/ext/standard/tests/general_functions/output_add_rewrite_var_basic4.phpt b/ext/standard/tests/general_functions/output_add_rewrite_var_basic4.phpt
index 775b590202..2dda4e7896 100644
--- a/ext/standard/tests/general_functions/output_add_rewrite_var_basic4.phpt
+++ b/ext/standard/tests/general_functions/output_add_rewrite_var_basic4.phpt
@@ -73,7 +73,6 @@ Test use_trans_sid=1
<form action="http://php.net/bar.php" method="get"> </a>
<form action="bad://php.net/bar.php" method="get"> </a>
<form action="//www.php.net/bar.php" method="get"> </a>
-
--EXPECT--
Without session
<a href="?%3CNAME%3E=%3CVALUE%3E"> </a>
diff --git a/ext/standard/tests/general_functions/php_uname_error.phpt b/ext/standard/tests/general_functions/php_uname_error.phpt
index 2f671cd016..392e1c930e 100644
--- a/ext/standard/tests/general_functions/php_uname_error.phpt
+++ b/ext/standard/tests/general_functions/php_uname_error.phpt
@@ -53,4 +53,4 @@ NULL
Warning: php_uname() expects parameter 1 to be string, resource given in %s on line %d
NULL
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/php_uname_variation1.phpt b/ext/standard/tests/general_functions/php_uname_variation1.phpt
index 4a47827657..d5b86c7b5c 100644
--- a/ext/standard/tests/general_functions/php_uname_variation1.phpt
+++ b/ext/standard/tests/general_functions/php_uname_variation1.phpt
@@ -109,4 +109,4 @@ string(%d) "%s"
string(%d) "%s"
-- Iterator unset var --
string(%d) "%s"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/print_r_64bit.phpt b/ext/standard/tests/general_functions/print_r_64bit.phpt
index 25776dd3ba..5447a94db8 100644
--- a/ext/standard/tests/general_functions/print_r_64bit.phpt
+++ b/ext/standard/tests/general_functions/print_r_64bit.phpt
@@ -7,7 +7,6 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
--INI--
precision=14
--FILE--
-
<?php
/* Prototype: bool print_r ( mixed $expression [, bool $return] );
Description: Prints human-readable information about a variable
diff --git a/ext/standard/tests/general_functions/sys_getloadavg.phpt b/ext/standard/tests/general_functions/sys_getloadavg.phpt
index a788e3206b..5763084f70 100644
--- a/ext/standard/tests/general_functions/sys_getloadavg.phpt
+++ b/ext/standard/tests/general_functions/sys_getloadavg.phpt
@@ -13,7 +13,6 @@ var_dump(sys_getloadavg());
echo "Done\n";
?>
--EXPECTF--
-
Warning: sys_getloadavg() expects exactly 0 parameters, %d given in %s
NULL
array(3) {
diff --git a/ext/standard/tests/general_functions/uniqid_error.phpt b/ext/standard/tests/general_functions/uniqid_error.phpt
index 388bc42599..4a56234bec 100644
--- a/ext/standard/tests/general_functions/uniqid_error.phpt
+++ b/ext/standard/tests/general_functions/uniqid_error.phpt
@@ -43,4 +43,4 @@ Warning: uniqid() expects parameter 1 to be string, array given in %s on line %d
Warning: uniqid() expects parameter 1 to be string, resource given in %s on line %d
Warning: uniqid() expects parameter 1 to be string, object given in %s on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt
index b12f5f579f..f0da840c3b 100644
--- a/ext/standard/tests/general_functions/var_dump.phpt
+++ b/ext/standard/tests/general_functions/var_dump.phpt
@@ -1575,4 +1575,3 @@ string(9) "
Warning: var_dump() expects at least 1 parameter, 0 given in %s on line %d
Done
-
diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt
index a7f61ec063..a2476ef3f6 100644
--- a/ext/standard/tests/general_functions/var_dump_64bit.phpt
+++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt
@@ -1575,4 +1575,3 @@ string(9) "
Warning: var_dump() expects at least 1 parameter, 0 given in %s on line %d
Done
-
diff --git a/ext/standard/tests/general_functions/var_export_basic2.phpt b/ext/standard/tests/general_functions/var_export_basic2.phpt
index 6dfb08f082..29c3a138f9 100644
--- a/ext/standard/tests/general_functions/var_export_basic2.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic2.phpt
@@ -73,4 +73,4 @@ false
false
string(5) "false"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/var_export_basic4.phpt b/ext/standard/tests/general_functions/var_export_basic4.phpt
index cfdac8b268..b99f4584a6 100644
--- a/ext/standard/tests/general_functions/var_export_basic4.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic4.phpt
@@ -144,4 +144,4 @@ string(7) "'\\060'"
'8'
string(3) "'8'"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/general_functions/var_export_error2.phpt b/ext/standard/tests/general_functions/var_export_error2.phpt
index 57764e54d1..eedb757d20 100644
--- a/ext/standard/tests/general_functions/var_export_error2.phpt
+++ b/ext/standard/tests/general_functions/var_export_error2.phpt
@@ -14,6 +14,5 @@ var_export($obj, true);
?>
===DONE===
--EXPECTF--
-
Warning: var_export does not handle circular references in %s on line 9
===DONE===
diff --git a/ext/standard/tests/general_functions/var_export_error3.phpt b/ext/standard/tests/general_functions/var_export_error3.phpt
index a5acb37027..38b5dbc28c 100644
--- a/ext/standard/tests/general_functions/var_export_error3.phpt
+++ b/ext/standard/tests/general_functions/var_export_error3.phpt
@@ -14,6 +14,5 @@ var_export($a, true);
?>
===DONE===
--EXPECTF--
-
Warning: var_export does not handle circular references in %s on line 9
===DONE===