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

65 files changed, 1 insertions, 79 deletions

diff --git a/tests/classes/__call_003.phpt b/tests/classes/__call_003.phpt
index 6c3e2cfa6c..a32554571b 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 2e2ef63a3c..0d4812908c 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 c89b0e8a14..c26eb6691f 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.
 --EXPECTF--
 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 91664e59d6..783b333f14 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 3c3378f93e..b6ec473709 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 a2a1764ce9..288c0f2df4 100644
--- a/tests/classes/unset_properties.phpt
+++ b/tests/classes/unset_properties.phpt
@@ -126,7 +126,6 @@ echo $o->getPrivateProperty();
 echo "\n\n";
 
 ?>
-
 --EXPECTF--
 publicProperty set
 true