Sync leading and final newlines in *.phpt sections

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

178 files changed, 3 insertions, 201 deletions

diff --git a/tests/basic/bug20539.phpt b/tests/basic/bug20539.phpt
index 1406ce088e..6c2cfb2647 100644
--- a/tests/basic/bug20539.phpt
+++ b/tests/basic/bug20539.phpt
@@ -17,4 +17,3 @@ session.save_path=./tests/basic/
 --EXPECT--
 good :)
 bool(true)
-
diff --git a/tests/classes/__call_003.phpt b/tests/classes/__call_003.phpt
index 30662add36..24d1b1b0b4 100644
--- a/tests/classes/__call_003.phpt
+++ b/tests/classes/__call_003.phpt
@@ -30,4 +30,3 @@ array(1) {
   [0]=>
   &string(7) "changed"
 }
-
diff --git a/tests/classes/abstract_derived.phpt b/tests/classes/abstract_derived.phpt
index 21f8fd8788..a23205f9a5 100644
--- a/tests/classes/abstract_derived.phpt
+++ b/tests/classes/abstract_derived.phpt
@@ -14,5 +14,4 @@ class derived extends base {
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-
 Fatal error: Class derived contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (derived::show) in %sabstract_derived.php on line %d
diff --git a/tests/classes/abstract_final.phpt b/tests/classes/abstract_final.phpt
index cdf61d17e7..a82bfff227 100644
--- a/tests/classes/abstract_final.phpt
+++ b/tests/classes/abstract_final.phpt
@@ -10,5 +10,4 @@ class fail {
 echo "Done\n"; // Shouldn't be displayed
 ?>
 --EXPECTF--
-
 Fatal error: Cannot use the final modifier on an abstract class member in %s on line %d
diff --git a/tests/classes/abstract_inherit.phpt b/tests/classes/abstract_inherit.phpt
index 1acf19d7c0..8e9e118e08 100644
--- a/tests/classes/abstract_inherit.phpt
+++ b/tests/classes/abstract_inherit.phpt
@@ -16,7 +16,6 @@ $t = new pass();
 echo "Done\n"; // Shouldn't be displayed
 ?>
 --EXPECTF--
-
 Fatal error: Uncaught Error: Cannot instantiate abstract class fail in %s:%d
 Stack trace:
 #0 {main}
diff --git a/tests/classes/abstract_redeclare.phpt b/tests/classes/abstract_redeclare.phpt
index 8e09a3a12b..5643cb7a61 100644
--- a/tests/classes/abstract_redeclare.phpt
+++ b/tests/classes/abstract_redeclare.phpt
@@ -16,5 +16,4 @@ class fail extends pass {
 echo "Done\n"; // Shouldn't be displayed
 ?>
 --EXPECTF--
-
 Fatal error: Class fail contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (fail::show) in %sabstract_redeclare.php on line %d
diff --git a/tests/classes/array_access_012.phpt b/tests/classes/array_access_012.phpt
index 1fe0b24865..ba3d6780f1 100644
--- a/tests/classes/array_access_012.phpt
+++ b/tests/classes/array_access_012.phpt
@@ -30,7 +30,6 @@ $data['element'] = &$test;
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-
 Notice: Indirect modification of overloaded element of ArrayAccessImpl has no effect in %sarray_access_012.php on line 24
 
 Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %sarray_access_012.php:24
diff --git a/tests/classes/autoload_018.phpt b/tests/classes/autoload_018.phpt
index 4a21fad338..e83767d632 100644
--- a/tests/classes/autoload_018.phpt
+++ b/tests/classes/autoload_018.phpt
@@ -44,4 +44,3 @@ OUT: autoload(UndefinedClass2)
 OUT: autoload(UndefinedClass1)
 OUT: autoload(UndefinedClass0)
 bool(false)
-
diff --git a/tests/classes/bug63462.phpt b/tests/classes/bug63462.phpt
index f425c1526b..e2c61897ec 100644
--- a/tests/classes/bug63462.phpt
+++ b/tests/classes/bug63462.phpt
@@ -49,7 +49,6 @@ $test->protectedProperty = 'value';
 $test->privateProperty   = 'value';
 
 ?>
-
 --EXPECTF--
 __get nonExisting
 Notice: Undefined property: Test::$nonExisting in %sbug63462.php on line %d
diff --git a/tests/classes/class_example.phpt b/tests/classes/class_example.phpt
index b0e9cf8f6e..7ee0615784 100644
--- a/tests/classes/class_example.phpt
+++ b/tests/classes/class_example.phpt
@@ -1,7 +1,6 @@
 --TEST--
 Classes general test
 --FILE--
-
 <?php
 
 /* pretty nifty object oriented code! */
diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt
index 03af299ba8..b60991844f 100644
--- a/tests/classes/constants_basic_001.phpt
+++ b/tests/classes/constants_basic_001.phpt
@@ -58,7 +58,6 @@ Class constant declarations
   echo "\nYou should not see this.";
 ?>
 --EXPECTF--
-
 Notice: Undefined variable: undef in %s on line 5
 
 Attempt to access various kinds of class constants:
diff --git a/tests/classes/constants_basic_002.phpt b/tests/classes/constants_basic_002.phpt
index 006e5fbab9..def661ec45 100644
--- a/tests/classes/constants_basic_002.phpt
+++ b/tests/classes/constants_basic_002.phpt
@@ -18,7 +18,6 @@ Basic class support - defining and reading a class constant.
   var_dump($myInstance)
 ?>
 --EXPECTF--
-
 Read class constant.
 string(5) "hello"
 
diff --git a/tests/classes/constants_basic_004.phpt b/tests/classes/constants_basic_004.phpt
index e893768629..c3df0747a4 100644
--- a/tests/classes/constants_basic_004.phpt
+++ b/tests/classes/constants_basic_004.phpt
@@ -42,7 +42,6 @@ Test properties with array default values using class constants as keys and valu
   var_dump($x, $b, $c);
 ?>
 --EXPECTF--
-
 Static properties:
 array(1) {
   ["key"]=>
diff --git a/tests/classes/constants_basic_005.phpt b/tests/classes/constants_basic_005.phpt
index 55d23f77b1..6d1ac8355d 100644
--- a/tests/classes/constants_basic_005.phpt
+++ b/tests/classes/constants_basic_005.phpt
@@ -13,4 +13,3 @@ Test constants with default values based on other constants.
 --EXPECT--
 string(5) "hello"
 string(5) "hello"
-
diff --git a/tests/classes/constants_error_001.phpt b/tests/classes/constants_error_001.phpt
index 9bb5533d7e..60ec7e6638 100644
--- a/tests/classes/constants_error_001.phpt
+++ b/tests/classes/constants_error_001.phpt
@@ -9,5 +9,4 @@ Error case: duplicate class constant definition
   }
 ?>
 --EXPECTF--
-
 Fatal error: Cannot redefine class constant myclass::myConst in %s on line 5
diff --git a/tests/classes/constants_error_003.phpt b/tests/classes/constants_error_003.phpt
index b56679b388..fa7984f06e 100644
--- a/tests/classes/constants_error_003.phpt
+++ b/tests/classes/constants_error_003.phpt
@@ -16,5 +16,4 @@ Basic class support - attempting to pass a class constant by reference.
   var_dump(aclass::myConst);
 ?>
 --EXPECTF--
-
 Fatal error: Only variables can be passed by reference in %s on line 12
diff --git a/tests/classes/constants_error_006.phpt b/tests/classes/constants_error_006.phpt
index 01839ba7ef..b8f970a16f 100644
--- a/tests/classes/constants_error_006.phpt
+++ b/tests/classes/constants_error_006.phpt
@@ -12,5 +12,4 @@ Basic class support - attempting to modify a class constant by assignment
   var_dump(aclass::myConst);
 ?>
 --EXPECTF--
-
 Parse error: %s in %s on line %d
diff --git a/tests/classes/constants_error_007.phpt b/tests/classes/constants_error_007.phpt
index 54b32e4ab2..b26ae3906c 100644
--- a/tests/classes/constants_error_007.phpt
+++ b/tests/classes/constants_error_007.phpt
@@ -11,5 +11,4 @@ Basic class support - attempting to create a reference to a class constant
   $a = &aclass::myConst;
 ?>
 --EXPECTF--
-
 Parse error: %s in %s on line %d
diff --git a/tests/classes/constants_scope_001.phpt b/tests/classes/constants_scope_001.phpt
index 650bcc2228..7adf3f8681 100644
--- a/tests/classes/constants_scope_001.phpt
+++ b/tests/classes/constants_scope_001.phpt
@@ -28,7 +28,6 @@ ErrorCodesDerived::print_fatal_error_codes();
 
 ?>
 --EXPECTF--
-
 Warning: Use of undefined constant FATAL - assumed 'FATAL' (this will throw an Error in a future version of PHP) in %sconstants_scope_001.php on line %d
 FATAL = FATAL
 self::FATAL = Fatal error
diff --git a/tests/classes/constants_visibility_006.phpt b/tests/classes/constants_visibility_006.phpt
index 537c8eac0f..a3317cca8a 100644
--- a/tests/classes/constants_visibility_006.phpt
+++ b/tests/classes/constants_visibility_006.phpt
@@ -8,4 +8,3 @@ class A {
 ?>
 --EXPECTF--
 Fatal error: Cannot use 'abstract' as constant modifier in %s on line 3
-
diff --git a/tests/classes/constants_visibility_error_003.phpt b/tests/classes/constants_visibility_error_003.phpt
index c385bbd300..6f62069c2e 100644
--- a/tests/classes/constants_visibility_error_003.phpt
+++ b/tests/classes/constants_visibility_error_003.phpt
@@ -10,7 +10,5 @@ class A {
 class B extends A {
 	protected const publicConst = 1;
 }
-
-
 --EXPECTF--
 Fatal error: Access level to B::publicConst must be public (as in class A) in %s on line 9
diff --git a/tests/classes/constants_visibility_error_004.phpt b/tests/classes/constants_visibility_error_004.phpt
index fe37b0691f..65bfbd3c2b 100644
--- a/tests/classes/constants_visibility_error_004.phpt
+++ b/tests/classes/constants_visibility_error_004.phpt
@@ -10,7 +10,5 @@ class A {
 class B extends A {
 	private const protectedConst = 1;
 }
-
-
 --EXPECTF--
 Fatal error: Access level to B::protectedConst must be protected (as in class A) or weaker in %s on line 9
diff --git a/tests/classes/factory_and_singleton_006.phpt b/tests/classes/factory_and_singleton_006.phpt
index 5bc9433e32..b11c9f05d4 100644
--- a/tests/classes/factory_and_singleton_006.phpt
+++ b/tests/classes/factory_and_singleton_006.phpt
@@ -18,4 +18,3 @@ Fatal error: Uncaught Error: Call to private test::__destruct() from context ''
 Stack trace:
 #0 {main}
   thrown in %sfactory_and_singleton_006.php on line %d
-
diff --git a/tests/classes/final_abstract.phpt b/tests/classes/final_abstract.phpt
index 25c2cfc810..229ae896b0 100644
--- a/tests/classes/final_abstract.phpt
+++ b/tests/classes/final_abstract.phpt
@@ -10,5 +10,4 @@ class fail {
 echo "Done\n"; // Shouldn't be displayed
 ?>
 --EXPECTF--
-
 Fatal error: Cannot use the final modifier on an abstract class member in %s
diff --git a/tests/classes/implicit_instantiation_001.phpt b/tests/classes/implicit_instantiation_001.phpt
index 67be8c4dc9..495a8a1e35 100644
--- a/tests/classes/implicit_instantiation_001.phpt
+++ b/tests/classes/implicit_instantiation_001.phpt
@@ -34,8 +34,6 @@ var_dump($c);
 
 ?>
 --EXPECTF--
-
-
 ---( $c->boolFalse )---
   --> Attempting implicit conversion to object using increment...
 
diff --git a/tests/classes/inheritance_003.phpt b/tests/classes/inheritance_003.phpt
index 919e03126f..bcbead1be7 100644
--- a/tests/classes/inheritance_003.phpt
+++ b/tests/classes/inheritance_003.phpt
@@ -16,6 +16,5 @@ class B extends A
 ?>
 ===DONE===
 --EXPECTF--
-
 Warning: Declaration of B::f() should be compatible with A::f($x) in %sinheritance_003.php on line %d
 ===DONE===
diff --git a/tests/classes/inheritance_004.phpt b/tests/classes/inheritance_004.phpt
index d92ed830e8..7eb57b2770 100644
--- a/tests/classes/inheritance_004.phpt
+++ b/tests/classes/inheritance_004.phpt
@@ -16,6 +16,5 @@ class B extends A
 ?>
 ===DONE===
 --EXPECTF--
-
 Warning: Declaration of B::f($x) should be compatible with A::f() in %sinheritance_004.php on line %d
 ===DONE===
diff --git a/tests/classes/interface_constant_inheritance_001.phpt b/tests/classes/interface_constant_inheritance_001.phpt
index 046f3b1c5a..9f5e76d297 100644
--- a/tests/classes/interface_constant_inheritance_001.phpt
+++ b/tests/classes/interface_constant_inheritance_001.phpt
@@ -13,5 +13,4 @@ interface I2 extends I1 {
 echo "Done\n";
 ?>
 --EXPECTF--
-
 Fatal error: Cannot inherit previously-inherited or override 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 952dbaf7f4..681de11cbf 100644
--- a/tests/classes/interface_constant_inheritance_002.phpt
+++ b/tests/classes/interface_constant_inheritance_002.phpt
@@ -13,5 +13,4 @@ class C implements I {
 echo "Done\n";
 ?>
 --EXPECTF--
-
 Fatal error: Cannot inherit previously-inherited or override constant FOO from interface I in %s on line 6
diff --git a/tests/classes/interface_constant_inheritance_003.phpt b/tests/classes/interface_constant_inheritance_003.phpt
index 908ca7b4d6..b4902f7306 100644
--- a/tests/classes/interface_constant_inheritance_003.phpt
+++ b/tests/classes/interface_constant_inheritance_003.phpt
@@ -16,5 +16,4 @@ class C implements I1,I2 {
 echo "Done\n";
 ?>
 --EXPECTF--
-
 Fatal error: Cannot inherit previously-inherited or override constant FOO from interface I2 in %s on line 10
diff --git a/tests/classes/interface_constant_inheritance_005.phpt b/tests/classes/interface_constant_inheritance_005.phpt
index 60bf222e85..1abb85751e 100644
--- a/tests/classes/interface_constant_inheritance_005.phpt
+++ b/tests/classes/interface_constant_inheritance_005.phpt
@@ -9,4 +9,4 @@ interface IA {
 echo "Done\n";
 ?>
 --EXPECT--
-Done
\ No newline at end of file
+Done
diff --git a/tests/classes/interface_constant_inheritance_006.phpt b/tests/classes/interface_constant_inheritance_006.phpt
index 125326b224..7e303bb152 100644
--- a/tests/classes/interface_constant_inheritance_006.phpt
+++ b/tests/classes/interface_constant_inheritance_006.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Ensure a interface can not have protected constants
-
 --FILE--
 <?php
 interface A {
diff --git a/tests/classes/interface_constant_inheritance_007.phpt b/tests/classes/interface_constant_inheritance_007.phpt
index 52695343e1..766f89b95d 100644
--- a/tests/classes/interface_constant_inheritance_007.phpt
+++ b/tests/classes/interface_constant_inheritance_007.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Ensure a interface can not have private constants
-
 --FILE--
 <?php
 interface A {
diff --git a/tests/classes/interface_method.phpt b/tests/classes/interface_method.phpt
index f3e465b21b..491b4c21d6 100644
--- a/tests/classes/interface_method.phpt
+++ b/tests/classes/interface_method.phpt
@@ -9,5 +9,4 @@ interface if_a {
 
 ?>
 --EXPECTF--
-
 Fatal error: Interface function if_a::err() cannot contain body %s on line %d
diff --git a/tests/classes/interface_method_final.phpt b/tests/classes/interface_method_final.phpt
index 74c86f1e50..e936b5a03a 100644
--- a/tests/classes/interface_method_final.phpt
+++ b/tests/classes/interface_method_final.phpt
@@ -9,5 +9,4 @@ class if_a {
 
 ?>
 --EXPECTF--
-
 Fatal error: Cannot use the final modifier on an abstract class member in %s on line %d
diff --git a/tests/classes/interface_method_private.phpt b/tests/classes/interface_method_private.phpt
index 000b33fae4..11f8bf648f 100644
--- a/tests/classes/interface_method_private.phpt
+++ b/tests/classes/interface_method_private.phpt
@@ -9,5 +9,4 @@ interface if_a {
 
 ?>
 --EXPECTF--
-
 Fatal error: Access type for interface method if_a::err() must be omitted in %s on line %d
diff --git a/tests/classes/interface_optional_arg.phpt b/tests/classes/interface_optional_arg.phpt
index 9c0de6cfb0..6fc97f55fb 100644
--- a/tests/classes/interface_optional_arg.phpt
+++ b/tests/classes/interface_optional_arg.phpt
@@ -22,4 +22,3 @@ $foo->bar();
 ?>
 --EXPECT--
 foo
-
diff --git a/tests/classes/interfaces_001.phpt b/tests/classes/interfaces_001.phpt
index d8d801192f..97b48aa03d 100644
--- a/tests/classes/interfaces_001.phpt
+++ b/tests/classes/interfaces_001.phpt
@@ -21,4 +21,3 @@ echo $foo->getMessage() . "\n";
 ?>
 --EXPECT--
 foo
-
diff --git a/tests/classes/interfaces_002.phpt b/tests/classes/interfaces_002.phpt
index fad961bf27..6cc899bf1d 100644
--- a/tests/classes/interfaces_002.phpt
+++ b/tests/classes/interfaces_002.phpt
@@ -23,5 +23,4 @@ echo "Message: " . $foo->getMessage() . "\n";
 ?>
 ===DONE===
 --EXPECTF--
-
 Fatal error: Class Exception_foo contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (ThrowableInterface::getErrno) in %s on line %d
diff --git a/tests/classes/interfaces_003.phpt b/tests/classes/interfaces_003.phpt
index 28680096c5..97b5f7dde5 100644
--- a/tests/classes/interfaces_003.phpt
+++ b/tests/classes/interfaces_003.phpt
@@ -22,7 +22,6 @@ $obj = new MyTestClass;
 ?>
 ===DONE===
 --EXPECTF--
-
 Fatal error: Uncaught ArgumentCountError: Too few arguments to function MyTestClass::__construct(), 0 passed in %sinterfaces_003.php on line 17 and exactly 1 expected in %sinterfaces_003.php:12
 Stack trace:
 #0 %s(%d): MyTestClass->__construct()
diff --git a/tests/classes/property_override_protectedStatic_private.phpt b/tests/classes/property_override_protectedStatic_private.phpt
index 712f51cd3c..1914825804 100644
--- a/tests/classes/property_override_protectedStatic_private.phpt
+++ b/tests/classes/property_override_protectedStatic_private.phpt
@@ -28,6 +28,4 @@ Redeclare inherited protected static property as private.
   $b->showB();
 ?>
 --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 72e6e8a0a2..126afb36a7 100644
--- a/tests/classes/property_override_protectedStatic_privateStatic.phpt
+++ b/tests/classes/property_override_protectedStatic_privateStatic.phpt
@@ -27,6 +27,4 @@ Redeclare inherited protected static property as private static.
   B::showB();
 ?>
 --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 b6780586c4..4706115724 100644
--- a/tests/classes/property_override_protectedStatic_protected.phpt
+++ b/tests/classes/property_override_protectedStatic_protected.phpt
@@ -28,6 +28,4 @@ Redeclare inherited protected static property as protected.
   $b->showB();
 ?>
 --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_public.phpt b/tests/classes/property_override_protectedStatic_public.phpt
index 14daa455a6..a0a68eebbd 100644
--- a/tests/classes/property_override_protectedStatic_public.phpt
+++ b/tests/classes/property_override_protectedStatic_public.phpt
@@ -28,6 +28,4 @@ Redeclare inherited protected static property as public.
   $b->showB();
 ?>
 --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 a214af9994..7c39838228 100644
--- a/tests/classes/property_override_protectedStatic_publicStatic.phpt
+++ b/tests/classes/property_override_protectedStatic_publicStatic.phpt
@@ -30,4 +30,3 @@ Redeclare inherited protected static property as public static.
 A::p (static)
 A::p (static)
 B::p (static)
-
diff --git a/tests/classes/property_override_protected_private.phpt b/tests/classes/property_override_protected_private.phpt
index 9875dd59b8..b19185d541 100644
--- a/tests/classes/property_override_protected_private.phpt
+++ b/tests/classes/property_override_protected_private.phpt
@@ -29,5 +29,4 @@ Redeclare inherited protected property as private (duplicates Zend/tests/errmsg_
   $b->showB();
 ?>
 --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_protected_privateStatic.phpt b/tests/classes/property_override_protected_privateStatic.phpt
index 7193178d48..149107424c 100644
--- a/tests/classes/property_override_protected_privateStatic.phpt
+++ b/tests/classes/property_override_protected_privateStatic.phpt
@@ -29,5 +29,4 @@ Redeclare inherited protected property as private static.
   B::showB();
 ?>
 --EXPECTF--
-
 Fatal error: Cannot redeclare non static A::$p as static B::$p in %s on line 18
diff --git a/tests/classes/property_override_protected_protectedStatic.phpt b/tests/classes/property_override_protected_protectedStatic.phpt
index abac19a793..e05b5f6f68 100644
--- a/tests/classes/property_override_protected_protectedStatic.phpt
+++ b/tests/classes/property_override_protected_protectedStatic.phpt
@@ -29,5 +29,4 @@ Redeclare inherited protected property as protected static.
   B::showB();
 ?>
 --EXPECTF--
-
 Fatal error: Cannot redeclare non static A::$p as static B::$p in %s on line 18
diff --git a/tests/classes/property_override_protected_publicStatic.phpt b/tests/classes/property_override_protected_publicStatic.phpt
index 37865cc7d4..59132bf6ce 100644
--- a/tests/classes/property_override_protected_publicStatic.phpt
+++ b/tests/classes/property_override_protected_publicStatic.phpt
@@ -29,5 +29,4 @@ Redeclare inherited protected property as public static.
   B::showB();
 ?>
 --EXPECTF--
-
 Fatal error: Cannot redeclare non static A::$p as static B::$p in %s on line 18
diff --git a/tests/classes/property_override_publicStatic_private.phpt b/tests/classes/property_override_publicStatic_private.phpt
index 6fd2774c54..1e5d28680c 100644
--- a/tests/classes/property_override_publicStatic_private.phpt
+++ b/tests/classes/property_override_publicStatic_private.phpt
@@ -28,6 +28,4 @@ Redeclare inherited public static property as private.
   $b->showB();
 ?>
 --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 3635b918db..12b0c3fcaa 100644
--- a/tests/classes/property_override_publicStatic_privateStatic.phpt
+++ b/tests/classes/property_override_publicStatic_privateStatic.phpt
@@ -27,6 +27,4 @@ Redeclare inherited public static property as private static.
   B::showB();
 ?>
 --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 a5eaaea714..1b0fd0bdf1 100644
--- a/tests/classes/property_override_publicStatic_protected.phpt
+++ b/tests/classes/property_override_publicStatic_protected.phpt
@@ -28,6 +28,4 @@ Redeclare inherited public static property as protected.
   $b->showB();
 ?>
 --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 00eb647d5d..c1f6f8ff1d 100644
--- a/tests/classes/property_override_publicStatic_protectedStatic.phpt
+++ b/tests/classes/property_override_publicStatic_protectedStatic.phpt
@@ -27,6 +27,4 @@ Redeclare inherited public static property as protected static.
   B::showB();
 ?>
 --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 f6ea7643c1..c6b6bf1b24 100644
--- a/tests/classes/property_override_publicStatic_public.phpt
+++ b/tests/classes/property_override_publicStatic_public.phpt
@@ -28,6 +28,4 @@ Redeclare inherited public static property as public.
   $b->showB();
 ?>
 --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_public_private.phpt b/tests/classes/property_override_public_private.phpt
index 581d663b60..fe4df691cc 100644
--- a/tests/classes/property_override_public_private.phpt
+++ b/tests/classes/property_override_public_private.phpt
@@ -29,6 +29,4 @@ Redeclare inherited public property as private.
   $b->showB();
 ?>
 --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_privateStatic.phpt b/tests/classes/property_override_public_privateStatic.phpt
index bacdc9ffe1..41daac4503 100644
--- a/tests/classes/property_override_public_privateStatic.phpt
+++ b/tests/classes/property_override_public_privateStatic.phpt
@@ -29,5 +29,4 @@ Redeclare inherited public property as private static.
   B::showB();
 ?>
 --EXPECTF--
-
 Fatal error: Cannot redeclare non static A::$p as static B::$p in %s on line 18
diff --git a/tests/classes/property_override_public_protected.phpt b/tests/classes/property_override_public_protected.phpt
index aa79a53595..eb7f1d7b2c 100644
--- a/tests/classes/property_override_public_protected.phpt
+++ b/tests/classes/property_override_public_protected.phpt
@@ -29,6 +29,4 @@ Redeclare inherited public property as protected.
   $b->showB();
 ?>
 --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_protectedStatic.phpt b/tests/classes/property_override_public_protectedStatic.phpt
index 8d78713add..2582305471 100644
--- a/tests/classes/property_override_public_protectedStatic.phpt
+++ b/tests/classes/property_override_public_protectedStatic.phpt
@@ -29,5 +29,4 @@ Redeclare inherited public property as protected static.
   B::showB();
 ?>
 --EXPECTF--
-
 Fatal error: Cannot redeclare non static A::$p as static B::$p in %s on line 18
diff --git a/tests/classes/property_override_public_publicStatic.phpt b/tests/classes/property_override_public_publicStatic.phpt
index 94feea8a22..bb6021454c 100644
--- a/tests/classes/property_override_public_publicStatic.phpt
+++ b/tests/classes/property_override_public_publicStatic.phpt
@@ -29,5 +29,4 @@ Redeclare inherited public property as public static.
   B::showB();
 ?>
 --EXPECTF--
-
 Fatal error: Cannot redeclare non static A::$p as static B::$p in %s on line 18
diff --git a/tests/classes/static_properties_003_error1.phpt b/tests/classes/static_properties_003_error1.phpt
index 68a57a8f89..08a89568e4 100644
--- a/tests/classes/static_properties_003_error1.phpt
+++ b/tests/classes/static_properties_003_error1.phpt
@@ -12,7 +12,6 @@ unset($c->y);
 ?>
 ==Done==
 --EXPECTF--
-
 --> Access non-visible static prop like instance prop:
 
 Fatal error: Uncaught Error: Cannot access protected property C::$y in %s:8
diff --git a/tests/classes/static_properties_003_error2.phpt b/tests/classes/static_properties_003_error2.phpt
index b428b4ff6e..45ccff11b6 100644
--- a/tests/classes/static_properties_003_error2.phpt
+++ b/tests/classes/static_properties_003_error2.phpt
@@ -12,7 +12,6 @@ echo $c->y;
 ?>
 ==Done==
 --EXPECTF--
-
 --> Access non-visible static prop like instance prop:
 
 Fatal error: Uncaught Error: Cannot access protected property C::$y in %s:8
diff --git a/tests/classes/static_properties_003_error3.phpt b/tests/classes/static_properties_003_error3.phpt
index b9423639b0..e8588a1160 100644
--- a/tests/classes/static_properties_003_error3.phpt
+++ b/tests/classes/static_properties_003_error3.phpt
@@ -12,7 +12,6 @@ $c->y = 1;
 ?>
 ==Done==
 --EXPECTF--
-
 --> Access non-visible static prop like instance prop:
 
 Fatal error: Uncaught Error: Cannot access protected property C::$y in %s:8
diff --git a/tests/classes/static_properties_003_error4.phpt b/tests/classes/static_properties_003_error4.phpt
index 6501689ddb..6a4eafcd2a 100644
--- a/tests/classes/static_properties_003_error4.phpt
+++ b/tests/classes/static_properties_003_error4.phpt
@@ -12,7 +12,6 @@ $c->y =& $ref;
 ?>
 ==Done==
 --EXPECTF--
-
 --> Access non-visible static prop like instance prop:
 
 Fatal error: Uncaught Error: Cannot access protected property C::$y in %s:8
diff --git a/tests/classes/tostring_004.phpt b/tests/classes/tostring_004.phpt
index bfaa57e36f..907f7bc306 100644
--- a/tests/classes/tostring_004.phpt
+++ b/tests/classes/tostring_004.phpt
@@ -52,4 +52,3 @@ Error: 4096 - Method badToString::__toString() must return a string value
 
 Try 2:
 Error: 4096 - Method badToString::__toString() must return a string value
-
diff --git a/tests/classes/type_hinting_001.phpt b/tests/classes/type_hinting_001.phpt
index 318dcbe086..35356581f4 100644
--- a/tests/classes/type_hinting_001.phpt
+++ b/tests/classes/type_hinting_001.phpt
@@ -32,7 +32,6 @@ $a->b($b);
 
 ?>
 --EXPECTF--
-
 Fatal error: Uncaught TypeError: Argument 1 passed to FooBar::a() must implement interface Foo, instance of Blort given, called in %s on line 27 and defined in %s:12
 Stack trace:
 #0 %s(%d): FooBar->a(Object(Blort))
diff --git a/tests/classes/unset_properties.phpt b/tests/classes/unset_properties.phpt
index e19a7d92d5..417542ddea 100644
--- a/tests/classes/unset_properties.phpt
+++ b/tests/classes/unset_properties.phpt
@@ -126,7 +126,6 @@ echo $o->getPrivateProperty();
 echo "\n\n";
 
 ?>
-
 --EXPECT--
 publicProperty set
 true
diff --git a/tests/func/003.phpt b/tests/func/003.phpt
index 1135009e21..8234af2e17 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/004.phpt b/tests/func/004.phpt
index 79c891a223..6dbef57363 100644
--- a/tests/func/004.phpt
+++ b/tests/func/004.phpt
@@ -34,7 +34,6 @@ some_other_function();
 
 ?>
 --EXPECT--
-
 Before function declaration...
 After function declaration...
 Calling function for the first time...
diff --git a/tests/func/005.phpt b/tests/func/005.phpt
index e19eda496b..1ba45123c4 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/ini_alter.phpt b/tests/func/ini_alter.phpt
index 111e826f71..258e4d2db0 100644
--- a/tests/func/ini_alter.phpt
+++ b/tests/func/ini_alter.phpt
@@ -16,4 +16,3 @@ var_dump($var);
 --EXPECT--
 string(1) "1"
 string(1) "0"
-
diff --git a/tests/lang/028.phpt b/tests/lang/028.phpt
index 0c2f2f0756..e455c3b446 100644
--- a/tests/lang/028.phpt
+++ b/tests/lang/028.phpt
@@ -1055,4 +1055,3 @@ I'm still alive
 Hey there!!
 199
 Dafna
-
diff --git a/tests/lang/032.phpt b/tests/lang/032.phpt
index caa4c7e430..abc98f752d 100644
--- a/tests/lang/032.phpt
+++ b/tests/lang/032.phpt
@@ -33,4 +33,3 @@ echo "OK\n";
 ?>
 --EXPECT--
 OK
-
diff --git a/tests/lang/bug21094.phpt b/tests/lang/bug21094.phpt
index ac3ae2a2c7..346185ba83 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/bug22690.phpt b/tests/lang/bug22690.phpt
index 9d5444051b..85ddcd3487 100644
--- a/tests/lang/bug22690.phpt
+++ b/tests/lang/bug22690.phpt
@@ -8,7 +8,6 @@ Bug #22690 (ob_start() is broken with create_function() callbacks)
 ?>
 bar
 --EXPECTF--
-
 Deprecated: Function create_function() is deprecated in %s on line %d
 BAR
 BAR
diff --git a/tests/lang/bug24054.phpt b/tests/lang/bug24054.phpt
index 7bf87212c1..fd9a9bf0c7 100644
--- a/tests/lang/bug24054.phpt
+++ b/tests/lang/bug24054.phpt
@@ -18,7 +18,6 @@ $i === $j
 TESTS;
 
 include(dirname(__FILE__) . '/../quicktester.inc');
-
 --EXPECT--
 1,1,0,0
 OK
diff --git a/tests/lang/bug24573.phpt b/tests/lang/bug24573.phpt
index 4a088c35e8..0e7456d3d2 100644
--- a/tests/lang/bug24573.phpt
+++ b/tests/lang/bug24573.phpt
@@ -20,5 +20,4 @@ echo "OK\n";
 
 ?>
 --EXPECTF--
-
 Fatal error: Cannot re-assign $this in %s on line %d
diff --git a/tests/lang/bug28800.phpt b/tests/lang/bug28800.phpt
index 8bd2c306e1..1b84cd6d0d 100644
--- a/tests/lang/bug28800.phpt
+++ b/tests/lang/bug28800.phpt
@@ -8,7 +8,6 @@ Bug #28800 (Incorrect string to number conversion for strings starting with 'inf
 	}
 ?>
 --EXPECTF--
-
 Warning: A non-numeric value encountered in %s on line %d
 0
 
@@ -26,4 +25,3 @@ Warning: A non-numeric value encountered in %s on line %d
 
 Warning: A non-numeric value encountered in %s on line %d
 0
-
diff --git a/tests/lang/bug43958.phpt b/tests/lang/bug43958.phpt
index bc88bcda0f..c1fca9d633 100644
--- a/tests/lang/bug43958.phpt
+++ b/tests/lang/bug43958.phpt
@@ -14,4 +14,3 @@ MyClass::loadCode('file-which-does-not-exist-on-purpose.php');
 Warning: include(file-which-does-not-exist-on-purpose.php): failed to open stream: No such file or directory in %sbug43958.php on line 5
 
 Warning: include(): Failed opening 'file-which-does-not-exist-on-purpose.php' for inclusion (include_path='%s') in %sbug43958.php on line 5
-
diff --git a/tests/lang/bug44827.phpt b/tests/lang/bug44827.phpt
index 90bf1d8893..d871cfd2a8 100644
--- a/tests/lang/bug44827.phpt
+++ b/tests/lang/bug44827.phpt
@@ -14,4 +14,3 @@ Warning: Class constants cannot be defined or redefined in %s on line %d
 
 Warning: constant(): Couldn't find constant :: in %s on line %d
 NULL
-
diff --git a/tests/lang/bug71897.phpt b/tests/lang/bug71897.phpt
index bd76921af6..5864b1dece 100644
--- a/tests/lang/bug71897.phpt
+++ b/tests/lang/bug71897.phpt
@@ -10,7 +10,6 @@ eval("
 
 ?>
 --EXPECTF--
-
 Warning: Unexpected character in input:  '%s' (ASCII=127) state=0 in %s(%d) : eval()'d code on line %d
 
 Parse error: syntax error, unexpected 'b' (T_STRING) in %s(%d) : eval()'d code on line %d
diff --git a/tests/lang/compare_objects_basic1.phpt b/tests/lang/compare_objects_basic1.phpt
index e54fb2173e..90eb9a0581 100644
--- a/tests/lang/compare_objects_basic1.phpt
+++ b/tests/lang/compare_objects_basic1.phpt
@@ -1,7 +1,6 @@
 --TEST--
 Test standard 'compare' object handler
 --FILE--
-
 <?php
 
 echo "Simple test for standard compare object handler\n";
diff --git a/tests/lang/compare_objects_basic2.phpt b/tests/lang/compare_objects_basic2.phpt
index c38dbcec42..ccd3a001fc 100644
--- a/tests/lang/compare_objects_basic2.phpt
+++ b/tests/lang/compare_objects_basic2.phpt
@@ -1,7 +1,6 @@
 --TEST--
 Test object compare when object handler different
 --FILE--
-
 <?php
 
 //Set the default time zone
diff --git a/tests/lang/each_binary_safety.phpt b/tests/lang/each_binary_safety.phpt
index 37b18b32c7..ce175495aa 100644
--- a/tests/lang/each_binary_safety.phpt
+++ b/tests/lang/each_binary_safety.phpt
@@ -10,6 +10,5 @@ while (list($key, $val) = each($arr)) {
 }
 ?>
 --EXPECTF--
-
 Deprecated: The each() function is deprecated. This message will be suppressed on further calls in %s on line %d
 7: foo%00bar => foo%00bar
diff --git a/tests/lang/engine_assignExecutionOrder_001.phpt b/tests/lang/engine_assignExecutionOrder_001.phpt
index f5140b54e2..a70e3eee93 100644
--- a/tests/lang/engine_assignExecutionOrder_001.phpt
+++ b/tests/lang/engine_assignExecutionOrder_001.phpt
@@ -72,8 +72,6 @@ var_dump(C::$string);
 
 ?>
 --EXPECTF--
-
-
 Order with local assignment:
 in f()
 in g()
diff --git a/tests/lang/foreachLoop.002.phpt b/tests/lang/foreachLoop.002.phpt
index 5b92736e5d..e0426e810f 100644
--- a/tests/lang/foreachLoop.002.phpt
+++ b/tests/lang/foreachLoop.002.phpt
@@ -72,7 +72,6 @@ var_dump($a);
 
 ?>
 --EXPECT--
-
 Directly changing array values.
 string(10) "original.1"
 string(10) "original.2"
diff --git a/tests/lang/foreachLoop.003.phpt b/tests/lang/foreachLoop.003.phpt
index a62d5dbb3b..3f20021a7b 100644
--- a/tests/lang/foreachLoop.003.phpt
+++ b/tests/lang/foreachLoop.003.phpt
@@ -31,7 +31,6 @@ foreach ($a as $v) {
 echo "done.\n";
 ?>
 --EXPECTF--
-
 Not an array.
 
 Warning: Invalid argument supplied for foreach() in %s on line 4
diff --git a/tests/lang/foreachLoop.009.phpt b/tests/lang/foreachLoop.009.phpt
index 37b0163358..9bf2957e12 100644
--- a/tests/lang/foreachLoop.009.phpt
+++ b/tests/lang/foreachLoop.009.phpt
@@ -51,7 +51,6 @@ foreach ($refedArray as $k=>&$v4) {
 
 ?>
 --EXPECT--
-
 Remove elements from a referenced array during loop
 key: 0; value: original.0
 key: 1; value: original.1
@@ -75,4 +74,3 @@ key: 4; value: new.1
 key: 5; value: new.2
 key: 6; value: new.3
 Loop detected, as expected.
-
diff --git a/tests/lang/foreachLoop.011.phpt b/tests/lang/foreachLoop.011.phpt
index 1f57e0acdf..b1048fa9a2 100644
--- a/tests/lang/foreachLoop.011.phpt
+++ b/tests/lang/foreachLoop.011.phpt
@@ -22,7 +22,6 @@ foreach ($a as $v) {
 
 ?>
 --EXPECT--
-
 Change from array to non iterable:
 int(1)
 int(2)
diff --git a/tests/lang/foreachLoop.012.phpt b/tests/lang/foreachLoop.012.phpt
index b308e9ff57..4d7beeba4f 100644
--- a/tests/lang/foreachLoop.012.phpt
+++ b/tests/lang/foreachLoop.012.phpt
@@ -69,7 +69,6 @@ withRefValue(4, $transform);
 
 ?>
 --EXPECT--
-
 Popping elements off end of an unreferenced array
 ---( Array with 1 element(s): )---
 --> State of array before loop:
diff --git a/tests/lang/foreachLoop.013.phpt b/tests/lang/foreachLoop.013.phpt
index e53130da00..acc197f86f 100644
--- a/tests/lang/foreachLoop.013.phpt
+++ b/tests/lang/foreachLoop.013.phpt
@@ -69,7 +69,6 @@ withRefValue(4, $transform);
 
 ?>
 --EXPECT--
-
 Popping elements off end of an unreferenced array, using &$value.
 ---( Array with 1 element(s): )---
 --> State of array before loop:
diff --git a/tests/lang/foreachLoop.015.phpt b/tests/lang/foreachLoop.015.phpt
index 876c867512..ef5d030cd0 100644
--- a/tests/lang/foreachLoop.015.phpt
+++ b/tests/lang/foreachLoop.015.phpt
@@ -71,7 +71,6 @@ withRefValue(4, $transform);
 
 ?>
 --EXPECT--
-
 Popping elements off end of a referenced array, using &$value
 ---( Array with 1 element(s): )---
 --> State of referenced array before loop:
diff --git a/tests/lang/foreachLoop.016.phpt b/tests/lang/foreachLoop.016.phpt
index 01c44449a7..00deb5f1db 100644
--- a/tests/lang/foreachLoop.016.phpt
+++ b/tests/lang/foreachLoop.016.phpt
@@ -117,7 +117,6 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so
   unset(C::$a[0]->b, $b);
 ?>
 --EXPECTF--
-
 $a
 array(1) {
   [0]=>
diff --git a/tests/lang/foreachLoopObjects.001.phpt b/tests/lang/foreachLoopObjects.001.phpt
index 93eeaadc6a..7e8a40438e 100644
--- a/tests/lang/foreachLoopObjects.001.phpt
+++ b/tests/lang/foreachLoopObjects.001.phpt
@@ -35,8 +35,6 @@ echo "\nCheck key and value after the loop.\n";
 var_dump($k, $v);
 ?>
 --EXPECT--
-
-
 Simple loop.
 string(10) "Original a"
 string(10) "Original b"
diff --git a/tests/lang/foreachLoopObjects.005.phpt b/tests/lang/foreachLoopObjects.005.phpt
index 624d9ad10c..8d6a4d5dc3 100644
--- a/tests/lang/foreachLoopObjects.005.phpt
+++ b/tests/lang/foreachLoopObjects.005.phpt
@@ -43,7 +43,6 @@ var_dump($obj);
 
 ?>
 --EXPECTF--
-
 Removing properties before the current element from an iterated object.
 string(10) "Original a"
 string(10) "Original b"
diff --git a/tests/lang/foreach_with_references_001.phpt b/tests/lang/foreach_with_references_001.phpt
index eb52bb8c10..a1f7c33600 100644
--- a/tests/lang/foreach_with_references_001.phpt
+++ b/tests/lang/foreach_with_references_001.phpt
@@ -16,7 +16,6 @@ foreach($arr as $key => &$val) {
 }
 
 print_r($arr);
-
 --EXPECT--
 Array
 (
diff --git a/tests/lang/func_get_arg_variation.phpt b/tests/lang/func_get_arg_variation.phpt
index 83b20848fe..741b6604c0 100644
--- a/tests/lang/func_get_arg_variation.phpt
+++ b/tests/lang/func_get_arg_variation.phpt
@@ -25,4 +25,3 @@ Warning: func_get_arg() expects parameter 1 to be int, string given in %s on lin
 Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
 
 Warning: func_get_arg():  Argument 2 not passed to function in %s on line %d
-
diff --git a/tests/lang/func_get_args.002.phpt b/tests/lang/func_get_args.002.phpt
index ea78d99a2b..f516893418 100644
--- a/tests/lang/func_get_args.002.phpt
+++ b/tests/lang/func_get_args.002.phpt
@@ -19,4 +19,3 @@ array(3) {
   [2]=>
   int(3)
 }
-
diff --git a/tests/lang/func_get_args.004.phpt b/tests/lang/func_get_args.004.phpt
index bafd9539ea..6e98c763b2 100644
--- a/tests/lang/func_get_args.004.phpt
+++ b/tests/lang/func_get_args.004.phpt
@@ -30,7 +30,6 @@ refVal($b, $b);
 var_dump($b);
 ?>
 --EXPECT--
-
 -- Val, Ref --
 string(10) "original.a"
 string(10) "original.a"
diff --git a/tests/lang/func_num_args.003.phpt b/tests/lang/func_num_args.003.phpt
index 168f79d04e..1520c31ed4 100644
--- a/tests/lang/func_num_args.003.phpt
+++ b/tests/lang/func_num_args.003.phpt
@@ -7,6 +7,5 @@ var_dump(func_num_args());
 
 ?>
 --EXPECTF--
-
 Warning: func_num_args():  Called from the global scope - no function context in %s on line %d
 int(-1)
diff --git a/tests/lang/func_num_args.004.phpt b/tests/lang/func_num_args.004.phpt
index aef61668a4..7924a85a68 100644
--- a/tests/lang/func_num_args.004.phpt
+++ b/tests/lang/func_num_args.004.phpt
@@ -30,8 +30,6 @@ refVal($b, $b);
 var_dump($b);
 ?>
 --EXPECT--
-
-
 -- Val, Ref --
 string(10) "original.a"
 string(10) "original.a"
diff --git a/tests/lang/operators/nan-comparison-false.phpt b/tests/lang/operators/nan-comparison-false.phpt
index f7679b8b67..2c44405670 100644
--- a/tests/lang/operators/nan-comparison-false.phpt
+++ b/tests/lang/operators/nan-comparison-false.phpt
@@ -15,7 +15,6 @@ var_dump(0 < $nan);
 var_dump(0 <= $nan);
 var_dump(0 > $nan);
 var_dump(0 >= $nan);
-
 --EXPECT--
 ** CONST
 bool(false)
diff --git a/tests/lang/operators/operator_identical_recusion-01.phpt b/tests/lang/operators/operator_identical_recusion-01.phpt
index 3680e30e4d..70a7605bae 100644
--- a/tests/lang/operators/operator_identical_recusion-01.phpt
+++ b/tests/lang/operators/operator_identical_recusion-01.phpt
@@ -7,4 +7,4 @@ $a = [[$n]];
 $b = [&$a];
 var_dump($a === $b);
 --EXPECT--
-bool(false)
\ No newline at end of file
+bool(false)
diff --git a/tests/lang/passByReference_003.phpt b/tests/lang/passByReference_003.phpt
index 8fe27407f1..be002031d7 100644
--- a/tests/lang/passByReference_003.phpt
+++ b/tests/lang/passByReference_003.phpt
@@ -23,7 +23,6 @@ echo "\nAfter call\n";
 var_dump($undef2)
 ?>
 --EXPECTF--
-
 Passing undefined by value
 
 Notice: Undefined variable: undef1 in %s on line 13
diff --git a/tests/lang/passByReference_005.phpt b/tests/lang/passByReference_005.phpt
index e3b0e21c5c..dc32962d67 100644
--- a/tests/lang/passByReference_005.phpt
+++ b/tests/lang/passByReference_005.phpt
@@ -143,7 +143,6 @@ var_dump($u1, $u2);
 
 ?>
 --EXPECTF--
-
 ---- Pass by ref / pass by val: functions ----
 
 Notice: Undefined variable: u1 in %s on line 72
diff --git a/tests/lang/passByReference_006.phpt b/tests/lang/passByReference_006.phpt
index f725092618..9f5d275333 100644
--- a/tests/lang/passByReference_006.phpt
+++ b/tests/lang/passByReference_006.phpt
@@ -54,7 +54,6 @@ var_dump($u1, $u2, $u3, $u4, $u5);
 
 ?>
 --EXPECTF--
-
  ---- Pass uninitialised array & object by ref: function call ---
 array(1) {
   [0]=>
diff --git a/tests/lang/passByReference_008.phpt b/tests/lang/passByReference_008.phpt
index 4fd9a819a8..5042b72e4b 100644
--- a/tests/lang/passByReference_008.phpt
+++ b/tests/lang/passByReference_008.phpt
@@ -26,8 +26,6 @@ refVal($b, $b);
 var_dump($b);
 ?>
 --EXPECT--
-
-
 -- Val, Ref --
 string(10) "original.a"
 string(10) "original.a"
diff --git a/tests/lang/passByReference_010.phpt b/tests/lang/passByReference_010.phpt
index 431659a24a..f996073c0f 100644
--- a/tests/lang/passByReference_010.phpt
+++ b/tests/lang/passByReference_010.phpt
@@ -33,8 +33,6 @@ var_dump($a);
 
 ?>
 --EXPECTF--
-
-
 ---> Pass constant assignment by reference:
 
 Notice: Only variables should be passed by reference in %s on line 9
diff --git a/tests/lang/returnByReference.002.phpt b/tests/lang/returnByReference.002.phpt
index 0880a8b7a5..67061048b3 100644
--- a/tests/lang/returnByReference.002.phpt
+++ b/tests/lang/returnByReference.002.phpt
@@ -23,7 +23,6 @@ $b = "changed";
 var_dump($a); //expecting "changed"
 ?>
 --EXPECTF--
-
 Notice: Only variables should be assigned by reference in %s on line 13
 string(8) "original"
 string(7) "changed"
diff --git a/tests/lang/returnByReference.003.phpt b/tests/lang/returnByReference.003.phpt
index b14ae69549..44b5f7825b 100644
--- a/tests/lang/returnByReference.003.phpt
+++ b/tests/lang/returnByReference.003.phpt
@@ -37,7 +37,6 @@ var_dump($a, $b);
 
 ?>
 --EXPECTF--
-
 ---> 1. Trying to assign by reference the return value of a function that returns by value:
 
 Notice: Only variables should be assigned by reference in %s on line 17
diff --git a/tests/lang/returnByReference.004.phpt b/tests/lang/returnByReference.004.phpt
index 1b01bafae6..63d4c709a3 100644
--- a/tests/lang/returnByReference.004.phpt
+++ b/tests/lang/returnByReference.004.phpt
@@ -39,7 +39,6 @@ var_dump($a, $b);
 
 ?>
 --EXPECTF--
-
 ---> 1. Trying to assign by reference the return value of a function that returns by value:
 
 Notice: Only variables should be assigned by reference in %s on line 19
diff --git a/tests/lang/returnByReference.005.phpt b/tests/lang/returnByReference.005.phpt
index d446553973..1d7a390b15 100644
--- a/tests/lang/returnByReference.005.phpt
+++ b/tests/lang/returnByReference.005.phpt
@@ -40,7 +40,6 @@ var_dump($a, $b);
 
 ?>
 --EXPECTF--
-
 ---> 1. Trying to assign by reference the return value of a function that returns by value:
 
 Notice: Only variables should be assigned by reference in %s on line 20
diff --git a/tests/lang/returnByReference.007.phpt b/tests/lang/returnByReference.007.phpt
index 4879c16f93..b38dfa0cb1 100644
--- a/tests/lang/returnByReference.007.phpt
+++ b/tests/lang/returnByReference.007.phpt
@@ -43,7 +43,6 @@ var_dump($a, $b);
 
 ?>
 --EXPECTF--
-
 ---> 1. Via a return by ref function call, assign by reference the return value of a function that returns by value:
 
 Notice: Only variable references should be returned by reference in %s on line 16
diff --git a/tests/lang/returnByReference.008.phpt b/tests/lang/returnByReference.008.phpt
index b39832b5d8..360df577c2 100644
--- a/tests/lang/returnByReference.008.phpt
+++ b/tests/lang/returnByReference.008.phpt
@@ -44,7 +44,6 @@ var_dump($a, $b);
 
 ?>
 --EXPECTF--
-
 ---> 1. Via a return by ref function call, assign by reference the return value of a function that returns by value:
 
 Notice: Only variable references should be returned by reference in %s on line 16
diff --git a/tests/lang/returnByReference.009.phpt b/tests/lang/returnByReference.009.phpt
index 0d51a22158..68662f53eb 100644
--- a/tests/lang/returnByReference.009.phpt
+++ b/tests/lang/returnByReference.009.phpt
@@ -28,7 +28,6 @@ var_dump (testReturnVarByRef());
 echo "\n---> 2. Return a value by reference -> Warning:\n";
 
 var_dump (testReturnValByRef());
-
 --EXPECTF--
 ---> 1. Return a variable by reference -> No warning:
 int(1)
diff --git a/tests/lang/static_basic_001.phpt b/tests/lang/static_basic_001.phpt
index 47da74d8ce..302d2cf131 100644
--- a/tests/lang/static_basic_001.phpt
+++ b/tests/lang/static_basic_001.phpt
@@ -46,7 +46,6 @@ for ($i=0; $i<3; $i++) {
 }
 ?>
 --EXPECT--
-
 Same variable used as static and non static.
 ---------
 0
diff --git a/tests/lang/string/unicode_escape.phpt b/tests/lang/string/unicode_escape.phpt
index 0e9ac2cfc5..1092cee533 100644
--- a/tests/lang/string/unicode_escape.phpt
+++ b/tests/lang/string/unicode_escape.phpt
@@ -9,8 +9,6 @@ var_dump("\u{ff}"); // case-insensitive
 var_dump("\u{2603}"); // Unicode snowman
 var_dump("\u{1F602}"); // FACE WITH TEARS OF JOY emoji
 var_dump("\u{0000001F602}"); // Leading zeroes permitted
-
-
 --EXPECT--
 string(1) "a"
 string(2) "ÿ"
diff --git a/tests/lang/string/unicode_escape_legacy.phpt b/tests/lang/string/unicode_escape_legacy.phpt
index 9d3f40215e..c5cac68669 100644
--- a/tests/lang/string/unicode_escape_legacy.phpt
+++ b/tests/lang/string/unicode_escape_legacy.phpt
@@ -7,7 +7,6 @@ Tolerated Unicode escape sequences: Legacy compatibility
 var_dump("\u");
 var_dump("\u202e");
 var_dump("\ufoobar");
-
 --EXPECT--
 string(2) "\u"
 string(6) "\u202e"
diff --git a/tests/lang/string/unicode_escape_surrogates.phpt b/tests/lang/string/unicode_escape_surrogates.phpt
index cbd78a2496..09e525ad12 100644
--- a/tests/lang/string/unicode_escape_surrogates.phpt
+++ b/tests/lang/string/unicode_escape_surrogates.phpt
@@ -9,7 +9,6 @@ Valid Unicode escape sequences: Surrogate halves
 var_dump(bin2hex("\u{D801}"));
 var_dump(bin2hex("\u{DC00}"));
 var_dump(bin2hex("\u{D801}\u{DC00}")); // CESU-8 encoding of U+10400
-
 --EXPECT--
 string(6) "eda081"
 string(6) "edb080"
diff --git a/tests/lang/string_decimals_001.phpt b/tests/lang/string_decimals_001.phpt
index 8313a66369..2bd3ef62a2 100644
--- a/tests/lang/string_decimals_001.phpt
+++ b/tests/lang/string_decimals_001.phpt
@@ -17,7 +17,6 @@ test("9.9.9");
 ?>
 ===DONE===
 --EXPECT--
-
 --> Testing ..9:
 int(0)
 float(0)
diff --git a/tests/lang/type_hints_001.phpt b/tests/lang/type_hints_001.phpt
index 65f1dc398d..f82a53fe75 100644
--- a/tests/lang/type_hints_001.phpt
+++ b/tests/lang/type_hints_001.phpt
@@ -20,7 +20,6 @@ type_hint_foo($bar);
 
 ?>
 --EXPECTF--
-
 Fatal error: Uncaught TypeError: Argument 1 passed to type_hint_foo() must be an instance of Foo, instance of Bar given, called in %s on line 16 and defined in %s:9
 Stack trace:
 #0 %s(%d): type_hint_foo(Object(Bar))
diff --git a/tests/lang/type_hints_002.phpt b/tests/lang/type_hints_002.phpt
index bdd5b4e93e..cd348ebfb2 100644
--- a/tests/lang/type_hints_002.phpt
+++ b/tests/lang/type_hints_002.phpt
@@ -23,4 +23,3 @@ NULL
 -
 NULL
 -
-
diff --git a/tests/lang/type_hints_003.phpt b/tests/lang/type_hints_003.phpt
index d2c48a3ad7..f6b04dabff 100644
--- a/tests/lang/type_hints_003.phpt
+++ b/tests/lang/type_hints_003.phpt
@@ -8,5 +8,4 @@ class T {
 }
 ?>
 --EXPECTF--
-
 Fatal error: Default value for parameters with a class type can only be NULL in %stype_hints_003.php on line 3
diff --git a/tests/output/bug60768.phpt b/tests/output/bug60768.phpt
index 2527e8e84a..4de7fbd69f 100644
--- a/tests/output/bug60768.phpt
+++ b/tests/output/bug60768.phpt
@@ -22,4 +22,3 @@ DONE
 --EXPECT--
 Output size: 120, expected 120
 DONE
-
diff --git a/tests/output/bug65593.phpt b/tests/output/bug65593.phpt
index 2e40afa076..d20c3b0c24 100644
--- a/tests/output/bug65593.phpt
+++ b/tests/output/bug65593.phpt
@@ -10,4 +10,3 @@ ob_start(function(){ob_start();});
 Test
 
 Fatal error: ob_start(): Cannot use output buffering in output buffering display handlers in %sbug65593.php on line %d
-
diff --git a/tests/output/ob_end_clean_basic_001.phpt b/tests/output/ob_end_clean_basic_001.phpt
index 87942c2f6d..6824857675 100644
--- a/tests/output/ob_end_clean_basic_001.phpt
+++ b/tests/output/ob_end_clean_basic_001.phpt
@@ -20,7 +20,6 @@ var_dump(ob_end_clean());
 
 ?>
 --EXPECTF--
-
 Notice: ob_end_clean(): failed to delete buffer. No buffer to delete in %s on line 7
 bool(false)
 bool(true)
@@ -28,4 +27,3 @@ bool(true)
 
 Notice: ob_end_clean(): failed to delete buffer. No buffer to delete in %s on line 16
 bool(false)
-
diff --git a/tests/output/ob_end_clean_error_001.phpt b/tests/output/ob_end_clean_error_001.phpt
index 09bacaa081..821831ee50 100644
--- a/tests/output/ob_end_clean_error_001.phpt
+++ b/tests/output/ob_end_clean_error_001.phpt
@@ -15,7 +15,6 @@ var_dump(ob_end_clean($extra_arg));
 
 ?>
 --EXPECTF--
-
 Too many arguments
 
 Warning: ob_end_clean() expects exactly 0 parameters, 1 given in %s on line 10
diff --git a/tests/output/ob_get_clean_error_001.phpt b/tests/output/ob_get_clean_error_001.phpt
index 563e62c35a..cbedc03297 100644
--- a/tests/output/ob_get_clean_error_001.phpt
+++ b/tests/output/ob_get_clean_error_001.phpt
@@ -15,7 +15,6 @@ var_dump(ob_get_clean($extra_arg));
 
 ?>
 --EXPECTF--
-
 Too many arguments
 
 Warning: ob_get_clean() expects exactly 0 parameters, 1 given in %s on line 10
diff --git a/tests/output/ob_get_length_error_001.phpt b/tests/output/ob_get_length_error_001.phpt
index 8e4318122b..f7fcfd2c96 100644
--- a/tests/output/ob_get_length_error_001.phpt
+++ b/tests/output/ob_get_length_error_001.phpt
@@ -15,7 +15,6 @@ var_dump(ob_get_length($extra_arg));
 
 ?>
 --EXPECTF--
-
 Too many arguments
 
 Warning: ob_get_length() expects exactly 0 parameters, 1 given in %s on line 10
diff --git a/tests/output/ob_start_basic_004.phpt b/tests/output/ob_start_basic_004.phpt
index eff1204236..ba75c16de9 100644
--- a/tests/output/ob_start_basic_004.phpt
+++ b/tests/output/ob_start_basic_004.phpt
@@ -34,7 +34,6 @@ for ($cs=-1; $cs<10; $cs++) {
 
 ?>
 --EXPECT--
-
 ----( chunk_size: -1, output append size: 1 )----
 f[call:1; len:8]12345678
 
diff --git a/tests/run-test/bug75042-3.phpt b/tests/run-test/bug75042-3.phpt
index 76ec2b5ff0..0e46d1e40f 100644
--- a/tests/run-test/bug75042-3.phpt
+++ b/tests/run-test/bug75042-3.phpt
@@ -5,4 +5,4 @@ nonexistentsharedmodule
 --FILE--
 <?php
 --EXPECTF--
-PHP Warning:  PHP Startup: Unable to load dynamic library '%snonexistentsharedmodule.%s' %A
\ No newline at end of file
+PHP Warning:  PHP Startup: Unable to load dynamic library '%snonexistentsharedmodule.%s' %A
diff --git a/tests/security/open_basedir_001.phpt b/tests/security/open_basedir_001.phpt
index c4459686fb..e6068350a8 100644
--- a/tests/security/open_basedir_001.phpt
+++ b/tests/security/open_basedir_001.phpt
@@ -22,4 +22,3 @@ string(10) "/usr/local"
 string(14) "/usr/local/bin"
 bool(false)
 string(14) "/usr/local/bin"
-
diff --git a/tests/security/open_basedir_chdir.phpt b/tests/security/open_basedir_chdir.phpt
index aa8cef52da..20d6f82bc3 100644
--- a/tests/security/open_basedir_chdir.phpt
+++ b/tests/security/open_basedir_chdir.phpt
@@ -47,4 +47,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 7256d6ed7d..fd9953f86a 100644
--- a/tests/security/open_basedir_chmod.phpt
+++ b/tests/security/open_basedir_chmod.phpt
@@ -69,4 +69,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 7cb902add0..989570d640 100644
--- a/tests/security/open_basedir_copy.phpt
+++ b/tests/security/open_basedir_copy.phpt
@@ -75,4 +75,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 899b31da27..e388ad76d7 100644
--- a/tests/security/open_basedir_copy_variation1.phpt
+++ b/tests/security/open_basedir_copy_variation1.phpt
@@ -31,4 +31,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 6dababa54b..90f55e5a95 100644
--- a/tests/security/open_basedir_dir.phpt
+++ b/tests/security/open_basedir_dir.phpt
@@ -86,4 +86,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 e89e190215..9c5890a262 100644
--- a/tests/security/open_basedir_error_log.phpt
+++ b/tests/security/open_basedir_error_log.phpt
@@ -42,4 +42,3 @@ bool(false)
 string(0) ""
 string(%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 ab182669a8..e3cb15d258 100644
--- a/tests/security/open_basedir_error_log_variation.phpt
+++ b/tests/security/open_basedir_error_log_variation.phpt
@@ -46,4 +46,3 @@ Warning: error_log(%s/bad.txt): failed to open stream: %s in %s on line %d
 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 e319482f7d..3382ae865d 100644
--- a/tests/security/open_basedir_file.phpt
+++ b/tests/security/open_basedir_file.phpt
@@ -85,4 +85,3 @@ array(1) {
   string(12) "Hello World!"
 }
 *** Finished testing open_basedir configuration [file] ***
-
diff --git a/tests/security/open_basedir_file_exists.phpt b/tests/security/open_basedir_file_exists.phpt
index c249fc1165..2c90fd550b 100644
--- a/tests/security/open_basedir_file_exists.phpt
+++ b/tests/security/open_basedir_file_exists.phpt
@@ -52,4 +52,3 @@ bool(true)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [file_exists] ***
-
diff --git a/tests/security/open_basedir_file_put_contents.phpt b/tests/security/open_basedir_file_put_contents.phpt
index 0235c509b5..9f1f3bf13b 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: %s in %s on line %d
 bool(false)
 *** Finished testing open_basedir configuration [file_put_contents] ***
-
diff --git a/tests/security/open_basedir_fileatime.phpt b/tests/security/open_basedir_fileatime.phpt
index 02cc94f83f..4cb7aefc39 100644
--- a/tests/security/open_basedir_fileatime.phpt
+++ b/tests/security/open_basedir_fileatime.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [fileatime] ***
-
diff --git a/tests/security/open_basedir_filectime.phpt b/tests/security/open_basedir_filectime.phpt
index 542c8423ed..08c7ecd5f2 100644
--- a/tests/security/open_basedir_filectime.phpt
+++ b/tests/security/open_basedir_filectime.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [filectime] ***
-
diff --git a/tests/security/open_basedir_filegroup.phpt b/tests/security/open_basedir_filegroup.phpt
index 5f6279aa8f..f85f81bb7b 100644
--- a/tests/security/open_basedir_filegroup.phpt
+++ b/tests/security/open_basedir_filegroup.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [filegroup] ***
-
diff --git a/tests/security/open_basedir_fileinode.phpt b/tests/security/open_basedir_fileinode.phpt
index 070c2c806c..08e378bb6f 100644
--- a/tests/security/open_basedir_fileinode.phpt
+++ b/tests/security/open_basedir_fileinode.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [fileinode] ***
-
diff --git a/tests/security/open_basedir_filemtime.phpt b/tests/security/open_basedir_filemtime.phpt
index 7213ddb5b9..36e2de9ce8 100644
--- a/tests/security/open_basedir_filemtime.phpt
+++ b/tests/security/open_basedir_filemtime.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [filemtime] ***
-
diff --git a/tests/security/open_basedir_fileowner.phpt b/tests/security/open_basedir_fileowner.phpt
index b363b7e0e8..7ce6cb30f8 100644
--- a/tests/security/open_basedir_fileowner.phpt
+++ b/tests/security/open_basedir_fileowner.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [fileowner] ***
-
diff --git a/tests/security/open_basedir_fileperms.phpt b/tests/security/open_basedir_fileperms.phpt
index a1e6511b08..944f1cd5ed 100644
--- a/tests/security/open_basedir_fileperms.phpt
+++ b/tests/security/open_basedir_fileperms.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [fileperms] ***
-
diff --git a/tests/security/open_basedir_filesize.phpt b/tests/security/open_basedir_filesize.phpt
index a335dfd17c..e682c2fac4 100644
--- a/tests/security/open_basedir_filesize.phpt
+++ b/tests/security/open_basedir_filesize.phpt
@@ -52,4 +52,3 @@ int(%d)
 int(%d)
 int(%d)
 *** Finished testing open_basedir configuration [filesize] ***
-
diff --git a/tests/security/open_basedir_filetype.phpt b/tests/security/open_basedir_filetype.phpt
index 5091db56f9..31a5aa4e23 100644
--- a/tests/security/open_basedir_filetype.phpt
+++ b/tests/security/open_basedir_filetype.phpt
@@ -52,4 +52,3 @@ string(4) "file"
 string(4) "file"
 string(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 3e236af9d5..e0fee66f0c 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.phpt b/tests/security/open_basedir_glob.phpt
index 602e48dfc4..505025a717 100644
--- a/tests/security/open_basedir_glob.phpt
+++ b/tests/security/open_basedir_glob.phpt
@@ -49,4 +49,3 @@ array(1) {
   string(%d) "%s/test/ok/../ok/ok.txt"
 }
 *** Finished testing open_basedir configuration [glob] ***
-
diff --git a/tests/security/open_basedir_glob_variation.phpt b/tests/security/open_basedir_glob_variation.phpt
index 52c354f90b..4aebc0b35e 100644
--- a/tests/security/open_basedir_glob_variation.phpt
+++ b/tests/security/open_basedir_glob_variation.phpt
@@ -23,4 +23,3 @@ array(1) {
   [0]=>
   string(12) "../globtest1"
 }
-
diff --git a/tests/security/open_basedir_is_dir.phpt b/tests/security/open_basedir_is_dir.phpt
index e4ad620d74..5c8967a9f4 100644
--- a/tests/security/open_basedir_is_dir.phpt
+++ b/tests/security/open_basedir_is_dir.phpt
@@ -52,4 +52,3 @@ bool(false)
 bool(false)
 bool(false)
 *** Finished testing open_basedir configuration [is_dir] ***
-
diff --git a/tests/security/open_basedir_is_file.phpt b/tests/security/open_basedir_is_file.phpt
index 51ef0a2d1f..a3303599b5 100644
--- a/tests/security/open_basedir_is_file.phpt
+++ b/tests/security/open_basedir_is_file.phpt
@@ -52,4 +52,3 @@ bool(true)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [is_file] ***
-
diff --git a/tests/security/open_basedir_is_link.phpt b/tests/security/open_basedir_is_link.phpt
index 5d12148d85..61485029f4 100644
--- a/tests/security/open_basedir_is_link.phpt
+++ b/tests/security/open_basedir_is_link.phpt
@@ -52,4 +52,3 @@ bool(false)
 bool(false)
 bool(false)
 *** Finished testing open_basedir configuration [is_link] ***
-
diff --git a/tests/security/open_basedir_is_readable.phpt b/tests/security/open_basedir_is_readable.phpt
index 951a19ac76..9a269b5c0b 100644
--- a/tests/security/open_basedir_is_readable.phpt
+++ b/tests/security/open_basedir_is_readable.phpt
@@ -52,4 +52,3 @@ bool(true)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [is_readable] ***
-
diff --git a/tests/security/open_basedir_is_writable.phpt b/tests/security/open_basedir_is_writable.phpt
index 25ce1c63a4..d2b70614cd 100644
--- a/tests/security/open_basedir_is_writable.phpt
+++ b/tests/security/open_basedir_is_writable.phpt
@@ -52,4 +52,3 @@ bool(true)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [is_writable] ***
-
diff --git a/tests/security/open_basedir_link.phpt b/tests/security/open_basedir_link.phpt
index 57506d599b..9f68f1eac3 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 5a532f8455..aaadbabfa0 100644
--- a/tests/security/open_basedir_linkinfo.phpt
+++ b/tests/security/open_basedir_linkinfo.phpt
@@ -63,4 +63,3 @@ bool(false)
 int(%d)
 bool(true)
 *** Finished testing open_basedir configuration [linkinfo] ***
-
diff --git a/tests/security/open_basedir_lstat.phpt b/tests/security/open_basedir_lstat.phpt
index 35e5a22019..8cd037dbd3 100644
--- a/tests/security/open_basedir_lstat.phpt
+++ b/tests/security/open_basedir_lstat.phpt
@@ -52,4 +52,3 @@ bool(true)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [lstat] ***
-
diff --git a/tests/security/open_basedir_opendir.phpt b/tests/security/open_basedir_opendir.phpt
index fc3111e361..6b88e13080 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 31ad1e5982..e6aa8b6418 100644
--- a/tests/security/open_basedir_parse_ini_file.phpt
+++ b/tests/security/open_basedir_parse_ini_file.phpt
@@ -72,4 +72,3 @@ Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is n
 Warning: parse_ini_file(%stest): failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 12
 bool(false)
 *** 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 a2d892909d..00d2e8c61f 100644
--- a/tests/security/open_basedir_readlink.phpt
+++ b/tests/security/open_basedir_readlink.phpt
@@ -70,4 +70,3 @@ bool(false)
 Warning: readlink(): 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 9f56cd8005..bce664ad9c 100644
--- a/tests/security/open_basedir_realpath.phpt
+++ b/tests/security/open_basedir_realpath.phpt
@@ -58,4 +58,3 @@ 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] ***
-
diff --git a/tests/security/open_basedir_rename.phpt b/tests/security/open_basedir_rename.phpt
index 2747093342..8d977ed8d1 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 c1d4b6b14b..378aae1442 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 3ef9b153f4..46ea790610 100644
--- a/tests/security/open_basedir_scandir.phpt
+++ b/tests/security/open_basedir_scandir.phpt
@@ -107,4 +107,3 @@ array(3) {
   string(6) "ok.txt"
 }
 *** Finished testing open_basedir configuration [scandir] ***
-
diff --git a/tests/security/open_basedir_stat.phpt b/tests/security/open_basedir_stat.phpt
index b80b854d6c..2ad67d67d5 100644
--- a/tests/security/open_basedir_stat.phpt
+++ b/tests/security/open_basedir_stat.phpt
@@ -52,4 +52,3 @@ bool(true)
 bool(true)
 bool(true)
 *** Finished testing open_basedir configuration [stat] ***
-
diff --git a/tests/security/open_basedir_symlink.phpt b/tests/security/open_basedir_symlink.phpt
index ae431df2ca..1e5871f98a 100644
--- a/tests/security/open_basedir_symlink.phpt
+++ b/tests/security/open_basedir_symlink.phpt
@@ -84,4 +84,3 @@ bool(true)
 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 fd63e2978c..b444164efd 100644
--- a/tests/security/open_basedir_tempnam.phpt
+++ b/tests/security/open_basedir_tempnam.phpt
@@ -72,4 +72,3 @@ bool(true)
 string(%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 3a8aee8219..f1cc88c79c 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 aeedac9130..a5b3a55b5f 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/offsets_chaining_1.phpt b/tests/strings/offsets_chaining_1.phpt
index 040a0970a9..0c3c0074b1 100644
--- a/tests/strings/offsets_chaining_1.phpt
+++ b/tests/strings/offsets_chaining_1.phpt
@@ -9,4 +9,3 @@ var_dump($string[0][0][0][0]);
 ?>
 --EXPECT--
 string(1) "f"
-
diff --git a/tests/strings/offsets_chaining_2.phpt b/tests/strings/offsets_chaining_2.phpt
index a7dbdcd9df..bbc170a6e6 100644
--- a/tests/strings/offsets_chaining_2.phpt
+++ b/tests/strings/offsets_chaining_2.phpt
@@ -9,4 +9,3 @@ var_dump($string{0}{0}[0][0]);
 ?>
 --EXPECT--
 string(1) "f"
-
diff --git a/tests/strings/offsets_chaining_3.phpt b/tests/strings/offsets_chaining_3.phpt
index 2d43451cb1..fc11b8d797 100644
--- a/tests/strings/offsets_chaining_3.phpt
+++ b/tests/strings/offsets_chaining_3.phpt
@@ -9,4 +9,3 @@ var_dump(isset($string[0][0][0][0]));
 ?>
 --EXPECT--
 bool(true)
-
diff --git a/tests/strings/offsets_chaining_4.phpt b/tests/strings/offsets_chaining_4.phpt
index f612c40671..d1f3de26af 100644
--- a/tests/strings/offsets_chaining_4.phpt
+++ b/tests/strings/offsets_chaining_4.phpt
@@ -9,4 +9,3 @@ var_dump(isset($string{0}{0}[0][0]));
 ?>
 --EXPECT--
 bool(true)
-
diff --git a/tests/strings/offsets_general.phpt b/tests/strings/offsets_general.phpt
index 9d69ea2bf5..4ec6aa5b86 100644
--- a/tests/strings/offsets_general.phpt
+++ b/tests/strings/offsets_general.phpt
@@ -35,4 +35,3 @@ bool(true)
 Warning: Illegal string offset 'foo' in %s line %d
 string(1) "f"
 bool(false)
-