Trim trailing whitespace in *.phpt

69 files changed, 91 insertions, 91 deletions

diff --git a/tests/basic/015.phpt b/tests/basic/015.phpt
index 41a6713ae5..c74e1e414d 100644
--- a/tests/basic/015.phpt
+++ b/tests/basic/015.phpt
@@ -1,5 +1,5 @@
 --TEST--
-POST Method test and arrays - 3 
+POST Method test and arrays - 3
 --POST--
 a[]=1&a[0]=5
 --FILE--
diff --git a/tests/basic/016.phpt b/tests/basic/016.phpt
index f7b301d84e..7c81444518 100644
--- a/tests/basic/016.phpt
+++ b/tests/basic/016.phpt
@@ -1,5 +1,5 @@
 --TEST--
-POST Method test and arrays - 4 
+POST Method test and arrays - 4
 --POST--
 a[a]=1&a[b]=3
 --FILE--
diff --git a/tests/basic/017.phpt b/tests/basic/017.phpt
index b7595ff2e1..ca0a2d6491 100644
--- a/tests/basic/017.phpt
+++ b/tests/basic/017.phpt
@@ -1,5 +1,5 @@
 --TEST--
-POST Method test and arrays - 5 
+POST Method test and arrays - 5
 --POST--
 a[]=1&a[a]=1&a[b]=3
 --FILE--
diff --git a/tests/basic/018.phpt b/tests/basic/018.phpt
index 5617adeec8..93bca86da1 100644
--- a/tests/basic/018.phpt
+++ b/tests/basic/018.phpt
@@ -1,5 +1,5 @@
 --TEST--
-POST Method test and arrays - 6 
+POST Method test and arrays - 6
 --POST--
 a[][]=1&a[][]=3&b[a][b][c]=1&b[a][b][d]=1
 --FILE--
diff --git a/tests/basic/019.phpt b/tests/basic/019.phpt
index 3c13b79801..0c90c4907a 100644
--- a/tests/basic/019.phpt
+++ b/tests/basic/019.phpt
@@ -1,5 +1,5 @@
 --TEST--
-POST Method test and arrays - 7 
+POST Method test and arrays - 7
 --POST--
 a[]=1&a[]]=3&a[[]=4
 --FILE--
diff --git a/tests/basic/020.phpt b/tests/basic/020.phpt
index 26430ef672..3a4d7f455b 100644
--- a/tests/basic/020.phpt
+++ b/tests/basic/020.phpt
@@ -1,5 +1,5 @@
 --TEST--
-POST Method test and arrays - 8 
+POST Method test and arrays - 8
 --POST--
 a[a[]]=1&a[b[]]=3
 --FILE--
diff --git a/tests/basic/bug45986.phpt b/tests/basic/bug45986.phpt
index 33c3f27eac..e63b1b3906 100644
--- a/tests/basic/bug45986.phpt
+++ b/tests/basic/bug45986.phpt
@@ -3,7 +3,7 @@ Bug #45986 (wrong error message for a non existent file on rename)
 --CREDITS--
 Sebastian Schürmann
 sebs@php.net
-Testfest 2009 Munich 
+Testfest 2009 Munich
 --FILE--
 <?php
 rename('foo', 'bar');
diff --git a/tests/classes/__call_003.phpt b/tests/classes/__call_003.phpt
index c80801f7cf..30662add36 100644
--- a/tests/classes/__call_003.phpt
+++ b/tests/classes/__call_003.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Force pass-by-reference to __call 
+Force pass-by-reference to __call
 --FILE--
 <?php
   class C
diff --git a/tests/classes/__call_005.phpt b/tests/classes/__call_005.phpt
index 6e1584878e..33c4df8e49 100644
--- a/tests/classes/__call_005.phpt
+++ b/tests/classes/__call_005.phpt
@@ -1,5 +1,5 @@
 --TEST--
-When __call() is invoked via ::, ensure private implementation of __call() in superclass is accessed without error. 
+When __call() is invoked via ::, ensure private implementation of __call() in superclass is accessed without error.
 --FILE--
 <?php
 class A {
diff --git a/tests/classes/__call_006.phpt b/tests/classes/__call_006.phpt
index c3937393fd..e6efdefe9e 100644
--- a/tests/classes/__call_006.phpt
+++ b/tests/classes/__call_006.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Ensure exceptions are handled properly when thrown in __call.  
+Ensure exceptions are handled properly when thrown in __call.
 --FILE--
 <?php
 class A {
diff --git a/tests/classes/__call_007.phpt b/tests/classes/__call_007.phpt
index cc7a2773bd..a1dd4594e9 100644
--- a/tests/classes/__call_007.phpt
+++ b/tests/classes/__call_007.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Ensure exceptions are handled properly when thrown in a statically declared __call.  
+Ensure exceptions are handled properly when thrown in a statically declared __call.
 --FILE--
 <?php
 class A {
diff --git a/tests/classes/autoload_009.phpt b/tests/classes/autoload_009.phpt
index ebe691ca28..63f1ea9801 100644
--- a/tests/classes/autoload_009.phpt
+++ b/tests/classes/autoload_009.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Ensure type hints for unknown types do not trigger autoload. 
+Ensure type hints for unknown types do not trigger autoload.
 --FILE--
 <?php
 spl_autoload_register(function ($name) {
diff --git a/tests/classes/constants_basic_004.phpt b/tests/classes/constants_basic_004.phpt
index 3542866cc0..e893768629 100644
--- a/tests/classes/constants_basic_004.phpt
+++ b/tests/classes/constants_basic_004.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test properties with array default values using class constants as keys and values. 
+Test properties with array default values using class constants as keys and values.
 --FILE--
 <?php
   class X
@@ -21,7 +21,7 @@ Test properties with array default values using class constants as keys and valu
 
   class C extends B
   {
-      // Static and instance array using class constants with parent 
+      // Static and instance array using class constants with parent
       public static $sa_c_parent = array(parent::KEY => parent::VALUE);
       public $a_c_parent = array(parent::KEY => parent::VALUE);
 
diff --git a/tests/classes/constants_basic_005.phpt b/tests/classes/constants_basic_005.phpt
index a97be1004a..55d23f77b1 100644
--- a/tests/classes/constants_basic_005.phpt
+++ b/tests/classes/constants_basic_005.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test constants with default values based on other constants. 
+Test constants with default values based on other constants.
 --FILE--
 <?php
   class C
diff --git a/tests/classes/interface_and_extends.phpt b/tests/classes/interface_and_extends.phpt
index 1c23d31ca6..8bb1ec05f1 100644
--- a/tests/classes/interface_and_extends.phpt
+++ b/tests/classes/interface_and_extends.phpt
@@ -1,5 +1,5 @@
 --TEST--
-ZE2 a class cannot extend an interface 
+ZE2 a class cannot extend an interface
 --FILE--
 <?php
 
diff --git a/tests/classes/interface_constant_inheritance_001.phpt b/tests/classes/interface_constant_inheritance_001.phpt
index f982a4a64e..046f3b1c5a 100644
--- a/tests/classes/interface_constant_inheritance_001.phpt
+++ b/tests/classes/interface_constant_inheritance_001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Ensure an interface may not shadow an inherited constant. 
+Ensure an interface may not shadow an inherited constant.
 --FILE--
 <?php
 interface I1 {
diff --git a/tests/classes/interface_constant_inheritance_002.phpt b/tests/classes/interface_constant_inheritance_002.phpt
index af4ce695f7..952dbaf7f4 100644
--- a/tests/classes/interface_constant_inheritance_002.phpt
+++ b/tests/classes/interface_constant_inheritance_002.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Ensure a class may not shadow a constant inherited from an interface. 
+Ensure a class may not shadow a constant inherited from an interface.
 --FILE--
 <?php
 interface I {
diff --git a/tests/classes/interface_constant_inheritance_003.phpt b/tests/classes/interface_constant_inheritance_003.phpt
index 6b4139bd98..908ca7b4d6 100644
--- a/tests/classes/interface_constant_inheritance_003.phpt
+++ b/tests/classes/interface_constant_inheritance_003.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Ensure a class may not inherit two constants with the same name from two separate interfaces. 
+Ensure a class may not inherit two constants with the same name from two separate interfaces.
 --FILE--
 <?php
 interface I1 {
diff --git a/tests/classes/interface_constant_inheritance_004.phpt b/tests/classes/interface_constant_inheritance_004.phpt
index 7f2d3e514f..aca9865eb1 100644
--- a/tests/classes/interface_constant_inheritance_004.phpt
+++ b/tests/classes/interface_constant_inheritance_004.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Ensure a class may implement two interfaces which include the same constant (due to inheritance). 
+Ensure a class may implement two interfaces which include the same constant (due to inheritance).
 --FILE--
 <?php
 interface IA {
diff --git a/tests/classes/method_override_optional_arg_002.phpt b/tests/classes/method_override_optional_arg_002.phpt
index c62e3a562e..254392718b 100644
--- a/tests/classes/method_override_optional_arg_002.phpt
+++ b/tests/classes/method_override_optional_arg_002.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Omitting optional arg in method inherited from abstract class 
+Omitting optional arg in method inherited from abstract class
 --FILE--
 <?php
 
diff --git a/tests/classes/private_members.phpt b/tests/classes/private_members.phpt
index 5ab448e437..4d8fd9eeb0 100644
--- a/tests/classes/private_members.phpt
+++ b/tests/classes/private_members.phpt
@@ -1,5 +1,5 @@
 --TEST--
-ZE2 A private member is 
+ZE2 A private member is
 --FILE--
 <?php
 
diff --git a/tests/classes/static_properties_003.phpt b/tests/classes/static_properties_003.phpt
index 2aab44d586..89c26d3dd3 100644
--- a/tests/classes/static_properties_003.phpt
+++ b/tests/classes/static_properties_003.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Attempting to access static properties using instance property syntax 
+Attempting to access static properties using instance property syntax
 --FILE--
 <?php
 class C {
diff --git a/tests/classes/static_properties_003_error1.phpt b/tests/classes/static_properties_003_error1.phpt
index df297a71b2..68a57a8f89 100644
--- a/tests/classes/static_properties_003_error1.phpt
+++ b/tests/classes/static_properties_003_error1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Attempting to access static properties using instance property syntax 
+Attempting to access static properties using instance property syntax
 --FILE--
 <?php
 class C {
diff --git a/tests/classes/static_properties_003_error2.phpt b/tests/classes/static_properties_003_error2.phpt
index 4509568160..b428b4ff6e 100644
--- a/tests/classes/static_properties_003_error2.phpt
+++ b/tests/classes/static_properties_003_error2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Attempting to access static properties using instance property syntax 
+Attempting to access static properties using instance property syntax
 --FILE--
 <?php
 class C {
diff --git a/tests/classes/static_properties_003_error3.phpt b/tests/classes/static_properties_003_error3.phpt
index 4f4288a63c..b9423639b0 100644
--- a/tests/classes/static_properties_003_error3.phpt
+++ b/tests/classes/static_properties_003_error3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Attempting to access static properties using instance property syntax 
+Attempting to access static properties using instance property syntax
 --FILE--
 <?php
 class C {
diff --git a/tests/classes/static_properties_003_error4.phpt b/tests/classes/static_properties_003_error4.phpt
index d526e7247b..6501689ddb 100644
--- a/tests/classes/static_properties_003_error4.phpt
+++ b/tests/classes/static_properties_003_error4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Attempting to access static properties using instance property syntax 
+Attempting to access static properties using instance property syntax
 --FILE--
 <?php
 class C {
diff --git a/tests/classes/static_properties_004.phpt b/tests/classes/static_properties_004.phpt
index 79bbc6380b..42860c3301 100644
--- a/tests/classes/static_properties_004.phpt
+++ b/tests/classes/static_properties_004.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Inherited static properties cannot be separated from their reference set. 
+Inherited static properties cannot be separated from their reference set.
 --FILE--
 <?php
 class C { public static $p = 'original'; }
diff --git a/tests/classes/this.phpt b/tests/classes/this.phpt
index 5551e8ac88..30ea83e285 100644
--- a/tests/classes/this.phpt
+++ b/tests/classes/this.phpt
@@ -3,7 +3,7 @@ ZE2 $this cannot be exchanged
 --FILE--
 <?php
 
-/* please don't shorten this test. It shows what would happen if 
+/* please don't shorten this test. It shows what would happen if
  * the fatal error would have been a warning.
  */
 class Foo
diff --git a/tests/lang/022.phpt b/tests/lang/022.phpt
index 8843e50e26..9660530bc7 100644
--- a/tests/lang/022.phpt
+++ b/tests/lang/022.phpt
@@ -11,7 +11,7 @@ function switchtest ($i, $j)
 					case 0:
 						echo "zero";
 						break;
-					case 1: 
+					case 1:
 						echo "one";
 						break;
 					default:
diff --git a/tests/lang/bug20175.phpt b/tests/lang/bug20175.phpt
index cfa465deac..0d040c82d9 100644
--- a/tests/lang/bug20175.phpt
+++ b/tests/lang/bug20175.phpt
@@ -33,7 +33,7 @@ function foo_static() {
 /* Part 2:
  * Storing a reference to the result of a function in a static variable.
  * Same as Part 1 but:
- * The return statement transports a copy of the value to return. In other 
+ * The return statement transports a copy of the value to return. In other
  * words the return value of bar_global() is a temporary variable only valid
  * after the function call bar_global() is done in current local scope.
  */
@@ -83,8 +83,8 @@ function wow_static() {
 
 /* Part 4:
  * Storing a reference to a new instance (that's where the name of the  test
- * comes from). First there is the global counter $oop_global again which 
- * counts the calls to the constructor of oop_class and hence counts the 
+ * comes from). First there is the global counter $oop_global again which
+ * counts the calls to the constructor of oop_class and hence counts the
  * creation of oop_class instances.
  * The class oop_test uses a static reference to a oop_class instance.
  * When another oop_test instance is created it must reuse the statically
diff --git a/tests/lang/bug22510.phpt b/tests/lang/bug22510.phpt
index 7c4349b71a..dbf7756daa 100644
--- a/tests/lang/bug22510.phpt
+++ b/tests/lang/bug22510.phpt
@@ -4,7 +4,7 @@ Bug #22510 (segfault among complex references)
 error_reporting=E_ALL | E_DEPRECATED
 --FILE--
 <?php
-class foo 
+class foo
 {
 	public $list = array();
 
@@ -29,7 +29,7 @@ class foo
 	}
 }
 
-class bar 
+class bar
 {
 	function run1() {
 		print __CLASS__."::".__FUNCTION__."\n";
diff --git a/tests/lang/bug44827.phpt b/tests/lang/bug44827.phpt
index 031045b083..90bf1d8893 100644
--- a/tests/lang/bug44827.phpt
+++ b/tests/lang/bug44827.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #44827 (Class error when trying to access :: as constant)
 --CREDITS--
-Sebastian Schürmann 
+Sebastian Schürmann
 sebs@php.net
 Testfest Munich 2009
 --FILE--
diff --git a/tests/lang/compare_objects_basic1.phpt b/tests/lang/compare_objects_basic1.phpt
index cf91803e3f..e54fb2173e 100644
--- a/tests/lang/compare_objects_basic1.phpt
+++ b/tests/lang/compare_objects_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test standard 'compare' object handler 
+Test standard 'compare' object handler
 --FILE--
 
 <?php
diff --git a/tests/lang/compare_objects_basic2.phpt b/tests/lang/compare_objects_basic2.phpt
index 74d74b8cd0..c38dbcec42 100644
--- a/tests/lang/compare_objects_basic2.phpt
+++ b/tests/lang/compare_objects_basic2.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test object compare when object handler different 
+Test object compare when object handler different
 --FILE--
 
 <?php
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "Simple test comparing two objects with different compare callback handler\n";
diff --git a/tests/lang/engine_assignExecutionOrder_002.phpt b/tests/lang/engine_assignExecutionOrder_002.phpt
index 52019f10c8..dbb0c0aba4 100644
--- a/tests/lang/engine_assignExecutionOrder_002.phpt
+++ b/tests/lang/engine_assignExecutionOrder_002.phpt
@@ -38,7 +38,7 @@ $i4 = array(array(1000,2000),3000);
 $i = array($i1,$i2,$i3,$i4);
 $j = array(0,0,0);
 $h = 0;
-// a list of lists 
+// a list of lists
 list(list($j[$h++],$j[$h++]),$j[$h++]) = $i[3];
 var_dump($j);
 
@@ -50,7 +50,7 @@ list(list($l,$m),$n) = $k;
 echo "L=$l M=$m N=$n\n";
 
 
-// expect $x and $y to be null - this fails on php.net 5.2.1 (invalid opcode) - fixed in 5.2.3 
+// expect $x and $y to be null - this fails on php.net 5.2.1 (invalid opcode) - fixed in 5.2.3
 list($o,$p) = 20;
 echo "O=$o and P=$p\n";
 
@@ -65,7 +65,7 @@ list(list(list($r,$s,,$t),list($u,$v),,$w),,$x) = $q4;
 echo "$r $s $t $u $v $w $x\n";
 
 
-// expect y and z to be undefined 
+// expect y and z to be undefined
 list($y,$z) = array();
 echo "Y=$y,Z=$z\n";
 
@@ -77,7 +77,7 @@ echo "AA=$aa\n";
 list($cc,,$dd) = array(10,20,30,40);
 echo "CC=$cc DD=$dd\n";
 
-// expect the inner array to be defined 
+// expect the inner array to be defined
 $ee = array("original array");
 function f() {
   global $ee;
diff --git a/tests/lang/engine_assignExecutionOrder_007.phpt b/tests/lang/engine_assignExecutionOrder_007.phpt
index d66773f024..14a2a812b1 100644
--- a/tests/lang/engine_assignExecutionOrder_007.phpt
+++ b/tests/lang/engine_assignExecutionOrder_007.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Check key execution order with new. 
+Check key execution order with new.
 --FILE--
 <?php
 $a[2][3] = 'stdClass';
diff --git a/tests/lang/foreachLoop.010.phpt b/tests/lang/foreachLoop.010.phpt
index 504132d035..e114e839b9 100644
--- a/tests/lang/foreachLoop.010.phpt
+++ b/tests/lang/foreachLoop.010.phpt
@@ -7,20 +7,20 @@ It will pass only if the 'contentious code' in PHPValue.decReferences() is enabl
 $a = array(1,2,3);
 $container = array(&$a);
 
-// From php.net:  
+// From php.net:
 //   "Unless the array is referenced, foreach operates on a copy of
 //    the specified array and not the array itself."
 // At this point, the array $a is referenced.
 
 // The following line ensures $a is no longer references as a consequence
-// of running the 'destructor' on $container.  
+// of running the 'destructor' on $container.
 $container = null;
 
 // At this point the array $a is no longer referenced, so foreach should operate on a copy of the array.
 // However, P8 does not invoke 'destructors' when refcount is decremented to 0.
 // Consequently, $a thinks it is still referenced, and foreach will operate on the array itself.
 // This provokes a difference in behaviour when changing the number of elements in the array while
-// iterating over it.  
+// iterating over it.
 
 $i=0;
 foreach ($a as $v) {
diff --git a/tests/lang/foreachLoop.011.phpt b/tests/lang/foreachLoop.011.phpt
index 8e4fca8a40..1f57e0acdf 100644
--- a/tests/lang/foreachLoop.011.phpt
+++ b/tests/lang/foreachLoop.011.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Changing from an interable type to a non iterable type during the iteration 
+Changing from an interable type to a non iterable type during the iteration
 --FILE--
 <?php
 echo "\nChange from array to non iterable:\n";
diff --git a/tests/lang/foreachLoopIterator.001.phpt b/tests/lang/foreachLoopIterator.001.phpt
index 4ca5648e58..61fffc617a 100644
--- a/tests/lang/foreachLoopIterator.001.phpt
+++ b/tests/lang/foreachLoopIterator.001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-foreach with Iterator. 
+foreach with Iterator.
 --FILE--
 <?php
 
diff --git a/tests/lang/func_get_arg.005.phpt b/tests/lang/func_get_arg.005.phpt
index 9da14eb6f3..5dd5468721 100644
--- a/tests/lang/func_get_arg.005.phpt
+++ b/tests/lang/func_get_arg.005.phpt
@@ -1,6 +1,6 @@
 --TEST--
 A variable, which is referenced by another variable, is passed by value.
-During the call, the original variable is updated. This should not affect func_get_arg().  
+During the call, the original variable is updated. This should not affect func_get_arg().
 --FILE--
 <?php
 function refVal($x) {
diff --git a/tests/lang/func_num_args.004.phpt b/tests/lang/func_num_args.004.phpt
index d8142c9e7e..aef61668a4 100644
--- a/tests/lang/func_num_args.004.phpt
+++ b/tests/lang/func_num_args.004.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Pass same variable by ref and by value. 
+Pass same variable by ref and by value.
 --FILE--
 <?php
 function valRef($x, &$y) {
diff --git a/tests/lang/operators/operator_identical_basic.phpt b/tests/lang/operators/operator_identical_basic.phpt
index ad2277ae7a..cddba995a6 100644
--- a/tests/lang/operators/operator_identical_basic.phpt
+++ b/tests/lang/operators/operator_identical_basic.phpt
@@ -22,7 +22,7 @@ $invalid_float2 = array("-67345.76567", "-67345.76567aaa", "  -67345.76567", "-
 
 
 $toCompare = array(
-  true, array(true), array_merge($valid_true, $valid_false), 
+  true, array(true), array_merge($valid_true, $valid_false),
   false, array(false), array_merge($valid_true, $valid_false),
   $int1, $valid_int1, $invalid_int1,
   $int2, $valid_int2, $invalid_int2,
diff --git a/tests/lang/operators/operator_lt_or_equal_basic.phpt b/tests/lang/operators/operator_lt_or_equal_basic.phpt
index a8b4b43c6b..5439fd7d75 100644
--- a/tests/lang/operators/operator_lt_or_equal_basic.phpt
+++ b/tests/lang/operators/operator_lt_or_equal_basic.phpt
@@ -21,7 +21,7 @@ $invalid_float2 = array(-67345.76569, -6.734576569E4);
 
 $toCompare = array(
   true, $valid_true, $valid_false,
-  false, array_merge($valid_false, $valid_true), NULL, 
+  false, array_merge($valid_false, $valid_true), NULL,
   $int1, $valid_int1, $invalid_int1,
   $int2, $valid_int2, $invalid_int2,
   $float1, $valid_float1, $invalid_float1,
diff --git a/tests/lang/operators/operator_notidentical_basic.phpt b/tests/lang/operators/operator_notidentical_basic.phpt
index 9c3db36cdc..d24c936119 100644
--- a/tests/lang/operators/operator_notidentical_basic.phpt
+++ b/tests/lang/operators/operator_notidentical_basic.phpt
@@ -22,7 +22,7 @@ $invalid_float2 = array(-67345.76567, -6.734576567E4);
 
 
 $toCompare = array(
-  true, array_merge($valid_true, $valid_false), array(true), 
+  true, array_merge($valid_true, $valid_false), array(true),
   false, array_merge($valid_true, $valid_false), array(false),
   $int1, $valid_int1, $invalid_int1,
   $int2, $valid_int2, $invalid_int2,
diff --git a/tests/lang/passByReference_003.phpt b/tests/lang/passByReference_003.phpt
index bbbc564654..8fe27407f1 100644
--- a/tests/lang/passByReference_003.phpt
+++ b/tests/lang/passByReference_003.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Implicit initialisation when passing by reference 
+Implicit initialisation when passing by reference
 --FILE--
 <?php
 function passbyVal($val) {
diff --git a/tests/lang/passByReference_008.phpt b/tests/lang/passByReference_008.phpt
index c7623fb73a..4fd9a819a8 100644
--- a/tests/lang/passByReference_008.phpt
+++ b/tests/lang/passByReference_008.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Pass same variable by ref and by value. 
+Pass same variable by ref and by value.
 --FILE--
 <?php
 function valRef($x, &$y) {
diff --git a/tests/lang/passByReference_009.phpt b/tests/lang/passByReference_009.phpt
index b1b0c358ee..7b723d552e 100644
--- a/tests/lang/passByReference_009.phpt
+++ b/tests/lang/passByReference_009.phpt
@@ -5,7 +5,7 @@ Assignement as argument
     function foo(&$x, &$y) { $x = 1; echo $y ; }
 
     $x = 0;
-    foo($x, $x); // prints 1 .. 
+    foo($x, $x); // prints 1 ..
 
 
     function foo2($x, &$y, $z)
diff --git a/tests/lang/passByReference_012.phpt b/tests/lang/passByReference_012.phpt
index 69d53ca261..3bc60a484e 100644
--- a/tests/lang/passByReference_012.phpt
+++ b/tests/lang/passByReference_012.phpt
@@ -8,7 +8,7 @@ Test pass by reference semantics
 $stack = array ( array ( 'two' ));
 var_dump(array_shift(array_shift($stack)));
 
-// This should show the identical warning 
+// This should show the identical warning
 $original = array ( array ( 'one' ));
 $stack = $original;
 var_dump(array_shift(array_shift($stack)));
diff --git a/tests/lang/returnByReference.002.phpt b/tests/lang/returnByReference.002.phpt
index 99365f1b14..0880a8b7a5 100644
--- a/tests/lang/returnByReference.002.phpt
+++ b/tests/lang/returnByReference.002.phpt
@@ -15,12 +15,12 @@ function returnVal() {
 $a = "original";
 $b =& returnVal();
 $b = "changed";
-var_dump($a); //expecting warning + "original" 
+var_dump($a); //expecting warning + "original"
 
 $a = "original";
 $b =& returnRef();
 $b = "changed";
-var_dump($a); //expecting "changed" 
+var_dump($a); //expecting "changed"
 ?>
 --EXPECTF--
 
diff --git a/tests/output/ob_clean_basic_001.phpt b/tests/output/ob_clean_basic_001.phpt
index a6d15d7aac..bd91676b12 100644
--- a/tests/output/ob_clean_basic_001.phpt
+++ b/tests/output/ob_clean_basic_001.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test ob_clean() function : basic functionality 
+Test ob_clean() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto bool ob_clean(void)
- * Description: Clean (delete) the current output buffer 
+ * Description: Clean (delete) the current output buffer
  * Source code: main/output.c
  * Alias to functions:
  */
diff --git a/tests/output/ob_clean_error_001.phpt b/tests/output/ob_clean_error_001.phpt
index 53f3a53c0c..fffe484074 100644
--- a/tests/output/ob_clean_error_001.phpt
+++ b/tests/output/ob_clean_error_001.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test ob_clean() function : error conditions 
+Test ob_clean() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto bool ob_clean(void)
- * Description: Clean (delete) the current output buffer 
+ * Description: Clean (delete) the current output buffer
  * Source code: main/output.c
  * Alias to functions:
  */
diff --git a/tests/output/ob_end_flush_basic_001.phpt b/tests/output/ob_end_flush_basic_001.phpt
index 5185a2efad..811d6a0761 100644
--- a/tests/output/ob_end_flush_basic_001.phpt
+++ b/tests/output/ob_end_flush_basic_001.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test ob_end_flush() function : basic functionality 
+Test ob_end_flush() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto bool ob_end_flush(void)
- * Description: Flush (send) the output buffer, and delete current output buffer 
+ * Description: Flush (send) the output buffer, and delete current output buffer
  * Source code: main/output.c
  * Alias to functions:
  */
diff --git a/tests/output/ob_end_flush_error_001.phpt b/tests/output/ob_end_flush_error_001.phpt
index f1afb4bd3c..e9c15bd05f 100644
--- a/tests/output/ob_end_flush_error_001.phpt
+++ b/tests/output/ob_end_flush_error_001.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test ob_end_flush() function : error conditions 
+Test ob_end_flush() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto bool ob_end_flush(void)
- * Description: Flush (send) the output buffer, and delete current output buffer 
+ * Description: Flush (send) the output buffer, and delete current output buffer
  * Source code: main/output.c
  * Alias to functions:
  */
diff --git a/tests/output/ob_flush_basic_001.phpt b/tests/output/ob_flush_basic_001.phpt
index 8e8349369d..e53c7e5a23 100644
--- a/tests/output/ob_flush_basic_001.phpt
+++ b/tests/output/ob_flush_basic_001.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test ob_flush() function : basic functionality 
+Test ob_flush() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto bool ob_flush(void)
- * Description: Flush (send) contents of the output buffer. The last buffer content is sent to next buffer 
+ * Description: Flush (send) contents of the output buffer. The last buffer content is sent to next buffer
  * Source code: main/output.c
  * Alias to functions:
  */
diff --git a/tests/output/ob_flush_error_001.phpt b/tests/output/ob_flush_error_001.phpt
index 714d01cb70..6e95810dce 100644
--- a/tests/output/ob_flush_error_001.phpt
+++ b/tests/output/ob_flush_error_001.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test ob_flush() function : error conditions 
+Test ob_flush() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto bool ob_flush(void)
- * Description: Flush (send) contents of the output buffer. The last buffer content is sent to next buffer 
+ * Description: Flush (send) contents of the output buffer. The last buffer content is sent to next buffer
  * Source code: main/output.c
  * Alias to functions:
  */
diff --git a/tests/output/ob_get_contents_basic_001.phpt b/tests/output/ob_get_contents_basic_001.phpt
index 2778c21d69..3f24ea04f6 100644
--- a/tests/output/ob_get_contents_basic_001.phpt
+++ b/tests/output/ob_get_contents_basic_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
 Test ob_get_contents() function : basic functionality
 --CREDITS--
-Iain Lewis <ilewis@php.net> 
+Iain Lewis <ilewis@php.net>
 --FILE--
 <?php
 /* Prototype  : proto string ob_get_contents(void)
- * Description: Return the contents of the output buffer 
+ * Description: Return the contents of the output buffer
  * Source code: main/output.c
  * Alias to functions:
  */
diff --git a/tests/output/ob_get_contents_error_001.phpt b/tests/output/ob_get_contents_error_001.phpt
index 00ccf30bef..2c1c043ba7 100644
--- a/tests/output/ob_get_contents_error_001.phpt
+++ b/tests/output/ob_get_contents_error_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
 Test ob_get_contents() function : error cases
 --CREDITS--
-Iain Lewis <ilewis@php.net> 
+Iain Lewis <ilewis@php.net>
 --FILE--
 <?php
 /* Prototype  : proto string ob_get_contents(void)
- * Description: Return the contents of the output buffer 
+ * Description: Return the contents of the output buffer
  * Source code: main/output.c
  * Alias to functions:
  */
diff --git a/tests/output/ob_get_level_basic_001.phpt b/tests/output/ob_get_level_basic_001.phpt
index fe8df5a17a..4a6c84785b 100644
--- a/tests/output/ob_get_level_basic_001.phpt
+++ b/tests/output/ob_get_level_basic_001.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test ob_get_level() function : basic functionality 
+Test ob_get_level() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto int ob_get_level(void)
- * Description: Return the nesting level of the output buffer 
+ * Description: Return the nesting level of the output buffer
  * Source code: main/output.c
  * Alias to functions:
  */
diff --git a/tests/output/ob_get_level_error_001.phpt b/tests/output/ob_get_level_error_001.phpt
index ede78fc17b..00e9eca555 100644
--- a/tests/output/ob_get_level_error_001.phpt
+++ b/tests/output/ob_get_level_error_001.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test ob_get_level() function : error conditions 
+Test ob_get_level() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto int ob_get_level(void)
- * Description: Return the nesting level of the output buffer 
+ * Description: Return the nesting level of the output buffer
  * Source code: main/output.c
  * Alias to functions:
  */
diff --git a/tests/output/ob_implicit_flush_basic_001.phpt b/tests/output/ob_implicit_flush_basic_001.phpt
index b980dda917..780eb6dfbb 100644
--- a/tests/output/ob_implicit_flush_basic_001.phpt
+++ b/tests/output/ob_implicit_flush_basic_001.phpt
@@ -3,7 +3,7 @@ Test ob_implicit_flush() function : check return value (always null).
 --FILE--
 <?php
 /* Prototype  : proto void ob_implicit_flush([int flag])
- * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call 
+ * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call
  * Source code: main/output.c
  * Alias to functions:
  */
diff --git a/tests/output/ob_implicit_flush_basic_002.phpt b/tests/output/ob_implicit_flush_basic_002.phpt
index 1f895d1037..37d10ba640 100644
--- a/tests/output/ob_implicit_flush_basic_002.phpt
+++ b/tests/output/ob_implicit_flush_basic_002.phpt
@@ -3,7 +3,7 @@ Test ob_implicit_flush() function : ensure implicit flushing does not apply to u
 --FILE--
 <?php
 /* Prototype  : proto void ob_implicit_flush([int flag])
- * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call 
+ * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call
  * Source code: main/output.c
  * Alias to functions:
  */
diff --git a/tests/output/ob_implicit_flush_error_001.phpt b/tests/output/ob_implicit_flush_error_001.phpt
index c70304aecc..63c892e0c4 100644
--- a/tests/output/ob_implicit_flush_error_001.phpt
+++ b/tests/output/ob_implicit_flush_error_001.phpt
@@ -3,7 +3,7 @@ Test ob_implicit_flush() function : wrong number of arguments
 --FILE--
 <?php
 /* Prototype  : proto void ob_implicit_flush([int flag])
- * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call 
+ * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call
  * Source code: main/output.c
  * Alias to functions:
  */
diff --git a/tests/output/ob_implicit_flush_variation_001.phpt b/tests/output/ob_implicit_flush_variation_001.phpt
index 0e8ce5313d..d6d3a45e01 100644
--- a/tests/output/ob_implicit_flush_variation_001.phpt
+++ b/tests/output/ob_implicit_flush_variation_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test ob_implicit_flush() function : usage variation 
+Test ob_implicit_flush() function : usage variation
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only");
 --FILE--
 <?php
 /* Prototype  : void ob_implicit_flush([int flag])
- * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call 
+ * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call
  * Source code: main/output.c
  * Alias to functions:
  */
diff --git a/tests/output/ob_start_basic_004.phpt b/tests/output/ob_start_basic_004.phpt
index 11ced5779d..eff1204236 100644
--- a/tests/output/ob_start_basic_004.phpt
+++ b/tests/output/ob_start_basic_004.phpt
@@ -1,5 +1,5 @@
 --TEST--
-ob_start() chunk_size: confirm buffer is flushed after any output call that causes its length to equal or exceed chunk_size. 
+ob_start() chunk_size: confirm buffer is flushed after any output call that causes its length to equal or exceed chunk_size.
 --INI--
 opcache.optimization_level=0
 --FILE--
diff --git a/tests/run-test/test005.phpt b/tests/run-test/test005.phpt
index ef644a4fb1..a95281fc13 100644
--- a/tests/run-test/test005.phpt
+++ b/tests/run-test/test005.phpt
@@ -12,7 +12,7 @@ track_errors=1
 //
 // We check the general ini settings which affect error handling
 // and than verify if a message is given by a division by zero.
-// EXPECTF is used here since the error format may change but ut 
+// EXPECTF is used here since the error format may change but ut
 // should always contain 'Division by zero'.
 var_dump(ini_get('display_errors'));
 var_dump(ini_get('error_reporting'));
diff --git a/tests/run-test/test008.phpt b/tests/run-test/test008.phpt
index 41d22d8e71..c289e7a696 100644
--- a/tests/run-test/test008.phpt
+++ b/tests/run-test/test008.phpt
@@ -12,7 +12,7 @@ track_errors=1
 //
 // We check the general ini settings which affect error handling
 // and than verify if a message is given by a division by zero.
-// EXPECTF is used here since the error format may change but ut 
+// EXPECTF is used here since the error format may change but ut
 // should always contain 'Division by zero'.
 var_dump(ini_get('display_errors'));
 var_dump(ini_get('error_reporting'));
diff --git a/tests/run-test/test008a.phpt b/tests/run-test/test008a.phpt
index 9814fa12f7..d247eb36c2 100644
--- a/tests/run-test/test008a.phpt
+++ b/tests/run-test/test008a.phpt
@@ -12,7 +12,7 @@ track_errors=1
 //
 // We check the general ini settings which affect error handling
 // and than verify if a message is given by a division by zero.
-// EXPECTF is used here since the error format may change but ut 
+// EXPECTF is used here since the error format may change but ut
 // should always contain 'Division by zero'.
 var_dump(ini_get('display_errors'));
 var_dump(ini_get('error_reporting'));
diff --git a/tests/strings/002.phpt b/tests/strings/002.phpt
index 7b95a25645..5e82091088 100644
--- a/tests/strings/002.phpt
+++ b/tests/strings/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Formatted print functions
 --FILE--
-<?php 
+<?php
 error_reporting(0);
 
 $fp = fopen("php://stdout", "w") or die("Arrggsgg!!");
diff --git a/tests/strings/bug22592.phpt b/tests/strings/bug22592.phpt
index 3443c32859..c66e27d880 100644
--- a/tests/strings/bug22592.phpt
+++ b/tests/strings/bug22592.phpt
@@ -13,7 +13,7 @@ $correct[1] = '*';
 $correct[3] = '*';
 $correct[5] = '*';
 
-// This produces the 
+// This produces the
 $wrong[1] = $wrong[3] = $wrong[5] = '*';
 
 var_dump($correct);