diff --git a/Zend/tests/001.phpt b/Zend/tests/001.phpt
index bbd4ea3ece6..c7c2060dc2f 100644
--- a/Zend/tests/001.phpt
+++ b/Zend/tests/001.phpt
@@ -44,7 +44,7 @@ var_dump(func_num_args());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(0)
 int(1)
 Exception: Too few arguments to function test2(), 0 passed in %s001.php on line 18 and exactly 1 expected
diff --git a/Zend/tests/002.phpt b/Zend/tests/002.phpt
index 1728330c08b..e89f71ef51f 100644
--- a/Zend/tests/002.phpt
+++ b/Zend/tests/002.phpt
@@ -50,7 +50,7 @@ var_dump(func_get_arg(1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: func_get_arg():  The argument number should be >= 0 in %s on line %d
 bool(false)
 
diff --git a/Zend/tests/003.phpt b/Zend/tests/003.phpt
index 91daa705d37..b1ef79ebcb7 100644
--- a/Zend/tests/003.phpt
+++ b/Zend/tests/003.phpt
@@ -44,7 +44,7 @@ var_dump(func_get_args());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(0) {
 }
 array(1) {
diff --git a/Zend/tests/004.phpt b/Zend/tests/004.phpt
index 6beafe70769..179684d0767 100644
--- a/Zend/tests/004.phpt
+++ b/Zend/tests/004.phpt
@@ -12,7 +12,7 @@ var_dump(strncmp("qwerty", "qwerty123", 7));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: strncmp() expects exactly 3 parameters, 2 given in %s on line %d
 NULL
 int(0)
diff --git a/Zend/tests/005.phpt b/Zend/tests/005.phpt
index 00f320e947d..6ad1b0f63d2 100644
--- a/Zend/tests/005.phpt
+++ b/Zend/tests/005.phpt
@@ -14,7 +14,7 @@ var_dump(strcasecmp("01", "01"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: strcasecmp() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 int(0)
diff --git a/Zend/tests/006.phpt b/Zend/tests/006.phpt
index eedb849719b..64c74ff1344 100644
--- a/Zend/tests/006.phpt
+++ b/Zend/tests/006.phpt
@@ -15,7 +15,7 @@ var_dump(strncasecmp("01", "01", 1000));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: strncasecmp() expects exactly 3 parameters, 1 given in %s on line %d
 NULL
 
diff --git a/Zend/tests/007.phpt b/Zend/tests/007.phpt
index f8e5b99a0e4..61201812698 100644
--- a/Zend/tests/007.phpt
+++ b/Zend/tests/007.phpt
@@ -21,7 +21,7 @@ var_dump(each($a));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: each() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
diff --git a/Zend/tests/008.phpt b/Zend/tests/008.phpt
index 3e990fb7689..5addbbdecb3 100644
--- a/Zend/tests/008.phpt
+++ b/Zend/tests/008.phpt
@@ -22,7 +22,7 @@ var_dump(constant("test const"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: define() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/Zend/tests/009.phpt b/Zend/tests/009.phpt
index 0dc94535766..82cfabee494 100644
--- a/Zend/tests/009.phpt
+++ b/Zend/tests/009.phpt
@@ -35,7 +35,7 @@ $f1->testNull();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Deprecated: Non-static method foo::bar() should not be called statically in %s on line %d
 string(3) "foo"
 
diff --git a/Zend/tests/010.phpt b/Zend/tests/010.phpt
index 45e18329146..d38f8adda5c 100644
--- a/Zend/tests/010.phpt
+++ b/Zend/tests/010.phpt
@@ -41,7 +41,7 @@ var_dump(get_parent_class(1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(false)
 bool(false)
 string(3) "foo"
diff --git a/Zend/tests/011.phpt b/Zend/tests/011.phpt
index 57c6214916a..7bcab0798fc 100644
--- a/Zend/tests/011.phpt
+++ b/Zend/tests/011.phpt
@@ -52,7 +52,7 @@ $bar->test();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: property_exists() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/Zend/tests/012.phpt b/Zend/tests/012.phpt
index b192bc1e0cb..40f68e97940 100644
--- a/Zend/tests/012.phpt
+++ b/Zend/tests/012.phpt
@@ -18,7 +18,7 @@ var_dump(class_exists("stdClass"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: class_exists() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 bool(false)
diff --git a/Zend/tests/013.phpt b/Zend/tests/013.phpt
index 1fc4af77ab8..aec10e53f1b 100644
--- a/Zend/tests/013.phpt
+++ b/Zend/tests/013.phpt
@@ -18,7 +18,7 @@ var_dump(interface_exists("stdClass"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: interface_exists() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 bool(false)
diff --git a/Zend/tests/014.phpt b/Zend/tests/014.phpt
index 25995b79760..18037a99e34 100644
--- a/Zend/tests/014.phpt
+++ b/Zend/tests/014.phpt
@@ -20,7 +20,7 @@ var_dump(get_included_files());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(1) {
   [0]=>
   string(%d) "%s"
diff --git a/Zend/tests/015.phpt b/Zend/tests/015.phpt
index ffe1a4f94e8..ccf5e4ddb09 100644
--- a/Zend/tests/015.phpt
+++ b/Zend/tests/015.phpt
@@ -13,7 +13,7 @@ var_dump(trigger_error("error", E_USER_DEPRECATED));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: trigger_error() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 
diff --git a/Zend/tests/016.phpt b/Zend/tests/016.phpt
index 6ec507e6b1f..de011606bcc 100644
--- a/Zend/tests/016.phpt
+++ b/Zend/tests/016.phpt
@@ -3,10 +3,10 @@ isset() with object properties when operating on non-object
 --FILE--
 <?php
 
-$foo = NULL; 
+$foo = NULL;
 isset($foo->bar->bar);
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 Done
diff --git a/Zend/tests/017.phpt b/Zend/tests/017.phpt
index 0e1c1be6973..ed1b2a38a5a 100644
--- a/Zend/tests/017.phpt
+++ b/Zend/tests/017.phpt
@@ -43,7 +43,7 @@ var_dump(count(get_extension_funcs("zend")));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: get_resource_type() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
diff --git a/Zend/tests/018.phpt b/Zend/tests/018.phpt
index 9543cc4caaf..5ced729fce1 100644
--- a/Zend/tests/018.phpt
+++ b/Zend/tests/018.phpt
@@ -17,7 +17,7 @@ var_dump(constant("TEST_CONST2"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: constant() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt
index 0548a38f883..e3f64885d4d 100644
--- a/Zend/tests/019.phpt
+++ b/Zend/tests/019.phpt
@@ -16,7 +16,7 @@ echo "*** Testing unset(), empty() & isset() with scalar variables ***\n";
 
 // testing scalar variables
 $scalar_variables = array(
-  0,    
+  0,
   1,
   +1
   -1,
@@ -52,23 +52,23 @@ foreach ($scalar_variables as $scalar_var) {
   echo "-- Iteration $loop_counter --\n"; $loop_counter++;
 
   // checking with isset before unsetting, expected: bool(true)
-  var_dump( isset($scalar_var) ); 
-  var_dump( isset($scalar_var, $set_var) );  
+  var_dump( isset($scalar_var) );
+  var_dump( isset($scalar_var, $set_var) );
   // checking if the var is empty, expected: bool(false) on most
   // except "", 0, "0", NULL, FALSE
-  var_dump( empty($scalar_var) );  
-  
+  var_dump( empty($scalar_var) );
+
   // destroy the variable using unset
-  unset( $scalar_var );   
-  // dump and see if its destroyed, expcted: NULL 
-  var_dump( $scalar_var ); 
+  unset( $scalar_var );
+  // dump and see if its destroyed, expcted: NULL
+  var_dump( $scalar_var );
 
   // check using isset to see if unset, expected: bool(false)
-  var_dump( isset($scalar_var) ); 
-  var_dump( isset($scalar_var, $set_var) ); 
+  var_dump( isset($scalar_var) );
+  var_dump( isset($scalar_var, $set_var) );
 
   // empty to check if empty, expecting bool(true)
-  var_dump( empty($scalar_var) ); 
+  var_dump( empty($scalar_var) );
 
   // isset() with two args, one arg only unset, expected: bool(false)
   var_dump( isset($scalar_var, $set_var) );
@@ -90,36 +90,36 @@ $array_variables = array(
   array(1 => "One", 2 => "two"),
   array("Name" => "Jack", "Age" => "30"),
   array(1,2, "One" => "1", 2 => "two", ""=>"empty", "" => '')
-);  
+);
 
 $outer_loop_counter = 1;
 foreach ($array_variables as $array_var) {
   echo "--- Outerloop Iteration $outer_loop_counter ---\n";
-  
+
   // check the isset and unset on non existing key
   $var = 1;  // a var which is defined
   // try to unset the element which is non-existent
-  unset($array_var['non_existent']); 
+  unset($array_var['non_existent']);
   // check using isset() & empty() on a non_existent element in the array
   var_dump( isset($array_var['non_existent']) );
   var_dump( isset($array_var['non_existent'], $var) );
   var_dump( isset($array_var['non_existent'], $array_var['none']) );
   var_dump( empty($array_var['non_existent']) );
 
-  // testing empty and isset on arrays 
+  // testing empty and isset on arrays
   var_dump( empty($array_var) ); // expecting bool(false), except: array(), which is considered empty
   var_dump( isset($array_var) ); // expecting bool(true), except: array(), which is not set
 
-  // get the keys of the $array_var 
+  // get the keys of the $array_var
   $keys = array_keys($array_var);
   // unset each element in the array and see the working of unset, isset & empty
   $inner_loop_counter = 1;
   foreach ($keys as $key_value) {
-    echo "-- Innerloop Iteration $inner_loop_counter of Outerloop Iteration $outer_loop_counter --\n"; 
+    echo "-- Innerloop Iteration $inner_loop_counter of Outerloop Iteration $outer_loop_counter --\n";
     $inner_loop_counter++;
 
     // unset the element
-    unset($array_var[$key_value]); 
+    unset($array_var[$key_value]);
     // dump the array after element was unset
     var_dump($array_var);
     // check using isset for the element that was unset
@@ -127,10 +127,10 @@ foreach ($array_variables as $array_var) {
     // calling isset with more args
     var_dump( isset($array_var[$key_val], $array_var) ); //expected: bool(false)
 
-    // calling empty, expected bool(true) 
+    // calling empty, expected bool(true)
     var_dump( empty($array_var[$key_val]) );
 
-    // dump the array to see that that array did not get modified 
+    // dump the array to see that that array did not get modified
     // because of using isset, empty and unset on its element
     var_dump($array_var);
   }
@@ -144,7 +144,7 @@ foreach ($array_variables as $array_var) {
   // use isset to see that array is not set
   var_dump( isset($array_var) ); //expected: bool(false)
   var_dump( isset($array_var, $array_var[$key_val]) ); // expected: bool(false)
-  
+
   // empty() to see if the array is empty
   var_dump( empty($array_var) ); // expected: bool(true)
 }
@@ -183,12 +183,12 @@ foreach ($resources as $resource) {
   unset($temp_var);
   // now the isset() with both the args as unset
   var_dump( isset($resource, $temp_var) ); // expected: bool(false);
-  
-  // dump the resource to see if there any effect on it 
+
+  // dump the resource to see if there any effect on it
   var_dump($resource);
 }
 // unset and dump the array containing all the resources to see that
-// unset works correctly 
+// unset works correctly
 unset($resources);
 var_dump($resources);
 var_dump( isset($resources) );  //expected: bool(false)
@@ -200,12 +200,12 @@ class Point
   var $x;
   var $y;
   var $lable;
-  
+
   function __construct($x, $y) {
     $this->x = $x;
     $this->y = $y;
   }
-  
+
   function setLable($lable) {
     $this->lable = $lable;
   }
@@ -215,8 +215,8 @@ class Point
 }
 $point1 = new Point(30,40);
 
-// use unset/empty/isset to check the object 
-var_dump($point1); // dump the object 
+// use unset/empty/isset to check the object
+var_dump($point1); // dump the object
 
 // check the object and member that is not set
 var_dump( isset($point1) );  // expected: bool(true)
@@ -229,7 +229,7 @@ $point1->setLable("Point1");
 var_dump( isset($point1->$lable) );  //expected: bool(true)
 var_dump( empty($point1->$lable) );  //expected: bool(false)
 
-// dump the object to see that obj was not harmed 
+// dump the object to see that obj was not harmed
 // because of the usage of the isset & empty
 var_dump($point1);
 
@@ -270,36 +270,36 @@ var_dump($point2);
 
 /* testing variation in operation for isset(), empty() & unset().
 Note: Most of the variation for function unset() is testing by a
-      set of testcases named "Zend/tests/unset_cv??.phpt", only 
+      set of testcases named "Zend/tests/unset_cv??.phpt", only
       variation not tested are attempted here */
 
 echo "\n*** Testing possible variation in operation for isset(), empty() & unset() ***\n";
-/* unset() variation1: checking unset on static variable inside a function. 
+/* unset() variation1: checking unset on static variable inside a function.
  * unset() destroys the variable only in the context of the rest of a function
  * Following calls will restore the previous value of a variable.
  */
 echo "\n** Testing unset() variation 1: unset on static variable inside a function **\n";
 function test_unset1() {
   static $static_var;
-  
+
   // increment the value of the static. this change is in function context
   $static_var ++;
- 
-  echo "value of static_var before unset: $static_var\n"; 
-  // check using isset and empty 
+
+  echo "value of static_var before unset: $static_var\n";
+  // check using isset and empty
   var_dump( isset($static_var) );
   var_dump( empty($static_var) );
-  
+
   // unset the static var
   unset($static_var);
-  echo "value of static_var after unset: $static_var\n"; 
-  // check using isset and empty 
+  echo "value of static_var after unset: $static_var\n";
+  // check using isset and empty
   var_dump( isset($static_var) );
   var_dump( empty($static_var) );
 
   // assign a value to static var
   $static_var = 20;
-  echo "value of static_var after new assignment: $static_var\n"; 
+  echo "value of static_var after new assignment: $static_var\n";
 }
 // call the functiont
 test_unset1();
@@ -308,10 +308,10 @@ test_unset1();
 
 
 echo "\n** Testing unset() variation 2: unset on a variable passed by ref. inside of a function **\n";
-/* unset() variation2: Pass by reference  
- * If a variable that is PASSED BY REFERENCE is unset() inside of a function, 
+/* unset() variation2: Pass by reference
+ * If a variable that is PASSED BY REFERENCE is unset() inside of a function,
  * only the local variable is destroyed. The variable in the calling environment
- * will retain the same value as before unset()  was called. 
+ * will retain the same value as before unset()  was called.
  */
 function test_unset2( &$ref_val ) {
   // unset the variable passed
@@ -329,7 +329,7 @@ var_dump($value);
 test_unset2($value);
 var_dump($value);
 
- 
+
 echo "\n** Testing unset() variation 3: unset on a global variable inside of a function **\n";
 /* unset() variation2: unset on a global variable inside a function
  * If a globalized variable is unset() inside of a function, only the
@@ -340,17 +340,17 @@ $global_var = 10;
 
 function test_unset3() {
   global $global_var;
-   
-  // check the $global_var using isset and empty 
-  var_dump( isset($global_var) ); 
-  var_dump( empty($global_var) ); 
- 
+
+  // check the $global_var using isset and empty
+  var_dump( isset($global_var) );
+  var_dump( empty($global_var) );
+
   // unset the global var
   unset($global_var);
- 
-  // check the $global_var using isset and empty 
-  var_dump( isset($global_var) ); 
-  var_dump( empty($global_var) ); 
+
+  // check the $global_var using isset and empty
+  var_dump( isset($global_var) );
+  var_dump( empty($global_var) );
 }
 
 var_dump($global_var);
diff --git a/Zend/tests/020.phpt b/Zend/tests/020.phpt
index 73a3a17e8ae..1e2bcff387f 100644
--- a/Zend/tests/020.phpt
+++ b/Zend/tests/020.phpt
@@ -19,7 +19,7 @@ foo(1,2);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: func_get_arg() expects exactly 1 parameter, 3 given in %s on line %d
 NULL
 
diff --git a/Zend/tests/030.phpt b/Zend/tests/030.phpt
index 2318420319a..6f3bda27d76 100644
--- a/Zend/tests/030.phpt
+++ b/Zend/tests/030.phpt
@@ -7,7 +7,7 @@ class foo {
 	public $test = 0;
 	private $test_2 = 1;
 	protected $test_3 = 2;
-	
+
 	public function bar() {
 		try {
 			throw new Exception('foo');
@@ -15,13 +15,13 @@ class foo {
 			var_dump($this);
 		}
 
-		$this->baz();		
+		$this->baz();
 	}
-	
+
 	public function baz() {
 		foreach ($this as $k => $v) {
 			printf("'%s' => '%s'\n", $k, $v);
-		}		
+		}
 		print "ok\n";
 	}
 }
diff --git a/Zend/tests/031.phpt b/Zend/tests/031.phpt
index 8db52a5debb..116a0e8f2c5 100644
--- a/Zend/tests/031.phpt
+++ b/Zend/tests/031.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing array with '[]' passed as argument by value
 --FILE--
-<?php 
+<?php
 
 function test($var) { }
 test($arr[]);
diff --git a/Zend/tests/032.phpt b/Zend/tests/032.phpt
index 8f7f9946473..1c7f59e937f 100644
--- a/Zend/tests/032.phpt
+++ b/Zend/tests/032.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing array with '[]' passed as argument by reference
 --FILE--
-<?php 
+<?php
 
 function test(&$var) { }
 test($arr[]);
diff --git a/Zend/tests/033.phpt b/Zend/tests/033.phpt
index 5ff00890582..b506f9172e3 100644
--- a/Zend/tests/033.phpt
+++ b/Zend/tests/033.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Using undefined multidimensional array
 --FILE--
-<?php 
+<?php
 
 $arr[1][2][3][4][5];
 
diff --git a/Zend/tests/034.phpt b/Zend/tests/034.phpt
index 0bcfa23f19f..132fbf78f51 100644
--- a/Zend/tests/034.phpt
+++ b/Zend/tests/034.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing multiples 'default:' in switch
 --FILE--
-<?php 
+<?php
 
 switch (1) {
 	case 2:
diff --git a/Zend/tests/ErrorException_getSeverity.phpt b/Zend/tests/ErrorException_getSeverity.phpt
index 6ad8af109d0..873ea68f6fe 100644
--- a/Zend/tests/ErrorException_getSeverity.phpt
+++ b/Zend/tests/ErrorException_getSeverity.phpt
@@ -649,7 +649,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -665,7 +665,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -681,7 +681,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 
@@ -698,7 +698,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -714,7 +714,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -730,7 +730,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -746,7 +746,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -762,7 +762,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -778,7 +778,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -794,7 +794,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -810,7 +810,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -826,7 +826,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -842,7 +842,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 try {
@@ -858,7 +858,7 @@ try {
         var_dump($e->getPrevious() === NULL);
         var_dump($e->getFile() === __FILE__);
         var_dump($e->getTraceAsString() === EXCEPTION_TRACE_AS_STRING_MSG);
-    }    
+    }
 }
 
 ?>
diff --git a/Zend/tests/abstract_inheritance_001.phpt b/Zend/tests/abstract_inheritance_001.phpt
index 9e061e65d5a..2bef85f8b3b 100644
--- a/Zend/tests/abstract_inheritance_001.phpt
+++ b/Zend/tests/abstract_inheritance_001.phpt
@@ -8,5 +8,5 @@ abstract class B extends A { abstract function bar($x); }
 
 echo "DONE";
 ?>
---EXPECT--	
+--EXPECT--
 DONE
diff --git a/Zend/tests/abstract_inheritance_002.phpt b/Zend/tests/abstract_inheritance_002.phpt
index 78f53c85c8b..916dbb3e325 100644
--- a/Zend/tests/abstract_inheritance_002.phpt
+++ b/Zend/tests/abstract_inheritance_002.phpt
@@ -8,5 +8,5 @@ abstract class B extends A { abstract function bar($x, $y = 0); }
 
 echo "DONE";
 ?>
---EXPECT--	
+--EXPECT--
 DONE
diff --git a/Zend/tests/abstract_inheritance_003.phpt b/Zend/tests/abstract_inheritance_003.phpt
index 24d5920cc15..6af55b7d867 100644
--- a/Zend/tests/abstract_inheritance_003.phpt
+++ b/Zend/tests/abstract_inheritance_003.phpt
@@ -8,5 +8,5 @@ abstract class B extends A { abstract function bar($x); }
 
 echo "DONE";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Declaration of B::bar($x) must be compatible with A::bar($x, $y = 0) in %s
diff --git a/Zend/tests/access_modifiers_001.phpt b/Zend/tests/access_modifiers_001.phpt
index 989b926be3d..f89d55bd938 100644
--- a/Zend/tests/access_modifiers_001.phpt
+++ b/Zend/tests/access_modifiers_001.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple access type modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/access_modifiers_002.phpt b/Zend/tests/access_modifiers_002.phpt
index cc5df306f10..f0b15e43dc8 100644
--- a/Zend/tests/access_modifiers_002.phpt
+++ b/Zend/tests/access_modifiers_002.phpt
@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple access type modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/access_modifiers_003.phpt b/Zend/tests/access_modifiers_003.phpt
index 2b3a88242f7..7f5d922f3bd 100644
--- a/Zend/tests/access_modifiers_003.phpt
+++ b/Zend/tests/access_modifiers_003.phpt
@@ -9,5 +9,5 @@ final final class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple final modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/access_modifiers_004.phpt b/Zend/tests/access_modifiers_004.phpt
index c023d2cb6d4..2be203a9179 100644
--- a/Zend/tests/access_modifiers_004.phpt
+++ b/Zend/tests/access_modifiers_004.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple abstract modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/access_modifiers_005.phpt b/Zend/tests/access_modifiers_005.phpt
index b32394d7f6b..7780cf4ca69 100644
--- a/Zend/tests/access_modifiers_005.phpt
+++ b/Zend/tests/access_modifiers_005.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple final modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/access_modifiers_006.phpt b/Zend/tests/access_modifiers_006.phpt
index 293fc1c64c2..aefe27c68a2 100644
--- a/Zend/tests/access_modifiers_006.phpt
+++ b/Zend/tests/access_modifiers_006.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple static modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/access_modifiers_007.phpt b/Zend/tests/access_modifiers_007.phpt
index 26779e6e688..4860c52c29d 100644
--- a/Zend/tests/access_modifiers_007.phpt
+++ b/Zend/tests/access_modifiers_007.phpt
@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use the final modifier on an abstract class member in %s on line %d
diff --git a/Zend/tests/access_modifiers_010.phpt b/Zend/tests/access_modifiers_010.phpt
index 342ef522af8..dd2e3e36b9e 100644
--- a/Zend/tests/access_modifiers_010.phpt
+++ b/Zend/tests/access_modifiers_010.phpt
@@ -21,7 +21,7 @@ abstract class b extends a {
 class c extends b {
 	public function __construct() {
 		$this->test();
-	}	
+	}
 }
 
 new c;
diff --git a/Zend/tests/access_modifiers_011.phpt b/Zend/tests/access_modifiers_011.phpt
index 4ed154f6f65..634aa504149 100644
--- a/Zend/tests/access_modifiers_011.phpt
+++ b/Zend/tests/access_modifiers_011.phpt
@@ -32,7 +32,7 @@ echo $a->func1(),"\n";
 echo $a->func2(),"\n";
 
 ?>
---EXPECTF--	
+--EXPECTF--
 var1 value
 var2 value
 in func1
diff --git a/Zend/tests/add_001.phpt b/Zend/tests/add_001.phpt
index 8d12aea11d2..5286bc5b3c6 100644
--- a/Zend/tests/add_001.phpt
+++ b/Zend/tests/add_001.phpt
@@ -29,7 +29,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {
   [0]=>
   int(1)
diff --git a/Zend/tests/add_002.phpt b/Zend/tests/add_002.phpt
index 4d804fe3e8d..ec3843fae08 100644
--- a/Zend/tests/add_002.phpt
+++ b/Zend/tests/add_002.phpt
@@ -19,7 +19,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Object of class stdClass could not be converted to int in %sadd_002.php on line %d
 
 Exception: Unsupported operand types
diff --git a/Zend/tests/add_003.phpt b/Zend/tests/add_003.phpt
index a3705479e25..5f3c328c013 100644
--- a/Zend/tests/add_003.phpt
+++ b/Zend/tests/add_003.phpt
@@ -1,5 +1,5 @@
 --TEST--
-adding arrays to objects 
+adding arrays to objects
 --FILE--
 <?php
 
@@ -19,7 +19,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Object of class stdClass could not be converted to int in %sadd_003.php on line %d
 
 Exception: Unsupported operand types
diff --git a/Zend/tests/add_004.phpt b/Zend/tests/add_004.phpt
index 026d2494dc9..a46f70b818f 100644
--- a/Zend/tests/add_004.phpt
+++ b/Zend/tests/add_004.phpt
@@ -16,7 +16,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Exception: Unsupported operand types
 
 Fatal error: Uncaught Error: Unsupported operand types in %s:%d
diff --git a/Zend/tests/add_005.phpt b/Zend/tests/add_005.phpt
index 7e9bc25d8f3..af84c01da9e 100644
--- a/Zend/tests/add_005.phpt
+++ b/Zend/tests/add_005.phpt
@@ -16,7 +16,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 float(2834756759.1231)
 float(2834756759.1231)
 Done
diff --git a/Zend/tests/add_006.phpt b/Zend/tests/add_006.phpt
index fe1c0830e25..c1124e026cb 100644
--- a/Zend/tests/add_006.phpt
+++ b/Zend/tests/add_006.phpt
@@ -37,7 +37,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 
 Warning: A non-numeric value encountered in %s on line %d
 int(75636)
diff --git a/Zend/tests/add_007.phpt b/Zend/tests/add_007.phpt
index 089b24ae0b5..6d9af8a9f52 100644
--- a/Zend/tests/add_007.phpt
+++ b/Zend/tests/add_007.phpt
@@ -1,5 +1,5 @@
 --TEST--
-adding strings to arrays 
+adding strings to arrays
 --FILE--
 <?php
 
@@ -18,7 +18,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 
 Warning: A non-numeric value encountered in %s on line %d
 
diff --git a/Zend/tests/and_001.phpt b/Zend/tests/and_001.phpt
index 109b2ce9952..0ebbc25fecf 100644
--- a/Zend/tests/and_001.phpt
+++ b/Zend/tests/and_001.phpt
@@ -30,7 +30,7 @@ var_dump($s);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(3) "020"
 string(4) "pead"
 string(4) "pead"
diff --git a/Zend/tests/anonymous_func_001.phpt b/Zend/tests/anonymous_func_001.phpt
index 8e4bc42a0b8..97b91b6544a 100644
--- a/Zend/tests/anonymous_func_001.phpt
+++ b/Zend/tests/anonymous_func_001.phpt
@@ -1,12 +1,12 @@
 --TEST--
 Testing calls to anonymous function
 --FILE--
-<?php 
+<?php
 
 for ($i = 0; $i < 10; $i++) {
 	$a = create_function('', 'return '. $i .';');
 	var_dump($a());
-	
+
 	$b = "\0lambda_". ($i + 1);
 	var_dump($b());
 }
diff --git a/Zend/tests/anonymous_func_002.phpt b/Zend/tests/anonymous_func_002.phpt
index 1b9375c89f7..28adc357dab 100644
--- a/Zend/tests/anonymous_func_002.phpt
+++ b/Zend/tests/anonymous_func_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing anonymous function return as array key and accessing $GLOBALS
 --FILE--
-<?php 
+<?php
 
 $test = create_function('$v', 'return $v;');
 
diff --git a/Zend/tests/anonymous_func_003.phpt b/Zend/tests/anonymous_func_003.phpt
index f06a463727a..d2610310f7c 100644
--- a/Zend/tests/anonymous_func_003.phpt
+++ b/Zend/tests/anonymous_func_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Using throw $var with anonymous function return
 --FILE--
-<?php 
+<?php
 
 try {
 	$a = create_function('', 'return new Exception("test");');
diff --git a/Zend/tests/argument_restriction_001.phpt b/Zend/tests/argument_restriction_001.phpt
index be4c734b59c..9c21dc2ccea 100644
--- a/Zend/tests/argument_restriction_001.phpt
+++ b/Zend/tests/argument_restriction_001.phpt
@@ -4,12 +4,12 @@ Bug #55719 (Argument restriction should come with a more specific error message)
 <?php
 Class Base {
 	public function &test($foo, array $bar, $option = NULL, $extra = "lllllllllllllllllllllllllllllllllllllllllllllllllll") {
-	}	
+	}
 }
 
 class Sub extends Base {
 	public function &test() {
-	}	
+	}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/argument_restriction_002.phpt b/Zend/tests/argument_restriction_002.phpt
index cbb3ec97d0b..4deb2d206b1 100644
--- a/Zend/tests/argument_restriction_002.phpt
+++ b/Zend/tests/argument_restriction_002.phpt
@@ -4,12 +4,12 @@ Bug #55719 (Argument restriction should come with a more specific error message)
 <?php
 Abstract Class Base {
 	public function test($foo, array &$bar, $option = NULL, $extra = 3.141592653589793238462643383279502884197169399375105  ) {
-	}	
+	}
 }
 
 class Sub extends Base {
 	public function test($foo, array &$bar) {
-	}	
+	}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/argument_restriction_003.phpt b/Zend/tests/argument_restriction_003.phpt
index 6979810e37c..c24e0ba852b 100644
--- a/Zend/tests/argument_restriction_003.phpt
+++ b/Zend/tests/argument_restriction_003.phpt
@@ -7,12 +7,12 @@ class Foo {
 
 Abstract Class Base {
 	public function test(Foo $foo, array $bar, $option = NULL, $extra = "lllllllllllllllllllllllllllllllllllllllllllllllllll") {
-	}	
+	}
 }
 
 class Sub extends Base {
 	public function test() {
-	}	
+	}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/argument_restriction_004.phpt b/Zend/tests/argument_restriction_004.phpt
index 599b3e1604f..fab5227764c 100644
--- a/Zend/tests/argument_restriction_004.phpt
+++ b/Zend/tests/argument_restriction_004.phpt
@@ -11,7 +11,7 @@ Abstract Class Base {
 
 class Sub extends Base {
 	public function test(Foo $foo, array $bar, $option = NULL, $extra = 0xffffff ) {
-	}	
+	}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/argument_restriction_005.phpt b/Zend/tests/argument_restriction_005.phpt
index 2826fe6a81f..712ccc878a8 100644
--- a/Zend/tests/argument_restriction_005.phpt
+++ b/Zend/tests/argument_restriction_005.phpt
@@ -4,7 +4,7 @@ Bug #55719 (Argument restriction should come with a more specific error message)
 <?php
 class Sub implements ArrayAccess {
 	public function offsetSet() {
-	}	
+	}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/argument_restriction_006.phpt b/Zend/tests/argument_restriction_006.phpt
index dd744d5ea90..2df0e1e90d8 100644
--- a/Zend/tests/argument_restriction_006.phpt
+++ b/Zend/tests/argument_restriction_006.phpt
@@ -4,12 +4,12 @@ Bug #60174 (Notice when array in method prototype error)
 <?php
 Abstract Class Base {
 	public function test($foo, $extra = array("test")) {
-	}	
+	}
 }
 
 class Sub extends Base {
 	public function test($foo, $extra) {
-	}	
+	}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/array_offset.phpt b/Zend/tests/array_offset.phpt
index 76c25f92987..0879f809181 100644
--- a/Zend/tests/array_offset.phpt
+++ b/Zend/tests/array_offset.phpt
@@ -10,7 +10,7 @@ Ensure "undefined offset" notice formats message corectly when undefined key is
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Undefined offset: -1 in %s on line 3
 
 Notice: Undefined offset: -1 in %s on line 4
diff --git a/Zend/tests/assign_to_obj_001.phpt b/Zend/tests/assign_to_obj_001.phpt
index 4b3cd31b929..3dccc1cd606 100644
--- a/Zend/tests/assign_to_obj_001.phpt
+++ b/Zend/tests/assign_to_obj_001.phpt
@@ -20,5 +20,5 @@ $a->test();
 $a->test();
 echo "okey";
 ?>
---EXPECT--	
+--EXPECT--
 okey
diff --git a/Zend/tests/assign_to_var_001.phpt b/Zend/tests/assign_to_var_001.phpt
index d37ebbcbd89..d4a2e549f46 100644
--- a/Zend/tests/assign_to_var_001.phpt
+++ b/Zend/tests/assign_to_var_001.phpt
@@ -12,7 +12,7 @@ var_dump($var1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(2)
 int(2)
 Done
diff --git a/Zend/tests/assign_to_var_002.phpt b/Zend/tests/assign_to_var_002.phpt
index e682765e538..6926da83cc8 100644
--- a/Zend/tests/assign_to_var_002.phpt
+++ b/Zend/tests/assign_to_var_002.phpt
@@ -12,7 +12,7 @@ var_dump($var1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(1) "g"
 string(1) "g"
 Done
diff --git a/Zend/tests/assign_to_var_003.phpt b/Zend/tests/assign_to_var_003.phpt
index 911ee0bb8e6..a0d8acbf29b 100644
--- a/Zend/tests/assign_to_var_003.phpt
+++ b/Zend/tests/assign_to_var_003.phpt
@@ -12,7 +12,7 @@ var_dump($var1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 NULL
 NULL
 Done
diff --git a/Zend/tests/assign_to_var_004.phpt b/Zend/tests/assign_to_var_004.phpt
index 787362acc4d..36258bc1552 100644
--- a/Zend/tests/assign_to_var_004.phpt
+++ b/Zend/tests/assign_to_var_004.phpt
@@ -15,7 +15,7 @@ var_dump($var2);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(5) "space"
 string(5) "space"
 string(5) "space"
diff --git a/Zend/tests/bug18556.phpt b/Zend/tests/bug18556.phpt
index f8e48c2772e..da083937c5d 100644
--- a/Zend/tests/bug18556.phpt
+++ b/Zend/tests/bug18556.phpt
@@ -3,7 +3,7 @@ Bug #18556 (Setting locale to 'tr_TR' lowercases class names)
 --FILE--
 <?php
 $g_lang = 'tr_TR';
-putenv("LANG=$g_lang"); 
+putenv("LANG=$g_lang");
 setlocale(LC_ALL, $g_lang);
 
 class InfoBlob {
diff --git a/Zend/tests/bug21478.phpt b/Zend/tests/bug21478.phpt
index 6e07a378c29..3e868ccaf94 100644
--- a/Zend/tests/bug21478.phpt
+++ b/Zend/tests/bug21478.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Bug #21478 (Zend/zend_alloc.c :: shutdown_memory_manager produces segfault) 
+Bug #21478 (Zend/zend_alloc.c :: shutdown_memory_manager produces segfault)
 --SKIPIF--
-<?php 
+<?php
 	if (!function_exists('stream_filter_register')) die('skip stream_filter_register() not available');
 ?>
 --FILE--
@@ -27,7 +27,7 @@ fwrite($fp, "This is a test.\n");
 print "Done.\n";
 fclose($fp);
 // Uncommenting the following 'print' line causes the segfault to stop occurring
-// print "2\n";  
+// print "2\n";
 readfile(dirname(__FILE__)."/test.txt");
 unlink(dirname(__FILE__)."/test.txt");
 ?>
diff --git a/Zend/tests/bug21888.phpt b/Zend/tests/bug21888.phpt
index b32bd356073..b79db58e147 100644
--- a/Zend/tests/bug21888.phpt
+++ b/Zend/tests/bug21888.phpt
@@ -8,19 +8,19 @@ class mom {
 
   protected function prot() {
     print "protected method\n";
-  } 
+  }
 }
 
 class child extends mom {
-  
+
   public function callMom() {
     $this->prot();
   }
-  
+
   public function viewMom() {
     print $this->prot;
   }
-  
+
 }
 
 $c = new child();
diff --git a/Zend/tests/bug24635.phpt b/Zend/tests/bug24635.phpt
index 758a803a06b..7235859d3ad 100644
--- a/Zend/tests/bug24635.phpt
+++ b/Zend/tests/bug24635.phpt
@@ -15,12 +15,12 @@ class SectionClass {
 		$this->Comment = $comment;
  	}
 	function __destruct() {
-		out($this->Comment); // this line doesn't crash PHP 
+		out($this->Comment); // this line doesn't crash PHP
  		out("\n<!-- End Section: " . $this->Comment . "-->"); // this line
  	}
 }
 function out($code) { return; }
-$site = new SiteClass(); 
+$site = new SiteClass();
 $site->page->Display();
 echo "OK\n";
 ?>
diff --git a/Zend/tests/bug26229.phpt b/Zend/tests/bug26229.phpt
index 347eb555715..5d99a152b9e 100644
--- a/Zend/tests/bug26229.phpt
+++ b/Zend/tests/bug26229.phpt
@@ -5,7 +5,7 @@ Bug #26229 (getIterator() segfaults when it returns arrays or scalars)
 
 class array_iterator implements IteratorAggregate {
         public function getIterator() {
-                return array('foo', 'bar');     
+                return array('foo', 'bar');
         }
 }
 
diff --git a/Zend/tests/bug26802.phpt b/Zend/tests/bug26802.phpt
index ab0ad25aa5c..0ab4760d488 100644
--- a/Zend/tests/bug26802.phpt
+++ b/Zend/tests/bug26802.phpt
@@ -14,15 +14,15 @@ $function();
 class foo
 {
 	static $method = 'global_func';
-	
+
 	static public function foo_func()
 	{
 		echo __METHOD__ . "\n";
 	}
 }
 
-/* The following is a BC break with PHP 4 where it would 
- * call foo::fail. In PHP 5 we first evaluate static class 
+/* The following is a BC break with PHP 4 where it would
+ * call foo::fail. In PHP 5 we first evaluate static class
  * properties and then do the function call.
  */
 $method = 'foo_func';
diff --git a/Zend/tests/bug27304.phpt b/Zend/tests/bug27304.phpt
index 0f248346cf8..9eb1ececf7f 100644
--- a/Zend/tests/bug27304.phpt
+++ b/Zend/tests/bug27304.phpt
@@ -14,7 +14,7 @@ class Staticexample
 $b = new Staticexample();
 Staticexample::test();
 $b->test();
-        
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/Zend/tests/bug27798.phpt b/Zend/tests/bug27798.phpt
index 9e54efa8331..2545d9e1003 100644
--- a/Zend/tests/bug27798.phpt
+++ b/Zend/tests/bug27798.phpt
@@ -8,7 +8,7 @@ class Base
 	public    $Foo = 1;
 	protected $Bar = 2;
 	private   $Baz = 3;
-	
+
 	function __construct()
 	{
 		echo __METHOD__ . "\n";
diff --git a/Zend/tests/bug28072.phpt b/Zend/tests/bug28072.phpt
index 76208733f81..3acd156320f 100644
--- a/Zend/tests/bug28072.phpt
+++ b/Zend/tests/bug28072.phpt
@@ -4,8 +4,8 @@ Bug #28072 (static array with some constant keys will be incorrectly ordered)
 <?php
 define("FIRST_KEY", "a");
 define("THIRD_KEY", "c");
-                                                                        
-                 
+
+
 function test()
 {
         static $arr = array(
@@ -16,7 +16,7 @@ function test()
         );
         print_r($arr);
 }
-                                                                        
+
 function test2()
 {
         static $arr = array(
@@ -27,7 +27,7 @@ function test2()
         );
         print_r($arr);
 }
-                 
+
 test();
 test2();
 ?>
diff --git a/Zend/tests/bug28377.phpt b/Zend/tests/bug28377.phpt
index 9d1b43472c1..78c865d7958 100644
--- a/Zend/tests/bug28377.phpt
+++ b/Zend/tests/bug28377.phpt
@@ -8,14 +8,14 @@ function doit($a, $b)
   custom_callback('dereferenced', $trace);
   custom_callback('direct', debug_backtrace());
 }
-  
+
 function custom_callback($traceName, $btInfo)
 {
   echo $traceName ." -- args: ";
   echo isset($btInfo[0]['args']) ? count($btInfo[0]['args']) : 'does not exist';
   echo "\n";
 }
-  
+
 doit('a','b');
 ?>
 --EXPECT--
diff --git a/Zend/tests/bug29104.phpt b/Zend/tests/bug29104.phpt
index 788b2190bf7..168f5341388 100644
--- a/Zend/tests/bug29104.phpt
+++ b/Zend/tests/bug29104.phpt
@@ -3,15 +3,15 @@ Bug #29104 (Function declaration in method doesn't work)
 --FILE--
 <?php
 class A
-{ 
-  function g() 
-  { 
+{
+  function g()
+  {
     echo "function g - begin\n";
-    
-    function f() 
-    { 
+
+    function f()
+    {
       echo "function f\n";
-    } 
+    }
 
     echo "function g - end\n";
   }
diff --git a/Zend/tests/bug29674.phpt b/Zend/tests/bug29674.phpt
index 39bc3024630..60f08a6df28 100644
--- a/Zend/tests/bug29674.phpt
+++ b/Zend/tests/bug29674.phpt
@@ -6,7 +6,7 @@ Bug #29674 (inherited method doesn't have access to private variables of the der
 class BaseClass
 {
 	private $private_base = "Base";
-	
+
 	function printVars ()
 	{
 		var_dump($this->private_base);
diff --git a/Zend/tests/bug30080.phpt b/Zend/tests/bug30080.phpt
index ff4a82b21ff..d1d6302e85f 100644
--- a/Zend/tests/bug30080.phpt
+++ b/Zend/tests/bug30080.phpt
@@ -2,13 +2,13 @@
 Bug #30080 (Passing array or non array of objects)
 --FILE--
 <?php
-class foo { 	
-  function __construct($arrayobj) { 
+class foo {
+  function __construct($arrayobj) {
     var_dump($arrayobj);
-  } 
-} 
+  }
+}
 
-new foo(array(new stdClass)); 
+new foo(array(new stdClass));
 ?>
 --EXPECTF--
 array(1) {
diff --git a/Zend/tests/bug30161.phpt b/Zend/tests/bug30161.phpt
index 22f8fb59e8b..b824cd56f50 100644
--- a/Zend/tests/bug30161.phpt
+++ b/Zend/tests/bug30161.phpt
@@ -18,7 +18,7 @@ class hariCow extends FIIFO {
                 } catch(Exception $e) {
                 }
         }
-        
+
         public function __toString() {
                 return "ok\n";
         }
diff --git a/Zend/tests/bug30162.phpt b/Zend/tests/bug30162.phpt
index a011292a13c..9cd3e9d5247 100644
--- a/Zend/tests/bug30162.phpt
+++ b/Zend/tests/bug30162.phpt
@@ -24,7 +24,7 @@ class hariCow extends FIIFO {
 		} catch(Exception $e) {
 		}
 	}
-	
+
 	public function __toString() {
 		return "Rusticus in asino sedet.";
 	}
diff --git a/Zend/tests/bug30346.phpt b/Zend/tests/bug30346.phpt
index 30f36fbde2f..8db080f820f 100644
--- a/Zend/tests/bug30346.phpt
+++ b/Zend/tests/bug30346.phpt
@@ -5,7 +5,7 @@ Bug #30346 (arrayAccess and using $this)
 
 class Test implements ArrayAccess
 {
-        public function __construct() { }       
+        public function __construct() { }
         public function offsetExists( $offset ) { return false; }
         public function offsetGet( $offset ) { return $offset; }
         public function offsetSet( $offset, $data ) { }
diff --git a/Zend/tests/bug30394.phpt b/Zend/tests/bug30394.phpt
index b69eda4fef7..516bea2d2d9 100644
--- a/Zend/tests/bug30394.phpt
+++ b/Zend/tests/bug30394.phpt
@@ -8,12 +8,12 @@ class Container
 	{
 		return $this->_p[ $what ];
 	}
-	
+
 	public function __set( $what, $value )
 	{
 		$this->_p[ $what ] = $value;
 	}
-	
+
 	private $_p = array();
 }
 
diff --git a/Zend/tests/bug30451.phpt b/Zend/tests/bug30451.phpt
index 210f087574f..5e9696f1283 100644
--- a/Zend/tests/bug30451.phpt
+++ b/Zend/tests/bug30451.phpt
@@ -6,7 +6,7 @@ Bug #30451 (static properties permissions broken)
 class A {
 
 	protected static $property = TRUE;
-	
+
 	protected static function method() {
 		return TRUE;
 	}
@@ -16,15 +16,15 @@ class A {
 class B extends A {
 
 	public function __construct() {
-		
+
 		var_dump(self::method());
 		var_dump(parent::method());
-		
+
 		var_dump(self::$property);
 		var_dump(parent::$property);
-	
+
 	}
-	
+
 }
 
 new B;
diff --git a/Zend/tests/bug30707.phpt b/Zend/tests/bug30707.phpt
index d37d32974ea..89db55c36ac 100644
--- a/Zend/tests/bug30707.phpt
+++ b/Zend/tests/bug30707.phpt
@@ -14,7 +14,7 @@ class C {
 		}
 	}
 
-	function plap($a) {	
+	function plap($a) {
 	}
 
 	function plop() {
diff --git a/Zend/tests/bug30725.phpt b/Zend/tests/bug30725.phpt
index ce6c9a50a26..75cb04843c6 100644
--- a/Zend/tests/bug30725.phpt
+++ b/Zend/tests/bug30725.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #30725 (PHP segfaults when an exception is thrown in getIterator() within foreach)
 --FILE--
-<?php 
+<?php
 
 class Test implements IteratorAggregate
 {
@@ -12,7 +12,7 @@ class Test implements IteratorAggregate
 }
 
 try
-{           
+{
 	$it = new Test;
 	foreach($it as $v)
 	{
diff --git a/Zend/tests/bug30998.phpt b/Zend/tests/bug30998.phpt
index 032da3d3bcc..2ff3068e5ca 100644
--- a/Zend/tests/bug30998.phpt
+++ b/Zend/tests/bug30998.phpt
@@ -3,14 +3,14 @@ Bug #30998 (Crash when user error handler returns false)
 --FILE--
 <?php
 error_reporting(-1);
-                           
+
 function my_error($errno, $errstr, $errfile, $errline)
 {
         print "$errstr ($errno) in $errfile:$errline\n";
         return false;
 }
 set_error_handler('my_error');
-                           
+
 $f = fopen("/tmp/blah", "r");
 ?>
 ===DONE===
diff --git a/Zend/tests/bug31177.phpt b/Zend/tests/bug31177.phpt
index 5e84573624e..c4434201185 100644
--- a/Zend/tests/bug31177.phpt
+++ b/Zend/tests/bug31177.phpt
@@ -7,7 +7,7 @@ class DbGow {
 	public function query() {
 		throw new Exception;
 	}
-	
+
 	public function select() {
 		return new DbGowRecordSet($this->query());
 	}
@@ -32,7 +32,7 @@ try {
 } catch(Exception $e) {
 	echo "ok\n";
 }
-	
+
 try {
 	$db->select2();
 } catch(Exception $e) {
diff --git a/Zend/tests/bug31683.phpt b/Zend/tests/bug31683.phpt
index 205aca0746e..26a048dad0f 100644
--- a/Zend/tests/bug31683.phpt
+++ b/Zend/tests/bug31683.phpt
@@ -6,42 +6,42 @@ Bug #31683 (changes to $name in __get($name) override future parameters)
 class Foo implements ArrayAccess {
 
   function __get($test) {
-    var_dump($test);         
+    var_dump($test);
     $test = 'bug';
   }
 
   function __set($test, $val) {
-    var_dump($test);         
+    var_dump($test);
     var_dump($val);
     $test = 'bug';
     $val = 'bug';
   }
 
   function __call($test, $arg) {
-    var_dump($test);         
+    var_dump($test);
     $test = 'bug';
   }
 
   function offsetget($test) {
-    var_dump($test);         
+    var_dump($test);
     $test = 'bug';
     return 123;
   }
 
   function offsetset($test, $val) {
-    var_dump($test);         
-    var_dump($val);         
+    var_dump($test);
+    var_dump($val);
     $test = 'bug';
     $val  = 'bug';
   }
 
   function offsetexists($test) {
-    var_dump($test);         
+    var_dump($test);
     $test = 'bug';
   }
 
   function offsetunset($test) {
-    var_dump($test);         
+    var_dump($test);
     $test = 'bug';
   }
 
diff --git a/Zend/tests/bug32322.phpt b/Zend/tests/bug32322.phpt
index 9f05e3f41f4..6d444ac2b3b 100644
--- a/Zend/tests/bug32322.phpt
+++ b/Zend/tests/bug32322.phpt
@@ -8,8 +8,8 @@ class test
 {
     private static $instance = null;
     private $myname = '';
-    
-    private function __construct( $value = '' ) 
+
+    private function __construct( $value = '' )
     {
         echo "New class $value created \n";
         $this -> myname = $value;
@@ -38,7 +38,7 @@ class test
         }
         return $instance2;
     }
-    public function __destruct() 
+    public function __destruct()
     {
         if ( defined('SCRIPT_END') )
         {
@@ -47,7 +47,7 @@ class test
             echo "Class " . $this -> myname . " destroyed beforce script end\n";
         }
     }
-}    
+}
 echo "Try static instance inside class :\n";
 $getCopyofSingleton    = test::getInstance();
 $getCopyofSingleton    = null;
diff --git a/Zend/tests/bug32428.phpt b/Zend/tests/bug32428.phpt
index e75148fec15..7c1b298e068 100644
--- a/Zend/tests/bug32428.phpt
+++ b/Zend/tests/bug32428.phpt
@@ -1,12 +1,12 @@
 --TEST--
 Bug #32428 (The @ warning error suppression operator is broken)
 --FILE--
-<?php 
-  $data = @$not_exists; 
-  $data = @($not_exists); 
-  $data = @!$not_exists; 
-  $data = !@$not_exists; 
-  $data = @($not_exists+1); 
+<?php
+  $data = @$not_exists;
+  $data = @($not_exists);
+  $data = @!$not_exists;
+  $data = !@$not_exists;
+  $data = @($not_exists+1);
   echo "ok\n";
 ?>
 --EXPECT--
diff --git a/Zend/tests/bug32596.phpt b/Zend/tests/bug32596.phpt
index 2dd0cfe9f00..287495d1506 100644
--- a/Zend/tests/bug32596.phpt
+++ b/Zend/tests/bug32596.phpt
@@ -4,7 +4,7 @@ Bug #32596 (Segfault/Memory Leak by getClass (etc) in __destruct)
 <?php
 class BUG {
   public $error = "please fix this thing, it wasted a nice part of my life!\n";
-  static function instance() {return new BUG();}  
+  static function instance() {return new BUG();}
 
   function __destruct()
   {
diff --git a/Zend/tests/bug32674.phpt b/Zend/tests/bug32674.phpt
index 771270f93b0..275a33562a9 100644
--- a/Zend/tests/bug32674.phpt
+++ b/Zend/tests/bug32674.phpt
@@ -52,7 +52,7 @@ try {
   	//irrelevant
 	}
 	echo 'shouldn`t get here';
-	//$dummy = 'this will not crash'; 
+	//$dummy = 'this will not crash';
 	$obj->dummy = 'this will crash';
 } catch (Exception $e) {
 	echo "ok\n";
diff --git a/Zend/tests/bug32833.phpt b/Zend/tests/bug32833.phpt
index e58c8453d97..08ef1462e18 100644
--- a/Zend/tests/bug32833.phpt
+++ b/Zend/tests/bug32833.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #32833 (Invalid opcode with $a[] .= '')
 --FILE--
-<?php 
+<?php
 $test = array();
 $test[] .= "ok\n";
 echo $test[0];
diff --git a/Zend/tests/bug33171.phpt b/Zend/tests/bug33171.phpt
index 27f5264bada..a342e10439e 100644
--- a/Zend/tests/bug33171.phpt
+++ b/Zend/tests/bug33171.phpt
@@ -10,7 +10,7 @@ class A
 class B extends A
 {
 	private $c = "B's c";
-		
+
 	public function go()
 	{
 		foreach ($this as $key => $val)
diff --git a/Zend/tests/bug33277.phpt b/Zend/tests/bug33277.phpt
index 859c4496333..5a84d365dc7 100644
--- a/Zend/tests/bug33277.phpt
+++ b/Zend/tests/bug33277.phpt
@@ -7,20 +7,20 @@ class foo {
                 echo "private!\n";
         }
 }
- 
+
 class fooson extends foo {
         function barson() {
                 $this->bar();
         }
 }
- 
+
 class foo2son extends fooson {
- 
+
         function bar() {
                 echo "public!\n";
         }
 }
- 
+
 $b = new foo2son();
 $b->barson();
 ?>
diff --git a/Zend/tests/bug33282.phpt b/Zend/tests/bug33282.phpt
index 65e3c16cf5a..27f399046eb 100644
--- a/Zend/tests/bug33282.phpt
+++ b/Zend/tests/bug33282.phpt
@@ -8,7 +8,7 @@ Bug #33282 (Re-assignment by reference does not clear the is_ref flag)
 	$r = &$a[2];
 	var_dump($a);
 ?>
---EXPECT--	
+--EXPECT--
 array(3) {
   [0]=>
   int(1)
diff --git a/Zend/tests/bug33512.phpt b/Zend/tests/bug33512.phpt
index dcb8f0417ef..0a0e4e7b117 100644
--- a/Zend/tests/bug33512.phpt
+++ b/Zend/tests/bug33512.phpt
@@ -41,7 +41,7 @@ class TheObj {
 
 	var_dump($SomeObj->RealVar1);
 	print $SomeObj->{'RealVar'.(3)}."\n";
-	
+
 	unset($SomeObj->RealVar1);
 	unset($SomeObj->{'RealVar'.(3)});
 
diff --git a/Zend/tests/bug33710.phpt b/Zend/tests/bug33710.phpt
index 330bb584a47..f65576074b5 100644
--- a/Zend/tests/bug33710.phpt
+++ b/Zend/tests/bug33710.phpt
@@ -9,12 +9,12 @@ class Foo implements ArrayAccess
 	function offsetGet($offset) {/*...*/}
 	function offsetSet($offset, $value) {/*...*/}
 	function offsetUnset($offset) {/*...*/}
-	
+
 	function fail()
 	{
 		$this['blah'];
 	}
-	
+
 	function succeed()
 	{
 		$this;
diff --git a/Zend/tests/bug33771.phpt b/Zend/tests/bug33771.phpt
index 72d953c9fa8..a8dca37080d 100644
--- a/Zend/tests/bug33771.phpt
+++ b/Zend/tests/bug33771.phpt
@@ -33,7 +33,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(32767)
 int(32767)
 int(30719)
diff --git a/Zend/tests/bug34260.phpt b/Zend/tests/bug34260.phpt
index fa393d065c2..7e35886faed 100644
--- a/Zend/tests/bug34260.phpt
+++ b/Zend/tests/bug34260.phpt
@@ -16,7 +16,7 @@ class Faulty
 
     function NormalMethod($Args)
     {
-       echo "I heart me\n"; 
+       echo "I heart me\n";
     }
 }
 
diff --git a/Zend/tests/bug34467.phpt b/Zend/tests/bug34467.phpt
index 5f0ccafc4f2..fa1d8de2cdb 100644
--- a/Zend/tests/bug34467.phpt
+++ b/Zend/tests/bug34467.phpt
@@ -8,10 +8,10 @@ class abc {
 	function __set ($key, $value) {
     $this->arr[$key] = $value;
   }
-	
+
 	function __get ($key) {
 	  return $this->arr[$key];
-	} 
+	}
 }
 $abc = new abc();
 foreach (array (1,2,3) as $abc->k => $abc->v) {
diff --git a/Zend/tests/bug34617.phpt b/Zend/tests/bug34617.phpt
index ded1aec2fd9..171db4b3f4c 100644
--- a/Zend/tests/bug34617.phpt
+++ b/Zend/tests/bug34617.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #34617 (zend_deactivate: objects_store used after zend_objects_store_destroy is called) 
+Bug #34617 (zend_deactivate: objects_store used after zend_objects_store_destroy is called)
 --SKIPIF--
 <?php if (!extension_loaded("xml")) print "skip the xml extension not available"; ?>
 --FILE--
diff --git a/Zend/tests/bug34873.phpt b/Zend/tests/bug34873.phpt
index 7d9eb78ab7e..da112764585 100644
--- a/Zend/tests/bug34873.phpt
+++ b/Zend/tests/bug34873.phpt
@@ -22,6 +22,6 @@ $myPwa->test();
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(7) "myvalue"
 Done
diff --git a/Zend/tests/bug35017.phpt b/Zend/tests/bug35017.phpt
index 0a89d23aa18..46b2487a62d 100644
--- a/Zend/tests/bug35017.phpt
+++ b/Zend/tests/bug35017.phpt
@@ -10,7 +10,7 @@ try {
 		echo "0\n";
 	}
 	echo "?\n";
-} catch(Exception $e) { 
+} catch(Exception $e) {
   echo "This Exception should be catched\n";
 }
 function errorHandler($errno, $errstr, $errfile, $errline, $vars) {
diff --git a/Zend/tests/bug35239.phpt b/Zend/tests/bug35239.phpt
index 869971e2a26..8a2ed501b63 100644
--- a/Zend/tests/bug35239.phpt
+++ b/Zend/tests/bug35239.phpt
@@ -2,7 +2,7 @@
 Bug #35239 (Objects can lose references)
 --FILE--
 <?php
-$a = new stdClass; 
+$a = new stdClass;
 $a->x0 = new stdClass;
 $a->x0->y0 = 'a';
 $a->x0->y1 =& $a->x0;
diff --git a/Zend/tests/bug36513.phpt b/Zend/tests/bug36513.phpt
index f46da4efc57..06cf5e416a4 100644
--- a/Zend/tests/bug36513.phpt
+++ b/Zend/tests/bug36513.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #36513 (comment will be outputed in last line)
 --FILE--
-<?php 
+<?php
 function test($s) {
   echo "'".trim(str_replace("&nbsp;", " ", htmlspecialchars_decode(strip_tags(highlight_string($s,1)))))."'\n";
 }
diff --git a/Zend/tests/bug36568.phpt b/Zend/tests/bug36568.phpt
index d621491a4cd..e837b7df594 100644
--- a/Zend/tests/bug36568.phpt
+++ b/Zend/tests/bug36568.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #36568 (memory_limit has no effect)
 --SKIPIF--
-<?php 
+<?php
 	if (!function_exists('memory_get_usage')) die('skip PHP is configured without memory_limit');
 ?>
 --INI--
diff --git a/Zend/tests/bug37251.phpt b/Zend/tests/bug37251.phpt
index 12d1e3d974c..0e5ac8fd485 100644
--- a/Zend/tests/bug37251.phpt
+++ b/Zend/tests/bug37251.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Bug #37251 (deadlock when custom error handler is to catch array type hint error) 
+Bug #37251 (deadlock when custom error handler is to catch array type hint error)
 --FILE--
 <?php
-class Foo {	
+class Foo {
 	function bar(array $foo) {
 	}
 }
diff --git a/Zend/tests/bug38461.phpt b/Zend/tests/bug38461.phpt
index 281d999019f..6f571876b8e 100644
--- a/Zend/tests/bug38461.phpt
+++ b/Zend/tests/bug38461.phpt
@@ -21,5 +21,5 @@ $op->x = 'test';
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 Done
diff --git a/Zend/tests/bug38624.phpt b/Zend/tests/bug38624.phpt
index 322ccc7fb31..7e341ec0e7c 100644
--- a/Zend/tests/bug38624.phpt
+++ b/Zend/tests/bug38624.phpt
@@ -25,7 +25,7 @@ $impl = new impl();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Uncaught Exception: doesn't work in %s:%d
 Stack trace:
 #0 %s(%d): impl->__get('counter')
diff --git a/Zend/tests/bug38772.phpt b/Zend/tests/bug38772.phpt
index 0e97c291c3f..0be6457d722 100644
--- a/Zend/tests/bug38772.phpt
+++ b/Zend/tests/bug38772.phpt
@@ -3,11 +3,11 @@ Bug #38772 (inconsistent overriding of methods in different visibility contexts)
 --FILE--
 <?php
 class A {
-	
+
 	public function __construct() {
 		$this -> foo();
 	}
-	
+
 	private function foo() {
 		echo __METHOD__ . "\r\n";
 	}
@@ -19,7 +19,7 @@ class B extends A {
 	}
 }
 
-class C extends A {	
+class C extends A {
 	protected function foo() {
 		echo __METHOD__ . "\r\n";
 	}
diff --git a/Zend/tests/bug38779.phpt b/Zend/tests/bug38779.phpt
index 5ffe990a0c3..2d0949714ea 100644
--- a/Zend/tests/bug38779.phpt
+++ b/Zend/tests/bug38779.phpt
@@ -28,5 +28,5 @@ require 'Loader://qqq.php';
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Parse error: %s error%sin Loader://qqq.php on line %d
diff --git a/Zend/tests/bug38779_1.phpt b/Zend/tests/bug38779_1.phpt
index 1cd25f90f35..2b69653eb02 100644
--- a/Zend/tests/bug38779_1.phpt
+++ b/Zend/tests/bug38779_1.phpt
@@ -47,6 +47,6 @@ if (file_exists($filename)) {
 	@unlink(dirname(__FILE__)."/bug38779.txt");
 }
 ?>
---EXPECTF--	
+--EXPECTF--
 Parse error: %s error%sin %s on line %d
 string(6) "close!"
diff --git a/Zend/tests/bug39003.phpt b/Zend/tests/bug39003.phpt
index 01761faa980..dc1c69e8c7c 100644
--- a/Zend/tests/bug39003.phpt
+++ b/Zend/tests/bug39003.phpt
@@ -19,7 +19,7 @@ test($obj);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Uncaught TypeError: Argument 1 passed to test() must be an instance of OtherClassName, instance of ClassName given, called in %s on line %d and defined in %s:%d
 Stack trace:
 #0 %s(%d): test(Object(ClassName))
diff --git a/Zend/tests/bug39036.phpt b/Zend/tests/bug39036.phpt
index 017012fddf4..419810eaa17 100644
--- a/Zend/tests/bug39036.phpt
+++ b/Zend/tests/bug39036.phpt
@@ -13,7 +13,7 @@ var_dump($key);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Undefined variable: key in %s on line %d
 NULL
 Done
diff --git a/Zend/tests/bug39127.phpt b/Zend/tests/bug39127.phpt
index 2f5b0fd2bfe..31fb6d27d58 100644
--- a/Zend/tests/bug39127.phpt
+++ b/Zend/tests/bug39127.phpt
@@ -3,17 +3,17 @@ Bug #39127 (Old-style constructor fallbacks produce strange results)
 --FILE--
 <?php
 
-class a { function a() { var_dump("a::a() called"); } } 
-class b extends a {} 
+class a { function a() { var_dump("a::a() called"); } }
+class b extends a {}
 
-$b = new b; 
+$b = new b;
 var_dump(is_callable(array($b,"a")));
 var_dump(is_callable(array($b,"b")));
 var_dump(is_callable(array($b,"__construct")));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; a has a deprecated constructor in %s on line %d
 string(13) "a::a() called"
 bool(true)
diff --git a/Zend/tests/bug39297.phpt b/Zend/tests/bug39297.phpt
index 92f91a55571..36c0af7dbbd 100644
--- a/Zend/tests/bug39297.phpt
+++ b/Zend/tests/bug39297.phpt
@@ -21,8 +21,8 @@ class MyTree implements ArrayAccess {
         $cannonicalName = strtolower($offset);
         $this->children[$cannonicalName] = $value;
         $value->parent = $this;
-    }    
-    
+    }
+
     public function offsetGet($offset) {
     	echo "offsetGet()\n";
         $cannonicalName = strtolower($offset);
diff --git a/Zend/tests/bug39304.phpt b/Zend/tests/bug39304.phpt
index 77da1a8bb8e..4394cae1d48 100644
--- a/Zend/tests/bug39304.phpt
+++ b/Zend/tests/bug39304.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #39304 (Segmentation fault with list unpacking of string offset)
 --FILE--
-<?php 
+<?php
   $s = "";
   list($a, $b) = $s[0];
   var_dump($a,$b);
diff --git a/Zend/tests/bug39346.phpt b/Zend/tests/bug39346.phpt
index 4a614c9e9a6..bde88edb9d5 100644
--- a/Zend/tests/bug39346.phpt
+++ b/Zend/tests/bug39346.phpt
@@ -6,12 +6,12 @@ class test
 {
 	protected $_id;
 	static $instances;
-	
+
 	public function __construct($id) {
-		$this->_id = $id;		
+		$this->_id = $id;
 		self::$instances[$this->_id] = $this;
 	}
-	
+
 	function __destruct() {
 		unset(self::$instances[$this->_id]);
 	}
diff --git a/Zend/tests/bug39438.phpt b/Zend/tests/bug39438.phpt
index e1ed8e8866d..d10e6d9ab72 100644
--- a/Zend/tests/bug39438.phpt
+++ b/Zend/tests/bug39438.phpt
@@ -19,12 +19,12 @@ $test2=array(
         	    'lastuploaddate' => 1088427240,
         	    'dependencies' => array (
         	          'depends' => array(
-        	                  'typo3' =>'', 
-        	                  'php' =>'', 
+        	                  'typo3' =>'',
+        	                  'php' =>'',
         	                  'cms' => ''
-        	           ),        	
-        	          'conflicts' => array('' =>'')        	
-        	    ),        	
+        	           ),
+        	          'conflicts' => array('' =>'')
+        	    ),
         	  	'authorname' => 'Mirko Balluff',
         	  	'authoremail' => 'balluff@amt1.de',
         	  	'ownerusername' => 'amt1',
@@ -34,7 +34,7 @@ $test2=array(
   	)
 );
 $test=array();
-while($i<1200) {	
+while($i<1200) {
 	$test[]=$test2;
 	$i++;
 }
diff --git a/Zend/tests/bug39721.phpt b/Zend/tests/bug39721.phpt
index 63edfc23ed0..aa0df793ff5 100644
--- a/Zend/tests/bug39721.phpt
+++ b/Zend/tests/bug39721.phpt
@@ -5,18 +5,18 @@ Bug #39721 (Runtime inheritance causes data corruption)
 class test2 {
 	private static $instances = 0;
 	public $instance;
-	
+
 	public function __construct() {
 		$this->instance = ++self::$instances;
 	}
-	 
+
 }
 
 $foo = new test2();
 
 if (is_object($foo)) {
 	class test2_child extends test2 {
-	 
+
 	}
 }
 
diff --git a/Zend/tests/bug39825.phpt b/Zend/tests/bug39825.phpt
index 791b329f71e..a241e0de36e 100644
--- a/Zend/tests/bug39825.phpt
+++ b/Zend/tests/bug39825.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #39825 (foreach produces memory error)
 --FILE--
-<?php 
+<?php
 $array = array(1 => 2, "foo" => "bar");
 $obj = (object)$array;
 foreach ($obj as $name => $value)  {
diff --git a/Zend/tests/bug39944.phpt b/Zend/tests/bug39944.phpt
index 4249988ffd9..d602a45b886 100644
--- a/Zend/tests/bug39944.phpt
+++ b/Zend/tests/bug39944.phpt
@@ -35,12 +35,12 @@ function addToArray(&$arr, $strToAdd) {
 }
 
 addToArray(getArray(), "xx1");
-$a = getArray();	
+$a = getArray();
 addToArray($a, "xx2");
 $b = &$arrTheArray;
 addToArray($b, "xx3");
 addToArray(getArray(), "xx4");
-$a = getArray();	
+$a = getArray();
 addToArray($a, "xx5");
 echo "arrTheArray = " . print_r($arrTheArray, 1);
 
@@ -51,7 +51,7 @@ class RefTest {
 
 	function Add($strToAdd) {
 		$this->addToArray($this->getArray(), $strToAdd);
-	}	
+	}
 
 	function &getArray() {
 		if (!$this->arr)
diff --git a/Zend/tests/bug39990.phpt b/Zend/tests/bug39990.phpt
index d7545eeecba..9aa44cdbaba 100644
--- a/Zend/tests/bug39990.phpt
+++ b/Zend/tests/bug39990.phpt
@@ -4,10 +4,10 @@ Bug #39990 (Cannot "foreach" over overloaded properties)
 <?php
   class Foo {
     public function __get($name) {
-      return array('Hello', 'World');    
+      return array('Hello', 'World');
     }
   }
-  
+
   $obj=new Foo();
   foreach($obj->arr as $value)
     echo "$value\n";
diff --git a/Zend/tests/bug40509.phpt b/Zend/tests/bug40509.phpt
index 65e32533ef1..5b7dfa09c86 100644
--- a/Zend/tests/bug40509.phpt
+++ b/Zend/tests/bug40509.phpt
@@ -5,7 +5,7 @@ Bug #40509 (key() function changed behaviour if global array is used within func
 function foo()
 {
 	global $arr;
-	
+
 	$c = $arr["v"];
 	foreach ($c as $v) {}
 }
diff --git a/Zend/tests/bug40621.phpt b/Zend/tests/bug40621.phpt
index 5ed16bd173f..b56a28e58bf 100644
--- a/Zend/tests/bug40621.phpt
+++ b/Zend/tests/bug40621.phpt
@@ -14,7 +14,7 @@ Foo::get();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Deprecated: Non-static method Foo::get() should not be called statically in %s on line %d
 
 Fatal error: Uncaught Error: Non-static method Foo::__construct() cannot be called statically in %s:%d
diff --git a/Zend/tests/bug40784.phpt b/Zend/tests/bug40784.phpt
index a103d4a01cc..ac2b2331b28 100644
--- a/Zend/tests/bug40784.phpt
+++ b/Zend/tests/bug40784.phpt
@@ -18,7 +18,7 @@ $b = new B;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; A has a deprecated constructor in %s on line %d
 I'm A
 I'm A
diff --git a/Zend/tests/bug40815.phpt b/Zend/tests/bug40815.phpt
index 6f7477a9ebc..cb38a5d971d 100644
--- a/Zend/tests/bug40815.phpt
+++ b/Zend/tests/bug40815.phpt
@@ -14,5 +14,5 @@ set_exception_handler("ehandle::exh");
 throw new Exception ("Whiii");
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 foo
diff --git a/Zend/tests/bug40833.phpt b/Zend/tests/bug40833.phpt
index c56ca4c3ba3..625103a6c0c 100644
--- a/Zend/tests/bug40833.phpt
+++ b/Zend/tests/bug40833.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #40833 (Crash when using unset() on an ArrayAccess object retrieved via __get) 
+Bug #40833 (Crash when using unset() on an ArrayAccess object retrieved via __get)
 --FILE--
 <?php
 	class entity
diff --git a/Zend/tests/bug41026.phpt b/Zend/tests/bug41026.phpt
index 7caac215e05..3b8701d09d0 100644
--- a/Zend/tests/bug41026.phpt
+++ b/Zend/tests/bug41026.phpt
@@ -20,7 +20,7 @@ try_class::main ();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Done
 
 Warning: (Registered shutdown functions) Unable to call self::on_shutdown() - function does not exist in Unknown on line 0
diff --git a/Zend/tests/bug41075.phpt b/Zend/tests/bug41075.phpt
index 0751cbd6904..d0a77a548cd 100644
--- a/Zend/tests/bug41075.phpt
+++ b/Zend/tests/bug41075.phpt
@@ -26,6 +26,6 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(40) "Creating default object from empty value"
 Done
diff --git a/Zend/tests/bug41209.phpt b/Zend/tests/bug41209.phpt
index 5e61750fa72..3924f99ac85 100644
--- a/Zend/tests/bug41209.phpt
+++ b/Zend/tests/bug41209.phpt
@@ -38,7 +38,7 @@ var_dump(isset($cache[$id]));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Uncaught ErrorException: Undefined variable: id in %s:%d
 Stack trace:
 #0 %s(%d): env::errorHandler(8, '%s', '%s', 34, Array)
diff --git a/Zend/tests/bug41351.phpt b/Zend/tests/bug41351.phpt
index 62af6a03366..6e40669341d 100644
--- a/Zend/tests/bug41351.phpt
+++ b/Zend/tests/bug41351.phpt
@@ -10,5 +10,5 @@ foreach($a[] as $b) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use [] for reading in %s on line %d
diff --git a/Zend/tests/bug41351_2.phpt b/Zend/tests/bug41351_2.phpt
index 7009eaa457e..0a36189d747 100644
--- a/Zend/tests/bug41351_2.phpt
+++ b/Zend/tests/bug41351_2.phpt
@@ -10,5 +10,5 @@ foreach($a[]['test'] as $b) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use [] for reading in %s on line %d
diff --git a/Zend/tests/bug41351_3.phpt b/Zend/tests/bug41351_3.phpt
index 9cb23882c20..0137ff7920d 100644
--- a/Zend/tests/bug41351_3.phpt
+++ b/Zend/tests/bug41351_3.phpt
@@ -10,5 +10,5 @@ foreach($a['test'][] as $b) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use [] for reading in %s on line %d
diff --git a/Zend/tests/bug41421.phpt b/Zend/tests/bug41421.phpt
index e223e6fc78a..e4fa9447de3 100644
--- a/Zend/tests/bug41421.phpt
+++ b/Zend/tests/bug41421.phpt
@@ -18,7 +18,7 @@ feof($fp);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: feof(): wrapper::stream_eof is not implemented! Assuming EOF in %s on line %d
 
 Fatal error: Uncaught Exception in %s:%d
diff --git a/Zend/tests/bug41813.phpt b/Zend/tests/bug41813.phpt
index 9a609d09c8d..af73344f5df 100644
--- a/Zend/tests/bug41813.phpt
+++ b/Zend/tests/bug41813.phpt
@@ -8,7 +8,7 @@ $foo[0]->bar = "xyz";
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Uncaught Error: Cannot use string offset as an object in %s:%d
 Stack trace:
 #0 {main}
diff --git a/Zend/tests/bug41929.phpt b/Zend/tests/bug41929.phpt
index c332aba2d47..736736d2372 100644
--- a/Zend/tests/bug41929.phpt
+++ b/Zend/tests/bug41929.phpt
@@ -10,7 +10,7 @@ class C {
     foreach ($this as $k=>$v) {
       echo "$k: $v\n";
     }
-  } 
+  }
 }
 
 class D extends C {
diff --git a/Zend/tests/bug41961.phpt b/Zend/tests/bug41961.phpt
index 514265b601d..5df08d94d15 100644
--- a/Zend/tests/bug41961.phpt
+++ b/Zend/tests/bug41961.phpt
@@ -3,26 +3,26 @@ Bug #41961 (Ensure search for hidden private methods does not stray from class h
 --FILE--
 <?php
 X::test();
- 
+
 /** Class X is related to neither ParentClass nor ChildClass. */
 class X {
   public static function test() {
-    $myChild = new ChildClass;  
+    $myChild = new ChildClass;
     $myChild->secret(); // bug - invokes X::secret() instead of ChildClass::secret()
   }
   private function secret() {
     echo "Called private " . __METHOD__ . "() on an instance of: " . get_class($this) . "\n";
-  } 
+  }
 }
- 
-class ParentClass { 
+
+class ParentClass {
   private function secret() { }
 }
- 
+
 class ChildClass extends ParentClass {
   public function secret() {
     echo "Called public " . __METHOD__ . "() on an instance of: " . get_class($this) . "\n";
-  } 
+  }
 }
 ?>
 --EXPECT--
diff --git a/Zend/tests/bug43201.phpt b/Zend/tests/bug43201.phpt
index 53bb5ba98d8..2ab26ca4b90 100644
--- a/Zend/tests/bug43201.phpt
+++ b/Zend/tests/bug43201.phpt
@@ -16,7 +16,7 @@ $c = new Foo();
 $c->arr[0]["k"] = 1;
 $c->arr[0]["k2"] = $ref;
 for($cnt=0;$cnt<6;$cnt++) {
-	$ref = chop($undef);	
+	$ref = chop($undef);
 	$c->arr[$cnt]["k2"] = $ref;
 }
 echo "ok\n";
diff --git a/Zend/tests/bug43426.phpt b/Zend/tests/bug43426.phpt
index 73c38df2ba9..7364494dc17 100644
--- a/Zend/tests/bug43426.phpt
+++ b/Zend/tests/bug43426.phpt
@@ -32,7 +32,7 @@ $c,
  $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c,
 $c,
  $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c, $c);
-function foo2($d) {}      
+function foo2($d) {}
 echo "ok\n";
 ?>
 --EXPECT--
diff --git a/Zend/tests/bug43450.phpt b/Zend/tests/bug43450.phpt
index 9f6c5f8504b..fc1db11087b 100644
--- a/Zend/tests/bug43450.phpt
+++ b/Zend/tests/bug43450.phpt
@@ -8,7 +8,7 @@ opcache.enable_cli=0
 <?php
 error_reporting(E_ALL|E_STRICT);
 
-class Foo 
+class Foo
 {
     public function __toString()
 	{
@@ -19,7 +19,7 @@ class Foo
 $num_repeats = 100000;
 
 $start = memory_get_usage() / 1024;
-for ($i=1;$i<$num_repeats;$i++) 
+for ($i=1;$i<$num_repeats;$i++)
 {
 	$foo = new Foo();
 	md5($foo);
diff --git a/Zend/tests/bug44653.phpt b/Zend/tests/bug44653.phpt
index 1abf9747c7d..28e1d8ef718 100644
--- a/Zend/tests/bug44653.phpt
+++ b/Zend/tests/bug44653.phpt
@@ -8,7 +8,7 @@ function fooBar() { echo __FUNCTION__ . PHP_EOL; }
 
 namespace B;
 class A {
-	static function fooBar() { echo "bag1\n"; }	
+	static function fooBar() { echo "bag1\n"; }
 }
 class B {
 	static function fooBar() { echo "bag2\n"; }
diff --git a/Zend/tests/bug44899_2.phpt b/Zend/tests/bug44899_2.phpt
index e98714929b1..f3ff50604c6 100644
--- a/Zend/tests/bug44899_2.phpt
+++ b/Zend/tests/bug44899_2.phpt
@@ -16,7 +16,7 @@ class myclass
 	{
 		return isset($this->_data[$field_name]);
 	}
-	
+
 	function __get($var) {
 		var_dump(empty($this->_data[$var]));
 		return $this->_data[$var];
diff --git a/Zend/tests/bug45186.phpt b/Zend/tests/bug45186.phpt
index bcf88a18976..411c2ea072b 100644
--- a/Zend/tests/bug45186.phpt
+++ b/Zend/tests/bug45186.phpt
@@ -20,7 +20,7 @@ class bar  {
 		call_user_func(array('self', 'y'));
 		call_user_func('self::y');
 	}
-	static function x() { 
+	static function x() {
 		print "ok\n";
 	}
 }
diff --git a/Zend/tests/bug45186_2.phpt b/Zend/tests/bug45186_2.phpt
index 9a707ace871..7c813a909c6 100644
--- a/Zend/tests/bug45186_2.phpt
+++ b/Zend/tests/bug45186_2.phpt
@@ -16,7 +16,7 @@ class bar  {
 		call_user_func(array('self', 'y'));
 		call_user_func('self::y');
 	}
-	static function x() { 
+	static function x() {
 		print "ok\n";
 	}
 }
diff --git a/Zend/tests/bug45742.phpt b/Zend/tests/bug45742.phpt
index bde690b39ac..1c28c35890e 100644
--- a/Zend/tests/bug45742.phpt
+++ b/Zend/tests/bug45742.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #45742 Wrong class array inpretetion using constant indexes 
+Bug #45742 Wrong class array inpretetion using constant indexes
 --FILE--
 <?php
 class Constants {
diff --git a/Zend/tests/bug45744.phpt b/Zend/tests/bug45744.phpt
index 029efcfe635..c1e2a4841cc 100644
--- a/Zend/tests/bug45744.phpt
+++ b/Zend/tests/bug45744.phpt
@@ -6,7 +6,7 @@ class Foo {
     public function __construct(array $data) {
 		var_dump(array_map(array($this, 'callback'), $data));
     }
-    
+
     private function callback($value) {
         if (!is_array($value)) {
             return stripslashes($value);
@@ -24,7 +24,7 @@ class Foo2 {
     public function __construct(array $data) {
 		var_dump(array_map(array($this, 'callBack'), $data));
     }
-    
+
     private function callBack($value) {
     }
 }
diff --git a/Zend/tests/bug45805.phpt b/Zend/tests/bug45805.phpt
index 1bb03e917ef..6e951496636 100644
--- a/Zend/tests/bug45805.phpt
+++ b/Zend/tests/bug45805.phpt
@@ -33,7 +33,7 @@ class B {
 set_error_handler(
   array('PHPUnit_Util_ErrorHandler', 'handleError'), E_ALL | E_STRICT
 );
-            
+
 $o = new B;
 $o->bar();
 ?>
diff --git a/Zend/tests/bug45910.phpt b/Zend/tests/bug45910.phpt
index 1041877fee3..7f2ea8b2052 100644
--- a/Zend/tests/bug45910.phpt
+++ b/Zend/tests/bug45910.phpt
@@ -14,7 +14,7 @@ class foo {
 		self::CCC	=> 'b',
 		self::DDD	=>  self::AAA
 	);
-	
+
 	public static function test() {
 		self::$foo;
 	}
diff --git a/Zend/tests/bug45910_2.phpt b/Zend/tests/bug45910_2.phpt
index 68ca9a1176b..dec6565c0e7 100644
--- a/Zend/tests/bug45910_2.phpt
+++ b/Zend/tests/bug45910_2.phpt
@@ -14,7 +14,7 @@ class foo {
 		self::CCC	=> 'b',
 		self::DDD	=>  11
 	);
-	
+
 	public static function test() {
 		self::$foo;
 	}
diff --git a/Zend/tests/bug46196.phpt b/Zend/tests/bug46196.phpt
index 7526d802ab5..13695f8afa4 100644
--- a/Zend/tests/bug46196.phpt
+++ b/Zend/tests/bug46196.phpt
@@ -5,9 +5,9 @@ Olivier Doucet
 --FILE--
 <?php
 /* Prototype  : void restore_error_handler(void)
- * Description: Restores the previously defined error handler function 
+ * Description: Restores the previously defined error handler function
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing restore_error_handler() : error bug #46196 ***\n";
diff --git a/Zend/tests/bug46241.phpt b/Zend/tests/bug46241.phpt
index 40ed7c8e8d1..0626857554b 100644
--- a/Zend/tests/bug46241.phpt
+++ b/Zend/tests/bug46241.phpt
@@ -33,7 +33,7 @@ function errorHandler1( $errno, $errstr )
 }
 
 function errorHandler2( $errno, $errstr )
-{   
+{
     echo "Caught on second level: '$errstr'\n";
     return true;
 }
diff --git a/Zend/tests/bug46246.phpt b/Zend/tests/bug46246.phpt
index a57222bf2a7..12be587d74b 100644
--- a/Zend/tests/bug46246.phpt
+++ b/Zend/tests/bug46246.phpt
@@ -8,7 +8,7 @@ class A
 	{
 		echo 'Hello from '.get_class($this)."\n";
 	}
-	
+
 	public function call($method, $args = array())
 	{
 		$this->Test();
diff --git a/Zend/tests/bug46381.phpt b/Zend/tests/bug46381.phpt
index bfe11cdf280..ce4e399284b 100644
--- a/Zend/tests/bug46381.phpt
+++ b/Zend/tests/bug46381.phpt
@@ -13,7 +13,7 @@ $test->method();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Uncaught Error: Non-static method ArrayIterator::current() cannot be called statically in %s:%d
 Stack trace:
 #0 %s(%d): test->method()
diff --git a/Zend/tests/bug46409.phpt b/Zend/tests/bug46409.phpt
index 1986e88b109..79e82b5f81d 100644
--- a/Zend/tests/bug46409.phpt
+++ b/Zend/tests/bug46409.phpt
@@ -4,7 +4,7 @@ Bug #46409 (__invoke method called outside of object context when using array_ma
 <?php
 class Callback {
     protected $val = 'hello, world';
-    
+
     public function __invoke() {
         return $this->val;
     }
diff --git a/Zend/tests/bug46701.phpt b/Zend/tests/bug46701.phpt
index e9cb99e77ac..523a96735fe 100644
--- a/Zend/tests/bug46701.phpt
+++ b/Zend/tests/bug46701.phpt
@@ -10,13 +10,13 @@ $test_array = array(
 	0xce331a00 => 2
 );
 $test_array[0xce359000] = 3;
-  
+
 var_dump($test_array);
 var_dump($test_array[0xce331a00]);
 
 class foo {
 	public $x;
-	
+
 	public function __construct() {
 		$this->x[0xce359000] = 3;
 		var_dump($this->x);
diff --git a/Zend/tests/bug46813.phpt b/Zend/tests/bug46813.phpt
index 91837db1ff0..b1505fc07da 100644
--- a/Zend/tests/bug46813.phpt
+++ b/Zend/tests/bug46813.phpt
@@ -6,7 +6,7 @@ namespace test;
 {
 	class inner
 	{
-		
+
 	}
 }
 
diff --git a/Zend/tests/bug47343.phpt b/Zend/tests/bug47343.phpt
index b0b7977beb3..bf1a5d2b312 100644
--- a/Zend/tests/bug47343.phpt
+++ b/Zend/tests/bug47343.phpt
@@ -8,7 +8,7 @@ class A
 	{
 		gc_collect_cycles();
 	}
-	
+
 	public function getB()
 	{
 		$this->data['foo'] = new B($this);
diff --git a/Zend/tests/bug47353.phpt b/Zend/tests/bug47353.phpt
index 4196fc77f37..aaf5a942a6d 100644
--- a/Zend/tests/bug47353.phpt
+++ b/Zend/tests/bug47353.phpt
@@ -22,5 +22,5 @@ $a = new A();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Done
diff --git a/Zend/tests/bug47593.phpt b/Zend/tests/bug47593.phpt
index 98aa19a91c3..ffbe7c8dbb5 100644
--- a/Zend/tests/bug47593.phpt
+++ b/Zend/tests/bug47593.phpt
@@ -12,7 +12,7 @@ class foo {
 }
 
 interface baz {
-}	
+}
 
 function bar() {
 }
diff --git a/Zend/tests/bug47771.phpt b/Zend/tests/bug47771.phpt
index a17fcf3b58f..c4350b9d95d 100644
--- a/Zend/tests/bug47771.phpt
+++ b/Zend/tests/bug47771.phpt
@@ -7,21 +7,21 @@ function throw_exc() {
 }
 
 class Test {
-  
+
   public function __construct() {
     echo 'Constr' ."\n";
   }
-  
+
   public function __destruct() {
     echo 'Destr' ."\n";
   }
-  
+
 }
 
 try {
-  
+
   $T =new Test(throw_exc());
-  
+
 } catch( Exception $e) {
   echo 'Exception: ' . $e->getMessage() . "\n";
 }
diff --git a/Zend/tests/bug48215_2.phpt b/Zend/tests/bug48215_2.phpt
index 458e68144f8..67380063c6a 100644
--- a/Zend/tests/bug48215_2.phpt
+++ b/Zend/tests/bug48215_2.phpt
@@ -7,7 +7,7 @@ class a {
 	public function a() { echo __METHOD__ . "\n"; }
 }
 class b extends a {}
-class c extends b { 
+class c extends b {
 	function __construct() {
 		b::b();
 	}
diff --git a/Zend/tests/bug48228.phpt b/Zend/tests/bug48228.phpt
index 1f0d0a54a11..9be02aa4d8e 100644
--- a/Zend/tests/bug48228.phpt
+++ b/Zend/tests/bug48228.phpt
@@ -7,7 +7,7 @@ function do_throw() {
 	throw new Exception();
 }
 
-class aa 
+class aa
 {
 	function check()
 	{
diff --git a/Zend/tests/bug48409.phpt b/Zend/tests/bug48409.phpt
index 238b52ed749..7ba99cdbf40 100644
--- a/Zend/tests/bug48409.phpt
+++ b/Zend/tests/bug48409.phpt
@@ -15,7 +15,7 @@ class BBB
 		return array('foo' => 'xyz');
 	}
 }
-	
+
 class CCC
 {
 	public function process($p)
diff --git a/Zend/tests/bug48533.phpt b/Zend/tests/bug48533.phpt
index 3b4777884e5..4fa49a2f222 100644
--- a/Zend/tests/bug48533.phpt
+++ b/Zend/tests/bug48533.phpt
@@ -5,7 +5,7 @@ Bug #48533 (__callStatic is not invoked for private/protected methods)
 
 class foo {
 	private function a() {
-		var_dump(1);	
+		var_dump(1);
 	}
 	public function b() {
 		var_dump(2);
diff --git a/Zend/tests/bug48770.phpt b/Zend/tests/bug48770.phpt
index 067e892e662..59b66641e0e 100644
--- a/Zend/tests/bug48770.phpt
+++ b/Zend/tests/bug48770.phpt
@@ -4,7 +4,7 @@ Bug #48770 (call_user_func_array() fails to call parent from inheriting class)
 See Bug #48770
 --FILE--
 <?php
- 
+
 class A {
 	public function func($str) {
 		var_dump(__METHOD__ .': '. $str);
@@ -13,22 +13,22 @@ class A {
 		var_dump(__METHOD__ .': '. $str);
 	}
 	protected function func3($str) {
-		var_dump(__METHOD__ .': '. $str);		
+		var_dump(__METHOD__ .': '. $str);
 	}
 	private function func22($str) {
-		var_dump(__METHOD__ .': '. $str);		
+		var_dump(__METHOD__ .': '. $str);
 	}
 }
 
 class B extends A {
 	public function func($str) {
 		static $avoid_crash = 0;
-		
+
 		if ($avoid_crash++ == 1) {
 			print "This method shouldn't be called when using parent::func!\n";
 			return;
 		}
-				
+
 		call_user_func_array(array($this, 'parent::func'), array($str));
 	}
 	private function func2($str) {
diff --git a/Zend/tests/bug48770_2.phpt b/Zend/tests/bug48770_2.phpt
index 54ce92fa616..d7984eac4fd 100644
--- a/Zend/tests/bug48770_2.phpt
+++ b/Zend/tests/bug48770_2.phpt
@@ -4,7 +4,7 @@ Bug #48770 (call_user_func_array() fails to call parent from inheriting class)
 See Bug #48770
 --FILE--
 <?php
- 
+
 class A {
 	public function func($str) {
 		var_dump(__METHOD__ .': '. $str);
@@ -13,10 +13,10 @@ class A {
 		var_dump(__METHOD__ .': '. $str);
 	}
 	protected function func3($str) {
-		var_dump(__METHOD__ .': '. $str);		
+		var_dump(__METHOD__ .': '. $str);
 	}
 	private function func22($str) {
-		var_dump(__METHOD__ .': '. $str);		
+		var_dump(__METHOD__ .': '. $str);
 	}
 }
 
diff --git a/Zend/tests/bug48770_3.phpt b/Zend/tests/bug48770_3.phpt
index 43311df5336..5c6eacb4705 100644
--- a/Zend/tests/bug48770_3.phpt
+++ b/Zend/tests/bug48770_3.phpt
@@ -4,7 +4,7 @@ Bug #48770 (call_user_func_array() fails to call parent from inheriting class)
 See Bug #48770
 --FILE--
 <?php
- 
+
 class A {
 	public function func($str) {
 		var_dump(__METHOD__ .': '. $str);
@@ -13,10 +13,10 @@ class A {
 		var_dump(__METHOD__ .': '. $str);
 	}
 	protected function func3($str) {
-		var_dump(__METHOD__ .': '. $str);		
+		var_dump(__METHOD__ .': '. $str);
 	}
 	private function func22($str) {
-		var_dump(__METHOD__ .': '. $str);		
+		var_dump(__METHOD__ .': '. $str);
 	}
 }
 
diff --git a/Zend/tests/bug49472.phpt b/Zend/tests/bug49472.phpt
index 1803d1848c8..2d7ae514f22 100644
--- a/Zend/tests/bug49472.phpt
+++ b/Zend/tests/bug49472.phpt
@@ -14,7 +14,7 @@ class Foo implements ia {
 class FooBar extends Foo implements ia {
 	const x = 1;
 	const c = 'Ocean';
-	
+
 	public function show() {
 		return ia::c;
 	}
diff --git a/Zend/tests/bug49908.phpt b/Zend/tests/bug49908.phpt
index 6999b9e0aab..2f330802588 100644
--- a/Zend/tests/bug49908.phpt
+++ b/Zend/tests/bug49908.phpt
@@ -5,7 +5,7 @@ Bug #49908 (throwing exception in __autoload crashes when interface is not defin
 
 spl_autoload_register(function ($className) {
 	var_dump($className);
-	
+
 	if ($className == 'Foo') {
 		class Foo implements Bar {};
 	} else {
diff --git a/Zend/tests/bug50261.phpt b/Zend/tests/bug50261.phpt
index ce120b9416e..321e9cfb8b3 100644
--- a/Zend/tests/bug50261.phpt
+++ b/Zend/tests/bug50261.phpt
@@ -12,12 +12,12 @@ class testClass {
 class testClass2 extends testClass {
 	function __construct() {
 		static $x = 0;
-		
+
 		if ($x) {
 			print "Infinite loop...\n";
 		} else {
 			$x++;
-			
+
 			parent::__construct(1);
 			testclass::__construct(2);
 			call_user_func(array('parent', '__construct'), 3);
diff --git a/Zend/tests/bug50394.phpt b/Zend/tests/bug50394.phpt
index e6069d36662..4e6c9761dd8 100644
--- a/Zend/tests/bug50394.phpt
+++ b/Zend/tests/bug50394.phpt
@@ -17,7 +17,7 @@ $proxy = new Proxy;
 call_user_func_array( array( $proxy, 'bar' ), $args );
 call_user_func_array( array( $proxy, 'bar' ), array(&$arg) );
 var_dump($arg);
---EXPECT--	
+--EXPECT--
 bar called!
 bar called!
 int(3)
diff --git a/Zend/tests/bug50810.phpt b/Zend/tests/bug50810.phpt
index 8b4d7190eb8..b2a29316515 100644
--- a/Zend/tests/bug50810.phpt
+++ b/Zend/tests/bug50810.phpt
@@ -7,31 +7,31 @@ class ExampleSuperClass
 {
     private $foo;
     static protected $bar;
- 
+
     private function foo()
     {
     }
- 
+
     public function propertyFooExists()
     {
         return property_exists($this, 'foo');
     }
- 
+
 }
- 
+
 class ExampleSubClass extends ExampleSuperClass
 {
     public function methodExists()
     {
         return method_exists($this, 'foo');
     }
- 
+
     public function propertyBarExists()
     {
         return property_exists($this, 'bar');
     }
 }
- 
+
 $example = new ExampleSubClass();
 var_dump($example->methodExists());
 var_dump(method_exists($example, 'propertyFooExists'));
diff --git a/Zend/tests/bug51176.phpt b/Zend/tests/bug51176.phpt
index 1b0e285c644..272ba1286f7 100644
--- a/Zend/tests/bug51176.phpt
+++ b/Zend/tests/bug51176.phpt
@@ -10,12 +10,12 @@ class Foo
 		static::bar();
 		Foo::bar();
 	}
-	
+
 	public function __call($n, $a)
 	{
 		echo "instance\n";
 	}
-	
+
 	public static function __callStatic($n, $a)
 	{
 		echo "static\n";
diff --git a/Zend/tests/bug51822.phpt b/Zend/tests/bug51822.phpt
index cffae7bb1a5..c0973952834 100644
--- a/Zend/tests/bug51822.phpt
+++ b/Zend/tests/bug51822.phpt
@@ -7,14 +7,14 @@ class DestructableObject
 	public function __destruct()
 	{
 		echo "2\n";
-	}	
+	}
 }
 
 class DestructorCreator
 {
 	public function __destruct()
 	{
-		$this->test = new DestructableObject;	
+		$this->test = new DestructableObject;
 		echo "1\n";
 	}
 }
diff --git a/Zend/tests/bug52484.phpt b/Zend/tests/bug52484.phpt
index 1d2c2d7cdcc..b8202a45043 100644
--- a/Zend/tests/bug52484.phpt
+++ b/Zend/tests/bug52484.phpt
@@ -3,7 +3,7 @@ Bug #52484 (__set() ignores setting properties with empty names)
 --FILE--
 <?php
 
-class A {	
+class A {
 	function __unset($prop) {
 		unset($this->$prop);
 	}
diff --git a/Zend/tests/bug52484_3.phpt b/Zend/tests/bug52484_3.phpt
index 408dd453fd6..995e624dfc5 100644
--- a/Zend/tests/bug52484_3.phpt
+++ b/Zend/tests/bug52484_3.phpt
@@ -3,7 +3,7 @@ Bug #52484.3 (__set() ignores setting properties with empty names)
 --FILE--
 <?php
 
-class A {	
+class A {
 	function __get($prop) {
 		var_dump($this->$prop);
 	}
diff --git a/Zend/tests/bug52614.phpt b/Zend/tests/bug52614.phpt
index d220881679e..0a1dca6882d 100644
--- a/Zend/tests/bug52614.phpt
+++ b/Zend/tests/bug52614.phpt
@@ -8,7 +8,7 @@ class foo {
 	public $a3;
 	public $o1;
 	public $o2;
-	
+
 	public function f1() {
 		return $this->a1;
 	}
diff --git a/Zend/tests/bug52940.phpt b/Zend/tests/bug52940.phpt
index f8d31c0dbe8..51137c091e4 100644
--- a/Zend/tests/bug52940.phpt
+++ b/Zend/tests/bug52940.phpt
@@ -4,7 +4,7 @@ Bug #52940 (call_user_func_array still allows call-time pass-by-reference)
 <?php
 function foo($a) {
 	$a++;
-	var_dump($a);	
+	var_dump($a);
 }
 function bar(&$a) {
         $a++;
diff --git a/Zend/tests/bug53632.phpt b/Zend/tests/bug53632.phpt
index 9a6dade9e1a..d28a41b273b 100644
--- a/Zend/tests/bug53632.phpt
+++ b/Zend/tests/bug53632.phpt
@@ -6,5 +6,5 @@ $d = 2.2250738585072011e-308;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Done
diff --git a/Zend/tests/bug54910.phpt b/Zend/tests/bug54910.phpt
index 8808cd0609b..a63f10fa7f1 100644
--- a/Zend/tests/bug54910.phpt
+++ b/Zend/tests/bug54910.phpt
@@ -6,14 +6,14 @@ class A {
     public function __call($method, $args) {
         if (stripos($method, 'get') === 0) {
             return $this->get();
-        } 
+        }
         die("No such method - '$method'\n");
     }
 
     protected function get() {
         $class = get_class($this);
         $call = array($class, 'noSuchMethod');
-        
+
         if (is_callable($call)) {
             call_user_func($call);
         }
diff --git a/Zend/tests/bug55007.phpt b/Zend/tests/bug55007.phpt
index c3fb3c47f99..fe8dfb3dcbc 100644
--- a/Zend/tests/bug55007.phpt
+++ b/Zend/tests/bug55007.phpt
@@ -14,7 +14,7 @@ function shutdown() {
 
 
 register_shutdown_function('shutdown');
-	
+
 new CompileErrorClass();
 
 ?>
diff --git a/Zend/tests/bug55156.phpt b/Zend/tests/bug55156.phpt
index 137a43fcaaa..99d2bbe7659 100644
--- a/Zend/tests/bug55156.phpt
+++ b/Zend/tests/bug55156.phpt
@@ -8,23 +8,23 @@ opcache.save_comments=1
 /** test */
 namespace foo {
 	function test() { }
-	 
+
 	$x = new \ReflectionFunction('foo\test');
-	var_dump($x->getDocComment());	
-	
+	var_dump($x->getDocComment());
+
 	/** test1 */
 	class bar { }
-	
+
 	/** test2 */
 	class foo extends namespace\bar { }
-	
+
 	$x = new \ReflectionClass('foo\bar');
 	var_dump($x->getDocComment());
-	
+
 	$x = new \ReflectionClass('foo\foo');
 	var_dump($x->getDocComment());
 }
-	
+
 ?>
 --EXPECTF--
 bool(false)
diff --git a/Zend/tests/bug55247.phpt b/Zend/tests/bug55247.phpt
index 6fa893f892c..8c21019abdd 100644
--- a/Zend/tests/bug55247.phpt
+++ b/Zend/tests/bug55247.phpt
@@ -7,7 +7,7 @@ class Test{
 	{
         echo $method . PHP_EOL;
     }
-    public function __call($method, $arguments) 
+    public function __call($method, $arguments)
 	{
         echo $method . PHP_EOL;
     }
diff --git a/Zend/tests/bug55578.phpt b/Zend/tests/bug55578.phpt
index 4a8604a23b8..b67d3824e01 100644
--- a/Zend/tests/bug55578.phpt
+++ b/Zend/tests/bug55578.phpt
@@ -1,14 +1,14 @@
 --TEST--
 Bug #55578 (Segfault on implode/concat)
 --FILE--
-<?php  
+<?php
 $options = array();
 
 class Foo {
     public function __toString() {
         return 'Foo';
     }
-}   
+}
 
 function test($options, $queryPart) {
 	return ''. (0 ? 1 : $queryPart);
diff --git a/Zend/tests/bug60536_002.phpt b/Zend/tests/bug60536_002.phpt
index 1dcba1dbc5f..0d396938087 100644
--- a/Zend/tests/bug60536_002.phpt
+++ b/Zend/tests/bug60536_002.phpt
@@ -5,7 +5,7 @@ The same rules are applied for properties that are defined in the class hierarch
 error_reporting(E_ALL | E_STRICT);
 
 class Base {
-  private $hello;    
+  private $hello;
 }
 
 trait THello1 {
@@ -31,7 +31,7 @@ echo "POST-CLASS-GUARD2\n";
 $t = new TraitsTest;
 $t->hello = "foo";
 ?>
---EXPECTF--	
+--EXPECTF--
 PRE-CLASS-GUARD
 POST-CLASS-GUARD
 
diff --git a/Zend/tests/bug60536_003.phpt b/Zend/tests/bug60536_003.phpt
index d944a0a41e8..df3bc6cc1f6 100644
--- a/Zend/tests/bug60536_003.phpt
+++ b/Zend/tests/bug60536_003.phpt
@@ -31,7 +31,7 @@ $b = new SubclassB;
 var_dump($b);
 
 ?>
---EXPECTF--	
+--EXPECTF--
 object(SubclassA)#%d (2) {
   ["hello":"SubclassA":private]=>
   int(0)
diff --git a/Zend/tests/bug60536_004.phpt b/Zend/tests/bug60536_004.phpt
index e0c9dc0b4df..324a90e55d7 100644
--- a/Zend/tests/bug60536_004.phpt
+++ b/Zend/tests/bug60536_004.phpt
@@ -5,7 +5,7 @@ Introducing new private variables of the same name in a subclass is ok, and does
 error_reporting(E_ALL | E_STRICT);
 
 class Base {
-  private $hello;    
+  private $hello;
 }
 
 trait THello1 {
@@ -29,7 +29,7 @@ class Notice extends Base {
 }
 echo "POST-CLASS-GUARD2\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 PRE-CLASS-GUARD
 POST-CLASS-GUARD
 POST-CLASS-GUARD2
diff --git a/Zend/tests/bug60536_005.phpt b/Zend/tests/bug60536_005.phpt
index a285ed47ab4..b8aa07ccb47 100644
--- a/Zend/tests/bug60536_005.phpt
+++ b/Zend/tests/bug60536_005.phpt
@@ -5,7 +5,7 @@ Introducing new private variables of the same name in a subclass is ok, and does
 error_reporting(E_ALL | E_STRICT);
 
 class Base {
-  protected $hello;    
+  protected $hello;
 }
 
 trait THello1 {
@@ -28,7 +28,7 @@ class Notice extends Base {
 }
 echo "POST-CLASS-GUARD2\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 PRE-CLASS-GUARD
 POST-CLASS-GUARD
 POST-CLASS-GUARD2
diff --git a/Zend/tests/bug61011.phpt b/Zend/tests/bug61011.phpt
index 1e91a550785..dc0aca64f8f 100644
--- a/Zend/tests/bug61011.phpt
+++ b/Zend/tests/bug61011.phpt
@@ -6,7 +6,7 @@ spl_autoload_register(function ($name) {
 	throw new Exception($name);
 });
 
-try { 
+try {
 	echo AAA::$a; //zend_fetch_var_address_helper
 } catch (Exception $e) {
 	try {
@@ -22,7 +22,7 @@ try {
 					isset(AAAA::$a); // ZEND_ISSET_ISEMPTY_VAR
 				} catch (Exception $e) {
 					try  {
-						$a = array("AAA", "foo"); 
+						$a = array("AAA", "foo");
 						$a(); //ZEND_INIT_FCALL_BY_NAME
 					} catch (Exception $e) {
 					}
diff --git a/Zend/tests/bug61681.phpt b/Zend/tests/bug61681.phpt
index acc02753981..00a23e97d7a 100644
--- a/Zend/tests/bug61681.phpt
+++ b/Zend/tests/bug61681.phpt
@@ -4,7 +4,7 @@ Bug #61681: Malformed grammar
 <?php
 $la = "ooxx";
 
-echo "${substr('laruence', 0, 2)}"; 
+echo "${substr('laruence', 0, 2)}";
 
 ?>
 --EXPECT--
diff --git a/Zend/tests/bug62358.phpt b/Zend/tests/bug62358.phpt
index 8509383d469..97381c3403c 100644
--- a/Zend/tests/bug62358.phpt
+++ b/Zend/tests/bug62358.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #62358 (Segfault when using traits a lot)
 --FILE--
-<?php 
+<?php
 
 trait T {
     public function foo() {
@@ -19,7 +19,7 @@ abstract class A implements I{
 
 class B extends A {
    public function foo($var) {
-   } 
+   }
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/bug62441.phpt b/Zend/tests/bug62441.phpt
index 3299f4967db..fba76cb2907 100644
--- a/Zend/tests/bug62441.phpt
+++ b/Zend/tests/bug62441.phpt
@@ -11,7 +11,7 @@ namespace ns {
     class Foo implements \Iface {
         function method(stdClass $o) { }
     }
-    
+
     (new Foo)->method(new \stdClass);
 }
 ?>
diff --git a/Zend/tests/bug62763.phpt b/Zend/tests/bug62763.phpt
index 50c27bdf35e..e74438dca6a 100644
--- a/Zend/tests/bug62763.phpt
+++ b/Zend/tests/bug62763.phpt
@@ -4,16 +4,16 @@ Bug #62763 (register_shutdown_function and extending class)
 <?php
 class test1 {
     public function __construct() {
-        register_shutdown_function(array($this, 'shutdown')); 
+        register_shutdown_function(array($this, 'shutdown'));
     }
-    public function shutdown() { 
+    public function shutdown() {
         exit(__METHOD__);
     }
 }
 
 class test2 extends test1 {
-    public function __destruct() { 
-       exit (__METHOD__); 
+    public function __destruct() {
+       exit (__METHOD__);
     }
 }
 new test1;
diff --git a/Zend/tests/bug62892.phpt b/Zend/tests/bug62892.phpt
index e6b0e60ff3c..8c4bca992c4 100644
--- a/Zend/tests/bug62892.phpt
+++ b/Zend/tests/bug62892.phpt
@@ -2,7 +2,7 @@
 Bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private)
 --FILE--
 <?php
- 
+
 trait myTrait {
      public function run() {}
 }
diff --git a/Zend/tests/bug62907.phpt b/Zend/tests/bug62907.phpt
index c47c34bbe79..81aa5b225c0 100644
--- a/Zend/tests/bug62907.phpt
+++ b/Zend/tests/bug62907.phpt
@@ -6,10 +6,10 @@ spl_autoload_register(function ($name) {
     if ($name == "B") {
         eval ("abstract class B extends A { }");
     } else if ($name == "A") {
-        eval ("abstract class A { use T { T::__construct as __asconstruct; }}"); 
+        eval ("abstract class A { use T { T::__construct as __asconstruct; }}");
     } else if ($name == "T") {
-        eval ("trait T { public function __construct() { } }"); 
-    } 
+        eval ("trait T { public function __construct() { } }");
+    }
     return TRUE;
 });
 
diff --git a/Zend/tests/bug63462.phpt b/Zend/tests/bug63462.phpt
index e936a6fa69b..6e60d12d435 100644
--- a/Zend/tests/bug63462.phpt
+++ b/Zend/tests/bug63462.phpt
@@ -11,8 +11,8 @@ class Test {
 
 	public function __construct() {
 		unset(
-			$this->publicProperty, 
-			$this->protectedProperty, 
+			$this->publicProperty,
+			$this->protectedProperty,
 			$this->privateProperty
 		);
 	}
diff --git a/Zend/tests/bug63635.phpt b/Zend/tests/bug63635.phpt
index 6f6fc6a44f4..03cbfaf751b 100644
--- a/Zend/tests/bug63635.phpt
+++ b/Zend/tests/bug63635.phpt
@@ -5,17 +5,17 @@ Bug #63635 (Segfault in gc_collect_cycles)
 class Node {
 	public $parent = NULL;
 	public $childs = array();
-	
+
 	function __construct(Node $parent=NULL) {
 		if ($parent) {
 			$parent->childs[] = $this;
 		}
 		$this->childs[] = $this;
 	}
-	
+
 	function __destruct() {
 		$this->childs = NULL;
-	}	
+	}
 }
 
 define("MAX", 16);
diff --git a/Zend/tests/bug64354.phpt b/Zend/tests/bug64354.phpt
index 03a4b80b4bc..d881779df1e 100644
--- a/Zend/tests/bug64354.phpt
+++ b/Zend/tests/bug64354.phpt
@@ -16,7 +16,7 @@ $data = array(new B);
 
 try {
     serialize($data);
-} catch (Exception $e) { 
+} catch (Exception $e) {
     var_dump($e->getMessage());
 }
 ?>
diff --git a/Zend/tests/bug64555.phpt b/Zend/tests/bug64555.phpt
index d5226af7a9d..23bfd4a5e9a 100644
--- a/Zend/tests/bug64555.phpt
+++ b/Zend/tests/bug64555.phpt
@@ -2,14 +2,14 @@
 Bug #64555: Array key within interned string gets wrong hash value
 --FILE--
 <?php
- 
+
 class Foo {
     protected $unsetme = 1;
     protected $keepme = 2;
-     
+
     public function test() {
         $a = get_object_vars($this);
-         
+
         foreach ($a as $k => $v) {
             if ($k == 'unsetme') {
                 echo "Unsetting: $k\n";
@@ -20,14 +20,14 @@ class Foo {
                 $a['keepme'] = 43;
             }
         }
-         
+
         var_dump($a, array_keys($a));
     }
 }
- 
+
 $f = new Foo;
 $f->test();
- 
+
 ?>
 --EXPECT--
 Unsetting: unsetme
diff --git a/Zend/tests/bug64720.phpt b/Zend/tests/bug64720.phpt
index efe3379bd4e..cbc5f3b01fe 100644
--- a/Zend/tests/bug64720.phpt
+++ b/Zend/tests/bug64720.phpt
@@ -10,7 +10,7 @@ class Stat {
         }
         return self::$requests[1];
     }
-    
+
     public function __destruct() {
         unset(self::$requests[1]);
     }
diff --git a/Zend/tests/bug64896.phpt b/Zend/tests/bug64896.phpt
index 3ff4a2167d5..59c59b7fe2e 100644
--- a/Zend/tests/bug64896.phpt
+++ b/Zend/tests/bug64896.phpt
@@ -29,7 +29,7 @@ gc_disable();
 
 unserialize(serialize($foo));
 gc_collect_cycles();
-var_dump($bar); 
+var_dump($bar);
 gc_enable();
 /*  will output:
 object(bad)#4 (1) {
diff --git a/Zend/tests/bug64960.phpt b/Zend/tests/bug64960.phpt
index cf36fef6da7..52af0bbe322 100644
--- a/Zend/tests/bug64960.phpt
+++ b/Zend/tests/bug64960.phpt
@@ -21,7 +21,7 @@ set_error_handler(function()
 {
 	$e = new Exception;
 	$e->_trace = debug_backtrace();
-	
+
 	throw $e;
 });
 
diff --git a/Zend/tests/bug65372.phpt b/Zend/tests/bug65372.phpt
index 50fc2dbb1b2..1fd419e94d7 100644
--- a/Zend/tests/bug65372.phpt
+++ b/Zend/tests/bug65372.phpt
@@ -10,7 +10,7 @@ class ParentClass
     public static function Get()
     {
         self::$_OBJECTS[1] = new ChildClass();
-        return self::$_OBJECTS[1];    
+        return self::$_OBJECTS[1];
     }
 }
 
diff --git a/Zend/tests/bug66252.phpt b/Zend/tests/bug66252.phpt
index e692a8e706d..93f6253a55a 100644
--- a/Zend/tests/bug66252.phpt
+++ b/Zend/tests/bug66252.phpt
@@ -8,7 +8,7 @@ class A {
 class B extends A {
 	const BHW = parent::HW . " extended by B";
 }
-const C = B::BHW; 
+const C = B::BHW;
 echo C, "\n";
 --EXPECT--
 this is A extended by B
diff --git a/Zend/tests/bug66286.phpt b/Zend/tests/bug66286.phpt
index 457e282402b..d5b9bd7161a 100644
--- a/Zend/tests/bug66286.phpt
+++ b/Zend/tests/bug66286.phpt
@@ -5,10 +5,10 @@ Bug #66286: Incorrect object comparison with inheritance
 
 abstract class first {
     protected $someArray = array();
-}     
+}
 
-class second extends first {    
-    protected $someArray = array();        
+class second extends first {
+    protected $someArray = array();
     protected $someValue = null;
 
     public function __construct($someValue) {
@@ -16,10 +16,10 @@ class second extends first {
     }
 }
 
-$objFirst = new second('123');       
-$objSecond = new second('321');       
+$objFirst = new second('123');
+$objSecond = new second('321');
 
-var_dump ($objFirst == $objSecond);    
+var_dump ($objFirst == $objSecond);
 
 ?>
 --EXPECT--
diff --git a/Zend/tests/bug68118.phpt b/Zend/tests/bug68118.phpt
index c56e70a112d..a485b11dbf2 100644
--- a/Zend/tests/bug68118.phpt
+++ b/Zend/tests/bug68118.phpt
@@ -8,7 +8,7 @@ set_error_handler(function() {
     $obj->test = 'meow';
     return true;
 });
- 
+
 $a = new stdClass;
 $a->undefined .= 'test';
 var_dump($a);
diff --git a/Zend/tests/bug68797.phpt b/Zend/tests/bug68797.phpt
index c192ebd415f..db0306049fa 100644
--- a/Zend/tests/bug68797.phpt
+++ b/Zend/tests/bug68797.phpt
@@ -5,9 +5,9 @@ precision=17
 --FILE--
 <?php
 
-echo 2.2250738585072012e-308, "\n"; 
+echo 2.2250738585072012e-308, "\n";
 ?>
 ==DONE==
---EXPECT--	
+--EXPECT--
 2.2250738585072014E-308
 ==DONE==
diff --git a/Zend/tests/bug69167.phpt b/Zend/tests/bug69167.phpt
index 79326ed583c..cae3528406a 100644
--- a/Zend/tests/bug69167.phpt
+++ b/Zend/tests/bug69167.phpt
@@ -5,10 +5,10 @@ Bug #69167 (call_user_func does not support references anymore)
 function l($m) {
 	    echo $m . "\n";
 }
- 
+
 $cb = 'l';
 call_user_func($cb, 'hi');
- 
+
 $cb2 = &$cb;
 call_user_func($cb2, 'hi2');
 ?>
diff --git a/Zend/tests/bug69676_2.phpt b/Zend/tests/bug69676_2.phpt
index 6ec3d499e5a..4c5036ad96c 100644
--- a/Zend/tests/bug69676_2.phpt
+++ b/Zend/tests/bug69676_2.phpt
@@ -7,7 +7,7 @@ class Foo {
     const A = 'Foo::A';
     const B = self::A . ' and ' . self::C;
     const C = 'Foo::C';
-    
+
 }
 
 class Bar extends Foo {
diff --git a/Zend/tests/bug69732.phpt b/Zend/tests/bug69732.phpt
index 8d5fccd7121..06dd5389dd9 100644
--- a/Zend/tests/bug69732.phpt
+++ b/Zend/tests/bug69732.phpt
@@ -4,17 +4,17 @@ Bug #69732 (can induce segmentation fault with basic php code)
 <?php
 class wpq {
     private $unreferenced;
- 
+
     public function __get($name) {
         return $this->$name . "XXX";
     }
 }
- 
+
 function ret_assoc() {
 	$x = "XXX";
     return array('foo' => 'bar', $x);
 }
- 
+
 $wpq = new wpq;
 $wpq->interesting =& ret_assoc();
 $x = $wpq->interesting;
diff --git a/Zend/tests/bug70124.phpt b/Zend/tests/bug70124.phpt
index 3138430b8f4..f32a8613fe2 100644
--- a/Zend/tests/bug70124.phpt
+++ b/Zend/tests/bug70124.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #70124 (null ptr deref / seg fault in ZEND_HANDLE_EXCEPTION_SPEC_HANDLER)
 --FILE--
-<?php 
+<?php
 
 try  {
 	echo base_convert([array_search(chr(48),chr(48),chr(48),chr(48),chr(48),$f("test"))],chr(48));
diff --git a/Zend/tests/bug70785.phpt b/Zend/tests/bug70785.phpt
index 3c427ba069f..f48bc3cdb99 100644
--- a/Zend/tests/bug70785.phpt
+++ b/Zend/tests/bug70785.phpt
@@ -8,7 +8,7 @@ set_error_handler(function($no, $msg) {
 });
 
 try {
-	if ($a === null) { // ZEND_VM_SMART_BRANCH  
+	if ($a === null) { // ZEND_VM_SMART_BRANCH
 		undefined_function('Null');
 	}
 } catch (Exception $e) {
diff --git a/Zend/tests/bug70805.phpt b/Zend/tests/bug70805.phpt
index ec835bcd1b9..1177233184a 100644
--- a/Zend/tests/bug70805.phpt
+++ b/Zend/tests/bug70805.phpt
@@ -37,7 +37,7 @@ $t[] = &$t;
 unset($t); // This is used to trigger C::__destruct while doing gc_colloct_roots
 
 $e = $a;
-unset($a); // This one can not be putted into roots buf because it's full, thus gc_colloct_roots will be called, 
+unset($a); // This one can not be putted into roots buf because it's full, thus gc_colloct_roots will be called,
            // but C::__destructor which is called in gc_colloct_roots will put $a into buf
 		   // which will make $a be putted into gc roots buf twice
 var_dump(gc_collect_cycles());
diff --git a/Zend/tests/bug70805_1.phpt b/Zend/tests/bug70805_1.phpt
index 51595668a18..035ec6884fc 100644
--- a/Zend/tests/bug70805_1.phpt
+++ b/Zend/tests/bug70805_1.phpt
@@ -26,7 +26,7 @@ $a->b->a = $a;
 $i = 0;
 
 $c = new A;
-$array = array($c); 
+$array = array($c);
 unset($c);
 
 while ($i++ < 9998) {
diff --git a/Zend/tests/bug70898.phpt b/Zend/tests/bug70898.phpt
index 41777072cc9..e31ee894bf9 100644
--- a/Zend/tests/bug70898.phpt
+++ b/Zend/tests/bug70898.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #70895 null ptr deref and segfault with crafted callable
 --FILE--
-<?php 
+<?php
 	function m($f,$a){
 		return array_map($f,0);
 	}
diff --git a/Zend/tests/bug70914.phpt b/Zend/tests/bug70914.phpt
index e5f5d7460ee..0382076efb3 100644
--- a/Zend/tests/bug70914.phpt
+++ b/Zend/tests/bug70914.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #70914 zend_throw_or_error() format string vulnerability 
+Bug #70914 zend_throw_or_error() format string vulnerability
 --SKIPIF--
 <?php
 if (!extension_loaded("pdo_sqlite")) {
diff --git a/Zend/tests/bug70997.phpt b/Zend/tests/bug70997.phpt
index bdb3377c746..119eb6cbbef 100644
--- a/Zend/tests/bug70997.phpt
+++ b/Zend/tests/bug70997.phpt
@@ -4,7 +4,7 @@ Bug #70997 (When using parentClass:: instead of parent::, static context changed
 <?php
 class A {
     const TEST = false;
-    
+
     public function test()
     {
         var_dump(static::TEST);
@@ -13,7 +13,7 @@ class A {
 
 class B extends A {
     const TEST = true;
-    
+
     public function test()
     {
         A::test();
diff --git a/Zend/tests/bug71163.phpt b/Zend/tests/bug71163.phpt
index 2f6cbd5a45d..f87b9514807 100644
--- a/Zend/tests/bug71163.phpt
+++ b/Zend/tests/bug71163.phpt
@@ -2,7 +2,7 @@
 Bug #71163 (Segmentation Fault (cleanup_unfinished_calls))
 --FILE--
 <?php
-spl_autoload_register(function ($name) { 
+spl_autoload_register(function ($name) {
 	eval ("class $name extends Exception { public static function foo() {}}");
 	throw new Exception("boom");
 });
diff --git a/Zend/tests/bug71221.phpt b/Zend/tests/bug71221.phpt
index e735302d9ec..0f6ee169462 100644
--- a/Zend/tests/bug71221.phpt
+++ b/Zend/tests/bug71221.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #71221 (Null pointer deref (segfault) in get_defined_vars via ob_start)
 --FILE--
-<?php 
+<?php
 ob_start("get_defined_vars");
 ob_end_clean();
 ?>
diff --git a/Zend/tests/bug72543.phpt b/Zend/tests/bug72543.phpt
index 4244b8ce410..7bde3aa95aa 100644
--- a/Zend/tests/bug72543.phpt
+++ b/Zend/tests/bug72543.phpt
@@ -6,20 +6,20 @@ function create_references(&$array) {
     foreach ($array as $key => $value) {
         create_references($array[$key]);
     }
-}  
+}
 
 function change_copy($copy) {
         $copy['b']['z']['z'] = $copy['b'];
-}  
+}
 
 $data = [
     'a' => [
         'b' => [],
-    ], 
-]; 
- 
+    ],
+];
+
 create_references($data);
- 
+
 $copy = $data['a'];
 var_dump($copy);
 
diff --git a/Zend/tests/bug72813.phpt b/Zend/tests/bug72813.phpt
index 85ba066adb4..fd1d98508ce 100644
--- a/Zend/tests/bug72813.phpt
+++ b/Zend/tests/bug72813.phpt
@@ -10,13 +10,13 @@ class Test
     {
         return $this->props[$prop];
     }
-    
+
     public function __set($prop, $value)
     {
         if ($prop === 'b') $value = [$value];
         $this->props[$prop] = $value;
     }
-    
+
     public function getProperties()
     {
         return [$this->props];
diff --git a/Zend/tests/bug74084.phpt b/Zend/tests/bug74084.phpt
index b27bbb4647e..2e65471bccb 100644
--- a/Zend/tests/bug74084.phpt
+++ b/Zend/tests/bug74084.phpt
@@ -4,15 +4,15 @@ Bug #74084 (Out of bound read - zend_mm_alloc_small)
 error_reporting=0
 --FILE--
 <?php
-$$A += $$B->a = &$$C; 
+$$A += $$B->a = &$$C;
 unset($$A);
-$$A -= $$B->a = &$$C; 
+$$A -= $$B->a = &$$C;
 unset($$A);
-$$A *= $$B->a = &$$C; 
+$$A *= $$B->a = &$$C;
 unset($$A);
-$$A /= $$B->a = &$$C; 
+$$A /= $$B->a = &$$C;
 unset($$A);
-$$A **= $$B->a = &$$C; 
+$$A **= $$B->a = &$$C;
 var_dump($$A);
 ?>
 --EXPECT--
diff --git a/Zend/tests/bug74408.phpt b/Zend/tests/bug74408.phpt
index c0cf2f87ca8..d530265d77e 100644
--- a/Zend/tests/bug74408.phpt
+++ b/Zend/tests/bug74408.phpt
@@ -13,7 +13,7 @@ error_reporting = E_ALL | E_DEPRECATED | E_STRICT
 	  $bla = new NonExistingClass2();
   }
 
-  public function exception_handler(Error $e) { 
+  public function exception_handler(Error $e) {
 	  echo "Caught, exception: " . $e->getMessage();
   }
  }
diff --git a/Zend/tests/bug74546.phpt b/Zend/tests/bug74546.phpt
index 9c1582ad4fc..2efa790766b 100644
--- a/Zend/tests/bug74546.phpt
+++ b/Zend/tests/bug74546.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #74546 (SIGILL in ZEND_FETCH_CLASS_CONSTANT_SPEC_CONST_CONST_HANDLER())
 --FILE--
-<?php 
+<?php
 "000000"[0]::d;
 ?>
 --EXPECTF--
diff --git a/Zend/tests/bug74947.phpt b/Zend/tests/bug74947.phpt
index e66d2929711..e0615fc4a61 100644
--- a/Zend/tests/bug74947.phpt
+++ b/Zend/tests/bug74947.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #74947 (Segfault in scanner on INF number)
 --FILE--
-<?php 
+<?php
 
 echo 200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000;
 
diff --git a/Zend/tests/bug75079_2.phpt b/Zend/tests/bug75079_2.phpt
index 6e0b1cd27fa..92518555b45 100644
--- a/Zend/tests/bug75079_2.phpt
+++ b/Zend/tests/bug75079_2.phpt
@@ -6,7 +6,7 @@ Bug #75079 variation without traits
 class Foo
 {
     private static $bar = 123;
-    
+
     static function test(){
         return function(){
             return function(){
@@ -22,7 +22,7 @@ $f = Foo::test();
 var_dump($f()());
 
 class A{}
-$a = new A; 
+$a = new A;
 var_dump($f->bindTo($a, A::CLASS)()());
 
 ?>
diff --git a/Zend/tests/bug_debug_backtrace.phpt b/Zend/tests/bug_debug_backtrace.phpt
index 3e4a0ec9466..71ce129201a 100644
--- a/Zend/tests/bug_debug_backtrace.phpt
+++ b/Zend/tests/bug_debug_backtrace.phpt
@@ -5,17 +5,17 @@ Bug - crash in debug_backtrace when trace starts in eval
 function foo() {
     bar();
 }
-                                                                                                            
+
 function bar() {
     boo();
 }
-                                                                                                            
+
 function boo(){
     debug_print_backtrace();
 }
-                                                                                                            
+
 eval("foo();");
-                                                                                                            
+
 echo "Done\n";
 ?>
 ===DONE===
diff --git a/Zend/tests/call_user_func_001.phpt b/Zend/tests/call_user_func_001.phpt
index e9b35f95700..d6ac94dd4de 100644
--- a/Zend/tests/call_user_func_001.phpt
+++ b/Zend/tests/call_user_func_001.phpt
@@ -7,7 +7,7 @@ namespace testing {
 	function foobar($str) {
 		var_dump($str);
 	}
-	
+
 	abstract class bar {
 		protected function prot($str) {
 			print "Shouldn't be called!\n";
@@ -18,9 +18,9 @@ namespace testing {
 			print "Shouldn't be called!\n";
 		}
 	}
-	
+
 	call_user_func(__NAMESPACE__ .'\foobar', 'foobar');
-	
+
 	$class =  __NAMESPACE__ .'\foo';
 	call_user_func(array(new $class, 'priv'), 'foobar');
 	call_user_func(array(new $class, 'prot'), 'foobar');
diff --git a/Zend/tests/call_user_func_003.phpt b/Zend/tests/call_user_func_003.phpt
index 102433f5576..1aad22fba75 100644
--- a/Zend/tests/call_user_func_003.phpt
+++ b/Zend/tests/call_user_func_003.phpt
@@ -5,14 +5,14 @@ Testing call_user_func() with closures
 
 $foo = function() {
 	static $instance;
-	
+
 	if (is_null($instance)) {
 		$instance = function () {
 			return 'OK!';
 		};
 	}
-		
-	return $instance;	
+
+	return $instance;
 };
 
 var_dump(call_user_func(array($foo, '__invoke'))->__invoke());
diff --git a/Zend/tests/call_user_func_005.phpt b/Zend/tests/call_user_func_005.phpt
index 525b853fbfd..d4554d62e2f 100644
--- a/Zend/tests/call_user_func_005.phpt
+++ b/Zend/tests/call_user_func_005.phpt
@@ -8,7 +8,7 @@ class foo {
 		var_dump($x,$y);
 		return 1;
 	}
-	
+
 	public function teste() {
 		return foo::x(function &($a=1,$b) { });
 	}
diff --git a/Zend/tests/call_with_refs.phpt b/Zend/tests/call_with_refs.phpt
index 84c4edfc209..f7b18365b4a 100644
--- a/Zend/tests/call_with_refs.phpt
+++ b/Zend/tests/call_with_refs.phpt
@@ -12,6 +12,6 @@ $oldhandler = set_error_handler("my_errorhandler");
 $my_var = str_repeat("A",64);
 $data = call_user_func_array("substr_replace",array(&$my_var, new StdClass(),1));
 echo "OK!";
---EXPECT--	
+--EXPECT--
 Object of class stdClass could not be converted to string
 OK!
diff --git a/Zend/tests/cast_to_array.phpt b/Zend/tests/cast_to_array.phpt
index 5e351052bbb..12261c8e844 100644
Binary files a/Zend/tests/cast_to_array.phpt and b/Zend/tests/cast_to_array.phpt differ
diff --git a/Zend/tests/cast_to_bool.phpt b/Zend/tests/cast_to_bool.phpt
index 75ab09d1b5e..e0edd35dedd 100644
--- a/Zend/tests/cast_to_bool.phpt
+++ b/Zend/tests/cast_to_bool.phpt
@@ -36,7 +36,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(false)
diff --git a/Zend/tests/cast_to_double.phpt b/Zend/tests/cast_to_double.phpt
index a1a1adc1dc0..d2ee8ca1e93 100644
--- a/Zend/tests/cast_to_double.phpt
+++ b/Zend/tests/cast_to_double.phpt
@@ -1,5 +1,5 @@
 --TEST--
-casting different variables to double 
+casting different variables to double
 --INI--
 precision=14
 --FILE--
@@ -38,7 +38,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 float(0)
 float(8754456)
 float(0)
diff --git a/Zend/tests/cast_to_int.phpt b/Zend/tests/cast_to_int.phpt
index 28c57ddf63b..2a637e15e5c 100644
--- a/Zend/tests/cast_to_int.phpt
+++ b/Zend/tests/cast_to_int.phpt
@@ -36,7 +36,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(0)
 int(8754456)
 int(0)
diff --git a/Zend/tests/cast_to_object.phpt b/Zend/tests/cast_to_object.phpt
index 04d68053e26..b7e5f219f67 100644
Binary files a/Zend/tests/cast_to_object.phpt and b/Zend/tests/cast_to_object.phpt differ
diff --git a/Zend/tests/cast_to_string.phpt b/Zend/tests/cast_to_string.phpt
index f8b57a22c51..b3d245f1ed9 100644
Binary files a/Zend/tests/cast_to_string.phpt and b/Zend/tests/cast_to_string.phpt differ
diff --git a/Zend/tests/class_alias_005.phpt b/Zend/tests/class_alias_005.phpt
index 47c825b41b7..ecc96c8cfa2 100644
--- a/Zend/tests/class_alias_005.phpt
+++ b/Zend/tests/class_alias_005.phpt
@@ -3,7 +3,7 @@ Testing static call method using the original class name
 --FILE--
 <?php
 
-class foo { 
+class foo {
 	static public function msg() {
 		print "hello\n";
 	}
@@ -14,10 +14,10 @@ interface test { }
 
 class_alias('foo', 'baz');
 
-class bar extends baz { 
+class bar extends baz {
 	public function __construct() {
 		foo::msg();
-	}	
+	}
 }
 
 new bar;
diff --git a/Zend/tests/class_alias_011.phpt b/Zend/tests/class_alias_011.phpt
index 58ba28a2bb8..6db2ec7b58c 100644
--- a/Zend/tests/class_alias_011.phpt
+++ b/Zend/tests/class_alias_011.phpt
@@ -3,7 +3,7 @@ Testing callback in alias
 --FILE--
 <?php
 
-class foo { 
+class foo {
 	static public function test() {
 		print "hello\n";
 	}
diff --git a/Zend/tests/class_alias_012.phpt b/Zend/tests/class_alias_012.phpt
index dd1c9b1072c..0e39061c131 100644
--- a/Zend/tests/class_alias_012.phpt
+++ b/Zend/tests/class_alias_012.phpt
@@ -5,7 +5,7 @@ Testing dynamic alias name
 
 namespace test\baz;
 
-class foo { 
+class foo {
 }
 
 new foo;
diff --git a/Zend/tests/class_alias_013.phpt b/Zend/tests/class_alias_013.phpt
index 4991d0fd31a..3b19dcd5da6 100644
--- a/Zend/tests/class_alias_013.phpt
+++ b/Zend/tests/class_alias_013.phpt
@@ -5,7 +5,7 @@ Testing alias of alias
 
 namespace test\baz;
 
-class foo { 
+class foo {
 }
 
 new foo;
diff --git a/Zend/tests/class_alias_018.phpt b/Zend/tests/class_alias_018.phpt
index 4666e76f893..b5141152853 100644
--- a/Zend/tests/class_alias_018.phpt
+++ b/Zend/tests/class_alias_018.phpt
@@ -9,7 +9,7 @@ class foo {
 class_alias('foo', 'bar');
 
 
-class baz extends bar { 
+class baz extends bar {
 }
 
 var_dump(is_subclass_of(new foo, 'foo'));
diff --git a/Zend/tests/class_alias_020.phpt b/Zend/tests/class_alias_020.phpt
index c7ba609f511..ba330e4ae57 100644
--- a/Zend/tests/class_alias_020.phpt
+++ b/Zend/tests/class_alias_020.phpt
@@ -13,7 +13,7 @@ class_alias(__NAMESPACE__ .'\foo', 'foo');
 
 namespace foo\bar;
 
-class foo { 
+class foo {
 }
 
 class_alias(__NAMESPACE__ .'\foo', 'bar');
diff --git a/Zend/tests/class_constants_001.phpt b/Zend/tests/class_constants_001.phpt
index 664ac356988..f36b1af9f62 100644
--- a/Zend/tests/class_constants_001.phpt
+++ b/Zend/tests/class_constants_001.phpt
@@ -15,7 +15,7 @@ var_dump(test::val3);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(6) "string"
 int(1)
 
diff --git a/Zend/tests/class_constants_002.phpt b/Zend/tests/class_constants_002.phpt
index 9aad8088da8..726b9b8357d 100644
--- a/Zend/tests/class_constants_002.phpt
+++ b/Zend/tests/class_constants_002.phpt
@@ -23,7 +23,7 @@ bar();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(1)
 int(5)
 int(10)
diff --git a/Zend/tests/class_constants_003.phpt b/Zend/tests/class_constants_003.phpt
index c2782ff1c99..d9f12367407 100644
--- a/Zend/tests/class_constants_003.phpt
+++ b/Zend/tests/class_constants_003.phpt
@@ -27,7 +27,7 @@ unlink($filename);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(1)
 int(5)
 Done
diff --git a/Zend/tests/class_constants_004.phpt b/Zend/tests/class_constants_004.phpt
index 73a42ede7a4..1ca49ebdf00 100644
--- a/Zend/tests/class_constants_004.phpt
+++ b/Zend/tests/class_constants_004.phpt
@@ -21,9 +21,9 @@ $const  = __NAMESPACE__ .'\\foo';  // class
 $const2 = __NAMESPACE__ .'\\Ifoo'; // interface
 
 var_dump(	foo,
-			\foo\foo, 
-			namespace\foo, 
-			\foo\foo::foo, 
+			\foo\foo,
+			namespace\foo,
+			\foo\foo::foo,
 			$const::foo,
 			\foo,
 			constant('foo'),
diff --git a/Zend/tests/class_exists_001.phpt b/Zend/tests/class_exists_001.phpt
index 8af96a49fc9..a8fba7829c4 100644
--- a/Zend/tests/class_exists_001.phpt
+++ b/Zend/tests/class_exists_001.phpt
@@ -6,7 +6,7 @@ Testing class_exists() inside namespace
 namespace foo;
 
 class foo {
-	
+
 }
 
 class_alias(__NAMESPACE__ .'\foo', 'bar');
diff --git a/Zend/tests/class_exists_002.phpt b/Zend/tests/class_exists_002.phpt
index d326f06aea3..ebe04575afb 100644
--- a/Zend/tests/class_exists_002.phpt
+++ b/Zend/tests/class_exists_002.phpt
@@ -4,7 +4,7 @@ Testing several valid and invalid parameters
 <?php
 
 class foo {
-	
+
 }
 
 var_dump(class_exists(''));
diff --git a/Zend/tests/clone_002.phpt b/Zend/tests/clone_002.phpt
index 50156428e17..5d9c9aa8e7f 100644
--- a/Zend/tests/clone_002.phpt
+++ b/Zend/tests/clone_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing multiple clone statements
 --FILE--
-<?php 
+<?php
 
 $a = clone clone $b = new stdClass;
 var_dump($a == $b);
diff --git a/Zend/tests/clone_004.phpt b/Zend/tests/clone_004.phpt
index 68ebd9da385..dd7fe3ecfff 100644
--- a/Zend/tests/clone_004.phpt
+++ b/Zend/tests/clone_004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing usage of object as array on clone statement
 --FILE--
-<?php 
+<?php
 
 error_reporting(E_ALL|E_STRICT);
 
diff --git a/Zend/tests/closure_001.phpt b/Zend/tests/closure_001.phpt
index ebac729b16c..7385c42f123 100644
--- a/Zend/tests/closure_001.phpt
+++ b/Zend/tests/closure_001.phpt
@@ -20,7 +20,7 @@ call_user_func($lambda2, "Universe");
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 bool(true)
 bool(true)
 Hello World!
diff --git a/Zend/tests/closure_005.phpt b/Zend/tests/closure_005.phpt
index b9eb79eafda..b3be8772164 100644
--- a/Zend/tests/closure_005.phpt
+++ b/Zend/tests/closure_005.phpt
@@ -25,13 +25,13 @@ class A {
 			echo $this->x."\n";
 		};
 	}
-	
+
 	function getError() {
 		return static function() {
 			echo $this->x."\n";
 		};
 	}
-	
+
 	function printX() {
 		echo $this->x."\n";
 	}
diff --git a/Zend/tests/closure_018.phpt b/Zend/tests/closure_018.phpt
index 2dcf15c6aa1..0241d3e8eed 100644
--- a/Zend/tests/closure_018.phpt
+++ b/Zend/tests/closure_018.phpt
@@ -6,7 +6,7 @@ Closure 018: Assigning lambda to static var and returning by ref
 class foo {
 	public function test(&$x) {
 		static $lambda;
-		$lambda = function &() use (&$x) { 
+		$lambda = function &() use (&$x) {
 			return $x = $x * $x;
 		};
 		return $lambda();
diff --git a/Zend/tests/closure_019.phpt b/Zend/tests/closure_019.phpt
index c1731086238..22aaec1bbab 100644
--- a/Zend/tests/closure_019.phpt
+++ b/Zend/tests/closure_019.phpt
@@ -9,7 +9,7 @@ $lambda = function &(&$x) {
 
 function test() {
 	global $lambda;
-	
+
 	$y = 3;
 	var_dump($GLOBALS['lambda']($y));
 	var_dump($lambda($y));
diff --git a/Zend/tests/closure_020.phpt b/Zend/tests/closure_020.phpt
index 3e019aaa423..9325e020c36 100644
--- a/Zend/tests/closure_020.phpt
+++ b/Zend/tests/closure_020.phpt
@@ -5,14 +5,14 @@ Closure 020: Trying to access private property outside class
 
 class foo {
 	private $test = 3;
-	
+
 	public function x() {
 		$a = &$this;
 		$this->a = function() use (&$a) { return $a; };
 		var_dump($this->a->__invoke());
 		var_dump(is_a($this->a, 'closure'));
 		var_dump(is_callable($this->a));
-		
+
 		return $this->a;
 	}
 }
diff --git a/Zend/tests/closure_026.phpt b/Zend/tests/closure_026.phpt
index 82a948d1a04..50c850e787c 100644
--- a/Zend/tests/closure_026.phpt
+++ b/Zend/tests/closure_026.phpt
@@ -6,13 +6,13 @@ Closure 026: Assigning a closure object to an array in $this
 class foo {
 	public function __construct() {
 		$a =& $this;
-		
+
 		$a->a[] = function() {
-			return 1;	
+			return 1;
 		};
-		
+
 		var_dump($this);
-		
+
 		var_dump($this->a[0]());
 	}
 }
diff --git a/Zend/tests/closure_028.phpt b/Zend/tests/closure_028.phpt
index 35840755da7..c28849f4481 100644
--- a/Zend/tests/closure_028.phpt
+++ b/Zend/tests/closure_028.phpt
@@ -3,8 +3,8 @@ Closure 028: Trying to use lambda directly in foreach
 --FILE--
 <?php
 
-foreach (function(){ return 1; } as $y) { 
-	var_dump($y);	
+foreach (function(){ return 1; } as $y) {
+	var_dump($y);
 }
 
 print "ok\n";
diff --git a/Zend/tests/closure_035.phpt b/Zend/tests/closure_035.phpt
index e39a991ab6b..d06d0bb25bd 100644
--- a/Zend/tests/closure_035.phpt
+++ b/Zend/tests/closure_035.phpt
@@ -7,7 +7,7 @@ $x = function () use (&$x) {
 	$h = function () use ($x) {
 		var_dump($x);
 		return 1;
-	};	
+	};
 	return $h();
 };
 
diff --git a/Zend/tests/closure_036.phpt b/Zend/tests/closure_036.phpt
index 77d7ce6906b..8dd403fd566 100644
--- a/Zend/tests/closure_036.phpt
+++ b/Zend/tests/closure_036.phpt
@@ -5,11 +5,11 @@ Closure 036: Rebinding closures, keep calling scope
 
 class A {
 	private $x;
-	
+
 	public function __construct($v) {
 		$this->x = $v;
 	}
-	
+
 	public function getIncrementor() {
 		return function() { return ++$this->x; };
 	}
diff --git a/Zend/tests/closure_038.phpt b/Zend/tests/closure_038.phpt
index 6d659be9104..568db49b81b 100644
--- a/Zend/tests/closure_038.phpt
+++ b/Zend/tests/closure_038.phpt
@@ -5,11 +5,11 @@ Closure 038: Rebinding closures, change scope, different runtime type
 
 class A {
 	private $x;
-	
+
 	public function __construct($v) {
 		$this->x = $v;
 	}
-	
+
 	public function getIncrementor() {
 		return function() { return ++$this->x; };
 	}
diff --git a/Zend/tests/closure_039.phpt b/Zend/tests/closure_039.phpt
index 5de432459ff..f72223d206d 100644
--- a/Zend/tests/closure_039.phpt
+++ b/Zend/tests/closure_039.phpt
@@ -5,11 +5,11 @@ Closure 039: Rebinding closures, change scope, same runtime type
 
 class A {
 	private $x;
-	
+
 	public function __construct($v) {
 		$this->x = $v;
 	}
-	
+
 	public function getIncrementor() {
 		return function() { return ++$this->x; };
 	}
diff --git a/Zend/tests/closure_040.phpt b/Zend/tests/closure_040.phpt
index a1b6cd604af..231ab4081cb 100644
--- a/Zend/tests/closure_040.phpt
+++ b/Zend/tests/closure_040.phpt
@@ -6,11 +6,11 @@ Closure 040: Rebinding closures, bad arguments
 class A {
 	private $x;
 	private static $xs = 10;
-	
+
 	public function __construct($v) {
 		$this->x = $v;
 	}
-	
+
 	public function getIncrementor() {
 		return function() { return ++$this->x; };
 	}
diff --git a/Zend/tests/closure_047.phpt b/Zend/tests/closure_047.phpt
index 2377bef6b7e..736793448df 100644
--- a/Zend/tests/closure_047.phpt
+++ b/Zend/tests/closure_047.phpt
@@ -4,13 +4,13 @@ Closure 047: Use in preg_replace_callback() using variables by reference
 <?php
 
 function replace_variables($text, $params) {
-	
+
 	preg_replace_callback( '/(\?)/', function($matches) use (&$params, &$text) {
-	
+
 		$text = preg_replace( '/(\?)/', array_shift( $params ), $text, 1 );
-	
+
 	}, $text );
-	
+
 	return $text;
 }
 
diff --git a/Zend/tests/closure_048.phpt b/Zend/tests/closure_048.phpt
index 40f2e2fbac8..47781641a84 100644
--- a/Zend/tests/closure_048.phpt
+++ b/Zend/tests/closure_048.phpt
@@ -4,13 +4,13 @@ Closure 048: Use in preg_replace_callback() using variables by reference
 <?php
 
 function replace_variables($text, $params) {
-	
+
 	$c = function($matches) use (&$params, &$text) {
 		$text = preg_replace( '/(\?)/', array_shift( $params ), $text, 1 );
 	};
 
 	preg_replace_callback( '/(\?)/', $c, $text );
-	
+
 	return $text;
 }
 
diff --git a/Zend/tests/compare_001.phpt b/Zend/tests/compare_001.phpt
index 51243da5df3..d9f3f080bc8 100644
--- a/Zend/tests/compare_001.phpt
+++ b/Zend/tests/compare_001.phpt
@@ -44,11 +44,11 @@ foreach($a as $var) {
 		my_dump($a[$i]);
 		echo "\n";
 	}
-}	
+}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} == array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != string(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != int(1)
diff --git a/Zend/tests/compare_001_64bit.phpt b/Zend/tests/compare_001_64bit.phpt
index 6d5a175d3d3..f72f91d17bb 100644
--- a/Zend/tests/compare_001_64bit.phpt
+++ b/Zend/tests/compare_001_64bit.phpt
@@ -44,11 +44,11 @@ foreach($a as $var) {
 		my_dump($a[$i]);
 		echo "\n";
 	}
-}	
+}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} == array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != string(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} != int(1)
diff --git a/Zend/tests/compare_002.phpt b/Zend/tests/compare_002.phpt
index 5e5009c323d..cbf2c953e38 100644
--- a/Zend/tests/compare_002.phpt
+++ b/Zend/tests/compare_002.phpt
@@ -44,11 +44,11 @@ foreach($a as $var) {
 		my_dump($a[$i]);
 		echo "\n";
 	}
-}	
+}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} === array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== string(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== int(1)
diff --git a/Zend/tests/compare_002_64bit.phpt b/Zend/tests/compare_002_64bit.phpt
index 517e7b94328..a18269e9f35 100644
--- a/Zend/tests/compare_002_64bit.phpt
+++ b/Zend/tests/compare_002_64bit.phpt
@@ -44,11 +44,11 @@ foreach($a as $var) {
 		my_dump($a[$i]);
 		echo "\n";
 	}
-}	
+}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} === array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== string(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} !== int(1)
diff --git a/Zend/tests/compare_003.phpt b/Zend/tests/compare_003.phpt
index 3b293d1daa1..4cb7a027cd9 100644
--- a/Zend/tests/compare_003.phpt
+++ b/Zend/tests/compare_003.phpt
@@ -44,11 +44,11 @@ foreach($a as $var) {
 		my_dump($a[$i]);
 		echo "\n";
 	}
-}	
+}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(1)
diff --git a/Zend/tests/compare_003_64bit.phpt b/Zend/tests/compare_003_64bit.phpt
index eca4b5c8ff9..2c361257ae4 100644
--- a/Zend/tests/compare_003_64bit.phpt
+++ b/Zend/tests/compare_003_64bit.phpt
@@ -44,11 +44,11 @@ foreach($a as $var) {
 		my_dump($a[$i]);
 		echo "\n";
 	}
-}	
+}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(1)
diff --git a/Zend/tests/compare_004.phpt b/Zend/tests/compare_004.phpt
index 6f6d29b1fb4..1d13f363345 100644
--- a/Zend/tests/compare_004.phpt
+++ b/Zend/tests/compare_004.phpt
@@ -44,11 +44,11 @@ foreach($a as $var) {
 		my_dump($a[$i]);
 		echo "\n";
 	}
-}	
+}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(1)
diff --git a/Zend/tests/compare_004_64bit.phpt b/Zend/tests/compare_004_64bit.phpt
index ef5083943be..8a69ae7816a 100644
--- a/Zend/tests/compare_004_64bit.phpt
+++ b/Zend/tests/compare_004_64bit.phpt
@@ -44,11 +44,11 @@ foreach($a as $var) {
 		my_dump($a[$i]);
 		echo "\n";
 	}
-}	
+}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(1)
diff --git a/Zend/tests/compare_005.phpt b/Zend/tests/compare_005.phpt
index 38f4200ef70..43ed96e70bd 100644
--- a/Zend/tests/compare_005.phpt
+++ b/Zend/tests/compare_005.phpt
@@ -44,11 +44,11 @@ foreach($a as $var) {
 		my_dump($a[$i]);
 		echo "\n";
 	}
-}	
+}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(1)
diff --git a/Zend/tests/compare_005_64bit.phpt b/Zend/tests/compare_005_64bit.phpt
index 86dcbe50f13..821f2a0ee4f 100644
--- a/Zend/tests/compare_005_64bit.phpt
+++ b/Zend/tests/compare_005_64bit.phpt
@@ -44,11 +44,11 @@ foreach($a as $var) {
 		my_dump($a[$i]);
 		echo "\n";
 	}
-}	
+}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= string(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} >= int(1)
diff --git a/Zend/tests/compare_006.phpt b/Zend/tests/compare_006.phpt
index 43389fb250f..1c212c5487f 100644
--- a/Zend/tests/compare_006.phpt
+++ b/Zend/tests/compare_006.phpt
@@ -44,11 +44,11 @@ foreach($a as $var) {
 		my_dump($a[$i]);
 		echo "\n";
 	}
-}	
+}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(1)
diff --git a/Zend/tests/compare_006_64bit.phpt b/Zend/tests/compare_006_64bit.phpt
index 3870e189f0e..41973a990d7 100644
--- a/Zend/tests/compare_006_64bit.phpt
+++ b/Zend/tests/compare_006_64bit.phpt
@@ -44,11 +44,11 @@ foreach($a as $var) {
 		my_dump($a[$i]);
 		echo "\n";
 	}
-}	
+}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} <= array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)}
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > string(0) ""
 array(3) {  [0]=>  int(1)  [1]=>  int(2)  [2]=>  int(3)} > int(1)
diff --git a/Zend/tests/concat_001.phpt b/Zend/tests/concat_001.phpt
index 1307c28930a..805478a0cf6 100644
--- a/Zend/tests/concat_001.phpt
+++ b/Zend/tests/concat_001.phpt
@@ -49,7 +49,7 @@ var_dump($d.$d);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 
 Notice: Array to string conversion in %sconcat_001.php on line %d
 string(24) "Arraythis is test object"
diff --git a/Zend/tests/concat_002.phpt b/Zend/tests/concat_002.phpt
index 3cb182ee7d7..4ec4f1fb322 100644
--- a/Zend/tests/concat_002.phpt
+++ b/Zend/tests/concat_002.phpt
@@ -18,7 +18,7 @@ for ($i = 0; $i < 25; ++$i) {
 var_dump(strlen($result));
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 int(33554432)
 Done
 
diff --git a/Zend/tests/constant_expressions_classes.phpt b/Zend/tests/constant_expressions_classes.phpt
index 6298ff66d63..e394442b859 100644
--- a/Zend/tests/constant_expressions_classes.phpt
+++ b/Zend/tests/constant_expressions_classes.phpt
@@ -21,7 +21,7 @@ $classlist = [
   'G' => 'class G extends F { const XX = parent::XX." extended by G"; public static function get_me($x = "got ".self::XX) { return $x; } }',
 ];
 
-spl_autoload_register(function ($class) use ($classlist) { 
+spl_autoload_register(function ($class) use ($classlist) {
 	if (isset($classlist[$class])) {
 		eval($classlist[$class]);
 	} else {
@@ -36,7 +36,7 @@ printf("E::getHW() = %s\n", E::getHW());
 printf("G::get_me() = %s\n", G::get_me());
 
 ?>
---EXPECT-- 
+--EXPECT--
 B::HW = this is A extended by B
 D::HW = this is space1\C extented by D
 E::getHW() = this is A extended by B
diff --git a/Zend/tests/constants_009.phpt b/Zend/tests/constants_009.phpt
index ea986dd3c7e..35c64dff162 100644
--- a/Zend/tests/constants_009.phpt
+++ b/Zend/tests/constants_009.phpt
@@ -7,7 +7,7 @@ namespace foo\x;
 
 const x = 2;
 
-class x { 
+class x {
 	const x = 1;
 }
 
diff --git a/Zend/tests/debug_backtrace_options.phpt b/Zend/tests/debug_backtrace_options.phpt
index 1b2d7e54850..a35eb64ff62 100644
--- a/Zend/tests/debug_backtrace_options.phpt
+++ b/Zend/tests/debug_backtrace_options.phpt
@@ -29,8 +29,8 @@ function doit($a, $b, $how)
 }
 
 class foo {
-	protected function doCall($dowhat, $how) 
-	{  
+	protected function doCall($dowhat, $how)
+	{
 	   $dowhat('a','b', $how);
 	}
 	static function statCall($dowhat, $how)
diff --git a/Zend/tests/debug_backtrace_with_include_and_this.phpt b/Zend/tests/debug_backtrace_with_include_and_this.phpt
index 695c8d21503..7cc868105a2 100644
--- a/Zend/tests/debug_backtrace_with_include_and_this.phpt
+++ b/Zend/tests/debug_backtrace_with_include_and_this.phpt
@@ -1,5 +1,5 @@
 --TEST--
-debug_backtrace segmentation fault with include and error handler 
+debug_backtrace segmentation fault with include and error handler
 --FILE--
 <?php
 class CLWrapper {
diff --git a/Zend/tests/decrement_001.phpt b/Zend/tests/decrement_001.phpt
index 6ade8ad1639..b768b5a8e54 100644
--- a/Zend/tests/decrement_001.phpt
+++ b/Zend/tests/decrement_001.phpt
@@ -32,7 +32,7 @@ foreach ($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {
   [0]=>
   int(1)
diff --git a/Zend/tests/decrement_001_64bit.phpt b/Zend/tests/decrement_001_64bit.phpt
index 7ad24b76f73..ac4f10d682a 100644
--- a/Zend/tests/decrement_001_64bit.phpt
+++ b/Zend/tests/decrement_001_64bit.phpt
@@ -32,7 +32,7 @@ foreach ($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {
   [0]=>
   int(1)
diff --git a/Zend/tests/dereference_001.phpt b/Zend/tests/dereference_001.phpt
index e09ad2992ab..7873d624aa9 100644
--- a/Zend/tests/dereference_001.phpt
+++ b/Zend/tests/dereference_001.phpt
@@ -12,11 +12,11 @@ var_dump(a()[1][0]); // int(5)
 function b() {
 	return array();
 }
-var_dump(b()[0]); // Notice: Undefined offset: 0 
+var_dump(b()[0]); // Notice: Undefined offset: 0
 
 class foo {
-	public $y = 1; 
-	
+	public $y = 1;
+
 	public function test() {
 		return array(array(array('foobar')));
 	}
diff --git a/Zend/tests/dereference_007.phpt b/Zend/tests/dereference_007.phpt
index 2f7d66fd2e6..e7df6a422de 100644
--- a/Zend/tests/dereference_007.phpt
+++ b/Zend/tests/dereference_007.phpt
@@ -7,17 +7,17 @@ error_reporting(E_ALL);
 
 class foo {
 	public $x = array();
-		
+
 	public function b() {
 		return $this->x;
 	}
-	
+
 	public function c() {
 		return $x;
 	}
-	
+
 	static public function d() {
-		
+
 	}
 }
 
diff --git a/Zend/tests/dereference_008.phpt b/Zend/tests/dereference_008.phpt
index 01c828f0c87..c615b9cd859 100644
--- a/Zend/tests/dereference_008.phpt
+++ b/Zend/tests/dereference_008.phpt
@@ -7,7 +7,7 @@ error_reporting(E_ALL);
 
 class foo {
 	public $x = array(1);
-		
+
 	public function &b() {
 		return $this->x;
 	}
diff --git a/Zend/tests/dereference_011.phpt b/Zend/tests/dereference_011.phpt
index 17dc8b346b5..43fec9b92aa 100644
--- a/Zend/tests/dereference_011.phpt
+++ b/Zend/tests/dereference_011.phpt
@@ -7,7 +7,7 @@ error_reporting(E_ALL);
 
 class foo {
 	public $arr;
-	
+
 	public function &a() {
 		return $this->arr;
 	}
diff --git a/Zend/tests/dereference_012.phpt b/Zend/tests/dereference_012.phpt
index f3ba774f064..ab70957a0a4 100644
--- a/Zend/tests/dereference_012.phpt
+++ b/Zend/tests/dereference_012.phpt
@@ -5,12 +5,12 @@ Testing array dereferencing on return of a method with and without reference
 
 class foo {
 	static $x = array();
-	
+
 	public function &a() {
 		self::$x = array(1, 2, 3);
 		return self::$x;
 	}
-	
+
 	public function b() {
 		$x = array(1);
 		$x[] = 2;
diff --git a/Zend/tests/dereference_013.phpt b/Zend/tests/dereference_013.phpt
index cfd89e71b53..139cd480b7b 100644
--- a/Zend/tests/dereference_013.phpt
+++ b/Zend/tests/dereference_013.phpt
@@ -7,7 +7,7 @@ error_reporting(E_ALL);
 
 class foo {
 	public $x = array(2);
-		
+
 	public function __call($x, $y) {
 		if (count($this->x) == 1) {
 			$this->x[] = $y[0];
diff --git a/Zend/tests/dereference_014.phpt b/Zend/tests/dereference_014.phpt
index 859ac933480..f8910dd016c 100644
--- a/Zend/tests/dereference_014.phpt
+++ b/Zend/tests/dereference_014.phpt
@@ -8,11 +8,11 @@ error_reporting(E_ALL);
 class foo {
 	public $x;
 	static public $y;
-		
+
 	public function a() {
 		return $this->x;
 	}
-	
+
 	static public function b() {
 		return self::$y;
 	}
diff --git a/Zend/tests/div_001.phpt b/Zend/tests/div_001.phpt
index 5fa264a11e5..b53c4cdc312 100644
--- a/Zend/tests/div_001.phpt
+++ b/Zend/tests/div_001.phpt
@@ -25,7 +25,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 float(394758.39454545)
 float(394758.39454545)
 float(394758.39454545)
diff --git a/Zend/tests/div_002.phpt b/Zend/tests/div_002.phpt
index bf5d512a651..be7b38e5b26 100644
--- a/Zend/tests/div_002.phpt
+++ b/Zend/tests/div_002.phpt
@@ -17,7 +17,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Exception: Unsupported operand types
 
 Fatal error: Uncaught Error: Unsupported operand types in %s:%d
diff --git a/Zend/tests/double_to_string.phpt b/Zend/tests/double_to_string.phpt
index 2948b0b54cc..a778017a63d 100644
--- a/Zend/tests/double_to_string.phpt
+++ b/Zend/tests/double_to_string.phpt
@@ -32,7 +32,7 @@ foreach ($doubles as $d) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(7) "2.9E+17"
 string(7) "2.9E+14"
 string(%d) "2%s"
diff --git a/Zend/tests/dynamic_call_001.phpt b/Zend/tests/dynamic_call_001.phpt
index 377ebf222e3..7f8a6c0b3d2 100644
--- a/Zend/tests/dynamic_call_001.phpt
+++ b/Zend/tests/dynamic_call_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
 Testing dynamic call to constructor (old-style)
 --FILE--
-<?php 
+<?php
 
-class foo { 
+class foo {
 	public function foo() {
-	}	
+	}
 }
 
 $a = 'foo';
diff --git a/Zend/tests/dynamic_call_002.phpt b/Zend/tests/dynamic_call_002.phpt
index e94f642681d..a0908622583 100644
--- a/Zend/tests/dynamic_call_002.phpt
+++ b/Zend/tests/dynamic_call_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing dynamic call with invalid value for method name
 --FILE--
-<?php 
+<?php
 
 $a = new stdClass;
 
diff --git a/Zend/tests/dynamic_call_003.phpt b/Zend/tests/dynamic_call_003.phpt
index b740ab3d4ad..a400e335967 100644
--- a/Zend/tests/dynamic_call_003.phpt
+++ b/Zend/tests/dynamic_call_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing dynamic call with invalid method name
 --FILE--
-<?php 
+<?php
 
 $a = new stdClass;
 $b = 1;
diff --git a/Zend/tests/dynamic_call_004.phpt b/Zend/tests/dynamic_call_004.phpt
index ad507c29539..2f444b3ee68 100644
--- a/Zend/tests/dynamic_call_004.phpt
+++ b/Zend/tests/dynamic_call_004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing dynamic call with undefined variables
 --FILE--
-<?php 
+<?php
 
 $a::$b();
 
diff --git a/Zend/tests/errmsg_001.phpt b/Zend/tests/errmsg_001.phpt
index b85e032b909..c17764cdecd 100644
--- a/Zend/tests/errmsg_001.phpt
+++ b/Zend/tests/errmsg_001.phpt
@@ -3,14 +3,14 @@ errmsg: Non-abstract method must contain body
 --FILE--
 <?php
 
-abstract class test { 
-} 
+abstract class test {
+}
 
-class Impl extends Test { 
-	function Foo(); 
+class Impl extends Test {
+	function Foo();
 }
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Non-abstract method Impl::Foo() must contain body in %s on line %d
diff --git a/Zend/tests/errmsg_002.phpt b/Zend/tests/errmsg_002.phpt
index b7330c9f1f4..d1c4cb893f6 100644
--- a/Zend/tests/errmsg_002.phpt
+++ b/Zend/tests/errmsg_002.phpt
@@ -10,5 +10,5 @@ abstract class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Abstract function test::foo() cannot be declared private in %s on line %d
diff --git a/Zend/tests/errmsg_003.phpt b/Zend/tests/errmsg_003.phpt
index 64e458781d3..8daa66ae102 100644
--- a/Zend/tests/errmsg_003.phpt
+++ b/Zend/tests/errmsg_003.phpt
@@ -15,5 +15,5 @@ $t->foo();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot re-assign $this in %s on line %d
diff --git a/Zend/tests/errmsg_004.phpt b/Zend/tests/errmsg_004.phpt
index e6d22d6aba1..e322b66429a 100644
--- a/Zend/tests/errmsg_004.phpt
+++ b/Zend/tests/errmsg_004.phpt
@@ -11,5 +11,5 @@ foo() = 1;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Can't use function return value in write context in %s on line %d
diff --git a/Zend/tests/errmsg_005.phpt b/Zend/tests/errmsg_005.phpt
index 31c924cbb35..a7a2dc803c4 100644
--- a/Zend/tests/errmsg_005.phpt
+++ b/Zend/tests/errmsg_005.phpt
@@ -14,5 +14,5 @@ $t->foo() = 1;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Can't use method return value in write context in %s on line %d
diff --git a/Zend/tests/errmsg_006.phpt b/Zend/tests/errmsg_006.phpt
index 976093d854b..1165770d4b0 100644
--- a/Zend/tests/errmsg_006.phpt
+++ b/Zend/tests/errmsg_006.phpt
@@ -8,5 +8,5 @@ $b = $a[];
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use [] for reading in %s on line %d
diff --git a/Zend/tests/errmsg_007.phpt b/Zend/tests/errmsg_007.phpt
index 1ac296695dd..de0e9d1f10d 100644
--- a/Zend/tests/errmsg_007.phpt
+++ b/Zend/tests/errmsg_007.phpt
@@ -8,5 +8,5 @@ isset($a[]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use [] for reading in %s on line %d
diff --git a/Zend/tests/errmsg_008.phpt b/Zend/tests/errmsg_008.phpt
index e900603a899..f399afe4145 100644
--- a/Zend/tests/errmsg_008.phpt
+++ b/Zend/tests/errmsg_008.phpt
@@ -8,5 +8,5 @@ unset($a[]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use [] for unsetting in %s on line %d
diff --git a/Zend/tests/errmsg_009.phpt b/Zend/tests/errmsg_009.phpt
index 4834fa3e7a7..c65b40e0d5f 100644
--- a/Zend/tests/errmsg_009.phpt
+++ b/Zend/tests/errmsg_009.phpt
@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple access type modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/errmsg_010.phpt b/Zend/tests/errmsg_010.phpt
index ae2572f7bc0..b283d2ce650 100644
--- a/Zend/tests/errmsg_010.phpt
+++ b/Zend/tests/errmsg_010.phpt
@@ -1,5 +1,5 @@
 --TEST--
-errmsg: multiple access type modifiers are not allowed (methods) 
+errmsg: multiple access type modifiers are not allowed (methods)
 --FILE--
 <?php
 
@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Multiple access type modifiers are not allowed in %s on line %d
diff --git a/Zend/tests/errmsg_011.phpt b/Zend/tests/errmsg_011.phpt
index 9cfde0f8bbd..5333f3b23c9 100644
--- a/Zend/tests/errmsg_011.phpt
+++ b/Zend/tests/errmsg_011.phpt
@@ -12,5 +12,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot redeclare test::foo() in %s on line %d
diff --git a/Zend/tests/errmsg_012.phpt b/Zend/tests/errmsg_012.phpt
index 183785be043..c914125af5d 100644
--- a/Zend/tests/errmsg_012.phpt
+++ b/Zend/tests/errmsg_012.phpt
@@ -7,5 +7,5 @@ function __autoload($a, $b) {}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: __autoload() must take exactly 1 argument in %s on line %d
diff --git a/Zend/tests/errmsg_013.phpt b/Zend/tests/errmsg_013.phpt
index 327d75eae7d..606282458b8 100644
--- a/Zend/tests/errmsg_013.phpt
+++ b/Zend/tests/errmsg_013.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Default value for parameters with array type can only be an array or NULL in %s on line %d
diff --git a/Zend/tests/errmsg_015.phpt b/Zend/tests/errmsg_015.phpt
index 8e626e50921..948dee2f766 100644
--- a/Zend/tests/errmsg_015.phpt
+++ b/Zend/tests/errmsg_015.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__clone() cannot accept any arguments in %s on line %d
diff --git a/Zend/tests/errmsg_016.phpt b/Zend/tests/errmsg_016.phpt
index ccda07b9a36..05e10b41ab5 100644
--- a/Zend/tests/errmsg_016.phpt
+++ b/Zend/tests/errmsg_016.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__isset() must take exactly 1 argument in %s on line %d
diff --git a/Zend/tests/errmsg_017.phpt b/Zend/tests/errmsg_017.phpt
index df2b665687e..ba55c1a2c53 100644
--- a/Zend/tests/errmsg_017.phpt
+++ b/Zend/tests/errmsg_017.phpt
@@ -1,5 +1,5 @@
 --TEST--
-errmsg: __unset() must take exactly 1 argument 
+errmsg: __unset() must take exactly 1 argument
 --FILE--
 <?php
 
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__unset() must take exactly 1 argument in %s on line %d
diff --git a/Zend/tests/errmsg_018.phpt b/Zend/tests/errmsg_018.phpt
index dc136ef57bd..b803499e503 100644
--- a/Zend/tests/errmsg_018.phpt
+++ b/Zend/tests/errmsg_018.phpt
@@ -1,5 +1,5 @@
 --TEST--
-errmsg: static abstract function 
+errmsg: static abstract function
 --FILE--
 <?php
 
@@ -9,6 +9,6 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 
 Fatal error: Class test contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (test::foo) in %s on line %d
diff --git a/Zend/tests/errmsg_019.phpt b/Zend/tests/errmsg_019.phpt
index 2b45650cf27..bb8ebff5ab0 100644
--- a/Zend/tests/errmsg_019.phpt
+++ b/Zend/tests/errmsg_019.phpt
@@ -1,5 +1,5 @@
 --TEST--
-errmsg: __destruct() cannot take arguments 
+errmsg: __destruct() cannot take arguments
 --FILE--
 <?php
 
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Destructor test::__destruct() cannot take arguments in %s on line %d
diff --git a/Zend/tests/errmsg_020.phpt b/Zend/tests/errmsg_020.phpt
index 8199d5d06e4..636e29d01fe 100644
--- a/Zend/tests/errmsg_020.phpt
+++ b/Zend/tests/errmsg_020.phpt
@@ -9,6 +9,6 @@ phpinfo();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: phpinfo() has been disabled for security reasons in %s on line %d
 Done
diff --git a/Zend/tests/errmsg_021.phpt b/Zend/tests/errmsg_021.phpt
index 4e62f85111f..7514e683590 100644
--- a/Zend/tests/errmsg_021.phpt
+++ b/Zend/tests/errmsg_021.phpt
@@ -12,6 +12,6 @@ $t = new test;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: test() has been disabled for security reasons in %s on line %d
 Done
diff --git a/Zend/tests/errmsg_022.phpt b/Zend/tests/errmsg_022.phpt
index ea7b082f9ef..aba8d750c6e 100644
--- a/Zend/tests/errmsg_022.phpt
+++ b/Zend/tests/errmsg_022.phpt
@@ -10,5 +10,5 @@ foo(1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Only variables can be passed by reference in %s on line %d
diff --git a/Zend/tests/errmsg_023.phpt b/Zend/tests/errmsg_023.phpt
index 9fd7804ea46..4532e2ad3af 100644
--- a/Zend/tests/errmsg_023.phpt
+++ b/Zend/tests/errmsg_023.phpt
@@ -7,11 +7,11 @@ class test1 {
 	protected $var;
 }
 
-class test extends test1 { 
+class test extends test1 {
 	private $var;
 }
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Access level to test::$var must be protected (as in class test1) or weaker in %s on line %d
diff --git a/Zend/tests/errmsg_024.phpt b/Zend/tests/errmsg_024.phpt
index 011e6fdea9a..abfb2b9c237 100644
--- a/Zend/tests/errmsg_024.phpt
+++ b/Zend/tests/errmsg_024.phpt
@@ -13,5 +13,5 @@ class test extends test1 {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Done
diff --git a/Zend/tests/errmsg_026.phpt b/Zend/tests/errmsg_026.phpt
index 90fa87d4f1c..2144a0707b2 100644
--- a/Zend/tests/errmsg_026.phpt
+++ b/Zend/tests/errmsg_026.phpt
@@ -8,5 +8,5 @@ class stdclass {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot declare class stdclass, because the name is already in use in %s on line %d
diff --git a/Zend/tests/errmsg_027.phpt b/Zend/tests/errmsg_027.phpt
index f4fec6155c0..b2cd4e16555 100644
--- a/Zend/tests/errmsg_027.phpt
+++ b/Zend/tests/errmsg_027.phpt
@@ -12,5 +12,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Class declarations may not be nested in %s on line %d
diff --git a/Zend/tests/errmsg_028.phpt b/Zend/tests/errmsg_028.phpt
index 3331cb35bf5..12fd36384fb 100644
--- a/Zend/tests/errmsg_028.phpt
+++ b/Zend/tests/errmsg_028.phpt
@@ -8,5 +8,5 @@ class self {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use 'self' as class name as it is reserved in %s on line %d
diff --git a/Zend/tests/errmsg_029.phpt b/Zend/tests/errmsg_029.phpt
index 73b85ce6a51..e40cb2dc682 100644
--- a/Zend/tests/errmsg_029.phpt
+++ b/Zend/tests/errmsg_029.phpt
@@ -8,5 +8,5 @@ class parent {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use 'parent' as class name as it is reserved in %s on line %d
diff --git a/Zend/tests/errmsg_030.phpt b/Zend/tests/errmsg_030.phpt
index ab6ccbd41eb..c0d42263c34 100644
--- a/Zend/tests/errmsg_030.phpt
+++ b/Zend/tests/errmsg_030.phpt
@@ -8,5 +8,5 @@ class test extends self {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use 'self' as class name as it is reserved in %s on line %d
diff --git a/Zend/tests/errmsg_031.phpt b/Zend/tests/errmsg_031.phpt
index 6e356485492..c847a26e642 100644
--- a/Zend/tests/errmsg_031.phpt
+++ b/Zend/tests/errmsg_031.phpt
@@ -8,5 +8,5 @@ class test extends parent {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use 'parent' as class name as it is reserved in %s on line %d
diff --git a/Zend/tests/errmsg_032.phpt b/Zend/tests/errmsg_032.phpt
index 6e34604cd80..f21e269a891 100644
--- a/Zend/tests/errmsg_032.phpt
+++ b/Zend/tests/errmsg_032.phpt
@@ -11,5 +11,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Constructor test::__construct() cannot be static in %s on line %d
diff --git a/Zend/tests/errmsg_033.phpt b/Zend/tests/errmsg_033.phpt
index 96938900eca..e5f36912b02 100644
--- a/Zend/tests/errmsg_033.phpt
+++ b/Zend/tests/errmsg_033.phpt
@@ -11,5 +11,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Destructor test::__destruct() cannot be static in %s on line %d
diff --git a/Zend/tests/errmsg_034.phpt b/Zend/tests/errmsg_034.phpt
index 1494fe53213..a8bfc80b9a1 100644
--- a/Zend/tests/errmsg_034.phpt
+++ b/Zend/tests/errmsg_034.phpt
@@ -11,5 +11,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Clone method test::__clone() cannot be static in %s on line %d
diff --git a/Zend/tests/errmsg_035.phpt b/Zend/tests/errmsg_035.phpt
index 76cbe3d48b0..e8fa8da8e8a 100644
--- a/Zend/tests/errmsg_035.phpt
+++ b/Zend/tests/errmsg_035.phpt
@@ -8,5 +8,5 @@ class test implements self {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use 'self' as interface name as it is reserved in %s on line %d
diff --git a/Zend/tests/errmsg_036.phpt b/Zend/tests/errmsg_036.phpt
index d1f4274bd11..4f98f384d78 100644
--- a/Zend/tests/errmsg_036.phpt
+++ b/Zend/tests/errmsg_036.phpt
@@ -8,5 +8,5 @@ class test implements parent {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot use 'parent' as interface name as it is reserved in %s on line %d
diff --git a/Zend/tests/errmsg_037.phpt b/Zend/tests/errmsg_037.phpt
index 6b98bb33395..b67ce0b5d0c 100644
--- a/Zend/tests/errmsg_037.phpt
+++ b/Zend/tests/errmsg_037.phpt
@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Properties cannot be declared abstract in %s on line %d
diff --git a/Zend/tests/errmsg_038.phpt b/Zend/tests/errmsg_038.phpt
index 2927e945fee..6312ef64cef 100644
--- a/Zend/tests/errmsg_038.phpt
+++ b/Zend/tests/errmsg_038.phpt
@@ -9,5 +9,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot declare property test::$var final, the final modifier is allowed only for methods and classes in %s on line %d
diff --git a/Zend/tests/errmsg_039.phpt b/Zend/tests/errmsg_039.phpt
index 0000811879b..5371ba56c61 100644
--- a/Zend/tests/errmsg_039.phpt
+++ b/Zend/tests/errmsg_039.phpt
@@ -10,5 +10,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Cannot redeclare test::$var in %s on line %d
diff --git a/Zend/tests/errmsg_040.phpt b/Zend/tests/errmsg_040.phpt
index d5d2bf38d37..ec28bb71af0 100644
--- a/Zend/tests/errmsg_040.phpt
+++ b/Zend/tests/errmsg_040.phpt
@@ -9,7 +9,7 @@ class test {
 var_dump(test::TEST);
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {
   [0]=>
   int(1)
diff --git a/Zend/tests/errmsg_041.phpt b/Zend/tests/errmsg_041.phpt
index bfcafd261df..2a60652a426 100644
--- a/Zend/tests/errmsg_041.phpt
+++ b/Zend/tests/errmsg_041.phpt
@@ -7,5 +7,5 @@ var_dump("abc" instanceof stdclass);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: instanceof expects an object instance, constant given in %s on line %d
diff --git a/Zend/tests/errmsg_042.phpt b/Zend/tests/errmsg_042.phpt
index 3b4ea7c2678..3ed20415c41 100644
--- a/Zend/tests/errmsg_042.phpt
+++ b/Zend/tests/errmsg_042.phpt
@@ -9,5 +9,5 @@ foreach ($a as &$k=>$v) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Key element cannot be a reference in %s on line %d
diff --git a/Zend/tests/error_reporting01.phpt b/Zend/tests/error_reporting01.phpt
index 5153d41eab4..75c4189ce29 100644
--- a/Zend/tests/error_reporting01.phpt
+++ b/Zend/tests/error_reporting01.phpt
@@ -11,7 +11,7 @@ function foo($arg) {
 function bar() {
 	throw new Exception("test");
 }
-	
+
 try {
 	@foo(@bar());
 } catch (Exception $e) {
@@ -21,6 +21,6 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 int(32767)
 Done
diff --git a/Zend/tests/error_reporting02.phpt b/Zend/tests/error_reporting02.phpt
index f4786639c08..6ceb8deaa37 100644
--- a/Zend/tests/error_reporting02.phpt
+++ b/Zend/tests/error_reporting02.phpt
@@ -12,7 +12,7 @@ function bar() {
 	error_reporting(E_ALL|E_STRICT);
 	throw new Exception("test");
 }
-	
+
 try {
 	@foo(@bar());
 } catch (Exception $e) {
@@ -22,6 +22,6 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 int(32767)
 Done
diff --git a/Zend/tests/error_reporting03.phpt b/Zend/tests/error_reporting03.phpt
index 3c6595ceaba..959a29b557f 100644
--- a/Zend/tests/error_reporting03.phpt
+++ b/Zend/tests/error_reporting03.phpt
@@ -29,7 +29,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Undefined variable: undef2 in %s on line %d
 int(32767)
 Done
diff --git a/Zend/tests/error_reporting05.phpt b/Zend/tests/error_reporting05.phpt
index fe5374c4f7a..6ea76fda3ea 100644
--- a/Zend/tests/error_reporting05.phpt
+++ b/Zend/tests/error_reporting05.phpt
@@ -4,7 +4,7 @@ testing @ and error_reporting - 5
 <?php
 
 error_reporting(E_ALL);
-	
+
 class test {
 	function __get($name) {
 		return $undef_name;
@@ -26,7 +26,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Undefined variable: undef_value in %s on line %d
 
 Notice: Undefined variable: undef_name in %s on line %d
diff --git a/Zend/tests/error_reporting06.phpt b/Zend/tests/error_reporting06.phpt
index 175ea37e809..f3c4bca6531 100644
--- a/Zend/tests/error_reporting06.phpt
+++ b/Zend/tests/error_reporting06.phpt
@@ -4,7 +4,7 @@ testing @ and error_reporting - 6
 <?php
 
 error_reporting(E_ALL);
-	
+
 function foo1($arg) {
 }
 
@@ -25,6 +25,6 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(32767)
 Done
diff --git a/Zend/tests/error_reporting07.phpt b/Zend/tests/error_reporting07.phpt
index 09b7690d3cf..fe7278cbec5 100644
--- a/Zend/tests/error_reporting07.phpt
+++ b/Zend/tests/error_reporting07.phpt
@@ -4,7 +4,7 @@ testing @ and error_reporting - 7
 <?php
 
 error_reporting(E_ALL);
-	
+
 function foo1($arg) {
 }
 
@@ -25,6 +25,6 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(32767)
 Done
diff --git a/Zend/tests/error_reporting08.phpt b/Zend/tests/error_reporting08.phpt
index c9945046eef..13d32ca4bc8 100644
--- a/Zend/tests/error_reporting08.phpt
+++ b/Zend/tests/error_reporting08.phpt
@@ -4,7 +4,7 @@ testing @ and error_reporting - 8
 <?php
 
 error_reporting(E_ALL);
-	
+
 function foo1($arg) {
 }
 
@@ -26,7 +26,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Undefined variable: undef3 in %s on line %d
 int(32767)
 Done
diff --git a/Zend/tests/error_reporting09.phpt b/Zend/tests/error_reporting09.phpt
index 8d4e7e1b174..a3c254d94d6 100644
--- a/Zend/tests/error_reporting09.phpt
+++ b/Zend/tests/error_reporting09.phpt
@@ -4,7 +4,7 @@ testing @ and error_reporting - 9
 <?php
 
 error_reporting(E_ALL);
-	
+
 function bar() {
 	echo @$blah;
 	echo $undef2;
@@ -16,14 +16,14 @@ function foo() {
 	echo $blah;
 	return bar();
 }
-	
-@foo();					
+
+@foo();
 
 var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Undefined variable: blah in %s on line %d
 
 Notice: Undefined variable: undef2 in %s on line %d
diff --git a/Zend/tests/error_reporting10.phpt b/Zend/tests/error_reporting10.phpt
index 12b1db57bae..1b6501a9756 100644
--- a/Zend/tests/error_reporting10.phpt
+++ b/Zend/tests/error_reporting10.phpt
@@ -29,7 +29,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(32767)
 int(32759)
 Done
diff --git a/Zend/tests/exception_002.phpt b/Zend/tests/exception_002.phpt
index 25f0c61f9d2..4554200aab5 100644
--- a/Zend/tests/exception_002.phpt
+++ b/Zend/tests/exception_002.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Testing exception and GOTO
 --FILE--
-<?php 
+<?php
 
 goto foo;
 
 try {
 	print 1;
-	
+
 	foo:
 	print 2;
 } catch (Exception $e) {
-	
+
 }
 
 ?>
diff --git a/Zend/tests/exception_003.phpt b/Zend/tests/exception_003.phpt
index 1f60f7874e1..813246c5dd5 100644
--- a/Zend/tests/exception_003.phpt
+++ b/Zend/tests/exception_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Throwing exception in global scope
 --FILE--
-<?php 
+<?php
 
 throw new Exception(1);
 
diff --git a/Zend/tests/exception_004.phpt b/Zend/tests/exception_004.phpt
index 9afe81f9c17..29288e25acb 100644
--- a/Zend/tests/exception_004.phpt
+++ b/Zend/tests/exception_004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Throwing exception using a class that isn't derived from the Exception base class
 --FILE--
-<?php 
+<?php
 
 error_reporting(E_ALL|E_STRICT);
 
diff --git a/Zend/tests/exception_008.phpt b/Zend/tests/exception_008.phpt
index fe4ee0d8eab..b88198302be 100644
--- a/Zend/tests/exception_008.phpt
+++ b/Zend/tests/exception_008.phpt
@@ -13,7 +13,7 @@ class TestFirst
 class TestSecond
 {
 	function __destruct() {
-		throw new Exception("Second");		
+		throw new Exception("Second");
 	}
 }
 
diff --git a/Zend/tests/exception_011.phpt b/Zend/tests/exception_011.phpt
index 850a3ecd9f8..a9905cc2f71 100644
--- a/Zend/tests/exception_011.phpt
+++ b/Zend/tests/exception_011.phpt
@@ -4,7 +4,7 @@ Test exception doesn't cause RSHUTDOWN bypass, variation 0
 assert.bail=1
 assert.exception=1
 --FILE--
-<?php 
+<?php
 
 define ("XXXXX", 1);
 assert(false);
diff --git a/Zend/tests/exception_012.phpt b/Zend/tests/exception_012.phpt
index a28e1643f55..4a1070330a1 100644
--- a/Zend/tests/exception_012.phpt
+++ b/Zend/tests/exception_012.phpt
@@ -4,7 +4,7 @@ Test exception doesn't cause RSHUTDOWN bypass, variation 1
 assert.bail=1
 assert.exception=1
 --FILE--
-<?php 
+<?php
 
 $func = create_function('', 'define("Mommy", 1); assert(false);');
 $func();
diff --git a/Zend/tests/exception_handler_001.phpt b/Zend/tests/exception_handler_001.phpt
index 8f6572ef017..7a85cff0212 100644
--- a/Zend/tests/exception_handler_001.phpt
+++ b/Zend/tests/exception_handler_001.phpt
@@ -16,5 +16,5 @@ throw new test();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(12) "test thrown!"
diff --git a/Zend/tests/exception_handler_002.phpt b/Zend/tests/exception_handler_002.phpt
index 5fd018f32c0..da57572300d 100644
--- a/Zend/tests/exception_handler_002.phpt
+++ b/Zend/tests/exception_handler_002.phpt
@@ -17,7 +17,7 @@ throw new test();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(12) "test thrown!"
 
 Fatal error: Uncaught Exception in %sexception_handler_002.php:7
diff --git a/Zend/tests/exception_handler_003.phpt b/Zend/tests/exception_handler_003.phpt
index 137a6cabb4c..7e1636a0cf9 100644
--- a/Zend/tests/exception_handler_003.phpt
+++ b/Zend/tests/exception_handler_003.phpt
@@ -20,5 +20,5 @@ throw new Exception();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(17) "Exception thrown!"
diff --git a/Zend/tests/exception_handler_004.phpt b/Zend/tests/exception_handler_004.phpt
index bf581bbed13..69a4136b088 100644
--- a/Zend/tests/exception_handler_004.phpt
+++ b/Zend/tests/exception_handler_004.phpt
@@ -10,7 +10,7 @@ set_exception_handler("foo", "bar");
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: set_exception_handler() expects the argument (fo) to be a valid callback in %s on line %d
 
 Warning: set_exception_handler() expects the argument (::) to be a valid callback in %s on line %d
diff --git a/Zend/tests/exception_handler_005.phpt b/Zend/tests/exception_handler_005.phpt
index cc99bc6230e..ca0ae07f81d 100644
--- a/Zend/tests/exception_handler_005.phpt
+++ b/Zend/tests/exception_handler_005.phpt
@@ -19,5 +19,5 @@ throw new excEption();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(25) "foo1(): Exception thrown!"
diff --git a/Zend/tests/exception_handler_006.phpt b/Zend/tests/exception_handler_006.phpt
index 05a5d927fa4..904bb42383a 100644
--- a/Zend/tests/exception_handler_006.phpt
+++ b/Zend/tests/exception_handler_006.phpt
@@ -21,5 +21,5 @@ throw new excEption();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(24) "foo(): Exception thrown!"
diff --git a/Zend/tests/foreach.phpt b/Zend/tests/foreach.phpt
index 041a7636ed9..0835e40aaf6 100644
--- a/Zend/tests/foreach.phpt
+++ b/Zend/tests/foreach.phpt
@@ -12,7 +12,7 @@ foreach($foo as $key => &$val) {
 }
 var_dump($foo);
 ?>
---EXPECT--	
+--EXPECT--
 array(4) {
   [0]=>
   int(2)
diff --git a/Zend/tests/foreach_005.phpt b/Zend/tests/foreach_005.phpt
index 6ed9fe940bf..063dc70de06 100644
--- a/Zend/tests/foreach_005.phpt
+++ b/Zend/tests/foreach_005.phpt
@@ -6,7 +6,7 @@ $a = [1,2,3];
 foreach($a as &$x) {
 	foreach($a as &$y) {
 		echo "$x-$y\n";
-		$y++; 
+		$y++;
 	}
 }
 ?>
diff --git a/Zend/tests/foreach_009.phpt b/Zend/tests/foreach_009.phpt
index 6ce83846425..754d9acb2f3 100644
--- a/Zend/tests/foreach_009.phpt
+++ b/Zend/tests/foreach_009.phpt
@@ -9,7 +9,7 @@ foreach ($a as &$ref) {
 		echo "$ref-$ref2\n";
 		if ($ref == 5 && $ref2 == 6) {
 			$a[42] = 8;
-		}	
+		}
 	}
 }
 ?>
diff --git a/Zend/tests/foreach_010.phpt b/Zend/tests/foreach_010.phpt
index 6ba7e7e9fd7..a86f87f6df8 100644
--- a/Zend/tests/foreach_010.phpt
+++ b/Zend/tests/foreach_010.phpt
@@ -9,7 +9,7 @@ foreach ($o as $v1) {
 		echo "$v1-$v2\n";
 		if ($v1 == 5 && $v2 == 6) {
 			$o->i = 8;
-		}	
+		}
 	}
 }
 ?>
diff --git a/Zend/tests/foreach_list_002.phpt b/Zend/tests/foreach_list_002.phpt
index 1a7be521b26..d84f3dd9d43 100644
--- a/Zend/tests/foreach_list_002.phpt
+++ b/Zend/tests/foreach_list_002.phpt
@@ -10,7 +10,7 @@ foreach (array(array(1,2), array(3,4)) as list($a, )) {
 $array = [['a', 'b'], 'c', 'd'];
 
 foreach($array as list(, $a)) {
-   var_dump($a); 
+   var_dump($a);
 }
 
 ?>
diff --git a/Zend/tests/foreach_undefined.phpt b/Zend/tests/foreach_undefined.phpt
index 101d9839e98..aa4a160e6c7 100644
--- a/Zend/tests/foreach_undefined.phpt
+++ b/Zend/tests/foreach_undefined.phpt
@@ -7,7 +7,7 @@ foreach($a as $val);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Undefined variable: a in %s on line %d
 
 Warning: Invalid argument supplied for foreach() in %s on line %d
diff --git a/Zend/tests/foreach_unset_globals.phpt b/Zend/tests/foreach_unset_globals.phpt
index 188c70ab18d..7d6a14e3750 100644
--- a/Zend/tests/foreach_unset_globals.phpt
+++ b/Zend/tests/foreach_unset_globals.phpt
@@ -11,7 +11,7 @@ foreach ($arr as $key => $val) {
 var_dump($arr);
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(2) {
   ["a"]=>
   int(1)
diff --git a/Zend/tests/function_exists_basic.phpt b/Zend/tests/function_exists_basic.phpt
index 469e3d8c9a4..58322315513 100644
--- a/Zend/tests/function_exists_basic.phpt
+++ b/Zend/tests/function_exists_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-function_exists function : basic functionality 
+function_exists function : basic functionality
 --FILE--
 <?php
-/* 
+/*
  * proto bool function_exists(string function_name)
  * Function is implemented in Zend/zend_builtin_functions.c
-*/ 
+*/
 
 echo "*** Testing function_exists() : basic functionality ***\n";
 
diff --git a/Zend/tests/function_exists_error.phpt b/Zend/tests/function_exists_error.phpt
index cbc3908f12b..8ce8a928859 100644
--- a/Zend/tests/function_exists_error.phpt
+++ b/Zend/tests/function_exists_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test function_exists() function : error conditions 
+Test function_exists() function : error conditions
 --FILE--
 <?php
-/* 
+/*
  * proto bool function_exists(string function_name)
  * Function is implemented in Zend/zend_builtin_functions.c
-*/ 
+*/
 
 echo "*** Testing function_exists() : error conditions ***\n";
 
diff --git a/Zend/tests/function_exists_variation1.phpt b/Zend/tests/function_exists_variation1.phpt
index 16b05fc0363..fc26f1e80ed 100644
--- a/Zend/tests/function_exists_variation1.phpt
+++ b/Zend/tests/function_exists_variation1.phpt
@@ -3,10 +3,10 @@ Test function_exists() function : usage variations - test values for $str argume
 --FILE--
 <?php
 
-/* 
+/*
  * proto bool function_exists(string function_name)
  * Function is implemented in Zend/zend_builtin_functions.c
-*/ 
+*/
 
 echo "*** Testing function_exists() function: with unexpected inputs for 'str' argument ***\n";
 
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
diff --git a/Zend/tests/gc_029_zts.phpt b/Zend/tests/gc_029_zts.phpt
index 5d16e833482..b291b6d92b6 100644
--- a/Zend/tests/gc_029_zts.phpt
+++ b/Zend/tests/gc_029_zts.phpt
@@ -1,6 +1,6 @@
 --TEST--
 GC 029: GC and destructors
---SKIPIF-- 
+--SKIPIF--
 <?php if (!PHP_ZTS) { print "skip only for zts build"; }
 --INI--
 zend.enable_gc=1
diff --git a/Zend/tests/generators/yield_from_multi_tree_exception.phpt b/Zend/tests/generators/yield_from_multi_tree_exception.phpt
index ec423606c29..2bdeedba7d9 100644
--- a/Zend/tests/generators/yield_from_multi_tree_exception.phpt
+++ b/Zend/tests/generators/yield_from_multi_tree_exception.phpt
@@ -29,7 +29,7 @@ for ($level = 1; $level < $levels; $level++) {
 	}
 }
 
-for ($i = 0; $i < 2; $i++) { 
+for ($i = 0; $i < 2; $i++) {
 	try {
 		foreach ($all as $gen) {
 			var_dump($gen->current());
diff --git a/Zend/tests/get_class_methods_001.phpt b/Zend/tests/get_class_methods_001.phpt
index a2a3d0ca209..877b41cbcd9 100644
--- a/Zend/tests/get_class_methods_001.phpt
+++ b/Zend/tests/get_class_methods_001.phpt
@@ -3,16 +3,16 @@ get_class_methods(): Testing scope
 --FILE--
 <?php
 
-abstract class X { 
+abstract class X {
 	public function a() { }
 	private function b() { }
-	protected function c() { }	
+	protected function c() { }
 }
 
 class Y extends X {
 	private function bb() { }
-	
-	static public function test() { 
+
+	static public function test() {
 		var_dump(get_class_methods('X'));
 		var_dump(get_class_methods('Y'));
 	}
diff --git a/Zend/tests/get_class_methods_002.phpt b/Zend/tests/get_class_methods_002.phpt
index 62f326c0531..b95d43d3e1f 100644
--- a/Zend/tests/get_class_methods_002.phpt
+++ b/Zend/tests/get_class_methods_002.phpt
@@ -3,7 +3,7 @@ get_class_methods(): Testing with interface
 --FILE--
 <?php
 
-interface A { 
+interface A {
 	function a();
 	function b();
 }
@@ -11,12 +11,12 @@ interface A {
 class B implements A {
 	public function a() { }
 	public function b() { }
-	
+
 	public function __construct() {
 		var_dump(get_class_methods('A'));
 		var_dump(get_class_methods('B'));
 	}
-	
+
 	public function __destruct() { }
 }
 
diff --git a/Zend/tests/get_class_methods_003.phpt b/Zend/tests/get_class_methods_003.phpt
index 5c3c09f4e07..982b7cbc0fa 100644
--- a/Zend/tests/get_class_methods_003.phpt
+++ b/Zend/tests/get_class_methods_003.phpt
@@ -3,7 +3,7 @@ get_class_methods(): Testing scope
 --FILE--
 <?php
 
-interface I { 
+interface I {
 	function aa();
 	function bb();
 	static function cc();
@@ -13,7 +13,7 @@ class X {
 	public function a() { }
 	protected function b() { }
 	private function c() { }
-	
+
 	static public function static_a() { }
 	static protected function static_b() { }
 	static private function static_c() { }
@@ -22,15 +22,15 @@ class X {
 class Y extends X implements I {
 	public function aa() { }
 	public function bb() { }
-	
+
 	static function cc() { }
-	
+
 	public function __construct() {
 		var_dump(get_class_methods('I'));
 		var_dump(get_class_methods('Y'));
 		var_dump(get_class_methods('X'));
 	}
-	
+
 	public function __destruct() { }
 }
 
diff --git a/Zend/tests/get_class_vars_002.phpt b/Zend/tests/get_class_vars_002.phpt
index 721ebe692e2..23531e458d4 100644
--- a/Zend/tests/get_class_vars_002.phpt
+++ b/Zend/tests/get_class_vars_002.phpt
@@ -19,9 +19,9 @@ class C extends B {
 	public function __construct() {
 		var_dump(get_class_vars('A'));
 		var_dump(get_class_vars('B'));
-		
+
 		var_dump($this->a, $this->b, $this->c);
-	}	
+	}
 }
 
 new C;
diff --git a/Zend/tests/get_class_vars_003.phpt b/Zend/tests/get_class_vars_003.phpt
index d2c82bb5937..5fe9f9971b3 100644
--- a/Zend/tests/get_class_vars_003.phpt
+++ b/Zend/tests/get_class_vars_003.phpt
@@ -13,7 +13,7 @@ class B extends A {
 	static public $aa = 4;
 	static private $bb = 5;
 	static protected $cc = 6;
-	
+
 	protected function __construct() {
 		var_dump(get_class_vars('C'));
 	}
@@ -26,7 +26,7 @@ class C extends B {
 
 	public function __construct() {
 		parent::__construct();
-	}	
+	}
 }
 
 new C;
diff --git a/Zend/tests/get_class_vars_004.phpt b/Zend/tests/get_class_vars_004.phpt
index 26cd461ba48..9b21d165e13 100644
--- a/Zend/tests/get_class_vars_004.phpt
+++ b/Zend/tests/get_class_vars_004.phpt
@@ -12,11 +12,11 @@ class A {
 
 	protected $c = 5;
 	static protected $C = 6;
-	
+
 	public function __construct() {
 		var_dump(get_class_vars('A'));
 	}
-	
+
 	static public function test() {
 		var_dump(get_class_vars('A'));
 	}
diff --git a/Zend/tests/get_class_vars_005.phpt b/Zend/tests/get_class_vars_005.phpt
index 51f54900a9a..47d28ca3369 100644
--- a/Zend/tests/get_class_vars_005.phpt
+++ b/Zend/tests/get_class_vars_005.phpt
@@ -13,7 +13,7 @@ class B extends A {
 	public function __construct() {
 		var_dump(get_class_vars('A'));
 		var_dump(get_class_vars('B'));
-	}	
+	}
 }
 
 var_dump(get_class_vars('A'));
diff --git a/Zend/tests/get_class_vars_006.phpt b/Zend/tests/get_class_vars_006.phpt
index d1c2844aeba..34da051fd51 100644
--- a/Zend/tests/get_class_vars_006.phpt
+++ b/Zend/tests/get_class_vars_006.phpt
@@ -21,7 +21,7 @@ class D extends B {
 	public function __construct() {
 		var_dump(get_class_vars('A'));
 		var_dump(get_class_vars('B'));
-		var_dump(get_class_vars('C'));		
+		var_dump(get_class_vars('C'));
 	}
 }
 
diff --git a/Zend/tests/get_defined_functions_basic.phpt b/Zend/tests/get_defined_functions_basic.phpt
index a849e32c78e..f782b90892c 100644
--- a/Zend/tests/get_defined_functions_basic.phpt
+++ b/Zend/tests/get_defined_functions_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-get_defined_functions() function : basic functionality 
+get_defined_functions() function : basic functionality
 --FILE--
 <?php
 
@@ -29,7 +29,7 @@ if (!is_array($func)) {
 
 if (!is_array($func["internal"])) {
  	echo "TEST FAILED: no element in result array with key 'internal'\n";
-} 	
+}
 
 $internal = $func["internal"];
 
@@ -37,7 +37,7 @@ $internal = $func["internal"];
 if (!in_array("cos", $internal) || !in_array("strlen", $internal)) {
  	echo "TEST FAILED: missing elements from 'internal' array\n";
  	var_dump($internal);
-} 
+}
 
 if (!is_array($func["user"])) {
  	echo "TEST FAILED: no element in result array with key 'user'\n";
@@ -49,7 +49,7 @@ if (count($user) == 2 && in_array("foo", $user) && in_array("helloworld", $user)
 } else {
 	echo "TEST FAILED: missing elements from 'user' array\n";
 	var_dump($user);
-}	
+}
 
 ?>
 ===Done===
diff --git a/Zend/tests/get_defined_functions_error.phpt b/Zend/tests/get_defined_functions_error.phpt
index fadd804b99e..1735446b2e8 100644
--- a/Zend/tests/get_defined_functions_error.phpt
+++ b/Zend/tests/get_defined_functions_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test get_defined_functions() function : error conditions 
+Test get_defined_functions() function : error conditions
 --FILE--
 <?php
 
@@ -17,7 +17,7 @@ $extra_arg = 10;
 $extra_arg2 = 20;
 var_dump( get_defined_functions($extra_arg, $extra_arg2) );
 
-?> 
+?>
 ===Done===
 --EXPECTF--
 *** Testing get_defined_functions() : error conditions ***
@@ -26,5 +26,4 @@ var_dump( get_defined_functions($extra_arg, $extra_arg2) );
 
 Warning: get_defined_functions() expects at most 1 parameter, 2 given in %s on line %d
 NULL
- 
 ===Done===
diff --git a/Zend/tests/get_defined_vars.phpt b/Zend/tests/get_defined_vars.phpt
index 81aa97a455d..e999bd291da 100644
--- a/Zend/tests/get_defined_vars.phpt
+++ b/Zend/tests/get_defined_vars.phpt
@@ -34,7 +34,7 @@ $arr = get_defined_vars();
 
 /* Displaying various variable through the array captured by the get_defined_vars function call */
 echo "\n*** Displaying various variables through the array captured by the get_defined_vars function call ***\n";
-var_dump( $arr["argc"] ); 
+var_dump( $arr["argc"] );
 var_dump( $arr["number"] );
 var_dump( $arr["string"] );
 var_dump( $arr["array1"] );
@@ -63,7 +63,7 @@ func2();
 func1();
 
 echo "\nDone";
-?> 
+?>
 --EXPECTF--
 *** Displaying various variables through the array captured by the get_defined_vars function call ***
 int(1)
diff --git a/Zend/tests/get_parent_class_001.phpt b/Zend/tests/get_parent_class_001.phpt
index dfef5e08cc7..95395f935be 100644
--- a/Zend/tests/get_parent_class_001.phpt
+++ b/Zend/tests/get_parent_class_001.phpt
@@ -4,7 +4,7 @@ Testing get_parent_class()
 <?php
 
 interface ITest {
-	function foo();	
+	function foo();
 }
 
 abstract class bar implements ITest {
diff --git a/Zend/tests/globals_001.phpt b/Zend/tests/globals_001.phpt
index 8efa71d31b0..9a9c5401fe2 100644
--- a/Zend/tests/globals_001.phpt
+++ b/Zend/tests/globals_001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-globals in global scope 
+globals in global scope
 --INI--
 variables_order="egpcs"
 --FILE--
@@ -19,7 +19,7 @@ var_dump($_SERVER);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(false)
 string(5) "array"
diff --git a/Zend/tests/globals_002.phpt b/Zend/tests/globals_002.phpt
index e5d518ac565..d57e350092b 100644
--- a/Zend/tests/globals_002.phpt
+++ b/Zend/tests/globals_002.phpt
@@ -22,7 +22,7 @@ test();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(false)
 string(5) "array"
diff --git a/Zend/tests/globals_003.phpt b/Zend/tests/globals_003.phpt
index 6de7c53e351..cdd4d211afd 100644
--- a/Zend/tests/globals_003.phpt
+++ b/Zend/tests/globals_003.phpt
@@ -28,7 +28,7 @@ test::bar();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(false)
 string(5) "array"
diff --git a/Zend/tests/globals_004.phpt b/Zend/tests/globals_004.phpt
index 07dfc7806dc..6e21b7fbc03 100644
--- a/Zend/tests/globals_004.phpt
+++ b/Zend/tests/globals_004.phpt
@@ -1,5 +1,5 @@
 --TEST--
-globals in local scope - 3 
+globals in local scope - 3
 --INI--
 variables_order="egpcs"
 --FILE--
@@ -13,7 +13,7 @@ test();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(false)
 string(5) "array"
diff --git a/Zend/tests/grammar/semi_reserved_008.phpt b/Zend/tests/grammar/semi_reserved_008.phpt
index 43218b1b05a..059bb8192e3 100644
--- a/Zend/tests/grammar/semi_reserved_008.phpt
+++ b/Zend/tests/grammar/semi_reserved_008.phpt
@@ -27,7 +27,7 @@ class Foo
             //
             /** doc comment */
             #
-        catch /* comment */ 
+        catch /* comment */
             // comment
             # comment
         insteadof TraitB;
diff --git a/Zend/tests/heredoc_011.phpt b/Zend/tests/heredoc_011.phpt
index d3b152ae62b..4f0adfd7e9f 100644
--- a/Zend/tests/heredoc_011.phpt
+++ b/Zend/tests/heredoc_011.phpt
@@ -6,7 +6,7 @@ STATIC heredocs CAN be used as static scalars.
 require_once 'nowdoc.inc';
 
 class e {
-    
+
     const E = <<<THISMUSTNOTERROR
 If you DON'T see this, something's wrong.
 THISMUSTNOTERROR;
diff --git a/Zend/tests/heredoc_015.phpt b/Zend/tests/heredoc_015.phpt
index 21658cf8a59..6c368f83184 100644
--- a/Zend/tests/heredoc_015.phpt
+++ b/Zend/tests/heredoc_015.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing heredoc with escape sequences
 --FILE--
-<?php 
+<?php
 
 $test = <<<TEST
 TEST;
diff --git a/Zend/tests/heredoc_016.phpt b/Zend/tests/heredoc_016.phpt
index de00036ccd4..3c8831e2753 100644
--- a/Zend/tests/heredoc_016.phpt
+++ b/Zend/tests/heredoc_016.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing heredoc (double quotes) with escape sequences
 --FILE--
-<?php 
+<?php
 
 $test = <<<"TEST"
 TEST;
diff --git a/Zend/tests/heredoc_017.phpt b/Zend/tests/heredoc_017.phpt
index e0ffddf05f3..6c4b8f3cde9 100644
--- a/Zend/tests/heredoc_017.phpt
+++ b/Zend/tests/heredoc_017.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testinh heredoc syntax
 --FILE--
-<?php 
+<?php
 
 $a = <<<A
 	A;
diff --git a/Zend/tests/hex_overflow_32bit.phpt b/Zend/tests/hex_overflow_32bit.phpt
index 0f192f34978..529757dd56d 100644
--- a/Zend/tests/hex_overflow_32bit.phpt
+++ b/Zend/tests/hex_overflow_32bit.phpt
@@ -21,7 +21,7 @@ foreach ($doubles as $d) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 float(4.0833602971%dE+14)
 float(4.7223664828%dE+21)
 float(1.3521606402%dE+31)
diff --git a/Zend/tests/increment_001.phpt b/Zend/tests/increment_001.phpt
index 3638474971a..16323381b82 100644
--- a/Zend/tests/increment_001.phpt
+++ b/Zend/tests/increment_001.phpt
@@ -32,7 +32,7 @@ foreach ($a as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {
   [0]=>
   int(1)
diff --git a/Zend/tests/indirect_call_string_001.phpt b/Zend/tests/indirect_call_string_001.phpt
index 9151de717be..89707caf046 100644
--- a/Zend/tests/indirect_call_string_001.phpt
+++ b/Zend/tests/indirect_call_string_001.phpt
@@ -10,7 +10,7 @@ namespace TestNamespace
         {
             echo "Static method called!\n";
         }
-        
+
         public static function staticMethodWithArgs($arg1, $arg2, $arg3)
         {
             printf("Static method called with args: %s, %s, %s\n", $arg1, $arg2, $arg3);
diff --git a/Zend/tests/instanceof_001.phpt b/Zend/tests/instanceof_001.phpt
index 9c86136c54c..8c13a0478c1 100644
--- a/Zend/tests/instanceof_001.phpt
+++ b/Zend/tests/instanceof_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing instanceof operator with several operators
 --FILE--
-<?php 
+<?php
 
 $a = new stdClass;
 var_dump($a instanceof stdClass);
diff --git a/Zend/tests/instanceof_002.phpt b/Zend/tests/instanceof_002.phpt
index d3f4a35358d..0d373042624 100644
--- a/Zend/tests/instanceof_002.phpt
+++ b/Zend/tests/instanceof_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing instanceof operator with class and interface inheriteds
 --FILE--
-<?php 
+<?php
 
 interface ITest {
 }
diff --git a/Zend/tests/int_overflow_32bit.phpt b/Zend/tests/int_overflow_32bit.phpt
index d9b56495e9f..9d91985f232 100644
--- a/Zend/tests/int_overflow_32bit.phpt
+++ b/Zend/tests/int_overflow_32bit.phpt
@@ -20,7 +20,7 @@ foreach ($doubles as $d) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(-2147483648)
 int(-2147483647)
 int(-2147483638)
diff --git a/Zend/tests/inter_007.phpt b/Zend/tests/inter_007.phpt
index 13b18883b1c..610210a7da3 100644
--- a/Zend/tests/inter_007.phpt
+++ b/Zend/tests/inter_007.phpt
@@ -4,11 +4,11 @@ Trying inherit abstract function twice
 <?php
 
 interface d {
-	static function B();	
+	static function B();
 }
 
 interface c {
-	function b();	
+	function b();
 }
 
 class_alias('c', 'w');
diff --git a/Zend/tests/inter_01.phpt b/Zend/tests/inter_01.phpt
index c73397c91af..71c50c2595e 100644
--- a/Zend/tests/inter_01.phpt
+++ b/Zend/tests/inter_01.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Inherited constant from interface 
+Inherited constant from interface
 --FILE--
 <?php
 interface foo {
@@ -11,7 +11,7 @@ class foobar implements foo {
     const foo = 'bar';
     public function bar($x = foo::foo) {
         var_dump($x);
-    }    
+    }
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/inter_03.phpt b/Zend/tests/inter_03.phpt
index c91f4aa142f..48c1b5eec2a 100644
--- a/Zend/tests/inter_03.phpt
+++ b/Zend/tests/inter_03.phpt
@@ -4,11 +4,11 @@ Testing interface constants with inheritance
 <?php
 
 interface a {
-	const b = 2;	
+	const b = 2;
 }
 
 interface b extends a {
-	const c = self::b;	
+	const c = self::b;
 }
 
 var_dump(b::c, a::b);
diff --git a/Zend/tests/inter_04.phpt b/Zend/tests/inter_04.phpt
index ea0bd847606..f0278d04f6d 100644
--- a/Zend/tests/inter_04.phpt
+++ b/Zend/tests/inter_04.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Trying declare interface with repeated name of inherited method
 --FILE--
-<?php 
+<?php
 
 interface a {
 	function b();
diff --git a/Zend/tests/jump04.phpt b/Zend/tests/jump04.phpt
index 2bbf1f5c017..29ec25d8bd0 100644
--- a/Zend/tests/jump04.phpt
+++ b/Zend/tests/jump04.phpt
@@ -3,18 +3,18 @@ jump 04: goto from loop (backward)
 --FILE--
 <?php
 $s = "X";
-echo "1: ok\n";	
+echo "1: ok\n";
 L1: if ($s != "X") {
-	echo "4: ok\n";	
-} else {	
-	echo "2: ok\n";	
+	echo "4: ok\n";
+} else {
+	echo "2: ok\n";
 	while ($s != "XXX") {
-		echo "3: ok\n";	
+		echo "3: ok\n";
 		$s .= "X";
 		goto L1;
-		echo "bug\n";	
+		echo "bug\n";
 	}
-	echo "bug\n";	
+	echo "bug\n";
 }
 ?>
 --EXPECT--
diff --git a/Zend/tests/jump11.phpt b/Zend/tests/jump11.phpt
index bd1107c4abe..4c4c4f30a20 100644
--- a/Zend/tests/jump11.phpt
+++ b/Zend/tests/jump11.phpt
@@ -4,16 +4,16 @@ jump 08: goto inside switch in constructor
 <?php
 class foobar {
     public function __construct() {
-        switch (1) {            
+        switch (1) {
             default:
                 goto b;
                 a:
                     print "ok!\n";
-                    break;               
+                    break;
                 b:
                     print "ok!\n";
                     goto a;
-        }        
+        }
         print "ok!\n";
     }
 }
diff --git a/Zend/tests/jump13.phpt b/Zend/tests/jump13.phpt
index 2d57f4aabbd..c281d8c93b0 100644
--- a/Zend/tests/jump13.phpt
+++ b/Zend/tests/jump13.phpt
@@ -13,12 +13,12 @@ try {
     }
     catch(Exception $e) {
         c: print 3;
-        goto d;    
-    }    
+        goto d;
+    }
 }
 catch(Exception $e) {
     d: print 4;
-    goto e;    
+    goto e;
 }
 ?>
 --EXPECT--
diff --git a/Zend/tests/jump14.phpt b/Zend/tests/jump14.phpt
index 2cc6391ce98..f55480acc75 100644
--- a/Zend/tests/jump14.phpt
+++ b/Zend/tests/jump14.phpt
@@ -1,13 +1,13 @@
 --TEST--
 Testing GOTO inside blocks
 --FILE--
-<?php 
+<?php
 
 goto A;
 
 {
 	B:
-		goto C;	
+		goto C;
 		return;
 }
 
diff --git a/Zend/tests/lsb_001.phpt b/Zend/tests/lsb_001.phpt
index 20a2fd83bbc..68582047d90 100644
--- a/Zend/tests/lsb_001.phpt
+++ b/Zend/tests/lsb_001.phpt
@@ -10,7 +10,7 @@ class TestClass {
 	protected static function staticFunction() {
 		return 'TestClassFunction';
 	}
-	
+
 	public static function testStaticVar() {
 		return static::$staticVar;
 	}
diff --git a/Zend/tests/lsb_002.phpt b/Zend/tests/lsb_002.phpt
index 4fca6ddd72b..75dcd1470e3 100644
--- a/Zend/tests/lsb_002.phpt
+++ b/Zend/tests/lsb_002.phpt
@@ -10,7 +10,7 @@ class TestClass {
 	protected static function staticFunction() {
 		return 'TestClassFunction';
 	}
-	
+
 	public function testStaticVar() {
 		return static::$staticVar;
 	}
diff --git a/Zend/tests/lsb_015.phpt b/Zend/tests/lsb_015.phpt
index ba293a24684..036c4d95173 100644
--- a/Zend/tests/lsb_015.phpt
+++ b/Zend/tests/lsb_015.phpt
@@ -1,5 +1,5 @@
 --TEST--
-ZE2 Late Static Binding with exceptions 
+ZE2 Late Static Binding with exceptions
 --FILE--
 <?php
 function foo() {
@@ -11,7 +11,7 @@ class C {
     }
     public static function getException() {
         return new Exception();
-         
+
     }
 }
 class A {
diff --git a/Zend/tests/lsb_019.phpt b/Zend/tests/lsb_019.phpt
index 1683ffe6384..92a444aee84 100644
--- a/Zend/tests/lsb_019.phpt
+++ b/Zend/tests/lsb_019.phpt
@@ -1,5 +1,5 @@
 --TEST--
-ZE2 Late Static Binding properties and methods declared as protected and overridden as public. 
+ZE2 Late Static Binding properties and methods declared as protected and overridden as public.
 --FILE--
 <?php
 class TestClass {
@@ -8,7 +8,7 @@ class TestClass {
 	protected static function staticFunction() {
 		return 'TestClassFunction';
 	}
-	
+
 	public static function testStaticVar() {
 		TestClass::$staticVar = 'TestClassStatic';
 		ChildClass1::$staticVar = 'ChildClassStatic';
diff --git a/Zend/tests/lsb_020.phpt b/Zend/tests/lsb_020.phpt
index 65ef97ab436..c1adbe4fa7e 100644
--- a/Zend/tests/lsb_020.phpt
+++ b/Zend/tests/lsb_020.phpt
@@ -1,5 +1,5 @@
 --TEST--
-ZE2 Late Static Binding properties and methods declared as public and overridden as public. 
+ZE2 Late Static Binding properties and methods declared as public and overridden as public.
 --FILE--
 <?php
 class TestClass {
@@ -8,7 +8,7 @@ class TestClass {
 	public static function staticFunction() {
 		return 'TestClassFunction';
 	}
-	
+
 	public static function testStaticVar() {
 		TestClass::$staticVar = 'TestClassStatic';
 		ChildClass1::$staticVar = 'ChildClassStatic';
diff --git a/Zend/tests/magic_by_ref_001.phpt b/Zend/tests/magic_by_ref_001.phpt
index e9bcf8fa287..09d744418f6 100644
--- a/Zend/tests/magic_by_ref_001.phpt
+++ b/Zend/tests/magic_by_ref_001.phpt
@@ -13,5 +13,5 @@ $t->$name = 1;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__set() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_002.phpt b/Zend/tests/magic_by_ref_002.phpt
index cb62f67f56a..41294468576 100644
--- a/Zend/tests/magic_by_ref_002.phpt
+++ b/Zend/tests/magic_by_ref_002.phpt
@@ -12,5 +12,5 @@ $t->prop = 1;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__set() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_003.phpt b/Zend/tests/magic_by_ref_003.phpt
index 022cbd563c6..c328b422ab0 100644
--- a/Zend/tests/magic_by_ref_003.phpt
+++ b/Zend/tests/magic_by_ref_003.phpt
@@ -13,5 +13,5 @@ var_dump($t->$name);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__get() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_004.phpt b/Zend/tests/magic_by_ref_004.phpt
index aa04d1aee64..a3a941d742c 100644
--- a/Zend/tests/magic_by_ref_004.phpt
+++ b/Zend/tests/magic_by_ref_004.phpt
@@ -14,5 +14,5 @@ var_dump($t->$name);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__unset() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_005.phpt b/Zend/tests/magic_by_ref_005.phpt
index 513c0618df2..5c451cac13f 100644
--- a/Zend/tests/magic_by_ref_005.phpt
+++ b/Zend/tests/magic_by_ref_005.phpt
@@ -14,5 +14,5 @@ var_dump(isset($t->$name));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__isset() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_006.phpt b/Zend/tests/magic_by_ref_006.phpt
index 14d7d708b8e..0d22c0ef4d5 100644
--- a/Zend/tests/magic_by_ref_006.phpt
+++ b/Zend/tests/magic_by_ref_006.phpt
@@ -14,5 +14,5 @@ $t->$func();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__call() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_by_ref_007.phpt b/Zend/tests/magic_by_ref_007.phpt
index c962d458136..d38227b9853 100644
--- a/Zend/tests/magic_by_ref_007.phpt
+++ b/Zend/tests/magic_by_ref_007.phpt
@@ -15,5 +15,5 @@ $t->$func($arg);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Method test::__call() cannot take arguments by reference in %s on line %d
diff --git a/Zend/tests/magic_methods_001.phpt b/Zend/tests/magic_methods_001.phpt
index 45701bf0a42..412702ded55 100644
--- a/Zend/tests/magic_methods_001.phpt
+++ b/Zend/tests/magic_methods_001.phpt
@@ -3,12 +3,12 @@ Testing several magic methods
 --FILE--
 <?php
 
-class foo {	
+class foo {
 	function __unset($a) {
 		print "unset\n";
 		var_dump($a);
 	}
-	
+
 	public function __call($a, $b) {
 		print "call\n";
 		var_dump($a);
@@ -19,7 +19,7 @@ class foo {
 	static public function __callstatic($a, $b) {
 		print "callstatic\n";
 	}
-	
+
 	public function __tostring() {
 		return 'foo';
 	}
diff --git a/Zend/tests/magic_methods_002.phpt b/Zend/tests/magic_methods_002.phpt
index fe0a4dcc3df..08b7f4497f3 100644
--- a/Zend/tests/magic_methods_002.phpt
+++ b/Zend/tests/magic_methods_002.phpt
@@ -3,7 +3,7 @@ Testing __unset with private visibility
 --FILE--
 <?php
 
-class foo {	
+class foo {
 	private function __unset($a) {
 		print "unset\n";
 	}
diff --git a/Zend/tests/magic_methods_003.phpt b/Zend/tests/magic_methods_003.phpt
index be354ecc304..7e965ba3fda 100644
--- a/Zend/tests/magic_methods_003.phpt
+++ b/Zend/tests/magic_methods_003.phpt
@@ -3,7 +3,7 @@ Testing __unset declaring as static
 --FILE--
 <?php
 
-class foo {	
+class foo {
 	static function __unset($a) {
 		print "unset\n";
 	}
diff --git a/Zend/tests/magic_methods_004.phpt b/Zend/tests/magic_methods_004.phpt
index 33a0a60c095..8caf5d4aa1b 100644
--- a/Zend/tests/magic_methods_004.phpt
+++ b/Zend/tests/magic_methods_004.phpt
@@ -3,7 +3,7 @@ Testing __unset() with protected visibility
 --FILE--
 <?php
 
-class foo {	
+class foo {
 	protected function __unset($a) {
 		print "unset\n";
 	}
diff --git a/Zend/tests/method_exists_002.phpt b/Zend/tests/method_exists_002.phpt
index cd49bdfc9e1..385506b0b7f 100644
--- a/Zend/tests/method_exists_002.phpt
+++ b/Zend/tests/method_exists_002.phpt
@@ -5,12 +5,12 @@ Testing method_exists()
 
 class bar {
 	static public function stat_a2() {
-	}	
+	}
 	static private function stat_b2() {
 	}
 	static protected function stat_c2() {
 	}
-	
+
 	private function method_a() {
 	}
 	protected function method_b() {
@@ -23,12 +23,12 @@ class bar {
 
 class baz extends bar {
 	static public function stat_a() {
-	}	
+	}
 	static private function stat_b() {
 	}
 	static protected function stat_c() {
 	}
-	
+
 	private function method_a() {
 	}
 	protected function method_b() {
diff --git a/Zend/tests/method_static_var.phpt b/Zend/tests/method_static_var.phpt
index c5e82fef722..438982bd71c 100644
--- a/Zend/tests/method_static_var.phpt
+++ b/Zend/tests/method_static_var.phpt
@@ -18,9 +18,9 @@ foo::test();
 new Foo;
 foo::test();
 
-/** 
+/**
  * function_add_ref() makes a clone of static variables for inherited functions, so $i in Bar::test gets initial value 1
- */ 
+ */
 Bar::test();
 Bar::test();
 --EXPECT--
diff --git a/Zend/tests/mul_001.phpt b/Zend/tests/mul_001.phpt
index d5843eef5f2..ea587902d0d 100644
--- a/Zend/tests/mul_001.phpt
+++ b/Zend/tests/mul_001.phpt
@@ -17,7 +17,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Exception: Unsupported operand types
 
 Fatal error: Uncaught Error: Unsupported operand types in %s:%d
diff --git a/Zend/tests/nested_method_and_function.phpt b/Zend/tests/nested_method_and_function.phpt
index 19f92ad260c..3fa1b18da14 100644
--- a/Zend/tests/nested_method_and_function.phpt
+++ b/Zend/tests/nested_method_and_function.phpt
@@ -14,11 +14,11 @@ class Foo {
 		}
 
 		foo();
-		
+
 		var_dump(__FUNCTION__);
 		var_dump(__METHOD__);
 		var_dump(__CLASS__);
-		
+
 		return function() {var_dump(__FUNCTION__); var_dump(__METHOD__); var_dump(__CLASS__); };
 	}
 }
diff --git a/Zend/tests/not_001.phpt b/Zend/tests/not_001.phpt
index 6eb0f000c90..2d581f2ad73 100644
--- a/Zend/tests/not_001.phpt
+++ b/Zend/tests/not_001.phpt
@@ -16,7 +16,7 @@ var_dump(bin2hex($s1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(-24)
 string(8) "8c90929a"
 Done
diff --git a/Zend/tests/not_002.phpt b/Zend/tests/not_002.phpt
index e59049c2a21..11efcaa2ea7 100644
--- a/Zend/tests/not_002.phpt
+++ b/Zend/tests/not_002.phpt
@@ -17,7 +17,7 @@ var_dump($a);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Exception: Unsupported operand types
 
 Fatal error: Uncaught Error: Unsupported operand types in %s:%d
diff --git a/Zend/tests/nowdoc_007.phpt b/Zend/tests/nowdoc_007.phpt
index d9e941106f0..35c9fddc362 100644
--- a/Zend/tests/nowdoc_007.phpt
+++ b/Zend/tests/nowdoc_007.phpt
@@ -4,7 +4,7 @@ braced and unbraced complex variable replacement test (nowdoc)
 <?php
 
 require_once 'nowdoc.inc';
-                     
+
 print <<<'ENDOFNOWDOC'
 This is nowdoc test #s $a, {$b}, {$c['c']}, and {$d->d}.
 
diff --git a/Zend/tests/nowdoc_011.phpt b/Zend/tests/nowdoc_011.phpt
index 84bcdb6916c..63bef94673e 100644
--- a/Zend/tests/nowdoc_011.phpt
+++ b/Zend/tests/nowdoc_011.phpt
@@ -6,7 +6,7 @@ Nowdocs CAN be used as static scalars.
 require_once 'nowdoc.inc';
 
 class e {
-    
+
     const E = <<<'THISMUSTNOTERROR'
 If you DON'T see this, something's wrong.
 THISMUSTNOTERROR;
diff --git a/Zend/tests/nowdoc_016.phpt b/Zend/tests/nowdoc_016.phpt
index 01eea4e7515..6ad53692d27 100644
--- a/Zend/tests/nowdoc_016.phpt
+++ b/Zend/tests/nowdoc_016.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing nowdocs with escape sequences
 --FILE--
-<?php 
+<?php
 
 $test = <<<'TEST'
 TEST;
diff --git a/Zend/tests/nowdoc_017.phpt b/Zend/tests/nowdoc_017.phpt
index 5d29a86ba81..3ac710811d7 100644
--- a/Zend/tests/nowdoc_017.phpt
+++ b/Zend/tests/nowdoc_017.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing nowdoc in default value for property
 --FILE--
-<?php 
+<?php
 
 class foo {
     public $bar = <<<'EOT'
diff --git a/Zend/tests/ns_001.phpt b/Zend/tests/ns_001.phpt
index 67715947af4..100dbe50e97 100644
--- a/Zend/tests/ns_001.phpt
+++ b/Zend/tests/ns_001.phpt
@@ -9,11 +9,11 @@ class Foo {
   function __construct() {
     echo __CLASS__,"\n";
   }
-  
+
   function bar() {
     echo __CLASS__,"\n";
   }
-  
+
   static function baz() {
     echo __CLASS__,"\n";
   }
diff --git a/Zend/tests/ns_008.phpt b/Zend/tests/ns_008.phpt
index 2c2c9180cfc..a0ae4e2d8f5 100644
--- a/Zend/tests/ns_008.phpt
+++ b/Zend/tests/ns_008.phpt
@@ -7,7 +7,7 @@ namespace test;
 class foo {
 }
 
-$x = __NAMESPACE__ . "\\foo"; 
+$x = __NAMESPACE__ . "\\foo";
 echo get_class(new $x),"\n";
 --EXPECT--
 test\foo
diff --git a/Zend/tests/ns_009.phpt b/Zend/tests/ns_009.phpt
index 3481316f288..21d2f00cc0c 100644
--- a/Zend/tests/ns_009.phpt
+++ b/Zend/tests/ns_009.phpt
@@ -5,7 +5,7 @@
 class foo {
 }
 
-$x = __NAMESPACE__ . "\\foo"; 
+$x = __NAMESPACE__ . "\\foo";
 echo get_class(new $x),"\n";
 --EXPECT--
 foo
diff --git a/Zend/tests/ns_010.phpt b/Zend/tests/ns_010.phpt
index 28ef61bcdd2..dfa35371b56 100644
--- a/Zend/tests/ns_010.phpt
+++ b/Zend/tests/ns_010.phpt
@@ -4,7 +4,7 @@
 <?php
 namespace X;
 use X as Y;
-class Foo {	
+class Foo {
 	const C = "const ok\n";
 	static $var = "var ok\n";
 	function __construct() {
diff --git a/Zend/tests/ns_011.phpt b/Zend/tests/ns_011.phpt
index 1706f2a00d9..9ee6888a651 100644
--- a/Zend/tests/ns_011.phpt
+++ b/Zend/tests/ns_011.phpt
@@ -7,7 +7,7 @@ namespace test\ns1;
 function foo() {
   echo __FUNCTION__,"\n";
 }
-  
+
 foo();
 \test\ns1\foo();
 bar();
diff --git a/Zend/tests/ns_018.phpt b/Zend/tests/ns_018.phpt
index 5c2495c6314..9ad2fb89b54 100644
--- a/Zend/tests/ns_018.phpt
+++ b/Zend/tests/ns_018.phpt
@@ -8,7 +8,7 @@ function foo() {
 	return __FUNCTION__;
 }
 
-$x = __NAMESPACE__ . "\\foo"; 
+$x = __NAMESPACE__ . "\\foo";
 echo $x(),"\n";
 --EXPECT--
 test\foo
diff --git a/Zend/tests/ns_019.phpt b/Zend/tests/ns_019.phpt
index c3db786867f..91aea33e10d 100644
--- a/Zend/tests/ns_019.phpt
+++ b/Zend/tests/ns_019.phpt
@@ -6,7 +6,7 @@ function foo() {
 	return __FUNCTION__;
 }
 
-$x = __NAMESPACE__ . "\\foo"; 
+$x = __NAMESPACE__ . "\\foo";
 echo $x(),"\n";
 --EXPECT--
 foo
diff --git a/Zend/tests/ns_041.phpt b/Zend/tests/ns_041.phpt
index cf5c3929b56..e1f0ba3a972 100644
--- a/Zend/tests/ns_041.phpt
+++ b/Zend/tests/ns_041.phpt
@@ -5,7 +5,7 @@
 namespace test\ns1;
 
 const FOO = "ok\n";
-  
+
 echo(FOO);
 echo(\test\ns1\FOO);
 echo(\test\ns1\FOO);
diff --git a/Zend/tests/ns_064.phpt b/Zend/tests/ns_064.phpt
index 0a7c4bc82d1..0df9b6f85e9 100644
--- a/Zend/tests/ns_064.phpt
+++ b/Zend/tests/ns_064.phpt
@@ -7,11 +7,11 @@ namespace test;
 
 class foo {
 	public $e = array();
-	
+
 	public function __construct() {
 		$this->e[] = $this;
 	}
-	
+
 	public function __set($a, $b) {
 		var_dump($a, $b);
 	}
diff --git a/Zend/tests/ns_072.phpt b/Zend/tests/ns_072.phpt
index 34a9bbf6ad4..932a38b3bae 100644
--- a/Zend/tests/ns_072.phpt
+++ b/Zend/tests/ns_072.phpt
@@ -6,7 +6,7 @@ Testing parameter type-hinted with interface
 namespace foo;
 
 interface foo {
-	
+
 }
 
 class bar {
@@ -16,7 +16,7 @@ class bar {
 }
 
 class test implements foo {
-	
+
 }
 
 
diff --git a/Zend/tests/ns_073.phpt b/Zend/tests/ns_073.phpt
index bb03308d71b..8f083195d5e 100644
--- a/Zend/tests/ns_073.phpt
+++ b/Zend/tests/ns_073.phpt
@@ -5,8 +5,8 @@ Testing type-hinted lambda parameter inside namespace
 
 namespace foo;
 
-$x = function (\stdclass $x = NULL) { 
-	var_dump($x);	
+$x = function (\stdclass $x = NULL) {
+	var_dump($x);
 };
 
 $x(NULL);
diff --git a/Zend/tests/ns_074.phpt b/Zend/tests/ns_074.phpt
index 28d8bf96b63..9fd8699aec7 100644
--- a/Zend/tests/ns_074.phpt
+++ b/Zend/tests/ns_074.phpt
@@ -5,8 +5,8 @@ Testing type-hinted lambda parameter inside namespace
 
 namespace foo;
 
-$x = function (\stdclass $x = NULL) { 
-	var_dump($x);	
+$x = function (\stdclass $x = NULL) {
+	var_dump($x);
 };
 
 class stdclass extends \stdclass { }
diff --git a/Zend/tests/numeric_string_errors_assign.phpt b/Zend/tests/numeric_string_errors_assign.phpt
index 8d882aadccd..31cc8a36311 100644
--- a/Zend/tests/numeric_string_errors_assign.phpt
+++ b/Zend/tests/numeric_string_errors_assign.phpt
@@ -25,7 +25,7 @@ echo "---", PHP_EOL;
 $a = foxcache("11 sed");
 $a *= "13 do";
 var_dump($a);
-$a = foxcache("eiusmod"); 
+$a = foxcache("eiusmod");
 $a *= "tempor";
 var_dump($a);
 echo "---", PHP_EOL;
diff --git a/Zend/tests/objects_001.phpt b/Zend/tests/objects_001.phpt
index fa1f171a289..42e0b54d31a 100644
--- a/Zend/tests/objects_001.phpt
+++ b/Zend/tests/objects_001.phpt
@@ -27,7 +27,7 @@ var_dump($b == 1);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(false)
 bool(true)
 bool(true)
diff --git a/Zend/tests/objects_002.phpt b/Zend/tests/objects_002.phpt
index 8907c1b48ce..1c45b2230c9 100644
--- a/Zend/tests/objects_002.phpt
+++ b/Zend/tests/objects_002.phpt
@@ -10,15 +10,15 @@ class test {
 }
 
 class test2 extends test {
-	function foo() {} 
+	function foo() {}
 }
 
 class test3 extends test {
-	function foo($arg) {} 
+	function foo($arg) {}
 }
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: Declaration of test3::foo($arg) should be compatible with test::foo() in %s on line %d
 Done
diff --git a/Zend/tests/objects_003.phpt b/Zend/tests/objects_003.phpt
index 13ebd33d680..4486888c40c 100644
--- a/Zend/tests/objects_003.phpt
+++ b/Zend/tests/objects_003.phpt
@@ -10,15 +10,15 @@ class test {
 }
 
 class test2 extends test {
-	function foo($arg) {} 
+	function foo($arg) {}
 }
 
 class test3 extends test {
-	function foo($arg, $arg2) {} 
+	function foo($arg, $arg2) {}
 }
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: Declaration of test3::foo($arg, $arg2) should be compatible with test::foo($arg) in %s on line %d
 Done
diff --git a/Zend/tests/objects_004.phpt b/Zend/tests/objects_004.phpt
index 5dd31eabf25..1cc90384a7a 100644
--- a/Zend/tests/objects_004.phpt
+++ b/Zend/tests/objects_004.phpt
@@ -10,15 +10,15 @@ class test {
 }
 
 class test2 extends test {
-	function foo($arg) {} 
+	function foo($arg) {}
 }
 
 class test3 extends test {
-	function foo(&$arg) {} 
+	function foo(&$arg) {}
 }
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: Declaration of test3::foo(&$arg) should be compatible with test::foo($arg) in %s on line %d
 Done
diff --git a/Zend/tests/objects_005.phpt b/Zend/tests/objects_005.phpt
index 1db8a91cb8e..a2369b731a3 100644
--- a/Zend/tests/objects_005.phpt
+++ b/Zend/tests/objects_005.phpt
@@ -10,15 +10,15 @@ class test {
 }
 
 class test2 extends test {
-	function &foo() {} 
+	function &foo() {}
 }
 
 class test3 extends test {
-	function foo() {} 
+	function foo() {}
 }
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: Declaration of test3::foo() should be compatible with & test::foo() in %s on line %d
 Done
diff --git a/Zend/tests/objects_006.phpt b/Zend/tests/objects_006.phpt
index 4198b9749d1..ed6ea6047af 100644
--- a/Zend/tests/objects_006.phpt
+++ b/Zend/tests/objects_006.phpt
@@ -10,15 +10,15 @@ class test {
 }
 
 class test2 extends test {
-	function foo($arg, $arg2 = NULL) {} 
+	function foo($arg, $arg2 = NULL) {}
 }
 
 class test3 extends test {
-	function foo($arg, $arg2) {} 
+	function foo($arg, $arg2) {}
 }
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: Declaration of test3::foo($arg, $arg2) should be compatible with test::foo($arg, $arg2 = NULL) in %s on line %d
 Done
diff --git a/Zend/tests/objects_007.phpt b/Zend/tests/objects_007.phpt
index f283b888f49..3094d60e8e2 100644
--- a/Zend/tests/objects_007.phpt
+++ b/Zend/tests/objects_007.phpt
@@ -10,15 +10,15 @@ class test {
 }
 
 class test2 extends test {
-	function foo($arg, &$arg2 = NULL) {} 
+	function foo($arg, &$arg2 = NULL) {}
 }
 
 class test3 extends test {
-	function foo($arg, &$arg2) {} 
+	function foo($arg, &$arg2) {}
 }
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: Declaration of test3::foo($arg, &$arg2) should be compatible with test::foo($arg, &$arg2 = NULL) in %s on line %d
 Done
diff --git a/Zend/tests/objects_008.phpt b/Zend/tests/objects_008.phpt
index aae162ca9a2..6554be99eba 100644
--- a/Zend/tests/objects_008.phpt
+++ b/Zend/tests/objects_008.phpt
@@ -10,15 +10,15 @@ class test {
 }
 
 class test2 extends test {
-	function foo(Test $arg) {} 
+	function foo(Test $arg) {}
 }
 
 class test3 extends test {
-	function foo(Test3 $arg) {} 
+	function foo(Test3 $arg) {}
 }
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: Declaration of test3::foo(Test3 $arg) should be compatible with test::foo(Test $arg) in %s on line %d
 Done
diff --git a/Zend/tests/objects_009.phpt b/Zend/tests/objects_009.phpt
index e2333235ab5..3c91b22742d 100644
--- a/Zend/tests/objects_009.phpt
+++ b/Zend/tests/objects_009.phpt
@@ -10,11 +10,11 @@ class test {
 }
 
 class test2 extends test {
-	function foo(Test $arg) {} 
+	function foo(Test $arg) {}
 }
 
 class test3 extends test {
-	function foo($arg) {} 
+	function foo($arg) {}
 }
 
 echo "Done\n";
diff --git a/Zend/tests/objects_010.phpt b/Zend/tests/objects_010.phpt
index 0f85498e2c9..036e6e22c0c 100644
--- a/Zend/tests/objects_010.phpt
+++ b/Zend/tests/objects_010.phpt
@@ -12,5 +12,5 @@ class test {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Done
diff --git a/Zend/tests/objects_012.phpt b/Zend/tests/objects_012.phpt
index 95cce3eca9a..dd5f149c42f 100644
--- a/Zend/tests/objects_012.phpt
+++ b/Zend/tests/objects_012.phpt
@@ -11,5 +11,5 @@ interface bar extends foo {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: bar cannot implement foo - it is not an interface in %s on line %d
diff --git a/Zend/tests/objects_013.phpt b/Zend/tests/objects_013.phpt
index 3f7bea81af8..0177a51a437 100644
--- a/Zend/tests/objects_013.phpt
+++ b/Zend/tests/objects_013.phpt
@@ -7,9 +7,9 @@ interface foo {
 }
 
 class bar implements foo, foo {
-}	
+}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Class bar cannot implement previously implemented interface foo in %s on line %d
diff --git a/Zend/tests/objects_014.phpt b/Zend/tests/objects_014.phpt
index c422b392ea9..138fd4f2946 100644
--- a/Zend/tests/objects_014.phpt
+++ b/Zend/tests/objects_014.phpt
@@ -7,9 +7,9 @@ interface foo {
 }
 
 interface bar extends foo, foo {
-}	
+}
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Class bar cannot implement previously implemented interface foo in %s on line %d
diff --git a/Zend/tests/objects_015.phpt b/Zend/tests/objects_015.phpt
index a923ee0c464..714d27ad5b0 100644
--- a/Zend/tests/objects_015.phpt
+++ b/Zend/tests/objects_015.phpt
@@ -15,7 +15,7 @@ var_dump(is_null($o));
 
 ?>
 ===DONE===
---EXPECT--	
+--EXPECT--
 bool(false)
 bool(true)
 bool(false)
diff --git a/Zend/tests/objects_021.phpt b/Zend/tests/objects_021.phpt
index 70dcbfbe727..d1fc63a38b0 100644
--- a/Zend/tests/objects_021.phpt
+++ b/Zend/tests/objects_021.phpt
@@ -5,19 +5,19 @@ Testing magic methods __set, __get and __call in cascade
 
 class test {
 	static public $i = 0;
-	
+
 	public function __construct() {
 		self::$i++;
 	}
-	
+
 	public function __set($a, $b) {
 		return x();
 	}
-	
+
 	public function __get($a) {
 		return x();
 	}
-	
+
 	public function __call($a, $b) {
 		return x();
 	}
diff --git a/Zend/tests/objects_022.phpt b/Zend/tests/objects_022.phpt
index 5f537feaf48..d5a695739f1 100644
--- a/Zend/tests/objects_022.phpt
+++ b/Zend/tests/objects_022.phpt
@@ -1,14 +1,14 @@
 --TEST--
 Testing 'self', 'parent' as type-hint
 --FILE--
-<?php 
+<?php
 
 interface iTest { }
- 
+
 class baz implements iTest {}
- 
+
 class bar { }
- 
+
 class foo extends bar {
     public function testFoo(self $obj) {
         var_dump($obj);
@@ -20,7 +20,7 @@ class foo extends bar {
         var_dump($obj);
     }
 }
- 
+
 $foo = new foo;
 $foo->testFoo(new foo);
 $foo->testBar(new bar);
diff --git a/Zend/tests/objects_023.phpt b/Zend/tests/objects_023.phpt
index 042a20e9d8d..5c8a8491ef8 100644
--- a/Zend/tests/objects_023.phpt
+++ b/Zend/tests/objects_023.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Creating instances dynamically
 --FILE--
-<?php 
+<?php
 
 $arr = array(new stdClass, 'stdClass');
 
diff --git a/Zend/tests/objects_024.phpt b/Zend/tests/objects_024.phpt
index af3f879db91..cbdb1cc2026 100644
--- a/Zend/tests/objects_024.phpt
+++ b/Zend/tests/objects_024.phpt
@@ -1,15 +1,15 @@
 --TEST--
 Testing direct assigning for property of object returned by function
 --FILE--
-<?php 
+<?php
 
 class foo {
 	static $bar = array();
-	
+
 	public function __set($a, $b) {
 		self::$bar[] = $b;
 	}
-	
+
 	public function __get($a) {
 		/* last */
 		return self::$bar[count(self::$bar)-1];
diff --git a/Zend/tests/objects_025.phpt b/Zend/tests/objects_025.phpt
index 8f7e961748e..53c1ae077ae 100644
--- a/Zend/tests/objects_025.phpt
+++ b/Zend/tests/objects_025.phpt
@@ -1,13 +1,13 @@
 --TEST--
 Testing invalid method names with __call and __callstatic
 --FILE--
-<?php 
+<?php
 
 class foo {
 	public function __call($a, $b) {
 		print "non-static - ok\n";
 	}
-	
+
 	public static function __callstatic($a, $b) {
 		print "static - ok\n";
 	}
diff --git a/Zend/tests/objects_027.phpt b/Zend/tests/objects_027.phpt
index 9355169b2ff..1a13f2de0a1 100644
--- a/Zend/tests/objects_027.phpt
+++ b/Zend/tests/objects_027.phpt
@@ -1,20 +1,20 @@
 --TEST--
 Testing 'new static;' calling parent method
 --FILE--
-<?php 
+<?php
 
 class bar {
 	public function show() {
 		var_dump(new static);
 	}
 }
- 
+
 class foo extends bar {
 	public function test() {
 		parent::show();
 	}
 }
- 
+
 $foo = new foo;
 $foo->test();
 $foo::test();
diff --git a/Zend/tests/oct_overflow_32bit.phpt b/Zend/tests/oct_overflow_32bit.phpt
index 5b62778e406..af312b07d73 100644
--- a/Zend/tests/oct_overflow_32bit.phpt
+++ b/Zend/tests/oct_overflow_32bit.phpt
@@ -22,7 +22,7 @@ foreach ($doubles as $d) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 float(4308640384%d)
 float(3545655%d)
 float(262143)
diff --git a/Zend/tests/offset_array.phpt b/Zend/tests/offset_array.phpt
index 790ed1d13cd..a1d0a43c69a 100644
--- a/Zend/tests/offset_array.phpt
+++ b/Zend/tests/offset_array.phpt
@@ -24,7 +24,7 @@ var_dump($arr[$arr1]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(2)
 int(1)
 
diff --git a/Zend/tests/offset_assign.phpt b/Zend/tests/offset_assign.phpt
index caa717935f2..04a4f41e6c7 100644
--- a/Zend/tests/offset_assign.phpt
+++ b/Zend/tests/offset_assign.phpt
@@ -3,11 +3,11 @@ Crash on $x['x']['y'] += 1 when $x is string
 --FILE--
 <?php
 $x = "a";
-$x['x']['y'] += 1; 
+$x['x']['y'] += 1;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: Illegal string offset 'x' in %soffset_assign.php on line %d
 
 Fatal error: Uncaught Error: Cannot use string offset as an array in %soffset_assign.php:%d
diff --git a/Zend/tests/offset_bool.phpt b/Zend/tests/offset_bool.phpt
index 9bf8a89da76..8357f99fc08 100644
--- a/Zend/tests/offset_bool.phpt
+++ b/Zend/tests/offset_bool.phpt
@@ -24,7 +24,7 @@ var_dump($bool[$arr]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 NULL
 NULL
 NULL
diff --git a/Zend/tests/offset_long.phpt b/Zend/tests/offset_long.phpt
index c65a5ba3f8d..88eae143613 100644
--- a/Zend/tests/offset_long.phpt
+++ b/Zend/tests/offset_long.phpt
@@ -24,7 +24,7 @@ var_dump($long[$arr]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 NULL
 NULL
 NULL
diff --git a/Zend/tests/offset_null.phpt b/Zend/tests/offset_null.phpt
index 9364f0a2e52..e9f77a788e3 100644
--- a/Zend/tests/offset_null.phpt
+++ b/Zend/tests/offset_null.phpt
@@ -24,7 +24,7 @@ var_dump($null[$arr]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 NULL
 NULL
 NULL
diff --git a/Zend/tests/offset_object.phpt b/Zend/tests/offset_object.phpt
index 7ab636b6a89..972a901756f 100644
--- a/Zend/tests/offset_object.phpt
+++ b/Zend/tests/offset_object.phpt
@@ -7,7 +7,7 @@ $object = new stdClass;
 var_dump($object[1]);
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Uncaught Error: Cannot use object of type stdClass as array in %s:%d
 Stack trace:
 #0 {main}
diff --git a/Zend/tests/offset_string.phpt b/Zend/tests/offset_string.phpt
index c546b371830..f7cb81bb20d 100644
--- a/Zend/tests/offset_string.phpt
+++ b/Zend/tests/offset_string.phpt
@@ -27,7 +27,7 @@ var_dump($str[$arr]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(1) "i"
 
 Notice: String offset cast occurred in %s on line %d
diff --git a/Zend/tests/or_001.phpt b/Zend/tests/or_001.phpt
index 1e4e5131a59..de09cee8254 100644
--- a/Zend/tests/or_001.phpt
+++ b/Zend/tests/or_001.phpt
@@ -21,7 +21,7 @@ var_dump($s);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(8) "3337>755"
 string(8) "3337>755"
 string(4) "wou"
diff --git a/Zend/tests/property_exists.phpt b/Zend/tests/property_exists.phpt
index f6d9a4a4e38..144b69c231a 100644
--- a/Zend/tests/property_exists.phpt
+++ b/Zend/tests/property_exists.phpt
@@ -13,7 +13,7 @@ class aParent {
 		var_dump(property_exists("A", "prot"));
 		var_dump(property_exists("A", "prot2"));
 		var_dump(property_exists("A", "prot3"));
-		print "------------------\n";		
+		print "------------------\n";
 	}
 	public function nonstaticTest() {
 		$a = new A;
diff --git a/Zend/tests/return_types/030.phpt b/Zend/tests/return_types/030.phpt
index 288137f05cc..0550f6f40b1 100644
--- a/Zend/tests/return_types/030.phpt
+++ b/Zend/tests/return_types/030.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Nullable return value 
+Nullable return value
 --FILE--
 <?php
 function foo($x) : ?array {
diff --git a/Zend/tests/selfParent_001.phpt b/Zend/tests/selfParent_001.phpt
index 9d8cd6e22f7..e7f1d2defa1 100644
--- a/Zend/tests/selfParent_001.phpt
+++ b/Zend/tests/selfParent_001.phpt
@@ -5,7 +5,7 @@ Test when constants are initialised. See also selfParent_002.phpt.
 class A {
 	const myConst = "const in A";
 	const myDynConst = self::myConst;
-	
+
 	public static function test() {
 		var_dump(self::myDynConst);
 	}
diff --git a/Zend/tests/selfParent_002.phpt b/Zend/tests/selfParent_002.phpt
index 18a8f09ea96..fda67f1e887 100644
--- a/Zend/tests/selfParent_002.phpt
+++ b/Zend/tests/selfParent_002.phpt
@@ -5,7 +5,7 @@ Test when constants are initialised. See also selfParent_001.phpt.
 class A {
 	const myConst = "const in A";
 	const myDynConst = self::myConst;
-	
+
 	public static function test() {
 		var_dump(self::myDynConst);
 	}
diff --git a/Zend/tests/self_and.phpt b/Zend/tests/self_and.phpt
index 071eb509cbc..26b86e51258 100644
--- a/Zend/tests/self_and.phpt
+++ b/Zend/tests/self_and.phpt
@@ -26,7 +26,7 @@ var_dump($s4);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(18)
 
 Warning: A non-numeric value encountered in %s on line %d
diff --git a/Zend/tests/settype_array.phpt b/Zend/tests/settype_array.phpt
index 5da023205ea..562d349099d 100644
Binary files a/Zend/tests/settype_array.phpt and b/Zend/tests/settype_array.phpt differ
diff --git a/Zend/tests/settype_bool.phpt b/Zend/tests/settype_bool.phpt
index cf59200b81a..44139967241 100644
--- a/Zend/tests/settype_bool.phpt
+++ b/Zend/tests/settype_bool.phpt
@@ -36,7 +36,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(false)
diff --git a/Zend/tests/settype_double.phpt b/Zend/tests/settype_double.phpt
index 7f1deccc8fd..11bdcfee72f 100644
--- a/Zend/tests/settype_double.phpt
+++ b/Zend/tests/settype_double.phpt
@@ -1,5 +1,5 @@
 --TEST--
-casting different variables to double using settype() 
+casting different variables to double using settype()
 --INI--
 precision=14
 --FILE--
@@ -38,7 +38,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 float(0)
 float(8754456)
 float(0)
diff --git a/Zend/tests/settype_int.phpt b/Zend/tests/settype_int.phpt
index 7b96cd594ea..f278bf1bcd2 100644
--- a/Zend/tests/settype_int.phpt
+++ b/Zend/tests/settype_int.phpt
@@ -36,7 +36,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(0)
 int(8754456)
 int(0)
diff --git a/Zend/tests/settype_null.phpt b/Zend/tests/settype_null.phpt
index 0abf2f98102..ddf3601914c 100644
--- a/Zend/tests/settype_null.phpt
+++ b/Zend/tests/settype_null.phpt
@@ -1,5 +1,5 @@
 --TEST--
-casting different variables to null using settype() 
+casting different variables to null using settype()
 --FILE--
 <?php
 
@@ -36,7 +36,7 @@ foreach ($vars as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 NULL
 NULL
 NULL
diff --git a/Zend/tests/settype_object.phpt b/Zend/tests/settype_object.phpt
index 7f9e5bc64b1..be2694c3126 100644
Binary files a/Zend/tests/settype_object.phpt and b/Zend/tests/settype_object.phpt differ
diff --git a/Zend/tests/settype_resource.phpt b/Zend/tests/settype_resource.phpt
index cc8cde34fd5..a6721cb7572 100644
Binary files a/Zend/tests/settype_resource.phpt and b/Zend/tests/settype_resource.phpt differ
diff --git a/Zend/tests/settype_string.phpt b/Zend/tests/settype_string.phpt
index d3beb54cb7f..3a2d59ecaea 100644
Binary files a/Zend/tests/settype_string.phpt and b/Zend/tests/settype_string.phpt differ
diff --git a/Zend/tests/shift_001.phpt b/Zend/tests/shift_001.phpt
index 7546f1a6d8f..fba24f5fd01 100644
--- a/Zend/tests/shift_001.phpt
+++ b/Zend/tests/shift_001.phpt
@@ -18,7 +18,7 @@ var_dump($s2);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(492)
 
 Warning: A non-numeric value encountered in %s on line %d
diff --git a/Zend/tests/shift_002.phpt b/Zend/tests/shift_002.phpt
index 6288152585f..fa068e1a902 100644
--- a/Zend/tests/shift_002.phpt
+++ b/Zend/tests/shift_002.phpt
@@ -18,7 +18,7 @@ var_dump($s2);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(30)
 
 Warning: A non-numeric value encountered in %s on line %d
diff --git a/Zend/tests/strict_001.phpt b/Zend/tests/strict_001.phpt
index f287d5e4dc9..3fcaa8c2bce 100644
--- a/Zend/tests/strict_001.phpt
+++ b/Zend/tests/strict_001.phpt
@@ -13,7 +13,7 @@ var_dump($array[$fp]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d
 int(%d)
 Done
diff --git a/Zend/tests/strict_002.phpt b/Zend/tests/strict_002.phpt
index cdeb73e0d85..8f76c8cf016 100644
--- a/Zend/tests/strict_002.phpt
+++ b/Zend/tests/strict_002.phpt
@@ -5,11 +5,11 @@ error_reporting=8191
 --FILE--
 <?php
 
-class test { 
+class test {
 	static $foo = 1;
-} 
+}
 
-$t = new test; 
+$t = new test;
 $t->foo = 5;
 
 $fp = fopen(__FILE__, 'r');
@@ -18,7 +18,7 @@ var_dump($t);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Accessing static property test::$foo as non static in %s on line %d
 object(test)#%d (1) {
   ["foo"]=>
diff --git a/Zend/tests/sub_001.phpt b/Zend/tests/sub_001.phpt
index 27091d1c5f9..ef02c382416 100644
--- a/Zend/tests/sub_001.phpt
+++ b/Zend/tests/sub_001.phpt
@@ -17,7 +17,7 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Exception: Unsupported operand types
 
 Fatal error: Uncaught Error: Unsupported operand types in %s:%d
diff --git a/Zend/tests/temporary_cleaning_007.phpt b/Zend/tests/temporary_cleaning_007.phpt
index 0e29ed6c333..c84665981bf 100644
--- a/Zend/tests/temporary_cleaning_007.phpt
+++ b/Zend/tests/temporary_cleaning_007.phpt
@@ -7,7 +7,7 @@ class saboteurTestController {
 }
 
 $controllers = array(new saboteurTestController(),new saboteurTestController());
-foreach ($controllers as $controller) {	
+foreach ($controllers as $controller) {
     try {
         if ($controller->isConsistent()) {
             return $controller;
diff --git a/Zend/tests/temporary_cleaning_008.phpt b/Zend/tests/temporary_cleaning_008.phpt
index fabd3b4b388..c876f3c2e83 100644
--- a/Zend/tests/temporary_cleaning_008.phpt
+++ b/Zend/tests/temporary_cleaning_008.phpt
@@ -9,7 +9,7 @@ try {
 	}
 } catch (Exception $e) {
 	echo "exception\n";
-} 
+}
 ?>
 --EXPECT--
 exception
diff --git a/Zend/tests/temporary_cleaning_011.phpt b/Zend/tests/temporary_cleaning_011.phpt
index e4a6af3ab95..aa1be00e565 100644
--- a/Zend/tests/temporary_cleaning_011.phpt
+++ b/Zend/tests/temporary_cleaning_011.phpt
@@ -9,7 +9,7 @@ class A {
 }
 $b = new A();
 $x = 0;
-$c = [[$x,$x]]; 
+$c = [[$x,$x]];
 try {
 	list($a, $b) = $c[0];
 } catch (Exception $e) {
diff --git a/Zend/tests/traits/bug54441.phpt b/Zend/tests/traits/bug54441.phpt
index 3fe688b3b1a..bb83d12299e 100644
--- a/Zend/tests/traits/bug54441.phpt
+++ b/Zend/tests/traits/bug54441.phpt
@@ -9,7 +9,7 @@ trait Foo {
 
 class Boo {
   use Foo {
-    bar as dontKnow; 
+    bar as dontKnow;
     dontKnow as protected;
   }
 }
diff --git a/Zend/tests/traits/bug55214.phpt b/Zend/tests/traits/bug55214.phpt
index 890fc3792c9..b27ae02428d 100644
--- a/Zend/tests/traits/bug55214.phpt
+++ b/Zend/tests/traits/bug55214.phpt
@@ -10,7 +10,7 @@ trait ATrait {
   public static function get_class_name() {
     return __CLASS__;
   }
-  
+
   public function get_class_name_obj() {
     return __CLASS__;
   }
@@ -18,7 +18,7 @@ trait ATrait {
   public static function get_class_name2() {
     return self::$static_var;
   }
-  
+
   public function get_class_name_obj2() {
     return $this->var;
   }
diff --git a/Zend/tests/traits/bug55355.phpt b/Zend/tests/traits/bug55355.phpt
index 301ceeeb09e..22350a281fd 100644
--- a/Zend/tests/traits/bug55355.phpt
+++ b/Zend/tests/traits/bug55355.phpt
@@ -8,7 +8,7 @@ trait ATrait {
 	function bar() {
 		$this->foo();
 	}
-	abstract function foo(); 
+	abstract function foo();
 }
 
 // A class on the second level in the
diff --git a/Zend/tests/traits/bug55424.phpt b/Zend/tests/traits/bug55424.phpt
index b6c3b545156..b1fdc8c353c 100644
--- a/Zend/tests/traits/bug55424.phpt
+++ b/Zend/tests/traits/bug55424.phpt
@@ -11,7 +11,7 @@ Bug #55424 (Method got missing from class when a trait defined an abstract metho
 		}
 
 		abstract function setAttribute();
-	}	
+	}
 
 	class Base
 	{
diff --git a/Zend/tests/traits/bug55554b.phpt b/Zend/tests/traits/bug55554b.phpt
index 06229bac340..cf2eadf2f84 100644
--- a/Zend/tests/traits/bug55554b.phpt
+++ b/Zend/tests/traits/bug55554b.phpt
@@ -16,7 +16,7 @@ class OverridingIsSilent1 {
     use TConstructor {
 	    foo as __construct;
 	}
-	
+
 	public function __construct() {
 	    echo "OverridingIsSilent1 __construct\n";
 	}
@@ -28,7 +28,7 @@ class OverridingIsSilent2 {
     use TConstructor {
 	    foo as OverridingIsSilent2;
 	}
-	
+
 	public function OverridingIsSilent2() {
 	    echo "OverridingIsSilent2 OverridingIsSilent2\n";
 	}
diff --git a/Zend/tests/traits/bug55554c.phpt b/Zend/tests/traits/bug55554c.phpt
index 466b3f1c089..dd224675bce 100644
--- a/Zend/tests/traits/bug55554c.phpt
+++ b/Zend/tests/traits/bug55554c.phpt
@@ -28,7 +28,7 @@ trait TC2 {
 
 class ReportCollision {
 	use TC1, TC2;
-	
+
 	public function __construct() {
         echo "New constructor executed\n";
     }
diff --git a/Zend/tests/traits/bug55554f.phpt b/Zend/tests/traits/bug55554f.phpt
index 34b327d305b..31f5f534c5d 100644
--- a/Zend/tests/traits/bug55554f.phpt
+++ b/Zend/tests/traits/bug55554f.phpt
@@ -14,7 +14,7 @@ trait TNew {
 
 class ReportCollision {
     use TNew;
-	
+
 	public function ReportCollision() {
 	    echo "ReportCollision executed\n";
 	}
diff --git a/Zend/tests/traits/bug55554g.phpt b/Zend/tests/traits/bug55554g.phpt
index 22d269603e7..662140cec0a 100644
--- a/Zend/tests/traits/bug55554g.phpt
+++ b/Zend/tests/traits/bug55554g.phpt
@@ -14,7 +14,7 @@ trait TLegacy {
 
 class ReportCollision {
     use TLegacy;
-	
+
 	public function __construct() {
 	    echo "ReportCollision executed\n";
 	}
diff --git a/Zend/tests/traits/bug60717.phpt b/Zend/tests/traits/bug60717.phpt
index bf3adb1c88b..d4bf7ea6dea 100644
--- a/Zend/tests/traits/bug60717.phpt
+++ b/Zend/tests/traits/bug60717.phpt
@@ -34,12 +34,12 @@ namespace HTML
 	{
 		use TextArea, HTMLAttributes, TextUTF8;
 	}
-	
+
 	class HTMLHelper2 implements Helper
 	{
 		use TextArea, TextUTF8, HTMLAttributes;
 	}
-	
+
 	class HTMLHelper3 implements Helper
 	{
 		use HTMLAttributes, TextArea, TextUTF8;
@@ -49,16 +49,16 @@ namespace HTML
 	{
 		use HTMLAttributes, TextUTF8, TextArea;
 	}
-	
+
 	class HTMLHelper5 implements Helper
 	{
 		use TextUTF8, TextArea, HTMLAttributes;
 	}
-	
+
 	class HTMLHelper6 implements Helper
 	{
 		use TextUTF8, HTMLAttributes, TextArea;
-	}	
+	}
 
 	$o = new HTMLHelper;
     $o = new HTMLHelper2;
diff --git a/Zend/tests/traits/bug61998.phpt b/Zend/tests/traits/bug61998.phpt
index 612caa0662f..4e811ba67cd 100644
--- a/Zend/tests/traits/bug61998.phpt
+++ b/Zend/tests/traits/bug61998.phpt
@@ -12,7 +12,7 @@ class Foo {
     }
 }
 
-trait T1 { 
+trait T1 {
     public function func() {
         echo "From T1\n";
     }
@@ -39,7 +39,7 @@ class Bar {
     }
 }
 
-trait T2 { 
+trait T2 {
     public function func2() {
         echo "From T2\n";
     }
diff --git a/Zend/tests/traits/bug74607.phpt b/Zend/tests/traits/bug74607.phpt
index 6f158db7e2a..12b0b376f0b 100644
--- a/Zend/tests/traits/bug74607.phpt
+++ b/Zend/tests/traits/bug74607.phpt
@@ -3,16 +3,16 @@ Bug #74607 (Traits enforce different inheritance rules - return types)
 --FILE--
 <?php
 
-abstract class L1{ 
+abstract class L1{
 abstract function m3($x);
-} 
+}
 
-trait L2t{ 
+trait L2t{
 function m3($x): int{}
-} 
+}
 
-class L2 extends L1{ 
-use L2t; 
+class L2 extends L1{
+use L2t;
 }
 
 echo "DONE";
diff --git a/Zend/tests/traits/bug74607a.phpt b/Zend/tests/traits/bug74607a.phpt
index efdced95c57..8ef3076fd65 100644
--- a/Zend/tests/traits/bug74607a.phpt
+++ b/Zend/tests/traits/bug74607a.phpt
@@ -3,16 +3,16 @@ Bug #74607 (Traits enforce different inheritance rules - number of required para
 --FILE--
 <?php
 
-abstract class L1{ 
+abstract class L1{
 abstract function m3($x);
-} 
+}
 
-trait L2t{ 
+trait L2t{
 function m3($x, $y = 0){}
-} 
+}
 
-class L2 extends L1{ 
-use L2t; 
+class L2 extends L1{
+use L2t;
 }
 
 echo "DONE";
diff --git a/Zend/tests/traits/bug75607a.phpt b/Zend/tests/traits/bug75607a.phpt
index 9f5f03521e8..2989814f397 100644
--- a/Zend/tests/traits/bug75607a.phpt
+++ b/Zend/tests/traits/bug75607a.phpt
@@ -20,7 +20,7 @@ class Base
 
 class Child extends base
 {
-	
+
 }
 
 class Grand extends Child
diff --git a/Zend/tests/traits/bugs/abstract-methods01.phpt b/Zend/tests/traits/bugs/abstract-methods01.phpt
index 6275caa193b..5b90ae0f3d9 100644
--- a/Zend/tests/traits/bugs/abstract-methods01.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods01.phpt
@@ -9,11 +9,11 @@ trait THello {
 }
 
 class TraitsTest {
-	use THello;  
+	use THello;
 }
 
 $test = new TraitsTest();
 $test->hello();
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Class %s contains %d abstract method and must therefore be declared abstract or implement the remaining methods (%s) in %s on line %d
\ No newline at end of file
diff --git a/Zend/tests/traits/bugs/abstract-methods02.phpt b/Zend/tests/traits/bugs/abstract-methods02.phpt
index 78abe7d1bc5..df12f9b554e 100644
--- a/Zend/tests/traits/bugs/abstract-methods02.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods02.phpt
@@ -22,5 +22,5 @@ class TraitsTest {
 $test = new TraitsTest();
 $test->hello();
 ?>
---EXPECTF--	
+--EXPECTF--
 Hello
\ No newline at end of file
diff --git a/Zend/tests/traits/bugs/abstract-methods03.phpt b/Zend/tests/traits/bugs/abstract-methods03.phpt
index 605b1d8e9e4..0914cbf3d77 100644
--- a/Zend/tests/traits/bugs/abstract-methods03.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods03.phpt
@@ -18,5 +18,5 @@ class TraitsTest {
 $test = new TraitsTest();
 $test->hello();
 ?>
---EXPECTF--	
+--EXPECTF--
 Hello
\ No newline at end of file
diff --git a/Zend/tests/traits/bugs/abstract-methods04.phpt b/Zend/tests/traits/bugs/abstract-methods04.phpt
index 56a34640678..00068e8cc74 100644
--- a/Zend/tests/traits/bugs/abstract-methods04.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods04.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Abstract Trait Methods should behave like common abstract methods and 
+Abstract Trait Methods should behave like common abstract methods and
 implementstion may be provided by other traits. Sorting order shouldn't influence result.
 --FILE--
 <?php
@@ -17,7 +17,7 @@ trait THelloImpl {
 
 class TraitsTest1 {
 	use THello;
-	use THelloImpl;  
+	use THelloImpl;
 }
 
 $test = new TraitsTest1();
@@ -25,12 +25,12 @@ $test->hello();
 
 class TraitsTest2 {
 	use THelloImpl;
-	use THello;  
+	use THello;
 }
 
 $test = new TraitsTest2();
 $test->hello();
 
 ?>
---EXPECTF--	
+--EXPECTF--
 HelloHello
\ No newline at end of file
diff --git a/Zend/tests/traits/bugs/abstract-methods05.phpt b/Zend/tests/traits/bugs/abstract-methods05.phpt
index 839be75c2b5..b40cbe30a6c 100644
--- a/Zend/tests/traits/bugs/abstract-methods05.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods05.phpt
@@ -16,10 +16,10 @@ trait THelloA {
 
 class TraitsTest1 {
 	use THelloB;
-	use THelloA;  
+	use THelloA;
 }
 
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Declaration of THelloB::hello() must be compatible with THelloA::hello($a) in %s on line %d
diff --git a/Zend/tests/traits/bugs/abstract-methods06.phpt b/Zend/tests/traits/bugs/abstract-methods06.phpt
index 8569aefb383..d8d4994f663 100644
--- a/Zend/tests/traits/bugs/abstract-methods06.phpt
+++ b/Zend/tests/traits/bugs/abstract-methods06.phpt
@@ -7,7 +7,7 @@ error_reporting(E_ALL);
 trait THelloB {
   public function hello() {
     echo 'Hello';
-  }  
+  }
 }
 
 trait THelloA {
@@ -22,5 +22,5 @@ class TraitsTest1 {
 
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Declaration of THelloB::hello() must be compatible with THelloA::hello($a) in %s on line %d
diff --git a/Zend/tests/traits/bugs/alias-semantics.phpt b/Zend/tests/traits/bugs/alias-semantics.phpt
index ac86692880d..39eb82cbbdc 100644
--- a/Zend/tests/traits/bugs/alias-semantics.phpt
+++ b/Zend/tests/traits/bugs/alias-semantics.phpt
@@ -19,5 +19,5 @@ $test->a();
 $test->b();
 
 ?>
---EXPECTF--	
+--EXPECTF--
 AA
\ No newline at end of file
diff --git a/Zend/tests/traits/bugs/alias-semantics02.phpt b/Zend/tests/traits/bugs/alias-semantics02.phpt
index e0b5286e4f5..d814dd39998 100644
--- a/Zend/tests/traits/bugs/alias-semantics02.phpt
+++ b/Zend/tests/traits/bugs/alias-semantics02.phpt
@@ -21,5 +21,5 @@ $test->a();
 $test->b();
 
 ?>
---EXPECTF--	
+--EXPECTF--
 AA
\ No newline at end of file
diff --git a/Zend/tests/traits/bugs/alias01.phpt b/Zend/tests/traits/bugs/alias01.phpt
index 4b89a54ddaa..e6c47858e5b 100644
--- a/Zend/tests/traits/bugs/alias01.phpt
+++ b/Zend/tests/traits/bugs/alias01.phpt
@@ -7,7 +7,7 @@ trait T1 {
   function m2() { echo "T:m2\n"; }
 }
 
-class C1 { 
+class C1 {
   use T1 { m1 as a1; }
 }
 
diff --git a/Zend/tests/traits/bugs/interfaces.phpt b/Zend/tests/traits/bugs/interfaces.phpt
index b632b73be29..97ec174a7f6 100644
--- a/Zend/tests/traits/bugs/interfaces.phpt
+++ b/Zend/tests/traits/bugs/interfaces.phpt
@@ -15,5 +15,5 @@ trait THello implements MyInterface {
 }
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Parse error: syntax error, unexpected 'implements' (T_IMPLEMENTS), expecting '{' in %s on line %d
diff --git a/Zend/tests/traits/bugs/missing-trait.phpt b/Zend/tests/traits/bugs/missing-trait.phpt
index ce4fa5c69ac..1cdd4f1cc64 100644
--- a/Zend/tests/traits/bugs/missing-trait.phpt
+++ b/Zend/tests/traits/bugs/missing-trait.phpt
@@ -11,5 +11,5 @@ class TraitsTest {
 $test = new TraitsTest();
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Trait 'THello' not found in %s on line %d
\ No newline at end of file
diff --git a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
index 0bbea110055..387c016492a 100644
--- a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
+++ b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
@@ -27,5 +27,5 @@ class TraitsTest {
 $test = new TraitsTest();
 $test->hello();
 ?>
---EXPECTF--	
+--EXPECTF--
 Hello
\ No newline at end of file
diff --git a/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt b/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt
index 1b9d98dac0c..b289651a9b7 100644
--- a/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt
+++ b/Zend/tests/traits/bugs/overridding-conflicting-property-initializer.phpt
@@ -19,5 +19,5 @@ class baz
 $obj = new baz();
 echo $obj->zoo, "\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: baz and foo define the same property ($zoo) in the composition of baz. However, the definition differs and is considered incompatible. Class was composed in %s on line %d
\ No newline at end of file
diff --git a/Zend/tests/traits/conflict001.phpt b/Zend/tests/traits/conflict001.phpt
index 32346b3d923..dfc9456853c 100644
--- a/Zend/tests/traits/conflict001.phpt
+++ b/Zend/tests/traits/conflict001.phpt
@@ -21,5 +21,5 @@ class TraitsTest {
 	use THello2;
 }
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on TraitsTest in %s on line %d
\ No newline at end of file
diff --git a/Zend/tests/traits/conflict002.phpt b/Zend/tests/traits/conflict002.phpt
index 64712d40a4f..db4386fbd9e 100644
--- a/Zend/tests/traits/conflict002.phpt
+++ b/Zend/tests/traits/conflict002.phpt
@@ -28,5 +28,5 @@ class TheWorldIsNotEnough {
 $o = new TheWorldIsNotEnough();
 $o->sayHello(); // echos Hello Universe!
 ?>
---EXPECTF--	
+--EXPECTF--
 Hello Universe!
\ No newline at end of file
diff --git a/Zend/tests/traits/conflict003.phpt b/Zend/tests/traits/conflict003.phpt
index 0e71063f19d..577f5c73c37 100644
--- a/Zend/tests/traits/conflict003.phpt
+++ b/Zend/tests/traits/conflict003.phpt
@@ -27,5 +27,5 @@ class Talker {
 }
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Trait method smallTalk has not been applied, because there are collisions with other trait methods on Talker in %s on line %d
\ No newline at end of file
diff --git a/Zend/tests/traits/error_001.phpt b/Zend/tests/traits/error_001.phpt
index 307e5c128ad..be4295a6d8b 100644
--- a/Zend/tests/traits/error_001.phpt
+++ b/Zend/tests/traits/error_001.phpt
@@ -3,7 +3,7 @@ Trying to use instanceof for a method twice
 --FILE--
 <?php
 
-trait foo {	
+trait foo {
 	public function foo() {
 		return 1;
 	}
diff --git a/Zend/tests/traits/error_003.phpt b/Zend/tests/traits/error_003.phpt
index 5122155bb37..23f62d2977e 100644
--- a/Zend/tests/traits/error_003.phpt
+++ b/Zend/tests/traits/error_003.phpt
@@ -3,7 +3,7 @@ Trying to use an interface as trait
 --FILE--
 <?php
 
-interface abc { 
+interface abc {
 }
 
 class A {
diff --git a/Zend/tests/traits/error_004.phpt b/Zend/tests/traits/error_004.phpt
index c7ac9161166..5bfcc263cc8 100644
--- a/Zend/tests/traits/error_004.phpt
+++ b/Zend/tests/traits/error_004.phpt
@@ -3,7 +3,7 @@ Trying to use a class as trait
 --FILE--
 <?php
 
-class abc { 
+class abc {
 }
 
 class A {
diff --git a/Zend/tests/traits/error_005.phpt b/Zend/tests/traits/error_005.phpt
index 5aa5e10d952..99952f70e6f 100644
--- a/Zend/tests/traits/error_005.phpt
+++ b/Zend/tests/traits/error_005.phpt
@@ -3,7 +3,7 @@ Trying to use a final class as trait
 --FILE--
 <?php
 
-final class abc { 
+final class abc {
 }
 
 class A {
diff --git a/Zend/tests/traits/error_006.phpt b/Zend/tests/traits/error_006.phpt
index 0169321936b..54083a310fb 100644
--- a/Zend/tests/traits/error_006.phpt
+++ b/Zend/tests/traits/error_006.phpt
@@ -3,7 +3,7 @@ Trying to use an abstract class as trait
 --FILE--
 <?php
 
-abstract class abc { 
+abstract class abc {
 }
 
 class A {
diff --git a/Zend/tests/traits/error_007.phpt b/Zend/tests/traits/error_007.phpt
index c015f6ea767..e6091749c96 100644
--- a/Zend/tests/traits/error_007.phpt
+++ b/Zend/tests/traits/error_007.phpt
@@ -3,7 +3,7 @@ Trying to instantiate a trait
 --FILE--
 <?php
 
-trait abc { 
+trait abc {
 }
 
 new abc;
diff --git a/Zend/tests/traits/flattening001.phpt b/Zend/tests/traits/flattening001.phpt
index aa7f03dcb8a..e493430d161 100644
--- a/Zend/tests/traits/flattening001.phpt
+++ b/Zend/tests/traits/flattening001.phpt
@@ -36,7 +36,7 @@ $o->setText('bar');
 
 var_dump($o->getText());
 ?>
---EXPECTF--	
+--EXPECTF--
 string(4) "test"
 string(3) "foo"
 string(3) "bar"
\ No newline at end of file
diff --git a/Zend/tests/traits/flattening002.phpt b/Zend/tests/traits/flattening002.phpt
index 251af29711b..71ec4b14508 100644
--- a/Zend/tests/traits/flattening002.phpt
+++ b/Zend/tests/traits/flattening002.phpt
@@ -1,5 +1,5 @@
 --TEST--
-parent:: works like in a method defined without traits. 
+parent:: works like in a method defined without traits.
 --FILE--
 <?php
 error_reporting(E_ALL);
@@ -9,7 +9,7 @@ class Base {
      echo 'Hello ';
    }
 }
- 
+
 trait SayWorld {
    public function sayHello() {
      parent::sayHello();
@@ -24,5 +24,5 @@ class MyHelloWorld extends Base {
 $o = new MyHelloWorld();
 $o->sayHello();
 ?>
---EXPECTF--	
+--EXPECTF--
 Hello World!
\ No newline at end of file
diff --git a/Zend/tests/traits/flattening003.phpt b/Zend/tests/traits/flattening003.phpt
index d189ca70c18..0e131a7792d 100644
--- a/Zend/tests/traits/flattening003.phpt
+++ b/Zend/tests/traits/flattening003.phpt
@@ -28,5 +28,5 @@ $o = new MyHelloWorld();
 $o->sayHello();
 $o->sayWorld();
 ?>
---EXPECTF--	
+--EXPECTF--
 Hello World!
\ No newline at end of file
diff --git a/Zend/tests/traits/inheritance001.phpt b/Zend/tests/traits/inheritance001.phpt
index e8195c4749c..22d4ba666a1 100644
--- a/Zend/tests/traits/inheritance001.phpt
+++ b/Zend/tests/traits/inheritance001.phpt
@@ -20,5 +20,5 @@ class TheWorldIsNotEnough {
 $o = new TheWorldIsNotEnough();
 $o->sayHello(); // echos Hello Universe!
 ?>
---EXPECTF--	
+--EXPECTF--
 Hello Universe!
\ No newline at end of file
diff --git a/Zend/tests/traits/inheritance002.phpt b/Zend/tests/traits/inheritance002.phpt
index 51badc5a4c7..20c2afe1f41 100644
--- a/Zend/tests/traits/inheritance002.phpt
+++ b/Zend/tests/traits/inheritance002.phpt
@@ -9,7 +9,7 @@ class Base {
      echo 'Hello ';
    }
 }
- 
+
 trait SayWorld {
    public function sayHello() {
      echo 'World!';
@@ -23,5 +23,5 @@ class MyHelloWorld extends Base {
 $o = new MyHelloWorld();
 $o->sayHello();
 ?>
---EXPECTF--	
+--EXPECTF--
 World!
\ No newline at end of file
diff --git a/Zend/tests/traits/inheritance003.phpt b/Zend/tests/traits/inheritance003.phpt
index 22ff6e243c3..1e630eef61d 100644
--- a/Zend/tests/traits/inheritance003.phpt
+++ b/Zend/tests/traits/inheritance003.phpt
@@ -32,7 +32,7 @@ $o = new MyHelloWorld();
 $o->sayHello(array());
 
 ?>
---EXPECTF--	
+--EXPECTF--
 World!
 
 Fatal error: Declaration of SayWorld::sayHello(Base $d) must be compatible with Base::sayHello(array $a) in %s on line %d
diff --git a/Zend/tests/traits/language001.phpt b/Zend/tests/traits/language001.phpt
index d892112416e..e85dd5fb2f0 100644
--- a/Zend/tests/traits/language001.phpt
+++ b/Zend/tests/traits/language001.phpt
@@ -17,5 +17,5 @@ class TraitsTest {
 $test = new TraitsTest();
 $test->hello();
 ?>
---EXPECTF--	
+--EXPECTF--
 Hello
diff --git a/Zend/tests/traits/language002.phpt b/Zend/tests/traits/language002.phpt
index d093f2952d9..2c20133ebda 100644
--- a/Zend/tests/traits/language002.phpt
+++ b/Zend/tests/traits/language002.phpt
@@ -15,18 +15,18 @@ trait World {
      echo 'World';
    }
 }
- 
+
 class MyHelloWorld {
    use Hello, World;
    public function sayExclamationMark() {
      echo '!';
    }
 }
- 
+
 $o = new MyHelloWorld();
 $o->sayHello();
 $o->sayWorld();
 $o->sayExclamationMark();
 ?>
---EXPECTF--	
+--EXPECTF--
 Hello World!
\ No newline at end of file
diff --git a/Zend/tests/traits/language003.phpt b/Zend/tests/traits/language003.phpt
index 77d4429f43a..8324179265c 100644
--- a/Zend/tests/traits/language003.phpt
+++ b/Zend/tests/traits/language003.phpt
@@ -15,15 +15,15 @@ trait World {
      echo 'World';
    }
 }
- 
+
 class MyHelloWorld {
    use Hello, World {
      Hello::saySomething insteadof World;
    }
 }
- 
+
 $o = new MyHelloWorld();
 $o->saySomething();
 ?>
---EXPECTF--	
+--EXPECTF--
 Hello
\ No newline at end of file
diff --git a/Zend/tests/traits/language004.phpt b/Zend/tests/traits/language004.phpt
index 4df307ab8df..98673f14dc2 100644
--- a/Zend/tests/traits/language004.phpt
+++ b/Zend/tests/traits/language004.phpt
@@ -15,17 +15,17 @@ trait World {
      echo ' World';
    }
 }
- 
+
 class MyHelloWorld {
    use Hello, World {
      Hello::saySomething insteadof World;
 	 World::saySomething as sayWorld;
    }
 }
- 
+
 $o = new MyHelloWorld();
 $o->saySomething();
 $o->sayWorld();
 ?>
---EXPECTF--	
+--EXPECTF--
 Hello World
\ No newline at end of file
diff --git a/Zend/tests/traits/language005.phpt b/Zend/tests/traits/language005.phpt
index 20eaeb35c25..11e28af6e64 100644
--- a/Zend/tests/traits/language005.phpt
+++ b/Zend/tests/traits/language005.phpt
@@ -24,7 +24,7 @@ trait B {
 
 class Talker {
     use A, B {
-		B::smallTalk insteadof A; 
+		B::smallTalk insteadof A;
 		A::bigTalk insteadof B;
 		B::bigTalk as talk;
 	}
@@ -36,5 +36,5 @@ $t->bigTalk();
 $t->talk();
 
 ?>
---EXPECTF--	
+--EXPECTF--
 bAB
\ No newline at end of file
diff --git a/Zend/tests/traits/language006.phpt b/Zend/tests/traits/language006.phpt
index 5a32359bb55..6dc6ba9c981 100644
--- a/Zend/tests/traits/language006.phpt
+++ b/Zend/tests/traits/language006.phpt
@@ -27,5 +27,5 @@ $o->setWorld(' World!');
 $o->sayHelloWorld();
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Hello World!
\ No newline at end of file
diff --git a/Zend/tests/traits/language007.phpt b/Zend/tests/traits/language007.phpt
index 3b65d0123a2..3ccbc859297 100644
--- a/Zend/tests/traits/language007.phpt
+++ b/Zend/tests/traits/language007.phpt
@@ -26,5 +26,5 @@ $o->sayHello();
 $o->sayWorld();
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Hello World!
\ No newline at end of file
diff --git a/Zend/tests/traits/language008a.phpt b/Zend/tests/traits/language008a.phpt
index 0d7a694d57e..65a792faac1 100644
--- a/Zend/tests/traits/language008a.phpt
+++ b/Zend/tests/traits/language008a.phpt
@@ -19,7 +19,7 @@ $o = new MyClass;
 $o->sayHello();
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Uncaught Error: Call to protected method MyClass::sayHello() from context '' in %s:%d
 Stack trace:
 #0 {main}
diff --git a/Zend/tests/traits/language008b.phpt b/Zend/tests/traits/language008b.phpt
index 8f745126e3c..c1a0d2629f2 100644
--- a/Zend/tests/traits/language008b.phpt
+++ b/Zend/tests/traits/language008b.phpt
@@ -25,7 +25,7 @@ $o->sayHelloWorld();
 
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Hello World!Hello World!
 Fatal error: Uncaught Error: Call to private method MyClass::sayHelloWorld() from context '' in %s:%d
 Stack trace:
diff --git a/Zend/tests/traits/language009.phpt b/Zend/tests/traits/language009.phpt
index e55c8d84aa9..db19eddc909 100644
--- a/Zend/tests/traits/language009.phpt
+++ b/Zend/tests/traits/language009.phpt
@@ -24,7 +24,7 @@ trait C {
 
 class MyClass {
     use C, A, B {
-		B::foo insteadof A, C; 
+		B::foo insteadof A, C;
 	}
 }
 
@@ -32,5 +32,5 @@ $t = new MyClass;
 $t->foo();
 
 ?>
---EXPECTF--	
+--EXPECTF--
 b
\ No newline at end of file
diff --git a/Zend/tests/traits/language010.phpt b/Zend/tests/traits/language010.phpt
index e550abb7bc6..ac3ab2e29ec 100644
--- a/Zend/tests/traits/language010.phpt
+++ b/Zend/tests/traits/language010.phpt
@@ -26,5 +26,5 @@ $o->hello();
 $o->world();
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Trait method world has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d
\ No newline at end of file
diff --git a/Zend/tests/traits/language011.phpt b/Zend/tests/traits/language011.phpt
index 585699da559..44de874705d 100644
--- a/Zend/tests/traits/language011.phpt
+++ b/Zend/tests/traits/language011.phpt
@@ -26,5 +26,5 @@ $o->sayHello();
 $o->sayWorld();
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Trait method sayHello has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d
diff --git a/Zend/tests/traits/language012.phpt b/Zend/tests/traits/language012.phpt
index 481dd64ec7b..439099d93a5 100644
--- a/Zend/tests/traits/language012.phpt
+++ b/Zend/tests/traits/language012.phpt
@@ -22,6 +22,6 @@ $o->inc();
 $o->inc();
 
 ?>
---EXPECTF--	
+--EXPECTF--
 1
 2
diff --git a/Zend/tests/traits/language013.phpt b/Zend/tests/traits/language013.phpt
index a55cbbed342..ec245b3fee0 100644
--- a/Zend/tests/traits/language013.phpt
+++ b/Zend/tests/traits/language013.phpt
@@ -30,7 +30,7 @@ $p->inc();
 $p->inc();
 
 ?>
---EXPECTF--	
+--EXPECTF--
 1
 2
 1
diff --git a/Zend/tests/traits/language014.phpt b/Zend/tests/traits/language014.phpt
index 102b9aed415..20dcdea7c8a 100644
--- a/Zend/tests/traits/language014.phpt
+++ b/Zend/tests/traits/language014.phpt
@@ -26,5 +26,5 @@ $o->hello();
 $o->world();
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Trait method hello has not been applied, because there are collisions with other trait methods on MyClass in %s on line %d
diff --git a/Zend/tests/traits/methods_001.phpt b/Zend/tests/traits/methods_001.phpt
index e1ee8152a66..758234f2d59 100644
--- a/Zend/tests/traits/methods_001.phpt
+++ b/Zend/tests/traits/methods_001.phpt
@@ -3,19 +3,19 @@ Testing magic method on trait
 --FILE--
 <?php
 
-trait foo {	
+trait foo {
 	public function __toString() {
 		return '123';
 	}
-	
+
 	public function __get($x) {
 		var_dump($x);
 	}
-	
+
 	public function __set($attr, $val) {
 		var_dump($attr .'==='. $val);
 	}
-	
+
 	public function __clone() {
 		var_dump(__FUNCTION__);
 	}
diff --git a/Zend/tests/traits/methods_002.phpt b/Zend/tests/traits/methods_002.phpt
index 4ed64c1a55a..2a4215fb2cc 100644
--- a/Zend/tests/traits/methods_002.phpt
+++ b/Zend/tests/traits/methods_002.phpt
@@ -3,7 +3,7 @@ Testing collision with magic methods
 --FILE--
 <?php
 
-trait foo {	
+trait foo {
 	public function __clone() {
 		var_dump(__FUNCTION__);
 	}
diff --git a/Zend/tests/traits/methods_003.phpt b/Zend/tests/traits/methods_003.phpt
index 1c1218ae3a8..d050b1135fb 100644
--- a/Zend/tests/traits/methods_003.phpt
+++ b/Zend/tests/traits/methods_003.phpt
@@ -3,7 +3,7 @@ Testing __construct and __destruct with Trait
 --FILE--
 <?php
 
-trait foo {	
+trait foo {
 	public function __construct() {
 		var_dump(__FUNCTION__);
 	}
diff --git a/Zend/tests/traits/property001.phpt b/Zend/tests/traits/property001.phpt
index 002a252a72b..eb1c5a520e8 100644
--- a/Zend/tests/traits/property001.phpt
+++ b/Zend/tests/traits/property001.phpt
@@ -32,7 +32,7 @@ class TraitsTest2 {
 var_dump(property_exists('TraitsTest', 'foo'));
 var_dump(property_exists('TraitsTest2', 'foo'));
 ?>
---EXPECTF--	
+--EXPECTF--
 PRE-CLASS-GUARD-TraitsTest
 PRE-CLASS-GUARD-TraitsTest2
 bool(true)
diff --git a/Zend/tests/traits/property002.phpt b/Zend/tests/traits/property002.phpt
index 27361e04d20..4234484d957 100644
--- a/Zend/tests/traits/property002.phpt
+++ b/Zend/tests/traits/property002.phpt
@@ -26,7 +26,7 @@ var_dump(property_exists('TraitsTest', 'world'));
 $t = new TraitsTest;
 $t->test();
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 hello World!
\ No newline at end of file
diff --git a/Zend/tests/traits/property003.phpt b/Zend/tests/traits/property003.phpt
index b4f0105d207..dc88ce31780 100644
--- a/Zend/tests/traits/property003.phpt
+++ b/Zend/tests/traits/property003.phpt
@@ -24,7 +24,7 @@ echo "POST-CLASS-GUARD\n";
 $t = new TraitsTest;
 $t->hello = "foo";
 ?>
---EXPECTF--	
+--EXPECTF--
 PRE-CLASS-GUARD
 
 Fatal error: THello1 and THello2 define the same property ($hello) in the composition of TraitsTest. However, the definition differs and is considered incompatible. Class was composed in %s on line %d
\ No newline at end of file
diff --git a/Zend/tests/traits/property004.phpt b/Zend/tests/traits/property004.phpt
index 393b492b7f0..483108dfb0e 100644
--- a/Zend/tests/traits/property004.phpt
+++ b/Zend/tests/traits/property004.phpt
@@ -24,7 +24,7 @@ class TraitsTest {
 
 $t = new TraitsTest;
 ?>
---EXPECTF--	
+--EXPECTF--
 PRE-CLASS-GUARD
 
 Fatal error: THello1 and THello2 define the same property ($hello) in the composition of TraitsTest. However, the definition differs and is considered incompatible. Class was composed in %s on line %d
\ No newline at end of file
diff --git a/Zend/tests/traits/property005.phpt b/Zend/tests/traits/property005.phpt
index 3d2d4484f51..135f28a3423 100644
--- a/Zend/tests/traits/property005.phpt
+++ b/Zend/tests/traits/property005.phpt
@@ -5,7 +5,7 @@ The same rules are applied for properties that are defined in the class hierarch
 error_reporting(E_ALL | E_STRICT);
 
 class Base {
-  private $hello;    
+  private $hello;
 }
 
 trait THello1 {
@@ -31,7 +31,7 @@ echo "POST-CLASS-GUARD2\n";
 $t = new TraitsTest;
 $t->hello = "foo";
 ?>
---EXPECTF--	
+--EXPECTF--
 PRE-CLASS-GUARD
 POST-CLASS-GUARD
 
diff --git a/Zend/tests/traits/property006.phpt b/Zend/tests/traits/property006.phpt
index bfe74543fd1..0dd80d8ba23 100644
--- a/Zend/tests/traits/property006.phpt
+++ b/Zend/tests/traits/property006.phpt
@@ -5,7 +5,7 @@ Introducing new private variables of the same name in a subclass is ok, and does
 error_reporting(E_ALL | E_STRICT);
 
 class Base {
-  private $hello;    
+  private $hello;
 }
 
 trait THello1 {
@@ -29,7 +29,7 @@ class Notice extends Base {
 }
 echo "POST-CLASS-GUARD2\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 PRE-CLASS-GUARD
 POST-CLASS-GUARD
 POST-CLASS-GUARD2
diff --git a/Zend/tests/traits/property007.phpt b/Zend/tests/traits/property007.phpt
index fb3c517876f..bdaca61ef2b 100644
--- a/Zend/tests/traits/property007.phpt
+++ b/Zend/tests/traits/property007.phpt
@@ -5,7 +5,7 @@ Introducing new private variables of the same name in a subclass is ok, and does
 error_reporting(E_ALL | E_STRICT);
 
 class Base {
-  protected $hello;    
+  protected $hello;
 }
 
 trait THello1 {
@@ -28,7 +28,7 @@ class Notice extends Base {
 }
 echo "POST-CLASS-GUARD2\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 PRE-CLASS-GUARD
 POST-CLASS-GUARD
 POST-CLASS-GUARD2
diff --git a/Zend/tests/traits/property008.phpt b/Zend/tests/traits/property008.phpt
index e263692d60e..5c463b596c1 100644
--- a/Zend/tests/traits/property008.phpt
+++ b/Zend/tests/traits/property008.phpt
@@ -41,7 +41,7 @@ $b = new SubclassB;
 var_dump($b);
 
 ?>
---EXPECTF--	
+--EXPECTF--
 object(SubclassClassicInheritance)#1 (2) {
   ["hello":"SubclassClassicInheritance":private]=>
   int(0)
diff --git a/Zend/tests/traits/trait_constant_001.phpt b/Zend/tests/traits/trait_constant_001.phpt
index 590949c2f6b..7a5268633e7 100644
--- a/Zend/tests/traits/trait_constant_001.phpt
+++ b/Zend/tests/traits/trait_constant_001.phpt
@@ -14,7 +14,7 @@ class Direct {
 }
 
 class IndirectInheritance extends Direct {
-  
+
 }
 
 trait TestTraitIndirect {
diff --git a/Zend/tests/traits/trait_constant_002.phpt b/Zend/tests/traits/trait_constant_002.phpt
index bbafbf210ef..ece3f61f9d3 100644
--- a/Zend/tests/traits/trait_constant_002.phpt
+++ b/Zend/tests/traits/trait_constant_002.phpt
@@ -8,11 +8,11 @@ __TRAIT__: Use outside of traits.
 		  return __TRAIT__;
 		}
 	}
-	
+
 	function someFun() {
 	  return __TRAIT__;
 	}
-	
+
 
 	$t = __TRAIT__;
 	var_dump($t);
diff --git a/Zend/tests/try/catch_004.phpt b/Zend/tests/try/catch_004.phpt
index 54920b8947b..7c269cc3362 100644
--- a/Zend/tests/try/catch_004.phpt
+++ b/Zend/tests/try/catch_004.phpt
@@ -20,7 +20,7 @@ class MyObject
 	{
 		echo __METHOD__ . "() Must not be called\n";
 	}
-	
+
 	static function test()
 	{
 		try
diff --git a/Zend/tests/try/catch_finally_001.phpt b/Zend/tests/try/catch_finally_001.phpt
index 0c3f597a0a5..0ae27cd480d 100644
--- a/Zend/tests/try/catch_finally_001.phpt
+++ b/Zend/tests/try/catch_finally_001.phpt
@@ -9,7 +9,7 @@ function foo ($throw = FALSE) {
         throw new Exception("ex");
      }
    } catch (Exception $e) {
-     echo "catch\n"; 
+     echo "catch\n";
    } finally {
      echo "finally\n";
    }
diff --git a/Zend/tests/try/catch_finally_004.phpt b/Zend/tests/try/catch_finally_004.phpt
index a2c22beab11..49cef2dc3b6 100644
--- a/Zend/tests/try/catch_finally_004.phpt
+++ b/Zend/tests/try/catch_finally_004.phpt
@@ -19,7 +19,7 @@ function foo (&$ex) {
       } finally {
         echo "4";
         throw_exception("finally");
-      } 
+      }
    } catch (Exception $e) {
       $ex = $e;
       echo "3";
diff --git a/Zend/tests/try/try_catch_finally_006.phpt b/Zend/tests/try/try_catch_finally_006.phpt
index dab6af6a581..66db8cd97cb 100644
--- a/Zend/tests/try/try_catch_finally_006.phpt
+++ b/Zend/tests/try/try_catch_finally_006.phpt
@@ -11,7 +11,7 @@ function foo($ex = NULL) {
         } finally {
             var_dump("finally1");
             if ($ex) throw $ex;
-        } 
+        }
     } catch (Exception $e) {
        var_dump("catched");
        if ($ex) return "return1";
diff --git a/Zend/tests/try/try_catch_finally_007.phpt b/Zend/tests/try/try_catch_finally_007.phpt
index ad33c681317..df8db61c903 100644
--- a/Zend/tests/try/try_catch_finally_007.phpt
+++ b/Zend/tests/try/try_catch_finally_007.phpt
@@ -16,10 +16,10 @@ function foo($ret = FALSE) {
         } finally {
             var_dump("finally1");
             throw new Exception("exception");
-        } 
+        }
     } catch (Exception $e) {
         goto local;
-local: 
+local:
         var_dump("catched");
         if ($ret) return "return";
     } finally {
diff --git a/Zend/tests/try/try_finally_007.phpt b/Zend/tests/try/try_finally_007.phpt
index 634937495c3..b180a7063f4 100644
--- a/Zend/tests/try/try_finally_007.phpt
+++ b/Zend/tests/try/try_finally_007.phpt
@@ -5,7 +5,7 @@ Try finally (with goto previous label)
 function foo () {
     try {
 label:
-        echo "label"; 
+        echo "label";
         try {
         } finally {
             goto label;
diff --git a/Zend/tests/unset_cv05.phpt b/Zend/tests/unset_cv05.phpt
index 2992e624c33..f7a2736bc62 100644
--- a/Zend/tests/unset_cv05.phpt
+++ b/Zend/tests/unset_cv05.phpt
@@ -4,9 +4,9 @@ unset() CV 5 (indirect unset() of global variable in session_start())
 session.auto_start=0
 session.save_handler=files
 --SKIPIF--
-<?php 
+<?php
 
-include(dirname(__FILE__).'/../../ext/session/tests/skipif.inc'); 
+include(dirname(__FILE__).'/../../ext/session/tests/skipif.inc');
 
 ?>
 --FILE--
diff --git a/Zend/tests/variadic/optional_params.phpt b/Zend/tests/variadic/optional_params.phpt
index ba965e538c4..6cb516fa0cd 100644
--- a/Zend/tests/variadic/optional_params.phpt
+++ b/Zend/tests/variadic/optional_params.phpt
@@ -6,7 +6,7 @@ Optional parameter before variadic parameter
 function fn($reqParam, $optParam = null, ...$params) {
     var_dump($reqParam, $optParam, $params);
 }
- 
+
 fn(1);
 fn(1, 2);
 fn(1, 2, 3);
diff --git a/Zend/tests/xor_001.phpt b/Zend/tests/xor_001.phpt
index e1a521dff96..afcd6e76eca 100644
--- a/Zend/tests/xor_001.phpt
+++ b/Zend/tests/xor_001.phpt
@@ -11,6 +11,6 @@ var_dump($c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(1)
 Done
diff --git a/Zend/tests/xor_002.phpt b/Zend/tests/xor_002.phpt
index 0cf4054fa4c..ae07dfc0318 100644
--- a/Zend/tests/xor_002.phpt
+++ b/Zend/tests/xor_002.phpt
@@ -29,7 +29,7 @@ var_dump(bin2hex($s));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(6) "030107"
 string(6) "030107"
 string(8) "070a1e11"
diff --git a/Zend/tests/xor_003.phpt b/Zend/tests/xor_003.phpt
index 8aa1c636b76..8b15025ec62 100644
--- a/Zend/tests/xor_003.phpt
+++ b/Zend/tests/xor_003.phpt
@@ -12,7 +12,7 @@ var_dump($f ^ $f);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(1)
 int(0)
 int(0)
diff --git a/Zend/tests/zend_strtod.phpt b/Zend/tests/zend_strtod.phpt
index 7f4bca59660..f7089932f29 100644
--- a/Zend/tests/zend_strtod.phpt
+++ b/Zend/tests/zend_strtod.phpt
@@ -11,7 +11,7 @@ var_dump("123123139932690.21688500" - "11399327900000000.21688500");
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 float(-100)
 float(808792757210)
 float(-4.5646456464565E+27)
diff --git a/ext/bz2/tests/001.phpt b/ext/bz2/tests/001.phpt
index 47dbfe84990..5a6b2878b80 100644
--- a/ext/bz2/tests/001.phpt
+++ b/ext/bz2/tests/001.phpt
@@ -18,7 +18,7 @@ var_dump(bzopen($fp, "r"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: bzopen() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/bz2/tests/002.phpt b/ext/bz2/tests/002.phpt
index c55e22d0af6..a69514a7113 100644
--- a/ext/bz2/tests/002.phpt
+++ b/ext/bz2/tests/002.phpt
@@ -73,7 +73,7 @@ var_dump(bzopen($fp, "w"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 resource(%d) of type (stream)
 resource(%d) of type (stream)
diff --git a/ext/bz2/tests/003-mb.phpt b/ext/bz2/tests/003-mb.phpt
index fbc683cb726..6454d0d1823 100644
--- a/ext/bz2/tests/003-mb.phpt
+++ b/ext/bz2/tests/003-mb.phpt
@@ -16,7 +16,7 @@ var_dump(bzread($fd, 100000));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: bzread() expects at least 1 parameter, 0 given in %s on line %d
 bool(false)
 
diff --git a/ext/bz2/tests/003.phpt b/ext/bz2/tests/003.phpt
index 1432600087a..23b005ac119 100644
--- a/ext/bz2/tests/003.phpt
+++ b/ext/bz2/tests/003.phpt
@@ -16,7 +16,7 @@ var_dump(bzread($fd, 100000));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: bzread() expects at least 1 parameter, 0 given in %s on line %d
 bool(false)
 
diff --git a/ext/bz2/tests/004.phpt b/ext/bz2/tests/004.phpt
index 7467d84a901..1c12f4f9f74 100644
--- a/ext/bz2/tests/004.phpt
+++ b/ext/bz2/tests/004.phpt
@@ -43,7 +43,7 @@ var_dump(bzerrno($fd2));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(2) {
   ["errno"]=>
   int(0)
diff --git a/ext/bz2/tests/bz2_filter_compress.phpt b/ext/bz2/tests/bz2_filter_compress.phpt
index 3de9a9d3ecb..a1c91a67ea4 100644
--- a/ext/bz2/tests/bz2_filter_compress.phpt
+++ b/ext/bz2/tests/bz2_filter_compress.phpt
@@ -12,6 +12,6 @@ stream_filter_append($fp, 'convert.base64-encode', STREAM_FILTER_WRITE);
 fwrite($fp, $text);
 fclose($fp);
 
-?> 
---EXPECT-- 
+?>
+--EXPECT--
 QlpoNDFBWSZTWRN6QG0AAAoVgECFACA395UgIABIintI1N6mpowIQ0E1MTTAQGYTNcRyMZm5kgW3ib7hVboE7Tmqj3ToGZ5G3q1ZauD2G58hibSck8KS95EEAbx1Cn+LuSKcKEgJvSA2gA==
diff --git a/ext/bz2/tests/bz2_filter_decompress.phpt b/ext/bz2/tests/bz2_filter_decompress.phpt
index 951d572cb2d..17233b68daf 100644
--- a/ext/bz2/tests/bz2_filter_decompress.phpt
+++ b/ext/bz2/tests/bz2_filter_decompress.phpt
@@ -12,6 +12,6 @@ stream_filter_append($fp, 'bzip2.decompress', STREAM_FILTER_WRITE);
 fwrite($fp, $text);
 fclose($fp);
 
-?> 
---EXPECT-- 
+?>
+--EXPECT--
 I am the very model of a modern major general, I've information vegetable, animal, and mineral.
diff --git a/ext/calendar/tests/bug53574_2.phpt b/ext/calendar/tests/bug53574_2.phpt
index 45e15cb3982..1ac4834cd5d 100644
--- a/ext/calendar/tests/bug53574_2.phpt
+++ b/ext/calendar/tests/bug53574_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #53574 (Integer overflow in SdnToJulian; leads to segfault)
 --SKIPIF--
-<?php 
+<?php
 include 'skipif.inc';
 if (PHP_INT_SIZE == 4) {
         die("skip this test is for 64bit platform only");
diff --git a/ext/calendar/tests/bug55797_2.phpt b/ext/calendar/tests/bug55797_2.phpt
index 2a9183dd8dd..4e4e9a4da9c 100644
--- a/ext/calendar/tests/bug55797_2.phpt
+++ b/ext/calendar/tests/bug55797_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #55797: Integer overflow in SdnToGregorian leads to segfault (in optimized builds)
 --SKIPIF--
-<?php 
+<?php
 include 'skipif.inc';
 if (PHP_INT_SIZE == 4) {
         die("skip this test is for 64bit platform only");
diff --git a/ext/calendar/tests/cal_days_in_month.phpt b/ext/calendar/tests/cal_days_in_month.phpt
index 9aaf3efdd0c..fbd6362b0f7 100644
--- a/ext/calendar/tests/cal_days_in_month.phpt
+++ b/ext/calendar/tests/cal_days_in_month.phpt
@@ -4,13 +4,13 @@ cal_days_in_month()
 <?php include 'skipif.inc'; ?>
 --FILE--
 <?php
-$num = cal_days_in_month(CAL_GREGORIAN, 8, 2003); 
+$num = cal_days_in_month(CAL_GREGORIAN, 8, 2003);
 echo "There are $num days in August 2003\n";
-$num = cal_days_in_month(CAL_GREGORIAN, 2, 2003); 
+$num = cal_days_in_month(CAL_GREGORIAN, 2, 2003);
 echo "There are $num days in February 2003\n";
-$num = cal_days_in_month(CAL_GREGORIAN, 2, 2004); 
+$num = cal_days_in_month(CAL_GREGORIAN, 2, 2004);
 echo "There are $num days in February 2004\n";
-$num = cal_days_in_month(CAL_GREGORIAN, 12, 2034); 
+$num = cal_days_in_month(CAL_GREGORIAN, 12, 2034);
 echo "There are $num days in December 2034\n";
 ?>
 --EXPECT--
diff --git a/ext/calendar/tests/easter_date.phpt b/ext/calendar/tests/easter_date.phpt
index 9222d3c2712..065e1478d0b 100644
--- a/ext/calendar/tests/easter_date.phpt
+++ b/ext/calendar/tests/easter_date.phpt
@@ -7,9 +7,9 @@ date.timezone=UTC
 --FILE--
 <?php
 putenv('TZ=UTC');
-echo date("Y-m-d", easter_date(2000))."\n";       
-echo date("Y-m-d", easter_date(2001))."\n";      
-echo date("Y-m-d", easter_date(2002))."\n";      
+echo date("Y-m-d", easter_date(2000))."\n";
+echo date("Y-m-d", easter_date(2001))."\n";
+echo date("Y-m-d", easter_date(2002))."\n";
 echo date("Y-m-d", easter_date(1492))."\n";
 ?>
 --EXPECTF--
diff --git a/ext/calendar/tests/jdtojewish64.phpt b/ext/calendar/tests/jdtojewish64.phpt
index 9f01109a71c..9239f204b59 100644
--- a/ext/calendar/tests/jdtojewish64.phpt
+++ b/ext/calendar/tests/jdtojewish64.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #64895: Integer overflow in SndToJewish
 --SKIPIF--
-<?php 
+<?php
 include 'skipif.inc';
 if (PHP_INT_SIZE == 4) {
         die("skip this test is for 64bit platform only");
diff --git a/ext/calendar/tests/jdtomonthname.phpt b/ext/calendar/tests/jdtomonthname.phpt
index 6765ecf80c9..7a11b1a7d8e 100644
--- a/ext/calendar/tests/jdtomonthname.phpt
+++ b/ext/calendar/tests/jdtomonthname.phpt
@@ -27,7 +27,7 @@ foreach ($jd_days as $jd_day) {
 echo "Done\n";
 
 ?>
---EXPECTF--	
+--EXPECTF--
 === 2453396
 string(3) "Jan"
 string(7) "January"
diff --git a/ext/com_dotnet/tests/bug33386.phpt b/ext/com_dotnet/tests/bug33386.phpt
index e7dcd28489a..102e69749b5 100644
--- a/ext/com_dotnet/tests/bug33386.phpt
+++ b/ext/com_dotnet/tests/bug33386.phpt
@@ -1,12 +1,12 @@
 --TEST--
 Bug #33386 (ScriptControl only sees last function of class)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present";
 if (4 != PHP_INT_SIZE)  print "skip MSScriptControl isn't available under x64";
 ?>
 --FILE--
-<?php 
+<?php
 error_reporting(E_ALL);
 
 class twoFuncs {
diff --git a/ext/com_dotnet/tests/bug34272.phpt b/ext/com_dotnet/tests/bug34272.phpt
index 3a65e2ce286..feb63c93c35 100644
--- a/ext/com_dotnet/tests/bug34272.phpt
+++ b/ext/com_dotnet/tests/bug34272.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Bug #34272 (empty array onto COM object blows up)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
 --FILE--
-<?php 
+<?php
 error_reporting(E_ALL);
 
 try {
diff --git a/ext/com_dotnet/tests/bug39596.phpt b/ext/com_dotnet/tests/bug39596.phpt
index dc8d1ef0661..bd893265605 100644
--- a/ext/com_dotnet/tests/bug39596.phpt
+++ b/ext/com_dotnet/tests/bug39596.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Bug #39596 (Creating Variant of type VT_ARRAY)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
 --FILE--
-<?php 
+<?php
 error_reporting(E_ALL);
 
 try {
diff --git a/ext/com_dotnet/tests/bug49192.phpt b/ext/com_dotnet/tests/bug49192.phpt
index ccbf237b645..e16c1358b17 100644
--- a/ext/com_dotnet/tests/bug49192.phpt
+++ b/ext/com_dotnet/tests/bug49192.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #49192 (PHP crashes when GC invoked on COM object)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
 --XFAIL--
 1
diff --git a/ext/com_dotnet/tests/bug66431_1.phpt b/ext/com_dotnet/tests/bug66431_1.phpt
index de696d6587a..11b76a15462 100644
--- a/ext/com_dotnet/tests/bug66431_1.phpt
+++ b/ext/com_dotnet/tests/bug66431_1.phpt
@@ -5,7 +5,7 @@ Bug #66431 Special Character via COM Interface (CP_UTF8), Application.Word
 if (!extension_loaded("com_dotnet")){ echo "skip COM/.Net support not present"; }
 
 try {
-	new COM("word.application", NULL, CP_UTF8); 
+	new COM("word.application", NULL, CP_UTF8);
 } catch (Exception $e) {
 	die('skip ' . $e->getMessage());
 }
@@ -19,15 +19,15 @@ $fpath = str_replace("/", "\\", dirname(__FILE__) . "/bug66431.docx");
 
 com_load_typelib('Word.Application');
 
-$Wrd = new COM("word.application", NULL, CP_UTF8); 
+$Wrd = new COM("word.application", NULL, CP_UTF8);
 $Wrd->Documents->Add();
-$Wrd->Selection->TypeText($text); 
+$Wrd->Selection->TypeText($text);
 $Wrd->ActiveDocument->SaveAs($fpath);
 $Wrd->ActiveDocument->Close(false);
 $Wrd->Application->Quit();
 unset($Wrd);
 
-$Wrd = new COM("word.application", NULL, CP_UTF8); 
+$Wrd = new COM("word.application", NULL, CP_UTF8);
 $Wrd->Documents->Open($fpath, NULL, false);
 $check_text = $Wrd->ActiveDocument->Range($Wrd->ActiveDocument->Sentences(1)->Start, $Wrd->ActiveDocument->Sentences(1)->End)->Text;
 $Wrd->ActiveDocument->Close(false);
diff --git a/ext/com_dotnet/tests/bug69939.phpt b/ext/com_dotnet/tests/bug69939.phpt
index 6a778d510aa..49ad20787a3 100644
--- a/ext/com_dotnet/tests/bug69939.phpt
+++ b/ext/com_dotnet/tests/bug69939.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #69939 (Casting object to bool returns false)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
 --FILE--
 <?php
diff --git a/ext/com_dotnet/tests/bug73679.phpt b/ext/com_dotnet/tests/bug73679.phpt
index 6f46d87d7f7..b5b884553fa 100644
--- a/ext/com_dotnet/tests/bug73679.phpt
+++ b/ext/com_dotnet/tests/bug73679.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #73679 DOTNET read access violation using invalid codepage 
+Bug #73679 DOTNET read access violation using invalid codepage
 --SKIPIF--
 <?php # vim:ft=php
 if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
diff --git a/ext/ctype/tests/001.phpt b/ext/ctype/tests/001.phpt
index 0c80aecba4f..edb1f52ab09 100644
--- a/ext/ctype/tests/001.phpt
+++ b/ext/ctype/tests/001.phpt
@@ -3,11 +3,11 @@ ctype on integers
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
-<?php 
-  setlocale(LC_ALL,"C"); 
+<?php
+  setlocale(LC_ALL,"C");
 
   function ctype_test_001($function) {
-    $n=0; 	
+    $n=0;
     for($a=0;$a<256;$a++) {
 	    if($function($a)) $n++;
     }
@@ -15,10 +15,10 @@ ctype on integers
   }
 ctype_test_001("ctype_lower");
 ctype_test_001("ctype_upper");
-ctype_test_001("ctype_alpha");	
-ctype_test_001("ctype_digit");	
-ctype_test_001("ctype_alnum");		
-ctype_test_001("ctype_cntrl");	
+ctype_test_001("ctype_alpha");
+ctype_test_001("ctype_digit");
+ctype_test_001("ctype_alnum");
+ctype_test_001("ctype_cntrl");
 ctype_test_001("ctype_graph");
 ctype_test_001("ctype_print");
 ctype_test_001("ctype_punct");
diff --git a/ext/ctype/tests/002.phpt b/ext/ctype/tests/002.phpt
index c20612cf44e..e949db39924 100644
--- a/ext/ctype/tests/002.phpt
+++ b/ext/ctype/tests/002.phpt
@@ -3,7 +3,7 @@ ctype on strings
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
-<?php 
+<?php
 
 setlocale(LC_ALL,"C");
 print "LOCALE is '" . setlocale(LC_ALL,0) . "'\n";
@@ -22,10 +22,10 @@ function ctype_test_002($function) {
 
 ctype_test_002("ctype_lower");
 ctype_test_002("ctype_upper");
-ctype_test_002("ctype_alpha");	
-ctype_test_002("ctype_digit");	
-ctype_test_002("ctype_alnum");		
-ctype_test_002("ctype_cntrl");	
+ctype_test_002("ctype_alpha");
+ctype_test_002("ctype_digit");
+ctype_test_002("ctype_alnum");
+ctype_test_002("ctype_cntrl");
 ctype_test_002("ctype_graph");
 ctype_test_002("ctype_print");
 ctype_test_002("ctype_punct");
diff --git a/ext/ctype/tests/ctype_alnum_basic.phpt b/ext/ctype/tests/ctype_alnum_basic.phpt
index 2a18b82abdc..43fd3f9824b 100644
--- a/ext/ctype/tests/ctype_alnum_basic.phpt
+++ b/ext/ctype/tests/ctype_alnum_basic.phpt
@@ -5,13 +5,13 @@ Test ctype_alnum() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool ctype_alnum(mixed $c)
- * Description: Checks for alphanumeric character(s) 
+ * Description: Checks for alphanumeric character(s)
  * Source code: ext/ctype/ctype.c
  */
 
 echo "*** Testing ctype_alnum() : basic functionality ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 $c1 = 'abcXYZ';
 $c2 = ' \t*@';
diff --git a/ext/ctype/tests/ctype_alnum_error.phpt b/ext/ctype/tests/ctype_alnum_error.phpt
index 0b4a63632e2..ed67406fa8d 100644
--- a/ext/ctype/tests/ctype_alnum_error.phpt
+++ b/ext/ctype/tests/ctype_alnum_error.phpt
@@ -5,7 +5,7 @@ Test ctype_alnum() function : error conditions - Incorrect number of args
 --FILE--
 <?php
 /* Prototype  : bool ctype_alnum(mixed $c)
- * Description: Checks for alphanumeric character(s) 
+ * Description: Checks for alphanumeric character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -15,7 +15,7 @@ Test ctype_alnum() function : error conditions - Incorrect number of args
 
 echo "*** Testing ctype_alnum() : error conditions ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 // Zero arguments
 echo "\n-- Testing ctype_alnum() function with Zero arguments --\n";
diff --git a/ext/ctype/tests/ctype_alnum_variation1.phpt b/ext/ctype/tests/ctype_alnum_variation1.phpt
index 2505428d21a..9f1ad70e538 100644
--- a/ext/ctype/tests/ctype_alnum_variation1.phpt
+++ b/ext/ctype/tests/ctype_alnum_variation1.phpt
@@ -5,7 +5,7 @@ Test ctype_alnum() function : usage variations - Different data types as $c arg
 --FILE--
 <?php
 /* Prototype  : bool ctype_alnum(mixed $c)
- * Description: Checks for alphanumeric character(s) 
+ * Description: Checks for alphanumeric character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -15,7 +15,7 @@ Test ctype_alnum() function : usage variations - Different data types as $c arg
 
 echo "*** Testing ctype_alnum() : usage variations ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 //get an unset variable
 $unset_var = 10;
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*19*/ "pqr",
        'LMN',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/ctype/tests/ctype_alnum_variation2.phpt b/ext/ctype/tests/ctype_alnum_variation2.phpt
index 94ae22da1ad..92cc3c5575f 100644
--- a/ext/ctype/tests/ctype_alnum_variation2.phpt
+++ b/ext/ctype/tests/ctype_alnum_variation2.phpt
@@ -5,7 +5,7 @@ Test ctype_alnum() function : usage variations - different integers
 --FILE--
 <?php
 /* Prototype  : bool ctype_alnum(mixed $c)
- * Description: Checks for alphanumeric character(s) 
+ * Description: Checks for alphanumeric character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -16,7 +16,7 @@ Test ctype_alnum() function : usage variations - different integers
 
 echo "*** Testing ctype_alnum() : usage variations ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 for ($i = 0; $i < 256; $i++) {
 	if (ctype_alnum($i)) {
diff --git a/ext/ctype/tests/ctype_alnum_variation3.phpt b/ext/ctype/tests/ctype_alnum_variation3.phpt
index a9da6c932ad..520c8ce3444 100644
--- a/ext/ctype/tests/ctype_alnum_variation3.phpt
+++ b/ext/ctype/tests/ctype_alnum_variation3.phpt
@@ -5,7 +5,7 @@ Test ctype_alnum() function : usage variations - different string values
 --FILE--
 <?php
 /* Prototype  : bool ctype_alnum(mixed $c)
- * Description: Checks for alphanumeric character(s) 
+ * Description: Checks for alphanumeric character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -15,7 +15,7 @@ Test ctype_alnum() function : usage variations - different string values
 
 echo "*** Testing ctype_alnum() : usage variations ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 $values = array(
 /*1*/  "This string contains just letters and spaces", // Simple string
@@ -39,7 +39,7 @@ $values = array(
        'abc123\n',
 /*20*/ 'abc 123',
        '',
-       ' ', 
+       ' ',
 /*23*/ base64_decode("w4DDoMOHw6fDiMOo") // non-ascii characters
 );
 
diff --git a/ext/ctype/tests/ctype_alnum_variation4.phpt b/ext/ctype/tests/ctype_alnum_variation4.phpt
index 49167eb34db..7e07e1f9874 100644
--- a/ext/ctype/tests/ctype_alnum_variation4.phpt
+++ b/ext/ctype/tests/ctype_alnum_variation4.phpt
@@ -5,7 +5,7 @@ Test ctype_alnum() function : usage variations  - octal and hexadecimal values
 --FILE--
 <?php
 /* Prototype  : bool ctype_alnum(mixed $c)
- * Description: Checks for alphanumeric character(s) 
+ * Description: Checks for alphanumeric character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -15,7 +15,7 @@ Test ctype_alnum() function : usage variations  - octal and hexadecimal values
 
 echo "*** Testing ctype_alnum() : usage variations ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 $octal_values = array (060, 061, 062, 063);
 $hex_values = array(0x30, 0x31, 0x32, 0x33);
diff --git a/ext/ctype/tests/ctype_alpha_basic.phpt b/ext/ctype/tests/ctype_alpha_basic.phpt
index f0d8af8abc0..4d0c0cfe9d1 100644
--- a/ext/ctype/tests/ctype_alpha_basic.phpt
+++ b/ext/ctype/tests/ctype_alpha_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test ctype_alpha() function : basic functionality 
+Test ctype_alpha() function : basic functionality
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : bool ctype_alpha(mixed $c)
- * Description: Checks for alphabetic character(s) 
+ * Description: Checks for alphabetic character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_alpha_error.phpt b/ext/ctype/tests/ctype_alpha_error.phpt
index 4cf8234e0d0..9334fef78be 100644
--- a/ext/ctype/tests/ctype_alpha_error.phpt
+++ b/ext/ctype/tests/ctype_alpha_error.phpt
@@ -5,7 +5,7 @@ Test ctype_alpha() function : error conditions - Incorrect number of arguments
 --FILE--
 <?php
 /* Prototype  : bool ctype_alpha(mixed $c)
- * Description: Checks for alphabetic character(s) 
+ * Description: Checks for alphabetic character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_alpha_variation1.phpt b/ext/ctype/tests/ctype_alpha_variation1.phpt
index baa75c8d4ea..6d06a9f210e 100644
--- a/ext/ctype/tests/ctype_alpha_variation1.phpt
+++ b/ext/ctype/tests/ctype_alpha_variation1.phpt
@@ -5,7 +5,7 @@ Test ctype_alpha() function : usage variations - different data types as $c arg
 --FILE--
 <?php
 /* Prototype  : bool ctype_alpha(mixed $c)
- * Description: Checks for alphabetic character(s) 
+ * Description: Checks for alphabetic character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/ctype/tests/ctype_alpha_variation2.phpt b/ext/ctype/tests/ctype_alpha_variation2.phpt
index 866f3725997..7548c8615a1 100644
--- a/ext/ctype/tests/ctype_alpha_variation2.phpt
+++ b/ext/ctype/tests/ctype_alpha_variation2.phpt
@@ -5,7 +5,7 @@ Test ctype_alpha() function : usage variations - different integers
 --FILE--
 <?php
 /* Prototype  : bool ctype_alpha(mixed $c)
- * Description: Checks for alphabetic character(s) 
+ * Description: Checks for alphabetic character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_alpha_variation3.phpt b/ext/ctype/tests/ctype_alpha_variation3.phpt
index 5ab4bd6dc22..8c923b01fef 100644
--- a/ext/ctype/tests/ctype_alpha_variation3.phpt
+++ b/ext/ctype/tests/ctype_alpha_variation3.phpt
@@ -5,7 +5,7 @@ Test ctype_alpha() function : usage variations - different strings
 --FILE--
 <?php
 /* Prototype  : bool ctype_alpha(mixed $c)
- * Description: Checks for alphabetic character(s) 
+ * Description: Checks for alphabetic character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -40,7 +40,7 @@ $values = array(
        'abc123\n',
 /*20*/ 'abc 123',
        '',
-       ' ', 
+       ' ',
 /*23*/ base64_decode("w4DDoMOHw6fDiMOo") // non-ascii characters
 );
 
diff --git a/ext/ctype/tests/ctype_alpha_variation4.phpt b/ext/ctype/tests/ctype_alpha_variation4.phpt
index c41d97291b3..b2f8bf0cd27 100644
--- a/ext/ctype/tests/ctype_alpha_variation4.phpt
+++ b/ext/ctype/tests/ctype_alpha_variation4.phpt
@@ -5,7 +5,7 @@ Test ctype_alpha() function : usage variations - Octal and hexadecimal values
 --FILE--
 <?php
 /* Prototype  : bool ctype_alpha(mixed $c)
- * Description: Checks for alphabetic character(s) 
+ * Description: Checks for alphabetic character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_cntrl_basic.phpt b/ext/ctype/tests/ctype_cntrl_basic.phpt
index b9241adc943..2aac8cc4095 100644
--- a/ext/ctype/tests/ctype_cntrl_basic.phpt
+++ b/ext/ctype/tests/ctype_cntrl_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test ctype_cntrl() function : basic functionality 
+Test ctype_cntrl() function : basic functionality
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : bool ctype_cntrl(mixed $c)
- * Description: Checks for control character(s) 
+ * Description: Checks for control character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_cntrl_error.phpt b/ext/ctype/tests/ctype_cntrl_error.phpt
index 7319ef63e26..9b62f0c0ce5 100644
--- a/ext/ctype/tests/ctype_cntrl_error.phpt
+++ b/ext/ctype/tests/ctype_cntrl_error.phpt
@@ -5,7 +5,7 @@ Test ctype_cntrl() function : error conditions - Incorrect number of args
 --FILE--
 <?php
 /* Prototype  : bool ctype_cntrl(mixed $c)
- * Description: Checks for control character(s) 
+ * Description: Checks for control character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_cntrl_variation1.phpt b/ext/ctype/tests/ctype_cntrl_variation1.phpt
index f74c13f967b..de7f8d34cc0 100644
--- a/ext/ctype/tests/ctype_cntrl_variation1.phpt
+++ b/ext/ctype/tests/ctype_cntrl_variation1.phpt
@@ -5,7 +5,7 @@ Test ctype_cntrl() function : usage variations - Different data types as $c arg
 --FILE--
 <?php
 /* Prototype  : bool ctype_cntrl(mixed $c)
- * Description: Checks for control character(s) 
+ * Description: Checks for control character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -73,7 +73,7 @@ $inputs = array(
        '
 ',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/ctype/tests/ctype_cntrl_variation2.phpt b/ext/ctype/tests/ctype_cntrl_variation2.phpt
index b48ab94450f..0861e7c6c8f 100644
--- a/ext/ctype/tests/ctype_cntrl_variation2.phpt
+++ b/ext/ctype/tests/ctype_cntrl_variation2.phpt
@@ -5,7 +5,7 @@ Test ctype_cntrl() function : usage variations - different integers
 --FILE--
 <?php
 /* Prototype  : bool ctype_cntrl(mixed $c)
- * Description: Checks for control character(s) 
+ * Description: Checks for control character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_cntrl_variation3.phpt b/ext/ctype/tests/ctype_cntrl_variation3.phpt
index 4ae5bc31886..c4876378ba7 100644
--- a/ext/ctype/tests/ctype_cntrl_variation3.phpt
+++ b/ext/ctype/tests/ctype_cntrl_variation3.phpt
@@ -5,7 +5,7 @@ Test ctype_cntrl() function : usage variations - Different strings
 --FILE--
 <?php
 /* Prototype  : bool ctype_cntrl(mixed $c)
- * Description: Checks for control character(s) 
+ * Description: Checks for control character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -40,7 +40,7 @@ $values = array(
        'abc123\n',
 /*20*/ 'abc 123',
        '',
-       ' ', 
+       ' ',
        base64_decode("w4DDoMOHw6fDiMOo"), // non-ascii characters
        "\n",
 /*25*/ "\r",
diff --git a/ext/ctype/tests/ctype_cntrl_variation4.phpt b/ext/ctype/tests/ctype_cntrl_variation4.phpt
index 0e1c50379b2..435bdcbaa59 100644
--- a/ext/ctype/tests/ctype_cntrl_variation4.phpt
+++ b/ext/ctype/tests/ctype_cntrl_variation4.phpt
@@ -5,7 +5,7 @@ Test ctype_cntrl() function : usage variations - Octal and hexadecimal values
 --FILE--
 <?php
 /* Prototype  : bool ctype_cntrl(mixed $c)
- * Description: Checks for control character(s) 
+ * Description: Checks for control character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_digit_basic.phpt b/ext/ctype/tests/ctype_digit_basic.phpt
index 049580db1b7..9faf051149d 100644
--- a/ext/ctype/tests/ctype_digit_basic.phpt
+++ b/ext/ctype/tests/ctype_digit_basic.phpt
@@ -5,7 +5,7 @@ Test ctype_digit() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool ctype_digit(mixed $c)
- * Description: Checks for numeric character(s) 
+ * Description: Checks for numeric character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_digit_error.phpt b/ext/ctype/tests/ctype_digit_error.phpt
index 5e8088226ae..ceade3d79b3 100644
--- a/ext/ctype/tests/ctype_digit_error.phpt
+++ b/ext/ctype/tests/ctype_digit_error.phpt
@@ -5,7 +5,7 @@ Test ctype_digit() function : error conditions - incorrect number of arguments
 --FILE--
 <?php
 /* Prototype  : bool ctype_digit(mixed $c)
- * Description: Checks for numeric character(s) 
+ * Description: Checks for numeric character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_digit_variation1.phpt b/ext/ctype/tests/ctype_digit_variation1.phpt
index 306949130d7..2a8b3ed16d9 100644
--- a/ext/ctype/tests/ctype_digit_variation1.phpt
+++ b/ext/ctype/tests/ctype_digit_variation1.phpt
@@ -5,7 +5,7 @@ Test ctype_digit() function : usage variations - different data types as $c arg
 --FILE--
 <?php
 /* Prototype  : bool ctype_digit(mixed $c)
- * Description: Checks for numeric character(s) 
+ * Description: Checks for numeric character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*19*/ "2",
        '309',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/ctype/tests/ctype_digit_variation2.phpt b/ext/ctype/tests/ctype_digit_variation2.phpt
index 318737f4f4c..a88b71758b2 100644
--- a/ext/ctype/tests/ctype_digit_variation2.phpt
+++ b/ext/ctype/tests/ctype_digit_variation2.phpt
@@ -5,7 +5,7 @@ Test ctype_digit() function : usage variations - different integers
 --FILE--
 <?php
 /* Prototype  : bool ctype_digit(mixed $c)
- * Description: Checks for numeric character(s) 
+ * Description: Checks for numeric character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_digit_variation3.phpt b/ext/ctype/tests/ctype_digit_variation3.phpt
index 66ef6f344cb..8f978918a80 100644
--- a/ext/ctype/tests/ctype_digit_variation3.phpt
+++ b/ext/ctype/tests/ctype_digit_variation3.phpt
@@ -5,7 +5,7 @@ Test ctype_digit() function : usage variations - different strings
 --FILE--
 <?php
 /* Prototype  : bool ctype_digit(mixed $c)
- * Description: Checks for numeric character(s) 
+ * Description: Checks for numeric character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -34,7 +34,7 @@ $values = array(
        '@!$*',
        "0",
 /*15*/ "3",
-       "9", 
+       "9",
        "1234",
        "7890",
        "0677",
diff --git a/ext/ctype/tests/ctype_digit_variation4.phpt b/ext/ctype/tests/ctype_digit_variation4.phpt
index c94be3e6df1..1b5c4de1d90 100644
--- a/ext/ctype/tests/ctype_digit_variation4.phpt
+++ b/ext/ctype/tests/ctype_digit_variation4.phpt
@@ -5,7 +5,7 @@ Test ctype_digit() function : usage variations - octal and hexadecimal values
 --FILE--
 <?php
 /* Prototype  : bool ctype_digit(mixed $c)
- * Description: Checks for numeric character(s) 
+ * Description: Checks for numeric character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_graph_basic.phpt b/ext/ctype/tests/ctype_graph_basic.phpt
index b45aac6d455..12af362bd73 100644
--- a/ext/ctype/tests/ctype_graph_basic.phpt
+++ b/ext/ctype/tests/ctype_graph_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test ctype_graph() function : basic functionality 
+Test ctype_graph() function : basic functionality
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : bool ctype_graph(mixed $c)
- * Description: Checks for any printable character(s) except space 
+ * Description: Checks for any printable character(s) except space
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_graph_error.phpt b/ext/ctype/tests/ctype_graph_error.phpt
index 953b553fb63..2c04bac654e 100644
--- a/ext/ctype/tests/ctype_graph_error.phpt
+++ b/ext/ctype/tests/ctype_graph_error.phpt
@@ -5,7 +5,7 @@ Test ctype_graph() function : error conditions - incorrect number of arguments
 --FILE--
 <?php
 /* Prototype  : bool ctype_graph(mixed $c)
- * Description: Checks for any printable character(s) except space 
+ * Description: Checks for any printable character(s) except space
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_graph_variation1.phpt b/ext/ctype/tests/ctype_graph_variation1.phpt
index 03471f1bda4..f04c48ade99 100644
--- a/ext/ctype/tests/ctype_graph_variation1.phpt
+++ b/ext/ctype/tests/ctype_graph_variation1.phpt
@@ -5,8 +5,8 @@ Test ctype_graph() function : usage variations - different data types as $c arg
 --FILE--
 <?php
 /* Prototype  : bool ctype_graph(mixed $c)
- * Description: Checks for any printable character(s) except space 
- * Source code: ext/ctype/ctype.c 
+ * Description: Checks for any printable character(s) except space
+ * Source code: ext/ctype/ctype.c
  */
 
 /*
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/ctype/tests/ctype_graph_variation2.phpt b/ext/ctype/tests/ctype_graph_variation2.phpt
index 8f8b3fed103..03cbbad203b 100644
--- a/ext/ctype/tests/ctype_graph_variation2.phpt
+++ b/ext/ctype/tests/ctype_graph_variation2.phpt
@@ -5,8 +5,8 @@ Test ctype_graph() function : usage variations - different integers
 --FILE--
 <?php
 /* Prototype  : bool ctype_graph(mixed $c)
- * Description: Checks for any printable character(s) except space 
- * Source code: ext/ctype/ctype.c 
+ * Description: Checks for any printable character(s) except space
+ * Source code: ext/ctype/ctype.c
  */
 
 /*
diff --git a/ext/ctype/tests/ctype_graph_variation3.phpt b/ext/ctype/tests/ctype_graph_variation3.phpt
index 327a497e9f6..5db7a32b38f 100644
--- a/ext/ctype/tests/ctype_graph_variation3.phpt
+++ b/ext/ctype/tests/ctype_graph_variation3.phpt
@@ -5,8 +5,8 @@ Test ctype_graph() function : usage variations - different strings
 --FILE--
 <?php
 /* Prototype  : bool ctype_graph(mixed $c)
- * Description: Checks for any printable character(s) except space 
- * Source code: ext/ctype/ctype.c 
+ * Description: Checks for any printable character(s) except space
+ * Source code: ext/ctype/ctype.c
  */
 
 /*
diff --git a/ext/ctype/tests/ctype_graph_variation4.phpt b/ext/ctype/tests/ctype_graph_variation4.phpt
index d425b4c7c32..8606cc016c9 100644
--- a/ext/ctype/tests/ctype_graph_variation4.phpt
+++ b/ext/ctype/tests/ctype_graph_variation4.phpt
@@ -5,8 +5,8 @@ Test ctype_graph() function : usage variations - octal and hexadecimal values
 --FILE--
 <?php
 /* Prototype  : bool ctype_graph(mixed $c)
- * Description: Checks for any printable character(s) except space 
- * Source code: ext/ctype/ctype.c 
+ * Description: Checks for any printable character(s) except space
+ * Source code: ext/ctype/ctype.c
  */
 
 /*
diff --git a/ext/ctype/tests/ctype_lower_basic.phpt b/ext/ctype/tests/ctype_lower_basic.phpt
index be6c0affd2f..1eae4cbd96e 100644
--- a/ext/ctype/tests/ctype_lower_basic.phpt
+++ b/ext/ctype/tests/ctype_lower_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test ctype_lower() function : basic functionality 
+Test ctype_lower() function : basic functionality
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : bool ctype_lower(mixed $c)
- * Description: Checks for lowercase character(s)  
+ * Description: Checks for lowercase character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_lower_error.phpt b/ext/ctype/tests/ctype_lower_error.phpt
index ef49c4cf440..1299cf84243 100644
--- a/ext/ctype/tests/ctype_lower_error.phpt
+++ b/ext/ctype/tests/ctype_lower_error.phpt
@@ -5,7 +5,7 @@ Test ctype_lower() function : error conditions - incorrect number of args
 --FILE--
 <?php
 /* Prototype  : bool ctype_lower(mixed $c)
- * Description: Checks for lowercase character(s)  
+ * Description: Checks for lowercase character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_lower_variation1.phpt b/ext/ctype/tests/ctype_lower_variation1.phpt
index 91c8ef54072..9ce1aab6c4c 100644
--- a/ext/ctype/tests/ctype_lower_variation1.phpt
+++ b/ext/ctype/tests/ctype_lower_variation1.phpt
@@ -5,7 +5,7 @@ Test ctype_lower() function : usage variations - different data types as $c arg
 --FILE--
 <?php
 /* Prototype  : bool ctype_lower(mixed $c)
- * Description: Checks for lowercase character(s)  
+ * Description: Checks for lowercase character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
@@ -95,7 +95,7 @@ foreach($inputs as $input) {
 };
 
 fclose($fp);
- 
+
 setlocale(LC_CTYPE, $orig);
 ?>
 ===DONE===
diff --git a/ext/ctype/tests/ctype_lower_variation2.phpt b/ext/ctype/tests/ctype_lower_variation2.phpt
index 39eff9a9568..de458576b76 100644
--- a/ext/ctype/tests/ctype_lower_variation2.phpt
+++ b/ext/ctype/tests/ctype_lower_variation2.phpt
@@ -5,7 +5,7 @@ Test ctype_lower() function : usage variations - different integers
 --FILE--
 <?php
 /* Prototype  : bool ctype_lower(mixed $c)
- * Description: Checks for lowercase character(s)  
+ * Description: Checks for lowercase character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -23,7 +23,7 @@ for ($i = 0; $i < 256; $i++) {
 		echo "character code $i is a lower case character\n";
 	}
 }
- 
+
 setlocale(LC_CTYPE, $orig);
 ?>
 ===DONE===
diff --git a/ext/ctype/tests/ctype_lower_variation3.phpt b/ext/ctype/tests/ctype_lower_variation3.phpt
index 061cc1ce9ae..e431fc649f8 100644
--- a/ext/ctype/tests/ctype_lower_variation3.phpt
+++ b/ext/ctype/tests/ctype_lower_variation3.phpt
@@ -5,7 +5,7 @@ Test ctype_lower() function : usage variations - different strings
 --FILE--
 <?php
 /* Prototype  : bool ctype_lower(mixed $c)
- * Description: Checks for lowercase character(s)  
+ * Description: Checks for lowercase character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_lower_variation4.phpt b/ext/ctype/tests/ctype_lower_variation4.phpt
index 25e3d17f87e..562b334b548 100644
--- a/ext/ctype/tests/ctype_lower_variation4.phpt
+++ b/ext/ctype/tests/ctype_lower_variation4.phpt
@@ -5,7 +5,7 @@ Test ctype_lower() function : usage variations - octal and hexadecimal values
 --FILE--
 <?php
 /* Prototype  : bool ctype_lower(mixed $c)
- * Description: Checks for lowercase character(s)  
+ * Description: Checks for lowercase character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_print_basic.phpt b/ext/ctype/tests/ctype_print_basic.phpt
index 49cb26fbdda..1616d3ccd56 100644
--- a/ext/ctype/tests/ctype_print_basic.phpt
+++ b/ext/ctype/tests/ctype_print_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test ctype_print() function : basic functionality 
+Test ctype_print() function : basic functionality
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : bool ctype_print(mixed $c)
- * Description: Checks for printable character(s) 
+ * Description: Checks for printable character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_print_error.phpt b/ext/ctype/tests/ctype_print_error.phpt
index 09ed8c94ca7..922f959452b 100644
--- a/ext/ctype/tests/ctype_print_error.phpt
+++ b/ext/ctype/tests/ctype_print_error.phpt
@@ -5,7 +5,7 @@ Test ctype_print() function : error conditions - incorrect number of args
 --FILE--
 <?php
 /* Prototype  : bool ctype_print(mixed $c)
- * Description: Checks for printable character(s) 
+ * Description: Checks for printable character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_print_variation1.phpt b/ext/ctype/tests/ctype_print_variation1.phpt
index a882c960205..17b5edbad9a 100644
--- a/ext/ctype/tests/ctype_print_variation1.phpt
+++ b/ext/ctype/tests/ctype_print_variation1.phpt
@@ -5,7 +5,7 @@ Test ctype_print() function : usage variations - different data types as $c arg
 --FILE--
 <?php
 /* Prototype  : bool ctype_print(mixed $c)
- * Description: Checks for printable character(s) 
+ * Description: Checks for printable character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/ctype/tests/ctype_print_variation2.phpt b/ext/ctype/tests/ctype_print_variation2.phpt
index c216e4da4a9..6758c6f66ea 100644
--- a/ext/ctype/tests/ctype_print_variation2.phpt
+++ b/ext/ctype/tests/ctype_print_variation2.phpt
@@ -5,7 +5,7 @@ Test ctype_print() function : usage variations - different integers
 --FILE--
 <?php
 /* Prototype  : bool ctype_print(mixed $c)
- * Description: Checks for printable character(s) 
+ * Description: Checks for printable character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_print_variation3.phpt b/ext/ctype/tests/ctype_print_variation3.phpt
index 7b90e4fd086..d86cc531ed6 100644
--- a/ext/ctype/tests/ctype_print_variation3.phpt
+++ b/ext/ctype/tests/ctype_print_variation3.phpt
@@ -5,7 +5,7 @@ Test ctype_print() function : usage variations - different strings
 --FILE--
 <?php
 /* Prototype  : bool ctype_print(mixed $c)
- * Description: Checks for printable character(s) 
+ * Description: Checks for printable character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -40,7 +40,7 @@ $values = array(
        "abc123\n",
 /*20*/ 'abc 123',
        '',
-       ' ', 
+       ' ',
 /*23*/ base64_decode("w4DDoMOHw6fDiMOo") // non-ascii characters
 );
 
diff --git a/ext/ctype/tests/ctype_print_variation4.phpt b/ext/ctype/tests/ctype_print_variation4.phpt
index d6dc84ac507..e1c65bf6862 100644
--- a/ext/ctype/tests/ctype_print_variation4.phpt
+++ b/ext/ctype/tests/ctype_print_variation4.phpt
@@ -5,7 +5,7 @@ Test ctype_print() function : usage variations - octal and hexadecimal values
 --FILE--
 <?php
 /* Prototype  : bool ctype_print(mixed $c)
- * Description: Checks for printable character(s) 
+ * Description: Checks for printable character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_punct_basic.phpt b/ext/ctype/tests/ctype_punct_basic.phpt
index 647f8519b1b..e21727467e6 100644
--- a/ext/ctype/tests/ctype_punct_basic.phpt
+++ b/ext/ctype/tests/ctype_punct_basic.phpt
@@ -1,18 +1,18 @@
 --TEST--
-Test ctype_punct() function : basic functionality 
+Test ctype_punct() function : basic functionality
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : bool ctype_punct(mixed $c)
- * Description: Checks for any printable character which is not whitespace 
- * or an alphanumeric character 
+ * Description: Checks for any printable character which is not whitespace
+ * or an alphanumeric character
  * Source code: ext/ctype/ctype.c
  */
 
 echo "*** Testing ctype_punct() : basic functionality ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 $c1 = '@!$*';
 $c2 = 'hello, world!';
@@ -20,7 +20,7 @@ $c2 = 'hello, world!';
 var_dump(ctype_punct($c1));
 var_dump(ctype_punct($c2));
 
-setlocale(LC_CTYPE, $orig); 
+setlocale(LC_CTYPE, $orig);
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/ctype/tests/ctype_punct_error.phpt b/ext/ctype/tests/ctype_punct_error.phpt
index afb9ff0de24..c60ab3a3dbc 100644
--- a/ext/ctype/tests/ctype_punct_error.phpt
+++ b/ext/ctype/tests/ctype_punct_error.phpt
@@ -5,8 +5,8 @@ Test ctype_punct() function : error conditions - incorrect number of args
 --FILE--
 <?php
 /* Prototype  : bool ctype_punct(mixed $c)
- * Description: Checks for any printable character which is not whitespace 
- * or an alphanumeric character 
+ * Description: Checks for any printable character which is not whitespace
+ * or an alphanumeric character
  * Source code: ext/ctype/ctype.c
  */
 
@@ -16,7 +16,7 @@ Test ctype_punct() function : error conditions - incorrect number of args
 
 echo "*** Testing ctype_punct() : error conditions ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 // Zero arguments
 echo "\n-- Testing ctype_punct() function with Zero arguments --\n";
@@ -28,7 +28,7 @@ $c = 1;
 $extra_arg = 10;
 var_dump( ctype_punct($c, $extra_arg) );
 
-setlocale(LC_CTYPE, $orig); 
+setlocale(LC_CTYPE, $orig);
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/ctype/tests/ctype_punct_variation1.phpt b/ext/ctype/tests/ctype_punct_variation1.phpt
index 0f57c45a664..e1b6cc22adf 100644
--- a/ext/ctype/tests/ctype_punct_variation1.phpt
+++ b/ext/ctype/tests/ctype_punct_variation1.phpt
@@ -5,8 +5,8 @@ Test ctype_punct() function : usage variations - different data types as $c argu
 --FILE--
 <?php
 /* Prototype  : bool ctype_punct(mixed $c)
- * Description: Checks for any printable character which is not whitespace 
- * or an alphanumeric character 
+ * Description: Checks for any printable character which is not whitespace
+ * or an alphanumeric character
  * Source code: ext/ctype/ctype.c
  */
 
@@ -16,7 +16,7 @@ Test ctype_punct() function : usage variations - different data types as $c argu
 
 echo "*** Testing ctype_punct() : usage variations ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 //get an unset variable
 $unset_var = 10;
@@ -63,7 +63,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -73,7 +73,7 @@ $inputs = array(
 /*19*/ ";:'@",
        '#~/?',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
@@ -97,7 +97,7 @@ foreach($inputs as $input) {
 
 fclose($fp);
 
-setlocale(LC_CTYPE, $orig); 
+setlocale(LC_CTYPE, $orig);
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/ctype/tests/ctype_punct_variation2.phpt b/ext/ctype/tests/ctype_punct_variation2.phpt
index 3a4a66ac7b9..68f3e770372 100644
--- a/ext/ctype/tests/ctype_punct_variation2.phpt
+++ b/ext/ctype/tests/ctype_punct_variation2.phpt
@@ -5,8 +5,8 @@ Test ctype_punct() function : usage variations - different integers
 --FILE--
 <?php
 /* Prototype  : bool ctype_punct(mixed $c)
- * Description: Checks for any printable character which is not whitespace 
- * or an alphanumeric character 
+ * Description: Checks for any printable character which is not whitespace
+ * or an alphanumeric character
  * Source code: ext/ctype/ctype.c
  */
 
@@ -17,7 +17,7 @@ Test ctype_punct() function : usage variations - different integers
 
 echo "*** Testing ctype_punct() : usage variations ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 for ($c = 1; $c < 256; $c++) {
 	if (ctype_punct($c)) {
@@ -25,7 +25,7 @@ for ($c = 1; $c < 256; $c++) {
 	}
 }
 
-setlocale(LC_CTYPE, $orig); 
+setlocale(LC_CTYPE, $orig);
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/ctype/tests/ctype_punct_variation3.phpt b/ext/ctype/tests/ctype_punct_variation3.phpt
index 73e377eed15..44da5f05348 100644
--- a/ext/ctype/tests/ctype_punct_variation3.phpt
+++ b/ext/ctype/tests/ctype_punct_variation3.phpt
@@ -5,8 +5,8 @@ Test ctype_punct() function : usage variations - different punctuation
 --FILE--
 <?php
 /* Prototype  : bool ctype_punct(mixed $c)
- * Description: Checks for any printable character which is not whitespace 
- * or an alphanumeric character 
+ * Description: Checks for any printable character which is not whitespace
+ * or an alphanumeric character
  * Source code: ext/ctype/ctype.c
  */
 
@@ -41,7 +41,7 @@ $values = array(
        "abc123\n",
 /*20*/ 'abc 123',
        '',
-       ' ', 
+       ' ',
        base64_decode("w4DDoMOHw6fDiMOo"), // non-ascii characters
        "!$%@\n",
 /*25*/ "\"?!\"",
diff --git a/ext/ctype/tests/ctype_punct_variation4.phpt b/ext/ctype/tests/ctype_punct_variation4.phpt
index 7b7201b1400..dbf36ed4641 100644
--- a/ext/ctype/tests/ctype_punct_variation4.phpt
+++ b/ext/ctype/tests/ctype_punct_variation4.phpt
@@ -5,8 +5,8 @@ Test ctype_punct() function : usage variations - Octal and Hexadecimal values
 --FILE--
 <?php
 /* Prototype  : bool ctype_punct(mixed $c)
- * Description: Checks for any printable character which is not whitespace 
- * or an alphanumeric character 
+ * Description: Checks for any printable character which is not whitespace
+ * or an alphanumeric character
  * Source code: ext/ctype/ctype.c
  */
 
@@ -16,7 +16,7 @@ Test ctype_punct() function : usage variations - Octal and Hexadecimal values
 
 echo "*** Testing ctype_punct() : usage variations ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 $octal_values = array(041,  042,  043,  044);
 $hex_values   = array(0x21, 0x22, 0x23, 0x24);
@@ -37,7 +37,7 @@ foreach($hex_values as $c) {
 	$iterator++;
 }
 
-setlocale(LC_CTYPE, $orig); 
+setlocale(LC_CTYPE, $orig);
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/ctype/tests/ctype_space_basic.phpt b/ext/ctype/tests/ctype_space_basic.phpt
index 55d9a81cbc1..0bb5efe7cc8 100644
--- a/ext/ctype/tests/ctype_space_basic.phpt
+++ b/ext/ctype/tests/ctype_space_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test ctype_space() function : basic functionality 
+Test ctype_space() function : basic functionality
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
@@ -19,7 +19,7 @@ var_dump(ctype_space($c1));
 $c2 = "Hello, world!\n";
 var_dump(ctype_space($c2));
 
-setlocale(LC_CTYPE, $orig); 
+setlocale(LC_CTYPE, $orig);
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/ctype/tests/ctype_space_variation1.phpt b/ext/ctype/tests/ctype_space_variation1.phpt
index 4a469ae0372..c072a28811f 100644
--- a/ext/ctype/tests/ctype_space_variation1.phpt
+++ b/ext/ctype/tests/ctype_space_variation1.phpt
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*19*/ "\n\t\r",
        ' ',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/ctype/tests/ctype_space_variation3.phpt b/ext/ctype/tests/ctype_space_variation3.phpt
index bb8423b1eee..c2c0ec498b3 100644
--- a/ext/ctype/tests/ctype_space_variation3.phpt
+++ b/ext/ctype/tests/ctype_space_variation3.phpt
@@ -40,7 +40,7 @@ $values = array(
        "abc123\n",
 /*20*/ 'abc 123',
        '',
-       ' ', 
+       ' ',
        base64_decode("w4DDoMOHw6fDiMOo"), // non-ascii characters
        "\"\n",
 /*25*/ " \t\r\n",
diff --git a/ext/ctype/tests/ctype_upper_basic.phpt b/ext/ctype/tests/ctype_upper_basic.phpt
index 635e4818dc5..8685689829e 100644
--- a/ext/ctype/tests/ctype_upper_basic.phpt
+++ b/ext/ctype/tests/ctype_upper_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test ctype_upper() function : basic functionality 
+Test ctype_upper() function : basic functionality
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : bool ctype_upper(mixed $c)
- * Description: Checks for uppercase character(s) 
+ * Description: Checks for uppercase character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_upper_error.phpt b/ext/ctype/tests/ctype_upper_error.phpt
index e9183f48382..a7c18ce4a5d 100644
--- a/ext/ctype/tests/ctype_upper_error.phpt
+++ b/ext/ctype/tests/ctype_upper_error.phpt
@@ -5,7 +5,7 @@ Test ctype_upper() function : error conditions - incorrect number of args
 --FILE--
 <?php
 /* Prototype  : bool ctype_upper(mixed $c)
- * Description: Checks for uppercase character(s) 
+ * Description: Checks for uppercase character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_upper_variation1.phpt b/ext/ctype/tests/ctype_upper_variation1.phpt
index a257cd3f4a2..228b602bc35 100644
--- a/ext/ctype/tests/ctype_upper_variation1.phpt
+++ b/ext/ctype/tests/ctype_upper_variation1.phpt
@@ -5,7 +5,7 @@ Test ctype_upper() function : usage variations - different data types
 --FILE--
 <?php
 /* Prototype  : bool ctype_upper(mixed $c)
- * Description: Checks for uppercase character(s) 
+ * Description: Checks for uppercase character(s)
  * Source code: ext/ctype/ctype.c
  */
 
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*19*/ "STRING",
        'STRING',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/ctype/tests/ctype_upper_variation2.phpt b/ext/ctype/tests/ctype_upper_variation2.phpt
index 9357feb1e45..c3ad073fa59 100644
--- a/ext/ctype/tests/ctype_upper_variation2.phpt
+++ b/ext/ctype/tests/ctype_upper_variation2.phpt
@@ -5,7 +5,7 @@ Test ctype_upper() function : usage variations - different integers
 --FILE--
 <?php
 /* Prototype  : bool ctype_upper(mixed $c)
- * Description: Checks for uppercase character(s) 
+ * Description: Checks for uppercase character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_upper_variation3.phpt b/ext/ctype/tests/ctype_upper_variation3.phpt
index 3e4509e345a..207165f2abc 100644
--- a/ext/ctype/tests/ctype_upper_variation3.phpt
+++ b/ext/ctype/tests/ctype_upper_variation3.phpt
@@ -5,7 +5,7 @@ Test ctype_upper() function : usage variations - different strings
 --FILE--
 <?php
 /* Prototype  : bool ctype_upper(mixed $c)
- * Description: Checks for uppercase character(s) 
+ * Description: Checks for uppercase character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_upper_variation4.phpt b/ext/ctype/tests/ctype_upper_variation4.phpt
index 0c279921598..989b7b06f9c 100644
--- a/ext/ctype/tests/ctype_upper_variation4.phpt
+++ b/ext/ctype/tests/ctype_upper_variation4.phpt
@@ -5,7 +5,7 @@ Test ctype_upper() function : usage variations - octal and hexadecimal values
 --FILE--
 <?php
 /* Prototype  : bool ctype_upper(mixed $c)
- * Description: Checks for uppercase character(s) 
+ * Description: Checks for uppercase character(s)
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_xdigit_basic.phpt b/ext/ctype/tests/ctype_xdigit_basic.phpt
index 179115d23d4..7643cc52ed7 100644
--- a/ext/ctype/tests/ctype_xdigit_basic.phpt
+++ b/ext/ctype/tests/ctype_xdigit_basic.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test ctype_xdigit() function : basic functionality 
+Test ctype_xdigit() function : basic functionality
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : bool ctype_xdigit(mixed $c)
- * Description: Checks for character(s) representing a hexadecimal digit 
+ * Description: Checks for character(s) representing a hexadecimal digit
  * Source code: ext/ctype/ctype.c
  */
 
 echo "*** Testing ctype_xdigit() : basic functionality ***\n";
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 $c1 = 'abcdefABCDEF0123456789';
 $c2 = 'face 034';
@@ -18,7 +18,7 @@ $c2 = 'face 034';
 var_dump(ctype_xdigit($c1));
 var_dump(ctype_xdigit($c2));
 
-setlocale(LC_CTYPE, $orig); 
+setlocale(LC_CTYPE, $orig);
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/ctype/tests/ctype_xdigit_error.phpt b/ext/ctype/tests/ctype_xdigit_error.phpt
index 60ea69ce1e9..c3adc06af93 100644
--- a/ext/ctype/tests/ctype_xdigit_error.phpt
+++ b/ext/ctype/tests/ctype_xdigit_error.phpt
@@ -5,7 +5,7 @@ Test ctype_xdigit() function : error conditions - Incorrect number of args
 --FILE--
 <?php
 /* Prototype  : bool ctype_xdigit(mixed $c)
- * Description: Checks for character(s) representing a hexadecimal digit 
+ * Description: Checks for character(s) representing a hexadecimal digit
  * Source code: ext/ctype/ctype.c
  */
 
diff --git a/ext/ctype/tests/ctype_xdigit_variation1.phpt b/ext/ctype/tests/ctype_xdigit_variation1.phpt
index 963755b3582..9f819bde161 100644
--- a/ext/ctype/tests/ctype_xdigit_variation1.phpt
+++ b/ext/ctype/tests/ctype_xdigit_variation1.phpt
@@ -5,7 +5,7 @@ Test ctype_xdigit() function : usage variations - different data typse as $c arg
 --FILE--
 <?php
 /* Prototype  : bool ctype_xdigit(mixed $c)
- * Description: Checks for character(s) representing a hexadecimal digit 
+ * Description: Checks for character(s) representing a hexadecimal digit
  * Source code: ext/ctype/ctype.c
  */
 
@@ -15,7 +15,7 @@ Test ctype_xdigit() function : usage variations - different data typse as $c arg
 
 echo "*** Testing ctype_xdigit() : usage variations ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 //get an unset variable
 $unset_var = 10;
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*19*/ "456",
        'def',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
@@ -96,7 +96,7 @@ foreach($inputs as $input) {
 
 fclose($fp);
 
-setlocale(LC_CTYPE, $orig); 
+setlocale(LC_CTYPE, $orig);
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/ctype/tests/ctype_xdigit_variation2.phpt b/ext/ctype/tests/ctype_xdigit_variation2.phpt
index 1e7b7bd4b47..074cb7fbc1d 100644
--- a/ext/ctype/tests/ctype_xdigit_variation2.phpt
+++ b/ext/ctype/tests/ctype_xdigit_variation2.phpt
@@ -5,7 +5,7 @@ Test ctype_xdigit() function : usage variations - different integers
 --FILE--
 <?php
 /* Prototype  : bool ctype_xdigit(mixed $c)
- * Description: Checks for character(s) representing a hexadecimal digit 
+ * Description: Checks for character(s) representing a hexadecimal digit
  * Source code: ext/ctype/ctype.c
  */
 
@@ -16,7 +16,7 @@ Test ctype_xdigit() function : usage variations - different integers
 
 echo "*** Testing ctype_xdigit() : usage variations ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 for($c = 1; $c < 256; $c++) {
 	if (ctype_xdigit($c)) {
@@ -24,7 +24,7 @@ for($c = 1; $c < 256; $c++) {
 	}
 }
 
-setlocale(LC_CTYPE, $orig); 
+setlocale(LC_CTYPE, $orig);
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/ctype/tests/ctype_xdigit_variation3.phpt b/ext/ctype/tests/ctype_xdigit_variation3.phpt
index 2c9960ced2b..50798dcc7d6 100644
--- a/ext/ctype/tests/ctype_xdigit_variation3.phpt
+++ b/ext/ctype/tests/ctype_xdigit_variation3.phpt
@@ -5,7 +5,7 @@ Test ctype_xdigit() function : usage variations - Different strings
 --FILE--
 <?php
 /* Prototype  : bool ctype_xdigit(mixed $c)
- * Description: Checks for character(s) representing a hexadecimal digit 
+ * Description: Checks for character(s) representing a hexadecimal digit
  * Source code: ext/ctype/ctype.c
  */
 
@@ -16,7 +16,7 @@ Test ctype_xdigit() function : usage variations - Different strings
 
 echo "*** Testing ctype_xdigit() : usage variations ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 $values = array(
 /*1*/  "This string contains just letters and spaces", // Simple string
@@ -54,7 +54,7 @@ foreach($values as $value) {
       $iterator++;
 };
 
-setlocale(LC_CTYPE, $orig); 
+setlocale(LC_CTYPE, $orig);
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/ctype/tests/ctype_xdigit_variation4.phpt b/ext/ctype/tests/ctype_xdigit_variation4.phpt
index 4707bcebff4..b504265e95d 100644
--- a/ext/ctype/tests/ctype_xdigit_variation4.phpt
+++ b/ext/ctype/tests/ctype_xdigit_variation4.phpt
@@ -5,7 +5,7 @@ Test ctype_xdigit() function : usage variations - heaxadecimal and octal values
 --FILE--
 <?php
 /* Prototype  : bool ctype_xdigit(mixed $c)
- * Description: Checks for character(s) representing a hexadecimal digit 
+ * Description: Checks for character(s) representing a hexadecimal digit
  * Source code: ext/ctype/ctype.c
  */
 
@@ -18,7 +18,7 @@ Test ctype_xdigit() function : usage variations - heaxadecimal and octal values
 
 echo "*** Testing ctype_xdigit() : usage variations ***\n";
 
-$orig = setlocale(LC_CTYPE, "C"); 
+$orig = setlocale(LC_CTYPE, "C");
 
 // contain hexadecimal digits but do not correspond to 'correct' ints
 $octal_values1 = array(012, 013, 014, 015);
@@ -51,7 +51,7 @@ echo "'Correct' Integers: \n";
 foreach($hex_values2 as $c) {
 	var_dump(ctype_xdigit($c));
 }
-setlocale(LC_CTYPE, $orig); 
+setlocale(LC_CTYPE, $orig);
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/curl/tests/bug45161.phpt b/ext/curl/tests/bug45161.phpt
index bfcd244004c..bf6f6697714 100644
--- a/ext/curl/tests/bug45161.phpt
+++ b/ext/curl/tests/bug45161.phpt
@@ -1,16 +1,16 @@
 --TEST--
 Bug #45161 (Reusing a curl handle leaks memory)
 --SKIPIF--
-<?php 
+<?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	exit("skip not for Windows");
 }
 if (!extension_loaded("curl")) {
 	exit("skip curl extension not loaded");
 }
-$curl_version = curl_version(); 
+$curl_version = curl_version();
 if ($curl_version['version_number'] < 0x071100) {
-	exit("skip: test works only with curl >= 7.17.0"); 
+	exit("skip: test works only with curl >= 7.17.0");
 }
 ?>
 --FILE--
diff --git a/ext/curl/tests/bug46711.phpt b/ext/curl/tests/bug46711.phpt
index 3149c45d7eb..86565132945 100644
--- a/ext/curl/tests/bug46711.phpt
+++ b/ext/curl/tests/bug46711.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #46711 (lost memory when foreach is used for values passed to curl_setopt())
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("curl")) {
 	exit("skip curl extension not loaded");
 }
diff --git a/ext/curl/tests/bug46739.phpt b/ext/curl/tests/bug46739.phpt
index 895bba7556c..b7adc5662f9 100644
--- a/ext/curl/tests/bug46739.phpt
+++ b/ext/curl/tests/bug46739.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #46739 (array returned by curl_getinfo should contain content_type key)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("curl")) {
 	exit("skip curl extension not loaded");
 }
diff --git a/ext/curl/tests/bug54798-win32.phpt b/ext/curl/tests/bug54798-win32.phpt
index bce39903ba1..3abbfff94ea 100644
--- a/ext/curl/tests/bug54798-win32.phpt
+++ b/ext/curl/tests/bug54798-win32.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54798 (Segfault when CURLOPT_STDERR file pointer is closed before calling curl_exec)
 --SKIPIF--
-<?php 
+<?php
 include 'skipif.inc';
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
     die('skip Windows only');
@@ -25,7 +25,7 @@ function checkForClosedFilePointer($host, $curl_option, $description) {
     }
 
 	curl_setopt($ch, $curl_option, $fp);
-	
+
 	curl_setopt($ch, CURLOPT_URL, $host);
 	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
diff --git a/ext/curl/tests/bug54798.phpt b/ext/curl/tests/bug54798.phpt
index d2542815d4b..c6040a68e20 100644
--- a/ext/curl/tests/bug54798.phpt
+++ b/ext/curl/tests/bug54798.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54798 (Segfault when CURLOPT_STDERR file pointer is closed before calling curl_exec)
 --SKIPIF--
-<?php 
+<?php
 include 'skipif.inc';
 if(substr(PHP_OS, 0, 3) == 'WIN' ) {
     die('skip not for Windows');
@@ -25,7 +25,7 @@ function checkForClosedFilePointer($host, $curl_option, $description) {
     }
 
 	curl_setopt($ch, $curl_option, $fp);
-	
+
 	curl_setopt($ch, CURLOPT_URL, $host);
 	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
diff --git a/ext/curl/tests/bug54995.phpt b/ext/curl/tests/bug54995.phpt
index 4af59948be9..2aa8f0f75a1 100644
--- a/ext/curl/tests/bug54995.phpt
+++ b/ext/curl/tests/bug54995.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54995 (Missing CURLINFO_RESPONSE_CODE support)
 --SKIPIF--
-<?php 
+<?php
 include 'skipif.inc';
 
 if ($curl_version['version_number'] > 0x070a08) {
diff --git a/ext/curl/tests/bug55767.phpt b/ext/curl/tests/bug55767.phpt
index bbeecb6b878..ae20261cad5 100644
--- a/ext/curl/tests/bug55767.phpt
+++ b/ext/curl/tests/bug55767.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test curl_opt() function with POST params from array with a numeric key
 --SKIPIF--
-<?php 
+<?php
 include 'skipif.inc';
 ?>
 --FILE--
@@ -26,7 +26,7 @@ include 'skipif.inc';
   curl_setopt($ch, CURLOPT_POST, 1);
   curl_setopt($ch, CURLOPT_POSTFIELDS, array('Hello'=>'World','Foo'=>'Bar',100=>'John Doe'));
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/ext/curl/tests/bug61948-win32.phpt b/ext/curl/tests/bug61948-win32.phpt
index b91ccb78154..2194c688060 100644
--- a/ext/curl/tests/bug61948-win32.phpt
+++ b/ext/curl/tests/bug61948-win32.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; 
+<?php if (!extension_loaded("curl")) print "skip";
 if(substr(PHP_OS, 0, 3) != 'WIN' )
   die("skip Not Valid for Linux");
 ?>
diff --git a/ext/curl/tests/bug61948.phpt b/ext/curl/tests/bug61948.phpt
index 00df07d73e2..1df9d7b7b4f 100644
--- a/ext/curl/tests/bug61948.phpt
+++ b/ext/curl/tests/bug61948.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; 
+<?php if (!extension_loaded("curl")) print "skip";
 if(substr(PHP_OS, 0, 3) == 'WIN' )
   die("skip Not Valid for Windows");
 ?>
diff --git a/ext/curl/tests/bug62839.phpt b/ext/curl/tests/bug62839.phpt
index e6988d6de18..f51b3b638c3 100644
--- a/ext/curl/tests/bug62839.phpt
+++ b/ext/curl/tests/bug62839.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #62839 (curl_copy_handle segfault with CURLOPT_FILE)
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; 
+<?php if (!extension_loaded("curl")) print "skip";
 ?>
 --FILE--
 <?php
diff --git a/ext/curl/tests/bug68089.phpt b/ext/curl/tests/bug68089.phpt
index d65441b2ccb..4af1dc9e7fd 100644
--- a/ext/curl/tests/bug68089.phpt
+++ b/ext/curl/tests/bug68089.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #68089 (NULL byte injection - cURL lib)
 --SKIPIF--
-<?php 
+<?php
 include 'skipif.inc';
 
 ?>
diff --git a/ext/curl/tests/bug68937.phpt b/ext/curl/tests/bug68937.phpt
index 0f346cf3fac..fe2a62d0452 100644
--- a/ext/curl/tests/bug68937.phpt
+++ b/ext/curl/tests/bug68937.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug # #68937 (Segfault in curl_multi_exec)
 --SKIPIF--
-<?php 
+<?php
 if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
 include 'skipif.inc';
 ?>
diff --git a/ext/curl/tests/bug68937_2.phpt b/ext/curl/tests/bug68937_2.phpt
index c25da3fd715..8cd3db2544a 100644
--- a/ext/curl/tests/bug68937_2.phpt
+++ b/ext/curl/tests/bug68937_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug # #68937 (Segfault in curl_multi_exec)
 --SKIPIF--
-<?php 
+<?php
 if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
 include 'skipif.inc';
 ?>
diff --git a/ext/curl/tests/check_win_config.phpt b/ext/curl/tests/check_win_config.phpt
index 7f656ef9ea7..b0b31c32ee0 100644
--- a/ext/curl/tests/check_win_config.phpt
+++ b/ext/curl/tests/check_win_config.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Check libcurl config on windows
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("curl")) {
-	die('skip - curl extension not available in this build'); 
+	die('skip - curl extension not available in this build');
 }
 if(substr(PHP_OS, 0, 3) != 'WIN' )
   die("skip for windows only");
diff --git a/ext/curl/tests/curl_basic_001.phpt b/ext/curl/tests/curl_basic_001.phpt
index 4921b69bdd4..8ed51de866b 100644
--- a/ext/curl/tests/curl_basic_001.phpt
+++ b/ext/curl/tests/curl_basic_001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test curl_exec() function with basic functionality 
+Test curl_exec() function with basic functionality
 --CREDITS--
 Sebastian Deutsch <sebastian.deutsch@9elements.com>
 TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net>
@@ -8,9 +8,9 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net>
 --FILE--
 <?php
 /* Prototype  : bool curl_exec(resource ch)
- * Description: Perform a cURL session 
+ * Description: Perform a cURL session
  * Source code: ext/curl/interface.c
- * Alias to functions: 
+ * Alias to functions:
  */
   include 'server.inc';
   $host = curl_cli_server_start();
diff --git a/ext/curl/tests/curl_basic_002.phpt b/ext/curl/tests/curl_basic_002.phpt
index 69aef4b8250..336d13ce470 100644
--- a/ext/curl/tests/curl_basic_002.phpt
+++ b/ext/curl/tests/curl_basic_002.phpt
@@ -25,7 +25,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net>
   ob_start(); // start output buffering
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/ext/curl/tests/curl_basic_003.phpt b/ext/curl/tests/curl_basic_003.phpt
index 9c5967db8fe..fb2c6d9312a 100644
--- a/ext/curl/tests/curl_basic_003.phpt
+++ b/ext/curl/tests/curl_basic_003.phpt
@@ -27,7 +27,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net>
   curl_setopt($ch, CURLOPT_POST, 1);
   curl_setopt($ch, CURLOPT_POSTFIELDS, "Hello=World&Foo=Bar&Person=John%20Doe");
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/ext/curl/tests/curl_basic_004.phpt b/ext/curl/tests/curl_basic_004.phpt
index 08dc7a10059..2db4386d154 100644
--- a/ext/curl/tests/curl_basic_004.phpt
+++ b/ext/curl/tests/curl_basic_004.phpt
@@ -26,7 +26,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net>
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_REFERER, 'http://www.refer.er');
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/ext/curl/tests/curl_basic_005.phpt b/ext/curl/tests/curl_basic_005.phpt
index 200db765dce..5dc749e8529 100644
--- a/ext/curl/tests/curl_basic_005.phpt
+++ b/ext/curl/tests/curl_basic_005.phpt
@@ -26,7 +26,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net>
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_USERAGENT, 'cURL phpt');
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/ext/curl/tests/curl_basic_006.phpt b/ext/curl/tests/curl_basic_006.phpt
index e48a5ba70d3..b2bac5d7ee8 100644
--- a/ext/curl/tests/curl_basic_006.phpt
+++ b/ext/curl/tests/curl_basic_006.phpt
@@ -28,7 +28,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine <jmf@durcommefaire.net>
     $GLOBALS['alldata'] .= $data;
     return strlen ($data);
   });
-   
+
   curl_exec($ch);
   curl_close($ch);
   ob_end_flush();
diff --git a/ext/curl/tests/curl_basic_008.phpt b/ext/curl/tests/curl_basic_008.phpt
index 4f0a29d7ff4..70f82532b72 100644
--- a/ext/curl/tests/curl_basic_008.phpt
+++ b/ext/curl/tests/curl_basic_008.phpt
@@ -4,7 +4,7 @@ Test curl_error() & curl_errno() function with problematic host
 TestFest 2009 - AFUP - Perrick Penet <perrick@noparking.net>
 --SKIPIF--
 <?php
-	if (!extension_loaded("curl")) print "skip"; 
+	if (!extension_loaded("curl")) print "skip";
 	$addr = "www.".uniqid().".".uniqid();
 	if (gethostbyname($addr) != $addr) {
 		print "skip catch all dns";
diff --git a/ext/curl/tests/curl_basic_011.phpt b/ext/curl/tests/curl_basic_011.phpt
index 4e33082409d..30dd5225a5f 100644
--- a/ext/curl/tests/curl_basic_011.phpt
+++ b/ext/curl/tests/curl_basic_011.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test curl_opt() function with COOKIE 
+Test curl_opt() function with COOKIE
 --CREDITS--
-TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>      
+TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
@@ -23,9 +23,9 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
 
   ob_start(); // start output buffering
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-  curl_setopt($ch, CURLOPT_COOKIE, 'foo=bar');    
+  curl_setopt($ch, CURLOPT_COOKIE, 'foo=bar');
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/ext/curl/tests/curl_basic_012.phpt b/ext/curl/tests/curl_basic_012.phpt
index f136880dff7..c05fc0f0300 100644
--- a/ext/curl/tests/curl_basic_012.phpt
+++ b/ext/curl/tests/curl_basic_012.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_0    
+Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_0
 --CREDITS--
-TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>   
+TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
@@ -25,7 +25,7 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/ext/curl/tests/curl_basic_013.phpt b/ext/curl/tests/curl_basic_013.phpt
index 6d09517e8de..c734cf5cd2f 100644
--- a/ext/curl/tests/curl_basic_013.phpt
+++ b/ext/curl/tests/curl_basic_013.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_1 
+Test curl_opt() function with CURLOPT_HTTP_VERSION/CURL_HTTP_VERSION_1_1
 --CREDITS--
-TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>      
+TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
@@ -25,7 +25,7 @@ TestFest 2009 - AFUP - Xavier Gorse <xgorse@elao.com>
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $curl_content = curl_exec($ch);
   curl_close($ch);
 
diff --git a/ext/curl/tests/curl_basic_015.phpt b/ext/curl/tests/curl_basic_015.phpt
index e8e43e5686f..b75b408ba8d 100644
--- a/ext/curl/tests/curl_basic_015.phpt
+++ b/ext/curl/tests/curl_basic_015.phpt
@@ -6,7 +6,7 @@ Jean-Marc Fontaine <jmf@durcommefaire.net>
 <?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); ?>
 --FILE--
 <?php
-  $url = 'http://www.example.com/'; 
+  $url = 'http://www.example.com/';
   $ch  = curl_init($url);
   var_dump($url == curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
 ?>
diff --git a/ext/curl/tests/curl_basic_016.phpt b/ext/curl/tests/curl_basic_016.phpt
index 2bd1f05037d..d1f162b3f29 100644
--- a/ext/curl/tests/curl_basic_016.phpt
+++ b/ext/curl/tests/curl_basic_016.phpt
@@ -3,7 +3,7 @@ Test curl_getinfo() function with basic functionality
 --CREDITS--
 Jean-Marc Fontaine <jmf@durcommefaire.net>
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("curl")) exit("skip curl extension not loaded");
 $curl_version = curl_version();
 if ($curl_version['version_number'] > 0x071201) {
diff --git a/ext/curl/tests/curl_basic_017.phpt b/ext/curl/tests/curl_basic_017.phpt
index dc0bee926bb..2baeb420e46 100644
--- a/ext/curl/tests/curl_basic_017.phpt
+++ b/ext/curl/tests/curl_basic_017.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test curl_multi_exec() function with basic functionality 
+Test curl_multi_exec() function with basic functionality
 --CREDITS--
 TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com>
 --SKIPIF--
@@ -7,11 +7,11 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com>
 --FILE--
 <?php
 /* Prototype  : bool curl_multi_exec(resource ch)
- * Description: Perform a cURL session 
+ * Description: Perform a cURL session
  * Source code: ext/curl/multi.c
- * Alias to functions: 
+ * Alias to functions:
  */
-	
+
   include 'server.inc';
   $host = curl_cli_server_start();
 
@@ -24,33 +24,33 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com>
     1 => curl_init(),
     2 => curl_init(),
   );
-  
+
   ob_start(); // start output buffering
-  
+
   curl_setopt($chs[0], CURLOPT_URL, $url); //set the url we want to use
   curl_setopt($chs[1], CURLOPT_URL, $url); //set the url we want to use
   curl_setopt($chs[2], CURLOPT_URL, $url); //set the url we want to use
-  
+
   $mh = curl_multi_init();
-  
+
   // add handlers
   curl_multi_add_handle($mh, $chs[0]);
   curl_multi_add_handle($mh, $chs[1]);
   curl_multi_add_handle($mh, $chs[2]);
-  
+
   $running=null;
   //execute the handles
   $state = null;
   do {
     $state = curl_multi_exec($mh, $running);
   } while ($running > 0);
-  
+
   //close the handles
   curl_multi_remove_handle($mh, $chs[0]);
   curl_multi_remove_handle($mh, $chs[1]);
   curl_multi_remove_handle($mh, $chs[2]);
   curl_multi_close($mh);
-  
+
   $curl_content = ob_get_contents();
   ob_end_clean();
 
diff --git a/ext/curl/tests/curl_basic_018.phpt b/ext/curl/tests/curl_basic_018.phpt
index 5c085c1c935..00178389ba8 100644
--- a/ext/curl/tests/curl_basic_018.phpt
+++ b/ext/curl/tests/curl_basic_018.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test curl_setopt() with curl_multi function with basic functionality 
+Test curl_setopt() with curl_multi function with basic functionality
 --CREDITS--
 TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com>
 --SKIPIF--
@@ -11,7 +11,7 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com>
  * Source code: ext/curl/interface.c
  * Alias to functions:
  */
-	
+
   include 'server.inc';
   $host = curl_cli_server_start();
 
@@ -24,25 +24,25 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com>
     1 => curl_init(),
     2 => curl_init(),
   );
-  
+
   ob_start(); // start output buffering
-  
+
   $options = array(
     CURLOPT_RETURNTRANSFER => 1,
     CURLOPT_URL => $url,
   );
-  
+
   curl_setopt_array($chs[0], $options); //set the options
   curl_setopt_array($chs[1], $options); //set the options
   curl_setopt_array($chs[2], $options); //set the options
-  
+
   $mh = curl_multi_init();
-  
+
   // add handlers
   curl_multi_add_handle($mh, $chs[0]);
   curl_multi_add_handle($mh, $chs[1]);
   curl_multi_add_handle($mh, $chs[2]);
-  
+
   $running=null;
   //execute the handles
   do {
@@ -53,15 +53,15 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com>
   $curl_content .= curl_multi_getcontent($chs[0]);
   $curl_content .= curl_multi_getcontent($chs[1]);
   $curl_content .= curl_multi_getcontent($chs[2]);
-  
+
   //close the handles
   curl_multi_remove_handle($mh, $chs[0]);
   curl_multi_remove_handle($mh, $chs[1]);
   curl_multi_remove_handle($mh, $chs[2]);
   curl_multi_close($mh);
-  
+
   var_dump( $curl_content );
-  
+
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/curl/tests/curl_basic_022.phpt b/ext/curl/tests/curl_basic_022.phpt
index d4277a3f899..a01ca4f5c59 100644
--- a/ext/curl/tests/curl_basic_022.phpt
+++ b/ext/curl/tests/curl_basic_022.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test curl_getinfo() function with CURLINFO_COOKIELIST parameter
 --SKIPIF--
-<?php if (!extension_loaded("curl")) print "skip"; 
+<?php if (!extension_loaded("curl")) print "skip";
 $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x070e01) {
 	    exit("skip: test works only with curl >= 7.14.1");
diff --git a/ext/curl/tests/curl_copy_handle_basic.phpt b/ext/curl/tests/curl_copy_handle_basic.phpt
index 1a6ff41699d..f92216ecc52 100644
--- a/ext/curl/tests/curl_copy_handle_basic.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test curl_copy_handle() function with basic functionality 
+Test curl_copy_handle() function with basic functionality
 --CREDITS--
 Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("curl")) exit("skip curl extension not loaded");
 ?>
 --FILE--
diff --git a/ext/curl/tests/curl_copy_handle_basic_001.phpt b/ext/curl/tests/curl_copy_handle_basic_001.phpt
index aafa41ee2e6..5dd779332d3 100644
--- a/ext/curl/tests/curl_copy_handle_basic_001.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic_001.phpt
@@ -19,10 +19,10 @@ Rick Buitenman <rick@meritos.nl>
   ob_start(); // start output buffering
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $copy = curl_copy_handle($ch);
   curl_close($ch);
-  
+
   $curl_content = curl_exec($copy);
   curl_close($copy);
 
diff --git a/ext/curl/tests/curl_copy_handle_basic_002.phpt b/ext/curl/tests/curl_copy_handle_basic_002.phpt
index 6e8214ad2b1..2eee456b455 100644
--- a/ext/curl/tests/curl_copy_handle_basic_002.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic_002.phpt
@@ -20,10 +20,10 @@ Rick Buitenman <rick@meritos.nl>
   curl_setopt($ch, CURLOPT_POST, 1);
   curl_setopt($ch, CURLOPT_POSTFIELDS, "Hello=World&Foo=Bar&Person=John%20Doe");
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $copy = curl_copy_handle($ch);
   curl_close($ch);
- 
+
   $curl_content = curl_exec($copy);
   curl_close($copy);
 
diff --git a/ext/curl/tests/curl_copy_handle_basic_004.phpt b/ext/curl/tests/curl_copy_handle_basic_004.phpt
index c690180a55a..9a141ef65f2 100644
--- a/ext/curl/tests/curl_copy_handle_basic_004.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic_004.phpt
@@ -19,13 +19,13 @@ Rick Buitenman <rick@meritos.nl>
   ob_start(); // start output buffering
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
-  
+
+
   $curl_content = curl_exec($ch);
   $copy = curl_copy_handle($ch);
   curl_close($ch);
-  
-  $curl_content_copy = curl_exec($copy); 
+
+  $curl_content_copy = curl_exec($copy);
   curl_close($copy);
 
   var_dump( $curl_content_copy );
diff --git a/ext/curl/tests/curl_copy_handle_basic_005.phpt b/ext/curl/tests/curl_copy_handle_basic_005.phpt
index e92603324ee..8031df7d816 100644
--- a/ext/curl/tests/curl_copy_handle_basic_005.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic_005.phpt
@@ -21,12 +21,12 @@ Rick Buitenman <rick@meritos.nl>
   curl_setopt($ch, CURLOPT_POST, 1);
   curl_setopt($ch, CURLOPT_POSTFIELDS, "Hello=World&Foo=Bar&Person=John%20Doe");
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
-  
+
+
   $curl_content = curl_exec($ch);
   $copy = curl_copy_handle($ch);
   curl_close($ch);
-  
+
   $curl_content_copy = curl_exec($copy);
   curl_close($copy);
 
diff --git a/ext/curl/tests/curl_copy_handle_basic_006.phpt b/ext/curl/tests/curl_copy_handle_basic_006.phpt
index 0a5c2a25e6d..0e7dd011a07 100644
--- a/ext/curl/tests/curl_copy_handle_basic_006.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic_006.phpt
@@ -20,7 +20,7 @@ Rick Buitenman <rick@meritos.nl>
   curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
   curl_setopt($ch, CURLOPT_USERAGENT, 'cURL phpt');
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $copy = curl_copy_handle($ch);
 
   var_dump( curl_exec($ch) );
diff --git a/ext/curl/tests/curl_copy_handle_basic_007.phpt b/ext/curl/tests/curl_copy_handle_basic_007.phpt
index 6334d2a4b86..65b23cff74d 100644
--- a/ext/curl/tests/curl_copy_handle_basic_007.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic_007.phpt
@@ -18,10 +18,10 @@ Test curl_copy_handle() with simple POST
   curl_setopt($ch, CURLOPT_POSTFIELDS, array("Hello" => "World", "Foo" => "Bar", "Person" => "John Doe"));
   curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:')); // Disable Expect: header (lighttpd does not support it :)
   curl_setopt($ch, CURLOPT_URL, $url); //set the url we want to use
-  
+
   $copy = curl_copy_handle($ch);
   curl_close($ch);
- 
+
   $curl_content = curl_exec($copy);
   curl_close($copy);
 
diff --git a/ext/curl/tests/curl_copy_handle_variation1.phpt b/ext/curl/tests/curl_copy_handle_variation1.phpt
index da4522192dd..220ec9699f0 100644
--- a/ext/curl/tests/curl_copy_handle_variation1.phpt
+++ b/ext/curl/tests/curl_copy_handle_variation1.phpt
@@ -4,7 +4,7 @@ Test curl_copy_handle() change options in one handle
 Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("curl")) exit("skip curl extension not loaded");
 ?>
 --FILE--
diff --git a/ext/curl/tests/curl_copy_handle_variation2.phpt b/ext/curl/tests/curl_copy_handle_variation2.phpt
index 924bf6a4707..7e49b11ca77 100644
--- a/ext/curl/tests/curl_copy_handle_variation2.phpt
+++ b/ext/curl/tests/curl_copy_handle_variation2.phpt
@@ -4,7 +4,7 @@ Test curl_copy_handle() add options to the handles
 Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("curl")) exit("skip curl extension not loaded");
 ?>
 --COMMENT--
diff --git a/ext/curl/tests/curl_error_basic.phpt b/ext/curl/tests/curl_error_basic.phpt
index 3d3502306a7..9b6f7ea586a 100644
--- a/ext/curl/tests/curl_error_basic.phpt
+++ b/ext/curl/tests/curl_error_basic.phpt
@@ -21,7 +21,7 @@ if ($ip != $url) die("skip 'fakeURL' resolves to $ip\n");
  * Source:        ext/curl/interface.c
  * Documentation: http://wiki.php.net/qa/temp/ext/curl
  */
- 
+
 // Fake URL to trigger an error
 $url = "fakeURL";
 
diff --git a/ext/curl/tests/curl_escape.phpt b/ext/curl/tests/curl_escape.phpt
index e759144c8ac..015b010a1ca 100644
Binary files a/ext/curl/tests/curl_escape.phpt and b/ext/curl/tests/curl_escape.phpt differ
diff --git a/ext/curl/tests/curl_ftp_pasv.phpt b/ext/curl/tests/curl_ftp_pasv.phpt
index 6cd74291046..ca863b067e0 100644
--- a/ext/curl/tests/curl_ftp_pasv.phpt
+++ b/ext/curl/tests/curl_ftp_pasv.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Test curl_exec() function with basic functionality 
+Test curl_exec() function with basic functionality
 --CREDITS--
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("curl")) exit("skip curl extension not loaded");
 if (false === getenv('PHP_CURL_FTP_REMOTE_SERVER'))  exit("skip PHP_CURL_FTP_REMOTE_SERVER env variable is not defined");
 if (false === getenv('PHP_CURL_FTP_REMOTE_USER'))  exit("skip PHP_CURL_FTP_REMOTE_USER env variable is not defined");
@@ -14,7 +14,7 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD'))  exit("skip PHP_CURL_FTP_REM
   $username = getenv('PHP_CURL_FTP_REMOTE_USER');
   $password = getenv('PHP_CURL_FTP_REMOTE_PASSWD');
 
-  // FTP this script to a server 
+  // FTP this script to a server
   $fp  =  fopen ( __FILE__ ,  "r" );
   $url  =  "ftp://$username:$password@$host/test.phpt" ;
 
diff --git a/ext/curl/tests/curl_multi_getcontent_basic3.phpt b/ext/curl/tests/curl_multi_getcontent_basic3.phpt
index 190fe9d9c03..5ad6d33703d 100644
--- a/ext/curl/tests/curl_multi_getcontent_basic3.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_basic3.phpt
@@ -20,7 +20,7 @@ Rein Velt (rein@velt.org)
 	curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt");
 	curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
 	curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true);
-	
+
 	//CREATE MULTIPLE CURL HANDLE
 	$mh=curl_multi_init();
 
@@ -40,7 +40,7 @@ Rein Velt (rein@velt.org)
 	//CLOSE
  	curl_multi_remove_handle($mh,$ch1);
 	curl_multi_remove_handle($mh,$ch2);
-	curl_multi_close($mh);	
+	curl_multi_close($mh);
 
 	echo $results1;
 	echo $results2;
diff --git a/ext/curl/tests/curl_multi_getcontent_error1.phpt b/ext/curl/tests/curl_multi_getcontent_error1.phpt
index 2fb11b3d971..6e23a2902a4 100644
--- a/ext/curl/tests/curl_multi_getcontent_error1.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_error1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Curl_multi_getcontent() error test 
+Curl_multi_getcontent() error test
 --CREDITS--
 Rein Velt (rein@velt.org)
 #TestFest Utrecht 20090509
@@ -20,7 +20,7 @@ if (!extension_loaded('curl')) print 'skip';
 	curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt");
 	curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
 	curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true);
-	
+
 	//CREATE MULTIPLE CURL HANDLE
 	$mh=curl_multi_init();
 
@@ -40,9 +40,9 @@ if (!extension_loaded('curl')) print 'skip';
 	//CLOSE
  	curl_multi_remove_handle($mh,$ch1);
 	curl_multi_remove_handle($mh,$ch2);
-	curl_multi_close($mh);	
+	curl_multi_close($mh);
 
-	echo $results1; 
+	echo $results1;
 	echo $results2;
 
 ?>
diff --git a/ext/curl/tests/curl_multi_getcontent_error2.phpt b/ext/curl/tests/curl_multi_getcontent_error2.phpt
index 0145d6a8fac..1c8fa676630 100644
--- a/ext/curl/tests/curl_multi_getcontent_error2.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_error2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Curl_multi_getcontent() error test 
+Curl_multi_getcontent() error test
 --CREDITS--
 Rein Velt (rein@velt.org)
 #TestFest Utrecht 20090509
@@ -20,7 +20,7 @@ if (!extension_loaded('curl')) print 'skip';
 	curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt");
 	curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
 	curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true);
-	
+
 	//CREATE MULTIPLE CURL HANDLE
 	$mh=curl_multi_init();
 
@@ -40,9 +40,9 @@ if (!extension_loaded('curl')) print 'skip';
 	//CLOSE
  	curl_multi_remove_handle($mh,$ch1);
 	curl_multi_remove_handle($mh,$ch2);
-	curl_multi_close($mh);	
+	curl_multi_close($mh);
 
-	echo $results1; 
+	echo $results1;
 	echo $results2;
 
 ?>
diff --git a/ext/curl/tests/curl_multi_getcontent_error3.phpt b/ext/curl/tests/curl_multi_getcontent_error3.phpt
index 2e1c7b2765b..0de4d03727f 100644
--- a/ext/curl/tests/curl_multi_getcontent_error3.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_error3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Curl_multi_getcontent() error test 
+Curl_multi_getcontent() error test
 --CREDITS--
 Rein Velt (rein@velt.org)
 #TestFest Utrecht 20090509
@@ -20,7 +20,7 @@ if (!extension_loaded('curl')) print 'skip';
 	curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt");
 	curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
 	curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true);
-	
+
 	//CREATE MULTIPLE CURL HANDLE
 	$mh=curl_multi_init();
 
@@ -34,7 +34,7 @@ if (!extension_loaded('curl')) print 'skip';
 		curl_multi_exec($mh,$running);
 	} while ($running>0);
 
-	$ch1="string"; 
+	$ch1="string";
 
 	$results1=curl_multi_getcontent($ch1); //incorrect parameter type
         $results2=curl_multi_getcontent($ch2);
@@ -42,9 +42,9 @@ if (!extension_loaded('curl')) print 'skip';
 	//CLOSE
  	//curl_multi_remove_handle($mh,$ch1);
 	curl_multi_remove_handle($mh,$ch2);
-	curl_multi_close($mh);	
+	curl_multi_close($mh);
 
-	echo $results1; 
+	echo $results1;
 	echo $results2;
 
 ?>
diff --git a/ext/curl/tests/curl_multi_getcontent_error4.phpt b/ext/curl/tests/curl_multi_getcontent_error4.phpt
index 68bda37fe49..292766700e3 100644
--- a/ext/curl/tests/curl_multi_getcontent_error4.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_error4.phpt
@@ -20,7 +20,7 @@ if (!extension_loaded('curl')) print 'skip';
 	curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt");
 	curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
 	curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true);
-	
+
 	//CREATE MULTIPLE CURL HANDLE
 	$mh=curl_multi_init();
 
@@ -41,9 +41,9 @@ if (!extension_loaded('curl')) print 'skip';
 	//CLOSE
  	//curl_multi_remove_handle($mh,$ch1);
 	curl_multi_remove_handle($mh,$ch2);
-	curl_multi_close($mh);	
+	curl_multi_close($mh);
 
-	echo $results1; 
+	echo $results1;
 	echo $results2;
 
 ?>
diff --git a/ext/curl/tests/curl_multi_segfault.phpt b/ext/curl/tests/curl_multi_segfault.phpt
index dde81894116..8d77e78c67b 100644
--- a/ext/curl/tests/curl_multi_segfault.phpt
+++ b/ext/curl/tests/curl_multi_segfault.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Segfault due to libcurl connection caching 
+Segfault due to libcurl connection caching
 --CREDITS--
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("curl")) exit("skip curl extension not loaded");
 if (false === getenv('PHP_CURL_FTP_REMOTE_SERVER'))  exit("skip PHP_CURL_FTP_REMOTE_SERVER env variable is not defined");
 if (false === getenv('PHP_CURL_FTP_REMOTE_USER'))  exit("skip PHP_CURL_FTP_REMOTE_USER env variable is not defined");
@@ -14,7 +14,7 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD'))  exit("skip PHP_CURL_FTP_REM
   $username = getenv('PHP_CURL_FTP_REMOTE_USER');
   $password = getenv('PHP_CURL_FTP_REMOTE_PASSWD');
 
-  // FTP this script to a server 
+  // FTP this script to a server
   $fp  =  fopen ( __FILE__ ,  "r" );
   $url  =  "ftp://$username:$password@$host/" ;
 
@@ -43,8 +43,8 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD'))  exit("skip PHP_CURL_FTP_REM
 			  $mrc = curl_multi_exec($cmh, $active);
 		  } while ($mrc == CURLM_CALL_MULTI_PERFORM);
 	  }
-  }   
-    
+  }
+
   var_dump(is_string(curl_multi_getcontent($ch)));
   curl_multi_remove_handle($cmh, $ch);
   curl_close($ch);
diff --git a/ext/curl/tests/curl_multi_select_basic1.phpt b/ext/curl/tests/curl_multi_select_basic1.phpt
index 7ae812412ea..03bd9263a2b 100644
--- a/ext/curl/tests/curl_multi_select_basic1.phpt
+++ b/ext/curl/tests/curl_multi_select_basic1.phpt
@@ -8,7 +8,7 @@ Ivo Jansch <ivo@ibuildings.com>
 --FILE--
 <?php
 /* Prototype         : resource curl_multi_select($mh, $timeout=1.0])
- * Description       : Get all the sockets associated with the cURL extension, which can then be 
+ * Description       : Get all the sockets associated with the cURL extension, which can then be
  *                     "selected"
  * Source code       : ?
  * Test documentation: http://wiki.php.net/qa/temp/ext/curl
diff --git a/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt b/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt
index 9de2c0faba6..92c80d17325 100644
--- a/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt
+++ b/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt
@@ -4,16 +4,16 @@ cURL option CURLOPT_READFUNCTION
 WHITE new media architects - Jeroen Vermeulen
 #testfest Utrecht 2009
 --SKIPIF--
-<?php 
-if (!extension_loaded("curl")) print "skip cURL extension not loaded"; 
+<?php
+if (!extension_loaded("curl")) print "skip cURL extension not loaded";
 ?>
 --FILE--
-<?php    
-function custom_readfunction($oCurl, $hReadHandle, $iMaxOut) 
+<?php
+function custom_readfunction($oCurl, $hReadHandle, $iMaxOut)
 {
   $sData = fread($hReadHandle,$iMaxOut-10); # -10 to have space to add "custom:"
   if (!empty($sData))
-  { 
+  {
     $sData = "custom:".$sData;
   }
   return $sData;
@@ -35,9 +35,9 @@ curl_setopt($oCurl, CURLOPT_INFILE,       $hReadHandle );
 curl_exec($oCurl);
 curl_close($oCurl);
 
-fclose ($hReadHandle); 
+fclose ($hReadHandle);
 
-$sOutput = file_get_contents($sWriteFile); 
+$sOutput = file_get_contents($sWriteFile);
 var_dump($sOutput);
 ?>
 ===DONE===
diff --git a/ext/curl/tests/curl_version_variation1.phpt b/ext/curl/tests/curl_version_variation1.phpt
index 7c0106cb6a4..2cd413abdd5 100644
--- a/ext/curl/tests/curl_version_variation1.phpt
+++ b/ext/curl/tests/curl_version_variation1.phpt
@@ -21,7 +21,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -47,7 +47,7 @@ $inputs =  array (
   array(),
   array(0),
   array(1, 2),
-  
+
   //string values
   "ABC",
   'abc',
diff --git a/ext/curl/tests/curl_write_file.phpt b/ext/curl/tests/curl_write_file.phpt
index 95d2b0ea477..2eb0eeaecb0 100644
--- a/ext/curl/tests/curl_write_file.phpt
+++ b/ext/curl/tests/curl_write_file.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test curl option CURLOPT_FILE 
+Test curl option CURLOPT_FILE
 --CREDITS--
 Mathieu Kooiman <mathieuk@gmail.com>
 Dutch UG, TestFest 2009, Utrecht
diff --git a/ext/curl/tests/curl_write_return.phpt b/ext/curl/tests/curl_write_return.phpt
index 1ddc5515779..583ec2fcc1e 100644
--- a/ext/curl/tests/curl_write_return.phpt
+++ b/ext/curl/tests/curl_write_return.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test curl option CURLOPT_RETURNTRANSFER 
+Test curl option CURLOPT_RETURNTRANSFER
 --CREDITS--
 Mathieu Kooiman <mathieuk@gmail.com>
 Dutch UG, TestFest 2009, Utrecht
diff --git a/ext/curl/tests/curl_writeheader_callback.phpt b/ext/curl/tests/curl_writeheader_callback.phpt
index 46e0cc18baa..6336e14a6d9 100644
--- a/ext/curl/tests/curl_writeheader_callback.phpt
+++ b/ext/curl/tests/curl_writeheader_callback.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test curl option CURLOPT_HEADERFUNCTION 
+Test curl option CURLOPT_HEADERFUNCTION
 --CREDITS--
 Mathieu Kooiman <mathieuk@gmail.com>
 Dutch UG, TestFest 2009, Utrecht
diff --git a/ext/date/tests/003.phpt b/ext/date/tests/003.phpt
index 2be6cf773d3..7e187ee0f37 100644
--- a/ext/date/tests/003.phpt
+++ b/ext/date/tests/003.phpt
@@ -10,7 +10,7 @@ for ($i = 0; $i < 32; $i++) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(4) "31st"
 string(3) "1st"
 string(3) "2nd"
diff --git a/ext/date/tests/004.phpt b/ext/date/tests/004.phpt
index 33e1fc79107..0008efae8e9 100644
--- a/ext/date/tests/004.phpt
+++ b/ext/date/tests/004.phpt
@@ -25,7 +25,7 @@ foreach ($tz as $zone) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(1) "2"
 string(3) "177"
 string(1) "6"
diff --git a/ext/date/tests/005.phpt b/ext/date/tests/005.phpt
index 911aea77910..e1075ef248c 100644
--- a/ext/date/tests/005.phpt
+++ b/ext/date/tests/005.phpt
@@ -19,7 +19,7 @@ var_dump(idate("'"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: idate() expects at least 1 parameter, 0 given in %s on line %d
 bool(false)
 
diff --git a/ext/date/tests/006.phpt b/ext/date/tests/006.phpt
index 19a044a91e9..425430a470f 100644
--- a/ext/date/tests/006.phpt
+++ b/ext/date/tests/006.phpt
@@ -18,7 +18,7 @@ var_dump(checkdate(1,1,-1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: checkdate() expects exactly 3 parameters, 0 given in %s on line %d
 bool(false)
 bool(true)
diff --git a/ext/date/tests/007.phpt b/ext/date/tests/007.phpt
index 567777e106a..141e2517533 100644
--- a/ext/date/tests/007.phpt
+++ b/ext/date/tests/007.phpt
@@ -14,7 +14,7 @@ var_dump(localtime($t, false));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: localtime() expects at most 2 parameters, 3 given in %s on line %d
 bool(false)
 array(9) {
diff --git a/ext/date/tests/008.phpt b/ext/date/tests/008.phpt
index ce6be18556e..e67b4bd0a4f 100644
--- a/ext/date/tests/008.phpt
+++ b/ext/date/tests/008.phpt
@@ -12,7 +12,7 @@ var_dump(getdate());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: getdate() expects at most 1 parameter, 2 given in %s on line %d
 bool(false)
 array(11) {
diff --git a/ext/date/tests/009.phpt b/ext/date/tests/009.phpt
index 23c7668a9fb..ae8011eebd2 100644
--- a/ext/date/tests/009.phpt
+++ b/ext/date/tests/009.phpt
@@ -29,7 +29,7 @@ var_dump(gmstrftime("blah", $t));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: strftime() expects at least 1 parameter, 0 given in %s on line %d
 bool(false)
 bool(false)
diff --git a/ext/date/tests/009_win32.phpt b/ext/date/tests/009_win32.phpt
index 3ad04f58490..3da5b35c81c 100644
--- a/ext/date/tests/009_win32.phpt
+++ b/ext/date/tests/009_win32.phpt
@@ -39,7 +39,7 @@ echo "Done\n";
 
 setlocale(LC_TIME, $loc);
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: strftime() expects at least 1 parameter, 0 given in %s on line %d
 bool(false)
 bool(false)
diff --git a/ext/date/tests/014.phpt b/ext/date/tests/014.phpt
index 5cc31aa93ac..2e72bdabe07 100644
--- a/ext/date/tests/014.phpt
+++ b/ext/date/tests/014.phpt
@@ -17,7 +17,7 @@ var_dump(timezone_offset_get($dto, $dtz));
 echo "Done\n";
 
 ?>
---EXPECTF-- 
+--EXPECTF--
 object(DateTime)#%d (3) {
   ["date"]=>
   string(26) "2006-12-12 00:00:00.000000"
diff --git a/ext/date/tests/DateInterval_format_a.phpt b/ext/date/tests/DateInterval_format_a.phpt
index 48c6cc1675c..ce0e8cc0864 100644
--- a/ext/date/tests/DateInterval_format_a.phpt
+++ b/ext/date/tests/DateInterval_format_a.phpt
@@ -6,8 +6,8 @@ Daniel Convissor <danielc@php.net>
 --INI--
 date.timezone=UTC
 --SKIPIF--
-<?php 
-if (!method_exists('DateInterval', 'format')) die("skip: method doesn't exist"); 
+<?php
+if (!method_exists('DateInterval', 'format')) die("skip: method doesn't exist");
 ?>
 --FILE--
 <?php
diff --git a/ext/date/tests/DateTimeZone_clone_basic1.phpt b/ext/date/tests/DateTimeZone_clone_basic1.phpt
index 49c190cf9fe..a40efc7411e 100644
--- a/ext/date/tests/DateTimeZone_clone_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_clone_basic1.phpt
@@ -3,7 +3,7 @@ Test clone on DateTimeZone objects
 --FILE--
 <?php
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set('Europe/London');
 
 echo "*** Testing clone on DateTime objects ***\n";
@@ -11,19 +11,19 @@ echo "*** Testing clone on DateTime objects ***\n";
 // Create a DateTimeZone object..
 $orig =  new DateTimeZone("GMT");
 
-// ..create a clone of it ..Clone 
+// ..create a clone of it ..Clone
 $clone = clone $orig;
 
 var_dump($orig);
-var_dump($clone); 
+var_dump($clone);
 
-if ($clone != $orig) { 
-	echo "TEST FAILED : objects not equal\n"; 
-}else if ($clone === $orig) { 
-	echo "TEST FAILED : objects identical\n"; 
+if ($clone != $orig) {
+	echo "TEST FAILED : objects not equal\n";
+}else if ($clone === $orig) {
+	echo "TEST FAILED : objects identical\n";
 } else {
-	echo "TEST PASSED : Objects equal but not indetical\n"; 
-}		
+	echo "TEST PASSED : Objects equal but not indetical\n";
+}
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/DateTimeZone_clone_basic2.phpt b/ext/date/tests/DateTimeZone_clone_basic2.phpt
index 92f833082f7..6cd07393e2f 100644
--- a/ext/date/tests/DateTimeZone_clone_basic2.phpt
+++ b/ext/date/tests/DateTimeZone_clone_basic2.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Testing clone on objects whoose class derived from DateTimeZone class 
+Testing clone on objects whoose class derived from DateTimeZone class
 --FILE--
 <?php
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 class DateTimeZoneExt1 extends DateTimeZone {
diff --git a/ext/date/tests/DateTimeZone_clone_basic3.phpt b/ext/date/tests/DateTimeZone_clone_basic3.phpt
index f9be4e417e8..c573af95716 100644
--- a/ext/date/tests/DateTimeZone_clone_basic3.phpt
+++ b/ext/date/tests/DateTimeZone_clone_basic3.phpt
@@ -2,7 +2,7 @@
 Test clone of DateTimeZOne objects
 --FILE--
 <?php
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing clone on DateTime objects ***\n";
diff --git a/ext/date/tests/DateTimeZone_clone_basic4.phpt b/ext/date/tests/DateTimeZone_clone_basic4.phpt
index a295b915ced..c818756c66e 100644
--- a/ext/date/tests/DateTimeZone_clone_basic4.phpt
+++ b/ext/date/tests/DateTimeZone_clone_basic4.phpt
@@ -2,12 +2,12 @@
 Test clone of DateTimeZone derived objects with __clone magic method
 --FILE--
 <?php
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 class DateTimeZoneExt1 extends DateTimeZone {
 	public function __clone() {
-		echo "-- DateTimeExt1 __clone magic method called --\n"; 
+		echo "-- DateTimeExt1 __clone magic method called --\n";
 	}
 }
 
@@ -17,7 +17,7 @@ $d1 = new DateTimeZoneExt1("America/New_York");
 $d1_clone = clone $d1;
 
 //verify clone by calling method on new object
-var_dump( $d1_clone->getName() ); 
+var_dump( $d1_clone->getName() );
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/DateTimeZone_compare_basic1.phpt b/ext/date/tests/DateTimeZone_compare_basic1.phpt
index f3648cb243e..130b6fa7544 100644
--- a/ext/date/tests/DateTimeZone_compare_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_compare_basic1.phpt
@@ -1,13 +1,13 @@
 --TEST--
 Test of compare object handler for DateTime objects
 --FILE--
-<?php 
+<?php
 
-// NB: DateTimeZone class does not define a customized compare class handler so standard object handler will be used  
+// NB: DateTimeZone class does not define a customized compare class handler so standard object handler will be used
 
 echo "Simple test for DateTimeZone compare object handler\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 class DateTimeZoneExt1 extends DateTimeZone {
diff --git a/ext/date/tests/DateTimeZone_construct_basic.phpt b/ext/date/tests/DateTimeZone_construct_basic.phpt
index 12b10906619..737d655b9cb 100644
--- a/ext/date/tests/DateTimeZone_construct_basic.phpt
+++ b/ext/date/tests/DateTimeZone_construct_basic.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test new DateTimeZone() : basic functionality 
+Test new DateTimeZone() : basic functionality
 --FILE--
 <?php
 /* Prototype  : DateTimeZone::__construct  ( string $timezone  )
  * Description: Returns new DateTimeZone object
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing new DateTimeZone() : basic functionality ***\n";
diff --git a/ext/date/tests/DateTimeZone_construct_error.phpt b/ext/date/tests/DateTimeZone_construct_error.phpt
index 8c8b14f12cb..1a5c3acc947 100644
--- a/ext/date/tests/DateTimeZone_construct_error.phpt
+++ b/ext/date/tests/DateTimeZone_construct_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test new DateTimeZone() : error conditions 
+Test new DateTimeZone() : error conditions
 --FILE--
 <?php
 /* Prototype  : DateTimeZone::__construct  ( string $timezone  )
  * Description: Returns new DateTimeZone object
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("GMT");
 
 echo "*** Testing DateTimeZone() : error conditions ***\n";
diff --git a/ext/date/tests/DateTimeZone_construct_variation1.phpt b/ext/date/tests/DateTimeZone_construct_variation1.phpt
index d9625eedc0c..874c19c3f94 100644
--- a/ext/date/tests/DateTimeZone_construct_variation1.phpt
+++ b/ext/date/tests/DateTimeZone_construct_variation1.phpt
@@ -5,12 +5,12 @@ Test DateTime::__construct() function : usage variation - Passing unexpected val
 /* Prototype  : DateTimeZone::__construct  ( string $timezone  )
  * Description: Returns new DateTimeZone object
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing DateTime::__construct() : usage variation -  unexpected values to first argument \$timezone***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -88,8 +88,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
@@ -100,8 +100,8 @@ foreach($inputs as $variation =>$timezone) {
       } catch (Throwable $e) {
       	  $msg = $e->getMessage();
       	  echo "FAILED: " . $msg . "\n";
-      }	
-      
+      }
+
 };
 
 // closing the resource
diff --git a/ext/date/tests/DateTimeZone_extends_basic1.phpt b/ext/date/tests/DateTimeZone_extends_basic1.phpt
index afc2ed64b28..b7022ddb971 100644
--- a/ext/date/tests/DateTimeZone_extends_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_extends_basic1.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test DateTimeZone class inheritance  
+Test DateTimeZone class inheritance
 --FILE--
 <?php
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing basic DateTimeZone inheritance() ***\n";
diff --git a/ext/date/tests/DateTimeZone_getLocation.phpt b/ext/date/tests/DateTimeZone_getLocation.phpt
index 011f0460f3a..f285e0deafd 100644
--- a/ext/date/tests/DateTimeZone_getLocation.phpt
+++ b/ext/date/tests/DateTimeZone_getLocation.phpt
@@ -22,7 +22,7 @@ foreach($arrayDate as $value){
 
         if((!in_array($timeZoneArray['country_code'], $countryCode)) && (NULL != $timeZoneArray['country_code']) && ("" != $timeZoneArray['country_code'])) {
             array_push($countryCode, $timeZoneArray['country_code']);
-            
+
             if(in_array($timeZoneArray['country_code'], $countryCodeTest)){
                 print_r($timeZoneArray);
             }
diff --git a/ext/date/tests/DateTimeZone_getName_basic1.phpt b/ext/date/tests/DateTimeZone_getName_basic1.phpt
index de5ca652d7b..ad59c8d9a1e 100644
--- a/ext/date/tests/DateTimeZone_getName_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_getName_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DateTimeZone::getName() function : basic functionality 
+Test DateTimeZone::getName() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : public string DateTimeZone::getName  ( void  )
@@ -10,7 +10,7 @@ Test DateTimeZone::getName() function : basic functionality
 
 echo "*** Testing DateTimeZone::getName() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("GMT");
 
 $tz1 = new DateTimeZone("Europe/London");
diff --git a/ext/date/tests/DateTimeZone_getName_error.phpt b/ext/date/tests/DateTimeZone_getName_error.phpt
index 0a87b100697..23d0313b127 100644
--- a/ext/date/tests/DateTimeZone_getName_error.phpt
+++ b/ext/date/tests/DateTimeZone_getName_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DateTimeZone::getName() function : error conditions 
+Test DateTimeZone::getName() function : error conditions
 --FILE--
 <?php
 /* Prototype  : public string DateTimeZone::getName  ( void  )
@@ -7,12 +7,12 @@ Test DateTimeZone::getName() function : error conditions
  * Source code: ext/date/php_date.c
  * Alias to functions: timezone_name_get()
  */
- 
-//Set the default time zone 
+
+//Set the default time zone
 date_default_timezone_set("GMT");
 
 $tz = new DateTimeZone("Europe/London");
- 
+
 echo "*** Testing DateTimeZone::getName() : error conditions ***\n";
 
 echo "\n-- Testing DateTimeZone::getName() function with more than expected no. of arguments --\n";
diff --git a/ext/date/tests/DateTimeZone_getOffset_basic1.phpt b/ext/date/tests/DateTimeZone_getOffset_basic1.phpt
index ea3c2804b1b..8c4e4094987 100644
--- a/ext/date/tests/DateTimeZone_getOffset_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_getOffset_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DateTimeZone::getOffset() function : basic functionality 
+Test DateTimeZone::getOffset() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int DateTimeZone::getOffset  ( DateTime $datetime  )
@@ -10,7 +10,7 @@ Test DateTimeZone::getOffset() function : basic functionality
 
 echo "*** Testing DateTimeZone::getOffset() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("GMT");
 
 $tz1 = new DateTimeZone("Europe/London");
diff --git a/ext/date/tests/DateTimeZone_getOffset_error.phpt b/ext/date/tests/DateTimeZone_getOffset_error.phpt
index 56e45b76d4d..58b852e44b0 100644
--- a/ext/date/tests/DateTimeZone_getOffset_error.phpt
+++ b/ext/date/tests/DateTimeZone_getOffset_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DateTimeZone::getOffset() function : error conditions 
+Test DateTimeZone::getOffset() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int DateTimeZone::getOffset  ( DateTime $datetime  )
@@ -7,13 +7,13 @@ Test DateTimeZone::getOffset() function : error conditions
  * Source code: ext/date/php_date.c
  * Alias to functions: timezone_offset_get()
  */
- 
-//Set the default time zone 
+
+//Set the default time zone
 date_default_timezone_set("GMT");
 
 $tz = new DateTimeZone("Europe/London");
 $date = date_create("GMT");
- 
+
 echo "*** Testing DateTimeZone::getOffset() : error conditions ***\n";
 
 echo "\n-- Testing DateTimeZone::getOffset() function with zero arguments --\n";
diff --git a/ext/date/tests/DateTimeZone_getOffset_variation1.phpt b/ext/date/tests/DateTimeZone_getOffset_variation1.phpt
index 2ee21a5262e..1859a5a3300 100644
--- a/ext/date/tests/DateTimeZone_getOffset_variation1.phpt
+++ b/ext/date/tests/DateTimeZone_getOffset_variation1.phpt
@@ -7,10 +7,10 @@ Test DateTimeZone::getOffset() function : usage variation - Passing unexpected v
  * Source code: ext/date/php_date.c
  * Alias to functions: timezone_offset_get()
  */
- 
+
 echo "*** Testing DateTimeZone::getOffset() : usage variation -  unexpected values to first argument \$datetime***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt
index d17808035bf..a88a34bf2de 100644
--- a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DateTimeZone::getTransitions() function : basic functionality 
+Test DateTimeZone::getTransitions() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array DateTimeZone::getTransitions  ()
@@ -10,7 +10,7 @@ Test DateTimeZone::getTransitions() function : basic functionality
 
 echo "*** Testing DateTimeZone::getTransitions() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 // Create a DateTimeZone object
@@ -22,7 +22,7 @@ if (!is_array($tran)) {
 	echo "TEST FAILED: Expected an array\n";
 }
 
-echo "\n-- Total number of transitions: " . count($tran). " --\n"; 
+echo "\n-- Total number of transitions: " . count($tran). " --\n";
 
 echo "\n-- Format a sample entry for Spring 1963 --\n";
 var_dump( $tran[6] );
diff --git a/ext/date/tests/DateTimeZone_getTransitions_error.phpt b/ext/date/tests/DateTimeZone_getTransitions_error.phpt
index bfcd224ca71..e1d0a294200 100644
--- a/ext/date/tests/DateTimeZone_getTransitions_error.phpt
+++ b/ext/date/tests/DateTimeZone_getTransitions_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DateTimeZone::getTransitions() function : error conditions 
+Test DateTimeZone::getTransitions() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array DateTimeZone::getTransitions  ([ int $timestamp_begin  [, int $timestamp_end  ]] )
@@ -7,12 +7,12 @@ Test DateTimeZone::getTransitions() function : error conditions
  * Source code: ext/date/php_date.c
  * Alias to functions: timezone_transitions_get()
  */
- 
-//Set the default time zone 
+
+//Set the default time zone
 date_default_timezone_set("GMT");
 
 $tz = new DateTimeZone("Europe/London");
- 
+
 echo "*** Testing DateTimeZone::getTransitions() : error conditions ***\n";
 
 echo "\n-- Testing DateTimeZone::getTransitions() function with more than expected no. of arguments --\n";
diff --git a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
index 5d68abe05f4..7d9df074f59 100644
--- a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DateTimeZone::listAbbreviations() function : basic functionality 
+Test DateTimeZone::listAbbreviations() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array DateTimeZone::listAbbreviations  ( void  )
@@ -10,7 +10,7 @@ Test DateTimeZone::listAbbreviations() function : basic functionality
 
 echo "*** Testing DateTimeZone::listAbbreviations() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("GMT");
 
 $abbr = DateTimeZone::listAbbreviations();
@@ -19,7 +19,7 @@ var_dump( gettype($abbr) );
 var_dump( count($abbr) );
 
 echo "\n-- Format a sample entry --\n";
-var_dump( $abbr["acst"] );	
+var_dump( $abbr["acst"] );
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt b/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt
index 7eebfa8fe63..4421964d710 100644
--- a/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test DateTimeZone::listIdentifiers function : basic functionality 
+Test DateTimeZone::listIdentifiers function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array DateTimeZone::listIdentifiers ( void )
- * Description: Returns numerically index array with all timezone identifiers  
+ * Description: Returns numerically index array with all timezone identifiers
  * Source code: ext/date/php_date.c
  * Alias to functions: timezone_identifiers_list
  */
 
 echo "*** Testing DateTimeZone::listIdentifiers() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("GMT");
 
 $zones = DateTimeZone::listIdentifiers();
diff --git a/ext/date/tests/DateTimeZone_serialize_type_1.phpt b/ext/date/tests/DateTimeZone_serialize_type_1.phpt
index 51a5c53b234..e6835f3daf1 100644
--- a/ext/date/tests/DateTimeZone_serialize_type_1.phpt
+++ b/ext/date/tests/DateTimeZone_serialize_type_1.phpt
@@ -2,21 +2,21 @@
 Test serialization of DateTimeZone objects
 --FILE--
 <?php
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 $tz1 = date_create("2012-01-01 10:00 +1:00")->getTimezone();
 var_dump( $tz1 );
 $serialized = serialize($tz1);
-var_dump($serialized); 
+var_dump($serialized);
 
 $tz2 = unserialize($serialized);
 var_dump($tz2);
-// Try to use unserialzied object 
-var_dump( $tz2->getName() ); 
+// Try to use unserialzied object
+var_dump( $tz2->getName() );
 
 ?>
-===DONE=== 
+===DONE===
 --EXPECTF--
 object(DateTimeZone)#%d (2) {
   ["timezone_type"]=>
diff --git a/ext/date/tests/DateTimeZone_serialize_type_2.phpt b/ext/date/tests/DateTimeZone_serialize_type_2.phpt
index 4147efe927f..92f1e70bc4d 100644
--- a/ext/date/tests/DateTimeZone_serialize_type_2.phpt
+++ b/ext/date/tests/DateTimeZone_serialize_type_2.phpt
@@ -2,21 +2,21 @@
 Test serialization of DateTimeZone objects
 --FILE--
 <?php
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 $tz1 = new DateTimeZone("EST");
 var_dump( $tz1 );
 $serialized = serialize($tz1);
-var_dump($serialized); 
+var_dump($serialized);
 
 $tz2 = unserialize($serialized);
 var_dump($tz2);
-// Try to use unserialzied object 
-var_dump( $tz2->getName() ); 
+// Try to use unserialzied object
+var_dump( $tz2->getName() );
 
 ?>
-===DONE=== 
+===DONE===
 --EXPECTF--
 object(DateTimeZone)#%d (2) {
   ["timezone_type"]=>
diff --git a/ext/date/tests/DateTimeZone_serialize_type_3.phpt b/ext/date/tests/DateTimeZone_serialize_type_3.phpt
index 396bff91963..ab6f6cdc0f3 100644
--- a/ext/date/tests/DateTimeZone_serialize_type_3.phpt
+++ b/ext/date/tests/DateTimeZone_serialize_type_3.phpt
@@ -2,21 +2,21 @@
 Test serialization of DateTimeZone objects
 --FILE--
 <?php
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 $tz1 = new DateTimeZone("America/New_York");
 var_dump( $tz1 );
 $serialized = serialize($tz1);
-var_dump($serialized); 
+var_dump($serialized);
 
 $tz2 = unserialize($serialized);
 var_dump($tz2);
-// Try to use unserialzied object 
-var_dump( $tz2->getName() ); 
+// Try to use unserialzied object
+var_dump( $tz2->getName() );
 
 ?>
-===DONE=== 
+===DONE===
 --EXPECTF--
 object(DateTimeZone)#1 (2) {
   ["timezone_type"]=>
diff --git a/ext/date/tests/DateTimeZone_verify.phpt b/ext/date/tests/DateTimeZone_verify.phpt
index f28742d26a5..2cba7c859ed 100644
--- a/ext/date/tests/DateTimeZone_verify.phpt
+++ b/ext/date/tests/DateTimeZone_verify.phpt
@@ -10,10 +10,10 @@ $class = new ReflectionClass('DateTimeZone');
 var_dump($class);
 
 echo "..and get names of all its methods\n";
-$methods = $class->getMethods(); 
+$methods = $class->getMethods();
 var_dump($methods);
 
-echo "..and get names of all its class constants\n"; 
+echo "..and get names of all its class constants\n";
 $constants = $class->getConstants();
 var_dump($constants);
 ?>
diff --git a/ext/date/tests/DateTime_add-dates.phpt b/ext/date/tests/DateTime_add-dates.phpt
index 48c821ff9d9..46d96540acb 100644
--- a/ext/date/tests/DateTime_add-dates.phpt
+++ b/ext/date/tests/DateTime_add-dates.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DateTime::add() -- dates 
+DateTime::add() -- dates
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 --FILE--
diff --git a/ext/date/tests/DateTime_add-fall-type3-type3.phpt b/ext/date/tests/DateTime_add-fall-type3-type3.phpt
index 24315529a07..acf63502946 100644
--- a/ext/date/tests/DateTime_add-fall-type3-type3.phpt
+++ b/ext/date/tests/DateTime_add-fall-type3-type3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DateTime::add() -- fall type3 type3 
+DateTime::add() -- fall type3 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 --XFAIL--
diff --git a/ext/date/tests/DateTime_add-february.phpt b/ext/date/tests/DateTime_add-february.phpt
index 8e47c0eddf0..990e5557b93 100644
--- a/ext/date/tests/DateTime_add-february.phpt
+++ b/ext/date/tests/DateTime_add-february.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DateTime::add() -- february 
+DateTime::add() -- february
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 --FILE--
diff --git a/ext/date/tests/DateTime_clone_basic1.phpt b/ext/date/tests/DateTime_clone_basic1.phpt
index cef6621a75d..9da13220dcb 100644
--- a/ext/date/tests/DateTime_clone_basic1.phpt
+++ b/ext/date/tests/DateTime_clone_basic1.phpt
@@ -3,7 +3,7 @@ Test clone on DateTime objects
 --FILE--
 <?php
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set('Europe/London');
 
 echo "*** Testing clone on DateTime objects ***\n";
@@ -11,7 +11,7 @@ echo "*** Testing clone on DateTime objects ***\n";
 // Create a DateTime object..
 $orig = new DateTime('2008-07-02 14:25:41');
 
-// ..create a clone of it ..Clone 
+// ..create a clone of it ..Clone
 $clone = clone $orig;
 
 // ..and modify original
diff --git a/ext/date/tests/DateTime_clone_basic2.phpt b/ext/date/tests/DateTime_clone_basic2.phpt
index 99659c10a09..e4ca0c1cab8 100644
--- a/ext/date/tests/DateTime_clone_basic2.phpt
+++ b/ext/date/tests/DateTime_clone_basic2.phpt
@@ -2,7 +2,7 @@
 Test clone of objects whoose class derived from DateTime class
 --FILE--
 <?php
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 class DateTimeExt1 extends DateTime {
diff --git a/ext/date/tests/DateTime_clone_basic3.phpt b/ext/date/tests/DateTime_clone_basic3.phpt
index f3d9c142fb5..5019b6685ce 100644
--- a/ext/date/tests/DateTime_clone_basic3.phpt
+++ b/ext/date/tests/DateTime_clone_basic3.phpt
@@ -2,7 +2,7 @@
 Test clone of DateTime objects
 --FILE--
 <?php
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing clone on DateTime objects ***\n";
diff --git a/ext/date/tests/DateTime_clone_basic4.phpt b/ext/date/tests/DateTime_clone_basic4.phpt
index f19f23d97b1..b7053d9b922 100644
--- a/ext/date/tests/DateTime_clone_basic4.phpt
+++ b/ext/date/tests/DateTime_clone_basic4.phpt
@@ -2,15 +2,15 @@
 Test clone of DateTime derived objects with __clone magic method
 --FILE--
 <?php
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 class DateTimeExt1 extends DateTime {
 	public function __clone() {
-		echo "-- DateTimeExt1 __clone magic method called --\n"; 
+		echo "-- DateTimeExt1 __clone magic method called --\n";
 	}
 }
 
@@ -20,7 +20,7 @@ $d1 = new DateTimeExt1("2009-02-03 12:34:41 GMT");
 $d1_clone = clone $d1;
 
 //verify clone by calling method on new object
-var_dump( $d1_clone->format( "m.d.y") ); 
+var_dump( $d1_clone->format( "m.d.y") );
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/DateTime_compare_basic1.phpt b/ext/date/tests/DateTime_compare_basic1.phpt
index 313dab1c25d..7119f0f8dc2 100644
--- a/ext/date/tests/DateTime_compare_basic1.phpt
+++ b/ext/date/tests/DateTime_compare_basic1.phpt
@@ -1,11 +1,11 @@
 --TEST--
 Test of compare object handler for DateTime objects
 --FILE--
-<?php 
+<?php
 
 echo "Simple test for DateTime compare object handler\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 class DateTimeExt1 extends DateTime {
@@ -33,7 +33,7 @@ var_dump($obj2 == $obj3);
 var_dump($obj2 == $obj4);
 var_dump($obj3 == $obj4);
 
-date_modify($obj1, "+1 day"); 
+date_modify($obj1, "+1 day");
 echo "\n-- The following test should still compare equal --\n";
 var_dump($obj1 == $obj1);
 echo "\n-- All the following tests should now compare NOT equal --\n";
@@ -44,7 +44,7 @@ var_dump($obj1 == $obj4);
 echo "\n-- All the following tests should again compare equal --\n";
 date_modify($obj2, "+1 day");
 date_modify($obj3, "+1 day");
-date_modify($obj4, "+1 day");   
+date_modify($obj4, "+1 day");
 var_dump($obj1 == $obj2);
 var_dump($obj1 == $obj3);
 var_dump($obj1 == $obj4);
diff --git a/ext/date/tests/DateTime_construct_basic1.phpt b/ext/date/tests/DateTime_construct_basic1.phpt
index d6a8956bf3f..f2a341b0535 100644
--- a/ext/date/tests/DateTime_construct_basic1.phpt
+++ b/ext/date/tests/DateTime_construct_basic1.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test new DateTime() : basic functionality 
+Test new DateTime() : basic functionality
 --FILE--
 <?php
 /* Prototype  : DateTime::__construct  ([ string $time="now"  [, DateTimeZone $timezone=NULL  ]] )
  * Description: Returns new DateTime object
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing new DateTime() : basic functionality ***\n";
diff --git a/ext/date/tests/DateTime_construct_error.phpt b/ext/date/tests/DateTime_construct_error.phpt
index d0a453fd9df..77495c72e98 100644
--- a/ext/date/tests/DateTime_construct_error.phpt
+++ b/ext/date/tests/DateTime_construct_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test new DateTime() : error conditions 
+Test new DateTime() : error conditions
 --FILE--
 <?php
 /* Prototype  : DateTime::__construct  ([ string $time="now"  [, DateTimeZone $timezone=NULL  ]] )
  * Description: Returns new DateTime object
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("GMT");
 
 echo "*** Testing date_create() : error conditions ***\n";
diff --git a/ext/date/tests/DateTime_construct_variation1.phpt b/ext/date/tests/DateTime_construct_variation1.phpt
index 8ff7f7e89cb..964d0ffc693 100644
--- a/ext/date/tests/DateTime_construct_variation1.phpt
+++ b/ext/date/tests/DateTime_construct_variation1.phpt
@@ -10,7 +10,7 @@ Test new DateTime() function : usage variation - Passing unexpected values to fi
 
 echo "*** Testing new DateTime(): usage variation -  unexpected values to first argument \$time***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
@@ -99,20 +99,20 @@ $timezone = new DateTimeZone("Europe/London");
 
 foreach($inputs as $variation =>$time) {
       echo "\n-- $variation --\n";
-      
+
       try {
       	var_dump( new DateTime($time) );
       } catch (Throwable $e) {
       	  $msg = $e->getMessage();
       	  echo "FAILED: " . $msg . "\n";
-      }	
-      
+      }
+
       try {
       	var_dump( new DateTime($time, $timezone) );
       } catch (Throwable $e) {
       	 $msg = $e->getMessage();
       	 echo "FAILED: " . $msg . "\n";
-      }	
+      }
 };
 
 // closing the resource
diff --git a/ext/date/tests/DateTime_construct_variation2.phpt b/ext/date/tests/DateTime_construct_variation2.phpt
index e75e14d8e30..c4047b8e812 100644
--- a/ext/date/tests/DateTime_construct_variation2.phpt
+++ b/ext/date/tests/DateTime_construct_variation2.phpt
@@ -10,7 +10,7 @@ Test new DateTime() function : usage variation - Passing unexpected values to se
 
 echo "*** Testing new DateTime() : usage variation -  unexpected values to second argument \$timezone***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
@@ -99,14 +99,14 @@ $time = "2005-07-14 22:30:41";
 
 foreach($inputs as $variation =>$timezone) {
       echo "\n-- $variation --\n";
-      
+
       try {
 			var_dump( new DateTime($time, $timezone) );
       } catch (Throwable $e) {
 			$msg = $e->getMessage();
 			echo "FAILED: " . $msg . "\n";
-      }	
-      
+      }
+
 };
 
 // closing the resource
diff --git a/ext/date/tests/DateTime_days-absolute.phpt b/ext/date/tests/DateTime_days-absolute.phpt
index 7a150e39a71..71a3f631cb7 100644
--- a/ext/date/tests/DateTime_days-absolute.phpt
+++ b/ext/date/tests/DateTime_days-absolute.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DateTime::diff() days -- absolute 
+DateTime::diff() days -- absolute
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 --FILE--
diff --git a/ext/date/tests/DateTime_days-dates.phpt b/ext/date/tests/DateTime_days-dates.phpt
index 446d56d78d5..574247a0ca6 100644
--- a/ext/date/tests/DateTime_days-dates.phpt
+++ b/ext/date/tests/DateTime_days-dates.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DateTime::diff() days -- dates 
+DateTime::diff() days -- dates
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 --FILE--
diff --git a/ext/date/tests/DateTime_days-fall-type3-type3.phpt b/ext/date/tests/DateTime_days-fall-type3-type3.phpt
index 38e4ef50f58..10579da98b5 100644
--- a/ext/date/tests/DateTime_days-fall-type3-type3.phpt
+++ b/ext/date/tests/DateTime_days-fall-type3-type3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DateTime::diff() days -- fall type3 type3 
+DateTime::diff() days -- fall type3 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 --FILE--
diff --git a/ext/date/tests/DateTime_days-february.phpt b/ext/date/tests/DateTime_days-february.phpt
index b8107d703d2..81032b7876f 100644
--- a/ext/date/tests/DateTime_days-february.phpt
+++ b/ext/date/tests/DateTime_days-february.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DateTime::diff() days -- february 
+DateTime::diff() days -- february
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 --FILE--
diff --git a/ext/date/tests/DateTime_diff-absolute.phpt b/ext/date/tests/DateTime_diff-absolute.phpt
index 5295b3a721d..92b607074d6 100644
--- a/ext/date/tests/DateTime_diff-absolute.phpt
+++ b/ext/date/tests/DateTime_diff-absolute.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DateTime::diff() -- absolute 
+DateTime::diff() -- absolute
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 --FILE--
diff --git a/ext/date/tests/DateTime_diff-dates.phpt b/ext/date/tests/DateTime_diff-dates.phpt
index 71c5e1b6c8c..f71dcbaa563 100644
--- a/ext/date/tests/DateTime_diff-dates.phpt
+++ b/ext/date/tests/DateTime_diff-dates.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DateTime::diff() -- dates 
+DateTime::diff() -- dates
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 --FILE--
diff --git a/ext/date/tests/DateTime_diff-fall-type3-type3.phpt b/ext/date/tests/DateTime_diff-fall-type3-type3.phpt
index bf25fef6207..484dbe2b5f3 100644
--- a/ext/date/tests/DateTime_diff-fall-type3-type3.phpt
+++ b/ext/date/tests/DateTime_diff-fall-type3-type3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DateTime::diff() -- fall type3 type3 
+DateTime::diff() -- fall type3 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 --XFAIL--
diff --git a/ext/date/tests/DateTime_diff-february.phpt b/ext/date/tests/DateTime_diff-february.phpt
index 7705b12e327..7f483bd6d38 100644
--- a/ext/date/tests/DateTime_diff-february.phpt
+++ b/ext/date/tests/DateTime_diff-february.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DateTime::diff() -- february 
+DateTime::diff() -- february
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 --FILE--
diff --git a/ext/date/tests/DateTime_extends_basic1.phpt b/ext/date/tests/DateTime_extends_basic1.phpt
index 8fe53d69f84..f1149fea4e5 100644
--- a/ext/date/tests/DateTime_extends_basic1.phpt
+++ b/ext/date/tests/DateTime_extends_basic1.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test DateTime class inheritance  
+Test DateTime class inheritance
 --FILE--
 <?php
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing basic DateTime inheritance() ***\n";
@@ -12,7 +12,7 @@ echo "*** Testing basic DateTime inheritance() ***\n";
 class DateTimeExt extends DateTime
 {
 	public static $format = "F j, Y, g:i:s a";
-	
+
 	public function __toString()
 	{
 		return parent::format(self::$format);
@@ -26,8 +26,8 @@ echo "\n-- Invoke __toString --\n";
 echo $d . "\n";
 
 echo "\n -- modify date and time --\n";
-$d->setDate(1963, 7, 2); 
-$d->setTime(10, 45, 30); 
+$d->setDate(1963, 7, 2);
+$d->setTime(10, 45, 30);
 
 echo "\n-- Invoke __toString again --\n";
 echo $d . "\n";
diff --git a/ext/date/tests/DateTime_extends_basic2.phpt b/ext/date/tests/DateTime_extends_basic2.phpt
index a4bf4aa27fb..026394af6a3 100644
--- a/ext/date/tests/DateTime_extends_basic2.phpt
+++ b/ext/date/tests/DateTime_extends_basic2.phpt
@@ -3,7 +3,7 @@ Test DateTime class inheritance : with user space __construct magic method
 --FILE--
 <?php
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing new DateTime() : with user space __construct magic method ***\n";
@@ -21,7 +21,7 @@ class DateTimeExt extends DateTime
 }
 
 $d = new DateTimeExt("1967-05-01 22:30:41");
-echo $d->format("F j, Y, g:i:s a") . "\n"; 
+echo $d->format("F j, Y, g:i:s a") . "\n";
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/DateTime_extends_basic3.phpt b/ext/date/tests/DateTime_extends_basic3.phpt
index bee395aa968..229c2cb4221 100644
--- a/ext/date/tests/DateTime_extends_basic3.phpt
+++ b/ext/date/tests/DateTime_extends_basic3.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Test DateTime class inheritance : with user space fromat() method  
+Test DateTime class inheritance : with user space fromat() method
 --FILE--
 <?php
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing new DateTime() : with user format() method ***\n";
diff --git a/ext/date/tests/DateTime_fix_createFromFormat.phpt b/ext/date/tests/DateTime_fix_createFromFormat.phpt
index abde292775d..f9c42403dc7 100644
--- a/ext/date/tests/DateTime_fix_createFromFormat.phpt
+++ b/ext/date/tests/DateTime_fix_createFromFormat.phpt
@@ -3,7 +3,7 @@ Test fix for DateTime when date have textual day with dot or other special char
 --FILE--
 <?php
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set('Europe/London');
 
 echo "*** Testing clone on DateTime objects ***\n";
diff --git a/ext/date/tests/DateTime_format_basic1.phpt b/ext/date/tests/DateTime_format_basic1.phpt
index b5bbecfc03b..354911875c1 100644
--- a/ext/date/tests/DateTime_format_basic1.phpt
+++ b/ext/date/tests/DateTime_format_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DateTime::format() function : basic functionality 
+Test DateTime::format() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : public string DateTime::format  ( string $format  )
@@ -7,22 +7,22 @@ Test DateTime::format() function : basic functionality
  * Source code: ext/date/php_date.c
  * Alias to functions: date_format
  */
- 
-//Set the default time zone 
+
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing DateTime::format() : basic functionality ***\n";
 $date = new DateTime("2005-07-14 22:30:41");
 
-var_dump( $date->format( "F j, Y, g:i a") );                 
-var_dump( $date->format( "m.d.y") );                         
-var_dump( $date->format( "j, n, Y") );                       
-var_dump( $date->format( "Ymd") );                          
-var_dump( $date->format( 'h-i-s, j-m-y, it is w Day') );     
-var_dump( $date->format( '\i\t \i\s \t\h\e jS \d\a\y.') );   
-var_dump( $date->format( "D M j G:i:s T Y") );               
-var_dump( $date->format( 'H:m:s \m \i\s\ \m\o\n\t\h') );     
-var_dump( $date->format( "H:i:s") );                         
+var_dump( $date->format( "F j, Y, g:i a") );
+var_dump( $date->format( "m.d.y") );
+var_dump( $date->format( "j, n, Y") );
+var_dump( $date->format( "Ymd") );
+var_dump( $date->format( 'h-i-s, j-m-y, it is w Day') );
+var_dump( $date->format( '\i\t \i\s \t\h\e jS \d\a\y.') );
+var_dump( $date->format( "D M j G:i:s T Y") );
+var_dump( $date->format( 'H:m:s \m \i\s\ \m\o\n\t\h') );
+var_dump( $date->format( "H:i:s") );
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/DateTime_format_basic2.phpt b/ext/date/tests/DateTime_format_basic2.phpt
index 016fa7b6b28..958b702ea4c 100644
--- a/ext/date/tests/DateTime_format_basic2.phpt
+++ b/ext/date/tests/DateTime_format_basic2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_format() function : basic functionality  
+Test date_format() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : public string DateTime::format  ( string $format  )
@@ -7,8 +7,8 @@ Test date_format() function : basic functionality
  * Source code: ext/date/php_date.c
  * Alias to functions: date_format
  */
- 
-//Set the default time zone 
+
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_format() : basic functionality - formatting coinstants ***\n";
diff --git a/ext/date/tests/DateTime_format_error.phpt b/ext/date/tests/DateTime_format_error.phpt
index db1be92290e..0772bf8a092 100644
--- a/ext/date/tests/DateTime_format_error.phpt
+++ b/ext/date/tests/DateTime_format_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DateTime::format() function : error conditions 
+Test DateTime::format() function : error conditions
 --FILE--
 <?php
 /* Prototype  : public string DateTime::format  ( string $format  )
@@ -7,8 +7,8 @@ Test DateTime::format() function : error conditions
  * Source code: ext/date/php_date.c
  * Alias to functions: date_format
  */
- 
-//Set the default time zone 
+
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 // Craete a date object
@@ -22,7 +22,7 @@ var_dump( $date->format() );
 echo "\n-- Testing date_date_formatcreate() function with more than expected no. of arguments --\n";
 $format = "F j, Y, g:i a";
 $extra_arg = 10;
-var_dump( $date->format($format, $extra_arg) );   
+var_dump( $date->format($format, $extra_arg) );
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/DateTime_format_variation1.phpt b/ext/date/tests/DateTime_format_variation1.phpt
index 87a99220a60..68bbd56caa7 100644
--- a/ext/date/tests/DateTime_format_variation1.phpt
+++ b/ext/date/tests/DateTime_format_variation1.phpt
@@ -7,10 +7,10 @@ Test DateTime::format() function : usage variation - Passing unexpected values t
  * Source code: ext/date/php_date.c
  * Alias to functions: date_format
  */
- 
+
 echo "*** Testing DateTime::format() : usage variation -  unexpected values to first argument \$format***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/DateTime_getOffset_basic1.phpt b/ext/date/tests/DateTime_getOffset_basic1.phpt
index 41b1a78d75c..cd66008dbdf 100644
--- a/ext/date/tests/DateTime_getOffset_basic1.phpt
+++ b/ext/date/tests/DateTime_getOffset_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DateTime::getOffset() function : basic functionality 
+Test DateTime::getOffset() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : public int DateTime::getOffset  ( void  )
@@ -7,8 +7,8 @@ Test DateTime::getOffset() function : basic functionality
  * Source code: ext/date/php_date.c
  * Alias to functions:  date_offset_get
  */
- 
-//Set the default time zone 
+
+//Set the default time zone
 date_default_timezone_set('Europe/London');
 
 echo "*** Testing DateTime::getOffset() : basic functionality ***\n";
@@ -16,8 +16,8 @@ echo "*** Testing DateTime::getOffset() : basic functionality ***\n";
 $winter = new DateTime('2008-12-25 14:25:41');
 $summer = new DateTime('2008-07-02 14:25:41');
 
-echo "Winter offset: " . $winter->getOffset() / 3600 . " hours\n"; 
-echo "Summer offset: " . $summer->getOffset() / 3600 . " hours\n"; 
+echo "Winter offset: " . $winter->getOffset() / 3600 . " hours\n";
+echo "Summer offset: " . $summer->getOffset() / 3600 . " hours\n";
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/DateTime_getOffset_error.phpt b/ext/date/tests/DateTime_getOffset_error.phpt
index 6e9c3f411d6..508ac7b9407 100644
--- a/ext/date/tests/DateTime_getOffset_error.phpt
+++ b/ext/date/tests/DateTime_getOffset_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DateTime::getOffset() function : error conditions 
+Test DateTime::getOffset() function : error conditions
 --FILE--
 <?php
 
@@ -8,8 +8,8 @@ Test DateTime::getOffset() function : error conditions
  * Source code: ext/date/php_date.c
  * Alias to functions:  date_offset_get
  */
- 
- //Set the default time zone 
+
+ //Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing DateTime::getOffset() : error conditions ***\n";
diff --git a/ext/date/tests/DateTime_getTimeZone_basic1.phpt b/ext/date/tests/DateTime_getTimeZone_basic1.phpt
index ee8a0db9a35..680e10f718d 100644
--- a/ext/date/tests/DateTime_getTimeZone_basic1.phpt
+++ b/ext/date/tests/DateTime_getTimeZone_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DateTime::getTimezone() function : basic functionality 
+Test DateTime::getTimezone() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : public DateTimeZone DateTime::getTimezone  ( void  )
@@ -12,16 +12,16 @@ echo "*** Testing DateTime::getTimezone() : basic functionality ***\n";
 
 date_default_timezone_set("Europe/London");
 $object = new DateTime("2009-01-30 17:57:32");
-var_dump( $object->getTimeZone()->getName() ); 
+var_dump( $object->getTimeZone()->getName() );
 
 
 date_default_timezone_set("America/New_York");
 $object = new DateTime("2009-01-30 17:57:32");
-var_dump( $object->getTimeZone()->getName() ); 
+var_dump( $object->getTimeZone()->getName() );
 
 $la_time = new DateTimeZone("America/Los_Angeles");
 $object->setTimeZone($la_time);
-var_dump( $object->getTimeZone()->getName() ); 
+var_dump( $object->getTimeZone()->getName() );
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/DateTime_modify_basic1.phpt b/ext/date/tests/DateTime_modify_basic1.phpt
index 052524d5a44..c9372eb8e9f 100644
--- a/ext/date/tests/DateTime_modify_basic1.phpt
+++ b/ext/date/tests/DateTime_modify_basic1.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test DateTime::modify() function : basic functionality 
+Test DateTime::modify() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::modify  ( string $modify  )
- * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime(). 
+ * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime().
  * Source code: ext/date/php_date.c
  * Alias to functions: public date_modify()
  */
 
- //Set the default time zone 
+ //Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing DateTime::modify() : basic functionality ***\n";
@@ -16,16 +16,16 @@ echo "*** Testing DateTime::modify() : basic functionality ***\n";
 // Create a date object to modify
 $datetime = new DateTime("2009-01-31 14:28:41");
 
-$datetime->modify("+1 day"); 
-echo "After modification 1: " . $datetime->format("D, d M Y") . "\n"; 
+$datetime->modify("+1 day");
+echo "After modification 1: " . $datetime->format("D, d M Y") . "\n";
 
-$datetime->modify("+1 week 2 days 4 hours 2 seconds"); 
+$datetime->modify("+1 week 2 days 4 hours 2 seconds");
 echo "After modification 2: " . $datetime->format("D, d M Y H:i:s") . "\n";
 
-$datetime->modify("next Thursday"); 
-echo "After modification 3: " . $datetime->format("D, d M Y") . "\n"; 
+$datetime->modify("next Thursday");
+echo "After modification 3: " . $datetime->format("D, d M Y") . "\n";
 
-$datetime->modify("last Sunday"); 
+$datetime->modify("last Sunday");
 echo "After modification 4: " . $datetime->format("D, d M Y") . "\n";
 
 ?>
diff --git a/ext/date/tests/DateTime_modify_error.phpt b/ext/date/tests/DateTime_modify_error.phpt
index bc4f2423f44..5f0df798846 100644
--- a/ext/date/tests/DateTime_modify_error.phpt
+++ b/ext/date/tests/DateTime_modify_error.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test DateTime::modify() function : error conditions 
+Test DateTime::modify() function : error conditions
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::modify  ( string $modify  )
- * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime(). 
+ * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime().
  * Source code: ext/date/php_date.c
  * Alias to functions: public date_modify()
  */
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing DateTime::modify() : error conditions ***\n";
diff --git a/ext/date/tests/DateTime_modify_variation1.phpt b/ext/date/tests/DateTime_modify_variation1.phpt
index ddb36751ce1..d442243ead0 100644
--- a/ext/date/tests/DateTime_modify_variation1.phpt
+++ b/ext/date/tests/DateTime_modify_variation1.phpt
@@ -3,14 +3,14 @@ Test DateTime::modify() function : usage variation - Passing unexpected values t
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::modify  ( string $modify  )
- * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime(). 
+ * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime().
  * Source code: ext/date/php_date.c
  * Alias to functions: public date_modify()
  */
 
 echo "*** Testing DateTime::modify() : usage variation -  unexpected values to first argument \$modify***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/DateTime_serialize.phpt b/ext/date/tests/DateTime_serialize.phpt
index b8af87eee10..48b8b01cf96 100644
--- a/ext/date/tests/DateTime_serialize.phpt
+++ b/ext/date/tests/DateTime_serialize.phpt
@@ -2,21 +2,21 @@
 Test serialization of DateTime objects
 --FILE--
 <?php
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 $date1 = new DateTime("2005-07-14 22:30:41");
 var_dump($date1);
 $serialized = serialize($date1);
-var_dump($serialized); 
+var_dump($serialized);
 
 $date2 = unserialize($serialized);
 var_dump($date2);
-// Try to use unserialzied object 
-var_dump( $date2->format( "F j, Y, g:i a") ); 
+// Try to use unserialzied object
+var_dump( $date2->format( "F j, Y, g:i a") );
 
 ?>
-===DONE=== 
+===DONE===
 --EXPECTF--
 object(DateTime)#%d (3) {
   ["date"]=>
diff --git a/ext/date/tests/DateTime_setDate_basic1.phpt b/ext/date/tests/DateTime_setDate_basic1.phpt
index 7989470cda9..581287faac6 100644
--- a/ext/date/tests/DateTime_setDate_basic1.phpt
+++ b/ext/date/tests/DateTime_setDate_basic1.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test DateTime::setDate() function : basic functionality 
+Test DateTime::setDate() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setDate  ( int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_date_set()
  */
- 
- //Set the default time zone 
+
+ //Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing DateTime::setDate() : basic functionality ***\n";
diff --git a/ext/date/tests/DateTime_setDate_error.phpt b/ext/date/tests/DateTime_setDate_error.phpt
index 29c019a2627..25bbb3b2e89 100644
--- a/ext/date/tests/DateTime_setDate_error.phpt
+++ b/ext/date/tests/DateTime_setDate_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test DateTime::setDate() function : error conditions 
+Test DateTime::setDate() function : error conditions
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setDate  ( int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_date_set()
  */
- 
+
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing DateTime::setDate() : error conditions ***\n";
diff --git a/ext/date/tests/DateTime_setDate_variation1.phpt b/ext/date/tests/DateTime_setDate_variation1.phpt
index 945f7ae973f..e4337f25158 100644
--- a/ext/date/tests/DateTime_setDate_variation1.phpt
+++ b/ext/date/tests/DateTime_setDate_variation1.phpt
@@ -3,14 +3,14 @@ Test DateTime::setDate() function : usage variation - Passing unexpected values
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setDate  ( int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_date_set
  */
 
 echo "*** Testing DateTime::setDate() : usage variation -  unexpected values to first argument \$year***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/DateTime_setDate_variation2.phpt b/ext/date/tests/DateTime_setDate_variation2.phpt
index e335d210598..bc62bbc08b6 100644
--- a/ext/date/tests/DateTime_setDate_variation2.phpt
+++ b/ext/date/tests/DateTime_setDate_variation2.phpt
@@ -3,14 +3,14 @@ Test DateTime::setDate() function : usage variation - Passing unexpected values
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setDate  ( int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_date_set
  */
 
 echo "*** Testing DateTime::setDate() : usage variation -  unexpected values to second argument \$month***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/DateTime_setDate_variation3.phpt b/ext/date/tests/DateTime_setDate_variation3.phpt
index ef65e45e0e9..d1ea4a8b815 100644
--- a/ext/date/tests/DateTime_setDate_variation3.phpt
+++ b/ext/date/tests/DateTime_setDate_variation3.phpt
@@ -3,14 +3,14 @@ Test DateTime::setDate() function : usage variation - Passing unexpected values
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setDate  ( int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_date_set
  */
 
 echo "*** Testing DateTime::setDate() : usage variation -  unexpected values to third argument \$day***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/DateTime_setISODate_basic1.phpt b/ext/date/tests/DateTime_setISODate_basic1.phpt
index cdedb44e7a2..d834dbe2640 100644
--- a/ext/date/tests/DateTime_setISODate_basic1.phpt
+++ b/ext/date/tests/DateTime_setISODate_basic1.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test DateTime::setISODate() function : basic functionality 
+Test DateTime::setISODate() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setISODate  ( int $year  , int $week  [, int $day  ] )
- * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_isodate_set
  */
 
 echo "*** Testing DateTime::setISODate() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 // Create a deate object
diff --git a/ext/date/tests/DateTime_setISODate_error.phpt b/ext/date/tests/DateTime_setISODate_error.phpt
index af22581829b..b228d9f30c1 100644
--- a/ext/date/tests/DateTime_setISODate_error.phpt
+++ b/ext/date/tests/DateTime_setISODate_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test DateTime::setISODate () function : error conditions 
+Test DateTime::setISODate () function : error conditions
 --FILE--
 <?php
 
 /* Prototype  : public DateTime DateTime::setISODate  ( int $year  , int $week  [, int $day  ] )
- * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_isodate_set
  */
- 
- //Set the default time zone 
+
+ //Set the default time zone
 date_default_timezone_set("Europe/London");
 
 $datetime = new DateTime("2009-01-30 19:34:10");
@@ -24,7 +24,7 @@ echo "\n-- Testing DateTime::setISODate() function with less than expected no. o
 var_dump( $datetime->setISODate($year) );
 
 echo "\n-- Testing date_isodate_set() function with more than expected no. of arguments --\n";
-$week = 30; 
+$week = 30;
 $day = 7;
 $extra_arg = 30;
 var_dump(  $datetime->setISODate($year, $week, $day, $extra_arg) );
diff --git a/ext/date/tests/DateTime_setISODate_variation1.phpt b/ext/date/tests/DateTime_setISODate_variation1.phpt
index 58043e56891..75e0c9cada5 100644
--- a/ext/date/tests/DateTime_setISODate_variation1.phpt
+++ b/ext/date/tests/DateTime_setISODate_variation1.phpt
@@ -3,14 +3,14 @@ Test DateTime::setISODate() function : usage variation - Passing unexpected valu
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setISODate  ( int $year  , int $week  [, int $day  ] )
- * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_isodate_set
  */
 
 echo "*** Testing DateTime::setISODate() : usage variation -  unexpected values to first argument \$year***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/DateTime_setISODate_variation2.phpt b/ext/date/tests/DateTime_setISODate_variation2.phpt
index c40665950a6..6838b44a306 100644
--- a/ext/date/tests/DateTime_setISODate_variation2.phpt
+++ b/ext/date/tests/DateTime_setISODate_variation2.phpt
@@ -3,14 +3,14 @@ Test DateTime::setISODate() function : usage variation - Passing unexpected valu
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setISODate  ( int $year  , int $week  [, int $day  ] )
- * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_isodate_set
  */
 
 echo "*** Testing DateTime::setISODate() : usage variation -  unexpected values to second argument \$week***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/DateTime_setISODate_variation3.phpt b/ext/date/tests/DateTime_setISODate_variation3.phpt
index 87c39264a74..e5f1e1dc558 100644
--- a/ext/date/tests/DateTime_setISODate_variation3.phpt
+++ b/ext/date/tests/DateTime_setISODate_variation3.phpt
@@ -3,14 +3,14 @@ Test DateTime::setISODate() function : usage variation - Passing unexpected valu
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setISODate  ( int $year  , int $week  [, int $day  ] )
- * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_isodate_set
  */
 
 echo "*** Testing DateTime::setISODate() : usage variation -  unexpected values to third argument \$day***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/DateTime_setTime_basic1.phpt b/ext/date/tests/DateTime_setTime_basic1.phpt
index bd95fecd089..ee7551a23c7 100644
--- a/ext/date/tests/DateTime_setTime_basic1.phpt
+++ b/ext/date/tests/DateTime_setTime_basic1.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test DateTime::setTime() function : basic functionality 
+Test DateTime::setTime() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setTime  ( int $hour  , int $minute  [, int $second  ] )
- * Description: Resets the current time of the DateTime object to a different time. 
+ * Description: Resets the current time of the DateTime object to a different time.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_time_set
  */
- 
- //Set the default time zone 
+
+ //Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing DateTime::setTime() : basic functionality ***\n";
diff --git a/ext/date/tests/DateTime_setTime_error.phpt b/ext/date/tests/DateTime_setTime_error.phpt
index a6b5c5edea0..4d33cb11fa0 100644
--- a/ext/date/tests/DateTime_setTime_error.phpt
+++ b/ext/date/tests/DateTime_setTime_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test DateTime::setTime() function : error conditions 
+Test DateTime::setTime() function : error conditions
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setTime  ( int $hour  , int $minute  [, int $second  ] )
- * Description: Resets the current time of the DateTime object to a different time. 
+ * Description: Resets the current time of the DateTime object to a different time.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_time_set
  */
- 
+
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing DateTime::setTime() : error conditions ***\n";
diff --git a/ext/date/tests/DateTime_setTime_variation1.phpt b/ext/date/tests/DateTime_setTime_variation1.phpt
index 3f3c1e4c216..a573a62b584 100644
--- a/ext/date/tests/DateTime_setTime_variation1.phpt
+++ b/ext/date/tests/DateTime_setTime_variation1.phpt
@@ -2,15 +2,15 @@
 Test DateTime::setTime() function : usage variation - Passing unexpected values to first argument $hour.
 --FILE--
 <?php
-/* Prototype  : public DateTime DateTime::setTime  ( int $hour  , int $minute  [, int $second  ] )   
- * Description: Resets the current time of the DateTime object to a different time. 
+/* Prototype  : public DateTime DateTime::setTime  ( int $hour  , int $minute  [, int $second  ] )
+ * Description: Resets the current time of the DateTime object to a different time.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_time_set
  */
 
 echo "*** Testing DateTime::setTime() : usage variation -  unexpected values to first argument \$hour***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/DateTime_setTime_variation2.phpt b/ext/date/tests/DateTime_setTime_variation2.phpt
index e2bc153b74c..5e7eda8b5e3 100644
--- a/ext/date/tests/DateTime_setTime_variation2.phpt
+++ b/ext/date/tests/DateTime_setTime_variation2.phpt
@@ -2,15 +2,15 @@
 Test DateTime::setTime() function : usage variation - Passing unexpected values to second argument $minute.
 --FILE--
 <?php
-/* Prototype  : public DateTime DateTime::setTime  ( int $hour  , int $minute  [, int $second  ] )   
- * Description: Resets the current time of the DateTime object to a different time. 
+/* Prototype  : public DateTime DateTime::setTime  ( int $hour  , int $minute  [, int $second  ] )
+ * Description: Resets the current time of the DateTime object to a different time.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_time_set
  */
 
 echo "*** Testing DateTime::setTime() : usage variation -  unexpected values to second argument \$minute***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/DateTime_setTime_variation3.phpt b/ext/date/tests/DateTime_setTime_variation3.phpt
index 59e0cefe1d4..78154efa440 100644
--- a/ext/date/tests/DateTime_setTime_variation3.phpt
+++ b/ext/date/tests/DateTime_setTime_variation3.phpt
@@ -2,15 +2,15 @@
 Test DateTime::setTime() function : usage variation - Passing unexpected values to third argument $second.
 --FILE--
 <?php
-/* Prototype  : public DateTime DateTime::setTime  ( int $hour  , int $minute  [, int $second  ] )   
- * Description: Resets the current time of the DateTime object to a different time. 
+/* Prototype  : public DateTime DateTime::setTime  ( int $hour  , int $minute  [, int $second  ] )
+ * Description: Resets the current time of the DateTime object to a different time.
  * Source code: ext/date/php_date.c
  * Alias to functions: date_time_set
  */
 
 echo "*** Testing DateTime::setTime() : usage variation -  unexpected values to third argument \$second***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/DateTime_setTimezone_basic1.phpt b/ext/date/tests/DateTime_setTimezone_basic1.phpt
index f4f479fe041..646516f7e59 100644
--- a/ext/date/tests/DateTime_setTimezone_basic1.phpt
+++ b/ext/date/tests/DateTime_setTimezone_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DateTime::setTimezone() function : basic functionality 
+Test DateTime::setTimezone() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setTimezone  ( DateTimeZone $timezone  )
@@ -10,7 +10,7 @@ Test DateTime::setTimezone() function : basic functionality
 
 echo "*** Testing DateTime::setTimezone() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 $datetime = new DateTime("2009-01-30 17:57:32");
diff --git a/ext/date/tests/DateTime_setTimezone_error.phpt b/ext/date/tests/DateTime_setTimezone_error.phpt
index 32d03fbec90..2c6e105d639 100644
--- a/ext/date/tests/DateTime_setTimezone_error.phpt
+++ b/ext/date/tests/DateTime_setTimezone_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DateTime::setTimezone () function : error conditions 
+Test DateTime::setTimezone () function : error conditions
 --FILE--
 <?php
 /* Prototype  : public DateTime DateTime::setTimezone  ( DateTimeZone $timezone  )
@@ -7,7 +7,7 @@ Test DateTime::setTimezone () function : error conditions
  * Source code: ext/date/php_date.c
  * Alias to functions: date_timezone_set
  */
- 
+
 date_default_timezone_set("UTC");
 
 echo "*** Testing DateTime::setTimezone () : error conditions ***\n";
@@ -15,13 +15,13 @@ echo "*** Testing DateTime::setTimezone () : error conditions ***\n";
 $datetime = new DateTime("2009-01-30 17:57:32");
 
 echo "\n-- Testing DateTime::setTimezone () function with zero arguments --\n";
-var_dump( $datetime->setTimezone() ); 
+var_dump( $datetime->setTimezone() );
 
 echo "\n-- Testing DateTime::setTimezone () function with more than expected no. of arguments --\n";
 $timezone  = new DateTimezone("GMT");
 $extra_arg = 99;
 var_dump( $datetime->setTimezone($timezone, $extra_arg) );
-  
+
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/date/tests/DateTime_setTimezone_variation1.phpt b/ext/date/tests/DateTime_setTimezone_variation1.phpt
index b61edcb3f68..f1505170c7b 100644
--- a/ext/date/tests/DateTime_setTimezone_variation1.phpt
+++ b/ext/date/tests/DateTime_setTimezone_variation1.phpt
@@ -10,7 +10,7 @@ Test DateTime::setTimezone() function : usage variation - Passing unexpected val
 
 echo "*** Testing DateTime::setTimezone() : usage variation -  unexpected values to first argument \$timezone***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/DateTime_sub-dates.phpt b/ext/date/tests/DateTime_sub-dates.phpt
index 26f49ba8382..78b621c2bd2 100644
--- a/ext/date/tests/DateTime_sub-dates.phpt
+++ b/ext/date/tests/DateTime_sub-dates.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DateTime::sub() -- dates 
+DateTime::sub() -- dates
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 --FILE--
diff --git a/ext/date/tests/DateTime_sub-fall-type3-type3.phpt b/ext/date/tests/DateTime_sub-fall-type3-type3.phpt
index 6448b5d8423..c217611d6f2 100644
--- a/ext/date/tests/DateTime_sub-fall-type3-type3.phpt
+++ b/ext/date/tests/DateTime_sub-fall-type3-type3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DateTime::sub() -- fall type3 type3 
+DateTime::sub() -- fall type3 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 --XFAIL--
diff --git a/ext/date/tests/DateTime_sub-february.phpt b/ext/date/tests/DateTime_sub-february.phpt
index 23c8da44791..09dc099c8e4 100644
--- a/ext/date/tests/DateTime_sub-february.phpt
+++ b/ext/date/tests/DateTime_sub-february.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DateTime::sub() -- february 
+DateTime::sub() -- february
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 --FILE--
diff --git a/ext/date/tests/DateTime_verify.phpt b/ext/date/tests/DateTime_verify.phpt
index bb3ed9909a3..6772d6045ca 100644
--- a/ext/date/tests/DateTime_verify.phpt
+++ b/ext/date/tests/DateTime_verify.phpt
@@ -10,10 +10,10 @@ $class = new ReflectionClass('DateTime');
 var_dump($class);
 
 echo "..and get names of all its methods\n";
-$methods = $class->getMethods(); 
+$methods = $class->getMethods();
 var_dump($methods);
 
-echo "..and get names of all its class constants\n"; 
+echo "..and get names of all its class constants\n";
 $constants = $class->getConstants();
 var_dump($constants);
 
diff --git a/ext/date/tests/big_year.phpt b/ext/date/tests/big_year.phpt
index 1cfc5af3dd0..6f86e524b54 100644
--- a/ext/date/tests/big_year.phpt
+++ b/ext/date/tests/big_year.phpt
@@ -6,9 +6,9 @@ Handling of large year values
 <?php
 date_default_timezone_set("America/Toronto");
 
-$t = mktime(0,0,0,1,1,292277026596); 
+$t = mktime(0,0,0,1,1,292277026596);
 
-var_dump(date("r", $t)); 
+var_dump(date("r", $t));
 
 echo "OK\n";
 ?>
diff --git a/ext/date/tests/bug13142.phpt b/ext/date/tests/bug13142.phpt
index 5849a94427a..5550d5ce9cb 100644
--- a/ext/date/tests/bug13142.phpt
+++ b/ext/date/tests/bug13142.phpt
@@ -18,7 +18,7 @@ if (date('T') == 'GMT') {
 	putenv("TZ=EST5EDT4,M4.1.0,M10.5.0");
 }
 echo date("r\n", strtotime("Sep 04 16:39:45 2001"));
-echo date("r\n", strtotime("Sep 04 2001 16:39:45"));	
+echo date("r\n", strtotime("Sep 04 2001 16:39:45"));
 ?>
 --EXPECT--
 Tue, 04 Sep 2001 16:39:45 -0400
diff --git a/ext/date/tests/bug20382-1.phpt b/ext/date/tests/bug20382-1.phpt
index e81ac20fd33..162852115b0 100644
--- a/ext/date/tests/bug20382-1.phpt
+++ b/ext/date/tests/bug20382-1.phpt
@@ -6,7 +6,7 @@ date.timezone=Europe/Amsterdam
 <?php
 	$tStamp = mktime (17, 17, 17, 10, 27, 2004);
 	echo "tStamp=". date("l Y-m-d H:i:s T", $tStamp). "\n";
-	
+
 	$strtotime_timestamp = strtotime ("Monday", $tStamp);
 	echo "result=". date("l Y-m-d H:i:s T", $strtotime_timestamp). "\n";
 	echo "wanted=Monday 2004-11-01 00:00:00 CET\n";
diff --git a/ext/date/tests/bug30096.phpt b/ext/date/tests/bug30096.phpt
index fa4f716ee65..9ca45c4ffe9 100644
--- a/ext/date/tests/bug30096.phpt
+++ b/ext/date/tests/bug30096.phpt
@@ -22,7 +22,7 @@ function gm_date_check($hour, $minute, $second, $month, $day, $year) {
 	global $ts, $tsold;
 
 	echo "gmmktime($hour,$minute,$second,$month,$day,$year): ";
-	
+
 	$tsold = $ts;
 	$ts = gmmktime($hour, $minute, $second, $month, $day, $year);
 
diff --git a/ext/date/tests/bug32555.phpt b/ext/date/tests/bug32555.phpt
index fca34ffa191..03ed09fab49 100644
--- a/ext/date/tests/bug32555.phpt
+++ b/ext/date/tests/bug32555.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #32555 (strtotime("tomorrow") can return false)
 --SKIPIF--
-<?php 
-if (substr(PHP_OS, 0, 3) == 'WIN') die('skip strftime uses system TZ'); 
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') die('skip strftime uses system TZ');
 ?>
 --INI--
 date.timezone=US/Eastern
diff --git a/ext/date/tests/bug33414-1.phpt b/ext/date/tests/bug33414-1.phpt
index a7596f93f29..0187aef831d 100644
--- a/ext/date/tests/bug33414-1.phpt
+++ b/ext/date/tests/bug33414-1.phpt
@@ -3,7 +3,7 @@ Bug #33414 [1] (Comprehensive list of incorrect days returned after strotime() /
 --INI--
 date.timezone=America/Mendoza
 --FILE--
-<?php 
+<?php
 
 print "TZ=America/Mendoza - wrong day.\n";
 $tStamp = mktime (17, 17, 17, 1, 8327, 1970);
@@ -63,27 +63,27 @@ print "wanted=Friday              00:00:00\n\n";
 
 print "TZ=America/Havana - wrong day.\n";
 date_default_timezone_set("America/Havana");
-$tStamp = mktime (17, 17, 17, 1, 12720, 1970);  
+$tStamp = mktime (17, 17, 17, 1, 12720, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Thursday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Thursday             00:00:00\n\n";
 
 print "TZ=Europe/Tallinn - wrong day.\n";
-date_default_timezone_set("Europe/Tallinn");   
+date_default_timezone_set("Europe/Tallinn");
 $tStamp = mktime (17, 17, 17, 1, 11777, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Saturday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
-print "wanted=Saturday          00:00:00\n\n";  
+print "wanted=Saturday          00:00:00\n\n";
 
-print "TZ=Asia/Jerusalem - wrong day.\n";     
+print "TZ=Asia/Jerusalem - wrong day.\n";
 date_default_timezone_set("Asia/Jerusalem");
 $tStamp = mktime (17, 17, 17, 1, 13056, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Thursday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
-print "wanted=Thursday             00:00:00\n\n";         
+print "wanted=Thursday             00:00:00\n\n";
 
 print "TZ=Europe/Vilnius - wrong day.\n";
 date_default_timezone_set("Europe/Vilnius");
@@ -141,29 +141,29 @@ $strtotime_tstamp = strtotime("next Thursday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Thursday            00:00:00\n\n";
 
-print "TZ=Asia/Kuala_Lumpur - wrong day.\n";     
+print "TZ=Asia/Kuala_Lumpur - wrong day.\n";
 date_default_timezone_set("Asia/Kuala_Lumpur");
 $tStamp = mktime (17, 17, 17, 1, 4380, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Monday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
-print "wanted=Monday            00:00:00\n\n";            
+print "wanted=Monday            00:00:00\n\n";
 
-print "TZ=Pacific/Chatham - wrong day.\n";       
-date_default_timezone_set("Pacific/Chatham");  
+print "TZ=Pacific/Chatham - wrong day.\n";
+date_default_timezone_set("Pacific/Chatham");
 $tStamp = mktime (17, 17, 17, 1, 1762, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Monday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
-print "wanted=Monday            00:00:00\n\n";            
+print "wanted=Monday            00:00:00\n\n";
 
-print "TZ=America/Lima - wrong day.\n";        
-date_default_timezone_set("America/Lima");   
-$tStamp = mktime (17, 17, 17, 1, 5839, 1970); 
+print "TZ=America/Lima - wrong day.\n";
+date_default_timezone_set("America/Lima");
+$tStamp = mktime (17, 17, 17, 1, 5839, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Thursday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
-print "wanted=Thursday            00:00:00\n\n";          
+print "wanted=Thursday            00:00:00\n\n";
 
 print "TZ=Asia/Karachi - wrong day.\n";
 date_default_timezone_set("Asia/Karachi");
diff --git a/ext/date/tests/bug33414-2.phpt b/ext/date/tests/bug33414-2.phpt
index 8e8ad4b0cf8..1c71e886fe5 100644
--- a/ext/date/tests/bug33414-2.phpt
+++ b/ext/date/tests/bug33414-2.phpt
@@ -4,11 +4,11 @@ Bug #33414 [2] (Comprehensive list of incorrect days returned after strotime() /
 <?php
 print "TZ=Pacific/Rarotonga - wrong day.\n";
 date_default_timezone_set("Pacific/Rarotonga");
-$tStamp = mktime (17, 17, 17, 1, 1, 1970);       
+$tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Tuesday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
-print "wanted=Tuesday            00:00:00\n\n"; 
+print "wanted=Tuesday            00:00:00\n\n";
 
 print "TZ=Atlantic/South_Georgia - wrong day.\n";
 date_default_timezone_set("Atlantic/South_Georgia");
@@ -38,17 +38,17 @@ print "TZ=Pacific/Kiritimati - wrong day, off by 2 days.\n";
 date_default_timezone_set("Pacific/Kiritimati");
 $tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
-$strtotime_tstamp = strtotime("next Monday", $tStamp);                 
+$strtotime_tstamp = strtotime("next Monday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Monday            00:00:00\n\n";
 
-print "TZ=America/Managua - wrong day.\n";     
+print "TZ=America/Managua - wrong day.\n";
 date_default_timezone_set("America/Managua");
 $tStamp = mktime (17, 17, 17, 1, 12879, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Tuesday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
-print "wanted=Tuesday            00:00:00\n\n";     
+print "wanted=Tuesday            00:00:00\n\n";
 
 print "TZ=Pacific/Pitcairn - wrong day.\n";
 date_default_timezone_set("Pacific/Pitcairn");
diff --git a/ext/date/tests/bug33415-2.phpt b/ext/date/tests/bug33415-2.phpt
index a78557df55e..43cd7c30f76 100644
--- a/ext/date/tests/bug33415-2.phpt
+++ b/ext/date/tests/bug33415-2.phpt
@@ -106,7 +106,7 @@ print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
 print "wanted=Tuesday            00:30:00\n\n";
 
 print "TZ=Pacific/Tarawa - Is it OK for this to be Midday? Note: does
-not appear to have a DST or timezone transition.\n";     
+not appear to have a DST or timezone transition.\n";
 date_default_timezone_set('Pacific/Tarawa');
 $tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
@@ -128,7 +128,7 @@ $tStamp = mktime (17, 17, 17, 1, 5838, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Wednesday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
-print "wanted=Wednesday            00:15:00\n\n";         
+print "wanted=Wednesday            00:15:00\n\n";
 
 print "TZ=Pacific/Nauru - Is it OK for this to be 0:30? yes\n";
 date_default_timezone_set('Pacific/Nauru');
@@ -144,16 +144,16 @@ $tStamp = mktime (17, 17, 17, 1, 3189, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Sunday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
-print "wanted=Sunday            00:30:00\n\n";            
+print "wanted=Sunday            00:30:00\n\n";
 
 print "TZ=Pacific/Port_Moresby - Is it OK for this to be 10 AM? No DST
 or timezone transition.\n";
 date_default_timezone_set('Pacific/Port_Moresby');
-$tStamp = mktime (17, 17, 17, 1, 1, 1970);   
+$tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
-$strtotime_tstamp = strtotime("next Thursday", $tStamp); 
+$strtotime_tstamp = strtotime("next Thursday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
-print "wanted=Thursday            00:00:00\n\n";          
+print "wanted=Thursday            00:00:00\n\n";
 
 print "TZ=America/Miquelon - Is it OK for this to be 1 AM ? yes\n";
 date_default_timezone_set('America/Miquelon');
@@ -166,7 +166,7 @@ print "wanted=Thursday            01:00:00\n\n";
 print "TZ=Pacific/Palau - Is it OK for this to be 9 AM? No DST or
 timezone transition.\n";
 date_default_timezone_set('Pacific/Palau');
-$tStamp = mktime (17, 17, 17, 1, 1, 1970);   
+$tStamp = mktime (17, 17, 17, 1, 1, 1970);
 print "tStamp=". date("l Y-m-d H:i:s T I", $tStamp). "\n";
 $strtotime_tstamp = strtotime("next Saturday", $tStamp);
 print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n";
diff --git a/ext/date/tests/bug42910.phpt b/ext/date/tests/bug42910.phpt
index 1bd07908123..e741db2ebc3 100644
--- a/ext/date/tests/bug42910.phpt
+++ b/ext/date/tests/bug42910.phpt
@@ -18,7 +18,7 @@ Bug #42910 (Constructing DateTime with TimeZone Indicator invalidates DateTimeZo
 // --------------
 
     date_default_timezone_set('Australia/Sydney');
-  
+
     $date= date_create('2007-11-04 12:00:00+0200');
     var_dump(date_format($date, 'O e'));
 ?>
diff --git a/ext/date/tests/bug44562.phpt b/ext/date/tests/bug44562.phpt
index 89ca7402c46..5610474108b 100644
--- a/ext/date/tests/bug44562.phpt
+++ b/ext/date/tests/bug44562.phpt
@@ -19,7 +19,7 @@ $interval = DateInterval::createFromDateString( "1 day" );
 $dp = new DatePeriod( $begin, $interval, 10 );
 foreach ( $dp as $d )
 {
-	var_dump ($d->format( DATE_ISO8601 ) ); 
+	var_dump ($d->format( DATE_ISO8601 ) );
 }
 
 ?>
diff --git a/ext/date/tests/bug45529.phpt b/ext/date/tests/bug45529.phpt
index b5d1d6a8ef2..25c6f131b53 100644
--- a/ext/date/tests/bug45529.phpt
+++ b/ext/date/tests/bug45529.phpt
@@ -12,7 +12,7 @@ $d->setTimeZone($tz1);
 echo $d->format(DATE_ISO8601), PHP_EOL;
 $d = new DateTime('2008-01-01 12:00:00+0200');
 $d->setTimeZone($tz2);
-echo $d->format(DATE_ISO8601), PHP_EOL; 
+echo $d->format(DATE_ISO8601), PHP_EOL;
 ?>
 --EXPECT--
 UTC
diff --git a/ext/date/tests/bug46111.phpt b/ext/date/tests/bug46111.phpt
index 806424ebc66..4fcdfb6fdf8 100644
--- a/ext/date/tests/bug46111.phpt
+++ b/ext/date/tests/bug46111.phpt
@@ -9,7 +9,7 @@ $timezones = timezone_identifiers_list();
 print "[strtotime(timezone) == false - Begin List]\n";
 foreach ($timezones as $zone) {
     $date_string = "2008-01-01 13:00:00 " . $zone;
-    
+
     if (!strtotime($date_string)) {
         echo $zone . "\n";
     }
diff --git a/ext/date/tests/bug51096.phpt b/ext/date/tests/bug51096.phpt
index df31313a76e..2b479a94a69 100644
--- a/ext/date/tests/bug51096.phpt
+++ b/ext/date/tests/bug51096.phpt
@@ -17,7 +17,7 @@ foreach ( $tests as $test )
 	$result = date_parse( $test );
 	$rel = $result['relative'];
 	echo $test, "\n- month: ", $rel['month'], '; day: ', $rel['day'],
-		 '; first-day-of: ', isset( $rel['first_day_of_month'] ) ? 'true' : 'false', 
+		 '; first-day-of: ', isset( $rel['first_day_of_month'] ) ? 'true' : 'false',
 		 '; last-day-of: ', isset( $rel['last_day_of_month'] ) ? 'true' : 'false', "\n";
 	$date = new DateTime( '2010-03-06 15:21 UTC' );
 	echo '- ', $date->format( DateTime::ISO8601 );
diff --git a/ext/date/tests/bug52342.phpt b/ext/date/tests/bug52342.phpt
index 45534a23da8..fa1936e379a 100644
--- a/ext/date/tests/bug52342.phpt
+++ b/ext/date/tests/bug52342.phpt
@@ -6,7 +6,7 @@ date_default_timezone_set('Europe/Berlin');
 $from = new DateTime();
 $from->setTime(0, 0, 0);
 $from->setISODate(2010, 28, 1); //Montag der 28ten Woche 2010
- 
+
 echo $from->format('d.m.Y H:i'), "\n"; //A
 echo $from->getTimestamp(), "\n"; //B
 echo date('d.m.Y H:i', $from->getTimestamp()), "\n"; //C
diff --git a/ext/date/tests/bug60236.phpt b/ext/date/tests/bug60236.phpt
index a71bb5a17dd..a5c78106290 100644
--- a/ext/date/tests/bug60236.phpt
+++ b/ext/date/tests/bug60236.phpt
@@ -4,7 +4,7 @@ Bug #60236 (TLA timezone dates are not converted properly from timestamp)
 date.timezone=America/New_York
 --FILE--
 <?php
-$t = new DateTime('2010-07-06 18:38:28 EDT'); 
+$t = new DateTime('2010-07-06 18:38:28 EDT');
 $ts = $t->format('U');
 var_dump($ts);
 $t->setTimestamp($ts);
diff --git a/ext/date/tests/bug73091.phpt b/ext/date/tests/bug73091.phpt
index c051573297e..14f161afe74 100644
--- a/ext/date/tests/bug73091.phpt
+++ b/ext/date/tests/bug73091.phpt
@@ -8,7 +8,7 @@ class foo {
         return 'may be a bug';
     }
 }
-    
+
 var_dump(unserialize('O:12:"DateInterval":1:{s:4:"days";O:3:"foo":0:{}}'));
 ?>
 --EXPECTF--
diff --git a/ext/date/tests/bug75002.phpt b/ext/date/tests/bug75002.phpt
index 6a6cd21d035..b10e0ebe00c 100644
--- a/ext/date/tests/bug75002.phpt
+++ b/ext/date/tests/bug75002.phpt
@@ -15,7 +15,7 @@ foreach (new aaa($start) as $y) {
 
 ?>
 ==DONE==
---EXPECTF--	
+--EXPECTF--
 Fatal error: Uncaught Error: DatePeriod has not been initialized correctly in %sbug75002.php:%d
 Stack trace:
 #0 {main}
diff --git a/ext/date/tests/checkdate_basic1.phpt b/ext/date/tests/checkdate_basic1.phpt
index 2937f29a8ea..9be78eb1712 100644
--- a/ext/date/tests/checkdate_basic1.phpt
+++ b/ext/date/tests/checkdate_basic1.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test date_create() function : basic functionality 
+Test date_create() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool checkdate  ( int $month  , int $day  , int $year  )
- * Description: Checks the validity of the date formed by the arguments. 
- *              A date is considered valid if each parameter is properly defined. 
+ * Description: Checks the validity of the date formed by the arguments.
+ *              A date is considered valid if each parameter is properly defined.
  * Source code: ext/date/php_date.c
  */
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing checkdate() : basic functionality ***\n";
@@ -20,8 +20,8 @@ var_dump( checkdate(7, 2, 1963) );
 var_dump( checkdate(5, 31, 2009) );
 var_dump( checkdate(2, 28, 2009) ); // non-leap year
 var_dump( checkdate(2, 29, 2008) ); // leap year
-var_dump( checkdate(7, 2, 1) );     // min year 
-var_dump( checkdate(7, 2, 32767) ); // max year 
+var_dump( checkdate(7, 2, 1) );     // min year
+var_dump( checkdate(7, 2, 32767) ); // max year
 
 echo "-- The following are all invalid dates --\n";
 var_dump( checkdate(13, 1, 2009) );
@@ -29,7 +29,7 @@ var_dump( checkdate(2, 31, 2009) );
 var_dump( checkdate(1, 32, 2009) );
 var_dump( checkdate(2, 29, 2009) ); // non-leap year
 var_dump( checkdate(7, 2, 32768) ); // >max year
-var_dump( checkdate(7, 2, 0) ); // <min year  
+var_dump( checkdate(7, 2, 0) ); // <min year
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/checkdate_error.phpt b/ext/date/tests/checkdate_error.phpt
index 4546408304f..a96aa50f2c4 100644
--- a/ext/date/tests/checkdate_error.phpt
+++ b/ext/date/tests/checkdate_error.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test checkdate() function : error conditions 
+Test checkdate() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool checkdate  ( int $month  , int $day  , int $year  )
  * Description: Validate a Gregorian date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing checkdate() : error conditions ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("America/Chicago");
 
 $arg_0 = 1;
@@ -27,7 +27,7 @@ var_dump (checkdate($arg_0));
 var_dump (checkdate($arg_0, $arg_1));
 
 ?>
-===DONE=== 
+===DONE===
 --EXPECTF--
 *** Testing checkdate() : error conditions ***
 
diff --git a/ext/date/tests/checkdate_variation1.phpt b/ext/date/tests/checkdate_variation1.phpt
index a3539dd9761..176054311b4 100644
--- a/ext/date/tests/checkdate_variation1.phpt
+++ b/ext/date/tests/checkdate_variation1.phpt
@@ -3,8 +3,8 @@ Test checkdate() function : usage variation - Passing unexpected values to first
 --FILE--
 <?php
 /* Prototype  : bool checkdate  ( int $month  , int $day  , int $year  )
- * Description: Checks the validity of the date formed by the arguments. 
- *              A date is considered valid if each parameter is properly defined. 
+ * Description: Checks the validity of the date formed by the arguments.
+ *              A date is considered valid if each parameter is properly defined.
  * Source code: ext/date/php_date.c
  */
 
@@ -80,8 +80,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/checkdate_variation2.phpt b/ext/date/tests/checkdate_variation2.phpt
index 9948faf86fe..8e2955311be 100644
--- a/ext/date/tests/checkdate_variation2.phpt
+++ b/ext/date/tests/checkdate_variation2.phpt
@@ -3,8 +3,8 @@ Test checkdate() function : usage variation - Passing unexpected values to secon
 --FILE--
 <?php
 /* Prototype  : bool checkdate  ( int $month  , int $day  , int $year  )
- * Description: Checks the validity of the date formed by the arguments. 
- *              A date is considered valid if each parameter is properly defined. 
+ * Description: Checks the validity of the date formed by the arguments.
+ *              A date is considered valid if each parameter is properly defined.
  * Source code: ext/date/php_date.c
  */
 
@@ -80,8 +80,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/checkdate_variation3.phpt b/ext/date/tests/checkdate_variation3.phpt
index a92bc0ce8c4..ca5f6df0f78 100644
--- a/ext/date/tests/checkdate_variation3.phpt
+++ b/ext/date/tests/checkdate_variation3.phpt
@@ -3,8 +3,8 @@ Test checkdate() function : usage variation - Passing unexpected values to third
 --FILE--
 <?php
 /* Prototype  : bool checkdate  ( int $month  , int $day  , int $year  )
- * Description: Checks the validity of the date formed by the arguments. 
- *              A date is considered valid if each parameter is properly defined. 
+ * Description: Checks the validity of the date formed by the arguments.
+ *              A date is considered valid if each parameter is properly defined.
  * Source code: ext/date/php_date.c
  */
 
@@ -80,8 +80,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date-parse-by-format001.phpt b/ext/date/tests/date-parse-by-format001.phpt
index 66975e9da72..4431d2d30f9 100644
--- a/ext/date/tests/date-parse-by-format001.phpt
+++ b/ext/date/tests/date-parse-by-format001.phpt
@@ -5,7 +5,7 @@ Test for date_parse_by_format()
 $date = "06/08/04";
 print_r( date_parse_from_format( '!m/d/y', $date ) );
 print_r( date_parse_from_format( '!m*d*y', $date ) );
-?> 
+?>
 --EXPECT--
 Array
 (
diff --git a/ext/date/tests/date_add_basic.phpt b/ext/date/tests/date_add_basic.phpt
index 14a3d832bb4..349be1f3460 100644
--- a/ext/date/tests/date_add_basic.phpt
+++ b/ext/date/tests/date_add_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_add() function : basic functionality 
+Test date_add() function : basic functionality
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --SKIPIF--
@@ -10,7 +10,7 @@ date_default_timezone_set('UTC');
 /* Prototype  : void date_add(DateTime object, DateInterval interval)
  * Description: Adds an interval to the current date in object.
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_add() : basic functionality ***\n";
diff --git a/ext/date/tests/date_basic1.phpt b/ext/date/tests/date_basic1.phpt
index f4d922b78f5..2b94ac34e7f 100644
--- a/ext/date/tests/date_basic1.phpt
+++ b/ext/date/tests/date_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date() function : basic functionality 
+Test date() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string date  ( string $format  [, int $timestamp  ] )
@@ -7,21 +7,21 @@ Test date() function : basic functionality
  * Source code: ext/date/php_date.c
  */
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date() : basic functionality ***\n";
 
 $timestamp = mktime(10, 44, 30, 2, 27, 2009);
 
-var_dump( date("F j, Y, g:i a", $timestamp) );     
-var_dump( date("m.d.y", $timestamp) );                         
-var_dump( date("j, n, Y", $timestamp) );             
-var_dump( date("Ymd", $timestamp) );      
-var_dump( date('h-i-s, j-m-y, it is w Day', $timestamp) );    
+var_dump( date("F j, Y, g:i a", $timestamp) );
+var_dump( date("m.d.y", $timestamp) );
+var_dump( date("j, n, Y", $timestamp) );
+var_dump( date("Ymd", $timestamp) );
+var_dump( date('h-i-s, j-m-y, it is w Day', $timestamp) );
 var_dump( date('\i\t \i\s \t\h\e jS \d\a\y.', $timestamp) );
 var_dump( date("D M j G:i:s T Y", $timestamp) );
-var_dump( date('H:m:s \m \i\s\ \m\o\n\t\h', $timestamp) );  
+var_dump( date('H:m:s \m \i\s\ \m\o\n\t\h', $timestamp) );
 var_dump( date("H:i:s", $timestamp) );
 
 ?>
diff --git a/ext/date/tests/date_constants.phpt b/ext/date/tests/date_constants.phpt
index b9fce8c78bd..043b6b45cd8 100644
--- a/ext/date/tests/date_constants.phpt
+++ b/ext/date/tests/date_constants.phpt
@@ -16,7 +16,7 @@ Date constants
         DATE_RSS,
         DATE_W3C
     );
-    
+
     foreach($constants as $const) {
         var_dump(date($const, strtotime("1 Jul 06 14:27:30 +0200")));
         var_dump(date($const, strtotime("2006-05-30T14:32:13+02:00")));
diff --git a/ext/date/tests/date_create-relative.phpt b/ext/date/tests/date_create-relative.phpt
index 8a90931586b..5d2a4196e93 100644
--- a/ext/date/tests/date_create-relative.phpt
+++ b/ext/date/tests/date_create-relative.phpt
@@ -9,7 +9,7 @@ if (!defined('PHP_INT_MIN')) {
 	define('PHP_INT_MIN', intval(-PHP_INT_MAX - 1));
 }
 
-$base_time = '28 Feb 2008 12:00:00'; 
+$base_time = '28 Feb 2008 12:00:00';
 
 // Most offsets tested in strtotime-relative.phpt. These are tests for dates outside the 32-bit range.
 $offsets = array(
@@ -19,20 +19,20 @@ $offsets = array(
 	'1460970 days',
 	'1460971 days',
 	'1462970 days',
-	
+
 	// around 1 leap year period in years
 	'398 years',
 	'399 years',
 	'400 years',
 	'401 years',
-	
+
 	// around 40000 years
 	'39755 years',
 	'39999 years',
 	'40000 years',
 	'40001 years',
 	'41010 years',
-	
+
 	// bigger than int (32-bit)
 	'10000000000 seconds',
 	'10000000000 minutes',
diff --git a/ext/date/tests/date_create_basic.phpt b/ext/date/tests/date_create_basic.phpt
index 4e13afebb3f..b9d1c2fa97d 100644
--- a/ext/date/tests/date_create_basic.phpt
+++ b/ext/date/tests/date_create_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_create() function : basic functionality 
+Test date_create() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : DateTime date_create  ([ string $time  [, DateTimeZone $timezone  ]] )
@@ -8,7 +8,7 @@ Test date_create() function : basic functionality
  * Alias to functions: DateTime::__construct
  */
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_create() : basic functionality ***\n";
diff --git a/ext/date/tests/date_create_error.phpt b/ext/date/tests/date_create_error.phpt
index 0a42f288103..fb468225fec 100644
--- a/ext/date/tests/date_create_error.phpt
+++ b/ext/date/tests/date_create_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_create() function : error conditions 
+Test date_create() function : error conditions
 --FILE--
 <?php
 /* Prototype  : DateTime date_create  ([ string $time  [, DateTimeZone $timezone  ]] )
diff --git a/ext/date/tests/date_create_variation1.phpt b/ext/date/tests/date_create_variation1.phpt
index a476473a100..8166ffa0197 100644
--- a/ext/date/tests/date_create_variation1.phpt
+++ b/ext/date/tests/date_create_variation1.phpt
@@ -10,7 +10,7 @@ Test date_create() function : usage variation - Passing unexpected values to fir
 
 echo "*** Testing date_create() : usage variation -  unexpected values to first argument \$time***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_create_variation2.phpt b/ext/date/tests/date_create_variation2.phpt
index 63a5723cd73..3ded642023c 100644
--- a/ext/date/tests/date_create_variation2.phpt
+++ b/ext/date/tests/date_create_variation2.phpt
@@ -10,7 +10,7 @@ Test date_create() function : usage variation - Passing unexpected values to sec
 
 echo "*** Testing date_create() : usage variation -  unexpected values to second argument \$timezone***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_date_set_basic1.phpt b/ext/date/tests/date_date_set_basic1.phpt
index 64802125f6a..43421fbc86e 100644
--- a/ext/date/tests/date_date_set_basic1.phpt
+++ b/ext/date/tests/date_date_set_basic1.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test date_date_set() function : basic functionality 
+Test date_date_set() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : DateTime date_date_set  ( DateTime $object  , int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setDate
  */
- 
- //Set the default time zone 
+
+ //Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_date_set() : basic functionality ***\n";
diff --git a/ext/date/tests/date_date_set_error.phpt b/ext/date/tests/date_date_set_error.phpt
index a44d36e34ce..383249cd9ae 100644
--- a/ext/date/tests/date_date_set_error.phpt
+++ b/ext/date/tests/date_date_set_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test date_date_set() function : error conditions 
+Test date_date_set() function : error conditions
 --FILE--
 <?php
 /* Prototype  : DateTime date_date_set  ( DateTime $object  , int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setDate
  */
- 
+
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_date_set() : error conditions ***\n";
diff --git a/ext/date/tests/date_date_set_variation1.phpt b/ext/date/tests/date_date_set_variation1.phpt
index 59823f12b32..4387759c5be 100644
--- a/ext/date/tests/date_date_set_variation1.phpt
+++ b/ext/date/tests/date_date_set_variation1.phpt
@@ -3,14 +3,14 @@ Test date_date_set() function : usage variation - Passing unexpected values to f
 --FILE--
 <?php
 /* Prototype  : DateTime date_date_set  ( DateTime $object  , int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setDate
  */
 
 echo "*** Testing date_date_set() : usage variation -  unexpected values to first argument \$object***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_date_set_variation2.phpt b/ext/date/tests/date_date_set_variation2.phpt
index ef4e8bb868e..37cbae3ad08 100644
--- a/ext/date/tests/date_date_set_variation2.phpt
+++ b/ext/date/tests/date_date_set_variation2.phpt
@@ -3,14 +3,14 @@ Test date_date_set() function : usage variation - Passing unexpected values to s
 --FILE--
 <?php
 /* Prototype  : DateTime date_date_set  ( DateTime $object  , int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setDate
  */
 
 echo "*** Testing date_date_set() : usage variation -  unexpected values to second argument \$year***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_date_set_variation3.phpt b/ext/date/tests/date_date_set_variation3.phpt
index f304dddba2b..f3c205c8e38 100644
--- a/ext/date/tests/date_date_set_variation3.phpt
+++ b/ext/date/tests/date_date_set_variation3.phpt
@@ -3,14 +3,14 @@ Test date_date_set() function : usage variation - Passing unexpected values to t
 --FILE--
 <?php
 /* Prototype  : DateTime date_date_set  ( DateTime $object  , int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setDate
  */
 
 echo "*** Testing date_date_set() : usage variation -  unexpected values to third argument \$month***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_date_set_variation4.phpt b/ext/date/tests/date_date_set_variation4.phpt
index e285afd69f7..bd440f4abe9 100644
--- a/ext/date/tests/date_date_set_variation4.phpt
+++ b/ext/date/tests/date_date_set_variation4.phpt
@@ -3,14 +3,14 @@ Test date_date_set() function : usage variation - Passing unexpected values to f
 --FILE--
 <?php
 /* Prototype  : DateTime date_date_set  ( DateTime $object  , int $year  , int $month  , int $day  )
- * Description: Resets the current date of the DateTime object to a different date. 
+ * Description: Resets the current date of the DateTime object to a different date.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setDate
  */
 
 echo "*** Testing date_date_set() : usage variation -  unexpected values to forth argument \$day***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_default_timezone_get_error.phpt b/ext/date/tests/date_default_timezone_get_error.phpt
index 1d96d18cd7b..bf8bc8ef6e9 100644
--- a/ext/date/tests/date_default_timezone_get_error.phpt
+++ b/ext/date/tests/date_default_timezone_get_error.phpt
@@ -6,7 +6,7 @@ Test date_default_timezone_get() function : error conditions
  * Description:  Gets the default timezone used by all date/time functions in a script.
  * Source code: ext/standard/data/php_date.c
  */
- 
+
 date_default_timezone_set("UTC");
 
 echo "*** Testing date_default_timezone_get() : error conditions ***\n";
diff --git a/ext/date/tests/date_default_timezone_set_variation1.phpt b/ext/date/tests/date_default_timezone_set_variation1.phpt
index 22f4c22de74..ea6057b6ce2 100644
--- a/ext/date/tests/date_default_timezone_set_variation1.phpt
+++ b/ext/date/tests/date_default_timezone_set_variation1.phpt
@@ -44,7 +44,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -54,7 +54,7 @@ $inputs = array(
 /*19*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // undefined data
 /*22*/ @$undefined_var,
 
diff --git a/ext/date/tests/date_error.phpt b/ext/date/tests/date_error.phpt
index ec7ff9da41a..16b22fd3b01 100644
--- a/ext/date/tests/date_error.phpt
+++ b/ext/date/tests/date_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date() function : error conditions 
+Test date() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string date  ( string $format  [, int $timestamp  ] )
@@ -9,7 +9,7 @@ Test date() function : error conditions
 
 echo "*** Testing date() : error conditions ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("America/Chicago");
 
 $format = "m.d.y";
@@ -23,7 +23,7 @@ $extra_arg = true;
 var_dump (checkdate($format, $timestamp, $extra_arg));
 
 ?>
-===DONE=== 
+===DONE===
 --EXPECTF--
 *** Testing date() : error conditions ***
 
diff --git a/ext/date/tests/date_format_basic1.phpt b/ext/date/tests/date_format_basic1.phpt
index dc55efb0ae8..e1d42acfc66 100644
--- a/ext/date/tests/date_format_basic1.phpt
+++ b/ext/date/tests/date_format_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_format() function : basic functionality 
+Test date_format() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string date_format  ( DateTime $object  , string $format  )
@@ -7,22 +7,22 @@ Test date_format() function : basic functionality
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::format
  */
- 
-//Set the default time zone 
+
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_format() : basic functionality ***\n";
 $date = date_create("2005-07-14 22:30:41");
 
-var_dump( date_format($date, "F j, Y, g:i a") );                 
-var_dump( date_format($date, "m.d.y") );                         
-var_dump( date_format($date, "j, n, Y") );                       
-var_dump( date_format($date, "Ymd") );                          
-var_dump( date_format($date, 'h-i-s, j-m-y, it is w Day') );     
-var_dump( date_format($date, '\i\t \i\s \t\h\e jS \d\a\y.') );   
-var_dump( date_format($date, "D M j G:i:s T Y") );               
-var_dump( date_format($date, 'H:m:s \m \i\s\ \m\o\n\t\h') );     
-var_dump( date_format($date, "H:i:s") );                         
+var_dump( date_format($date, "F j, Y, g:i a") );
+var_dump( date_format($date, "m.d.y") );
+var_dump( date_format($date, "j, n, Y") );
+var_dump( date_format($date, "Ymd") );
+var_dump( date_format($date, 'h-i-s, j-m-y, it is w Day') );
+var_dump( date_format($date, '\i\t \i\s \t\h\e jS \d\a\y.') );
+var_dump( date_format($date, "D M j G:i:s T Y") );
+var_dump( date_format($date, 'H:m:s \m \i\s\ \m\o\n\t\h') );
+var_dump( date_format($date, "H:i:s") );
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/date_format_error.phpt b/ext/date/tests/date_format_error.phpt
index a563d0d974b..b8a9c52c29f 100644
--- a/ext/date/tests/date_format_error.phpt
+++ b/ext/date/tests/date_format_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_format() function : error conditions 
+Test date_format() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string date_format  ( DateTime $object  , string $format  )
@@ -7,8 +7,8 @@ Test date_format() function : error conditions
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::format
  */
- 
-//Set the default time zone 
+
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_format() : error conditions ***\n";
@@ -28,11 +28,11 @@ var_dump( date_format($date, $format, $extra_arg) );
 
 echo "\n-- Testing date_create() function with an invalid values for \$object argument --\n";
 $invalid_obj = new stdClass();
-var_dump( date_format($invalid_obj, $format) );  
+var_dump( date_format($invalid_obj, $format) );
 $invalid_obj = 10;
 var_dump( date_format($invalid_obj, $format) );
 $invalid_obj = null;
-var_dump( date_format($invalid_obj, $format) );    
+var_dump( date_format($invalid_obj, $format) );
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/date_format_variation1.phpt b/ext/date/tests/date_format_variation1.phpt
index af76a7ef907..196c916266a 100644
--- a/ext/date/tests/date_format_variation1.phpt
+++ b/ext/date/tests/date_format_variation1.phpt
@@ -7,10 +7,10 @@ Test date_format() function : usage variation - Passing unexpected values to fir
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTimeInterface::format
  */
- 
+
 echo "*** Testing date_format() : usage variation -  unexpected values to first argument \$object***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_format_variation2.phpt b/ext/date/tests/date_format_variation2.phpt
index 1a90951bd88..136d3d4558e 100644
--- a/ext/date/tests/date_format_variation2.phpt
+++ b/ext/date/tests/date_format_variation2.phpt
@@ -7,10 +7,10 @@ Test date_format() function : usage variation - Passing unexpected values to sec
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::format
  */
- 
+
 echo "*** Testing date_format() : usage variation -  unexpected values to second argument \$format***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_interval_create_from_date_string.phpt b/ext/date/tests/date_interval_create_from_date_string.phpt
index 9a1745c9acf..97cfce0b8c9 100644
--- a/ext/date/tests/date_interval_create_from_date_string.phpt
+++ b/ext/date/tests/date_interval_create_from_date_string.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_interval_create_from_date_string() function : basic functionality 
+Test date_interval_create_from_date_string() function : basic functionality
 --CREDITS--
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 --FILE--
diff --git a/ext/date/tests/date_interval_create_from_date_string_nullparam.phpt b/ext/date/tests/date_interval_create_from_date_string_nullparam.phpt
index 526b474e47c..bb7bf94ce2d 100644
--- a/ext/date/tests/date_interval_create_from_date_string_nullparam.phpt
+++ b/ext/date/tests/date_interval_create_from_date_string_nullparam.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_interval_create_from_date_string() function : null parameter 
+Test date_interval_create_from_date_string() function : null parameter
 --CREDITS--
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 --FILE--
diff --git a/ext/date/tests/date_isodate_set_basic1.phpt b/ext/date/tests/date_isodate_set_basic1.phpt
index dc8daba533a..ad45d0d53d0 100644
--- a/ext/date/tests/date_isodate_set_basic1.phpt
+++ b/ext/date/tests/date_isodate_set_basic1.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test date_isodate_set() function : basic functionality 
+Test date_isodate_set() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : DateTime date_isodate_set  ( DateTime $object  , int $year  , int $week  [, int $day  ] )
- * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setISODate
  */
 
 echo "*** Testing date_isodate_set() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 // Create a deate object
diff --git a/ext/date/tests/date_isodate_set_error.phpt b/ext/date/tests/date_isodate_set_error.phpt
index 9accd92d931..1f5fc9bd1d5 100644
--- a/ext/date/tests/date_isodate_set_error.phpt
+++ b/ext/date/tests/date_isodate_set_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test date_isodate_set() function : error conditions 
+Test date_isodate_set() function : error conditions
 --FILE--
 <?php
 
 /* Prototype  : DateTime date_isodate_set  ( DateTime $object  , int $year  , int $week  [, int $day  ] )
- * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setISODate
  */
- 
- //Set the default time zone 
+
+ //Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_isodate_set() : error conditions ***\n";
@@ -23,18 +23,18 @@ var_dump( date_isodate_set($datetime) );
 
 echo "\n-- Testing date_isodate_set() function with more than expected no. of arguments --\n";
 $year = 2009;
-$week = 30; 
+$week = 30;
 $day = 7;
 $extra_arg = 30;
 var_dump( date_isodate_set($datetime, $year, $week, $day, $extra_arg) );
 
 echo "\n-- Testing date_isodate_set() function with an invalid values for \$object argument --\n";
 $invalid_obj = new stdClass();
-var_dump( date_isodate_set($invalid_obj, $year, $week, $day) );  
+var_dump( date_isodate_set($invalid_obj, $year, $week, $day) );
 $invalid_obj = 10;
 var_dump( date_isodate_set($invalid_obj, $year, $week, $day) );
 $invalid_obj = null;
-var_dump( date_isodate_set($invalid_obj, $year, $week, $day) );  
+var_dump( date_isodate_set($invalid_obj, $year, $week, $day) );
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/date/tests/date_isodate_set_variation1.phpt b/ext/date/tests/date_isodate_set_variation1.phpt
index 900dc844754..cfc6564531b 100644
--- a/ext/date/tests/date_isodate_set_variation1.phpt
+++ b/ext/date/tests/date_isodate_set_variation1.phpt
@@ -3,14 +3,14 @@ Test date_isodate_set() function : usage variation - Passing unexpected values t
 --FILE--
 <?php
 /* Prototype  : DateTime date_isodate_set  ( DateTime $object  , int $year  , int $week  [, int $day  ] )
- * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setISODate
  */
 
 echo "*** Testing date_isodate_set() : usage variation -  unexpected values to first argument \$object***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_isodate_set_variation2.phpt b/ext/date/tests/date_isodate_set_variation2.phpt
index fe667801a2d..10738b95a60 100644
--- a/ext/date/tests/date_isodate_set_variation2.phpt
+++ b/ext/date/tests/date_isodate_set_variation2.phpt
@@ -3,14 +3,14 @@ Test date_isodate_set() function : usage variation - Passing unexpected values t
 --FILE--
 <?php
 /* Prototype  : DateTime date_isodate_set  ( DateTime $object  , int $year  , int $week  [, int $day  ] )
- * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setISODate
  */
 
 echo "*** Testing date_isodate_set() : usage variation -  unexpected values to second argument \$year***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_isodate_set_variation3.phpt b/ext/date/tests/date_isodate_set_variation3.phpt
index 5a7a4a28021..60513ddaed3 100644
--- a/ext/date/tests/date_isodate_set_variation3.phpt
+++ b/ext/date/tests/date_isodate_set_variation3.phpt
@@ -3,14 +3,14 @@ Test date_isodate_set() function : usage variation - Passing unexpected values t
 --FILE--
 <?php
 /* Prototype  : DateTime date_isodate_set  ( DateTime $object  , int $year  , int $week  [, int $day  ] )
- * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setISODate
  */
 
 echo "*** Testing date_isodate_set() : usage variation -  unexpected values to third argument \$week***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_isodate_set_variation4.phpt b/ext/date/tests/date_isodate_set_variation4.phpt
index 074df8452fb..a09010529fd 100644
--- a/ext/date/tests/date_isodate_set_variation4.phpt
+++ b/ext/date/tests/date_isodate_set_variation4.phpt
@@ -3,14 +3,14 @@ Test date_isodate_set() function : usage variation - Passing unexpected values t
 --FILE--
 <?php
 /* Prototype  : DateTime date_isodate_set  ( DateTime $object  , int $year  , int $week  [, int $day  ] )
- * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setISODate
  */
 
 echo "*** Testing date_isodate_set() : usage variation -  unexpected values to forth argument \$day***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_modify_basic1.phpt b/ext/date/tests/date_modify_basic1.phpt
index 038b94ce08d..c4e37097344 100644
--- a/ext/date/tests/date_modify_basic1.phpt
+++ b/ext/date/tests/date_modify_basic1.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test date_modify() function : basic functionality 
+Test date_modify() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : DateTime date_modify  ( DateTime $object  , string $modify  )
- * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime(). 
+ * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime().
  * Source code: ext/date/php_date.c
  * Alias to functions: public DateTime DateTime::modify()
  */
 
- //Set the default time zone 
+ //Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_modify() : basic functionality ***\n";
@@ -16,16 +16,16 @@ echo "*** Testing date_modify() : basic functionality ***\n";
 // Create a date object to modify
 $datetime = date_create("2009-01-31 14:28:41");
 
-date_modify($datetime, "+1 day"); 
-echo "After modification 1: " . date_format($datetime, "D, d M Y") . "\n"; 
+date_modify($datetime, "+1 day");
+echo "After modification 1: " . date_format($datetime, "D, d M Y") . "\n";
 
-date_modify($datetime, "+1 week 2 days 4 hours 2 seconds"); 
+date_modify($datetime, "+1 week 2 days 4 hours 2 seconds");
 echo "After modification 2: " . date_format($datetime, "D, d M Y H:i:s") . "\n";
 
-date_modify($datetime, "next Thursday"); 
-echo "After modification 3: " . date_format($datetime, "D, d M Y") . "\n"; 
+date_modify($datetime, "next Thursday");
+echo "After modification 3: " . date_format($datetime, "D, d M Y") . "\n";
 
-date_modify($datetime, "last Sunday"); 
+date_modify($datetime, "last Sunday");
 echo "After modification 4: " . date_format($datetime, "D, d M Y") . "\n";
 
 ?>
diff --git a/ext/date/tests/date_modify_error.phpt b/ext/date/tests/date_modify_error.phpt
index ac727f1ca19..67fd3e89a25 100644
--- a/ext/date/tests/date_modify_error.phpt
+++ b/ext/date/tests/date_modify_error.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test date_modify() function : error conditions 
+Test date_modify() function : error conditions
 --FILE--
 <?php
 /* Prototype  : DateTime date_modify  ( DateTime $object  , string $modify  )
- * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime(). 
+ * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime().
  * Source code: ext/date/php_date.c
  * Alias to functions: public DateTime DateTime::modify()
  */
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_modify() : error conditions ***\n";
@@ -29,11 +29,11 @@ var_dump( date_modify($datetime, $modify, $extra_arg) );
 
 echo "\n-- Testing date_modify() function with an invalid values for \$object argument --\n";
 $invalid_obj = new stdClass();
-var_dump( date_modify($invalid_obj, $modify) );  
+var_dump( date_modify($invalid_obj, $modify) );
 $invalid_obj = 10;
 var_dump( date_modify($invalid_obj, $modify) );
 $invalid_obj = null;
-var_dump( date_modify($invalid_obj, $modify) );  
+var_dump( date_modify($invalid_obj, $modify) );
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/date_modify_variation1.phpt b/ext/date/tests/date_modify_variation1.phpt
index afe75e2c699..401a55959f1 100644
--- a/ext/date/tests/date_modify_variation1.phpt
+++ b/ext/date/tests/date_modify_variation1.phpt
@@ -3,14 +3,14 @@ Test date_modify() function : usage variation - Passing unexpected values to fir
 --FILE--
 <?php
 /* Prototype  : DateTime date_modify  ( DateTime $object  , string $modify  )
- * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime(). 
+ * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime().
  * Source code: ext/date/php_date.c
  * Alias to functions: public DateTime DateTime::modify()
  */
 
 echo "*** Testing date_modify() : usage variation -  unexpected values to first argument \$object***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_modify_variation2.phpt b/ext/date/tests/date_modify_variation2.phpt
index a28261be445..f2a87ce7255 100644
--- a/ext/date/tests/date_modify_variation2.phpt
+++ b/ext/date/tests/date_modify_variation2.phpt
@@ -3,14 +3,14 @@ Test date_modify() function : usage variation - Passing unexpected values to sec
 --FILE--
 <?php
 /* Prototype  : DateTime date_modify  ( DateTime $object  , string $modify  )
- * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime(). 
+ * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime().
  * Source code: ext/date/php_date.c
  * Alias to functions: public DateTime DateTime::modify()
  */
 
 echo "*** Testing date_modify() : usage variation -  unexpected values to second argument \$format***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_offset_get_basic1.phpt b/ext/date/tests/date_offset_get_basic1.phpt
index 42f38939e85..b91b1415f88 100644
--- a/ext/date/tests/date_offset_get_basic1.phpt
+++ b/ext/date/tests/date_offset_get_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_offset_get() function : basic functionality 
+Test date_offset_get() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int date_offset_get  ( DateTime $object  )
@@ -7,8 +7,8 @@ Test date_offset_get() function : basic functionality
  * Source code: ext/date/php_date.c
  * Alias to functions:  DateTime::getOffset
  */
- 
-//Set the default time zone 
+
+//Set the default time zone
 date_default_timezone_set('Europe/London');
 
 echo "*** Testing date_offset_get() : basic functionality ***\n";
@@ -16,8 +16,8 @@ echo "*** Testing date_offset_get() : basic functionality ***\n";
 $winter = date_create('2008-12-25 14:25:41');
 $summer = date_create('2008-07-02 14:25:41');
 
-echo "Winter offset: " . date_offset_get($winter) / 3600 . " hours\n"; 
-echo "Summer offset: " . date_offset_get($summer) / 3600 . " hours\n"; 
+echo "Winter offset: " . date_offset_get($winter) / 3600 . " hours\n";
+echo "Summer offset: " . date_offset_get($summer) / 3600 . " hours\n";
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/date_offset_get_error.phpt b/ext/date/tests/date_offset_get_error.phpt
index 8531845ca7b..7c7349977fe 100644
--- a/ext/date/tests/date_offset_get_error.phpt
+++ b/ext/date/tests/date_offset_get_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_offset_get() function : error conditions 
+Test date_offset_get() function : error conditions
 --FILE--
 <?php
 
@@ -8,8 +8,8 @@ Test date_offset_get() function : error conditions
  * Source code: ext/date/php_date.c
  * Alias to functions:  DateTimeInterface::getOffset
  */
- 
- //Set the default time zone 
+
+ //Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_offset_get() : error conditions ***\n";
@@ -24,11 +24,11 @@ var_dump( date_offset_get($datetime, $extra_arg) );
 
 echo "\n-- Testing date_offset_get() function with an invalid values for \$object argument --\n";
 $invalid_obj = new stdClass();
-var_dump( date_offset_get($invalid_obj) );  
+var_dump( date_offset_get($invalid_obj) );
 $invalid_obj = 10;
 var_dump( date_offset_get($invalid_obj) );
 $invalid_obj = null;
-var_dump( date_offset_get($invalid_obj) ); 
+var_dump( date_offset_get($invalid_obj) );
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/date/tests/date_offset_get_variation1.phpt b/ext/date/tests/date_offset_get_variation1.phpt
index a3d93b3f231..4bef97dc86b 100644
--- a/ext/date/tests/date_offset_get_variation1.phpt
+++ b/ext/date/tests/date_offset_get_variation1.phpt
@@ -10,7 +10,7 @@ Test date_offset_get() function : usage variation - Passing unexpected values to
 
 echo "*** Testing date_offset_get() : usage variation -  unexpected values to first argument \$object***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_parse_001.phpt b/ext/date/tests/date_parse_001.phpt
index 73fe8257238..b5c5ac0f48f 100644
--- a/ext/date/tests/date_parse_001.phpt
+++ b/ext/date/tests/date_parse_001.phpt
@@ -15,7 +15,7 @@ Test basic date_parse()
     var_dump(date_parse(array()));
     echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(12) {
   ["year"]=>
   int(2006)
diff --git a/ext/date/tests/date_parse_basic1.phpt b/ext/date/tests/date_parse_basic1.phpt
index 04710d1adbd..a0801d70644 100644
--- a/ext/date/tests/date_parse_basic1.phpt
+++ b/ext/date/tests/date_parse_basic1.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test date_parse() function : basic functionality 
+Test date_parse() function : basic functionality
 --FILE--
 <?php
-/* Prototype  : array date_parse  ( string $date  ) 
+/* Prototype  : array date_parse  ( string $date  )
  * Description: Returns associative array with detailed info about given date.
  * Source code: ext/date/php_date.c
  */
- 
-//Set the default time zone 
+
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_parse() : basic functionality ***\n";
diff --git a/ext/date/tests/date_parse_error.phpt b/ext/date/tests/date_parse_error.phpt
index 389f519ef91..9f444bb4350 100644
--- a/ext/date/tests/date_parse_error.phpt
+++ b/ext/date/tests/date_parse_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test date_parse() function : error conditions 
+Test date_parse() function : error conditions
 --FILE--
 <?php
-/* Prototype  : array date_parse  ( string $date  ) 
+/* Prototype  : array date_parse  ( string $date  )
  * Description: Returns associative array with detailed info about given date.
  * Source code: ext/date/php_date.c
  */
- 
-//Set the default time zone 
+
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_parse() : error conditions ***\n";
@@ -22,7 +22,7 @@ var_dump( date_parse($date, $extra_arg) );
 
 echo "\n-- Testing date_parse() function with unexpected characters in \$date argument --\n";
 $invalid_date = "2OO9-02--27 10:00?00.5";
-var_dump( date_parse($invalid_date) );  
+var_dump( date_parse($invalid_date) );
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/date_parse_variation1.phpt b/ext/date/tests/date_parse_variation1.phpt
index 300bd5eac7e..d40a75f8aae 100644
--- a/ext/date/tests/date_parse_variation1.phpt
+++ b/ext/date/tests/date_parse_variation1.phpt
@@ -2,14 +2,14 @@
 Test date_parse() function : usage variation - Passing unexpected values to first argument $date.
 --FILE--
 <?php
-/* Prototype  : array date_parse  ( string $date  ) 
+/* Prototype  : array date_parse  ( string $date  )
  * Description: Returns associative array with detailed info about given date.
  * Source code: ext/date/php_date.c
  */
 
 echo "*** Testing date_parse() : usage variation -  unexpected values to first argument \$date***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -89,8 +89,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
@@ -100,8 +100,8 @@ foreach($inputs as $variation =>$date) {
       if (is_array($result)) {
       	  var_dump($result["errors"]);
       } else {
-      	  var_dump($result); 
-      }		
+      	  var_dump($result);
+      }
 };
 
 // closing the resource
diff --git a/ext/date/tests/date_sub_basic.phpt b/ext/date/tests/date_sub_basic.phpt
index 0e12704945b..40d93c21adb 100644
--- a/ext/date/tests/date_sub_basic.phpt
+++ b/ext/date/tests/date_sub_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_sub() function : basic functionality 
+Test date_sub() function : basic functionality
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --SKIPIF--
@@ -10,7 +10,7 @@ date_default_timezone_set('UTC');
 /* Prototype  : void date_sub(DateTime object, DateInterval interval)
  * Description: Subtracts an interval from the current date in object.
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sub() : basic functionality ***\n";
diff --git a/ext/date/tests/date_sun_info_001.phpt b/ext/date/tests/date_sun_info_001.phpt
index 44b6d112e4d..d880f98776f 100644
--- a/ext/date/tests/date_sun_info_001.phpt
+++ b/ext/date/tests/date_sun_info_001.phpt
@@ -7,7 +7,7 @@ $sun_info = date_sun_info(strtotime("2006-12-12"), 31.7667, 35.2333);
 var_dump($sun_info);
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(9) {
   ["sunrise"]=>
   int(1165897761)
diff --git a/ext/date/tests/date_sun_info_variation1.phpt b/ext/date/tests/date_sun_info_variation1.phpt
index 1faafea1d97..864d78bdcab 100644
--- a/ext/date/tests/date_sun_info_variation1.phpt
+++ b/ext/date/tests/date_sun_info_variation1.phpt
@@ -6,7 +6,7 @@ Test date_sun_info() function : error variations - Pass unexpected values for ti
  * Description:  Returns an array with information about sunset/sunrise and twilight begin/end.
  * Source code: ext/standard/data/php_date.c
  */
- 
+
 date_default_timezone_set("UTC");
 
 echo "*** Testing date_sun_info() : usage variations ***\n";
@@ -47,7 +47,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -57,7 +57,7 @@ $inputs = array(
 /*19*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // undefined data
 /*22*/ @$undefined_var,
 
diff --git a/ext/date/tests/date_sun_info_variation2.phpt b/ext/date/tests/date_sun_info_variation2.phpt
index 8c8267a2342..42254d55864 100644
--- a/ext/date/tests/date_sun_info_variation2.phpt
+++ b/ext/date/tests/date_sun_info_variation2.phpt
@@ -6,7 +6,7 @@ Test date_sun_info() function : error variations - Pass unexpected values for la
  * Description:  Returns an array with information about sunset/sunrise and twilight begin/end.
  * Source code: ext/standard/data/php_date.c
  */
- 
+
 date_default_timezone_set("UTC");
 
 echo "*** Testing date_sun_info() : usage variations ***\n";
@@ -47,7 +47,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -57,7 +57,7 @@ $inputs = array(
 /*19*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // undefined data
 /*22*/ @$undefined_var,
 
diff --git a/ext/date/tests/date_sun_info_variation3.phpt b/ext/date/tests/date_sun_info_variation3.phpt
index 28af4266235..69396e4ee27 100644
--- a/ext/date/tests/date_sun_info_variation3.phpt
+++ b/ext/date/tests/date_sun_info_variation3.phpt
@@ -6,7 +6,7 @@ Test date_sun_info() function : usage variations - Pass unexpected values for lo
  * Description:  Returns an array with information about sunset/sunrise and twilight begin/end.
  * Source code: ext/standard/data/php_date.c
  */
- 
+
 date_default_timezone_set("UTC");
 
 echo "*** Testing date_sun_info() : usage variations ***\n";
@@ -47,7 +47,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -57,7 +57,7 @@ $inputs = array(
 /*19*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // undefined data
 /*22*/ @$undefined_var,
 
diff --git a/ext/date/tests/date_sunrise_and_sunset_basic.phpt b/ext/date/tests/date_sunrise_and_sunset_basic.phpt
index f89b63fd933..6224c4bd3ff 100644
--- a/ext/date/tests/date_sunrise_and_sunset_basic.phpt
+++ b/ext/date/tests/date_sunrise_and_sunset_basic.phpt
@@ -14,7 +14,7 @@ offset: +1 GMT
 
 echo "Basic test for date_sunrise() and date_sunset()\n";
 
-// suppress date() function strict msgs 
+// suppress date() function strict msgs
 error_reporting(E_ALL & ~E_STRICT);
 
 echo date("D M d Y") . ', sunrise time : ' . date_sunrise(time(), SUNFUNCS_RET_STRING, 38.4, -9, 90, 1) . "\n";
diff --git a/ext/date/tests/date_sunrise_error.phpt b/ext/date/tests/date_sunrise_error.phpt
index f57b7ed1c26..d420bfa293e 100644
--- a/ext/date/tests/date_sunrise_error.phpt
+++ b/ext/date/tests/date_sunrise_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test date_sunrise() function : error conditions 
+Test date_sunrise() function : error conditions
 --FILE--
 <?php
 /* Prototype  : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunrise for a given day and location 
+ * Description: Returns time of sunrise for a given day and location
  * Source code: ext/date/php_date.c
  */
 
diff --git a/ext/date/tests/date_sunrise_variation1.phpt b/ext/date/tests/date_sunrise_variation1.phpt
index ccb0ad83259..282f93f4ecc 100644
--- a/ext/date/tests/date_sunrise_variation1.phpt
+++ b/ext/date/tests/date_sunrise_variation1.phpt
@@ -3,7 +3,7 @@ Test date_sunrise() function : usage variation - Passing unexpected values to fi
 --FILE--
 <?php
 /* Prototype  : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunrise for a given day and location 
+ * Description: Returns time of sunrise for a given day and location
  * Source code: ext/date/php_date.c
  */
 
diff --git a/ext/date/tests/date_sunrise_variation2.phpt b/ext/date/tests/date_sunrise_variation2.phpt
index 45519798f4b..7e7a4c8cb4d 100644
--- a/ext/date/tests/date_sunrise_variation2.phpt
+++ b/ext/date/tests/date_sunrise_variation2.phpt
@@ -5,9 +5,9 @@ Test date_sunrise() function : usage variation - Passing unexpected values to se
 --FILE--
 <?php
 /* Prototype  : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunrise for a given day and location 
+ * Description: Returns time of sunrise for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunrise() : usage variation ***\n";
diff --git a/ext/date/tests/date_sunrise_variation3.phpt b/ext/date/tests/date_sunrise_variation3.phpt
index 537171c24bf..32287db2437 100644
--- a/ext/date/tests/date_sunrise_variation3.phpt
+++ b/ext/date/tests/date_sunrise_variation3.phpt
@@ -3,7 +3,7 @@ Test date_sunrise() function : usage variation - Passing unexpected values to th
 --FILE--
 <?php
 /* Prototype  : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunrise for a given day and location 
+ * Description: Returns time of sunrise for a given day and location
  * Source code: ext/date/php_date.c
  */
 
diff --git a/ext/date/tests/date_sunrise_variation4.phpt b/ext/date/tests/date_sunrise_variation4.phpt
index 7909ca11009..00fb15837ba 100644
--- a/ext/date/tests/date_sunrise_variation4.phpt
+++ b/ext/date/tests/date_sunrise_variation4.phpt
@@ -3,9 +3,9 @@ Test date_sunrise() function : usage variation - Passing unexpected values to fo
 --FILE--
 <?php
 /* Prototype  : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunrise for a given day and location 
+ * Description: Returns time of sunrise for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunrise() : usage variation ***\n";
diff --git a/ext/date/tests/date_sunrise_variation5.phpt b/ext/date/tests/date_sunrise_variation5.phpt
index 9858c890bae..7e44590a7db 100644
--- a/ext/date/tests/date_sunrise_variation5.phpt
+++ b/ext/date/tests/date_sunrise_variation5.phpt
@@ -3,9 +3,9 @@ Test date_sunrise() function : usage variation - Passing unexpected values to fi
 --FILE--
 <?php
 /* Prototype  : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunrise for a given day and location 
+ * Description: Returns time of sunrise for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunrise() : usage variation ***\n";
diff --git a/ext/date/tests/date_sunrise_variation6.phpt b/ext/date/tests/date_sunrise_variation6.phpt
index 4c7a8e762ca..0a9e776a613 100644
--- a/ext/date/tests/date_sunrise_variation6.phpt
+++ b/ext/date/tests/date_sunrise_variation6.phpt
@@ -3,9 +3,9 @@ Test date_sunrise() function : usage variation - Passing unexpected values to si
 --FILE--
 <?php
 /* Prototype  : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunrise for a given day and location 
+ * Description: Returns time of sunrise for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunrise() : usage variation ***\n";
diff --git a/ext/date/tests/date_sunrise_variation7.phpt b/ext/date/tests/date_sunrise_variation7.phpt
index 6e9c2ec83b3..2415370a62a 100644
--- a/ext/date/tests/date_sunrise_variation7.phpt
+++ b/ext/date/tests/date_sunrise_variation7.phpt
@@ -3,9 +3,9 @@ Test date_sunrise() function : usage variation -  Checking sunrise for consecuti
 --FILE--
 <?php
 /* Prototype  : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunrise for a given day and location 
+ * Description: Returns time of sunrise for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunrise() : usage variation ***\n";
@@ -28,7 +28,7 @@ foreach($inputs as $timezone => $value) {
 	 date_default_timezone_set($timezone);
 	 $time = mktime(8, 8, 8, 8, 11, 2008);
 	 var_dump( date_sunrise($time, SUNFUNCS_RET_STRING, $value["Latitude"], $value["Longitude"], 90, $value["GMT"] ));
-	 $time = mktime(8, 8, 8, 8, 12, 2008); 
+	 $time = mktime(8, 8, 8, 8, 12, 2008);
 	 var_dump( date_sunrise($time, SUNFUNCS_RET_STRING, $value["Latitude"], $value["Longitude"], 90, $value["GMT"]) );
 }
 
diff --git a/ext/date/tests/date_sunrise_variation8.phpt b/ext/date/tests/date_sunrise_variation8.phpt
index 1d22be8c8c1..4bc2913e204 100644
--- a/ext/date/tests/date_sunrise_variation8.phpt
+++ b/ext/date/tests/date_sunrise_variation8.phpt
@@ -3,9 +3,9 @@ Test date_sunrise() function : usage variation -  Checking with North and South
 --FILE--
 <?php
 /* Prototype  : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunrise for a given day and location 
+ * Description: Returns time of sunrise for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunrise() : usage variation ***\n";
@@ -28,10 +28,10 @@ foreach( $time_date as $date => $time ){
 	echo "\n--$date--\n";
 	var_dump( date_sunrise($time, SUNFUNCS_RET_STRING, 90, 0 ) );
 	var_dump( date_sunrise($time, SUNFUNCS_RET_DOUBLE, 90, 0 ) );
-	var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, 90, 0 ) );		
+	var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, 90, 0 ) );
 	var_dump( date_sunrise($time, SUNFUNCS_RET_STRING, -90, 0 ) );
 	var_dump( date_sunrise($time, SUNFUNCS_RET_DOUBLE, -90, 0 ) );
-	var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, -90, 0 ) );		
+	var_dump( date_sunrise($time, SUNFUNCS_RET_TIMESTAMP, -90, 0 ) );
 }
 
 ?>
diff --git a/ext/date/tests/date_sunrise_variation9.phpt b/ext/date/tests/date_sunrise_variation9.phpt
index 979fa455a00..7c95e8734f6 100644
--- a/ext/date/tests/date_sunrise_variation9.phpt
+++ b/ext/date/tests/date_sunrise_variation9.phpt
@@ -5,9 +5,9 @@ Test date_sunrise() function : usage variation -  Passing high positive and nega
 --FILE--
 <?php
 /* Prototype  : mixed date_sunrise(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunrise for a given day and location 
+ * Description: Returns time of sunrise for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunrise() : usage variation ***\n";
diff --git a/ext/date/tests/date_sunset_error.phpt b/ext/date/tests/date_sunset_error.phpt
index a5e75b649e0..92d8879c4ef 100644
--- a/ext/date/tests/date_sunset_error.phpt
+++ b/ext/date/tests/date_sunset_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test date_sunset() function : error conditions 
+Test date_sunset() function : error conditions
 --FILE--
 <?php
 /* Prototype  : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunset for a given day and location 
+ * Description: Returns time of sunset for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunset() : error conditions ***\n";
diff --git a/ext/date/tests/date_sunset_variation1.phpt b/ext/date/tests/date_sunset_variation1.phpt
index 99b6230338c..0d3f4a8f9ea 100644
--- a/ext/date/tests/date_sunset_variation1.phpt
+++ b/ext/date/tests/date_sunset_variation1.phpt
@@ -3,9 +3,9 @@ Test date_sunset() function : usage variation - Passing unexpected values to fir
 --FILE--
 <?php
 /* Prototype  : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunset for a given day and location 
+ * Description: Returns time of sunset for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunset() : usage variation ***\n";
diff --git a/ext/date/tests/date_sunset_variation2.phpt b/ext/date/tests/date_sunset_variation2.phpt
index 8015995fe01..f61c2bf6947 100644
--- a/ext/date/tests/date_sunset_variation2.phpt
+++ b/ext/date/tests/date_sunset_variation2.phpt
@@ -5,9 +5,9 @@ Test date_sunset() function : usage variation - Passing unexpected values to sec
 --FILE--
 <?php
 /* Prototype  : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunset for a given day and location 
+ * Description: Returns time of sunset for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunset() : usage variation ***\n";
diff --git a/ext/date/tests/date_sunset_variation3.phpt b/ext/date/tests/date_sunset_variation3.phpt
index 0a51ac6b171..ca91e639d0b 100644
--- a/ext/date/tests/date_sunset_variation3.phpt
+++ b/ext/date/tests/date_sunset_variation3.phpt
@@ -3,9 +3,9 @@ Test date_sunset() function : usage variation - Passing unexpected values to thi
 --FILE--
 <?php
 /* Prototype  : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunset for a given day and location 
+ * Description: Returns time of sunset for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunset() : usage variation ***\n";
@@ -95,7 +95,7 @@ foreach($inputs as $key =>$value) {
       var_dump( date_sunset($time, SUNFUNCS_RET_STRING, $value, $longitude, $zenith, $gmt_offset) );
       var_dump( date_sunset($time, SUNFUNCS_RET_DOUBLE, $value, $longitude, $zenith, $gmt_offset) );
       var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, $value, $longitude, $zenith, $gmt_offset) );
-      
+
 };
 
 ?>
diff --git a/ext/date/tests/date_sunset_variation4.phpt b/ext/date/tests/date_sunset_variation4.phpt
index c892f87c099..75fc64cc92a 100644
--- a/ext/date/tests/date_sunset_variation4.phpt
+++ b/ext/date/tests/date_sunset_variation4.phpt
@@ -3,9 +3,9 @@ Test date_sunset() function : usage variation - Passing unexpected values to fou
 --FILE--
 <?php
 /* Prototype  : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunset for a given day and location 
+ * Description: Returns time of sunset for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunset() : usage variation ***\n";
diff --git a/ext/date/tests/date_sunset_variation5.phpt b/ext/date/tests/date_sunset_variation5.phpt
index 579e1c8eb01..54ea07a8c47 100644
--- a/ext/date/tests/date_sunset_variation5.phpt
+++ b/ext/date/tests/date_sunset_variation5.phpt
@@ -3,9 +3,9 @@ Test date_sunset() function : usage variation - Passing unexpected values to fif
 --FILE--
 <?php
 /* Prototype  : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunset for a given day and location 
+ * Description: Returns time of sunset for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunset() : usage variation ***\n";
diff --git a/ext/date/tests/date_sunset_variation6.phpt b/ext/date/tests/date_sunset_variation6.phpt
index 29b31f6e957..933f634036d 100644
--- a/ext/date/tests/date_sunset_variation6.phpt
+++ b/ext/date/tests/date_sunset_variation6.phpt
@@ -3,9 +3,9 @@ Test date_sunset() function : usage variation - Passing unexpected values to six
 --FILE--
 <?php
 /* Prototype  : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunset for a given day and location 
+ * Description: Returns time of sunset for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunset() : usage variation ***\n";
diff --git a/ext/date/tests/date_sunset_variation7.phpt b/ext/date/tests/date_sunset_variation7.phpt
index 67bd2f41825..34c3e85bd39 100644
--- a/ext/date/tests/date_sunset_variation7.phpt
+++ b/ext/date/tests/date_sunset_variation7.phpt
@@ -3,9 +3,9 @@ Test date_sunset() function : usage variation -  Checking sunrise for consecutiv
 --FILE--
 <?php
 /* Prototype  : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunrise for a given day and location 
+ * Description: Returns time of sunrise for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunset() : usage variation ***\n";
@@ -29,7 +29,7 @@ foreach($inputs as $timezone => $value) {
 	 date_default_timezone_set($timezone);
 	 $time = mktime(8, 8, 8, 8, 11, 2008);
 	 var_dump( date_sunset($time, SUNFUNCS_RET_STRING, $value["Latitude"], $value["Longitude"], 90, $value["GMT"] ));
-	 $time = mktime(8, 8, 8, 8, 12, 2008); 
+	 $time = mktime(8, 8, 8, 8, 12, 2008);
 	 var_dump( date_sunset($time, SUNFUNCS_RET_STRING, $value["Latitude"], $value["Longitude"], 90, $value["GMT"]) );
 }
 ?>
diff --git a/ext/date/tests/date_sunset_variation8.phpt b/ext/date/tests/date_sunset_variation8.phpt
index 07319ab4e12..70aefff3675 100644
--- a/ext/date/tests/date_sunset_variation8.phpt
+++ b/ext/date/tests/date_sunset_variation8.phpt
@@ -3,9 +3,9 @@ Test date_sunset() function : usage variation -  Checking with North and South p
 --FILE--
 <?php
 /* Prototype  : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunrise for a given day and location 
+ * Description: Returns time of sunrise for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunset() : usage variation ***\n";
@@ -28,10 +28,10 @@ foreach( $time_date as $date => $time ){
 	echo "\n--$date--\n";
 	var_dump( date_sunset($time, SUNFUNCS_RET_STRING, 90, 0 ) );
 	var_dump( date_sunset($time, SUNFUNCS_RET_DOUBLE, 90, 0 ) );
-	var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, 90, 0 ) );		
+	var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, 90, 0 ) );
 	var_dump( date_sunset($time, SUNFUNCS_RET_STRING, -90, 0 ) );
 	var_dump( date_sunset($time, SUNFUNCS_RET_DOUBLE, -90, 0 ) );
-	var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, -90, 0 ) );		
+	var_dump( date_sunset($time, SUNFUNCS_RET_TIMESTAMP, -90, 0 ) );
 }
 
 ?>
diff --git a/ext/date/tests/date_sunset_variation9.phpt b/ext/date/tests/date_sunset_variation9.phpt
index c18d48e42ca..8ad57e28ccc 100644
--- a/ext/date/tests/date_sunset_variation9.phpt
+++ b/ext/date/tests/date_sunset_variation9.phpt
@@ -5,9 +5,9 @@ Test date_sunset() function : usage variation - Passing high positive and negati
 --FILE--
 <?php
 /* Prototype  : mixed date_sunset(mixed time [, int format [, float latitude [, float longitude [, float zenith [, float gmt_offset]]]]])
- * Description: Returns time of sunset for a given day and location 
+ * Description: Returns time of sunset for a given day and location
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing date_sunset() : usage variation ***\n";
diff --git a/ext/date/tests/date_time_set_basic1.phpt b/ext/date/tests/date_time_set_basic1.phpt
index c0c9c66c56d..e89899b6934 100644
--- a/ext/date/tests/date_time_set_basic1.phpt
+++ b/ext/date/tests/date_time_set_basic1.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test date_time_set() function : basic functionality 
+Test date_time_set() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : DateTime date_time_set  ( DateTime $object  , int $hour  , int $minute  [, int $second  ] )
- * Description: Resets the current time of the DateTime object to a different time. 
+ * Description: Resets the current time of the DateTime object to a different time.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setTime
  */
- 
- //Set the default time zone 
+
+ //Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_time_set() : basic functionality ***\n";
diff --git a/ext/date/tests/date_time_set_error.phpt b/ext/date/tests/date_time_set_error.phpt
index 5c5ddaf4d28..1264acde4f6 100644
--- a/ext/date/tests/date_time_set_error.phpt
+++ b/ext/date/tests/date_time_set_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test date_time_set() function : error conditions 
+Test date_time_set() function : error conditions
 --FILE--
 <?php
 /* Prototype  : DateTime date_time_set  ( DateTime $object  , int $hour  , int $minute  [, int $second  ] )
- * Description: Resets the current time of the DateTime object to a different time. 
+ * Description: Resets the current time of the DateTime object to a different time.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setTime
  */
- 
+
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_time_set() : error conditions ***\n";
@@ -30,11 +30,11 @@ var_dump( date_time_set($datetime, $hour, $min, $sec, $microseconds, $extra_arg)
 
 echo "\n-- Testing date_time_set() function with an invalid values for \$object argument --\n";
 $invalid_obj = new stdClass();
-var_dump( date_time_set($invalid_obj, $hour, $min, $sec) );  
+var_dump( date_time_set($invalid_obj, $hour, $min, $sec) );
 $invalid_obj = 10;
 var_dump( date_time_set($invalid_obj, $hour, $min, $sec) );
 $invalid_obj = null;
-var_dump( date_time_set($invalid_obj, $hour, $min, $sec) ); 
+var_dump( date_time_set($invalid_obj, $hour, $min, $sec) );
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/date/tests/date_time_set_variation1.phpt b/ext/date/tests/date_time_set_variation1.phpt
index 64e65d58b87..cecadbe6318 100644
--- a/ext/date/tests/date_time_set_variation1.phpt
+++ b/ext/date/tests/date_time_set_variation1.phpt
@@ -3,14 +3,14 @@ Test date_time_set() function : usage variation - Passing unexpected values to f
 --FILE--
 <?php
 /* Prototype  : DateTime date_time_set  ( DateTime $object  , int $hour  , int $minute  [, int $second  ] )
- * Description: Resets the current time of the DateTime object to a different time. 
+ * Description: Resets the current time of the DateTime object to a different time.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setTime
  */
 
 echo "*** Testing date_time_set() : usage variation -  unexpected values to first argument \$object***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_time_set_variation2.phpt b/ext/date/tests/date_time_set_variation2.phpt
index 3e77fffadae..24aa7304ecd 100644
--- a/ext/date/tests/date_time_set_variation2.phpt
+++ b/ext/date/tests/date_time_set_variation2.phpt
@@ -3,14 +3,14 @@ Test date_time_set() function : usage variation - Passing unexpected values to s
 --FILE--
 <?php
 /* Prototype  : DateTime date_time_set  ( DateTime $object  , int $hour  , int $minute  [, int $second  ] )
- * Description: Resets the current time of the DateTime object to a different time. 
+ * Description: Resets the current time of the DateTime object to a different time.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setTime
  */
 
 echo "*** Testing date_time_set() : usage variation -  unexpected values to second argument \$hour***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_time_set_variation3.phpt b/ext/date/tests/date_time_set_variation3.phpt
index 12a60a118cd..0577d26794a 100644
--- a/ext/date/tests/date_time_set_variation3.phpt
+++ b/ext/date/tests/date_time_set_variation3.phpt
@@ -3,14 +3,14 @@ Test date_time_set() function : usage variation - Passing unexpected values to t
 --FILE--
 <?php
 /* Prototype  : DateTime date_time_set  ( DateTime $object  , int $hour  , int $minute  [, int $second  ] )
- * Description: Resets the current time of the DateTime object to a different time. 
+ * Description: Resets the current time of the DateTime object to a different time.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setTime
  */
 
 echo "*** Testing date_time_set() : usage variation -  unexpected values to third argument \$minute***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_time_set_variation4.phpt b/ext/date/tests/date_time_set_variation4.phpt
index aa05f7dd402..df0c767c9f7 100644
--- a/ext/date/tests/date_time_set_variation4.phpt
+++ b/ext/date/tests/date_time_set_variation4.phpt
@@ -3,14 +3,14 @@ Test date_time_set() function : usage variation - Passing unexpected values to f
 --FILE--
 <?php
 /* Prototype  : DateTime date_time_set  ( DateTime $object  , int $hour  , int $minute  [, int $second  ] )
- * Description: Resets the current time of the DateTime object to a different time. 
+ * Description: Resets the current time of the DateTime object to a different time.
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setTime
  */
 
 echo "*** Testing date_time_set() : usage variation -  unexpected values to forth argument \$sec***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_timestamp_get.phpt b/ext/date/tests/date_timestamp_get.phpt
index ec0258bdc00..94b08d224b6 100644
--- a/ext/date/tests/date_timestamp_get.phpt
+++ b/ext/date/tests/date_timestamp_get.phpt
@@ -7,7 +7,7 @@ Havard Eide <nucleuz@gmail.com>
 date.timezone=UTC
 --FILE--
 <?php
-$tz = date_timestamp_get(new DateTime()); 
+$tz = date_timestamp_get(new DateTime());
 var_dump(is_int($tz));
 echo "\n\n";
 $tz = date_timestamp_get(time());
diff --git a/ext/date/tests/date_timestamp_set.phpt b/ext/date/tests/date_timestamp_set.phpt
index e01660193f1..42b91573f1f 100644
--- a/ext/date/tests/date_timestamp_set.phpt
+++ b/ext/date/tests/date_timestamp_set.phpt
@@ -4,14 +4,14 @@ Test the basics to function date_timestamp_set().
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 --INI--
 date.timezone = UTC;
-date_default_timezone_set("America/Sao_Paulo"); 
+date_default_timezone_set("America/Sao_Paulo");
 --FILE--
 <?php
 $dftz021 = date_default_timezone_get(); //UTC
 
-$dtms021 = date_create(); 
+$dtms021 = date_create();
 
-date_timestamp_set($dtms021, 1234567890); 
+date_timestamp_set($dtms021, 1234567890);
 
 var_dump(date_format($dtms021, 'B => (U) => T Y-M-d H:i:s'));
 ?>
diff --git a/ext/date/tests/date_timestamp_set_nullparam.phpt b/ext/date/tests/date_timestamp_set_nullparam.phpt
index 1bcb800242b..04cde83346c 100644
--- a/ext/date/tests/date_timestamp_set_nullparam.phpt
+++ b/ext/date/tests/date_timestamp_set_nullparam.phpt
@@ -4,14 +4,14 @@ Test the function date_timestamp_set() with first null parameter.
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 --INI--
 date.timezone = UTC;
-date_default_timezone_set("America/Sao_Paulo"); 
+date_default_timezone_set("America/Sao_Paulo");
 --FILE--
 <?php
 $dftz021 = date_default_timezone_get(); //UTC
 
-$dtms021 = date_create(); 
+$dtms021 = date_create();
 
-date_timestamp_set(null, 1234567890); 
+date_timestamp_set(null, 1234567890);
 ?>
 --EXPECTF--
 Warning: date_timestamp_set() expects parameter 1 to be DateTime, null given in %s on line %d
\ No newline at end of file
diff --git a/ext/date/tests/date_timestamp_set_nullparam2.phpt b/ext/date/tests/date_timestamp_set_nullparam2.phpt
index 1442da4426f..0f2198b9ac6 100644
--- a/ext/date/tests/date_timestamp_set_nullparam2.phpt
+++ b/ext/date/tests/date_timestamp_set_nullparam2.phpt
@@ -4,12 +4,12 @@ Test the function date_timestamp_set() with second null parameter.
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 --INI--
 date.timezone = UTC;
-date_default_timezone_set("America/Sao_Paulo"); 
+date_default_timezone_set("America/Sao_Paulo");
 --FILE--
 <?php
 $dftz021 = date_default_timezone_get(); //UTC
 
-$dtms021 = date_create(); 
+$dtms021 = date_create();
 
 var_dump(date_timestamp_set($dtms021, null));
 ?>
diff --git a/ext/date/tests/date_timestamp_set_wrongparam_001.phpt b/ext/date/tests/date_timestamp_set_wrongparam_001.phpt
index 9a0fca99c1d..43fec3796a6 100644
--- a/ext/date/tests/date_timestamp_set_wrongparam_001.phpt
+++ b/ext/date/tests/date_timestamp_set_wrongparam_001.phpt
@@ -4,12 +4,12 @@ Check the function date_timestamp_set() with first parameter wrong (array).
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 --INI--
 date.timezone = UTC;
-date_default_timezone_set("America/Sao_Paulo"); 
+date_default_timezone_set("America/Sao_Paulo");
 --FILE--
 <?php
 $dftz021 = date_default_timezone_get(); //UTC
 
-$dtms021 = array(); 
+$dtms021 = array();
 
 date_timestamp_set($dtms021, 123456789);
 ?>
diff --git a/ext/date/tests/date_timestamp_set_wrongparam_002.phpt b/ext/date/tests/date_timestamp_set_wrongparam_002.phpt
index ed31cb217d7..27ff8a1cd0b 100644
--- a/ext/date/tests/date_timestamp_set_wrongparam_002.phpt
+++ b/ext/date/tests/date_timestamp_set_wrongparam_002.phpt
@@ -4,7 +4,7 @@ Check the function date_timestamp_set() with first parameter wrong (integer).
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 --INI--
 date.timezone = UTC;
-date_default_timezone_set("America/Sao_Paulo"); 
+date_default_timezone_set("America/Sao_Paulo");
 --FILE--
 <?php
 $dftz021 = date_default_timezone_get(); //UTC
diff --git a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt
index 387313b13b2..48e9c5a3517 100644
--- a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt
+++ b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt
@@ -4,12 +4,12 @@ Check the function date_timestamp_set() with second parameter wrong (array).
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 --INI--
 date.timezone = UTC;
-date_default_timezone_set("America/Sao_Paulo"); 
+date_default_timezone_set("America/Sao_Paulo");
 --FILE--
 <?php
 $dftz021 = date_default_timezone_get(); //UTC
 
-$dtms021 = new DateTime(); 
+$dtms021 = new DateTime();
 
 $wrong_parameter = array();
 
diff --git a/ext/date/tests/date_timestamp_set_wrongparam_004.phpt b/ext/date/tests/date_timestamp_set_wrongparam_004.phpt
index b171e98bd46..a9aab110e20 100644
--- a/ext/date/tests/date_timestamp_set_wrongparam_004.phpt
+++ b/ext/date/tests/date_timestamp_set_wrongparam_004.phpt
@@ -4,12 +4,12 @@ Check the function date_timestamp_set() with 3 parameters.
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 --INI--
 date.timezone = UTC;
-date_default_timezone_set("America/Sao_Paulo"); 
+date_default_timezone_set("America/Sao_Paulo");
 --FILE--
 <?php
 $dftz021 = date_default_timezone_get(); //UTC
 
-$dtms021 = new DateTime(); 
+$dtms021 = new DateTime();
 
 date_timestamp_set($dtms021, 123456789, 'error');
 ?>
diff --git a/ext/date/tests/date_timezone_get_basic1.phpt b/ext/date/tests/date_timezone_get_basic1.phpt
index f77352ef8fa..9c6085243b5 100644
--- a/ext/date/tests/date_timezone_get_basic1.phpt
+++ b/ext/date/tests/date_timezone_get_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_timezone_get() function : basic functionality 
+Test date_timezone_get() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : DateTimeZone date_timezone_get  ( DateTime $object  )
@@ -12,17 +12,17 @@ echo "*** Testing date_timezone_get() : basic functionality ***\n";
 
 date_default_timezone_set("Europe/London");
 $object = date_create("2009-01-30 17:57:32");
-$tz = date_timezone_get($object); 
+$tz = date_timezone_get($object);
 var_dump( timezone_name_get($tz) );
 
 date_default_timezone_set("America/New_York");
 $object = date_create("2009-01-30 17:57:32");
-$tz = date_timezone_get($object); 
+$tz = date_timezone_get($object);
 var_dump( timezone_name_get($tz) );
 
 $la_time = timezone_open("America/Los_Angeles");
 date_timezone_set($object, $la_time);
-$tz = date_timezone_get($object); 
+$tz = date_timezone_get($object);
 var_dump( timezone_name_get($tz) );
 
 ?>
diff --git a/ext/date/tests/date_timezone_get_error.phpt b/ext/date/tests/date_timezone_get_error.phpt
index 01963c82249..5c0d80b46cb 100644
--- a/ext/date/tests/date_timezone_get_error.phpt
+++ b/ext/date/tests/date_timezone_get_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_timezone_get() function : error conditions 
+Test date_timezone_get() function : error conditions
 --FILE--
 <?php
 /* Prototype  : DateTimeZone date_timezone_get  ( DateTimeInterface $object  )
@@ -7,14 +7,14 @@ Test date_timezone_get() function : error conditions
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTimeInterface::getTimezone
  */
- 
-// Set timezone 
+
+// Set timezone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing date_timezone_get() : error conditions ***\n";
 
 echo "\n-- Testing date_timezone_get() function with zero arguments --\n";
-var_dump( date_timezone_get() ); 
+var_dump( date_timezone_get() );
 
 echo "\n-- Testing date_timezone_get() function with more than expected no. of arguments --\n";
 $datetime = date_create("2009-01-30 17:57:32");
@@ -23,11 +23,11 @@ var_dump( date_timezone_get($datetime, $extra_arg) );
 
 echo "\n-- Testing date_timezone_get() function with an invalid values for \$object argument --\n";
 $invalid_obj = new stdClass();
-var_dump( date_timezone_get($invalid_obj) );  
+var_dump( date_timezone_get($invalid_obj) );
 $invalid_obj = 10;
 var_dump( date_timezone_get($invalid_obj) );
 $invalid_obj = null;
-var_dump( date_timezone_get($invalid_obj) ); 
+var_dump( date_timezone_get($invalid_obj) );
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/date/tests/date_timezone_get_variation1.phpt b/ext/date/tests/date_timezone_get_variation1.phpt
index 4bbd414895d..bcc9831c281 100644
--- a/ext/date/tests/date_timezone_get_variation1.phpt
+++ b/ext/date/tests/date_timezone_get_variation1.phpt
@@ -10,7 +10,7 @@ Test date_timezone_get() function : usage variation - Passing unexpected values
 
 echo "*** Testing date_timezone_get() : usage variation -  unexpected values to first argument \$object***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_timezone_set_basic1.phpt b/ext/date/tests/date_timezone_set_basic1.phpt
index 2e9154cebe8..8f074345523 100644
--- a/ext/date/tests/date_timezone_set_basic1.phpt
+++ b/ext/date/tests/date_timezone_set_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_timezone_set() function : basic functionality 
+Test date_timezone_set() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : DateTime date_timezone_set  ( DateTime $object  , DateTimeZone $timezone  )
@@ -10,7 +10,7 @@ Test date_timezone_set() function : basic functionality
 
 echo "*** Testing date_timezone_set() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 $datetime = date_create("2009-01-30 17:57:32");
diff --git a/ext/date/tests/date_timezone_set_error.phpt b/ext/date/tests/date_timezone_set_error.phpt
index 8c9c00d638f..2de5696f7fa 100644
--- a/ext/date/tests/date_timezone_set_error.phpt
+++ b/ext/date/tests/date_timezone_set_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test date_timezone_set() function : error conditions 
+Test date_timezone_set() function : error conditions
 --FILE--
 <?php
 /* Prototype  : DateTime date_timezone_set  ( DateTime $object  , DateTimeZone $timezone  )
@@ -7,17 +7,17 @@ Test date_timezone_set() function : error conditions
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::setTimezone
  */
- 
+
 date_default_timezone_set("UTC");
 
 echo "*** Testing date_timezone_set() : error conditions ***\n";
 
 echo "\n-- Testing date_timezone_set() function with zero arguments --\n";
-var_dump( date_timezone_set() ); 
+var_dump( date_timezone_set() );
 
 echo "\n-- Testing date_timezone_set() function with less than expected no. of arguments --\n";
 $datetime = date_create("2009-01-30 17:57:32");
-var_dump( date_timezone_set($datetime) ); 
+var_dump( date_timezone_set($datetime) );
 
 echo "\n-- Testing date_timezone_set() function with more than expected no. of arguments --\n";
 $timezone  = timezone_open("GMT");
@@ -26,11 +26,11 @@ var_dump( date_timezone_set($datetime, $timezone, $extra_arg) );
 
 echo "\n-- Testing date_timezone_set() function with an invalid values for \$object argument --\n";
 $invalid_obj = new stdClass();
-var_dump( date_timezone_set($invalid_obj, $timezone) );  
+var_dump( date_timezone_set($invalid_obj, $timezone) );
 $invalid_obj = 10;
 var_dump( date_timezone_set($invalid_obj, $timezone) );
 $invalid_obj = null;
-var_dump( date_timezone_set($invalid_obj, $timezone) );  
+var_dump( date_timezone_set($invalid_obj, $timezone) );
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/date/tests/date_timezone_set_variation1.phpt b/ext/date/tests/date_timezone_set_variation1.phpt
index 0adaf14b943..6d5fd56b203 100644
--- a/ext/date/tests/date_timezone_set_variation1.phpt
+++ b/ext/date/tests/date_timezone_set_variation1.phpt
@@ -10,7 +10,7 @@ Test date_timezone_set() function : usage variation - Passing unexpected values
 
 echo "*** Testing date_timezone_set() : usage variation -  unexpected values to first argument \$object***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_timezone_set_variation2.phpt b/ext/date/tests/date_timezone_set_variation2.phpt
index 46ce4e58147..796b5b1b450 100644
--- a/ext/date/tests/date_timezone_set_variation2.phpt
+++ b/ext/date/tests/date_timezone_set_variation2.phpt
@@ -10,7 +10,7 @@ Test date_timezone_set() function : usage variation - Passing unexpected values
 
 echo "*** Testing date_timezone_set() : usage variation -  unexpected values to second argument \$timezone***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_variation1.phpt b/ext/date/tests/date_variation1.phpt
index a7193591d03..0a3b9d41896 100644
--- a/ext/date/tests/date_variation1.phpt
+++ b/ext/date/tests/date_variation1.phpt
@@ -9,7 +9,7 @@ Test date() function : usage variation - Passing unexpected values to first argu
 
 echo "*** Testing date() : usage variation -  unexpected values to first argument \$format***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -89,8 +89,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/date_variation2.phpt b/ext/date/tests/date_variation2.phpt
index 597c4d83bb4..96140b621dc 100644
--- a/ext/date/tests/date_variation2.phpt
+++ b/ext/date/tests/date_variation2.phpt
@@ -9,7 +9,7 @@ Test date() function : usage variation - Passing unexpected values to second arg
 
 echo "*** Testing date() : usage variation -  unexpected values to second argument \$timestamp***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -89,8 +89,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/getdate_basic.phpt b/ext/date/tests/getdate_basic.phpt
index 5d6cc815dcd..eed29c6e4b2 100644
--- a/ext/date/tests/getdate_basic.phpt
+++ b/ext/date/tests/getdate_basic.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test getdate() function : basic functionality 
+Test getdate() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array getdate([int timestamp])
- * Description: Get date/time information 
+ * Description: Get date/time information
  * Source code: ext/date/php_date.c
  */
 
 echo "*** Testing getdate() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Asia/Calcutta");
 
 // Initialise all required variables
diff --git a/ext/date/tests/getdate_error.phpt b/ext/date/tests/getdate_error.phpt
index 149d06695b8..e6704b032b6 100644
--- a/ext/date/tests/getdate_error.phpt
+++ b/ext/date/tests/getdate_error.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test getdate() function : error conditions 
+Test getdate() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array getdate([int timestamp])
- * Description: Get date/time information 
+ * Description: Get date/time information
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing getdate() : error conditions ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("America/Chicago");
 
 //Test getdate with one more than the expected number of arguments
diff --git a/ext/date/tests/getdate_variation1.phpt b/ext/date/tests/getdate_variation1.phpt
index e0b8bab0086..a937645a9b9 100644
--- a/ext/date/tests/getdate_variation1.phpt
+++ b/ext/date/tests/getdate_variation1.phpt
@@ -3,14 +3,14 @@ Test getdate() function : usage variation - Passing unexpected values to first a
 --FILE--
 <?php
 /* Prototype  : array getdate([int timestamp])
- * Description: Get date/time information 
+ * Description: Get date/time information
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing getdate() : usage variation ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Asia/Calcutta");
 
 //get an unset variable
diff --git a/ext/date/tests/getdate_variation2.phpt b/ext/date/tests/getdate_variation2.phpt
index f987d2134d9..6868dcfdb8a 100644
--- a/ext/date/tests/getdate_variation2.phpt
+++ b/ext/date/tests/getdate_variation2.phpt
@@ -3,14 +3,14 @@ Test getdate() function : usage variation - Passing octal timestamp values
 --FILE--
 <?php
 /* Prototype  : array getdate([int timestamp])
- * Description: Get date/time information 
+ * Description: Get date/time information
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing getdate() : usage variation ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Asia/Calcutta");
 
 //array of values to iterate over
diff --git a/ext/date/tests/getdate_variation3.phpt b/ext/date/tests/getdate_variation3.phpt
index f7d68632087..884acb6f66b 100644
--- a/ext/date/tests/getdate_variation3.phpt
+++ b/ext/date/tests/getdate_variation3.phpt
@@ -3,14 +3,14 @@ Test getdate() function : usage variation - Passing hexadcimal timestamp values
 --FILE--
 <?php
 /* Prototype  : array getdate([int timestamp])
- * Description: Get date/time information 
+ * Description: Get date/time information
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing getdate() : usage variation ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Asia/Calcutta");
 
 //array of values to iterate over
diff --git a/ext/date/tests/getdate_variation4.phpt b/ext/date/tests/getdate_variation4.phpt
index 92719ac650f..be8820e7412 100644
--- a/ext/date/tests/getdate_variation4.phpt
+++ b/ext/date/tests/getdate_variation4.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test getdate() function : usage variation - Verifyig by supplying year-wise sample time stamps since Unix epoch time  
+Test getdate() function : usage variation - Verifyig by supplying year-wise sample time stamps since Unix epoch time
 --FILE--
 <?php
 /* Prototype  : array getdate([int timestamp])
- * Description: Get date/time information 
+ * Description: Get date/time information
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing getdate() : usage variation ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Asia/Calcutta");
 
 //array of values to iterate over
diff --git a/ext/date/tests/getdate_variation5.phpt b/ext/date/tests/getdate_variation5.phpt
index e4524a86590..d7d2650c5e3 100644
--- a/ext/date/tests/getdate_variation5.phpt
+++ b/ext/date/tests/getdate_variation5.phpt
@@ -1,18 +1,18 @@
 --TEST--
-Test getdate() function : usage variation - Verifyig with different timezones on Unix epoch timestamp  
+Test getdate() function : usage variation - Verifyig with different timezones on Unix epoch timestamp
 --FILE--
 <?php
 /* Prototype  : array getdate([int timestamp])
- * Description: Get date/time information 
+ * Description: Get date/time information
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing getdate() : usage variation ***\n";
 
 //Timezones with required data for date_sunrise
 $inputs = array (
-		//GMT-11		
+		//GMT-11
 		"Pacific/Samoa",
 		//GMT-9
 		"US/Alaska",
diff --git a/ext/date/tests/getdate_variation6.phpt b/ext/date/tests/getdate_variation6.phpt
index 5c03a3bb714..c5ae4f96f20 100644
--- a/ext/date/tests/getdate_variation6.phpt
+++ b/ext/date/tests/getdate_variation6.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test getdate() function : usage variation - Passing strings containing numbers  
+Test getdate() function : usage variation - Passing strings containing numbers
 --FILE--
 <?php
 /* Prototype  : array getdate([int timestamp])
- * Description: Get date/time information 
+ * Description: Get date/time information
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing getdate() : usage variation ***\n";
diff --git a/ext/date/tests/getdate_variation7.phpt b/ext/date/tests/getdate_variation7.phpt
index 0f0165edea6..c764f3c8b37 100644
--- a/ext/date/tests/getdate_variation7.phpt
+++ b/ext/date/tests/getdate_variation7.phpt
@@ -5,9 +5,9 @@ Test getdate() function : usage variation - Passing high positive and negative f
 --FILE--
 <?php
 /* Prototype  : array getdate([int timestamp])
- * Description: Get date/time information 
+ * Description: Get date/time information
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing getdate() : usage variation ***\n";
diff --git a/ext/date/tests/gettimeofday_basic.phpt b/ext/date/tests/gettimeofday_basic.phpt
index fe04f015e50..f9821307527 100644
--- a/ext/date/tests/gettimeofday_basic.phpt
+++ b/ext/date/tests/gettimeofday_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test gettimeofday() function : basic functionality 
+Test gettimeofday() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array gettimeofday([bool get_as_float])
- * Description: Returns the current time as array 
+ * Description: Returns the current time as array
  * Source code: ext/standard/microtime.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gettimeofday() : basic functionality ***\n";
diff --git a/ext/date/tests/gettimeofday_error.phpt b/ext/date/tests/gettimeofday_error.phpt
index 558a381fe3f..f18b54f9cdc 100644
--- a/ext/date/tests/gettimeofday_error.phpt
+++ b/ext/date/tests/gettimeofday_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test gettimeofday() function : error conditions 
+Test gettimeofday() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array gettimeofday([bool get_as_float])
- * Description: Returns the current time as array 
+ * Description: Returns the current time as array
  * Source code: ext/standard/microtime.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gettimeofday() : error conditions ***\n";
diff --git a/ext/date/tests/gettimeofday_variation1.phpt b/ext/date/tests/gettimeofday_variation1.phpt
index f494a25b53b..7f173d1c6a5 100644
--- a/ext/date/tests/gettimeofday_variation1.phpt
+++ b/ext/date/tests/gettimeofday_variation1.phpt
@@ -3,9 +3,9 @@ Test gettimeofday() function : usage variation - Passing unexpected values to ge
 --FILE--
 <?php
 /* Prototype  : array gettimeofday([bool get_as_float])
- * Description: Returns the current time as array 
+ * Description: Returns the current time as array
  * Source code: ext/standard/microtime.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gettimeofday() : usage variation ***\n";
diff --git a/ext/date/tests/gmdate_basic.phpt b/ext/date/tests/gmdate_basic.phpt
index ae036cacba6..3ebde84d62c 100644
--- a/ext/date/tests/gmdate_basic.phpt
+++ b/ext/date/tests/gmdate_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test gmdate() function : basic functionality 
+Test gmdate() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmdate() : basic functionality ***\n";
diff --git a/ext/date/tests/gmdate_error.phpt b/ext/date/tests/gmdate_error.phpt
index fbee071269c..210c9d134b5 100644
--- a/ext/date/tests/gmdate_error.phpt
+++ b/ext/date/tests/gmdate_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test gmdate() function : error conditions 
+Test gmdate() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmdate() : error conditions ***\n";
diff --git a/ext/date/tests/gmdate_variation1.phpt b/ext/date/tests/gmdate_variation1.phpt
index e2e23319582..88fb91d5fe5 100644
--- a/ext/date/tests/gmdate_variation1.phpt
+++ b/ext/date/tests/gmdate_variation1.phpt
@@ -3,9 +3,9 @@ Test gmdate() function : usage variation - Passing unexpected values to format a
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmdate() : usage variation ***\n";
diff --git a/ext/date/tests/gmdate_variation10.phpt b/ext/date/tests/gmdate_variation10.phpt
index d5298368d3f..fd72d5bf756 100644
--- a/ext/date/tests/gmdate_variation10.phpt
+++ b/ext/date/tests/gmdate_variation10.phpt
@@ -3,9 +3,9 @@ Test gmdate() function : usage variation - Passing Timezone format options to fo
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmdate() : usage variation ***\n";
diff --git a/ext/date/tests/gmdate_variation11.phpt b/ext/date/tests/gmdate_variation11.phpt
index a9520907cb8..601864d8298 100644
--- a/ext/date/tests/gmdate_variation11.phpt
+++ b/ext/date/tests/gmdate_variation11.phpt
@@ -3,9 +3,9 @@ Test gmdate() function : usage variation - Passing Full Date/Time format options
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmdate() : usage variation ***\n";
diff --git a/ext/date/tests/gmdate_variation12.phpt b/ext/date/tests/gmdate_variation12.phpt
index 8f0146f3848..60bb69a32aa 100644
--- a/ext/date/tests/gmdate_variation12.phpt
+++ b/ext/date/tests/gmdate_variation12.phpt
@@ -3,9 +3,9 @@ Test gmdate() function : usage variation - Valid and invalid range of timestamp.
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmdate() : usage variation ***\n";
diff --git a/ext/date/tests/gmdate_variation13.phpt b/ext/date/tests/gmdate_variation13.phpt
index 1d1f434ecee..58103ec9f42 100644
--- a/ext/date/tests/gmdate_variation13.phpt
+++ b/ext/date/tests/gmdate_variation13.phpt
@@ -3,7 +3,7 @@ Test gmdate() function : usage variation - Passing predefined constants to forma
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
  */
 
diff --git a/ext/date/tests/gmdate_variation14.phpt b/ext/date/tests/gmdate_variation14.phpt
index 4b58febaea3..3067b65c1ea 100644
--- a/ext/date/tests/gmdate_variation14.phpt
+++ b/ext/date/tests/gmdate_variation14.phpt
@@ -5,7 +5,7 @@ Test gmdate() function : usage variation - Passing high positive and negetive fl
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
  */
 
diff --git a/ext/date/tests/gmdate_variation2.phpt b/ext/date/tests/gmdate_variation2.phpt
index 3a2ba5e69f7..2884d51a2be 100644
--- a/ext/date/tests/gmdate_variation2.phpt
+++ b/ext/date/tests/gmdate_variation2.phpt
@@ -3,9 +3,9 @@ Test gmdate() function : usage variation - Passing unexpected values to timestam
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmdate() : usage variation ***\n";
diff --git a/ext/date/tests/gmdate_variation3.phpt b/ext/date/tests/gmdate_variation3.phpt
index a93d6e9239a..8e13182a64f 100644
--- a/ext/date/tests/gmdate_variation3.phpt
+++ b/ext/date/tests/gmdate_variation3.phpt
@@ -3,9 +3,9 @@ Test gmdate() function : usage variation - Passing numeric representation of day
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmdate() : usage variation ***\n";
diff --git a/ext/date/tests/gmdate_variation4.phpt b/ext/date/tests/gmdate_variation4.phpt
index bb97b567c6d..a23877923ab 100644
--- a/ext/date/tests/gmdate_variation4.phpt
+++ b/ext/date/tests/gmdate_variation4.phpt
@@ -3,9 +3,9 @@ Test gmdate() function : usage variation - Passing textual representation of day
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmdate() : usage variation ***\n";
diff --git a/ext/date/tests/gmdate_variation5.phpt b/ext/date/tests/gmdate_variation5.phpt
index d40488a6927..0127fc5876a 100644
--- a/ext/date/tests/gmdate_variation5.phpt
+++ b/ext/date/tests/gmdate_variation5.phpt
@@ -3,9 +3,9 @@ Test gmdate() function : usage variation - Passing Week representation to format
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmdate() : usage variation ***\n";
diff --git a/ext/date/tests/gmdate_variation6.phpt b/ext/date/tests/gmdate_variation6.phpt
index f5b63a5b3f6..f5d8684ec73 100644
--- a/ext/date/tests/gmdate_variation6.phpt
+++ b/ext/date/tests/gmdate_variation6.phpt
@@ -3,9 +3,9 @@ Test gmdate() function : usage variation - Passing Month format options to forma
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmdate() : usage variation ***\n";
diff --git a/ext/date/tests/gmdate_variation7.phpt b/ext/date/tests/gmdate_variation7.phpt
index 8d9c1b0b971..1b590ad75b2 100644
--- a/ext/date/tests/gmdate_variation7.phpt
+++ b/ext/date/tests/gmdate_variation7.phpt
@@ -3,9 +3,9 @@ Test gmdate() function : usage variation - Passing Year format options to format
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmdate() : usage variation ***\n";
diff --git a/ext/date/tests/gmdate_variation8.phpt b/ext/date/tests/gmdate_variation8.phpt
index 8d9c1b0b971..1b590ad75b2 100644
--- a/ext/date/tests/gmdate_variation8.phpt
+++ b/ext/date/tests/gmdate_variation8.phpt
@@ -3,9 +3,9 @@ Test gmdate() function : usage variation - Passing Year format options to format
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmdate() : usage variation ***\n";
diff --git a/ext/date/tests/gmdate_variation9.phpt b/ext/date/tests/gmdate_variation9.phpt
index e210557ace9..85c4e720426 100644
--- a/ext/date/tests/gmdate_variation9.phpt
+++ b/ext/date/tests/gmdate_variation9.phpt
@@ -3,9 +3,9 @@ Test gmdate() function : usage variation - Passing Time format options to format
 --FILE--
 <?php
 /* Prototype  : string gmdate(string format [, long timestamp])
- * Description: Format a GMT date/time 
+ * Description: Format a GMT date/time
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmdate() : usage variation ***\n";
@@ -32,7 +32,7 @@ foreach($time_formats as $key =>$value) {
       echo "\n--$key--\n";
 	  var_dump( gmdate($value) );
 	  var_dump( gmdate($value, $timestamp) );
-}	  
+}
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/gmmktime_basic.phpt b/ext/date/tests/gmmktime_basic.phpt
index 58777ef7712..cdb44f0c621 100644
--- a/ext/date/tests/gmmktime_basic.phpt
+++ b/ext/date/tests/gmmktime_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test gmmktime() function : basic functionality 
+Test gmmktime() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date 
+ * Description: Get UNIX timestamp for a GMT date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmmktime() : basic functionality ***\n";
diff --git a/ext/date/tests/gmmktime_error.phpt b/ext/date/tests/gmmktime_error.phpt
index 62e62057ea7..fb6dc85c3b9 100644
--- a/ext/date/tests/gmmktime_error.phpt
+++ b/ext/date/tests/gmmktime_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test gmmktime() function : error conditions 
+Test gmmktime() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date 
+ * Description: Get UNIX timestamp for a GMT date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmmktime() : error conditions ***\n";
diff --git a/ext/date/tests/gmmktime_variation1.phpt b/ext/date/tests/gmmktime_variation1.phpt
index 2792c1000cf..2748b341c8c 100644
--- a/ext/date/tests/gmmktime_variation1.phpt
+++ b/ext/date/tests/gmmktime_variation1.phpt
@@ -3,9 +3,9 @@ Test gmmktime() function : usage variation - Passing unexpected values to first
 --FILE--
 <?php
 /* Prototype  : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date 
+ * Description: Get UNIX timestamp for a GMT date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmmktime() : usage variation ***\n";
diff --git a/ext/date/tests/gmmktime_variation2.phpt b/ext/date/tests/gmmktime_variation2.phpt
index b53430d46b5..7db25376b18 100644
--- a/ext/date/tests/gmmktime_variation2.phpt
+++ b/ext/date/tests/gmmktime_variation2.phpt
@@ -3,9 +3,9 @@ Test gmmktime() function : usage variation - Passing unexpected values to second
 --FILE--
 <?php
 /* Prototype  : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date 
+ * Description: Get UNIX timestamp for a GMT date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmmktime() : usage variation ***\n";
diff --git a/ext/date/tests/gmmktime_variation3.phpt b/ext/date/tests/gmmktime_variation3.phpt
index 5a7bdcb0bb0..0119bcef61c 100644
--- a/ext/date/tests/gmmktime_variation3.phpt
+++ b/ext/date/tests/gmmktime_variation3.phpt
@@ -3,9 +3,9 @@ Test gmmktime() function : usage variation - Passing unexpected values to third
 --FILE--
 <?php
 /* Prototype  : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date 
+ * Description: Get UNIX timestamp for a GMT date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmmktime() : usage variation ***\n";
diff --git a/ext/date/tests/gmmktime_variation4.phpt b/ext/date/tests/gmmktime_variation4.phpt
index de88ab56dcf..33d02b3218f 100644
--- a/ext/date/tests/gmmktime_variation4.phpt
+++ b/ext/date/tests/gmmktime_variation4.phpt
@@ -3,9 +3,9 @@ Test gmmktime() function : usage variation - Passing unexpected values to fourth
 --FILE--
 <?php
 /* Prototype  : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date 
+ * Description: Get UNIX timestamp for a GMT date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmmktime() : usage variation ***\n";
diff --git a/ext/date/tests/gmmktime_variation5.phpt b/ext/date/tests/gmmktime_variation5.phpt
index 5d7451a348f..448503c8785 100644
--- a/ext/date/tests/gmmktime_variation5.phpt
+++ b/ext/date/tests/gmmktime_variation5.phpt
@@ -3,9 +3,9 @@ Test gmmktime() function : usage variation - Passing unexpected values to fifth
 --FILE--
 <?php
 /* Prototype  : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date 
+ * Description: Get UNIX timestamp for a GMT date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmmktime() : usage variation ***\n";
diff --git a/ext/date/tests/gmmktime_variation6.phpt b/ext/date/tests/gmmktime_variation6.phpt
index 81b930ceb67..373a70e4454 100644
--- a/ext/date/tests/gmmktime_variation6.phpt
+++ b/ext/date/tests/gmmktime_variation6.phpt
@@ -3,9 +3,9 @@ Test gmmktime() function : usage variation - Passing unexpected values to sixth
 --FILE--
 <?php
 /* Prototype  : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date 
+ * Description: Get UNIX timestamp for a GMT date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmmktime() : usage variation ***\n";
diff --git a/ext/date/tests/gmmktime_variation7.phpt b/ext/date/tests/gmmktime_variation7.phpt
index 3d0d25a003c..223da1cc718 100644
--- a/ext/date/tests/gmmktime_variation7.phpt
+++ b/ext/date/tests/gmmktime_variation7.phpt
@@ -3,9 +3,9 @@ Test gmmktime() function : usage variation - Checking with few optional argument
 --FILE--
 <?php
 /* Prototype  : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date 
+ * Description: Get UNIX timestamp for a GMT date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmmktime() : usage variation ***\n";
diff --git a/ext/date/tests/gmmktime_variation8.phpt b/ext/date/tests/gmmktime_variation8.phpt
index b0c56a127bb..d36426c3c2b 100644
--- a/ext/date/tests/gmmktime_variation8.phpt
+++ b/ext/date/tests/gmmktime_variation8.phpt
@@ -3,9 +3,9 @@ Test gmmktime() function : usage variation - Passing octal and hexadecimal value
 --FILE--
 <?php
 /* Prototype  : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date 
+ * Description: Get UNIX timestamp for a GMT date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmmktime() : usage variation ***\n";
diff --git a/ext/date/tests/gmmktime_variation9.phpt b/ext/date/tests/gmmktime_variation9.phpt
index fa463e0d69f..1d1750b9b51 100644
--- a/ext/date/tests/gmmktime_variation9.phpt
+++ b/ext/date/tests/gmmktime_variation9.phpt
@@ -3,14 +3,14 @@ Test gmmktime() function : usage variation - Passing positive and negative float
 --FILE--
 <?php
 /* Prototype  : int gmmktime([int hour [, int min [, int sec [, int mon [, int day [, int year]]]]]])
- * Description: Get UNIX timestamp for a GMT date 
+ * Description: Get UNIX timestamp for a GMT date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmmktime() : usage variation ***\n";
 
-//Initialise variables 
+//Initialise variables
 $hour = 8;
 $min = 8;
 $sec = 8;
@@ -33,7 +33,7 @@ foreach($inputs as $key =>$value) {
 	  var_dump( gmmktime($hour, $min, $value, $mon, $day, $year) );
 	  var_dump( gmmktime($hour, $min, $sec, $value, $day, $year) );
 	  var_dump( gmmktime($hour, $min, $sec, $mon, $value, $value) );
-}	  
+}
 ?>
 ===DONE===
 --EXPECTREGEX--
diff --git a/ext/date/tests/gmstrftime_basic.phpt b/ext/date/tests/gmstrftime_basic.phpt
index 17bad69d066..1accff51276 100644
--- a/ext/date/tests/gmstrftime_basic.phpt
+++ b/ext/date/tests/gmstrftime_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test gmstrftime() function : basic functionality 
+Test gmstrftime() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : basic functionality ***\n";
diff --git a/ext/date/tests/gmstrftime_error.phpt b/ext/date/tests/gmstrftime_error.phpt
index d28780fe03b..3e6050c1404 100644
--- a/ext/date/tests/gmstrftime_error.phpt
+++ b/ext/date/tests/gmstrftime_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test gmstrftime() function : error conditions 
+Test gmstrftime() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : error conditions ***\n";
diff --git a/ext/date/tests/gmstrftime_variation1.phpt b/ext/date/tests/gmstrftime_variation1.phpt
index d123fb25425..c8dcbe08e5b 100644
--- a/ext/date/tests/gmstrftime_variation1.phpt
+++ b/ext/date/tests/gmstrftime_variation1.phpt
@@ -3,9 +3,9 @@ Test gmstrftime() function : usage variation - Passing unexpected values to firs
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation10.phpt b/ext/date/tests/gmstrftime_variation10.phpt
index 0e54d846ea7..70cca370ba8 100644
--- a/ext/date/tests/gmstrftime_variation10.phpt
+++ b/ext/date/tests/gmstrftime_variation10.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking week related formats which are supported other than on Windows. 
+Test gmstrftime() function : usage variation - Checking week related formats which are supported other than on Windows.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation11.phpt b/ext/date/tests/gmstrftime_variation11.phpt
index f90e51ec16c..bb37757c7a4 100644
--- a/ext/date/tests/gmstrftime_variation11.phpt
+++ b/ext/date/tests/gmstrftime_variation11.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking month related formats which was not supported on Windows before VC14. 
+Test gmstrftime() function : usage variation - Checking month related formats which was not supported on Windows before VC14.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation12.phpt b/ext/date/tests/gmstrftime_variation12.phpt
index 2c25af6e2a8..96d034b2d2b 100644
--- a/ext/date/tests/gmstrftime_variation12.phpt
+++ b/ext/date/tests/gmstrftime_variation12.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking month related formats which are supported other than on Windows. 
+Test gmstrftime() function : usage variation - Checking month related formats which are supported other than on Windows.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation13.phpt b/ext/date/tests/gmstrftime_variation13.phpt
index cccfa89d420..c8c77c80552 100644
--- a/ext/date/tests/gmstrftime_variation13.phpt
+++ b/ext/date/tests/gmstrftime_variation13.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking date related formats which was not supported on Windows before VC14. 
+Test gmstrftime() function : usage variation - Checking date related formats which was not supported on Windows before VC14.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation14.phpt b/ext/date/tests/gmstrftime_variation14.phpt
index 880b4330c5b..fca6829231c 100644
--- a/ext/date/tests/gmstrftime_variation14.phpt
+++ b/ext/date/tests/gmstrftime_variation14.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking date related formats which are supported other than on Windows. 
+Test gmstrftime() function : usage variation - Checking date related formats which are supported other than on Windows.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation15.phpt b/ext/date/tests/gmstrftime_variation15.phpt
index 0a32b433229..157eaa8fecd 100644
--- a/ext/date/tests/gmstrftime_variation15.phpt
+++ b/ext/date/tests/gmstrftime_variation15.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking time related formats which was not supported on Windows before VC14. 
+Test gmstrftime() function : usage variation - Checking time related formats which was not supported on Windows before VC14.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation16.phpt b/ext/date/tests/gmstrftime_variation16.phpt
index fd9f809ea72..762c9541633 100644
--- a/ext/date/tests/gmstrftime_variation16.phpt
+++ b/ext/date/tests/gmstrftime_variation16.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking time related formats which are supported other than on Windows. 
+Test gmstrftime() function : usage variation - Checking time related formats which are supported other than on Windows.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation17.phpt b/ext/date/tests/gmstrftime_variation17.phpt
index 5fa308f645b..d4d82efd10c 100644
--- a/ext/date/tests/gmstrftime_variation17.phpt
+++ b/ext/date/tests/gmstrftime_variation17.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking day related formats which was not supported on Windows before vc14. 
+Test gmstrftime() function : usage variation - Checking day related formats which was not supported on Windows before vc14.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation18.phpt b/ext/date/tests/gmstrftime_variation18.phpt
index 7cd5948c6a9..f74d82229bd 100644
--- a/ext/date/tests/gmstrftime_variation18.phpt
+++ b/ext/date/tests/gmstrftime_variation18.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking day related formats which are supported other than on Windows. 
+Test gmstrftime() function : usage variation - Checking day related formats which are supported other than on Windows.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation19.phpt b/ext/date/tests/gmstrftime_variation19.phpt
index 9ba714750e4..d8df1a11346 100644
--- a/ext/date/tests/gmstrftime_variation19.phpt
+++ b/ext/date/tests/gmstrftime_variation19.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking newline and tab formats which was not supported on Windows before VC14. 
+Test gmstrftime() function : usage variation - Checking newline and tab formats which was not supported on Windows before VC14.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation2.phpt b/ext/date/tests/gmstrftime_variation2.phpt
index c3ff81d1361..86682a31642 100644
--- a/ext/date/tests/gmstrftime_variation2.phpt
+++ b/ext/date/tests/gmstrftime_variation2.phpt
@@ -9,9 +9,9 @@ if(PHP_INT_SIZE != 4 ) {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation20.phpt b/ext/date/tests/gmstrftime_variation20.phpt
index a8898d8ec88..135520e37cd 100644
--- a/ext/date/tests/gmstrftime_variation20.phpt
+++ b/ext/date/tests/gmstrftime_variation20.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking newline and tab formats which are supported other than on Windows. 
+Test gmstrftime() function : usage variation - Checking newline and tab formats which are supported other than on Windows.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation21.phpt b/ext/date/tests/gmstrftime_variation21.phpt
index 08ca2fc606a..a427090942a 100644
--- a/ext/date/tests/gmstrftime_variation21.phpt
+++ b/ext/date/tests/gmstrftime_variation21.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking Preferred date and time representation on Windows. 
+Test gmstrftime() function : usage variation - Checking Preferred date and time representation on Windows.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation22.phpt b/ext/date/tests/gmstrftime_variation22.phpt
index d9abdce17af..1a69726f67b 100644
--- a/ext/date/tests/gmstrftime_variation22.phpt
+++ b/ext/date/tests/gmstrftime_variation22.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking Preferred date and time representation other than on Windows. 
+Test gmstrftime() function : usage variation - Checking Preferred date and time representation other than on Windows.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
@@ -12,9 +12,9 @@ if (!setlocale(LC_TIME, "POSIX")) {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation3.phpt b/ext/date/tests/gmstrftime_variation3.phpt
index bc05c7b4c08..aebb938a77d 100644
--- a/ext/date/tests/gmstrftime_variation3.phpt
+++ b/ext/date/tests/gmstrftime_variation3.phpt
@@ -3,9 +3,9 @@ Test gmstrftime() function : usage variation - Passing week related format strin
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
@@ -18,7 +18,7 @@ $inputs = array(
       'Abbreviated weekday name' => "%a",
       'Full weekday name' => "%A",
 	  'Week number of the year' => "%U",
-	  'Week number of the year in decimal number' => "%W",	
+	  'Week number of the year in decimal number' => "%W",
 );
 
 // loop through each element of the array for timestamp
diff --git a/ext/date/tests/gmstrftime_variation4.phpt b/ext/date/tests/gmstrftime_variation4.phpt
index 619e633a9c1..3ec4e06e176 100644
--- a/ext/date/tests/gmstrftime_variation4.phpt
+++ b/ext/date/tests/gmstrftime_variation4.phpt
@@ -3,9 +3,9 @@ Test gmstrftime() function : usage variation - Passing month related format stri
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation5.phpt b/ext/date/tests/gmstrftime_variation5.phpt
index 95e3bd23961..c43c1e37406 100644
--- a/ext/date/tests/gmstrftime_variation5.phpt
+++ b/ext/date/tests/gmstrftime_variation5.phpt
@@ -3,9 +3,9 @@ Test gmstrftime() function : usage variation - Passing date related format strin
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
@@ -20,7 +20,7 @@ date_default_timezone_set("Asia/Calcutta");
 $inputs = array(
 	  'Year as decimal number without a century' => "%y",
 	  'Year as decimal number including the century' => "%Y",
-	  'Time zone offset' => "%Z",	 	
+	  'Time zone offset' => "%Z",
 	  'Time zone offset' => "%z",
 );
 
diff --git a/ext/date/tests/gmstrftime_variation6.phpt b/ext/date/tests/gmstrftime_variation6.phpt
index 92dd1ede304..f09df7847b9 100644
--- a/ext/date/tests/gmstrftime_variation6.phpt
+++ b/ext/date/tests/gmstrftime_variation6.phpt
@@ -3,9 +3,9 @@ Test gmstrftime() function : usage variation - Passing time related format strin
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation7.phpt b/ext/date/tests/gmstrftime_variation7.phpt
index dd0584b702a..4cb69e1d2f3 100644
--- a/ext/date/tests/gmstrftime_variation7.phpt
+++ b/ext/date/tests/gmstrftime_variation7.phpt
@@ -3,9 +3,9 @@ Test gmstrftime() function : usage variation - Passing day related format string
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation8.phpt b/ext/date/tests/gmstrftime_variation8.phpt
index 59057aa1736..3cbb8e39f6d 100644
--- a/ext/date/tests/gmstrftime_variation8.phpt
+++ b/ext/date/tests/gmstrftime_variation8.phpt
@@ -3,9 +3,9 @@ Test gmstrftime() function : usage variation - Passing literal related strings t
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/gmstrftime_variation9.phpt b/ext/date/tests/gmstrftime_variation9.phpt
index 6ba33ac394e..07f5dec2e39 100644
--- a/ext/date/tests/gmstrftime_variation9.phpt
+++ b/ext/date/tests/gmstrftime_variation9.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test gmstrftime() function : usage variation - Checking week related formats which was not supported on Windows before vc14. 
+Test gmstrftime() function : usage variation - Checking week related formats which was not supported on Windows before vc14.
 --SKIPIF--
 <?php
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string gmstrftime(string format [, int timestamp])
- * Description: Format a GMT/UCT time/date according to locale settings 
+ * Description: Format a GMT/UCT time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gmstrftime() : usage variation ***\n";
diff --git a/ext/date/tests/idate_basic.phpt b/ext/date/tests/idate_basic.phpt
index 944f29f5b19..2306a5f64f5 100644
--- a/ext/date/tests/idate_basic.phpt
+++ b/ext/date/tests/idate_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test idate() function : basic functionality 
+Test idate() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int idate(string format [, int timestamp])
- * Description: Format a local time/date as integer 
+ * Description: Format a local time/date as integer
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing idate() : basic functionality ***\n";
diff --git a/ext/date/tests/idate_error.phpt b/ext/date/tests/idate_error.phpt
index 7dad4606d77..b9a83549235 100644
--- a/ext/date/tests/idate_error.phpt
+++ b/ext/date/tests/idate_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test idate() function : error conditions 
+Test idate() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int idate(string format [, int timestamp])
- * Description: Format a local time/date as integer 
+ * Description: Format a local time/date as integer
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing idate() : error conditions ***\n";
diff --git a/ext/date/tests/idate_variation1.phpt b/ext/date/tests/idate_variation1.phpt
index c0231a6c0ce..8727b8133a1 100644
--- a/ext/date/tests/idate_variation1.phpt
+++ b/ext/date/tests/idate_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test idate() function : usage variation - Passing unexpected values to first argument 'format'. 
+Test idate() function : usage variation - Passing unexpected values to first argument 'format'.
 --FILE--
 <?php
 /* Prototype  : int idate(string format [, int timestamp])
- * Description: Format a local time/date as integer 
+ * Description: Format a local time/date as integer
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing idate() : usage variation ***\n";
diff --git a/ext/date/tests/idate_variation2.phpt b/ext/date/tests/idate_variation2.phpt
index cfa8076ea0b..c6aa53920a8 100644
--- a/ext/date/tests/idate_variation2.phpt
+++ b/ext/date/tests/idate_variation2.phpt
@@ -3,9 +3,9 @@ Test idate() function : usage variation - Passing unexpected values to second op
 --FILE--
 <?php
 /* Prototype  : int idate(string format [, int timestamp])
- * Description: Format a local time/date as integer 
+ * Description: Format a local time/date as integer
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing idate() : usage variation ***\n";
diff --git a/ext/date/tests/idate_variation3.phpt b/ext/date/tests/idate_variation3.phpt
index dd38a441704..45871068551 100644
--- a/ext/date/tests/idate_variation3.phpt
+++ b/ext/date/tests/idate_variation3.phpt
@@ -5,9 +5,9 @@ Test idate() function : usage variation - Passing higher positive and negetive f
 --FILE--
 <?php
 /* Prototype  : int idate(string format [, int timestamp])
- * Description: Format a local time/date as integer 
+ * Description: Format a local time/date as integer
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing idate() : usage variation ***\n";
@@ -23,7 +23,7 @@ var_dump( idate($format, $timestamp) );
 echo "\n-- Testing idate() function with float -12.3456789000e10 to timestamp --\n";
 $timestamp = -12.3456789000e10;
 var_dump( idate($format, $timestamp) );
-      
+
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/date/tests/idate_variation4.phpt b/ext/date/tests/idate_variation4.phpt
index 6aa1735dfb5..15be1807908 100644
--- a/ext/date/tests/idate_variation4.phpt
+++ b/ext/date/tests/idate_variation4.phpt
@@ -3,9 +3,9 @@ Test idate() function : usage variation - Passing supported Date format characte
 --FILE--
 <?php
 /* Prototype  : int idate(string format [, int timestamp])
- * Description: Format a local time/date as integer 
+ * Description: Format a local time/date as integer
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing idate() : usage variation ***\n";
diff --git a/ext/date/tests/idate_variation5.phpt b/ext/date/tests/idate_variation5.phpt
index e70509c596f..6064a9e989a 100644
--- a/ext/date/tests/idate_variation5.phpt
+++ b/ext/date/tests/idate_variation5.phpt
@@ -3,9 +3,9 @@ Test idate() function : usage variation - Passing supported Time format characte
 --FILE--
 <?php
 /* Prototype  : int idate(string format [, int timestamp])
- * Description: Format a local time/date as integer 
+ * Description: Format a local time/date as integer
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing idate() : usage variation ***\n";
diff --git a/ext/date/tests/idate_variation6.phpt b/ext/date/tests/idate_variation6.phpt
index 161a80d511d..43e3c8f613a 100644
--- a/ext/date/tests/idate_variation6.phpt
+++ b/ext/date/tests/idate_variation6.phpt
@@ -3,9 +3,9 @@ Test idate() function : usage variation - Checking return of year(1 or 2 digits)
 --FILE--
 <?php
 /* Prototype  : int idate(string format [, int timestamp])
- * Description: Format a local time/date as integer 
+ * Description: Format a local time/date as integer
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing idate() : usage variation ***\n";
diff --git a/ext/date/tests/localtime_basic.phpt b/ext/date/tests/localtime_basic.phpt
index fcfd636fb3d..e957e53fc71 100644
--- a/ext/date/tests/localtime_basic.phpt
+++ b/ext/date/tests/localtime_basic.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test localtime() function : basic functionality 
+Test localtime() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array localtime([int timestamp [, bool associative_array]])
- * Description: Returns the results of the C system call localtime as an associative array 
- * if the associative_array argument is set to 1 other wise it is a regular array 
+ * Description: Returns the results of the C system call localtime as an associative array
+ * if the associative_array argument is set to 1 other wise it is a regular array
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing localtime() : basic functionality ***\n";
diff --git a/ext/date/tests/localtime_error.phpt b/ext/date/tests/localtime_error.phpt
index b231ed07496..0224c3538e1 100644
--- a/ext/date/tests/localtime_error.phpt
+++ b/ext/date/tests/localtime_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test localtime() function : error conditions 
+Test localtime() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array localtime([int timestamp [, bool associative_array]])
- * Description: Returns the results of the C system call localtime as an associative array 
- * if the associative_array argument is set to 1 other wise it is a regular array 
+ * Description: Returns the results of the C system call localtime as an associative array
+ * if the associative_array argument is set to 1 other wise it is a regular array
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing localtime() : error conditions ***\n";
diff --git a/ext/date/tests/localtime_variation1.phpt b/ext/date/tests/localtime_variation1.phpt
index b19f0ed6484..d79296ac93a 100644
--- a/ext/date/tests/localtime_variation1.phpt
+++ b/ext/date/tests/localtime_variation1.phpt
@@ -3,10 +3,10 @@ Test localtime() function : usage variation - Passing unexpected values to first
 --FILE--
 <?php
 /* Prototype  : array localtime([int timestamp [, bool associative_array]])
- * Description: Returns the results of the C system call localtime as an associative array 
- * if the associative_array argument is set to 1 other wise it is a regular array 
+ * Description: Returns the results of the C system call localtime as an associative array
+ * if the associative_array argument is set to 1 other wise it is a regular array
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing localtime() : usage variation ***\n";
diff --git a/ext/date/tests/localtime_variation2.phpt b/ext/date/tests/localtime_variation2.phpt
index a2048206afe..2a4e9db4e18 100644
--- a/ext/date/tests/localtime_variation2.phpt
+++ b/ext/date/tests/localtime_variation2.phpt
@@ -3,10 +3,10 @@ Test localtime() function : usage variation - Passing unexpected values to secon
 --FILE--
 <?php
 /* Prototype  : array localtime([int timestamp [, bool associative_array]])
- * Description: Returns the results of the C system call localtime as an associative array 
- * if the associative_array argument is set to 1 other wise it is a regular array 
+ * Description: Returns the results of the C system call localtime as an associative array
+ * if the associative_array argument is set to 1 other wise it is a regular array
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing localtime() : usage variation ***\n";
diff --git a/ext/date/tests/localtime_variation3.phpt b/ext/date/tests/localtime_variation3.phpt
index a8dd3ac35f2..bf9d794a24a 100644
--- a/ext/date/tests/localtime_variation3.phpt
+++ b/ext/date/tests/localtime_variation3.phpt
@@ -5,10 +5,10 @@ Test localtime() function : usage variation - Passing higher positive and negeti
 --FILE--
 <?php
 /* Prototype  : array localtime([int timestamp [, bool associative_array]])
- * Description: Returns the results of the C system call localtime as an associative array 
- * if the associative_array argument is set to 1 other wise it is a regular array 
+ * Description: Returns the results of the C system call localtime as an associative array
+ * if the associative_array argument is set to 1 other wise it is a regular array
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing localtime() : usage variation ***\n";
diff --git a/ext/date/tests/localtime_variation4.phpt b/ext/date/tests/localtime_variation4.phpt
index 2796c22d5bf..a44b887ac76 100644
--- a/ext/date/tests/localtime_variation4.phpt
+++ b/ext/date/tests/localtime_variation4.phpt
@@ -3,10 +3,10 @@ Test localtime() function : usage variation - Passing octal values to timestamp.
 --FILE--
 <?php
 /* Prototype  : array localtime([int timestamp [, bool associative_array]])
- * Description: Returns the results of the C system call localtime as an associative array 
- * if the associative_array argument is set to 1 other wise it is a regular array 
+ * Description: Returns the results of the C system call localtime as an associative array
+ * if the associative_array argument is set to 1 other wise it is a regular array
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing localtime() : usage variation ***\n";
@@ -21,14 +21,14 @@ $inputs = array(
       'Octal 0' => 00,
 	  'Octal 10' => 012,
 	  'Octal -10' => -012
-);	
+);
 
 foreach($inputs as $key =>$value) {
       echo "\n--$key--\n";
 	  var_dump( localtime($value) );
 	  var_dump( localtime($value, $is_associative) );
 }
-	  
+
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/date/tests/localtime_variation5.phpt b/ext/date/tests/localtime_variation5.phpt
index 883e34887be..07802faead1 100644
--- a/ext/date/tests/localtime_variation5.phpt
+++ b/ext/date/tests/localtime_variation5.phpt
@@ -3,10 +3,10 @@ Test localtime() function : usage variation - Passing hexa decimal values to tim
 --FILE--
 <?php
 /* Prototype  : array localtime([int timestamp [, bool associative_array]])
- * Description: Returns the results of the C system call localtime as an associative array 
- * if the associative_array argument is set to 1 other wise it is a regular array 
+ * Description: Returns the results of the C system call localtime as an associative array
+ * if the associative_array argument is set to 1 other wise it is a regular array
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing localtime() : usage variation ***\n";
@@ -21,14 +21,14 @@ $inputs = array(
       'Hexa-decimal 0' => 0x0,
 	  'Hexa-decimal 10' => 0xA,
 	  'Hexa-decimal -10' => -0XA
-);	
+);
 
 foreach($inputs as $key =>$value) {
       echo "\n--$key--\n";
 	  var_dump( localtime($value) );
 	  var_dump( localtime($value, $is_associative) );
 }
-	  
+
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/date/tests/microtime_basic.phpt b/ext/date/tests/microtime_basic.phpt
index 88c49522955..a9045947cbd 100644
--- a/ext/date/tests/microtime_basic.phpt
+++ b/ext/date/tests/microtime_basic.phpt
@@ -2,10 +2,10 @@
 Test return type and value for expected input microtime()
 --FILE--
 <?php
-/* 
+/*
  * proto mixed microtime([bool get_as_float])
  * Function is implemented in ext/standard/microtime.c
-*/ 
+*/
 
 var_dump(microtime());
 var_dump(microtime(true));
diff --git a/ext/date/tests/microtime_error.phpt b/ext/date/tests/microtime_error.phpt
index 07ac90874f4..a537a146a23 100644
--- a/ext/date/tests/microtime_error.phpt
+++ b/ext/date/tests/microtime_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for microtime()
 --FILE--
 <?php
-/* 
+/*
  * proto mixed microtime([bool get_as_float])
  * Function is implemented in ext/standard/microtime.c
-*/ 
+*/
 
 $opt_arg_0 = true;
 $extra_arg = 1;
diff --git a/ext/date/tests/mktime-1.phpt b/ext/date/tests/mktime-1.phpt
index 86723e01aca..aa413b7319a 100644
--- a/ext/date/tests/mktime-1.phpt
+++ b/ext/date/tests/mktime-1.phpt
@@ -3,12 +3,12 @@ Check for mktime with out-of-range parameters
 --INI--
 error_reporting=E_ALL
 --FILE--
-<?php 
+<?php
 
 date_default_timezone_set("Europe/Amsterdam");
 # MacOS/X libc implementation doesn't treat out-of-range values
 # the same way other unices do (Bug# 10686) so some extra code
-# was added to datetime.c to take care of this 
+# was added to datetime.c to take care of this
 echo date("Y-m-d", mktime( 12, 0, 0, 3,  0, 2000)) ."\n";
 echo date("Y-m-d", mktime( 12, 0, 0, 3, -1, 2000)) ."\n";
 echo date("Y-m-d", mktime( 12, 0, 0, 2, 29, 2000)) ."\n";
diff --git a/ext/date/tests/mktime_basic1.phpt b/ext/date/tests/mktime_basic1.phpt
index da1f3d63bfe..afb289815d6 100644
--- a/ext/date/tests/mktime_basic1.phpt
+++ b/ext/date/tests/mktime_basic1.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test mktime() function : basic functionality 
+Test mktime() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
  * Description: Get Unix timestamp for a date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 error_reporting(E_ALL | E_STRICT);
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing DateTime::modify() : basic functionality ***\n";
diff --git a/ext/date/tests/mktime_error.phpt b/ext/date/tests/mktime_error.phpt
index 9e3e872cb5e..77631187107 100644
--- a/ext/date/tests/mktime_error.phpt
+++ b/ext/date/tests/mktime_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test mktime() function : error conditions 
+Test mktime() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
  * Description: Get Unix timestamp for a date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 error_reporting(E_ALL | E_STRICT);
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing mktime() : error conditions ***\n";
diff --git a/ext/date/tests/mktime_variation1.phpt b/ext/date/tests/mktime_variation1.phpt
index 5d0f0c50e04..7ea8f83f76f 100644
--- a/ext/date/tests/mktime_variation1.phpt
+++ b/ext/date/tests/mktime_variation1.phpt
@@ -5,12 +5,12 @@ Test mktime() function : usage variation - Passing unexpected values to first ar
 /* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
  * Description: Get Unix timestamp for a date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mktime() : usage variation -  unexpected values to first argument \$hour***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -89,8 +89,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
@@ -100,7 +100,7 @@ $sec = 45;
 $month = 7;
 $day = 2;
 $year = 1963;
-$is_dst = 0; 
+$is_dst = 0;
 
 foreach($inputs as $variation =>$hour) {
       echo "\n-- $variation --\n";
diff --git a/ext/date/tests/mktime_variation2.phpt b/ext/date/tests/mktime_variation2.phpt
index f5f8ef78036..61e1f1fdfa1 100644
--- a/ext/date/tests/mktime_variation2.phpt
+++ b/ext/date/tests/mktime_variation2.phpt
@@ -5,12 +5,12 @@ Test mktime() function : usage variation - Passing unexpected values to second a
 /* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
  * Description: Get Unix timestamp for a date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mktime() : usage variation -  unexpected values to second argument \$minute***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -89,8 +89,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/mktime_variation3.phpt b/ext/date/tests/mktime_variation3.phpt
index 8abf2a2d350..411a068ecbd 100644
--- a/ext/date/tests/mktime_variation3.phpt
+++ b/ext/date/tests/mktime_variation3.phpt
@@ -5,12 +5,12 @@ Test mktime() function : usage variation - Passing unexpected values to third ar
 /* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
  * Description: Get Unix timestamp for a date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mktime() : usage variation -  unexpected values to third argument \$second***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -89,8 +89,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/mktime_variation4.phpt b/ext/date/tests/mktime_variation4.phpt
index 1b64c27e854..c3a48546a2a 100644
--- a/ext/date/tests/mktime_variation4.phpt
+++ b/ext/date/tests/mktime_variation4.phpt
@@ -5,12 +5,12 @@ Test mktime() function : usage variation - Passing unexpected values to forth ar
 /* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
  * Description: Get Unix timestamp for a date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mktime() : usage variation -  unexpected values to forth argument \$month***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -89,8 +89,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/mktime_variation5.phpt b/ext/date/tests/mktime_variation5.phpt
index fc36797a0ec..7236b8d511a 100644
--- a/ext/date/tests/mktime_variation5.phpt
+++ b/ext/date/tests/mktime_variation5.phpt
@@ -5,12 +5,12 @@ Test mktime() function : usage variation - Passing unexpected values to fifth ar
 /* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
  * Description: Get Unix timestamp for a date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mktime() : usage variation -  unexpected values to fifth argument \$day***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -89,8 +89,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/mktime_variation6.phpt b/ext/date/tests/mktime_variation6.phpt
index 0b2a1309150..c9e3507b7f3 100644
--- a/ext/date/tests/mktime_variation6.phpt
+++ b/ext/date/tests/mktime_variation6.phpt
@@ -5,12 +5,12 @@ Test mktime() function : usage variation - Passing unexpected values to sixth ar
 /* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
  * Description: Get Unix timestamp for a date
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mktime() : usage variation -  unexpected values to sixth argument \$year***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -89,8 +89,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/strftime_basic.phpt b/ext/date/tests/strftime_basic.phpt
index 07f22af8233..340ac99e229 100644
--- a/ext/date/tests/strftime_basic.phpt
+++ b/ext/date/tests/strftime_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test strftime() function : basic functionality 
+Test strftime() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : basic functionality ***\n";
diff --git a/ext/date/tests/strftime_error.phpt b/ext/date/tests/strftime_error.phpt
index 19663798e33..fe51d234666 100644
--- a/ext/date/tests/strftime_error.phpt
+++ b/ext/date/tests/strftime_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test strftime() function : error conditions 
+Test strftime() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : error conditions ***\n";
diff --git a/ext/date/tests/strftime_variation1.phpt b/ext/date/tests/strftime_variation1.phpt
index 04b4819fe52..c75661dcb4f 100644
--- a/ext/date/tests/strftime_variation1.phpt
+++ b/ext/date/tests/strftime_variation1.phpt
@@ -3,9 +3,9 @@ Test strftime() function : usage variation - Passing unexpected values to first
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
diff --git a/ext/date/tests/strftime_variation10.phpt b/ext/date/tests/strftime_variation10.phpt
index 7d2a1b8fcd3..0a4059ee207 100644
--- a/ext/date/tests/strftime_variation10.phpt
+++ b/ext/date/tests/strftime_variation10.phpt
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
@@ -33,7 +33,7 @@ foreach($inputs as $key =>$value) {
 	echo "\n--$key--\n";
 	var_dump( strftime($value) );
 	var_dump( strftime($value, $timestamp) );
-}	
+}
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/strftime_variation11.phpt b/ext/date/tests/strftime_variation11.phpt
index 08d5634daad..55eb7226b81 100644
--- a/ext/date/tests/strftime_variation11.phpt
+++ b/ext/date/tests/strftime_variation11.phpt
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
diff --git a/ext/date/tests/strftime_variation12.phpt b/ext/date/tests/strftime_variation12.phpt
index b798f428f6b..07b1b3ec1c5 100644
--- a/ext/date/tests/strftime_variation12.phpt
+++ b/ext/date/tests/strftime_variation12.phpt
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
diff --git a/ext/date/tests/strftime_variation13.phpt b/ext/date/tests/strftime_variation13.phpt
index 3218558184a..887a14e7e70 100644
--- a/ext/date/tests/strftime_variation13.phpt
+++ b/ext/date/tests/strftime_variation13.phpt
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
@@ -35,7 +35,7 @@ foreach($inputs as $key =>$value) {
       echo "\n--$key--\n";
 	  var_dump( strftime($value) );
 	  var_dump( strftime($value, $timestamp) );
-}	  
+}
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/strftime_variation14.phpt b/ext/date/tests/strftime_variation14.phpt
index 7ccb7d283d5..80074acff8e 100644
--- a/ext/date/tests/strftime_variation14.phpt
+++ b/ext/date/tests/strftime_variation14.phpt
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
@@ -35,7 +35,7 @@ foreach($inputs as $key =>$value) {
       echo "\n--$key--\n";
 	  var_dump( strftime($value) );
 	  var_dump( strftime($value, $timestamp) );
-}	  
+}
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/strftime_variation15.phpt b/ext/date/tests/strftime_variation15.phpt
index 962afd89c56..41be0bfeafd 100644
--- a/ext/date/tests/strftime_variation15.phpt
+++ b/ext/date/tests/strftime_variation15.phpt
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
@@ -34,7 +34,7 @@ foreach($inputs as $key =>$value) {
       echo "\n--$key--\n";
 	  var_dump( strftime($value) );
 	  var_dump( strftime($value, $timestamp) );
-}	  
+}
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/strftime_variation16.phpt b/ext/date/tests/strftime_variation16.phpt
index 5103b3add8b..b74a6fe96f6 100644
--- a/ext/date/tests/strftime_variation16.phpt
+++ b/ext/date/tests/strftime_variation16.phpt
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
@@ -34,7 +34,7 @@ foreach($inputs as $key =>$value) {
       echo "\n--$key--\n";
 	  var_dump( strftime($value) );
 	  var_dump( strftime($value, $timestamp) );
-}	  
+}
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/strftime_variation17.phpt b/ext/date/tests/strftime_variation17.phpt
index 66527e3436f..05ff3a0c8af 100644
--- a/ext/date/tests/strftime_variation17.phpt
+++ b/ext/date/tests/strftime_variation17.phpt
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
diff --git a/ext/date/tests/strftime_variation18.phpt b/ext/date/tests/strftime_variation18.phpt
index 4340325dfa0..b0f21ff010c 100644
--- a/ext/date/tests/strftime_variation18.phpt
+++ b/ext/date/tests/strftime_variation18.phpt
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
diff --git a/ext/date/tests/strftime_variation19.phpt b/ext/date/tests/strftime_variation19.phpt
index f36d0a189e1..03970034d8a 100644
--- a/ext/date/tests/strftime_variation19.phpt
+++ b/ext/date/tests/strftime_variation19.phpt
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
@@ -33,7 +33,7 @@ foreach($inputs as $key =>$value) {
       echo "\n--$key--\n";
 	  var_dump( strftime($value) );
 	  var_dump( strftime($value, $timestamp) );
-}	  
+}
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/strftime_variation2.phpt b/ext/date/tests/strftime_variation2.phpt
index 599f5f41a54..a67f2ffb930 100644
--- a/ext/date/tests/strftime_variation2.phpt
+++ b/ext/date/tests/strftime_variation2.phpt
@@ -3,9 +3,9 @@ Test strftime() function : usage variation - Passing unexpected values to second
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
diff --git a/ext/date/tests/strftime_variation20.phpt b/ext/date/tests/strftime_variation20.phpt
index 336c6d2afbe..0fb11914d40 100644
--- a/ext/date/tests/strftime_variation20.phpt
+++ b/ext/date/tests/strftime_variation20.phpt
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
@@ -33,7 +33,7 @@ foreach($inputs as $key =>$value) {
       echo "\n--$key--\n";
 	  var_dump( strftime($value) );
 	  var_dump( strftime($value, $timestamp) );
-}	  
+}
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/strftime_variation21.phpt b/ext/date/tests/strftime_variation21.phpt
index 735659298a2..0eb0bea02b6 100644
--- a/ext/date/tests/strftime_variation21.phpt
+++ b/ext/date/tests/strftime_variation21.phpt
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
@@ -34,7 +34,7 @@ foreach($inputs as $key =>$value) {
       echo "\n--$key--\n";
 	  var_dump( strftime($value) );
 	  var_dump( strftime($value, $timestamp) );
-}	  
+}
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/strftime_variation22.phpt b/ext/date/tests/strftime_variation22.phpt
index 7b72ca51e1e..11dcf756947 100644
--- a/ext/date/tests/strftime_variation22.phpt
+++ b/ext/date/tests/strftime_variation22.phpt
@@ -12,9 +12,9 @@ if(!setlocale(LC_ALL, "POSIX")) {
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
@@ -38,7 +38,7 @@ foreach($inputs as $key =>$value) {
       echo "\n--$key--\n";
 	  var_dump( $value );
 	  var_dump( strftime($value, $timestamp) );
-}	  
+}
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/strftime_variation23.phpt b/ext/date/tests/strftime_variation23.phpt
index 94034b1749f..9ac6edfbbe0 100644
--- a/ext/date/tests/strftime_variation23.phpt
+++ b/ext/date/tests/strftime_variation23.phpt
@@ -5,9 +5,9 @@ Test strftime() function : usage variation - Checking large positive and negativ
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
diff --git a/ext/date/tests/strftime_variation3.phpt b/ext/date/tests/strftime_variation3.phpt
index 342cb76925f..69f747ca341 100644
--- a/ext/date/tests/strftime_variation3.phpt
+++ b/ext/date/tests/strftime_variation3.phpt
@@ -3,9 +3,9 @@ Test strftime() function : usage variation - Passing week related format strings
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
@@ -19,7 +19,7 @@ $inputs = array(
       'Abbreviated weekday name' => "%a",
       'Full weekday name' => "%A",
 	  'Week number of the year' => "%U",
-	  'Week number of the year in decimal number' => "%W",	
+	  'Week number of the year in decimal number' => "%W",
 );
 // loop through each element of the array for timestamp
 
diff --git a/ext/date/tests/strftime_variation4.phpt b/ext/date/tests/strftime_variation4.phpt
index 6236dd9e7f5..54df26a1c60 100644
--- a/ext/date/tests/strftime_variation4.phpt
+++ b/ext/date/tests/strftime_variation4.phpt
@@ -3,9 +3,9 @@ Test strftime() function : usage variation - Passing month related format string
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
diff --git a/ext/date/tests/strftime_variation5.phpt b/ext/date/tests/strftime_variation5.phpt
index 90f4e37ba3f..15ad8b08eab 100644
--- a/ext/date/tests/strftime_variation5.phpt
+++ b/ext/date/tests/strftime_variation5.phpt
@@ -3,9 +3,9 @@ Test strftime() function : usage variation - Passing date related format strings
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
@@ -19,7 +19,7 @@ $timestamp = mktime(8, 8, 8, 8, 8, 2008);
 $inputs = array(
 	  'Year as decimal number without a century' => "%y",
 	  'Year as decimal number including the century' => "%Y",
-	  'Time zone offset' => "%Z",	 	
+	  'Time zone offset' => "%Z",
 	  'Time zone offset' => "%z",
 );
 
diff --git a/ext/date/tests/strftime_variation6.phpt b/ext/date/tests/strftime_variation6.phpt
index 6713a198e97..f4413c6c79b 100644
--- a/ext/date/tests/strftime_variation6.phpt
+++ b/ext/date/tests/strftime_variation6.phpt
@@ -3,9 +3,9 @@ Test strftime() function : usage variation - Passing time related format strings
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
diff --git a/ext/date/tests/strftime_variation7.phpt b/ext/date/tests/strftime_variation7.phpt
index 67fd416ac03..29a94063819 100644
--- a/ext/date/tests/strftime_variation7.phpt
+++ b/ext/date/tests/strftime_variation7.phpt
@@ -3,9 +3,9 @@ Test strftime() function : usage variation - Passing day related format strings
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
diff --git a/ext/date/tests/strftime_variation8.phpt b/ext/date/tests/strftime_variation8.phpt
index af8089f9809..74cb90b6251 100644
--- a/ext/date/tests/strftime_variation8.phpt
+++ b/ext/date/tests/strftime_variation8.phpt
@@ -3,9 +3,9 @@ Test strftime() function : usage variation - Passing literal related strings to
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
diff --git a/ext/date/tests/strftime_variation9.phpt b/ext/date/tests/strftime_variation9.phpt
index eff030984f7..d9898e0294e 100644
--- a/ext/date/tests/strftime_variation9.phpt
+++ b/ext/date/tests/strftime_variation9.phpt
@@ -9,9 +9,9 @@ if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string strftime(string format [, int timestamp])
- * Description: Format a local time/date according to locale settings 
+ * Description: Format a local time/date according to locale settings
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strftime() : usage variation ***\n";
@@ -33,7 +33,7 @@ foreach($inputs as $key =>$value) {
 	echo "\n--$key--\n";
 	var_dump( strftime($value) );
 	var_dump( strftime($value, $timestamp) );
-}	
+}
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/strtotime-relative.phpt b/ext/date/tests/strtotime-relative.phpt
index 769cd2ec2e2..293223bb2dd 100644
--- a/ext/date/tests/strtotime-relative.phpt
+++ b/ext/date/tests/strtotime-relative.phpt
@@ -14,28 +14,28 @@ $offsets = array(
 	'86400 seconds',
 	'86401 seconds',
 	'112913 seconds',
-	
+
 	// offset around 7 days
 	'134 hours',
 	'167 hours',
 	'168 hours',
 	'169 hours',
 	'183 hours',
-	
+
 	// offset around 6 months
 	'178 days',
 	'179 days',
 	'180 days',
 	'183 days',
 	'184 days',
-	
+
 	// offset around 10 years
 	'115 months',
 	'119 months',
 	'120 months',
 	'121 months',
 	'128 months',
-	
+
 	// offset around 25 years (can't do much more reliably with strtotime)
 	'24 years',
 	'25 years',
@@ -46,7 +46,7 @@ foreach ($offsets AS $offset) {
 	foreach (array('+', '-') AS $direction) {
 		echo "$direction$offset: " . date(DATE_ISO8601, strtotime("$direction$offset", $base_time)) . "\n";
 	}
-}	
+}
 
 ?>
 --EXPECT--
diff --git a/ext/date/tests/strtotime_basic.phpt b/ext/date/tests/strtotime_basic.phpt
index 75f66978ab3..a0c6973a8bf 100644
--- a/ext/date/tests/strtotime_basic.phpt
+++ b/ext/date/tests/strtotime_basic.phpt
@@ -12,29 +12,29 @@ date_default_timezone_set('UTC');
 
 /*
  * This is parsed as the "first following Monday OR the current day if it is a Monday"
- */ 
+ */
 var_dump(date('Y-m-d', strtotime('1 Monday December 2008')));
 /*
- * This is parsed as the "second following Monday OR the first following 
+ * This is parsed as the "second following Monday OR the first following
  * Monday if the current day is a Monday"
  */
 var_dump(date('Y-m-d', strtotime('2 Monday December 2008')));
 /*
- * This is parsed as the "third following Monday OR the second following 
+ * This is parsed as the "third following Monday OR the second following
  * Monday if the current day is a Monday"
  */
 var_dump(date('Y-m-d', strtotime('3 Monday December 2008')));
 /*
  * This is parsed as the "first following Monday after the first Monday in December"
- */ 
+ */
 var_dump(date('Y-m-d', strtotime('first Monday December 2008')));
 /*
  * This is parsed as the "second following Monday after the first Monday in December"
- */ 
+ */
 var_dump(date('Y-m-d', strtotime('second Monday December 2008')));
 /*
  * This is parsed as the "third following Monday after the first Monday in December"
- */ 
+ */
 var_dump(date('Y-m-d', strtotime('third Monday December 2008')));
 ?>
 --EXPECTF--
diff --git a/ext/date/tests/sunfuncts.phpt b/ext/date/tests/sunfuncts.phpt
index 8309b69c51e..672b3affe2b 100644
--- a/ext/date/tests/sunfuncts.phpt
+++ b/ext/date/tests/sunfuncts.phpt
@@ -9,7 +9,7 @@ for($a=1;$a<=12;$a++){
 	echo date_sunrise(mktime(1,1,1,$a,1,2003),SUNFUNCS_RET_TIMESTAMP,31.76670,35.23330,90.83,2)." ";
 	echo date_sunrise(mktime(1,1,1,$a,1,2003),SUNFUNCS_RET_STRING,31.76670,35.23330,90.83,2)." ";
 	echo date_sunrise(mktime(1,1,1,$a,1,2003),SUNFUNCS_RET_DOUBLE,31.76670,35.23330,90.83,2)."\n";
-	
+
 	echo date_sunset(mktime(1,1,1,$a,1,2003),SUNFUNCS_RET_TIMESTAMP,31.76670,35.23330,90.83,2)." ";
 	echo date_sunset(mktime(1,1,1,$a,1,2003),SUNFUNCS_RET_STRING,31.76670,35.23330,90.83,2)." ";
 	echo date_sunset(mktime(1,1,1,$a,1,2003),SUNFUNCS_RET_DOUBLE,31.76670,35.23330,90.83,2)."\n";
diff --git a/ext/date/tests/time_basic.phpt b/ext/date/tests/time_basic.phpt
index 116c0a4175e..7b93e9dac2a 100644
--- a/ext/date/tests/time_basic.phpt
+++ b/ext/date/tests/time_basic.phpt
@@ -2,10 +2,10 @@
 Test return type and value for expected input time()
 --FILE--
 <?php
-/* 
+/*
  * proto int time(void)
  * Function is implemented in ext/date/php_date.c
-*/ 
+*/
 
 var_dump(time());
 
diff --git a/ext/date/tests/time_error.phpt b/ext/date/tests/time_error.phpt
index 853c1babe78..5f6f52f81d9 100644
--- a/ext/date/tests/time_error.phpt
+++ b/ext/date/tests/time_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for time()
 --FILE--
 <?php
-/* 
+/*
  * proto int time(void)
  * Function is implemented in ext/date/php_date.c
-*/ 
+*/
 
 // Extra arguments are ignored
 $extra_arg = 1;
diff --git a/ext/date/tests/timezone-configuration.phpt b/ext/date/tests/timezone-configuration.phpt
index c70d6456d04..b3958530330 100644
--- a/ext/date/tests/timezone-configuration.phpt
+++ b/ext/date/tests/timezone-configuration.phpt
@@ -1,6 +1,6 @@
 --TEST--
 timezone configuration [1]
---INI-- 		
+--INI--
 date.timezone=GMT
 --FILE--
 <?php
diff --git a/ext/date/tests/timezone_abbreviations_list_basic1.phpt b/ext/date/tests/timezone_abbreviations_list_basic1.phpt
index c3510f1e649..36b6bbbfc0f 100644
--- a/ext/date/tests/timezone_abbreviations_list_basic1.phpt
+++ b/ext/date/tests/timezone_abbreviations_list_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test timezone_abbreviations_list() function : basic functionality 
+Test timezone_abbreviations_list() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array timezone_abbreviations_list  ( void  )
@@ -10,7 +10,7 @@ Test timezone_abbreviations_list() function : basic functionality
 
 echo "*** Testing timezone_abbreviations_list() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("GMT");
 
 $abbr = timezone_abbreviations_list();
@@ -19,7 +19,7 @@ var_dump( gettype($abbr) );
 var_dump( count($abbr) );
 
 echo "\n-- Format a sample entry --\n";
-var_dump( $abbr["acst"] );	
+var_dump( $abbr["acst"] );
 
 ?>
 ===DONE===
diff --git a/ext/date/tests/timezone_identifiers_list_basic1.phpt b/ext/date/tests/timezone_identifiers_list_basic1.phpt
index 4476da20dd8..3d591b5e7eb 100644
--- a/ext/date/tests/timezone_identifiers_list_basic1.phpt
+++ b/ext/date/tests/timezone_identifiers_list_basic1.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test timezone_identifiers_list() function : basic functionality 
+Test timezone_identifiers_list() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array timezone_identifiers_list  ( void )
- * Description: Returns numerically index array with all timezone identifiers  
+ * Description: Returns numerically index array with all timezone identifiers
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing timezone_identifiers_list() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("GMT");
 
 $zones = timezone_identifiers_list();
diff --git a/ext/date/tests/timezone_name_from_abbr_basic1.phpt b/ext/date/tests/timezone_name_from_abbr_basic1.phpt
index b6a0bd94f7a..8ddb60d3303 100644
--- a/ext/date/tests/timezone_name_from_abbr_basic1.phpt
+++ b/ext/date/tests/timezone_name_from_abbr_basic1.phpt
@@ -1,19 +1,19 @@
 --TEST--
-Test timezone_name_from_abbr() function : basic functionality 
+Test timezone_name_from_abbr() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string timezone_name_from_abbr  ( string $abbr  [, int $gmtOffset= -1  [, int $isdst= -1  ]] )
  * Description: Returns the timezone name from abbrevation
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing timezone_name_from_abbr() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
-echo "-- Tests with special cases first - no lookup needed --\n"; 
+echo "-- Tests with special cases first - no lookup needed --\n";
 var_dump( timezone_name_from_abbr("GMT") );
 var_dump( timezone_name_from_abbr("UTC") );
 
@@ -21,17 +21,17 @@ echo "-- Lookup with just name --\n";
 var_dump( timezone_name_from_abbr("CET") );
 var_dump( timezone_name_from_abbr("EDT") );
 
-echo "-- Lookup with name and offset--\n"; 
+echo "-- Lookup with name and offset--\n";
 var_dump( timezone_name_from_abbr("ADT", -10800) );
 var_dump( timezone_name_from_abbr("ADT", 14400) );
 
-echo "-- Tests without valid name - uses gmtOffset and isdst to find match --\n"; 
+echo "-- Tests without valid name - uses gmtOffset and isdst to find match --\n";
 var_dump( timezone_name_from_abbr("", 3600, 1) );
 var_dump( timezone_name_from_abbr("FOO", -7200, 1) );
 var_dump( timezone_name_from_abbr("", -14400, 1) );
 var_dump( timezone_name_from_abbr("", -14400, 0) );
 
-echo "-- Tests with invalid offsets --\n"; 
+echo "-- Tests with invalid offsets --\n";
 var_dump( timezone_name_from_abbr("", 5400) ); // offset = 1.5 hrs
 var_dump( timezone_name_from_abbr("", 62400) ); // offset = 24 hrs
 ?>
diff --git a/ext/date/tests/timezone_name_from_abbr_error.phpt b/ext/date/tests/timezone_name_from_abbr_error.phpt
index 640caaec543..75e09ede615 100644
--- a/ext/date/tests/timezone_name_from_abbr_error.phpt
+++ b/ext/date/tests/timezone_name_from_abbr_error.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test timezone_name_from_abbr() function : error conditions 
+Test timezone_name_from_abbr() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string timezone_name_from_abbr  ( string $abbr  [, int $gmtOffset= -1  [, int $isdst= -1  ]] )
  * Description: Returns the timezone name from abbrevation
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 error_reporting(E_ALL | E_STRICT);
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing timezone_name_from_abbr() : error conditions ***\n";
diff --git a/ext/date/tests/timezone_name_from_abbr_variation1.phpt b/ext/date/tests/timezone_name_from_abbr_variation1.phpt
index 4825d09f5b2..f2702fe2c94 100644
--- a/ext/date/tests/timezone_name_from_abbr_variation1.phpt
+++ b/ext/date/tests/timezone_name_from_abbr_variation1.phpt
@@ -5,12 +5,12 @@ Test timezone_name_from_abbr() function : usage variation - Passing unexpected v
 /* Prototype  : string timezone_name_from_abbr  ( string $abbr  [, int $gmtOffset= -1  [, int $isdst= -1  ]] )
  * Description: Returns the timezone name from abbrevation
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing timezone_name_from_abbr() : usage variation -  unexpected values to first argument \$abbr***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -89,8 +89,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/timezone_name_from_abbr_variation2.phpt b/ext/date/tests/timezone_name_from_abbr_variation2.phpt
index 5b4b671b813..68b79675b07 100644
--- a/ext/date/tests/timezone_name_from_abbr_variation2.phpt
+++ b/ext/date/tests/timezone_name_from_abbr_variation2.phpt
@@ -5,12 +5,12 @@ Test timezone_name_from_abbr() function : usage variation - Passing unexpected v
 /* Prototype  : string timezone_name_from_abbr  ( string $abbr  [, int $gmtOffset= -1  [, int $isdst= -1  ]] )
  * Description: Returns the timezone name from abbrevation
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing timezone_name_from_abbr() : usage variation -  unexpected values to second argument \$gmtOffset***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -89,8 +89,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/timezone_name_from_abbr_variation3.phpt b/ext/date/tests/timezone_name_from_abbr_variation3.phpt
index 803afbaf752..180f2deadac 100644
--- a/ext/date/tests/timezone_name_from_abbr_variation3.phpt
+++ b/ext/date/tests/timezone_name_from_abbr_variation3.phpt
@@ -5,12 +5,12 @@ Test timezone_name_from_abbr() function : usage variation - Passing unexpected v
 /* Prototype  : string timezone_name_from_abbr  ( string $abbr  [, int $gmtOffset= -1  [, int $isdst= -1  ]] )
  * Description: Returns the timezone name from abbrevation
  * Source code: ext/date/php_date.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing timezone_name_from_abbr() : usage variation -  unexpected values to third argument \$isdst***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -89,8 +89,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/timezone_name_get_error.phpt b/ext/date/tests/timezone_name_get_error.phpt
index 3c33e33f4d6..ae8fa39ff9c 100644
--- a/ext/date/tests/timezone_name_get_error.phpt
+++ b/ext/date/tests/timezone_name_get_error.phpt
@@ -1,20 +1,20 @@
 --TEST--
-Test timezone_name_get() function : error conditions 
+Test timezone_name_get() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string timezone_name_get ( DateTime $object  )
  * Description: Returns the name of the timezone
  * Source code: ext/date/php_date.c
- * Alias to functions: DateTimeZone::getName() 
+ * Alias to functions: DateTimeZone::getName()
  */
- 
-// Set timezone 
+
+// Set timezone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing timezone_name_get() : error conditions ***\n";
 
 echo "\n-- Testing timezone_name_get() function with zero arguments --\n";
-var_dump( timezone_name_get() ); 
+var_dump( timezone_name_get() );
 
 echo "\n-- Testing date_timezone_set() function with more than expected no. of arguments --\n";
 $datetime = date_create("2009-01-30 17:57:32");
@@ -23,11 +23,11 @@ var_dump( timezone_name_get($datetime,  $extra_arg) );
 
 echo "\n-- Testing timezone_name_get() function with an invalid values for \$object argument --\n";
 $invalid_obj = new stdClass();
-var_dump( timezone_name_get($invalid_obj) );  
+var_dump( timezone_name_get($invalid_obj) );
 $invalid_obj = 10;
 var_dump( timezone_name_get($invalid_obj) );
 $invalid_obj = null;
-var_dump( timezone_name_get($invalid_obj) ); 
+var_dump( timezone_name_get($invalid_obj) );
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/date/tests/timezone_offset_get_basic1.phpt b/ext/date/tests/timezone_offset_get_basic1.phpt
index aa658e94223..90fc4bb9a35 100644
--- a/ext/date/tests/timezone_offset_get_basic1.phpt
+++ b/ext/date/tests/timezone_offset_get_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test timezone_offset_get() function : basic functionality 
+Test timezone_offset_get() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int timezone_offset_get  ( DateTimeZone $object  , DateTime $datetime  )
@@ -10,7 +10,7 @@ Test timezone_offset_get() function : basic functionality
 
 echo "*** Testing timezone_offset_get() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("GMT");
 
 $tz = timezone_open("Europe/London");
diff --git a/ext/date/tests/timezone_offset_get_variation1.phpt b/ext/date/tests/timezone_offset_get_variation1.phpt
index edeeb7fea75..7afda2ad333 100644
--- a/ext/date/tests/timezone_offset_get_variation1.phpt
+++ b/ext/date/tests/timezone_offset_get_variation1.phpt
@@ -7,10 +7,10 @@ Test timezone_offset_get() function : usage variation - Passing unexpected value
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTimeZone::getOffset()
  */
- 
+
 echo "*** Testing timezone_offset_get() : usage variation -  unexpected values to first argument \$object***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 set_error_handler('handler');
@@ -98,8 +98,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/timezone_offset_get_variation2.phpt b/ext/date/tests/timezone_offset_get_variation2.phpt
index 2d007d5e705..86b9f39f8d1 100644
--- a/ext/date/tests/timezone_offset_get_variation2.phpt
+++ b/ext/date/tests/timezone_offset_get_variation2.phpt
@@ -7,10 +7,10 @@ Test timezone_offset_get() function : usage variation - Passing unexpected value
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTimeZone::getOffset()
  */
- 
+
 echo "*** Testing timezone_offset_get() : usage variation -  unexpected values to second argument \$datetime***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 set_error_handler('handler');
@@ -98,8 +98,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/timezone_open_basic1.phpt b/ext/date/tests/timezone_open_basic1.phpt
index abd016b35a5..ee54b5feb48 100644
--- a/ext/date/tests/timezone_open_basic1.phpt
+++ b/ext/date/tests/timezone_open_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test timezone_open() function : basic functionality 
+Test timezone_open() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : DateTimeZone timezone_open  ( string $timezone  )
diff --git a/ext/date/tests/timezone_open_error.phpt b/ext/date/tests/timezone_open_error.phpt
index 16c5f0b09f7..a2a6473b769 100644
--- a/ext/date/tests/timezone_open_error.phpt
+++ b/ext/date/tests/timezone_open_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test timezone_open() function : error conditions 
+Test timezone_open() function : error conditions
 --FILE--
 <?php
 /* Prototype  : DateTimeZone timezone_open  ( string $timezone  )
@@ -7,7 +7,7 @@ Test timezone_open() function : error conditions
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTime::__construct()
  */
- 
+
 echo "*** Testing timezone_open() : error conditions ***\n";
 
 echo "\n-- Testing timezone_open() function with zero arguments --\n";
diff --git a/ext/date/tests/timezone_open_variation1.phpt b/ext/date/tests/timezone_open_variation1.phpt
index eb4d4b782ec..d9afa4700dc 100644
--- a/ext/date/tests/timezone_open_variation1.phpt
+++ b/ext/date/tests/timezone_open_variation1.phpt
@@ -10,7 +10,7 @@ Test timezone_open function : usage variation - Passing unexpected values to fir
 
 echo "*** Testing timezone_open() : usage variation -  unexpected values to first argument \$timezone***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -88,15 +88,15 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
 foreach($inputs as $variation =>$timezone) {
     echo "\n-- $variation --\n";
 	var_dump( timezone_open($timezone) );
-      
+
 };
 
 // closing the resource
diff --git a/ext/date/tests/timezone_transitions_get_basic1.phpt b/ext/date/tests/timezone_transitions_get_basic1.phpt
index 97c5f0ccc10..3189e350741 100644
--- a/ext/date/tests/timezone_transitions_get_basic1.phpt
+++ b/ext/date/tests/timezone_transitions_get_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test timezone_transitions_get() function : basic functionality 
+Test timezone_transitions_get() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array timezone_transitions_get  ( DateTimeZone $object, [ int $timestamp_begin  [, int $timestamp_end  ]]  )
@@ -10,7 +10,7 @@ Test timezone_transitions_get() function : basic functionality
 
 echo "*** Testing timezone_transitions_get() : basic functionality ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 // Create a DateTimeZone object
@@ -22,7 +22,7 @@ echo "\n-- Get all 60s transitions --\n";
 $tran = timezone_transitions_get($tz, -306972000, -37241999);
 var_dump( gettype($tran) );
 
-echo "\n-- Total number of transitions: " . count($tran). " --\n"; 
+echo "\n-- Total number of transitions: " . count($tran). " --\n";
 
 echo "\n-- Format a sample entry pfor Spring 1963 --\n";
 var_dump( $tran[6] );
diff --git a/ext/date/tests/timezone_transitions_get_error.phpt b/ext/date/tests/timezone_transitions_get_error.phpt
index 142cfda2ff1..0a6dec8b32e 100644
--- a/ext/date/tests/timezone_transitions_get_error.phpt
+++ b/ext/date/tests/timezone_transitions_get_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test timezone_transitions_get() function : error conditions 
+Test timezone_transitions_get() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array timezone_transitions_get  ( DateTimeZone $object, [ int $timestamp_begin  [, int $timestamp_end  ]]  )
@@ -7,11 +7,11 @@ Test timezone_transitions_get() function : error conditions
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTimeZone::getTransitions()
  */
- 
-//Set the default time zone 
+
+//Set the default time zone
 date_default_timezone_set("GMT");
 $tz = timezone_open("Europe/London");
- 
+
 echo "*** Testing timezone_transitions_get() : error conditions ***\n";
 
 echo "\n-- Testing timezone_transitions_get() function with zero arguments --\n";
@@ -25,11 +25,11 @@ var_dump( timezone_transitions_get($tz, $timestamp_begin, $timestamp_end, $extra
 
 echo "\n-- Testing timezone_transitions_get() function with an invalid values for \$object argument --\n";
 $invalid_obj = new stdClass();
-var_dump( timezone_transitions_get($invalid_obj) );  
+var_dump( timezone_transitions_get($invalid_obj) );
 $invalid_obj = 10;
 var_dump( timezone_transitions_get($invalid_obj) );
 $invalid_obj = null;
-var_dump( timezone_transitions_get($invalid_obj) ); 
+var_dump( timezone_transitions_get($invalid_obj) );
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/date/tests/timezone_transitions_get_variation1.phpt b/ext/date/tests/timezone_transitions_get_variation1.phpt
index 9ebe2861e60..01f7713e9f9 100644
--- a/ext/date/tests/timezone_transitions_get_variation1.phpt
+++ b/ext/date/tests/timezone_transitions_get_variation1.phpt
@@ -7,10 +7,10 @@ Test timezone_transitions_get() function : usage variation - Passing unexpected
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTimeZone::getTransitions()
  */
- 
+
 echo "*** Testing timezone_transitions_get() : usage variation -  unexpected values to first argument \$object***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/timezone_transitions_get_variation2.phpt b/ext/date/tests/timezone_transitions_get_variation2.phpt
index 07a394e9f95..95d5b481fe5 100644
--- a/ext/date/tests/timezone_transitions_get_variation2.phpt
+++ b/ext/date/tests/timezone_transitions_get_variation2.phpt
@@ -7,10 +7,10 @@ Test timezone_transitions_get() function : usage variation - Passing unexpected
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTimeZone::getTransitions()
  */
- 
+
 echo "*** Testing timezone_transitions_get() : usage variation -  unexpected values to first argument \$timestamp_begin ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/timezone_transitions_get_variation3.phpt b/ext/date/tests/timezone_transitions_get_variation3.phpt
index 0d2889c3592..5e4522e04b7 100644
--- a/ext/date/tests/timezone_transitions_get_variation3.phpt
+++ b/ext/date/tests/timezone_transitions_get_variation3.phpt
@@ -7,10 +7,10 @@ Test timezone_transitions_get() function : usage variation - Passing unexpected
  * Source code: ext/date/php_date.c
  * Alias to functions: DateTimeZone::getTransitions()
  */
- 
+
 echo "*** Testing timezone_transitions_get() : usage variation -  unexpected values to first argument \$timestamp_end ***\n";
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 //get an unset variable
@@ -90,8 +90,8 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      // resource 
+
+      // resource
       'resource' => $file_handle
 );
 
diff --git a/ext/date/tests/timezone_version_get.phpt b/ext/date/tests/timezone_version_get.phpt
index e0760042896..2c75de7ebc7 100644
--- a/ext/date/tests/timezone_version_get.phpt
+++ b/ext/date/tests/timezone_version_get.phpt
@@ -4,7 +4,7 @@ Test the basics to function timezone_version_get().
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 --INI--
 date.timezone = UTC;
-date_default_timezone_set("America/Sao_Paulo"); 
+date_default_timezone_set("America/Sao_Paulo");
 --FILE--
 <?php
 var_dump(timezone_version_get());
diff --git a/ext/date/tests/timezone_version_get_basic1.phpt b/ext/date/tests/timezone_version_get_basic1.phpt
index 27224e3d44e..ba0ac00715b 100644
--- a/ext/date/tests/timezone_version_get_basic1.phpt
+++ b/ext/date/tests/timezone_version_get_basic1.phpt
@@ -1,12 +1,12 @@
 --TEST--
-timezone_version_get: Test that timezone_location_get returns a date concatenated with a dot and a version number 
+timezone_version_get: Test that timezone_location_get returns a date concatenated with a dot and a version number
 --CREDITS--
 Rodrigo Wanderley de Melo Cardoso <rodrigogepem@gmail.com>
 #PHPTestFest2014 São Paulo 2014-07-05
 --INI--
 date.timezone=UTC
 --FILE--
-<?php $versionTimezone = timezone_version_get(); 
+<?php $versionTimezone = timezone_version_get();
 echo $versionTimezone; ?>
 --EXPECTREGEX--
 ^[12][0-9]{3}.[0-9]+$
\ No newline at end of file
diff --git a/ext/dba/tests/bug36436.phpt b/ext/dba/tests/bug36436.phpt
index 19254df3c77..40cc5283cd0 100644
--- a/ext/dba/tests/bug36436.phpt
+++ b/ext/dba/tests/bug36436.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #36436 (DBA problem with Berkeley DB4)
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'db4';
 	require_once(dirname(__FILE__) .'/skipif.inc');
 ?>
@@ -26,8 +26,8 @@ dba_close($db);
 ?>
 ===DONE===
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 resource(%d) of type (dba persistent)
diff --git a/ext/dba/tests/bug38698.phpt b/ext/dba/tests/bug38698.phpt
index 1d1ed674fef..254d3e37c62 100644
--- a/ext/dba/tests/bug38698.phpt
+++ b/ext/dba/tests/bug38698.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #38698 (Bug #38698 for some keys cdbmake creates corrupted db and cdb can't read valid db)
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'cdb_make';
 	require_once(dirname(__FILE__) .'/skipif.inc');
 ?>
diff --git a/ext/dba/tests/bug48240.phpt b/ext/dba/tests/bug48240.phpt
index 5a72073f360..547c7a9ccc5 100644
--- a/ext/dba/tests/bug48240.phpt
+++ b/ext/dba/tests/bug48240.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #48240 (DBA Segmentation fault dba_nextkey)
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'db4';
 	require_once(dirname(__FILE__) .'/skipif.inc');
 ?>
@@ -20,8 +20,8 @@ dba_close($db);
 ?>
 ===DONE===
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECT--
 bool(false)
diff --git a/ext/dba/tests/bug49125.phpt b/ext/dba/tests/bug49125.phpt
index e06495a109d..c1ecc50846e 100644
--- a/ext/dba/tests/bug49125.phpt
+++ b/ext/dba/tests/bug49125.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #49125 (Error in dba_exists C code)
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'db4';
 	require_once(dirname(__FILE__) .'/skipif.inc');
 ?>
@@ -23,8 +23,8 @@ dba_close($db);
 
 ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECT--
 bool(true)
diff --git a/ext/dba/tests/bug62490.phpt b/ext/dba/tests/bug62490.phpt
index 325dd345541..41a9cdead7e 100644
--- a/ext/dba/tests/bug62490.phpt
+++ b/ext/dba/tests/bug62490.phpt
@@ -29,7 +29,7 @@ var_dump(dba_delete("a", $dba));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 include "clean.inc";
 ?>
 --EXPECT--
diff --git a/ext/dba/tests/bug65708.phpt b/ext/dba/tests/bug65708.phpt
index b77138f6ed4..ede2511c9eb 100644
--- a/ext/dba/tests/bug65708.phpt
+++ b/ext/dba/tests/bug65708.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #65708 (dba functions cast $key param to string in-place, bypassing copy on write)
 --SKIPIF--
-<?php 
+<?php
 	require_once(dirname(__FILE__) .'/skipif.inc');
 ?>
 --FILE--
@@ -28,8 +28,8 @@ dba_close($db);
 
 ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECT--
 integer
diff --git a/ext/dba/tests/bug72157.phpt b/ext/dba/tests/bug72157.phpt
index 7b3217012af..3443f4bb40c 100644
--- a/ext/dba/tests/bug72157.phpt
+++ b/ext/dba/tests/bug72157.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72157 (use-after-free caused by dba_open)
 --SKIPIF--
-<?php 
+<?php
 	require_once(dirname(__FILE__) .'/skipif.inc');
 ?>
 --FILE--
diff --git a/ext/dba/tests/bug72885.phpt b/ext/dba/tests/bug72885.phpt
index eb6777841e7..bef95fd5c8e 100644
--- a/ext/dba/tests/bug72885.phpt
+++ b/ext/dba/tests/bug72885.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72885 flatfile: dba_fetch() fails to read replaced entry
 --SKIPIF--
-<?php 
+<?php
 $handler = "flatfile";
 require_once(dirname(__FILE__) .'/skipif.inc');
 ?>
diff --git a/ext/dba/tests/dba001.phpt b/ext/dba/tests/dba001.phpt
index b63829abbf2..e5a8f58f85c 100644
--- a/ext/dba/tests/dba001.phpt
+++ b/ext/dba/tests/dba001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA File Creation Test
 --SKIPIF--
-<?php 
+<?php
 	require_once(dirname(__FILE__) .'/skipif.inc');
 	die("info $HND handler used");
 ?>
@@ -17,8 +17,8 @@ DBA File Creation Test
     }
 ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba002.phpt b/ext/dba/tests/dba002.phpt
index e60e7336036..051c51b9b5e 100644
--- a/ext/dba/tests/dba002.phpt
+++ b/ext/dba/tests/dba002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA Insert/Fetch Test
 --SKIPIF--
-<?php 
+<?php
 	require_once(dirname(__FILE__) .'/skipif.inc');
 	die("info $HND handler used");
 ?>
@@ -18,8 +18,8 @@ DBA Insert/Fetch Test
 	}
 ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba003.phpt b/ext/dba/tests/dba003.phpt
index a027b5356ed..6d1e26bfacc 100644
--- a/ext/dba/tests/dba003.phpt
+++ b/ext/dba/tests/dba003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA Insert/Replace/Fetch Test
 --SKIPIF--
-<?php 
+<?php
 	require_once(dirname(__FILE__) .'/skipif.inc');
 	die("info $HND handler used");
 ?>
@@ -20,8 +20,8 @@ DBA Insert/Replace/Fetch Test
 	}
 ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba004.phpt b/ext/dba/tests/dba004.phpt
index 6e7180cf666..69bc717ea46 100644
--- a/ext/dba/tests/dba004.phpt
+++ b/ext/dba/tests/dba004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA Multiple Insert/Fetch Test
 --SKIPIF--
-<?php 
+<?php
 	require_once(dirname(__FILE__) .'/skipif.inc');
 	die("info $HND handler used");
 ?>
@@ -24,8 +24,8 @@ DBA Multiple Insert/Fetch Test
 	}
 ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba005.phpt b/ext/dba/tests/dba005.phpt
index 68ad6002207..4e43beab193 100644
--- a/ext/dba/tests/dba005.phpt
+++ b/ext/dba/tests/dba005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA FirstKey/NextKey Loop Test With 5 Items
 --SKIPIF--
-<?php 
+<?php
 	require_once(dirname(__FILE__) .'/skipif.inc');
 	die("info $HND handler used");
 ?>
@@ -31,8 +31,8 @@ DBA FirstKey/NextKey Loop Test With 5 Items
 	}
 ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba006.phpt b/ext/dba/tests/dba006.phpt
index a3fc738fac0..7f359a2fd80 100644
--- a/ext/dba/tests/dba006.phpt
+++ b/ext/dba/tests/dba006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA FirstKey/NextKey with 2 deletes
 --SKIPIF--
-<?php 
+<?php
 	require_once(dirname(__FILE__) .'/skipif.inc');
 	die("info $HND handler used");
 ?>
@@ -33,8 +33,8 @@ DBA FirstKey/NextKey with 2 deletes
 	}
 ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba007.phpt b/ext/dba/tests/dba007.phpt
index 2519fdc5974..fbd78212f22 100644
--- a/ext/dba/tests/dba007.phpt
+++ b/ext/dba/tests/dba007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA Multiple File Creation Test
 --SKIPIF--
-<?php 
+<?php
 	require_once(dirname(__FILE__) .'/skipif.inc');
 	if (!function_exists('dba_list')) die('skip dba_list() not available');
 	die("info $HND handler used");
@@ -10,8 +10,8 @@ DBA Multiple File Creation Test
 <?php
 	require_once(dirname(__FILE__) .'/test.inc');
 	echo "database handler: $handler\n";
-	$db_file1 = $db_filename1 = dirname(__FILE__).'/test1.dbm'; 
-	$db_file2 = $db_filename2 = dirname(__FILE__).'/test2.dbm'; 
+	$db_file1 = $db_filename1 = dirname(__FILE__).'/test1.dbm';
+	$db_file2 = $db_filename2 = dirname(__FILE__).'/test2.dbm';
 	if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
     	echo "database file created\n";
 	} else {
@@ -34,8 +34,8 @@ DBA Multiple File Creation Test
 	@unlink($db_filename2);
 ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba008.phpt b/ext/dba/tests/dba008.phpt
index f7015d921f2..9344d5823f7 100644
--- a/ext/dba/tests/dba008.phpt
+++ b/ext/dba/tests/dba008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA magic_quotes_runtime Test
 --SKIPIF--
-<?php 
+<?php
 	die('skip, magic_quotes removed');
 	require_once(dirname(__FILE__) .'/skipif.inc');
 	die("info $HND handler used");
@@ -26,8 +26,8 @@ DBA magic_quotes_runtime Test
 	}
 ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba009.phpt b/ext/dba/tests/dba009.phpt
index 698657b2a38..3da48b0cc7e 100644
--- a/ext/dba/tests/dba009.phpt
+++ b/ext/dba/tests/dba009.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA dba_popen Test
 --SKIPIF--
-<?php 
+<?php
 	require_once(dirname(__FILE__) .'/skipif.inc');
 	print("info $HND handler used");
 ?>
@@ -25,8 +25,8 @@ DBA dba_popen Test
 	}
 ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba010.phpt b/ext/dba/tests/dba010.phpt
index c818373f1f0..d411c56adb1 100644
--- a/ext/dba/tests/dba010.phpt
+++ b/ext/dba/tests/dba010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA with array keys
 --SKIPIF--
-<?php 
+<?php
 	require_once(dirname(__FILE__) .'/skipif.inc');
 	die("info $HND handler used");
 ?>
@@ -36,8 +36,8 @@ if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba011.phpt b/ext/dba/tests/dba011.phpt
index 71164be3c5a..0891a30f482 100644
--- a/ext/dba/tests/dba011.phpt
+++ b/ext/dba/tests/dba011.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA argument tests
 --SKIPIF--
-<?php 
+<?php
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
 ?>
@@ -17,8 +17,8 @@ var_dump(dba_open($db_file, 'nq', $handler));
 var_dump(dba_open($db_file, 'n', $handler, 2, 3, 4, 5, 6, 7, 8));
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: flatfile
diff --git a/ext/dba/tests/dba012.phpt b/ext/dba/tests/dba012.phpt
index 821c4e2aba6..612d543249b 100644
--- a/ext/dba/tests/dba012.phpt
+++ b/ext/dba/tests/dba012.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA dba.default_handler tests
 --SKIPIF--
-<?php 
+<?php
 $handler = "flatfile";
 require_once(dirname(__FILE__) .'/skipif.inc');
 ?>
@@ -27,8 +27,8 @@ var_dump(dba_open($db_filename, 'n'));
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: flatfile
diff --git a/ext/dba/tests/dba013.phpt b/ext/dba/tests/dba013.phpt
index 8e37b263154..661275c07de 100644
--- a/ext/dba/tests/dba013.phpt
+++ b/ext/dba/tests/dba013.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA with array key with empty array
 --SKIPIF--
-<?php 
+<?php
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
 ?>
@@ -18,8 +18,8 @@ if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba014.phpt b/ext/dba/tests/dba014.phpt
index f08fff25d7f..799fe830a5a 100644
--- a/ext/dba/tests/dba014.phpt
+++ b/ext/dba/tests/dba014.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA with array key with array containing too many elements
 --SKIPIF--
-<?php 
+<?php
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
 ?>
@@ -18,8 +18,8 @@ if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba015.phpt b/ext/dba/tests/dba015.phpt
index dbb683dcecb..4cd0ea101a9 100644
--- a/ext/dba/tests/dba015.phpt
+++ b/ext/dba/tests/dba015.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA with persistent connections
 --SKIPIF--
-<?php 
+<?php
 $handler = "flatfile";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -50,8 +50,8 @@ echo dba_fetch("key2", $db_file1), "\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: flatfile
diff --git a/ext/dba/tests/dba016.phpt b/ext/dba/tests/dba016.phpt
index 29726ac11ab..aa5ce3e2a55 100644
--- a/ext/dba/tests/dba016.phpt
+++ b/ext/dba/tests/dba016.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA lock modifier error message test
 --SKIPIF--
-<?php 
+<?php
 $handler = "flatfile";
 require_once(dirname(__FILE__) .'/skipif.inc');
 ?>
diff --git a/ext/dba/tests/dba_cdb.phpt b/ext/dba/tests/dba_cdb.phpt
index b9ef68f2be0..998fc416387 100644
--- a/ext/dba/tests/dba_cdb.phpt
+++ b/ext/dba/tests/dba_cdb.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA CDB handler test
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'cdb';
 	require_once(dirname(__FILE__) .'/skipif.inc');
 	die('info CDB does not support replace or delete');
@@ -14,8 +14,8 @@ DBA CDB handler test
 ?>
 ===DONE===
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECT--
 database handler: cdb
diff --git a/ext/dba/tests/dba_cdb_001.phpt b/ext/dba/tests/dba_cdb_001.phpt
index 43727543847..a0dc438636e 100644
--- a/ext/dba/tests/dba_cdb_001.phpt
+++ b/ext/dba/tests/dba_cdb_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA CDB handler test
 --SKIPIF--
-<?php 
+<?php
 $handler = 'cdb';
 require_once(dirname(__FILE__) .'/skipif.inc');
 die('info CDB does not support replace or delete');
@@ -63,8 +63,8 @@ else {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 Test 0
diff --git a/ext/dba/tests/dba_cdb_make.phpt b/ext/dba/tests/dba_cdb_make.phpt
index 6a5f2dd9c36..0a1fd79b36d 100644
--- a/ext/dba/tests/dba_cdb_make.phpt
+++ b/ext/dba/tests/dba_cdb_make.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA CDB_MAKE handler test
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'cdb_make';
 	require_once(dirname(__FILE__) .'/skipif.inc');
 	die('info CDB_MAKE does not support reading');
@@ -31,8 +31,8 @@ DBA CDB_MAKE handler test
 	}
 ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECT--
 database handler: cdb_make
diff --git a/ext/dba/tests/dba_cdb_read.phpt b/ext/dba/tests/dba_cdb_read.phpt
index a782a572e9c..9d65f8b7323 100644
--- a/ext/dba/tests/dba_cdb_read.phpt
+++ b/ext/dba/tests/dba_cdb_read.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA CDB handler test (read only)
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'cdb_make';
 	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
@@ -15,7 +15,7 @@ DBA CDB handler test (read only)
 		$a = dba_firstkey($db_file);
 		$count= 0;
 		$keys = $a;
-		while($a) {     
+		while($a) {
 			$a = dba_nextkey($db_file);
 			$keys .= $a;
 			$count++;
diff --git a/ext/dba/tests/dba_db1.phpt b/ext/dba/tests/dba_db1.phpt
index d0e530e026f..01d96feec58 100644
--- a/ext/dba/tests/dba_db1.phpt
+++ b/ext/dba/tests/dba_db1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB1 handler test
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'db1';
 	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
diff --git a/ext/dba/tests/dba_db2.phpt b/ext/dba/tests/dba_db2.phpt
index 1cfbb3e340c..09fefb581ed 100644
--- a/ext/dba/tests/dba_db2.phpt
+++ b/ext/dba/tests/dba_db2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB2 handler test
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'db2';
 	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
diff --git a/ext/dba/tests/dba_db3.phpt b/ext/dba/tests/dba_db3.phpt
index 5de7e5a0417..9c78eb37265 100644
--- a/ext/dba/tests/dba_db3.phpt
+++ b/ext/dba/tests/dba_db3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB3 handler test
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'db3';
 	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
diff --git a/ext/dba/tests/dba_db4_000.phpt b/ext/dba/tests/dba_db4_000.phpt
index 17db4bb62df..21e4a18394f 100644
--- a/ext/dba/tests/dba_db4_000.phpt
+++ b/ext/dba/tests/dba_db4_000.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 handler test
 --SKIPIF--
-<?php 
+<?php
 $handler = 'db4';
 require_once(dirname(__FILE__) .'/skipif.inc');
 ?>
@@ -13,8 +13,8 @@ require_once(dirname(__FILE__) .'/dba_handler.inc');
 ?>
 ===DONE===
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECT--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_001.phpt b/ext/dba/tests/dba_db4_001.phpt
index ecc8389cb13..26674a1516c 100644
--- a/ext/dba/tests/dba_db4_001.phpt
+++ b/ext/dba/tests/dba_db4_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 New File Creation open("c") & Insert Test
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -23,8 +23,8 @@ if (($db_file = dba_open($db_filename, "c", $handler)) !== FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_002.phpt b/ext/dba/tests/dba_db4_002.phpt
index 18ac0ec4610..35512c4410a 100644
--- a/ext/dba/tests/dba_db4_002.phpt
+++ b/ext/dba/tests/dba_db4_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 New File Creation open("n") & Insert Test
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -23,8 +23,8 @@ if (($db_file = dba_open($db_filename, "n", $handler)) !== FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_003.phpt b/ext/dba/tests/dba_db4_003.phpt
index 8708170fc1b..5690bd9250c 100644
--- a/ext/dba/tests/dba_db4_003.phpt
+++ b/ext/dba/tests/dba_db4_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 File Creation open("c") with existing file
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -32,8 +32,8 @@ echo "$s\n";
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_004.phpt b/ext/dba/tests/dba_db4_004.phpt
index ca876f82d7c..ecfaae9fbde 100644
--- a/ext/dba/tests/dba_db4_004.phpt
+++ b/ext/dba/tests/dba_db4_004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 Truncate Existing File open("n")
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -30,8 +30,8 @@ if (($db_file = dba_open($db_filename, "n", $handler)) !== FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_005.phpt b/ext/dba/tests/dba_db4_005.phpt
index 54bb475e9ec..89a204ea241 100644
--- a/ext/dba/tests/dba_db4_005.phpt
+++ b/ext/dba/tests/dba_db4_005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 New File Creation popen("c") & Insert Test
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -23,8 +23,8 @@ if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_006.phpt b/ext/dba/tests/dba_db4_006.phpt
index 7d95385fe38..5fc0e494b2c 100644
--- a/ext/dba/tests/dba_db4_006.phpt
+++ b/ext/dba/tests/dba_db4_006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 New File Creation popen("n") & Insert Test
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -23,8 +23,8 @@ if (($db_file = dba_popen($db_filename, "n", $handler)) !== FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_007.phpt b/ext/dba/tests/dba_db4_007.phpt
index 027d0af0329..193d2ed3412 100644
--- a/ext/dba/tests/dba_db4_007.phpt
+++ b/ext/dba/tests/dba_db4_007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 File Creation popen("c") with existing invalid file
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -28,8 +28,8 @@ if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_008.phpt b/ext/dba/tests/dba_db4_008.phpt
index 80f62eab5b4..d00c00a91d4 100644
--- a/ext/dba/tests/dba_db4_008.phpt
+++ b/ext/dba/tests/dba_db4_008.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 Truncate Existing File popen("n")
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -30,8 +30,8 @@ if (($db_file = dba_popen($db_filename, "n", $handler)) !== FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_009.phpt b/ext/dba/tests/dba_db4_009.phpt
index 5a870c90edd..8069c84bf88 100644
--- a/ext/dba/tests/dba_db4_009.phpt
+++ b/ext/dba/tests/dba_db4_009.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 Multiple File Creation Test
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -11,8 +11,8 @@ die("info $HND handler used");
 $handler = "db4";
 require_once(dirname(__FILE__) .'/test.inc');
 echo "database handler: $handler\n";
-$db_file1 = $db_filename1 = dirname(__FILE__).'/test1.dbm'; 
-$db_file2 = $db_filename2 = dirname(__FILE__).'/test2.dbm'; 
+$db_file1 = $db_filename1 = dirname(__FILE__).'/test1.dbm';
+$db_file2 = $db_filename2 = dirname(__FILE__).'/test2.dbm';
 if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
     echo "database file created\n";
 } else {
@@ -35,8 +35,8 @@ dba_close($db_file);
 @unlink($db_filename2);
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_011.phpt b/ext/dba/tests/dba_db4_011.phpt
index ce9be2770ba..aa2d597eedb 100644
--- a/ext/dba/tests/dba_db4_011.phpt
+++ b/ext/dba/tests/dba_db4_011.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 with repeated key
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -24,8 +24,8 @@ if (($db_file=dba_open($db_filename, "c", $handler))!==FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_012.phpt b/ext/dba/tests/dba_db4_012.phpt
index 2caa43c84f8..e626ba0c115 100644
--- a/ext/dba/tests/dba_db4_012.phpt
+++ b/ext/dba/tests/dba_db4_012.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 New File Creation open("rl")
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -21,8 +21,8 @@ if (($db_file = dba_open($db_filename, "rl", $handler)) !== FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_013.phpt b/ext/dba/tests/dba_db4_013.phpt
index ba2d171dcfb..133f90f88ae 100644
--- a/ext/dba/tests/dba_db4_013.phpt
+++ b/ext/dba/tests/dba_db4_013.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 File open("rl") & Insert Test
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -29,8 +29,8 @@ if (($db_file = dba_popen($db_filename, "rl", $handler)) !== FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_014.phpt b/ext/dba/tests/dba_db4_014.phpt
index 6fb22f87b33..38d272dd28b 100644
--- a/ext/dba/tests/dba_db4_014.phpt
+++ b/ext/dba/tests/dba_db4_014.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 File open("wl") & Insert Test
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -22,8 +22,8 @@ if (($db_file = dba_open($db_filename, "wl", $handler)) !== FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_015.phpt b/ext/dba/tests/dba_db4_015.phpt
index a1535675b85..faa87789a6e 100644
--- a/ext/dba/tests/dba_db4_015.phpt
+++ b/ext/dba/tests/dba_db4_015.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 File open("wl") & Insert Test
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -29,8 +29,8 @@ if (($db_file = dba_popen($db_filename, "wl", $handler)) !== FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_016.phpt b/ext/dba/tests/dba_db4_016.phpt
index b79cc71f82f..ab940a92ab1 100644
--- a/ext/dba/tests/dba_db4_016.phpt
+++ b/ext/dba/tests/dba_db4_016.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 File Creation popen("c") with existing valid file
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -44,8 +44,8 @@ if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_017.phpt b/ext/dba/tests/dba_db4_017.phpt
index 12bf3df866f..8e23d0aa1d8 100644
--- a/ext/dba/tests/dba_db4_017.phpt
+++ b/ext/dba/tests/dba_db4_017.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 file creation dba_open("cd")
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 ?>
@@ -27,8 +27,8 @@ if (($db_file = dba_open($db_filename, "cd", $handler)) !== FALSE) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_018.phpt b/ext/dba/tests/dba_db4_018.phpt
index ecd1980e460..fb696e9f5f8 100644
--- a/ext/dba/tests/dba_db4_018.phpt
+++ b/ext/dba/tests/dba_db4_018.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 with persistent connections
 --SKIPIF--
-<?php 
+<?php
 $handler = "db4";
 require_once(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -50,8 +50,8 @@ echo dba_fetch("key2", $db_file1), "\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --XFAIL--
 Test 6 crashes with dba pointer of NULL, bug http://bugs.php.net/bug.php?id=51278
diff --git a/ext/dba/tests/dba_db4_handlers.phpt b/ext/dba/tests/dba_db4_handlers.phpt
index d238f431a45..41c397bdf42 100644
--- a/ext/dba/tests/dba_db4_handlers.phpt
+++ b/ext/dba/tests/dba_db4_handlers.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DB4 Handler Test
 --SKIPIF--
-<?php 
+<?php
 $handler="db4";
 require(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -39,8 +39,8 @@ foreach ($h as $key => $val) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTREGEX--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_optimize.phpt b/ext/dba/tests/dba_db4_optimize.phpt
index de27dd8df4d..d6b1353f429 100644
--- a/ext/dba/tests/dba_db4_optimize.phpt
+++ b/ext/dba/tests/dba_db4_optimize.phpt
@@ -28,8 +28,8 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) {
 ===DONE===
 <?php exit(0); ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_db4_sync.phpt b/ext/dba/tests/dba_db4_sync.phpt
index 8c4e248bc86..1326fae1a93 100644
--- a/ext/dba/tests/dba_db4_sync.phpt
+++ b/ext/dba/tests/dba_db4_sync.phpt
@@ -28,8 +28,8 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) {
 ===DONE===
 <?php exit(0); ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: db4
diff --git a/ext/dba/tests/dba_dbm.phpt b/ext/dba/tests/dba_dbm.phpt
index 8bea8463da7..4ce8011892a 100644
--- a/ext/dba/tests/dba_dbm.phpt
+++ b/ext/dba/tests/dba_dbm.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA DBM handler test
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'dbm';
 	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
diff --git a/ext/dba/tests/dba_flatfile.phpt b/ext/dba/tests/dba_flatfile.phpt
index ac7f86ebdaa..c6064239c60 100644
--- a/ext/dba/tests/dba_flatfile.phpt
+++ b/ext/dba/tests/dba_flatfile.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA FlatFile handler test
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'flatfile';
 	require_once(dirname(__FILE__) .'/skipif.inc');
 ?>
@@ -13,8 +13,8 @@ DBA FlatFile handler test
 ?>
 ===DONE===
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECT--
 database handler: flatfile
diff --git a/ext/dba/tests/dba_gdbm.phpt b/ext/dba/tests/dba_gdbm.phpt
index d8fde4b6284..18ee455e4db 100644
--- a/ext/dba/tests/dba_gdbm.phpt
+++ b/ext/dba/tests/dba_gdbm.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA GDBM handler test
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'gdbm';
 	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
@@ -11,7 +11,7 @@ DBA GDBM handler test
 	require_once dirname(__FILE__) .'/test.inc';
 	$lock_flag = ''; // lock in library
 	require_once dirname(__FILE__) .'/dba_handler.inc';
-	
+
 	// Read during write is system dependent. Important is that there is no deadlock
 ?>
 ===DONE===
diff --git a/ext/dba/tests/dba_handlers.phpt b/ext/dba/tests/dba_handlers.phpt
index 9f66a79f27a..41c23b5cf6f 100644
--- a/ext/dba/tests/dba_handlers.phpt
+++ b/ext/dba/tests/dba_handlers.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA Handler Test
 --SKIPIF--
-<?php 
+<?php
 $handler="flatfile";
 require(dirname(__FILE__) .'/skipif.inc');
 die("info $HND handler used");
@@ -51,8 +51,8 @@ foreach ($h as $key => $val) {
 
 ?>
 --CLEAN--
-<?php 
-require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: flatfile
diff --git a/ext/dba/tests/dba_inifile.phpt b/ext/dba/tests/dba_inifile.phpt
index ae06aee09f4..ad7b72a82d0 100644
--- a/ext/dba/tests/dba_inifile.phpt
+++ b/ext/dba/tests/dba_inifile.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA INIFILE handler test
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'inifile';
 	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
@@ -13,8 +13,8 @@ DBA INIFILE handler test
 ?>
 ===DONE===
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECT--
 database handler: inifile
diff --git a/ext/dba/tests/dba_ndbm.phpt b/ext/dba/tests/dba_ndbm.phpt
index 193db6f94d7..a3478862ebd 100644
--- a/ext/dba/tests/dba_ndbm.phpt
+++ b/ext/dba/tests/dba_ndbm.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA NDBM handler test
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'ndbm';
 	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
diff --git a/ext/dba/tests/dba_optimize.phpt b/ext/dba/tests/dba_optimize.phpt
index 794d7e8f79d..6347d4983ca 100644
--- a/ext/dba/tests/dba_optimize.phpt
+++ b/ext/dba/tests/dba_optimize.phpt
@@ -35,8 +35,8 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) {
 ===DONE===
 <?php exit(0); ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: flatfile
diff --git a/ext/dba/tests/dba_sync.phpt b/ext/dba/tests/dba_sync.phpt
index e0906eeeef1..0e64ea2905c 100644
--- a/ext/dba/tests/dba_sync.phpt
+++ b/ext/dba/tests/dba_sync.phpt
@@ -35,8 +35,8 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) {
 ===DONE===
 <?php exit(0); ?>
 --CLEAN--
-<?php 
-	require(dirname(__FILE__) .'/clean.inc'); 
+<?php
+	require(dirname(__FILE__) .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: flatfile
diff --git a/ext/dba/tests/dba_tcadb.phpt b/ext/dba/tests/dba_tcadb.phpt
index f75aa813d48..0420909c36b 100644
--- a/ext/dba/tests/dba_tcadb.phpt
+++ b/ext/dba/tests/dba_tcadb.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DBA TCADB handler test
 --SKIPIF--
-<?php 
+<?php
 	$handler = 'tcadb';
 	require_once dirname(__FILE__) .'/skipif.inc';
 ?>
@@ -17,7 +17,7 @@ DBA TCADB handler test
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 $db_filename = $db_file = dirname(__FILE__) .'/test0.tch';
 @unlink($db_filename);
 @unlink($db_filename.'.lck');
diff --git a/ext/dom/tests/DOMAttr_value_basic_001.phpt b/ext/dom/tests/DOMAttr_value_basic_001.phpt
index 51c4ac954de..f4a22801030 100644
--- a/ext/dom/tests/DOMAttr_value_basic_001.phpt
+++ b/ext/dom/tests/DOMAttr_value_basic_001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Read empty $value. 
+Read empty $value.
 --CREDITS--
 Jason Bouffard <jbouffard1@yahoo.com>
 # TestFest Atlanta 2009-05-14
diff --git a/ext/dom/tests/DOMCDATASection_construct_error_001.phpt b/ext/dom/tests/DOMCDATASection_construct_error_001.phpt
index fbce3c75270..21540161428 100644
--- a/ext/dom/tests/DOMCDATASection_construct_error_001.phpt
+++ b/ext/dom/tests/DOMCDATASection_construct_error_001.phpt
@@ -2,7 +2,7 @@
 __construct() with no arguments.
 --CREDITS--
 Nic Rosental nicrosental@gmail.com
-# TestFest Atlanta 2009-5-14 
+# TestFest Atlanta 2009-5-14
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
diff --git a/ext/dom/tests/DOMCharacterData_data_basic_002.phpt b/ext/dom/tests/DOMCharacterData_data_basic_002.phpt
index 394b316fa3a..f96791150a9 100644
--- a/ext/dom/tests/DOMCharacterData_data_basic_002.phpt
+++ b/ext/dom/tests/DOMCharacterData_data_basic_002.phpt
@@ -2,7 +2,7 @@
 Create CDATA section and change it using DOMcreateCDATASection
 --CREDITS--
 Nic Rosental nicrosental@gmail.com
-# TestFest Atlanta 2009-5-28 
+# TestFest Atlanta 2009-5-28
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
diff --git a/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt b/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt
index b9d73e18198..8b924f04d53 100644
--- a/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_substringData_basic_001.phpt
@@ -1,8 +1,8 @@
 --TEST--
-__DOMCharacterData::substringData pull mid section of string 
+__DOMCharacterData::substringData pull mid section of string
 --CREDITS--
 Nic Rosental nicrosental@gmail.com
-# TestFest Atlanta 2009-5-28 
+# TestFest Atlanta 2009-5-28
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
diff --git a/ext/dom/tests/DOMDocument_createAttribute_basic.phpt b/ext/dom/tests/DOMDocument_createAttribute_basic.phpt
index 4dd181b3f8b..4e00fbb8d88 100644
--- a/ext/dom/tests/DOMDocument_createAttribute_basic.phpt
+++ b/ext/dom/tests/DOMDocument_createAttribute_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 DomDocument::createAttribute() - basic test for DomDocument::createAttribute()
 --CREDITS--
-Muhammad Khalid Adnan 
+Muhammad Khalid Adnan
 # TestFest 2008
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
diff --git a/ext/dom/tests/DOMDocument_loadHTML_basic.phpt b/ext/dom/tests/DOMDocument_loadHTML_basic.phpt
index 616d1d83715..733704b0f6f 100644
--- a/ext/dom/tests/DOMDocument_loadHTML_basic.phpt
+++ b/ext/dom/tests/DOMDocument_loadHTML_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DOMDocument::loadHTML 
+DOMDocument::loadHTML
 --CREDITS--
 Frank Cassedanne franck@ouarz.net
 #London TestFest 2008
diff --git a/ext/dom/tests/DOMDocument_loadXML_error1.phpt b/ext/dom/tests/DOMDocument_loadXML_error1.phpt
index 52d44ea291d..9a433d1282c 100644
--- a/ext/dom/tests/DOMDocument_loadXML_error1.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_error1.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test DOMDocument::loadXML() detects not-well formed XML 
+Test DOMDocument::loadXML() detects not-well formed XML
 --DESCRIPTION--
-This test verifies the method detects an opening and ending tag mismatch 
+This test verifies the method detects an opening and ending tag mismatch
 Environment variables used in the test:
 - XML_FILE: the xml file to load
 - LOAD_OPTIONS: the second parameter to pass to the method
diff --git a/ext/dom/tests/DOMDocument_loadXML_error2.phpt b/ext/dom/tests/DOMDocument_loadXML_error2.phpt
index 6ac4193dafd..e3072720e62 100644
--- a/ext/dom/tests/DOMDocument_loadXML_error2.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_error2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DOMDocument::loadXML() detects not-well formed XML 
+Test DOMDocument::loadXML() detects not-well formed XML
 --DESCRIPTION--
 This test verifies the method detects attributes values not closed between " or '
 Environment variables used in the test:
diff --git a/ext/dom/tests/DOMDocument_loadXML_error3.phpt b/ext/dom/tests/DOMDocument_loadXML_error3.phpt
index 07f7ca77383..3678c79601f 100644
--- a/ext/dom/tests/DOMDocument_loadXML_error3.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_error3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DOMDocument::loadXML() detects not-well formed XML 
+Test DOMDocument::loadXML() detects not-well formed XML
 --DESCRIPTION--
 This test verifies the method detects a typo in tag names
 Environment variables used in the test:
diff --git a/ext/dom/tests/DOMDocument_loadXML_error4.phpt b/ext/dom/tests/DOMDocument_loadXML_error4.phpt
index 1854a34de4d..e4a1e9d7744 100644
--- a/ext/dom/tests/DOMDocument_loadXML_error4.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_error4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DOMDocument::loadXML() detects not-well formed XML 
+Test DOMDocument::loadXML() detects not-well formed XML
 --DESCRIPTION--
 This test verifies the method detects an unsupported xml version
 Environment variables used in the test:
diff --git a/ext/dom/tests/DOMDocument_loadXML_error5.phpt b/ext/dom/tests/DOMDocument_loadXML_error5.phpt
index a4aa1858f58..29cb464e8d3 100644
--- a/ext/dom/tests/DOMDocument_loadXML_error5.phpt
+++ b/ext/dom/tests/DOMDocument_loadXML_error5.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test DOMDocument::loadXML() detects not-well formed XML 
+Test DOMDocument::loadXML() detects not-well formed XML
 --DESCRIPTION--
-This test verifies the method detects extra content at the end of the document 
+This test verifies the method detects extra content at the end of the document
 Environment variables used in the test:
 - XML_FILE: the xml file to load
 - LOAD_OPTIONS: the second parameter to pass to the method
diff --git a/ext/dom/tests/DOMDocument_load_error1.phpt b/ext/dom/tests/DOMDocument_load_error1.phpt
index 2ac3f50979c..4c661f7e696 100644
--- a/ext/dom/tests/DOMDocument_load_error1.phpt
+++ b/ext/dom/tests/DOMDocument_load_error1.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test DOMDocument::load() detects not-well formed XML 
+Test DOMDocument::load() detects not-well formed XML
 --DESCRIPTION--
-This test verifies the method detects an opening and ending tag mismatch 
+This test verifies the method detects an opening and ending tag mismatch
 Environment variables used in the test:
 - XML_FILE: the xml file to load
 - LOAD_OPTIONS: the second parameter to pass to the method
diff --git a/ext/dom/tests/DOMDocument_load_error2.phpt b/ext/dom/tests/DOMDocument_load_error2.phpt
index 23a5e4827d5..282f764989f 100644
--- a/ext/dom/tests/DOMDocument_load_error2.phpt
+++ b/ext/dom/tests/DOMDocument_load_error2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test DOMDocument::load() detects not-well formed XML 
+Test DOMDocument::load() detects not-well formed XML
 --DESCRIPTION--
 This test verifies the method detects attributes values not closed between " or '
 Environment variables used in the test:
diff --git a/ext/dom/tests/DOMDocument_load_error3.phpt b/ext/dom/tests/DOMDocument_load_error3.phpt
index b9ac49c4667..fbd795ee4df 100644
--- a/ext/dom/tests/DOMDocument_load_error3.phpt
+++ b/ext/dom/tests/DOMDocument_load_error3.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test DOMDocument::load() detects not-well formed XML 
+Test DOMDocument::load() detects not-well formed XML
 --DESCRIPTION--
-This test verifies the method detects and opening and ending tag mismatch 
+This test verifies the method detects and opening and ending tag mismatch
 Environment variables used in the test:
 - XML_FILE: the xml file to load
 - LOAD_OPTIONS: the second parameter to pass to the method
diff --git a/ext/dom/tests/DOMDocument_load_error4.phpt b/ext/dom/tests/DOMDocument_load_error4.phpt
index 9fa6ce279aa..b1a5103c8a1 100644
--- a/ext/dom/tests/DOMDocument_load_error4.phpt
+++ b/ext/dom/tests/DOMDocument_load_error4.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test DOMDocument::load() detects not-well formed XML 
+Test DOMDocument::load() detects not-well formed XML
 --DESCRIPTION--
-This test verifies the method detects an unsupported xml version 
+This test verifies the method detects an unsupported xml version
 Environment variables used in the test:
 - XML_FILE: the xml file to load
 - LOAD_OPTIONS: the second parameter to pass to the method
diff --git a/ext/dom/tests/DOMDocument_load_error5.phpt b/ext/dom/tests/DOMDocument_load_error5.phpt
index a374f9474d1..27f2c06300d 100644
--- a/ext/dom/tests/DOMDocument_load_error5.phpt
+++ b/ext/dom/tests/DOMDocument_load_error5.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test DOMDocument::load() detects not-well formed XML 
+Test DOMDocument::load() detects not-well formed XML
 --DESCRIPTION--
-This test verifies the method detects extra content at the end of the document 
+This test verifies the method detects extra content at the end of the document
 Environment variables used in the test:
 - XML_FILE: the xml file to load
 - LOAD_OPTIONS: the second parameter to pass to the method
diff --git a/ext/dom/tests/DOMDocument_saveHTML_basic.phpt b/ext/dom/tests/DOMDocument_saveHTML_basic.phpt
index 76f1ed0abfa..c13f883dda9 100644
--- a/ext/dom/tests/DOMDocument_saveHTML_basic.phpt
+++ b/ext/dom/tests/DOMDocument_saveHTML_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DOMDocument::saveHTML() should dump the internal document into a string using HTML formatting 
+DOMDocument::saveHTML() should dump the internal document into a string using HTML formatting
 --CREDITS--
 Knut Urdalen <knut@php.net>
 #PHPTestFest2009 Norway 2009-06-09 \o/
diff --git a/ext/dom/tests/DOMDocument_saveHTML_variant1.phpt b/ext/dom/tests/DOMDocument_saveHTML_variant1.phpt
index d1691138ae1..8c4b56924dc 100644
--- a/ext/dom/tests/DOMDocument_saveHTML_variant1.phpt
+++ b/ext/dom/tests/DOMDocument_saveHTML_variant1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DOMDocument::saveHTML() optional parameters 
+DOMDocument::saveHTML() optional parameters
 --SKIPIF--
 <?php
 require_once dirname(__FILE__) .'/skipif.inc';
diff --git a/ext/dom/tests/DOMDocument_saveHTML_variant2.phpt b/ext/dom/tests/DOMDocument_saveHTML_variant2.phpt
index 54ccda1fa57..c39d4e57096 100644
--- a/ext/dom/tests/DOMDocument_saveHTML_variant2.phpt
+++ b/ext/dom/tests/DOMDocument_saveHTML_variant2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DOMDocument::saveHTML() vs DOMDocumet::saveXML() 
+DOMDocument::saveHTML() vs DOMDocumet::saveXML()
 --SKIPIF--
 <?php
 require_once dirname(__FILE__) .'/skipif.inc';
diff --git a/ext/dom/tests/DOMDocument_strictErrorChecking_basic.phpt b/ext/dom/tests/DOMDocument_strictErrorChecking_basic.phpt
index 9ad55a4ad64..33aecf49256 100644
--- a/ext/dom/tests/DOMDocument_strictErrorChecking_basic.phpt
+++ b/ext/dom/tests/DOMDocument_strictErrorChecking_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DomDocument::$strictErrorChecking - basic test 
+DomDocument::$strictErrorChecking - basic test
 --CREDITS--
 Vincent Tsao <notes4vincent@gmail.com>
 # TestFest 2009 NYPHP
diff --git a/ext/dom/tests/DOMElement_hasAttributes_basic.phpt b/ext/dom/tests/DOMElement_hasAttributes_basic.phpt
index 8e804bea92c..e275c8c717a 100644
--- a/ext/dom/tests/DOMElement_hasAttributes_basic.phpt
+++ b/ext/dom/tests/DOMElement_hasAttributes_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DOMNode: hasAttributes() 
+DOMNode: hasAttributes()
 --CREDITS--
 James Lewis <james@s-1.com>
 #TestFest 2008
@@ -22,15 +22,15 @@ echo "Verify that we have a DOMElement object:\n";
 echo get_class($element), "\n";
 
 echo "\nElement should have attributes:\n";
-var_dump($element->hasAttributes()); 
+var_dump($element->hasAttributes());
 
-$nodelist=$dom->getElementsByTagName('tbody') ; 
+$nodelist=$dom->getElementsByTagName('tbody') ;
 $element = $nodelist->item(0);
 
 echo "\nVerify that we have a DOMElement object:\n";
 echo get_class($element), "\n";
 
-echo "\nElement should have no attributes:\n"; 
+echo "\nElement should have no attributes:\n";
 var_dump($element->hasAttributes());
 
 
diff --git a/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt b/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt
index 3b19ea46145..32e180cdc65 100644
--- a/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt
+++ b/ext/dom/tests/DOMImplementation_createDocumentType_basic.phpt
@@ -7,8 +7,8 @@ include('skipif.inc');
 --FILE--
 <?php
 $imp = new DOMImplementation();
-$doctype = $imp->createDocumentType("html", 
-	"-//W3C//DTD XHTML 1.0 Strict//EN", 
+$doctype = $imp->createDocumentType("html",
+	"-//W3C//DTD XHTML 1.0 Strict//EN",
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd");
 $doc = $imp->createDocument(null, 'html', $doctype);
 echo $doc->saveHTML();
diff --git a/ext/dom/tests/DOMNode_cloneNode_basic.phpt b/ext/dom/tests/DOMNode_cloneNode_basic.phpt
index cba3c17a2cd..bbfbcc15eae 100644
--- a/ext/dom/tests/DOMNode_cloneNode_basic.phpt
+++ b/ext/dom/tests/DOMNode_cloneNode_basic.phpt
@@ -28,7 +28,7 @@ $xml = <<< EOXML
 EOXML;
 
 function dumpcourse($current) {
-	$title = ($current->nodeType != XML_TEXT_NODE && $current->hasAttribute('title')) ? $current->getAttribute('title'):"no title"; 
+	$title = ($current->nodeType != XML_TEXT_NODE && $current->hasAttribute('title')) ? $current->getAttribute('title'):"no title";
 	echo "Course: $title:";echo(get_class($current)), "\n";
 	echo "~";var_dump($current->textContent);
 }
diff --git a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt
index 3a6f6b42188..6670226246d 100644
--- a/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt
+++ b/ext/dom/tests/DOMNode_hasChildNodes_basic.phpt
@@ -5,11 +5,11 @@ Test whether a node has child nodes: hasChildNodes()
 include('skipif.inc');
 ?>
 --FILE--
-<?php 
+<?php
 
 /* Create an XML document
  * with strcuture
- * <book> 
+ * <book>
  *  <title>This is the title</title>
  * </book>
  * Check for child nodes of the <book>, <title> and This is the title
diff --git a/ext/dom/tests/DOMNode_insertBefore_error2.phpt b/ext/dom/tests/DOMNode_insertBefore_error2.phpt
index 835dfa065ab..fbe212d4b90 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error2.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error2.phpt
@@ -2,7 +2,7 @@
 Test DOMNode::insertBefore()  check the error code DOM_NOT_FOUND is raised
 --DESCRIPTION--
 DOMNode::insertBefore(newNode, [refNode])
-DOM_NOT_FOUND is raised if refnode is not a child 
+DOM_NOT_FOUND is raised if refnode is not a child
 This test checks the error message is raised when the refnode is a sibling
 --CREDITS--
 Antonio Diaz Ruiz <dejalatele@gmail.com>
diff --git a/ext/dom/tests/DOMNode_insertBefore_error3.phpt b/ext/dom/tests/DOMNode_insertBefore_error3.phpt
index a3bad5433e7..a8b4e45494a 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error3.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error3.phpt
@@ -2,7 +2,7 @@
 Test DOMNode::insertBefore()  check the error code DOM_NOT_FOUND is raised
 --DESCRIPTION--
 DOMNode::insertBefore(newNode, [refNode])
-DOM_NOT_FOUND is raised if refnode is not a child 
+DOM_NOT_FOUND is raised if refnode is not a child
 This test checks the error message is raised when refnode is the parent node
 --CREDITS--
 Antonio Diaz Ruiz <dejalatele@gmail.com>
diff --git a/ext/dom/tests/DOMNode_insertBefore_error4.phpt b/ext/dom/tests/DOMNode_insertBefore_error4.phpt
index a8d12914e3d..5b1fc3150ae 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error4.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error4.phpt
@@ -2,7 +2,7 @@
 Test DOMNode::insertBefore()  check the error code DOM_NOT_FOUND is raised
 --DESCRIPTION--
 DOMNode::insertBefore(newNode, [refNode])
-DOM_NOT_FOUND is raised if refnode is not a child 
+DOM_NOT_FOUND is raised if refnode is not a child
 This test checks the error message is raised when the refnode is a brand new node
 --CREDITS--
 Antonio Diaz Ruiz <dejalatele@gmail.com>
diff --git a/ext/dom/tests/DOMNode_insertBefore_error5.phpt b/ext/dom/tests/DOMNode_insertBefore_error5.phpt
index c41a9edfbb2..f5bcf098e79 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error5.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error5.phpt
@@ -2,8 +2,8 @@
 Test DOMNode::insertBefore()  check the error code DOM_NOT_FOUND is raised
 --DESCRIPTION--
 DOMNode::insertBefore(newNode, [refNode])
-DOM_NOT_FOUND is raised if refnode is not a child 
-This test checks the error message is raised when the refnode is a descendant but not a child 
+DOM_NOT_FOUND is raised if refnode is not a child
+This test checks the error message is raised when the refnode is a descendant but not a child
 --CREDITS--
 Antonio Diaz Ruiz <dejalatele@gmail.com>
 --INI--
diff --git a/ext/dom/tests/DOMNode_insertBefore_error6.phpt b/ext/dom/tests/DOMNode_insertBefore_error6.phpt
index 99c72f86214..5afecafed74 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error6.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error6.phpt
@@ -2,7 +2,7 @@
 Test DOMNode::insertBefore()  check the error code DOM_NOT_FOUND is raised
 --DESCRIPTION--
 DOMNode::insertBefore(newNode, [refNode])
-DOM_NOT_FOUND is raised if refnode is not a child 
+DOM_NOT_FOUND is raised if refnode is not a child
 This test checks the error message is raised when the refnode is the parent
 --CREDITS--
 Antonio Diaz Ruiz <dejalatele@gmail.com>
diff --git a/ext/dom/tests/DOMNode_issamenode_basic.phpt b/ext/dom/tests/DOMNode_issamenode_basic.phpt
index e008340ead9..21feda8a7e0 100644
--- a/ext/dom/tests/DOMNode_issamenode_basic.phpt
+++ b/ext/dom/tests/DOMNode_issamenode_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DOMNode: isSameNode() 
+DOMNode: isSameNode()
 --CREDITS--
 James Lewis <james@s-1.com>
 #TestFest 2008
@@ -17,18 +17,18 @@ if(!$dom) {
 }
 
 $node = $dom->documentElement;
-if($node->isSameNode($node)) 
-	echo "EXPECTING SAME NODE, PASSED\n" ; 
+if($node->isSameNode($node))
+	echo "EXPECTING SAME NODE, PASSED\n" ;
 else
-	echo "EXPECTING SAME NODE, FAILED\n" ; 
+	echo "EXPECTING SAME NODE, FAILED\n" ;
 
-$nodelist=$dom->getElementsByTagName('tbody') ; 
+$nodelist=$dom->getElementsByTagName('tbody') ;
 
 if($nodelist->item(0)->isSameNode($node))
-	echo "EXPECTING NOT SAME NODE, FAILED\n" ; 
+	echo "EXPECTING NOT SAME NODE, FAILED\n" ;
 else
-	echo "EXPECTING NOT SAME NODE, PASSED\n" ; 
-	
+	echo "EXPECTING NOT SAME NODE, PASSED\n" ;
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/dom/tests/DOMNode_removeChild_basic.phpt b/ext/dom/tests/DOMNode_removeChild_basic.phpt
index fb0977488e6..24f48e6d0b6 100644
--- a/ext/dom/tests/DOMNode_removeChild_basic.phpt
+++ b/ext/dom/tests/DOMNode_removeChild_basic.phpt
@@ -28,7 +28,7 @@ $xml = <<< EOXML
 EOXML;
 
 function dumpcourse($current) {
-	$title = ($current->nodeType != XML_TEXT_NODE && $current->hasAttribute('title')) ? $current->getAttribute('title'):"no title"; 
+	$title = ($current->nodeType != XML_TEXT_NODE && $current->hasAttribute('title')) ? $current->getAttribute('title'):"no title";
 	echo "Course: $title:";echo get_class($current), "\n";
 	echo "~";var_dump($current->textContent);
 }
diff --git a/ext/dom/tests/bug28721.phpt b/ext/dom/tests/bug28721.phpt
index 464498ef808..818e62973ec 100644
--- a/ext/dom/tests/bug28721.phpt
+++ b/ext/dom/tests/bug28721.phpt
@@ -24,7 +24,7 @@ function print_node_r(DomNode $node) {
     print_node($node->previousSibling);
   else
     echo "NULL\n";
-  
+
   echo $indent . "nextSibling: ";
   if ( $node->nextSibling )
     print_node($node->nextSibling);
@@ -33,7 +33,7 @@ function print_node_r(DomNode $node) {
 
   if ( !$node->hasChildNodes() )
     return;
-  
+
   foreach ($node->childNodes as $child) {
 
     $old_indent  = $indent;
diff --git a/ext/dom/tests/bug28817.phpt b/ext/dom/tests/bug28817.phpt
index a250bff03eb..856917638f3 100644
--- a/ext/dom/tests/bug28817.phpt
+++ b/ext/dom/tests/bug28817.phpt
@@ -17,7 +17,7 @@ class z extends domDocument{
 		$this->p_array[] = 'tiro';
 
 		$this->p_variable = 'Cessante causa cessat effectus';
-	}	
+	}
 }
 
 $z=new z();
diff --git a/ext/dom/tests/bug38474.phpt b/ext/dom/tests/bug38474.phpt
index 54226efe565..9c694c432eb 100644
--- a/ext/dom/tests/bug38474.phpt
+++ b/ext/dom/tests/bug38474.phpt
@@ -1,11 +1,11 @@
 --TEST--
 Bug #38474 (getAttribute select attribute by order, even when prefixed) (OK to fail with libxml2 < 2.6.2x)
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
 if (version_compare(LIBXML_DOTTED_VERSION, "2.6.20", "<")) {
     print "skip libxml version " . LIBXML_DOTTED_VERSION;
-}   
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/dom/tests/bug43364.phpt b/ext/dom/tests/bug43364.phpt
index 6e08ffc01f2..e4808f19edb 100644
--- a/ext/dom/tests/bug43364.phpt
+++ b/ext/dom/tests/bug43364.phpt
@@ -3,7 +3,7 @@ Bug #43364 (recursive xincludes don't remove internal xml nodes properly)
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
-<?php 
+<?php
 function loopElements($nodes)
 {
     $count = 0;
diff --git a/ext/dom/tests/bug46185.phpt b/ext/dom/tests/bug46185.phpt
index 02117cdd671..927a6e59e63 100644
--- a/ext/dom/tests/bug46185.phpt
+++ b/ext/dom/tests/bug46185.phpt
@@ -3,7 +3,7 @@ Bug #46185 (importNode changes the namespace of an XML element).
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
-<?php 
+<?php
 $aDOM = new DOMDocument();
 $aDOM->loadXML('<?xml version="1.0"?>
 <ns1:a xmlns:ns1="urn::ns"/>');
diff --git a/ext/dom/tests/bug46335.phpt b/ext/dom/tests/bug46335.phpt
index bea4ae9e7d0..18d4039aaba 100644
--- a/ext/dom/tests/bug46335.phpt
+++ b/ext/dom/tests/bug46335.phpt
@@ -3,7 +3,7 @@ Bug #46335 (DOMText::splitText doesn't handle multibyte characters).
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
-<?php 
+<?php
 $textascii = 'This is an "example" of using DOM splitText';
 $text = 'This is an ‘example’ of using DOM splitText';
 $start = 30;
diff --git a/ext/dom/tests/bug47430.phpt b/ext/dom/tests/bug47430.phpt
index 243fe8441cc..efce132a2eb 100644
--- a/ext/dom/tests/bug47430.phpt
+++ b/ext/dom/tests/bug47430.phpt
@@ -3,7 +3,7 @@ Bug #47430 (Errors after writing to nodeValue parameter of an absent previousSib
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
-<?php 
+<?php
 $xml = '<?xml
 version="1.0"?><html><p><i>Hello</i></p><p><i>World!</i></p></html>';
 $dom = new DOMDocument();
diff --git a/ext/dom/tests/bug47848.phpt b/ext/dom/tests/bug47848.phpt
index b4453c72091..e484e9c5dda 100644
--- a/ext/dom/tests/bug47848.phpt
+++ b/ext/dom/tests/bug47848.phpt
@@ -3,7 +3,7 @@ Bug #47848 (importNode doesn't preserve attribute namespaces)
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
-<?php 
+<?php
 
 $aDOM = new DOMDocument();
 $aDOM->appendChild($aDOM->createElementNS('http://friend2friend.net/','f2f:a'));
diff --git a/ext/dom/tests/bug47849.phpt b/ext/dom/tests/bug47849.phpt
index 7e6b02c8cf8..c0628e81f3b 100644
--- a/ext/dom/tests/bug47849.phpt
+++ b/ext/dom/tests/bug47849.phpt
@@ -3,7 +3,7 @@ Bug #47849 (Non-deep import loses the namespace).
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
-<?php 
+<?php
 
 $aDOM= new DOMDocument();
 $aDOM->appendChild($aDOM->createElementNS('urn::root','r:root'));
diff --git a/ext/dom/tests/bug69846.phpt b/ext/dom/tests/bug69846.phpt
index 2e8e05aa2c5..fcca4c06d65 100644
--- a/ext/dom/tests/bug69846.phpt
+++ b/ext/dom/tests/bug69846.phpt
@@ -6,7 +6,7 @@ Bug #69846 Segmenation fault (access violation) when iterating over DOMNodeList
 <?php
 
 $tmpDomDocument = new DOMDocument();
-        
+
 $xml = '<?xml version="1.0" encoding="UTF-8"?><dummy xmlns:xfa="http://www.xfa.org/schema/xfa-data/1.0/"><xfa:data>
   <form1>
     <TextField1>Value A</TextField1>
diff --git a/ext/dom/tests/canonicalization.phpt b/ext/dom/tests/canonicalization.phpt
index cf1a81f24a9..c1caf3fec36 100644
--- a/ext/dom/tests/canonicalization.phpt
+++ b/ext/dom/tests/canonicalization.phpt
@@ -39,12 +39,12 @@ echo $doc->c14N(TRUE, FALSE, array('query'=>'(//. | //@* | //namespace::*)'))."\
 /* exclusive/without comments first child element of doc element is context.
    using xpath query with registered namespace.
    test namespace prefix is also included. */
-echo $doc->c14N(TRUE, FALSE, 
-                array('query'=>'(//a:contain | //a:bar | .//namespace::*)', 
-                      'namespaces'=>array('a'=>'http://www.example.com/ns/foo')), 
+echo $doc->c14N(TRUE, FALSE,
+                array('query'=>'(//a:contain | //a:bar | .//namespace::*)',
+                      'namespaces'=>array('a'=>'http://www.example.com/ns/foo')),
                 array('test'))."\n\n";
 
-/* exclusive/without comments first child element of doc element is context. 
+/* exclusive/without comments first child element of doc element is context.
    test namespace prefix is also included */
 echo $doc->C14N(TRUE, FALSE, NULL, array('test'));
 ?>
diff --git a/ext/dom/tests/dom001.phpt b/ext/dom/tests/dom001.phpt
index a0c78fbb0a1..910a18c6285 100644
--- a/ext/dom/tests/dom001.phpt
+++ b/ext/dom/tests/dom001.phpt
@@ -46,7 +46,7 @@ echo "--------- creating a new attribute\n";
 //$attr = $dom->createAttribute("src", "picture.gif");
 //print_r($attr);
 
-//$rootnode->set_attributeNode($attr); 
+//$rootnode->set_attributeNode($attr);
 $attr = $rootnode->setAttribute("src", "picture.gif");
 $attr = $rootnode->getAttribute("src");
 print_r($attr);
diff --git a/ext/dom/tests/dom006.phpt b/ext/dom/tests/dom006.phpt
index b8e8ed17244..6872a293ee4 100644
--- a/ext/dom/tests/dom006.phpt
+++ b/ext/dom/tests/dom006.phpt
@@ -18,7 +18,7 @@ Class books extends domDocument {
         $bookElement->appendChild($authorElement);
         $this->documentElement->appendChild($bookElement);
     }
-   
+
 }
 
 $dom = new books;
diff --git a/ext/dom/tests/dom_create_element.phpt b/ext/dom/tests/dom_create_element.phpt
index 3f307099bb1..bd2c8f11dae 100644
--- a/ext/dom/tests/dom_create_element.phpt
+++ b/ext/dom/tests/dom_create_element.phpt
@@ -221,7 +221,7 @@ try {
     print $e->getMessage() . "\n";
 }
 
-/* the qualifiedName has a prefix that is "xml" and the  namespaceURI 
+/* the qualifiedName has a prefix that is "xml" and the  namespaceURI
    is different from "http://www.w3.org/XML/1998/namespace" [XML Namespaces] */
 
 print "26 DOMDocument::createElementNS('http://wrong.namespaceURI.com', 'xml:valid')\n";
@@ -261,7 +261,7 @@ try {
 }
 
 
-/* the qualifiedName or its prefix is "xmlns" and the  namespaceURI is 
+/* the qualifiedName or its prefix is "xmlns" and the  namespaceURI is
    different from  "http://www.w3.org/2000/xmlns/" */
 
 print "30 DOMDocument::createElementNS('http://wrong.namespaceURI.com', 'xmlns:valid')\n";
@@ -298,7 +298,7 @@ try {
     print $e->getMessage() . "\n";
 }
 
-/* the namespaceURI is "http://www.w3.org/2000/xmlns/" and neither the 
+/* the namespaceURI is "http://www.w3.org/2000/xmlns/" and neither the
    qualifiedName nor its prefix is "xmlns". */
 
 print "34 DOMDocument::createElementNS('http://www.w3.org/2000/xmlns/', 'wrongprefix:valid')\n";
diff --git a/ext/dom/tests/dom_set_attr_node.phpt b/ext/dom/tests/dom_set_attr_node.phpt
index 18c697710a5..677dfa5e70e 100644
--- a/ext/dom/tests/dom_set_attr_node.phpt
+++ b/ext/dom/tests/dom_set_attr_node.phpt
@@ -31,7 +31,7 @@ ob_start();
 	$contents = ob_get_contents();
 	ob_end_clean();
 	echo preg_replace('/object\(DOMAttr\).+\{.*?\}/s', 'DOMAttr', $contents);
-} 
+}
 
 ?>
 --EXPECTF--
diff --git a/ext/dom/tests/domdocument_createentityreference_001.phpt b/ext/dom/tests/domdocument_createentityreference_001.phpt
index 7343e74cfd2..9a43599914e 100644
--- a/ext/dom/tests/domdocument_createentityreference_001.phpt
+++ b/ext/dom/tests/domdocument_createentityreference_001.phpt
@@ -7,7 +7,7 @@ Clint Priest @ PhpTek09
 --FILE--
 <?php
 	$objDoc = new DomDocument();
-	
+
 	$objRef = $objDoc->createEntityReference('Test');
 	echo $objRef->nodeName . "\n";
 ?>
diff --git a/ext/dom/tests/domdocument_createentityreference_002.phpt b/ext/dom/tests/domdocument_createentityreference_002.phpt
index a2416c2d89d..90754100ddb 100644
--- a/ext/dom/tests/domdocument_createentityreference_002.phpt
+++ b/ext/dom/tests/domdocument_createentityreference_002.phpt
@@ -7,7 +7,7 @@ Clint Priest @ PhpTek09
 --FILE--
 <?php
 	$objDoc = new DomDocument();
-	
+
 	$objRef = $objDoc->createEntityReference();
 ?>
 ===DONE===
diff --git a/ext/enchant/tests/broker_describe.phpt b/ext/enchant/tests/broker_describe.phpt
index 224902f579c..c54e05b9e9c 100644
--- a/ext/enchant/tests/broker_describe.phpt
+++ b/ext/enchant/tests/broker_describe.phpt
@@ -14,22 +14,22 @@ $counter = 0;
 
 if($broker) {
     echo("OK\n");
-    $provider = enchant_broker_describe($broker);    
-    
+    $provider = enchant_broker_describe($broker);
+
     if (is_array($provider)) {
         echo("OK\n");
-        
+
 	if ((isset($provider[$counter]['name']) && isset($provider[$counter]['desc']) && isset($provider[$counter]['file']))) {
 	   echo("OK\n");
-	   
-	} else {    
+
+	} else {
 	   echo("failed, broker describe\n");
-	   
+
 	}
     } else {
         echo "failed, brocker describe array \n";
     }
-    
+
 } else {
     echo("failed, broker_init failure\n");
 }
diff --git a/ext/enchant/tests/broker_free.phpt b/ext/enchant/tests/broker_free.phpt
index dd9149468dd..6964895962d 100644
--- a/ext/enchant/tests/broker_free.phpt
+++ b/ext/enchant/tests/broker_free.phpt
@@ -13,7 +13,7 @@ $broker = enchant_broker_init();
 if (is_resource($broker)) {
     echo "OK\n";
     enchant_broker_free($broker);
-    
+
 } else {
     exit("init failed\n");
 }
diff --git a/ext/enchant/tests/broker_free_01.phpt b/ext/enchant/tests/broker_free_01.phpt
index 3de4c4b7e32..77391cdd608 100644
--- a/ext/enchant/tests/broker_free_01.phpt
+++ b/ext/enchant/tests/broker_free_01.phpt
@@ -12,7 +12,7 @@ if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");}
 $broker = enchant_broker_init();
 if (is_resource($broker)) {
     echo("OK\n");
-    
+
     if (enchant_broker_free($broker)) {
         echo("OK\n");
     } else {
diff --git a/ext/enchant/tests/broker_free_02.phpt b/ext/enchant/tests/broker_free_02.phpt
index a777d889ae9..75ce5cb8ac1 100644
--- a/ext/enchant/tests/broker_free_02.phpt
+++ b/ext/enchant/tests/broker_free_02.phpt
@@ -16,23 +16,23 @@ $newWord = array("iLoveJava","iLoveJavascript","iLoveRuby","iLovePerl","iLoveAwk
 
 if (is_resource($broker)) {
     echo("OK\n");
-    $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']);    
-    
+    $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']);
+
     if ($requestDict) {
         echo("OK\n");
         for($x=0;$x<count($newWord);$x++) {
             $AddtoPersonalDict = enchant_dict_add_to_personal($requestDict,$newWord[$x]);
         }
-        
+
         if (NULL === $AddtoPersonalDict) {
             var_dump($AddtoPersonalDict);
-         
+
             if (enchant_broker_free_dict($requestDict)) {
                 echo("OK\n");
-                
+
                 if (enchant_broker_free($broker)) {
                     echo("OK\n");
-                    
+
                 } else {
                     echo("broker free failed\n");
                 }
@@ -43,8 +43,8 @@ if (is_resource($broker)) {
             echo("dict add to personal failed\n");
         }
     } else {
-        echo("broker request dict failed\n");        
-    }    
+        echo("broker request dict failed\n");
+    }
 } else {
     echo("init failed\n");
 }
diff --git a/ext/enchant/tests/broker_free_dict.phpt b/ext/enchant/tests/broker_free_dict.phpt
index f0b6bb6dc38..0e18ae7cc68 100644
--- a/ext/enchant/tests/broker_free_dict.phpt
+++ b/ext/enchant/tests/broker_free_dict.phpt
@@ -3,7 +3,7 @@ enchant_broker_free_dict(resource $dict); function
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('enchant')) die('skip, enchant not loader');
 if(!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");}
 if(!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, dont has dictionary install in this machine! \n");}
@@ -16,29 +16,29 @@ $newWord = "iLoveJava";
 if (is_resource($broker)) {
     echo("OK\n");
     $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']);
-    
+
     if ($requestDict) {
         echo("OK\n");
-        $AddtoPersonalDict = enchant_dict_add_to_personal($requestDict, $newWord);    
-        
+        $AddtoPersonalDict = enchant_dict_add_to_personal($requestDict, $newWord);
+
         if (NULL === $AddtoPersonalDict) {
-            var_dump($AddtoPersonalDict);    
-            
+            var_dump($AddtoPersonalDict);
+
             if (enchant_broker_free_dict($requestDict)) {
                 echo("OK\n");
-            
+
             } else {
                 echo("dict broker free has failed\n");
             }
-            
+
         } else {
             echo("dict add to personal failed\n");
         }
-        
+
     } else {
-        echo("broker request dict failed\n");        
+        echo("broker request dict failed\n");
     }
-    
+
 } else {
     echo("broker is not a resource; failed;\n");
 }
diff --git a/ext/enchant/tests/broker_get_error.phpt b/ext/enchant/tests/broker_get_error.phpt
index e8d248eca6f..93f6130c249 100644
--- a/ext/enchant/tests/broker_get_error.phpt
+++ b/ext/enchant/tests/broker_get_error.phpt
@@ -13,7 +13,7 @@ $broker = enchant_broker_init();
 if (is_resource($broker)) {
     echo("OK\n");
     $enchantErr = enchant_broker_get_error($broker);
-    
+
     if ("" == $enchantErr) {
         echo("OK\n");
     } else {
diff --git a/ext/enchant/tests/broker_init.phpt b/ext/enchant/tests/broker_init.phpt
index 12c25e3ddc0..b13541c070c 100644
--- a/ext/enchant/tests/broker_init.phpt
+++ b/ext/enchant/tests/broker_init.phpt
@@ -3,7 +3,7 @@ enchant_broker_init() function
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('enchant')) die('skip, enchant not loader');
 if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");}
  ?>
@@ -12,7 +12,7 @@ if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");}
 $broker = enchant_broker_init();
 if (is_resource($broker)) {
     echo("OK\n");
-} else {    
+} else {
     echo("failure, its not a resource\n");
 }
 ?>
diff --git a/ext/enchant/tests/broker_list_dicts.phpt b/ext/enchant/tests/broker_list_dicts.phpt
index a634734a587..185777c72da 100644
--- a/ext/enchant/tests/broker_list_dicts.phpt
+++ b/ext/enchant/tests/broker_list_dicts.phpt
@@ -13,7 +13,7 @@ $broker = enchant_broker_init();
 if (is_resource($broker)) {
     echo("OK\n");
     $brokerListDicts = enchant_broker_list_dicts($broker);
-    
+
     if (is_array($brokerListDicts)) {
         echo("OK\n");
     } else {
diff --git a/ext/enchant/tests/broker_request_dict.phpt b/ext/enchant/tests/broker_request_dict.phpt
index 5b7abe76bf6..3cf952f8699 100644
--- a/ext/enchant/tests/broker_request_dict.phpt
+++ b/ext/enchant/tests/broker_request_dict.phpt
@@ -16,7 +16,7 @@ $dicts = enchant_broker_list_dicts($broker);
 if (is_array($dicts)) {
     if (count($dicts)) {
     $dict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']);
-   
+
         if (is_resource($dict)) {
             echo "OK\n";
         } else {
diff --git a/ext/enchant/tests/broker_request_dict_01.phpt b/ext/enchant/tests/broker_request_dict_01.phpt
index 518b16de448..49deeaaf303 100644
--- a/ext/enchant/tests/broker_request_dict_01.phpt
+++ b/ext/enchant/tests/broker_request_dict_01.phpt
@@ -3,7 +3,7 @@ enchant_broker_request_dict() function
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('enchant')) die('skip, enchant not loader');
 if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");}
 if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, dont has dictionary install in this machine! \n");}
diff --git a/ext/enchant/tests/broker_request_pwl_dict.phpt b/ext/enchant/tests/broker_request_pwl_dict.phpt
index 6235aeea5fa..a8beadba6c3 100644
--- a/ext/enchant/tests/broker_request_pwl_dict.phpt
+++ b/ext/enchant/tests/broker_request_pwl_dict.phpt
@@ -3,7 +3,7 @@ resource enchant_broker_request_pwl_dict(resource $broker, string $filename); fu
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('enchant')) die('skip, enchant not loader');
 if(!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");}
 ?>
@@ -15,11 +15,11 @@ $pathPwlDict = __DIR__ . "/enchant_broker_request_pwl_dict.pwl";
 if (is_resource($broker)) {
     echo("OK\n");
     $requestDict = enchant_broker_request_pwl_dict($broker, $pathPwlDict);
-    
+
     if (is_resource($requestDict)) {
         echo("OK\n");
         $dictdescribe = enchant_dict_describe($requestDict);
-        
+
         if ($pathPwlDict === $dictdescribe['file']) {
             echo("OK\n");
         } else {
diff --git a/ext/enchant/tests/bug13181.phpt b/ext/enchant/tests/bug13181.phpt
index 38aec636cf2..a8b2501f615 100644
--- a/ext/enchant/tests/bug13181.phpt
+++ b/ext/enchant/tests/bug13181.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bug #13181, leaving a context frees the broker resources
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('enchant')) die('skip, enchant not loader');
 
  ?>
diff --git a/ext/enchant/tests/dict_add_to_personal.phpt b/ext/enchant/tests/dict_add_to_personal.phpt
index 96bac1e2569..e711a25f454 100644
--- a/ext/enchant/tests/dict_add_to_personal.phpt
+++ b/ext/enchant/tests/dict_add_to_personal.phpt
@@ -3,7 +3,7 @@ enchant_dict_add_to_personal() function
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('enchant')) die('skip, enchant not loader');
 if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");}
 if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, dont has dictionary install in this machine! \n");}
@@ -17,21 +17,21 @@ $newWord = "iLoveJava";
 if (is_resource($broker)) {
     echo("OK\n");
     $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']);
-    
+
     if ($requestDict) {
         echo("OK\n");
-        $AddtoPersonalDict = enchant_dict_add_to_personal($requestDict,$newWord);    
-        
+        $AddtoPersonalDict = enchant_dict_add_to_personal($requestDict,$newWord);
+
         if (NULL === $AddtoPersonalDict) {
-            var_dump($AddtoPersonalDict);    
-            
+            var_dump($AddtoPersonalDict);
+
         } else {
             echo("dict add to personal failed\n");
         }
-        
+
     } else {
-	echo("broker request dict failed\n");        
-    
+	echo("broker request dict failed\n");
+
     }
 
 } else {
diff --git a/ext/enchant/tests/dict_add_to_session.phpt b/ext/enchant/tests/dict_add_to_session.phpt
index 78f66f84477..441d2dde746 100644
--- a/ext/enchant/tests/dict_add_to_session.phpt
+++ b/ext/enchant/tests/dict_add_to_session.phpt
@@ -17,24 +17,24 @@ $newWord = "iLoveJavaScript";
 if (is_resource($broker)) {
     echo("OK\n");
     $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']);
-    
+
     if ($requestDict) {
         echo("OK\n");
         $AddtoSessionDict = enchant_dict_add_to_session($requestDict,$newWord);
-        
+
         if (NULL === $AddtoSessionDict) {
             var_dump($AddtoSessionDict);
         } else {
             echo("dict add to session failed\n");
-        
+
         }
-        
+
     } else {
         echo("broker request dict failed\n");
     }
 } else {
     echo("broker is not a resource; failed;\n");
-    
+
 }
 echo "OK\n";
 ?>
diff --git a/ext/enchant/tests/dict_check.phpt b/ext/enchant/tests/dict_check.phpt
index fd5cf45b34c..eb4198c4cf7 100644
--- a/ext/enchant/tests/dict_check.phpt
+++ b/ext/enchant/tests/dict_check.phpt
@@ -3,7 +3,7 @@ enchant_dict_check() function
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('enchant')) die('skip, enchant not loader');
 if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");}
 if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, dont has dictionary install in this machine! \n");}
@@ -17,21 +17,21 @@ $newWord = "java";
 if (is_resource($broker)) {
     echo("OK\n");
     $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']);
-    
+
     if ($requestDict) {
         echo("OK\n");
         enchant_dict_add_to_personal($requestDict, $newWord);
-      
+
         if (enchant_dict_check($requestDict, $newWord)) {
             echo("OK\n");
-            
+
         } else {
             echo("dict check new word failed\n");
         }
-        
+
     } else {
-	echo("broker request dict failed\n");        
-    
+	echo("broker request dict failed\n");
+
     }
 
 } else {
diff --git a/ext/enchant/tests/dict_describe.phpt b/ext/enchant/tests/dict_describe.phpt
index 60a1e7c3f37..18cdbfe3794 100644
--- a/ext/enchant/tests/dict_describe.phpt
+++ b/ext/enchant/tests/dict_describe.phpt
@@ -16,14 +16,14 @@ $dicts = enchant_broker_list_dicts($broker);
 if (is_resource($broker)) {
     echo("OK\n");
     $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']);
-    
+
     if ($requestDict) {
         echo("OK\n");
         $dictDescribe = enchant_dict_describe($requestDict);
-        
+
         if (is_array($dictDescribe)) {
             echo("OK\n");
-        
+
         } else {
            echo("broker request dict failed\n");
         }
diff --git a/ext/enchant/tests/dict_get_error.phpt b/ext/enchant/tests/dict_get_error.phpt
index fc942a55ef3..271214a7868 100644
--- a/ext/enchant/tests/dict_get_error.phpt
+++ b/ext/enchant/tests/dict_get_error.phpt
@@ -16,7 +16,7 @@ $dicts = enchant_broker_list_dicts($broker);
 if (is_resource($broker)) {
     echo("OK\n");
     $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']);
-    
+
     if ($requestDict) {
         var_dump(enchant_dict_get_error($requestDict));
     } else {
diff --git a/ext/enchant/tests/dict_is_in_session.phpt b/ext/enchant/tests/dict_is_in_session.phpt
index 6bf4af4839f..4e670d5512f 100644
--- a/ext/enchant/tests/dict_is_in_session.phpt
+++ b/ext/enchant/tests/dict_is_in_session.phpt
@@ -17,11 +17,11 @@ $newWord = "aspell";
 if (is_resource($broker)) {
     echo("OK\n");
     $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']);
-    
+
     if ($requestDict) {
         echo("OK\n");
         $AddtoPersonalDict = enchant_dict_add_to_personal($requestDict,$newWord);
-        
+
         if (NULL === $AddtoPersonalDict) {
             var_dump(enchant_dict_is_in_session($requestDict,$newWord));
         } else {
diff --git a/ext/enchant/tests/dict_quick_check_01.phpt b/ext/enchant/tests/dict_quick_check_01.phpt
index 4ef46829c35..a4dd8181114 100644
--- a/ext/enchant/tests/dict_quick_check_01.phpt
+++ b/ext/enchant/tests/dict_quick_check_01.phpt
@@ -17,10 +17,10 @@ $word = "aspell";
 if (is_resource($broker)) {
     echo("OK\n");
     $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']);
-    
+
     if ($requestDict) {
         enchant_dict_quick_check($requestDict,$word,$sugs);
-        
+
         if (is_array($sugs)) {
             echo("OK\n");
         } else {
diff --git a/ext/enchant/tests/dict_store_replacement.phpt b/ext/enchant/tests/dict_store_replacement.phpt
index 3383e77fe17..8ecd7b06a0c 100644
--- a/ext/enchant/tests/dict_store_replacement.phpt
+++ b/ext/enchant/tests/dict_store_replacement.phpt
@@ -18,11 +18,11 @@ $rightWord = "java";
 if (is_resource($broker)) {
     echo("OK\n");
     $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']);
-    
+
     if ($requestDict) {
         echo("OK\n");
         $AddtoPersonalDict = enchant_dict_store_replacement($requestDict,$wrongWord,$rightWord);
-        
+
         if (NULL === $AddtoPersonalDict) {
             var_dump($AddtoPersonalDict);
         } else {
diff --git a/ext/enchant/tests/dict_suggest.phpt b/ext/enchant/tests/dict_suggest.phpt
index 7317120a3b0..85aa8235792 100644
--- a/ext/enchant/tests/dict_suggest.phpt
+++ b/ext/enchant/tests/dict_suggest.phpt
@@ -3,7 +3,7 @@ enchant_dict_suggest() function
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('enchant')) die('skip, enchant not loader');
 if (!is_resource(enchant_broker_init())) {die("skip, resource dont load\n");}
 if (!is_array(enchant_broker_list_dicts(enchant_broker_init()))) {die("skip, dont has dictionary install in this machine! \n");}
@@ -17,20 +17,20 @@ $sugs = "soong";
 if (is_resource($broker)) {
     echo("OK\n");
     $requestDict = enchant_broker_request_dict($broker, $dicts[0]['lang_tag']);
-    
+
     if ($requestDict) {
     	echo("OK\n");
-        $dictSuggest = enchant_dict_suggest($requestDict,$sugs);        
+        $dictSuggest = enchant_dict_suggest($requestDict,$sugs);
 
         if (is_array($dictSuggest)) {
             echo("OK\n");
         } else {
             echo("dict suggest failed\n");
         }
-        
+
     } else {
-	echo("broker request dict failed\n");        
-    
+	echo("broker request dict failed\n");
+
     }
 
 } else {
diff --git a/ext/enchant/tests/enchant_broker_set_dict_path.phpt b/ext/enchant/tests/enchant_broker_set_dict_path.phpt
index 47a65093bc4..db35288a42c 100644
--- a/ext/enchant/tests/enchant_broker_set_dict_path.phpt
+++ b/ext/enchant/tests/enchant_broker_set_dict_path.phpt
@@ -19,23 +19,23 @@ $dictTypeValue2 = 2;
 
 if (is_resource($broker)) {
     echo("OK\n");
-    
+
     if (enchant_broker_set_dict_path($broker, $dictTypeValue1, $backEndDictType1)) {
         echo("OK\n");
-        
+
         if (enchant_broker_set_dict_path($broker, $dictTypeValue2, $backEndDictType2)) {
             echo("OK\n");
-                
-            if ( 
-                  (enchant_broker_get_dict_path($broker,$dictTypeValue1) == $backEndDictType1) && 
-                  (enchant_broker_get_dict_path($broker,$dictTypeValue2) == $backEndDictType2)            
+
+            if (
+                  (enchant_broker_get_dict_path($broker,$dictTypeValue1) == $backEndDictType1) &&
+                  (enchant_broker_get_dict_path($broker,$dictTypeValue2) == $backEndDictType2)
               ) {
                    echo("OK\n");
 
             } else {
                    echo("broker get dict path has failed \n");
-            }                    
-        
+            }
+
         } else {
            echo("broker set dict path {$backEndDictType2} has failed \n");
         }
diff --git a/ext/exif/tests/bug34704-mb.phpt b/ext/exif/tests/bug34704-mb.phpt
index 05c50b3a5a8..8185eb319cd 100644
--- a/ext/exif/tests/bug34704-mb.phpt
+++ b/ext/exif/tests/bug34704-mb.phpt
@@ -4,7 +4,7 @@ Bug #34704 (Infinite recursion due to corrupt JPEG)
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --INI--
 output_handler=
-zlib.output_compression=0 
+zlib.output_compression=0
 --FILE--
 <?php
 $infile = dirname(__FILE__).'/bug34704��ガラスを食�られ��.jpg';
diff --git a/ext/exif/tests/bug34704.phpt b/ext/exif/tests/bug34704.phpt
index 7688ce861af..ebe05fb8787 100644
--- a/ext/exif/tests/bug34704.phpt
+++ b/ext/exif/tests/bug34704.phpt
@@ -4,7 +4,7 @@ Bug #34704 (Infinite recursion due to corrupt JPEG)
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --INI--
 output_handler=
-zlib.output_compression=0 
+zlib.output_compression=0
 --FILE--
 <?php
 $infile = dirname(__FILE__).'/bug34704.jpg';
diff --git a/ext/exif/tests/bug48378.phpt b/ext/exif/tests/bug48378.phpt
index 286ce610733..a66aba3a51c 100644
--- a/ext/exif/tests/bug48378.phpt
+++ b/ext/exif/tests/bug48378.phpt
@@ -5,7 +5,7 @@ Bug #48378 (Infinite recursion due to corrupt JPEG)
 --FILE--
 <?php
 exif_read_data(
-dirname(__FILE__) . "/bug48378.jpeg", 
+dirname(__FILE__) . "/bug48378.jpeg",
 "FILE,COMPUTED,ANY_TAG"
 );
 ?>
diff --git a/ext/exif/tests/bug50660/bug50660.phpt b/ext/exif/tests/bug50660/bug50660.phpt
index 00a83ce4b0c..e523921ebde 100644
--- a/ext/exif/tests/bug50660/bug50660.phpt
+++ b/ext/exif/tests/bug50660/bug50660.phpt
@@ -4,7 +4,7 @@ Bug #50660 (exif_read_data(): Illegal IFD offset (works fine with other exif rea
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --INI--
 output_handler=
-zlib.output_compression=0 
+zlib.output_compression=0
 --FILE--
 <?php
 $infile = dirname(__FILE__).'/bug50660-1.jpg';
diff --git a/ext/exif/tests/bug60150.phpt b/ext/exif/tests/bug60150.phpt
index be01998fd8e..2f39c115118 100644
--- a/ext/exif/tests/bug60150.phpt
+++ b/ext/exif/tests/bug60150.phpt
@@ -4,7 +4,7 @@ Bug #60150 (Integer overflow during the parsing of invalid exif header)
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --INI--
 output_handler=
-zlib.output_compression=0 
+zlib.output_compression=0
 --FILE--
 <?php
 $infile = dirname(__FILE__).'/bug60150.jpg';
diff --git a/ext/exif/tests/bug72735/bug72682.phpt b/ext/exif/tests/bug72735/bug72682.phpt
index b3f17791a3b..afbf5c59cb8 100644
--- a/ext/exif/tests/bug72735/bug72682.phpt
+++ b/ext/exif/tests/bug72735/bug72682.phpt
@@ -9,7 +9,7 @@ foreach (['nokia.jpg', 'samsung.jpg', 'panasonic.jpg'] as $picture) {
 
 	$info = exif_read_data(__DIR__ . DIRECTORY_SEPARATOR . $picture);
 	var_dump($info['MakerNote']);
-} 
+}
 ?>
 --EXPECTF--
 nokia.jpg: string(5) "Nikon"
diff --git a/ext/exif/tests/bug72735/bug72735.phpt b/ext/exif/tests/bug72735/bug72735.phpt
index 38d9ed21997..055ec0d06b3 100644
--- a/ext/exif/tests/bug72735/bug72735.phpt
+++ b/ext/exif/tests/bug72735/bug72735.phpt
@@ -16,7 +16,7 @@ foreach (['nokia.jpg', 'samsung.jpg', 'panasonic.jpg'] as $picture) {
 	}
 
 	echo 'int(' . $len . ')', PHP_EOL;
-} 
+}
 ?>
 --EXPECTF--
 nokia.jpg: int(5899)
diff --git a/ext/exif/tests/bug72819/bug72819.phpt b/ext/exif/tests/bug72819/bug72819.phpt
index f71fa316632..d99a15c1972 100644
--- a/ext/exif/tests/bug72819/bug72819.phpt
+++ b/ext/exif/tests/bug72819/bug72819.phpt
@@ -4,7 +4,7 @@ Bug #72819 (EXIF thumbnails not read anymore)
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --INI--
 output_handler=
-zlib.output_compression=0 
+zlib.output_compression=0
 --FILE--
 <?php
 $infile = dirname(__FILE__).'/bug72819.jpg';
diff --git a/ext/exif/tests/bug73115/bug73115.phpt b/ext/exif/tests/bug73115/bug73115.phpt
index 969ddebe9f4..9ce3818e591 100644
--- a/ext/exif/tests/bug73115/bug73115.phpt
+++ b/ext/exif/tests/bug73115/bug73115.phpt
@@ -4,7 +4,7 @@ Bug #73115 (exif_read_data triggers warning on reading binary strings)
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --INI--
 output_handler=
-zlib.output_compression=0 
+zlib.output_compression=0
 --FILE--
 <?php
 $infile = dirname(__FILE__).'/bug73115.jpg';
diff --git a/ext/exif/tests/bug74428/bug74428.phpt b/ext/exif/tests/bug74428/bug74428.phpt
index b2beca3f21b..24911084e42 100644
--- a/ext/exif/tests/bug74428/bug74428.phpt
+++ b/ext/exif/tests/bug74428/bug74428.phpt
@@ -4,7 +4,7 @@ Bug #74428 (exif_read_data(): "Illegal IFD size" warning occurs with correct exi
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --INI--
 output_handler=
-zlib.output_compression=0 
+zlib.output_compression=0
 --FILE--
 <?php
 $infile = dirname(__FILE__).'/bug74428.jpg';
diff --git a/ext/exif/tests/exif002.phpt b/ext/exif/tests/exif002.phpt
index 2a70f2920c9..7f78ef28135 100644
--- a/ext/exif/tests/exif002.phpt
+++ b/ext/exif/tests/exif002.phpt
@@ -4,7 +4,7 @@ Check for exif_thumbnail
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --INI--
 output_handler=
-zlib.output_compression=0 
+zlib.output_compression=0
 --FILE--
 <?php
 /*
diff --git a/ext/exif/tests/exif003.phpt b/ext/exif/tests/exif003.phpt
index 20cb61ee171..d0a1b7b3ba0 100644
--- a/ext/exif/tests/exif003.phpt
+++ b/ext/exif/tests/exif003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for exif_read_data, Unicode user comment
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded('exif')) die('skip exif extension not available');
 	if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
 	if (!defined("EXIF_USE_MBSTRING") || !EXIF_USE_MBSTRING) die ('skip mbstring loaded by dl');
diff --git a/ext/exif/tests/exif004.phpt b/ext/exif/tests/exif004.phpt
index 8797955f8c8..fd941cc4d4e 100644
--- a/ext/exif/tests/exif004.phpt
+++ b/ext/exif/tests/exif004.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Check for exif_read_data, Unicode WinXP tags	
+Check for exif_read_data, Unicode WinXP tags
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded('exif')) die('skip exif extension not available');
 	if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
 	if (!defined("EXIF_USE_MBSTRING") || !EXIF_USE_MBSTRING) die ('skip mbstring loaded by dl');
diff --git a/ext/exif/tests/exif_imagetype_error.phpt b/ext/exif/tests/exif_imagetype_error.phpt
index 989d02b6a49..59c9b8d12c7 100644
--- a/ext/exif/tests/exif_imagetype_error.phpt
+++ b/ext/exif/tests/exif_imagetype_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test exif_imagetype() function : error conditions 
+Test exif_imagetype() function : error conditions
 --SKIPIF--
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --FILE--
diff --git a/ext/exif/tests/exif_imagetype_variation1.phpt b/ext/exif/tests/exif_imagetype_variation1.phpt
index d33217c5f8d..c190aed15c3 100644
--- a/ext/exif/tests/exif_imagetype_variation1.phpt
+++ b/ext/exif/tests/exif_imagetype_variation1.phpt
@@ -21,7 +21,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
   return "obj'ct";
-  } 
+  }
 }
 
 // Defining resource
@@ -65,13 +65,13 @@ $values =  array (
 
   // unset variable
   $unset_var,
-  
+
   // objects
   new sample(),
 
   // resource
   $file_handle,
- 
+
   NULL,
   null
 );
diff --git a/ext/exif/tests/exif_tagname_basic.phpt b/ext/exif/tests/exif_tagname_basic.phpt
index e33601197b3..82bd06ebabc 100644
--- a/ext/exif/tests/exif_tagname_basic.phpt
+++ b/ext/exif/tests/exif_tagname_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test exif_tagname() function : basic functionality 
+Test exif_tagname() function : basic functionality
 --SKIPIF--
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --INI--
diff --git a/ext/exif/tests/exif_tagname_error.phpt b/ext/exif/tests/exif_tagname_error.phpt
index ed1f2fdc3a5..2408ad5ce8b 100644
--- a/ext/exif/tests/exif_tagname_error.phpt
+++ b/ext/exif/tests/exif_tagname_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test exif_tagname() function : error conditions 
+Test exif_tagname() function : error conditions
 --SKIPIF--
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --FILE--
diff --git a/ext/exif/tests/exif_tagname_variation1-64bit.phpt b/ext/exif/tests/exif_tagname_variation1-64bit.phpt
index 22298af2ae5..468a63bf0ac 100644
--- a/ext/exif/tests/exif_tagname_variation1-64bit.phpt
+++ b/ext/exif/tests/exif_tagname_variation1-64bit.phpt
@@ -23,7 +23,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
   return "obj'ct";
-  } 
+  }
 }
 
 // Defining resource
@@ -67,13 +67,13 @@ $values =  array (
 
   // unset variable
   $unset_var,
-  
+
   // objects
   new sample(),
 
   // resource
   $file_handle,
- 
+
   NULL,
   null
 );
diff --git a/ext/exif/tests/exif_tagname_variation1.phpt b/ext/exif/tests/exif_tagname_variation1.phpt
index 44d2568f496..805ad814b24 100644
--- a/ext/exif/tests/exif_tagname_variation1.phpt
+++ b/ext/exif/tests/exif_tagname_variation1.phpt
@@ -23,7 +23,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
   return "obj'ct";
-  } 
+  }
 }
 
 // Defining resource
@@ -65,13 +65,13 @@ $values =  array (
 
   // unset variable
   $unset_var,
-  
+
   // objects
   new sample(),
 
   // resource
   $file_handle,
- 
+
   NULL,
   null
 );
diff --git a/ext/exif/tests/sony.phpt b/ext/exif/tests/sony.phpt
index 683d58d4ac1..8c2bf7c58cf 100644
--- a/ext/exif/tests/sony.phpt
+++ b/ext/exif/tests/sony.phpt
@@ -10,7 +10,7 @@ if (!$data) {
 	exit('Error: Unable to parse EXIF data');
 }
 
-// Perhaps we should just test for SonyModelID since it seems to be 
+// Perhaps we should just test for SonyModelID since it seems to be
 // the most specific tag name that should be found in any Sony generated
 // picture
 foreach (['SonyModelID', 'Panorama', 'AntiBlur'] as $sony_tag) {
diff --git a/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt b/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt
index e56062a534d..c76b310adfe 100644
--- a/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt
+++ b/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test finfo_buffer() function : basic functionality 
+Test finfo_buffer() function : basic functionality
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
- * Description: Return infromation about a string buffer. 
+ * Description: Return infromation about a string buffer.
  * Source code: ext/fileinfo/fileinfo.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic��ガラスを食�られ��';
diff --git a/ext/fileinfo/tests/finfo_buffer_basic.phpt b/ext/fileinfo/tests/finfo_buffer_basic.phpt
index 0c3c641388f..f4923628ade 100644
--- a/ext/fileinfo/tests/finfo_buffer_basic.phpt
+++ b/ext/fileinfo/tests/finfo_buffer_basic.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test finfo_buffer() function : basic functionality 
+Test finfo_buffer() function : basic functionality
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
- * Description: Return infromation about a string buffer. 
+ * Description: Return infromation about a string buffer.
  * Source code: ext/fileinfo/fileinfo.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic';
diff --git a/ext/fileinfo/tests/finfo_buffer_error.phpt b/ext/fileinfo/tests/finfo_buffer_error.phpt
index 088836fc27b..3e74d71ef99 100644
--- a/ext/fileinfo/tests/finfo_buffer_error.phpt
+++ b/ext/fileinfo/tests/finfo_buffer_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test finfo_buffer() function : error conditions 
+Test finfo_buffer() function : error conditions
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
- * Description: Return infromation about a string buffer. 
+ * Description: Return infromation about a string buffer.
  * Source code: ext/fileinfo/fileinfo.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic';
diff --git a/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt b/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt
index 5179fd44977..4fbec8f9b0b 100644
--- a/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt
+++ b/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test finfo_buffer() function : basic functionality 
+Test finfo_buffer() function : basic functionality
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
- * Description: Return infromation about a string buffer. 
+ * Description: Return infromation about a string buffer.
  * Source code: ext/fileinfo/fileinfo.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic��ガラスを食�られ��';
diff --git a/ext/fileinfo/tests/finfo_buffer_variation1.phpt b/ext/fileinfo/tests/finfo_buffer_variation1.phpt
index 4fdd2be272f..db8ab8a404b 100644
--- a/ext/fileinfo/tests/finfo_buffer_variation1.phpt
+++ b/ext/fileinfo/tests/finfo_buffer_variation1.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test finfo_buffer() function : basic functionality 
+Test finfo_buffer() function : basic functionality
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
- * Description: Return infromation about a string buffer. 
+ * Description: Return infromation about a string buffer.
  * Source code: ext/fileinfo/fileinfo.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic';
diff --git a/ext/fileinfo/tests/finfo_close_basic.phpt b/ext/fileinfo/tests/finfo_close_basic.phpt
index 966431d99db..b307b23bef9 100644
--- a/ext/fileinfo/tests/finfo_close_basic.phpt
+++ b/ext/fileinfo/tests/finfo_close_basic.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test finfo_close() function : basic functionality 
+Test finfo_close() function : basic functionality
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : resource finfo_close(resource finfo)
- * Description: Close fileinfo resource. 
+ * Description: Close fileinfo resource.
  * Source code: ext/fileinfo/fileinfo.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing finfo_close() : basic functionality ***\n";
diff --git a/ext/fileinfo/tests/finfo_close_error.phpt b/ext/fileinfo/tests/finfo_close_error.phpt
index 85dc75406ed..374787aa55d 100644
--- a/ext/fileinfo/tests/finfo_close_error.phpt
+++ b/ext/fileinfo/tests/finfo_close_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test finfo_close() function : error conditions 
+Test finfo_close() function : error conditions
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : resource finfo_close(resource finfo)
- * Description: Close fileinfo resource. 
+ * Description: Close fileinfo resource.
  * Source code: ext/fileinfo/fileinfo.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing finfo_close() : error conditions ***\n";
diff --git a/ext/fileinfo/tests/finfo_file_basic.phpt b/ext/fileinfo/tests/finfo_file_basic.phpt
index c99695ef529..ab39dea0700 100644
--- a/ext/fileinfo/tests/finfo_file_basic.phpt
+++ b/ext/fileinfo/tests/finfo_file_basic.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test finfo_file() function : basic functionality 
+Test finfo_file() function : basic functionality
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : string finfo_file(resource finfo, char *file_name [, int options [, resource context]])
- * Description: Return information about a file. 
+ * Description: Return information about a file.
  * Source code: ext/fileinfo/fileinfo.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic';
diff --git a/ext/fileinfo/tests/finfo_file_regex.phpt b/ext/fileinfo/tests/finfo_file_regex.phpt
index d6c027d1338..c7e562a79f7 100644
--- a/ext/fileinfo/tests/finfo_file_regex.phpt
+++ b/ext/fileinfo/tests/finfo_file_regex.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test finfo_file() function : regex rules
 --SKIPIF--
-<?php require_once(dirname(__FILE__) . '/skipif.inc'); 
+<?php require_once(dirname(__FILE__) . '/skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/ext/fileinfo/tests/finfo_open_basic.phpt b/ext/fileinfo/tests/finfo_open_basic.phpt
index 30fe7c23646..887ffb09af7 100644
--- a/ext/fileinfo/tests/finfo_open_basic.phpt
+++ b/ext/fileinfo/tests/finfo_open_basic.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test finfo_open() function : basic functionality 
+Test finfo_open() function : basic functionality
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : resource finfo_open([int options [, string arg]])
- * Description: Create a new fileinfo resource. 
+ * Description: Create a new fileinfo resource.
  * Source code: ext/fileinfo/fileinfo.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic';
diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt
index 511df600c14..05fbc50b9ce 100644
--- a/ext/fileinfo/tests/finfo_open_error.phpt
+++ b/ext/fileinfo/tests/finfo_open_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test finfo_open() function : error functionality 
+Test finfo_open() function : error functionality
 --SKIPIF--
-<?php require_once(dirname(__FILE__) . '/skipif.inc'); 
+<?php require_once(dirname(__FILE__) . '/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : resource finfo_open([int options [, string arg]])
- * Description: Create a new fileinfo resource. 
+ * Description: Create a new fileinfo resource.
  * Source code: ext/fileinfo/fileinfo.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic';
diff --git a/ext/fileinfo/tests/finfo_open_variation1.phpt b/ext/fileinfo/tests/finfo_open_variation1.phpt
index 1bc46f4ad3c..caa6e4abe74 100644
--- a/ext/fileinfo/tests/finfo_open_variation1.phpt
+++ b/ext/fileinfo/tests/finfo_open_variation1.phpt
@@ -5,9 +5,9 @@ Test finfo_open() function : variations in opening
 --FILE--
 <?php
 /* Prototype  : resource finfo_open([int options [, string arg]])
- * Description: Create a new fileinfo resource. 
+ * Description: Create a new fileinfo resource.
  * Source code: ext/fileinfo/fileinfo.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic';
diff --git a/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt b/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt
index 40b788b3166..615afd40f8e 100644
--- a/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt
+++ b/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test finfo_set_flags() function : basic functionality 
+Test finfo_set_flags() function : basic functionality
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : bool finfo_set_flags(resource finfo, int options)
- * Description: Set libmagic configuration options. 
+ * Description: Set libmagic configuration options.
  * Source code: ext/fileinfo/fileinfo.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic��ガラスを食�られ��';
diff --git a/ext/fileinfo/tests/finfo_set_flags_basic.phpt b/ext/fileinfo/tests/finfo_set_flags_basic.phpt
index 5b5ab517b1e..3b7168a6845 100644
--- a/ext/fileinfo/tests/finfo_set_flags_basic.phpt
+++ b/ext/fileinfo/tests/finfo_set_flags_basic.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test finfo_set_flags() function : basic functionality 
+Test finfo_set_flags() function : basic functionality
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
 /* Prototype  : bool finfo_set_flags(resource finfo, int options)
- * Description: Set libmagic configuration options. 
+ * Description: Set libmagic configuration options.
  * Source code: ext/fileinfo/fileinfo.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $magicFile = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'magic';
diff --git a/ext/fileinfo/tests/mime_content_type_002.phpt b/ext/fileinfo/tests/mime_content_type_002.phpt
index e56b2b198a1..4022a67077c 100644
--- a/ext/fileinfo/tests/mime_content_type_002.phpt
+++ b/ext/fileinfo/tests/mime_content_type_002.phpt
@@ -4,7 +4,7 @@ mime_content_type(): Testing parameter
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
 <?php
-	
+
 var_dump(mime_content_type(__FILE__));
 var_dump(mime_content_type(fopen(__FILE__, 'r')));
 var_dump(mime_content_type('.'));
diff --git a/ext/filter/tests/002.phpt b/ext/filter/tests/002.phpt
index 7136b251a6f..7629f0125ab 100644
--- a/ext/filter/tests/002.phpt
+++ b/ext/filter/tests/002.phpt
@@ -4,7 +4,7 @@ GET test with 2 values and an empty one
 a=1&b=&c=3
 --FILE--
 <?php echo $_GET['a'];
-echo $_GET['b']; 
+echo $_GET['b'];
 echo $_GET['c'];
 ?>
 --EXPECT--
diff --git a/ext/filter/tests/003.phpt b/ext/filter/tests/003.phpt
index 43e6cd9b03c..e49e2404482 100644
--- a/ext/filter/tests/003.phpt
+++ b/ext/filter/tests/003.phpt
@@ -6,7 +6,7 @@ d=4&e=5
 a=1&b=&c=3
 --FILE--
 <?php echo $_GET['a'];
-echo $_GET['b']; 
+echo $_GET['b'];
 echo $_GET['c'];
 echo $_POST['d'];
 echo $_POST['e'];
diff --git a/ext/filter/tests/004.phpt b/ext/filter/tests/004.phpt
index b8991249364..e36682979c4 100644
--- a/ext/filter/tests/004.phpt
+++ b/ext/filter/tests/004.phpt
@@ -10,7 +10,7 @@ d="quotes"&e=\slash
 a=O'Henry&b=&c=<b>Bold</b>
 --FILE--
 <?php echo $_GET['a'];
-echo $_GET['b']; 
+echo $_GET['b'];
 echo $_GET['c'];
 echo $_POST['d'];
 echo $_POST['e'];
diff --git a/ext/filter/tests/005.phpt b/ext/filter/tests/005.phpt
index b3735f5627f..7ddb8a783b7 100644
--- a/ext/filter/tests/005.phpt
+++ b/ext/filter/tests/005.phpt
@@ -7,14 +7,14 @@ filter.default=stripped
 --GET--
 id=f03_photos&pgurl=http%3A//fifaworldcup.yahoo.com/03/en/photozone/index.html
 --FILE--
-<?php 
+<?php
 echo $_GET['id'];
 echo "\n";
-echo $_GET['pgurl']; 
+echo $_GET['pgurl'];
 echo "\n";
 echo $_REQUEST['id'];
 echo "\n";
-echo $_REQUEST['pgurl']; 
+echo $_REQUEST['pgurl'];
 ?>
 --EXPECT--
 f03_photos
diff --git a/ext/filter/tests/006.phpt b/ext/filter/tests/006.phpt
index 9439e471c2e..703cc2c65fa 100644
--- a/ext/filter/tests/006.phpt
+++ b/ext/filter/tests/006.phpt
@@ -5,7 +5,7 @@ filter() test
 --POST--
 foo=<b>abc</b>
 --FILE--
-<?php 
+<?php
 echo filter_input(INPUT_POST, 'foo', FILTER_SANITIZE_STRIPPED);
 ?>
 --EXPECT--
diff --git a/ext/filter/tests/007.phpt b/ext/filter/tests/007.phpt
index 0214533a109..b008af7125d 100644
--- a/ext/filter/tests/007.phpt
+++ b/ext/filter/tests/007.phpt
@@ -31,7 +31,7 @@ var_dump(filter_has_var("", array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(false)
diff --git a/ext/filter/tests/008.phpt b/ext/filter/tests/008.phpt
index 54880e59cc9..e49a379601e 100644
--- a/ext/filter/tests/008.phpt
+++ b/ext/filter/tests/008.phpt
@@ -10,7 +10,7 @@ var_dump(filter_list(array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(21) {
   [0]=>
   string(3) "int"
diff --git a/ext/filter/tests/009.phpt b/ext/filter/tests/009.phpt
index d09f996fd07..5c38e5603a8 100644
--- a/ext/filter/tests/009.phpt
+++ b/ext/filter/tests/009.phpt
@@ -16,7 +16,7 @@ var_dump(filter_id(0,0,0));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(513)
 int(513)
 int(518)
diff --git a/ext/filter/tests/010.phpt b/ext/filter/tests/010.phpt
index 40dd27bc528..471f36a9d7d 100644
--- a/ext/filter/tests/010.phpt
+++ b/ext/filter/tests/010.phpt
@@ -18,7 +18,7 @@ var_dump(filter_var(1, 0, array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(7) {
   [0]=>
   int(1)
diff --git a/ext/filter/tests/011.phpt b/ext/filter/tests/011.phpt
index 0413966e832..57f2ec2f1b2 100644
--- a/ext/filter/tests/011.phpt
+++ b/ext/filter/tests/011.phpt
@@ -28,7 +28,7 @@ var_dump(filter_var(0, 0, 0, 0, 0));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(4) "test"
 string(18) "http://example.com"
 string(27) "&#60;b&#62;test&#60;/b&#62;"
diff --git a/ext/filter/tests/012.phpt b/ext/filter/tests/012.phpt
index 9a8ead944d6..cd74081e8ca 100644
--- a/ext/filter/tests/012.phpt
+++ b/ext/filter/tests/012.phpt
@@ -11,7 +11,7 @@ var_dump(filter_input(INPUT_COOKIE, ""));
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 NULL
 NULL
 NULL
diff --git a/ext/filter/tests/013.phpt b/ext/filter/tests/013.phpt
index 421c5d55bfc..c9dd915d83e 100644
--- a/ext/filter/tests/013.phpt
+++ b/ext/filter/tests/013.phpt
@@ -40,7 +40,7 @@ var_dump(filter_var("010", FILTER_VALIDATE_INT));
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 int(234)
 int(234)
 int(234)
diff --git a/ext/filter/tests/014.phpt b/ext/filter/tests/014.phpt
index 88374571476..6b34a19b77e 100644
--- a/ext/filter/tests/014.phpt
+++ b/ext/filter/tests/014.phpt
@@ -30,11 +30,11 @@ var_dump(filter_var("", FILTER_VALIDATE_BOOLEAN));
 var_dump(filter_var(-1, FILTER_VALIDATE_BOOLEAN));
 var_dump(filter_var("000000", FILTER_VALIDATE_BOOLEAN));
 var_dump(filter_var("111111", FILTER_VALIDATE_BOOLEAN));
-	
+
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 bool(false)
 bool(false)
 bool(false)
diff --git a/ext/filter/tests/015.phpt b/ext/filter/tests/015.phpt
index 44926a1cacb..4a5298e6731 100644
--- a/ext/filter/tests/015.phpt
+++ b/ext/filter/tests/015.phpt
@@ -6,11 +6,11 @@ filter_var() and FILTER_VALIDATE_URL
 <?php
 
 $values = Array(
-'http://example.com/index.html',	
-'http://www.example.com/index.php',	
-'http://www.example/img/test.png',	
-'http://www.example/img/dir/',	
-'http://www.example/img/dir',	
+'http://example.com/index.html',
+'http://www.example.com/index.php',
+'http://www.example/img/test.png',
+'http://www.example/img/dir/',
+'http://www.example/img/dir',
 'http://www.thelongestdomainnameintheworldandthensomeandthensomemoreandmore.com/',
 'http://toolongtoolongtoolongtoolongtoolongtoolongtoolongtoolongtoolongtoolong.com',
 'http://eauBcFReEmjLcoZwI0RuONNnwU4H9r151juCaqTI5VeIP5jcYIqhx1lh5vV00l2rTs6y7hOp7rYw42QZiq6VIzjcYrRm8gFRMk9U9Wi1grL8Mr5kLVloYLthHgyA94QK3SaXCATklxgo6XvcbXIqAGG7U0KxTr8hJJU1p2ZQ2mXHmp4DhYP8N9SRuEKzaCPcSIcW7uj21jZqBigsLsNAXEzU8SPXZjmVQVtwQATPWeWyGW4GuJhjP4Q8o0.com',
@@ -27,19 +27,19 @@ $values = Array(
 'http://-.abc.com',
 'http://abc.-.abc.com',
 'http://underscore_.example.com',
-'http//www.example/wrong/url/',	
-'http:/www.example',	
-'file:///tmp/test.c',	
-'ftp://ftp.example.com/tmp/',	
-'/tmp/test.c',	
-'/',	
-'http://',	
-'http:/',	
-'http:',	
-'http',	
-'',	
--1,	
-array(),	
+'http//www.example/wrong/url/',
+'http:/www.example',
+'file:///tmp/test.c',
+'ftp://ftp.example.com/tmp/',
+'/tmp/test.c',
+'/',
+'http://',
+'http:/',
+'http:',
+'http',
+'',
+-1,
+array(),
 'mailto:foo@bar.com',
 'news:news.php.net',
 'file://foo/bar',
@@ -66,7 +66,7 @@ var_dump(filter_var("http://www.example.com/index.php?a=b&c=d", FILTER_VALIDATE_
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(29) "http://example.com/index.html"
 string(32) "http://www.example.com/index.php"
 string(31) "http://www.example/img/test.png"
diff --git a/ext/filter/tests/016.phpt b/ext/filter/tests/016.phpt
index c6783444d01..c614903f637 100644
--- a/ext/filter/tests/016.phpt
+++ b/ext/filter/tests/016.phpt
@@ -5,14 +5,14 @@ filter_var() and FILTER_VALIDATE_EMAIL
 --FILE--
 <?php
 $values = Array(
-'a@b.c',	
-'abuse@example.com',	
-'test!.!@#$%^&*@example.com',	
-'test@@#$%^&*())).com',	
-'test@.com',	
-'test@com',	
-'@',	
-'[]()/@example.com',	
+'a@b.c',
+'abuse@example.com',
+'test!.!@#$%^&*@example.com',
+'test@@#$%^&*())).com',
+'test@.com',
+'test@com',
+'@',
+'[]()/@example.com',
 'QWERTYUIOPASDFGHJKLZXCVBNM@QWERTYUIOPASDFGHJKLZXCVBNM.NET',
 'e.x.a.m.p.l.e.@example.com',
 'firstname.lastname@employee.2something.com',
@@ -27,7 +27,7 @@ foreach ($values as $value) {
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(5) "a@b.c"
 string(17) "abuse@example.com"
 bool(false)
diff --git a/ext/filter/tests/017.phpt b/ext/filter/tests/017.phpt
index 518ee792561..d11688ecebe 100644
--- a/ext/filter/tests/017.phpt
+++ b/ext/filter/tests/017.phpt
@@ -14,7 +14,7 @@ var_dump(filter_var("data", FILTER_VALIDATE_REGEXP));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(4) "data"
 bool(false)
 string(4) "data"
diff --git a/ext/filter/tests/018.phpt b/ext/filter/tests/018.phpt
index 833500fd338..640a2556bdc 100644
--- a/ext/filter/tests/018.phpt
+++ b/ext/filter/tests/018.phpt
@@ -30,7 +30,7 @@ var_dump(filter_var("::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 | FILTER_FLAG_NO
 var_dump(filter_var("127.0.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV4));
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(11) "192.168.0.1"
 bool(false)
 string(3) "::1"
diff --git a/ext/filter/tests/019.phpt b/ext/filter/tests/019.phpt
index 1665181cd20..09fdddca8e9 100644
--- a/ext/filter/tests/019.phpt
+++ b/ext/filter/tests/019.phpt
@@ -13,7 +13,7 @@ var_dump(filter_var("1.1.1.1", FILTER_VALIDATE_IP));
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 bool(false)
 bool(false)
 bool(false)
diff --git a/ext/filter/tests/020.phpt b/ext/filter/tests/020.phpt
index c2ab6096d52..855897da9bd 100644
--- a/ext/filter/tests/020.phpt
+++ b/ext/filter/tests/020.phpt
@@ -12,7 +12,7 @@ var_dump(filter_var(-1, FILTER_SANITIZE_MAGIC_QUOTES));
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(36) "test\'asd\'asd\'\' asd\\\'\"asdfasdf"
 string(2) "\'"
 string(0) ""
diff --git a/ext/filter/tests/021.phpt b/ext/filter/tests/021.phpt
index 994dac282b0..43248b1fbaa 100644
--- a/ext/filter/tests/021.phpt
+++ b/ext/filter/tests/021.phpt
@@ -25,7 +25,7 @@ var_dump(filter_var("", FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(6) "123456"
 string(11) "12312312323"
 string(5) "12323"
diff --git a/ext/filter/tests/022.phpt b/ext/filter/tests/022.phpt
index 649c6e409d3..ac8b9febccc 100644
--- a/ext/filter/tests/022.phpt
+++ b/ext/filter/tests/022.phpt
@@ -10,10 +10,10 @@ var_dump(filter_var("a[!@#$%^&*()@a@#$%^&*(.com@#$%^&*(", FILTER_SANITIZE_EMAIL)
 var_dump(filter_var("white space here \ \ \" som more", FILTER_SANITIZE_EMAIL));
 var_dump(filter_var("", FILTER_SANITIZE_EMAIL));
 var_dump(filter_var("123456789000000", FILTER_SANITIZE_EMAIL));
-	
+
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(5) "a@b.c"
 string(30) "a[!@#$%^&*@a@#$%^&*.com@#$%^&*"
 string(21) "whitespaceheresommore"
diff --git a/ext/filter/tests/023.phpt b/ext/filter/tests/023.phpt
index f8d4137bf01..577239a8822 100644
--- a/ext/filter/tests/023.phpt
+++ b/ext/filter/tests/023.phpt
@@ -10,10 +10,10 @@ var_dump(filter_var("a[!@#<b>$%^&*()@a@#$%^&*(.<br>com@#$%^&*(", FILTER_UNSAFE_R
 var_dump(filter_var("white space here \ \ \" some more", FILTER_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP));
 var_dump(filter_var("", FILTER_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP));
 var_dump(filter_var("             123456789000000       <qwertyuiop> ", FILTER_UNSAFE_RAW, FILTER_FLAG_ENCODE_AMP));
-	
+
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(18) "}"<p>test para</p>"
 string(53) "a[!@#<b>$%^&#38;*()@a@#$%^&#38;*(.<br>com@#$%^&#38;*("
 string(32) "white space here \ \ " some more"
diff --git a/ext/filter/tests/024.phpt b/ext/filter/tests/024.phpt
index 7d7349fcd4a..026a90a5bd2 100644
--- a/ext/filter/tests/024.phpt
+++ b/ext/filter/tests/024.phpt
@@ -12,7 +12,7 @@ var_dump(filter_var("!@#$%^&*()QWERTYUIOP{ASDFGHJKL:\"ZXCVBNM<>?", FILTER_SANITI
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(26) "%22%3Cbr%3Eblah%3C%2Fph%3E"
 string(0) ""
 string(23) "%20%20text%20here%20%20"
diff --git a/ext/filter/tests/025.phpt b/ext/filter/tests/025.phpt
index df8c3737bf3..fc04918357d 100644
--- a/ext/filter/tests/025.phpt
+++ b/ext/filter/tests/025.phpt
@@ -15,7 +15,7 @@ var_dump(filter_var(".", FILTER_SANITIZE_STRING));
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(0) ""
 string(0) ""
 string(12) "!@#$%^&*()'""
diff --git a/ext/filter/tests/026.phpt b/ext/filter/tests/026.phpt
index 38d15e7d0ac..3cfddd392b2 100644
--- a/ext/filter/tests/026.phpt
+++ b/ext/filter/tests/026.phpt
@@ -19,7 +19,7 @@ var_dump(filter_var("", FILTER_SANITIZE_STRIPPED, FILTER_FLAG_STRIP_HIGH));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(40) "Let me see you Stripped down to the bone"
 string(11) "!@#$%^&*()>"
 string(0) ""
diff --git a/ext/filter/tests/027.phpt b/ext/filter/tests/027.phpt
index 759030a643f..b5a85cf8525 100644
--- a/ext/filter/tests/027.phpt
+++ b/ext/filter/tests/027.phpt
@@ -19,7 +19,7 @@ var_dump(filter_var("", FILTER_SANITIZE_ENCODED, FILTER_FLAG_ENCODE_HIGH));
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(75) "%3F%3E%3C%21%40%23%24%25%5E%26%2A%28%29%7D%7B%7EQwertyuilfdsasdfgmnbvcxcvbn"
 string(17) "%3Cdata%26sons%3E"
 string(0) ""
diff --git a/ext/filter/tests/028.phpt b/ext/filter/tests/028.phpt
index c0ab16fe833..f88a6282529 100644
--- a/ext/filter/tests/028.phpt
+++ b/ext/filter/tests/028.phpt
@@ -22,7 +22,7 @@ var_dump(filter_var("кириллица", FILTER_SANITIZE_SPECIAL_CHARS, FILTER_
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(55) "?&#62;&#60;!@#$%^&#38;*()}{~Qwertyuilfdsasdfgmnbvcxcvbn"
 string(23) "&#60;data&#38;sons&#62;"
 string(0) ""
diff --git a/ext/filter/tests/029.phpt b/ext/filter/tests/029.phpt
index c1ede74ab05..14b516c35a8 100644
--- a/ext/filter/tests/029.phpt
+++ b/ext/filter/tests/029.phpt
@@ -9,7 +9,7 @@ filter_var() and FILTER_CALLBACK
 function test($var) {
 	return strtoupper($var);
 }
-	
+
 var_dump(filter_var("data", FILTER_CALLBACK, array("options"=>"test")));
 var_dump(filter_var("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FILTER_CALLBACK, array("options"=>"test")));
 var_dump(filter_var("", FILTER_CALLBACK, array("options"=>"test")));
@@ -31,7 +31,7 @@ var_dump(filter_var("", FILTER_CALLBACK, array("options"=>array("test_class","te
 /* empty function without return value */
 function test1($var) {
 }
-	
+
 var_dump(filter_var("data", FILTER_CALLBACK, array("options"=>"test1")));
 var_dump(filter_var("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FILTER_CALLBACK, array("options"=>"test1")));
 var_dump(filter_var("", FILTER_CALLBACK, array("options"=>"test1")));
@@ -40,7 +40,7 @@ var_dump(filter_var("", FILTER_CALLBACK, array("options"=>"test1")));
 function test2(&$var) {
 	$var = 1;
 }
-	
+
 var_dump(filter_var("data", FILTER_CALLBACK, array("options"=>"test2")));
 var_dump(filter_var("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FILTER_CALLBACK, array("options"=>"test2")));
 var_dump(filter_var("", FILTER_CALLBACK, array("options"=>"test2")));
@@ -49,7 +49,7 @@ var_dump(filter_var("", FILTER_CALLBACK, array("options"=>"test2")));
 function test3(&$var) {
 	unset($var);
 }
-	
+
 var_dump(filter_var("data", FILTER_CALLBACK, array("options"=>"test3")));
 var_dump(filter_var("~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?\"}{:", FILTER_CALLBACK, array("options"=>"test3")));
 var_dump(filter_var("", FILTER_CALLBACK, array("options"=>"test3")));
@@ -59,7 +59,7 @@ function test4(&$var) {
 	unset($var);
 	return 1;
 }
-	
+
 var_dump(filter_var("data", FILTER_CALLBACK, array("options"=>"test4")));
 
 /* thrown exception in the callback */
@@ -75,7 +75,7 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(4) "DATA"
 string(46) "~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?"}{:"
 string(0) ""
diff --git a/ext/filter/tests/030.phpt b/ext/filter/tests/030.phpt
index c5af15e1526..6c380dee901 100644
--- a/ext/filter/tests/030.phpt
+++ b/ext/filter/tests/030.phpt
@@ -1,5 +1,5 @@
 --TEST--
-filter_var() and IPv6 
+filter_var() and IPv6
 --SKIPIF--
 <?php if (!extension_loaded("filter")) die("skip"); ?>
 --FILE--
@@ -23,22 +23,22 @@ $ipv6_test = array(
     "0:0:0:0:0:0:0:13.1.68.3"		=> false,
 	"::13.1.68.3"					=> true,
     "::FFFF:129.144.52.38"			=> true,
-    
+
     "1:2:3:4:5:6::129.144.52.38"	=> false,
     "::1:2:3:4:5:6:129.144.52.38"	=> false,
     "1:2:3::4:5:6:129.144.52.38"	=> false,
-    
+
     "1:2:3:4::5:6:7:8"				=> false,
     "::1:2:3:4:5:6:7"				=> true,
     "::1:2:3:4:5:6:7:8"				=> false,
     "1:2:3:4:5:6:7::"				=> true,
     "1:2:3:4:5:6:7:8::"				=> false,
     "1:2:3:4:5:6:7::8"				=> false,
-    
+
     "1:2:3:4:5:6:7:8g"				=> false,
     "1:2:3:4:5:6:7:g"				=> false,
     "1:2:3:4:5g:6:7:8"				=> false,
-    
+
     'a:b:c:d:e::1.2.3.4'			=> true,
     '::0:a:b:c:d:e:f'				=> true,
     '0:a:b:c:d:e:f::'				=> true,
@@ -53,12 +53,12 @@ foreach ($ipv6_test as $ip => $exp) {
 	$out = filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
 	$out = (int) ($out === false ? 0 : 1);
 	if ($exp != $out) {
-		echo "$ip failed (expected ", $exp?"true":"false", ", got ", 
+		echo "$ip failed (expected ", $exp?"true":"false", ", got ",
             $out?"true":"false", ")\n";
 	}
 }
 
 echo "Ok\n";
 ?>
---EXPECT--	
+--EXPECT--
 Ok
diff --git a/ext/filter/tests/033.phpt b/ext/filter/tests/033.phpt
index 3819c6a01ca..24f9abd00ff 100644
--- a/ext/filter/tests/033.phpt
+++ b/ext/filter/tests/033.phpt
@@ -9,7 +9,7 @@ default_charset=UTF-8
 <?php
 include dirname(__FILE__) . '/033_run.inc';
 ?>
---EXPECT--     
+--EXPECT--
 int                      1                                               123                                                         
 boolean                  1                                                                                                           
 float                    1                                               123                                                         
diff --git a/ext/filter/tests/034.phpt b/ext/filter/tests/034.phpt
index 364f9024f12..8d9d89301c0 100644
--- a/ext/filter/tests/034.phpt
+++ b/ext/filter/tests/034.phpt
@@ -29,5 +29,5 @@ foreach($booleans as $val=>$exp) {
 }
 echo "Ok.";
 ?>
---EXPECTF--	
+--EXPECTF--
 Ok.
diff --git a/ext/filter/tests/035.phpt b/ext/filter/tests/035.phpt
index e2d3325270c..611c57176ec 100644
--- a/ext/filter/tests/035.phpt
+++ b/ext/filter/tests/035.phpt
@@ -1,5 +1,5 @@
 --TEST--
-GET/POST/REQUEST Test with input_filter 
+GET/POST/REQUEST Test with input_filter
 --SKIPIF--
 <?php if (!extension_loaded("filter")) die("skip"); ?>
 --POST--
diff --git a/ext/filter/tests/036.phpt b/ext/filter/tests/036.phpt
index 954326661d5..d08add12012 100644
--- a/ext/filter/tests/036.phpt
+++ b/ext/filter/tests/036.phpt
@@ -22,7 +22,7 @@ var_dump($var); //should be still string(1) "1"
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(2) {
   ["test1"]=>
   int(1)
diff --git a/ext/filter/tests/037.phpt b/ext/filter/tests/037.phpt
index f8497c63b05..e9f02afca43 100644
--- a/ext/filter/tests/037.phpt
+++ b/ext/filter/tests/037.phpt
@@ -23,7 +23,7 @@ $res = filter_input_array(INPUT_GET, array(
 					'filter' => FILTER_CALLBACK,
 					'options' => 'myfunc'
 					),
-				'b' => FILTER_VALIDATE_INT 
+				'b' => FILTER_VALIDATE_INT
 		)
 	);
 
diff --git a/ext/filter/tests/039.phpt b/ext/filter/tests/039.phpt
index ae883db3e32..501414deee7 100644
--- a/ext/filter/tests/039.phpt
+++ b/ext/filter/tests/039.phpt
@@ -49,7 +49,7 @@ var_dump($a, $b);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 -- (1)
 
 Warning: filter_var_array() expects parameter 1 to be array, null given in %s on line %d
diff --git a/ext/filter/tests/040.phpt b/ext/filter/tests/040.phpt
index 03c5091ccb2..8f1db36237b 100644
--- a/ext/filter/tests/040.phpt
+++ b/ext/filter/tests/040.phpt
@@ -24,7 +24,7 @@ var_dump(filter_has_var("", "cc"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: filter_has_var() expects exactly 2 parameters, 0 given in %s on line %d
 bool(false)
 bool(false)
diff --git a/ext/filter/tests/041.phpt b/ext/filter/tests/041.phpt
index 0a2e3f0a117..febcbfe3621 100644
--- a/ext/filter/tests/041.phpt
+++ b/ext/filter/tests/041.phpt
@@ -8,7 +8,7 @@ filter.default_flags=0
 --COOKIE--
 abc=dir; def=true; abc=root; xyz="foo bar";
 --FILE--
-<?php 
+<?php
 var_dump($_COOKIE);
 var_dump(filter_has_var(INPUT_COOKIE, "abc"));
 var_dump(filter_input(INPUT_COOKIE, "abc"));
diff --git a/ext/filter/tests/042.phpt b/ext/filter/tests/042.phpt
index 08f4dd633a2..4d5ec341586 100644
--- a/ext/filter/tests/042.phpt
+++ b/ext/filter/tests/042.phpt
@@ -3,7 +3,7 @@ Combination of strip & sanitize filters
 --SKIPIF--
 <?php if (!extension_loaded("filter")) die("skip"); ?>
 --FILE--
-<?php 
+<?php
 $var = 'XYZ< script>alert(/ext/filter+bypass/);< /script>ABC';
 $a = filter_var($var, FILTER_SANITIZE_STRING, array("flags" => FILTER_FLAG_STRIP_LOW));
 echo $a . "\n";
diff --git a/ext/filter/tests/043.phpt b/ext/filter/tests/043.phpt
index 92ac0517d16..b889e354765 100644
--- a/ext/filter/tests/043.phpt
+++ b/ext/filter/tests/043.phpt
@@ -3,7 +3,7 @@ Character encoding test
 --SKIPIF--
 <?php if (!extension_loaded("filter")) die("skip"); ?>
 --FILE--
-<?php 
+<?php
 $flags = FILTER_FLAG_ENCODE_AMP|FILTER_FLAG_ENCODE_LOW|FILTER_FLAG_ENCODE_HIGH;
 
 for ($i = 0; $i < 256; $i++) {
diff --git a/ext/filter/tests/044.phpt b/ext/filter/tests/044.phpt
index ff4689381d2..c456d473bbc 100644
--- a/ext/filter/tests/044.phpt
+++ b/ext/filter/tests/044.phpt
@@ -5,7 +5,7 @@ Integer validation with spaces
 --INI--
 precision=14
 --FILE--
-<?php 
+<?php
 $vals = array(
 "	
  ",
diff --git a/ext/filter/tests/045.phpt b/ext/filter/tests/045.phpt
index ad8f47ec9a4..8fb934c2f04 100644
--- a/ext/filter/tests/045.phpt
+++ b/ext/filter/tests/045.phpt
@@ -4,7 +4,7 @@ Options must not be changed by filter_var()
 <?php if (!extension_loaded("filter")) die("skip"); ?>
 --FILE--
 <?php
-$a = array("flags"=>(string)FILTER_FLAG_ALLOW_HEX, "options" => array("min_range"=>"0", "max_range"=>"1024")); 
+$a = array("flags"=>(string)FILTER_FLAG_ALLOW_HEX, "options" => array("min_range"=>"0", "max_range"=>"1024"));
 $ret = filter_var("0xff", FILTER_VALIDATE_INT, $a);
 echo ($ret === 255 && $a["options"]["min_range"] === "0")?"ok\n":"bug\n";
 echo ($ret === 255 && $a["options"]["max_range"] === "1024")?"ok\n":"bug\n";
diff --git a/ext/filter/tests/055.phpt b/ext/filter/tests/055.phpt
index 688dbb2b540..28f94fe4081 100644
--- a/ext/filter/tests/055.phpt
+++ b/ext/filter/tests/055.phpt
@@ -26,7 +26,7 @@ foreach ($values as $value) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(17) "01-23-45-67-89-ab"
 string(17) "01-23-45-67-89-ab"
 bool(false)
diff --git a/ext/filter/tests/056.phpt b/ext/filter/tests/056.phpt
index 4a27a9fa102..e3a4570ea78 100644
--- a/ext/filter/tests/056.phpt
+++ b/ext/filter/tests/056.phpt
@@ -6,7 +6,7 @@ filter_var() and FILTER_VALIDATE_DOMAIN
 <?php
 
 $values = Array(
-'example.com',	
+'example.com',
 'www.thelongestdomainnameintheworldandthensomeandthensomemoreandmore.com',
 'toolongtoolongtoolongtoolongtoolongtoolongtoolongtoolongtoolongtoolong.com',
 'eauBcFReEmjLcoZwI0RuONNnwU4H9r151juCaqTI5VeIP5jcYIqhx1lh5vV00l2rTs6y7hOp7rYw42QZiq6VIzjcYrRm8gFRMk9U9Wi1grL8Mr5kLVloYLthHgyA94QK3SaXCATklxgo6XvcbXIqAGG7U0KxTr8hJJU1p2ZQ2mXHmp4DhYP8N9SRuEKzaCPcSIcW7uj21jZqBigsLsNAXEzU8SPXZjmVQVtwQATPWeWyGW4GuJhjP4Q8o0.com',
@@ -19,9 +19,9 @@ $values = Array(
 '-.abc.com',
 'abc.-.abc.com',
 'underscore_.example.com',
-'',	
--1,	
-array(),	
+'',
+-1,
+array(),
 '\r\n',
 );
 foreach ($values as $value) {
@@ -39,7 +39,7 @@ var_dump(filter_var('test._example.com', FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOS
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(11) "example.com"
 string(71) "www.thelongestdomainnameintheworldandthensomeandthensomemoreandmore.com"
 bool(false)
diff --git a/ext/filter/tests/PMOPB45.phpt b/ext/filter/tests/PMOPB45.phpt
index 532eb219d38..a403b3c6e7d 100644
--- a/ext/filter/tests/PMOPB45.phpt
+++ b/ext/filter/tests/PMOPB45.phpt
@@ -7,5 +7,5 @@ PMOPB-45-2007:PHP ext/filter Email Validation Vulnerability
 	$var = "test@example.com\n";
 	var_dump(filter_var($var, FILTER_VALIDATE_EMAIL));
 ?>
---EXPECT--	
+--EXPECT--
 bool(false)
diff --git a/ext/filter/tests/bug39846.phpt b/ext/filter/tests/bug39846.phpt
index 57407f1082c..3beeaf89204 100644
--- a/ext/filter/tests/bug39846.phpt
+++ b/ext/filter/tests/bug39846.phpt
@@ -7,6 +7,6 @@ Bug #39846 (ipv4 trailing data validation)
 var_dump(filter_var('192.168.1.100random-text-here', FILTER_VALIDATE_IP));
 var_dump(filter_var("192.168.1.155\0foo", FILTER_VALIDATE_IP));
 ?>
---EXPECT--	
+--EXPECT--
 bool(false)
 bool(false)
diff --git a/ext/filter/tests/bug44445.phpt b/ext/filter/tests/bug44445.phpt
index 36a8641419b..a8dcc046ece 100644
--- a/ext/filter/tests/bug44445.phpt
+++ b/ext/filter/tests/bug44445.phpt
@@ -7,6 +7,6 @@ Bug #44445 (email validator does not handle domains starting/ending with a -)
 var_dump(filter_var("foo@-foo.com",FILTER_VALIDATE_EMAIL));
 var_dump(filter_var("foo@foo-.com",FILTER_VALIDATE_EMAIL));
 ?>
---EXPECT--	
+--EXPECT--
 bool(false)
 bool(false)
diff --git a/ext/filter/tests/bug46973.phpt b/ext/filter/tests/bug46973.phpt
index eacacf5b3e2..7cb9c86cd0e 100644
--- a/ext/filter/tests/bug46973.phpt
+++ b/ext/filter/tests/bug46973.phpt
@@ -8,7 +8,7 @@ Bug #46973 (IPv6 address filter rejects valid address)
 var_dump(filter_var('1fff::a88:85a3::172.31.128.1', FILTER_VALIDATE_IP,FILTER_FLAG_IPV6));
 var_dump(filter_var('3ffe:6a88:85a3:08d3:1319:8a2e:0370:7344', FILTER_VALIDATE_IP,FILTER_FLAG_IPV6));
 var_dump(filter_var('1fff::a88:85a3::172.31.128.1', FILTER_VALIDATE_IP,FILTER_FLAG_IPV6));
- 
+
 ?>
 --EXPECTF--
 bool(false)
diff --git a/ext/filter/tests/bug47435.phpt b/ext/filter/tests/bug47435.phpt
index 9388679ebb4..f192c76a0bf 100644
--- a/ext/filter/tests/bug47435.phpt
+++ b/ext/filter/tests/bug47435.phpt
@@ -19,7 +19,7 @@ var_dump(filter_var("5f::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 | FILTER_FLAG_
 var_dump(filter_var("3ff3::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6));
 var_dump(filter_var("3ff3::1", FILTER_VALIDATE_IP, FILTER_FLAG_IPV6 | FILTER_FLAG_NO_RES_RANGE));
 ?>
---EXPECT--	
+--EXPECT--
 string(7) "FC00::1"
 bool(false)
 string(2) "::"
diff --git a/ext/filter/tests/bug49274.phpt b/ext/filter/tests/bug49274.phpt
index 2adc6ed9772..c4eab521c67 100644
--- a/ext/filter/tests/bug49274.phpt
+++ b/ext/filter/tests/bug49274.phpt
@@ -6,5 +6,5 @@
 <?php
 var_dump(filter_var(new stdClass, FILTER_VALIDATE_EMAIL));
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(false)
diff --git a/ext/filter/tests/bug50158.phpt b/ext/filter/tests/bug50158.phpt
index d41dfd56c0d..c6b85acfbdf 100644
--- a/ext/filter/tests/bug50158.phpt
+++ b/ext/filter/tests/bug50158.phpt
@@ -5,17 +5,17 @@ Bug #50158 (FILTER_VALIDATE_EMAIL fails with valid addresses containing = or ?)
 --FILE--
 <?php
 
-$email_address = "test=mail@example.com";    
-var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));    
-                                                                
-$email_address = "test-mail@example.com";    
-var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));    
-    
-$email_address = "test+mail@example.com";    
-var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));   
+$email_address = "test=mail@example.com";
+var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));
 
-$email_address = "test?mail@example.com";    
-var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));   
+$email_address = "test-mail@example.com";
+var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));
+
+$email_address = "test+mail@example.com";
+var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));
+
+$email_address = "test?mail@example.com";
+var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));
 
 ?>
 --EXPECTF--
diff --git a/ext/filter/tests/bug50632.phpt b/ext/filter/tests/bug50632.phpt
index 2f33b91ff73..3f11202bb14 100644
--- a/ext/filter/tests/bug50632.phpt
+++ b/ext/filter/tests/bug50632.phpt
@@ -7,5 +7,5 @@ bug 50632, filter_input() does not return default value if the variable does not
 $foo = filter_input(INPUT_GET, 'foo', FILTER_VALIDATE_INT, array('flags' => FILTER_REQUIRE_SCALAR, 'options' => array('default' => 23)));
 var_dump($foo);
 ?>
---EXPECT--	
+--EXPECT--
 int(23)
diff --git a/ext/filter/tests/bug51192.phpt b/ext/filter/tests/bug51192.phpt
index 96c67eae1de..16ffeff6447 100644
--- a/ext/filter/tests/bug51192.phpt
+++ b/ext/filter/tests/bug51192.phpt
@@ -7,7 +7,7 @@ bug 51192, FILTER_VALIDATE_URL will invalidate a hostname that includes '-'
 var_dump(filter_var('http://example.com/path', FILTER_VALIDATE_URL));
 var_dump(filter_var('http://exa-mple.com/path', FILTER_VALIDATE_URL));
 var_dump(filter_var('http://exa_mple.com/path', FILTER_VALIDATE_URL));
---EXPECT--	
+--EXPECT--
 string(23) "http://example.com/path"
 string(24) "http://exa-mple.com/path"
 bool(false)
diff --git a/ext/filter/tests/bug52209.phpt b/ext/filter/tests/bug52209.phpt
index 79db7494542..3a15cbe1480 100644
--- a/ext/filter/tests/bug52209.phpt
+++ b/ext/filter/tests/bug52209.phpt
@@ -2,8 +2,8 @@
 Bug #52209 (INPUT_ENV returns NULL for set variables (CLI))
 --SKIPIF--
 <?php
-/* This test makes no sense on windows as an empty variable 
-   would never show up in the "set" list. Which means, it's 
+/* This test makes no sense on windows as an empty variable
+   would never show up in the "set" list. Which means, it's
    always undefined in PHP. */
 if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows");
 if (!extension_loaded("filter") || !empty($_ENV['PWD'])) die("skip");
@@ -14,5 +14,5 @@ variables_order=GPCSE
 <?php
 	var_dump(filter_input(INPUT_ENV, 'PWD'));
 ?>
---EXPECTF--	
+--EXPECTF--
 string(%d) "%s"
diff --git a/ext/filter/tests/bug52929.phpt b/ext/filter/tests/bug52929.phpt
index 29332959f7d..1b223188189 100644
--- a/ext/filter/tests/bug52929.phpt
+++ b/ext/filter/tests/bug52929.phpt
@@ -12,7 +12,7 @@ var_dump(filter_var('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 // An invalid address likely to crash PHP due to stack exhaustion if it goes to
 // the validation regex.
 var_dump(filter_var(str_repeat('x', 8000), FILTER_VALIDATE_EMAIL));
---EXPECT--	
+--EXPECT--
 string(19) "valid@email.address"
 bool(false)
 bool(false)
diff --git a/ext/filter/tests/bug53037.phpt b/ext/filter/tests/bug53037.phpt
index 4a1e9e318b0..82ecc7a75e6 100644
--- a/ext/filter/tests/bug53037.phpt
+++ b/ext/filter/tests/bug53037.phpt
@@ -9,6 +9,6 @@ var_dump(
     filter_var("", FILTER_DEFAULT, array('flags' => FILTER_FLAG_EMPTY_STRING_NULL))
 );
 ?>
---EXPECT--	
+--EXPECT--
 string(0) ""
 NULL
diff --git a/ext/filter/tests/bug53150.phpt b/ext/filter/tests/bug53150.phpt
index 4906888bdf7..a8030137c33 100644
--- a/ext/filter/tests/bug53150.phpt
+++ b/ext/filter/tests/bug53150.phpt
@@ -17,7 +17,7 @@ var_dump(filter_var('191.255.0.0', FILTER_VALIDATE_IP));
 var_dump(filter_var('191.255.0.0', FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
 
 ?>
---EXPECT--	
+--EXPECT--
 string(9) "127.0.0.1"
 string(3) "::1"
 bool(false)
diff --git a/ext/filter/tests/bug55478.phpt b/ext/filter/tests/bug55478.phpt
index 243d7078e7a..bbfd50e9b77 100644
--- a/ext/filter/tests/bug55478.phpt
+++ b/ext/filter/tests/bug55478.phpt
@@ -5,7 +5,7 @@ Bug #55478 (FILTER_VALIDATE_EMAIL fails with internationalized domain name addre
 --FILE--
 <?php
 $email_address = "test@xn--example--7za.de"; // "example-ä.de"
-var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));   
+var_dump(filter_var($email_address, FILTER_VALIDATE_EMAIL));
 ?>
---EXPECT--	
+--EXPECT--
 string(24) "test@xn--example--7za.de"
diff --git a/ext/filter/tests/bug7586.phpt b/ext/filter/tests/bug7586.phpt
index 74e55ff71b6..35549be4a4d 100644
--- a/ext/filter/tests/bug7586.phpt
+++ b/ext/filter/tests/bug7586.phpt
@@ -32,7 +32,7 @@ $args = array(
 $out = filter_var_array($data, $args);
 var_dump($out);
 ?>
---EXPECTF--	
+--EXPECTF--
 array(6) {
   ["product_id"]=>
   string(17) "libgd%3Cscript%3E"
diff --git a/ext/filter/tests/bug7715.phpt b/ext/filter/tests/bug7715.phpt
index 4298d505d3f..fb72f8e2ddf 100644
--- a/ext/filter/tests/bug7715.phpt
+++ b/ext/filter/tests/bug7715.phpt
@@ -22,7 +22,7 @@ foreach ($data as $val) {
 }
 echo "\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 float(0.23)
 float(-42)
 float(42)
diff --git a/ext/filter/tests/bug7733.phpt b/ext/filter/tests/bug7733.phpt
index ab02123907e..01e2377563b 100644
--- a/ext/filter/tests/bug7733.phpt
+++ b/ext/filter/tests/bug7733.phpt
@@ -14,7 +14,7 @@ $data = array(
 $out = filter_var($data, FILTER_VALIDATE_FLOAT, FILTER_REQUIRE_ARRAY);
 var_dump($out);
 ?>
---EXPECTF--	
+--EXPECTF--
 array(5) {
   [0]=>
   bool(false)
diff --git a/ext/filter/tests/bug8315.phpt b/ext/filter/tests/bug8315.phpt
index 094d82f2105..89b3be71045 100644
--- a/ext/filter/tests/bug8315.phpt
+++ b/ext/filter/tests/bug8315.phpt
@@ -1,5 +1,5 @@
 --TEST--
-bug 8315, NULL values halt the validation 
+bug 8315, NULL values halt the validation
 --SKIPIF--
 <?php if (!extension_loaded("filter")) die("skip"); ?>
 --FILE--
@@ -10,6 +10,6 @@ var_dump(filter_var($var, FILTER_VALIDATE_INT));
 $var="3".chr(0)."foo";
 var_dump(filter_var($var, FILTER_VALIDATE_FLOAT));
 ?>
---EXPECT--	
+--EXPECT--
 bool(false)
 bool(false)
diff --git a/ext/filter/tests/callback_closure.phpt b/ext/filter/tests/callback_closure.phpt
index e27a31b37e6..0ece4ab2851 100644
--- a/ext/filter/tests/callback_closure.phpt
+++ b/ext/filter/tests/callback_closure.phpt
@@ -10,5 +10,5 @@ $callback = function ($var) {
 $var = "test";
 var_dump(filter_var($var, FILTER_CALLBACK, array('options'=> $callback)));
 ?>
---EXPECT--	
+--EXPECT--
 string(4) "test"
diff --git a/ext/filter/tests/callback_non_modified_var.phpt b/ext/filter/tests/callback_non_modified_var.phpt
index f0d557577b5..e546fcc89de 100644
--- a/ext/filter/tests/callback_non_modified_var.phpt
+++ b/ext/filter/tests/callback_non_modified_var.phpt
@@ -10,5 +10,5 @@ function callback($var) {
 $var = "test";
 var_dump(filter_var($var, FILTER_CALLBACK, array('options'=>'callback')));
 ?>
---EXPECT--	
+--EXPECT--
 string(4) "test"
diff --git a/ext/ftp/tests/ftp_fget_basic.phpt b/ext/ftp/tests/ftp_fget_basic.phpt
index 355b8b84691..336594e3167 100644
--- a/ext/ftp/tests/ftp_fget_basic.phpt
+++ b/ext/ftp/tests/ftp_fget_basic.phpt
@@ -27,7 +27,7 @@ var_dump(ftp_fget($ftp, $fp, 'binary data.bin', FTP_BINARY));
 fseek($fp, $postition);
 var_dump(urlencode(fgets($fp)));
 
-//test non-existent file request 
+//test non-existent file request
 ftp_fget($ftp, $fp ,'a warning.txt', FTP_ASCII);
 
 //remove file
diff --git a/ext/ftp/tests/ftp_get_basic.phpt b/ext/ftp/tests/ftp_get_basic.phpt
index 2fd8c791491..43022cde45c 100644
--- a/ext/ftp/tests/ftp_get_basic.phpt
+++ b/ext/ftp/tests/ftp_get_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-FTP ftp_get file for both binary and ASCII transfer modes 
+FTP ftp_get file for both binary and ASCII transfer modes
 --CREDITS--
 Nathaniel McHugh
 --SKIPIF--
@@ -27,7 +27,7 @@ var_dump(ftp_get($ftp, $tmpfname, 'binary data.bin', FTP_BINARY));
 var_dump(urlencode(file_get_contents($tmpfname)));
 unlink($tmpfname);
 
-//test non-existent file request 
+//test non-existent file request
 ftp_get($ftp, $tmpfname ,'a warning.txt', FTP_ASCII);
 ?>
 --EXPECTF--
diff --git a/ext/ftp/tests/ftp_mdtm_basic.phpt b/ext/ftp/tests/ftp_mdtm_basic.phpt
index 39aeb766fb9..202c8584560 100644
--- a/ext/ftp/tests/ftp_mdtm_basic.phpt
+++ b/ext/ftp/tests/ftp_mdtm_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test the File Modification Time as described in http://tools.ietf.org/html/rfc3659#section-3.1
 --CREDITS--
-Nathaniel McHugh 
+Nathaniel McHugh
 --SKIPIF--
 <?php
 require 'skipif.inc';
diff --git a/ext/gd/tests/001-mb.phpt b/ext/gd/tests/001-mb.phpt
index 743df7d2c7c..9307450f5be 100644
--- a/ext/gd/tests/001-mb.phpt
+++ b/ext/gd/tests/001-mb.phpt
@@ -16,7 +16,7 @@ var_dump(imagecreatefrompng($file));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: imagecreatefrompng(%s001��ガラスを食�られ��.test): failed to open stream: No such file or directory in %s on line %d
 bool(false)
 
diff --git a/ext/gd/tests/001.phpt b/ext/gd/tests/001.phpt
index b0ac2a398f3..039511a5589 100644
--- a/ext/gd/tests/001.phpt
+++ b/ext/gd/tests/001.phpt
@@ -16,7 +16,7 @@ var_dump(imagecreatefrompng($file));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: imagecreatefrompng(%s001.test): failed to open stream: No such file or directory in %s on line %d
 bool(false)
 
diff --git a/ext/gd/tests/bug38179.phpt b/ext/gd/tests/bug38179.phpt
index 34a6d58e071..9b0318829a0 100644
--- a/ext/gd/tests/bug38179.phpt
+++ b/ext/gd/tests/bug38179.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #38179 (imagecopy from a palette to a truecolor image loses alpha channel) 
+Bug #38179 (imagecopy from a palette to a truecolor image loses alpha channel)
 --SKIPIF--
 <?php
         if (!function_exists('imagecopy')) die("skip gd extension not available\n");
diff --git a/ext/gd/tests/bug40764.phpt b/ext/gd/tests/bug40764.phpt
index cbe262fe7a1..3802094e255 100644
--- a/ext/gd/tests/bug40764.phpt
+++ b/ext/gd/tests/bug40764.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #40764 (line thickness not respected for horizontal and vertical lines)
 --SKIPIF--
-<?php 
-	if (!extension_loaded('gd')) die("skip gd extension not available\n"); 
+<?php
+	if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug41442.phpt b/ext/gd/tests/bug41442.phpt
index 78a61bec95a..ba5950dd15a 100644
--- a/ext/gd/tests/bug41442.phpt
+++ b/ext/gd/tests/bug41442.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #41442 (imagegd2() under output control)
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded('gd')) {
 		die("skip gd extension not available.");
 	}
@@ -31,7 +31,7 @@ var_dump(imagecreatefromstring($str2));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (gd)
 resource(%d) of type (gd)
 Done
diff --git a/ext/gd/tests/bug48555.phpt b/ext/gd/tests/bug48555.phpt
index d378aafd8e3..43e14db05fc 100644
--- a/ext/gd/tests/bug48555.phpt
+++ b/ext/gd/tests/bug48555.phpt
@@ -21,7 +21,7 @@ var_dump($with_line_break);
 if ($with_line_break==$without_line_break) {
   echo "with line break == without line break".PHP_EOL;
 } else {
-  echo "with line break != without line break".PHP_EOL;	
+  echo "with line break != without line break".PHP_EOL;
 }
 
 ?>
diff --git a/ext/gd/tests/bug50194.phpt b/ext/gd/tests/bug50194.phpt
index f68165be42c..0ccab830630 100644
--- a/ext/gd/tests/bug50194.phpt
+++ b/ext/gd/tests/bug50194.phpt
@@ -13,7 +13,7 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
 $im = imagecreatetruecolor(240, 55);
 $background = imagecolorallocatealpha($im, 60, 60, 60, 0); // no tranparency
 $black = imagecolorallocate($im, 0, 0, 0);
-imagealphablending($im, false); 
+imagealphablending($im, false);
 imagefilledrectangle($im, 0, 0, 239, 54, $background);
 $text = 'Testing ... ';
 $font = __DIR__ . DIRECTORY_SEPARATOR . 'Tuffy.ttf';
diff --git a/ext/gd/tests/bug53156.phpt b/ext/gd/tests/bug53156.phpt
index ceb37c13c49..63482217a8d 100644
--- a/ext/gd/tests/bug53156.phpt
+++ b/ext/gd/tests/bug53156.phpt
@@ -12,7 +12,7 @@ if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3', '<')) {
 function draw_and_check_pixel($x, $y)
 {
     global $img, $black, $red;
-    
+
     echo (imagecolorat($img, $x, $y) === $black) ? '+' : '-';
     imagesetpixel($img, $x, $y, $red);
 }
@@ -20,7 +20,7 @@ function draw_and_check_pixel($x, $y)
 function draw_and_check_rectangle($x1, $y1, $x2, $y2)
 {
     global $img, $black;
-    
+
     echo 'Rectangle: ';
     imagerectangle($img, $x1, $y1, $x2, $y2, $black);
     $x = ($x1 + $x2) / 2;
diff --git a/ext/gd/tests/bug72298.phpt b/ext/gd/tests/bug72298.phpt
index 7fba241ed18..512aa8b4c1a 100644
--- a/ext/gd/tests/bug72298.phpt
+++ b/ext/gd/tests/bug72298.phpt
@@ -6,7 +6,7 @@ Bug #72298: pass2_no_dither out-of-bounds access
 ?>
 --FILE--
 <?php
-$img = imagecreatetruecolor (1 , 1); 
+$img = imagecreatetruecolor (1 , 1);
 imagecolortransparent($img, 0);
 imagetruecolortopalette($img, false, 4);
 ?>
diff --git a/ext/gd/tests/bug72339.phpt b/ext/gd/tests/bug72339.phpt
index c8862833464..486e7556162 100644
--- a/ext/gd/tests/bug72339.phpt
+++ b/ext/gd/tests/bug72339.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow 
+Bug #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
 --SKIPIF--
 <?php
 if (!function_exists("imagecreatefromgd2")) print "skip";
@@ -31,7 +31,7 @@ if ($im) {
 unlink($fname);
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: imagecreatefromgd2(): gd warning: product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully
  in %sbug72339.php on line %d
 
diff --git a/ext/gd/tests/bug72697.phpt b/ext/gd/tests/bug72697.phpt
index 6110385fcb8..d243bd2f14b 100644
--- a/ext/gd/tests/bug72697.phpt
+++ b/ext/gd/tests/bug72697.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72697: select_colors write out-of-bounds
 --SKIPIF--
-<?php 
+<?php
 if (!function_exists("imagecreatetruecolor")) die("skip");
 if (PHP_INT_MAX !== 9223372036854775807) die("skip for 64-bit long systems only");
 ?>
diff --git a/ext/gd/tests/bug72730.phpt b/ext/gd/tests/bug72730.phpt
index e7c13cb5e9d..a15252ea41c 100644
--- a/ext/gd/tests/bug72730.phpt
+++ b/ext/gd/tests/bug72730.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #72730: imagegammacorrect allows arbitrary write access
 --SKIPIF--
-<?php 
+<?php
 if (!function_exists("imagecreatetruecolor")) die("skip");
 ?>
 --FILE--
diff --git a/ext/gd/tests/copypalette.phpt b/ext/gd/tests/copypalette.phpt
index ec00c030a42..3e29b42a434 100644
--- a/ext/gd/tests/copypalette.phpt
+++ b/ext/gd/tests/copypalette.phpt
@@ -20,7 +20,7 @@ for ($i=0; $i<256; $i++) {
 	if ($c['red']!=$i || $c['green']!=$i || $c['blue']!=$i) {
 		$failed = true;
 		break;
-	} 
+	}
 }
 echo "copy palette 255 colors: ";
 echo $failed ? 'failed' : 'ok';
@@ -34,7 +34,7 @@ imagepalettecopy($im2, $im);
 $c = imagecolorsforindex($im2, 0);
 if ($c['red']!=0 || $c['green']!=0 || $c['blue']!=0 || $c['alpha']!=100) {
 	$failed = true;
-} 
+}
 echo 'copy palette 1 color and alpha: ';
 echo $failed ? 'failed' : 'ok';
 echo "\n";
diff --git a/ext/gd/tests/dashedlines.phpt b/ext/gd/tests/dashedlines.phpt
index 7c130841573..3b2c73252b8 100644
--- a/ext/gd/tests/dashedlines.phpt
+++ b/ext/gd/tests/dashedlines.phpt
@@ -1,5 +1,5 @@
 --TEST--
-imageline, dashed 
+imageline, dashed
 --SKIPIF--
 <?php
         if (!function_exists('imagecreatefromstring')) die("skip gd extension not available\n");
diff --git a/ext/gd/tests/gd_info_basic.phpt b/ext/gd/tests/gd_info_basic.phpt
index 61a2304e8f9..b027462a41b 100644
--- a/ext/gd/tests/gd_info_basic.phpt
+++ b/ext/gd/tests/gd_info_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gd_info()
 --SKIPIF--
-<?php 
+<?php
 	if (!function_exists('gd_info')) {
 		die('skip gd_info() not available');
 	}
@@ -15,9 +15,9 @@ gd_info()
  * Alias to functions:
  */
 	echo "basic test of gd_info() function\n";
-	
+
 	var_dump(gd_info());
-	
+
 	echo "\nDone\n";
 ?>
 --EXPECTF--
diff --git a/ext/gd/tests/gif.phpt b/ext/gd/tests/gif.phpt
index eab8f5f327e..61e836e5919 100644
--- a/ext/gd/tests/gif.phpt
+++ b/ext/gd/tests/gif.phpt
@@ -1,7 +1,7 @@
 --TEST--
 gif in/out
 --SKIPIF--
-<?php 
+<?php
 // $Id$
 	if (!extension_loaded('gd')) {
 		die("skip gd extension not available.");
diff --git a/ext/gd/tests/github_bug_215.phpt b/ext/gd/tests/github_bug_215.phpt
index 8657f95d768..14261869712 100644
--- a/ext/gd/tests/github_bug_215.phpt
+++ b/ext/gd/tests/github_bug_215.phpt
@@ -1,15 +1,15 @@
---TEST-- 
+--TEST--
 Github #215 (imagefilltoborder stack overflow when invalid pallete index used)
---SKIPIF-- 
-<?php  
-if (!extension_loaded("gd")) die("skip GD not present"); 
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
     die("skip test requires GD 2.2.2 or higher");
 }
-?> 
+?>
 --FILE--
 <?php
-$image = imagecreate( 10, 10 ); 
+$image = imagecreate( 10, 10 );
 $bgd = imagecolorallocate( $image, 0, 0, 0 );
 $border = imagecolorallocate( $image, 255, 0, 0 );
 $fillcolor = imagecolorallocate( $image, 255, 0, 0 );
@@ -37,8 +37,8 @@ imagefilltoborder( $image, 0,0, $border+10, $fillcolor+10);
 echo "#5 passes";
 
 
-?> 
---EXPECT-- 
+?>
+--EXPECT--
 #1 passes
 #2 passes
 #3 passes
diff --git a/ext/gd/tests/imageantialias_error1.phpt b/ext/gd/tests/imageantialias_error1.phpt
index 53fe0cc66ac..8a9d5315a60 100644
--- a/ext/gd/tests/imageantialias_error1.phpt
+++ b/ext/gd/tests/imageantialias_error1.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource in imageantialias() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageantialias_error2.phpt b/ext/gd/tests/imageantialias_error2.phpt
index 8dad8bd1153..aac0f15d070 100644
--- a/ext/gd/tests/imageantialias_error2.phpt
+++ b/ext/gd/tests/imageantialias_error2.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter passing in imageantialias() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagearc_basic.phpt b/ext/gd/tests/imagearc_basic.phpt
index b4761f2399c..0e2ea3b514b 100644
--- a/ext/gd/tests/imagearc_basic.phpt
+++ b/ext/gd/tests/imagearc_basic.phpt
@@ -4,7 +4,7 @@ Testing imagearc() of GD library
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
@@ -14,7 +14,7 @@ $image = imagecreatetruecolor(100, 100);
 
 $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
 
-//create an arc with white color    
+//create an arc with white color
 imagearc($image, 50, 50, 30, 30, 0, 180, $white);
 
 include_once __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/imagearc_error1.phpt b/ext/gd/tests/imagearc_error1.phpt
index 1e634068328..65c582b2553 100644
--- a/ext/gd/tests/imagearc_error1.phpt
+++ b/ext/gd/tests/imagearc_error1.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imagearc() of GD library
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
@@ -14,7 +14,7 @@ $image = imagecreatetruecolor(100, 100);
 
 $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
 
-//create an arc with white color    
+//create an arc with white color
 imagearc($image, 50, 50, 30, 30, 0, 180);
 
 include_once __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/imagearc_variation1.phpt b/ext/gd/tests/imagearc_variation1.phpt
index 1b36eedf290..3fb2a7d31c8 100644
--- a/ext/gd/tests/imagearc_variation1.phpt
+++ b/ext/gd/tests/imagearc_variation1.phpt
@@ -4,7 +4,7 @@ Testing passing negative end angle to imagearc() of GD library
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
@@ -14,7 +14,7 @@ $image = imagecreatetruecolor(100, 100);
 
 $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
 
-//create an arc with white color    
+//create an arc with white color
 imagearc($image, 50, 50, 30, 30, 0, -90, $white);
 
 include_once __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/imagearc_variation2.phpt b/ext/gd/tests/imagearc_variation2.phpt
index 40227c3750f..ad9addf7cdb 100644
--- a/ext/gd/tests/imagearc_variation2.phpt
+++ b/ext/gd/tests/imagearc_variation2.phpt
@@ -4,7 +4,7 @@ Testing passing negative start angle to imagearc() of GD library
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
@@ -14,7 +14,7 @@ $image = imagecreatetruecolor(100, 100);
 
 $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
 
-//create an arc with white color    
+//create an arc with white color
 imagearc($image, 50, 50, 30, 30, -90, 0, $white);
 
 include_once __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/imagechar_basic.phpt b/ext/gd/tests/imagechar_basic.phpt
index f238aabae45..3616f449ec3 100644
--- a/ext/gd/tests/imagechar_basic.phpt
+++ b/ext/gd/tests/imagechar_basic.phpt
@@ -4,7 +4,7 @@ Testing imagechar() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagechar_error1.phpt b/ext/gd/tests/imagechar_error1.phpt
index 373d3042e46..c91a3ec55b4 100644
--- a/ext/gd/tests/imagechar_error1.phpt
+++ b/ext/gd/tests/imagechar_error1.phpt
@@ -4,7 +4,7 @@ Testing error on non-resource parameter 1 of imagechar() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagechar_error2.phpt b/ext/gd/tests/imagechar_error2.phpt
index 02a95994f62..1666788eadf 100644
--- a/ext/gd/tests/imagechar_error2.phpt
+++ b/ext/gd/tests/imagechar_error2.phpt
@@ -4,7 +4,7 @@ Testing error on non-image resource parameter 1 of imagechar() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagechar_error3.phpt b/ext/gd/tests/imagechar_error3.phpt
index 31b1c2386f7..b48243a840f 100644
--- a/ext/gd/tests/imagechar_error3.phpt
+++ b/ext/gd/tests/imagechar_error3.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 2 of imagechar() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagechar_error4.phpt b/ext/gd/tests/imagechar_error4.phpt
index 263da50e607..c86c3fa46c3 100644
--- a/ext/gd/tests/imagechar_error4.phpt
+++ b/ext/gd/tests/imagechar_error4.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 3 of imagechar() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagechar_error5.phpt b/ext/gd/tests/imagechar_error5.phpt
index 8d47dc377bc..1ca63ba0777 100644
--- a/ext/gd/tests/imagechar_error5.phpt
+++ b/ext/gd/tests/imagechar_error5.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 4 of imagechar() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagechar_error6.phpt b/ext/gd/tests/imagechar_error6.phpt
index eaef2f88c22..4ec608a60cb 100644
--- a/ext/gd/tests/imagechar_error6.phpt
+++ b/ext/gd/tests/imagechar_error6.phpt
@@ -4,7 +4,7 @@ Testing error on non-string parameter 5 of imagechar() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagechar_error7.phpt b/ext/gd/tests/imagechar_error7.phpt
index 1d7819265c8..cc67532ebf3 100644
--- a/ext/gd/tests/imagechar_error7.phpt
+++ b/ext/gd/tests/imagechar_error7.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 6 of imagechar() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecharup_basic.phpt b/ext/gd/tests/imagecharup_basic.phpt
index 50b0a596133..258f8b6e38c 100644
--- a/ext/gd/tests/imagecharup_basic.phpt
+++ b/ext/gd/tests/imagecharup_basic.phpt
@@ -4,7 +4,7 @@ Testing imagecharup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecharup_error1.phpt b/ext/gd/tests/imagecharup_error1.phpt
index e0b3e318a92..aaa2a2a68fe 100644
--- a/ext/gd/tests/imagecharup_error1.phpt
+++ b/ext/gd/tests/imagecharup_error1.phpt
@@ -4,7 +4,7 @@ Testing error on non-resource parameter 1 of imagecharup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecharup_error2.phpt b/ext/gd/tests/imagecharup_error2.phpt
index b78dc9221ea..e2db7bb5580 100644
--- a/ext/gd/tests/imagecharup_error2.phpt
+++ b/ext/gd/tests/imagecharup_error2.phpt
@@ -4,7 +4,7 @@ Testing error on non-image resource parameter 1 of imagecharup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecharup_error3.phpt b/ext/gd/tests/imagecharup_error3.phpt
index a44b766484c..7bcf5da6109 100644
--- a/ext/gd/tests/imagecharup_error3.phpt
+++ b/ext/gd/tests/imagecharup_error3.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 2 of imagecharup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecharup_error4.phpt b/ext/gd/tests/imagecharup_error4.phpt
index f1824f1344c..cc46149cc93 100644
--- a/ext/gd/tests/imagecharup_error4.phpt
+++ b/ext/gd/tests/imagecharup_error4.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 3 of imagecharup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecharup_error5.phpt b/ext/gd/tests/imagecharup_error5.phpt
index 73c2d075fec..3e40c3cdb71 100644
--- a/ext/gd/tests/imagecharup_error5.phpt
+++ b/ext/gd/tests/imagecharup_error5.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 4 of imagecharup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecharup_error6.phpt b/ext/gd/tests/imagecharup_error6.phpt
index a1f12f1ea6e..c7f40d576c8 100644
--- a/ext/gd/tests/imagecharup_error6.phpt
+++ b/ext/gd/tests/imagecharup_error6.phpt
@@ -4,7 +4,7 @@ Testing error on non-string parameter 5 of imagecharup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecharup_error7.phpt b/ext/gd/tests/imagecharup_error7.phpt
index fe1fe073da8..b77cfb2e398 100644
--- a/ext/gd/tests/imagecharup_error7.phpt
+++ b/ext/gd/tests/imagecharup_error7.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 6 of imagecharup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolorallocate_basic.phpt b/ext/gd/tests/imagecolorallocate_basic.phpt
index 25b28214854..874501dd4a6 100644
--- a/ext/gd/tests/imagecolorallocate_basic.phpt
+++ b/ext/gd/tests/imagecolorallocate_basic.phpt
@@ -8,7 +8,7 @@ if(!extension_loaded('gd')) {
 if(!function_exists('imagecreatetruecolor')) {
     die('skip imagecreatetruecolor function is not available');
 }
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : int imagecolorallocate(resource im, int red, int green, int blue)
diff --git a/ext/gd/tests/imagecolorallocate_error.phpt b/ext/gd/tests/imagecolorallocate_error.phpt
index 6c685b2c985..b584e18634c 100644
--- a/ext/gd/tests/imagecolorallocate_error.phpt
+++ b/ext/gd/tests/imagecolorallocate_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test imagecolorallocate() function : error conditions 
+Test imagecolorallocate() function : error conditions
 --SKIPIF--
 <?php
 if(!extension_loaded('gd')) {
     die('skip gd extension is not loaded');
 }
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : int imagecolorallocate(resource im, int red, int green, int blue)
diff --git a/ext/gd/tests/imagecolorallocate_variation1.phpt b/ext/gd/tests/imagecolorallocate_variation1.phpt
index 60d690bfbe3..fa304b5c8c6 100644
--- a/ext/gd/tests/imagecolorallocate_variation1.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation1.phpt
@@ -5,7 +5,7 @@ Test imagecolorallocate() function : usage variations  - passing different data
 if(!extension_loaded('gd')) {
     die('skip gd extension is not loaded');
 }
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : int imagecolorallocate(resource im, int red, int green, int blue)
@@ -70,7 +70,7 @@ $values = array(
       'int indexed array' => $index_array,
       'associative array' => $assoc_array,
 	  'nested arrays' => array('foo', $index_array, $assoc_array),
-      
+
       // null data
 	  'uppercase NULL' => NULL,
       'lowercase null' => null,
@@ -100,8 +100,8 @@ $values = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      //resource 
+
+      //resource
       "file resource" => $fp
 );
 
diff --git a/ext/gd/tests/imagecolorallocate_variation2.phpt b/ext/gd/tests/imagecolorallocate_variation2.phpt
index 7de60bc19f0..9e0fe13f8b4 100644
--- a/ext/gd/tests/imagecolorallocate_variation2.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation2.phpt
@@ -9,7 +9,7 @@ if(!function_exists('imagecreatetruecolor')) {
     die('skip imagecreatetruecolor function is not available');
 }
 if (PHP_INT_SIZE != 8) die('skip 64-bit only');
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : int imagecolorallocate(resource im, int red, int green, int blue)
@@ -65,7 +65,7 @@ $values = array(
       'int indexed array' => $index_array,
       'associative array' => $assoc_array,
 	  'nested arrays' => array('foo', $index_array, $assoc_array),
-      
+
       // null data
 	  'uppercase NULL' => NULL,
       'lowercase null' => null,
@@ -95,8 +95,8 @@ $values = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      //resource 
+
+      //resource
       "file resource" => $fp
 );
 // loop through each element of the array for red
diff --git a/ext/gd/tests/imagecolorallocate_variation3.phpt b/ext/gd/tests/imagecolorallocate_variation3.phpt
index 3fe1f50f82d..0066810991f 100644
--- a/ext/gd/tests/imagecolorallocate_variation3.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation3.phpt
@@ -8,7 +8,7 @@ if(!extension_loaded('gd')) {
 if(!function_exists('imagecreatetruecolor')) {
     die('skip imagecreatetruecolor function is not available');
 }
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : imagecolorallocate(resource im, int red, int green, int blue)
@@ -64,7 +64,7 @@ $values = array(
       'int indexed array' => $index_array,
       'associative array' => $assoc_array,
 	  'nested arrays' => array('foo', $index_array, $assoc_array),
-      
+
       // null data
 	  'uppercase NULL' => NULL,
       'lowercase null' => null,
@@ -94,8 +94,8 @@ $values = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      //resource 
+
+      //resource
       "file resource" => $fp
 );
 // loop through each element of the array for red
diff --git a/ext/gd/tests/imagecolorallocate_variation4.phpt b/ext/gd/tests/imagecolorallocate_variation4.phpt
index e4ef7c62a21..5c332723a13 100644
--- a/ext/gd/tests/imagecolorallocate_variation4.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation4.phpt
@@ -64,7 +64,7 @@ $values = array(
       'int indexed array' => $index_array,
       'associative array' => $assoc_array,
 	  'nested arrays' => array('foo', $index_array, $assoc_array),
-      
+
       // null data
 	  'uppercase NULL' => NULL,
       'lowercase null' => null,
@@ -94,8 +94,8 @@ $values = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
-      //resource 
+
+      //resource
       "file resource" => $fp
 );
 // loop through each element of the array for red
diff --git a/ext/gd/tests/imagecolorallocate_variation5.phpt b/ext/gd/tests/imagecolorallocate_variation5.phpt
index 794abb3d719..9f25940852d 100644
--- a/ext/gd/tests/imagecolorallocate_variation5.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation5.phpt
@@ -28,7 +28,7 @@ $values = array(
       "Octal 012" => 012,
       "Octal -012" => -012,
       "Octal 0377" => 0377,
-     
+
       // hexa-decimal integer data
       "Hexa-decimal 0x0" => 0x0,
       "Hexa-decimal 0xA" => 0xA,
diff --git a/ext/gd/tests/imagecolorallocate_variation6.phpt b/ext/gd/tests/imagecolorallocate_variation6.phpt
index bc939c97998..48f1c908a71 100644
--- a/ext/gd/tests/imagecolorallocate_variation6.phpt
+++ b/ext/gd/tests/imagecolorallocate_variation6.phpt
@@ -18,12 +18,12 @@ if(!function_exists('imagecreatetruecolor')) {
 echo "*** Testing imagecolorallocate() : usage variations ***\n";
 
 $values = array(
-      //Decimal integera data  
+      //Decimal integera data
       "Decimal 256" => 256,
-      
+
       // octal integer data
       "Octal 0400" => 0400,
-     
+
       // hexa-decimal integer data
       "Hexa-decimal 0x100" => 0x100
 );
diff --git a/ext/gd/tests/imagecolorallocatealpha_basic.phpt b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
index f0d1e45e6ef..536e2cf842f 100644
--- a/ext/gd/tests/imagecolorallocatealpha_basic.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
@@ -3,7 +3,7 @@ Testing imagecolorallocatealpha()
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
 		die("skip test requires GD 2.2.2 or higher");
diff --git a/ext/gd/tests/imagecolorallocatealpha_error1.phpt b/ext/gd/tests/imagecolorallocatealpha_error1.phpt
index a9030248bb9..bba92624229 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error1.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error1.phpt
@@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 1
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolorallocatealpha_error2.phpt b/ext/gd/tests/imagecolorallocatealpha_error2.phpt
index d0df2a7d6b4..7b50b0b35f4 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error2.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error2.phpt
@@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 2
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolorallocatealpha_error3.phpt b/ext/gd/tests/imagecolorallocatealpha_error3.phpt
index ab92960c207..406d20eea07 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error3.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error3.phpt
@@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 3
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolorallocatealpha_error4.phpt b/ext/gd/tests/imagecolorallocatealpha_error4.phpt
index 708e95e6801..b0c8f51351f 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error4.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error4.phpt
@@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 4
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolorallocatealpha_error5.phpt b/ext/gd/tests/imagecolorallocatealpha_error5.phpt
index fd434103658..a4d485b61ee 100644
--- a/ext/gd/tests/imagecolorallocatealpha_error5.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_error5.phpt
@@ -3,7 +3,7 @@ Testing imagecolorallocatealpha(): Wrong types for parameter 5
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolordeallocate_basic.phpt b/ext/gd/tests/imagecolordeallocate_basic.phpt
index 3c80c690f89..877e8b64c4b 100644
--- a/ext/gd/tests/imagecolordeallocate_basic.phpt
+++ b/ext/gd/tests/imagecolordeallocate_basic.phpt
@@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolordeallocate_error1.phpt b/ext/gd/tests/imagecolordeallocate_error1.phpt
index 6d642d4a262..82460139b61 100644
--- a/ext/gd/tests/imagecolordeallocate_error1.phpt
+++ b/ext/gd/tests/imagecolordeallocate_error1.phpt
@@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library with invalid resource type
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolordeallocate_error2.phpt b/ext/gd/tests/imagecolordeallocate_error2.phpt
index 989e0fd97a5..ca880529b86 100644
--- a/ext/gd/tests/imagecolordeallocate_error2.phpt
+++ b/ext/gd/tests/imagecolordeallocate_error2.phpt
@@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library with no resource
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolordeallocate_error3.phpt b/ext/gd/tests/imagecolordeallocate_error3.phpt
index 8000218ade0..e9be1ea66a2 100644
--- a/ext/gd/tests/imagecolordeallocate_error3.phpt
+++ b/ext/gd/tests/imagecolordeallocate_error3.phpt
@@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library with Out of range intergers (Above)
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolordeallocate_error4.phpt b/ext/gd/tests/imagecolordeallocate_error4.phpt
index 7aaeffebeeb..22fc2fa3ef4 100644
--- a/ext/gd/tests/imagecolordeallocate_error4.phpt
+++ b/ext/gd/tests/imagecolordeallocate_error4.phpt
@@ -4,7 +4,7 @@ Testing imagecolordeallocate() of GD library with Out of range intergers (Below)
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolormatch_basic.phpt b/ext/gd/tests/imagecolormatch_basic.phpt
index 1d188121b6f..fd0187fd771 100644
--- a/ext/gd/tests/imagecolormatch_basic.phpt
+++ b/ext/gd/tests/imagecolormatch_basic.phpt
@@ -4,7 +4,7 @@ Basic test imagecolormatch() of GD library
 Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolormatch_error1.phpt b/ext/gd/tests/imagecolormatch_error1.phpt
index 9750a8b2452..5e8d82cc393 100644
--- a/ext/gd/tests/imagecolormatch_error1.phpt
+++ b/ext/gd/tests/imagecolormatch_error1.phpt
@@ -4,7 +4,7 @@ Send only 1 parameter imagecolormatch() of GD library
 Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolormatch_error2.phpt b/ext/gd/tests/imagecolormatch_error2.phpt
index bdb3c2460ea..2240f987df5 100644
--- a/ext/gd/tests/imagecolormatch_error2.phpt
+++ b/ext/gd/tests/imagecolormatch_error2.phpt
@@ -4,7 +4,7 @@ Send not TrueColor to Image 1 parameter imagecolormatch() of GD library
 Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolormatch_error3.phpt b/ext/gd/tests/imagecolormatch_error3.phpt
index 8793e15227f..245ebca646d 100644
--- a/ext/gd/tests/imagecolormatch_error3.phpt
+++ b/ext/gd/tests/imagecolormatch_error3.phpt
@@ -4,7 +4,7 @@ Send not TrueColor to Image 1 parameter imagecolormatch() of GD library
 Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolormatch_error4.phpt b/ext/gd/tests/imagecolormatch_error4.phpt
index 0bfe767c2b1..4579192571a 100644
--- a/ext/gd/tests/imagecolormatch_error4.phpt
+++ b/ext/gd/tests/imagecolormatch_error4.phpt
@@ -4,7 +4,7 @@ using different image sizes imagecolormatch() of GD library
 Paulo Alves de Sousa Filho <pspalves [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolorstotal_basic.phpt b/ext/gd/tests/imagecolorstotal_basic.phpt
index 472a10d8640..771ce429f77 100644
--- a/ext/gd/tests/imagecolorstotal_basic.phpt
+++ b/ext/gd/tests/imagecolorstotal_basic.phpt
@@ -9,7 +9,7 @@ if(!extension_loaded('gd')) {
 if(!function_exists('imagecolorstotal') || !function_exists('imagecreatefromgif')) {
     die('skip imagecolorstotal and imagecreatefromgif functions not available in this build');
 }
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : int imagecolorstotal  ( resource $image  )
@@ -19,7 +19,7 @@ if(!function_exists('imagecolorstotal') || !function_exists('imagecreatefromgif'
 
 echo "*** Testing imagecolorstotal() : basic functionality ***\n";
 
-// Get an image 
+// Get an image
 $gif = dirname(__FILE__)."/php.gif";
 $im = imagecreatefromgif($gif);
 
diff --git a/ext/gd/tests/imagecolorstotal_error.phpt b/ext/gd/tests/imagecolorstotal_error.phpt
index a7f3b957197..59999423ca5 100644
--- a/ext/gd/tests/imagecolorstotal_error.phpt
+++ b/ext/gd/tests/imagecolorstotal_error.phpt
@@ -8,7 +8,7 @@ if(!extension_loaded('gd')) {
 if(!function_exists('imagecolorstotal')) {
     die('skip imagecolorstotal function is not available');
 }
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : int imagecolorstotal  ( resource $image  )
@@ -31,7 +31,7 @@ var_dump( imagecolorstotal($im, $extra_arg) );
 echo "\n-- Testing imagecolorstotal() function with a invalid resource\n";
 var_dump( imagecolorstotal($im) );
 
-fclose($im); 
+fclose($im);
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/gd/tests/imagecolourstotal_basic.phpt b/ext/gd/tests/imagecolourstotal_basic.phpt
index c26fa68cf2d..b740a841e7a 100644
--- a/ext/gd/tests/imagecolourstotal_basic.phpt
+++ b/ext/gd/tests/imagecolourstotal_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test imagecolorstotal() function : basic functionality 
+Test imagecolorstotal() function : basic functionality
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --SKIPIF--
@@ -14,9 +14,9 @@ Felix De Vliegher <felix.devliegher@gmail.com>
 --FILE--
 <?php
 /* Prototype  : int imagecolorstotal(resource im)
- * Description: Find out the number of colors in an image's palette 
+ * Description: Find out the number of colors in an image's palette
  * Source code: ext/gd/gd.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing imagecolorstotal() : basic functionality ***\n";
diff --git a/ext/gd/tests/imageconvolution_basic.phpt b/ext/gd/tests/imageconvolution_basic.phpt
index 972de76f86f..be6ff52eaa2 100644
--- a/ext/gd/tests/imageconvolution_basic.phpt
+++ b/ext/gd/tests/imageconvolution_basic.phpt
@@ -4,7 +4,7 @@ Testing imageconvolution() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageconvolution_error1.phpt b/ext/gd/tests/imageconvolution_error1.phpt
index 5dc250a85ba..7090bf4a57e 100644
--- a/ext/gd/tests/imageconvolution_error1.phpt
+++ b/ext/gd/tests/imageconvolution_error1.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imageconvolution() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageconvolution_error2.phpt b/ext/gd/tests/imageconvolution_error2.phpt
index 5161c198c34..217e3e1547f 100644
--- a/ext/gd/tests/imageconvolution_error2.phpt
+++ b/ext/gd/tests/imageconvolution_error2.phpt
@@ -4,7 +4,7 @@ Testing wrong array size 2x3 in imageconvolution() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageconvolution_error3.phpt b/ext/gd/tests/imageconvolution_error3.phpt
index df6b148bd19..5f1ddc95bea 100644
--- a/ext/gd/tests/imageconvolution_error3.phpt
+++ b/ext/gd/tests/imageconvolution_error3.phpt
@@ -4,7 +4,7 @@ Testing wrong array size 3x2 in imageconvolution() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecopymerge_basic.phpt b/ext/gd/tests/imagecopymerge_basic.phpt
index f324eaedf1a..d533209f6dd 100644
--- a/ext/gd/tests/imagecopymerge_basic.phpt
+++ b/ext/gd/tests/imagecopymerge_basic.phpt
@@ -7,7 +7,7 @@ Cleston Viel Vieira de Sousa <cleston [dot] vs [at] gmail [dot] com>
 Updated by Sean Fraaser <frasmage [at] gmail [dot] com>
 PHP[tek] 2017
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecopymerge_error.phpt b/ext/gd/tests/imagecopymerge_error.phpt
index e43bf694525..90d9c55871c 100644
--- a/ext/gd/tests/imagecopymerge_error.phpt
+++ b/ext/gd/tests/imagecopymerge_error.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter passing imagecopymerge() of GD library
 Cleston Viel Vieira de Sousa <cleston [dot] vs [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecopymergegray_basic.phpt b/ext/gd/tests/imagecopymergegray_basic.phpt
index baad9b43aca..a4e587123f0 100644
--- a/ext/gd/tests/imagecopymergegray_basic.phpt
+++ b/ext/gd/tests/imagecopymergegray_basic.phpt
@@ -4,7 +4,7 @@ Testing imagecopymergegray() of GD library
 Sean Fraser <frasmage [at] gmail [dot] com>
 PHP[tek] 2017
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecopyresampled_basic.phpt b/ext/gd/tests/imagecopyresampled_basic.phpt
index edf7ba65487..77af59c085e 100644
--- a/ext/gd/tests/imagecopyresampled_basic.phpt
+++ b/ext/gd/tests/imagecopyresampled_basic.phpt
@@ -1,8 +1,8 @@
 --TEST--
 imagecopyresampled()
 --SKIPIF--
-<?php 
-	if (!function_exists('imagecopyresampled')) die('skip imagecopyresampled() not available'); 
+<?php
+	if (!function_exists('imagecopyresampled')) die('skip imagecopyresampled() not available');
 ?>
 --FILE--
 <?php
@@ -10,7 +10,7 @@ imagecopyresampled()
 /* Prototype  : bool imagecopyresampled  ( resource $dst_image  , resource $src_image  , int $dst_x  , int $dst_y  , int $src_x  , int $src_y  , int $dst_w  , int $dst_h  , int $src_w  , int $src_h  )
  * Description: Copy and resize part of an image with resampling.
  * Source code: ext/standard/image.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "Simple test of imagecopyresampled() function\n";
@@ -21,7 +21,7 @@ $dest_sml = dirname(realpath(__FILE__)) . '/imagesmall.png';
 // create a blank image
 $image_lge = imagecreatetruecolor(400, 300);
 
-// set the background color to black 
+// set the background color to black
 $bg = imagecolorallocate($image_lge, 0, 0, 0);
 
 // fill polygon with blue
@@ -50,14 +50,14 @@ imagepng($image_sml, $dest_sml);
 list($width, $height) = getimagesize($dest_sml);
 echo "Size of copy: width=". $width . " height=" . $height . "\n";
 
-imagedestroy($image_lge); 
+imagedestroy($image_lge);
 imagedestroy($image_sml);
- 
 
-echo "Done\n"; 
+
+echo "Done\n";
 ?>
 --CLEAN--
-<?php 
+<?php
 	$dest_lge = dirname(realpath(__FILE__)) . '/imagelarge.png';
 	$dest_sml = dirname(realpath(__FILE__)) . '/imagesmall.png';
 	@unlink($dest_lge);
diff --git a/ext/gd/tests/imagecreatetruecolor_basic.phpt b/ext/gd/tests/imagecreatetruecolor_basic.phpt
index e2a5a09fbae..2da09cd18bb 100644
--- a/ext/gd/tests/imagecreatetruecolor_basic.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_basic.phpt
@@ -3,7 +3,7 @@ Testing imagecreatetruecolor() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
diff --git a/ext/gd/tests/imagecreatetruecolor_error1.phpt b/ext/gd/tests/imagecreatetruecolor_error1.phpt
index 7ec75aa66f4..8781ccaf2b3 100644
--- a/ext/gd/tests/imagecreatetruecolor_error1.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error1.phpt
@@ -3,7 +3,7 @@ Testing imagecreatetruecolor(): error on non-long parameters
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
diff --git a/ext/gd/tests/imagecreatetruecolor_error2.phpt b/ext/gd/tests/imagecreatetruecolor_error2.phpt
index 62ff43a62f4..a3c385c6cf3 100644
--- a/ext/gd/tests/imagecreatetruecolor_error2.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error2.phpt
@@ -3,7 +3,7 @@ Testing imagecreatetruecolor(): error on out of bound parameters
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
diff --git a/ext/gd/tests/imagecreatetruecolor_error3.phpt b/ext/gd/tests/imagecreatetruecolor_error3.phpt
index 332cdef3a3a..3982e8aceb7 100644
--- a/ext/gd/tests/imagecreatetruecolor_error3.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error3.phpt
@@ -3,7 +3,7 @@ Testing imagecreatetruecolor(): error on wrong parameter count
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
diff --git a/ext/gd/tests/imagecrop_auto-ext.phpt b/ext/gd/tests/imagecrop_auto-ext.phpt
index f37b3ca8e21..cc88e5d657d 100644
--- a/ext/gd/tests/imagecrop_auto-ext.phpt
+++ b/ext/gd/tests/imagecrop_auto-ext.phpt
@@ -1,36 +1,36 @@
---TEST-- 
-Testing imagecropauto() 
---SKIPIF-- 
-<?php  
-if ( ! extension_loaded('gd') || !function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' ); 
+--TEST--
+Testing imagecropauto()
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') || !function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' );
 if (GD_BUNDLED) die('skip requires external libgd');
-?> 
+?>
 --FILE--
 <?php
 
 echo "TC IMG_CROP_DEFAULT\n";
-$im = imagecreatetruecolor(99, 99); 
+$im = imagecreatetruecolor(99, 99);
 imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
 $im_crop = imagecropauto($im, IMG_CROP_DEFAULT);
 var_dump(imagesx($im_crop));
 var_dump(imagesy($im_crop));
 
 echo "Palette IMG_CROP_DEFAULT\n";
-$im = imagecreate(99, 99); 
+$im = imagecreate(99, 99);
 imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
 $im_crop = imagecropauto($im, IMG_CROP_DEFAULT);
 var_dump(imagesx($im_crop));
 var_dump(imagesy($im_crop));
 
 echo "TC IMG_CROP_SIDES\n";
-$im = imagecreatetruecolor(99, 99); 
+$im = imagecreatetruecolor(99, 99);
 imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
 $im_crop = imagecropauto($im, IMG_CROP_SIDES);
 var_dump(imagesx($im_crop));
 var_dump(imagesy($im_crop));
 
 echo "Palette IMG_CROP_SIDES\n";
-$im = imagecreate(99, 99); 
+$im = imagecreate(99, 99);
 imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
 $im_crop = imagecropauto($im, IMG_CROP_SIDES);
 var_dump(imagesx($im_crop));
@@ -60,8 +60,8 @@ var_dump(imagesx($im_crop));
 var_dump(imagesy($im_crop));
 
 @unlink(__DIR__ . "/crop_threshold.png");
-?> 
---EXPECT-- 
+?>
+--EXPECT--
 TC IMG_CROP_DEFAULT
 int(99)
 int(99)
diff --git a/ext/gd/tests/imagecrop_auto.phpt b/ext/gd/tests/imagecrop_auto.phpt
index 07f6b8ae4c1..b12cc971ee9 100644
--- a/ext/gd/tests/imagecrop_auto.phpt
+++ b/ext/gd/tests/imagecrop_auto.phpt
@@ -1,36 +1,36 @@
---TEST-- 
-Testing imagecropauto() 
---SKIPIF-- 
-<?php  
-if ( ! extension_loaded('gd') || !function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' ); 
+--TEST--
+Testing imagecropauto()
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') || !function_exists('imagecrop')) die( 'skip GD imagecropauto not present; skipping test' );
 if (!GD_BUNDLED) die('skip requires bundled libgd');
-?> 
+?>
 --FILE--
 <?php
 
 echo "TC IMG_CROP_DEFAULT\n";
-$im = imagecreatetruecolor(99, 99); 
+$im = imagecreatetruecolor(99, 99);
 imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
 $im_crop = imagecropauto($im, IMG_CROP_DEFAULT);
 var_dump(imagesx($im_crop));
 var_dump(imagesy($im_crop));
 
 echo "Palette IMG_CROP_DEFAULT\n";
-$im = imagecreate(99, 99); 
+$im = imagecreate(99, 99);
 imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
 $im_crop = imagecropauto($im, IMG_CROP_DEFAULT);
 var_dump(imagesx($im_crop));
 var_dump(imagesy($im_crop));
 
 echo "TC IMG_CROP_SIDES\n";
-$im = imagecreatetruecolor(99, 99); 
+$im = imagecreatetruecolor(99, 99);
 imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
 $im_crop = imagecropauto($im, IMG_CROP_SIDES);
 var_dump(imagesx($im_crop));
 var_dump(imagesy($im_crop));
 
 echo "Palette IMG_CROP_SIDES\n";
-$im = imagecreate(99, 99); 
+$im = imagecreate(99, 99);
 imagefilledrectangle($im, 20, 20, 30, 30, 0xff);
 $im_crop = imagecropauto($im, IMG_CROP_SIDES);
 var_dump(imagesx($im_crop));
@@ -60,8 +60,8 @@ var_dump(imagesx($im_crop));
 var_dump(imagesy($im_crop));
 
 @unlink(__DIR__ . "/crop_threshold.png");
-?> 
---EXPECT-- 
+?>
+--EXPECT--
 TC IMG_CROP_DEFAULT
 int(11)
 int(11)
diff --git a/ext/gd/tests/imagedashedline_basic.phpt b/ext/gd/tests/imagedashedline_basic.phpt
index 35525f57bcd..bc87c465c6f 100644
--- a/ext/gd/tests/imagedashedline_basic.phpt
+++ b/ext/gd/tests/imagedashedline_basic.phpt
@@ -1,8 +1,8 @@
 --TEST--
 imagedashedline()
 --SKIPIF--
-<?php 
-	if (!function_exists('imagedashedline')) die('skip imagedashedline() not available'); 
+<?php
+	if (!function_exists('imagedashedline')) die('skip imagedashedline() not available');
 ?>
 --FILE--
 <?php
@@ -11,7 +11,7 @@ imagedashedline()
  * Description: Draws a dashed line.
  * This function is deprecated. Use combination of imagesetstyle() and imageline() instead.
  * Source code: ext/standard/image.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
@@ -22,15 +22,15 @@ $dest = dirname(realpath(__FILE__)) . '/imagedashedline.png';
 // create a blank image
 $image = imagecreatetruecolor(250, 250);
 
-// set the background color to black 
+// set the background color to black
 $bg = imagecolorallocate($image, 0, 0, 0);
 
 // red dashed lines
 $col_line = imagecolorallocate($image, 255, 0, 0);
 
 // draw a couple of vertical dashed lines
-imagedashedline($image, 100, 20, 100, 230, $col_line );	
-imagedashedline($image, 150, 20, 150, 230, $col_line );	
+imagedashedline($image, 100, 20, 100, 230, $col_line );
+imagedashedline($image, 150, 20, 150, 230, $col_line );
 
 // output the picture to a file
 imagepng($image, $dest);
@@ -44,11 +44,11 @@ $color1 = imagecolorsforindex($image, $col1);
 $color2 = imagecolorsforindex($image, $col2);
 var_dump($color1, $color2);
 
-imagedestroy($image); 
-echo "Done\n"; 
+imagedestroy($image);
+echo "Done\n";
 ?>
 --CLEAN--
-<?php 
+<?php
 	$dest = dirname(realpath(__FILE__)) . '/imagedashedline.png';
 	@unlink($dest);
 ?>
diff --git a/ext/gd/tests/imageellipse_basic.phpt b/ext/gd/tests/imageellipse_basic.phpt
index f3b1e10bfea..9f0cf977bbc 100644
--- a/ext/gd/tests/imageellipse_basic.phpt
+++ b/ext/gd/tests/imageellipse_basic.phpt
@@ -4,7 +4,7 @@ Testing imageellipse() of GD library
 Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageellipse_error1.phpt b/ext/gd/tests/imageellipse_error1.phpt
index aa8ad789d92..476b5daa756 100644
--- a/ext/gd/tests/imageellipse_error1.phpt
+++ b/ext/gd/tests/imageellipse_error1.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library
 Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageellipse_error2.phpt b/ext/gd/tests/imageellipse_error2.phpt
index d9062f65317..2c989827313 100644
--- a/ext/gd/tests/imageellipse_error2.phpt
+++ b/ext/gd/tests/imageellipse_error2.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library
 Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageellipse_error3.phpt b/ext/gd/tests/imageellipse_error3.phpt
index fca825ff2f2..69521555e95 100644
--- a/ext/gd/tests/imageellipse_error3.phpt
+++ b/ext/gd/tests/imageellipse_error3.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library
 Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageellipse_error4.phpt b/ext/gd/tests/imageellipse_error4.phpt
index c8d6eb0fa06..51cb02b1737 100644
--- a/ext/gd/tests/imageellipse_error4.phpt
+++ b/ext/gd/tests/imageellipse_error4.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library
 Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageellipse_error5.phpt b/ext/gd/tests/imageellipse_error5.phpt
index e4d24732256..18c185c5f6e 100644
--- a/ext/gd/tests/imageellipse_error5.phpt
+++ b/ext/gd/tests/imageellipse_error5.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library
 Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageellipse_error7.phpt b/ext/gd/tests/imageellipse_error7.phpt
index 23f1eeeab7d..0b4c1f549df 100644
--- a/ext/gd/tests/imageellipse_error7.phpt
+++ b/ext/gd/tests/imageellipse_error7.phpt
@@ -1,20 +1,20 @@
---TEST-- 
-Testing wrong param passing imageellipse() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
-#testfest PHPSP on 2009-06-20 
---SKIPIF-- 
-<?php  
-if (!extension_loaded("gd")) die("skip GD not present"); 
-?> 
---FILE-- 
-<?php 
+--TEST--
+Testing wrong param passing imageellipse() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
+#testfest PHPSP on 2009-06-20
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
+--FILE--
+<?php
 
-// Create a resource 
-$image = tmpfile(); 
+// Create a resource
+$image = tmpfile();
 
-// try to draw a white ellipse 
-imageellipse($image, 200, 150, 300, 200, 16777215); 
-?> 
---EXPECTF-- 
+// try to draw a white ellipse
+imageellipse($image, 200, 150, 300, 200, 16777215);
+?>
+--EXPECTF--
 Warning: imageellipse(): supplied resource is not a valid Image resource in %s on line %d
diff --git a/ext/gd/tests/imageellipse_error8.phpt b/ext/gd/tests/imageellipse_error8.phpt
index d02b97eec36..5be5a12c391 100644
--- a/ext/gd/tests/imageellipse_error8.phpt
+++ b/ext/gd/tests/imageellipse_error8.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imageellipse() of GD library
 Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if ( ! extension_loaded("gd") ) die( 'skip GD not present; skipping test' );
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefill_1.phpt b/ext/gd/tests/imagefill_1.phpt
index 04e1cab55a9..f356fe826df 100644
--- a/ext/gd/tests/imagefill_1.phpt
+++ b/ext/gd/tests/imagefill_1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 imagefill() infinite loop with wrong color index
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded('gd')) {
 		die("skip gd extension not available.");
 	}
diff --git a/ext/gd/tests/imagefilledarc_basic.phpt b/ext/gd/tests/imagefilledarc_basic.phpt
index 9969e6be95d..b353d808e6a 100644
--- a/ext/gd/tests/imagefilledarc_basic.phpt
+++ b/ext/gd/tests/imagefilledarc_basic.phpt
@@ -4,7 +4,7 @@ Testing imagefilledarc() of GD library
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
 	die("skip test requires GD 2.2.2 or higher");
@@ -17,7 +17,7 @@ $image = imagecreatetruecolor(100, 100);
 
 $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
 
-//create an arc and fill it with white color    
+//create an arc and fill it with white color
 imagefilledarc($image, 50, 50, 30, 30, 0, 90, $white, IMG_ARC_PIE);
 
 include_once __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/imagefilledarc_error1.phpt b/ext/gd/tests/imagefilledarc_error1.phpt
index 81d04358fbb..2ef47150ee3 100644
--- a/ext/gd/tests/imagefilledarc_error1.phpt
+++ b/ext/gd/tests/imagefilledarc_error1.phpt
@@ -4,7 +4,7 @@ Testing wrong param passing imagefilledarc() of GD library
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
@@ -14,7 +14,7 @@ $image = imagecreatetruecolor(100, 100);
 
 $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
 
-//create an arc and fill it with white color    
+//create an arc and fill it with white color
 imagefilledarc($image, 50, 50, 30, 30, 0, 90, $white);
 
 include_once __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/imagefilledarc_variation1.phpt b/ext/gd/tests/imagefilledarc_variation1.phpt
index 7eb2350cb38..cc6e01b4ad4 100644
--- a/ext/gd/tests/imagefilledarc_variation1.phpt
+++ b/ext/gd/tests/imagefilledarc_variation1.phpt
@@ -4,7 +4,7 @@ Testing passing negative end angle to imagefilledarc() of GD library
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
 	die("skip test requires GD 2.2.2 or higher");
@@ -17,7 +17,7 @@ $image = imagecreatetruecolor(100, 100);
 
 $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
 
-//create an arc and fill it with white color    
+//create an arc and fill it with white color
 imagefilledarc($image, 50, 50, 30, 30, 0, -25, $white, IMG_ARC_PIE);
 
 include_once __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/imagefilledarc_variation2.phpt b/ext/gd/tests/imagefilledarc_variation2.phpt
index 28cb517631a..feb81a8e062 100644
--- a/ext/gd/tests/imagefilledarc_variation2.phpt
+++ b/ext/gd/tests/imagefilledarc_variation2.phpt
@@ -4,7 +4,7 @@ Testing passing negative start angle to imagefilledarc() of GD library
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
 	die("skip test requires GD 2.2.2 or higher");
@@ -17,7 +17,7 @@ $image = imagecreatetruecolor(100, 100);
 
 $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
 
-//create an arc and fill it with white color    
+//create an arc and fill it with white color
 imagefilledarc($image, 50, 50, 30, 30, -25, 25, $white, IMG_ARC_PIE);
 
 include_once __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/imagefilledellipse_basic.phpt b/ext/gd/tests/imagefilledellipse_basic.phpt
index 1dee961b13b..ef492510af0 100644
--- a/ext/gd/tests/imagefilledellipse_basic.phpt
+++ b/ext/gd/tests/imagefilledellipse_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing imagefilledellipse() of GD library
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
@@ -11,7 +11,7 @@ $image = imagecreatetruecolor(100, 100);
 
 $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
 
-//create an ellipse and fill it with white color    
+//create an ellipse and fill it with white color
 imagefilledellipse($image, 50, 50, 40, 30, $white);
 
 include_once __DIR__ . '/func.inc';
diff --git a/ext/gd/tests/imagefilledpolygon_basic.phpt b/ext/gd/tests/imagefilledpolygon_basic.phpt
index b957cce698f..0f5f9cf335c 100644
--- a/ext/gd/tests/imagefilledpolygon_basic.phpt
+++ b/ext/gd/tests/imagefilledpolygon_basic.phpt
@@ -1,8 +1,8 @@
 --TEST--
 imagefilledpolygon()
 --SKIPIF--
-<?php 
-	if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available'); 
+<?php
+	if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available');
 ?>
 --FILE--
 <?php
@@ -10,7 +10,7 @@ imagefilledpolygon()
 /* Prototype  : bool imagefilledpolygon  ( resource $image  , array $points  , int $num_points  , int $color  )
  * Description: Draws a filled polygon.
  * Source code: ext/standard/image.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "Simple test of imagefilledpolygon() function\n";
@@ -18,18 +18,18 @@ echo "Simple test of imagefilledpolygon() function\n";
 $dest = dirname(realpath(__FILE__)) . '/imagefilledpolygon.png';
 
 $points = array(
-            40,  50,  
-            20,  240, 
-            60,  60,  
-            240, 20,  
-            50,  40,  
-            10,  10   
+            40,  50,
+            20,  240,
+            60,  60,
+            240, 20,
+            50,  40,
+            10,  10
             );
 
 // create a blank image
 $image = imagecreatetruecolor(250, 250);
 
-// set the background color to black 
+// set the background color to black
 $bg = imagecolorallocate($image, 0, 0, 0);
 
 // fill polygon with green
@@ -41,12 +41,12 @@ imagefilledpolygon($image, $points, count($points)/2, $col_poly);
 // output the picture to a file
 imagepng($image, $dest);
 
-// get it back 
+// get it back
 $image_in = imagecreatefrompng($dest);
 
 //check color of a point on edge..
 $col1 = imagecolorat($image_in, 40, 50);
-//.. a point in filled body 
+//.. a point in filled body
 $col2 = imagecolorat($image_in, 15, 15);
 // ..and a point on background
 $col3 = imagecolorat($image_in, 5, 5);
@@ -56,13 +56,13 @@ $color2 = imagecolorsforindex($image_in, $col2);
 $color3 = imagecolorsforindex($image_in, $col3);
 var_dump($color1, $color2, $color3);
 
-imagedestroy($image); 
+imagedestroy($image);
 imagedestroy($image_in);
 
-echo "Done\n"; 
+echo "Done\n";
 ?>
 --CLEAN--
-<?php 
+<?php
 	$dest = dirname(realpath(__FILE__)) . '/imagefilledpolygon.png';
 	@unlink($dest);
 ?>
diff --git a/ext/gd/tests/imagefilledpolygon_negative.phpt b/ext/gd/tests/imagefilledpolygon_negative.phpt
index ced853067ba..a572a195f5d 100644
--- a/ext/gd/tests/imagefilledpolygon_negative.phpt
+++ b/ext/gd/tests/imagefilledpolygon_negative.phpt
@@ -1,8 +1,8 @@
 --TEST--
 imagefilledpolygon() with a negative num of points
 --SKIPIF--
-<?php 
-	if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available'); 
+<?php
+	if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagefilltoborder_basic.phpt b/ext/gd/tests/imagefilltoborder_basic.phpt
index 843eed473d2..e177918e3ea 100644
--- a/ext/gd/tests/imagefilltoborder_basic.phpt
+++ b/ext/gd/tests/imagefilltoborder_basic.phpt
@@ -1,16 +1,16 @@
---TEST-- 
-Testing imagefilltoborder() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing imagefilltoborder() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if (!extension_loaded("gd")) die("skip GD not present"); 
-?> 
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -24,6 +24,6 @@ imagefilltoborder( $image, 50, 50, imagecolorallocate( $image, 0, 0, 0 ), imagec
 include_once __DIR__ . '/func.inc';
 test_image_equals_file(__DIR__ . '/imagefilltoborder_basic.png', $image);
 
-?> 
---EXPECT-- 
+?>
+--EXPECT--
 The images are equal.
diff --git a/ext/gd/tests/imagefilltoborder_error1.phpt b/ext/gd/tests/imagefilltoborder_error1.phpt
index 9412da73944..c53d53718db 100644
--- a/ext/gd/tests/imagefilltoborder_error1.phpt
+++ b/ext/gd/tests/imagefilltoborder_error1.phpt
@@ -1,16 +1,16 @@
---TEST-- 
-Testing wrong param passing imagefilltoborder() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagefilltoborder() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if (!extension_loaded("gd")) die("skip GD not present"); 
-?> 
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) );
 // Try to fill border
 imagefilltoborder( 'wrong param', 50, 50, imagecolorallocate( $image, 0, 0, 0 ), imagecolorallocate( $image, 255, 0, 0 ) );
 
-?> 
+?>
 --EXPECTF--
 Warning: imagefilltoborder() expects parameter 1 to be resource, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error2.phpt b/ext/gd/tests/imagefilltoborder_error2.phpt
index 8ad1f4004ed..7d0f3e3c010 100644
--- a/ext/gd/tests/imagefilltoborder_error2.phpt
+++ b/ext/gd/tests/imagefilltoborder_error2.phpt
@@ -1,16 +1,16 @@
---TEST-- 
-Testing wrong param passing imagefilltoborder() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagefilltoborder() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if (!extension_loaded("gd")) die("skip GD not present"); 
-?> 
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) );
 // Try to fill border
 imagefilltoborder( $image, 'wrong param', 50, imagecolorallocate( $image, 0, 0, 0 ), imagecolorallocate( $image, 255, 0, 0 ) );
 
-?> 
+?>
 --EXPECTF--
 Warning: imagefilltoborder() expects parameter 2 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error3.phpt b/ext/gd/tests/imagefilltoborder_error3.phpt
index b0e089cfa05..4a5a09ae5fd 100644
--- a/ext/gd/tests/imagefilltoborder_error3.phpt
+++ b/ext/gd/tests/imagefilltoborder_error3.phpt
@@ -1,16 +1,16 @@
---TEST-- 
-Testing wrong param passing imagefilltoborder() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagefilltoborder() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if (!extension_loaded("gd")) die("skip GD not present"); 
-?> 
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) );
 // Try to fill border
 imagefilltoborder( $image, 50, 'wrong param', imagecolorallocate( $image, 0, 0, 0 ), imagecolorallocate( $image, 255, 0, 0 ) );
 
-?> 
+?>
 --EXPECTF--
 Warning: imagefilltoborder() expects parameter 3 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error4.phpt b/ext/gd/tests/imagefilltoborder_error4.phpt
index 94a6123a967..cd1daa7171d 100644
--- a/ext/gd/tests/imagefilltoborder_error4.phpt
+++ b/ext/gd/tests/imagefilltoborder_error4.phpt
@@ -1,16 +1,16 @@
---TEST-- 
-Testing wrong param passing imagefilltoborder() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagefilltoborder() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if (!extension_loaded("gd")) die("skip GD not present"); 
-?> 
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) );
 // Try to fill border
 imagefilltoborder( $image, 50, 50, 'wrong param', imagecolorallocate( $image, 255, 0, 0 ) );
 
-?> 
+?>
 --EXPECTF--
 Warning: imagefilltoborder() expects parameter 4 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error5.phpt b/ext/gd/tests/imagefilltoborder_error5.phpt
index 6f4255ae3b5..7d7014fdc20 100644
--- a/ext/gd/tests/imagefilltoborder_error5.phpt
+++ b/ext/gd/tests/imagefilltoborder_error5.phpt
@@ -1,16 +1,16 @@
---TEST-- 
-Testing wrong param passing imagefilltoborder() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagefilltoborder() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if (!extension_loaded("gd")) die("skip GD not present"); 
-?> 
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) );
 // Try to fill border
 imagefilltoborder( $image, 50, 50, imagecolorallocate( $image, 0, 0, 0 ), 'wrong param' );
 
-?> 
+?>
 --EXPECTF--
 Warning: imagefilltoborder() expects parameter 5 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagefilltoborder_error6.phpt b/ext/gd/tests/imagefilltoborder_error6.phpt
index b5ce53b0d6c..03ac65be9cf 100644
--- a/ext/gd/tests/imagefilltoborder_error6.phpt
+++ b/ext/gd/tests/imagefilltoborder_error6.phpt
@@ -1,16 +1,16 @@
---TEST-- 
-Testing wrong param passing imagefilltoborder() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagefilltoborder() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if (!extension_loaded("gd")) die("skip GD not present"); 
-?> 
+--SKIPIF--
+<?php
+if (!extension_loaded("gd")) die("skip GD not present");
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -22,7 +22,7 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) );
 $image_foo = tmpfile();
 imagefilltoborder( $image_foo, 50, 50, imagecolorallocate( $image, 0, 0, 0 ), imagecolorallocate( $image, 255, 0, 0 ) );
 
-?> 
+?>
 --EXPECTF--
 Warning: imagefilltoborder(): supplied resource is not a valid Image resource in %s on line %d
 
diff --git a/ext/gd/tests/imagefilltoborder_error7.phpt b/ext/gd/tests/imagefilltoborder_error7.phpt
index f3313e11f42..944fe8e4d4f 100644
--- a/ext/gd/tests/imagefilltoborder_error7.phpt
+++ b/ext/gd/tests/imagefilltoborder_error7.phpt
@@ -1,16 +1,16 @@
---TEST-- 
-Testing wrong param passing imagefilltoborder() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagefilltoborder() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if ( ! extension_loaded("gd")) die("skip GD not present; skipping test"); 
-?> 
+--SKIPIF--
+<?php
+if ( ! extension_loaded("gd")) die("skip GD not present; skipping test");
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagefilledrectangle( $image, 0, 0, 100, 100, imagecolorallocate( $image, 255, 255, 255 ) );
@@ -21,6 +21,6 @@ imageellipse( $image, 50, 50, 50, 50, imagecolorallocate( $image, 0, 0, 0 ) );
 // Try to fill border
 imagefilltoborder( $image, 50, 50 );
 
-?> 
+?>
 --EXPECTF--
 Warning: imagefilltoborder() expects exactly 5 parameters, %d given in %s on line %d
diff --git a/ext/gd/tests/imagefilter.phpt b/ext/gd/tests/imagefilter.phpt
index 8b17fb80b1b..04a2395b8bd 100644
--- a/ext/gd/tests/imagefilter.phpt
+++ b/ext/gd/tests/imagefilter.phpt
@@ -21,7 +21,7 @@ $no_arg_filters = array(
 
 $SAVE_DIR = dirname(__FILE__);
 $SOURCE_IMG = $SAVE_DIR . "/test.png";
-	
+
 	foreach ($no_arg_filters as $filt) {
 		$im = imagecreatefrompng($SOURCE_IMG);
 		if (imagefilter($im, constant($filt))) {
@@ -34,7 +34,7 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
 	}
 
 	$im = imagecreatefrompng($SOURCE_IMG);
-	
+
 	if (imagefilter($im, IMG_FILTER_SMOOTH, -1924.124)) {
 		imagepng($im, $SAVE_DIR . "/IMG_FILTER_SMOOTH.png");
 		echo "IMG_FILTER_SMOOTH success\n";
@@ -42,9 +42,9 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
 	} else {
 		echo "IMG_FILTER_SMOOTH failed\n";
 	}
-	
+
 	$im = imagecreatefrompng($SOURCE_IMG);
-	
+
 	if (imagefilter($im, IMG_FILTER_COLORIZE, -127.12, -127.98, 127)) {
 		imagepng($im, $SAVE_DIR . "/IMG_FILTER_COLORIZE.png");
 		echo "IMG_FILTER_COLORIZE success\n";
@@ -52,9 +52,9 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
 	} else {
 		echo "IMG_FILTER_COLORIZE failed\n";
 	}
-	
+
 	$im = imagecreatefrompng($SOURCE_IMG);
-	
+
 	if (imagefilter($im, IMG_FILTER_CONTRAST, -90)) {
 		imagepng($im, $SAVE_DIR . "/IMG_FILTER_CONTRAST.png");
 		echo "IMG_FILTER_CONTRAST success\n";
@@ -64,7 +64,7 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
 	}
 
 	$im = imagecreatefrompng($SOURCE_IMG);
-	
+
 	if (imagefilter($im, IMG_FILTER_BRIGHTNESS, 98)) {
 		imagepng($im, $SAVE_DIR . "/IMG_FILTER_BRIGHTNESS.png");
 		echo "IMG_FILTER_BRIGHTNESS success\n";
@@ -74,7 +74,7 @@ $SOURCE_IMG = $SAVE_DIR . "/test.png";
 	}
 
 	$im = imagecreatefrompng($SOURCE_IMG);
-	
+
 	if (imagefilter($im, IMG_FILTER_PIXELATE, 5, true)) {
 		imagepng($im, $SAVE_DIR . "/IMG_FILTER_PIXELATE.png");
 		echo "IMG_FILTER_PIXELATE success\n";
diff --git a/ext/gd/tests/imagefilter_error1.phpt b/ext/gd/tests/imagefilter_error1.phpt
index fb96ae32b4b..41637994b46 100644
--- a/ext/gd/tests/imagefilter_error1.phpt
+++ b/ext/gd/tests/imagefilter_error1.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter passing in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error10.phpt b/ext/gd/tests/imagefilter_error10.phpt
index 8b412116298..0cea9aa3c1a 100644
--- a/ext/gd/tests/imagefilter_error10.phpt
+++ b/ext/gd/tests/imagefilter_error10.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of EMBOSS in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error11.phpt b/ext/gd/tests/imagefilter_error11.phpt
index 9b1cf4d92bb..2f162045b8a 100644
--- a/ext/gd/tests/imagefilter_error11.phpt
+++ b/ext/gd/tests/imagefilter_error11.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource passing of EDGEDETECT in imagefilter() of GD li
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error12.phpt b/ext/gd/tests/imagefilter_error12.phpt
index 33fee28e632..29664518a0a 100644
--- a/ext/gd/tests/imagefilter_error12.phpt
+++ b/ext/gd/tests/imagefilter_error12.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of COLORIZE in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error13.phpt b/ext/gd/tests/imagefilter_error13.phpt
index 687d148be5d..0f0be0ef963 100644
--- a/ext/gd/tests/imagefilter_error13.phpt
+++ b/ext/gd/tests/imagefilter_error13.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter value of COLORIZE in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error14.phpt b/ext/gd/tests/imagefilter_error14.phpt
index 50359a29d0f..f801b323e67 100644
--- a/ext/gd/tests/imagefilter_error14.phpt
+++ b/ext/gd/tests/imagefilter_error14.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter type of COLORIZE in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error15.phpt b/ext/gd/tests/imagefilter_error15.phpt
index 87a412e4cd6..9c76bf24abb 100644
--- a/ext/gd/tests/imagefilter_error15.phpt
+++ b/ext/gd/tests/imagefilter_error15.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of CONTRAST in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error16.phpt b/ext/gd/tests/imagefilter_error16.phpt
index c4ecc0b96af..a513ecd568a 100644
--- a/ext/gd/tests/imagefilter_error16.phpt
+++ b/ext/gd/tests/imagefilter_error16.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter type of CONTRAST in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error17.phpt b/ext/gd/tests/imagefilter_error17.phpt
index adafc3e5e85..9a3ba394398 100644
--- a/ext/gd/tests/imagefilter_error17.phpt
+++ b/ext/gd/tests/imagefilter_error17.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of GRAYSCALE in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error18.phpt b/ext/gd/tests/imagefilter_error18.phpt
index b636bfc07a5..d96d02426f2 100644
--- a/ext/gd/tests/imagefilter_error18.phpt
+++ b/ext/gd/tests/imagefilter_error18.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of NEGATE in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error19.phpt b/ext/gd/tests/imagefilter_error19.phpt
index a225d6391f3..bcff8df0740 100644
--- a/ext/gd/tests/imagefilter_error19.phpt
+++ b/ext/gd/tests/imagefilter_error19.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter type of BRIGHTNESS in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error2.phpt b/ext/gd/tests/imagefilter_error2.phpt
index a9fefd377ad..5e94b9cb93f 100644
--- a/ext/gd/tests/imagefilter_error2.phpt
+++ b/ext/gd/tests/imagefilter_error2.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter passing in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error20.phpt b/ext/gd/tests/imagefilter_error20.phpt
index f3db724acb8..f1a330dbed3 100644
--- a/ext/gd/tests/imagefilter_error20.phpt
+++ b/ext/gd/tests/imagefilter_error20.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of BRIGHTNESS in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error3.phpt b/ext/gd/tests/imagefilter_error3.phpt
index 413183d4bb7..9561d436cd4 100644
--- a/ext/gd/tests/imagefilter_error3.phpt
+++ b/ext/gd/tests/imagefilter_error3.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter passing of PIXELATE in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error4.phpt b/ext/gd/tests/imagefilter_error4.phpt
index babb37e0ac9..f60ce11b42a 100644
--- a/ext/gd/tests/imagefilter_error4.phpt
+++ b/ext/gd/tests/imagefilter_error4.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of PIXELATE in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error5.phpt b/ext/gd/tests/imagefilter_error5.phpt
index 6ed6ae66b85..7965271a541 100644
--- a/ext/gd/tests/imagefilter_error5.phpt
+++ b/ext/gd/tests/imagefilter_error5.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter passing of SMOOTH in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error6.phpt b/ext/gd/tests/imagefilter_error6.phpt
index 05dd187a2d4..1ace03cba33 100644
--- a/ext/gd/tests/imagefilter_error6.phpt
+++ b/ext/gd/tests/imagefilter_error6.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of SMOOTH in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error7.phpt b/ext/gd/tests/imagefilter_error7.phpt
index 6c08e5acf34..4e095801e81 100644
--- a/ext/gd/tests/imagefilter_error7.phpt
+++ b/ext/gd/tests/imagefilter_error7.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of MEAN_REMOVAL in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error8.phpt b/ext/gd/tests/imagefilter_error8.phpt
index 57c3168f7e9..5086e6421d4 100644
--- a/ext/gd/tests/imagefilter_error8.phpt
+++ b/ext/gd/tests/imagefilter_error8.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of SELECTIVE_BLUR in imagefilter() of GD librar
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilter_error9.phpt b/ext/gd/tests/imagefilter_error9.phpt
index a74ea643cf3..268a65f0f73 100644
--- a/ext/gd/tests/imagefilter_error9.phpt
+++ b/ext/gd/tests/imagefilter_error9.phpt
@@ -4,7 +4,7 @@ Testing wrong parameter resource of GAUSSIAN_BLUR in imagefilter() of GD library
 Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageflip.phpt b/ext/gd/tests/imageflip.phpt
index f4660940a2f..8a439075f24 100644
--- a/ext/gd/tests/imageflip.phpt
+++ b/ext/gd/tests/imageflip.phpt
@@ -1,13 +1,13 @@
---TEST-- 
-Testing imageflip() of GD library 
---SKIPIF-- 
-<?php  
-if ( ! extension_loaded('gd') || !function_exists('imageflip')) die( 'skip GD not present; skipping test' ); 
-?> 
+--TEST--
+Testing imageflip() of GD library
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') || !function_exists('imageflip')) die( 'skip GD not present; skipping test' );
+?>
 --FILE--
 <?php
 
-$im = imagecreatetruecolor( 99, 99 ); 
+$im = imagecreatetruecolor( 99, 99 );
 
 imagesetpixel($im, 0, 0, 0xFF);
 imagesetpixel($im, 0, 98, 0x00FF00);
@@ -22,8 +22,8 @@ var_dump(dechex(imagecolorat($im, 0, 0)));
 var_dump(dechex(imagecolorat($im, 0, 98)));
 var_dump(dechex(imagecolorat($im, 98, 0)));
 var_dump(dechex(imagecolorat($im, 98, 98)));
-?> 
---EXPECT-- 
+?>
+--EXPECT--
 string(2) "ff"
 string(4) "ff00"
 string(6) "ff0000"
diff --git a/ext/gd/tests/imagefontheight_basic.phpt b/ext/gd/tests/imagefontheight_basic.phpt
index bfcd0bb27ce..ddb47c7cbd9 100644
--- a/ext/gd/tests/imagefontheight_basic.phpt
+++ b/ext/gd/tests/imagefontheight_basic.phpt
@@ -4,7 +4,7 @@ Testing imagefontheight() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefontheight_error1.phpt b/ext/gd/tests/imagefontheight_error1.phpt
index 34aa4a89034..8a5b16e59a9 100644
--- a/ext/gd/tests/imagefontheight_error1.phpt
+++ b/ext/gd/tests/imagefontheight_error1.phpt
@@ -4,7 +4,7 @@ Testing error on string parameter for imagefontheight() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefontwidth_basic.phpt b/ext/gd/tests/imagefontwidth_basic.phpt
index 0a9df520959..2e3a5eb3caf 100644
--- a/ext/gd/tests/imagefontwidth_basic.phpt
+++ b/ext/gd/tests/imagefontwidth_basic.phpt
@@ -4,7 +4,7 @@ Testing imagefontwidth() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefontwidth_error1.phpt b/ext/gd/tests/imagefontwidth_error1.phpt
index c1a1463b9ba..cb8bbcf6141 100644
--- a/ext/gd/tests/imagefontwidth_error1.phpt
+++ b/ext/gd/tests/imagefontwidth_error1.phpt
@@ -4,7 +4,7 @@ Testing error on string parameter for imagefontwidth() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefttext.phpt b/ext/gd/tests/imagefttext.phpt
index 16e0495ef03..2a516cb6c54 100644
--- a/ext/gd/tests/imagefttext.phpt
+++ b/ext/gd/tests/imagefttext.phpt
@@ -1,7 +1,7 @@
 --TEST--
 imagefttext() function test
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded('gd')) {
 		die("skip gd extension not available.");
 	}
diff --git a/ext/gd/tests/imagegammacorrect_basic.phpt b/ext/gd/tests/imagegammacorrect_basic.phpt
index c315c4688e9..0e3203e9857 100644
--- a/ext/gd/tests/imagegammacorrect_basic.phpt
+++ b/ext/gd/tests/imagegammacorrect_basic.phpt
@@ -4,7 +4,7 @@ Testing imagegammacorrect() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
 		die("skip test requires GD 2.2.2 or higher");
diff --git a/ext/gd/tests/imagegammacorrect_error1.phpt b/ext/gd/tests/imagegammacorrect_error1.phpt
index fdcdec8bec2..ab60957579c 100644
--- a/ext/gd/tests/imagegammacorrect_error1.phpt
+++ b/ext/gd/tests/imagegammacorrect_error1.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Testing error with non-resource paramenter of imagegammacorrect() of GD library, 
+Testing error with non-resource paramenter of imagegammacorrect() of GD library,
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagegammacorrect_error2.phpt b/ext/gd/tests/imagegammacorrect_error2.phpt
index 604d7da7961..fd6d136ae8e 100644
--- a/ext/gd/tests/imagegammacorrect_error2.phpt
+++ b/ext/gd/tests/imagegammacorrect_error2.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Testing error with non-Image resource paramenter of imagegammacorrect() of GD library, 
+Testing error with non-Image resource paramenter of imagegammacorrect() of GD library,
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagegammacorrect_error3.phpt b/ext/gd/tests/imagegammacorrect_error3.phpt
index 6dcecbe04b1..8bb47ad2342 100644
--- a/ext/gd/tests/imagegammacorrect_error3.phpt
+++ b/ext/gd/tests/imagegammacorrect_error3.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Testing error with non-double first paramenter of imagegammacorrect() of GD library, 
+Testing error with non-double first paramenter of imagegammacorrect() of GD library,
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagegammacorrect_error4.phpt b/ext/gd/tests/imagegammacorrect_error4.phpt
index e7ff6b4528e..d2546fd41c5 100644
--- a/ext/gd/tests/imagegammacorrect_error4.phpt
+++ b/ext/gd/tests/imagegammacorrect_error4.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Testing error with non-double second paramenter of imagegammacorrect() of GD library, 
+Testing error with non-double second paramenter of imagegammacorrect() of GD library,
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagegammacorrect_variation1.phpt b/ext/gd/tests/imagegammacorrect_variation1.phpt
index 73327c1eff9..8cc978a6fff 100644
--- a/ext/gd/tests/imagegammacorrect_variation1.phpt
+++ b/ext/gd/tests/imagegammacorrect_variation1.phpt
@@ -4,7 +4,7 @@ Testing imagegammacorrect() of GD library with non TrueColor image
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
 		die("skip test requires GD 2.2.2 or higher");
diff --git a/ext/gd/tests/imagegammacorrect_variation2.phpt b/ext/gd/tests/imagegammacorrect_variation2.phpt
index d314df6c4c9..6a66147ce93 100644
--- a/ext/gd/tests/imagegammacorrect_variation2.phpt
+++ b/ext/gd/tests/imagegammacorrect_variation2.phpt
@@ -26,9 +26,9 @@ function test_gamma($in, $out, $constructor)
             draw_cell($im, $i, $j);
         }
     }
-    
+
     imagegammacorrect($im, $in, $out);
-    
+
     $filename = __DIR__ . DIRECTORY_SEPARATOR
         . "imagegammacorrect_variation2_{$in}_{$out}.png";
     $kind = $constructor === 'imagecreate' ? 'palette' : 'truecolor';
diff --git a/ext/gd/tests/imageinterlace_basic.phpt b/ext/gd/tests/imageinterlace_basic.phpt
index 657b256d678..62d99bcf91e 100644
--- a/ext/gd/tests/imageinterlace_basic.phpt
+++ b/ext/gd/tests/imageinterlace_basic.phpt
@@ -4,7 +4,7 @@ Testing imageinterlace() of GD library
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageinterlace_error1.phpt b/ext/gd/tests/imageinterlace_error1.phpt
index 5c871e7bba2..2dd438a5e70 100644
--- a/ext/gd/tests/imageinterlace_error1.phpt
+++ b/ext/gd/tests/imageinterlace_error1.phpt
@@ -4,7 +4,7 @@ Testing passing no parameters to imageinterlace() of GD library
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageinterlace_error2.phpt b/ext/gd/tests/imageinterlace_error2.phpt
index 808c88a3123..e20f3ae9012 100644
--- a/ext/gd/tests/imageinterlace_error2.phpt
+++ b/ext/gd/tests/imageinterlace_error2.phpt
@@ -4,7 +4,7 @@ Testing resource that is not a image to imageinterlace() of GD library
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageinterlace_variation1.phpt b/ext/gd/tests/imageinterlace_variation1.phpt
index 2c224ef41f5..d8eb7972fa1 100644
--- a/ext/gd/tests/imageinterlace_variation1.phpt
+++ b/ext/gd/tests/imageinterlace_variation1.phpt
@@ -4,7 +4,7 @@ Testing setting the interlace bit on with imageinterlace() of GD library
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageinterlace_variation2.phpt b/ext/gd/tests/imageinterlace_variation2.phpt
index b4735dcfb9f..f1ee51502df 100644
--- a/ext/gd/tests/imageinterlace_variation2.phpt
+++ b/ext/gd/tests/imageinterlace_variation2.phpt
@@ -4,7 +4,7 @@ Testing setting the interlace bit off with imageinterlace() of GD library
 Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageistruecolor_basic.phpt b/ext/gd/tests/imageistruecolor_basic.phpt
index a78aaa46ef9..d43052db7dd 100644
--- a/ext/gd/tests/imageistruecolor_basic.phpt
+++ b/ext/gd/tests/imageistruecolor_basic.phpt
@@ -3,7 +3,7 @@ Testing imageistruecolor() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
diff --git a/ext/gd/tests/imageistruecolor_error1.phpt b/ext/gd/tests/imageistruecolor_error1.phpt
index 06453b7d317..8b3033c39b8 100644
--- a/ext/gd/tests/imageistruecolor_error1.phpt
+++ b/ext/gd/tests/imageistruecolor_error1.phpt
@@ -3,7 +3,7 @@ Testing imageistruecolor(): wrong parameters
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
diff --git a/ext/gd/tests/imagelayereffect_basic.phpt b/ext/gd/tests/imagelayereffect_basic.phpt
index 2c948fd0c51..5a9c3807582 100644
--- a/ext/gd/tests/imagelayereffect_basic.phpt
+++ b/ext/gd/tests/imagelayereffect_basic.phpt
@@ -4,7 +4,7 @@ Testing imagelayereffect() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
 ?>
diff --git a/ext/gd/tests/imagelayereffect_error1.phpt b/ext/gd/tests/imagelayereffect_error1.phpt
index 21f37a8a1e4..1265b84ad11 100644
--- a/ext/gd/tests/imagelayereffect_error1.phpt
+++ b/ext/gd/tests/imagelayereffect_error1.phpt
@@ -4,7 +4,7 @@ Testing imagelayereffect() with invalid resource of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
 ?>
diff --git a/ext/gd/tests/imagelayereffect_error2.phpt b/ext/gd/tests/imagelayereffect_error2.phpt
index bd1d5aaf1f3..65ab020a15f 100644
--- a/ext/gd/tests/imagelayereffect_error2.phpt
+++ b/ext/gd/tests/imagelayereffect_error2.phpt
@@ -4,7 +4,7 @@ Testing imagelayereffect() wth invalid effect of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
 ?>
diff --git a/ext/gd/tests/imagelayereffect_error3.phpt b/ext/gd/tests/imagelayereffect_error3.phpt
index d4deff1076c..63d1e0e9519 100644
--- a/ext/gd/tests/imagelayereffect_error3.phpt
+++ b/ext/gd/tests/imagelayereffect_error3.phpt
@@ -4,7 +4,7 @@ Testing imagelayereffect() with invalid resource of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
 ?>
diff --git a/ext/gd/tests/imageloadfont_error2.phpt b/ext/gd/tests/imageloadfont_error2.phpt
index 459cb71f5f5..262009f2cf8 100644
--- a/ext/gd/tests/imageloadfont_error2.phpt
+++ b/ext/gd/tests/imageloadfont_error2.phpt
@@ -3,7 +3,7 @@ Testing that imageloadfont() breaks on invalid file passed as first argument
 --CREDITS--
 Austin Drouare <austin.drouare [at] gmail [dot] com> #testfest #tek11
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imageloadfont_invalid.phpt b/ext/gd/tests/imageloadfont_invalid.phpt
index 6cf0e336b69..85f721edb01 100644
--- a/ext/gd/tests/imageloadfont_invalid.phpt
+++ b/ext/gd/tests/imageloadfont_invalid.phpt
@@ -1,8 +1,8 @@
 --TEST--
 imageloadfont() function crashes
 --SKIPIF--
-<?php 
-	if (!extension_loaded('gd')) die("skip gd extension not available\n"); 
+<?php
+	if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagepolygon_basic.phpt b/ext/gd/tests/imagepolygon_basic.phpt
index 5c79cdf5be3..21186e9ecc2 100644
--- a/ext/gd/tests/imagepolygon_basic.phpt
+++ b/ext/gd/tests/imagepolygon_basic.phpt
@@ -1,8 +1,8 @@
 --TEST--
 imageploygon()
 --SKIPIF--
-<?php 
-	if (!function_exists('imagepolygon')) die('skip imagepolygon() not available'); 
+<?php
+	if (!function_exists('imagepolygon')) die('skip imagepolygon() not available');
 	require_once('skipif_imagetype.inc');
 ?>
 --FILE--
@@ -11,7 +11,7 @@ imageploygon()
 /* Prototype  : bool imagepolygon  ( resource $image  , array $points  , int $num_points  , int $color  )
  * Description: Draws a polygon.
  * Source code: ext/standard/image.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
@@ -22,7 +22,7 @@ $dest = dirname(realpath(__FILE__)) . '/imagepolygon.png';
 // create a blank image
 $image = imagecreatetruecolor(400, 300);
 
-// set the background color to black 
+// set the background color to black
 $bg = imagecolorallocate($image, 0, 0, 0);
 
 // draw a red polygon
@@ -45,16 +45,16 @@ $col2 = imagecolorat($image, 100, 100);
 $color1 = imagecolorsforindex($image, $col1);
 $color2 = imagecolorsforindex($image, $col2);
 var_dump($color1, $color2);
- 
+
 imagedestroy($image);
 
-echo "Done\n"; 
+echo "Done\n";
 ?>
 --CLEAN--
 <?php
 	$dest = dirname(realpath(__FILE__)) . '/imagepolygon.png';
 	@unlink($dest);
-?>	
+?>
 --EXPECT--
 Simple test of imagepolygon() function
 array(4) {
diff --git a/ext/gd/tests/imagepolygon_negative.phpt b/ext/gd/tests/imagepolygon_negative.phpt
index bb9010c92fa..d122a3bbaa7 100644
--- a/ext/gd/tests/imagepolygon_negative.phpt
+++ b/ext/gd/tests/imagepolygon_negative.phpt
@@ -1,8 +1,8 @@
 --TEST--
 imagepolygon() with a negative num of points
 --SKIPIF--
-<?php 
-	if (!function_exists('imagepolygon')) die('skip imagepolygon() not available'); 
+<?php
+	if (!function_exists('imagepolygon')) die('skip imagepolygon() not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagerectangle_basic.phpt b/ext/gd/tests/imagerectangle_basic.phpt
index d23cbdfe79b..462ff583375 100644
--- a/ext/gd/tests/imagerectangle_basic.phpt
+++ b/ext/gd/tests/imagerectangle_basic.phpt
@@ -1,22 +1,22 @@
---TEST-- 
-Testing imagerectangle() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing imagerectangle() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); 
-?> 
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagerectangle( $image, 0, 0, 50, 50, imagecolorallocate($image, 255, 255, 255) );
 
 include_once __DIR__ . '/func.inc';
 test_image_equals_file(__DIR__ . '/imagerectangle_basic.png', $image);
-?> 
---EXPECT-- 
+?>
+--EXPECT--
 The images are equal.
diff --git a/ext/gd/tests/imagerectangle_error1.phpt b/ext/gd/tests/imagerectangle_error1.phpt
index 3b9e8d3f0ce..1dd04dab493 100644
--- a/ext/gd/tests/imagerectangle_error1.phpt
+++ b/ext/gd/tests/imagerectangle_error1.phpt
@@ -1,19 +1,19 @@
---TEST-- 
-Testing wrong param passing imagerectangle() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagerectangle() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); 
-?> 
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagerectangle( 'wrong param', 0, 0, 50, 50, imagecolorallocate($image, 255, 255, 255) );
-?> 
+?>
 --EXPECTF--
 Warning: imagerectangle() expects parameter 1 to be resource, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error2.phpt b/ext/gd/tests/imagerectangle_error2.phpt
index 63525d2cb78..dd84ff414ad 100644
--- a/ext/gd/tests/imagerectangle_error2.phpt
+++ b/ext/gd/tests/imagerectangle_error2.phpt
@@ -1,19 +1,19 @@
---TEST-- 
-Testing wrong param passing imagerectangle() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagerectangle() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); 
-?> 
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
 --FILE--
 <?php
-// Create a resource 
-$image = tmpfile(); 
+// Create a resource
+$image = tmpfile();
 
 // Draw a rectangle
 imagerectangle( $image, 0, 0, 50, 50, 2 );
-?> 
---EXPECTF-- 
+?>
+--EXPECTF--
 Warning: imagerectangle(): supplied resource is not a valid Image resource in %s on line %d
\ No newline at end of file
diff --git a/ext/gd/tests/imagerectangle_error3.phpt b/ext/gd/tests/imagerectangle_error3.phpt
index 350ee1bf826..fc6792902cb 100644
--- a/ext/gd/tests/imagerectangle_error3.phpt
+++ b/ext/gd/tests/imagerectangle_error3.phpt
@@ -1,19 +1,19 @@
---TEST-- 
-Testing wrong param passing imagerectangle() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagerectangle() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); 
-?> 
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagerectangle( $image, 'wrong param', 0, 50, 50, imagecolorallocate($image, 255, 255, 255) );
-?> 
+?>
 --EXPECTF--
 Warning: imagerectangle() expects parameter 2 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error4.phpt b/ext/gd/tests/imagerectangle_error4.phpt
index 4c448dc0272..dd618cfd13c 100644
--- a/ext/gd/tests/imagerectangle_error4.phpt
+++ b/ext/gd/tests/imagerectangle_error4.phpt
@@ -1,19 +1,19 @@
---TEST-- 
-Testing wrong param passing imagerectangle() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagerectangle() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); 
-?> 
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagerectangle( $image, 0, 'wrong param', 50, 50, imagecolorallocate($image, 255, 255, 255) );
-?> 
+?>
 --EXPECTF--
 Warning: imagerectangle() expects parameter 3 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error5.phpt b/ext/gd/tests/imagerectangle_error5.phpt
index fa9486e3de9..af96f0aab43 100644
--- a/ext/gd/tests/imagerectangle_error5.phpt
+++ b/ext/gd/tests/imagerectangle_error5.phpt
@@ -1,19 +1,19 @@
---TEST-- 
-Testing wrong param passing imagerectangle() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagerectangle() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); 
-?> 
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagerectangle( $image, 0, 0, 'wrong param', 50, imagecolorallocate($image, 255, 255, 255) );
-?> 
+?>
 --EXPECTF--
 Warning: imagerectangle() expects parameter 4 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error6.phpt b/ext/gd/tests/imagerectangle_error6.phpt
index 1523a9ec575..2c843ffdd88 100644
--- a/ext/gd/tests/imagerectangle_error6.phpt
+++ b/ext/gd/tests/imagerectangle_error6.phpt
@@ -1,19 +1,19 @@
---TEST-- 
-Testing wrong param passing imagerectangle() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagerectangle() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); 
-?> 
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagerectangle( $image, 0, 0, 50, 'wrong param', imagecolorallocate($image, 255, 255, 255) );
-?> 
+?>
 --EXPECTF--
 Warning: imagerectangle() expects parameter 5 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error7.phpt b/ext/gd/tests/imagerectangle_error7.phpt
index ee6326feffb..7273df910a1 100644
--- a/ext/gd/tests/imagerectangle_error7.phpt
+++ b/ext/gd/tests/imagerectangle_error7.phpt
@@ -1,19 +1,19 @@
---TEST-- 
-Testing wrong param passing imagerectangle() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagerectangle() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); 
-?> 
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagerectangle( $image, 0, 0, 50, 50, 'wrong param' );
-?> 
+?>
 --EXPECTF--
 Warning: imagerectangle() expects parameter 6 to be integer, %s given in %s on line %d
diff --git a/ext/gd/tests/imagerectangle_error8.phpt b/ext/gd/tests/imagerectangle_error8.phpt
index cb0746e4923..47b4a021760 100644
--- a/ext/gd/tests/imagerectangle_error8.phpt
+++ b/ext/gd/tests/imagerectangle_error8.phpt
@@ -1,19 +1,19 @@
---TEST-- 
-Testing wrong param passing imagerectangle() of GD library 
---CREDITS-- 
-Ivan Rosolen <contato [at] ivanrosolen [dot] com> 
+--TEST--
+Testing wrong param passing imagerectangle() of GD library
+--CREDITS--
+Ivan Rosolen <contato [at] ivanrosolen [dot] com>
 #testfest PHPSP on 2009-06-30
---SKIPIF-- 
-<?php  
-if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' ); 
-?> 
+--SKIPIF--
+<?php
+if ( ! extension_loaded('gd') ) die( 'skip GD not present; skipping test' );
+?>
 --FILE--
 <?php
-// Create a image 
-$image = imagecreatetruecolor( 100, 100 ); 
+// Create a image
+$image = imagecreatetruecolor( 100, 100 );
 
 // Draw a rectangle
 imagerectangle( $image, 0, 0, 50, 50 );
-?> 
+?>
 --EXPECTF--
 Warning: imagerectangle() expects exactly 6 parameters, %d given in %s on line %d
diff --git a/ext/gd/tests/imagesetbrush_basic.phpt b/ext/gd/tests/imagesetbrush_basic.phpt
index e1a9c6a80c8..0afe6fc1d01 100644
--- a/ext/gd/tests/imagesetbrush_basic.phpt
+++ b/ext/gd/tests/imagesetbrush_basic.phpt
@@ -13,16 +13,16 @@ if (!extension_loaded('gd')) {
 <?php
 // Create the brush image
 $img = imagecreate(10, 10);
- 
+
 // Create the main image, 100x100
 $mainimg = imagecreatetruecolor(100, 100);
-  
+
 $white = imagecolorallocate($img, 255, 0, 0);
 imagefilledrectangle($img, 0, 0, 299, 99, $white);
 
 // Set the brush
 imagesetbrush($mainimg, $img);
-   
+
 // Draw a couple of brushes, each overlaying each
 imageline($mainimg, 50, 50, 50, 60, IMG_COLOR_BRUSHED);
 
diff --git a/ext/gd/tests/imagesetthickness_basic.phpt b/ext/gd/tests/imagesetthickness_basic.phpt
index 3c91a886df0..376d18f790b 100644
--- a/ext/gd/tests/imagesetthickness_basic.phpt
+++ b/ext/gd/tests/imagesetthickness_basic.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
diff --git a/ext/gd/tests/imagesetthickness_error1.phpt b/ext/gd/tests/imagesetthickness_error1.phpt
index 0aed3a1f2fe..112f9df8637 100644
--- a/ext/gd/tests/imagesetthickness_error1.phpt
+++ b/ext/gd/tests/imagesetthickness_error1.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong types for first parameter
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagesetthickness_error2.phpt b/ext/gd/tests/imagesetthickness_error2.phpt
index 263e18bcc3c..01050bce09d 100644
--- a/ext/gd/tests/imagesetthickness_error2.phpt
+++ b/ext/gd/tests/imagesetthickness_error2.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong types for second parameter
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
diff --git a/ext/gd/tests/imagestring_basic.phpt b/ext/gd/tests/imagestring_basic.phpt
index 311683f7af8..1265fed6e60 100644
--- a/ext/gd/tests/imagestring_basic.phpt
+++ b/ext/gd/tests/imagestring_basic.phpt
@@ -4,7 +4,7 @@ Testing imagestring() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestring_error1.phpt b/ext/gd/tests/imagestring_error1.phpt
index b31f74ebfa3..96055bd9df0 100644
--- a/ext/gd/tests/imagestring_error1.phpt
+++ b/ext/gd/tests/imagestring_error1.phpt
@@ -4,7 +4,7 @@ Testing error on non-resource parameter 1 of imagestring() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestring_error2.phpt b/ext/gd/tests/imagestring_error2.phpt
index d6146f70890..e4b22651c6f 100644
--- a/ext/gd/tests/imagestring_error2.phpt
+++ b/ext/gd/tests/imagestring_error2.phpt
@@ -4,7 +4,7 @@ Testing error on non-image resource parameter 1 of imagestring() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestring_error3.phpt b/ext/gd/tests/imagestring_error3.phpt
index 464e46e8d20..b626e300faa 100644
--- a/ext/gd/tests/imagestring_error3.phpt
+++ b/ext/gd/tests/imagestring_error3.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 2 of imagestring() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestring_error4.phpt b/ext/gd/tests/imagestring_error4.phpt
index f782b7bda42..6af69a62cd7 100644
--- a/ext/gd/tests/imagestring_error4.phpt
+++ b/ext/gd/tests/imagestring_error4.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 3 of imagestring() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestring_error5.phpt b/ext/gd/tests/imagestring_error5.phpt
index d7743147972..a8e2c7820fd 100644
--- a/ext/gd/tests/imagestring_error5.phpt
+++ b/ext/gd/tests/imagestring_error5.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 4 of imagestring() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestring_error6.phpt b/ext/gd/tests/imagestring_error6.phpt
index 29bc79d4f61..9306e5bf15a 100644
--- a/ext/gd/tests/imagestring_error6.phpt
+++ b/ext/gd/tests/imagestring_error6.phpt
@@ -4,7 +4,7 @@ Testing error on non-string parameter 5 of imagestring() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestring_error7.phpt b/ext/gd/tests/imagestring_error7.phpt
index 2f44682a930..59e06229b92 100644
--- a/ext/gd/tests/imagestring_error7.phpt
+++ b/ext/gd/tests/imagestring_error7.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 6 of imagestring() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestringup_basic.phpt b/ext/gd/tests/imagestringup_basic.phpt
index 015d375eded..4a53da464ff 100644
--- a/ext/gd/tests/imagestringup_basic.phpt
+++ b/ext/gd/tests/imagestringup_basic.phpt
@@ -4,7 +4,7 @@ Testing imagestringup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestringup_error1.phpt b/ext/gd/tests/imagestringup_error1.phpt
index 14477273ba7..12f802139be 100644
--- a/ext/gd/tests/imagestringup_error1.phpt
+++ b/ext/gd/tests/imagestringup_error1.phpt
@@ -4,7 +4,7 @@ Testing error on non-resource parameter 1 of imagestringup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestringup_error2.phpt b/ext/gd/tests/imagestringup_error2.phpt
index d1d5aa26ac4..871dd54fdec 100644
--- a/ext/gd/tests/imagestringup_error2.phpt
+++ b/ext/gd/tests/imagestringup_error2.phpt
@@ -4,7 +4,7 @@ Testing error on non-image resource parameter 1 of imagestringup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestringup_error3.phpt b/ext/gd/tests/imagestringup_error3.phpt
index e4cfe98c75f..c433d809a77 100644
--- a/ext/gd/tests/imagestringup_error3.phpt
+++ b/ext/gd/tests/imagestringup_error3.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 2 of imagestringup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestringup_error4.phpt b/ext/gd/tests/imagestringup_error4.phpt
index 0b525cea261..28fb103bdee 100644
--- a/ext/gd/tests/imagestringup_error4.phpt
+++ b/ext/gd/tests/imagestringup_error4.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 3 of imagestringup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestringup_error5.phpt b/ext/gd/tests/imagestringup_error5.phpt
index d7743147972..a8e2c7820fd 100644
--- a/ext/gd/tests/imagestringup_error5.phpt
+++ b/ext/gd/tests/imagestringup_error5.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 4 of imagestring() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestringup_error6.phpt b/ext/gd/tests/imagestringup_error6.phpt
index ac6fe4a88a8..8683c0b5b00 100644
--- a/ext/gd/tests/imagestringup_error6.phpt
+++ b/ext/gd/tests/imagestringup_error6.phpt
@@ -4,7 +4,7 @@ Testing error on non-string parameter 5 of imagestringup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagestringup_error7.phpt b/ext/gd/tests/imagestringup_error7.phpt
index 46099365673..62590a9dc2e 100644
--- a/ext/gd/tests/imagestringup_error7.phpt
+++ b/ext/gd/tests/imagestringup_error7.phpt
@@ -4,7 +4,7 @@ Testing error on non-long parameter 6 of imagestringup() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagetruecolortopalette_basic.phpt b/ext/gd/tests/imagetruecolortopalette_basic.phpt
index 9bc922a15b8..18aa04a35d9 100644
--- a/ext/gd/tests/imagetruecolortopalette_basic.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_basic.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette() of GD library
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
 		die("skip test requires GD 2.2.2 or higher");
diff --git a/ext/gd/tests/imagetruecolortopalette_error1.phpt b/ext/gd/tests/imagetruecolortopalette_error1.phpt
index ecafa158b6b..2c3dd0d4297 100644
--- a/ext/gd/tests/imagetruecolortopalette_error1.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error1.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong parameters for parameter 1
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
diff --git a/ext/gd/tests/imagetruecolortopalette_error2.phpt b/ext/gd/tests/imagetruecolortopalette_error2.phpt
index cb7004caa86..afc9c3b0583 100644
--- a/ext/gd/tests/imagetruecolortopalette_error2.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error2.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong parameters for parameter 2
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
diff --git a/ext/gd/tests/imagetruecolortopalette_error3.phpt b/ext/gd/tests/imagetruecolortopalette_error3.phpt
index 46e3f487e0b..4e1b41ee987 100644
--- a/ext/gd/tests/imagetruecolortopalette_error3.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error3.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): wrong parameters for parameter 3
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
diff --git a/ext/gd/tests/imagetruecolortopalette_error4.phpt b/ext/gd/tests/imagetruecolortopalette_error4.phpt
index f0e18b86be1..2db042e89f3 100644
--- a/ext/gd/tests/imagetruecolortopalette_error4.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error4.phpt
@@ -3,7 +3,7 @@ Testing imagetruecolortopalette(): out of range parameter 3
 --CREDITS--
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gd")) die("skip GD not present");
 	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
diff --git a/ext/gd/tests/jpeg2wbmp_error1.phpt b/ext/gd/tests/jpeg2wbmp_error1.phpt
index 2368e7549f0..fcdef0bcb1f 100644
--- a/ext/gd/tests/jpeg2wbmp_error1.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error1.phpt
@@ -4,7 +4,7 @@ Test jpeg2wbmp() function : wrong threshold value param
 Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('gd')) {
     die('skip gd extension is not loaded');
 }
diff --git a/ext/gd/tests/jpeg2wbmp_error2-mb.phpt b/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
index b414cb35aae..4eeac126a4b 100644
--- a/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error2-mb.phpt
@@ -4,7 +4,7 @@ Test jpeg2wbmp() function : wrong origin filename param
 Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('gd')) {
     die('skip gd extension is not loaded');
 }
diff --git a/ext/gd/tests/jpeg2wbmp_error2.phpt b/ext/gd/tests/jpeg2wbmp_error2.phpt
index 22e2301d993..405eb831291 100644
--- a/ext/gd/tests/jpeg2wbmp_error2.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error2.phpt
@@ -4,7 +4,7 @@ Test jpeg2wbmp() function : wrong origin filename param
 Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('gd')) {
     die('skip gd extension is not loaded');
 }
diff --git a/ext/gd/tests/jpeg2wbmp_error3.phpt b/ext/gd/tests/jpeg2wbmp_error3.phpt
index e15c94765f2..2662b7a86b3 100644
--- a/ext/gd/tests/jpeg2wbmp_error3.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error3.phpt
@@ -4,7 +4,7 @@ Test jpeg2wbmp() function : wrong destination filename param
 Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('gd')) {
     die('skip gd extension is not loaded');
 }
diff --git a/ext/gd/tests/png2wbmp_error1-mb.phpt b/ext/gd/tests/png2wbmp_error1-mb.phpt
index a16e1a67c66..8c779d36d99 100644
--- a/ext/gd/tests/png2wbmp_error1-mb.phpt
+++ b/ext/gd/tests/png2wbmp_error1-mb.phpt
@@ -4,7 +4,7 @@ Test png2wbmp() function : wrong threshold value param
 Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('gd')) {
     die('skip gd extension is not loaded');
 }
diff --git a/ext/gd/tests/png2wbmp_error1.phpt b/ext/gd/tests/png2wbmp_error1.phpt
index e3496a45c93..543013b4bc1 100644
--- a/ext/gd/tests/png2wbmp_error1.phpt
+++ b/ext/gd/tests/png2wbmp_error1.phpt
@@ -4,7 +4,7 @@ Test png2wbmp() function : wrong threshold value param
 Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('gd')) {
     die('skip gd extension is not loaded');
 }
diff --git a/ext/gd/tests/png2wbmp_error2.phpt b/ext/gd/tests/png2wbmp_error2.phpt
index 71912b61983..a674e0d6ccd 100644
--- a/ext/gd/tests/png2wbmp_error2.phpt
+++ b/ext/gd/tests/png2wbmp_error2.phpt
@@ -4,7 +4,7 @@ Test png2wbmp() function : wrong origin filename param
 Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('gd')) {
     die('skip gd extension is not loaded');
 }
diff --git a/ext/gd/tests/png2wbmp_error3.phpt b/ext/gd/tests/png2wbmp_error3.phpt
index 53ffb543197..3cab3ccb982 100644
--- a/ext/gd/tests/png2wbmp_error3.phpt
+++ b/ext/gd/tests/png2wbmp_error3.phpt
@@ -4,7 +4,7 @@ Test png2wbmp() function : wrong destination filename param
 Levi Fukumori <levi [at] fukumori [dot] com [dot] br>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
-<?php 
+<?php
 if(!extension_loaded('gd')) {
     die('skip gd extension is not loaded');
 }
diff --git a/ext/gd/tests/xbm2png.phpt b/ext/gd/tests/xbm2png.phpt
index 6edebc0b8d5..7eaabc410b1 100644
--- a/ext/gd/tests/xbm2png.phpt
+++ b/ext/gd/tests/xbm2png.phpt
@@ -1,7 +1,7 @@
 --TEST--
 xbm --> png conversion test
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded('gd')) {
 		die("skip gd extension not available.");
 	}
@@ -19,7 +19,7 @@ xbm --> png conversion test
 	echo "XBM to PNG conversion: ";
 	echo imagepng(imagecreatefromxbm($cwd . "/conv_test.xbm"), $cwd . "/test_xbm.png") ? 'ok' : 'failed';
 	echo "\n";
-	
+
 	@unlink($cwd . "/test_xbm.png");
 ?>
 --EXPECT--
diff --git a/ext/gettext/tests/dcngettext.phpt b/ext/gettext/tests/dcngettext.phpt
index 2b8e2b196d6..4bf493507b9 100644
--- a/ext/gettext/tests/dcngettext.phpt
+++ b/ext/gettext/tests/dcngettext.phpt
@@ -1,8 +1,8 @@
 --TEST--
 dcngettext() tests
 --SKIPIF--
-<?php 
-if (!extension_loaded("gettext")) die("skip"); 
+<?php
+if (!extension_loaded("gettext")) die("skip");
 if (!function_exists("dcngettext")) die("skip dcngettext() doesn't exist");
 ?>
 --FILE--
@@ -18,7 +18,7 @@ var_dump(dcngettext("","","",0,0));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: dcngettext() expects exactly 5 parameters, 4 given in %s on line %d
 bool(false)
 string(1) "1"
diff --git a/ext/gettext/tests/gettext_basic-enus.phpt b/ext/gettext/tests/gettext_basic-enus.phpt
index 4691d77f83f..207739b3f8d 100644
--- a/ext/gettext/tests/gettext_basic-enus.phpt
+++ b/ext/gettext/tests/gettext_basic-enus.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Gettext basic test with en_US locale that should be on nearly every system
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gettext")) {
 		die("skip\n");
 	}
@@ -10,7 +10,7 @@ Gettext basic test with en_US locale that should be on nearly every system
 	}
 ?>
 --FILE--
-<?php 
+<?php
 
 chdir(dirname(__FILE__));
 setlocale(LC_ALL, 'en_US.UTF-8');
diff --git a/ext/gettext/tests/gettext_basic.phpt b/ext/gettext/tests/gettext_basic.phpt
index 441ca57a834..188c5e403ba 100644
--- a/ext/gettext/tests/gettext_basic.phpt
+++ b/ext/gettext/tests/gettext_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Gettext basic test
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gettext")) {
 		die("skip\n");
 	}
diff --git a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
index 2c8e5612fe5..2b321cb95b8 100644
--- a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
+++ b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
@@ -1,9 +1,9 @@
 --TEST--
-test if bind_textdomain_codeset() returns correct value 
+test if bind_textdomain_codeset() returns correct value
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gettext")) {
-		die("skip"); 
+		die("skip");
 	}
 ?>
 --FILE--
@@ -13,7 +13,7 @@ test if bind_textdomain_codeset() returns correct value
 
 	echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(false)
 string(5) "UTF-8"
 Done
diff --git a/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt b/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt
index eb50c5d6e58..0361f45e918 100644
--- a/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_bind_textdomain_codeset-wrongparams.phpt
@@ -1,9 +1,9 @@
 --TEST--
 test if bind_textdomain_codeset() fails on wrong param count
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gettext")) {
-		die("skip"); 
+		die("skip");
 	}
 ?>
 --FILE--
@@ -13,7 +13,7 @@ test if bind_textdomain_codeset() fails on wrong param count
 
 	echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: bind_textdomain_codeset() expects exactly 2 parameters, 1 given in %s on line %d
 
 Warning: bind_textdomain_codeset() expects exactly 2 parameters, 3 given in %s on line %d
diff --git a/ext/gettext/tests/gettext_dgettext_error_wrongparams.phpt b/ext/gettext/tests/gettext_dgettext_error_wrongparams.phpt
index 783935826c8..b28072b7ea9 100644
--- a/ext/gettext/tests/gettext_dgettext_error_wrongparams.phpt
+++ b/ext/gettext/tests/gettext_dgettext_error_wrongparams.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check how dgettext() with wrong parameter types and wrong parameter cou types and wrong parameter count behaves.
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gettext")) {
 		die("skip extension gettext not loaded\n");
 	}
@@ -11,7 +11,7 @@ Check how dgettext() with wrong parameter types and wrong parameter cou types an
 
 ?>
 --FILE--
-<?php 
+<?php
     chdir(dirname(__FILE__));
     setlocale(LC_ALL, 'en_US.UTF-8');
     dgettext ('foo');
diff --git a/ext/gettext/tests/gettext_gettext_error_wrongparams.phpt b/ext/gettext/tests/gettext_gettext_error_wrongparams.phpt
index a90109053c5..418cdff5e29 100644
--- a/ext/gettext/tests/gettext_gettext_error_wrongparams.phpt
+++ b/ext/gettext/tests/gettext_gettext_error_wrongparams.phpt
@@ -1,13 +1,13 @@
 --TEST--
 Check how gettext() with wrong parameters behaves.
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gettext")) {
 		die("skip extension gettext not loaded\n");
 	}
 ?>
 --FILE--
-<?php 
+<?php
 gettext (array());
 ?>
 --EXPECTF--
diff --git a/ext/gettext/tests/gettext_ngettext-wrongparams.phpt b/ext/gettext/tests/gettext_ngettext-wrongparams.phpt
index f73e1330267..5deecffa964 100644
--- a/ext/gettext/tests/gettext_ngettext-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_ngettext-wrongparams.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check how ngettext() with wrong parameters behaves.
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gettext")) {
 		die("SKIP extension gettext not loaded\n");
 	}
diff --git a/ext/gettext/tests/gettext_ngettext.phpt b/ext/gettext/tests/gettext_ngettext.phpt
index d0f13020a10..1f65618389e 100644
--- a/ext/gettext/tests/gettext_ngettext.phpt
+++ b/ext/gettext/tests/gettext_ngettext.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ngettext() functionality
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gettext")) {
 		die("SKIP extension gettext not loaded\n");
 	}
diff --git a/ext/gettext/tests/gettext_phpinfo.phpt b/ext/gettext/tests/gettext_phpinfo.phpt
index 6a38943d10b..a2bc332ea2a 100644
--- a/ext/gettext/tests/gettext_phpinfo.phpt
+++ b/ext/gettext/tests/gettext_phpinfo.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test phpinfo() displays gettext support 
+Test phpinfo() displays gettext support
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gettext")) {
 		die("SKIP extension gettext not loaded\n");
 	}
diff --git a/ext/gettext/tests/gettext_textdomain-retval.phpt b/ext/gettext/tests/gettext_textdomain-retval.phpt
index 3e82f6711ad..35f23b0d53c 100644
--- a/ext/gettext/tests/gettext_textdomain-retval.phpt
+++ b/ext/gettext/tests/gettext_textdomain-retval.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check if textdomain() returns the new domain
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gettext")) {
 		die("skip\n");
 	}
diff --git a/ext/gettext/tests/gettext_textdomain-wrongparams.phpt b/ext/gettext/tests/gettext_textdomain-wrongparams.phpt
index 251ee9a21b4..c2152019fc4 100644
--- a/ext/gettext/tests/gettext_textdomain-wrongparams.phpt
+++ b/ext/gettext/tests/gettext_textdomain-wrongparams.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check how textdomain() with wrong parameters behaves.
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("gettext")) {
 		die("skip\n");
 	}
diff --git a/ext/gmp/tests/002.phpt b/ext/gmp/tests/002.phpt
index ac2a7a54946..0fbc864ec60 100644
--- a/ext/gmp/tests/002.phpt
+++ b/ext/gmp/tests/002.phpt
@@ -3,9 +3,9 @@ GMP functionality test - factorial
 --SKIPIF--
 <?php if (!extension_loaded("gmp")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 function fact($x) {
-  if($x <= 1) 
+  if($x <= 1)
         return 1;
   else
         return gmp_mul($x,fact($x-1));
diff --git a/ext/gmp/tests/bug32773.phpt b/ext/gmp/tests/bug32773.phpt
index 6823fa1a1bb..efa293bbf26 100644
--- a/ext/gmp/tests/bug32773.phpt
+++ b/ext/gmp/tests/bug32773.phpt
@@ -6,10 +6,10 @@ Bug #32773 (binary GMP functions returns unexpected value, when second parameter
 <?php
 echo '10 + 0 = ', gmp_strval(gmp_add(10, 0)), "\n";
 echo '10 + "0" = ', gmp_strval(gmp_add(10, '0')), "\n";
-                                                                                                              
+
 echo gmp_strval(gmp_div(10, 0))."\n";
 echo gmp_strval(gmp_div_qr(10, 0))."\n";
-                                                                                                              
+
 ?>
 --EXPECTF--
 10 + 0 = 10
diff --git a/ext/gmp/tests/bug52906.phpt b/ext/gmp/tests/bug52906.phpt
index 60fc7417b62..f0973a5bddd 100644
--- a/ext/gmp/tests/bug52906.phpt
+++ b/ext/gmp/tests/bug52906.phpt
@@ -24,7 +24,7 @@ foreach($vals as $data) {
 }
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 7%3=1
 7%3=1
 2%7=2
diff --git a/ext/gmp/tests/cast.phpt b/ext/gmp/tests/cast.phpt
index 8606538bafb..cc9abdd4163 100644
--- a/ext/gmp/tests/cast.phpt
+++ b/ext/gmp/tests/cast.phpt
@@ -13,7 +13,7 @@ var_dump((float) $n);
 var_dump((bool) $n);
 
 ?>
---EXPECTF--	
+--EXPECTF--
 42
 string(2) "42"
 int(42)
diff --git a/ext/gmp/tests/clone.phpt b/ext/gmp/tests/clone.phpt
index 56b5ca3dfee..e512825d829 100644
--- a/ext/gmp/tests/clone.phpt
+++ b/ext/gmp/tests/clone.phpt
@@ -11,7 +11,7 @@ gmp_clrbit($a, 0);
 var_dump($a, $b); // $b should be unaffected
 
 ?>
---EXPECTF--	
+--EXPECTF--
 object(GMP)#1 (1) {
   ["num"]=>
   string(1) "2"
diff --git a/ext/gmp/tests/gmp_abs.phpt b/ext/gmp/tests/gmp_abs.phpt
index bb35891f2a3..811ab3d5eee 100644
--- a/ext/gmp/tests/gmp_abs.phpt
+++ b/ext/gmp/tests/gmp_abs.phpt
@@ -21,7 +21,7 @@ var_dump(gmp_abs(array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_abs(): Unable to convert variable to GMP - string is not an integer in %s on line %d
 string(1) "0"
 string(1) "0"
diff --git a/ext/gmp/tests/gmp_and.phpt b/ext/gmp/tests/gmp_and.phpt
index 9bc401031b2..2fb27c3e702 100644
--- a/ext/gmp/tests/gmp_and.phpt
+++ b/ext/gmp/tests/gmp_and.phpt
@@ -25,7 +25,7 @@ var_dump(gmp_and(array(), array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(6) "106502"
 string(5) "40994"
 string(3) "515"
diff --git a/ext/gmp/tests/gmp_cmp.phpt b/ext/gmp/tests/gmp_cmp.phpt
index 83e7910d1e6..2e48d3b83b9 100644
--- a/ext/gmp/tests/gmp_cmp.phpt
+++ b/ext/gmp/tests/gmp_cmp.phpt
@@ -24,7 +24,7 @@ var_dump(gmp_cmp());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(2)
 int(0)
 int(-1)
diff --git a/ext/gmp/tests/gmp_com.phpt b/ext/gmp/tests/gmp_com.phpt
index 1e0c1b4694a..ae6ec59200a 100644
--- a/ext/gmp/tests/gmp_com.phpt
+++ b/ext/gmp/tests/gmp_com.phpt
@@ -23,7 +23,7 @@ var_dump(gmp_strval(gmp_com()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(2) "-1"
 string(2) "-1"
 
diff --git a/ext/gmp/tests/gmp_div_q.phpt b/ext/gmp/tests/gmp_div_q.phpt
index 3b75a48e182..afc64c3547e 100644
--- a/ext/gmp/tests/gmp_div_q.phpt
+++ b/ext/gmp/tests/gmp_div_q.phpt
@@ -26,7 +26,7 @@ var_dump(gmp_div_q(array(), array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_div_q() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/gmp/tests/gmp_div_qr.phpt b/ext/gmp/tests/gmp_div_qr.phpt
index 90099249db4..936fbc6ef1b 100644
--- a/ext/gmp/tests/gmp_div_qr.phpt
+++ b/ext/gmp/tests/gmp_div_qr.phpt
@@ -28,7 +28,7 @@ var_dump(gmp_div_qr(array(), array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_div_qr() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/gmp/tests/gmp_div_r.phpt b/ext/gmp/tests/gmp_div_r.phpt
index c1874c86f90..bab243e4658 100644
--- a/ext/gmp/tests/gmp_div_r.phpt
+++ b/ext/gmp/tests/gmp_div_r.phpt
@@ -26,7 +26,7 @@ var_dump(gmp_div_r(array(), array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_div_r() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/gmp/tests/gmp_divexact.phpt b/ext/gmp/tests/gmp_divexact.phpt
index a42c1b6b4e2..53f0c677ab7 100644
--- a/ext/gmp/tests/gmp_divexact.phpt
+++ b/ext/gmp/tests/gmp_divexact.phpt
@@ -1,8 +1,8 @@
 --TEST--
 gmp_divexact() tests
 --SKIPIF--
-<?php 
-if (!extension_loaded("gmp")) die ("skip"); 
+<?php
+if (!extension_loaded("gmp")) die ("skip");
 if (!defined('GMP_VERSION') || version_compare("4.2.1", GMP_VERSION, ">=")) {
 	die("skip your GMP is too old and will crash");
 }
@@ -38,7 +38,7 @@ var_dump(gmp_strval($r));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_divexact() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 
diff --git a/ext/gmp/tests/gmp_fact.phpt b/ext/gmp/tests/gmp_fact.phpt
index 5cb8089b49e..032f7354355 100644
--- a/ext/gmp/tests/gmp_fact.phpt
+++ b/ext/gmp/tests/gmp_fact.phpt
@@ -28,7 +28,7 @@ var_dump(gmp_strval(gmp_fact(array())));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(1) "1"
 string(1) "1"
 string(1) "1"
diff --git a/ext/gmp/tests/gmp_gcd.phpt b/ext/gmp/tests/gmp_gcd.phpt
index 275f0bca35d..cf4eac9e92f 100644
--- a/ext/gmp/tests/gmp_gcd.phpt
+++ b/ext/gmp/tests/gmp_gcd.phpt
@@ -27,7 +27,7 @@ var_dump(gmp_gcd(array(),$n,1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(1) "3"
 string(5) "12387"
 string(3) "224"
diff --git a/ext/gmp/tests/gmp_gcdext.phpt b/ext/gmp/tests/gmp_gcdext.phpt
index 57fb05822f3..4adecf25d26 100644
--- a/ext/gmp/tests/gmp_gcdext.phpt
+++ b/ext/gmp/tests/gmp_gcdext.phpt
@@ -37,7 +37,7 @@ var_dump(gmp_gcdext());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(1) "3"
 string(1) "3"
 string(1) "1"
diff --git a/ext/gmp/tests/gmp_hamdist.phpt b/ext/gmp/tests/gmp_hamdist.phpt
index c21e03ccb25..60ef89f84df 100644
--- a/ext/gmp/tests/gmp_hamdist.phpt
+++ b/ext/gmp/tests/gmp_hamdist.phpt
@@ -24,7 +24,7 @@ var_dump(gmp_hamdist());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(13)
 int(-1)
 int(36)
diff --git a/ext/gmp/tests/gmp_init.phpt b/ext/gmp/tests/gmp_init.phpt
index 29640ba7049..a35f12345cf 100644
--- a/ext/gmp/tests/gmp_init.phpt
+++ b/ext/gmp/tests/gmp_init.phpt
@@ -17,7 +17,7 @@ var_dump(gmp_strval(gmp_init("993247326237679187178",3)));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 object(GMP)#%d (1) {
   ["num"]=>
   string(8) "98765678"
diff --git a/ext/gmp/tests/gmp_intval.phpt b/ext/gmp/tests/gmp_intval.phpt
index 088dd08fd8e..f30b3915735 100644
--- a/ext/gmp/tests/gmp_intval.phpt
+++ b/ext/gmp/tests/gmp_intval.phpt
@@ -24,7 +24,7 @@ var_dump(gmp_intval($g));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_intval() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 int(0)
diff --git a/ext/gmp/tests/gmp_invert.phpt b/ext/gmp/tests/gmp_invert.phpt
index 81a90fe16ae..8c1d7c577cb 100644
--- a/ext/gmp/tests/gmp_invert.phpt
+++ b/ext/gmp/tests/gmp_invert.phpt
@@ -27,7 +27,7 @@ var_dump(gmp_invert(array(), array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(7) "2293131"
 string(1) "0"
 string(4) "5827"
diff --git a/ext/gmp/tests/gmp_jacobi.phpt b/ext/gmp/tests/gmp_jacobi.phpt
index 04ddba4f08a..da92b874012 100644
--- a/ext/gmp/tests/gmp_jacobi.phpt
+++ b/ext/gmp/tests/gmp_jacobi.phpt
@@ -30,7 +30,7 @@ var_dump(gmp_jacobi());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(1) "0"
 string(2) "-1"
 string(1) "0"
diff --git a/ext/gmp/tests/gmp_legendre.phpt b/ext/gmp/tests/gmp_legendre.phpt
index 6dde34e1e7e..71191e133d6 100644
--- a/ext/gmp/tests/gmp_legendre.phpt
+++ b/ext/gmp/tests/gmp_legendre.phpt
@@ -30,7 +30,7 @@ var_dump(gmp_legendre());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(1) "0"
 string(2) "-1"
 string(1) "0"
diff --git a/ext/gmp/tests/gmp_mod.phpt b/ext/gmp/tests/gmp_mod.phpt
index 12e7cad2b32..4f216965c96 100644
--- a/ext/gmp/tests/gmp_mod.phpt
+++ b/ext/gmp/tests/gmp_mod.phpt
@@ -21,7 +21,7 @@ var_dump(gmp_mod($a, $b));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_mod() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/gmp/tests/gmp_neg.phpt b/ext/gmp/tests/gmp_neg.phpt
index 8ca3471cb8c..c457fa6574a 100644
--- a/ext/gmp/tests/gmp_neg.phpt
+++ b/ext/gmp/tests/gmp_neg.phpt
@@ -23,7 +23,7 @@ var_dump(gmp_neg(array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(0)
 int(-1)
 int(1)
diff --git a/ext/gmp/tests/gmp_nextprime.phpt b/ext/gmp/tests/gmp_nextprime.phpt
index da89221c0af..87a295f62c8 100644
--- a/ext/gmp/tests/gmp_nextprime.phpt
+++ b/ext/gmp/tests/gmp_nextprime.phpt
@@ -22,10 +22,10 @@ $n = gmp_nextprime("");
 var_dump(gmp_strval($n));
 $n = gmp_nextprime(new stdclass());
 var_dump(gmp_strval($n));
-	
+
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(1) "2"
 string(1) "2"
 string(1) "2"
diff --git a/ext/gmp/tests/gmp_or.phpt b/ext/gmp/tests/gmp_or.phpt
index 035f070bd75..ef486df8e9e 100644
--- a/ext/gmp/tests/gmp_or.phpt
+++ b/ext/gmp/tests/gmp_or.phpt
@@ -25,7 +25,7 @@ var_dump(gmp_or(array(), array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(7) "2226831"
 string(6) "517363"
 string(10) "2342341163"
diff --git a/ext/gmp/tests/gmp_perfect_square.phpt b/ext/gmp/tests/gmp_perfect_square.phpt
index aa596ba9cd0..0f519c7b79c 100644
--- a/ext/gmp/tests/gmp_perfect_square.phpt
+++ b/ext/gmp/tests/gmp_perfect_square.phpt
@@ -26,7 +26,7 @@ var_dump(gmp_perfect_square(array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(false)
diff --git a/ext/gmp/tests/gmp_popcount.phpt b/ext/gmp/tests/gmp_popcount.phpt
index 4b45a044810..26a7b5af8db 100644
--- a/ext/gmp/tests/gmp_popcount.phpt
+++ b/ext/gmp/tests/gmp_popcount.phpt
@@ -17,7 +17,7 @@ var_dump(gmp_popcount());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(-1)
 int(0)
 int(10)
diff --git a/ext/gmp/tests/gmp_pow.phpt b/ext/gmp/tests/gmp_pow.phpt
index 6140b0cebf0..39b0f861492 100644
--- a/ext/gmp/tests/gmp_pow.phpt
+++ b/ext/gmp/tests/gmp_pow.phpt
@@ -30,7 +30,7 @@ var_dump(gmp_pow(array(),10));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(4) "1024"
 string(4) "1024"
 string(5) "-2048"
diff --git a/ext/gmp/tests/gmp_pown.phpt b/ext/gmp/tests/gmp_pown.phpt
index f5857b6995d..b732aa331fc 100644
--- a/ext/gmp/tests/gmp_pown.phpt
+++ b/ext/gmp/tests/gmp_pown.phpt
@@ -38,7 +38,7 @@ var_dump(gmp_powm(10, $n, 10));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(1) "0"
 string(1) "5"
 string(1) "5"
diff --git a/ext/gmp/tests/gmp_prob_prime.phpt b/ext/gmp/tests/gmp_prob_prime.phpt
index f8f3e6921ca..99735bd7c00 100644
--- a/ext/gmp/tests/gmp_prob_prime.phpt
+++ b/ext/gmp/tests/gmp_prob_prime.phpt
@@ -33,7 +33,7 @@ var_dump(gmp_prob_prime(array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(0)
 int(2)
 int(2)
diff --git a/ext/gmp/tests/gmp_random.phpt b/ext/gmp/tests/gmp_random.phpt
index da4ca5c7bd1..ed1601f4865 100644
--- a/ext/gmp/tests/gmp_random.phpt
+++ b/ext/gmp/tests/gmp_random.phpt
@@ -19,7 +19,7 @@ var_dump(gmp_random("test"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Deprecated: Function gmp_random() is deprecated in %s on line %d
 string(%d) "%d"
 
diff --git a/ext/gmp/tests/gmp_remroot.phpt b/ext/gmp/tests/gmp_remroot.phpt
index 331f447aa20..acd8f84925f 100644
--- a/ext/gmp/tests/gmp_remroot.phpt
+++ b/ext/gmp/tests/gmp_remroot.phpt
@@ -20,7 +20,7 @@ var_dump(gmp_rootrem(100, 0));
 var_dump(gmp_rootrem(100, -3));
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_rootrem() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 array(2) {
diff --git a/ext/gmp/tests/gmp_root.phpt b/ext/gmp/tests/gmp_root.phpt
index 70faf27051e..654e2ffeb62 100644
--- a/ext/gmp/tests/gmp_root.phpt
+++ b/ext/gmp/tests/gmp_root.phpt
@@ -20,7 +20,7 @@ var_dump(gmp_root(100, 0));
 var_dump(gmp_root(100, -3));
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_root() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 object(GMP)#%d (1) {
diff --git a/ext/gmp/tests/gmp_scan0.phpt b/ext/gmp/tests/gmp_scan0.phpt
index 2a87a968a24..fb70cf8b25b 100644
--- a/ext/gmp/tests/gmp_scan0.phpt
+++ b/ext/gmp/tests/gmp_scan0.phpt
@@ -20,7 +20,7 @@ var_dump(gmp_scan0());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_scan0(): Starting index must be greater than or equal to zero in %s on line %d
 bool(false)
 int(2)
diff --git a/ext/gmp/tests/gmp_scan1.phpt b/ext/gmp/tests/gmp_scan1.phpt
index 7ebce9be7d1..a89a9195b05 100644
--- a/ext/gmp/tests/gmp_scan1.phpt
+++ b/ext/gmp/tests/gmp_scan1.phpt
@@ -20,7 +20,7 @@ var_dump(gmp_scan1());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_scan1(): Starting index must be greater than or equal to zero in %s on line %d
 bool(false)
 int(1)
diff --git a/ext/gmp/tests/gmp_sign.phpt b/ext/gmp/tests/gmp_sign.phpt
index 1efdc28c6f4..7ac03013d4a 100644
--- a/ext/gmp/tests/gmp_sign.phpt
+++ b/ext/gmp/tests/gmp_sign.phpt
@@ -19,7 +19,7 @@ var_dump(gmp_sign());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(-1)
 int(1)
 int(0)
diff --git a/ext/gmp/tests/gmp_sqrt.phpt b/ext/gmp/tests/gmp_sqrt.phpt
index d90f5382134..e824de3706e 100644
--- a/ext/gmp/tests/gmp_sqrt.phpt
+++ b/ext/gmp/tests/gmp_sqrt.phpt
@@ -24,7 +24,7 @@ var_dump(gmp_sqrt(array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_sqrt(): Number has to be greater than or equal to 0 in %s on line %d
 string(1) "0"
 
diff --git a/ext/gmp/tests/gmp_sqrtrem.phpt b/ext/gmp/tests/gmp_sqrtrem.phpt
index d30bb2b2953..595a1dc45ae 100644
--- a/ext/gmp/tests/gmp_sqrtrem.phpt
+++ b/ext/gmp/tests/gmp_sqrtrem.phpt
@@ -55,7 +55,7 @@ var_dump(gmp_sqrtrem());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_sqrtrem(): Number has to be greater than or equal to 0 in %s on line %d
 bool(false)
 string(1) "0"
diff --git a/ext/gmp/tests/gmp_strval.phpt b/ext/gmp/tests/gmp_strval.phpt
index df3e596a192..49dfbd14fad 100644
--- a/ext/gmp/tests/gmp_strval.phpt
+++ b/ext/gmp/tests/gmp_strval.phpt
@@ -33,7 +33,7 @@ var_dump(gmp_strval(new stdclass));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_strval() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 
diff --git a/ext/gmp/tests/gmp_sub.phpt b/ext/gmp/tests/gmp_sub.phpt
index e1d9df67db7..fabc0c0ebbe 100644
--- a/ext/gmp/tests/gmp_sub.phpt
+++ b/ext/gmp/tests/gmp_sub.phpt
@@ -22,7 +22,7 @@ var_dump(gmp_strval($g));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_sub() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/gmp/tests/gmp_testbit.phpt b/ext/gmp/tests/gmp_testbit.phpt
index ab40abed7f7..bdabe3d8418 100644
--- a/ext/gmp/tests/gmp_testbit.phpt
+++ b/ext/gmp/tests/gmp_testbit.phpt
@@ -39,7 +39,7 @@ var_dump(gmp_strval($n));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gmp_testbit() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/gmp/tests/gmp_xor.phpt b/ext/gmp/tests/gmp_xor.phpt
index 2b0d29a6206..9bf31f02f41 100644
--- a/ext/gmp/tests/gmp_xor.phpt
+++ b/ext/gmp/tests/gmp_xor.phpt
@@ -25,7 +25,7 @@ var_dump(gmp_xor(array(), array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(7) "2120329"
 string(6) "476369"
 string(10) "2342340648"
diff --git a/ext/gmp/tests/serialize.phpt b/ext/gmp/tests/serialize.phpt
index e9b9bb549f7..dedd1507252 100644
--- a/ext/gmp/tests/serialize.phpt
+++ b/ext/gmp/tests/serialize.phpt
@@ -22,7 +22,7 @@ try {
 } catch (Exception $e) { var_dump($e->getMessage()); }
 
 ?>
---EXPECTF--	
+--EXPECTF--
 object(GMP)#%d (1) {
   ["num"]=>
   string(2) "42"
diff --git a/ext/hash/tests/hash_algos.phpt b/ext/hash/tests/hash_algos.phpt
index 0014f95b1d5..f25bf38a044 100644
--- a/ext/hash/tests/hash_algos.phpt
+++ b/ext/hash/tests/hash_algos.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test hash_algos() function : basic functionality 
+Test hash_algos() function : basic functionality
 --SKIPIF--
 <?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
@@ -8,7 +8,7 @@ Test hash_algos() function : basic functionality
 /* Prototype  : array hash_algos (void)
  * Description: Return a list of registered hashing algorithms
  * Source code: ext/hash/hash.c
- * Alias to functions: 
+ * Alias to functions:
 */
 
 echo "*** Testing hash_algos() : basic functionality ***\n";
diff --git a/ext/hash/tests/hash_copy_001.phpt b/ext/hash/tests/hash_copy_001.phpt
index cd1af4de099..1b23c32cf90 100644
--- a/ext/hash/tests/hash_copy_001.phpt
+++ b/ext/hash/tests/hash_copy_001.phpt
@@ -30,7 +30,7 @@ foreach ($algos as $algo) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(3) "md2"
 string(32) "d5ac4ffd08f6a57b9bd402b8068392ff"
 string(32) "d5ac4ffd08f6a57b9bd402b8068392ff"
diff --git a/ext/hash/tests/hash_copy_002.phpt b/ext/hash/tests/hash_copy_002.phpt
index 5fbbf5b4d8b..2b6ce4a07b3 100644
--- a/ext/hash/tests/hash_copy_002.phpt
+++ b/ext/hash/tests/hash_copy_002.phpt
@@ -12,7 +12,7 @@ var_dump(hash_copy($r, $r));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: hash_copy() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 object(HashContext)#%d (0) {
diff --git a/ext/hash/tests/hash_error.phpt b/ext/hash/tests/hash_error.phpt
index 8317a56e141..e51c19fbf3e 100644
--- a/ext/hash/tests/hash_error.phpt
+++ b/ext/hash/tests/hash_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test hash() function : error conditions 
+Test hash() function : error conditions
 --SKIPIF--
 <?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
@@ -8,7 +8,7 @@ Test hash() function : error conditions
 /* Prototype  : string hash  ( string $algo  , string $data  [, bool $raw_output  ] )
  * Description: Generate a hash value (message digest)
  * Source code: ext/hash/hash.c
- * Alias to functions: 
+ * Alias to functions:
 */
 echo "*** Testing hash() : error conditions ***\n";
 
@@ -17,7 +17,7 @@ var_dump(hash());
 var_dump(hash('adler32'));
 
 echo "\n-- Testing hash() function with more than expected no. of arguments --\n";
-$extra_arg= 10; 
+$extra_arg= 10;
 var_dump(hash('adler32', '', false, $extra_arg));
 
 echo "\n-- Testing hash() function with invalid hash algorithm --\n";
diff --git a/ext/hash/tests/hash_file_basic.phpt b/ext/hash/tests/hash_file_basic.phpt
index b16927d20ed..dd51af64a10 100644
--- a/ext/hash/tests/hash_file_basic.phpt
+++ b/ext/hash/tests/hash_file_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test hash_file() function : basic functionality 
+Test hash_file() function : basic functionality
 --SKIPIF--
 <?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --CREDITS--
@@ -9,7 +9,7 @@ Felix De Vliegher <felix.devliegher@gmail.com>
 /* Prototype  : string hash_file(string algo, string filename[, bool raw_output = false])
  * Description: Generate a hash of a given file
  * Source code: ext/hash/hash.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing hash_file() : basic functionality ***\n";
diff --git a/ext/hash/tests/hash_file_basic1.phpt b/ext/hash/tests/hash_file_basic1.phpt
index 9a2bc01016c..b0e286d741c 100644
--- a/ext/hash/tests/hash_file_basic1.phpt
+++ b/ext/hash/tests/hash_file_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test hash_file() function : basic functionality 
+Test hash_file() function : basic functionality
 --SKIPIF--
 <?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
@@ -8,7 +8,7 @@ Test hash_file() function : basic functionality
 /* Prototype  : string hash_file ( string algo, string filename [, bool raw_output] )
  * Description: Generate a hash value using the contents of a given file
  * Source code: ext/hash/hash.c
- * Alias to functions: 
+ * Alias to functions:
 */
 
 echo "*** Testing hash_file() : basic functionality ***\n";
@@ -18,9 +18,9 @@ $file = dirname(__FILE__) . "hash_file.txt";
 if (($fp = fopen( $file, "w+")) == FALSE) {
 	echo "Cannot create file ($file)";
     exit;
-}	
+}
 
-/* Writing into file */ 
+/* Writing into file */
 $content = "This is a sample string used to test the hash_file function with various hashing algorithms";
 if (is_writable($file)) {
   if (fwrite($fp, $content) === FALSE) {
@@ -29,7 +29,7 @@ if (is_writable($file)) {
   }
 }
 
-// close the file 
+// close the file
 fclose($fp);
 
 echo "adler32: " . hash_file('adler32', $file) . "\n";
diff --git a/ext/hash/tests/hash_file_error.phpt b/ext/hash/tests/hash_file_error.phpt
index 96c41e64321..7a3b604e674 100644
--- a/ext/hash/tests/hash_file_error.phpt
+++ b/ext/hash/tests/hash_file_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test hash_file() function : error conditions 
+Test hash_file() function : error conditions
 --SKIPIF--
 <?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --CREDITS--
@@ -9,7 +9,7 @@ Felix De Vliegher <felix.devliegher@gmail.com>
 /* Prototype  : string hash_file(string algo, string filename[, bool raw_output = false])
  * Description: Generate a hash of a given file
  * Source code: ext/hash/hash.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing hash_file() : error conditions ***\n";
diff --git a/ext/hash/tests/hash_hmac_algos.phpt b/ext/hash/tests/hash_hmac_algos.phpt
index 89877b7c124..b5b118f5492 100644
--- a/ext/hash/tests/hash_hmac_algos.phpt
+++ b/ext/hash/tests/hash_hmac_algos.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test hash_hmac_algos() function : basic functionality 
+Test hash_hmac_algos() function : basic functionality
 --SKIPIF--
 <?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
diff --git a/ext/hash/tests/hash_hmac_basic.phpt b/ext/hash/tests/hash_hmac_basic.phpt
index ad4e754e550..7db710cf823 100644
--- a/ext/hash/tests/hash_hmac_basic.phpt
+++ b/ext/hash/tests/hash_hmac_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test hash_file() function : basic functionality 
+Test hash_file() function : basic functionality
 --SKIPIF--
 <?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
@@ -8,7 +8,7 @@ Test hash_file() function : basic functionality
 /* Prototype  : string hash_hmac  ( string $algo  , string $data  , string $key  [, bool $raw_output  ] )
  * Description: Generate a keyed hash value using the HMAC method
  * Source code: ext/hash/hash.c
- * Alias to functions: 
+ * Alias to functions:
 */
 
 echo "*** Testing hash_hmac() : basic functionality ***\n";
diff --git a/ext/hash/tests/hash_hmac_error.phpt b/ext/hash/tests/hash_hmac_error.phpt
index bff478a55e5..b9a9e535d3d 100644
--- a/ext/hash/tests/hash_hmac_error.phpt
+++ b/ext/hash/tests/hash_hmac_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test hash_hmac() function : basic functionality 
+Test hash_hmac() function : basic functionality
 --SKIPIF--
 <?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
diff --git a/ext/hash/tests/hash_hmac_file_basic.phpt b/ext/hash/tests/hash_hmac_file_basic.phpt
index 8ac248756c4..e2f6da14de0 100644
--- a/ext/hash/tests/hash_hmac_file_basic.phpt
+++ b/ext/hash/tests/hash_hmac_file_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test hash_hmac_file() function : basic functionality 
+Test hash_hmac_file() function : basic functionality
 --SKIPIF--
 <?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
@@ -9,7 +9,7 @@ Test hash_hmac_file() function : basic functionality
 /* Prototype  : string hash_hmac_file ( string algo, string filename, string key [, bool raw_output] )
  * Description: Generate a keyed hash value using the HMAC method and the contents of a given file
  * Source code: ext/hash/hash.c
- * Alias to functions: 
+ * Alias to functions:
 */
 
 echo "*** Testing hash_hmac_file() : basic functionality ***\n";
@@ -19,9 +19,9 @@ $file = dirname(__FILE__) . "hash_hmac_file.txt";
 if (($fp = fopen( $file, "w+")) == FALSE) {
 	echo "Cannot create file ($file)";
     exit;
-}	
+}
 
-/* Writing into file */ 
+/* Writing into file */
 $content = "This is a sample string used to test the hash_hmac_file function with various hashing algorithms";
 if (is_writable($file)) {
   if (fwrite($fp, $content) === FALSE) {
@@ -30,7 +30,7 @@ if (is_writable($file)) {
   }
 }
 
-// close the files 
+// close the files
 fclose($fp);
 
 $key = 'secret';
diff --git a/ext/hash/tests/hash_hmac_file_error.phpt b/ext/hash/tests/hash_hmac_file_error.phpt
index 29adbddba8f..61f9e4d265c 100644
--- a/ext/hash/tests/hash_hmac_file_error.phpt
+++ b/ext/hash/tests/hash_hmac_file_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test hash_hmac_file() function : basic functionality 
+Test hash_hmac_file() function : basic functionality
 --SKIPIF--
 <?php extension_loaded('hash') or die('skip: hash extension not loaded.'); ?>
 --FILE--
@@ -8,7 +8,7 @@ Test hash_hmac_file() function : basic functionality
 /* Prototype  : string hash_hmac_file ( string algo, string filename, string key [, bool raw_output] )
  * Description: Generate a keyed hash value using the HMAC method and the contents of a given file
  * Source code: ext/hash/hash.c
- * Alias to functions: 
+ * Alias to functions:
 */
 
 echo "*** Testing hash() : error conditions ***\n";
@@ -22,7 +22,7 @@ var_dump(hash_hmac_file('crc32'));
 var_dump(hash_hmac_file('crc32', $file));
 
 echo "\n-- Testing hash_hmac_file() function with more than expected no. of arguments --\n";
-$extra_arg = 10; 
+$extra_arg = 10;
 hash_hmac_file('crc32', $file, $key, TRUE, $extra_arg);
 
 echo "\n-- Testing hash_hmac_file() function with invalid hash algorithm --\n";
diff --git a/ext/hash/tests/joaat.phpt b/ext/hash/tests/joaat.phpt
index fa310a96e2b..63751c9f3ba 100644
--- a/ext/hash/tests/joaat.phpt
+++ b/ext/hash/tests/joaat.phpt
@@ -17,7 +17,7 @@ $pass = true;
 
 foreach ($tests as $test) {
 	++$i;
-	
+
 	$result = hash("joaat", $test[0]);
 	if ($result != $test[1]) {
 		echo "Iteration " . $i . " failed - expected '" . $test[1] . "', got '" . $result . "' for '" . $test[1] . "'\n";
diff --git a/ext/hash/tests/mhash_002.phpt b/ext/hash/tests/mhash_002.phpt
index 45cf09fb771..a44bb4b5553 100644
--- a/ext/hash/tests/mhash_002.phpt
+++ b/ext/hash/tests/mhash_002.phpt
@@ -29,7 +29,7 @@ $supported_hash_al = array(
 
 $hc = mhash_count() + 1;
 
-$known_hash_al = array();	
+$known_hash_al = array();
 for ($i=0; $i < $hc; $i++) {
 	$known_hash_al[mhash_get_hash_name($i)] = $i;
 }
@@ -40,7 +40,7 @@ foreach ($supported_hash_al as $name => $len) {
 		echo "$name = $len\n";
 	} else {
 		echo "$name ? $len\n";
-	} 
+	}
 }
 ?>
 --EXPECTREGEX--
diff --git a/ext/iconv/tests/bug37176.phpt b/ext/iconv/tests/bug37176.phpt
index 70242fe0917..c562ceac850 100644
--- a/ext/iconv/tests/bug37176.phpt
+++ b/ext/iconv/tests/bug37176.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #37176 (iconv_strpos() fails to find a string)
 --SKIPIF--
-<?php 
-include('skipif.inc'); 
+<?php
+include('skipif.inc');
 
 $test = @iconv_strpos("abbttt","ttt",0,"UTF-8");
 if ($test === false) {
diff --git a/ext/iconv/tests/bug37773.phpt b/ext/iconv/tests/bug37773.phpt
index d21e6fd0f84..f9a1d3470ee 100644
--- a/ext/iconv/tests/bug37773.phpt
+++ b/ext/iconv/tests/bug37773.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #37773 (iconv_substr() gives "Unknown error" when string length = 1")
 --SKIPIF--
-<?php 
-include('skipif.inc'); 
+<?php
+include('skipif.inc');
 
 $test = @iconv_strpos("abbttt","ttt",0,"UTF-8");
 if ($test === false) {
diff --git a/ext/iconv/tests/bug52211.phpt b/ext/iconv/tests/bug52211.phpt
index c851cbad6af..f4fe747cde8 100644
--- a/ext/iconv/tests/bug52211.phpt
+++ b/ext/iconv/tests/bug52211.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #52211 (iconv() returns part of string on error)
 --SKIPIF--
-<?php 
+<?php
 include('skipif.inc');
 ?>
 --FILE--
diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt
index 4ffcfef5165..38cfdd37b89 100644
--- a/ext/iconv/tests/eucjp2utf8.phpt
+++ b/ext/iconv/tests/eucjp2utf8.phpt
@@ -48,7 +48,7 @@ $str = "
 ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
 ";
 
-$str = iconv("EUC-JP", "UTF-8", $str); /* libiconv(1.8) doesn't know "UTF8" but "UTF-8". */ 
+$str = iconv("EUC-JP", "UTF-8", $str); /* libiconv(1.8) doesn't know "UTF8" but "UTF-8". */
 $str = base64_encode($str);
 echo $str."\n";
 
diff --git a/ext/iconv/tests/iconv002.phpt b/ext/iconv/tests/iconv002.phpt
index 034b3761faf..d49e5eccc22 100644
--- a/ext/iconv/tests/iconv002.phpt
+++ b/ext/iconv/tests/iconv002.phpt
@@ -4,7 +4,7 @@ iconv() test 2 (UCS4BE to ASCII)
 <?php
 include('skipif.inc');
 if (@iconv("ascii","UCS-4LE", "abcd") == '') {
-	die("skip conversion to UCS-4LE not supported"); 
+	die("skip conversion to UCS-4LE not supported");
 }
 ?>
 --INI--
diff --git a/ext/iconv/tests/iconv003.phpt b/ext/iconv/tests/iconv003.phpt
index 9642cf1e79f..690c1569f98 100644
--- a/ext/iconv/tests/iconv003.phpt
+++ b/ext/iconv/tests/iconv003.phpt
@@ -4,7 +4,7 @@ iconv() test 3
 <?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
 --FILE--
 <?php
-for ($i = 0; $i < 3; ++$i) { 
+for ($i = 0; $i < 3; ++$i) {
 	if (@iconv('blah', 'blah', 'blah') != '') {
 		die("failed\n");
 	}
diff --git a/ext/iconv/tests/iconv_basic.phpt b/ext/iconv/tests/iconv_basic.phpt
index 8669af040c2..1c57cfbeff5 100644
--- a/ext/iconv/tests/iconv_basic.phpt
+++ b/ext/iconv/tests/iconv_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test iconv() function : basic functionality 
+Test iconv() function : basic functionality
 --SKIPIF--
 <?php
 extension_loaded('iconv') or die('skip');
@@ -8,7 +8,7 @@ function_exists('iconv') or die("skip iconv() is not available in this build");
 --FILE--
 <?php
 /* Prototype  : string iconv(string in_charset, string out_charset, string str)
- * Description: Returns converted string in desired encoding 
+ * Description: Returns converted string in desired encoding
  * Source code: ext/iconv/iconv.c
  */
 
diff --git a/ext/iconv/tests/iconv_encoding_basic.phpt b/ext/iconv/tests/iconv_encoding_basic.phpt
index 35314f1e690..47d87ffc750 100644
--- a/ext/iconv/tests/iconv_encoding_basic.phpt
+++ b/ext/iconv/tests/iconv_encoding_basic.phpt
@@ -13,10 +13,10 @@ iconv.output_encoding=ISO-8859-1
 --FILE--
 <?php
 /* Prototype  : mixed iconv_get_encoding([string type])
- * Description: Get internal encoding and output encoding for ob_iconv_handler() 
+ * Description: Get internal encoding and output encoding for ob_iconv_handler()
  * Prototype  : bool iconv_set_encoding(string type, string charset)
  * Description: Sets internal encoding and output encoding for ob_iconv_handler()
- * Source code: ext/iconv/iconv.c 
+ * Source code: ext/iconv/iconv.c
  */
 
 /*
diff --git a/ext/iconv/tests/iconv_get_encoding_error.phpt b/ext/iconv/tests/iconv_get_encoding_error.phpt
index b0c3e0724d1..0526fce2a56 100644
--- a/ext/iconv/tests/iconv_get_encoding_error.phpt
+++ b/ext/iconv/tests/iconv_get_encoding_error.phpt
@@ -8,8 +8,8 @@ function_exists('iconv_get_encoding') or die("skip iconv_get_encoding() is not a
 --FILE--
 <?php
 /* Prototype  : mixed iconv_get_encoding([string type])
- * Description: Get internal encoding and output encoding for ob_iconv_handler() 
- * Source code: ext/iconv/iconv.c 
+ * Description: Get internal encoding and output encoding for ob_iconv_handler()
+ * Source code: ext/iconv/iconv.c
  */
 
 /*
@@ -63,7 +63,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
index 7cc32c7e706..5973ca0640b 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation1.phpt
@@ -81,7 +81,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -90,7 +90,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
index f89658a47dd..54c39c1cd88 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation2.phpt
@@ -82,7 +82,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -91,7 +91,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
index 4ee232e835c..3dc028b440b 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers_variation3.phpt
@@ -85,7 +85,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -94,7 +94,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_mime_decode_variation1.phpt b/ext/iconv/tests/iconv_mime_decode_variation1.phpt
index 4d91d68add6..f76593bda28 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation1.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation1.phpt
@@ -69,7 +69,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -78,7 +78,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_mime_decode_variation2.phpt b/ext/iconv/tests/iconv_mime_decode_variation2.phpt
index f4508e98603..fab5492298a 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation2.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation2.phpt
@@ -70,7 +70,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -79,7 +79,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_mime_decode_variation3.phpt b/ext/iconv/tests/iconv_mime_decode_variation3.phpt
index c077aa10fa1..cb20eea7d10 100644
--- a/ext/iconv/tests/iconv_mime_decode_variation3.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_variation3.phpt
@@ -72,7 +72,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -81,7 +81,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_set_encoding_error.phpt b/ext/iconv/tests/iconv_set_encoding_error.phpt
index 4ba840067d5..4176bf9165c 100644
--- a/ext/iconv/tests/iconv_set_encoding_error.phpt
+++ b/ext/iconv/tests/iconv_set_encoding_error.phpt
@@ -9,7 +9,7 @@ function_exists('iconv_set_encoding') or die("skip iconv_set_encoding() is not a
 <?php
 /* Prototype  : bool iconv_set_encoding(string type, string charset)
  * Description: Sets internal encoding and output encoding for ob_iconv_handler()
- * Source code: ext/iconv/iconv.c 
+ * Source code: ext/iconv/iconv.c
  */
 
 /*
@@ -63,7 +63,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_set_encoding_variation.phpt b/ext/iconv/tests/iconv_set_encoding_variation.phpt
index 4e097569fda..906f46bc315 100644
--- a/ext/iconv/tests/iconv_set_encoding_variation.phpt
+++ b/ext/iconv/tests/iconv_set_encoding_variation.phpt
@@ -11,7 +11,7 @@ error_reporting=E_ALL & ~E_DEPRECATED
 <?php
 /* Prototype  : bool iconv_set_encoding(string type, string charset)
  * Description: Sets internal encoding and output encoding for ob_iconv_handler()
- * Source code: ext/iconv/iconv.c 
+ * Source code: ext/iconv/iconv.c
  */
 
 /*
@@ -65,7 +65,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -74,7 +74,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_strlen_basic.phpt b/ext/iconv/tests/iconv_strlen_basic.phpt
index e5d6271f69a..50ffbb1f46e 100644
--- a/ext/iconv/tests/iconv_strlen_basic.phpt
+++ b/ext/iconv/tests/iconv_strlen_basic.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in
 --FILE--
 <?php
 /* Prototype  : int iconv_strlen(string str [, string charset])
- * Description: Get character numbers of a string 
+ * Description: Get character numbers of a string
  * Source code: ext/iconv/iconv.c
  */
 
diff --git a/ext/iconv/tests/iconv_strlen_error1.phpt b/ext/iconv/tests/iconv_strlen_error1.phpt
index 3c63b20f798..21b99c011df 100644
--- a/ext/iconv/tests/iconv_strlen_error1.phpt
+++ b/ext/iconv/tests/iconv_strlen_error1.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in
 --FILE--
 <?php
 /* Prototype  : int iconv_strlen(string str [, string charset])
- * Description: Get character numbers of a string 
+ * Description: Get character numbers of a string
  * Source code: ext/iconv/iconv.c
  */
 
diff --git a/ext/iconv/tests/iconv_strlen_error2.phpt b/ext/iconv/tests/iconv_strlen_error2.phpt
index 6c760b14c8e..973efecb350 100644
--- a/ext/iconv/tests/iconv_strlen_error2.phpt
+++ b/ext/iconv/tests/iconv_strlen_error2.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in
 --FILE--
 <?php
 /* Prototype  : int iconv_strlen(string str [, string charset])
- * Description: Get character numbers of a string 
+ * Description: Get character numbers of a string
  * Source code: ext/iconv/iconv.c
  */
 
diff --git a/ext/iconv/tests/iconv_strlen_variation1.phpt b/ext/iconv/tests/iconv_strlen_variation1.phpt
index e3e25aa0dc6..d6edf5b86d6 100644
--- a/ext/iconv/tests/iconv_strlen_variation1.phpt
+++ b/ext/iconv/tests/iconv_strlen_variation1.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in
 --FILE--
 <?php
 /* Prototype  : int iconv_strlen(string str [, string charset])
- * Description: Get character numbers of a string 
+ * Description: Get character numbers of a string
  * Source code: ext/iconv/iconv.c
  */
 
@@ -45,14 +45,14 @@ $fp = fopen(__FILE__, "r");
 $inputs = array(
 
        // int data
-/*1*/ 
+/*1*/
 	 'int 0' => 0,
      'int 1' => 1,
      'int 12345' => 12345,
      'int -12345' => -12345,
 
        // float data
-/*5*/ 
+/*5*/
 	 'float 10.5' => 10.5,
      'float -10.5' => -10.5,
      'float 12.3456789000e10' => 12.3456789000e10,
@@ -60,39 +60,39 @@ $inputs = array(
      'float .5' => .5,
 
        // null data
-/*10*/ 
+/*10*/
       'uppercase NULL' => NULL,
       'lowercase null' => null,
-       
+
        // boolean data
-/*12*/ 
+/*12*/
       'lowercase true' => true,
       'lowercase false' =>false,
       'uppercase TRUE' =>TRUE,
       'uppercase FALSE' =>FALSE,
-              
+
        // empty data
-/*16*/ 
+/*16*/
       'empty string DQ' => "",
       'empty string SQ' => '',
-       
+
        // string data
-/*18*/ 
+/*18*/
       'string DQ' => "string",
       'string SQ' => 'string',
       'mixed case string' => "sTrInG",
       'heredoc' => $heredoc,
-             
+
        // object data
-/*21*/ 
+/*21*/
       'instance of class' => new classA(),
-       
+
        // undefined data
-/*22*/ 
+/*22*/
       'undefined var' => @$undefined_var,
 
        // unset data
-/*23*/ 
+/*23*/
       'unset var' => @$unset_var,
 
        // resource variable
diff --git a/ext/iconv/tests/iconv_strlen_variation2.phpt b/ext/iconv/tests/iconv_strlen_variation2.phpt
index 85dd0483a69..be5afdc93b2 100644
--- a/ext/iconv/tests/iconv_strlen_variation2.phpt
+++ b/ext/iconv/tests/iconv_strlen_variation2.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strlen') or die("skip iconv_strlen() is not available in
 --FILE--
 <?php
 /* Prototype  : int iconv_strlen(string str [, string charset])
- * Description: Get character numbers of a string 
+ * Description: Get character numbers of a string
  * Source code: ext/iconv/iconv.c
  */
 
@@ -67,7 +67,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -76,7 +76,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_strpos_basic.phpt b/ext/iconv/tests/iconv_strpos_basic.phpt
index 1017f8e3b6f..f6cd521f821 100644
--- a/ext/iconv/tests/iconv_strpos_basic.phpt
+++ b/ext/iconv/tests/iconv_strpos_basic.phpt
@@ -10,7 +10,7 @@ error_reporting=E_ALL & ~E_DEPRECATED
 --FILE--
 <?php
 /* Prototype  : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
diff --git a/ext/iconv/tests/iconv_strpos_error1.phpt b/ext/iconv/tests/iconv_strpos_error1.phpt
index 232466562c4..dd0fe466d76 100644
--- a/ext/iconv/tests/iconv_strpos_error1.phpt
+++ b/ext/iconv/tests/iconv_strpos_error1.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in
 --FILE--
 <?php
 /* Prototype  : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
diff --git a/ext/iconv/tests/iconv_strpos_error2.phpt b/ext/iconv/tests/iconv_strpos_error2.phpt
index 01e728ad9e0..91f27049030 100644
--- a/ext/iconv/tests/iconv_strpos_error2.phpt
+++ b/ext/iconv/tests/iconv_strpos_error2.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in
 --FILE--
 <?php
 /* Prototype  : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
diff --git a/ext/iconv/tests/iconv_strpos_variation1.phpt b/ext/iconv/tests/iconv_strpos_variation1.phpt
index 38dc353383a..1eb8f7b21b7 100644
--- a/ext/iconv/tests/iconv_strpos_variation1.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation1.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in
 --FILE--
 <?php
 /* Prototype  : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
@@ -68,7 +68,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -77,7 +77,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_strpos_variation2.phpt b/ext/iconv/tests/iconv_strpos_variation2.phpt
index e702ca9869e..798fe7f85cf 100644
--- a/ext/iconv/tests/iconv_strpos_variation2.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation2.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in
 --FILE--
 <?php
 /* Prototype  : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
@@ -68,7 +68,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -77,7 +77,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_strpos_variation3.phpt b/ext/iconv/tests/iconv_strpos_variation3.phpt
index ea889a07bd0..4fdd4db65c8 100644
--- a/ext/iconv/tests/iconv_strpos_variation3.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation3.phpt
@@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
@@ -71,7 +71,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
        "",
        '',
@@ -80,7 +80,7 @@ $inputs = array(
        "string",
        'string',
        $heredoc,
-       
+
        // object data
        new classA(),
 
diff --git a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
index c4e3e141a11..abf8715ed63 100644
--- a/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation3_64bit.phpt
@@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
@@ -71,7 +71,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
        "",
        '',
@@ -80,7 +80,7 @@ $inputs = array(
        "string",
        'string',
        $heredoc,
-       
+
        // object data
        new classA(),
 
diff --git a/ext/iconv/tests/iconv_strpos_variation4.phpt b/ext/iconv/tests/iconv_strpos_variation4.phpt
index 539305541ad..5a97c2a5acb 100644
--- a/ext/iconv/tests/iconv_strpos_variation4.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation4.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strpos') or die("skip iconv_strpos() is not available in
 --FILE--
 <?php
 /* Prototype  : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
@@ -70,7 +70,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -79,7 +79,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_strpos_variation5.phpt b/ext/iconv/tests/iconv_strpos_variation5.phpt
index 759294f73a9..7ada6fbb91a 100644
--- a/ext/iconv/tests/iconv_strpos_variation5.phpt
+++ b/ext/iconv/tests/iconv_strpos_variation5.phpt
@@ -10,13 +10,13 @@ error_reporting=E_ALL & ~E_DEPRECATED
 --FILE--
 <?php
 /* Prototype  : int iconv_strpos(string haystack, string needle [, int offset [, string charset]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
 /*
  * Test how iconv_strpos() behaves when passed different integers as $offset argument
- * The character length of $string_ascii and $string_mb is the same, 
+ * The character length of $string_ascii and $string_mb is the same,
  * and the needle appears at the same positions in both strings
  */
 
diff --git a/ext/iconv/tests/iconv_strrpos_basic.phpt b/ext/iconv/tests/iconv_strrpos_basic.phpt
index 78dfaa0db1e..6f4991a462e 100644
--- a/ext/iconv/tests/iconv_strrpos_basic.phpt
+++ b/ext/iconv/tests/iconv_strrpos_basic.phpt
@@ -10,7 +10,7 @@ error_reporting=E_ALL & ~E_DEPRECATED
 --FILE--
 <?php
 /* Prototype  : proto int iconv_strrpos(string haystack, string needle [, string charset])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
diff --git a/ext/iconv/tests/iconv_strrpos_error1.phpt b/ext/iconv/tests/iconv_strrpos_error1.phpt
index 9d185c744d8..b9a18209335 100644
--- a/ext/iconv/tests/iconv_strrpos_error1.phpt
+++ b/ext/iconv/tests/iconv_strrpos_error1.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i
 --FILE--
 <?php
 /* Prototype  : proto int iconv_strrpos(string haystack, string needle [, string charset])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
diff --git a/ext/iconv/tests/iconv_strrpos_error2.phpt b/ext/iconv/tests/iconv_strrpos_error2.phpt
index ea72322807d..16b7a9def82 100644
--- a/ext/iconv/tests/iconv_strrpos_error2.phpt
+++ b/ext/iconv/tests/iconv_strrpos_error2.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i
 --FILE--
 <?php
 /* Prototype  : proto int iconv_strrpos(string haystack, string needle [, string charset])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
diff --git a/ext/iconv/tests/iconv_strrpos_variation1.phpt b/ext/iconv/tests/iconv_strrpos_variation1.phpt
index e4ed0113399..573c2ea517f 100644
--- a/ext/iconv/tests/iconv_strrpos_variation1.phpt
+++ b/ext/iconv/tests/iconv_strrpos_variation1.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i
 --FILE--
 <?php
 /* Prototype  : proto int iconv_strrpos(string haystack, string needle [, string charset])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
@@ -67,7 +67,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -76,7 +76,7 @@ $inputs = array(
 /*18*/ "hello, world",
        'hello, world',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_strrpos_variation2.phpt b/ext/iconv/tests/iconv_strrpos_variation2.phpt
index a0001f5269e..297a7589d38 100644
--- a/ext/iconv/tests/iconv_strrpos_variation2.phpt
+++ b/ext/iconv/tests/iconv_strrpos_variation2.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i
 --FILE--
 <?php
 /* Prototype  : proto int iconv_strrpos(string haystack, string needle [, string charset])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
@@ -67,7 +67,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -76,7 +76,7 @@ $inputs = array(
 /*18*/ "world",
        'world',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_strrpos_variation3.phpt b/ext/iconv/tests/iconv_strrpos_variation3.phpt
index 373e905173c..35e5056e0f3 100644
--- a/ext/iconv/tests/iconv_strrpos_variation3.phpt
+++ b/ext/iconv/tests/iconv_strrpos_variation3.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_strrpos') or die("skip iconv_strrpos() is not available i
 --FILE--
 <?php
 /* Prototype  : proto int iconv_strrpos(string haystack, string needle [, string charset])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/iconv/iconv.c
  */
 
@@ -68,7 +68,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -77,7 +77,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/iconv/tests/iconv_substr_basic.phpt b/ext/iconv/tests/iconv_substr_basic.phpt
index 2e33c5aa9b3..582529d54d1 100644
--- a/ext/iconv/tests/iconv_substr_basic.phpt
+++ b/ext/iconv/tests/iconv_substr_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test iconv_substr() function : basic functionality 
+Test iconv_substr() function : basic functionality
 --SKIPIF--
 <?php
 extension_loaded('iconv') or die('skip');
@@ -12,7 +12,7 @@ iconv.output_encoding=ISO-8859-1
 --FILE--
 <?php
 /* Prototype  : string iconv_substr(string str, int offset, [int length, string charset])
- * Description: Returns part of a string 
+ * Description: Returns part of a string
  * Source code: ext/iconv/iconv.c
  */
 
diff --git a/ext/iconv/tests/iconv_substr_error1.phpt b/ext/iconv/tests/iconv_substr_error1.phpt
index 7a30c7d5091..61c01dc0d09 100644
--- a/ext/iconv/tests/iconv_substr_error1.phpt
+++ b/ext/iconv/tests/iconv_substr_error1.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_substr') or die("skip iconv_substr() is not available in
 --FILE--
 <?php
 /* Prototype  : string iconv_substr(string str, int offset, [int length, string charset])
- * Description: Returns part of a string 
+ * Description: Returns part of a string
  * Source code: ext/iconv/iconv.c
  */
 
diff --git a/ext/iconv/tests/iconv_substr_error2.phpt b/ext/iconv/tests/iconv_substr_error2.phpt
index ac5081331b2..0bc0661026d 100644
--- a/ext/iconv/tests/iconv_substr_error2.phpt
+++ b/ext/iconv/tests/iconv_substr_error2.phpt
@@ -8,7 +8,7 @@ function_exists('iconv_substr') or die("skip iconv_substr() is not available in
 --FILE--
 <?php
 /* Prototype  : string iconv_substr(string str, int offset, [int length, string charset])
- * Description: Returns part of a string 
+ * Description: Returns part of a string
  * Source code: ext/iconv/iconv.c
  */
 
diff --git a/ext/iconv/tests/translit-failure.phpt b/ext/iconv/tests/translit-failure.phpt
index d8b9fbff839..2132e7e130f 100644
--- a/ext/iconv/tests/translit-failure.phpt
+++ b/ext/iconv/tests/translit-failure.phpt
@@ -3,7 +3,7 @@ Translit failure
 --SKIPIF--
 <?php
 include('skipif.inc');
-( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); 
+( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
 ?>
 --INI--
 error_reporting=2039
diff --git a/ext/iconv/tests/translit-utf8.phpt b/ext/iconv/tests/translit-utf8.phpt
index 0151dc385c3..c363eeeab69 100644
--- a/ext/iconv/tests/translit-utf8.phpt
+++ b/ext/iconv/tests/translit-utf8.phpt
@@ -3,7 +3,7 @@ Translit UTF-8 quotes
 --SKIPIF--
 <?php
 include('skipif.inc');
-( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); 
+( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
 ?>
 --INI--
 error_reporting=2047
diff --git a/ext/imap/tests/bug31142_1.phpt b/ext/imap/tests/bug31142_1.phpt
index efb92b7b45b..9afedf1c418 100644
--- a/ext/imap/tests/bug31142_1.phpt
+++ b/ext/imap/tests/bug31142_1.phpt
@@ -1,9 +1,9 @@
---TEST--                                 
+--TEST--
 Bug #31142 test #1 (imap_mail_compose() generates incorrect output)
 --SKIPIF--
 <?php
-        if (!extension_loaded("imap")) { 
-                die("skip imap extension not available");  
+        if (!extension_loaded("imap")) {
+                die("skip imap extension not available");
         }
 ?>
 --FILE--
diff --git a/ext/imap/tests/bug31142_2.phpt b/ext/imap/tests/bug31142_2.phpt
index 2a81760a7b9..c9eed598b3c 100644
--- a/ext/imap/tests/bug31142_2.phpt
+++ b/ext/imap/tests/bug31142_2.phpt
@@ -1,9 +1,9 @@
---TEST--                                 
+--TEST--
 Bug #31142 test #2 (imap_mail_compose() generates incorrect output)
 --SKIPIF--
 <?php
-        if (!extension_loaded("imap")) { 
-                die("skip imap extension not available");  
+        if (!extension_loaded("imap")) {
+                die("skip imap extension not available");
         }
 ?>
 --FILE--
diff --git a/ext/imap/tests/bug32589.phpt b/ext/imap/tests/bug32589.phpt
index c5030e8970a..52a73c6f237 100644
--- a/ext/imap/tests/bug32589.phpt
+++ b/ext/imap/tests/bug32589.phpt
@@ -1,9 +1,9 @@
---TEST--                                 
+--TEST--
 Bug #32589 (crash inside imap_mail_compose() function)
 --SKIPIF--
 <?php
-        if (!extension_loaded("imap")) { 
-                die("skip imap extension not available");  
+        if (!extension_loaded("imap")) {
+                die("skip imap extension not available");
         }
 ?>
 --FILE--
diff --git a/ext/imap/tests/bug35669.phpt b/ext/imap/tests/bug35669.phpt
index 1cc4e702b95..1f8ca5d7c36 100644
--- a/ext/imap/tests/bug35669.phpt
+++ b/ext/imap/tests/bug35669.phpt
@@ -1,9 +1,9 @@
---TEST--                                 
+--TEST--
 Bug #35669 (imap_mail_compose() crashes with multipart-multiboundary-email)
 --SKIPIF--
 <?php
-        if (!extension_loaded("imap")) { 
-                die("skip imap extension not available");  
+        if (!extension_loaded("imap")) {
+                die("skip imap extension not available");
         }
 ?>
 --FILE--
@@ -11,15 +11,15 @@ Bug #35669 (imap_mail_compose() crashes with multipart-multiboundary-email)
 	$envelope["from"] = 'Santa <somewhere@northpole.gov>';
         $envelope["to"]  = 'The bad smurf <bad@smurf.com>';
         $envelope['date'] = 'Wed, 04 Jan 2006 19:24:43 -0500';
-                
+
         $multipart["type"] = TYPEMULTIPART;
         $multipart["subtype"] = "MIXED";
         $body[] = $multipart; //add multipart stuff
-        
+
         $textpart["type"] = TYPEMULTIPART;
         $textpart["subtype"] = "ALTERNATIVE";
         $body[] = $textpart; //add body part
-        
+
         $plain["type"] = TYPETEXT;
         $plain["subtype"] = "PLAIN";
         $plain["charset"] = "iso-8859-1";
@@ -27,9 +27,9 @@ Bug #35669 (imap_mail_compose() crashes with multipart-multiboundary-email)
         $plain["description"] = "Plaintype part of message";
         $plain['disposition'] = "inline";
         $plain["contents.data"] = 'See mom, it will crash';
-        
+
         $body[] = $plain; //next add plain text part
-        
+
         $html["type"] = TYPETEXT;
         $html["subtype"] = "HTML";
         $html["charset"] = "iso-8859-1";
@@ -37,9 +37,9 @@ Bug #35669 (imap_mail_compose() crashes with multipart-multiboundary-email)
         $html["description"] = "HTML part of message";
         $html['disposition'] = "inline";
         $html["contents.data"] = 'See mom, it will <b>crash</b>';
-        
+
         $body[] = $html;
-        
+
         echo imap_mail_compose($envelope, $body);
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/bug40854.phpt b/ext/imap/tests/bug40854.phpt
index 3df81ea29de..970542cf954 100644
--- a/ext/imap/tests/bug40854.phpt
+++ b/ext/imap/tests/bug40854.phpt
@@ -1,9 +1,9 @@
---TEST--                                 
+--TEST--
 Bug #40854 (imap_mail_compose() creates an invalid terminator for multipart e-mails)
 --SKIPIF--
 <?php
-        if (!extension_loaded("imap")) { 
-                die("skip imap extension not available");  
+        if (!extension_loaded("imap")) {
+                die("skip imap extension not available");
         }
 ?>
 --FILE--
diff --git a/ext/imap/tests/bug44098.phpt b/ext/imap/tests/bug44098.phpt
index f758c117b60..c424f05f547 100644
--- a/ext/imap/tests/bug44098.phpt
+++ b/ext/imap/tests/bug44098.phpt
@@ -2,8 +2,8 @@
 Bug #44098 (imap_utf8() returns only capital letters)
 --SKIPIF--
 <?php
-        if (!extension_loaded("imap")) { 
-                die("skip imap extension not available");  
+        if (!extension_loaded("imap")) {
+                die("skip imap extension not available");
         }
 ?>
 --FILE--
diff --git a/ext/imap/tests/bug45705_1.phpt b/ext/imap/tests/bug45705_1.phpt
index eedaed0817f..f699451407e 100644
--- a/ext/imap/tests/bug45705_1.phpt
+++ b/ext/imap/tests/bug45705_1.phpt
@@ -2,8 +2,8 @@
 Bug #45705 test #1 (imap rfc822_parse_adrlist() modifies passed address parameter)
 --SKIPIF--
 <?php
-	if (!extension_loaded("imap")) { 
-		die("skip imap extension not available");  
+	if (!extension_loaded("imap")) {
+		die("skip imap extension not available");
 	}
 ?>
 --FILE--
diff --git a/ext/imap/tests/bug45705_2.phpt b/ext/imap/tests/bug45705_2.phpt
index 797d473178d..b8c1c295aee 100644
--- a/ext/imap/tests/bug45705_2.phpt
+++ b/ext/imap/tests/bug45705_2.phpt
@@ -2,8 +2,8 @@
 Bug #45705 test #2 (imap rfc822_parse_adrlist() modifies passed address parameter)
 --SKIPIF--
 <?php
-	if (!extension_loaded("imap")) { 
-		die("skip imap extension not available");  
+	if (!extension_loaded("imap")) {
+		die("skip imap extension not available");
 	}
 ?>
 --FILE--
diff --git a/ext/imap/tests/bug46918.phpt b/ext/imap/tests/bug46918.phpt
index 351becaf00c..adb7fb307b4 100644
--- a/ext/imap/tests/bug46918.phpt
+++ b/ext/imap/tests/bug46918.phpt
@@ -2,8 +2,8 @@
 Bug #46918 (imap_rfc822_parse_adrlist host part not filled in correctly)
 --SKIPIF--
 <?php
-        if (!extension_loaded("imap")) { 
-                die("skip imap extension not available");  
+        if (!extension_loaded("imap")) {
+                die("skip imap extension not available");
         }
 ?>
 --FILE--
diff --git a/ext/imap/tests/bug53377.phpt b/ext/imap/tests/bug53377.phpt
index 1a2173a09b9..dfe2d032ab6 100644
--- a/ext/imap/tests/bug53377.phpt
+++ b/ext/imap/tests/bug53377.phpt
@@ -2,8 +2,8 @@
 Bug #53377 (imap_mime_header_decode() doesn't ignore \t during long MIME header unfolding)
 --SKIPIF--
 <?php
-        if (!extension_loaded("imap")) { 
-                die("skip imap extension not available");  
+        if (!extension_loaded("imap")) {
+                die("skip imap extension not available");
         }
 ?>
 --FILE--
diff --git a/ext/imap/tests/imap_8bit_basic.phpt b/ext/imap/tests/imap_8bit_basic.phpt
index aaa05917223..799889bb3d2 100644
--- a/ext/imap/tests/imap_8bit_basic.phpt
+++ b/ext/imap/tests/imap_8bit_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test imap_8bit() function : basic functionality 
+Test imap_8bit() function : basic functionality
 --SKIPIF--
 <?php
 extension_loaded('imap') or die('skip imap extension not available in this build');
diff --git a/ext/imap/tests/imap_alerts_error.phpt b/ext/imap/tests/imap_alerts_error.phpt
index ee13b135034..2baefc3da16 100644
--- a/ext/imap/tests/imap_alerts_error.phpt
+++ b/ext/imap/tests/imap_alerts_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test imap_alerts() function : error conditions 
+Test imap_alerts() function : error conditions
 --SKIPIF--
 <?php
 require_once(dirname(__FILE__).'/skipif.inc');
@@ -7,9 +7,9 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : array imap_alerts(void)
- * Description: Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called. 
+ * Description: Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called.
  * Source code: ext/imap/php_imap.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing imap_alerts() : error conditions ***\n";
diff --git a/ext/imap/tests/imap_append_basic.phpt b/ext/imap/tests/imap_append_basic.phpt
index 60847ce7169..e46268533d1 100644
--- a/ext/imap/tests/imap_append_basic.phpt
+++ b/ext/imap/tests/imap_append_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test imap_append() function : basic functionality 
+Test imap_append() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 require_once(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
@@ -22,7 +22,7 @@ if (!is_resource($imap_stream)) {
 }
 
 $mb_details = imap_mailboxmsginfo($imap_stream);
-echo "Add a couple of msgs to new mailbox " . $mb_details->Mailbox . "\n"; 
+echo "Add a couple of msgs to new mailbox " . $mb_details->Mailbox . "\n";
 var_dump(imap_append($imap_stream, $mb_details->Mailbox
                    , "From: webmaster@something.com\r\n"
                    . "To: info@something.com\r\n"
@@ -30,15 +30,15 @@ var_dump(imap_append($imap_stream, $mb_details->Mailbox
                    . "\r\n"
                    . "this is a test message, please ignore\r\n"
                    ));
-                   
+
 var_dump(imap_append($imap_stream, $mb_details->Mailbox
                    , "From: webmaster@something.com\r\n"
                    . "To: info@something.com\r\n"
                    . "Subject: Another test\r\n"
                    . "\r\n"
                    . "this is another test message, please ignore it too!!\r\n"
-                   ));     
-                   
+                   ));
+
 $check = imap_check($imap_stream);
 echo "Msg Count after append : ". $check->Nmsgs . "\n";
 
@@ -49,7 +49,7 @@ imap_close($imap_stream);
 ?>
 ===Done===
 --CLEAN--
-<?php 
+<?php
 require_once('clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_base64_basic.phpt b/ext/imap/tests/imap_base64_basic.phpt
index f5cc6039f34..3557e9f87ee 100644
--- a/ext/imap/tests/imap_base64_basic.phpt
+++ b/ext/imap/tests/imap_base64_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test imap_base64() function : basic functionality 
+Test imap_base64() function : basic functionality
 --SKIPIF--
 <?php
 extension_loaded('imap') or die('skip imap extension not available in this build');
@@ -35,7 +35,7 @@ if (imap_base64($base64) == $hex) {
 	echo "TEST PASSED\n";
 } else {
 	echo "TEST FAILED";
-}		
+}
 
 ?>
 ===Done===
diff --git a/ext/imap/tests/imap_binary_basic.phpt b/ext/imap/tests/imap_binary_basic.phpt
index 3deb51a6a6c..4d5e3c43524 100644
--- a/ext/imap/tests/imap_binary_basic.phpt
+++ b/ext/imap/tests/imap_binary_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test imap_binary() function : basic functionality 
+Test imap_binary() function : basic functionality
 --SKIPIF--
 <?php
 extension_loaded('imap') or die('skip imap extension not available in this build');
@@ -18,7 +18,7 @@ $str = 'This is an example string to be base 64 encoded';
 $base64 = imap_binary($str);
 var_dump(bin2hex($base64));
 
-echo "Encode a string which results in more than 60 charters of output\n"; 
+echo "Encode a string which results in more than 60 charters of output\n";
 $str = 'This is a long string with results in more than 60 characters of output';
 $base64 = imap_binary($str);
 var_dump(bin2hex($base64));
diff --git a/ext/imap/tests/imap_body.phpt b/ext/imap/tests/imap_body.phpt
index 40f35f07aa5..1c75a944267 100644
--- a/ext/imap/tests/imap_body.phpt
+++ b/ext/imap/tests/imap_body.phpt
@@ -16,7 +16,7 @@ echo  "Checking with incorrect parameter type\n";
 imap_body('');
 imap_body(false);
 require_once(dirname(__FILE__).'/imap_include.inc');
-$stream_id = imap_open($default_mailbox, $username, $password) or 
+$stream_id = imap_open($default_mailbox, $username, $password) or
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
 imap_body($stream_id);
 imap_body($stream_id,-1);
diff --git a/ext/imap/tests/imap_body_basic.phpt b/ext/imap/tests/imap_body_basic.phpt
index 640738b2507..3cfe3e3d6b6 100644
--- a/ext/imap/tests/imap_body_basic.phpt
+++ b/ext/imap/tests/imap_body_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test imap_body() function : basic functionality 
+Test imap_body() function : basic functionality
 --SKIPIF--
 <?php
 require_once(dirname(__FILE__).'/skipif.inc');
@@ -22,8 +22,8 @@ if (!is_resource($imap_stream)) {
 }
 
 $check = imap_check($imap_stream);
-echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";    
-    
+echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";
+
 // show body for msg 1
 var_dump(imap_body($imap_stream, 1));
 
@@ -34,7 +34,7 @@ imap_close($imap_stream);
 ?>
 ===Done===
 --CLEAN--
-<?php 
+<?php
 require_once('clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_bodystruct_basic.phpt b/ext/imap/tests/imap_bodystruct_basic.phpt
index cc643a6b519..a5db378c008 100644
--- a/ext/imap/tests/imap_bodystruct_basic.phpt
+++ b/ext/imap/tests/imap_bodystruct_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test imap_bodystruct() function : basic functionality 
+Test imap_bodystruct() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 require_once(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
@@ -20,10 +20,10 @@ if (!is_resource($imap_stream)) {
 	exit("TEST FAILED: Unable to create test mailbox\n");
 }
 
-echo "\nGet and validate structure of body part 1\n"; 
+echo "\nGet and validate structure of body part 1\n";
+
+$m = imap_bodystruct($imap_stream, 1, "1");
 
-$m = imap_bodystruct($imap_stream, 1, "1"); 
- 
 $mandatoryFields = array(
                     'ifsubtype',
                     'ifdescription',
@@ -33,9 +33,9 @@ $mandatoryFields = array(
                     'ifparameters',
                     );
 
-foreach($mandatoryFields as $mf) 
+foreach($mandatoryFields as $mf)
 {
-  if(isValid($m->$mf)) 
+  if(isValid($m->$mf))
   {
     echo "$mf is 0 or 1\n";
   }
@@ -45,32 +45,32 @@ foreach($mandatoryFields as $mf)
   }
 }
 
-if(is_array($m->parameters)) 
+if(is_array($m->parameters))
 {
   echo "parameters is an array\n";
 }
 
 echo "\nTry to get part 4!\n";
-var_dump(imap_bodystruct($imap_stream, 1, "4")); 
+var_dump(imap_bodystruct($imap_stream, 1, "4"));
 
 imap_close($imap_stream);
 
-function isValid($param) 
+function isValid($param)
 {
- if(($param == 0) || ($param == 1)) 
+ if(($param == 0) || ($param == 1))
  {
    $result=true;
  }
  else
  {
    $result=false;
- } 
+ }
 return $result;
 }
 ?>
 ===Done===
 --CLEAN--
-<?php 
+<?php
 require_once('clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_clearflag_full_basic.phpt b/ext/imap/tests/imap_clearflag_full_basic.phpt
index 4269688e14d..359c3af28c4 100644
--- a/ext/imap/tests/imap_clearflag_full_basic.phpt
+++ b/ext/imap/tests/imap_clearflag_full_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test imap_clearflag_full() function : basic functionality 
+Test imap_clearflag_full() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 require_once(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
@@ -24,7 +24,7 @@ if (!is_resource($imap_stream)) {
 $check = imap_check($imap_stream);
 echo "Initial msg count in new_mailbox : ". $check->Nmsgs . "\n";
 
-echo "Set some flags\n"; 
+echo "Set some flags\n";
 var_dump(imap_setflag_full($imap_stream, "1,3", "\\Seen \\Answered"));
 var_dump(imap_setflag_full($imap_stream, "2,4", "\\Answered"));
 var_dump(imap_setflag_full($imap_stream, "5,7", "\\Flagged \\Deleted"));
@@ -49,7 +49,7 @@ imap_close($imap_stream);
 ?>
 ===Done===
 --CLEAN--
-<?php 
+<?php
 require_once('clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_close_basic.phpt b/ext/imap/tests/imap_close_basic.phpt
index a99853071b3..bbb78bfbf96 100644
--- a/ext/imap/tests/imap_close_basic.phpt
+++ b/ext/imap/tests/imap_close_basic.phpt
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : bool imap_close(resource $stream_id [, int $options])
- * Description: Close an IMAP stream 
+ * Description: Close an IMAP stream
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/ext/imap/tests/imap_close_error.phpt b/ext/imap/tests/imap_close_error.phpt
index fd32f3edd8f..89cafab3bac 100644
--- a/ext/imap/tests/imap_close_error.phpt
+++ b/ext/imap/tests/imap_close_error.phpt
@@ -7,7 +7,7 @@ require_once (dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : bool imap_close(resource $stream_id [, int $options])
- * Description: Close an IMAP stream 
+ * Description: Close an IMAP stream
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/ext/imap/tests/imap_close_variation1.phpt b/ext/imap/tests/imap_close_variation1.phpt
index 4de03ddc523..493b5bf0127 100644
--- a/ext/imap/tests/imap_close_variation1.phpt
+++ b/ext/imap/tests/imap_close_variation1.phpt
@@ -7,7 +7,7 @@ extension_loaded('imap') or die('skip imap extension not available in this build
 --FILE--
 <?php
 /* Prototype  : bool imap_close(resource $stream_id [, int $options])
- * Description: Close an IMAP stream 
+ * Description: Close an IMAP stream
  * Source code: ext/imap/php_imap.c
  */
 
@@ -59,7 +59,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -69,7 +69,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/imap/tests/imap_close_variation2.phpt b/ext/imap/tests/imap_close_variation2.phpt
index f1d36d0abe8..14ccd62b987 100644
--- a/ext/imap/tests/imap_close_variation2.phpt
+++ b/ext/imap/tests/imap_close_variation2.phpt
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : bool imap_close(resource $stream_id [, int $options])
- * Description: Close an IMAP stream 
+ * Description: Close an IMAP stream
  * Source code: ext/imap/php_imap.c
  */
 
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
diff --git a/ext/imap/tests/imap_close_variation3.phpt b/ext/imap/tests/imap_close_variation3.phpt
index 6f6161aa235..777ca07124c 100644
--- a/ext/imap/tests/imap_close_variation3.phpt
+++ b/ext/imap/tests/imap_close_variation3.phpt
@@ -7,7 +7,7 @@ extension_loaded('imap') or die('skip imap extension not available in this build
 --FILE--
 <?php
 /* Prototype  : bool imap_close(resource $stream_id [, int $options])
- * Description: Close an IMAP stream 
+ * Description: Close an IMAP stream
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/ext/imap/tests/imap_close_variation4.phpt b/ext/imap/tests/imap_close_variation4.phpt
index ca82619d42c..7a2d59b9b16 100644
--- a/ext/imap/tests/imap_close_variation4.phpt
+++ b/ext/imap/tests/imap_close_variation4.phpt
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : bool imap_close(resource $stream_id [, int $options])
- * Description: Close an IMAP stream 
+ * Description: Close an IMAP stream
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/ext/imap/tests/imap_createmailbox_basic.phpt b/ext/imap/tests/imap_createmailbox_basic.phpt
index 431d59f97d3..e827af5960e 100644
--- a/ext/imap/tests/imap_createmailbox_basic.phpt
+++ b/ext/imap/tests/imap_createmailbox_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test imap_createmailbox() function : basic functionality 
+Test imap_createmailbox() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 require_once(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
@@ -15,7 +15,7 @@ echo "*** Testing imap_createmailbox() : basic functionality ***\n";
 
 require_once(dirname(__FILE__).'/imap_include.inc');
 
-$imap_stream = imap_open($default_mailbox, $username, $password) or 
+$imap_stream = imap_open($default_mailbox, $username, $password) or
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
 
 $newname = "phpnewbox";
@@ -25,8 +25,8 @@ echo "Newname will be '$newname'\n";
 $newbox = imap_utf7_encode($server.$newname);
 if (imap_createmailbox($imap_stream, $newbox)) {
 
-	echo "Add a couple of msgs to '$newname' mailbox\n"; 
-	populate_mailbox($imap_stream, $newbox, 2);	
+	echo "Add a couple of msgs to '$newname' mailbox\n";
+	populate_mailbox($imap_stream, $newbox, 2);
 
     $status = imap_status($imap_stream, $newbox, SA_ALL);
     if ($status) {
@@ -36,7 +36,7 @@ if (imap_createmailbox($imap_stream, $newbox)) {
         echo "Unseen:      " . $status->unseen      . "\n";
         echo "UIDnext:     " . $status->uidnext     . "\n";
         echo "UIDvalidity: " . $status->uidvalidity . "\n";
-       
+
     } else {
         echo "imap_status on new mailbox failed: " . imap_last_error() . "\n";
     }
diff --git a/ext/imap/tests/imap_errors_basic.phpt b/ext/imap/tests/imap_errors_basic.phpt
index 91be3286aae..e4c77213931 100644
--- a/ext/imap/tests/imap_errors_basic.phpt
+++ b/ext/imap/tests/imap_errors_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test imap_errors() function : basic functionality 
+Test imap_errors() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 require_once(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
@@ -13,19 +13,19 @@ require_once(dirname(__FILE__).'/skipif.inc');
 
 echo "*** Testing imap_errors() : basic functionality ***\n";
 require_once(dirname(__FILE__).'/imap_include.inc');
-$password = "bogus"; // invalid password to use in this test 
+$password = "bogus"; // invalid password to use in this test
 
 echo "Issue open with invalid password with normal default number of retries, i.e 3\n";
 $mbox = imap_open($default_mailbox, $username, $password, OP_READONLY, 3);
 
 echo "List any errors\n";
-var_dump(imap_errors()); 
+var_dump(imap_errors());
 
 echo "\n\nIssue open with invalid password with retries == 1\n";
 $mbox = imap_open($default_mailbox, $username, $password, OP_READONLY, 1);
 
 echo "List any errors\n";
-var_dump(imap_errors()); 
+var_dump(imap_errors());
 ?>
 ===Done===
 --EXPECTF--
diff --git a/ext/imap/tests/imap_fetch_overview_basic.phpt b/ext/imap/tests/imap_fetch_overview_basic.phpt
index 83fab123912..152eaae9da0 100644
--- a/ext/imap/tests/imap_fetch_overview_basic.phpt
+++ b/ext/imap/tests/imap_fetch_overview_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test imap_fetch_overview() function : basic functionality 
+Test imap_fetch_overview() function : basic functionality
 --SKIPIF--
 <?php
 require_once(dirname(__FILE__).'/skipif.inc');
@@ -7,8 +7,8 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers 
- * of the given message sequence 
+ * Description: Read an overview of the information in the headers
+ * of the given message sequence
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/ext/imap/tests/imap_fetch_overview_error.phpt b/ext/imap/tests/imap_fetch_overview_error.phpt
index e300e629280..78510d6bd15 100644
--- a/ext/imap/tests/imap_fetch_overview_error.phpt
+++ b/ext/imap/tests/imap_fetch_overview_error.phpt
@@ -7,8 +7,8 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers 
- * of the given message sequence 
+ * Description: Read an overview of the information in the headers
+ * of the given message sequence
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/ext/imap/tests/imap_fetch_overview_variation1.phpt b/ext/imap/tests/imap_fetch_overview_variation1.phpt
index 437cdcfa8af..f4b696a34e5 100644
--- a/ext/imap/tests/imap_fetch_overview_variation1.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation1.phpt
@@ -7,8 +7,8 @@ extension_loaded('imap') or die('skip imap extension not available in this build
 --FILE--
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers 
- * of the given message sequence 
+ * Description: Read an overview of the information in the headers
+ * of the given message sequence
  * Source code: ext/imap/php_imap.c
  */
 
@@ -63,7 +63,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -73,7 +73,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/imap/tests/imap_fetch_overview_variation2.phpt b/ext/imap/tests/imap_fetch_overview_variation2.phpt
index fbc0319fe84..0751c40816c 100644
--- a/ext/imap/tests/imap_fetch_overview_variation2.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation2.phpt
@@ -7,8 +7,8 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers 
- * of the given message sequence 
+ * Description: Read an overview of the information in the headers
+ * of the given message sequence
  * Source code: ext/imap/php_imap.c
  */
 
@@ -67,7 +67,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -77,7 +77,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/imap/tests/imap_fetch_overview_variation3.phpt b/ext/imap/tests/imap_fetch_overview_variation3.phpt
index 7bd78d899ef..a3543078a38 100644
--- a/ext/imap/tests/imap_fetch_overview_variation3.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation3.phpt
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers of the given message sequence 
+ * Description: Read an overview of the information in the headers of the given message sequence
  * Source code: ext/imap/php_imap.c
  */
 
@@ -28,13 +28,13 @@ $msg_uid = imap_uid($stream_id, $msg_no);
 
 $options = array ('1',
                   true,
-                  1.000000000000001, 
-                  0.00001e5, 
-                  PHP_INT_MAX, 
+                  1.000000000000001,
+                  0.00001e5,
+                  PHP_INT_MAX,
                   -PHP_INT_MAX
                  );
 
-// iterate over each element of $options array 
+// iterate over each element of $options array
 $iterator = 1;
 imap_check($stream_id);
 foreach($options as $option) {
diff --git a/ext/imap/tests/imap_fetch_overview_variation4.phpt b/ext/imap/tests/imap_fetch_overview_variation4.phpt
index a5c26663107..4798344830b 100644
--- a/ext/imap/tests/imap_fetch_overview_variation4.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation4.phpt
@@ -7,8 +7,8 @@ extension_loaded('imap') or die('skip imap extension not available in this build
 --FILE--
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers 
- * of the given message sequence 
+ * Description: Read an overview of the information in the headers
+ * of the given message sequence
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/ext/imap/tests/imap_fetch_overview_variation5.phpt b/ext/imap/tests/imap_fetch_overview_variation5.phpt
index 5feeedb523f..d713a33934f 100644
--- a/ext/imap/tests/imap_fetch_overview_variation5.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test imap_fetch_overview() function : usage variations - $msg_no argument 
+Test imap_fetch_overview() function : usage variations - $msg_no argument
 --SKIPIF--
 <?php
 require_once(dirname(__FILE__).'/skipif.inc');
@@ -7,8 +7,8 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers 
- * of the given message sequence 
+ * Description: Read an overview of the information in the headers
+ * of the given message sequence
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/ext/imap/tests/imap_fetch_overview_variation6.phpt b/ext/imap/tests/imap_fetch_overview_variation6.phpt
index bdf05579de9..4c2d3234f79 100644
--- a/ext/imap/tests/imap_fetch_overview_variation6.phpt
+++ b/ext/imap/tests/imap_fetch_overview_variation6.phpt
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers of the given message sequence 
+ * Description: Read an overview of the information in the headers of the given message sequence
  * Source code: ext/imap/php_imap.c
  */
 
@@ -47,17 +47,17 @@ function create_multipart_message($imap_stream, $mailbox) {
 
 	$part1["type"] = TYPEMULTIPART;
 	$part1["subtype"] = "mixed";
-		
+
 	$part2["type"] = TYPETEXT;
 	$part2["subtype"] = "plain";
 	$part2["description"] = "imap_mail_compose() function";
 	$part2["contents.data"] = "message 1:xxxxxxxxxxxxxxxxxxxxxxxxxx";
-		
+
 	$part3["type"] = TYPETEXT;
 	$part3["subtype"] = "plain";
 	$part3["description"] = "Example";
 	$part3["contents.data"] = "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy";
-		
+
 	$file_handle = fopen(__FILE__, 'r+');
 	$file_size = 1;
 
@@ -69,12 +69,12 @@ function create_multipart_message($imap_stream, $mailbox) {
 	$part4['disposition'] = array ('filename' => 'Test');
 	$part4['type.parameters'] = array('name' => 'Test');
 	$part4["contents.data"] = base64_encode(fread($file_handle, 1));
-		
+
 	$body[1] = $part1;
 	$body[2] = $part2;
 	$body[3] = $part3;
 	$body[4] = $part4;
-		
+
 	$msg = imap_mail_compose($envelope, $body);
 
 	if (imap_append($imap_stream, $mailbox, $msg) === false) {
diff --git a/ext/imap/tests/imap_fetchbody_basic.phpt b/ext/imap/tests/imap_fetchbody_basic.phpt
index c821f2046e2..2986f0e89ec 100644
--- a/ext/imap/tests/imap_fetchbody_basic.phpt
+++ b/ext/imap/tests/imap_fetchbody_basic.phpt
@@ -6,9 +6,9 @@ require_once(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section
  *           [, int $options])
- * Description: Get a specific body section 
+ * Description: Get a specific body section
  * Source code: ext/imap/php_imap.c
  */
 
@@ -34,14 +34,14 @@ foreach ($options as $key => $option) {
 		$msg_uid = imap_uid($stream_id, $msg_no);
 		var_dump( imap_fetchbody($stream_id, $msg_uid, $section, $option) );
 		break;
-		
+
 		case 'FT_PEEK';
 		var_dump( imap_fetchbody($stream_id, $msg_no, $section, $option) );
 		$overview = imap_fetch_overview($stream_id, 1);
 		echo "Seen Flag: ";
 		var_dump( $overview[0]->seen );
 		break;
-		
+
 		case 'FT_INTERNAL';
 		var_dump( imap_fetchbody($stream_id, $msg_no, $section, $option) );
 		break;
diff --git a/ext/imap/tests/imap_fetchbody_error.phpt b/ext/imap/tests/imap_fetchbody_error.phpt
index f496fbd7691..a91599a3050 100644
--- a/ext/imap/tests/imap_fetchbody_error.phpt
+++ b/ext/imap/tests/imap_fetchbody_error.phpt
@@ -6,9 +6,9 @@ require_once(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-/* Prototype  :string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
+/* Prototype  :string imap_fetchbody(resource $stream_id, int $msg_no, string $section
  *          [, int $options])
- * Description: Get a specific body section 
+ * Description: Get a specific body section
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/ext/imap/tests/imap_fetchbody_variation1.phpt b/ext/imap/tests/imap_fetchbody_variation1.phpt
index ac9087c3a2b..1e207843a6a 100644
--- a/ext/imap/tests/imap_fetchbody_variation1.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation1.phpt
@@ -6,9 +6,9 @@ extension_loaded('imap') or die('skip imap extension not available in this build
 ?>
 --FILE--
 <?php
-/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section
  *           [, int $options])
- * Description: Get a specific body section 
+ * Description: Get a specific body section
  * Source code: ext/imap/php_imap.c
  */
 
@@ -64,7 +64,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -74,7 +74,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/imap/tests/imap_fetchbody_variation2.phpt b/ext/imap/tests/imap_fetchbody_variation2.phpt
index 8565e233c9b..9093b516c26 100644
--- a/ext/imap/tests/imap_fetchbody_variation2.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation2.phpt
@@ -6,9 +6,9 @@ require_once(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section
  *           [, int $options])
- * Description: Get a specific body section 
+ * Description: Get a specific body section
  * Source code: ext/imap/php_imap.c
  */
 
@@ -66,7 +66,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -76,7 +76,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/imap/tests/imap_fetchbody_variation3.phpt b/ext/imap/tests/imap_fetchbody_variation3.phpt
index 19656a1df30..560f2b82424 100644
--- a/ext/imap/tests/imap_fetchbody_variation3.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation3.phpt
@@ -6,9 +6,9 @@ require_once(dirname(__FILE__).'/skipif.inc');
 ?>
 --FILE--
 <?php
-/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section
  *           [, int $options])
- * Description: Get a specific body section 
+ * Description: Get a specific body section
  * Source code: ext/imap/php_imap.c
  */
 
@@ -66,7 +66,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -76,7 +76,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/imap/tests/imap_fetchbody_variation4.phpt b/ext/imap/tests/imap_fetchbody_variation4.phpt
index d8126bce0e7..de336e4d50c 100644
--- a/ext/imap/tests/imap_fetchbody_variation4.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation4.phpt
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section [, int $options])
- * Description: Get a specific body section 
+ * Description: Get a specific body section
  * Source code: ext/imap/php_imap.c
  */
 
@@ -27,8 +27,8 @@ $msg_uid = imap_uid($stream_id, $msg_no);
 $section = 1;
 
 //Note: the first four values are valid as they will all be cast to 1L.
-$options = array ('1', true, 
-                  1.000000000000001, 0.00001e5, 
+$options = array ('1', true,
+                  1.000000000000001, 0.00001e5,
                   PHP_INT_MAX, -PHP_INT_MAX);
 
 // iterate over each element of $options array to test whether FT_UID is set
diff --git a/ext/imap/tests/imap_fetchbody_variation5.phpt b/ext/imap/tests/imap_fetchbody_variation5.phpt
index dfc5e9fa55c..50589e4d0b8 100644
--- a/ext/imap/tests/imap_fetchbody_variation5.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation5.phpt
@@ -6,9 +6,9 @@ extension_loaded('imap') or die('skip imap extension not available in this build
 ?>
 --FILE--
 <?php
-/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section
  *           [, int options])
- * Description: Get a specific body section 
+ * Description: Get a specific body section
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/ext/imap/tests/imap_fetchbody_variation6.phpt b/ext/imap/tests/imap_fetchbody_variation6.phpt
index 96f754b625c..ba3f7889354 100644
--- a/ext/imap/tests/imap_fetchbody_variation6.phpt
+++ b/ext/imap/tests/imap_fetchbody_variation6.phpt
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section [, int $options])
- * Description: Get a specific body section 
+ * Description: Get a specific body section
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/ext/imap/tests/imap_fetchheader_basic.phpt b/ext/imap/tests/imap_fetchheader_basic.phpt
index 5502c55fc47..70bb66b2bd2 100644
--- a/ext/imap/tests/imap_fetchheader_basic.phpt
+++ b/ext/imap/tests/imap_fetchheader_basic.phpt
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
- * Description: Get the full unfiltered header for a message 
+ * Description: Get the full unfiltered header for a message
  * Source code: ext/imap/php_imap.c
  */
 
@@ -17,7 +17,7 @@ require_once(dirname(__FILE__).'/imap_include.inc');
 // Initialise all required variables
 $stream_id = setup_test_mailbox('', 1, $mailbox, 'multiPart'); // setup temp mailbox with 1 msg
 $msg_no = 1;
-$options = array('FT_UID' => FT_UID, 'FT_INTERNAL' => FT_INTERNAL, 
+$options = array('FT_UID' => FT_UID, 'FT_INTERNAL' => FT_INTERNAL,
                  'FT_PREFETCHTEXT' => FT_PREFETCHTEXT);
 
 // Calling imap_fetchheader() with all possible arguments
diff --git a/ext/imap/tests/imap_fetchheader_error.phpt b/ext/imap/tests/imap_fetchheader_error.phpt
index e2f5b1260bc..77f6002eb5e 100644
--- a/ext/imap/tests/imap_fetchheader_error.phpt
+++ b/ext/imap/tests/imap_fetchheader_error.phpt
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
- * Description: Get the full unfiltered header for a message 
+ * Description: Get the full unfiltered header for a message
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/ext/imap/tests/imap_fetchheader_variation1.phpt b/ext/imap/tests/imap_fetchheader_variation1.phpt
index 22d56b1bd3e..68b9e6e6cce 100644
--- a/ext/imap/tests/imap_fetchheader_variation1.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation1.phpt
@@ -7,7 +7,7 @@ extension_loaded('imap') or die('skip imap extension not available in this build
 --FILE--
 <?php
 /* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
- * Description: Get the full unfiltered header for a message 
+ * Description: Get the full unfiltered header for a message
  * Source code: ext/imap/php_imap.c
  */
 
@@ -69,7 +69,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -78,14 +78,14 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // array data
 /*21*/ array(),
        $index_array,
        $assoc_array,
        array('foo', $index_array, $assoc_array),
-       
-       
+
+
        // object data
 /*25*/ new classA(),
 
diff --git a/ext/imap/tests/imap_fetchheader_variation2.phpt b/ext/imap/tests/imap_fetchheader_variation2.phpt
index 64ed2be3190..5f3abcf2d55 100644
--- a/ext/imap/tests/imap_fetchheader_variation2.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation2.phpt
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
- * Description: Get the full unfiltered header for a message 
+ * Description: Get the full unfiltered header for a message
  * Source code: ext/imap/php_imap.c
  */
 
@@ -69,7 +69,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -78,14 +78,14 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // array data
 /*21*/ array(),
        $index_array,
        $assoc_array,
        array('foo', $index_array, $assoc_array),
-       
-       
+
+
        // object data
 /*25*/ new classA(),
 
diff --git a/ext/imap/tests/imap_fetchheader_variation3.phpt b/ext/imap/tests/imap_fetchheader_variation3.phpt
index feba766e685..728f8c38999 100644
--- a/ext/imap/tests/imap_fetchheader_variation3.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation3.phpt
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
- * Description: Get the full unfiltered header for a message 
+ * Description: Get the full unfiltered header for a message
  * Source code: ext/imap/php_imap.c
  */
 
@@ -26,8 +26,8 @@ $stream_id = setup_test_mailbox('', 1); // set up temporary mailbox with one sim
 $msg_no = 1;
 $msg_uid = imap_uid($stream_id, $msg_no);
 
-$options = array ('1', true, 
-                  1.000000000000001, 0.00001e5, 
+$options = array ('1', true,
+                  1.000000000000001, 0.00001e5,
                   PHP_INT_MAX, -PHP_INT_MAX);
 
 // iterate over each element of $options array to test whether FT_UID is set
diff --git a/ext/imap/tests/imap_fetchheader_variation4.phpt b/ext/imap/tests/imap_fetchheader_variation4.phpt
index b4b19e3d378..ad45f4d39da 100644
--- a/ext/imap/tests/imap_fetchheader_variation4.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation4.phpt
@@ -7,7 +7,7 @@ extension_loaded('imap') or die('skip imap extension not available in this build
 --FILE--
 <?php
 /* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
- * Description: Get the full unfiltered header for a message 
+ * Description: Get the full unfiltered header for a message
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/ext/imap/tests/imap_fetchheader_variation5.phpt b/ext/imap/tests/imap_fetchheader_variation5.phpt
index 0554ef01029..bdd6f6de606 100644
--- a/ext/imap/tests/imap_fetchheader_variation5.phpt
+++ b/ext/imap/tests/imap_fetchheader_variation5.phpt
@@ -7,12 +7,12 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
- * Description: Get the full unfiltered header for a message 
+ * Description: Get the full unfiltered header for a message
  * Source code: ext/imap/php_imap.c
  */
 
 /*
- * Pass different integers and strings as $msg_no argument 
+ * Pass different integers and strings as $msg_no argument
  * to test behaviour of imap_fetchheader()
  */
 
@@ -24,7 +24,7 @@ $stream_id = setup_test_mailbox('', 3, $mailbox, 'notSimple'); // set up temp ma
 
 $sequences = array (0,     4, // out of range
                     '1,3', '1:3', // message sequences instead of numbers
-                    ); 
+                    );
 
 foreach($sequences as $msg_no) {
 	echo "\n-- \$msg_no is $msg_no --\n";
diff --git a/ext/imap/tests/imap_gc_error.phpt b/ext/imap/tests/imap_gc_error.phpt
index 8738b7dd827..1a14ec1fed5 100644
--- a/ext/imap/tests/imap_gc_error.phpt
+++ b/ext/imap/tests/imap_gc_error.phpt
@@ -17,7 +17,7 @@ imap_gc('', false);
 imap_gc(false, false);
 
 require_once(dirname(__FILE__).'/imap_include.inc');
-$stream_id = imap_open($default_mailbox, $username, $password) or 
+$stream_id = imap_open($default_mailbox, $username, $password) or
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
 imap_gc($stream_id, -1);
 
diff --git a/ext/imap/tests/imap_getsubscribed_basic.phpt b/ext/imap/tests/imap_getsubscribed_basic.phpt
index ba8a42daa84..63617686b1d 100644
--- a/ext/imap/tests/imap_getsubscribed_basic.phpt
+++ b/ext/imap/tests/imap_getsubscribed_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-imap_getsubscribed() function : basic functionality 
+imap_getsubscribed() function : basic functionality
 --CREDITS--
 Olivier Doucet
 --SKIPIF--
@@ -16,7 +16,7 @@ imap_getsubscribed('');
 imap_getsubscribed(false);
 
 require_once(dirname(__FILE__).'/imap_include.inc');
-$stream_id = imap_open($default_mailbox, $username, $password) or 
+$stream_id = imap_open($default_mailbox, $username, $password) or
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
 
 imap_getsubscribed($stream_id);
@@ -39,7 +39,7 @@ var_dump($z[0]);
 imap_close($stream_id);
 ?>
 --CLEAN--
-<?php 
+<?php
 require_once('clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_headerinfo_basic.phpt b/ext/imap/tests/imap_headerinfo_basic.phpt
index b772476afcb..afee066f4a3 100644
--- a/ext/imap/tests/imap_headerinfo_basic.phpt
+++ b/ext/imap/tests/imap_headerinfo_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-imap_headerinfo() function : basic functionality 
+imap_headerinfo() function : basic functionality
 --CREDITS--
 Olivier Doucet
 --SKIPIF--
@@ -16,7 +16,7 @@ $z = imap_headerinfo($stream_id, 1);
 
 $fields = array ('toaddress','to','fromaddress','from',
 'reply_toaddress','reply_to',
-	'senderaddress', 'sender', 
+	'senderaddress', 'sender',
 'subject','Subject',
 	'Recent','Unseen','Flagged','Answered','Deleted','Draft',
 	'Msgno','MailDate','Size','udate');
@@ -84,7 +84,7 @@ imap_close($stream_id);
 
 ?>
 --CLEAN--
-<?php 
+<?php
 require_once('clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_headerinfo_error.phpt b/ext/imap/tests/imap_headerinfo_error.phpt
index b526096fe15..9869c3472e2 100644
--- a/ext/imap/tests/imap_headerinfo_error.phpt
+++ b/ext/imap/tests/imap_headerinfo_error.phpt
@@ -16,9 +16,9 @@ imap_headerinfo('');
 imap_headerinfo(false);
 
 require_once(dirname(__FILE__).'/imap_include.inc');
-$stream_id = imap_open($default_mailbox, $username, $password) or 
+$stream_id = imap_open($default_mailbox, $username, $password) or
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
-	
+
 imap_headerinfo($stream_id);
 
 imap_close($stream_id);
diff --git a/ext/imap/tests/imap_list_basic.phpt b/ext/imap/tests/imap_list_basic.phpt
index 36f07f755aa..436cd5c3a34 100644
--- a/ext/imap/tests/imap_list_basic.phpt
+++ b/ext/imap/tests/imap_list_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-imap_list() function : basic functionality 
+imap_list() function : basic functionality
 --CREDITS--
 Olivier Doucet
 --SKIPIF--
@@ -16,7 +16,7 @@ imap_list('');
 imap_list(false);
 
 require_once(dirname(__FILE__).'/imap_include.inc');
-$stream_id = imap_open($default_mailbox, $username, $password) or 
+$stream_id = imap_open($default_mailbox, $username, $password) or
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
 
 imap_list($stream_id);
diff --git a/ext/imap/tests/imap_lsub_basic.phpt b/ext/imap/tests/imap_lsub_basic.phpt
index 153ca2a1bfa..7775ec0c3ee 100644
--- a/ext/imap/tests/imap_lsub_basic.phpt
+++ b/ext/imap/tests/imap_lsub_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-imap_lsub() function : basic functionality 
+imap_lsub() function : basic functionality
 --CREDITS--
 Olivier Doucet
 --SKIPIF--
@@ -16,7 +16,7 @@ imap_lsub('');
 imap_lsub(false);
 
 require_once(dirname(__FILE__).'/imap_include.inc');
-$stream_id = imap_open($default_mailbox, $username, $password) or 
+$stream_id = imap_open($default_mailbox, $username, $password) or
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
 
 imap_lsub($stream_id);
@@ -39,7 +39,7 @@ var_dump($z[0]);
 imap_close($stream_id);
 ?>
 --CLEAN--
-<?php 
+<?php
 require_once('clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_mail_copy.phpt b/ext/imap/tests/imap_mail_copy.phpt
index 47c5e61bb07..fc6d7e56a27 100644
--- a/ext/imap/tests/imap_mail_copy.phpt
+++ b/ext/imap/tests/imap_mail_copy.phpt
@@ -22,9 +22,9 @@ require_once(dirname(__FILE__).'/imap_include.inc');
 
 
 echo "Test with IMAP server\n";
-$stream_id = imap_open($default_mailbox, $username, $password) or 
+$stream_id = imap_open($default_mailbox, $username, $password) or
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
-	
+
 var_dump(imap_mail_copy($stream_id));
 var_dump(imap_mail_copy($stream_id,-1));
 var_dump(imap_mail_copy($stream_id, ''));
diff --git a/ext/imap/tests/imap_mail_copy_basic.phpt b/ext/imap/tests/imap_mail_copy_basic.phpt
index a7b9421e31d..05cb128a61e 100644
--- a/ext/imap/tests/imap_mail_copy_basic.phpt
+++ b/ext/imap/tests/imap_mail_copy_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test imap_mail_copy() function : basic functionality 
+Test imap_mail_copy() function : basic functionality
 --CREDITS--
 Olivier Doucet
 --SKIPIF--
@@ -9,7 +9,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : bool imap_mail_copy  ( resource $imap_stream  , string $msglist  , string $mailbox  [, int $options = 0  ] )
- * Description: Copies mail messages specified by msglist  to specified mailbox. 
+ * Description: Copies mail messages specified by msglist  to specified mailbox.
  * Source code: ext/imap/php_imap.c
  */
 
@@ -25,7 +25,7 @@ if (!is_resource($imap_stream)) {
 }
 
 $check = imap_check($imap_stream);
-echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";    
+echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";
 
 var_dump(imap_mail_copy($imap_stream, '1', 'INBOX.'.$mailbox_prefix));
 
@@ -33,7 +33,7 @@ imap_close($imap_stream);
 ?>
 ===Done===
 --CLEAN--
-<?php 
+<?php
 require_once('clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_mail_move.phpt b/ext/imap/tests/imap_mail_move.phpt
index 67ddea713aa..0456e23c087 100644
--- a/ext/imap/tests/imap_mail_move.phpt
+++ b/ext/imap/tests/imap_mail_move.phpt
@@ -22,9 +22,9 @@ require_once(dirname(__FILE__).'/imap_include.inc');
 
 
 echo "Test with IMAP server\n";
-$stream_id = imap_open($default_mailbox, $username, $password) or 
+$stream_id = imap_open($default_mailbox, $username, $password) or
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
-	
+
 var_dump(imap_mail_move($stream_id));
 var_dump(imap_mail_move($stream_id,-1));
 var_dump(imap_mail_move($stream_id, ''));
diff --git a/ext/imap/tests/imap_mail_move_basic.phpt b/ext/imap/tests/imap_mail_move_basic.phpt
index a543582565e..bd04308a440 100644
--- a/ext/imap/tests/imap_mail_move_basic.phpt
+++ b/ext/imap/tests/imap_mail_move_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test imap_mail_move() function : basic functionality 
+Test imap_mail_move() function : basic functionality
 --CREDITS--
 Olivier Doucet
 --SKIPIF--
@@ -9,7 +9,7 @@ require_once(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 /* Prototype  : bool imap_mail_move  ( resource $imap_stream  , string $msglist  , string $mailbox  [, int $options = 0  ] )
- * Description: Copies mail messages specified by msglist  to specified mailbox. 
+ * Description: Copies mail messages specified by msglist  to specified mailbox.
  * Source code: ext/imap/php_imap.c
  */
 
@@ -25,7 +25,7 @@ if (!is_resource($imap_stream)) {
 }
 
 $check = imap_check($imap_stream);
-echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";    
+echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";
 
 var_dump(imap_mail_move($imap_stream, '1', 'INBOX.'.$mailbox_prefix));
 
@@ -33,7 +33,7 @@ imap_close($imap_stream);
 ?>
 ===Done===
 --CLEAN--
-<?php 
+<?php
 require_once('clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_mutf7_to_utf8.phpt b/ext/imap/tests/imap_mutf7_to_utf8.phpt
index 7a1a54aec5c..e2c745ecd02 100644
--- a/ext/imap/tests/imap_mutf7_to_utf8.phpt
+++ b/ext/imap/tests/imap_mutf7_to_utf8.phpt
@@ -13,7 +13,7 @@ var_dump(imap_mutf7_to_utf8("t&AOQ-st"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(0) ""
 string(1) "1"
 
diff --git a/ext/imap/tests/imap_renamemailbox_basic.phpt b/ext/imap/tests/imap_renamemailbox_basic.phpt
index b445f1d3e4c..d8b3f485e59 100644
--- a/ext/imap/tests/imap_renamemailbox_basic.phpt
+++ b/ext/imap/tests/imap_renamemailbox_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-imap_renamemailbox() function : basic functionality 
+imap_renamemailbox() function : basic functionality
 --CREDITS--
 Olivier Doucet
 --SKIPIF--
@@ -17,7 +17,7 @@ imap_renamemailbox(false);
 
 
 require_once(dirname(__FILE__).'/imap_include.inc');
-	
+
 $stream_id = setup_test_mailbox('', 1);
 
 if (!is_resource($stream_id)) {
@@ -43,7 +43,7 @@ var_dump(imap_renamemailbox($stream_id, $newbox.'.test', $newbox.'.testd'));
 imap_close($stream_id);
 ?>
 --CLEAN--
-<?php 
+<?php
 require_once('clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt
index e4253925d29..07eb69bf685 100644
--- a/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt
+++ b/ext/imap/tests/imap_rfc822_parse_headers_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-imap_rfc822_parse_headers() function : basic functionality 
+imap_rfc822_parse_headers() function : basic functionality
 --CREDITS--
 Olivier Doucet
 --SKIPIF--
@@ -16,7 +16,7 @@ $z = imap_headerinfo($stream_id, 1);
 
 $fields = array ('toaddress','to','fromaddress','from',
 'reply_toaddress','reply_to',
-	'senderaddress', 'sender', 
+	'senderaddress', 'sender',
 'subject','Subject',
 	'MailDate','Size','udate');
 
@@ -84,7 +84,7 @@ imap_close($stream_id);
 
 ?>
 --CLEAN--
-<?php 
+<?php
 require_once('clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_savebody_basic.phpt b/ext/imap/tests/imap_savebody_basic.phpt
index 91e6ce03e92..23c35739963 100644
--- a/ext/imap/tests/imap_savebody_basic.phpt
+++ b/ext/imap/tests/imap_savebody_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-imap_savebody() function : basic functionality 
+imap_savebody() function : basic functionality
 --CREDITS--
 Olivier Doucet
 --SKIPIF--
@@ -37,7 +37,7 @@ echo "Size: ".filesize($file)."\n";
 imap_close($stream_id);
 ?>
 --CLEAN--
-<?php 
+<?php
 @unlink(dirname(__FILE__).'/tmpsavebody.txt');
 require_once('clean.inc');
 ?>
diff --git a/ext/imap/tests/imap_timeout_basic.phpt b/ext/imap/tests/imap_timeout_basic.phpt
index 9e616df60e2..da93ded5106 100644
--- a/ext/imap/tests/imap_timeout_basic.phpt
+++ b/ext/imap/tests/imap_timeout_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-imap_timeout() function : basic functionality 
+imap_timeout() function : basic functionality
 --CREDITS--
 Olivier Doucet
 --SKIPIF--
diff --git a/ext/imap/tests/imap_undelete_basic.phpt b/ext/imap/tests/imap_undelete_basic.phpt
index 4b48b1b09ae..60e30ae21bb 100644
--- a/ext/imap/tests/imap_undelete_basic.phpt
+++ b/ext/imap/tests/imap_undelete_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-imap_undelete() function : basic functionality 
+imap_undelete() function : basic functionality
 --CREDITS--
 Olivier Doucet
 --SKIPIF--
@@ -20,7 +20,7 @@ imap_close($stream_id);
 
 ?>
 --CLEAN--
-<?php 
+<?php
 require_once('clean.inc');
 ?>
 --EXPECTF--
diff --git a/ext/imap/tests/imap_undelete_error.phpt b/ext/imap/tests/imap_undelete_error.phpt
index c82801e15a3..3366c04f051 100644
--- a/ext/imap/tests/imap_undelete_error.phpt
+++ b/ext/imap/tests/imap_undelete_error.phpt
@@ -16,9 +16,9 @@ imap_undelete('');
 imap_undelete(false);
 
 require_once(dirname(__FILE__).'/imap_include.inc');
-$stream_id = imap_open($default_mailbox, $username, $password) or 
+$stream_id = imap_open($default_mailbox, $username, $password) or
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
-	
+
 imap_undelete($stream_id);
 
 imap_close($stream_id);
diff --git a/ext/imap/tests/imap_utf8.phpt b/ext/imap/tests/imap_utf8.phpt
index f701f82f273..a8901555d52 100644
--- a/ext/imap/tests/imap_utf8.phpt
+++ b/ext/imap/tests/imap_utf8.phpt
@@ -12,7 +12,7 @@ var_dump(imap_utf8("test"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(0) ""
 string(1) "1"
 
diff --git a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
index 54b43efaeca..bea268a4571 100644
--- a/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
+++ b/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt
@@ -13,7 +13,7 @@ var_dump(imap_utf8_to_mutf7("täst"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(0) ""
 string(1) "1"
 
diff --git a/ext/interbase/tests/002.phpt b/ext/interbase/tests/002.phpt
index 37b0a4f344d..6c7d7805882 100644
--- a/ext/interbase/tests/002.phpt
+++ b/ext/interbase/tests/002.phpt
@@ -6,7 +6,7 @@ InterBase: connect, close and pconnect
 <?php
 
 	require("interbase.inc");
-    
+
 	ibase_connect($test_base);
 	out_table("test1");
 	ibase_close();
diff --git a/ext/interbase/tests/003.phpt b/ext/interbase/tests/003.phpt
index 8ee86d3e9e6..70fa5f0d307 100644
--- a/ext/interbase/tests/003.phpt
+++ b/ext/interbase/tests/003.phpt
@@ -7,7 +7,7 @@ InterBase: misc sql types (may take a while)
 
     require("interbase.inc");
     ibase_connect($test_base);
-    
+
     ibase_query(
     	"create table test3 (
             iter		integer not null,
@@ -129,7 +129,7 @@ InterBase: misc sql types (may take a while)
 	$q = ibase_query('SELECT 1 AS id, 2 AS id, 3 AS id, 4 AS id, 5 AS id, 6 AS id, 7 AS id, 8 AS id, 9 AS id,
 		10 AS id, 11 AS id, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22 FROM rdb$database');
 	var_dump(ibase_fetch_assoc($q));
-	
+
     ibase_close();
     echo "end of test\n";
 ?>
diff --git a/ext/interbase/tests/004.phpt b/ext/interbase/tests/004.phpt
index 54a6b7b9b52..4e63ce205fa 100644
--- a/ext/interbase/tests/004.phpt
+++ b/ext/interbase/tests/004.phpt
@@ -6,7 +6,7 @@ InterBase: BLOB test
 <?php
 
     require("interbase.inc");
-    
+
     $link = ibase_connect($test_base);
 
     ibase_query(
@@ -38,7 +38,7 @@ InterBase: BLOB test
     $row = ibase_fetch_object($q);
     $bl_h = ibase_blob_open($row->V_BLOB);
 
-	$blob = '';    
+	$blob = '';
     while($piece = ibase_blob_get($bl_h, 1 + rand() % 1024))
         $blob .= $piece;
     if($blob != $blob_str)
@@ -47,7 +47,7 @@ InterBase: BLOB test
 
     $bl_h = ibase_blob_open($link,$row->V_BLOB);
 
-	$blob = '';    
+	$blob = '';
     while($piece = ibase_blob_get($bl_h, 100 * 1024))
         $blob .= $piece;
     if($blob != $blob_str)
@@ -108,7 +108,7 @@ InterBase: BLOB test
     $row = ibase_fetch_object($q);
 	ibase_commit();
 	ibase_close();
-	    
+
     $link = ibase_connect($test_base);
     ibase_blob_echo($link, $row->V_BLOB);
     ibase_free_result($q);
diff --git a/ext/interbase/tests/005.phpt b/ext/interbase/tests/005.phpt
index 85234430786..b460adceaf4 100644
--- a/ext/interbase/tests/005.phpt
+++ b/ext/interbase/tests/005.phpt
@@ -6,7 +6,7 @@ InterBase: transactions
 <?php
 
     require("interbase.inc");
-    
+
     ibase_connect($test_base);
 
     @ibase_query("create table test5 (i integer)");
@@ -15,7 +15,7 @@ InterBase: transactions
 
 
     echo "default transaction:\n";
-    
+
 /*
 Difference between default and other transactions:
 default committed when you call  ibase_close().
@@ -30,14 +30,14 @@ ibase_blob_create(), ibase_blob_import()  first time.
 /*
 simple default transaction test without ibase_trans()
 */
-    
+
     ibase_connect($test_base);
 
     echo "empty table\n";
 
 	/*  out_table call ibase_query()
       and ibase_query() start default transaction */
-    out_table("test5");   
+    out_table("test5");
 
     /* in default transaction context */
     ibase_query("insert into test5 (i) values (1)");
@@ -49,13 +49,13 @@ simple default transaction test without ibase_trans()
 
     echo "after rollback table empty again\n";
     out_table("test5");  /* started new default transaction */
-    
+
     ibase_query("insert into test5 (i) values (2)");
 
     ibase_close(); /* commit here! */
-    
+
     ibase_connect($test_base);
-    
+
     echo "one row\n";
     out_table("test5");
     ibase_close();
@@ -66,14 +66,14 @@ First open transaction on link will be default.
 $tr_def_l1 may be omitted. All queryes without link and trans
 parameters run in this context
 */
-    
+
     $link_def = ibase_connect($test_base);
-    
+
     $tr_def_l1 = ibase_trans(IBASE_READ); /* here transaction start */
-    
+
     /* all default */
 	$res = ibase_query("select * from test5");
-    
+
     echo "one row\n";
     out_result($res,"test5");
 
@@ -81,15 +81,15 @@ parameters run in this context
 
     /* specify transaction context...  */
 	$res = ibase_query($tr_def_l1, "select * from test5");
-    
+
     echo "one row... again.\n";
     out_result($res,"test5");
 
     ibase_free_result($res);
-    
+
     /* specify default transaction on link  */
 	$res = ibase_query($link_def, "select * from test5");
-    
+
     echo "one row.\n";
     out_result($res,"test5");
 
@@ -98,14 +98,14 @@ parameters run in this context
     ibase_rollback($link_def); /* just for example */
 
     ibase_close();
-    
+
 /*
 three transaction on default link
 */
     ibase_connect($test_base);
-    
+
 	$res = ibase_query("select * from test5");
-    
+
     echo "one row\n";
     out_result($res,"test5");
 
@@ -113,38 +113,38 @@ three transaction on default link
 
 	$tr_1 = ibase_query("SET TRANSACTION");
 	$tr_2 = ibase_query("SET TRANSACTION READ ONLY");
-	$tr_3 = ibase_trans(IBASE_READ+IBASE_COMMITTED+IBASE_REC_VERSION+IBASE_WAIT);    
-	$tr_4 = ibase_trans(IBASE_READ+IBASE_COMMITTED+IBASE_REC_NO_VERSION+IBASE_NOWAIT);	
-    
+	$tr_3 = ibase_trans(IBASE_READ+IBASE_COMMITTED+IBASE_REC_VERSION+IBASE_WAIT);
+	$tr_4 = ibase_trans(IBASE_READ+IBASE_COMMITTED+IBASE_REC_NO_VERSION+IBASE_NOWAIT);
+
     /* insert in first transaction context...  */
     /* as default */
     ibase_query("insert into test5 (i) values (3)");
     /* specify context */
     ibase_query($tr_1, "insert into test5 (i) values (4)");
-    
+
 	$res = ibase_query("select * from test5");
-    
+
     echo "two rows\n";
     out_result($res,"test5");
 
     ibase_free_result($res);
-    
+
 	$res = ibase_query($tr_1, "select * from test5");
-    
+
     echo "two rows again\n";
     out_result($res,"test5");
 
     ibase_free_result($res);
-    
+
 	ibase_commit();
     ibase_commit($tr_1);
 
 	$tr_1 = ibase_trans();
   	 ibase_query($tr_1, "insert into test5 (i) values (5)");
-	
+
 	/* tr_2 is IBASE_READ + IBASE_CONCURRENCY + IBASE_WAIT */
 	$res = ibase_query($tr_2, "select * from test5");
-    
+
     echo "one row in second transaction\n";
     out_result($res,"test5");
 
@@ -152,7 +152,7 @@ three transaction on default link
 
 	/* tr_3 is IBASE_COMMITTED + IBASE_REC_VERSION + IBASE_WAIT */
 	$res = ibase_query($tr_3, "select * from test5");
-    
+
     echo "three rows in third transaction\n";
     out_result($res,"test5");
 
@@ -160,12 +160,12 @@ three transaction on default link
 
  	/* tr_4 IBASE_COMMITTED + IBASE_REC_NO_VERSION + IBASE_NOWAIT */
  	$res = ibase_query($tr_4, "select * from test5");
-   
+
  	 echo "three rows in fourth transaction with deadlock\n";
     out_result_trap_error($res,"test5");
 
-    ibase_free_result($res); 
- 
+    ibase_free_result($res);
+
 	 ibase_rollback($tr_1);
     ibase_close();
 /*
@@ -173,35 +173,35 @@ transactions on second link
 */
     $link_1 = ibase_pconnect($test_base);
     $link_2 = ibase_pconnect($test_base);
-    
+
 	$tr_1 = ibase_trans(IBASE_DEFAULT, $link_2);  /* this default transaction also */
 	$tr_2 = ibase_trans(IBASE_COMMITTED, $link_2);
-    
+
 	$res = ibase_query($tr_1, "select * from test5");
-    
+
     echo "three rows\n";
     out_result($res,"test5");
 
     ibase_free_result($res);
 
     ibase_query($tr_1, "insert into test5 (i) values (5)");
-    
+
 	$res = ibase_query($tr_1, "select * from test5");
-    
+
     echo "four rows\n";
     out_result($res,"test5");
 
     ibase_free_result($res);
-    
+
     ibase_commit($tr_1);
-    
+
 	$res = ibase_query($tr_2, "select * from test5");
-    
+
     echo "four rows again\n";
     out_result($res,"test5");
 
     ibase_free_result($res);
-    
+
     ibase_close($link_1);
     ibase_close($link_2);
 
diff --git a/ext/interbase/tests/006.phpt b/ext/interbase/tests/006.phpt
index a32807eec01..cf360045ed6 100644
--- a/ext/interbase/tests/006.phpt
+++ b/ext/interbase/tests/006.phpt
@@ -6,9 +6,9 @@ InterBase: binding (may take a while)
 <?php
 
 	require("interbase.inc");
-	
+
 	ibase_connect($test_base);
-	
+
 	ibase_query(
 		"create table test6 (
 			iter		integer,
@@ -171,7 +171,7 @@ InterBase: binding (may take a while)
 			echo "VARCHAR fail\n";
 		}
 		ibase_free_result($sel);
-        
+
 	} /*for iter*/
 
 	echo "prepare and exec insert\n";
diff --git a/ext/interbase/tests/007.phpt b/ext/interbase/tests/007.phpt
index 92e7c73984a..8afe6e6ca30 100644
--- a/ext/interbase/tests/007.phpt
+++ b/ext/interbase/tests/007.phpt
@@ -6,9 +6,9 @@ InterBase: array handling
 <?php
 
 	require("interbase.inc");
-	
+
 	ibase_connect($test_base);
-	
+
 	ibase_query(
 		"create table test7 (
 			iter		integer,
@@ -29,7 +29,7 @@ InterBase: array handling
 	ini_set('ibase.timestampformat',"%m/%d/%Y %H:%M:%S");
 
 	echo "insert\n";
-	
+
 	for ($i = 1; $i <= 10; ++$i) {
 		for ($j = 1; $j <= 10; ++$j) {
 			for ($k = 1; $k <= 10; ++$k) {
@@ -37,7 +37,7 @@ InterBase: array handling
 			}
 		}
 	}
-				
+
 	for($iter = 0; $iter < 3; $iter++) {
 
 		/* prepare data  */
@@ -62,7 +62,7 @@ InterBase: array handling
 			$v_smallint[$i] = rand_number(5) % 32767;
 			$v_varchar[$i] = rand_str(1000);
 		}
-		
+
 		ibase_query("insert into test7
 			(iter,v_multi,v_char,v_date,v_decimal,v_double,v_float,
 			v_integer,v_numeric,v_smallint,v_varchar)
@@ -73,7 +73,7 @@ InterBase: array handling
 
 		$row = ibase_fetch_object($sel,IBASE_FETCH_ARRAYS);
 		for ($i = 1; $i <= 10; ++$i) {
-			
+
 			if(strncmp($row->V_CHAR[$i],$v_char[$i],strlen($v_char[$i])) != 0) {
 				echo " CHAR[$i] fail:\n";
 				echo " in:  ".$v_char[$i]."\n";
@@ -124,7 +124,7 @@ InterBase: array handling
 	}/* for($iter) */
 
 	echo "select\n";
-	
+
 	$sel = ibase_query("SELECT v_multi[5,5,5],v_multi[10,10,10] FROM test7 WHERE iter = 0");
 	print_r(ibase_fetch_row($sel));
 	ibase_free_result($sel);
diff --git a/ext/interbase/tests/008.phpt b/ext/interbase/tests/008.phpt
index 6728b9d7d3d..c7b01dc2edb 100644
--- a/ext/interbase/tests/008.phpt
+++ b/ext/interbase/tests/008.phpt
@@ -1,9 +1,9 @@
 --TEST--
 InterBase: event handling
 --SKIPIF--
-<?php 
+<?php
 if (PHP_OS == "WINNT") echo "skip";
-include("skipif.inc"); 
+include("skipif.inc");
 ?>
 --FILE--
 <?php
diff --git a/ext/interbase/tests/bug45373.phpt b/ext/interbase/tests/bug45373.phpt
index 8b16ef00f2f..3853c9ab5a1 100644
--- a/ext/interbase/tests/bug45373.phpt
+++ b/ext/interbase/tests/bug45373.phpt
@@ -6,7 +6,7 @@ Bug #45373 (php crash on query with errors in params)
 <?php
 
 	require("interbase.inc");
-    
+
 	$db = ibase_connect($test_base);
 
 
@@ -16,11 +16,11 @@ Bug #45373 (php crash on query with errors in params)
 	$r = ibase_execute($q, 1, 'test table not created with isql');
 	var_dump(ibase_fetch_assoc($r));
 	ibase_free_result($r);
-	
+
 	$r = ibase_execute($q, 1, 'test table not created with isql', 1);
 	var_dump(ibase_fetch_assoc($r));
 	ibase_free_result($r);
-	
+
 	$r = ibase_execute($q, 1);
 	var_dump(ibase_fetch_assoc($r));
 
diff --git a/ext/interbase/tests/ibase_drop_db_001.phpt b/ext/interbase/tests/ibase_drop_db_001.phpt
index 7526e13144e..c7129f71bdf 100644
--- a/ext/interbase/tests/ibase_drop_db_001.phpt
+++ b/ext/interbase/tests/ibase_drop_db_001.phpt
@@ -10,7 +10,7 @@ require("interbase.inc");
 unlink($file = tempnam('/tmp',"php_ibase_test"));
 
 
-$db = ibase_query(IBASE_CREATE, 
+$db = ibase_query(IBASE_CREATE,
 		sprintf("CREATE SCHEMA '%s' USER '%s' PASSWORD '%s' DEFAULT CHARACTER SET %s",$file,
 		$user, $password, ($charset = ini_get('ibase.default_charset')) ? $charset : 'NONE'));
 
diff --git a/ext/intl/tests/badargs.phpt b/ext/intl/tests/badargs.phpt
index d6ce48317b0..c3d7a331c2c 100644
--- a/ext/intl/tests/badargs.phpt
+++ b/ext/intl/tests/badargs.phpt
@@ -13,7 +13,7 @@ foreach($funcs as $func) {
         if($rfunc->getNumberOfRequiredParameters() == 0) {
                 continue;
         }
-		
+
 		try {
 			$res = $func($arg);
 		} catch (Exception $e) {
diff --git a/ext/intl/tests/bug61487.phpt b/ext/intl/tests/bug61487.phpt
index 2270b25cce8..b303e007106 100644
--- a/ext/intl/tests/bug61487.phpt
+++ b/ext/intl/tests/bug61487.phpt
@@ -1,7 +1,7 @@
 --TEST--
 grapheme() str[i]pos limits
 --SKIPIF--
-<?php if( !extension_loaded( 'intl' ) ) die('skip'); 
+<?php if( !extension_loaded( 'intl' ) ) die('skip');
 if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 ?>
 --FILE--
diff --git a/ext/intl/tests/bug62915.phpt b/ext/intl/tests/bug62915.phpt
index e541d72d637..2277cde9d5c 100644
--- a/ext/intl/tests/bug62915.phpt
+++ b/ext/intl/tests/bug62915.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded('intl'))
 
 class foo extends IntlTimeZone {
 		public $foo = 'test';
-			
+
 				public function __construct() { }
 }
 
diff --git a/ext/intl/tests/bug71020.phpt b/ext/intl/tests/bug71020.phpt
index 368d967efd0..9f9b8eede33 100644
--- a/ext/intl/tests/bug71020.phpt
+++ b/ext/intl/tests/bug71020.phpt
@@ -4,7 +4,7 @@ Bug #71020 (Use after free in Collator::sortWithSortKeys)
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
 --FILE--
 <?php
- 
+
 $var_3=new Collator("Whatever");
 for($x=0;$x<0xbb;$x++)
 	$myarray[substr(md5(microtime()),rand(0,26),9) . strval($x)]= substr(md5(microtime()),rand(0,26),9) . strval($x);
diff --git a/ext/intl/tests/calendar_fieldDifference_basic.phpt b/ext/intl/tests/calendar_fieldDifference_basic.phpt
index 3432420df40..0287e259c14 100644
--- a/ext/intl/tests/calendar_fieldDifference_basic.phpt
+++ b/ext/intl/tests/calendar_fieldDifference_basic.phpt
@@ -19,7 +19,7 @@ var_dump(
 				IntlCalendar::FIELD_SECOND),
 		$intlcal->get(IntlCalendar::FIELD_HOUR_OF_DAY));
 
-				
+
 $intlcal->setTime(strtotime('2012-02-29 05:06:07 +0000') * 1000);
 var_dump(
 		intlcal_field_difference(
diff --git a/ext/intl/tests/calendar_getXMaximum_basic.phpt b/ext/intl/tests/calendar_getXMaximum_basic.phpt
index 9b840212d92..2e6d1a3fa92 100644
--- a/ext/intl/tests/calendar_getXMaximum_basic.phpt
+++ b/ext/intl/tests/calendar_getXMaximum_basic.phpt
@@ -17,7 +17,7 @@ var_dump(
 		$intlcal->getLeastMaximum(IntlCalendar::FIELD_DAY_OF_MONTH),
 		intlcal_get_least_maximum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH),
 		$intlcal->getActualMaximum(IntlCalendar::FIELD_DAY_OF_MONTH),
-		intlcal_get_actual_maximum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH), 
+		intlcal_get_actual_maximum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH),
 		$intlcal->getMaximum(IntlCalendar::FIELD_DAY_OF_MONTH),
 		intlcal_get_maximum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH)
 );
diff --git a/ext/intl/tests/calendar_getXMinimum_basic.phpt b/ext/intl/tests/calendar_getXMinimum_basic.phpt
index 83fd1638098..ff0518d8822 100644
--- a/ext/intl/tests/calendar_getXMinimum_basic.phpt
+++ b/ext/intl/tests/calendar_getXMinimum_basic.phpt
@@ -17,7 +17,7 @@ var_dump(
 		$intlcal->getGreatestMinimum(IntlCalendar::FIELD_DAY_OF_MONTH),
 		intlcal_get_greatest_minimum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH),
 		$intlcal->getActualMinimum(IntlCalendar::FIELD_DAY_OF_MONTH),
-		intlcal_get_actual_minimum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH), 
+		intlcal_get_actual_minimum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH),
 		$intlcal->getMinimum(IntlCalendar::FIELD_DAY_OF_MONTH),
 		intlcal_get_minimum($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH)
 );
diff --git a/ext/intl/tests/calendar_setTime_basic.phpt b/ext/intl/tests/calendar_setTime_basic.phpt
index f7f213c0d84..c4d57be4b97 100644
--- a/ext/intl/tests/calendar_setTime_basic.phpt
+++ b/ext/intl/tests/calendar_setTime_basic.phpt
@@ -19,7 +19,7 @@ $intlcal->setTime($time * 1000);
 var_dump(
 	(float)$time*1000,
 	$intlcal->getTime());
-	
+
 $intlcal = IntlCalendar::createInstance('UTC');
 intlcal_set_time($intlcal,$time * 1000);
 var_dump(intlcal_get_time($intlcal));
diff --git a/ext/intl/tests/calendar_set_variation1.phpt b/ext/intl/tests/calendar_set_variation1.phpt
index 8ea016ed61d..20dfa53eb65 100644
--- a/ext/intl/tests/calendar_set_variation1.phpt
+++ b/ext/intl/tests/calendar_set_variation1.phpt
@@ -16,7 +16,7 @@ $intlcal->clear();
 var_dump($intlcal->set(2012, 1, 29));
 var_dump($intlcal->getTime(),
 		strtotime('2012-02-29 00:00:00 +0000') * 1000.);
-		
+
 //two minutes to midnight!
 var_dump($intlcal->set(2012, 1, 29, 23, 58));
 var_dump($intlcal->getTime(),
diff --git a/ext/intl/tests/collator_asort.phpt b/ext/intl/tests/collator_asort.phpt
index 94fb6ef7a44..0b3d0ee7958 100644
--- a/ext/intl/tests/collator_asort.phpt
+++ b/ext/intl/tests/collator_asort.phpt
@@ -35,7 +35,7 @@ function sort_arrays( $locale, $test_arrays, $sort_flag = Collator::SORT_REGULAR
         $md5 = md5( $res_dump );
 
         global $test_num;
-        
+
         $res_str .= "\n\n".
                     "Test $test_num.$md5:" .
                     $res_dump;
diff --git a/ext/intl/tests/collator_asort_variant2.phpt b/ext/intl/tests/collator_asort_variant2.phpt
index 0a7c914d89b..08725095b52 100644
--- a/ext/intl/tests/collator_asort_variant2.phpt
+++ b/ext/intl/tests/collator_asort_variant2.phpt
@@ -35,7 +35,7 @@ function sort_arrays( $locale, $test_arrays, $sort_flag = Collator::SORT_REGULAR
         $md5 = md5( $res_dump );
 
         global $test_num;
-        
+
         $res_str .= "\n\n".
                     "Test $test_num.$md5:" .
                     $res_dump;
diff --git a/ext/intl/tests/collator_create4.phpt b/ext/intl/tests/collator_create4.phpt
index 0e2126eca4e..509a89913bc 100644
--- a/ext/intl/tests/collator_create4.phpt
+++ b/ext/intl/tests/collator_create4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-create() icu >= 53.1 
+create() icu >= 53.1
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
 <?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?>
diff --git a/ext/intl/tests/collator_get_error_code.phpt b/ext/intl/tests/collator_get_error_code.phpt
index c886943d5d1..17a17eeefca 100644
--- a/ext/intl/tests/collator_get_error_code.phpt
+++ b/ext/intl/tests/collator_get_error_code.phpt
@@ -16,7 +16,7 @@ get_error_code()
 function check_rc( $rc, $expected )
 {
     return ( $rc === $expected ? "ok" : "failed" ) . "\n";
-} 
+}
 
 function ut_main()
 {
diff --git a/ext/intl/tests/collator_get_sort_key.phpt b/ext/intl/tests/collator_get_sort_key.phpt
index 58240d426c5..ad0d13e502b 100644
--- a/ext/intl/tests/collator_get_sort_key.phpt
+++ b/ext/intl/tests/collator_get_sort_key.phpt
@@ -3,7 +3,7 @@ collator_get_sort_key()
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
 <?php if(version_compare(INTL_ICU_VERSION, '4.8') < 0) print 'skip ICU >= 4.8 only'; ?>
-<?php /* XXX Obviously it fails somewhere between >= 4.8 and < 51.2 */ 
+<?php /* XXX Obviously it fails somewhere between >= 4.8 and < 51.2 */
 if (version_compare(INTL_ICU_VERSION, '51.2') >=  0) die('skip for ICU < 51.2'); ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/collator_sort.phpt b/ext/intl/tests/collator_sort.phpt
index e16eeea1e85..4f7a12352a3 100644
--- a/ext/intl/tests/collator_sort.phpt
+++ b/ext/intl/tests/collator_sort.phpt
@@ -36,7 +36,7 @@ function sort_arrays( $locale, $arrays, $sort_flag = Collator::SORT_REGULAR )
         $md5 = md5( $res_dump );
 
         global $test_num;
-        
+
         $res_str .= "\n\n".
                     "Test $test_num.$md5:" .
                     $res_dump;
diff --git a/ext/intl/tests/collator_sort_variant2.phpt b/ext/intl/tests/collator_sort_variant2.phpt
index 29a5082fda4..abb302eda65 100644
--- a/ext/intl/tests/collator_sort_variant2.phpt
+++ b/ext/intl/tests/collator_sort_variant2.phpt
@@ -36,7 +36,7 @@ function sort_arrays( $locale, $arrays, $sort_flag = Collator::SORT_REGULAR )
         $md5 = md5( $res_dump );
 
         global $test_num;
-        
+
         $res_str .= "\n\n".
                     "Test $test_num.$md5:" .
                     $res_dump;
diff --git a/ext/intl/tests/collator_sort_with_sort_keys.phpt b/ext/intl/tests/collator_sort_with_sort_keys.phpt
index 8be9c97789c..8f19f23881f 100644
--- a/ext/intl/tests/collator_sort_with_sort_keys.phpt
+++ b/ext/intl/tests/collator_sort_with_sort_keys.phpt
@@ -31,8 +31,8 @@ function sort_arrays( $locale, $arrays )
         // with output string.
         $res_dump = "\n" . dump( $array ) .
                     "\n Result: " . dump( $res_val );
-        
-        
+
+
         // Preppend test signature to output string
         $md5 = md5( $res_dump );
 
diff --git a/ext/intl/tests/collator_sort_with_sort_keys_variant2.phpt b/ext/intl/tests/collator_sort_with_sort_keys_variant2.phpt
index 5257f8a6ffa..7416e6f7ec5 100644
--- a/ext/intl/tests/collator_sort_with_sort_keys_variant2.phpt
+++ b/ext/intl/tests/collator_sort_with_sort_keys_variant2.phpt
@@ -31,8 +31,8 @@ function sort_arrays( $locale, $arrays )
         // with output string.
         $res_dump = "\n" . dump( $array ) .
                     "\n Result: " . dump( $res_val );
-        
-        
+
+
         // Preppend test signature to output string
         $md5 = md5( $res_dump );
 
diff --git a/ext/intl/tests/dateformat_bug68893.phpt b/ext/intl/tests/dateformat_bug68893.phpt
index b3faf543424..5ada711c386 100644
--- a/ext/intl/tests/dateformat_bug68893.phpt
+++ b/ext/intl/tests/dateformat_bug68893.phpt
@@ -5,10 +5,10 @@ Bug #68893 Stackoverflow in datefmt_create
 --FILE--
 <?php
 
-$f = datefmt_create("en_us", -10000000, 1); 
+$f = datefmt_create("en_us", -10000000, 1);
 var_dump($f, intl_get_error_message());
 
-$f = datefmt_create("en_us", 1, -10000000); 
+$f = datefmt_create("en_us", 1, -10000000);
 var_dump($f, intl_get_error_message());
 
 ?>
diff --git a/ext/intl/tests/dateformat_format.phpt b/ext/intl/tests/dateformat_format.phpt
index a0135a809cc..6893b737391 100644
--- a/ext/intl/tests/dateformat_format.phpt
+++ b/ext/intl/tests/dateformat_format.phpt
@@ -20,7 +20,7 @@ function ut_main()
 	$locale_arr = array (
 		'en_US'
 	);
-	
+
 	$datetype_arr = array (
                 IntlDateFormatter::FULL,
                 IntlDateFormatter::LONG,
@@ -73,12 +73,12 @@ function ut_main()
 		$localtime_arr2,
 		$localtime_arr3
 	);
-	
+
 	$d1 = new DateTime("2010-01-01 01:02:03", new DateTimeZone("UTC"));
 	$d2 = new DateTime("2000-12-31 03:04:05", new DateTimeZone("UTC"));
 	$d2->setTimezone(new DateTimeZone("PDT"));
 	$dates = array(
-		$d1, 
+		$d1,
 		$d2,
 		new StdClass(),
 	);
@@ -129,7 +129,7 @@ function ut_main()
 				$res_str .= "\n------------";
 				$res_str .= "\nDate is: ".var_export($date_entry, true);
 				$res_str .= "\n------------";
-				
+
 				$fmt = ut_datefmt_create( $locale_entry , $datetype_entry ,$datetype_entry, $timezone, IntlDateFormatter::GREGORIAN );
 				$formatted1 = ut_datefmt_format( $fmt , $date_entry);
 				if( intl_get_error_code() == U_ZERO_ERROR){
diff --git a/ext/intl/tests/dateformat_format_parse.phpt b/ext/intl/tests/dateformat_format_parse.phpt
index 516951371a1..68f54eb7e70 100644
--- a/ext/intl/tests/dateformat_format_parse.phpt
+++ b/ext/intl/tests/dateformat_format_parse.phpt
@@ -13,12 +13,12 @@ datefmt_format_code() and datefmt_parse_code()
 
 function ut_main()
 {
-	$timezone = 'GMT+05:00'; 
+	$timezone = 'GMT+05:00';
 
 	$locale_arr = array (
 		'en_US'
 	);
-	
+
 	$datetype_arr = array (
                 IntlDateFormatter::FULL,
                 IntlDateFormatter::LONG,
diff --git a/ext/intl/tests/dateformat_format_parse_version2.phpt b/ext/intl/tests/dateformat_format_parse_version2.phpt
index 8c6f00ef54e..f672cd6d221 100644
--- a/ext/intl/tests/dateformat_format_parse_version2.phpt
+++ b/ext/intl/tests/dateformat_format_parse_version2.phpt
@@ -13,12 +13,12 @@ datefmt_format_code() and datefmt_parse_code()
 
 function ut_main()
 {
-	$timezone = 'GMT+05:00'; 
+	$timezone = 'GMT+05:00';
 
 	$locale_arr = array (
 		'en_US'
 	);
-	
+
 	$datetype_arr = array (
                 IntlDateFormatter::FULL,
                 IntlDateFormatter::LONG,
diff --git a/ext/intl/tests/dateformat_format_variant2.phpt b/ext/intl/tests/dateformat_format_variant2.phpt
index a3df39aa952..b8999005096 100644
--- a/ext/intl/tests/dateformat_format_variant2.phpt
+++ b/ext/intl/tests/dateformat_format_variant2.phpt
@@ -20,7 +20,7 @@ function ut_main()
 	$locale_arr = array (
 		'en_US'
 	);
-	
+
 	$datetype_arr = array (
                 IntlDateFormatter::FULL,
                 IntlDateFormatter::LONG,
@@ -73,12 +73,12 @@ function ut_main()
 		$localtime_arr2,
 		$localtime_arr3
 	);
-	
+
 	$d1 = new DateTime("2010-01-01 01:02:03", new DateTimeZone("UTC"));
 	$d2 = new DateTime("2000-12-31 03:04:05", new DateTimeZone("UTC"));
 	$d2->setTimezone(new DateTimeZone("PDT"));
 	$dates = array(
-		$d1, 
+		$d1,
 		$d2,
 		new StdClass(),
 	);
@@ -129,7 +129,7 @@ function ut_main()
 				$res_str .= "\n------------";
 				$res_str .= "\nDate is: ".var_export($date_entry, true);
 				$res_str .= "\n------------";
-				
+
 				$fmt = ut_datefmt_create( $locale_entry , $datetype_entry ,$datetype_entry, $timezone, IntlDateFormatter::GREGORIAN );
 				$formatted1 = ut_datefmt_format( $fmt , $date_entry);
 				if( intl_get_error_code() == U_ZERO_ERROR){
diff --git a/ext/intl/tests/dateformat_format_variant3.phpt b/ext/intl/tests/dateformat_format_variant3.phpt
index da0d662ca79..645d33e2797 100644
--- a/ext/intl/tests/dateformat_format_variant3.phpt
+++ b/ext/intl/tests/dateformat_format_variant3.phpt
@@ -20,7 +20,7 @@ function ut_main()
 	$locale_arr = array (
 		'en_US'
 	);
-	
+
 	$datetype_arr = array (
                 IntlDateFormatter::FULL,
                 IntlDateFormatter::LONG,
@@ -73,12 +73,12 @@ function ut_main()
 		$localtime_arr2,
 		$localtime_arr3
 	);
-	
+
 	$d1 = new DateTime("2010-01-01 01:02:03", new DateTimeZone("UTC"));
 	$d2 = new DateTime("2000-12-31 03:04:05", new DateTimeZone("UTC"));
 	$d2->setTimezone(new DateTimeZone("PDT"));
 	$dates = array(
-		$d1, 
+		$d1,
 		$d2,
 		new StdClass(),
 	);
@@ -129,7 +129,7 @@ function ut_main()
 				$res_str .= "\n------------";
 				$res_str .= "\nDate is: ".var_export($date_entry, true);
 				$res_str .= "\n------------";
-				
+
 				$fmt = ut_datefmt_create( $locale_entry , $datetype_entry ,$datetype_entry, $timezone, IntlDateFormatter::GREGORIAN );
 				$formatted1 = ut_datefmt_format( $fmt , $date_entry);
 				if( intl_get_error_code() == U_ZERO_ERROR){
diff --git a/ext/intl/tests/dateformat_get_datetype.phpt b/ext/intl/tests/dateformat_get_datetype.phpt
index 24d03898ead..ec03bb68f48 100644
--- a/ext/intl/tests/dateformat_get_datetype.phpt
+++ b/ext/intl/tests/dateformat_get_datetype.phpt
@@ -19,7 +19,7 @@ function ut_main()
 		IntlDateFormatter::SHORT,
 		IntlDateFormatter::NONE
 	);
-	
+
 	$res_str = '';
 
 	foreach( $datetype_arr as $datetype_entry )
diff --git a/ext/intl/tests/dateformat_get_locale.phpt b/ext/intl/tests/dateformat_get_locale.phpt
index 48b7daa8d46..aa7a0a46c3f 100644
--- a/ext/intl/tests/dateformat_get_locale.phpt
+++ b/ext/intl/tests/dateformat_get_locale.phpt
@@ -20,7 +20,7 @@ function ut_main()
 		'en_UK',
 		'hi'
 	);
-	
+
 	$res_str = '';
 
 	foreach( $locale_arr as $locale_entry )
diff --git a/ext/intl/tests/dateformat_get_timetype.phpt b/ext/intl/tests/dateformat_get_timetype.phpt
index 2ddc1172b1c..cca3c6f96a3 100644
--- a/ext/intl/tests/dateformat_get_timetype.phpt
+++ b/ext/intl/tests/dateformat_get_timetype.phpt
@@ -19,7 +19,7 @@ function ut_main()
 		IntlDateFormatter::SHORT,
 		IntlDateFormatter::NONE
 	);
-	
+
 	$res_str = '';
 
 	foreach( $timetype_arr as $timetype_entry )
diff --git a/ext/intl/tests/dateformat_get_timezone_id.phpt b/ext/intl/tests/dateformat_get_timezone_id.phpt
index a9701c38687..f529614f213 100644
--- a/ext/intl/tests/dateformat_get_timezone_id.phpt
+++ b/ext/intl/tests/dateformat_get_timezone_id.phpt
@@ -20,7 +20,7 @@ function ut_main()
 		'US/Pacific',
 		'US/Central'
 	);
-	
+
 	$res_str = '';
 
 	foreach( $timezone_id_arr as $timezone_id_entry )
diff --git a/ext/intl/tests/dateformat_localtime.phpt b/ext/intl/tests/dateformat_localtime.phpt
index 4d185c232dd..5db43fb611e 100644
--- a/ext/intl/tests/dateformat_localtime.phpt
+++ b/ext/intl/tests/dateformat_localtime.phpt
@@ -18,7 +18,7 @@ function ut_main()
 	$locale_arr = array (
 		'en_US_CA'
 	);
-	
+
 	$datetype_arr = array (
                 IntlDateFormatter::FULL,
                 IntlDateFormatter::LONG,
@@ -67,7 +67,7 @@ function ut_main()
 			$res_str .= "\n------------";
 			$res_str .= "\nIntlDateFormatter : ".$fmt_desc_array[$cnt];
 		$parse_pos = 0;
-			$cnt++;		
+			$cnt++;
 			$parsed_arr = ut_datefmt_localtime( $fmt_entry , $text_entry , $parse_pos );
 
 				if( $parsed_arr){
diff --git a/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt b/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt
index 03f99f1d920..c491608ad3d 100644
--- a/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt
+++ b/ext/intl/tests/dateformat_parse_localtime_parsepos.phpt
@@ -16,7 +16,7 @@ function ut_main()
 	$locale_arr = array (
 		'en_US_CA'
 	);
-	
+
 	$datetype_arr = array (
                 IntlDateFormatter::FULL,
                 IntlDateFormatter::LONG,
@@ -37,7 +37,7 @@ function ut_main()
 	$fmt2 = ut_datefmt_create( 'en_US_CA', IntlDateFormatter::MEDIUM, IntlDateFormatter::MEDIUM);
 	$fmt3 = ut_datefmt_create( 'en_US_CA', IntlDateFormatter::FULL, IntlDateFormatter::FULL);
 	$fmt_array  = array(
-		$fmt1 , $fmt2 ,$fmt3 
+		$fmt1 , $fmt2 ,$fmt3
 	);
 	$fmt_desc_array  = array(
 		"DateType::LONG, TimeType::LONG",
@@ -52,7 +52,7 @@ function ut_main()
                 foreach( $fmt_array as $fmt_entry ){
 			$res_str .= "\n------------";
 			$res_str .= "\nIntlDateFormatter : ".$fmt_desc_array[$cnt];
-			$cnt++;		
+			$cnt++;
 			$parsed_arr = ut_datefmt_localtime( $fmt_entry , $text_entry);
 
 				if( $parsed_arr){
diff --git a/ext/intl/tests/formatter_fail.phpt b/ext/intl/tests/formatter_fail.phpt
index dcc5cb24fa1..9cfc6f50542 100644
--- a/ext/intl/tests/formatter_fail.phpt
+++ b/ext/intl/tests/formatter_fail.phpt
@@ -49,11 +49,11 @@ try {
 	print_exception($e);
 	$fmt = null;
 }
-err($fmt); 
+err($fmt);
 $fmt = numfmt_create();
-err($fmt); 
+err($fmt);
 $fmt = NumberFormatter::create();
-err($fmt); 
+err($fmt);
 
 foreach($args as $arg) {
 	$fmt = crt("O", $arg[0], $arg[1]);
diff --git a/ext/intl/tests/formatter_get_set_pattern.phpt b/ext/intl/tests/formatter_get_set_pattern.phpt
index 7f33254e2cd..66d6837d758 100644
--- a/ext/intl/tests/formatter_get_set_pattern.phpt
+++ b/ext/intl/tests/formatter_get_set_pattern.phpt
@@ -33,7 +33,7 @@ function ut_main()
     $res_str .= "New pattern: '" . ut_nfmt_get_pattern( $fmt ) . "'\n";
     $res_str .= "Formatted number: " . ut_nfmt_format( $fmt, $test_value ) . "\n";
 
-	ut_nfmt_set_pattern($fmt, str_repeat('@', 200));	
+	ut_nfmt_set_pattern($fmt, str_repeat('@', 200));
 	$res_str .= "New pattern: '" . ut_nfmt_get_pattern( $fmt ) . "'\n";
     $res_str .= "Formatted number: " . ut_nfmt_format( $fmt, $test_value ) . "\n";
 
diff --git a/ext/intl/tests/formatter_get_set_pattern2.phpt b/ext/intl/tests/formatter_get_set_pattern2.phpt
index 7bf98ae79e7..b1d1ad0c487 100644
--- a/ext/intl/tests/formatter_get_set_pattern2.phpt
+++ b/ext/intl/tests/formatter_get_set_pattern2.phpt
@@ -33,7 +33,7 @@ function ut_main()
     $res_str .= "New pattern: '" . ut_nfmt_get_pattern( $fmt ) . "'\n";
     $res_str .= "Formatted number: " . ut_nfmt_format( $fmt, $test_value ) . "\n";
 
-	ut_nfmt_set_pattern($fmt, str_repeat('@', 200));	
+	ut_nfmt_set_pattern($fmt, str_repeat('@', 200));
 	$res_str .= "New pattern: '" . ut_nfmt_get_pattern( $fmt ) . "'\n";
     $res_str .= "Formatted number: " . ut_nfmt_format( $fmt, $test_value ) . "\n";
 
diff --git a/ext/intl/tests/grapheme.phpt b/ext/intl/tests/grapheme.phpt
index 251b1d142f5..6b476edaabb 100644
--- a/ext/intl/tests/grapheme.phpt
+++ b/ext/intl/tests/grapheme.phpt
@@ -29,7 +29,7 @@ function ut_main()
 	$char_fi_ligature = "\xEF\xAC\x81";  // 'LATIN SMALL LIGATURE FI' (U+FB01)
 
 	$char_long_s_dot = "\xE1\xBA\x9B";	// 'LATIN SMALL LETTER LONG S WITH DOT ABOVE' (U+1E9B)
-	
+
 	// the word 'hindi' using Devanagari characters:
 	$hindi = "\xe0\xa4\xb9\xe0\xa4\xbf\xe0\xa4\xa8\xe0\xa5\x8d\xe0\xa4\xa6\xe0\xa5\x80";
 
@@ -42,7 +42,7 @@ function ut_main()
 	//=====================================================================================
 	$res_str .= "\n" . 'function grapheme_strlen($string) {}' . "\n\n";
 
-	
+
 	$res_str .= "\"hindi\" in devanagari strlen " . grapheme_strlen($hindi) . "\n";
 	$res_str .= "\"ab\" + \"hindi\" + \"cde\" strlen " . grapheme_strlen('ab' . $hindi . 'cde') . "\n";
 	$res_str .= "\"\" strlen " . grapheme_strlen("") . "\n";
@@ -50,7 +50,7 @@ function ut_main()
 	$res_str .= "char_a_ring_nfd + \"bc\" strlen " . grapheme_strlen($char_a_ring_nfd . 'bc') . "\n";
 	$res_str .= "\"abc\" strlen " . grapheme_strlen('abc') . "\n";
 
-	
+
 	//=====================================================================================
 	$res_str .= "\n" . 'function grapheme_strpos($haystack, $needle, $offset = 0) {}' . "\n\n";
 
@@ -75,7 +75,7 @@ function ut_main()
 		array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "o", "o", -5, 6 ),
 		array( $char_o_diaeresis_nfd . $char_a_ring_nfd . "a" . $char_a_ring_nfd . "bc", $char_a_ring_nfd, 2, 3 ),
 		array( $char_o_diaeresis_nfd . $char_a_ring_nfd . "a" . $char_a_ring_nfd . "bc", $char_a_ring_nfd, -4, 3 ),
-		
+
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "opq", "op", 5 ),
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "opq", "opq", 5 ),
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd, "abc", "false" ),
@@ -119,10 +119,10 @@ function ut_main()
 		}
 		$res_str .= " == " . $test[count($test)-1] . check_result($result, $test[count($test)-1]) . "\n";
 	}
-	
+
 	//=====================================================================================
 	$res_str .= "\n" . 'function grapheme_stripos($haystack, $needle, $offset = 0) {}' . "\n\n";
-	
+
 	$tests = array(
 		array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "O", "o", 2, 6 ),
 		array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Oo", "o", -6, 6 ),
@@ -142,7 +142,7 @@ function ut_main()
 		array( "abc", "A", 0, 0 ),
 		array( "Abc", "a", 1, "false" ),
 		array( "ababc", "A", 1, 2 ),
-		
+
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", "oP", 5 ),
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", "opQ", 5 ),
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd, "abc", "false" ),
@@ -187,7 +187,7 @@ function ut_main()
 		$res_str .= " == " . $test[count($test)-1] . check_result($result, $test[count($test)-1]) . "\n";
 	}
 
-	
+
 	//=====================================================================================
 	$res_str .= "\n" . 'function grapheme_strrpos($haystack, $needle, $offset = 0) {}' . "\n\n";
 
@@ -209,7 +209,7 @@ function ut_main()
 		array( "ababc", "a", 1, 2 ),
 		array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "o", "o", 2, 6 ),
 		array( $char_o_diaeresis_nfd . $char_a_ring_nfd . "a" . $char_a_ring_nfd . "bc", $char_a_ring_nfd, 2, 3 ),
-		
+
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "opq", "op", 5 ),
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "opq", "opq", 5 ),
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd, "abc", "false" ),
@@ -252,11 +252,11 @@ function ut_main()
 		}
 		$res_str .= " == " . $test[count($test)-1] .  check_result($result, $test[count($test)-1]) . "\n";
 	}
-	
+
 
 	//=====================================================================================
 	$res_str .= "\n" . 'function grapheme_strripos($haystack, $needle, $offset = 0) {}' . "\n\n";
-	
+
 	$tests = array(
 		array( "ao" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "O", "o", 2, 6 ),
 		array( $char_o_diaeresis_nfd . $char_a_ring_nfd . "a" . $char_A_ring_nfd . "bc", $char_a_ring_nfd, 2, 3 ),
@@ -274,7 +274,7 @@ function ut_main()
 		array( "abc", "A", 0, 0 ),
 		array( "Abc", "a", 1, "false" ),
 		array( "ababc", "A", 1, 2 ),
-		
+
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", "oP", 5 ),
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", "opQ", 5 ),
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd, "abc", "false" ),
@@ -317,8 +317,8 @@ function ut_main()
 		}
 		$res_str .= " == " . $test[count($test)-1] . check_result($result, $test[count($test)-1]) . "\n";
 	}
-	
-	
+
+
 	//=====================================================================================
 	$res_str .= "\n" . 'function grapheme_substr($string, $start, $length = -1) {}' . "\n\n";
 
@@ -343,7 +343,7 @@ function ut_main()
 		array( "Abc", -4, 1, "false" ),
 		array( "ababc", 1, 2, "ba" ),
 		array( "ababc", 0, 10, "ababc" ),
-		
+
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", 0, 10 , "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq" ),
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", 5, "Opq" ),
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", 5, -1, "Op" ),
@@ -392,7 +392,7 @@ function ut_main()
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", -8, -7, "a" ),
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", -8, -8, "" ),
 		array( "a" . $char_a_ring_nfd . "bc" . $char_o_diaeresis_nfd . "Opq", -8, -9, "false" ),
-		
+
 	);
 
 	foreach( $tests as $test ) {
@@ -414,7 +414,7 @@ function ut_main()
 		}
 		$res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n";
 	}
-	
+
 
 	//=====================================================================================
 	$res_str .= "\n" . 'function grapheme_strstr($haystack, $needle, $before_needle = FALSE) {}' . "\n\n";
@@ -441,7 +441,7 @@ function ut_main()
 		array( "ababc", "bab", TRUE, "a" ),
 		array( "ababc", "abc", TRUE, "ab" ),
 		array( "ababc", "abc", FALSE, "abc" ),
-		
+
 		array( "ab" . $char_a_ring_nfd . "c", "d", "false" ),
 		array( "bc" . $char_a_ring_nfd . "a", "a", "a" ),
 		array( "a" . $char_a_ring_nfd . "bc", "b", "bc" ),
@@ -479,7 +479,7 @@ function ut_main()
 		}
 		$res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n";
 	}
-	
+
 
 	//=====================================================================================
 	$res_str .= "\n" . 'function grapheme_stristr($haystack, $needle, $before_needle = FALSE) {}' . "\n\n";
@@ -506,7 +506,7 @@ function ut_main()
 		array( "aBabc", "bab", TRUE, "a" ),
 		array( "ababc", "aBc", TRUE, "ab" ),
 		array( "ababc", "abC", FALSE, "abc" ),
-		
+
 		array( "ab" . $char_a_ring_nfd . "c", "d", "false" ),
 		array( "bc" . $char_a_ring_nfd . "A", "a", "A" ),
 		array( "a" . $char_a_ring_nfd . "bc", "B", "bc" ),
@@ -544,7 +544,7 @@ function ut_main()
 		}
 		$res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n";
 	}
-	
+
 
 	//=====================================================================================
 	$res_str .= "\n" . 'function grapheme_extract($haystack, $size, $extract_type = GRAPHEME_EXTR_COUNT, $start = 0[, $next])' . "\n\n";
@@ -635,7 +635,7 @@ function ut_main()
 		}
 		$res_str .= "\n";
 	}
-	
+
 
 	//=====================================================================================
 	$res_str .= "\n" . 'function grapheme_extract($haystack, $size, $extract_type = GRAPHEME_EXTR_MAXBYTES, $start = 0)' . "\n\n";
@@ -693,7 +693,7 @@ function ut_main()
 		}
 		$res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n";
 	}
-	
+
 
 	//=====================================================================================
 	$res_str .= "\n" . 'function grapheme_extract($haystack, $size, $extract_type = GRAPHEME_EXTR_MAXCHARS, $start = 0)' . "\n\n";
@@ -757,10 +757,10 @@ function ut_main()
 		}
 		$res_str .= " == " . urlencode($test[count($test)-1]) . check_result($result, $test[count($test)-1]) . "\n";
 	}
-	
-	
+
+
 	//=====================================================================================
-	
+
 	return $res_str;
 }
 
diff --git a/ext/intl/tests/idn_uts46_basic.phpt b/ext/intl/tests/idn_uts46_basic.phpt
index 2ca185092d6..881e8311c9d 100644
--- a/ext/intl/tests/idn_uts46_basic.phpt
+++ b/ext/intl/tests/idn_uts46_basic.phpt
@@ -12,9 +12,9 @@ $utf8dn = "www.fußball.com";
 $asciiNonTrans = "www.xn--fuball-cta.com";
 
 echo "all ok, no details:", "\n";
-var_dump(idn_to_ascii($utf8dn, 
+var_dump(idn_to_ascii($utf8dn,
 	IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46));
-	
+
 echo "all ok, no details, transitional:", "\n";
 var_dump(idn_to_ascii($utf8dn, 0, INTL_IDNA_VARIANT_UTS46));
 
diff --git a/ext/intl/tests/locale_accept.phpt b/ext/intl/tests/locale_accept.phpt
index cf1dc6e675c..a2834d8adec 100644
--- a/ext/intl/tests/locale_accept.phpt
+++ b/ext/intl/tests/locale_accept.phpt
@@ -6,7 +6,7 @@ locale_accept_from_http
 <?php
 
 /*
- * Try parsing different Locales  
+ * Try parsing different Locales
  * with Procedural and Object methods.
  */
 
diff --git a/ext/intl/tests/locale_compose_locale.phpt b/ext/intl/tests/locale_compose_locale.phpt
index 2d0ca54e742..5eef05b3e63 100644
--- a/ext/intl/tests/locale_compose_locale.phpt
+++ b/ext/intl/tests/locale_compose_locale.phpt
@@ -6,42 +6,42 @@ locale_compose_locale()
 <?php
 
 /*
- * Try parsing different Locales  
+ * Try parsing different Locales
  * with Procedural and Object methods.
  */
 
 function ut_main()
 {
-	$loc_parts_arr1 = array( 
+	$loc_parts_arr1 = array(
 		Locale::LANG_TAG =>'sl' ,
 		Locale::SCRIPT_TAG =>'Latn' ,
-		Locale::REGION_TAG =>'IT' 
+		Locale::REGION_TAG =>'IT'
 	);
-	$loc_parts_arr2 = array( 
+	$loc_parts_arr2 = array(
 		Locale::LANG_TAG =>'de' ,
 		Locale::REGION_TAG =>'DE'
 	);
-	$loc_parts_arr3 = array( 
+	$loc_parts_arr3 = array(
 		Locale::LANG_TAG =>'hi'
 	);
-	$loc_parts_arr4 = array( 
+	$loc_parts_arr4 = array(
 		Locale::LANG_TAG =>'zh' ,
 		Locale::SCRIPT_TAG =>'Hans' ,
 		Locale::REGION_TAG =>'CN'
 	);
-	$loc_parts_arr5 = array( 
+	$loc_parts_arr5 = array(
 		Locale::LANG_TAG =>'es' ,
 		Locale::SCRIPT_TAG =>'Hans' ,
 		Locale::REGION_TAG =>'CN'
 	);
-	$loc_parts_arr6 = array( 
+	$loc_parts_arr6 = array(
 		Locale::LANG_TAG =>'en' ,
 		Locale::SCRIPT_TAG =>'Hans' ,
 		Locale::REGION_TAG =>'CN',
 		Locale::VARIANT_TAG.'14' =>'rozaj' ,
-		'variant1'=>'nedis' 
+		'variant1'=>'nedis'
 	);
-	$loc_parts_arr7 = array( 
+	$loc_parts_arr7 = array(
 		Locale::LANG_TAG =>'en' ,
 		Locale::SCRIPT_TAG =>'Hans' ,
 		Locale::REGION_TAG =>'CN',
@@ -50,7 +50,7 @@ function ut_main()
 		'extlang0'=>'lng' ,
 		'extlang1'=>'ing'
 	);
-	$loc_parts_arr8 = array( 
+	$loc_parts_arr8 = array(
 		Locale::LANG_TAG =>'en' ,
 		Locale::SCRIPT_TAG =>'Hans' ,
 		Locale::REGION_TAG =>'CN',
@@ -61,21 +61,21 @@ function ut_main()
 		'private7'=>'prv1' ,
 		'private9'=>'prv2'
 	);
-	$loc_parts_arr9 = array( 
+	$loc_parts_arr9 = array(
 		Locale::REGION_TAG =>'DE'
 	);
-	$loc_parts_arr10 = array( 
+	$loc_parts_arr10 = array(
 		Locale::LANG_TAG => 45,
 		Locale::REGION_TAG => false,
 		Locale::SCRIPT_TAG => 15
 	);
 	$loc_parts_arr11 = array(
-		Locale::LANG_TAG =>'de'  , 
-		Locale::REGION_TAG =>'DE', 
+		Locale::LANG_TAG =>'de'  ,
+		Locale::REGION_TAG =>'DE',
 		'private0' => 13,
 		'variant1' => array(),
 		'extlang2' => false
-	);	
+	);
         $loc_parts_arr12 = array(
                 Locale::LANG_TAG =>'en' ,
                 Locale::SCRIPT_TAG =>'Hans' ,
@@ -91,7 +91,7 @@ function ut_main()
 		'loc2' => $loc_parts_arr2	,
 		'loc3' => $loc_parts_arr3	,
 		'loc4' => $loc_parts_arr4	,
-		'loc5' => $loc_parts_arr5	,	
+		'loc5' => $loc_parts_arr5	,
 		'loc6' => $loc_parts_arr6	,
 		'loc7' => $loc_parts_arr7	,
 		'loc8' => $loc_parts_arr8	,
@@ -102,13 +102,13 @@ function ut_main()
 	);
 
     error_reporting( E_ERROR );
-	
+
     $cnt  = 0;
     $res_str = '';
 	foreach($loc_parts_arr as $key => $value ){
 		$res_str .= "\n------------";
 		$res_str .= "\nInput Array name is : loc".(++$cnt) ;
-/*	
+/*
 		foreach($value as $valKey => $valValue ){
 			$res_str .=  $valKey ."->".$valValue."  " ;
 		}
diff --git a/ext/intl/tests/locale_filter_matches.phpt b/ext/intl/tests/locale_filter_matches.phpt
index cada499b9ad..5f4a9457c5b 100644
--- a/ext/intl/tests/locale_filter_matches.phpt
+++ b/ext/intl/tests/locale_filter_matches.phpt
@@ -7,7 +7,7 @@ locale_filter_matches.phpt() icu <= 4.2
 <?php
 
 /*
- * Try parsing different Locales  
+ * Try parsing different Locales
  * with Procedural and Object methods.
  */
 
@@ -21,7 +21,7 @@ function ut_main()
 		'art-lojban',
 		'sl_IT'
 	);
-	
+
 	$lang_tags = array(
 		'de-DEVA',
 		'de-DE-1996',
@@ -48,7 +48,7 @@ function ut_main()
 			$res_str .="--------------\n";
 			$result= ut_loc_locale_filter_matches( $lang_tag , $loc_range , $isCanonical);
 			$res_str .= "loc_range:$loc_range matches lang_tag $lang_tag ? ";
-			if( $result){	
+			if( $result){
 				$res_str .= "YES\n";
 			}else{
 				$res_str .= "NO\n";
@@ -58,7 +58,7 @@ function ut_main()
 			$can_loc_range = ut_loc_canonicalize($loc_range);
 			$can_lang_tag = ut_loc_canonicalize($lang_tag);
 			$res_str .= "loc_range:$can_loc_range canonically matches lang_tag $can_lang_tag ? ";
-			if( $result){	
+			if( $result){
 				$res_str .= "YES\n";
 			}else{
 				$res_str .= "NO\n";
diff --git a/ext/intl/tests/locale_filter_matches2.phpt b/ext/intl/tests/locale_filter_matches2.phpt
index 46771b7c1a1..3ce86030285 100644
--- a/ext/intl/tests/locale_filter_matches2.phpt
+++ b/ext/intl/tests/locale_filter_matches2.phpt
@@ -8,7 +8,7 @@ locale_filter_matches.phpt() icu >= 4.8 && icu < 50.1.2
 <?php
 
 /*
- * Try parsing different Locales  
+ * Try parsing different Locales
  * with Procedural and Object methods.
  */
 
@@ -22,7 +22,7 @@ function ut_main()
 		'art-lojban',
 		'sl_IT'
 	);
-	
+
 	$lang_tags = array(
 		'de-DEVA',
 		'de-DE-1996',
@@ -49,7 +49,7 @@ function ut_main()
 			$res_str .="--------------\n";
 			$result= ut_loc_locale_filter_matches( $lang_tag , $loc_range , $isCanonical);
 			$res_str .= "loc_range:$loc_range matches lang_tag $lang_tag ? ";
-			if( $result){	
+			if( $result){
 				$res_str .= "YES\n";
 			}else{
 				$res_str .= "NO\n";
@@ -59,7 +59,7 @@ function ut_main()
 			$can_loc_range = ut_loc_canonicalize($loc_range);
 			$can_lang_tag = ut_loc_canonicalize($lang_tag);
 			$res_str .= "loc_range:$can_loc_range canonically matches lang_tag $can_lang_tag ? ";
-			if( $result){	
+			if( $result){
 				$res_str .= "YES\n";
 			}else{
 				$res_str .= "NO\n";
diff --git a/ext/intl/tests/locale_filter_matches3.phpt b/ext/intl/tests/locale_filter_matches3.phpt
index 4c1d4d3898e..2816ba5e122 100644
--- a/ext/intl/tests/locale_filter_matches3.phpt
+++ b/ext/intl/tests/locale_filter_matches3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-locale_filter_matches.phpt() ICU >= 51.2 
+locale_filter_matches.phpt() ICU >= 51.2
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
 <?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?>
@@ -7,7 +7,7 @@ locale_filter_matches.phpt() ICU >= 51.2
 <?php
 
 /*
- * Try parsing different Locales  
+ * Try parsing different Locales
  * with Procedural and Object methods.
  */
 
@@ -21,7 +21,7 @@ function ut_main()
 		'art-lojban',
 		'sl_IT'
 	);
-	
+
 	$lang_tags = array(
 		'de-DEVA',
 		'de-DE-1996',
@@ -48,7 +48,7 @@ function ut_main()
 			$res_str .="--------------\n";
 			$result= ut_loc_locale_filter_matches( $lang_tag , $loc_range , $isCanonical);
 			$res_str .= "loc_range:$loc_range matches lang_tag $lang_tag ? ";
-			if( $result){	
+			if( $result){
 				$res_str .= "YES\n";
 			}else{
 				$res_str .= "NO\n";
@@ -58,7 +58,7 @@ function ut_main()
 			$can_loc_range = ut_loc_canonicalize($loc_range);
 			$can_lang_tag = ut_loc_canonicalize($lang_tag);
 			$res_str .= "loc_range:$can_loc_range canonically matches lang_tag $can_lang_tag ? ";
-			if( $result){	
+			if( $result){
 				$res_str .= "YES\n";
 			}else{
 				$res_str .= "NO\n";
diff --git a/ext/intl/tests/locale_get_all_variants.phpt b/ext/intl/tests/locale_get_all_variants.phpt
index 864b8a2e1a5..8f2bcbfa396 100644
--- a/ext/intl/tests/locale_get_all_variants.phpt
+++ b/ext/intl/tests/locale_get_all_variants.phpt
@@ -6,7 +6,7 @@ locale_get_all_variants.phpt()
 <?php
 
 /*
- * Try parsing different Locales  
+ * Try parsing different Locales
  * with Procedural and Object methods.
  */
 
@@ -24,7 +24,7 @@ function ut_main()
 		'sgn-BE-nl',
 		'sgn-CH-de',
 		'sl_IT_rozaj@currency=EUR'
-	);	
+	);
     $res_str = '';
 	foreach($locales as $locale){
 		$variants_arr = ut_loc_locale_get_all_variants( $locale);
diff --git a/ext/intl/tests/locale_get_default.phpt b/ext/intl/tests/locale_get_default.phpt
index 57c46ccd2b9..6bb5a9a86b2 100644
--- a/ext/intl/tests/locale_get_default.phpt
+++ b/ext/intl/tests/locale_get_default.phpt
@@ -15,7 +15,7 @@ intl.default_locale=en-US
 function ut_main()
 {
     $res_str = '';
-	
+
     $lang = ut_loc_get_default() ;
     $res_str .= "Default locale: $lang";
     $res_str .= "\n";
diff --git a/ext/intl/tests/locale_get_display_language.phpt b/ext/intl/tests/locale_get_display_language.phpt
index 2e000562843..35d7532d6bd 100644
--- a/ext/intl/tests/locale_get_display_language.phpt
+++ b/ext/intl/tests/locale_get_display_language.phpt
@@ -80,7 +80,7 @@ function ut_main()
         	$scr = ut_loc_get_display_language( $locale ,$disp_locale );
         	$res_str .= "disp_locale=$disp_locale :  display_language=$scr";
         	$res_str .= "\n";
-		} 
+		}
         $res_str .= "-----------------\n";
     }
 
diff --git a/ext/intl/tests/locale_get_display_name.phpt b/ext/intl/tests/locale_get_display_name.phpt
index b1287342777..ee921020afb 100644
--- a/ext/intl/tests/locale_get_display_name.phpt
+++ b/ext/intl/tests/locale_get_display_name.phpt
@@ -89,10 +89,10 @@ function ut_main()
    		foreach( $disp_locales as $disp_locale )
     	{
         	$scr = ut_loc_get_display_name( $locale ,$disp_locale );
-		$scr = str_replace(array('(', ')'), '#', $scr); 
+		$scr = str_replace(array('(', ')'), '#', $scr);
         	$res_str .= "disp_locale=$disp_locale :  display_name=$scr";
         	$res_str .= "\n";
-		} 
+		}
         $res_str .= "-----------------\n";
     }
 
diff --git a/ext/intl/tests/locale_get_display_name2.phpt b/ext/intl/tests/locale_get_display_name2.phpt
index dcc996eca97..0b0bc6c3216 100644
--- a/ext/intl/tests/locale_get_display_name2.phpt
+++ b/ext/intl/tests/locale_get_display_name2.phpt
@@ -90,10 +90,10 @@ function ut_main()
    		foreach( $disp_locales as $disp_locale )
     	{
         	$scr = ut_loc_get_display_name( $locale ,$disp_locale );
-		$scr = str_replace(array('(', ')'), '#', $scr); 
+		$scr = str_replace(array('(', ')'), '#', $scr);
         	$res_str .= "disp_locale=$disp_locale :  display_name=$scr";
         	$res_str .= "\n";
-		} 
+		}
         $res_str .= "-----------------\n";
     }
 
diff --git a/ext/intl/tests/locale_get_display_name3.phpt b/ext/intl/tests/locale_get_display_name3.phpt
index 0340f14b2cf..2052a6d4564 100644
--- a/ext/intl/tests/locale_get_display_name3.phpt
+++ b/ext/intl/tests/locale_get_display_name3.phpt
@@ -89,10 +89,10 @@ function ut_main()
    		foreach( $disp_locales as $disp_locale )
     	{
         	$scr = ut_loc_get_display_name( $locale ,$disp_locale );
-		$scr = str_replace(array('(', ')'), '#', $scr); 
+		$scr = str_replace(array('(', ')'), '#', $scr);
         	$res_str .= "disp_locale=$disp_locale :  display_name=$scr";
         	$res_str .= "\n";
-		} 
+		}
         $res_str .= "-----------------\n";
     }
 
diff --git a/ext/intl/tests/locale_get_display_name4.phpt b/ext/intl/tests/locale_get_display_name4.phpt
index 4b3255c0f64..a0b40a4114b 100644
--- a/ext/intl/tests/locale_get_display_name4.phpt
+++ b/ext/intl/tests/locale_get_display_name4.phpt
@@ -90,10 +90,10 @@ function ut_main()
    		foreach( $disp_locales as $disp_locale )
     	{
         	$scr = ut_loc_get_display_name( $locale ,$disp_locale );
-		$scr = str_replace(array('(', ')'), '#', $scr); 
+		$scr = str_replace(array('(', ')'), '#', $scr);
         	$res_str .= "disp_locale=$disp_locale :  display_name=$scr";
         	$res_str .= "\n";
-		} 
+		}
         $res_str .= "-----------------\n";
     }
 
diff --git a/ext/intl/tests/locale_get_display_name5.phpt b/ext/intl/tests/locale_get_display_name5.phpt
index b633b1f62cd..99263190aca 100644
--- a/ext/intl/tests/locale_get_display_name5.phpt
+++ b/ext/intl/tests/locale_get_display_name5.phpt
@@ -89,10 +89,10 @@ function ut_main()
    		foreach( $disp_locales as $disp_locale )
     	{
         	$scr = ut_loc_get_display_name( $locale ,$disp_locale );
-		$scr = str_replace(array('(', ')'), '#', $scr); 
+		$scr = str_replace(array('(', ')'), '#', $scr);
         	$res_str .= "disp_locale=$disp_locale :  display_name=$scr";
         	$res_str .= "\n";
-		} 
+		}
         $res_str .= "-----------------\n";
     }
 
diff --git a/ext/intl/tests/locale_get_keywords.phpt b/ext/intl/tests/locale_get_keywords.phpt
index 4a09f54d363..622dd79dc81 100644
--- a/ext/intl/tests/locale_get_keywords.phpt
+++ b/ext/intl/tests/locale_get_keywords.phpt
@@ -30,7 +30,7 @@ function ut_main()
         'fr',
         'ja',
         'i-enochian', //(example of a grandfathered tag)
-//Language subtag plus Script subtag:	
+//Language subtag plus Script subtag:
         'zh-Hant',
         'zh-Hans',
         'sr-Cyrl',
@@ -53,7 +53,7 @@ function ut_main()
 //Private use subtags:
         'de-CH-x-phonebk',
         'az-Arab-x-AZE-derbend',
-//Extended language subtags 
+//Extended language subtags
         'zh-min',
         'zh-min-nan-Hant-CN',
 //Private use registry values
diff --git a/ext/intl/tests/locale_get_keywords2.phpt b/ext/intl/tests/locale_get_keywords2.phpt
index 7bcaca18979..c36655f7b2b 100644
--- a/ext/intl/tests/locale_get_keywords2.phpt
+++ b/ext/intl/tests/locale_get_keywords2.phpt
@@ -30,7 +30,7 @@ function ut_main()
         'fr',
         'ja',
         'i-enochian', //(example of a grandfathered tag)
-//Language subtag plus Script subtag:	
+//Language subtag plus Script subtag:
         'zh-Hant',
         'zh-Hans',
         'sr-Cyrl',
@@ -53,7 +53,7 @@ function ut_main()
 //Private use subtags:
         'de-CH-x-phonebk',
         'az-Arab-x-AZE-derbend',
-//Extended language subtags 
+//Extended language subtags
         'zh-min',
         'zh-min-nan-Hant-CN',
 //Private use registry values
diff --git a/ext/intl/tests/locale_lookup.phpt b/ext/intl/tests/locale_lookup.phpt
index ff8aab049d5..9d4843038de 100644
--- a/ext/intl/tests/locale_lookup.phpt
+++ b/ext/intl/tests/locale_lookup.phpt
@@ -7,7 +7,7 @@ locale_lookup.phpt() icu >= 4.8 && icu < 50.1.2
 <?php
 
 /*
- * Try parsing different Locales  
+ * Try parsing different Locales
  * with Procedural and Object methods.
  */
 
@@ -20,7 +20,7 @@ function ut_main()
 		'jbo',
 		'art-lojban'
 	);
-	
+
 	$lang_tags = array(
 		'de-DEVA',
 		'de-DE-1996',
diff --git a/ext/intl/tests/locale_lookup_variant2.phpt b/ext/intl/tests/locale_lookup_variant2.phpt
index 4715951e9ab..75a5350abfb 100644
--- a/ext/intl/tests/locale_lookup_variant2.phpt
+++ b/ext/intl/tests/locale_lookup_variant2.phpt
@@ -7,7 +7,7 @@ locale_lookup.phpt()
 <?php
 
 /*
- * Try parsing different Locales  
+ * Try parsing different Locales
  * with Procedural and Object methods.
  */
 
@@ -20,7 +20,7 @@ function ut_main()
 		'jbo',
 		'art-lojban'
 	);
-	
+
 	$lang_tags = array(
 		'de-DEVA',
 		'de-DE-1996',
diff --git a/ext/intl/tests/locale_set_default.phpt b/ext/intl/tests/locale_set_default.phpt
index 7debf4d3dea..d56c9177cde 100644
--- a/ext/intl/tests/locale_set_default.phpt
+++ b/ext/intl/tests/locale_set_default.phpt
@@ -56,7 +56,7 @@ function ut_main()
         'sr-Latn-QM',
         'sr-Qaaa-CS',
 //Tags that use extensions (examples ONLY: extensions MUST be defined
-//   by revision or update to this document or by RFC): 
+//   by revision or update to this document or by RFC):
         'en-US-u-islamCal',
         'zh-CN-a-myExt-x-private',
         'en-a-myExt-b-another',
@@ -67,7 +67,7 @@ function ut_main()
     );
 
 /*
-	$locales = array(	
+	$locales = array(
 		'es'
 	);
 */
diff --git a/ext/intl/tests/msgfmt_fail.phpt b/ext/intl/tests/msgfmt_fail.phpt
index daeaa8f677c..afb415d1c82 100644
--- a/ext/intl/tests/msgfmt_fail.phpt
+++ b/ext/intl/tests/msgfmt_fail.phpt
@@ -51,9 +51,9 @@ try {
 	print_exception($e);
 	$fmt = null;
 }
-err($fmt); 
+err($fmt);
 $fmt = msgfmt_create();
-err($fmt); 
+err($fmt);
 $fmt = MessageFormatter::create();
 err($fmt);
 try {
@@ -62,11 +62,11 @@ try {
 	print_exception($e);
 	$fmt = null;
 }
-err($fmt); 
+err($fmt);
 $fmt = msgfmt_create('en');
-err($fmt); 
+err($fmt);
 $fmt = MessageFormatter::create('en');
-err($fmt); 
+err($fmt);
 
 foreach($args as $arg) {
 	$fmt = crt("O", $arg[0], $arg[1]);
diff --git a/ext/intl/tests/msgfmt_fail2.phpt b/ext/intl/tests/msgfmt_fail2.phpt
index 698d19afcef..d574531b3a9 100644
--- a/ext/intl/tests/msgfmt_fail2.phpt
+++ b/ext/intl/tests/msgfmt_fail2.phpt
@@ -51,9 +51,9 @@ try {
 	print_exception($e);
 	$fmt = null;
 }
-err($fmt); 
+err($fmt);
 $fmt = msgfmt_create();
-err($fmt); 
+err($fmt);
 $fmt = MessageFormatter::create();
 err($fmt);
 try {
@@ -62,11 +62,11 @@ try {
 	print_exception($e);
 	$fmt = null;
 }
-err($fmt); 
+err($fmt);
 $fmt = msgfmt_create('en');
-err($fmt); 
+err($fmt);
 $fmt = MessageFormatter::create('en');
-err($fmt); 
+err($fmt);
 
 foreach($args as $arg) {
 	$fmt = crt("O", $arg[0], $arg[1]);
diff --git a/ext/intl/tests/msgfmt_format.phpt b/ext/intl/tests/msgfmt_format.phpt
index c1bf5e9db61..19581e9698d 100644
--- a/ext/intl/tests/msgfmt_format.phpt
+++ b/ext/intl/tests/msgfmt_format.phpt
@@ -15,16 +15,16 @@ function ut_main()
     $locales = array(
         'en_US' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree",
         'ru_UA' => "{0,number,integer} мавп на {1,number,integer} деревах це {2,number} мавпи на кожному деревi",
-        'de' => "{0,number,integer} Affen über {1,number,integer} Bäume um {2,number} Affen pro Baum", 
-        'en_UK' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree", 
+        'de' => "{0,number,integer} Affen über {1,number,integer} Bäume um {2,number} Affen pro Baum",
+        'en_UK' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree",
 	'root' => '{0,whatever} would not work!',
 	'fr' => "C'est la vie!",
-    );  
+    );
 
     $str_res = '';
 	$m = 4560;
 	$t = 123;
-	
+
     foreach( $locales as $locale => $pattern )
     {
         $str_res .= "\nLocale is: $locale\n";
diff --git a/ext/intl/tests/msgfmt_format_mixed_params.phpt b/ext/intl/tests/msgfmt_format_mixed_params.phpt
index 93412f49e22..9a3691db510 100644
--- a/ext/intl/tests/msgfmt_format_mixed_params.phpt
+++ b/ext/intl/tests/msgfmt_format_mixed_params.phpt
@@ -13,7 +13,7 @@ ini_set("intl.error_level", E_WARNING);
 
 $mf = new MessageFormatter('en_US',
 	"{0,number} -- {foo,ordinal}");
-	
+
 var_dump($mf->format(array(2.3, "foo" => 1.3)));
 var_dump($mf->format(array("foo" => 1.3, 0 => 2.3)));
 
diff --git a/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt
index 299ae483a49..a300d13b772 100644
--- a/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt
+++ b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt
@@ -25,7 +25,7 @@ $mf = new MessageFormatter('en_US',"
 	ordinal			{i,ordinal}
 	duration		{j,duration}
 	");
-	
+
 $ex = "1336317965.5 str";
 var_dump($mf->format(array(
 'a' => $ex,
diff --git a/ext/intl/tests/msgfmt_get_set_pattern.phpt b/ext/intl/tests/msgfmt_get_set_pattern.phpt
index 67b1aca4598..7d7ab83e091 100644
--- a/ext/intl/tests/msgfmt_get_set_pattern.phpt
+++ b/ext/intl/tests/msgfmt_get_set_pattern.phpt
@@ -35,7 +35,7 @@ function ut_main()
     ut_msgfmt_set_pattern($fmt, str_repeat($pattern, 10));
     $res_str .= "New pattern: '" . ut_msgfmt_get_pattern( $fmt ) . "'\n";
     $res_str .= "Formatted message: " . ut_msgfmt_format( $fmt, array(123, 456) ) . "\n";
- 
+
 
     return $res_str;
 }
diff --git a/ext/intl/tests/msgfmt_parse.phpt b/ext/intl/tests/msgfmt_parse.phpt
index b9ec36374bc..95645a63a02 100644
--- a/ext/intl/tests/msgfmt_parse.phpt
+++ b/ext/intl/tests/msgfmt_parse.phpt
@@ -15,12 +15,12 @@ function ut_main()
     $locales = array(
         'en_US' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree",
         'ru_UA' => "{0,number,integer} мавп на {1,number,integer} деревах це {2,number} мавпи на кожному деревi",
-        'de' => "{0,number,integer} Affen über {1,number,integer} Bäume um {2,number} Affen pro Baum", 
-        'en_UK' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree", 
+        'de' => "{0,number,integer} Affen über {1,number,integer} Bäume um {2,number} Affen pro Baum",
+        'en_UK' => "{0,number,integer} monkeys on {1,number,integer} trees make {2,number} monkeys per tree",
 	'root' => '{0,whatever} would not work!',
 	'fr' => 'C\'est {0,number,integer}',
     );
-	
+
 	$results = array(
 		'en_US' => "4,560 monkeys on 123 trees make 37.073 monkeys per tree",
 		'ru_UA' => "4 560 мавп на 123 деревах це 37,073 мавпи на кожному деревi",
@@ -28,11 +28,11 @@ function ut_main()
 		'en_UK' => "4,560 monkeys on 123 trees make 37.073 monkeys per tree",
 		'root' => "4,560 monkeys on 123 trees make 37.073 monkeys per tree",
 		'fr' => "C'est 42",
-		
+
 	);
 
 	$str_res = '';
-	
+
     foreach( $locales as $locale => $pattern )
     {
         $str_res .= "\nLocale is: $locale\n";
diff --git a/ext/intl/tests/msgfmt_setPattern_cache.phpt b/ext/intl/tests/msgfmt_setPattern_cache.phpt
index 35ec463c2a7..995eee6f2e7 100644
--- a/ext/intl/tests/msgfmt_setPattern_cache.phpt
+++ b/ext/intl/tests/msgfmt_setPattern_cache.phpt
@@ -11,7 +11,7 @@ ini_set("intl.error_level", E_WARNING);
 
 $mf = new MessageFormatter('en_US',
 	"{0,number} -- {1,ordinal}");
-	
+
 var_dump($mf->format(array(1.3, 1.3)));
 var_dump($mf->format(array(1.3, 1.3)));
 $mf->setPattern("{0,ordinal} -- {1,number}");
diff --git a/ext/intl/tests/normalizer_normalize.phpt b/ext/intl/tests/normalizer_normalize.phpt
index 238b7423cf7..1af9d10da27 100644
--- a/ext/intl/tests/normalizer_normalize.phpt
+++ b/ext/intl/tests/normalizer_normalize.phpt
@@ -39,7 +39,7 @@ function ut_main()
 
 			$res_str .= "Invalid normalization form declarations!\n";
 	}
-		 
+
 	$char_a_diaeresis = "\xC3\xA4";	// 'LATIN SMALL LETTER A WITH DIAERESIS' (U+00E4)
 	$char_a_ring = "\xC3\xA5";		// 'LATIN SMALL LETTER A WITH RING ABOVE' (U+00E5)
 	$char_o_diaeresis = "\xC3\xB6";    // 'LATIN SMALL LETTER O WITH DIAERESIS' (U+00F6)
@@ -55,7 +55,7 @@ function ut_main()
 	$char_fi_ligature = "\xEF\xAC\x81";  // 'LATIN SMALL LIGATURE FI' (U+FB01)
 
 	$char_long_s_dot = "\xE1\xBA\x9B";	// 'LATIN SMALL LETTER LONG S WITH DOT ABOVE' (U+1E9B)
-			
+
 	$strs = array(
 		'ABC',
 		$char_a_diaeresis . '||' . $char_a_ring . '||' . $char_o_diaeresis,
@@ -64,7 +64,7 @@ function ut_main()
 		$char_fi_ligature,
 		$char_long_s_dot,
 	);
-	
+
 	foreach( $forms as $form )
 	{
 		foreach( $strs as $str )
@@ -75,15 +75,15 @@ function ut_main()
 
 			$str_hex = urlencode($str);
 			$str_norm_hex = urlencode($str_norm);
-			$res_str .= "'$str_hex' normalized to form '{$forms_str[$form]}' is '$str_norm_hex'" 
-					 .	"\terror info: '$error_message' ($error_code)\n" 
+			$res_str .= "'$str_hex' normalized to form '{$forms_str[$form]}' is '$str_norm_hex'"
+					 .	"\terror info: '$error_message' ($error_code)\n"
 					 .	"";
-			
+
 			$is_norm = ut_norm_is_normalized( $str, $form );
 			$error_code = intl_get_error_code();
 			$error_message = intl_get_error_message();
 
-			$res_str .= "		is in form '{$forms_str[$form]}'? = " . ($is_norm ? "yes" : "no") 
+			$res_str .= "		is in form '{$forms_str[$form]}'? = " . ($is_norm ? "yes" : "no")
 					 .	"\terror info: '$error_message' ($error_code)\n"
 					 .	"";
 		}
diff --git a/ext/intl/tests/resourcebundle_create.phpt b/ext/intl/tests/resourcebundle_create.phpt
index 2bf4f556a86..1a1ba8e03f0 100644
--- a/ext/intl/tests/resourcebundle_create.phpt
+++ b/ext/intl/tests/resourcebundle_create.phpt
@@ -4,7 +4,7 @@ Test ResourceBundle::__construct() - existing/missing bundles/locales
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
 --FILE--
 <?php
-	
+
 include "resourcebundle.inc";
 
 function ut_main() {
@@ -31,7 +31,7 @@ function ut_main() {
 	// missing
 	$r3 = ut_resourcebundle_create( 'en_US', 'nonexisting' );
         $str_res .= debug( $r3 );
-	
+
 	return $str_res;
 }
 
diff --git a/ext/intl/tests/resourcebundle_individual.phpt b/ext/intl/tests/resourcebundle_individual.phpt
index dcbf1f5831f..0fb512f8e56 100644
--- a/ext/intl/tests/resourcebundle_individual.phpt
+++ b/ext/intl/tests/resourcebundle_individual.phpt
@@ -27,7 +27,7 @@ function ut_main() {
 
 	$t = ut_resourcebundle_get( $r, 'nonexisting' );
 	$str_res .= debug( $t );
-	
+
 	return $str_res;
 }
 	include_once( 'ut_common.inc' );
diff --git a/ext/intl/tests/resourcebundle_locales.phpt b/ext/intl/tests/resourcebundle_locales.phpt
index e14a7e5aa1e..c744e631937 100644
--- a/ext/intl/tests/resourcebundle_locales.phpt
+++ b/ext/intl/tests/resourcebundle_locales.phpt
@@ -4,14 +4,14 @@ Test ResourceBundle::getLocales
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
 --FILE--
 <?php
-	
+
 include "resourcebundle.inc";
 
 function ut_main() {
 	$str_res = '';
 
 	$str_res .= join("\n", ut_resourcebundle_locales(BUNDLE));
-	
+
 	return $str_res;
 }
 
diff --git a/ext/intl/tests/symfony_format_type_int32_intl1.phpt b/ext/intl/tests/symfony_format_type_int32_intl1.phpt
index 2867b35690b..7d892cf5b6e 100644
--- a/ext/intl/tests/symfony_format_type_int32_intl1.phpt
+++ b/ext/intl/tests/symfony_format_type_int32_intl1.phpt
@@ -10,13 +10,13 @@ Symfony StubNumberFormatterTest#testFormatTypeInt32Intl #1
 
 // Crashes on Windows
 // Windows note: the popup '...program has stopped working'(AEDebug Popup)
-//    doesn't always show if you're rapidly running this test repeatedly. 
+//    doesn't always show if you're rapidly running this test repeatedly.
 //    regardless of that, the test always crashes every time.
 //    (it will show up the first time, or if you wait a while before running it again.)
 //    (the popup may also be disabled, which can be done with a registry setting.)
 //    you can confirm it crashed by checking the exit code OR
 //    the message this test prints at the very end (expected output for pass).
-// 
+//
 // Get Exit Code
 //  Linux: echo $?
 //  Windows: echo %ErrorLevel%
diff --git a/ext/intl/tests/timezone_getOffset_basic.phpt b/ext/intl/tests/timezone_getOffset_basic.phpt
index 582d45cad91..403bf8fc35d 100644
--- a/ext/intl/tests/timezone_getOffset_basic.phpt
+++ b/ext/intl/tests/timezone_getOffset_basic.phpt
@@ -17,7 +17,7 @@ var_dump($ams->getOffset($date *1000., true, $rawOffset, $dstOffset),
 	$rawOffset, $dstOffset);
 
 $lsb = IntlTimeZone::createTimeZone('Europe/Lisbon');
-	
+
 var_dump(intltz_get_offset($lsb, $date *1000., true, $rawOffset, $dstOffset),
 	$rawOffset, $dstOffset);
 
diff --git a/ext/json/tests/002.phpt b/ext/json/tests/002.phpt
index b562b616c8e..9af0af172dc 100644
--- a/ext/json/tests/002.phpt
+++ b/ext/json/tests/002.phpt
@@ -22,7 +22,7 @@ var_dump(json_encode("ру��иш"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(2) """"
 string(4) "null"
 string(4) "true"
diff --git a/ext/json/tests/003.phpt b/ext/json/tests/003.phpt
index b7a215cee7b..3248689bf94 100644
--- a/ext/json/tests/003.phpt
+++ b/ext/json/tests/003.phpt
@@ -22,7 +22,7 @@ var_dump(json_last_error(), json_last_error_msg());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(1) {
   [0]=>
   &array(1) {
diff --git a/ext/json/tests/004.phpt b/ext/json/tests/004.phpt
index 040973c9f3a..f712ffd38ba 100644
--- a/ext/json/tests/004.phpt
+++ b/ext/json/tests/004.phpt
@@ -22,7 +22,7 @@ var_dump(json_last_error(), json_last_error_msg());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 object(stdClass)#%d (1) {
   ["prop"]=>
   *RECURSION*
diff --git a/ext/json/tests/bug41403.phpt b/ext/json/tests/bug41403.phpt
index 4f30b25901c..918803a07fb 100644
--- a/ext/json/tests/bug41403.phpt
+++ b/ext/json/tests/bug41403.phpt
@@ -2,7 +2,7 @@
 Bug #41403 (json_decode cannot decode floats if localeconv decimal_point is not '.')
 --SKIPIF--
 <?php
-if (!extension_loaded('json')) die('skip'); 
+if (!extension_loaded('json')) die('skip');
 if (setlocale(LC_NUMERIC, "de_DE") === false) {
 	die("skip no de_DE locale");
 }
@@ -20,7 +20,7 @@ var_dump(json_decode('[123,13452345]'));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(1) {
   [0]=>
   float(2,1)
diff --git a/ext/json/tests/bug41504.phpt b/ext/json/tests/bug41504.phpt
index bef497404f2..2724f1690be 100644
--- a/ext/json/tests/bug41504.phpt
+++ b/ext/json/tests/bug41504.phpt
@@ -11,7 +11,7 @@ var_dump(json_decode('{"key":"value", "":"value"}', true));
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 array(1) {
   [""]=>
   string(5) "value"
diff --git a/ext/json/tests/bug41567.phpt b/ext/json/tests/bug41567.phpt
index a2db6fe290f..05d8ca438b0 100644
--- a/ext/json/tests/bug41567.phpt
+++ b/ext/json/tests/bug41567.phpt
@@ -12,6 +12,6 @@ var_dump(json_decode($a));
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 float(123456789.12345)
 Done
diff --git a/ext/json/tests/bug47644.phpt b/ext/json/tests/bug47644.phpt
index 85c4858af54..c8650958e89 100644
--- a/ext/json/tests/bug47644.phpt
+++ b/ext/json/tests/bug47644.phpt
@@ -15,7 +15,7 @@ for ($i = 10000000000000000; $i < 10000000000000006; $i++) {
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 array(1) {
   [0]=>
   int(10000000000000000)
diff --git a/ext/json/tests/bug69187.phpt b/ext/json/tests/bug69187.phpt
index d39dbe522de..00fdbd46fd5 100644
--- a/ext/json/tests/bug69187.phpt
+++ b/ext/json/tests/bug69187.phpt
@@ -4,7 +4,7 @@ Bug #69187 json_last_error return BC in PHP7
 <?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
-var_dump(json_decode(NULL)); 
+var_dump(json_decode(NULL));
 var_dump(json_last_error());
 var_dump(json_decode(FALSE));
 var_dump(json_last_error());
diff --git a/ext/json/tests/fail001.phpt b/ext/json/tests/fail001.phpt
index ea203746a6d..47c2e654871 100644
--- a/ext/json/tests/fail001.phpt
+++ b/ext/json/tests/fail001.phpt
@@ -6,7 +6,7 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/fail*.json)
 ?>
 --FILE--
 <?php
-    
+
 $tests = array(
 	'"A JSON payload should be an object or array, not a string."',
 	'["Unclosed array"',
diff --git a/ext/json/tests/json_decode_basic.phpt b/ext/json/tests/json_decode_basic.phpt
index 0bc939c2573..d1169eb7777 100644
--- a/ext/json/tests/json_decode_basic.phpt
+++ b/ext/json/tests/json_decode_basic.phpt
@@ -27,7 +27,7 @@ $inputs =  array (
 	'{"Jan":31,"Feb":29,"Mar":31,"April":30,"May":31,"June":30}',
 	'""',
 	'{}'
-);  
+);
 
 // loop through with each element of the $inputs array to test json_decode() function
 $count = 1;
@@ -40,7 +40,7 @@ foreach($inputs as $input) {
 
 ?>
 ===Done===
---EXPECTF-- 
+--EXPECTF--
 *** Testing json_decode() : basic functionality ***
 -- Iteration 1 --
 int(0)
diff --git a/ext/json/tests/json_encode_basic.phpt b/ext/json/tests/json_encode_basic.phpt
index 7fe855d1dc9..0267d0dd4fc 100644
--- a/ext/json/tests/json_encode_basic.phpt
+++ b/ext/json/tests/json_encode_basic.phpt
@@ -37,7 +37,7 @@ $inputs =  array (
 	123.456,
 	1.23E3,
 	-1.23E3,
-  
+
 	// boolean
 	TRUE,
 	true,
@@ -47,7 +47,7 @@ $inputs =  array (
 	// NULL
 	NULL,
 	null,
-  
+
 	// strings
 	"abc",
 	'abc',
@@ -74,8 +74,8 @@ $inputs =  array (
 
 	// object variable
 	$obj
-  
-);  
+
+);
 
 // loop through with each element of the $inputs array to test json_encode() function
 $count = 1;
@@ -87,7 +87,7 @@ foreach($inputs as $input) {
 
 ?>
 ===Done===
---EXPECTF-- 
+--EXPECTF--
 *** Testing json_encode() : basic functionality ***
 -- Iteration 1 --
 string(1) "0"
diff --git a/ext/json/tests/json_encode_basic_utf8.phpt b/ext/json/tests/json_encode_basic_utf8.phpt
index d03e83a8a9e..68fbd391113 100644
--- a/ext/json/tests/json_encode_basic_utf8.phpt
+++ b/ext/json/tests/json_encode_basic_utf8.phpt
@@ -7,11 +7,11 @@ Test json_encode() function : basic functionality with UTF8 string input
 echo "*** Testing json_encode() : basic functionality with UTF-8 input***\n";
 
 $utf8_string = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
-var_dump(json_encode($utf8_string)); 
+var_dump(json_encode($utf8_string));
 
 ?>
 ===Done===
---EXPECTF-- 
+--EXPECTF--
 *** Testing json_encode() : basic functionality with UTF-8 input***
 string(103) ""\u65e5\u672c\u8a9e\u30c6\u30ad\u30b9\u30c8\u3067\u3059\u300201234\uff15\uff16\uff17\uff18\uff19\u3002""
 ===Done===
diff --git a/ext/json/tests/pass002.phpt b/ext/json/tests/pass002.phpt
index aa61cf53963..1d375ad3cf0 100644
--- a/ext/json/tests/pass002.phpt
+++ b/ext/json/tests/pass002.phpt
@@ -4,7 +4,7 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/pass2.json)
 <?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
-    
+
 $test = '[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]]';
 echo 'Testing: ' . $test . "\n";
 echo "DECODE: AS OBJECT\n";
diff --git a/ext/json/tests/pass003.phpt b/ext/json/tests/pass003.phpt
index bdfbaf298c3..6afbf2d9273 100644
--- a/ext/json/tests/pass003.phpt
+++ b/ext/json/tests/pass003.phpt
@@ -4,7 +4,7 @@ JSON (http://www.crockford.com/JSON/JSON_checker/test/pass3.json)
 <?php if (!extension_loaded("json")) print "skip"; ?>
 --FILE--
 <?php
-    
+
 $test = '
 {
     "JSON Test Pattern pass3": {
diff --git a/ext/ldap/tests/bug76248.phpt b/ext/ldap/tests/bug76248.phpt
index 45a7f83efb8..21bb4fa31d5 100644
--- a/ext/ldap/tests/bug76248.phpt
+++ b/ext/ldap/tests/bug76248.phpt
@@ -14,14 +14,14 @@ if ($pid == 0) {
     $server = stream_socket_server("tcp://127.0.0.1:12345");
 	$socket = stream_socket_accept($server, 3);
 	fwrite($socket, base64_decode("MAwCAQFhBwoBAAQABAAweQIBAmR0BJljbj1yb290LGRjPWV4YW1wbGUsZGM9Y29tMFcwIwQLb2JqZWN0Q2xhc3MxFAQSb3JnYW5pemF0aW9uYWxSb2xlMAwEAmNuMQYEBHJvb3QwIgQLZGVzY3JpcHRpb24xEwQRRGlyZWN0b3J5IE1hbmFnZXIwDAIBAmUHCgEABAAEADB5AgEDZHQEmWNuPXJvb3QsZGM9ZXhhbXBsZSxkYz1jb20wVzAjBAtvYmplY3RDbGFzczEUBBJvcmdhbml6YXRpb25hbFJvbGUwDAQCY24xBgQEcm9vdDAiBAtkZXNjcmlwdGlvbjETBBFEaXJlY3RvcnkgTWFuYWdlcjAMAgEDZQcKAQAEAAQA"));
-	fflush($socket);	
+	fflush($socket);
 } else {
 	// parent
 	$ds = ldap_connect("127.0.0.1", PORT);
 	ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
 	$b = ldap_bind($ds, "cn=root,dc=example,dc=com", "secret");
 
-	$s = ldap_search($ds, "dc=example,dc=com", "(cn=root)"); 
+	$s = ldap_search($ds, "dc=example,dc=com", "(cn=root)");
 	$tt = ldap_get_entries($ds, $s);
 	var_dump($tt);
 }
diff --git a/ext/ldap/tests/ldap_unbind_variation.phpt b/ext/ldap/tests/ldap_unbind_variation.phpt
index 377018c583d..60edb03b68b 100644
--- a/ext/ldap/tests/ldap_unbind_variation.phpt
+++ b/ext/ldap/tests/ldap_unbind_variation.phpt
@@ -14,10 +14,10 @@ function rebind_proc ($ds, $ldap_url) {
 	global $user;
 	global $passwd;
 	global $protocol_version;
-	
+
 	// required by most modern LDAP servers, use LDAPv3
 	ldap_set_option($a, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
-	
+
 	if (!ldap_bind($a, $user, $passwd)) {
 		print "Cannot bind";
 	}
diff --git a/ext/libxml/tests/bug61367-write.phpt b/ext/libxml/tests/bug61367-write.phpt
index 63e99a8e50a..155c9aba9db 100644
--- a/ext/libxml/tests/bug61367-write.phpt
+++ b/ext/libxml/tests/bug61367-write.phpt
@@ -10,7 +10,7 @@ open_basedir=.
 class StreamExploiter {
 	public function stream_close (  ) {
 		$doc = new DOMDocument;
-		$doc->appendChild($doc->createTextNode('hello')); 
+		$doc->appendChild($doc->createTextNode('hello'));
 		var_dump($doc->save(dirname(getcwd()) . '/bad'));
 	}
 
diff --git a/ext/mbstring/tests/bug43840.phpt b/ext/mbstring/tests/bug43840.phpt
index b2dd0481860..9cf7cacdb9e 100644
--- a/ext/mbstring/tests/bug43840.phpt
+++ b/ext/mbstring/tests/bug43840.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b
 --FILE--
 <?php
 /* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/bug43841.phpt b/ext/mbstring/tests/bug43841.phpt
index c4be058ffa7..753842cac4c 100644
--- a/ext/mbstring/tests/bug43841.phpt
+++ b/ext/mbstring/tests/bug43841.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/bug43994.phpt b/ext/mbstring/tests/bug43994.phpt
index b2fd867da93..e9a11d054e3 100644
--- a/ext/mbstring/tests/bug43994.phpt
+++ b/ext/mbstring/tests/bug43994.phpt
@@ -8,12 +8,12 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build
 --FILE--
 <?php
 /* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
- * Description: Regular expression match for multibyte string 
+ * Description: Regular expression match for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
  */
 
 /*
- * mb_ereg 'successfully' matching incorrectly: 
+ * mb_ereg 'successfully' matching incorrectly:
  * Bug now seems to be fixed - error message is now generated when an 'empty'
  * pattern is supplied to mb_ereg. Similar error message to ereg().
  */
@@ -38,7 +38,7 @@ foreach($inputs as $input) {
 };
 ?>
 
---EXPECTF-- 
+--EXPECTF--
 
 -- Iteration 1 --
 Without $regs arg:
diff --git a/ext/mbstring/tests/bug46806.phpt b/ext/mbstring/tests/bug46806.phpt
index eec44b5232f..ea00035c0f9 100644
--- a/ext/mbstring/tests/bug46806.phpt
+++ b/ext/mbstring/tests/bug46806.phpt
@@ -3,7 +3,7 @@ Bug #46806 (mb_wtrimwidth cutting to early)
 --CREDITS--
 Sebastian Schürmann
 sebs@php.net
-Testfest 2009 
+Testfest 2009
 --SKIPIF--
 <?php if (!extension_loaded("mbstring")) die("skip mbstring is not available"); ?>
 --FILE--
diff --git a/ext/mbstring/tests/bug65045.phpt b/ext/mbstring/tests/bug65045.phpt
index 03a090ded2d..002c5ed1744 100644
--- a/ext/mbstring/tests/bug65045.phpt
+++ b/ext/mbstring/tests/bug65045.phpt
@@ -17,7 +17,7 @@ $expected2 = "\xF0\xA4\xAD\xA2"."\xF0\xA4\xAD\xA2"."\xEF\xBF\xBD";
 mb_substitute_character(0xFFFD);
 var_dump(
     $expected === htmlspecialchars_decode(htmlspecialchars($str, ENT_SUBSTITUTE, 'UTF-8')),
-    $expected2 === htmlspecialchars_decode(htmlspecialchars($str2, ENT_SUBSTITUTE, 'UTF-8')), 
+    $expected2 === htmlspecialchars_decode(htmlspecialchars($str2, ENT_SUBSTITUTE, 'UTF-8')),
     $expected === mb_convert_encoding($str, 'UTF-8', 'UTF-8'),
     $expected2 === mb_convert_encoding($str2, 'UTF-8', 'UTF-8')
 );
diff --git a/ext/mbstring/tests/bug69079.phpt b/ext/mbstring/tests/bug69079.phpt
index 65b1fd45a5b..287b577ce47 100644
--- a/ext/mbstring/tests/bug69079.phpt
+++ b/ext/mbstring/tests/bug69079.phpt
@@ -7,7 +7,7 @@ Bug #69079 (enhancement for mb_substitute_character)
 
 mb_internal_encoding('UTF-8');
 var_dump(mb_substitute_character(0x1F600));
-var_dump(bin2hex(mb_scrub("\xff"))); 
+var_dump(bin2hex(mb_scrub("\xff")));
 mb_substitute_character(0x3f); // Reset to '?', as the next call will fail
 var_dump(mb_substitute_character(0xD800)); // Surrogate (illegal)
 var_dump(bin2hex(mb_scrub("\xff")));
diff --git a/ext/mbstring/tests/casefold.phpt b/ext/mbstring/tests/casefold.phpt
index 977b0bb658a..002269b680a 100644
--- a/ext/mbstring/tests/casefold.phpt
+++ b/ext/mbstring/tests/casefold.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_strtoupper() / mb_strtolower() 
+mb_strtoupper() / mb_strtolower()
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip mbstring not available');
diff --git a/ext/mbstring/tests/htmlent.phpt b/ext/mbstring/tests/htmlent.phpt
index 5af96c7c414..943e0751a70 100644
--- a/ext/mbstring/tests/htmlent.phpt
+++ b/ext/mbstring/tests/htmlent.phpt
@@ -1,9 +1,9 @@
 --TEST--
 HTML input/output
 --SKIPIF--
-<?php 
-	ini_set('include_path', dirname(__FILE__)); 
-	extension_loaded('mbstring') or die('skip mbstring not available'); 
+<?php
+	ini_set('include_path', dirname(__FILE__));
+	extension_loaded('mbstring') or die('skip mbstring not available');
 ?>
 --INI--
 output_buffering=4096
@@ -20,7 +20,7 @@ filter.default=unsafe_raw
 <?php
 // enable output encoding through output handler
 //ob_start("mb_output_handler");
-// &#64... are must be decoded on input these are not reencoded on output. 
+// &#64... are must be decoded on input these are not reencoded on output.
 // If you see &#64;&#65;&#66; on output this means input encoding fails.
 // If you do not see &auml;... on output this means output encoding fails.
 // Using UTF-8 internally allows to encode/decode ALL characters.
diff --git a/ext/mbstring/tests/illformed_utf_sequences.phpt b/ext/mbstring/tests/illformed_utf_sequences.phpt
index 378b956d681..11ab1799e9c 100644
--- a/ext/mbstring/tests/illformed_utf_sequences.phpt
+++ b/ext/mbstring/tests/illformed_utf_sequences.phpt
@@ -128,7 +128,7 @@ echo "UTF-32 and surrogates area with BOM\n";
 $out = '';
 $cnt = 0;
 for ($i = 0xd7ff; $i <= 0xe000; ++$i) {
-    $s = chk_enc("\x00\x00\xfe\xff". pack('C4', $i >> 24, ($i >> 16) & 0xff, ($i >> 8) & 0xff, $i & 0xff), 
+    $s = chk_enc("\x00\x00\xfe\xff". pack('C4', $i >> 24, ($i >> 16) & 0xff, ($i >> 8) & 0xff, $i & 0xff),
 				 1, "UTF-32", true);
 	if ($s === false) {
 		$cnt++;
@@ -142,7 +142,7 @@ var_dump(str_replace("0000feff","",$out));
 $out = '';
 $cnt = 0;
 for ($i = 0xd7ff; $i <= 0xe000; ++$i) {
-    $s = chk_enc("\xff\xfe\x00\x00". pack('C4', $i & 0xff, ($i >> 8) & 0xff, ($i >> 16) & 0xff, ($i >> 24) & 0xff), 
+    $s = chk_enc("\xff\xfe\x00\x00". pack('C4', $i & 0xff, ($i >> 8) & 0xff, ($i >> 16) & 0xff, ($i >> 24) & 0xff),
 				 1, "UTF-32", true);
 	if ($s === false) {
 		$cnt++;
diff --git a/ext/mbstring/tests/mb_convert_encoding.phpt b/ext/mbstring/tests/mb_convert_encoding.phpt
index 1bc7c8673a6..13faa9d12db 100644
--- a/ext/mbstring/tests/mb_convert_encoding.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding.phpt
@@ -39,7 +39,7 @@ $s = mb_convert_encoding($s, 'JIS', 'EUC-JP');
 print("JIS: ".base64_encode($s)."\n"); // JIS
 
 
-// Using Encoding List Array 
+// Using Encoding List Array
 echo "== STRING ENCODING LIST ==\n";
 
 $a = 'JIS,UTF-8,EUC-JP,SJIS';
@@ -56,7 +56,7 @@ $s = mb_convert_encoding($s, 'JIS', $a);
 print("JIS: ".base64_encode($s)."\n"); // JIS
 
 
-// Using Encoding List Array 
+// Using Encoding List Array
 echo "== ARRAY ENCODING LIST ==\n";
 
 $a = array(0=>'JIS', 1=>'UTF-8', 2=>'EUC-JP', 3=>'SJIS');
@@ -73,7 +73,7 @@ $s = mb_convert_encoding($s, 'JIS', $a);
 print("JIS: ".base64_encode($s)."\n"); // JIS
 
 
-// Using Detect Order 
+// Using Detect Order
 echo "== DETECT ORDER ==\n";
 
 $s = $jis;
diff --git a/ext/mbstring/tests/mb_convert_encoding_array.phpt b/ext/mbstring/tests/mb_convert_encoding_array.phpt
index 5bb78df0284..d689e24ecfd 100644
--- a/ext/mbstring/tests/mb_convert_encoding_array.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding_array.phpt
@@ -8,7 +8,7 @@ function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not
 --FILE--
 <?php
 /* Prototype  : string mb_convert_encoding(string $str, string $to_encoding [, mixed $from_encoding])
- * Description: Returns converted string in desired encoding 
+ * Description: Returns converted string in desired encoding
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_convert_encoding_basic.phpt b/ext/mbstring/tests/mb_convert_encoding_basic.phpt
index 0060a71808d..cf641e6431f 100644
--- a/ext/mbstring/tests/mb_convert_encoding_basic.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_convert_encoding() function : basic functionality 
+Test mb_convert_encoding() function : basic functionality
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,7 +8,7 @@ function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not
 --FILE--
 <?php
 /* Prototype  : string mb_convert_encoding(string $str, string $to_encoding [, mixed $from_encoding])
- * Description: Returns converted string in desired encoding 
+ * Description: Returns converted string in desired encoding
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt
index c8d21143806..50e7076a13c 100644
--- a/ext/mbstring/tests/mb_convert_encoding_variation1.phpt
+++ b/ext/mbstring/tests/mb_convert_encoding_variation1.phpt
@@ -8,7 +8,7 @@ function_exists('mb_convert_encoding') or die("skip mb_convert_encoding() is not
 --FILE--
 <?php
 /* Prototype  : string mb_convert_encoding(string $str, string $to_encoding [, mixed $from_encoding])
- * Description: Returns converted string in desired encoding 
+ * Description: Returns converted string in desired encoding
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -68,7 +68,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -77,7 +77,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_convert_variables.phpt b/ext/mbstring/tests/mb_convert_variables.phpt
index 22253b5352c..bc1c320c3db 100644
--- a/ext/mbstring/tests/mb_convert_variables.phpt
+++ b/ext/mbstring/tests/mb_convert_variables.phpt
@@ -70,32 +70,32 @@ print("{$aa[0]}{$aa[1]}{$aa[2]}\n"); // Converted to EUC-JP
 
 // Test for object
 echo "== OBJECT TEST ==\n";
-class foo 
+class foo
 {
 	public $s1;
 	public $s2;
 	public $s3;
 
-	function __construct() 
+	function __construct()
 	{
 		global $sjis, $jis, $euc_jp;
-		
+
 		$this->s1 = $euc_jp;
 		$this->s2 = $euc_jp;
 		$this->s3 = $euc_jp;
 	}
 }
 
-class bar 
+class bar
 {
 	public $s1;
 	public $s2;
 	public $s3;
 
-	function __construct() 
+	function __construct()
 	{
 		global $sjis, $jis, $euc_jp;
-		
+
 		$this->s1 = $euc_jp;
 		$this->s2 = $euc_jp;
 		$this->s3 = $euc_jp;
diff --git a/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt
index 5374c31c158..39bea621fe5 100644
--- a/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt
+++ b/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_decode_mimeheader() function : basic functionality 
+Test mb_decode_mimeheader() function : basic functionality
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,15 +8,15 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n
 --FILE--
 <?php
 /* Prototype  : string mb_decode_mimeheader(string string)
- * Description: Decodes the MIME "encoded-word" in the string 
+ * Description: Decodes the MIME "encoded-word" in the string
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_decode_mimeheader() : basic functionality ***\n";
 mb_internal_encoding('utf-8');
 
-//the following encoded-words are identical and are UTF-8 Japanese. 
+//the following encoded-words are identical and are UTF-8 Japanese.
 $a = "=?UTF-8?b?5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CC?=";
 $b = mb_decode_mimeheader($a);
 var_dump(bin2hex($b));
diff --git a/ext/mbstring/tests/mb_decode_mimeheader_error.phpt b/ext/mbstring/tests/mb_decode_mimeheader_error.phpt
index c40cdbd643a..3ceff967f59 100644
--- a/ext/mbstring/tests/mb_decode_mimeheader_error.phpt
+++ b/ext/mbstring/tests/mb_decode_mimeheader_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_decode_mimeheader() function : error conditions 
+Test mb_decode_mimeheader() function : error conditions
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n
 --FILE--
 <?php
 /* Prototype  : string mb_decode_mimeheader(string string)
- * Description: Decodes the MIME "encoded-word" in the string 
+ * Description: Decodes the MIME "encoded-word" in the string
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_decode_mimeheader() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt
index e07ccad998d..5ee6fc569c9 100644
--- a/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt
+++ b/ext/mbstring/tests/mb_decode_mimeheader_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_decode_mimeheader() function : usage variation 
+Test mb_decode_mimeheader() function : usage variation
 --CREDITS--
 D. Kesley
 --SKIPIF--
@@ -10,9 +10,9 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n
 --FILE--
 <?php
 /* Prototype  : string mb_decode_mimeheader(string string)
- * Description: Decodes the MIME "encoded-word" in the string 
+ * Description: Decodes the MIME "encoded-word" in the string
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_decode_mimeheader() : usage variation ***\n";
@@ -101,9 +101,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for string
diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt
index 7527c9aa5a1..33c022b0871 100644
--- a/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt
+++ b/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_decode_mimeheader() function : variation 
+Test mb_decode_mimeheader() function : variation
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n
 --FILE--
 <?php
 /* Prototype  : string mb_decode_mimeheader(string string)
- * Description: Decodes the MIME "encoded-word" in the string 
+ * Description: Decodes the MIME "encoded-word" in the string
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_decode_mimeheader() : variation ***\n";
@@ -33,7 +33,7 @@ $encoded_words = array(
 "=?EUC-JP?Q?=C6=FC=CB=DC=B8=EC=A5=C6=A5=AD=A5=B9=A5=C8=A4=C7=A4=B9=A1=A3?=
 =?EUC-JP?Q?=30=31=32=33=34=A3=B5=A3=B6=A3=B7=A3=B8=A3=B9=A1=A3?="
  );
- 
+
  foreach ($encoded_words as $word) {
     var_dump(bin2hex(mb_decode_mimeheader($word)));
 }
diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt
index 968e76eaf63..6f5c8b9c534 100644
--- a/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt
+++ b/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_decode_mimeheader() function : variation 
+Test mb_decode_mimeheader() function : variation
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_decode_mimeheader') or die("skip mb_decode_mimeheader() is n
 --FILE--
 <?php
 /* Prototype  : string mb_decode_mimeheader(string string)
- * Description: Decodes the MIME "encoded-word" in the string 
+ * Description: Decodes the MIME "encoded-word" in the string
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_decode_mimeheader() : variation ***\n";
diff --git a/ext/mbstring/tests/mb_detect_encoding.phpt b/ext/mbstring/tests/mb_detect_encoding.phpt
index 4fd22a69c3b..d50330849c3 100644
--- a/ext/mbstring/tests/mb_detect_encoding.phpt
+++ b/ext/mbstring/tests/mb_detect_encoding.phpt
@@ -23,7 +23,7 @@ $euc_jp = '
 echo "== BASIC TEST ==\n";
 $s = $sjis;
 $s = mb_detect_encoding($s, 'SJIS');
-print("SJIS: $s\n"); 
+print("SJIS: $s\n");
 
 $s = $jis;
 $s = mb_detect_encoding($s, 'JIS');
@@ -39,7 +39,7 @@ print("EUC-JP: $s\n");
 
 
 
-// Using Encoding List Array 
+// Using Encoding List Array
 echo "== ARRAY ENCODING LIST ==\n";
 
 $a = array(0=>'UTF-8',1=>'EUC-JP', 2=>'SJIS', 3=>'JIS');
@@ -55,10 +55,10 @@ print("EUC-JP: $s\n");
 
 $s = $sjis;
 $s = mb_detect_encoding($s, $a);
-print("SJIS: $s\n"); 
+print("SJIS: $s\n");
 
 
-// Using Detect Order 
+// Using Detect Order
 echo "== DETECT ORDER ==\n";
 
 mb_detect_order('auto');
@@ -66,15 +66,15 @@ mb_detect_order('auto');
 
 $s = $jis;
 $s = mb_detect_encoding($s);
-print("JIS: $s\n"); 
+print("JIS: $s\n");
 
 $s = $euc_jp;
 $s = mb_detect_encoding($s);
-print("EUC-JP: $s\n"); 
+print("EUC-JP: $s\n");
 
 $s = $sjis;
 $s = mb_detect_encoding($s);
-print("SJIS: $s\n"); 
+print("SJIS: $s\n");
 
 
 // Invalid(?) Parameters
diff --git a/ext/mbstring/tests/mb_detect_order.phpt b/ext/mbstring/tests/mb_detect_order.phpt
index 382691cfc8d..8c6ee3eb5e9 100644
--- a/ext/mbstring/tests/mb_detect_order.phpt
+++ b/ext/mbstring/tests/mb_detect_order.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_detect_order()  
+mb_detect_order()
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
index 0487a194f22..cd9eb1bb398 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt
@@ -10,7 +10,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n
 <?php
 /* Prototype  : string mb_encode_mimeheader
  * (string $str [, string $charset [, string $transfer-encoding [, string $linefeed [, int $indent]]]])
- * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?=
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt
index cd52fa526d4..7763e2c0417 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_basic2.phpt
@@ -8,9 +8,9 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n
 
 --FILE--
 <?php
-/* Prototype  : string mb_encode_mimeheader(string $str [, string $charset 
+/* Prototype  : string mb_encode_mimeheader(string $str [, string $charset
  * [, string $transfer-encoding [, string $linefeed [, int $indent]]]])
- * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?=
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
index b2f0c8b7d17..ad921ab108f 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_basic3.phpt
@@ -8,9 +8,9 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n
 
 --FILE--
 <?php
-/* Prototype  : string mb_encode_mimeheader(string $str [, string $charset 
+/* Prototype  : string mb_encode_mimeheader(string $str [, string $charset
  * [, string $transfer-encoding [, string $linefeed [, int $indent]]]])
- * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?=
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt
index 11fe23f531d..00b471a7472 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_indent.phpt
@@ -10,7 +10,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n
 <?php
 /* Prototype  : string mb_encode_mimeheader
  * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
- * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?=
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -30,7 +30,7 @@ $linefeed = "\r\n";
 for ($i = 0; $i < 100; $i++) {
   echo "\n-- Iteration $i --\n";
   var_dump( mb_encode_mimeheader($str, $charset, "B", $linefeed, $i));
-  var_dump( mb_encode_mimeheader($str, $charset, "Q", $linefeed, $i));  
+  var_dump( mb_encode_mimeheader($str, $charset, "Q", $linefeed, $i));
 };
 echo "Done";
 ?>
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt
index 7b5bd30661b..8f8cf3e3dcb 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation1.phpt
@@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n
 <?php
 /* Prototype  : string mb_encode_mimeheader
  * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
- * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?=
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -70,7 +70,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -79,7 +79,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt
index e765e943889..e9d9fa2dd67 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation2.phpt
@@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n
 <?php
 /* Prototype  : string mb_encode_mimeheader
  * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
- * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?=
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -72,7 +72,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -81,7 +81,7 @@ $inputs = array(
 /*18*/ "utf-8",
        'utf-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt
index c2976f5d008..1da923ec212 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation3.phpt
@@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n
 <?php
 /* Prototype  : string mb_encode_mimeheader
  * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
- * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?=
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -72,7 +72,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -81,7 +81,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt
index fe050840ef2..11279c7bf6e 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation4.phpt
@@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n
 <?php
 /* Prototype  : string mb_encode_mimeheader
  * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
- * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?=
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -73,7 +73,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -82,7 +82,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
index d8712e3949f..e0de4e63c60 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation5.phpt
@@ -10,7 +10,7 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 <?php
 /* Prototype  : string mb_encode_mimeheader
  * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
- * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?=
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -73,7 +73,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -82,7 +82,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
index 668ae8bfea6..fb81271f748 100644
--- a/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
+++ b/ext/mbstring/tests/mb_encode_mimeheader_variation6.phpt
@@ -9,7 +9,7 @@ function_exists('mb_encode_mimeheader') or die("skip mb_encode_mimeheader() is n
 <?php
 /* Prototype  : string mb_encode_mimeheader
  * (string $str [, string $charset [, string $transfer_encoding [, string $linefeed [, int $indent]]]])
- * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= 
+ * Description: Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?=
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_ereg.phpt b/ext/mbstring/tests/mb_ereg.phpt
index 3b2d13de513..faf6ea65e40 100644
--- a/ext/mbstring/tests/mb_ereg.phpt
+++ b/ext/mbstring/tests/mb_ereg.phpt
@@ -18,10 +18,10 @@ output_handler=
 		$pat = mb_convert_encoding( $pat, $test_enc, $in_enc );
 		$str = mb_convert_encoding( $str, $test_enc, $in_enc );
 		printf( "(%d)%s\n", mb_ereg( $pat, $str, $reg ), ( is_array( $reg )? bin2hex(mb_convert_encoding( implode( ' ', $reg ), $in_enc, $test_enc )) : '' ) );
-	} 
+	}
 	function do_tests( $enc ) {
 		test_ereg( $enc, 'abc ([a-z]+) ([a-z]+) ([a-z]+)$', "abc def ghi jkl" );
-		$pat = '([£á-£ú]+) ([ ¤¢-¤«]+)([¤«-¤Ê]+) ([¤ï-¤ó]+)$'; 
+		$pat = '([£á-£ú]+) ([ ¤¢-¤«]+)([¤«-¤Ê]+) ([¤ï-¤ó]+)$';
 		test_ereg( $enc, $pat, '£á£â£ã ¤¢¤ª¤¤ ¤«¤³¤Ê ¤ï¤ñ¤ó' );
 		test_ereg( $enc, $pat, '£í£ú£ø£æ£ð ¤¦¤ª¤« ¤­¤« ¤ò¤ð' );
 	}
diff --git a/ext/mbstring/tests/mb_ereg1.phpt b/ext/mbstring/tests/mb_ereg1.phpt
index c61cdb6da2e..59ef788a77a 100644
--- a/ext/mbstring/tests/mb_ereg1.phpt
+++ b/ext/mbstring/tests/mb_ereg1.phpt
@@ -19,7 +19,7 @@ foreach ($a as $args) {
 }
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(false)
 array(3) {
   [0]=>
diff --git a/ext/mbstring/tests/mb_ereg2.phpt b/ext/mbstring/tests/mb_ereg2.phpt
index 2b79bafd14c..ecae0aca494 100644
--- a/ext/mbstring/tests/mb_ereg2.phpt
+++ b/ext/mbstring/tests/mb_ereg2.phpt
@@ -5,19 +5,19 @@ mb_ereg() returning matches
 --FILE--
 <?php
 
-$a = -1; $b = -1; $c = -1; 
-mbereg($a, $b, $c); 
-var_dump($a, $b, $c); 
+$a = -1; $b = -1; $c = -1;
+mbereg($a, $b, $c);
+var_dump($a, $b, $c);
 
-mberegi($a, $b, $c); 
-var_dump($a, $b, $c); 
+mberegi($a, $b, $c);
+var_dump($a, $b, $c);
 
-mbereg_search_init($a, $b, $c); 
+mbereg_search_init($a, $b, $c);
 var_dump($a, $b, $c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(-1)
 int(-1)
 array(1) {
diff --git a/ext/mbstring/tests/mb_ereg3.phpt b/ext/mbstring/tests/mb_ereg3.phpt
index 8dca4358fc8..fe779fcc855 100644
--- a/ext/mbstring/tests/mb_ereg3.phpt
+++ b/ext/mbstring/tests/mb_ereg3.phpt
@@ -8,19 +8,19 @@ if (!function_exists("mb_ereg")) print "skip mb_ereg() not available";
 --FILE--
 <?php
 
-$a = -1; $b = -1; $c = -1; 
-mbereg($a, $b, $c); 
-var_dump($a, $b, $c); 
+$a = -1; $b = -1; $c = -1;
+mbereg($a, $b, $c);
+var_dump($a, $b, $c);
 
-mberegi($a, $b, $c); 
-var_dump($a, $b, $c); 
+mberegi($a, $b, $c);
+var_dump($a, $b, $c);
 
-mbereg_search_init($a, $b, $c); 
+mbereg_search_init($a, $b, $c);
 var_dump($a, $b, $c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(-1)
 int(-1)
 array(1) {
diff --git a/ext/mbstring/tests/mb_ereg4.phpt b/ext/mbstring/tests/mb_ereg4.phpt
index 8dca4358fc8..fe779fcc855 100644
--- a/ext/mbstring/tests/mb_ereg4.phpt
+++ b/ext/mbstring/tests/mb_ereg4.phpt
@@ -8,19 +8,19 @@ if (!function_exists("mb_ereg")) print "skip mb_ereg() not available";
 --FILE--
 <?php
 
-$a = -1; $b = -1; $c = -1; 
-mbereg($a, $b, $c); 
-var_dump($a, $b, $c); 
+$a = -1; $b = -1; $c = -1;
+mbereg($a, $b, $c);
+var_dump($a, $b, $c);
 
-mberegi($a, $b, $c); 
-var_dump($a, $b, $c); 
+mberegi($a, $b, $c);
+var_dump($a, $b, $c);
 
-mbereg_search_init($a, $b, $c); 
+mbereg_search_init($a, $b, $c);
 var_dump($a, $b, $c);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(-1)
 int(-1)
 array(1) {
diff --git a/ext/mbstring/tests/mb_ereg_basic.phpt b/ext/mbstring/tests/mb_ereg_basic.phpt
index ff64666f083..021200dfdef 100644
--- a/ext/mbstring/tests/mb_ereg_basic.phpt
+++ b/ext/mbstring/tests/mb_ereg_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_ereg() function : basic functionality 
+Test mb_ereg() function : basic functionality
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build
 --FILE--
 <?php
 /* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
- * Description: Regular expression match for multibyte string 
+ * Description: Regular expression match for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
  */
 
diff --git a/ext/mbstring/tests/mb_ereg_error.phpt b/ext/mbstring/tests/mb_ereg_error.phpt
index 21216257cd7..2081f54b4ce 100644
--- a/ext/mbstring/tests/mb_ereg_error.phpt
+++ b/ext/mbstring/tests/mb_ereg_error.phpt
@@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build
 --FILE--
 <?php
 /* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
- * Description: Regular expression match for multibyte string 
+ * Description: Regular expression match for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
  */
 
diff --git a/ext/mbstring/tests/mb_ereg_match_basic.phpt b/ext/mbstring/tests/mb_ereg_match_basic.phpt
index c035acc0183..c82e1b6f3c8 100644
--- a/ext/mbstring/tests/mb_ereg_match_basic.phpt
+++ b/ext/mbstring/tests/mb_ereg_match_basic.phpt
@@ -8,7 +8,7 @@ function_exists('mb_ereg_match') or die("skip mb_ereg_match() is not available i
 --FILE--
 <?php
 /* Prototype  : bool mb_ereg_match(string $pattern, string $string [,string $option])
- * Description: Regular expression match for multibyte string 
+ * Description: Regular expression match for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
  */
 
@@ -27,7 +27,7 @@ $string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXv
 echo "\n-- ASCII string 1 --\n";
 var_dump(mb_ereg_match('.*def', $string_ascii));
 
-//will return false as pattern would match half way through string 
+//will return false as pattern would match half way through string
 echo "\n-- ASCII string 2 --\n";
 var_dump(mb_ereg_match('def', $string_ascii));
 
diff --git a/ext/mbstring/tests/mb_ereg_match_error1.phpt b/ext/mbstring/tests/mb_ereg_match_error1.phpt
index aab95fe6cd3..d483b6609dd 100644
--- a/ext/mbstring/tests/mb_ereg_match_error1.phpt
+++ b/ext/mbstring/tests/mb_ereg_match_error1.phpt
@@ -8,7 +8,7 @@ function_exists('mb_ereg_match') or die("skip mb_ereg_match() is not available i
 --FILE--
 <?php
 /* Prototype  : bool mb_ereg_match(string $pattern, string $string [,string $option])
- * Description: Regular expression match for multibyte string 
+ * Description: Regular expression match for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
  */
 
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
index ad2c6c1c560..6e988555aed 100644
--- a/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
@@ -2,7 +2,7 @@
 mb_ereg_replace() compat test 1
 --SKIPIF--
 <?php
-extension_loaded('mbstring') or die('skip'); 
+extension_loaded('mbstring') or die('skip');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
 ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_ereg_replace_basic.phpt b/ext/mbstring/tests/mb_ereg_replace_basic.phpt
index 746dd4e1a47..ac30149099c 100644
--- a/ext/mbstring/tests/mb_ereg_replace_basic.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_ereg_replace() function : basic 
+Test mb_ereg_replace() function : basic
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -7,9 +7,9 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab
 ?>
 --FILE--
 <?php
-/* Prototype  : string mb_ereg_replace(string $pattern, string $replacement, 
+/* Prototype  : string mb_ereg_replace(string $pattern, string $replacement,
  * string $string [, string o$ption])
- * Description: Replace regular expression for multibyte string 
+ * Description: Replace regular expression for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
  */
 
diff --git a/ext/mbstring/tests/mb_ereg_replace_error.phpt b/ext/mbstring/tests/mb_ereg_replace_error.phpt
index 4e8a3388dd0..58a69c075d5 100644
--- a/ext/mbstring/tests/mb_ereg_replace_error.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_ereg_replace() function : error conditions 
+Test mb_ereg_replace() function : error conditions
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab
 --FILE--
 <?php
 /* Prototype  : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option])
- * Description: Replace regular expression for multibyte string 
+ * Description: Replace regular expression for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_ereg_replace() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_ereg_replace_variation1.phpt b/ext/mbstring/tests/mb_ereg_replace_variation1.phpt
index cbf3dd98cd6..6a1231bf8b1 100644
--- a/ext/mbstring/tests/mb_ereg_replace_variation1.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_variation1.phpt
@@ -10,9 +10,9 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab
 --FILE--
 <?php
 /* Prototype  : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option])
- * Description: Replace regular expression for multibyte string 
+ * Description: Replace regular expression for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_ereg_replace() : usage variations ***\n";
@@ -64,7 +64,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -73,7 +73,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt
index 37a89fcba70..e69e147e482 100644
--- a/ext/mbstring/tests/mb_ereg_replace_variation2.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_variation2.phpt
@@ -8,9 +8,9 @@ function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not availab
 --FILE--
 <?php
 /* Prototype  : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option])
- * Description: Replace regular expression for multibyte string 
+ * Description: Replace regular expression for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_ereg_replace() : usage variations ***\n";
@@ -65,7 +65,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -74,7 +74,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_ereg_replace_variation3.phpt b/ext/mbstring/tests/mb_ereg_replace_variation3.phpt
index 09da6cd3ee1..2e115f5d6fe 100644
--- a/ext/mbstring/tests/mb_ereg_replace_variation3.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_variation3.phpt
@@ -4,13 +4,13 @@ Test mb_ereg_replace() function : usage variations
 <?php
 extension_loaded('mbstring') or die('skip');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option])
- * Description: Replace regular expression for multibyte string 
+ * Description: Replace regular expression for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_ereg_replace() : usage variations ***\n";
@@ -65,7 +65,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -74,7 +74,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_ereg_replace_variation4.phpt b/ext/mbstring/tests/mb_ereg_replace_variation4.phpt
index 05b4f60da34..c85f68aa064 100644
--- a/ext/mbstring/tests/mb_ereg_replace_variation4.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace_variation4.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test mb_ereg_replace() function : usage variations  
+Test mb_ereg_replace() function : usage variations
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
 function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : proto string mb_ereg_replace(string pattern, string replacement, string string [, string option])
- * Description: Replace regular expression for multibyte string 
+ * Description: Replace regular expression for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_ereg_replace() : usage variations ***\n";
@@ -65,7 +65,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -74,7 +74,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_ereg_search_pos.phpt b/ext/mbstring/tests/mb_ereg_search_pos.phpt
index 08fcd7f87b6..d73046ff0f0 100644
--- a/ext/mbstring/tests/mb_ereg_search_pos.phpt
+++ b/ext/mbstring/tests/mb_ereg_search_pos.phpt
@@ -12,9 +12,9 @@ $test_str = 'I
 if(mb_ereg_search_init($test_str))
 {
 	$val=mb_ereg_search_pos("nâtiôn");
-	
+
 	var_dump($val);
-	
+
 }
 else{
 	var_dump("false");
diff --git a/ext/mbstring/tests/mb_ereg_search_regs.phpt b/ext/mbstring/tests/mb_ereg_search_regs.phpt
index 2cc55a7bdca..813dabf641d 100644
--- a/ext/mbstring/tests/mb_ereg_search_regs.phpt
+++ b/ext/mbstring/tests/mb_ereg_search_regs.phpt
@@ -7,19 +7,19 @@ function_exists('mb_ereg_search_regs') or die("skip mb_ereg_search_regs() not av
 ?>
 --FILE--
 <?php
-    // homepage: 
-    
+    // homepage:
+
     //$mb_str = "�лек�ей Федорович Карамазов был �лек�ей Федорович Карамазов был kyrillischer string string";
     //      = "Lorem ipsum dolor sit amet"
-    
+
     mb_ereg_search_init("�лек�ей Федорович Карамазов был �лек�ей Федорович Карамазов был");
-    
-    
-    
+
+
+
     $match= mb_ereg_search_regs("ов");
-    var_dump($match);  
-    
-    
+    var_dump($match);
+
+
 ?>
 --EXPECT--
 array(1) {
diff --git a/ext/mbstring/tests/mb_ereg_search_xxx.phpt b/ext/mbstring/tests/mb_ereg_search_xxx.phpt
index c2c0b84a856..49182248f81 100644
--- a/ext/mbstring/tests/mb_ereg_search_xxx.phpt
+++ b/ext/mbstring/tests/mb_ereg_search_xxx.phpt
@@ -23,7 +23,7 @@ output_handler=
 			array_shift( $regs );
 			printf( "(%s) (%d) %s\n", $test_enc, mb_ereg_search_getpos(), mb_convert_encoding( ( is_array( $regs ) ? implode( '-', $regs ): '' ), $in_enc, $test_enc ) );
 		}
-	}	
+	}
 	function do_tests( $enc, $opt ) {
 		test_search( $enc, "¢Ï¡¦ ¡¦¢Ï\n", ' (¡¦?¢Ï¡¦?)[[:space:]]', $opt );
 		test_search( $enc, 'abcde abdeabcf anvfabc odu abcd ', '(ab[a-z]+)', $opt );
diff --git a/ext/mbstring/tests/mb_ereg_variation1.phpt b/ext/mbstring/tests/mb_ereg_variation1.phpt
index 3077bcbd5d4..999dcec574f 100644
--- a/ext/mbstring/tests/mb_ereg_variation1.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation1.phpt
@@ -8,8 +8,8 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build
 --FILE--
 <?php
 /* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
- * Description: Regular expression match for multibyte string 
- * Source code: ext/mbstring/php_mbregex.c 
+ * Description: Regular expression match for multibyte string
+ * Source code: ext/mbstring/php_mbregex.c
  */
 
 /*
@@ -65,7 +65,7 @@ $inputs = array(
 /*12*/ "string",
        'string',
        $heredoc,
- 
+
 // object data
 /*15*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_ereg_variation2.phpt b/ext/mbstring/tests/mb_ereg_variation2.phpt
index 291c1c1ec45..f6a93ebc832 100644
--- a/ext/mbstring/tests/mb_ereg_variation2.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation2.phpt
@@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build
 --FILE--
 <?php
 /* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
- * Description: Regular expression match for multibyte string 
+ * Description: Regular expression match for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
  */
 
@@ -66,7 +66,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
- 
+
 // empty data
 /*16*/ "",
        '',
@@ -75,7 +75,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
- 
+
 // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_ereg_variation3.phpt b/ext/mbstring/tests/mb_ereg_variation3.phpt
index a71f2395da1..756e8761267 100644
--- a/ext/mbstring/tests/mb_ereg_variation3.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation3.phpt
@@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build
 --FILE--
 <?php
 /* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
- * Description: Regular expression match for multibyte string 
+ * Description: Regular expression match for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
  */
 
diff --git a/ext/mbstring/tests/mb_ereg_variation4.phpt b/ext/mbstring/tests/mb_ereg_variation4.phpt
index 7f7d6dfc93f..eb428323900 100644
--- a/ext/mbstring/tests/mb_ereg_variation4.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation4.phpt
@@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build
 --FILE--
 <?php
 /* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
- * Description: Regular expression match for multibyte string 
+ * Description: Regular expression match for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
  */
 
diff --git a/ext/mbstring/tests/mb_ereg_variation6.phpt b/ext/mbstring/tests/mb_ereg_variation6.phpt
index 0de5064fedf..5a2e746dd68 100644
--- a/ext/mbstring/tests/mb_ereg_variation6.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation6.phpt
@@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build
 --FILE--
 <?php
 /* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
- * Description: Regular expression match for multibyte string 
+ * Description: Regular expression match for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
  */
 
@@ -24,13 +24,13 @@ if(mb_regex_encoding('utf-8') == true) {
 	echo "Could not set regex encoding to utf-8\n";
 }
 
-$regex_char = array ('\w+' => '\w+', 
-                     '\W+' => '\W+', 
-                     '\s+' => '\s+', 
-                     '\S+' => '\S+', 
-                     '\d+' => '\d+', 
-                     '\D+' => '\D+', 
-                     '\b' =>  '\b', 
+$regex_char = array ('\w+' => '\w+',
+                     '\W+' => '\W+',
+                     '\s+' => '\s+',
+                     '\S+' => '\S+',
+                     '\d+' => '\d+',
+                     '\D+' => '\D+',
+                     '\b' =>  '\b',
                      '\B' =>  '\B');
 
 $string_ascii = 'This is an English string. 0123456789.';
diff --git a/ext/mbstring/tests/mb_ereg_variation7.phpt b/ext/mbstring/tests/mb_ereg_variation7.phpt
index 41c427162e5..e35b9ef5cf2 100644
--- a/ext/mbstring/tests/mb_ereg_variation7.phpt
+++ b/ext/mbstring/tests/mb_ereg_variation7.phpt
@@ -8,7 +8,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build
 --FILE--
 <?php
 /* Prototype  : int mb_ereg(string $pattern, string $string [, array $registers])
- * Description: Regular expression match for multibyte string 
+ * Description: Regular expression match for multibyte string
  * Source code: ext/mbstring/php_mbregex.c
  */
 
diff --git a/ext/mbstring/tests/mb_eregi_replace.phpt b/ext/mbstring/tests/mb_eregi_replace.phpt
index 0405d8984c4..540905b1a1f 100644
--- a/ext/mbstring/tests/mb_eregi_replace.phpt
+++ b/ext/mbstring/tests/mb_eregi_replace.phpt
@@ -22,7 +22,7 @@ function do_translit($st) {
         "Я"=>"YA","Ч"=>"CH","С"=>"C","М"=>"M","И"=>"I","Т"=>"T",
         "Ь"=>"\'","Б"=>"B","Ю"=>"YU",
     );
-   
+
     foreach($replacement as $i=>$u) {
         $st = mb_eregi_replace($i,$u,$st);
     }
diff --git a/ext/mbstring/tests/mb_http_input.phpt b/ext/mbstring/tests/mb_http_input.phpt
index 6e72c5d590f..3a4916d7511 100644
--- a/ext/mbstring/tests/mb_http_input.phpt
+++ b/ext/mbstring/tests/mb_http_input.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_http_input() 
+mb_http_input()
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip mbstring not available');
diff --git a/ext/mbstring/tests/mb_http_output.phpt b/ext/mbstring/tests/mb_http_output.phpt
index a6cac3fb356..cb2ea21f773 100644
--- a/ext/mbstring/tests/mb_http_output.phpt
+++ b/ext/mbstring/tests/mb_http_output.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_http_output()  
+mb_http_output()
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_internal_encoding.phpt b/ext/mbstring/tests/mb_internal_encoding.phpt
index acb3c6fbb6b..6ef4be23d90 100644
--- a/ext/mbstring/tests/mb_internal_encoding.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding.phpt
@@ -4,7 +4,7 @@ mb_internal_encoding()
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
-// TODO: 
+// TODO:
 //$debug = true;
 ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
diff --git a/ext/mbstring/tests/mb_internal_encoding_basic.phpt b/ext/mbstring/tests/mb_internal_encoding_basic.phpt
index a289dcf8de1..48327304ccc 100644
--- a/ext/mbstring/tests/mb_internal_encoding_basic.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_basic.phpt
@@ -8,8 +8,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n
 --FILE--
 <?php
 /* Prototype  : string mb_internal_encoding([string $encoding])
- * Description: Sets the current internal encoding or Returns 
- * the current internal encoding as a string 
+ * Description: Sets the current internal encoding or Returns
+ * the current internal encoding as a string
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt
index eb8fea2b9b3..5bffecce73b 100644
--- a/ext/mbstring/tests/mb_internal_encoding_basic2.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_basic2.phpt
@@ -13,8 +13,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n
 --FILE--
 <?php
 /* Prototype  : string mb_internal_encoding([string $encoding])
- * Description: Sets the current internal encoding or Returns 
- * the current internal encoding as a string 
+ * Description: Sets the current internal encoding or Returns
+ * the current internal encoding as a string
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_internal_encoding_error1.phpt b/ext/mbstring/tests/mb_internal_encoding_error1.phpt
index ce824e6a2fd..c16d5e3bda3 100644
--- a/ext/mbstring/tests/mb_internal_encoding_error1.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_error1.phpt
@@ -4,12 +4,12 @@ Test mb_internal_encoding() function : error conditions - pass incorrect number
 <?php
 extension_loaded('mbstring') or die('skip');
 function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is not available in this build");
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : string mb_internal_encoding([string $encoding])
- * Description: Sets the current internal encoding or 
- * Returns the current internal encoding as a string 
+ * Description: Sets the current internal encoding or
+ * Returns the current internal encoding as a string
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_internal_encoding_error2.phpt b/ext/mbstring/tests/mb_internal_encoding_error2.phpt
index d0a1653ebec..13fa3f59c14 100644
--- a/ext/mbstring/tests/mb_internal_encoding_error2.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_error2.phpt
@@ -8,8 +8,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n
 --FILE--
 <?php
 /* Prototype  : string mb_internal_encoding([string $encoding])
- * Description: Sets the current internal encoding or 
- * Returns the current internal encoding as a string 
+ * Description: Sets the current internal encoding or
+ * Returns the current internal encoding as a string
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt
index 581df064148..954f7aecc2a 100644
--- a/ext/mbstring/tests/mb_internal_encoding_variation1.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_variation1.phpt
@@ -8,8 +8,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n
 --FILE--
 <?php
 /* Prototype  : string mb_internal_encoding([string $encoding])
- * Description: Sets the current internal encoding or Returns 
- * the current internal encoding as a string 
+ * Description: Sets the current internal encoding or Returns
+ * the current internal encoding as a string
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -65,7 +65,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -74,7 +74,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
index 914041c9149..216c789c54c 100644
--- a/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_variation2.phpt
@@ -8,8 +8,8 @@ function_exists('mb_internal_encoding') or die("skip mb_internal_encoding() is n
 --FILE--
 <?php
 /* Prototype  : string mb_internal_encoding([string $encoding])
- * Description: Sets the current internal encoding or Returns 
- * the current internal encoding as a string 
+ * Description: Sets the current internal encoding or Returns
+ * the current internal encoding as a string
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_regex_encoding_basic.phpt b/ext/mbstring/tests/mb_regex_encoding_basic.phpt
index a0a41e96773..8da42ad7c77 100644
--- a/ext/mbstring/tests/mb_regex_encoding_basic.phpt
+++ b/ext/mbstring/tests/mb_regex_encoding_basic.phpt
@@ -8,8 +8,8 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava
 --FILE--
 <?php
 /* Prototype  : proto string mb_regex_encoding([string encoding])
- * Description: Returns the current encoding for regex as a string. 
- * Source code: ext/mbstring/php_mbregex.c 
+ * Description: Returns the current encoding for regex as a string.
+ * Source code: ext/mbstring/php_mbregex.c
  */
 
 /*
diff --git a/ext/mbstring/tests/mb_regex_encoding_error1.phpt b/ext/mbstring/tests/mb_regex_encoding_error1.phpt
index 4c5456d36c9..9609dc22d59 100644
--- a/ext/mbstring/tests/mb_regex_encoding_error1.phpt
+++ b/ext/mbstring/tests/mb_regex_encoding_error1.phpt
@@ -8,7 +8,7 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava
 --FILE--
 <?php
 /* Prototype  : string mb_regex_encoding([string $encoding])
- * Description: Returns the current encoding for regex as a string. 
+ * Description: Returns the current encoding for regex as a string.
  * Source code: ext/mbstring/php_mbregex.c
  */
 
diff --git a/ext/mbstring/tests/mb_regex_encoding_error2.phpt b/ext/mbstring/tests/mb_regex_encoding_error2.phpt
index c752609daf3..eae246dced4 100644
--- a/ext/mbstring/tests/mb_regex_encoding_error2.phpt
+++ b/ext/mbstring/tests/mb_regex_encoding_error2.phpt
@@ -8,7 +8,7 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava
 --FILE--
 <?php
 /* Prototype  : string mb_regex_encoding([string $encoding])
- * Description: Returns the current encoding for regex as a string. 
+ * Description: Returns the current encoding for regex as a string.
  * Source code: ext/mbstring/php_mbregex.c
  */
 
diff --git a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt
index 09b263d7519..c3bb50ce807 100644
--- a/ext/mbstring/tests/mb_regex_encoding_variation1.phpt
+++ b/ext/mbstring/tests/mb_regex_encoding_variation1.phpt
@@ -8,7 +8,7 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava
 --FILE--
 <?php
 /* Prototype  : string mb_regex_encoding([string $encoding])
- * Description: Returns the current encoding for regex as a string. 
+ * Description: Returns the current encoding for regex as a string.
  * Source code: ext/mbstring/php_mbregex.c
  */
 
@@ -63,7 +63,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_regex_encoding_variation2.phpt b/ext/mbstring/tests/mb_regex_encoding_variation2.phpt
index fc9c6003715..baaab535d4e 100644
--- a/ext/mbstring/tests/mb_regex_encoding_variation2.phpt
+++ b/ext/mbstring/tests/mb_regex_encoding_variation2.phpt
@@ -8,7 +8,7 @@ function_exists('mb_regex_encoding') or die("skip mb_regex_encoding() is not ava
 --FILE--
 <?php
 /* Prototype  : string mb_regex_encoding([string $encoding])
- * Description: Returns the current encoding for regex as a string. 
+ * Description: Returns the current encoding for regex as a string.
  * Source code: ext/mbstring/php_mbregex.c
  */
 
diff --git a/ext/mbstring/tests/mb_regex_set_options.phpt b/ext/mbstring/tests/mb_regex_set_options.phpt
index 88ee9c92500..26c8a998f8e 100644
--- a/ext/mbstring/tests/mb_regex_set_options.phpt
+++ b/ext/mbstring/tests/mb_regex_set_options.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_regex_set_options() 
+mb_regex_set_options()
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die("skip mbstring not available\n");
diff --git a/ext/mbstring/tests/mb_split.phpt b/ext/mbstring/tests/mb_split.phpt
index 45d361c598d..a63c8cabbe7 100644
--- a/ext/mbstring/tests/mb_split.phpt
+++ b/ext/mbstring/tests/mb_split.phpt
@@ -21,7 +21,7 @@ mbstring.func_overload=0
 			print "ok\n";
 		} else {
 			print count($result1).'-'.count($result2)."\n";
-		}	
+		}
 	}
 
 	var_dump( mb_split( " ", "a b c d e f g" )
diff --git a/ext/mbstring/tests/mb_split_error.phpt b/ext/mbstring/tests/mb_split_error.phpt
index b48e21520b9..b307e404931 100644
--- a/ext/mbstring/tests/mb_split_error.phpt
+++ b/ext/mbstring/tests/mb_split_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_split() function : error conditions 
+Test mb_split() function : error conditions
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_split') or die("skip mb_split() is not available in this bui
 --FILE--
 <?php
 /* Prototype  : proto array mb_split(string pattern, string string [, int limit])
- * Description: split multibyte string into array by regular expression 
+ * Description: split multibyte string into array by regular expression
  * Source code: ext/mbstring/php_mbregex.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/mbstring/tests/mb_split_variation1.phpt b/ext/mbstring/tests/mb_split_variation1.phpt
index b508049969d..7d2f952bff6 100644
--- a/ext/mbstring/tests/mb_split_variation1.phpt
+++ b/ext/mbstring/tests/mb_split_variation1.phpt
@@ -8,9 +8,9 @@ function_exists('mb_split') or die("skip mb_split() is not available in this bui
 --FILE--
 <?php
 /* Prototype  : proto array mb_split(string pattern, string string [, int limit])
- * Description: split multibyte string into array by regular expression 
+ * Description: split multibyte string into array by regular expression
  * Source code: ext/mbstring/php_mbregex.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_split() : usage variations ***\n";
@@ -64,7 +64,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -73,7 +73,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_split_variation2.phpt b/ext/mbstring/tests/mb_split_variation2.phpt
index a6db2cc04f1..2ef402f205d 100644
--- a/ext/mbstring/tests/mb_split_variation2.phpt
+++ b/ext/mbstring/tests/mb_split_variation2.phpt
@@ -8,9 +8,9 @@ function_exists('mb_split') or die("skip mb_split() is not available in this bui
 --FILE--
 <?php
 /* Prototype  : proto array mb_split(string pattern, string string [, int limit])
- * Description: split multibyte string into array by regular expression 
+ * Description: split multibyte string into array by regular expression
  * Source code: ext/mbstring/php_mbregex.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
@@ -65,7 +65,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -74,7 +74,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_split_variation3.phpt b/ext/mbstring/tests/mb_split_variation3.phpt
index 3ef13513dac..6856a92d292 100644
--- a/ext/mbstring/tests/mb_split_variation3.phpt
+++ b/ext/mbstring/tests/mb_split_variation3.phpt
@@ -9,9 +9,9 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 --FILE--
 <?php
 /* Prototype  : proto array mb_split(string pattern, string string [, int limit])
- * Description: split multibyte string into array by regular expression 
+ * Description: split multibyte string into array by regular expression
  * Source code: ext/mbstring/php_mbregex.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_split() : usage variations ***\n";
@@ -65,7 +65,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -74,7 +74,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_stripos.phpt b/ext/mbstring/tests/mb_stripos.phpt
index ac84b582428..d1f795ceac9 100644
--- a/ext/mbstring/tests/mb_stripos.phpt
+++ b/ext/mbstring/tests/mb_stripos.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_stripos() 
+mb_stripos()
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_stripos_basic.phpt b/ext/mbstring/tests/mb_stripos_basic.phpt
index e061d8f7cc2..b360858e6d2 100644
--- a/ext/mbstring/tests/mb_stripos_basic.phpt
+++ b/ext/mbstring/tests/mb_stripos_basic.phpt
@@ -8,9 +8,9 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Description: Finds position of first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -34,14 +34,14 @@ $ascii_needles = array(
    'de',
    'De',
    'dE',
-   
+
    //flag a swap between good and bad
-   '!', 
-   
+   '!',
+
    // 4 bad ones
    'df',
    'Df',
-   'dF', 
+   'dF',
    'DF'
 );
 
@@ -63,11 +63,11 @@ $greek_bmixed2 = base64_decode('zrzOvs6f');
 $greek_needles = array(
    // 4 good ones
    $greek_nlower, $greek_nupper, $greek_nmixed1, $greek_nmixed2,
-   
+
    '!', // used to flag a swap between good and bad
-   
+
    // 4 bad ones
-   $greek_blower, $greek_bupper, $greek_bmixed1, $greek_bmixed2,   
+   $greek_blower, $greek_bupper, $greek_bmixed1, $greek_bmixed2,
 );
 
 // try the basic options
@@ -80,7 +80,7 @@ foreach ($ascii_needles as $needle) {
       foreach ($ascii_haystacks as $haystack) {
          var_dump(mb_stripos($haystack, $needle));
       }
-   }   
+   }
 }
 
 echo "\n -- Greek Strings, needle should be found --\n";
@@ -92,7 +92,7 @@ foreach ($greek_needles as $needle) {
       foreach ($greek_haystacks as $haystack) {
          var_dump(mb_stripos($haystack, $needle));
       }
-   }   
+   }
 }
 
 echo "Done";
diff --git a/ext/mbstring/tests/mb_stripos_basic2.phpt b/ext/mbstring/tests/mb_stripos_basic2.phpt
index 76a6cc5066f..8c8732493f0 100644
--- a/ext/mbstring/tests/mb_stripos_basic2.phpt
+++ b/ext/mbstring/tests/mb_stripos_basic2.phpt
@@ -8,9 +8,9 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Description: Finds position of first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -56,7 +56,7 @@ $greek_needles = array(
 echo "\n -- ASCII Strings --\n";
 foreach ($ascii_needles as $needle) {
    foreach ($ascii_haystacks as $haystack) {
-      var_dump(mb_stripos($haystack, $needle));      
+      var_dump(mb_stripos($haystack, $needle));
       var_dump(mb_stripos($haystack, $needle, 6));
    }
 }
@@ -65,7 +65,7 @@ echo "\n -- Greek Strings --\n";
 foreach ($greek_needles as $needle) {
    foreach ($greek_haystacks as $haystack) {
       var_dump(mb_stripos($haystack, $needle));
-      var_dump(mb_stripos($haystack, $needle, 4));         
+      var_dump(mb_stripos($haystack, $needle, 4));
    }
 }
 
diff --git a/ext/mbstring/tests/mb_stripos_error1.phpt b/ext/mbstring/tests/mb_stripos_error1.phpt
index 4187898f010..3f1ab01bc13 100644
--- a/ext/mbstring/tests/mb_stripos_error1.phpt
+++ b/ext/mbstring/tests/mb_stripos_error1.phpt
@@ -8,9 +8,9 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Description: Finds position of first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/mbstring/tests/mb_stripos_error2.phpt b/ext/mbstring/tests/mb_stripos_error2.phpt
index 82b01b92f38..bbf1fb7a9a0 100644
--- a/ext/mbstring/tests/mb_stripos_error2.phpt
+++ b/ext/mbstring/tests/mb_stripos_error2.phpt
@@ -8,9 +8,9 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Description: Finds position of first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/mbstring/tests/mb_stripos_variation1.phpt b/ext/mbstring/tests/mb_stripos_variation1.phpt
index 39837aa0802..7ecbbe9e70f 100644
--- a/ext/mbstring/tests/mb_stripos_variation1.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation1.phpt
@@ -8,9 +8,9 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Description: Finds position of first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -69,7 +69,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -78,7 +78,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_stripos_variation2.phpt b/ext/mbstring/tests/mb_stripos_variation2.phpt
index 32b75467f78..b92aceecdbc 100644
--- a/ext/mbstring/tests/mb_stripos_variation2.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation2.phpt
@@ -8,9 +8,9 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Description: Finds position of first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -69,7 +69,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -78,7 +78,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_stripos_variation3.phpt b/ext/mbstring/tests/mb_stripos_variation3.phpt
index 9907356ccdc..0107d07e3f4 100644
--- a/ext/mbstring/tests/mb_stripos_variation3.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation3.phpt
@@ -71,7 +71,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*18*/ "",
        '',
@@ -80,7 +80,7 @@ $inputs = array(
 /*20*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*23*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_stripos_variation4.phpt b/ext/mbstring/tests/mb_stripos_variation4.phpt
index dc11b48d382..e762bb4e713 100644
--- a/ext/mbstring/tests/mb_stripos_variation4.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation4.phpt
@@ -8,9 +8,9 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_stripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of first occurrence of a string within another, case insensitive 
+ * Description: Finds position of first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -70,7 +70,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -79,7 +79,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt
index f2f9555a2b3..436ac90811f 100644
--- a/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt
+++ b/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt
@@ -14,7 +14,7 @@ function_exists('mb_stripos') or die("skip mb_stripos() is not available in this
 
 /*
  * Test how mb_stripos() behaves when passed different integers as $offset argument
- * The character length of $string_ascii and $string_mb is the same, 
+ * The character length of $string_ascii and $string_mb is the same,
  * and the needle appears at the same positions in both strings
  */
 
diff --git a/ext/mbstring/tests/mb_stristr_basic.phpt b/ext/mbstring/tests/mb_stristr_basic.phpt
index 58a03dcb2c1..22fc5b12785 100644
--- a/ext/mbstring/tests/mb_stristr_basic.phpt
+++ b/ext/mbstring/tests/mb_stristr_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_stristr() function : basic functionality 
+Test mb_stristr() function : basic functionality
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another, case insensitive 
+ * Description: Finds first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_stristr() : basic functionality ***\n";
diff --git a/ext/mbstring/tests/mb_stristr_error1.phpt b/ext/mbstring/tests/mb_stristr_error1.phpt
index c20f13470d1..ac54d27172d 100644
--- a/ext/mbstring/tests/mb_stristr_error1.phpt
+++ b/ext/mbstring/tests/mb_stristr_error1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_stristr() function : error conditions 
+Test mb_stristr() function : error conditions
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another, case insensitive 
+ * Description: Finds first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_stristr() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_stristr_error2.phpt b/ext/mbstring/tests/mb_stristr_error2.phpt
index 74f8bfb4ebe..d5abd115de3 100644
--- a/ext/mbstring/tests/mb_stristr_error2.phpt
+++ b/ext/mbstring/tests/mb_stristr_error2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_stristr() function : error conditions 
+Test mb_stristr() function : error conditions
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another, case insensitive 
+ * Description: Finds first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_stristr() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_stristr_variation1.phpt b/ext/mbstring/tests/mb_stristr_variation1.phpt
index c8c2ae1f68f..8f01425221d 100644
--- a/ext/mbstring/tests/mb_stristr_variation1.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation1.phpt
@@ -8,9 +8,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another, case insensitive 
+ * Description: Finds first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_stristr() : usage variation ***\n";
@@ -102,9 +102,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for haystack
diff --git a/ext/mbstring/tests/mb_stristr_variation2.phpt b/ext/mbstring/tests/mb_stristr_variation2.phpt
index 498bb3b8683..5842a8c6fd7 100644
--- a/ext/mbstring/tests/mb_stristr_variation2.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation2.phpt
@@ -8,9 +8,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another, case insensitive 
+ * Description: Finds first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_stristr() : usage variation ***\n";
@@ -102,9 +102,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for needle
diff --git a/ext/mbstring/tests/mb_stristr_variation3.phpt b/ext/mbstring/tests/mb_stristr_variation3.phpt
index cc0e6483209..642b3d9161c 100644
--- a/ext/mbstring/tests/mb_stristr_variation3.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation3.phpt
@@ -8,11 +8,11 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another, case insensitive 
+ * Description: Finds first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
- 
+
 echo "*** Testing mb_stristr() : usage variation ***\n";
 
 // Define error handler
@@ -108,9 +108,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for part
diff --git a/ext/mbstring/tests/mb_stristr_variation4.phpt b/ext/mbstring/tests/mb_stristr_variation4.phpt
index 7da3eeced02..122e92fcc45 100644
--- a/ext/mbstring/tests/mb_stristr_variation4.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation4.phpt
@@ -8,9 +8,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another, case insensitive 
+ * Description: Finds first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_stristr() : usage variation ***\n";
@@ -102,9 +102,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for encoding
diff --git a/ext/mbstring/tests/mb_stristr_variation5.phpt b/ext/mbstring/tests/mb_stristr_variation5.phpt
index 54d527ecf51..2fca14ff95f 100644
--- a/ext/mbstring/tests/mb_stristr_variation5.phpt
+++ b/ext/mbstring/tests/mb_stristr_variation5.phpt
@@ -8,9 +8,9 @@ function_exists('mb_stristr') or die("skip mb_stristr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_stristr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another, case insensitive 
+ * Description: Finds first occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_stristr() : basic functionality ***\n";
diff --git a/ext/mbstring/tests/mb_strlen.phpt b/ext/mbstring/tests/mb_strlen.phpt
index 97c09a79ae4..512d76de043 100644
--- a/ext/mbstring/tests/mb_strlen.phpt
+++ b/ext/mbstring/tests/mb_strlen.phpt
@@ -43,7 +43,7 @@ echo "== JIS ==\n";
 $jis = mb_convert_encoding($euc_jp, 'JIS','EUC-JP');
 print  mb_strlen($jis,'JIS') . "\n";
 mb_internal_encoding('JIS')  or print("mb_internal_encoding() failed\n");
-print  strlen($jis) . "\n"; 
+print  strlen($jis) . "\n";
 
 // UTF-8
 // Note: either convert_encoding or strlen has problem
@@ -51,7 +51,7 @@ echo "== UTF-8 ==\n";
 $utf8 = mb_convert_encoding($euc_jp, 'UTF-8','EUC-JP');
 print  mb_strlen($utf8,'UTF-8') . "\n";
 mb_internal_encoding('UTF-8')  or print("mb_internal_encoding() failed\n");
-print  strlen($utf8) . "\n";  
+print  strlen($utf8) . "\n";
 
 
 // Wrong Parameters
diff --git a/ext/mbstring/tests/mb_strlen_basic.phpt b/ext/mbstring/tests/mb_strlen_basic.phpt
index 6214f3069ca..e4a1435e905 100644
--- a/ext/mbstring/tests/mb_strlen_basic.phpt
+++ b/ext/mbstring/tests/mb_strlen_basic.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b
 --FILE--
 <?php
 /* Prototype  : int mb_strlen(string $str [, string $encoding])
- * Description: Get character numbers of a string 
+ * Description: Get character numbers of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_strlen_error1.phpt b/ext/mbstring/tests/mb_strlen_error1.phpt
index aff78d60f3e..6508d769a8c 100644
--- a/ext/mbstring/tests/mb_strlen_error1.phpt
+++ b/ext/mbstring/tests/mb_strlen_error1.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b
 --FILE--
 <?php
 /* Prototype  : int mb_strlen(string $str [, string $encoding])
- * Description: Get character numbers of a string 
+ * Description: Get character numbers of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_strlen_error2.phpt b/ext/mbstring/tests/mb_strlen_error2.phpt
index a530a844173..9507fd16c5e 100644
--- a/ext/mbstring/tests/mb_strlen_error2.phpt
+++ b/ext/mbstring/tests/mb_strlen_error2.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b
 --FILE--
 <?php
 /* Prototype  : int mb_strlen(string $str [, string $encoding])
- * Description: Get character numbers of a string 
+ * Description: Get character numbers of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_strlen_variation1.phpt b/ext/mbstring/tests/mb_strlen_variation1.phpt
index 4af8dc61aaa..480ee6909f8 100644
--- a/ext/mbstring/tests/mb_strlen_variation1.phpt
+++ b/ext/mbstring/tests/mb_strlen_variation1.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b
 --FILE--
 <?php
 /* Prototype  : int mb_strlen(string $str [, string $encoding])
- * Description: Get character numbers of a string 
+ * Description: Get character numbers of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -66,7 +66,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -75,7 +75,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strlen_variation2.phpt b/ext/mbstring/tests/mb_strlen_variation2.phpt
index 276731ce929..93111271319 100644
--- a/ext/mbstring/tests/mb_strlen_variation2.phpt
+++ b/ext/mbstring/tests/mb_strlen_variation2.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b
 --FILE--
 <?php
 /* Prototype  : int mb_strlen(string $str [, string $encoding])
- * Description: Get character numbers of a string 
+ * Description: Get character numbers of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -67,7 +67,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -76,7 +76,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strlen_variation3.phpt b/ext/mbstring/tests/mb_strlen_variation3.phpt
index efa11ad47ec..948b464ffdf 100644
--- a/ext/mbstring/tests/mb_strlen_variation3.phpt
+++ b/ext/mbstring/tests/mb_strlen_variation3.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strlen') or die("skip mb_strlen() is not available in this b
 --FILE--
 <?php
 /* Prototype  : int mb_strlen(string $str [, string $encoding])
- * Description: Get character numbers of a string 
+ * Description: Get character numbers of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_strpos.phpt b/ext/mbstring/tests/mb_strpos.phpt
index e5a74364ff7..7e4a64e351e 100644
--- a/ext/mbstring/tests/mb_strpos.phpt
+++ b/ext/mbstring/tests/mb_strpos.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_strpos() 
+mb_strpos()
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_strpos_basic.phpt b/ext/mbstring/tests/mb_strpos_basic.phpt
index 1197fbadd7b..f55ec59f6ee 100644
--- a/ext/mbstring/tests/mb_strpos_basic.phpt
+++ b/ext/mbstring/tests/mb_strpos_basic.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b
 --FILE--
 <?php
 /* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_strpos_error1.phpt b/ext/mbstring/tests/mb_strpos_error1.phpt
index ef0cbafeff6..14ec3b0097d 100644
--- a/ext/mbstring/tests/mb_strpos_error1.phpt
+++ b/ext/mbstring/tests/mb_strpos_error1.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b
 --FILE--
 <?php
 /* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_strpos_error2.phpt b/ext/mbstring/tests/mb_strpos_error2.phpt
index f75390f2c52..fc117606c94 100644
--- a/ext/mbstring/tests/mb_strpos_error2.phpt
+++ b/ext/mbstring/tests/mb_strpos_error2.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b
 --FILE--
 <?php
 /* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_strpos_variation1.phpt b/ext/mbstring/tests/mb_strpos_variation1.phpt
index 0684724b5cc..696cc1cd898 100644
--- a/ext/mbstring/tests/mb_strpos_variation1.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation1.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b
 --FILE--
 <?php
 /* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -68,7 +68,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -77,7 +77,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strpos_variation2.phpt b/ext/mbstring/tests/mb_strpos_variation2.phpt
index fb2d7227b90..9dc8e2a0194 100644
--- a/ext/mbstring/tests/mb_strpos_variation2.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation2.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b
 --FILE--
 <?php
 /* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -68,7 +68,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -77,7 +77,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strpos_variation3.phpt b/ext/mbstring/tests/mb_strpos_variation3.phpt
index ce43080dc35..d5205419d1c 100644
--- a/ext/mbstring/tests/mb_strpos_variation3.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation3.phpt
@@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 --FILE--
 <?php
 /* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -71,7 +71,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*18*/ "",
        '',
@@ -80,7 +80,7 @@ $inputs = array(
 /*20*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*23*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strpos_variation4.phpt b/ext/mbstring/tests/mb_strpos_variation4.phpt
index 31b43bacb7d..f9b8d9bcfdd 100644
--- a/ext/mbstring/tests/mb_strpos_variation4.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation4.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b
 --FILE--
 <?php
 /* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -69,7 +69,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -78,7 +78,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strpos_variation5.phpt b/ext/mbstring/tests/mb_strpos_variation5.phpt
index 1dccce63852..404af22c457 100644
--- a/ext/mbstring/tests/mb_strpos_variation5.phpt
+++ b/ext/mbstring/tests/mb_strpos_variation5.phpt
@@ -8,13 +8,13 @@ function_exists('mb_strpos') or die("skip mb_strpos() is not available in this b
 --FILE--
 <?php
 /* Prototype  : int mb_strpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of first occurrence of a string within another 
+ * Description: Find position of first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
 /*
  * Test how mb_strpos() behaves when passed different integers as $offset argument
- * The character length of $string_ascii and $string_mb is the same, 
+ * The character length of $string_ascii and $string_mb is the same,
  * and the needle appears at the same positions in both strings
  */
 
diff --git a/ext/mbstring/tests/mb_strrchr_basic.phpt b/ext/mbstring/tests/mb_strrchr_basic.phpt
index 8c227487f0b..2d8b8009c06 100644
--- a/ext/mbstring/tests/mb_strrchr_basic.phpt
+++ b/ext/mbstring/tests/mb_strrchr_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_strrchr() function : basic functionality 
+Test mb_strrchr() function : basic functionality
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another 
+ * Description: Finds the last occurrence of a character in a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrchr() : basic functionality ***\n";
diff --git a/ext/mbstring/tests/mb_strrchr_error1.phpt b/ext/mbstring/tests/mb_strrchr_error1.phpt
index 42346afbf0b..2878871dd82 100644
--- a/ext/mbstring/tests/mb_strrchr_error1.phpt
+++ b/ext/mbstring/tests/mb_strrchr_error1.phpt
@@ -4,13 +4,13 @@ Test mb_strrchr() function : error conditions
 <?php
 extension_loaded('mbstring') or die('skip');
 function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this build");
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another 
+ * Description: Finds the last occurrence of a character in a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrchr() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_strrchr_error2.phpt b/ext/mbstring/tests/mb_strrchr_error2.phpt
index 11abee609b1..e81e1befde9 100644
--- a/ext/mbstring/tests/mb_strrchr_error2.phpt
+++ b/ext/mbstring/tests/mb_strrchr_error2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_strrchr() function : error conditions 
+Test mb_strrchr() function : error conditions
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another 
+ * Description: Finds the last occurrence of a character in a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrchr() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_strrchr_variation1.phpt b/ext/mbstring/tests/mb_strrchr_variation1.phpt
index 7284939a571..da635fb74a6 100644
--- a/ext/mbstring/tests/mb_strrchr_variation1.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation1.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another 
+ * Description: Finds the last occurrence of a character in a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrchr() : usage variation ***\n";
@@ -102,9 +102,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for haystack
diff --git a/ext/mbstring/tests/mb_strrchr_variation2.phpt b/ext/mbstring/tests/mb_strrchr_variation2.phpt
index 074cdda1086..942980e5fdf 100644
--- a/ext/mbstring/tests/mb_strrchr_variation2.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation2.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another 
+ * Description: Finds the last occurrence of a character in a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrchr() : usage variation ***\n";
@@ -102,9 +102,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for needle
diff --git a/ext/mbstring/tests/mb_strrchr_variation3.phpt b/ext/mbstring/tests/mb_strrchr_variation3.phpt
index c93895c7a5d..d21072de753 100644
--- a/ext/mbstring/tests/mb_strrchr_variation3.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation3.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another 
+ * Description: Finds the last occurrence of a character in a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrchr() : usage variation ***\n";
@@ -108,9 +108,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for part
@@ -123,7 +123,7 @@ foreach($inputs as $key =>$value) {
       }
       else {
          var_dump(bin2hex($res));
-      }      
+      }
 };
 
 fclose($fp);
diff --git a/ext/mbstring/tests/mb_strrchr_variation4.phpt b/ext/mbstring/tests/mb_strrchr_variation4.phpt
index a85979c9884..5ba8e0563f7 100644
--- a/ext/mbstring/tests/mb_strrchr_variation4.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation4.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another 
+ * Description: Finds the last occurrence of a character in a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrchr() : usage variation ***\n";
@@ -102,9 +102,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for encoding
diff --git a/ext/mbstring/tests/mb_strrchr_variation5.phpt b/ext/mbstring/tests/mb_strrchr_variation5.phpt
index fa37db646c6..869fdde76f0 100644
--- a/ext/mbstring/tests/mb_strrchr_variation5.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation5.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another 
+ * Description: Finds the last occurrence of a character in a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrchr() : variation ***\n";
diff --git a/ext/mbstring/tests/mb_strrchr_variation6.phpt b/ext/mbstring/tests/mb_strrchr_variation6.phpt
index 2c941c51140..053a1cf7269 100644
--- a/ext/mbstring/tests/mb_strrchr_variation6.phpt
+++ b/ext/mbstring/tests/mb_strrchr_variation6.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strrchr') or die("skip mb_strrchr() is not available in this
 --FILE--
 <?php
 /* Prototype  : string mb_strrchr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another 
+ * Description: Finds the last occurrence of a character in a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrchr() : variation ***\n";
diff --git a/ext/mbstring/tests/mb_strrichr_basic.phpt b/ext/mbstring/tests/mb_strrichr_basic.phpt
index 2670de774c8..4f82f224749 100644
--- a/ext/mbstring/tests/mb_strrichr_basic.phpt
+++ b/ext/mbstring/tests/mb_strrichr_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_strrichr() function : basic functionality 
+Test mb_strrichr() function : basic functionality
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th
 --FILE--
 <?php
 /* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrichr() : basic functionality ***\n";
diff --git a/ext/mbstring/tests/mb_strrichr_error1.phpt b/ext/mbstring/tests/mb_strrichr_error1.phpt
index 7280c530853..a8c8cd49733 100644
--- a/ext/mbstring/tests/mb_strrichr_error1.phpt
+++ b/ext/mbstring/tests/mb_strrichr_error1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_strrichr() function : error conditions 
+Test mb_strrichr() function : error conditions
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th
 --FILE--
 <?php
 /* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrichr() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_strrichr_error2.phpt b/ext/mbstring/tests/mb_strrichr_error2.phpt
index b1877db9c10..fec201e99a6 100644
--- a/ext/mbstring/tests/mb_strrichr_error2.phpt
+++ b/ext/mbstring/tests/mb_strrichr_error2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_strrichr() function : error conditions 
+Test mb_strrichr() function : error conditions
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th
 --FILE--
 <?php
 /* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrichr() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_strrichr_variation1.phpt b/ext/mbstring/tests/mb_strrichr_variation1.phpt
index 06ca5e31c96..afc01e70fbc 100644
--- a/ext/mbstring/tests/mb_strrichr_variation1.phpt
+++ b/ext/mbstring/tests/mb_strrichr_variation1.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th
 --FILE--
 <?php
 /* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrichr() : usage variation ***\n";
@@ -102,9 +102,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for haystack
diff --git a/ext/mbstring/tests/mb_strrichr_variation2.phpt b/ext/mbstring/tests/mb_strrichr_variation2.phpt
index e2c979b428c..b389f607218 100644
--- a/ext/mbstring/tests/mb_strrichr_variation2.phpt
+++ b/ext/mbstring/tests/mb_strrichr_variation2.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th
 --FILE--
 <?php
 /* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrichr() : usage variation ***\n";
@@ -102,9 +102,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for needle
diff --git a/ext/mbstring/tests/mb_strrichr_variation3.phpt b/ext/mbstring/tests/mb_strrichr_variation3.phpt
index 3949c148d1e..79824c8a73f 100644
--- a/ext/mbstring/tests/mb_strrichr_variation3.phpt
+++ b/ext/mbstring/tests/mb_strrichr_variation3.phpt
@@ -8,11 +8,11 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th
 --FILE--
 <?php
 /* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
- 
+
 echo "*** Testing mb_strrichr() : usage variation ***\n";
 
 // Define error handler
@@ -108,9 +108,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for part
@@ -123,7 +123,7 @@ foreach($inputs as $key =>$value) {
       }
       else {
          var_dump(bin2hex($res));
-      }         
+      }
 };
 
 fclose($fp);
diff --git a/ext/mbstring/tests/mb_strrichr_variation4.phpt b/ext/mbstring/tests/mb_strrichr_variation4.phpt
index f9d9f680372..adcccee2090 100644
--- a/ext/mbstring/tests/mb_strrichr_variation4.phpt
+++ b/ext/mbstring/tests/mb_strrichr_variation4.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th
 --FILE--
 <?php
 /* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrichr() : usage variation ***\n";
@@ -102,9 +102,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for encoding
diff --git a/ext/mbstring/tests/mb_strrichr_variation5.phpt b/ext/mbstring/tests/mb_strrichr_variation5.phpt
index 0e5d472fd85..be28a5955c9 100644
--- a/ext/mbstring/tests/mb_strrichr_variation5.phpt
+++ b/ext/mbstring/tests/mb_strrichr_variation5.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strrichr') or die("skip mb_strrichr() is not available in th
 --FILE--
 <?php
 /* Prototype  : string mb_strrichr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds the last occurrence of a character in a string within another, case insensitive 
+ * Description: Finds the last occurrence of a character in a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strrichr() : basic functionality ***\n";
diff --git a/ext/mbstring/tests/mb_strripos_basic.phpt b/ext/mbstring/tests/mb_strripos_basic.phpt
index c9e1ff84fc2..ce538ec0afa 100644
--- a/ext/mbstring/tests/mb_strripos_basic.phpt
+++ b/ext/mbstring/tests/mb_strripos_basic.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th
 --FILE--
 <?php
 /* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Description: Finds position of last occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -34,14 +34,14 @@ $ascii_needles = array(
    'de',
    'De',
    'dE',
-   
+
    //flag a swap between good and bad
-   '!', 
-   
+   '!',
+
    // 4 bad ones
    'df',
    'Df',
-   'dF', 
+   'dF',
    'DF'
 );
 
@@ -63,11 +63,11 @@ $greek_bmixed2 = base64_decode('zrzOvs6f');
 $greek_needles = array(
    // 4 good ones
    $greek_nlower, $greek_nupper, $greek_nmixed1, $greek_nmixed2,
-   
+
    '!', // used to flag a swap between good and bad
-   
+
    // 4 bad ones
-   $greek_blower, $greek_bupper, $greek_bmixed1, $greek_bmixed2,   
+   $greek_blower, $greek_bupper, $greek_bmixed1, $greek_bmixed2,
 );
 
 // try the basic options
@@ -80,7 +80,7 @@ foreach ($ascii_needles as $needle) {
       foreach ($ascii_haystacks as $haystack) {
          var_dump(mb_strripos($haystack, $needle));
       }
-   }   
+   }
 }
 
 echo "\n -- Greek Strings, needle should be found --\n";
@@ -92,7 +92,7 @@ foreach ($greek_needles as $needle) {
       foreach ($greek_haystacks as $haystack) {
          var_dump(mb_strripos($haystack, $needle));
       }
-   }   
+   }
 }
 
 echo "Done";
diff --git a/ext/mbstring/tests/mb_strripos_basic2.phpt b/ext/mbstring/tests/mb_strripos_basic2.phpt
index b330323c7ef..c4d7f0d3384 100644
--- a/ext/mbstring/tests/mb_strripos_basic2.phpt
+++ b/ext/mbstring/tests/mb_strripos_basic2.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th
 --FILE--
 <?php
 /* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Description: Finds position of last occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -56,7 +56,7 @@ $greek_needles = array(
 echo "\n -- ASCII Strings --\n";
 foreach ($ascii_needles as $needle) {
    foreach ($ascii_haystacks as $haystack) {
-      var_dump(mb_strripos($haystack, $needle));      
+      var_dump(mb_strripos($haystack, $needle));
       var_dump(mb_strripos($haystack, $needle, 14));
    }
 }
@@ -65,7 +65,7 @@ echo "\n -- Greek Strings --\n";
 foreach ($greek_needles as $needle) {
    foreach ($greek_haystacks as $haystack) {
       var_dump(mb_strripos($haystack, $needle));
-      var_dump(mb_strripos($haystack, $needle, 12));         
+      var_dump(mb_strripos($haystack, $needle, 12));
    }
 }
 
diff --git a/ext/mbstring/tests/mb_strripos_error1.phpt b/ext/mbstring/tests/mb_strripos_error1.phpt
index 3e2f6d928d0..6c2d31376e8 100644
--- a/ext/mbstring/tests/mb_strripos_error1.phpt
+++ b/ext/mbstring/tests/mb_strripos_error1.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th
 --FILE--
 <?php
 /* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Description: Finds position of last occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/mbstring/tests/mb_strripos_error2.phpt b/ext/mbstring/tests/mb_strripos_error2.phpt
index d01a774107f..ae4ee7d0178 100644
--- a/ext/mbstring/tests/mb_strripos_error2.phpt
+++ b/ext/mbstring/tests/mb_strripos_error2.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th
 --FILE--
 <?php
 /* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Description: Finds position of last occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/mbstring/tests/mb_strripos_variation1.phpt b/ext/mbstring/tests/mb_strripos_variation1.phpt
index 0a3be0a7da6..0ba21a5624d 100644
--- a/ext/mbstring/tests/mb_strripos_variation1.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation1.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th
 --FILE--
 <?php
 /* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Description: Finds position of last occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -69,7 +69,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -78,7 +78,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strripos_variation2.phpt b/ext/mbstring/tests/mb_strripos_variation2.phpt
index eafe7f79e97..6777145e130 100644
--- a/ext/mbstring/tests/mb_strripos_variation2.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation2.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th
 --FILE--
 <?php
 /* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Description: Finds position of last occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -69,7 +69,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -78,7 +78,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
index cc3843e1028..43e847fef52 100644
--- a/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
@@ -9,9 +9,9 @@ if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 --FILE--
 <?php
 /* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Description: Finds position of last occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -70,7 +70,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -79,7 +79,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strripos_variation4.phpt b/ext/mbstring/tests/mb_strripos_variation4.phpt
index 27973e51ead..195060be072 100644
--- a/ext/mbstring/tests/mb_strripos_variation4.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation4.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th
 --FILE--
 <?php
 /* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Description: Finds position of last occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -70,7 +70,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -79,7 +79,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt
index ce3074abf02..11d289f52d3 100644
--- a/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt
+++ b/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt
@@ -8,14 +8,14 @@ function_exists('mb_strripos') or die("skip mb_strripos() is not available in th
 --FILE--
 <?php
 /* Prototype  : int mb_strripos(string haystack, string needle [, int offset [, string encoding]])
- * Description: Finds position of last occurrence of a string within another, case insensitive 
+ * Description: Finds position of last occurrence of a string within another, case insensitive
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
  * Test how mb_strripos() behaves when passed different integers as $offset argument
- * The character length of $string_ascii and $string_mb is the same, 
+ * The character length of $string_ascii and $string_mb is the same,
  * and the needle appears at the same positions in both strings
  */
 
diff --git a/ext/mbstring/tests/mb_strrpos_basic.phpt b/ext/mbstring/tests/mb_strrpos_basic.phpt
index 9de0388f436..7a49cde621c 100644
--- a/ext/mbstring/tests/mb_strrpos_basic.phpt
+++ b/ext/mbstring/tests/mb_strrpos_basic.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_strrpos_error1.phpt b/ext/mbstring/tests/mb_strrpos_error1.phpt
index 892599acc2f..f8e90d03b3c 100644
--- a/ext/mbstring/tests/mb_strrpos_error1.phpt
+++ b/ext/mbstring/tests/mb_strrpos_error1.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_strrpos_error2.phpt b/ext/mbstring/tests/mb_strrpos_error2.phpt
index fa3719509c0..ed69ce53cd0 100644
--- a/ext/mbstring/tests/mb_strrpos_error2.phpt
+++ b/ext/mbstring/tests/mb_strrpos_error2.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_strrpos_variation1.phpt b/ext/mbstring/tests/mb_strrpos_variation1.phpt
index f0e6e479877..cd6c111206b 100644
--- a/ext/mbstring/tests/mb_strrpos_variation1.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation1.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -68,7 +68,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -77,7 +77,7 @@ $inputs = array(
 /*18*/ "hello, world",
        'hello, world',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strrpos_variation2.phpt b/ext/mbstring/tests/mb_strrpos_variation2.phpt
index c2855e0f812..8a23321c026 100644
--- a/ext/mbstring/tests/mb_strrpos_variation2.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation2.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -68,7 +68,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -77,7 +77,7 @@ $inputs = array(
 /*18*/ "world",
        'world',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strrpos_variation3.phpt b/ext/mbstring/tests/mb_strrpos_variation3.phpt
index da28d6ed7c9..99e5962f671 100644
--- a/ext/mbstring/tests/mb_strrpos_variation3.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation3.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -65,7 +65,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // object data
 /*16*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strrpos_variation4.phpt b/ext/mbstring/tests/mb_strrpos_variation4.phpt
index 287142793b6..a7011dd278c 100644
--- a/ext/mbstring/tests/mb_strrpos_variation4.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation4.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -69,7 +69,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -78,7 +78,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strrpos_variation5.phpt b/ext/mbstring/tests/mb_strrpos_variation5.phpt
index cb5089679b9..8470aa7c6b1 100644
--- a/ext/mbstring/tests/mb_strrpos_variation5.phpt
+++ b/ext/mbstring/tests/mb_strrpos_variation5.phpt
@@ -8,7 +8,7 @@ function_exists('mb_strrpos') or die("skip mb_strrpos() is not available in this
 --FILE--
 <?php
 /* Prototype  : int mb_strrpos(string $haystack, string $needle [, int $offset [, string $encoding]])
- * Description: Find position of last occurrence of a string within another 
+ * Description: Find position of last occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_strstr.phpt b/ext/mbstring/tests/mb_strstr.phpt
index fcf9e85bc2c..d224475370d 100644
--- a/ext/mbstring/tests/mb_strstr.phpt
+++ b/ext/mbstring/tests/mb_strstr.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_strstr() 
+mb_strstr()
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
diff --git a/ext/mbstring/tests/mb_strstr_basic.phpt b/ext/mbstring/tests/mb_strstr_basic.phpt
index 2b41707a6a6..5a9068e606c 100644
--- a/ext/mbstring/tests/mb_strstr_basic.phpt
+++ b/ext/mbstring/tests/mb_strstr_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_strstr() function : basic functionality 
+Test mb_strstr() function : basic functionality
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another 
+ * Description: Finds first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strstr() : basic functionality ***\n";
diff --git a/ext/mbstring/tests/mb_strstr_error1.phpt b/ext/mbstring/tests/mb_strstr_error1.phpt
index cf7c0b1f17d..82ae618b5dc 100644
--- a/ext/mbstring/tests/mb_strstr_error1.phpt
+++ b/ext/mbstring/tests/mb_strstr_error1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_strstr() function : error conditions 
+Test mb_strstr() function : error conditions
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another 
+ * Description: Finds first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strstr() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_strstr_error2.phpt b/ext/mbstring/tests/mb_strstr_error2.phpt
index 8df700080ea..81daccb432c 100644
--- a/ext/mbstring/tests/mb_strstr_error2.phpt
+++ b/ext/mbstring/tests/mb_strstr_error2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_strstr() function : error conditions 
+Test mb_strstr() function : error conditions
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another 
+ * Description: Finds first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strstr() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_strstr_variation1.phpt b/ext/mbstring/tests/mb_strstr_variation1.phpt
index a9406f1cadc..5dfeaee8a1f 100644
--- a/ext/mbstring/tests/mb_strstr_variation1.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation1.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another 
+ * Description: Finds first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strstr() : usage variation ***\n";
@@ -102,9 +102,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for haystack
diff --git a/ext/mbstring/tests/mb_strstr_variation2.phpt b/ext/mbstring/tests/mb_strstr_variation2.phpt
index 8c059cb6b2a..b14da94fabe 100644
--- a/ext/mbstring/tests/mb_strstr_variation2.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation2.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another 
+ * Description: Finds first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strstr() : usage variation ***\n";
@@ -102,9 +102,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for needle
diff --git a/ext/mbstring/tests/mb_strstr_variation3.phpt b/ext/mbstring/tests/mb_strstr_variation3.phpt
index 6bb1c887294..18d96e5ad0f 100644
--- a/ext/mbstring/tests/mb_strstr_variation3.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation3.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another 
+ * Description: Finds first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strstr() : usage variation ***\n";
@@ -108,9 +108,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for part
@@ -123,7 +123,7 @@ foreach($inputs as $key =>$value) {
       }
       else {
          var_dump(bin2hex($res));
-      }      
+      }
 };
 
 fclose($fp);
diff --git a/ext/mbstring/tests/mb_strstr_variation4.phpt b/ext/mbstring/tests/mb_strstr_variation4.phpt
index 8a0efcba8e7..088f4dac0db 100644
--- a/ext/mbstring/tests/mb_strstr_variation4.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation4.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another 
+ * Description: Finds first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strstr() : usage variation ***\n";
@@ -102,9 +102,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for encoding
diff --git a/ext/mbstring/tests/mb_strstr_variation5.phpt b/ext/mbstring/tests/mb_strstr_variation5.phpt
index ab6315be441..2b6fd238b85 100644
--- a/ext/mbstring/tests/mb_strstr_variation5.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation5.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another 
+ * Description: Finds first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strstr() : variation ***\n";
diff --git a/ext/mbstring/tests/mb_strstr_variation6.phpt b/ext/mbstring/tests/mb_strstr_variation6.phpt
index d00f15cfa3b..c2438b771e9 100644
--- a/ext/mbstring/tests/mb_strstr_variation6.phpt
+++ b/ext/mbstring/tests/mb_strstr_variation6.phpt
@@ -8,9 +8,9 @@ function_exists('mb_strstr') or die("skip mb_strstr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
- * Description: Finds first occurrence of a string within another 
+ * Description: Finds first occurrence of a string within another
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_strstr() : variation ***\n";
diff --git a/ext/mbstring/tests/mb_strtolower_variation1.phpt b/ext/mbstring/tests/mb_strtolower_variation1.phpt
index 3b151b96c72..057fc299ced 100644
--- a/ext/mbstring/tests/mb_strtolower_variation1.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation1.phpt
@@ -64,7 +64,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -73,7 +73,7 @@ $inputs = array(
 /*18*/ "String",
        'String',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strtolower_variation2.phpt b/ext/mbstring/tests/mb_strtolower_variation2.phpt
index 43d0f537286..b5195cb9953 100644
--- a/ext/mbstring/tests/mb_strtolower_variation2.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation2.phpt
@@ -67,7 +67,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -76,7 +76,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strtolower_variation4.phpt b/ext/mbstring/tests/mb_strtolower_variation4.phpt
index f08b508798e..e8792c0d96e 100644
--- a/ext/mbstring/tests/mb_strtolower_variation4.phpt
+++ b/ext/mbstring/tests/mb_strtolower_variation4.phpt
@@ -18,7 +18,7 @@ function_exists('mb_strtolower') or die("skip mb_strtolower() is not available i
 
 echo "*** Testing mb_strtolower() :  usage variations ***\n";
 
-$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 
+$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
                 'Characters With Accents' => base64_decode('w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlg=='),
                 'Russian' => base64_decode('0JDQkdCS0JPQlNCV0JbQlw=='));
 $lowers = array('Basic Latin' => 'abcdefghijklmnopqrstuvwxyz',
diff --git a/ext/mbstring/tests/mb_strtoupper_variation1.phpt b/ext/mbstring/tests/mb_strtoupper_variation1.phpt
index efe88456382..6331db27bae 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation1.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation1.phpt
@@ -13,7 +13,7 @@ function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available i
  */
 
 /*
- * 
+ *
  * Pass different data types as $sourcestring argument to mb_strtoupper to test behaviour
  */
 
@@ -66,7 +66,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -75,7 +75,7 @@ $inputs = array(
 /*18*/ "String",
        'String',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strtoupper_variation2.phpt b/ext/mbstring/tests/mb_strtoupper_variation2.phpt
index 52beb3d7410..ec90324a10b 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation2.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation2.phpt
@@ -67,7 +67,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -76,7 +76,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_strtoupper_variation4.phpt b/ext/mbstring/tests/mb_strtoupper_variation4.phpt
index 8f5abe7269e..733ed8a1b59 100644
--- a/ext/mbstring/tests/mb_strtoupper_variation4.phpt
+++ b/ext/mbstring/tests/mb_strtoupper_variation4.phpt
@@ -19,7 +19,7 @@ function_exists('mb_strtoupper') or die("skip mb_strtoupper() is not available i
 
 echo "*** Testing mb_strtoupper() : usage variations ***\n";
 
-$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 
+$uppers = array('Basic Latin' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
                 'Characters With Accents' => base64_decode('w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlg=='),
                 'Russian' => base64_decode('0JDQkdCS0JPQlNCV0JbQlw=='));
 $lowers = array('Basic Latin' => 'abcdefghijklmnopqrstuvwxyz',
diff --git a/ext/mbstring/tests/mb_substitute_character.phpt b/ext/mbstring/tests/mb_substitute_character.phpt
index db1198822f6..502a4136dd2 100644
--- a/ext/mbstring/tests/mb_substitute_character.phpt
+++ b/ext/mbstring/tests/mb_substitute_character.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mb_substitute_character()  
+mb_substitute_character()
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
diff --git a/ext/mbstring/tests/mb_substitute_character_basic.phpt b/ext/mbstring/tests/mb_substitute_character_basic.phpt
index 036203f416a..9fa3a5b1aca 100644
--- a/ext/mbstring/tests/mb_substitute_character_basic.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_substitute_character() function : basic functionality 
+Test mb_substitute_character() function : basic functionality
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character(
 --FILE--
 <?php
 /* Prototype  : mixed mb_substitute_character([mixed substchar])
- * Description: Sets the current substitute_character or returns the current substitute_character 
+ * Description: Sets the current substitute_character or returns the current substitute_character
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_substitute_character() : basic functionality ***\n";
diff --git a/ext/mbstring/tests/mb_substitute_character_error.phpt b/ext/mbstring/tests/mb_substitute_character_error.phpt
index 2a816b8b2ff..4fe13683eac 100644
--- a/ext/mbstring/tests/mb_substitute_character_error.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_substitute_character() function : error conditions 
+Test mb_substitute_character() function : error conditions
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character(
 --FILE--
 <?php
 /* Prototype  : mixed mb_substitute_character([mixed substchar])
- * Description: Sets the current substitute_character or returns the current substitute_character 
+ * Description: Sets the current substitute_character or returns the current substitute_character
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_substitute_character() : error conditions ***\n";
diff --git a/ext/mbstring/tests/mb_substitute_character_variation1.phpt b/ext/mbstring/tests/mb_substitute_character_variation1.phpt
index fa786a1e5c7..10df85ea279 100644
--- a/ext/mbstring/tests/mb_substitute_character_variation1.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_substitute_character() function : usage variation 
+Test mb_substitute_character() function : usage variation
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,9 +8,9 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character(
 --FILE--
 <?php
 /* Prototype  : mixed mb_substitute_character([mixed substchar])
- * Description: Sets the current substitute_character or returns the current substitute_character 
+ * Description: Sets the current substitute_character or returns the current substitute_character
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_substitute_character() : usage variation ***\n";
diff --git a/ext/mbstring/tests/mb_substitute_character_variation2.phpt b/ext/mbstring/tests/mb_substitute_character_variation2.phpt
index 6248174aa61..d447dc87d71 100644
--- a/ext/mbstring/tests/mb_substitute_character_variation2.phpt
+++ b/ext/mbstring/tests/mb_substitute_character_variation2.phpt
@@ -8,9 +8,9 @@ function_exists('mb_substitute_character') or die("skip mb_substitute_character(
 --FILE--
 <?php
 /* Prototype  : mixed mb_substitute_character([mixed substchar])
- * Description: Sets the current substitute_character or returns the current substitute_character 
+ * Description: Sets the current substitute_character or returns the current substitute_character
  * Source code: ext/mbstring/mbstring.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mb_substitute_character() : variation ***\n";
diff --git a/ext/mbstring/tests/mb_substr_basic.phpt b/ext/mbstring/tests/mb_substr_basic.phpt
index d6d6b75d236..dc09fe381f2 100644
--- a/ext/mbstring/tests/mb_substr_basic.phpt
+++ b/ext/mbstring/tests/mb_substr_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_substr() function : basic functionality 
+Test mb_substr() function : basic functionality
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -10,7 +10,7 @@ mbstring.internal_encoding=ISO-8859-1
 --FILE--
 <?php
 /* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
- * Description: Returns part of a string 
+ * Description: Returns part of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_substr_count_basic.phpt b/ext/mbstring/tests/mb_substr_count_basic.phpt
index c4d1d7830aa..31e3620f1c2 100644
--- a/ext/mbstring/tests/mb_substr_count_basic.phpt
+++ b/ext/mbstring/tests/mb_substr_count_basic.phpt
@@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab
 --FILE--
 <?php
 /* Prototype  : int mb_substr_count(string $haystack, string $needle [, string $encoding])
- * Description: Count the number of substring occurrences 
+ * Description: Count the number of substring occurrences
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_substr_count_error1.phpt b/ext/mbstring/tests/mb_substr_count_error1.phpt
index 881ca0c22ee..50c6765541b 100644
--- a/ext/mbstring/tests/mb_substr_count_error1.phpt
+++ b/ext/mbstring/tests/mb_substr_count_error1.phpt
@@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab
 --FILE--
 <?php
 /* Prototype  : int mb_substr_count(string $haystack, string $needle [, string $encoding])
- * Description: Count the number of substring occurrences 
+ * Description: Count the number of substring occurrences
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_substr_count_error2.phpt b/ext/mbstring/tests/mb_substr_count_error2.phpt
index aefb2c05c8d..e715e30ad92 100644
--- a/ext/mbstring/tests/mb_substr_count_error2.phpt
+++ b/ext/mbstring/tests/mb_substr_count_error2.phpt
@@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab
 --FILE--
 <?php
 /* Prototype  : int mb_substr_count(string $haystack, string $needle [, string $encoding])
- * Description: Count the number of substring occurrences 
+ * Description: Count the number of substring occurrences
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_substr_count_variation1.phpt b/ext/mbstring/tests/mb_substr_count_variation1.phpt
index cc55135ab24..86efcadad9a 100644
--- a/ext/mbstring/tests/mb_substr_count_variation1.phpt
+++ b/ext/mbstring/tests/mb_substr_count_variation1.phpt
@@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab
 --FILE--
 <?php
 /* Prototype  :int mb_substr_count(string $haystack, string $needle [, string $encoding])
- * Description: Count the number of substring occurrences 
+ * Description: Count the number of substring occurrences
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -67,7 +67,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -76,7 +76,7 @@ $inputs = array(
 /*18*/ "hello, world",
        'hello, world',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_substr_count_variation2.phpt b/ext/mbstring/tests/mb_substr_count_variation2.phpt
index 87b5eed1898..48dd675fda7 100644
--- a/ext/mbstring/tests/mb_substr_count_variation2.phpt
+++ b/ext/mbstring/tests/mb_substr_count_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mb_substr_count() function : usage variations - pass different data types as $needle arg 
+Test mb_substr_count() function : usage variations - pass different data types as $needle arg
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab
 --FILE--
 <?php
 /* Prototype  : int mb_substr_count(string $haystack, string $needle [, string $encoding])
- * Description: Count the number of substring occurrences 
+ * Description: Count the number of substring occurrences
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -66,7 +66,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -75,7 +75,7 @@ $inputs = array(
 /*18*/ "world",
        'world',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_substr_count_variation3.phpt b/ext/mbstring/tests/mb_substr_count_variation3.phpt
index d2e7a605669..3b1e442724b 100644
--- a/ext/mbstring/tests/mb_substr_count_variation3.phpt
+++ b/ext/mbstring/tests/mb_substr_count_variation3.phpt
@@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab
 --FILE--
 <?php
 /* Prototype  : int mb_substr_count(string $haystack, string $needle [, string $encoding])
- * Description: Count the number of substring occurrences 
+ * Description: Count the number of substring occurrences
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -68,7 +68,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -77,7 +77,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_substr_count_variation4.phpt b/ext/mbstring/tests/mb_substr_count_variation4.phpt
index 21c9f956fb1..cef5fdd9aa7 100644
--- a/ext/mbstring/tests/mb_substr_count_variation4.phpt
+++ b/ext/mbstring/tests/mb_substr_count_variation4.phpt
@@ -8,7 +8,7 @@ function_exists('mb_substr_count') or die("skip mb_substr_count() is not availab
 --FILE--
 <?php
 /* Prototype  : int mb_substr_count(string $haystack, string $needle [, string $encoding])
- * Description: Count the number of substring occurrences 
+ * Description: Count the number of substring occurrences
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_substr_error1.phpt b/ext/mbstring/tests/mb_substr_error1.phpt
index e48b3193b3c..e8dfe29ad4d 100644
--- a/ext/mbstring/tests/mb_substr_error1.phpt
+++ b/ext/mbstring/tests/mb_substr_error1.phpt
@@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
- * Description: Returns part of a string 
+ * Description: Returns part of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_substr_error2.phpt b/ext/mbstring/tests/mb_substr_error2.phpt
index 72be974ed07..85bea20e10c 100644
--- a/ext/mbstring/tests/mb_substr_error2.phpt
+++ b/ext/mbstring/tests/mb_substr_error2.phpt
@@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
- * Description: Returns part of a string 
+ * Description: Returns part of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
diff --git a/ext/mbstring/tests/mb_substr_variation1.phpt b/ext/mbstring/tests/mb_substr_variation1.phpt
index b02daa3450d..6e5ec9ef2bb 100644
--- a/ext/mbstring/tests/mb_substr_variation1.phpt
+++ b/ext/mbstring/tests/mb_substr_variation1.phpt
@@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
- * Description: Returns part of a string 
+ * Description: Returns part of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -67,7 +67,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -76,7 +76,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_substr_variation2.phpt b/ext/mbstring/tests/mb_substr_variation2.phpt
index 7c763f36168..5a72406b6b0 100644
--- a/ext/mbstring/tests/mb_substr_variation2.phpt
+++ b/ext/mbstring/tests/mb_substr_variation2.phpt
@@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
- * Description: Returns part of a string 
+ * Description: Returns part of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -69,7 +69,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -78,7 +78,7 @@ $inputs = array(
 /*18*/ "UTF-8",
        'UTF-8',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/mbstring/tests/mb_substr_variation4.phpt b/ext/mbstring/tests/mb_substr_variation4.phpt
index ce4df530058..f4a4643421e 100644
--- a/ext/mbstring/tests/mb_substr_variation4.phpt
+++ b/ext/mbstring/tests/mb_substr_variation4.phpt
@@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
- * Description: Returns part of a string 
+ * Description: Returns part of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -44,7 +44,7 @@ for ($i = -60; $i <= 60; $i += 10) {
 	} else {
 		echo "Difference in length of ASCII string and multibyte string\n";
 	}
-	
+
 }
 
 echo "Done";
diff --git a/ext/mbstring/tests/mb_substr_variation5.phpt b/ext/mbstring/tests/mb_substr_variation5.phpt
index 1ec92be9934..a9be0686fa9 100644
--- a/ext/mbstring/tests/mb_substr_variation5.phpt
+++ b/ext/mbstring/tests/mb_substr_variation5.phpt
@@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
- * Description: Returns part of a string 
+ * Description: Returns part of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -45,7 +45,7 @@ for ($i = -60; $i <= 60; $i += 10) {
 	} else {
 		echo "Difference in length of ASCII string and multibyte string\n";
 	}
-	
+
 }
 
 echo "Done";
diff --git a/ext/mbstring/tests/mb_substr_variation6.phpt b/ext/mbstring/tests/mb_substr_variation6.phpt
index aa75c70c00b..b1783c839f2 100644
--- a/ext/mbstring/tests/mb_substr_variation6.phpt
+++ b/ext/mbstring/tests/mb_substr_variation6.phpt
@@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
- * Description: Returns part of a string 
+ * Description: Returns part of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -41,7 +41,7 @@ for ($i = -60; $i <= 60; $i += 10) {
 	}
 	else {
 	   var_dump($a);
-	}		
+	}
 	echo "--Multibyte String --\n";
 	$b = mb_substr($string_mb, $i, 4, 'UTF-8');
 	if (strlen($a) == mb_strlen($b, 'UTF-8')) { // should return same length
@@ -49,7 +49,7 @@ for ($i = -60; $i <= 60; $i += 10) {
 	} else {
 		echo "Difference in length of ASCII string and multibyte string\n";
 	}
-	
+
 }
 
 echo "Done";
diff --git a/ext/mbstring/tests/mb_substr_variation7.phpt b/ext/mbstring/tests/mb_substr_variation7.phpt
index 22b5fa2fe32..da00d4b80a9 100644
--- a/ext/mbstring/tests/mb_substr_variation7.phpt
+++ b/ext/mbstring/tests/mb_substr_variation7.phpt
@@ -8,7 +8,7 @@ function_exists('mb_substr') or die("skip mb_substr() is not available in this b
 --FILE--
 <?php
 /* Prototype  : string mb_substr(string $str, int $start [, int $length [, string $encoding]])
- * Description: Returns part of a string 
+ * Description: Returns part of a string
  * Source code: ext/mbstring/mbstring.c
  */
 
@@ -42,7 +42,7 @@ for ($i = -60; $i <= 60; $i += 10) {
 	}
 	else {
 	   var_dump($a);
-	}			
+	}
 	echo "--Multibyte String --\n";
 	$b = mb_substr($string_mb, 1, $i, 'UTF-8');
 	if (strlen($a) == mb_strlen($b, 'UTF-8')) { // should return same length
@@ -50,7 +50,7 @@ for ($i = -60; $i <= 60; $i += 10) {
 	} else {
 		echo "Difference in length of ASCII string and multibyte string\n";
 	}
-	
+
 }
 
 echo "Done";
diff --git a/ext/mbstring/tests/overload01.phpt b/ext/mbstring/tests/overload01.phpt
index 7efc65da826..0657394d2e3 100644
--- a/ext/mbstring/tests/overload01.phpt
+++ b/ext/mbstring/tests/overload01.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Function overloading test 1
 --SKIPIF--
-<?php 
-	extension_loaded('mbstring') or die('skip mbstring not available'); 
+<?php
+	extension_loaded('mbstring') or die('skip mbstring not available');
 	if (!function_exists("mail")) {
 		die('skip mail() function is not available.');
 	}
diff --git a/ext/mbstring/tests/overload02.phpt b/ext/mbstring/tests/overload02.phpt
index 48705b782b2..b237a6254e5 100644
--- a/ext/mbstring/tests/overload02.phpt
+++ b/ext/mbstring/tests/overload02.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Function overloading test 2 
+Function overloading test 2
 --SKIPIF--
-<?php 
-	extension_loaded('mbstring') or die('skip mbstring not available'); 
+<?php
+	extension_loaded('mbstring') or die('skip mbstring not available');
 	if (!function_exists("mail")) {
 		die('skip mail() function is not available.');
 	}
diff --git a/ext/mbstring/tests/php_gr_jp_10830.phpt b/ext/mbstring/tests/php_gr_jp_10830.phpt
index f9599d995f3..fff136d692f 100644
--- a/ext/mbstring/tests/php_gr_jp_10830.phpt
+++ b/ext/mbstring/tests/php_gr_jp_10830.phpt
@@ -1,5 +1,5 @@
 --TEST--
-php-users@php.gr.jp #10830 
+php-users@php.gr.jp #10830
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip mbstring not available');
diff --git a/ext/mbstring/tests/simpletest.phpt b/ext/mbstring/tests/simpletest.phpt
index 80b2f725961..b07b6f52bc2 100644
--- a/ext/mbstring/tests/simpletest.phpt
+++ b/ext/mbstring/tests/simpletest.phpt
@@ -18,7 +18,7 @@ $s2 = "
 echo "echo: ".$s1.$s2."\n";
 print("print: ".$s1.$s2."\n");
 printf("printf: %s%s\n",$s1, $s2);
-echo sprintf("sprintf: %s%s\n",$s1, $s2); 
+echo sprintf("sprintf: %s%s\n",$s1, $s2);
 
 // Assign to var
 $s3 = $s1.$s2."\n";
diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt
index 4896a786a8d..89ad7ae3da4 100644
--- a/ext/mysqli/tests/004.phpt
+++ b/ext/mysqli/tests/004.phpt
@@ -34,7 +34,7 @@ require_once('skipifconnectfailure.inc');
 
 	if (!$stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch ORDER BY c1"))
 		printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-	
+
 	$c1 = $c2 = NULL;
 	mysqli_stmt_bind_result($stmt, $c1, $c2);
 	mysqli_stmt_execute($stmt);
diff --git a/ext/mysqli/tests/bug33491.phpt b/ext/mysqli/tests/bug33491.phpt
index 6500241760e..719146f292e 100644
--- a/ext/mysqli/tests/bug33491.phpt
+++ b/ext/mysqli/tests/bug33491.phpt
@@ -3,8 +3,8 @@ Bug #33491 (extended mysqli class crashes when result is not object)
 --INI--
 error_reporting=1
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug38003.phpt b/ext/mysqli/tests/bug38003.phpt
index a974815d4d2..bcfd2399116 100644
--- a/ext/mysqli/tests/bug38003.phpt
+++ b/ext/mysqli/tests/bug38003.phpt
@@ -16,7 +16,7 @@ $DB = new DB();
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Uncaught Error: Call to private DB::__construct() from invalid context in %s
 Stack trace:
 #0 {main}
diff --git a/ext/mysqli/tests/bug54221.phpt b/ext/mysqli/tests/bug54221.phpt
index 78c9a2c40e3..e6166e19d4b 100644
--- a/ext/mysqli/tests/bug54221.phpt
+++ b/ext/mysqli/tests/bug54221.phpt
@@ -30,7 +30,7 @@ mysqli.reconnect = Off
 				$warnings = $link->get_warnings();
 				if ($warnings) {
 					do {
-						echo "Warning: ".$warnings->errno.": ".$warnings->message."\n"; 
+						echo "Warning: ".$warnings->errno.": ".$warnings->message."\n";
 					} while ($warnings->next());
 				}
 			}
diff --git a/ext/mysqli/tests/bug55582.phpt b/ext/mysqli/tests/bug55582.phpt
index 39338451473..132a731d0c5 100644
--- a/ext/mysqli/tests/bug55582.phpt
+++ b/ext/mysqli/tests/bug55582.phpt
@@ -12,7 +12,7 @@ require_once("connect.inc");
 	if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))) {
 		printf("[001] Cannot connect to the server");
 	}
-	
+
 	var_dump($link->real_query("SELECT 1"));
 	$res = $link->use_result();
 	var_dump(mysqli_num_rows($res));
diff --git a/ext/mysqli/tests/bug62046.phpt b/ext/mysqli/tests/bug62046.phpt
index c8ad3c36754..3ad913d9518 100644
--- a/ext/mysqli/tests/bug62046.phpt
+++ b/ext/mysqli/tests/bug62046.phpt
@@ -16,14 +16,14 @@ require_once('skipifconnectfailure.inc');
 		printf("[002] Prepare failed, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 	}
 	if (FALSE === $stmt->execute()) {
-		printf("[003] Execute failed, [%d] %s\n", $stmt->errorno, $stmt->error);	
+		printf("[003] Execute failed, [%d] %s\n", $stmt->errorno, $stmt->error);
 	}
 	if (FALSE === $stmt->store_result()) {
-		printf("[004] store_result failed, [%d] %s\n", $stmt->errorno, $stmt->error);	
+		printf("[004] store_result failed, [%d] %s\n", $stmt->errorno, $stmt->error);
 	}
 	$one = NULL;
 	if (FALSE === $stmt->bind_result($one)) {
-		printf("[005] bind_result failed, [%d] %s\n", $stmt->errorno, $stmt->error);	
+		printf("[005] bind_result failed, [%d] %s\n", $stmt->errorno, $stmt->error);
 	}
 	if (FALSE === $stmt->reset()) {
 		printf("[006] bind_result failed, [%d] %s\n", $stmt->errorno, $stmt->error);
diff --git a/ext/mysqli/tests/bug70384.phpt b/ext/mysqli/tests/bug70384.phpt
index aa8662badf7..e3b18ae2123 100644
--- a/ext/mysqli/tests/bug70384.phpt
+++ b/ext/mysqli/tests/bug70384.phpt
@@ -49,7 +49,7 @@ mysqli_float_handling - ensure 4 byte float is handled correctly
 	if (json_encode($rows[0][0]) != json_encode($jsfield_data)) {
 		printf("[006] Data differs");
 		var_dump(json_encode($rows[0][0]) != json_encode($jsfield_data));
-		die();	
+		die();
 	}
 	mysqli_close($link);
 	echo "OK";
diff --git a/ext/mysqli/tests/bug70949.phpt b/ext/mysqli/tests/bug70949.phpt
index 17f7f9d96b4..dc7b2021520 100644
--- a/ext/mysqli/tests/bug70949.phpt
+++ b/ext/mysqli/tests/bug70949.phpt
@@ -21,7 +21,7 @@ $mysql->query("INSERT INTO bug70949 VALUES ('dummy'),(NULL),('foo'),('bar')");
 $sql = "select * from bug70949";
 
 if ($stmt = $mysql->prepare($sql))
-{	
+{
 	$stmt->attr_set(MYSQLI_STMT_ATTR_CURSOR_TYPE, MYSQLI_CURSOR_TYPE_READ_ONLY);
 
 	if ($stmt->bind_result($name)) {
@@ -29,7 +29,7 @@ if ($stmt = $mysql->prepare($sql))
 			if ($stmt->execute())
 			{
 				while ($stmt->fetch())
-				{	
+				{
 					var_dump($name);
 				}
 			}
diff --git a/ext/mysqli/tests/bug71863.phpt b/ext/mysqli/tests/bug71863.phpt
index ea0a78faebe..18465e996b9 100644
--- a/ext/mysqli/tests/bug71863.phpt
+++ b/ext/mysqli/tests/bug71863.phpt
@@ -18,7 +18,7 @@ $req = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 // create db and table for test
 mysqli_query($req, "DROP TABLE IF EXISTS test_bug_71863") or die(mysqli_error($req));
 mysqli_query($req, "CREATE TABLE test_bug_71863 (id INT UNSIGNED NOT NULL DEFAULT 0)") or die(mysqli_error($req));
-    
+
 // segfault if EXPLAIN + "Unknown column" error
 mysqli_query($req, "EXPLAIN SELECT `id` FROM `test_bug_71863` WHERE `owner_id` = '2' AND `object_id` = '1' AND type = '0'") or die(mysqli_error($req)."\n");
 
diff --git a/ext/mysqli/tests/bug72489.phpt b/ext/mysqli/tests/bug72489.phpt
index 4e8fb3f4e5c..754eadeed3c 100644
--- a/ext/mysqli/tests/bug72489.phpt
+++ b/ext/mysqli/tests/bug72489.phpt
@@ -45,9 +45,9 @@ while ($stmt->fetch()) {
 echo "Finished 1\n";
 
 $newArray = array();
-	
+
 echo "Finished 2\n";
-	
+
 ?>
 --CLEAN--
 <?php
diff --git a/ext/mysqli/tests/bug73949.phpt b/ext/mysqli/tests/bug73949.phpt
index 7ce311eb777..d358c55a40d 100644
--- a/ext/mysqli/tests/bug73949.phpt
+++ b/ext/mysqli/tests/bug73949.phpt
@@ -12,7 +12,7 @@ require_once("connect.inc");
 
 class cc{
     function __construct($c=null){
-    }   
+    }
 };
 $i=mysqli_connect('p:'.$host, $user, $passwd, $db);
 $res=mysqli_query($i, "SHOW STATUS LIKE 'Connections'");
diff --git a/ext/mysqli/tests/bug_bits.phpt b/ext/mysqli/tests/bug_bits.phpt
index 8a56469772b..59752e41592 100644
--- a/ext/mysqli/tests/bug_bits.phpt
+++ b/ext/mysqli/tests/bug_bits.phpt
@@ -42,7 +42,7 @@ while ($row = $res->fetch_assoc()) {
 
 $link->close();
 
-echo "Done\n";	
+echo "Done\n";
 ?>
 --CLEAN--
 <?php
diff --git a/ext/mysqli/tests/mysqli_begin_transaction.phpt b/ext/mysqli/tests/mysqli_begin_transaction.phpt
index 6c0508172ff..57f05952389 100644
--- a/ext/mysqli/tests/mysqli_begin_transaction.phpt
+++ b/ext/mysqli/tests/mysqli_begin_transaction.phpt
@@ -97,7 +97,7 @@ if (!have_innodb($link))
 			$res = mysqli_query($link, "SELECT id FROM test WHERE id = 2");
 		}
 	}
-	
+
 	if (!mysqli_begin_transaction($link, -1)) {
 			printf("[019] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 	}
diff --git a/ext/mysqli/tests/mysqli_connect.phpt b/ext/mysqli/tests/mysqli_connect.phpt
index 8b1c923304f..3ae00500177 100644
--- a/ext/mysqli/tests/mysqli_connect.phpt
+++ b/ext/mysqli/tests/mysqli_connect.phpt
@@ -1,9 +1,9 @@
 --TEST--
 mysqli_connect()
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
-require_once('skipifemb.inc'); 
+require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_connect_oo.phpt b/ext/mysqli/tests/mysqli_connect_oo.phpt
index 32dfac0eb25..7b19b1e41f8 100644
--- a/ext/mysqli/tests/mysqli_connect_oo.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo.phpt
@@ -1,9 +1,9 @@
 --TEST--
 new mysqli()
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
-require_once('skipifemb.inc'); 
+require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
index 7f049b052f2..b3dde58c3db 100644
--- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
@@ -1,9 +1,9 @@
 --TEST--
 new mysqli()
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
-require_once('skipifemb.inc'); 
+require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_fetch_object.phpt b/ext/mysqli/tests/mysqli_fetch_object.phpt
index dff91531cee..746e78faf56 100644
--- a/ext/mysqli/tests/mysqli_fetch_object.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object.phpt
@@ -67,7 +67,7 @@ require_once('skipifconnectfailure.inc');
 		}
 	} catch (Throwable $e) {
 		echo "Exception: " . $e->getMessage() . "\n";
-	}	
+	}
 
 	try {
 		$obj = mysqli_fetch_object($res, 'mysqli_fetch_object_construct', array('a'));
@@ -77,7 +77,7 @@ require_once('skipifconnectfailure.inc');
 		}
 	} catch (Throwable $e) {
 		echo "Exception: " . $e->getMessage() . "\n";
-	}	
+	}
 
 	$obj = mysqli_fetch_object($res, 'mysqli_fetch_object_construct', array('a', 'b'));
 	if (($obj->ID !== "5") || ($obj->label !== "e") || ($obj->a !== 'a') || ($obj->b !== 'b') || (get_class($obj) != 'mysqli_fetch_object_construct')) {
diff --git a/ext/mysqli/tests/mysqli_get_client_version.phpt b/ext/mysqli/tests/mysqli_get_client_version.phpt
index 5862c0aaa18..7994c1d65ca 100644
--- a/ext/mysqli/tests/mysqli_get_client_version.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_version.phpt
@@ -4,10 +4,10 @@ mysqli_get_client_version()
 <?php require_once('skipif.inc'); ?>
 <?php require_once('skipifemb.inc'); ?>
 --FILE--
-<?php	
+<?php
 	if (!is_int($info = mysqli_get_client_version()) || ($info < 100))
 		printf("[001] Expecting int/any_non_empty, got %s/%s\n", gettype($info), $info);
-		
+
 	print "done!";
 ?>
 --EXPECTF--
diff --git a/ext/mysqli/tests/mysqli_get_host_info.phpt b/ext/mysqli/tests/mysqli_get_host_info.phpt
index 2c3c0f806d7..2dff6ae8b3c 100644
--- a/ext/mysqli/tests/mysqli_get_host_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_host_info.phpt
@@ -23,7 +23,7 @@ require_once('skipifconnectfailure.inc');
 	if ($IS_MYSQLND && $host != 'localhost' && $host != '127.0.0.1' && $port != '' && $host != "" && strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 		/* this should be a TCP/IP connection and not a Unix Socket (or SHM or Named Pipe) */
 		if (!stristr($info, "TCP/IP"))
-			printf("[004] Should be a TCP/IP connection but mysqlnd says '%s'\n", $info);	
+			printf("[004] Should be a TCP/IP connection but mysqlnd says '%s'\n", $info);
 	}
 	print "done!";
 ?>
diff --git a/ext/mysqli/tests/mysqli_init.phpt b/ext/mysqli/tests/mysqli_init.phpt
index 1abb7ca37ed..0c4059175bc 100644
--- a/ext/mysqli/tests/mysqli_init.phpt
+++ b/ext/mysqli/tests/mysqli_init.phpt
@@ -1,9 +1,9 @@
 --TEST--
 mysqli_init()
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
-require_once('skipifemb.inc'); 
+require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_options.phpt b/ext/mysqli/tests/mysqli_options.phpt
index 5daaa597fab..32bfb979067 100644
--- a/ext/mysqli/tests/mysqli_options.phpt
+++ b/ext/mysqli/tests/mysqli_options.phpt
@@ -58,7 +58,7 @@ require_once('skipifconnectfailure.inc');
 	var_dump("MYSQLI_OPT_LOCAL_INFILE",		mysqli_options($link, MYSQLI_OPT_LOCAL_INFILE, 1));
 	var_dump("MYSQLI_INIT_COMMAND",			mysqli_options($link, MYSQLI_INIT_COMMAND, array('SET AUTOCOMMIT=0', 'SET AUTOCOMMIT=1')));
 
-	
+
 	if (!$link2 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
 		printf("[006] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
 			$host, $user, $db, $port, $socket);
@@ -104,7 +104,7 @@ require_once('skipifconnectfailure.inc');
 
 	/* mysqli_real_connect() */
 	var_dump("MYSQLI_CLIENT_SSL",			mysqli_options($link, MYSQLI_CLIENT_SSL, 'not a mysqli_option'));
-	
+
 	mysqli_close($link);
 
 	echo "Link closed";
diff --git a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt
index 4b0c947191d..42acfd2af09 100644
--- a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt
+++ b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt
@@ -7,7 +7,7 @@ require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
-if (!$IS_MYSQLND)	
+if (!$IS_MYSQLND)
 	die("skip mysqlnd only test");
 ?>
 --FILE--
@@ -45,12 +45,12 @@ if (!$IS_MYSQLND)
 			printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 			continue;
 		}
-		
+
 		if (!mysqli_query($link, sprintf("CREATE TABLE test (id %s)", $data[0]))) {
 			printf("[004] TODO [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 			continue;
 		}
-		
+
 		if (!mysqli_query($link, sprintf("INSERT INTO test(id) VALUES (%f)", $data[1]))) {
 			printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 			continue;
@@ -65,7 +65,7 @@ if (!$IS_MYSQLND)
 		mysqli_free_result($res);
 
 		if ($row['id'] !== $data[1]) {
-			printf("[007] Expecting %s - %s/%s got %s/%s\n", 
+			printf("[007] Expecting %s - %s/%s got %s/%s\n",
 				$name,
 				$data[1], gettype($data[1]), $row['id'], gettype($row['id']));
 		}
@@ -81,7 +81,7 @@ if (!$IS_MYSQLND)
 			printf("[009] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 			continue;
 		}
-		
+
 		if (!$res = mysqli_query($link, "SELECT id FROM test")) {
 			printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 			continue;
@@ -91,14 +91,14 @@ if (!$IS_MYSQLND)
 		mysqli_free_result($res);
 
 		if (!is_string($row['id']) || ($row['id'] != $data[1])) {
-			printf("[011] Expecting %s - %s/string got %s/%s\n", 
+			printf("[011] Expecting %s - %s/string got %s/%s\n",
 				$name,
 				$data[1], $row['id'], gettype($row['id']));
-		}		
-		mysqli_close($link);		
+		}
+		mysqli_close($link);
 
 	}
-	
+
 	print "done!";
 ?>
 --CLEAN--
diff --git a/ext/mysqli/tests/mysqli_select_db.phpt b/ext/mysqli/tests/mysqli_select_db.phpt
index f58a19bea34..0a7acb4b20d 100644
--- a/ext/mysqli/tests/mysqli_select_db.phpt
+++ b/ext/mysqli/tests/mysqli_select_db.phpt
@@ -67,7 +67,7 @@ require_once('skipifconnectfailure.inc');
 
 	$current_db = $row['dbname'];
 
-	mysqli_report(MYSQLI_REPORT_OFF);	  
+	mysqli_report(MYSQLI_REPORT_OFF);
 	mysqli_select_db($link, 'I can not imagine that this database exists');
 	mysqli_report(MYSQLI_REPORT_ERROR);
 
@@ -91,7 +91,7 @@ require_once('skipifconnectfailure.inc');
 	if (strtolower($row['dbname']) != strtolower($current_db))
 		printf("[017] Current DB should not change if set fails\n");
 
-	
+
 	if (!$res = $link->query("SELECT id FROM test WHERE id = 1"))
 		printf("[018] [%d] %s\n");
 
diff --git a/ext/mysqli/tests/mysqli_stmt_multires.phpt b/ext/mysqli/tests/mysqli_stmt_multires.phpt
index 28cf5e38f44..7420e85b9db 100644
--- a/ext/mysqli/tests/mysqli_stmt_multires.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_multires.phpt
@@ -22,7 +22,7 @@ require_once('skipifconnectfailure.inc');
 	if (!$link->query("CREATE PROCEDURE p123() BEGIN SELECT id+12, CONCAT_WS('-',label,'ahoi') FROM test ORDER BY id LIMIT 1; SELECT id + 42, CONCAT_WS('---',label, label) FROM test ORDER BY id LIMIT 1; END")) {
 		printf("[002] [%d] %s\n", $link->error, $link->errno);
 	}
-	
+
 	if (!($stmt = $link->prepare("CALL p123"))) {
 		printf("[003] [%d] %s\n", $stmt->error, $stmt->errno);
 	}
diff --git a/ext/oci8/tests/bug37220.phpt b/ext/oci8/tests/bug37220.phpt
index e1788c46c8d..fb62f9df4ed 100644
--- a/ext/oci8/tests/bug37220.phpt
+++ b/ext/oci8/tests/bug37220.phpt
@@ -31,7 +31,7 @@ $clob = oci_new_descriptor($c, OCI_D_LOB);
 oci_bind_by_name($stmt, ':data', $clob, -1, OCI_B_CLOB);
 $clob->writetemporary("<MYTAG/>", OCI_TEMP_CLOB);
 $success = oci_execute($stmt, OCI_COMMIT_ON_SUCCESS);
-oci_free_statement($stmt); 
+oci_free_statement($stmt);
 $clob->close();
 
 // Query back the change
diff --git a/ext/oci8/tests/connect_scope1.phpt b/ext/oci8/tests/connect_scope1.phpt
index 55cc1710470..53827847e7c 100644
--- a/ext/oci8/tests/connect_scope1.phpt
+++ b/ext/oci8/tests/connect_scope1.phpt
@@ -18,7 +18,7 @@ if (!empty($dbase))
 	$c1 = oci_new_connect($user,$password,$dbase);
 else
 	$c1 = oci_new_connect($user,$password);
-						 
+
 oci8_test_sql_execute($c1, $stmtarray);
 
 // Run Test
diff --git a/ext/oci8/tests/connect_scope2.phpt b/ext/oci8/tests/connect_scope2.phpt
index 76ed42ca178..1c7e88e896c 100644
--- a/ext/oci8/tests/connect_scope2.phpt
+++ b/ext/oci8/tests/connect_scope2.phpt
@@ -18,7 +18,7 @@ if (!empty($dbase))
 	$c1 = oci_new_connect($user,$password,$dbase);
 else
 	$c1 = oci_new_connect($user,$password);
-						 
+
 oci8_test_sql_execute($c1, $stmtarray);
 
 // Run Test
diff --git a/ext/odbc/tests/bug47803.phpt b/ext/odbc/tests/bug47803.phpt
index 9a2600dd18d..505d596134c 100644
--- a/ext/odbc/tests/bug47803.phpt
+++ b/ext/odbc/tests/bug47803.phpt
@@ -73,7 +73,7 @@ if (!$result) {
 	print ('[sql] prep: '.$sql);
 	goto out;
 }
-foreach ($upd_params as $k) { 
+foreach ($upd_params as $k) {
 	if(!odbc_execute($result, array($k['id']))) {
 		print ('[sql] exec: '."array({$k['id']})");
 		goto out;
diff --git a/ext/odbc/tests/bug60616.phpt b/ext/odbc/tests/bug60616.phpt
index 95c72049e3e..16536881afc 100644
--- a/ext/odbc/tests/bug60616.phpt
+++ b/ext/odbc/tests/bug60616.phpt
@@ -2,7 +2,7 @@
 odbc_exec(): Getting accurate unicode data from query
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
-<?php 
+<?php
 	if ("unixODBC" != ODBC_TYPE) {
 		die("skip ODBC_TYPE != unixODBC");
 	}
diff --git a/ext/odbc/tests/odbc_exec_001.phpt b/ext/odbc/tests/odbc_exec_001.phpt
index dfdddf88c0e..310dda2da76 100644
--- a/ext/odbc/tests/odbc_exec_001.phpt
+++ b/ext/odbc/tests/odbc_exec_001.phpt
@@ -2,7 +2,7 @@
 odbc_exec(): Basic test
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
-<?php 
+<?php
 	if ("unixODBC" != ODBC_TYPE) {
 		die("skip ODBC_TYPE != unixODBC");
 	}
diff --git a/ext/opcache/tests/blacklist-win32.phpt b/ext/opcache/tests/blacklist-win32.phpt
index fab0698f7fb..7fbe5dbd296 100644
--- a/ext/opcache/tests/blacklist-win32.phpt
+++ b/ext/opcache/tests/blacklist-win32.phpt
@@ -13,8 +13,8 @@ opcache.file_cache_only=0
 <?php
 $conf = opcache_get_configuration();
 $conf = $conf['blacklist'];
-$conf[3] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[3]); 
-$conf[4] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[4]); 
+$conf[3] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[3]);
+$conf[4] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[4]);
 print_r($conf);
 include("blacklist.inc");
 $status = opcache_get_status();
diff --git a/ext/opcache/tests/blacklist.phpt b/ext/opcache/tests/blacklist.phpt
index 4e9a0f16fcb..da3ef47c994 100644
--- a/ext/opcache/tests/blacklist.phpt
+++ b/ext/opcache/tests/blacklist.phpt
@@ -13,8 +13,8 @@ opcache.file_cache_only=0
 <?php
 $conf = opcache_get_configuration();
 $conf = $conf['blacklist'];
-$conf[3] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[3]); 
-$conf[4] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[4]); 
+$conf[3] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[3]);
+$conf[4] = preg_replace("!^\\Q".dirname(__FILE__)."\\E!", "__DIR__", $conf[4]);
 print_r($conf);
 include("blacklist.inc");
 $status = opcache_get_status();
diff --git a/ext/opcache/tests/bug64482.phpt b/ext/opcache/tests/bug64482.phpt
index fa722f6d450..e328c9fc1dd 100644
--- a/ext/opcache/tests/bug64482.phpt
+++ b/ext/opcache/tests/bug64482.phpt
@@ -6,7 +6,7 @@ opcache.enable_cli=1
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
-<?php 
+<?php
 include 'bug64482.inc';
 echo "\n";
 include 'php://filter/read=string.toupper/resource=bug64482.inc';
diff --git a/ext/opcache/tests/bug69038.phpt b/ext/opcache/tests/bug69038.phpt
index ab625d74b0e..1670a9eca6d 100644
--- a/ext/opcache/tests/bug69038.phpt
+++ b/ext/opcache/tests/bug69038.phpt
@@ -9,7 +9,7 @@ opcache.optimization_level=-1
 --FILE--
 <?php
 function a($a = "bad") {
-	
+
 	switch (PHP_OS) {
 	case "LALALALA" : return "LALALAL";
 	case PHP_OS: return "okey";
diff --git a/ext/opcache/tests/bug74980.phpt b/ext/opcache/tests/bug74980.phpt
index 40fd3cd5377..e82e234bdda 100644
--- a/ext/opcache/tests/bug74980.phpt
+++ b/ext/opcache/tests/bug74980.phpt
@@ -16,7 +16,7 @@ class A
 		while ($undef) {
 			$arr[][] = NULL;
 		}
- 
+
 		foreach ($arr as $a) {
 			bar($a + []);
 		}
diff --git a/ext/opcache/tests/compact_literals.phpt b/ext/opcache/tests/compact_literals.phpt
index 367331f7425..0aabb22b501 100644
--- a/ext/opcache/tests/compact_literals.phpt
+++ b/ext/opcache/tests/compact_literals.phpt
@@ -65,7 +65,7 @@ function get_eol_define() {
 get_eol_define();
 define("EOL", MY_EOL);
 
-echo "constants define" . ":" . EOL; 
+echo "constants define" . ":" . EOL;
 
 echo "define " . "TEST" . EOL;
 define("TEST", "TEST");
@@ -150,7 +150,7 @@ var_dump($h::H);
 var_dump(CH::H);
 
 echo "-->I" . PHP_EOL;
-$h = geti(); 
+$h = geti();
 $h->H();
 var_dump($h::H);
 var_dump(CI::H);
diff --git a/ext/opcache/tests/zzz_basic_logging.phpt b/ext/opcache/tests/zzz_basic_logging.phpt
index 809046ed57d..e8d84a93042 100644
--- a/ext/opcache/tests/zzz_basic_logging.phpt
+++ b/ext/opcache/tests/zzz_basic_logging.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test basic logging for the Opcache
 --DESCRIPTION--
-This test runs a simple PHP script and ensures the Opcache 
+This test runs a simple PHP script and ensures the Opcache
 outputs the correct logging at the highest log_verbosity_level
 
 --INI--
diff --git a/ext/openssl/tests/001.phpt b/ext/openssl/tests/001.phpt
index 7f5af24ae69..77b0f321838 100644
--- a/ext/openssl/tests/001.phpt
+++ b/ext/openssl/tests/001.phpt
@@ -1,9 +1,9 @@
 --TEST--
 OpenSSL private key functions
 --SKIPIF--
-<?php 
-if (!extension_loaded("openssl")) die("skip"); 
-if (!@openssl_pkey_new()) die("skip cannot create private key"); 
+<?php
+if (!extension_loaded("openssl")) die("skip");
+if (!@openssl_pkey_new()) die("skip cannot create private key");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug25614.phpt b/ext/openssl/tests/bug25614.phpt
index a43130708b1..6adc0f39c15 100644
--- a/ext/openssl/tests/bug25614.phpt
+++ b/ext/openssl/tests/bug25614.phpt
@@ -1,12 +1,12 @@
 --TEST--
 openssl: get public key from generated private key
 --SKIPIF--
-<?php 
-if (!extension_loaded("openssl")) die("skip"); 
-if (!@openssl_pkey_new()) die("skip cannot create private key"); 
+<?php
+if (!extension_loaded("openssl")) die("skip");
+if (!@openssl_pkey_new()) die("skip cannot create private key");
 ?>
 --FILE--
-<?php 
+<?php
 $priv = openssl_pkey_new();
 $pub = openssl_pkey_get_public($priv);
 ?>
diff --git a/ext/openssl/tests/bug28382.phpt b/ext/openssl/tests/bug28382.phpt
index c3888e962b6..1ff839bf4cb 100644
--- a/ext/openssl/tests/bug28382.phpt
+++ b/ext/openssl/tests/bug28382.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #28382 (openssl_x509_parse extensions support)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip");
 ?>
 --FILE--
diff --git a/ext/openssl/tests/bug36732.phpt b/ext/openssl/tests/bug36732.phpt
index 5c1b70724d3..105fd129d0c 100644
--- a/ext/openssl/tests/bug36732.phpt
+++ b/ext/openssl/tests/bug36732.phpt
@@ -1,11 +1,11 @@
 --TEST--
 Bug #36732 (add support for req_extensions in openss_csr_new and sign)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip");
 ?>
 --FILE--
-<?php 
+<?php
 $configargs = array(
     "req_extensions" => "v3_req",
     "x509_extensions" => "usr_cert",
diff --git a/ext/openssl/tests/bug37820.phpt b/ext/openssl/tests/bug37820.phpt
index 994f9e412cd..80a9f648a09 100644
--- a/ext/openssl/tests/bug37820.phpt
+++ b/ext/openssl/tests/bug37820.phpt
@@ -1,11 +1,11 @@
 --TEST--
-openssl_sign/verify: accept different algos 
+openssl_sign/verify: accept different algos
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip");
 ?>
 --FILE--
-<?php 
+<?php
 $dir = dirname(__FILE__);
 $file_pub = $dir . '/bug37820cert.pem';
 $file_key = $dir . '/bug37820key.pem';
diff --git a/ext/openssl/tests/bug38255.phpt b/ext/openssl/tests/bug38255.phpt
index 9eca6594a95..f49b77485c4 100644
--- a/ext/openssl/tests/bug38255.phpt
+++ b/ext/openssl/tests/bug38255.phpt
@@ -1,12 +1,12 @@
 --TEST--
-openssl key from zval leaks 
+openssl key from zval leaks
 --SKIPIF--
-<?php 
-if (!extension_loaded("openssl")) die("skip"); 
+<?php
+if (!extension_loaded("openssl")) die("skip");
 ?>
 --FILE--
 <?php
-$pub_key_id = false; 
+$pub_key_id = false;
 $signature = '';
 $ok = openssl_verify("foo", $signature, $pub_key_id, OPENSSL_ALGO_MD5);
 
diff --git a/ext/openssl/tests/bug38261.phpt b/ext/openssl/tests/bug38261.phpt
index 66919473203..fa25d93d62e 100644
--- a/ext/openssl/tests/bug38261.phpt
+++ b/ext/openssl/tests/bug38261.phpt
@@ -1,8 +1,8 @@
 --TEST--
-openssl key from zval leaks 
+openssl key from zval leaks
 --SKIPIF--
-<?php 
-if (!extension_loaded("openssl")) die("skip"); 
+<?php
+if (!extension_loaded("openssl")) die("skip");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug39217.phpt b/ext/openssl/tests/bug39217.phpt
index ad64058a56b..0e7732b62fd 100644
--- a/ext/openssl/tests/bug39217.phpt
+++ b/ext/openssl/tests/bug39217.phpt
@@ -1,11 +1,11 @@
 --TEST--
 Bug #39217 (Large serial number return -1)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip");
 ?>
 --FILE--
-<?php 
+<?php
 $dir = dirname(__FILE__);
 $certs = array('bug39217cert2.txt', 'bug39217cert1.txt');
 foreach($certs as $cert) {
diff --git a/ext/openssl/tests/bug41033.phpt b/ext/openssl/tests/bug41033.phpt
index f52a4c7d275..6f8ebc64c3e 100644
--- a/ext/openssl/tests/bug41033.phpt
+++ b/ext/openssl/tests/bug41033.phpt
@@ -1,7 +1,7 @@
 --TEST--
 #41033, enable signing with DSA keys
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip, openssl required");
 ?>
 --FILE--
diff --git a/ext/openssl/tests/bug41353.phpt b/ext/openssl/tests/bug41353.phpt
index 47fda89f7b6..5f03c1c1ada 100644
--- a/ext/openssl/tests/bug41353.phpt
+++ b/ext/openssl/tests/bug41353.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #41353 (openssl_pkcs12_read() does not verify the type of the first arg)
 --SKIPIF--
-<?php 
-if (!extension_loaded("openssl")) die("skip"); 
+<?php
+if (!extension_loaded("openssl")) die("skip");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug46127.phpt b/ext/openssl/tests/bug46127.phpt
index f11d8baf0be..5bfa0cebb09 100644
--- a/ext/openssl/tests/bug46127.phpt
+++ b/ext/openssl/tests/bug46127.phpt
@@ -1,7 +1,7 @@
 --TEST--
-#46127, openssl_sign/verify: accept different algos 
+#46127, openssl_sign/verify: accept different algos
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip openssl not loaded");
 if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
diff --git a/ext/openssl/tests/bug48182.phpt b/ext/openssl/tests/bug48182.phpt
index d11cddf2734..b509c7d858d 100644
--- a/ext/openssl/tests/bug48182.phpt
+++ b/ext/openssl/tests/bug48182.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #48182: ssl handshake fails during asynchronous socket connection
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip openssl not loaded");
 if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
diff --git a/ext/openssl/tests/bug54992.phpt b/ext/openssl/tests/bug54992.phpt
index 01369dca001..c07bbf8cba2 100644
--- a/ext/openssl/tests/bug54992.phpt
+++ b/ext/openssl/tests/bug54992.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54992: Stream not closed and error not returned when SSL CN_match fails
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip openssl not loaded");
 if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
diff --git a/ext/openssl/tests/bug61124.phpt b/ext/openssl/tests/bug61124.phpt
index 4b6194bdb4d..9c7d0ac4831 100644
--- a/ext/openssl/tests/bug61124.phpt
+++ b/ext/openssl/tests/bug61124.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #61124: Segmentation fault with openssl_decrypt
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip");
 --FILE--
 <?php
diff --git a/ext/openssl/tests/bug65729.phpt b/ext/openssl/tests/bug65729.phpt
index 5e91197b701..cffba43dfef 100644
--- a/ext/openssl/tests/bug65729.phpt
+++ b/ext/openssl/tests/bug65729.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #65729: CN_match gives false positive when wildcard is used
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip openssl not loaded");
 if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
diff --git a/ext/openssl/tests/bug66501.phpt b/ext/openssl/tests/bug66501.phpt
index 3994ebdc3c0..47a22dabdd8 100644
--- a/ext/openssl/tests/bug66501.phpt
+++ b/ext/openssl/tests/bug66501.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #66501: EC private key support in openssl_sign
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip");
 if (!defined('OPENSSL_KEYTYPE_EC')) die("skip no EC available");
 ?>
diff --git a/ext/openssl/tests/bug68912.phpt b/ext/openssl/tests/bug68912.phpt
index c18291a6ec6..963e660ee6c 100644
--- a/ext/openssl/tests/bug68912.phpt
+++ b/ext/openssl/tests/bug68912.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #68912 (Segmentation fault at openssl_spki_new)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip");
 if (!extension_loaded("xml")) die("skip xml extension not loaded");
 if (!@openssl_pkey_new()) die("skip cannot create private key");
@@ -10,8 +10,8 @@ if (!@openssl_pkey_new()) die("skip cannot create private key");
 <?php
 
 $var1=xml_parser_create_ns();
-$var2=2; 
-$var3=3; 
+$var2=2;
+$var3=3;
 
 openssl_spki_new($var1, $var2, $var3);
 ?>
diff --git a/ext/openssl/tests/bug68920.phpt b/ext/openssl/tests/bug68920.phpt
index 4c6271819b2..34e07a4532c 100644
--- a/ext/openssl/tests/bug68920.phpt
+++ b/ext/openssl/tests/bug68920.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #68920: peer_fingerprint input checks should be strict
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip openssl not loaded");
 if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
diff --git a/ext/openssl/tests/bug71475.phpt b/ext/openssl/tests/bug71475.phpt
index e959371c4ce..659544297bf 100644
--- a/ext/openssl/tests/bug71475.phpt
+++ b/ext/openssl/tests/bug71475.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #71475: openssl_seal() uninitialized memory usage
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip openssl not loaded");
 ?>
 --FILE--
diff --git a/ext/openssl/tests/bug74903.phpt b/ext/openssl/tests/bug74903.phpt
index 40b14f0acf4..7a20b8693d9 100644
--- a/ext/openssl/tests/bug74903.phpt
+++ b/ext/openssl/tests/bug74903.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #74903 openssl_pkcs7_encrypt() uses different EOL than before
 --SKIPIF--
-<?php 
-if (!extension_loaded("openssl")) die("skip"); 
+<?php
+if (!extension_loaded("openssl")) die("skip");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/openssl_csr_get_subject_basic.phpt b/ext/openssl/tests/openssl_csr_get_subject_basic.phpt
index 441ed3339b9..1ec79ad42cf 100644
--- a/ext/openssl/tests/openssl_csr_get_subject_basic.phpt
+++ b/ext/openssl/tests/openssl_csr_get_subject_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 openssl_csr_get_subject() tests
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip");
 ?>
 --FILE--
@@ -39,7 +39,7 @@ $csr_file = file_get_contents(dirname(__FILE__) . '/cert.csr');
 var_dump(openssl_csr_get_subject($csr_file));
 var_dump(openssl_csr_get_subject($csr, false));
 ?>
---EXPECTF--	
+--EXPECTF--
 array(6) {
   ["C"]=>
   string(2) "NL"
diff --git a/ext/openssl/tests/openssl_csr_new_basic.phpt b/ext/openssl/tests/openssl_csr_new_basic.phpt
index e0f52d739f1..89d661d1348 100644
--- a/ext/openssl/tests/openssl_csr_new_basic.phpt
+++ b/ext/openssl/tests/openssl_csr_new_basic.phpt
@@ -25,7 +25,7 @@ var_dump(openssl_csr_new(["countryName" => "DE"], $x, $conf + ["x509_extensions"
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: openssl_csr_new() expects parameter 1 to be array, integer given in %s on line %d
 NULL
 
diff --git a/ext/openssl/tests/openssl_decrypt_error.phpt b/ext/openssl/tests/openssl_decrypt_error.phpt
index b34397a6512..eab67f403cf 100644
--- a/ext/openssl/tests/openssl_decrypt_error.phpt
+++ b/ext/openssl/tests/openssl_decrypt_error.phpt
@@ -12,7 +12,7 @@ $iv = str_repeat("\0", openssl_cipher_iv_length($method));
 
 $encrypted = openssl_encrypt($data, $method, $password);
 var_dump($encrypted); /* Not passing $iv should be the same as all-NULL iv, but with a warning */
-var_dump(openssl_encrypt($data, $method, $password, 0, $iv)); 
+var_dump(openssl_encrypt($data, $method, $password, 0, $iv));
 var_dump(openssl_decrypt($encrypted, $method, $wrong));
 var_dump(openssl_decrypt($encrypted, $wrong, $password));
 var_dump(openssl_decrypt($wrong, $method, $password));
diff --git a/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt b/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt
index 430de54dfdd..0a745e8c3db 100644
--- a/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt
+++ b/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing peer fingerprint on connection
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip openssl not loaded");
 if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
diff --git a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt
index d4105db75ac..d22501cc997 100644
--- a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt
+++ b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt
@@ -7,13 +7,13 @@ openssl_pkcs7_decrypt() and invalid parameters
 
 function myErrorHandler($errno, $errstr, $errfile, $errline) {
     var_dump($errstr);
-} 
-set_error_handler("myErrorHandler"); 
+}
+set_error_handler("myErrorHandler");
 
-$a = 1; 
-$b = 1; 
-$c = new stdclass; 
-$d = new stdclass; 
+$a = 1;
+$b = 1;
+$c = new stdclass;
+$d = new stdclass;
 
 var_dump(openssl_pkcs7_decrypt($a, $b, $c, $d));
 var_dump($c);
@@ -25,7 +25,7 @@ var_dump(openssl_pkcs7_decrypt($a, $b, 0, 0));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(57) "Object of class stdClass could not be converted to string"
 string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert"
 bool(false)
diff --git a/ext/openssl/tests/openssl_seal_basic.phpt b/ext/openssl/tests/openssl_seal_basic.phpt
index 4f1958a365b..1899ebac3bb 100644
--- a/ext/openssl/tests/openssl_seal_basic.phpt
+++ b/ext/openssl/tests/openssl_seal_basic.phpt
@@ -29,7 +29,7 @@ var_dump(openssl_seal($data, $sealed, $ekeys, array($wrong)));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s on line %d
 bool(false)
 
diff --git a/ext/openssl/tests/openssl_sign_basic.phpt b/ext/openssl/tests/openssl_sign_basic.phpt
index 3d41ee1d348..0200e5ba6ec 100644
--- a/ext/openssl/tests/openssl_sign_basic.phpt
+++ b/ext/openssl/tests/openssl_sign_basic.phpt
@@ -12,7 +12,7 @@ var_dump(openssl_sign($data, $sign, $privkey));                 // no output
 var_dump(openssl_sign($data, $sign, $wrong));
 var_dump(openssl_sign(array(), $sign, $privkey));
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 
 Warning: openssl_sign(): supplied key param cannot be coerced into a private key in %s on line %d
diff --git a/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt b/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt
index 677f4d89055..9634663556d 100644
--- a/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt
@@ -3,7 +3,7 @@ int openssl_x509_checkpurpose ( mixed $x509cert , int $purpose [, array $cainfo
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
-<?php if (!extension_loaded("openssl")) print "skip"; 
+<?php if (!extension_loaded("openssl")) print "skip";
 if (OPENSSL_VERSION_NUMBER < 0x10000000) die("skip Output requires OpenSSL 1.0");
 ?>
 --FILE--
diff --git a/ext/openssl/tests/openssl_x509_read_basic.phpt b/ext/openssl/tests/openssl_x509_read_basic.phpt
index 5f530534ffd..72a62f70790 100644
--- a/ext/openssl/tests/openssl_x509_read_basic.phpt
+++ b/ext/openssl/tests/openssl_x509_read_basic.phpt
@@ -6,7 +6,7 @@ openssl_x509_read() tests
 <?php
 $fp = fopen(dirname(__FILE__) . "/cert.crt","r");
 $a = fread($fp,8192);
-fclose($fp); 
+fclose($fp);
 
 $b = "file://" . dirname(__FILE__) . "/cert.crt";
 $c = "invalid cert";
diff --git a/ext/openssl/tests/peer_verification.phpt b/ext/openssl/tests/peer_verification.phpt
index 3abc1916675..db2a7734658 100644
--- a/ext/openssl/tests/peer_verification.phpt
+++ b/ext/openssl/tests/peer_verification.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Peer verification enabled for client streams
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip openssl not loaded");
 if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
diff --git a/ext/openssl/tests/san_peer_matching.phpt b/ext/openssl/tests/san_peer_matching.phpt
index f048c4e0f15..87410dd16dd 100644
--- a/ext/openssl/tests/san_peer_matching.phpt
+++ b/ext/openssl/tests/san_peer_matching.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Peer verification matches SAN names
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip openssl not loaded");
 if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
diff --git a/ext/openssl/tests/tlsv1.0_wrapper.phpt b/ext/openssl/tests/tlsv1.0_wrapper.phpt
index 952a2883058..6be29848bc5 100644
--- a/ext/openssl/tests/tlsv1.0_wrapper.phpt
+++ b/ext/openssl/tests/tlsv1.0_wrapper.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tlsv1.0 stream wrapper
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip openssl not loaded");
 if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
diff --git a/ext/openssl/tests/tlsv1.1_wrapper.phpt b/ext/openssl/tests/tlsv1.1_wrapper.phpt
index eedf54fea74..cbc9474ca85 100644
--- a/ext/openssl/tests/tlsv1.1_wrapper.phpt
+++ b/ext/openssl/tests/tlsv1.1_wrapper.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tlsv1.1 stream wrapper
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip openssl not loaded");
 if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
diff --git a/ext/openssl/tests/tlsv1.2_wrapper.phpt b/ext/openssl/tests/tlsv1.2_wrapper.phpt
index 3d7b3ba26cb..d1ec44053bc 100644
--- a/ext/openssl/tests/tlsv1.2_wrapper.phpt
+++ b/ext/openssl/tests/tlsv1.2_wrapper.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tlsv1.2 stream wrapper
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("openssl")) die("skip openssl not loaded");
 if (!function_exists("proc_open")) die("skip no proc_open");
 ?>
diff --git a/ext/pcntl/tests/001.phpt b/ext/pcntl/tests/001.phpt
index fb1006e4bd1..6aedbaf33b9 100644
--- a/ext/pcntl/tests/001.phpt
+++ b/ext/pcntl/tests/001.phpt
@@ -2,11 +2,11 @@
 Test pcntl wait functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip"; 
+	if (!extension_loaded("pcntl")) print "skip";
 	elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
 ?>
 --FILE--
-<?php 
+<?php
 function test_exit_waits(){
 	print "\n\nTesting pcntl_wifexited and wexitstatus....";
 
@@ -25,7 +25,7 @@ function test_exit_signal(){
 	print "\n\nTesting pcntl_wifsignaled....";
 
 	$pid=pcntl_fork();
-    
+
 	if ($pid==0) {
 		sleep(10);
 		exit;
@@ -47,7 +47,7 @@ function test_stop_signal(){
 	print "\n\nTesting pcntl_wifstopped and pcntl_wstopsig....";
 
 	$pid=pcntl_fork();
-    
+
 	if ($pid==0) {
 		sleep(1);
 		exit;
diff --git a/ext/pcntl/tests/async_signals.phpt b/ext/pcntl/tests/async_signals.phpt
index b650606df30..f6f39afd513 100644
--- a/ext/pcntl/tests/async_signals.phpt
+++ b/ext/pcntl/tests/async_signals.phpt
@@ -2,7 +2,7 @@
 Asynchronous signal handling through VM interrupts
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip"; 
+	if (!extension_loaded("pcntl")) print "skip";
 	elseif (!function_exists("pcntl_signal")) print "skip pcntl_signal() not available";
 	elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
 	elseif (!function_exists("posix_getpid")) print "skip posix_getpid() not available";
diff --git a/ext/pcntl/tests/pcntl_exec.phpt b/ext/pcntl/tests/pcntl_exec.phpt
index 9a2c96ea38a..b1225221ded 100644
--- a/ext/pcntl/tests/pcntl_exec.phpt
+++ b/ext/pcntl/tests/pcntl_exec.phpt
@@ -1,8 +1,8 @@
 --TEST--
 pcntl_exec()
 --SKIPIF--
-<?php 
-if (!extension_loaded("pcntl")) print "skip"; 
+<?php
+if (!extension_loaded("pcntl")) print "skip";
 if (!getenv("TEST_PHP_EXECUTABLE") || !is_executable(getenv("TEST_PHP_EXECUTABLE"))) die("skip TEST_PHP_EXECUTABLE not set");
 ?>
 --FILE--
diff --git a/ext/pcntl/tests/pcntl_exec_2.phpt b/ext/pcntl/tests/pcntl_exec_2.phpt
index 5383593d979..72274ede5fc 100644
--- a/ext/pcntl/tests/pcntl_exec_2.phpt
+++ b/ext/pcntl/tests/pcntl_exec_2.phpt
@@ -3,7 +3,7 @@ pcntl_exec() 2
 --SKIPIF--
 <?php
 
-if (!extension_loaded("pcntl")) print "skip"; 
+if (!extension_loaded("pcntl")) print "skip";
 if (!getenv("TEST_PHP_EXECUTABLE") || !is_executable(getenv("TEST_PHP_EXECUTABLE"))) die("skip TEST_PHP_EXECUTABLE not set");
 
 ?>
@@ -15,7 +15,7 @@ if (getenv("PCNTL_EXEC_TEST_IS_CHILD")) {
 }
 echo "ok\n";
 pcntl_exec(getenv("TEST_PHP_EXECUTABLE"), array('-n', __FILE__), array(
-	"PCNTL_EXEC_TEST_IS_CHILD" => "1", 
+	"PCNTL_EXEC_TEST_IS_CHILD" => "1",
 	"FOO" => "BAR",
 	1 => "long")
 );
diff --git a/ext/pcntl/tests/pcntl_fork_basic.phpt b/ext/pcntl/tests/pcntl_fork_basic.phpt
index b1e2a9bf68d..59931df8509 100644
--- a/ext/pcntl/tests/pcntl_fork_basic.phpt
+++ b/ext/pcntl/tests/pcntl_fork_basic.phpt
@@ -15,7 +15,7 @@ echo "*** Test by calling method or function with its expected arguments, first
 
 $pid = pcntl_fork();
 if ($pid > 0) {
-	pcntl_wait($status); 
+	pcntl_wait($status);
 	var_dump($pid);
 } else {
 	var_dump($pid);
diff --git a/ext/pcntl/tests/pcntl_fork_variation.phpt b/ext/pcntl/tests/pcntl_fork_variation.phpt
index 4eea07181ca..4a839665334 100644
--- a/ext/pcntl/tests/pcntl_fork_variation.phpt
+++ b/ext/pcntl/tests/pcntl_fork_variation.phpt
@@ -16,24 +16,24 @@ echo "*** Testing the process isolations between a process and its forks ***\n";
 $pid = pcntl_fork();
 
 if ($pid > 0) {
-  pcntl_wait($status); 
+  pcntl_wait($status);
   echo "father is $pid\n";
 
-  if (!isset($pid2)) 
+  if (!isset($pid2))
   {
     echo "father ($pid) doesn't know its grandsons\n";
   }
-} 
-else 
+}
+else
 {
   echo "son ($pid)\n";
   $pid2 = pcntl_fork();
   if ($pid2 > 0)
-  {	
-    pcntl_wait($status2); 
+  {
+    pcntl_wait($status2);
     echo "son is father of $pid2\n";
-  } 
-  else 
+  }
+  else
   {
     echo "grandson ($pid2)\n";
   }
diff --git a/ext/pcntl/tests/pcntl_get_last_error.phpt b/ext/pcntl/tests/pcntl_get_last_error.phpt
index 4ed66c9610e..f1a517051c4 100644
--- a/ext/pcntl/tests/pcntl_get_last_error.phpt
+++ b/ext/pcntl/tests/pcntl_get_last_error.phpt
@@ -2,10 +2,10 @@
 Test pcntl_get_last_error()
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip"; 
+	if (!extension_loaded("pcntl")) print "skip";
 ?>
 --FILE--
-<?php 
+<?php
 var_dump(pcntl_get_last_error());
 $pid = pcntl_wait($status);
 var_dump($pid);
diff --git a/ext/pcntl/tests/pcntl_signal_dispatch.phpt b/ext/pcntl/tests/pcntl_signal_dispatch.phpt
index acf6cc05e18..dc5bb7e3fff 100644
--- a/ext/pcntl/tests/pcntl_signal_dispatch.phpt
+++ b/ext/pcntl/tests/pcntl_signal_dispatch.phpt
@@ -2,7 +2,7 @@
 pcnt_signal_dispatch()
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip"; 
+	if (!extension_loaded("pcntl")) print "skip";
 	elseif (!function_exists("pcntl_signal")) print "skip pcntl_signal() not available";
 	elseif (!function_exists("pcntl_signal_dispatch")) print "skip pcntl_signal_dispatch() not available";
 	elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
diff --git a/ext/pcntl/tests/pcntl_wait_rusage1.phpt b/ext/pcntl/tests/pcntl_wait_rusage1.phpt
index 6c9cd395400..b23195f9141 100644
--- a/ext/pcntl/tests/pcntl_wait_rusage1.phpt
+++ b/ext/pcntl/tests/pcntl_wait_rusage1.phpt
@@ -25,7 +25,7 @@ if ($pid == -1) {
 	pcntl_wait($status, 0, $rusage);
 	var_dump(gettype($rusage));
 	var_dump(count($rusage));
-	
+
 	$rusage = new stdClass;
 	pcntl_wait($status, 0, $rusage);
 	var_dump(gettype($rusage));
diff --git a/ext/pcntl/tests/pcntl_waitpid_rusage1.phpt b/ext/pcntl/tests/pcntl_waitpid_rusage1.phpt
index 4ecc664bac2..393dd59b9c3 100644
--- a/ext/pcntl/tests/pcntl_waitpid_rusage1.phpt
+++ b/ext/pcntl/tests/pcntl_waitpid_rusage1.phpt
@@ -25,7 +25,7 @@ if ($pid == -1) {
 	pcntl_waitpid($pid, $status, 0, $rusage);
 	var_dump(gettype($rusage));
 	var_dump(count($rusage));
-	
+
 	$rusage = new stdClass;
 	pcntl_waitpid($pid, $status, 0, $rusage);
 	var_dump(gettype($rusage));
diff --git a/ext/pcntl/tests/signal_closure_handler.phpt b/ext/pcntl/tests/signal_closure_handler.phpt
index 438e05159f2..1e84ee7c6b3 100644
--- a/ext/pcntl/tests/signal_closure_handler.phpt
+++ b/ext/pcntl/tests/signal_closure_handler.phpt
@@ -2,7 +2,7 @@
 Closures as a signal handler
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip"; 
+	if (!extension_loaded("pcntl")) print "skip";
 	elseif (!function_exists("pcntl_signal")) print "skip pcntl_signal() not available";
 	elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
 	elseif (!function_exists("posix_getpid")) print "skip posix_getpid() not available";
diff --git a/ext/pcre/tests/006.phpt b/ext/pcre/tests/006.phpt
index a16b4fbe718..34ab8c0bcab 100644
--- a/ext/pcre/tests/006.phpt
+++ b/ext/pcre/tests/006.phpt
@@ -17,7 +17,7 @@ var_dump($result);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(58) "[CODE]&lt;td align=&quot;$stylevar[right]&quot;&gt;[/CODE]"
 NULL
 string(58) "[CODE]&lt;td align=&quot;$stylevar[right]&quot;&gt;[/CODE]"
diff --git a/ext/pcre/tests/bug20528.phpt b/ext/pcre/tests/bug20528.phpt
index 8182fd9bfe5..43e548b26e6 100644
--- a/ext/pcre/tests/bug20528.phpt
+++ b/ext/pcre/tests/bug20528.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #20528 (preg_split() drops characters (re-opens Bug #15413)) 
+Bug #20528 (preg_split() drops characters (re-opens Bug #15413))
 --FILE--
 <?php
 	$data = '(#11/19/2002#)';
diff --git a/ext/pcre/tests/bug21758.phpt b/ext/pcre/tests/bug21758.phpt
index db599196f2c..6e407d4a179 100644
--- a/ext/pcre/tests/bug21758.phpt
+++ b/ext/pcre/tests/bug21758.phpt
@@ -4,20 +4,20 @@ Bug #21758 (preg_replace_callback() not working with class methods)
 <?php
   class Foo {
     function __construct() {
-      
+
       $s = 'preg_replace() is broken';
-      
+
       var_dump(preg_replace_callback(
               '/broken/',
               array(&$this, 'bar'),
               $s
            ));
     }
-    
+
     function bar() {
       return 'working';
     }
-    
+
   } // of Foo
 
   $o = new Foo;
diff --git a/ext/pcre/tests/bug26927.phpt b/ext/pcre/tests/bug26927.phpt
index 5c64deb37c5..200a534b763 100644
--- a/ext/pcre/tests/bug26927.phpt
+++ b/ext/pcre/tests/bug26927.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #26927 (preg_quote() does not escape \0) 
+Bug #26927 (preg_quote() does not escape \0)
 --FILE--
 <?php
 	$str = "a\000b";
diff --git a/ext/pcre/tests/bug40909.phpt b/ext/pcre/tests/bug40909.phpt
index f66a8f9abb5..432069a7ffd 100644
--- a/ext/pcre/tests/bug40909.phpt
+++ b/ext/pcre/tests/bug40909.phpt
@@ -2,7 +2,7 @@
 Bug #40909 (pcre 7.0 regression)
 --FILE--
 <?php
-            
+
 $pattern =
 "/\s([\w_\.\/]+)(?:=([\'\"]?(?:[\w\d\s\?=\(\)\.,'_#\/\\:;&-]|(?:\\\\\"|\\\')?)+[\'\"]?))?/";
 $context = "<simpletag an_attribute=\"simpleValueInside\">";
diff --git a/ext/pcre/tests/invalid_utf8.phpt b/ext/pcre/tests/invalid_utf8.phpt
index 56bad834dc4..f24042a3bdf 100644
--- a/ext/pcre/tests/invalid_utf8.phpt
+++ b/ext/pcre/tests/invalid_utf8.phpt
@@ -9,14 +9,14 @@ if (@preg_match('/./u', '') === false) {
 --FILE--
 <?php
 
-$string = urldecode("search%e4"); 
-$result = preg_replace("#(&\#x*)([0-9A-F]+);*#iu","$1$2;",$string); 
-var_dump($result); 
+$string = urldecode("search%e4");
+$result = preg_replace("#(&\#x*)([0-9A-F]+);*#iu","$1$2;",$string);
+var_dump($result);
 var_dump(preg_last_error());
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 NULL
 int(4)
 Done
diff --git a/ext/pcre/tests/locales.phpt b/ext/pcre/tests/locales.phpt
index a1030204eed..f2f5b8c073a 100644
--- a/ext/pcre/tests/locales.phpt
+++ b/ext/pcre/tests/locales.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Localized match
 --SKIPIF--
-<?php 
+<?php
 
 if (!function_exists('setlocale')) die('skip: setlocale() not available');
 if (!@setlocale(LC_ALL, 'pt_PT', 'pt', 'pt_PT.ISO8859-1', 'portuguese')) die('skip pt locale not available');
diff --git a/ext/pcre/tests/pcre.constants.phpt b/ext/pcre/tests/pcre.constants.phpt
index 0b103308e1b..ad012e7e699 100644
--- a/ext/pcre/tests/pcre.constants.phpt
+++ b/ext/pcre/tests/pcre.constants.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test for pre-defined pcre constants 
+Test for pre-defined pcre constants
 --FILE--
 <?php
 
-echo "PCRE constants test\n"; 
+echo "PCRE constants test\n";
 
 echo "PREG_PATTERN_ORDER= ", PREG_PATTERN_ORDER, "\n";
 echo "PREG_OFFSET_CAPTURE= ", PREG_OFFSET_CAPTURE, "\n";
-echo "PREG_SPLIT_NO_EMPTY= ", PREG_SPLIT_NO_EMPTY, "\n"; 
+echo "PREG_SPLIT_NO_EMPTY= ", PREG_SPLIT_NO_EMPTY, "\n";
 echo "PREG_SPLIT_DELIM_CAPTURE= ", PREG_SPLIT_DELIM_CAPTURE, "\n";
 echo "PREG_SPLIT_OFFSET_CAPTURE= ", PREG_SPLIT_OFFSET_CAPTURE, "\n";
 echo "PREG_GREP_INVERT= ", PREG_GREP_INVERT, "\n";
diff --git a/ext/pcre/tests/preg_grep_basic.phpt b/ext/pcre/tests/preg_grep_basic.phpt
index fe9d7ceaa78..4874aa8ab63 100644
--- a/ext/pcre/tests/preg_grep_basic.phpt
+++ b/ext/pcre/tests/preg_grep_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test preg_grep() function : basic functionality 
+Test preg_grep() function : basic functionality
 --FILE--
 <?php
 /*
diff --git a/ext/pcre/tests/preg_match_all_basic.phpt b/ext/pcre/tests/preg_match_all_basic.phpt
index 20c4a96be48..a824c4a6ffe 100644
--- a/ext/pcre/tests/preg_match_all_basic.phpt
+++ b/ext/pcre/tests/preg_match_all_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test preg_match_all() function : basic functionality 
+Test preg_match_all() function : basic functionality
 --FILE--
 <?php
 /*
diff --git a/ext/pcre/tests/preg_match_all_edit_basic.phpt b/ext/pcre/tests/preg_match_all_edit_basic.phpt
index 9edcf73596e..5731814398b 100644
--- a/ext/pcre/tests/preg_match_all_edit_basic.phpt
+++ b/ext/pcre/tests/preg_match_all_edit_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test preg_match_all() function : basic functionality 
+Test preg_match_all() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto int preg_match_all(string pattern, string subject, array subpatterns [, int flags [, int offset]])
- * Description: Perform a Perl-style global regular expression match 
+ * Description: Perform a Perl-style global regular expression match
  * Source code: ext/pcre/php_pcre.c
- * Alias to functions: 
+ * Alias to functions:
 */
 
 $string = 'Hello, world! This is a test. This is another test. \[4]. 34534 string.';
@@ -22,7 +22,7 @@ var_dump($match3);
 var_dump(preg_match_all('/\d{2}$/', $string, $match4));										//tries to find 2 digits at the end of a string (0 matches)
 var_dump($match4);
 
-var_dump(preg_match_all('/(This is a ){2}(.*)\stest/', $string, $match5));							//tries to find "This is aThis is a [...] test" (0 matches)	
+var_dump(preg_match_all('/(This is a ){2}(.*)\stest/', $string, $match5));							//tries to find "This is aThis is a [...] test" (0 matches)
 var_dump($match5);
 ?>
 --EXPECTF--
diff --git a/ext/pcre/tests/preg_match_all_error3.phpt b/ext/pcre/tests/preg_match_all_error3.phpt
index 547ff03e44e..6c1422b61a9 100644
--- a/ext/pcre/tests/preg_match_all_error3.phpt
+++ b/ext/pcre/tests/preg_match_all_error3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test preg_match_all() function : error conditions  
+Test preg_match_all() function : error conditions
 --FILE--
 <?php
 /*
diff --git a/ext/pcre/tests/preg_match_basic.phpt b/ext/pcre/tests/preg_match_basic.phpt
index ddf54a0aaf6..1f20bbdde53 100644
--- a/ext/pcre/tests/preg_match_basic.phpt
+++ b/ext/pcre/tests/preg_match_basic.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Test preg_match() function : basic functionality 
+Test preg_match() function : basic functionality
 --FILE--
 <?php
-/* 
+/*
  *  proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]])
  * Function is implemented in ext/pcre/php_pcre.c
 */
diff --git a/ext/pcre/tests/preg_match_basic_002.phpt b/ext/pcre/tests/preg_match_basic_002.phpt
index 977a67ea101..e4854f6b082 100644
--- a/ext/pcre/tests/preg_match_basic_002.phpt
+++ b/ext/pcre/tests/preg_match_basic_002.phpt
@@ -6,7 +6,7 @@ preg_match() single line match with multi-line input
  * Description: Perform a regular expression match
  * Source code: ext/pcre/php_pcre.c
  */
- 
+
 $string = "My\nName\nIs\nStrange";
 preg_match("/M(.*)/", $string, $matches);
 
diff --git a/ext/pcre/tests/preg_match_basic_edit.phpt b/ext/pcre/tests/preg_match_basic_edit.phpt
index bd469d3346a..116899c60f6 100644
--- a/ext/pcre/tests/preg_match_basic_edit.phpt
+++ b/ext/pcre/tests/preg_match_basic_edit.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test preg_match() function : basic functionality 
+Test preg_match() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]])
- * Description: Perform a Perl-style regular expression match 
+ * Description: Perform a Perl-style regular expression match
  * Source code: ext/pcre/php_pcre.c
- * Alias to functions: 
+ * Alias to functions:
 */
 
 
diff --git a/ext/pcre/tests/preg_match_error.phpt b/ext/pcre/tests/preg_match_error.phpt
index ca1f128ada1..7d318115f61 100644
--- a/ext/pcre/tests/preg_match_error.phpt
+++ b/ext/pcre/tests/preg_match_error.phpt
@@ -2,7 +2,7 @@
 Test preg_match() function : error conditions - wrong numbers of parameters
 --FILE--
 <?php
-/* 
+/*
  *  proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]])
  * Function is implemented in ext/pcre/php_pcre.c
 */
diff --git a/ext/pcre/tests/preg_match_error1.phpt b/ext/pcre/tests/preg_match_error1.phpt
index ec9cf8cec8c..ba0aea49126 100644
--- a/ext/pcre/tests/preg_match_error1.phpt
+++ b/ext/pcre/tests/preg_match_error1.phpt
@@ -2,7 +2,7 @@
 Test preg_match() function : error conditions - bad regular expressions
 --FILE--
 <?php
-/* 
+/*
  *  proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]])
  * Function is implemented in ext/pcre/php_pcre.c
 */
diff --git a/ext/pcre/tests/preg_match_error2.phpt b/ext/pcre/tests/preg_match_error2.phpt
index f30fb480371..f44b1d0f724 100644
--- a/ext/pcre/tests/preg_match_error2.phpt
+++ b/ext/pcre/tests/preg_match_error2.phpt
@@ -2,7 +2,7 @@
 Test preg_match() function : error conditions - wrong arg types
 --FILE--
 <?php
-/* 
+/*
  *  proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]])
  * Function is implemented in ext/pcre/php_pcre.c
 */
diff --git a/ext/pcre/tests/preg_match_variation1.phpt b/ext/pcre/tests/preg_match_variation1.phpt
index a289ee48eed..5fa50ce49c9 100644
--- a/ext/pcre/tests/preg_match_variation1.phpt
+++ b/ext/pcre/tests/preg_match_variation1.phpt
@@ -2,7 +2,7 @@
 Test preg_match() function : variation
 --FILE--
 <?php
-/* 
+/*
  *  proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]])
  * Function is implemented in ext/pcre/php_pcre.c
 */
diff --git a/ext/pcre/tests/preg_quote_basic.phpt b/ext/pcre/tests/preg_quote_basic.phpt
index c78f5665c0d..2697a801556 100644
--- a/ext/pcre/tests/preg_quote_basic.phpt
+++ b/ext/pcre/tests/preg_quote_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test preg_quote() function : basic functionality 
+Test preg_quote() function : basic functionality
 --FILE--
 <?php
 /*
diff --git a/ext/pcre/tests/preg_quote_error.phpt b/ext/pcre/tests/preg_quote_error.phpt
index 30b832dbf96..b5dd733b2f6 100644
--- a/ext/pcre/tests/preg_quote_error.phpt
+++ b/ext/pcre/tests/preg_quote_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test preg_quote() function : error conditions  - wrong numbers of parameters 
+Test preg_quote() function : error conditions  - wrong numbers of parameters
 --FILE--
 <?php
 /*
diff --git a/ext/pcre/tests/preg_replace_basic.phpt b/ext/pcre/tests/preg_replace_basic.phpt
index 6962bce255f..9c2eba47d82 100644
--- a/ext/pcre/tests/preg_replace_basic.phpt
+++ b/ext/pcre/tests/preg_replace_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test preg_replace() function : basic functionality 
+Test preg_replace() function : basic functionality
 --FILE--
 <?php
 /*
diff --git a/ext/pcre/tests/preg_replace_callback.phpt b/ext/pcre/tests/preg_replace_callback.phpt
index 0b0bc27576e..a52ef5c9626 100644
--- a/ext/pcre/tests/preg_replace_callback.phpt
+++ b/ext/pcre/tests/preg_replace_callback.phpt
@@ -2,11 +2,11 @@
 preg_replace_callback()
 --FILE--
 <?php
-$input = "plain [indent] deep [indent] [abcd]deeper[/abcd] [/indent] deep [/indent] plain"; 
+$input = "plain [indent] deep [indent] [abcd]deeper[/abcd] [/indent] deep [/indent] plain";
 
 function parseTagsRecursive($input)
 {
-    
+
     $regex = '#\[indent]((?:[^[]|\[(?!/?indent])|(?R))+)\[/indent]#';
 
     if (is_array($input)) {
diff --git a/ext/pcre/tests/preg_replace_callback3.phpt b/ext/pcre/tests/preg_replace_callback3.phpt
index fc3218b9e7c..82047952e6b 100644
--- a/ext/pcre/tests/preg_replace_callback3.phpt
+++ b/ext/pcre/tests/preg_replace_callback3.phpt
@@ -17,7 +17,7 @@ var_dump(preg_replace_callback($a,$a,$a,$a,$a));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: preg_replace_callback() expects at least 3 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/pcre/tests/preg_replace_callback_array2.phpt b/ext/pcre/tests/preg_replace_callback_array2.phpt
index 8e70bb06e8c..24552239879 100644
--- a/ext/pcre/tests/preg_replace_callback_array2.phpt
+++ b/ext/pcre/tests/preg_replace_callback_array2.phpt
@@ -33,7 +33,7 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: preg_replace_callback_array() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/pcre/tests/preg_replace_callback_basic.phpt b/ext/pcre/tests/preg_replace_callback_basic.phpt
index 01d290a1b96..6f359f27eb2 100644
--- a/ext/pcre/tests/preg_replace_callback_basic.phpt
+++ b/ext/pcre/tests/preg_replace_callback_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test preg_replace_callback() function : basic functionality 
+Test preg_replace_callback() function : basic functionality
 --FILE--
 <?php
 /*
@@ -13,7 +13,7 @@ $replacement = array('zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seve
 function integer_word($matches) {
     global $replacement;
     return $replacement[$matches[0]]; //all examples will be looking for an integer value, if one is found it will be stored in $matches[0] which corresponds to a key in the $replacements array
-    
+
 }
 $subject1 = 'there are 7 words in this sentence.';
 $new_subject1 = preg_replace_callback('/\d/', "integer_word", $subject1);
diff --git a/ext/pcre/tests/preg_replace_callback_error.phpt b/ext/pcre/tests/preg_replace_callback_error.phpt
index 9371fcf1bf2..2834eea4db6 100644
--- a/ext/pcre/tests/preg_replace_callback_error.phpt
+++ b/ext/pcre/tests/preg_replace_callback_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test preg_replace_callback() function : error 
+Test preg_replace_callback() function : error
 --FILE--
 <?php
 /*
diff --git a/ext/pcre/tests/preg_replace_callback_error1.phpt b/ext/pcre/tests/preg_replace_callback_error1.phpt
index a00b97c1bb4..add24fbc82d 100644
--- a/ext/pcre/tests/preg_replace_callback_error1.phpt
+++ b/ext/pcre/tests/preg_replace_callback_error1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test preg_replace_callback() function : error 
+Test preg_replace_callback() function : error
 --FILE--
 <?php
 /*
diff --git a/ext/pcre/tests/preg_replace_edit_basic.phpt b/ext/pcre/tests/preg_replace_edit_basic.phpt
index 556b48b8c1d..cd9297684dd 100644
--- a/ext/pcre/tests/preg_replace_edit_basic.phpt
+++ b/ext/pcre/tests/preg_replace_edit_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test preg_replace() function : basic 
+Test preg_replace() function : basic
 --FILE--
 <?php
 /* Prototype  : proto string preg_replace(mixed regex, mixed replace, mixed subject [, int limit [, count]])
- * Description: Perform Perl-style regular expression replacement. 
+ * Description: Perform Perl-style regular expression replacement.
  * Source code: ext/pcre/php_pcre.c
- * Alias to functions: 
+ * Alias to functions:
 */
 
 $string = '123456789 - Hello, world -           This is a string.';
@@ -14,7 +14,7 @@ var_dump($string);
 var_dump(preg_replace('<- This is a string$>',
                       'This shouldn\'t work', $string));				//tries to find '- This is a string' at the end of a string but can't so replaces nothing and prints the unchanged $string.
 
-var_dump(preg_replace('<[0-35-9]>', 
+var_dump(preg_replace('<[0-35-9]>',
                       '4', $string,               					//finds any number that's not 4 and replaces it with a 4
 			    '5', $count));							//limits to 5 replacements returns 444444789
 var_dump($count);											//counts the number of replacements made (5)
@@ -26,7 +26,7 @@ var_dump(preg_replace('<\b[hH]\w{2,4}>',
 var_dump(preg_replace('<(\w)\s*-\s*(\w)>',
                       '\\1. \\2', $string));						//finds dashes with an indefinite amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space
 
-var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>', 
+var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>',
                       '\\1 at \\2 dot \\3 dot \\4', 'josmessa@uk.ibm.com'));	//finds the e-mail address and replaces the @ and . with "at" and "dot" (uses backreferences) ('josmessa at uk dot ibm dot com')
 ?>
 --EXPECTF--
diff --git a/ext/pcre/tests/preg_split_basic.phpt b/ext/pcre/tests/preg_split_basic.phpt
index 5d23ce6df13..c33640920b5 100644
--- a/ext/pcre/tests/preg_split_basic.phpt
+++ b/ext/pcre/tests/preg_split_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test preg_split() function : basic functionality 
+Test preg_split() function : basic functionality
 --FILE--
 <?php
 /*
diff --git a/ext/pdo/tests/bug_36428.phpt b/ext/pdo/tests/bug_36428.phpt
index 703b9d4de08..d21f7071f87 100644
--- a/ext/pdo/tests/bug_36428.phpt
+++ b/ext/pdo/tests/bug_36428.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
-if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); 
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 
 $db = PDOTest::factory();
diff --git a/ext/pdo/tests/bug_36798.phpt b/ext/pdo/tests/bug_36798.phpt
index 9da703e84ff..0ca0beaa8e7 100644
--- a/ext/pdo/tests/bug_36798.phpt
+++ b/ext/pdo/tests/bug_36798.phpt
@@ -1,7 +1,7 @@
 --TEST--
 PDO Common: Bug #36798 (Error parsing named parameters with queries containing high-ascii chars)
 --SKIPIF--
-<?php  
+<?php
 if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
@@ -32,7 +32,7 @@ $row = $stmt->fetch(PDO::FETCH_NUM);
 var_dump( $row );
 
 ?>
---EXPECT--	
+--EXPECT--
 array(1) {
   [0]=>
   string(1) "Ã"
diff --git a/ext/pdo/tests/bug_38394.phpt b/ext/pdo/tests/bug_38394.phpt
index be990b3b199..4bff89bb003 100644
--- a/ext/pdo/tests/bug_38394.phpt
+++ b/ext/pdo/tests/bug_38394.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
-if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); 
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 
 $db = PDOTest::factory();
diff --git a/ext/pdo/tests/bug_39398.phpt b/ext/pdo/tests/bug_39398.phpt
index 633771a951a..0ad46f4131e 100644
--- a/ext/pdo/tests/bug_39398.phpt
+++ b/ext/pdo/tests/bug_39398.phpt
@@ -10,7 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
-if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); 
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 
 $db = PDOTest::factory();
diff --git a/ext/pdo/tests/bug_40285.phpt b/ext/pdo/tests/bug_40285.phpt
index c0a56743893..213777a8088 100644
--- a/ext/pdo/tests/bug_40285.phpt
+++ b/ext/pdo/tests/bug_40285.phpt
@@ -1,7 +1,7 @@
 --TEST--
 PDO Common: Bug #40285 (The prepare parser goes into an infinite loop on ': or ":)
 --SKIPIF--
-<?php  
+<?php
 if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
@@ -23,5 +23,5 @@ $s->execute();
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 Done
diff --git a/ext/pdo/tests/bug_44409.phpt b/ext/pdo/tests/bug_44409.phpt
index fe24fdfb862..64d385b26c8 100644
--- a/ext/pdo/tests/bug_44409.phpt
+++ b/ext/pdo/tests/bug_44409.phpt
@@ -19,16 +19,16 @@ $db->exec("INSERT INTO test (dat) VALUES ('Data from DB')");
 
 class bug44409 implements Serializable
 {
-	public function __construct() 
+	public function __construct()
 	{
-		printf("Method called: %s()\n", __METHOD__); 
-	} 	
+		printf("Method called: %s()\n", __METHOD__);
+	}
 
 	public function serialize()
 	{
-		return "any data from serizalize()"; 
+		return "any data from serizalize()";
 	}
-	
+
 	public function unserialize($dat)
 	{
 		printf("Method called: %s(%s)\n", __METHOD__, var_export($dat, true));
diff --git a/ext/pdo/tests/bug_47769.phpt b/ext/pdo/tests/bug_47769.phpt
index f713effd5dc..c0ac8350ce5 100644
--- a/ext/pdo/tests/bug_47769.phpt
+++ b/ext/pdo/tests/bug_47769.phpt
@@ -16,7 +16,7 @@ class test extends PDO
 	private function isPrivate() {
 		echo "this is a private method.\n";
 	}
-    
+
     public function quote($str, $paramtype = NULL) {
     	$this->isProtected();
     	$this->isPrivate();
diff --git a/ext/pdo/tests/bug_50458.phpt b/ext/pdo/tests/bug_50458.phpt
index 3deb2892ee3..b70c314a19f 100644
--- a/ext/pdo/tests/bug_50458.phpt
+++ b/ext/pdo/tests/bug_50458.phpt
@@ -10,7 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
-if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); 
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 
 $db = PDOTest::factory();
diff --git a/ext/pdo/tests/pdo_009.phpt b/ext/pdo/tests/pdo_009.phpt
index 0e21177477d..509a7d44db4 100644
--- a/ext/pdo/tests/pdo_009.phpt
+++ b/ext/pdo/tests/pdo_009.phpt
@@ -15,14 +15,14 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE classtypes(id int NOT NULL PRIMARY KEY, name VARCHAR(10) NOT NULL UNIQUE)');
-$db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')'); 
-$db->exec('INSERT INTO classtypes VALUES(1, \'Test1\')'); 
-$db->exec('INSERT INTO classtypes VALUES(2, \'Test2\')'); 
+$db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')');
+$db->exec('INSERT INTO classtypes VALUES(1, \'Test1\')');
+$db->exec('INSERT INTO classtypes VALUES(2, \'Test2\')');
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, 0, \'A\')'); 
-$db->exec('INSERT INTO test VALUES(2, 1, \'B\')'); 
-$db->exec('INSERT INTO test VALUES(3, 2, \'C\')'); 
-$db->exec('INSERT INTO test VALUES(4, 3, \'D\')'); 
+$db->exec('INSERT INTO test VALUES(1, 0, \'A\')');
+$db->exec('INSERT INTO test VALUES(2, 1, \'B\')');
+$db->exec('INSERT INTO test VALUES(3, 2, \'C\')');
+$db->exec('INSERT INTO test VALUES(4, 3, \'D\')');
 
 $stmt = $db->prepare('SELECT classtypes.name, test.id AS id, test.val AS val FROM test LEFT JOIN classtypes ON test.classtype=classtypes.id');
 
diff --git a/ext/pdo/tests/pdo_010.phpt b/ext/pdo/tests/pdo_010.phpt
index 812b868eb01..e00f901abe5 100644
--- a/ext/pdo/tests/pdo_010.phpt
+++ b/ext/pdo/tests/pdo_010.phpt
@@ -15,14 +15,14 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE classtypes(id int NOT NULL PRIMARY KEY, name VARCHAR(10) NOT NULL UNIQUE)');
-$db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')'); 
-$db->exec('INSERT INTO classtypes VALUES(1, \'Test1\')'); 
-$db->exec('INSERT INTO classtypes VALUES(2, \'Test2\')'); 
+$db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')');
+$db->exec('INSERT INTO classtypes VALUES(1, \'Test1\')');
+$db->exec('INSERT INTO classtypes VALUES(2, \'Test2\')');
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, 0, \'A\', \'Group1\')'); 
-$db->exec('INSERT INTO test VALUES(2, 1, \'B\', \'Group1\')'); 
-$db->exec('INSERT INTO test VALUES(3, 2, \'C\', \'Group2\')'); 
-$db->exec('INSERT INTO test VALUES(4, 3, \'D\', \'Group2\')'); 
+$db->exec('INSERT INTO test VALUES(1, 0, \'A\', \'Group1\')');
+$db->exec('INSERT INTO test VALUES(2, 1, \'B\', \'Group1\')');
+$db->exec('INSERT INTO test VALUES(3, 2, \'C\', \'Group2\')');
+$db->exec('INSERT INTO test VALUES(4, 3, \'D\', \'Group2\')');
 
 $stmt = $db->prepare('SELECT classtypes.name, test.grp AS grp, test.id AS id, test.val AS val FROM test LEFT JOIN classtypes ON test.classtype=classtypes.id');
 
diff --git a/ext/pdo/tests/pdo_011.phpt b/ext/pdo/tests/pdo_011.phpt
index 4a240426e18..ffeac5bd8d7 100644
--- a/ext/pdo/tests/pdo_011.phpt
+++ b/ext/pdo/tests/pdo_011.phpt
@@ -15,10 +15,10 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); 
-$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group1\')'); 
-$db->exec('INSERT INTO test VALUES(3, \'C\', \'Group2\')'); 
-$db->exec('INSERT INTO test VALUES(4, \'D\', \'Group2\')'); 
+$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')');
+$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group1\')');
+$db->exec('INSERT INTO test VALUES(3, \'C\', \'Group2\')');
+$db->exec('INSERT INTO test VALUES(4, \'D\', \'Group2\')');
 
 class DerivedStatement extends PDOStatement
 {
diff --git a/ext/pdo/tests/pdo_012.phpt b/ext/pdo/tests/pdo_012.phpt
index 471c397c0ae..ac87a384b51 100644
--- a/ext/pdo/tests/pdo_012.phpt
+++ b/ext/pdo/tests/pdo_012.phpt
@@ -15,8 +15,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); 
-$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')'); 
+$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')');
+$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')');
 
 $SELECT = 'SELECT val, grp FROM test';
 
diff --git a/ext/pdo/tests/pdo_013.phpt b/ext/pdo/tests/pdo_013.phpt
index 009c7e2d65c..f4dcea5a2ab 100644
--- a/ext/pdo/tests/pdo_013.phpt
+++ b/ext/pdo/tests/pdo_013.phpt
@@ -15,8 +15,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); 
-$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')'); 
+$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')');
+$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')');
 
 $SELECT = 'SELECT val, grp FROM test';
 
diff --git a/ext/pdo/tests/pdo_014.phpt b/ext/pdo/tests/pdo_014.phpt
index 7b93fb83a80..20fbb84db7d 100644
--- a/ext/pdo/tests/pdo_014.phpt
+++ b/ext/pdo/tests/pdo_014.phpt
@@ -17,8 +17,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); 
-$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')'); 
+$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')');
+$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')');
 $SELECT = 'SELECT val, grp FROM test';
 
 class Test
@@ -49,7 +49,7 @@ class PDOStatementAggregate extends PDOStatement implements IteratorAggregate
 	private function __construct()
 	{
 		echo __METHOD__ . "\n";
-		$this->setFetchMode(PDO::FETCH_NUM);   
+		$this->setFetchMode(PDO::FETCH_NUM);
 		/* default fetch mode is BOTH, so we see if the ctor can overwrite that */
 	}
 
diff --git a/ext/pdo/tests/pdo_015.phpt b/ext/pdo/tests/pdo_015.phpt
index aea292b97f1..ac6a61f1fb6 100644
--- a/ext/pdo/tests/pdo_015.phpt
+++ b/ext/pdo/tests/pdo_015.phpt
@@ -15,8 +15,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(20))');
-$db->exec('INSERT INTO test VALUES(1, \'A\', \'A2\')'); 
-$db->exec('INSERT INTO test VALUES(2, \'A\', \'B2\')'); 
+$db->exec('INSERT INTO test VALUES(1, \'A\', \'A2\')');
+$db->exec('INSERT INTO test VALUES(2, \'A\', \'B2\')');
 
 $select1 = $db->prepare('SELECT id, val, val2 FROM test');
 $select2 = $db->prepare('SELECT val, val2 FROM test');
diff --git a/ext/pdo/tests/pdo_016.phpt b/ext/pdo/tests/pdo_016.phpt
index 12c95172338..abbe93f0bf7 100644
--- a/ext/pdo/tests/pdo_016.phpt
+++ b/ext/pdo/tests/pdo_016.phpt
@@ -47,10 +47,10 @@ while($stmt2->fetch(PDO::FETCH_BOUND)) {
 
 echo "===ALONE===\n";
 
-$stmt3 = $db->prepare('SELECT txt FROM test WHERE idx=:inp'); 
+$stmt3 = $db->prepare('SELECT txt FROM test WHERE idx=:inp');
 $stmt3->bindParam(':inp', $idx); /* by foreign name */
 
-$stmt4 = $db->prepare('SELECT idx FROM test WHERE txt=:txt'); 
+$stmt4 = $db->prepare('SELECT idx FROM test WHERE txt=:txt');
 $stmt4->bindParam(':txt', $txt);  /* using same name */
 
 foreach($cont as $idx => $txt)
diff --git a/ext/pdo/tests/pdo_016a.phpt b/ext/pdo/tests/pdo_016a.phpt
index 72f4b4224f1..47039811737 100644
--- a/ext/pdo/tests/pdo_016a.phpt
+++ b/ext/pdo/tests/pdo_016a.phpt
@@ -47,10 +47,10 @@ while($stmt2->fetch(PDO::FETCH_BOUND)) {
 
 echo "===ALONE===\n";
 
-$stmt3 = $db->prepare('SELECT txt FROM test WHERE idx=:inp'); 
+$stmt3 = $db->prepare('SELECT txt FROM test WHERE idx=:inp');
 $stmt3->bindParam('inp', $idx); /* by foreign name */
 
-$stmt4 = $db->prepare('SELECT idx FROM test WHERE txt=:txt'); 
+$stmt4 = $db->prepare('SELECT idx FROM test WHERE txt=:txt');
 $stmt4->bindParam('txt', $txt);  /* using same name */
 
 foreach($cont as $idx => $txt)
diff --git a/ext/pdo/tests/pdo_019.phpt b/ext/pdo/tests/pdo_019.phpt
index f6d75bbd1af..eb3bb22c88b 100644
--- a/ext/pdo/tests/pdo_019.phpt
+++ b/ext/pdo/tests/pdo_019.phpt
@@ -15,10 +15,10 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(idx int NOT NULL PRIMARY KEY, txt VARCHAR(20))');
-$db->exec('INSERT INTO test VALUES(0, \'String0\')'); 
-$db->exec('INSERT INTO test VALUES(1, \'String1\')'); 
-$db->exec('INSERT INTO test VALUES(2, \'String2\')'); 
-$db->exec('INSERT INTO test VALUES(3, \'String3\')'); 
+$db->exec('INSERT INTO test VALUES(0, \'String0\')');
+$db->exec('INSERT INTO test VALUES(1, \'String1\')');
+$db->exec('INSERT INTO test VALUES(2, \'String2\')');
+$db->exec('INSERT INTO test VALUES(3, \'String3\')');
 
 
 var_dump($db->query('SELECT COUNT(*) FROM test')->fetchColumn());
diff --git a/ext/pdo/tests/pdo_020.phpt b/ext/pdo/tests/pdo_020.phpt
index dc7e4d1a79e..9c35da6adf1 100644
--- a/ext/pdo/tests/pdo_020.phpt
+++ b/ext/pdo/tests/pdo_020.phpt
@@ -15,8 +15,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(16))');
-$db->exec("INSERT INTO test VALUES(1, 'A', 'A')"); 
-$db->exec("INSERT INTO test VALUES(2, 'B', 'B')"); 
+$db->exec("INSERT INTO test VALUES(1, 'A', 'A')");
+$db->exec("INSERT INTO test VALUES(2, 'B', 'B')");
 $db->exec("INSERT INTO test VALUES(3, 'C', 'C')");
 
 foreach (array('SELECT id, val FROM test', 'SELECT id, val, val2 FROM test', 'SELECT COUNT(*) FROM test') as $sql) {
diff --git a/ext/pdo/tests/pdo_021.phpt b/ext/pdo/tests/pdo_021.phpt
index fb25fc52bcc..b1c18fbefd6 100644
--- a/ext/pdo/tests/pdo_021.phpt
+++ b/ext/pdo/tests/pdo_021.phpt
@@ -44,7 +44,7 @@ echo 'There are ' . $num . " rows in the table.\n";
 // Insert using named parameters
 $stmt2 = $db->prepare("INSERT INTO test VALUES(:first, :second, :third)");
 foreach ($data as $row) {
-    $stmt2->execute(array(':first'=>($row[0] + 5), ':second'=>$row[1], 
+    $stmt2->execute(array(':first'=>($row[0] + 5), ':second'=>$row[1],
         ':third'=>$row[2]));
 }
 
diff --git a/ext/pdo/tests/pdo_022.phpt b/ext/pdo/tests/pdo_022.phpt
index daec14f9edc..7b8bee199cc 100644
--- a/ext/pdo/tests/pdo_022.phpt
+++ b/ext/pdo/tests/pdo_022.phpt
@@ -25,7 +25,7 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 $db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(16))');
-$db->exec('insert2', "INSERT INTO test VALUES(:first, :second, :third)"); 
+$db->exec('insert2', "INSERT INTO test VALUES(:first, :second, :third)");
 
 $data = array(
     array('10', 'Abc', 'zxy'),
diff --git a/ext/pdo/tests/pdo_023.phpt b/ext/pdo/tests/pdo_023.phpt
index 564bcf8c516..8b4df3293bb 100644
--- a/ext/pdo/tests/pdo_023.phpt
+++ b/ext/pdo/tests/pdo_023.phpt
@@ -16,14 +16,14 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 class PDOStatementX extends PDOStatement
 {
     public $test1 = 1;
-    
+
     protected function __construct()
     {
     	$this->test2 = 2;
     	$this->test2 = 22;
     	echo __METHOD__ . "()\n";
     }
-    
+
     function __destruct()
     {
     	echo __METHOD__ . "()\n";
@@ -33,12 +33,12 @@ class PDOStatementX extends PDOStatement
 class PDODatabaseX extends PDO
 {
     public $test1 = 1;
-    
+
     function __destruct()
     {
     	echo __METHOD__ . "()\n";
     }
-    
+
     function test()
     {
     	$this->test2 = 2;
@@ -46,7 +46,7 @@ class PDODatabaseX extends PDO
         var_dump($this->test2);
     	$this->test2 = 22;
     }
-    
+
     function query($sql)
     {
     	echo __METHOD__ . "()\n";
diff --git a/ext/pdo/tests/pdo_026.phpt b/ext/pdo/tests/pdo_026.phpt
index d993f32445d..78121c926a2 100644
--- a/ext/pdo/tests/pdo_026.phpt
+++ b/ext/pdo/tests/pdo_026.phpt
@@ -22,13 +22,13 @@ $data = array(
 class PDOStatementX extends PDOStatement
 {
     public $dbh;
-    
+
     protected function __construct($dbh)
     {
     	$this->dbh = $dbh;
     	echo __METHOD__ . "()\n";
     }
-    
+
     function __destruct()
     {
     	echo __METHOD__ . "()\n";
@@ -41,7 +41,7 @@ class PDODatabase extends PDO
     {
     	echo __METHOD__ . "()\n";
     }
-    
+
     function query($sql)
     {
     	echo __METHOD__ . "()\n";
diff --git a/ext/pdo/tests/pdo_029.phpt b/ext/pdo/tests/pdo_029.phpt
index f3dc1f2fa4c..8e495de3bd5 100644
--- a/ext/pdo/tests/pdo_029.phpt
+++ b/ext/pdo/tests/pdo_029.phpt
@@ -10,7 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
-if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); 
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 
 $data = array(
@@ -22,22 +22,22 @@ $data = array(
 class PDOStatementX extends PDOStatement
 {
     public $dbh;
-    
+
     protected function __construct($dbh)
     {
     	$this->dbh = $dbh;
     	echo __METHOD__ . "()\n";
     }
-    
+
     function __destruct()
     {
     	echo __METHOD__ . "()\n";
     }
-    
+
     function execute($params = array())
     {
     	echo __METHOD__ . "()\n";
-		parent::execute();    	
+		parent::execute();
     }
 }
 
@@ -47,7 +47,7 @@ class PDODatabase extends PDO
     {
     	echo __METHOD__ . "()\n";
     }
-    
+
     function query($sql)
     {
     	echo __METHOD__ . "()\n";
diff --git a/ext/pdo/tests/pdo_030.phpt b/ext/pdo/tests/pdo_030.phpt
index 243e94a1e77..a2a9207e77b 100644
--- a/ext/pdo/tests/pdo_030.phpt
+++ b/ext/pdo/tests/pdo_030.phpt
@@ -10,7 +10,7 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
-if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); 
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 
 $data = array(
@@ -22,23 +22,23 @@ $data = array(
 class PDOStatementX extends PDOStatement
 {
     public $dbh;
-    
+
     protected function __construct($dbh)
     {
     	$this->dbh = $dbh;
     	$this->setFetchMode(PDO::FETCH_ASSOC);
     	echo __METHOD__ . "()\n";
     }
-    
+
     function __destruct()
     {
     	echo __METHOD__ . "()\n";
     }
-    
+
     function execute($params = array())
     {
     	echo __METHOD__ . "()\n";
-		parent::execute();    	
+		parent::execute();
     }
 }
 
@@ -48,7 +48,7 @@ class PDODatabase extends PDO
     {
     	echo __METHOD__ . "()\n";
     }
-    
+
     function query($sql)
     {
     	echo __METHOD__ . "()\n";
diff --git a/ext/pdo/tests/pdo_031.phpt b/ext/pdo/tests/pdo_031.phpt
index 9065ce97193..f3021f491e9 100644
--- a/ext/pdo/tests/pdo_031.phpt
+++ b/ext/pdo/tests/pdo_031.phpt
@@ -13,9 +13,9 @@ PDOTest::skip();
 ?>
 --FILE--
 <?php
-if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); 
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
-if (!class_exists('RecursiveTreeIterator', false)) require_once(getenv('REDIR_TEST_DIR').'../../spl/examples/recursivetreeiterator.inc'); 
+if (!class_exists('RecursiveTreeIterator', false)) require_once(getenv('REDIR_TEST_DIR').'../../spl/examples/recursivetreeiterator.inc');
 
 $data = array(
     array('10', 'Abc', 'zxy'),
diff --git a/ext/pdo_dblib/tests/bug_54648.phpt b/ext/pdo_dblib/tests/bug_54648.phpt
index aa9f2926699..93cde8e4153 100644
--- a/ext/pdo_dblib/tests/bug_54648.phpt
+++ b/ext/pdo_dblib/tests/bug_54648.phpt
@@ -8,7 +8,7 @@ require dirname(__FILE__) . '/config.inc';
 --FILE--
 <?php
 require dirname(__FILE__) . '/config.inc';
-$db->query('set dateformat ymd'); 
+$db->query('set dateformat ymd');
 $rs = $db->query("select cast('1950-01-18 23:00:00' as smalldatetime) as sdt, cast('2030-01-01 23:59:59' as datetime) as dt");
 var_dump($rs->fetchAll(PDO::FETCH_ASSOC));
 echo "Done.\n";
diff --git a/ext/pdo_firebird/tests/bug_76488.phpt b/ext/pdo_firebird/tests/bug_76488.phpt
index dba6734c28b..028d3cb805a 100644
--- a/ext/pdo_firebird/tests/bug_76488.phpt
+++ b/ext/pdo_firebird/tests/bug_76488.phpt
@@ -20,7 +20,7 @@ from r
 
     for ($i = 0; $i < 10; $i++) {
         $sth = $dbh->prepare($sql);
-        $sth->execute();          
+        $sth->execute();
         $rows = $sth->fetchAll();
 	    unset($rows);
 	    unset($sth);
diff --git a/ext/pdo_firebird/tests/connect.phpt b/ext/pdo_firebird/tests/connect.phpt
index cbe76e6865e..5c4342bff92 100644
--- a/ext/pdo_firebird/tests/connect.phpt
+++ b/ext/pdo_firebird/tests/connect.phpt
@@ -7,11 +7,11 @@ PDO_Firebird: connect/disconnect
 <?php /* $Id$ */
 
 	require("testdb.inc");
-    
+
 	$db = new PDO("firebird:dbname=$test_base",$user,$password) or die;
 	unset($db);
 	echo "done\n";
-	
+
 ?>
 --EXPECT--
 done
diff --git a/ext/pdo_firebird/tests/ddl.phpt b/ext/pdo_firebird/tests/ddl.phpt
index 9d2a0953ec5..ef194370e8d 100644
--- a/ext/pdo_firebird/tests/ddl.phpt
+++ b/ext/pdo_firebird/tests/ddl.phpt
@@ -7,29 +7,29 @@ PDO_Firebird: DDL/transactions
 <?php /* $Id$ */
 
 	require("testdb.inc");
-    
+
 	$db = new PDO("firebird:dbname=$test_base",$user,$password) or die;
 	$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
-	
+
 	$db->exec("CREATE TABLE ddl (id INT NOT NULL PRIMARY KEY, text BLOB SUB_TYPE 1)");
 	$db->exec("CREATE GENERATOR gen_ddl_id");
 	$db->exec("CREATE TRIGGER ddl_bi FOR ddl BEFORE INSERT AS
 		BEGIN IF (NEW.id IS NULL) THEN NEW.id=GEN_ID(gen_ddl_id,1); END");
-	
+
 	$db->setAttribute(PDO::ATTR_AUTOCOMMIT,0);
-	
+
 	$db->beginTransaction();
 	var_dump($db->exec("INSERT INTO ddl (text) VALUES ('bla')"));
 	var_dump($db->exec("UPDATE ddl SET text='blabla'"));
 	$db->rollback();
-	
+
 	$db->beginTransaction();
 	var_dump($db->exec("DELETE FROM ddl"));
 	$db->commit();
-	
+
 	unset($db);
 	echo "done\n";
-	
+
 ?>
 --EXPECT--
 int(1)
diff --git a/ext/pdo_firebird/tests/execute.phpt b/ext/pdo_firebird/tests/execute.phpt
index 3cec9e3aa8c..49f4bb8353d 100644
--- a/ext/pdo_firebird/tests/execute.phpt
+++ b/ext/pdo_firebird/tests/execute.phpt
@@ -9,7 +9,7 @@ ibase.timestampformat=%Y-%m-%d %H:%M:%S
 <?php /* $Id$ */
 
 	require("testdb.inc");
-    
+
 	$db = new PDO("firebird:dbname=$test_base",$user,$password) or die;
 
 	var_dump($db->getAttribute(PDO::ATTR_CONNECTION_STATUS));
@@ -19,7 +19,7 @@ ibase.timestampformat=%Y-%m-%d %H:%M:%S
 	$db->exec("CREATE TABLE ddl (id SMALLINT NOT NULL PRIMARY KEY, text VARCHAR(32),
 		datetime TIMESTAMP DEFAULT '2000-02-12' NOT NULL)");
 	$db->exec("INSERT INTO ddl (id,text) VALUES (1,'bla')");
-	
+
 	$s = $db->prepare("SELECT * FROM ddl WHERE id=? FOR UPDATE");
 
 	$id = 0;
@@ -29,21 +29,21 @@ ibase.timestampformat=%Y-%m-%d %H:%M:%S
 	$id = 1;
 	$s->execute();
 	$s->setAttribute(PDO::ATTR_CURSOR_NAME, "c");
-	
+
 	var_dump($id);
 
 	var_dump($s->fetch());
 
 	var_dump($var);
-	
+
 	var_dump($db->exec("UPDATE ddl SET id=2 WHERE CURRENT OF c"));
 
 	var_dump($s->fetch());
-	
-	unset($s);	
+
+	unset($s);
 	unset($db);
 	echo "done\n";
-	
+
 ?>
 --EXPECT--
 bool(true)
diff --git a/ext/pdo_mysql/tests/bug41125.phpt b/ext/pdo_mysql/tests/bug41125.phpt
index cd913bbf3ae..66ecbc7d4d7 100644
--- a/ext/pdo_mysql/tests/bug41125.phpt
+++ b/ext/pdo_mysql/tests/bug41125.phpt
@@ -75,7 +75,7 @@ foreach ($queries as $k => $query) {
 	$stmt = $db->prepare($query);
 	$stmt->bindParam(':id', $id);
 	$stmt->execute();
-	
+
 	printf("[%d] Query: [[%s]]\n", $k + 1, $query);
 	print implode(' - ', (($r = @$stmt->fetch(PDO::FETCH_NUM)) ? $r : array())) ."\n";
 	print implode(' - ', $stmt->errorinfo()) ."\n";
diff --git a/ext/pdo_mysql/tests/bug44327.phpt b/ext/pdo_mysql/tests/bug44327.phpt
index f5ca9e0d9d9..cb2fbda097a 100644
--- a/ext/pdo_mysql/tests/bug44327.phpt
+++ b/ext/pdo_mysql/tests/bug44327.phpt
@@ -12,12 +12,12 @@ $db = MySQLPDOTest::factory();
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 	$db = MySQLPDOTest::factory();
 
-	$stmt = $db->prepare("SELECT 1 AS \"one\""); 
-	$stmt->execute(); 
-	$row = $stmt->fetch(PDO::FETCH_LAZY); 
+	$stmt = $db->prepare("SELECT 1 AS \"one\"");
+	$stmt->execute();
+	$row = $stmt->fetch(PDO::FETCH_LAZY);
 	var_dump($row);
 	var_dump($row->{0});
-	var_dump($row->one); 
+	var_dump($row->one);
 	var_dump($row->queryString);
 
 	print "----------------------------------\n";
@@ -34,11 +34,11 @@ $db = MySQLPDOTest::factory();
 
 	print "----------------------------------\n";
 
-	$stmt = $db->prepare('foo'); 
+	$stmt = $db->prepare('foo');
 	@$stmt->execute();
 	$row = $stmt->fetch();
 	var_dump($row->queryString);
-	
+
 ?>
 --EXPECTF--
 object(PDORow)#%d (2) {
diff --git a/ext/pdo_mysql/tests/bug46292.phpt b/ext/pdo_mysql/tests/bug46292.phpt
index 6a430a4dfb5..8885384f1c6 100644
--- a/ext/pdo_mysql/tests/bug46292.phpt
+++ b/ext/pdo_mysql/tests/bug46292.phpt
@@ -7,22 +7,22 @@ require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
 --FILE--
-<?php	
-	
+<?php
+
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 	$pdoDb = MySQLPDOTest::factory();
-	
+
 
 	class myclass implements Serializable {
 		public function __construct() {
 			printf("%s()\n", __METHOD__);
 		}
-		
+
 		public function serialize() {
 			printf("%s()\n", __METHOD__);
 			return "any data from serialize()";
 		}
-		
+
 		public function unserialize($dat) {
 			printf("%s(%s)\n", __METHOD__, var_export($dat, true));
 			return $dat;
@@ -33,11 +33,11 @@ MySQLPDOTest::skip();
 
 	$pdoDb->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
 	$pdoDb->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
-	
+
 	$pdoDb->query('DROP TABLE IF EXISTS testz');
-	
+
 	$pdoDb->query('CREATE TABLE testz (name VARCHAR(20) NOT NULL, value INT)');
-	
+
 	$pdoDb->query("INSERT INTO testz VALUES ('myclass', 1), ('myclass2', 2), ('myclass', NULL), ('myclass3', NULL)");
 
 	$stmt = $pdoDb->prepare("SELECT * FROM testz");
diff --git a/ext/pdo_mysql/tests/bug54929.phpt b/ext/pdo_mysql/tests/bug54929.phpt
index 0a111d89353..d7b4c7ad7fc 100644
--- a/ext/pdo_mysql/tests/bug54929.phpt
+++ b/ext/pdo_mysql/tests/bug54929.phpt
@@ -18,7 +18,7 @@ $pdodb = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
 function testQuery($query) {
 	global $pdodb;
 	$stmt = $pdodb->prepare($query);
-	
+
 	if (!$stmt->execute(array("foo"))) {
 		var_dump($stmt->errorInfo());
 	} else{
diff --git a/ext/pdo_mysql/tests/bug_37445.phpt b/ext/pdo_mysql/tests/bug_37445.phpt
index c9400717b4b..6a51233cc46 100644
--- a/ext/pdo_mysql/tests/bug_37445.phpt
+++ b/ext/pdo_mysql/tests/bug_37445.phpt
@@ -1,5 +1,5 @@
 --TEST--
-PDO MySQL Bug #37445 (Premature stmt object destruction) 
+PDO MySQL Bug #37445 (Premature stmt object destruction)
 --SKIPIF--
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not loaded');
diff --git a/ext/pdo_mysql/tests/bug_39483.phpt b/ext/pdo_mysql/tests/bug_39483.phpt
index c20f4a36027..c493b8c03fb 100644
Binary files a/ext/pdo_mysql/tests/bug_39483.phpt and b/ext/pdo_mysql/tests/bug_39483.phpt differ
diff --git a/ext/pdo_mysql/tests/bug_50323.phpt b/ext/pdo_mysql/tests/bug_50323.phpt
index 02050fac5d2..944605277d6 100644
--- a/ext/pdo_mysql/tests/bug_50323.phpt
+++ b/ext/pdo_mysql/tests/bug_50323.phpt
@@ -44,7 +44,7 @@ if (1 === @$db->exec('CREATE DATABASE `crazy;dbname`')) {
     $dsn = changeDSN(getenv('PDOTEST_DSN'), array('dbname' => 'crazy;;dbname'));
     $user = getenv('PDOTEST_USER');
     $pass = getenv('PDOTEST_PASS');
-    
+
     new PDO($dsn, $user, $pass);
 }
 echo 'done!';
diff --git a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
index fba1c2433e3..090f97d0431 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
@@ -43,7 +43,7 @@ if (!extension_loaded('mysqli') && !extension_loaded('mysqlnd')) {
 			$expected['MYSQL_ATTR_SERVER_PUBLIC_KEY']	= true;
 	    }
 	} else if (MySQLPDOTest::getClientVersion(MySQLPDOTest::factory()) > 50605) {
-		/* XXX the MySQL client library version isn't exposed with any 
+		/* XXX the MySQL client library version isn't exposed with any
 		constants, the single possibility is to use the PDO::getAttribute().
 		This however will fail with no connection. */
 		$expected['MYSQL_ATTR_SERVER_PUBLIC_KEY']		= true;
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt
index ae7e7fc4242..382ed0ea56b 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt
@@ -132,7 +132,7 @@ unlink($file);
 		printf("[001] %s [%s] %s\n",
 			$e->getMessage(), $db->errorCode(), implode(' ', $db->errorInfo()));
 	}
-	
+
 	print "done!";
 ?>
 --CLEAN--
diff --git a/ext/pdo_oci/tests/bug46274.phpt b/ext/pdo_oci/tests/bug46274.phpt
index 23ee8ee20f7..e80451e7ee8 100644
--- a/ext/pdo_oci/tests/bug46274.phpt
+++ b/ext/pdo_oci/tests/bug46274.phpt
@@ -2,7 +2,7 @@
 Bug #46274 (pdo_pgsql - Segfault when using PDO::ATTR_STRINGIFY_FETCHES and blob)
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) 
+if (!extension_loaded('pdo') || !extension_loaded('pdo_oci'))
 die('skip not loaded');
 require dirname(__FILE__).'/../../pdo/tests/pdo_test.inc';
 PDOTest::skip();
diff --git a/ext/pdo_oci/tests/bug46274_2.phpt b/ext/pdo_oci/tests/bug46274_2.phpt
index cbadcef4f8c..3430877b9ff 100644
--- a/ext/pdo_oci/tests/bug46274_2.phpt
+++ b/ext/pdo_oci/tests/bug46274_2.phpt
@@ -2,7 +2,7 @@
 Bug #46274 (pdo_pgsql - Segfault when using PDO::ATTR_STRINGIFY_FETCHES and blob)
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) 
+if (!extension_loaded('pdo') || !extension_loaded('pdo_oci'))
 die('skip not loaded');
 require dirname(__FILE__).'/../../pdo/tests/pdo_test.inc';
 PDOTest::skip();
diff --git a/ext/pdo_oci/tests/bug54379.phpt b/ext/pdo_oci/tests/bug54379.phpt
index abb6bc73e17..8f3c4f75c03 100644
--- a/ext/pdo_oci/tests/bug54379.phpt
+++ b/ext/pdo_oci/tests/bug54379.phpt
@@ -2,7 +2,7 @@
 Bug #54379 (PDO_OCI: UTF-8 output gets truncated)
 --SKIPIF--
 <?php
-if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) 
+if (!extension_loaded('pdo') || !extension_loaded('pdo_oci'))
 die('skip not loaded');
 require dirname(__FILE__).'/../../pdo/tests/pdo_test.inc';
 if (!preg_match('/charset=.*utf8/i', getenv('PDOTEST_DSN')))
diff --git a/ext/pdo_oci/tests/bug57702.phpt b/ext/pdo_oci/tests/bug57702.phpt
index d0abc6ff8c9..10b2d1c9454 100644
--- a/ext/pdo_oci/tests/bug57702.phpt
+++ b/ext/pdo_oci/tests/bug57702.phpt
@@ -25,7 +25,7 @@ $stmt->execute();
 
 function do_insert($db, $id, $data1, $data2)
 {
-	$db->beginTransaction(); 
+	$db->beginTransaction();
 	$stmt = $db->prepare("insert into bug57702 (id, data1, data2) values (:id, empty_blob(), empty_blob()) returning data1, data2 into :blob1, :blob2");
 	$stmt->bindParam(':id', $id);
 	$stmt->bindParam(':blob1', $blob1, PDO::PARAM_LOB);
@@ -34,10 +34,10 @@ function do_insert($db, $id, $data1, $data2)
 	$blob2 = null;
 	$stmt->execute();
 
-	fwrite($blob1, $data1);  
+	fwrite($blob1, $data1);
 	fclose($blob1);
-	fwrite($blob2, $data2);  
-	fclose($blob2);	
+	fwrite($blob2, $data2);
+	fclose($blob2);
 	$db->commit();
 }
 
@@ -84,7 +84,7 @@ while ($stmt->fetch(PDO::FETCH_BOUND)) {
 
 ////////////////////
 
-echo "\nFourth Query\n"; 
+echo "\nFourth Query\n";
 
 $a = array();
 $i = 0;
@@ -101,7 +101,7 @@ for ($i = 0; $i < count($a); $i++) {
 
 ////////////////////
 
-echo "\nFifth Query\n"; 
+echo "\nFifth Query\n";
 
 $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);  // Let's use streams
 
@@ -124,7 +124,7 @@ for ($i = 0; $i < count($a); $i++) {
 
 ////////////////////
 
-echo "\nSixth Query\n"; 
+echo "\nSixth Query\n";
 
 $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);  // Let's use streams
 
diff --git a/ext/pdo_oci/tests/checkliveness.phpt b/ext/pdo_oci/tests/checkliveness.phpt
index 4bb070f40d7..293a26b5662 100644
--- a/ext/pdo_oci/tests/checkliveness.phpt
+++ b/ext/pdo_oci/tests/checkliveness.phpt
@@ -19,7 +19,7 @@ $attr = getenv('PDOTEST_ATTR');
 
 try {
     $db = new PDO($dsn, $user, $pass, array(PDO::ATTR_PERSISTENT => true));
-} 
+}
 catch (PDOException $e) {
     echo 'Connection failed: ' . $e->getMessage();
     exit;
@@ -28,7 +28,7 @@ catch (PDOException $e) {
 // This triggers the call to check liveness
 try {
     $db = new PDO($dsn, $user, $pass, array(PDO::ATTR_PERSISTENT => true));
-} 
+}
 catch (PDOException $e) {
     echo 'Connection failed: ' . $e->getMessage();
     exit;
diff --git a/ext/pdo_oci/tests/pdo_oci_stream_2a.phpt b/ext/pdo_oci/tests/pdo_oci_stream_2a.phpt
index 72d2ed93b17..8096fe17f7f 100644
--- a/ext/pdo_oci/tests/pdo_oci_stream_2a.phpt
+++ b/ext/pdo_oci/tests/pdo_oci_stream_2a.phpt
@@ -24,7 +24,7 @@ $stmt->execute();
 
 function do_insert($db, $id, $data1, $data2)
 {
-    $db->beginTransaction(); 
+    $db->beginTransaction();
     $stmt = $db->prepare("insert into pdo_oci_stream_2 (id, data1, data2) values (:id, empty_blob(), empty_blob()) returning data1, data2 into :blob1, :blob2");
     $stmt->bindParam(':id', $id);
     $stmt->bindParam(':blob1', $blob1, PDO::PARAM_LOB);
@@ -33,7 +33,7 @@ function do_insert($db, $id, $data1, $data2)
     $blob2 = null;
     $stmt->execute();
 
-    fwrite($blob1, $data1);  
+    fwrite($blob1, $data1);
     fclose($blob1);
     fwrite($blob2, $data2);
     fclose($blob2);
diff --git a/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt b/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt
index 22ae7c6724d..db55d244e53 100644
--- a/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt
+++ b/ext/pdo_oci/tests/pdo_oci_stream_2b.phpt
@@ -27,16 +27,16 @@ $a_val = ord('a');
 foreach($db->query("select data1 as d4_1, data2 as d4_2 from pdo_oci_stream_2 order by id") as $row) {
     $a = $row['d4_1'];
 	$a1 = $row['d4_2'];
-    
+
     $str1 = stream_get_contents($a);
 	$str2 = stream_get_contents($a1);
-    
+
     $str1len = strlen($str1);
 	$str2len = strlen($str2);
-    
+
     $b = ord($str1[0]);
 	$b1 = ord($str2[0]);
-    
+
     if (($b != ($a_val + $i)) && ($str1len != (4086 + $i)) &&
         ($b1 != ($a_val + $j)) && ($str2len != (4086 + $j))) {
         printf("There is a bug!\n");
@@ -45,13 +45,13 @@ foreach($db->query("select data1 as d4_1, data2 as d4_2 from pdo_oci_stream_2 or
         printf("b     = %d\n", $b);
         printf("i     = %d\n", $i);
         printf("str1len = %d\n", $str1len);
-        
+
         printf("Col2:\n");
         printf("a_val = %d\n", $a_val);
         printf("b1    = %d\n", $b1);
         printf("j     = %d\n", $j);
         printf("str2len = %d\n", $str1len);
-        
+
     }
     $i++;
     if ($i>9)
diff --git a/ext/pdo_oci/tests/pecl_bug_11345.phpt b/ext/pdo_oci/tests/pecl_bug_11345.phpt
index b80773a334c..8a633f547c0 100644
--- a/ext/pdo_oci/tests/pecl_bug_11345.phpt
+++ b/ext/pdo_oci/tests/pecl_bug_11345.phpt
@@ -15,7 +15,7 @@ PDOTest::skip();
 
 try {
     $dbh = new PDO('oci:dbname=xxx;charset=yyy', 'abc', 'def');
-} 
+}
 catch (PDOException $e) {
     echo 'Connection failed: ' . $e->getMessage(). "\n";
     exit;
diff --git a/ext/pdo_odbc/tests/long_columns.phpt b/ext/pdo_odbc/tests/long_columns.phpt
index cc7b19517e4..fda63c47cb6 100644
--- a/ext/pdo_odbc/tests/long_columns.phpt
+++ b/ext/pdo_odbc/tests/long_columns.phpt
@@ -35,7 +35,7 @@ if (!isset($config['ENV']['PDOTEST_DSN']) || $config['ENV']['PDOTEST_DSN']===fal
 //       -otherwise, you'll have to open MS Access, create a database, then load that file in this Window to map it to a DSN
 // 7. set the environment variable PDOTEST_DSN="odbc:<system dsn from step 5>" ex: SET PDOTEST_DSN=odbc:accdb12
 //         -note: on Windows, " is included in environment variable
-// 
+//
 // easy way to compile:
 // configure --disable-all --enable-cli --enable-zts --enable-pdo --with-pdo-odbc --enable-debug
 // configure --disable-all --eanble-cli --enable-pdo --with-pdo-odbc=unixODBC,/usr,/usr --with-unixODBC=/usr --enable-debug
diff --git a/ext/pdo_pgsql/tests/bug72294.phpt b/ext/pdo_pgsql/tests/bug72294.phpt
index d6bb6617338..484a6f5765c 100644
--- a/ext/pdo_pgsql/tests/bug72294.phpt
+++ b/ext/pdo_pgsql/tests/bug72294.phpt
@@ -106,7 +106,7 @@ class PreparedStatementCache
     }
 }
 
-class DatabaseTest extends PHPUnit_Framework_TestCase 
+class DatabaseTest extends PHPUnit_Framework_TestCase
 {
     public function testIt()
     {
diff --git a/ext/pdo_pgsql/tests/bug75402.phpt b/ext/pdo_pgsql/tests/bug75402.phpt
index 4595ca93f2c..bf79a1f775f 100644
--- a/ext/pdo_pgsql/tests/bug75402.phpt
+++ b/ext/pdo_pgsql/tests/bug75402.phpt
@@ -59,11 +59,11 @@ $sql = "SELECT
             to_char(INSERT_DATETIME, 'IYYY.MM.DD HH24:MI:SS')  as \"sDatetime\" 
           FROM bug75402 
           ORDER BY INSERT_DATETIME DESC";
-  
+
 if ($db) {
     $stmt = $db->prepare($sql,
 		array(
-			// With the following options memory is not being 
+			// With the following options memory is not being
 			// deallocated
 			  \PDO::ATTR_CURSOR => \PDO::CURSOR_SCROLL
 			// With the following option memory is de-allocated
diff --git a/ext/pdo_pgsql/tests/copy_from.phpt b/ext/pdo_pgsql/tests/copy_from.phpt
index 31d7752174d..552038069c3 100644
--- a/ext/pdo_pgsql/tests/copy_from.phpt
+++ b/ext/pdo_pgsql/tests/copy_from.phpt
@@ -119,7 +119,7 @@ try {
 }
 $db->rollback();
 
-// Clean up 
+// Clean up
 foreach (array($filename, $filenameWithDifferentNullValues, $filenameWithDifferentNullValuesAndSelectedFields) as $f) {
 	@unlink($f);
 }
diff --git a/ext/pdo_sqlite/tests/bug35336.phpt b/ext/pdo_sqlite/tests/bug35336.phpt
index 59dbda38bac..b80ce629c27 100644
--- a/ext/pdo_sqlite/tests/bug35336.phpt
+++ b/ext/pdo_sqlite/tests/bug35336.phpt
@@ -20,7 +20,7 @@ $rez = $a->query ("SELECT * FROM test")->fetchAll(PDO::FETCH_CLASS, 'EEE');
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 hello world
 hello world
 Done
diff --git a/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt b/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt
index ea6f22c0549..31eec63e21a 100644
--- a/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt
+++ b/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt
@@ -33,7 +33,7 @@ var_dump($st->fetchAll(PDO::FETCH_FUNC, 1));
 $st = $db->query('SELECT * FROM testing');
 var_dump($st->fetchAll(PDO::FETCH_FUNC, array('self', 'foo')));
 
-class foo { 
+class foo {
 	public function method($x) {
 		return "--- $x ---";
 	}
@@ -43,15 +43,15 @@ class bar extends foo {
 		$st = $db->query('SELECT * FROM testing');
 		var_dump($st->fetchAll(PDO::FETCH_FUNC, array($this, 'parent::method')));
 	}
-	
+
 	static public function test($x, $y) {
 		return $x .'---'. $y;
 	}
-	
+
 	private function test2($x, $y) {
 		return $x;
 	}
-	
+
 	public function test3($x, $y) {
 		return $x .'==='. $y;
 	}
diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
index d6e095d54a9..56ad5c66b9d 100644
--- a/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
+++ b/ext/pdo_sqlite/tests/pdo_sqlite_get_attribute.phpt
@@ -4,7 +4,7 @@ PDO_sqlite: Testing getAttribute()
 <?php if (!extension_loaded('pdo_sqlite')) print 'skip not loaded'; ?>
 --FILE--
 <?php
- 
+
 $pdo = new PDO('sqlite::memory:');
 var_dump($pdo->getAttribute(PDO::ATTR_SERVER_VERSION));
 var_dump($pdo->getAttribute(PDO::ATTR_CLIENT_VERSION));
diff --git a/ext/pgsql/tests/02connection.phpt b/ext/pgsql/tests/02connection.phpt
index 234427ba199..8db5e2071a6 100644
--- a/ext/pgsql/tests/02connection.phpt
+++ b/ext/pgsql/tests/02connection.phpt
@@ -11,41 +11,41 @@ include('config.inc');
 $db = pg_pconnect($conn_str);
 var_dump($db);
 
-if (pg_connection_status($db) != PGSQL_CONNECTION_OK) 
+if (pg_connection_status($db) != PGSQL_CONNECTION_OK)
 {
 	echo "pg_connection_status() error\n";
 }
-if (!pg_connection_reset($db)) 
+if (!pg_connection_reset($db))
 {
 	echo "pg_connection_reset() error\n";
 }
-if (pg_connection_busy($db)) 
+if (pg_connection_busy($db))
 {
 	echo "pg_connection_busy() error\n";
 }
 if (function_exists('pg_transaction_status')) {
-	if (pg_transaction_status($db) != PGSQL_TRANSACTION_IDLE) 
+	if (pg_transaction_status($db) != PGSQL_TRANSACTION_IDLE)
 	{
 		echo "pg_transaction_status() error\n";
 	}
 }
-if (false === pg_host($db)) 
+if (false === pg_host($db))
 {
 	echo "pg_host() error\n";
 }
-if (!pg_dbname($db)) 
+if (!pg_dbname($db))
 {
 	echo "pg_dbname() error\n";
 }
-if (!pg_port($db)) 
+if (!pg_port($db))
 {
 	echo "pg_port() error\n";
 }
-if (pg_tty($db)) 
+if (pg_tty($db))
 {
 	echo "pg_tty() error\n";
 }
-if (pg_options($db)) 
+if (pg_options($db))
 {
 	echo "pg_options() error\n";
 }
diff --git a/ext/pgsql/tests/03sync_query.phpt b/ext/pgsql/tests/03sync_query.phpt
index afb6bb4475f..eb8fae084d1 100644
--- a/ext/pgsql/tests/03sync_query.phpt
+++ b/ext/pgsql/tests/03sync_query.phpt
@@ -14,19 +14,19 @@ if (!($rows   = pg_num_rows($result)))
 {
 	echo "pg_num_row() error\n";
 }
-for ($i=0; $i < $rows; $i++) 
+for ($i=0; $i < $rows; $i++)
 {
 	pg_fetch_array($result, $i, PGSQL_NUM);
 }
-for ($i=0; $i < $rows; $i++) 
+for ($i=0; $i < $rows; $i++)
 {
 	pg_fetch_object($result);
 }
-for ($i=0; $i < $rows; $i++) 
+for ($i=0; $i < $rows; $i++)
 {
 	pg_fetch_row($result, $i);
 }
-for ($i=0; $i < $rows; $i++) 
+for ($i=0; $i < $rows; $i++)
 {
 	pg_fetch_result($result, $i, 0);
 }
diff --git a/ext/pgsql/tests/04async_query.phpt b/ext/pgsql/tests/04async_query.phpt
index 7711240a797..fe67382026c 100644
--- a/ext/pgsql/tests/04async_query.phpt
+++ b/ext/pgsql/tests/04async_query.phpt
@@ -16,7 +16,7 @@ while(pg_connection_busy($db));  // busy wait: intended
 if (pg_connection_status($db) === PGSQL_CONNECTION_BAD) {
 	echo "pg_connection_status() error\n";
 }
-if (!($result = pg_get_result($db))) 
+if (!($result = pg_get_result($db)))
 {
 	echo "pg_get_result() error\n";
 }
@@ -24,19 +24,19 @@ if (!($result = pg_get_result($db)))
 if (!($rows = pg_num_rows($result))) {
 	echo "pg_num_rows() error\n";
 }
-for ($i=0; $i < $rows; $i++) 
+for ($i=0; $i < $rows; $i++)
 {
 	pg_fetch_array($result, $i, PGSQL_NUM);
 }
-for ($i=0; $i < $rows; $i++) 
+for ($i=0; $i < $rows; $i++)
 {
 	pg_fetch_object($result);
 }
-for ($i=0; $i < $rows; $i++) 
+for ($i=0; $i < $rows; $i++)
 {
 	pg_fetch_row($result, $i);
 }
-for ($i=0; $i < $rows; $i++) 
+for ($i=0; $i < $rows; $i++)
 {
 	pg_fetch_result($result, $i, 0);
 }
@@ -50,7 +50,7 @@ pg_field_type($result, 0);
 pg_field_prtlen($result, 0);
 pg_field_is_null($result, 0);
 
-if (!pg_send_query($db, "INSERT INTO ".$table_name." VALUES (8888, 'GGG');")) 
+if (!pg_send_query($db, "INSERT INTO ".$table_name." VALUES (8888, 'GGG');"))
 {
 	echo "pg_send_query() error\n";
 }
diff --git a/ext/pgsql/tests/23sync_query_params.phpt b/ext/pgsql/tests/23sync_query_params.phpt
index 6959cd75a7d..a700ddca17b 100644
--- a/ext/pgsql/tests/23sync_query_params.phpt
+++ b/ext/pgsql/tests/23sync_query_params.phpt
@@ -1,8 +1,8 @@
 --TEST--
 PostgreSQL sync query params
 --SKIPIF--
-<?php 
-include("skipif.inc"); 
+<?php
+include("skipif.inc");
 if (!function_exists('pg_query_params')) die('skip function pg_query_params() does not exist');
 ?>
 --FILE--
@@ -19,19 +19,19 @@ if ($version['protocol'] >= 3) {
 	{
 		echo "pg_num_row() error\n";
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_array($result, $i, PGSQL_NUM);
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_object($result);
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_row($result, $i);
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_result($result, $i, 0);
 	}
diff --git a/ext/pgsql/tests/24sync_query_prepared.phpt b/ext/pgsql/tests/24sync_query_prepared.phpt
index ea8f14661a0..ca099eb43b8 100644
--- a/ext/pgsql/tests/24sync_query_prepared.phpt
+++ b/ext/pgsql/tests/24sync_query_prepared.phpt
@@ -22,19 +22,19 @@ if ($version['protocol'] >= 3) {
 	{
 		echo "pg_num_row() error\n";
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_array($result, $i, PGSQL_NUM);
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_object($result);
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_row($result, $i);
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_result($result, $i, 0);
 	}
diff --git a/ext/pgsql/tests/25async_query_params.phpt b/ext/pgsql/tests/25async_query_params.phpt
index 6e7dafe34b3..ae1a1630efe 100644
--- a/ext/pgsql/tests/25async_query_params.phpt
+++ b/ext/pgsql/tests/25async_query_params.phpt
@@ -21,26 +21,26 @@ if ($version['protocol'] >= 3) {
 	if (pg_connection_status($db) === PGSQL_CONNECTION_BAD) {
 		echo "pg_connection_status() error\n";
 	}
-	if (!($result = pg_get_result($db))) 
+	if (!($result = pg_get_result($db)))
 	{
 		echo "pg_get_result() error\n";
 	}
 	if (!($rows = pg_num_rows($result))) {
 		echo "pg_num_rows() error\n";
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_array($result, $i, PGSQL_NUM);
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_object($result);
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_row($result, $i);
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_result($result, $i, 0);
 	}
diff --git a/ext/pgsql/tests/26async_query_prepared.phpt b/ext/pgsql/tests/26async_query_prepared.phpt
index bda363b7501..33ca7c7bfa3 100644
--- a/ext/pgsql/tests/26async_query_prepared.phpt
+++ b/ext/pgsql/tests/26async_query_prepared.phpt
@@ -21,7 +21,7 @@ if ($version['protocol'] >= 3) {
 	if (pg_connection_status($db) === PGSQL_CONNECTION_BAD) {
 		echo "pg_connection_status() error\n";
 	}
-	if (!($result = pg_get_result($db))) 
+	if (!($result = pg_get_result($db)))
 	{
 		echo "pg_get_result() error\n";
 	}
@@ -34,7 +34,7 @@ if ($version['protocol'] >= 3) {
 	if (pg_connection_status($db) === PGSQL_CONNECTION_BAD) {
 		echo "pg_connection_status() error\n";
 	}
-	if (!($result = pg_get_result($db))) 
+	if (!($result = pg_get_result($db)))
 	{
 		echo "pg_get_result() error\n";
 	}
@@ -42,19 +42,19 @@ if ($version['protocol'] >= 3) {
 	if (!($rows = pg_num_rows($result))) {
 		echo "pg_num_rows() error\n";
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_array($result, $i, PGSQL_NUM);
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_object($result);
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_row($result, $i);
 	}
-	for ($i=0; $i < $rows; $i++) 
+	for ($i=0; $i < $rows; $i++)
 	{
 		pg_fetch_result($result, $i, 0);
 	}
@@ -76,7 +76,7 @@ if ($version['protocol'] >= 3) {
 	if (pg_connection_status($db) === PGSQL_CONNECTION_BAD) {
 		echo "pg_connection_status() error\n";
 	}
-	if (!($result = pg_get_result($db))) 
+	if (!($result = pg_get_result($db)))
 	{
 		echo "pg_get_result() error\n";
 	}
@@ -90,7 +90,7 @@ if ($version['protocol'] >= 3) {
 	if (pg_connection_status($db) === PGSQL_CONNECTION_BAD) {
 		echo "pg_connection_status() error\n";
 	}
-	if (!($result = pg_get_result($db))) 
+	if (!($result = pg_get_result($db)))
 	{
 		echo "pg_get_result() error\n";
 	}
diff --git a/ext/pgsql/tests/27large_object_oid.phpt b/ext/pgsql/tests/27large_object_oid.phpt
index 0a469bc20ee..c9e33992d70 100644
--- a/ext/pgsql/tests/27large_object_oid.phpt
+++ b/ext/pgsql/tests/27large_object_oid.phpt
@@ -1,8 +1,8 @@
 --TEST--
 PostgreSQL create large object with given oid
 --SKIPIF--
-<?php 
-include("skipif.inc"); 
+<?php
+include("skipif.inc");
 $v = pg_version($conn);
 if (version_compare("8.3", $v["client"]) > 0) die("skip - requires pg client >= 8.3\n");
 if (version_compare("8.3", $v["server"]) > 0) die("skip - requires pg server >= 8.3\n");
diff --git a/ext/pgsql/tests/28large_object_import_oid.phpt b/ext/pgsql/tests/28large_object_import_oid.phpt
index 323d1796350..9ffb96123e9 100644
--- a/ext/pgsql/tests/28large_object_import_oid.phpt
+++ b/ext/pgsql/tests/28large_object_import_oid.phpt
@@ -1,8 +1,8 @@
 --TEST--
 PostgreSQL import large object with given oid
 --SKIPIF--
-<?php 
-include("skipif.inc"); 
+<?php
+include("skipif.inc");
 $v = pg_version($conn);
 if (version_compare("8.4devel", $v["client"]) > 0) die("skip - requires pg client >= 8.4\n");
 if (version_compare("8.4devel", $v["server"]) > 0) die("skip - requires pg server >= 8.4\n");
diff --git a/ext/pgsql/tests/80_bug14383.phpt b/ext/pgsql/tests/80_bug14383.phpt
index e73f0fd1fbb..97fcfe6dcb8 100644
--- a/ext/pgsql/tests/80_bug14383.phpt
+++ b/ext/pgsql/tests/80_bug14383.phpt
@@ -1,14 +1,14 @@
 --TEST--
 Bug #14383 (8.0+) (using postgres with DBA causes DBA not to be able to find any keys)
 --SKIPIF--
-<?php 
+<?php
 require_once(dirname(__FILE__).'/../../dba/tests/skipif.inc');
 require_once('skipif.inc');
 ?>
 --FILE--
 <?php
 require_once('config.inc');
-	
+
 $dbh = @pg_connect($conn_str);
 if (!$dbh) {
 	die ("Could not connect to the server");
diff --git a/ext/pgsql/tests/80_bug24499.phpt b/ext/pgsql/tests/80_bug24499.phpt
index 32e789de8d8..a9773bdafe0 100644
--- a/ext/pgsql/tests/80_bug24499.phpt
+++ b/ext/pgsql/tests/80_bug24499.phpt
@@ -1,14 +1,14 @@
 --TEST--
 Bug #24499 (Notice: Undefined property: stdClass::)
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
 ?>
 --FILE--
 <?php
 
 require_once('config.inc');
-	
+
 $dbh = @pg_connect($conn_str);
 if (!$dbh) {
 	die ("Could not connect to the server");
diff --git a/ext/pgsql/tests/80_bug27597.phpt b/ext/pgsql/tests/80_bug27597.phpt
index 7d5b5db8900..48f3e331325 100644
--- a/ext/pgsql/tests/80_bug27597.phpt
+++ b/ext/pgsql/tests/80_bug27597.phpt
@@ -1,14 +1,14 @@
 --TEST--
 Bug #27597 (pg_fetch_array not returning false)
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
 ?>
 --FILE--
 <?php
 
 require_once(dirname(__FILE__) . '/config.inc');
-	
+
 $dbh = @pg_connect($conn_str);
 if (!$dbh) {
 	die ("Could not connect to the server");
@@ -23,7 +23,7 @@ for ($i=0; $i<4; $i++) {
 
 function xi_fetch_array($res, $type = PGSQL_ASSOC) {
 	$a = pg_fetch_array($res, NULL, $type) ;
-	return $a ;	
+	return $a ;
 }
 
 $res = pg_query("SELECT * FROM id");
diff --git a/ext/pgsql/tests/80_bug32223.phpt b/ext/pgsql/tests/80_bug32223.phpt
index b9bbbf86edf..fbe0d5ff97e 100644
--- a/ext/pgsql/tests/80_bug32223.phpt
+++ b/ext/pgsql/tests/80_bug32223.phpt
@@ -1,11 +1,11 @@
 --TEST--
 Bug #32223 (weird behaviour of pg_last_notice)
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
 
 _skip_lc_messages();
-	
+
 @pg_query($conn, "CREATE LANGUAGE 'plpgsql' HANDLER plpgsql_call_handler LANCOMPILER 'PL/pgSQL'");
 $res = @pg_query($conn, "CREATE OR REPLACE FUNCTION test_notice() RETURNS boolean AS '
 begin
@@ -22,7 +22,7 @@ pgsql.ignore_notice=0
 
 require_once('config.inc');
 require_once('lcmess.inc');
-	
+
 $dbh = @pg_connect($conn_str);
 if (!$dbh) {
 	die ("Could not connect to the server");
diff --git a/ext/pgsql/tests/80_bug32223b.phpt b/ext/pgsql/tests/80_bug32223b.phpt
index 418ccfc9aeb..9e0e0f71329 100644
--- a/ext/pgsql/tests/80_bug32223b.phpt
+++ b/ext/pgsql/tests/80_bug32223b.phpt
@@ -1,11 +1,11 @@
 --TEST--
 Bug #32223 (weird behaviour of pg_last_notice using define)
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
 
 _skip_lc_messages();
-	
+
 @pg_query($conn, "CREATE LANGUAGE 'plpgsql' HANDLER plpgsql_call_handler LANCOMPILER 'PL/pgSQL'");
 $res = @pg_query($conn, "CREATE OR REPLACE FUNCTION test_notice() RETURNS boolean AS '
 begin
diff --git a/ext/pgsql/tests/80_bug36625.phpt b/ext/pgsql/tests/80_bug36625.phpt
index 87dd84adc48..86d40ce4dc2 100644
--- a/ext/pgsql/tests/80_bug36625.phpt
+++ b/ext/pgsql/tests/80_bug36625.phpt
@@ -8,7 +8,7 @@ require_once('skipif.inc');
 <?php
 
 require_once('config.inc');
-	
+
 $dbh = @pg_connect($conn_str);
 if (!$dbh) {
 	die ('Could not connect to the server');
diff --git a/ext/pgsql/tests/80_bug39971.phpt b/ext/pgsql/tests/80_bug39971.phpt
index 49f370b88d2..14c7fbd547b 100644
--- a/ext/pgsql/tests/80_bug39971.phpt
+++ b/ext/pgsql/tests/80_bug39971.phpt
@@ -1,14 +1,14 @@
 --TEST--
 Bug #39971 (8.0+) (pg_insert/pg_update do not allow now() to be used for timestamp fields)
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
 ?>
 --FILE--
 <?php
 
 require_once('config.inc');
-	
+
 $dbh = @pg_connect($conn_str);
 if (!$dbh) {
 	die ("Could not connect to the server");
diff --git a/ext/pgsql/tests/80_bug42783.phpt b/ext/pgsql/tests/80_bug42783.phpt
index 575e527db9a..91461f4b736 100644
--- a/ext/pgsql/tests/80_bug42783.phpt
+++ b/ext/pgsql/tests/80_bug42783.phpt
@@ -1,14 +1,14 @@
 --TEST--
 Bug #42783 (pg_insert() does not support an empty value array)
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
 ?>
 --FILE--
 <?php
 
 require_once('config.inc');
-	
+
 $dbh = @pg_connect($conn_str);
 if (!$dbh) {
 	die ("Could not connect to the server");
diff --git a/ext/pgsql/tests/9999dropdb.phpt b/ext/pgsql/tests/9999dropdb.phpt
index 80502e54b62..f3583a545b6 100644
--- a/ext/pgsql/tests/9999dropdb.phpt
+++ b/ext/pgsql/tests/9999dropdb.phpt
@@ -4,7 +4,7 @@ PostgreSQL drop db
 <?php include("skipif.inc"); ?>
 --FILE--
 <?php
-// drop test table 
+// drop test table
 
 include('config.inc');
 
diff --git a/ext/pgsql/tests/bug71998.phpt b/ext/pgsql/tests/bug71998.phpt
index b9924166f9a..f69261c1c07 100644
--- a/ext/pgsql/tests/bug71998.phpt
+++ b/ext/pgsql/tests/bug71998.phpt
@@ -4,7 +4,7 @@ Bug #71998 Function pg_insert does not insert when column type = inet
 <?php include("skipif.inc"); ?>
 --FILE--
 <?php
-// Kudos for the IP regex to 
+// Kudos for the IP regex to
 // http://stackoverflow.com/a/17871737/3358424
 
 include('config.inc');
@@ -55,7 +55,7 @@ $i = 0;
 $errors = 0;
 foreach ($ips as $ip) {
 	$data = array("id" => ++$i, "remote_addr" => $ip);
-	$r = @pg_insert($db, 'tmp_statistics', $data);   
+	$r = @pg_insert($db, 'tmp_statistics', $data);
 
 	if (!$r && in_array($ip, $bad)) {
 		$errors++;
diff --git a/ext/pgsql/tests/bug72197.phpt b/ext/pgsql/tests/bug72197.phpt
index 2ce15bdaf4b..6b6cc3ec67a 100644
--- a/ext/pgsql/tests/bug72197.phpt
+++ b/ext/pgsql/tests/bug72197.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #72197 pg_lo_create arbitrary read 
+Bug #72197 pg_lo_create arbitrary read
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
diff --git a/ext/phar/tests/026.phpt b/ext/phar/tests/026.phpt
index 696fbcf415a..e59a07239bc 100644
--- a/ext/phar/tests/026.phpt
+++ b/ext/phar/tests/026.phpt
@@ -11,11 +11,11 @@ $pname = 'phar://' . $fname;
 $file = "<?php __HALT_COMPILER(); ?>";
 
 $files = array();
-$files['a.php']   = '<?php echo "This is a\n"; require \''.$pname.'/b.php\'; ?>';      
-$files['b.php']   = '<?php echo "This is b\n"; require \''.$pname.'/b/c.php\'; ?>';    
-$files['b/c.php'] = '<?php echo "This is b/c\n"; require \''.$pname.'/b/d.php\'; ?>';  
-$files['b/d.php'] = '<?php echo "This is b/d\n"; require \''.$pname.'/e.php\'; ?>';    
-$files['e.php']   = '<?php echo "This is e\n"; ?>';                                  
+$files['a.php']   = '<?php echo "This is a\n"; require \''.$pname.'/b.php\'; ?>';
+$files['b.php']   = '<?php echo "This is b\n"; require \''.$pname.'/b/c.php\'; ?>';
+$files['b/c.php'] = '<?php echo "This is b/c\n"; require \''.$pname.'/b/d.php\'; ?>';
+$files['b/d.php'] = '<?php echo "This is b/d\n"; require \''.$pname.'/e.php\'; ?>';
+$files['e.php']   = '<?php echo "This is e\n"; ?>';
 
 include 'files/phar_test.inc';
 
diff --git a/ext/phar/tests/028.phpt b/ext/phar/tests/028.phpt
index 087f822777f..04324eff07a 100644
--- a/ext/phar/tests/028.phpt
+++ b/ext/phar/tests/028.phpt
@@ -12,11 +12,11 @@ $file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>';
 $alias = '';
 
 $files = array();
-$files['a.php']   = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>';      
-$files['b.php']   = '<?php echo "This is b\n"; include "'.$pname.'/b/c.php"; ?>';    
-$files['b/c.php'] = '<?php echo "This is b/c\n"; include "'.$pname.'/b/d.php"; ?>';  
-$files['b/d.php'] = '<?php echo "This is b/d\n"; include "'.$pname.'/e.php"; ?>';    
-$files['e.php']   = '<?php echo "This is e\n"; ?>';                                  
+$files['a.php']   = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>';
+$files['b.php']   = '<?php echo "This is b\n"; include "'.$pname.'/b/c.php"; ?>';
+$files['b/c.php'] = '<?php echo "This is b/c\n"; include "'.$pname.'/b/d.php"; ?>';
+$files['b/d.php'] = '<?php echo "This is b/d\n"; include "'.$pname.'/e.php"; ?>';
+$files['e.php']   = '<?php echo "This is e\n"; ?>';
 
 include 'files/phar_test.inc';
 
diff --git a/ext/phar/tests/029.phpt b/ext/phar/tests/029.phpt
index 41fcec03e7f..58eddb72735 100644
--- a/ext/phar/tests/029.phpt
+++ b/ext/phar/tests/029.phpt
@@ -14,11 +14,11 @@ $pname = 'phar://hio';
 $file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>';
 
 $files = array();
-$files['a.php']   = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>';      
-$files['b.php']   = '<?php echo "This is b\n"; include "'.$pname.'/b/c.php"; ?>';    
-$files['b/c.php'] = '<?php echo "This is b/c\n"; include "'.$pname.'/b/d.php"; ?>';  
-$files['b/d.php'] = '<?php echo "This is b/d\n"; include "'.$pname.'/e.php"; ?>';    
-$files['e.php']   = '<?php echo "This is e\n"; ?>';                                  
+$files['a.php']   = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>';
+$files['b.php']   = '<?php echo "This is b\n"; include "'.$pname.'/b/c.php"; ?>';
+$files['b/c.php'] = '<?php echo "This is b/c\n"; include "'.$pname.'/b/d.php"; ?>';
+$files['b/d.php'] = '<?php echo "This is b/d\n"; include "'.$pname.'/e.php"; ?>';
+$files['e.php']   = '<?php echo "This is e\n"; ?>';
 
 include 'files/phar_test.inc';
 
@@ -39,7 +39,7 @@ catch (Exception $e)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php');
 ?>
diff --git a/ext/phar/tests/030.phpt b/ext/phar/tests/030.phpt
index e1e94dba80d..d8907571cfe 100644
--- a/ext/phar/tests/030.phpt
+++ b/ext/phar/tests/030.phpt
@@ -34,7 +34,7 @@ echo $e->getMessage(),"\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/031.phpt b/ext/phar/tests/031.phpt
index d458f068f55..ec44624d3f5 100644
--- a/ext/phar/tests/031.phpt
+++ b/ext/phar/tests/031.phpt
@@ -21,7 +21,7 @@ require $pname;
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/031.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/032.phpt b/ext/phar/tests/032.phpt
index 4df6cc32b09..5e5d759c623 100644
--- a/ext/phar/tests/032.phpt
+++ b/ext/phar/tests/032.phpt
@@ -20,7 +20,7 @@ echo $e->getMessage();
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/032.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/033.phpt b/ext/phar/tests/033.phpt
index d53c7f52fa8..a0b1f659f57 100644
--- a/ext/phar/tests/033.phpt
+++ b/ext/phar/tests/033.phpt
@@ -32,7 +32,7 @@ var_dump($a['dir']->isReadable());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php');
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/033a.phpt b/ext/phar/tests/033a.phpt
index e8725bdda63..8dcdfc40744 100644
--- a/ext/phar/tests/033a.phpt
+++ b/ext/phar/tests/033a.phpt
@@ -27,7 +27,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php');
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/bug13727.phpt b/ext/phar/tests/bug13727.phpt
index e742b955d7c..4996c2eb21e 100644
--- a/ext/phar/tests/bug13727.phpt
+++ b/ext/phar/tests/bug13727.phpt
@@ -19,17 +19,17 @@ for ($i = 0; $i < 4*1024; $i++){
 	mkdir($fileDir, 0777, true);
 	file_put_contents("$fileDir/$i", "");
 	$p->addFile("$fileDir/$i", "$dirName");
-} 	
+}
 echo("\n Written Files($i)\n");
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 $dirName = dirname(__FILE__);
 $fileDir="$dirName/test_data";
 for ($i = 0; $i < 4*1024; $i++){
 	unlink("$fileDir/$i");
-} 	
+}
 rmdir($fileDir);
 unlink($dirName . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 __HALT_COMPILER();
diff --git a/ext/phar/tests/bug45218_SLOWTEST.phpt b/ext/phar/tests/bug45218_SLOWTEST.phpt
index aa98eb2339c..28db3de7b53 100644
--- a/ext/phar/tests/bug45218_SLOWTEST.phpt
+++ b/ext/phar/tests/bug45218_SLOWTEST.phpt
@@ -53,7 +53,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.txt');
 __halt_compiler();
diff --git a/ext/phar/tests/bug46060.phpt b/ext/phar/tests/bug46060.phpt
index 1ca346ea192..e4ecf9fd6ed 100644
--- a/ext/phar/tests/bug46060.phpt
+++ b/ext/phar/tests/bug46060.phpt
@@ -21,7 +21,7 @@ var_dump($phar['blah']->isDir(), $phar['test']->isDir());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.tar');
 __HALT_COMPILER();
diff --git a/ext/phar/tests/bug53872.phpt b/ext/phar/tests/bug53872.phpt
index 2fc55d9155a..a3745a20cb1 100644
--- a/ext/phar/tests/bug53872.phpt
+++ b/ext/phar/tests/bug53872.phpt
@@ -1,9 +1,9 @@
 --TEST--
 bug#53872 (internal corruption of phar)
 --SKIPIF--
-<?php 
-if (!extension_loaded("phar")) die("skip"); 
-if (!extension_loaded("zlib")) die("skip Test needs ext/zlib"); 
+<?php
+if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("zlib")) die("skip Test needs ext/zlib");
 ?>
 --INI--
 phar.readonly=0
diff --git a/ext/phar/tests/bug64931/bug64931.phpt b/ext/phar/tests/bug64931/bug64931.phpt
index 630746cdf88..4439fcf792f 100644
--- a/ext/phar/tests/bug64931/bug64931.phpt
+++ b/ext/phar/tests/bug64931/bug64931.phpt
@@ -5,7 +5,7 @@ Bug #64931 (phar_add_file is too restrictive on filename)
 --INI--
 phar.readonly=0
 --FILE--
-<?php 
+<?php
 
 echo "Test\n";
 
diff --git a/ext/phar/tests/bug65028.phpt b/ext/phar/tests/bug65028.phpt
index 74273b850b0..d62f3c2b72f 100644
--- a/ext/phar/tests/bug65028.phpt
+++ b/ext/phar/tests/bug65028.phpt
@@ -122,7 +122,7 @@ $files = array(
 	"style/Fusonic/40components.css",
 	"style/_emptyDirectory",
 	"index.php",
-//	"a", // This will make the test pass	
+//	"a", // This will make the test pass
 );
 
 // Create Phar with the filenames above
diff --git a/ext/phar/tests/bug69958.phpt b/ext/phar/tests/bug69958.phpt
index 96f2198b144..6df1178befb 100644
--- a/ext/phar/tests/bug69958.phpt
+++ b/ext/phar/tests/bug69958.phpt
@@ -7,7 +7,7 @@ Still has memory leaks, see https://bugs.php.net/bug.php?id=70005
 --FILE--
 <?php
 $tarphar = new PharData(__DIR__.'/bug69958.tar');
-$phar = $tarphar->convertToData(Phar::TAR); 
+$phar = $tarphar->convertToData(Phar::TAR);
 --EXPECTF--
 Fatal error: Uncaught exception 'BadMethodCallException' with message 'phar "%s/bug69958.tar" exists and must be unlinked prior to conversion' in %s/bug69958.php:%d
 Stack trace:
diff --git a/ext/phar/tests/bug70019.phpt b/ext/phar/tests/bug70019.phpt
index 85bf1780aa4..6ada368707f 100644
--- a/ext/phar/tests/bug70019.phpt
+++ b/ext/phar/tests/bug70019.phpt
@@ -9,7 +9,7 @@ $phar = new PharData(__DIR__."/bug70019.zip");
 if(!is_dir($dir)) {
   mkdir($dir);
 }
-$phar->extractTo($dir); 
+$phar->extractTo($dir);
 var_dump(file_exists("$dir/ThisIsATestFile.txt"));
 ?>
 ===DONE===
diff --git a/ext/phar/tests/bug71391.phpt b/ext/phar/tests/bug71391.phpt
index b8d84f53759..6965aaaa30f 100644
--- a/ext/phar/tests/bug71391.phpt
+++ b/ext/phar/tests/bug71391.phpt
@@ -11,7 +11,7 @@ $p->delMetaData();
 ?>
 DONE
 --CLEAN--
-<?php 
+<?php
 unlink(__DIR__."/bug71391.test.tar");
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/bug71625.phpt b/ext/phar/tests/bug71625.phpt
index 8e6c31f4627..afdf56e8ad6 100644
--- a/ext/phar/tests/bug71625.phpt
+++ b/ext/phar/tests/bug71625.phpt
@@ -3,7 +3,7 @@ Phar - Bug #71625 - Crash in php7.dll
 --INI--
 phar.readonly=0
 --SKIPIF--
-<?php 
+<?php
 
 if (!extension_loaded("phar") || !extension_loaded("zlib")) die("skip");
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt
index 3449b07fc63..e3f7be856ca 100644
--- a/ext/phar/tests/create_path_error.phpt
+++ b/ext/phar/tests/create_path_error.phpt
@@ -29,7 +29,7 @@ set_error_handler('error_handler');
 
 $count = 0;
 $checks = array(
-    '/', '.', '../', 'a/..', 'a/', 'b//a.php', 
+    '/', '.', '../', 'a/..', 'a/', 'b//a.php',
     "Font\xE5\x84\xB7\xE9\xBB\x91pro.ttf", //two valid multi-byte characters
     "\xF0\x9F\x98\x8D.ttf", // valid 4 byte char - smiling face with heart-shaped eyes
     "Font\xE9\xBBpro.ttf", //Invalid multi-byte character - missing last byte
diff --git a/ext/phar/tests/mkdir.phpt b/ext/phar/tests/mkdir.phpt
index 45c1d4674f5..527d77547cb 100644
--- a/ext/phar/tests/mkdir.phpt
+++ b/ext/phar/tests/mkdir.phpt
@@ -27,7 +27,7 @@ echo $e->getMessage(),"\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_begin_setstub_commit.phpt b/ext/phar/tests/phar_begin_setstub_commit.phpt
index 880bd53f3ad..029870a45be 100644
--- a/ext/phar/tests/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/phar_begin_setstub_commit.phpt
@@ -31,7 +31,7 @@ var_dump($p->getStub());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/brandnewphar.phar');
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/phar_buildfromdirectory1.phpt b/ext/phar/tests/phar_buildfromdirectory1.phpt
index 957f246664f..93fdf2922df 100644
--- a/ext/phar/tests/phar_buildfromdirectory1.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory1.phpt
@@ -18,7 +18,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromdirectory1.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_buildfromdirectory2-win.phpt b/ext/phar/tests/phar_buildfromdirectory2-win.phpt
index 5ed890a48bf..b49b78d7c8a 100644
--- a/ext/phar/tests/phar_buildfromdirectory2-win.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory2-win.phpt
@@ -20,7 +20,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromdirectory2.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_buildfromdirectory2.phpt b/ext/phar/tests/phar_buildfromdirectory2.phpt
index a33e50abbb0..c98e8c2ffe6 100644
--- a/ext/phar/tests/phar_buildfromdirectory2.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory2.phpt
@@ -20,7 +20,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromdirectory2.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_buildfromdirectory3.phpt b/ext/phar/tests/phar_buildfromdirectory3.phpt
index 921e39593dd..ba2103a7571 100644
--- a/ext/phar/tests/phar_buildfromdirectory3.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory3.phpt
@@ -18,7 +18,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromdirectory3.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_buildfromdirectory4.phpt b/ext/phar/tests/phar_buildfromdirectory4.phpt
index 5ee2c33871a..16072ef8f71 100644
--- a/ext/phar/tests/phar_buildfromdirectory4.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory4.phpt
@@ -29,7 +29,7 @@ var_dump(file_exists(dirname(__FILE__) . '/buildfromdirectory4.phar'));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromdirectory4.phar');
 foreach(range(1, 4) as $i) {
     unlink(dirname(__FILE__) . "/testdir4/file$i.txt");
diff --git a/ext/phar/tests/phar_buildfromdirectory5.phpt b/ext/phar/tests/phar_buildfromdirectory5.phpt
index f20c52ab91f..60567506699 100644
--- a/ext/phar/tests/phar_buildfromdirectory5.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory5.phpt
@@ -28,7 +28,7 @@ var_dump(file_exists(dirname(__FILE__) . '/buildfromdirectory5.phar'));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromdirectory5.phar');
 foreach(range(1, 4) as $i) {
     unlink(dirname(__FILE__) . "/testdir5/file$i.txt");
diff --git a/ext/phar/tests/phar_buildfromdirectory6.phpt b/ext/phar/tests/phar_buildfromdirectory6.phpt
index 5537ebac235..5015ce42bd8 100644
--- a/ext/phar/tests/phar_buildfromdirectory6.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory6.phpt
@@ -26,7 +26,7 @@ var_dump(file_exists(dirname(__FILE__) . '/buildfromdirectory6.phar'));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromdirectory6.phar');
 foreach(range(1, 4) as $i) {
     unlink(dirname(__FILE__) . "/testdir6/file$i.txt");
diff --git a/ext/phar/tests/phar_buildfromiterator1.phpt b/ext/phar/tests/phar_buildfromiterator1.phpt
index 0f656b64f20..7a67ea70730 100644
--- a/ext/phar/tests/phar_buildfromiterator1.phpt
+++ b/ext/phar/tests/phar_buildfromiterator1.phpt
@@ -18,7 +18,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator1.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_buildfromiterator10.phpt b/ext/phar/tests/phar_buildfromiterator10.phpt
index e6b9c025da8..69c2704c3f7 100644
--- a/ext/phar/tests/phar_buildfromiterator10.phpt
+++ b/ext/phar/tests/phar_buildfromiterator10.phpt
@@ -24,7 +24,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator10.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_buildfromiterator2.phpt b/ext/phar/tests/phar_buildfromiterator2.phpt
index e9dd26e9de0..c6669e05557 100644
--- a/ext/phar/tests/phar_buildfromiterator2.phpt
+++ b/ext/phar/tests/phar_buildfromiterator2.phpt
@@ -17,7 +17,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator2.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_buildfromiterator3.phpt b/ext/phar/tests/phar_buildfromiterator3.phpt
index 16036312783..8537fe3ef7e 100644
--- a/ext/phar/tests/phar_buildfromiterator3.phpt
+++ b/ext/phar/tests/phar_buildfromiterator3.phpt
@@ -45,7 +45,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator3.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_buildfromiterator4.phpt b/ext/phar/tests/phar_buildfromiterator4.phpt
index 9277db562b4..9268d033f29 100644
--- a/ext/phar/tests/phar_buildfromiterator4.phpt
+++ b/ext/phar/tests/phar_buildfromiterator4.phpt
@@ -53,7 +53,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator4.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_buildfromiterator5.phpt b/ext/phar/tests/phar_buildfromiterator5.phpt
index b6fafec6f4f..0b9bbde3a99 100644
--- a/ext/phar/tests/phar_buildfromiterator5.phpt
+++ b/ext/phar/tests/phar_buildfromiterator5.phpt
@@ -46,7 +46,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator5.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_buildfromiterator6.phpt b/ext/phar/tests/phar_buildfromiterator6.phpt
index 3a315fae4dc..7167e5c743f 100644
--- a/ext/phar/tests/phar_buildfromiterator6.phpt
+++ b/ext/phar/tests/phar_buildfromiterator6.phpt
@@ -46,7 +46,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator6.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_buildfromiterator7.phpt b/ext/phar/tests/phar_buildfromiterator7.phpt
index 3dd8fc1b001..029204fe6f9 100644
--- a/ext/phar/tests/phar_buildfromiterator7.phpt
+++ b/ext/phar/tests/phar_buildfromiterator7.phpt
@@ -46,7 +46,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator7.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_buildfromiterator8.phpt b/ext/phar/tests/phar_buildfromiterator8.phpt
index de37ee86878..783cad2196f 100644
--- a/ext/phar/tests/phar_buildfromiterator8.phpt
+++ b/ext/phar/tests/phar_buildfromiterator8.phpt
@@ -19,7 +19,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator8.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_buildfromiterator9.phpt b/ext/phar/tests/phar_buildfromiterator9.phpt
index 2c9306b6cc8..04328dca91b 100644
--- a/ext/phar/tests/phar_buildfromiterator9.phpt
+++ b/ext/phar/tests/phar_buildfromiterator9.phpt
@@ -47,7 +47,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator9.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_commitwrite.phpt b/ext/phar/tests/phar_commitwrite.phpt
index cd9e52f36f6..86578754d97 100644
--- a/ext/phar/tests/phar_commitwrite.phpt
+++ b/ext/phar/tests/phar_commitwrite.phpt
@@ -24,7 +24,7 @@ var_dump($p->getStub());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/brandnewphar.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_convert_repeated.phpt b/ext/phar/tests/phar_convert_repeated.phpt
index 351e54af044..4ccf84fa6d3 100644
--- a/ext/phar/tests/phar_convert_repeated.phpt
+++ b/ext/phar/tests/phar_convert_repeated.phpt
@@ -87,7 +87,7 @@ var_dump($phar->getAlias());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
diff --git a/ext/phar/tests/phar_convert_tar.phpt b/ext/phar/tests/phar_convert_tar.phpt
index d4031ec32f4..c3f047d977a 100644
--- a/ext/phar/tests/phar_convert_tar.phpt
+++ b/ext/phar/tests/phar_convert_tar.phpt
@@ -39,7 +39,7 @@ var_dump($phar->getStub());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar');
diff --git a/ext/phar/tests/phar_convert_tar2.phpt b/ext/phar/tests/phar_convert_tar2.phpt
index f0f0f698258..7160c52fbb9 100644
--- a/ext/phar/tests/phar_convert_tar2.phpt
+++ b/ext/phar/tests/phar_convert_tar2.phpt
@@ -43,7 +43,7 @@ var_dump($phar->getStub());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.gz');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar');
diff --git a/ext/phar/tests/phar_convert_tar3.phpt b/ext/phar/tests/phar_convert_tar3.phpt
index 52fd0f555a9..7a958057874 100644
--- a/ext/phar/tests/phar_convert_tar3.phpt
+++ b/ext/phar/tests/phar_convert_tar3.phpt
@@ -43,7 +43,7 @@ var_dump($phar->getStub());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.bz2');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
diff --git a/ext/phar/tests/phar_convert_zip.phpt b/ext/phar/tests/phar_convert_zip.phpt
index 734551ee9c2..b17ccaa35ed 100644
--- a/ext/phar/tests/phar_convert_zip.phpt
+++ b/ext/phar/tests/phar_convert_zip.phpt
@@ -38,7 +38,7 @@ var_dump($phar->getStub());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip');
diff --git a/ext/phar/tests/phar_create_in_cwd.phpt b/ext/phar/tests/phar_create_in_cwd.phpt
index cafc8a1cfb0..78dd1b39e76 100644
--- a/ext/phar/tests/phar_create_in_cwd.phpt
+++ b/ext/phar/tests/phar_create_in_cwd.phpt
@@ -28,7 +28,7 @@ __HALT_COMPILER();
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/brandnewphar.phar');
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/phar_ctx_001.phpt b/ext/phar/tests/phar_ctx_001.phpt
index 13b4d6a7812..197c7628d88 100644
--- a/ext/phar/tests/phar_ctx_001.phpt
+++ b/ext/phar/tests/phar_ctx_001.phpt
@@ -60,7 +60,7 @@ var_dump($phar['b']->getMetaData());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/phar_decompress.phpt b/ext/phar/tests/phar_decompress.phpt
index abf385a68f1..3344d9bbbd4 100644
--- a/ext/phar/tests/phar_decompress.phpt
+++ b/ext/phar/tests/phar_decompress.phpt
@@ -48,7 +48,7 @@ echo $e->getMessage() . "\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.zip');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.hooba.phar');
diff --git a/ext/phar/tests/phar_dir_iterate.phpt b/ext/phar/tests/phar_dir_iterate.phpt
index 04968f28b5b..b2c0639843f 100644
--- a/ext/phar/tests/phar_dir_iterate.phpt
+++ b/ext/phar/tests/phar_dir_iterate.phpt
@@ -21,7 +21,7 @@ foreach (new RecursiveIteratorIterator($newphar) as $path => $obj) {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_magic.phpt b/ext/phar/tests/phar_magic.phpt
index f6a0a675ef0..f0d87a72419 100644
--- a/ext/phar/tests/phar_magic.phpt
+++ b/ext/phar/tests/phar_magic.phpt
@@ -20,7 +20,7 @@ include $fname;
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_oo_001.phpt b/ext/phar/tests/phar_oo_001.phpt
index f40e678d955..98e9992b5f1 100644
--- a/ext/phar/tests/phar_oo_001.phpt
+++ b/ext/phar/tests/phar_oo_001.phpt
@@ -44,7 +44,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_001.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_002.phpt b/ext/phar/tests/phar_oo_002.phpt
index 269d9e5b0c2..1a4c4e40e7f 100644
--- a/ext/phar/tests/phar_oo_002.phpt
+++ b/ext/phar/tests/phar_oo_002.phpt
@@ -48,7 +48,7 @@ foreach(new RecursiveIteratorIterator($phar) as $name => $ent)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_002.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_003.phpt b/ext/phar/tests/phar_oo_003.phpt
index 43957926324..b1596b5fe58 100644
--- a/ext/phar/tests/phar_oo_003.phpt
+++ b/ext/phar/tests/phar_oo_003.phpt
@@ -26,7 +26,7 @@ foreach($phar as $name => $ent)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_003.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_004.phpt b/ext/phar/tests/phar_oo_004.phpt
index 3fc18dc65c8..118e3b0c1f2 100644
--- a/ext/phar/tests/phar_oo_004.phpt
+++ b/ext/phar/tests/phar_oo_004.phpt
@@ -76,7 +76,7 @@ foreach($it as $name => $ent)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_004.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt
index 7bc1db61d13..8da8a541c30 100644
--- a/ext/phar/tests/phar_oo_005.phpt
+++ b/ext/phar/tests/phar_oo_005.phpt
@@ -29,7 +29,7 @@ foreach($it as $name => $ent)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_005.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_006.phpt b/ext/phar/tests/phar_oo_006.phpt
index 5d1d7052066..485d015f3ef 100644
--- a/ext/phar/tests/phar_oo_006.phpt
+++ b/ext/phar/tests/phar_oo_006.phpt
@@ -37,7 +37,7 @@ echo $phar['b.php']->getFilename() . "\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_006.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_007.phpt b/ext/phar/tests/phar_oo_007.phpt
index d0b5aa5ecae..d7048350ffa 100644
--- a/ext/phar/tests/phar_oo_007.phpt
+++ b/ext/phar/tests/phar_oo_007.phpt
@@ -58,7 +58,7 @@ var_dump($f->eof());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_007.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_008.phpt b/ext/phar/tests/phar_oo_008.phpt
index d95af571b3c..543a5d19135 100644
--- a/ext/phar/tests/phar_oo_008.phpt
+++ b/ext/phar/tests/phar_oo_008.phpt
@@ -82,7 +82,7 @@ foreach($v as $k => $d)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_008.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_009.phpt b/ext/phar/tests/phar_oo_009.phpt
index 3c842fabeda..56d547a042a 100644
--- a/ext/phar/tests/phar_oo_009.phpt
+++ b/ext/phar/tests/phar_oo_009.phpt
@@ -35,7 +35,7 @@ foreach($f as $k => $v)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_009.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_010.phpt b/ext/phar/tests/phar_oo_010.phpt
index 331d300a8c6..667971ae251 100644
--- a/ext/phar/tests/phar_oo_010.phpt
+++ b/ext/phar/tests/phar_oo_010.phpt
@@ -35,7 +35,7 @@ var_dump(isset($phar['b']));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_010.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_011.phpt b/ext/phar/tests/phar_oo_011.phpt
index 01fa9f01e6e..d99dd21c9c6 100644
--- a/ext/phar/tests/phar_oo_011.phpt
+++ b/ext/phar/tests/phar_oo_011.phpt
@@ -25,7 +25,7 @@ echo "\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_011.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_011b.phpt b/ext/phar/tests/phar_oo_011b.phpt
index 34cae0e760b..0ce2dca7b61 100644
--- a/ext/phar/tests/phar_oo_011b.phpt
+++ b/ext/phar/tests/phar_oo_011b.phpt
@@ -12,11 +12,11 @@ phar.require_hash=0
 try
 {
 	$pharconfig = 0;
-	
+
 	require_once 'files/phar_oo_test.inc';
-	
+
 	$phar = new Phar($fname);
-	
+
 	$phar['f.php'] = 'hi';
 	var_dump(isset($phar['f.php']));
 	echo $phar['f.php'];
@@ -30,7 +30,7 @@ catch (BadMethodCallException $e)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_011b.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_012.phpt b/ext/phar/tests/phar_oo_012.phpt
index b6f9f44b1e1..2c8f089376b 100644
--- a/ext/phar/tests/phar_oo_012.phpt
+++ b/ext/phar/tests/phar_oo_012.phpt
@@ -26,7 +26,7 @@ var_dump(isset($phar['f.php']));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_012.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_012_confirm.phpt b/ext/phar/tests/phar_oo_012_confirm.phpt
index ce5a58f212d..9264c7ce932 100644
--- a/ext/phar/tests/phar_oo_012_confirm.phpt
+++ b/ext/phar/tests/phar_oo_012_confirm.phpt
@@ -29,7 +29,7 @@ var_dump(isset($phar['f.php']));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_012_confirm.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_012b.phpt b/ext/phar/tests/phar_oo_012b.phpt
index 066d3bc0687..1c06f6631a8 100644
--- a/ext/phar/tests/phar_oo_012b.phpt
+++ b/ext/phar/tests/phar_oo_012b.phpt
@@ -14,10 +14,10 @@ try
 	$pharconfig = 0;
 
 	require_once 'files/phar_oo_test.inc';
-	
+
 	$phar = new Phar($fname);
 	$phar->setInfoClass('SplFileObject');
-	
+
 	$phar['f.php'] = 'hi';
 	var_dump(isset($phar['f.php']));
 	echo $phar['f.php'];
@@ -33,7 +33,7 @@ catch (BadMethodCallException $e)
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_012b.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_compressallbz2.phpt b/ext/phar/tests/phar_oo_compressallbz2.phpt
index 3f52227194f..ed6314e146e 100644
--- a/ext/phar/tests/phar_oo_compressallbz2.phpt
+++ b/ext/phar/tests/phar_oo_compressallbz2.phpt
@@ -43,7 +43,7 @@ var_dump($phar['b']->isCompressed(Phar::BZ2));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>
diff --git a/ext/phar/tests/phar_oo_compressallgz.phpt b/ext/phar/tests/phar_oo_compressallgz.phpt
index 55e7435f951..1d45e5b4d0b 100644
--- a/ext/phar/tests/phar_oo_compressallgz.phpt
+++ b/ext/phar/tests/phar_oo_compressallgz.phpt
@@ -47,7 +47,7 @@ echo $e->getMessage() . "\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>
diff --git a/ext/phar/tests/phar_oo_compressed_001.phpt b/ext/phar/tests/phar_oo_compressed_001.phpt
index af02012573e..e049697d973 100644
--- a/ext/phar/tests/phar_oo_compressed_001.phpt
+++ b/ext/phar/tests/phar_oo_compressed_001.phpt
@@ -47,7 +47,7 @@ var_dump($phar['d']->isCompressed());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/phar_oo_compressed_001b.phpt b/ext/phar/tests/phar_oo_compressed_001b.phpt
index 6d4c7328622..c3b15f5cf17 100644
--- a/ext/phar/tests/phar_oo_compressed_001b.phpt
+++ b/ext/phar/tests/phar_oo_compressed_001b.phpt
@@ -47,7 +47,7 @@ var_dump($phar['d']->isCompressed());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/phar_oo_compressed_002.phpt b/ext/phar/tests/phar_oo_compressed_002.phpt
index d03d6f1a989..c3254308257 100644
--- a/ext/phar/tests/phar_oo_compressed_002.phpt
+++ b/ext/phar/tests/phar_oo_compressed_002.phpt
@@ -50,7 +50,7 @@ var_dump($phar['e']->isCompressed());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/phar_oo_compressed_002b.phpt b/ext/phar/tests/phar_oo_compressed_002b.phpt
index 0e167012b76..f4d40755060 100644
--- a/ext/phar/tests/phar_oo_compressed_002b.phpt
+++ b/ext/phar/tests/phar_oo_compressed_002b.phpt
@@ -50,7 +50,7 @@ var_dump($phar['e']->isCompressed());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/phar_oo_getcontents.phpt b/ext/phar/tests/phar_oo_getcontents.phpt
index e42bca46fcf..c3bb3a53c6b 100644
--- a/ext/phar/tests/phar_oo_getcontents.phpt
+++ b/ext/phar/tests/phar_oo_getcontents.phpt
@@ -27,7 +27,7 @@ echo $e->getMessage(), "\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_getcontentsgz.phpt b/ext/phar/tests/phar_oo_getcontentsgz.phpt
index a480a696377..2f6ceb8cd4d 100644
--- a/ext/phar/tests/phar_oo_getcontentsgz.phpt
+++ b/ext/phar/tests/phar_oo_getcontentsgz.phpt
@@ -22,7 +22,7 @@ echo $phar2['a']->getContent() . "\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php');
 __halt_compiler();
diff --git a/ext/phar/tests/phar_oo_getmodified.phpt b/ext/phar/tests/phar_oo_getmodified.phpt
index d531393281b..27a52c09f3d 100644
--- a/ext/phar/tests/phar_oo_getmodified.phpt
+++ b/ext/phar/tests/phar_oo_getmodified.phpt
@@ -26,7 +26,7 @@ var_dump($phar->getModified());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>
diff --git a/ext/phar/tests/phar_oo_iswriteable.phpt b/ext/phar/tests/phar_oo_iswriteable.phpt
index 9fbca2c9eac..8da3ca9e78a 100644
--- a/ext/phar/tests/phar_oo_iswriteable.phpt
+++ b/ext/phar/tests/phar_oo_iswriteable.phpt
@@ -58,7 +58,7 @@ chmod($fname2, 0666);
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.phar.php');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar');
 ?>
diff --git a/ext/phar/tests/phar_oo_nosig.phpt b/ext/phar/tests/phar_oo_nosig.phpt
index d99222e12ce..de16a35e65d 100644
--- a/ext/phar/tests/phar_oo_nosig.phpt
+++ b/ext/phar/tests/phar_oo_nosig.phpt
@@ -15,7 +15,7 @@ var_dump($phar->getSignature());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
diff --git a/ext/phar/tests/phar_oo_uncompressall.phpt b/ext/phar/tests/phar_oo_uncompressall.phpt
index 19cf953197b..278572e69a7 100644
--- a/ext/phar/tests/phar_oo_uncompressall.phpt
+++ b/ext/phar/tests/phar_oo_uncompressall.phpt
@@ -51,7 +51,7 @@ var_dump($phar['a']->isCompressed());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 ?>
diff --git a/ext/phar/tests/phar_setalias.phpt b/ext/phar/tests/phar_setalias.phpt
index ef9fa283d5b..14990d0300f 100644
--- a/ext/phar/tests/phar_setalias.phpt
+++ b/ext/phar/tests/phar_setalias.phpt
@@ -25,7 +25,7 @@ echo $phar->getAlias() . "\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php');
 __HALT_COMPILER();
diff --git a/ext/phar/tests/phar_setalias2.phpt b/ext/phar/tests/phar_setalias2.phpt
index 901e4d2ebd5..d9c763333fd 100644
--- a/ext/phar/tests/phar_setalias2.phpt
+++ b/ext/phar/tests/phar_setalias2.phpt
@@ -37,7 +37,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php');
 unlink(dirname(__FILE__) . '/notphar.phar');
diff --git a/ext/phar/tests/phar_setdefaultstub.phpt b/ext/phar/tests/phar_setdefaultstub.phpt
index fc7143af7b8..19136853132 100644
--- a/ext/phar/tests/phar_setdefaultstub.phpt
+++ b/ext/phar/tests/phar_setdefaultstub.phpt
@@ -50,7 +50,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/phar_setsignaturealgo1.phpt b/ext/phar/tests/phar_setsignaturealgo1.phpt
index eacee7bb808..a6d59ff4702 100644
--- a/ext/phar/tests/phar_setsignaturealgo1.phpt
+++ b/ext/phar/tests/phar_setsignaturealgo1.phpt
@@ -37,7 +37,7 @@ echo $e->getMessage();
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/brandnewphar.phar');
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/phar_stub.phpt b/ext/phar/tests/phar_stub.phpt
index ed306816e2d..8dfd50ae6e1 100644
--- a/ext/phar/tests/phar_stub.phpt
+++ b/ext/phar/tests/phar_stub.phpt
@@ -77,7 +77,7 @@ fclose($fp);
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php');
 __HALT_COMPILER();
diff --git a/ext/phar/tests/phar_stub_error.phpt b/ext/phar/tests/phar_stub_error.phpt
index 99f313bc2ff..8e57692ab43 100644
--- a/ext/phar/tests/phar_stub_error.phpt
+++ b/ext/phar/tests/phar_stub_error.phpt
@@ -40,7 +40,7 @@ var_dump($phar->getStub() == $stub);
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_stub_write.phpt b/ext/phar/tests/phar_stub_write.phpt
index 9e5d6d56352..dd0f35d2953 100644
--- a/ext/phar/tests/phar_stub_write.phpt
+++ b/ext/phar/tests/phar_stub_write.phpt
@@ -43,7 +43,7 @@ var_dump($phar->getStub() == $sexp);
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_stub_write_file.phpt b/ext/phar/tests/phar_stub_write_file.phpt
index c5a0a1eba90..3c0d72259f1 100644
--- a/ext/phar/tests/phar_stub_write_file.phpt
+++ b/ext/phar/tests/phar_stub_write_file.phpt
@@ -44,7 +44,7 @@ var_dump($phar->getStub() == $sexp);
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/phar_unlinkarchive.phpt b/ext/phar/tests/phar_unlinkarchive.phpt
index 2f441bace50..98001fcbf08 100644
--- a/ext/phar/tests/phar_unlinkarchive.phpt
+++ b/ext/phar/tests/phar_unlinkarchive.phpt
@@ -78,7 +78,7 @@ include $pname . '/evil.php';
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip');
diff --git a/ext/phar/tests/tar/033.phpt b/ext/phar/tests/tar/033.phpt
index 29223e49e33..0c39b0be93c 100644
--- a/ext/phar/tests/tar/033.phpt
+++ b/ext/phar/tests/tar/033.phpt
@@ -36,7 +36,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/tar/033a.phpt b/ext/phar/tests/tar/033a.phpt
index 09b5446aecb..09c2f3add1a 100644
--- a/ext/phar/tests/tar/033a.phpt
+++ b/ext/phar/tests/tar/033a.phpt
@@ -36,7 +36,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/tar/bug67761.phpt b/ext/phar/tests/tar/bug67761.phpt
index 860213d28e5..0686881118e 100644
--- a/ext/phar/tests/tar/bug67761.phpt
+++ b/ext/phar/tests/tar/bug67761.phpt
@@ -3,7 +3,7 @@ Bug #67761 (Phar::mapPhar fails for Phars inside a path containing ".tar")
 --SKIPIF--
 <?php extension_loaded("phar") or die("SKIP need ext/phar suppport"); ?>
 --FILE--
-<?php 
+<?php
 
 echo "Test\n";
 
diff --git a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
index 1ef19ab1302..d362637cc6f 100644
--- a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
@@ -31,7 +31,7 @@ var_dump($p->getStub());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/brandnewphar.phar.tar');
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/tar/phar_buildfromiterator4.phpt b/ext/phar/tests/tar/phar_buildfromiterator4.phpt
index b7d6d56f64d..051b3c2978b 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator4.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator4.phpt
@@ -47,7 +47,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator.phar.tar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/tar/phar_buildfromiterator5.phpt b/ext/phar/tests/tar/phar_buildfromiterator5.phpt
index 54972cbb0b7..dcb610fb1e4 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator5.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator5.phpt
@@ -46,7 +46,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator.phar.tar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/tar/phar_buildfromiterator6.phpt b/ext/phar/tests/tar/phar_buildfromiterator6.phpt
index 408775cd756..927ebec7383 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator6.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator6.phpt
@@ -46,7 +46,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator.phar.tar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/tar/phar_buildfromiterator7.phpt b/ext/phar/tests/tar/phar_buildfromiterator7.phpt
index 65084f3724d..f123c10e813 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator7.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator7.phpt
@@ -46,7 +46,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator.phar.tar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/tar/phar_buildfromiterator8.phpt b/ext/phar/tests/tar/phar_buildfromiterator8.phpt
index f42640f692c..c2fcd1d264a 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator8.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator8.phpt
@@ -20,7 +20,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator.phar.tar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/tar/phar_buildfromiterator9.phpt b/ext/phar/tests/tar/phar_buildfromiterator9.phpt
index f9deef4d9fd..d6be8fd9bc3 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator9.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator9.phpt
@@ -47,7 +47,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator.phar.tar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/tar/phar_commitwrite.phpt b/ext/phar/tests/tar/phar_commitwrite.phpt
index bfbac61a91f..cdfc449c1c7 100644
--- a/ext/phar/tests/tar/phar_commitwrite.phpt
+++ b/ext/phar/tests/tar/phar_commitwrite.phpt
@@ -25,7 +25,7 @@ var_dump($p->isFileFormat(Phar::TAR));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/brandnewphar.phar.tar');
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/tar/phar_convert_phar.phpt b/ext/phar/tests/tar/phar_convert_phar.phpt
index c827c218edf..df13006d793 100644
--- a/ext/phar/tests/tar/phar_convert_phar.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar.phpt
@@ -37,7 +37,7 @@ var_dump(strlen($phar->getStub()));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar');
diff --git a/ext/phar/tests/tar/phar_convert_phar2.phpt b/ext/phar/tests/tar/phar_convert_phar2.phpt
index e21a9843a55..1117a752605 100644
--- a/ext/phar/tests/tar/phar_convert_phar2.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar2.phpt
@@ -39,7 +39,7 @@ var_dump(strlen($phar->getStub()));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.gz');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
diff --git a/ext/phar/tests/tar/phar_convert_phar3.phpt b/ext/phar/tests/tar/phar_convert_phar3.phpt
index 39cf120d2d2..762473f961b 100644
--- a/ext/phar/tests/tar/phar_convert_phar3.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar3.phpt
@@ -39,7 +39,7 @@ var_dump(strlen($phar->getStub()));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.bz2');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
diff --git a/ext/phar/tests/tar/phar_convert_phar4.phpt b/ext/phar/tests/tar/phar_convert_phar4.phpt
index 3ad27dcbc87..7c4c9ace2a0 100644
--- a/ext/phar/tests/tar/phar_convert_phar4.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar4.phpt
@@ -44,7 +44,7 @@ var_dump($phar->getMetadata());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.gz');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
diff --git a/ext/phar/tests/tar/phar_magic.phpt b/ext/phar/tests/tar/phar_magic.phpt
index 1bb336f96ca..9e1f7d44cb0 100644
--- a/ext/phar/tests/tar/phar_magic.phpt
+++ b/ext/phar/tests/tar/phar_magic.phpt
@@ -21,7 +21,7 @@ include $fname;
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/tar/phar_setalias.phpt b/ext/phar/tests/tar/phar_setalias.phpt
index a1bc51154cd..ffdd508c315 100644
--- a/ext/phar/tests/tar/phar_setalias.phpt
+++ b/ext/phar/tests/tar/phar_setalias.phpt
@@ -39,7 +39,7 @@ echo $a->getAlias() . "\n";
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.tar');
 __HALT_COMPILER();
diff --git a/ext/phar/tests/tar/phar_setalias2.phpt b/ext/phar/tests/tar/phar_setalias2.phpt
index a44cc397c21..115b9866177 100644
--- a/ext/phar/tests/tar/phar_setalias2.phpt
+++ b/ext/phar/tests/tar/phar_setalias2.phpt
@@ -41,7 +41,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.tar');
 __HALT_COMPILER();
diff --git a/ext/phar/tests/tar/phar_setdefaultstub.phpt b/ext/phar/tests/tar/phar_setdefaultstub.phpt
index c1e6642a176..f0db2767224 100644
--- a/ext/phar/tests/tar/phar_setdefaultstub.phpt
+++ b/ext/phar/tests/tar/phar_setdefaultstub.phpt
@@ -55,7 +55,7 @@ var_dump($phar->getStub());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/tar/phar_stub.phpt b/ext/phar/tests/tar/phar_stub.phpt
index e0d728f6f84..3d8e2874efe 100644
--- a/ext/phar/tests/tar/phar_stub.phpt
+++ b/ext/phar/tests/tar/phar_stub.phpt
@@ -59,7 +59,7 @@ echo $phar->getStub();
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar.php');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.tar.php');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php');
diff --git a/ext/phar/tests/tar/phar_stub_error.phpt b/ext/phar/tests/tar/phar_stub_error.phpt
index 61532b9b42f..fc22bcb16ba 100644
--- a/ext/phar/tests/tar/phar_stub_error.phpt
+++ b/ext/phar/tests/tar/phar_stub_error.phpt
@@ -37,7 +37,7 @@ var_dump($phar->getStub() == $stub);
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/zip/033a.phpt b/ext/phar/tests/zip/033a.phpt
index 429d3bdd985..dc611485320 100644
--- a/ext/phar/tests/zip/033a.phpt
+++ b/ext/phar/tests/zip/033a.phpt
@@ -36,7 +36,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip');
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/zip/getalias.phpt b/ext/phar/tests/zip/getalias.phpt
index 9c917633c92..4094e0cd99f 100644
--- a/ext/phar/tests/zip/getalias.phpt
+++ b/ext/phar/tests/zip/getalias.phpt
@@ -44,7 +44,7 @@ var_dump($phar->getAlias());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/zip/notphar.phpt b/ext/phar/tests/zip/notphar.phpt
index ab4ff52e1ef..d7b79b0cb4d 100644
--- a/ext/phar/tests/zip/notphar.phpt
+++ b/ext/phar/tests/zip/notphar.phpt
@@ -16,7 +16,7 @@ include $fname;
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
index fe200949e88..75122a54a32 100644
--- a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
@@ -43,7 +43,7 @@ fclose($a);
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/brandnewphar.phar.zip');
 unlink(dirname(__FILE__) . '/myfakestub.php');
 ?>
diff --git a/ext/phar/tests/zip/phar_buildfromiterator4.phpt b/ext/phar/tests/zip/phar_buildfromiterator4.phpt
index cc11fe55372..27cf41fc115 100644
--- a/ext/phar/tests/zip/phar_buildfromiterator4.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator4.phpt
@@ -47,7 +47,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/zip/phar_buildfromiterator5.phpt b/ext/phar/tests/zip/phar_buildfromiterator5.phpt
index 1d14686d5bc..4aca17e6a35 100644
--- a/ext/phar/tests/zip/phar_buildfromiterator5.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator5.phpt
@@ -46,7 +46,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/zip/phar_buildfromiterator6.phpt b/ext/phar/tests/zip/phar_buildfromiterator6.phpt
index 936dda9f6df..5eea92dd70f 100644
--- a/ext/phar/tests/zip/phar_buildfromiterator6.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator6.phpt
@@ -46,7 +46,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/zip/phar_buildfromiterator7.phpt b/ext/phar/tests/zip/phar_buildfromiterator7.phpt
index 777dbf86dd7..85a801002da 100644
--- a/ext/phar/tests/zip/phar_buildfromiterator7.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator7.phpt
@@ -46,7 +46,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/zip/phar_buildfromiterator8.phpt b/ext/phar/tests/zip/phar_buildfromiterator8.phpt
index d2b1be2087c..8c92edf1d78 100644
--- a/ext/phar/tests/zip/phar_buildfromiterator8.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator8.phpt
@@ -20,7 +20,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator.phar.zip');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/zip/phar_buildfromiterator9.phpt b/ext/phar/tests/zip/phar_buildfromiterator9.phpt
index 0b563075456..f676783f7cb 100644
--- a/ext/phar/tests/zip/phar_buildfromiterator9.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator9.phpt
@@ -47,7 +47,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/buildfromiterator.phar');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/zip/phar_commitwrite.phpt b/ext/phar/tests/zip/phar_commitwrite.phpt
index eb3aeae04b9..cb7fa0f35c6 100644
--- a/ext/phar/tests/zip/phar_commitwrite.phpt
+++ b/ext/phar/tests/zip/phar_commitwrite.phpt
@@ -25,7 +25,7 @@ var_dump($p->isFileFormat(Phar::ZIP));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/brandnewphar.phar.zip');
 ?>
 --EXPECT--
diff --git a/ext/phar/tests/zip/phar_convert_phar.phpt b/ext/phar/tests/zip/phar_convert_phar.phpt
index 9cf942bd0ac..5ae1aae2223 100644
--- a/ext/phar/tests/zip/phar_convert_phar.phpt
+++ b/ext/phar/tests/zip/phar_convert_phar.phpt
@@ -37,7 +37,7 @@ var_dump(strlen($phar->getStub()));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar');
diff --git a/ext/phar/tests/zip/phar_magic.phpt b/ext/phar/tests/zip/phar_magic.phpt
index 4dfdd2e84dd..05b30fb74ad 100644
--- a/ext/phar/tests/zip/phar_magic.phpt
+++ b/ext/phar/tests/zip/phar_magic.phpt
@@ -26,7 +26,7 @@ include $pname;
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/zip/phar_oo_compressallbz2.phpt b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt
index d6b0a8f4cf4..7d9ede72389 100644
--- a/ext/phar/tests/zip/phar_oo_compressallbz2.phpt
+++ b/ext/phar/tests/zip/phar_oo_compressallbz2.phpt
@@ -44,7 +44,7 @@ var_dump($c['a']->isCompressed(Phar::BZ2));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip');
 ?>
diff --git a/ext/phar/tests/zip/phar_oo_compressallgz.phpt b/ext/phar/tests/zip/phar_oo_compressallgz.phpt
index 47dddac4877..535d2abdb6c 100644
--- a/ext/phar/tests/zip/phar_oo_compressallgz.phpt
+++ b/ext/phar/tests/zip/phar_oo_compressallgz.phpt
@@ -36,7 +36,7 @@ var_dump($phar['c']->isCompressed(Phar::GZ));
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php');
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/zip/phar_setalias2.phpt b/ext/phar/tests/zip/phar_setalias2.phpt
index c89f4c777a7..255f069c2c0 100644
--- a/ext/phar/tests/zip/phar_setalias2.phpt
+++ b/ext/phar/tests/zip/phar_setalias2.phpt
@@ -38,7 +38,7 @@ try {
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip');
 __HALT_COMPILER();
 ?>
diff --git a/ext/phar/tests/zip/phar_setdefaultstub.phpt b/ext/phar/tests/zip/phar_setdefaultstub.phpt
index e21d7644878..28127e42a5f 100644
--- a/ext/phar/tests/zip/phar_setdefaultstub.phpt
+++ b/ext/phar/tests/zip/phar_setdefaultstub.phpt
@@ -55,7 +55,7 @@ var_dump($phar->getStub());
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip');
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/zip/phar_stub.phpt b/ext/phar/tests/zip/phar_stub.phpt
index a2a6aa6f2a1..49b97f24f0c 100644
--- a/ext/phar/tests/zip/phar_stub.phpt
+++ b/ext/phar/tests/zip/phar_stub.phpt
@@ -59,7 +59,7 @@ echo $phar->getStub();
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip.php');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.zip.php');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phartmp.php');
diff --git a/ext/phar/tests/zip/phar_stub_error.phpt b/ext/phar/tests/zip/phar_stub_error.phpt
index dafb312cf28..ad168d6e82b 100644
--- a/ext/phar/tests/zip/phar_stub_error.phpt
+++ b/ext/phar/tests/zip/phar_stub_error.phpt
@@ -37,7 +37,7 @@ var_dump($phar->getStub() == $stub);
 ?>
 ===DONE===
 --CLEAN--
-<?php 
+<?php
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip');
 __HALT_COMPILER();
 ?>
diff --git a/ext/posix/tests/posix_ctermid.phpt b/ext/posix/tests/posix_ctermid.phpt
index 551ed7304e2..ccf850d776c 100644
--- a/ext/posix/tests/posix_ctermid.phpt
+++ b/ext/posix/tests/posix_ctermid.phpt
@@ -7,12 +7,12 @@ Source code: ext/posix/posix.c
 Falko Menge, mail at falko-menge dot de
 PHP Testfest Berlin 2009-05-10
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) { 
+<?php
+	if (!extension_loaded('posix')) {
         die('SKIP - POSIX extension not available');
     }
     // needed because of #ifdef HAVE_CTERMID in posix.c
-    if (!function_exists('posix_ctermid')) { 
+    if (!function_exists('posix_ctermid')) {
         die('SKIP - Function posix_ctermid() not available');
     }
 ?>
diff --git a/ext/posix/tests/posix_ctermid_basic.phpt b/ext/posix/tests/posix_ctermid_basic.phpt
index d1d46943ba3..467e60e9ba1 100644
--- a/ext/posix/tests/posix_ctermid_basic.phpt
+++ b/ext/posix/tests/posix_ctermid_basic.phpt
@@ -5,8 +5,8 @@ Marco Fabbri mrfabbri@gmail.com
 Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_errno_basic.phpt b/ext/posix/tests/posix_errno_basic.phpt
index cd94a97515b..c2fd0216690 100644
--- a/ext/posix/tests/posix_errno_basic.phpt
+++ b/ext/posix/tests/posix_errno_basic.phpt
@@ -5,8 +5,8 @@ Morten Amundsen mor10am@gmail.com
 Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_errno_variation1.phpt b/ext/posix/tests/posix_errno_variation1.phpt
index b57b7c0cac0..ce8208b7abe 100644
--- a/ext/posix/tests/posix_errno_variation1.phpt
+++ b/ext/posix/tests/posix_errno_variation1.phpt
@@ -5,9 +5,9 @@ Morten Amundsen mor10am@gmail.com
 Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
-        if(posix_getuid()==0) print "skip - Cannot run test as root.";    
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
+        if(posix_getuid()==0) print "skip - Cannot run test as root.";
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_errno_variation2.phpt b/ext/posix/tests/posix_errno_variation2.phpt
index ad3aa311ea2..23dc910b9a5 100644
--- a/ext/posix/tests/posix_errno_variation2.phpt
+++ b/ext/posix/tests/posix_errno_variation2.phpt
@@ -5,8 +5,8 @@ Morten Amundsen mor10am@gmail.com
 Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
         if(!extension_loaded("pcntl")) print "skip - PCNTL extension required";
 ?>
 --FILE--
@@ -17,9 +17,9 @@ echo "*** Test by calling function with pid error ***\n";
 $pid = 10000;
 
 do {
-  $pid += 1;   	
+  $pid += 1;
   $result = shell_exec("ps -p " . $pid);
-} while (strstr($pid, $result)); 
+} while (strstr($pid, $result));
 
 posix_kill($pid, SIGKILL);
 var_dump(posix_errno());
diff --git a/ext/posix/tests/posix_get_last_error_error.phpt b/ext/posix/tests/posix_get_last_error_error.phpt
index 6cf2161d0cc..5400b615982 100644
--- a/ext/posix/tests/posix_get_last_error_error.phpt
+++ b/ext/posix/tests/posix_get_last_error_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test posix_get_last_error() function : error conditions 
+Test posix_get_last_error() function : error conditions
 --SKIPIF--
-<?php 
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int posix_get_last_error(void)
- * Description: Retrieve the error number set by the last posix function which failed. 
+ * Description: Retrieve the error number set by the last posix function which failed.
  * Source code: ext/posix/posix.c
  * Alias to functions: posix_errno
  */
diff --git a/ext/posix/tests/posix_getcwd.phpt b/ext/posix/tests/posix_getcwd.phpt
index 75c8d575baf..20f7b0372e7 100644
--- a/ext/posix/tests/posix_getcwd.phpt
+++ b/ext/posix/tests/posix_getcwd.phpt
@@ -2,7 +2,7 @@
 posix_getcwd(): Basic tests
 --SKIPIF--
 <?php
-if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getcwd')) die('skip posix_getcwd() not found');
 ?>
 --FILE--
diff --git a/ext/posix/tests/posix_getcwd_basic.phpt b/ext/posix/tests/posix_getcwd_basic.phpt
index 2477c376a86..9186f5e2702 100644
--- a/ext/posix/tests/posix_getcwd_basic.phpt
+++ b/ext/posix/tests/posix_getcwd_basic.phpt
@@ -2,12 +2,12 @@
 posix_getcwd(): Basic tests
 --SKIPIF--
 <?php
-if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getcwd')) die('skip posix_getcwd() not found');
 ?>
 --FILE--
 <?php
-echo "Basic test of POSIX posix_getcwd function\n"; 
+echo "Basic test of POSIX posix_getcwd function\n";
 var_dump(posix_getcwd());
 var_dump(posix_getcwd(1));
 
diff --git a/ext/posix/tests/posix_getegid_basic.phpt b/ext/posix/tests/posix_getegid_basic.phpt
index d0016f497f8..ab7da5a2c76 100644
--- a/ext/posix/tests/posix_getegid_basic.phpt
+++ b/ext/posix/tests/posix_getegid_basic.phpt
@@ -4,8 +4,8 @@ Test function posix_getegid() by calling it with its expected arguments
 Michelangelo van Dam dragonbe@gmail.com
 #PHPTestFest Dutch PHP Conference 2012
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_geteuid_basic.phpt b/ext/posix/tests/posix_geteuid_basic.phpt
index 76e9028043c..f25fc34fd23 100644
--- a/ext/posix/tests/posix_geteuid_basic.phpt
+++ b/ext/posix/tests/posix_geteuid_basic.phpt
@@ -5,8 +5,8 @@ Marco Fabbri mrfabbri@gmail.com
 Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_geteuid_error1.phpt b/ext/posix/tests/posix_geteuid_error1.phpt
index ac4e0d5ddc1..941005f0288 100644
--- a/ext/posix/tests/posix_geteuid_error1.phpt
+++ b/ext/posix/tests/posix_geteuid_error1.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_geteuid() by calling it more than or less than its expected arguments
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --CREDITS--
 Marco Fabbri mrfabbri@gmail.com
diff --git a/ext/posix/tests/posix_getgid_error.phpt b/ext/posix/tests/posix_getgid_error.phpt
index bcd7a2fbdf2..f02d07413ac 100644
--- a/ext/posix/tests/posix_getgid_error.phpt
+++ b/ext/posix/tests/posix_getgid_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test posix_getgid() function : error conditions 
+Test posix_getgid() function : error conditions
 --SKIPIF--
-<?php 
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int posix_getgid(void)
- * Description: Get the current group id (POSIX.1, 4.2.1) 
+ * Description: Get the current group id (POSIX.1, 4.2.1)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_getgid() : error conditions ***\n";
diff --git a/ext/posix/tests/posix_getgrgid_basic.phpt b/ext/posix/tests/posix_getgrgid_basic.phpt
index fdcdf35a420..5759d0034d9 100644
--- a/ext/posix/tests/posix_getgrgid_basic.phpt
+++ b/ext/posix/tests/posix_getgrgid_basic.phpt
@@ -1,18 +1,18 @@
 --TEST--
-Test posix_getgrgid() function : basic functionality 
+Test posix_getgrgid() function : basic functionality
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+<?php
+	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
-<?php 
-  echo "Basic test of POSIX getgid and getgrid fucntions\n"; 
-  	
+<?php
+  echo "Basic test of POSIX getgid and getgrid fucntions\n";
+
   $gid = posix_getgid();
   $groupinfo = posix_getgrgid($gid);
-  
+
   print_r($groupinfo);
-  
+
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/posix/tests/posix_getgrgid_error.phpt b/ext/posix/tests/posix_getgrgid_error.phpt
index 7fcc8926f48..ef7fa57a9db 100644
--- a/ext/posix/tests/posix_getgrgid_error.phpt
+++ b/ext/posix/tests/posix_getgrgid_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test posix_getgrgid() function : error conditions 
+Test posix_getgrgid() function : error conditions
 --SKIPIF--
-<?php 
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto array posix_getgrgid(long gid)
- * Description: Group database access (POSIX.1, 9.2.1) 
+ * Description: Group database access (POSIX.1, 9.2.1)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_getgrgid() : error conditions ***\n";
diff --git a/ext/posix/tests/posix_getgrgid_variation.phpt b/ext/posix/tests/posix_getgrgid_variation.phpt
index 7abd32b97ff..d8cce49911b 100644
--- a/ext/posix/tests/posix_getgrgid_variation.phpt
+++ b/ext/posix/tests/posix_getgrgid_variation.phpt
@@ -3,14 +3,14 @@ Test posix_getgrgid() function : usage variations  - parameter types
 --SKIPIF--
 <?php
     PHP_INT_SIZE == 4 or die("skip - 32-bit only");
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto array posix_getgrgid(long gid)
- * Description: Group database access (POSIX.1, 9.2.1) 
+ * Description: Group database access (POSIX.1, 9.2.1)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_getgrgid() : usage variations ***\n";
@@ -71,8 +71,8 @@ $values = array(
 foreach($values as $value) {
       echo "\nArg value $value \n";
       $result = posix_getgrgid($value);
-      if ((is_array($result) && (count($result) == 4)) 
-          || 
+      if ((is_array($result) && (count($result) == 4))
+          ||
           ($result === false)) {
           echo "valid output\n";
       } else {
diff --git a/ext/posix/tests/posix_getgroups_basic.phpt b/ext/posix/tests/posix_getgroups_basic.phpt
index f062468b4f5..2d309e61d44 100644
--- a/ext/posix/tests/posix_getgroups_basic.phpt
+++ b/ext/posix/tests/posix_getgroups_basic.phpt
@@ -1,21 +1,21 @@
 --TEST--
-Test posix_getgroups() function : basic functionality 
+Test posix_getgroups() function : basic functionality
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+<?php
+	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
-<?php 
+<?php
   echo "Basic test of POSIX getgroups\n";
-   
+
   $groups = posix_getgroups();
-  
+
   if (!is_array($groups)) {
-  	echo "TEST FAILED - array result expected\n"; 
+  	echo "TEST FAILED - array result expected\n";
   } else {
   	echo "TEST PASSED\n";
-  }		 
-  
+  }
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/posix/tests/posix_getpgid_basic.phpt b/ext/posix/tests/posix_getpgid_basic.phpt
index 3195387b752..500bc18cff8 100644
--- a/ext/posix/tests/posix_getpgid_basic.phpt
+++ b/ext/posix/tests/posix_getpgid_basic.phpt
@@ -1,18 +1,18 @@
 --TEST--
-Test posix_getpgid() function : basic functionality 
+Test posix_getpgid() function : basic functionality
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+<?php
+	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
-<?php 
-  echo "Basic test of posix_getpgid function\n"; 
-  
-  $pid = posix_getpid();	
+<?php
+  echo "Basic test of posix_getpgid function\n";
+
+  $pid = posix_getpid();
   $pgid = posix_getpgid($pid);
-  
-  var_dump($pgid); 
-  
+
+  var_dump($pgid);
+
 ?>
 ===DONE====
 --EXPECTF--
diff --git a/ext/posix/tests/posix_getpgid_error.phpt b/ext/posix/tests/posix_getpgid_error.phpt
index b15a3c39b2a..88d68554ee7 100644
--- a/ext/posix/tests/posix_getpgid_error.phpt
+++ b/ext/posix/tests/posix_getpgid_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test posix_getpgid() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if((!extension_loaded("posix")) || (!function_exists("posix_getpgid"))) {
 	 print "skip - POSIX extension not loaded or posix_getpgid() does not exist";
-} 
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int posix_getpgid(void)
- * Description: Get the process group id of the specified process (This is not a POSIX function, but a SVR4ism, so we compile conditionally) 
+ * Description: Get the process group id of the specified process (This is not a POSIX function, but a SVR4ism, so we compile conditionally)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_getpgid() : error conditions ***\n";
diff --git a/ext/posix/tests/posix_getpgid_variation.phpt b/ext/posix/tests/posix_getpgid_variation.phpt
index 478164c210b..00449da8aba 100644
--- a/ext/posix/tests/posix_getpgid_variation.phpt
+++ b/ext/posix/tests/posix_getpgid_variation.phpt
@@ -1,18 +1,18 @@
 --TEST--
-Test posix_getpgid() function : variation 
+Test posix_getpgid() function : variation
 --SKIPIF--
-<?php 
+<?php
 PHP_INT_SIZE == 4 or die("skip - 32-bit only");
 if((!extension_loaded("posix")) || (!function_exists("posix_getpgid"))) {
 	 print "skip - POSIX extension not loaded or posix_getpgid() does not exist";
-} 
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int posix_getpgid(void)
- * Description: Get the process group id of the specified process (This is not a POSIX function, but a SVR4ism, so we compile conditionally) 
+ * Description: Get the process group id of the specified process (This is not a POSIX function, but a SVR4ism, so we compile conditionally)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_getpgid() : usage variations ***\n";
@@ -63,7 +63,7 @@ $values = array(
 
       // unset data
       $unset_var,
-      
+
       // object data
       new stdclass(),
 );
diff --git a/ext/posix/tests/posix_getpgrp_basic.phpt b/ext/posix/tests/posix_getpgrp_basic.phpt
index a737019a2f4..f460e347ce8 100644
--- a/ext/posix/tests/posix_getpgrp_basic.phpt
+++ b/ext/posix/tests/posix_getpgrp_basic.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test posix_getpgrp() function : basic functionality 
+Test posix_getpgrp() function : basic functionality
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+<?php
+	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
-<?php 
-  echo "Basic test of POSIX getpgrp function\n"; 
-  	
+<?php
+  echo "Basic test of POSIX getpgrp function\n";
+
   $pgrp = posix_getpgrp();
-  
-  var_dump($pgrp); 
-  
+
+  var_dump($pgrp);
+
 ?>
 ===DONE====
 --EXPECTF--
diff --git a/ext/posix/tests/posix_getpgrp_error.phpt b/ext/posix/tests/posix_getpgrp_error.phpt
index 97f47ce8ca1..6076d688c9a 100644
--- a/ext/posix/tests/posix_getpgrp_error.phpt
+++ b/ext/posix/tests/posix_getpgrp_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test posix_getpgrp() function : error conditions 
+Test posix_getpgrp() function : error conditions
 --SKIPIF--
-<?php 
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int posix_getpgrp(void)
- * Description: Get current process group id (POSIX.1, 4.3.1) 
+ * Description: Get current process group id (POSIX.1, 4.3.1)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_getpgrp() : error conditions ***\n";
diff --git a/ext/posix/tests/posix_getpid_basic.phpt b/ext/posix/tests/posix_getpid_basic.phpt
index a1444413ede..40689583b58 100644
--- a/ext/posix/tests/posix_getpid_basic.phpt
+++ b/ext/posix/tests/posix_getpid_basic.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test posix_getpid() function : basic functionality 
+Test posix_getpid() function : basic functionality
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+<?php
+	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
-<?php 
-  echo "Basic test of POSIX getpid function\n"; 
-  	
+<?php
+  echo "Basic test of POSIX getpid function\n";
+
   $pid = posix_getpid();
-  
-  var_dump($pid); 
-  
+
+  var_dump($pid);
+
 ?>
 ===DONE====
 --EXPECTF--
diff --git a/ext/posix/tests/posix_getpid_error.phpt b/ext/posix/tests/posix_getpid_error.phpt
index 721bf669963..46131b7c9dc 100644
--- a/ext/posix/tests/posix_getpid_error.phpt
+++ b/ext/posix/tests/posix_getpid_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test posix_getpid() function : error conditions 
+Test posix_getpid() function : error conditions
 --SKIPIF--
-<?php 
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int posix_getpid(void)
- * Description: Get the current process id (POSIX.1, 4.1.1) 
+ * Description: Get the current process id (POSIX.1, 4.1.1)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_getpid() : error conditions ***\n";
diff --git a/ext/posix/tests/posix_getppid_basic.phpt b/ext/posix/tests/posix_getppid_basic.phpt
index 2da591c1771..8d10afc4569 100644
--- a/ext/posix/tests/posix_getppid_basic.phpt
+++ b/ext/posix/tests/posix_getppid_basic.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test posix_getppid() function : basic functionality 
+Test posix_getppid() function : basic functionality
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+<?php
+	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
-<?php 
-  echo "Basic test of POSIX getppid function\n"; 
-  	
+<?php
+  echo "Basic test of POSIX getppid function\n";
+
   $ppid = posix_getppid();
-  
-  var_dump($ppid); 
-  
+
+  var_dump($ppid);
+
 ?>
 ===DONE====
 --EXPECTF--
diff --git a/ext/posix/tests/posix_getppid_error.phpt b/ext/posix/tests/posix_getppid_error.phpt
index 366c1ed8dcc..d962182ba4e 100644
--- a/ext/posix/tests/posix_getppid_error.phpt
+++ b/ext/posix/tests/posix_getppid_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test posix_getppid() function : error conditions 
+Test posix_getppid() function : error conditions
 --SKIPIF--
-<?php 
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int posix_getppid(void)
- * Description: Get the parent process id (POSIX.1, 4.1.1) 
+ * Description: Get the parent process id (POSIX.1, 4.1.1)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_getppid() : error conditions ***\n";
diff --git a/ext/posix/tests/posix_getpwuid_basic.phpt b/ext/posix/tests/posix_getpwuid_basic.phpt
index 1bcd59d0e63..16e0ae11523 100644
--- a/ext/posix/tests/posix_getpwuid_basic.phpt
+++ b/ext/posix/tests/posix_getpwuid_basic.phpt
@@ -1,18 +1,18 @@
 --TEST--
-Test posix_getpwuid() function : basic functionality 
+Test posix_getpwuid() function : basic functionality
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+<?php
+	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
-<?php 
+<?php
   echo "Basic test of POSIX getpwuid\n";
-   
-  	
+
+
   $pwuid = posix_getpwuid(posix_getuid());
-  
+
   print_r($pwuid);
-  
+
 ?>
 ===DONE====
 --EXPECTREGEX--
diff --git a/ext/posix/tests/posix_getpwuid_error.phpt b/ext/posix/tests/posix_getpwuid_error.phpt
index 4920e4e9da7..440edf6a769 100644
--- a/ext/posix/tests/posix_getpwuid_error.phpt
+++ b/ext/posix/tests/posix_getpwuid_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test posix_getpwuid() function : error conditions 
+Test posix_getpwuid() function : error conditions
 --SKIPIF--
-<?php 
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto array posix_getpwuid(long uid)
- * Description: User database access (POSIX.1, 9.2.2) 
+ * Description: User database access (POSIX.1, 9.2.2)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_getpwuid() : error conditions ***\n";
diff --git a/ext/posix/tests/posix_getpwuid_variation.phpt b/ext/posix/tests/posix_getpwuid_variation.phpt
index fa000f5b8ad..0a0ad640514 100644
--- a/ext/posix/tests/posix_getpwuid_variation.phpt
+++ b/ext/posix/tests/posix_getpwuid_variation.phpt
@@ -3,14 +3,14 @@ Test posix_getpwuid() function : usage variations  - parameter types
 --SKIPIF--
 <?php
     PHP_INT_SIZE == 4 or die("skip - 32-bit only");
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto array posix_getpwuid(long uid)
- * Description: User database access (POSIX.1, 9.2.2) 
+ * Description: User database access (POSIX.1, 9.2.2)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_getpwuid() : usage variations ***\n";
@@ -61,7 +61,7 @@ $values = array(
 
       // unset data
       $unset_var,
-      
+
       // object data
       new stdclass(),
 );
@@ -71,8 +71,8 @@ $values = array(
 foreach($values as $value) {
       echo "\nArg value $value \n";
       $result = posix_getpwuid($value);
-      if ((is_array($result) && (count($result) == 7)) 
-          || 
+      if ((is_array($result) && (count($result) == 7))
+          ||
           ($result === false)) {
           echo "valid output\n";
       } else {
diff --git a/ext/posix/tests/posix_getrlimit.phpt b/ext/posix/tests/posix_getrlimit.phpt
index 61da64a9385..8cfc7575a43 100644
--- a/ext/posix/tests/posix_getrlimit.phpt
+++ b/ext/posix/tests/posix_getrlimit.phpt
@@ -2,7 +2,7 @@
 posix_getrlimit(): Basic tests
 --SKIPIF--
 <?php
-if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getrlimit')) die('skip posix_getrlimit() not found');
 ?>
 --FILE--
diff --git a/ext/posix/tests/posix_getrlimit_basic.phpt b/ext/posix/tests/posix_getrlimit_basic.phpt
index 7fdd0e7e4b3..bace9fd5ee0 100644
--- a/ext/posix/tests/posix_getrlimit_basic.phpt
+++ b/ext/posix/tests/posix_getrlimit_basic.phpt
@@ -2,12 +2,12 @@
 posix_getrlimit(): Basic tests
 --SKIPIF--
 <?php
-if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_getrlimit')) die('skip posix_getrlimit() not found');
 ?>
 --FILE--
 <?php
-echo "Basic test of POSIX posix_getrlimit function\n"; 
+echo "Basic test of POSIX posix_getrlimit function\n";
 var_dump(posix_getrlimit());
 
 ?>
diff --git a/ext/posix/tests/posix_getsid.phpt b/ext/posix/tests/posix_getsid.phpt
index 62ed3c9ebd1..5b7fc04118a 100644
--- a/ext/posix/tests/posix_getsid.phpt
+++ b/ext/posix/tests/posix_getsid.phpt
@@ -1,14 +1,14 @@
 --TEST--
 Test posix_getsid() function test
 --DESCRIPTION--
-Get the current session id of a process pid (POSIX.1, 4.2.1) 
+Get the current session id of a process pid (POSIX.1, 4.2.1)
 Source code: ext/posix/posix.c
 --CREDITS--
 Moritz Neuhaeuser, info@xcompile.net
 PHP Testfest Berlin 2009-05-10
 --SKIPIF--
-<?php 
-	if(!extension_loaded("posix")) print "SKIP - POSIX extension not loaded"; 
+<?php
+	if(!extension_loaded("posix")) print "SKIP - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getsid_basic.phpt b/ext/posix/tests/posix_getsid_basic.phpt
index a53e1df8b3f..5bf362efd44 100644
--- a/ext/posix/tests/posix_getsid_basic.phpt
+++ b/ext/posix/tests/posix_getsid_basic.phpt
@@ -1,18 +1,18 @@
 --TEST--
-Test posix_getsid() function : basic functionality 
+Test posix_getsid() function : basic functionality
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+<?php
+	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
-<?php 
-  echo "Basic test of posix_getsid function\n"; 
-  
-  $pid = posix_getpid();	
+<?php
+  echo "Basic test of posix_getsid function\n";
+
+  $pid = posix_getpid();
   $sid = posix_getsid($pid);
-  
-  var_dump($sid); 
-  
+
+  var_dump($sid);
+
 ?>
 ===DONE====
 --EXPECTF--
diff --git a/ext/posix/tests/posix_getsid_error.phpt b/ext/posix/tests/posix_getsid_error.phpt
index 9d2a2596243..696595bfde2 100644
--- a/ext/posix/tests/posix_getsid_error.phpt
+++ b/ext/posix/tests/posix_getsid_error.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test posix_getsid() function : error conditions 
+Test posix_getsid() function : error conditions
 --DESCRIPTION--
 cases: no params, wrong param, wrong param range
 --CREDITS--
 Moritz Neuhaeuser, info@xcompile.net
 PHP Testfest Berlin 2009-05-10
 --SKIPIF--
-<?php 
+<?php
 	if(!extension_loaded("posix")) {
-        die("SKIP - POSIX extension not loaded"); 
+        die("SKIP - POSIX extension not loaded");
     }
 ?>
 --FILE--
diff --git a/ext/posix/tests/posix_getuid_error.phpt b/ext/posix/tests/posix_getuid_error.phpt
index 42a35512a0b..8954108c32c 100644
--- a/ext/posix/tests/posix_getuid_error.phpt
+++ b/ext/posix/tests/posix_getuid_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test posix_getuid() function : error conditions 
+Test posix_getuid() function : error conditions
 --SKIPIF--
-<?php 
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int posix_getuid(void)
- * Description: Get the current user id (POSIX.1, 4.2.1) 
+ * Description: Get the current user id (POSIX.1, 4.2.1)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_getuid() : error conditions ***\n";
diff --git a/ext/posix/tests/posix_initgroups.phpt b/ext/posix/tests/posix_initgroups.phpt
index e7db4a67940..3e464df0848 100644
--- a/ext/posix/tests/posix_initgroups.phpt
+++ b/ext/posix/tests/posix_initgroups.phpt
@@ -2,7 +2,7 @@
 posix_initgroups(): Basic tests
 --SKIPIF--
 <?php
-if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_initgroups')) die('skip posix_initgroups() not found');
 ?>
 --FILE--
diff --git a/ext/posix/tests/posix_initgroups_basic.phpt b/ext/posix/tests/posix_initgroups_basic.phpt
index afed6103359..5799f3c7229 100644
--- a/ext/posix/tests/posix_initgroups_basic.phpt
+++ b/ext/posix/tests/posix_initgroups_basic.phpt
@@ -2,12 +2,12 @@
 posix_initgroups(): Basic tests
 --SKIPIF--
 <?php
-if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_initgroups')) die('skip posix_initgroups() not found');
 ?>
 --FILE--
 <?php
-echo "Basic test of POSIX posix_initgroups function\n"; 
+echo "Basic test of POSIX posix_initgroups function\n";
 var_dump(posix_initgroups('foo', 'bar'));
 var_dump(posix_initgroups(NULL, NULL));
 
diff --git a/ext/posix/tests/posix_isatty.phpt b/ext/posix/tests/posix_isatty.phpt
index 0b40dd1d438..011a636e645 100644
--- a/ext/posix/tests/posix_isatty.phpt
+++ b/ext/posix/tests/posix_isatty.phpt
@@ -2,7 +2,7 @@
 posix_isatty(): Basic tests
 --SKIPIF--
 <?php
-if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_isatty')) die('skip posix_isatty() not found');
 ?>
 --FILE--
diff --git a/ext/posix/tests/posix_kill_basic.phpt b/ext/posix/tests/posix_kill_basic.phpt
index b68d3cb5dbe..b73e73c476c 100644
--- a/ext/posix/tests/posix_kill_basic.phpt
+++ b/ext/posix/tests/posix_kill_basic.phpt
@@ -1,32 +1,32 @@
 --TEST--
-Test posix_kill(), posix_get_last_error and posix_strerror() functions : basic functionality 
+Test posix_kill(), posix_get_last_error and posix_strerror() functions : basic functionality
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+<?php
+	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
-<?php 
-  echo "Basic test of POSIX getpgid(), kill(), get_last_error() and strerror() functions\n"; 
-  	
+<?php
+  echo "Basic test of POSIX getpgid(), kill(), get_last_error() and strerror() functions\n";
+
   	// Don't rely on PCNTL extension being around
   	$SIGKILL = 9;
-  	
+
   	// TODO Once we have PS open working beef up this test to create a process and kill it
   	// for now start at a low pid and find first pid which does not exist.
   	$pid = 999;
   	do {
-  		$pid += 1;   	
+  		$pid += 1;
   		$result = shell_exec("ps -p " . $pid);
-	} while (stripos($result, (string)$pid) != FALSE); 
-  	
+	} while (stripos($result, (string)$pid) != FALSE);
+
   	echo "Kill pid=" . $pid . "\n";
 	var_dump(posix_kill($pid,$SIGKILL));
-	
-	$errno = posix_get_last_error(); 
-	
+
+	$errno = posix_get_last_error();
+
 	var_dump($errno);
 	var_dump(posix_strerror($errno));
-	
+
 ?>
 ===DONE====
 --EXPECTF--
diff --git a/ext/posix/tests/posix_kill_error.phpt b/ext/posix/tests/posix_kill_error.phpt
index 082b21d6adc..0c8f6ef642d 100644
--- a/ext/posix/tests/posix_kill_error.phpt
+++ b/ext/posix/tests/posix_kill_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test posix_kill() function : error conditions 
+Test posix_kill() function : error conditions
 --SKIPIF--
-<?php 
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto bool posix_kill(int pid, int sig)
- * Description: Send a signal to a process (POSIX.1, 3.3.2) 
+ * Description: Send a signal to a process (POSIX.1, 3.3.2)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
diff --git a/ext/posix/tests/posix_kill_variation1.phpt b/ext/posix/tests/posix_kill_variation1.phpt
index d26f11df032..ca6602f259e 100644
--- a/ext/posix/tests/posix_kill_variation1.phpt
+++ b/ext/posix/tests/posix_kill_variation1.phpt
@@ -3,14 +3,14 @@ Test posix_kill() function : usage variations  - first parameter type
 --SKIPIF--
 <?php
     PHP_INT_SIZE == 4 or die("skip - 32-bit only");
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto bool posix_kill(int pid, int sig)
- * Description: Send a signal to a process (POSIX.1, 3.3.2) 
+ * Description: Send a signal to a process (POSIX.1, 3.3.2)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_kill() : usage variations ***\n";
@@ -62,7 +62,7 @@ $values = array(
 
       // unset data
       $unset_var,
-      
+
       // object data
       new stdclass(),
 );
diff --git a/ext/posix/tests/posix_kill_variation2.phpt b/ext/posix/tests/posix_kill_variation2.phpt
index 399151a7ed7..61baf7e6a41 100644
--- a/ext/posix/tests/posix_kill_variation2.phpt
+++ b/ext/posix/tests/posix_kill_variation2.phpt
@@ -1,16 +1,16 @@
 --TEST--
 Test posix_kill() function : usage variations  - second parameter type
 --SKIPIF--
-<?php 
+<?php
     PHP_INT_SIZE == 4 or die("skip - 32-bit only");
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto bool posix_kill(int pid, int sig)
- * Description: Send a signal to a process (POSIX.1, 3.3.2) 
+ * Description: Send a signal to a process (POSIX.1, 3.3.2)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_kill() : usage variations ***\n";
@@ -62,7 +62,7 @@ $values = array(
 
       // unset data
       $unset_var,
-      
+
       // object data
       new stdclass(),
 );
diff --git a/ext/posix/tests/posix_mknod.phpt b/ext/posix/tests/posix_mknod.phpt
index 4044fb98d96..a238f18186b 100644
--- a/ext/posix/tests/posix_mknod.phpt
+++ b/ext/posix/tests/posix_mknod.phpt
@@ -2,7 +2,7 @@
 posix_mknod(): Basic tests
 --SKIPIF--
 <?php
-if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_mknod')) die('skip posix_mknod() not found');
 ?>
 --FILE--
diff --git a/ext/posix/tests/posix_mknod_basic.phpt b/ext/posix/tests/posix_mknod_basic.phpt
index bc351564604..e95aa301fd6 100644
--- a/ext/posix/tests/posix_mknod_basic.phpt
+++ b/ext/posix/tests/posix_mknod_basic.phpt
@@ -2,12 +2,12 @@
 posix_mknod(): Basic tests
 --SKIPIF--
 <?php
-if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_mknod')) die('skip posix_mknod() not found');
 ?>
 --FILE--
 <?php
-echo "Basic test of POSIX posix_mknod function\n"; 
+echo "Basic test of POSIX posix_mknod function\n";
 var_dump(posix_mknod(NULL, NULL, NULL, NULL));
 
 ?>
diff --git a/ext/posix/tests/posix_setegid_basic.phpt b/ext/posix/tests/posix_setegid_basic.phpt
index 729abc5f540..c5c98b1a495 100644
--- a/ext/posix/tests/posix_setegid_basic.phpt
+++ b/ext/posix/tests/posix_setegid_basic.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_setegid() by calling it with its expected arguments
 --SKIPIF--
-<?php 
-    if(!extension_loaded("posix")) die("skip - POSIX extension not loaded"); 
+<?php
+    if(!extension_loaded("posix")) die("skip - POSIX extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_seteuid_basic.phpt b/ext/posix/tests/posix_seteuid_basic.phpt
index 204ebe8d073..49c4f5c449c 100644
--- a/ext/posix/tests/posix_seteuid_basic.phpt
+++ b/ext/posix/tests/posix_seteuid_basic.phpt
@@ -5,8 +5,8 @@ Marco Fabbri mrfabbri@gmail.com
 Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_seteuid_error.phpt b/ext/posix/tests/posix_seteuid_error.phpt
index b10e41075e6..1ac3a38226d 100644
--- a/ext/posix/tests/posix_seteuid_error.phpt
+++ b/ext/posix/tests/posix_seteuid_error.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_seteuid() by calling it more than or less than its expected arguments
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --CREDITS--
 Marco Fabbri mrfabbri@gmail.com
diff --git a/ext/posix/tests/posix_seteuid_error2.phpt b/ext/posix/tests/posix_seteuid_error2.phpt
index cf724c13a58..6e1222aab34 100644
--- a/ext/posix/tests/posix_seteuid_error2.phpt
+++ b/ext/posix/tests/posix_seteuid_error2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_seteuid() by substituting argument 1 with object values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --CREDITS--
 Marco Fabbri mrfabbri@gmail.com
diff --git a/ext/posix/tests/posix_seteuid_variation1.phpt b/ext/posix/tests/posix_seteuid_variation1.phpt
index 44546c47bfc..1c823bd8d9a 100644
--- a/ext/posix/tests/posix_seteuid_variation1.phpt
+++ b/ext/posix/tests/posix_seteuid_variation1.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_seteuid() by substituting argument 1 with array values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --CREDITS--
 Marco Fabbri mrfabbri@gmail.com
diff --git a/ext/posix/tests/posix_seteuid_variation2.phpt b/ext/posix/tests/posix_seteuid_variation2.phpt
index bcba3943857..eafc366a003 100644
--- a/ext/posix/tests/posix_seteuid_variation2.phpt
+++ b/ext/posix/tests/posix_seteuid_variation2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_seteuid() by substituting argument 1 with boolean values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
         if(posix_geteuid() == 0) print "skip - Cannot run test as root.";
 ?>
 --CREDITS--
diff --git a/ext/posix/tests/posix_seteuid_variation3.phpt b/ext/posix/tests/posix_seteuid_variation3.phpt
index 413c6c21bd5..25adbd4a720 100644
--- a/ext/posix/tests/posix_seteuid_variation3.phpt
+++ b/ext/posix/tests/posix_seteuid_variation3.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_seteuid() by substituting argument 1 with emptyUnsetUndefNull values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
         if(posix_geteuid() == 0) print "skip - Cannot run test as root.";
 ?>
 --CREDITS--
diff --git a/ext/posix/tests/posix_seteuid_variation4.phpt b/ext/posix/tests/posix_seteuid_variation4.phpt
index 7dc10f85c70..dff46ea5e97 100644
--- a/ext/posix/tests/posix_seteuid_variation4.phpt
+++ b/ext/posix/tests/posix_seteuid_variation4.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function posix_seteuid() by substituting argument 1 with float values.
 --SKIPIF--
-<?php 
+<?php
         PHP_INT_SIZE == 4 or die("skip - 32-bit only");
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
         if(posix_geteuid() == 0) print "skip - Cannot run test as root.";
 ?>
 --CREDITS--
diff --git a/ext/posix/tests/posix_seteuid_variation5.phpt b/ext/posix/tests/posix_seteuid_variation5.phpt
index 8e43e1a1528..5a102d4e03f 100644
--- a/ext/posix/tests/posix_seteuid_variation5.phpt
+++ b/ext/posix/tests/posix_seteuid_variation5.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_seteuid() by substituting argument 1 with int values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
         if(posix_geteuid() == 0) print "skip - Cannot run test as root.";
 ?>
 --CREDITS--
diff --git a/ext/posix/tests/posix_seteuid_variation6.phpt b/ext/posix/tests/posix_seteuid_variation6.phpt
index 10fd2a81b61..9a3b241d216 100644
--- a/ext/posix/tests/posix_seteuid_variation6.phpt
+++ b/ext/posix/tests/posix_seteuid_variation6.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_seteuid() by substituting argument 1 with string values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --CREDITS--
 Marco Fabbri mrfabbri@gmail.com
diff --git a/ext/posix/tests/posix_setgid_basic.phpt b/ext/posix/tests/posix_setgid_basic.phpt
index da3751fea45..a1f4b418693 100644
--- a/ext/posix/tests/posix_setgid_basic.phpt
+++ b/ext/posix/tests/posix_setgid_basic.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_setgid() by calling it with its expected arguments
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --CREDITS--
 Marco Fabbri mrfabbri@gmail.com
diff --git a/ext/posix/tests/posix_setgid_error.phpt b/ext/posix/tests/posix_setgid_error.phpt
index 83d727c58a8..169bd9f9abd 100644
--- a/ext/posix/tests/posix_setgid_error.phpt
+++ b/ext/posix/tests/posix_setgid_error.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_setgid() by calling it more than or less than its expected arguments.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 Marco Fabbri mrfabbri@gmail.com
 Francesco Fullone ff@ideato.it
diff --git a/ext/posix/tests/posix_setgid_variation1.phpt b/ext/posix/tests/posix_setgid_variation1.phpt
index 64b83ec3cd3..b4a511c8e3f 100644
--- a/ext/posix/tests/posix_setgid_variation1.phpt
+++ b/ext/posix/tests/posix_setgid_variation1.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_setgid() by substituting argument 1 with array values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --CREDITS--
 Marco Fabbri mrfabbri@gmail.com
diff --git a/ext/posix/tests/posix_setgid_variation2.phpt b/ext/posix/tests/posix_setgid_variation2.phpt
index b8e50bad4d1..6d4adb5a5a9 100644
--- a/ext/posix/tests/posix_setgid_variation2.phpt
+++ b/ext/posix/tests/posix_setgid_variation2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_setgid() by substituting argument 1 with boolean values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
         if(posix_geteuid() == 0) print "skip - Cannot run test as root.";
 ?>
 --CREDITS--
diff --git a/ext/posix/tests/posix_setgid_variation4.phpt b/ext/posix/tests/posix_setgid_variation4.phpt
index 15d3cf56d89..94bfa68a5ed 100644
--- a/ext/posix/tests/posix_setgid_variation4.phpt
+++ b/ext/posix/tests/posix_setgid_variation4.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function posix_setgid() by substituting argument 1 with float values.
 --SKIPIF--
-<?php 
+<?php
         PHP_INT_SIZE == 4 or die("skip - 32-bit only");
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
         if(posix_geteuid() == 0) print "skip - Cannot run test as root.";
 ?>
 --CREDITS--
diff --git a/ext/posix/tests/posix_setgid_variation5.phpt b/ext/posix/tests/posix_setgid_variation5.phpt
index 49e98ec8eb9..e447b87e276 100644
--- a/ext/posix/tests/posix_setgid_variation5.phpt
+++ b/ext/posix/tests/posix_setgid_variation5.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_setgid() by substituting argument 1 with int values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
         if(posix_geteuid() == 0) print "skip - Cannot run test as root.";
 ?>
 --CREDITS--
diff --git a/ext/posix/tests/posix_setgid_variation6.phpt b/ext/posix/tests/posix_setgid_variation6.phpt
index a711d05c9af..70882d5b4a3 100644
--- a/ext/posix/tests/posix_setgid_variation6.phpt
+++ b/ext/posix/tests/posix_setgid_variation6.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_setgid() by substituting argument 1 with object values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --CREDITS--
 Marco Fabbri mrfabbri@gmail.com
diff --git a/ext/posix/tests/posix_setrlimit.phpt b/ext/posix/tests/posix_setrlimit.phpt
index 4806fcfb4d6..88d62a2d2fd 100644
--- a/ext/posix/tests/posix_setrlimit.phpt
+++ b/ext/posix/tests/posix_setrlimit.phpt
@@ -2,7 +2,7 @@
 posix_setrlimit(): Basic tests
 --SKIPIF--
 <?php
-if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 if (!function_exists('posix_setrlimit')) die('skip posix_setrlimit() not found');
 ?>
 --FILE--
diff --git a/ext/posix/tests/posix_setuid_basic.phpt b/ext/posix/tests/posix_setuid_basic.phpt
index 986b0be62c8..3d3f7f8caed 100644
--- a/ext/posix/tests/posix_setuid_basic.phpt
+++ b/ext/posix/tests/posix_setuid_basic.phpt
@@ -5,8 +5,8 @@ Marco Fabbri mrfabbri@gmail.com
 Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_setuid_error.phpt b/ext/posix/tests/posix_setuid_error.phpt
index 8aa51586a49..f1522e663ca 100644
--- a/ext/posix/tests/posix_setuid_error.phpt
+++ b/ext/posix/tests/posix_setuid_error.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_setuid() by calling it more than or less than its expected arguments
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --CREDITS--
 Marco Fabbri mrfabbri@gmail.com
diff --git a/ext/posix/tests/posix_setuid_error2.phpt b/ext/posix/tests/posix_setuid_error2.phpt
index 5473f488971..697bd5b7541 100644
--- a/ext/posix/tests/posix_setuid_error2.phpt
+++ b/ext/posix/tests/posix_setuid_error2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_setuid() by substituting argument 1 with object values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --CREDITS--
 Marco Fabbri mrfabbri@gmail.com
diff --git a/ext/posix/tests/posix_setuid_variation1.phpt b/ext/posix/tests/posix_setuid_variation1.phpt
index 6748d7b9e83..94f13fbb10e 100644
--- a/ext/posix/tests/posix_setuid_variation1.phpt
+++ b/ext/posix/tests/posix_setuid_variation1.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_setuid() by substituting argument 1 with array values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --CREDITS--
 Marco Fabbri mrfabbri@gmail.com
diff --git a/ext/posix/tests/posix_setuid_variation2.phpt b/ext/posix/tests/posix_setuid_variation2.phpt
index 77505a64f7a..f3d697b7b44 100644
--- a/ext/posix/tests/posix_setuid_variation2.phpt
+++ b/ext/posix/tests/posix_setuid_variation2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_setuid() by substituting argument 1 with boolean values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
         if(posix_geteuid() == 0) print "skip - Cannot run test as root.";
 ?>
 --CREDITS--
diff --git a/ext/posix/tests/posix_setuid_variation3.phpt b/ext/posix/tests/posix_setuid_variation3.phpt
index 0042b72ee3d..9cef49876a6 100644
--- a/ext/posix/tests/posix_setuid_variation3.phpt
+++ b/ext/posix/tests/posix_setuid_variation3.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_setuid() by substituting argument 1 with emptyUnsetUndefNull values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
         if(posix_geteuid() == 0) print "skip - Cannot run test as root.";
 ?>
 --CREDITS--
diff --git a/ext/posix/tests/posix_setuid_variation4.phpt b/ext/posix/tests/posix_setuid_variation4.phpt
index 185ef8f53c5..dd552148cdf 100644
--- a/ext/posix/tests/posix_setuid_variation4.phpt
+++ b/ext/posix/tests/posix_setuid_variation4.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function posix_setuid() by substituting argument 1 with float values.
 --SKIPIF--
-<?php 
+<?php
         PHP_INT_SIZE == 4 or die("skip - 32-bit only");
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
         if(posix_geteuid() == 0) print "skip - Cannot run test as root.";
 ?>
 --CREDITS--
diff --git a/ext/posix/tests/posix_setuid_variation5.phpt b/ext/posix/tests/posix_setuid_variation5.phpt
index a4ebe63395c..09320b0cd9a 100644
--- a/ext/posix/tests/posix_setuid_variation5.phpt
+++ b/ext/posix/tests/posix_setuid_variation5.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_setuid() by substituting argument 1 with int values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
         if(posix_geteuid() == 0) print "skip - Cannot run test as root.";
 ?>
 --CREDITS--
diff --git a/ext/posix/tests/posix_setuid_variation6.phpt b/ext/posix/tests/posix_setuid_variation6.phpt
index 0536b8d199c..f3f421593fd 100644
--- a/ext/posix/tests/posix_setuid_variation6.phpt
+++ b/ext/posix/tests/posix_setuid_variation6.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test function posix_setuid() by substituting argument 1 with string values.
 --SKIPIF--
-<?php 
-        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+        if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --CREDITS--
 Marco Fabbri mrfabbri@gmail.com
diff --git a/ext/posix/tests/posix_strerror_error.phpt b/ext/posix/tests/posix_strerror_error.phpt
index 3803f465b21..3007f976c63 100644
--- a/ext/posix/tests/posix_strerror_error.phpt
+++ b/ext/posix/tests/posix_strerror_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test posix_strerror() function : error conditions 
+Test posix_strerror() function : error conditions
 --SKIPIF--
-<?php 
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto string posix_strerror(int errno)
- * Description: Retrieve the system error message associated with the given errno. 
+ * Description: Retrieve the system error message associated with the given errno.
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_strerror() : error conditions ***\n";
diff --git a/ext/posix/tests/posix_strerror_variation1.phpt b/ext/posix/tests/posix_strerror_variation1.phpt
index 40fff34be87..e95ca55b853 100644
--- a/ext/posix/tests/posix_strerror_variation1.phpt
+++ b/ext/posix/tests/posix_strerror_variation1.phpt
@@ -3,14 +3,14 @@ Test posix_strerror() function : usage variations
 --SKIPIF--
 <?php
     PHP_INT_SIZE == 4 or die("skip - 32-bit only");
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto string posix_strerror(int errno)
- * Description: Retrieve the system error message associated with the given errno. 
+ * Description: Retrieve the system error message associated with the given errno.
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_strerror() : usage variations ***\n";
@@ -61,7 +61,7 @@ $values = array(
 
       // unset data
       $unset_var,
-      
+
       // object data
       new stdclass(),
 );
diff --git a/ext/posix/tests/posix_times.phpt b/ext/posix/tests/posix_times.phpt
index 6ad3407ccb0..f75caa7920f 100644
--- a/ext/posix/tests/posix_times.phpt
+++ b/ext/posix/tests/posix_times.phpt
@@ -7,8 +7,8 @@ Source code: ext/posix/posix.c
 Falko Menge, mail at falko-menge dot de
 PHP Testfest Berlin 2009-05-10
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) { 
+<?php
+	if (!extension_loaded('posix')) {
         die('SKIP - POSIX extension not available');
     }
 ?>
diff --git a/ext/posix/tests/posix_times_basic.phpt b/ext/posix/tests/posix_times_basic.phpt
index 5da6434b143..ad37834fd91 100644
--- a/ext/posix/tests/posix_times_basic.phpt
+++ b/ext/posix/tests/posix_times_basic.phpt
@@ -1,23 +1,23 @@
 --TEST--
-Test posix_times() function : basic functionality 
+Test posix_times() function : basic functionality
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+<?php
+	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
-<?php 
-  echo "Basic test of POSIX times function\n"; 
-  	
+<?php
+  echo "Basic test of POSIX times function\n";
+
   $times = posix_times();
-  
-  var_dump($times); 
-  
-  
+
+  var_dump($times);
+
+
   if ($times == FALSE) {
   	$errno= posix_get_last_error();
-  	var_dump(posix_strerror($errno)); 
+  	var_dump(posix_strerror($errno));
   }
-  
+
 ?>
 ===DONE====
 --EXPECTF--
diff --git a/ext/posix/tests/posix_times_error.phpt b/ext/posix/tests/posix_times_error.phpt
index b7050473585..0f8a9e36015 100644
--- a/ext/posix/tests/posix_times_error.phpt
+++ b/ext/posix/tests/posix_times_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test posix_times() function : error conditions 
+Test posix_times() function : error conditions
 --SKIPIF--
-<?php 
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto array posix_times(void)
- * Description: Get process times (POSIX.1, 4.5.2) 
+ * Description: Get process times (POSIX.1, 4.5.2)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_times() : error conditions ***\n";
diff --git a/ext/posix/tests/posix_ttyname.phpt b/ext/posix/tests/posix_ttyname.phpt
index 76dff4e4c03..bfaf63861c6 100644
--- a/ext/posix/tests/posix_ttyname.phpt
+++ b/ext/posix/tests/posix_ttyname.phpt
@@ -7,8 +7,8 @@ Source code: ext/posix/posix.c
 Falko Menge, mail at falko-menge dot de
 PHP Testfest Berlin 2009-05-10
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) { 
+<?php
+	if (!extension_loaded('posix')) {
         die('SKIP - POSIX extension not available');
     }
 ?>
diff --git a/ext/posix/tests/posix_ttyname_error.phpt b/ext/posix/tests/posix_ttyname_error.phpt
index f7b011e7736..effa7097178 100644
--- a/ext/posix/tests/posix_ttyname_error.phpt
+++ b/ext/posix/tests/posix_ttyname_error.phpt
@@ -17,7 +17,7 @@ if (!extension_loaded('posix')) {
 echo "*** Test by calling method or function with incorrect numbers of arguments ***\n";
 
 $fd = 'foo';
-$extra_arg = 'bar'; 
+$extra_arg = 'bar';
 
 var_dump(posix_ttyname( $fd, $extra_arg ) );
 
diff --git a/ext/posix/tests/posix_ttyname_error_wrongparams.phpt b/ext/posix/tests/posix_ttyname_error_wrongparams.phpt
index daa487f8533..787e49c0f79 100644
--- a/ext/posix/tests/posix_ttyname_error_wrongparams.phpt
+++ b/ext/posix/tests/posix_ttyname_error_wrongparams.phpt
@@ -7,11 +7,11 @@ Source code: ext/posix/posix.c
 Falko Menge, mail at falko-menge dot de
 PHP Testfest Berlin 2009-05-10
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) { 
+<?php
+	if (!extension_loaded('posix')) {
         die('SKIP - POSIX extension not available');
     }
-	if (!extension_loaded('gd')) { 
+	if (!extension_loaded('gd')) {
         die('SKIP - GD extension not available');
     }
     if (!function_exists('imagecreate')) {
diff --git a/ext/posix/tests/posix_uname_basic.phpt b/ext/posix/tests/posix_uname_basic.phpt
index 6bd5b100ee0..c48694579a8 100644
--- a/ext/posix/tests/posix_uname_basic.phpt
+++ b/ext/posix/tests/posix_uname_basic.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test posix_uname() function : basic functionality 
+Test posix_uname() function : basic functionality
 --SKIPIF--
-<?php 
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded'); 
+<?php
+	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
-<?php 
-  echo "Basic test of POSIX uname function\n"; 
-  	
-  $uname = posix_uname();  
-  unset($uname['domainname']);  
+<?php
+  echo "Basic test of POSIX uname function\n";
+
+  $uname = posix_uname();
+  unset($uname['domainname']);
   print_r($uname);
-  
+
 ?>
 ===DONE====
 --EXPECTF--
diff --git a/ext/posix/tests/posix_uname_error.phpt b/ext/posix/tests/posix_uname_error.phpt
index b44f4ae8ca6..09c435fe695 100644
--- a/ext/posix/tests/posix_uname_error.phpt
+++ b/ext/posix/tests/posix_uname_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test posix_uname() function : error conditions 
+Test posix_uname() function : error conditions
 --SKIPIF--
-<?php 
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; 
+<?php
+	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
 /* Prototype  : proto array posix_uname(void)
- * Description: Get system name (POSIX.1, 4.4.1) 
+ * Description: Get system name (POSIX.1, 4.4.1)
  * Source code: ext/posix/posix.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing posix_uname() : error conditions ***\n";
diff --git a/ext/pspell/tests/001.phpt b/ext/pspell/tests/001.phpt
index 0a22352eefe..4853ab597e5 100644
--- a/ext/pspell/tests/001.phpt
+++ b/ext/pspell/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 pspell basic tests (warning: may fail with pspell/aspell < GNU Aspell 0.50.3)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("pspell")) die("skip");
 if (!@pspell_new ("en", "", "", "", (PSPELL_FAST|PSPELL_RUN_TOGETHER))) {
 	die("skip English dictionary is not available");
@@ -29,7 +29,7 @@ for($i=0,$u=count($array);$i<$u;++$i) {
     echo $array[$i].' : ';
     if (!pspell_check($pspell, $array[$i])) {
         echo "..false\n";
-        echo "Possible spellings: " . join(',',pspell_suggest ($pspell, $array[$i])) . "\n"; 
+        echo "Possible spellings: " . join(',',pspell_suggest ($pspell, $array[$i])) . "\n";
     } else {
         echo "true\n";
     }
diff --git a/ext/readline/tests/bug72538.phpt b/ext/readline/tests/bug72538.phpt
index 7de37f2e6e4..978dc00a8ce 100644
--- a/ext/readline/tests/bug72538.phpt
+++ b/ext/readline/tests/bug72538.phpt
@@ -1,12 +1,12 @@
 --TEST--
 Bug #72538 (readline_redisplay crashes php)
 --SKIPIF--
-<?php if (!extension_loaded("readline")) die("skip"); 
+<?php if (!extension_loaded("readline")) die("skip");
 if (READLINE_LIB != "libedit") die("skip libedit only");
 if (!function_exists("readline_redisplay")) die("skip readline_redisplay not available");
 ?>
 --FILE--
-<?php 
+<?php
 
 readline_redisplay();
 
diff --git a/ext/readline/tests/libedit_info_001-win32.phpt b/ext/readline/tests/libedit_info_001-win32.phpt
index 5d43921c60d..42be5929546 100644
--- a/ext/readline/tests/libedit_info_001-win32.phpt
+++ b/ext/readline/tests/libedit_info_001-win32.phpt
@@ -1,7 +1,7 @@
 --TEST--
 readline_info(): Basic test
 --SKIPIF--
-<?php if (!extension_loaded("readline")) die("skip"); 
+<?php if (!extension_loaded("readline")) die("skip");
 if (READLINE_LIB != "libedit") die("skip libedit only");
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
 	die('skip windows only test');
diff --git a/ext/readline/tests/libedit_info_001.phpt b/ext/readline/tests/libedit_info_001.phpt
index 33dc144add6..4c77e7a97c0 100644
--- a/ext/readline/tests/libedit_info_001.phpt
+++ b/ext/readline/tests/libedit_info_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 readline_info(): Basic test
 --SKIPIF--
-<?php if (!extension_loaded("readline")) die("skip"); 
+<?php if (!extension_loaded("readline")) die("skip");
 if (READLINE_LIB != "libedit") die("skip libedit only");
 if(substr(PHP_OS, 0, 3) == 'WIN' ) {
 	die('skip not for windows');
diff --git a/ext/reflection/tests/002.phpt b/ext/reflection/tests/002.phpt
index cbd7319731e..6024eaba1c1 100644
--- a/ext/reflection/tests/002.phpt
+++ b/ext/reflection/tests/002.phpt
@@ -6,7 +6,7 @@ Reflection properties are read only
 class ReflectionMethodEx extends ReflectionMethod
 {
 	public $foo = "xyz";
-	
+
 	function __construct($c,$m)
 	{
 		echo __METHOD__ . "\n";
diff --git a/ext/reflection/tests/006.phpt b/ext/reflection/tests/006.phpt
index 89c438765a1..ab22f5c5c97 100644
--- a/ext/reflection/tests/006.phpt
+++ b/ext/reflection/tests/006.phpt
@@ -12,7 +12,7 @@ Class Test
 	static public    $pub = 'pub';
 	static protected $pro = 'pro';
 	static private   $pri = 'pri';
-	
+
 	static function testing()
 	{
 		$ref = new ReflectionClass('Test');
diff --git a/ext/reflection/tests/007.phpt b/ext/reflection/tests/007.phpt
index 8dfc2e8bcc3..2b4f3df43f4 100644
--- a/ext/reflection/tests/007.phpt
+++ b/ext/reflection/tests/007.phpt
@@ -29,7 +29,7 @@ function test($class)
 	{
 		echo "Exception: " . $e->getMessage() . "\n";
 	}
-	
+
 	echo "====>newInstance(25)\n";
 	try
 	{
@@ -49,7 +49,7 @@ function test($class)
 	{
 		var_dump($e->getMessage());
 	}
-	
+
 	echo "\n";
 }
 
diff --git a/ext/reflection/tests/008.phpt b/ext/reflection/tests/008.phpt
index 2abdcdb57b5..4cae4abeffe 100644
--- a/ext/reflection/tests/008.phpt
+++ b/ext/reflection/tests/008.phpt
@@ -12,10 +12,10 @@ foreach ($a as $val) {
 		var_dump($e->getMessage());
 	}
 }
- 
+
 $a = array("", 1, "");
 $b = array("", "", 1);
- 
+
 foreach ($a as $key=>$val) {
 	try {
 		new ReflectionMethod($val, $b[$key]);
@@ -26,7 +26,7 @@ foreach ($a as $key=>$val) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(20) "Invalid method name "
 string(21) "Invalid method name 1"
 string(21) "Class  does not exist"
diff --git a/ext/reflection/tests/009.phpt b/ext/reflection/tests/009.phpt
index c6a252cfca9..09df90c8c36 100644
--- a/ext/reflection/tests/009.phpt
+++ b/ext/reflection/tests/009.phpt
@@ -47,7 +47,7 @@ var_dump($func->getNumberOfRequiredParameters());
 echo "Done\n";
 
 ?>
---EXPECTF--	
+--EXPECTF--
 /**
 hoho
 */
diff --git a/ext/reflection/tests/010.phpt b/ext/reflection/tests/010.phpt
index 8f92feea09e..8a08d9a788c 100644
--- a/ext/reflection/tests/010.phpt
+++ b/ext/reflection/tests/010.phpt
@@ -15,7 +15,7 @@ class Bar extends Foo {
 $m = new ReflectionMethod("Bar::func");
 echo $m;
 ?>
---EXPECTF--	
+--EXPECTF--
 Method [ <user, overwrites Foo, prototype Foo> public method func ] {
   @@ %s010.php 7 - 8
 }
diff --git a/ext/reflection/tests/011.phpt b/ext/reflection/tests/011.phpt
index b39be37c90a..e71f042f903 100644
--- a/ext/reflection/tests/011.phpt
+++ b/ext/reflection/tests/011.phpt
@@ -8,5 +8,5 @@ $ext = new ReflectionExtension("reflection");
 $classes = $ext->getClasses();
 echo $classes["ReflectionException"]->getName();
 ?>
---EXPECT--	
+--EXPECT--
 ReflectionException
diff --git a/ext/reflection/tests/012.phpt b/ext/reflection/tests/012.phpt
index b8a2694004b..24643450c17 100644
--- a/ext/reflection/tests/012.phpt
+++ b/ext/reflection/tests/012.phpt
@@ -11,6 +11,6 @@ $class = new ReflectionClass("Foo");
 $props = $class->getDefaultProperties();
 echo $props["test"];
 ?>
---EXPECT--	
+--EXPECT--
 ok
 
diff --git a/ext/reflection/tests/013.phpt b/ext/reflection/tests/013.phpt
index 9ecfa8b66c7..9905b95a7ac 100644
--- a/ext/reflection/tests/013.phpt
+++ b/ext/reflection/tests/013.phpt
@@ -8,6 +8,6 @@ $ext = new ReflectionExtension("standard");
 $funcs = $ext->getFunctions();
 echo $funcs["sleep"]->getName();
 ?>
---EXPECT--	
+--EXPECT--
 sleep
 
diff --git a/ext/reflection/tests/014.phpt b/ext/reflection/tests/014.phpt
index 8b5955f1248..c61403872ea 100644
--- a/ext/reflection/tests/014.phpt
+++ b/ext/reflection/tests/014.phpt
@@ -8,6 +8,6 @@ $ext = new ReflectionExtension("standard");
 $consts = $ext->getConstants();
 var_dump($consts["CONNECTION_NORMAL"]);
 ?>
---EXPECT--	
+--EXPECT--
 int(0)
 
diff --git a/ext/reflection/tests/015.phpt b/ext/reflection/tests/015.phpt
index b17236242a1..ed6607417fb 100644
--- a/ext/reflection/tests/015.phpt
+++ b/ext/reflection/tests/015.phpt
@@ -10,6 +10,6 @@ $ext = new ReflectionExtension("standard");
 $inis = $ext->getINIEntries();
 var_dump($inis["user_agent"]);
 ?>
---EXPECT--	
+--EXPECT--
 string(3) "php"
 
diff --git a/ext/reflection/tests/016.phpt b/ext/reflection/tests/016.phpt
index d2891652510..e9b37c0acb5 100644
--- a/ext/reflection/tests/016.phpt
+++ b/ext/reflection/tests/016.phpt
@@ -2,7 +2,7 @@
 ReflectionExtension::getDependencies()
 --SKIPIF--
 <?php
-extension_loaded('reflection') or die('skip'); 
+extension_loaded('reflection') or die('skip');
 if (!extension_loaded("xml")) {
   die('skip xml extension not available');
 }
@@ -13,7 +13,7 @@ $ext = new ReflectionExtension("xml");
 $deps = $ext->getDependencies();
 var_dump($deps);
 ?>
---EXPECT--	
+--EXPECT--
 array(1) {
   ["libxml"]=>
   string(8) "Required"
diff --git a/ext/reflection/tests/018.phpt b/ext/reflection/tests/018.phpt
index fbda5d62d44..40bda17544e 100644
--- a/ext/reflection/tests/018.phpt
+++ b/ext/reflection/tests/018.phpt
@@ -6,7 +6,7 @@ Reflection::getModifierNames
 <?php
 var_dump(Reflection::getModifierNames(ReflectionMethod::IS_FINAL | ReflectionMethod::IS_PROTECTED));
 ?>
---EXPECT--	
+--EXPECT--
 array(2) {
   [0]=>
   string(5) "final"
diff --git a/ext/reflection/tests/019.phpt b/ext/reflection/tests/019.phpt
index b6ac20c6bd7..cd4bd3e467b 100644
--- a/ext/reflection/tests/019.phpt
+++ b/ext/reflection/tests/019.phpt
@@ -7,5 +7,5 @@ ReflectionFunction::getExtensionName
 $f = new ReflectionFunction("sleep");
 var_dump($f->getExtensionName());
 ?>
---EXPECT--	
+--EXPECT--
 string(8) "standard"
diff --git a/ext/reflection/tests/020.phpt b/ext/reflection/tests/020.phpt
index c5b0ae5c2ac..fc2d0a61a0f 100644
--- a/ext/reflection/tests/020.phpt
+++ b/ext/reflection/tests/020.phpt
@@ -20,7 +20,7 @@ var_dump($obj->hasProperty("p2"));
 var_dump($obj->hasProperty("p3"));
 var_dump($obj->hasProperty("p4"));
 ?>
---EXPECT--	
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/reflection/tests/021.phpt b/ext/reflection/tests/021.phpt
index 30dbb5afcb3..25701eb9399 100644
--- a/ext/reflection/tests/021.phpt
+++ b/ext/reflection/tests/021.phpt
@@ -11,6 +11,6 @@ $class = new ReflectionClass("Foo");
 var_dump($class->hasConstant("c1"));
 var_dump($class->hasConstant("c2"));
 ?>
---EXPECT--	
+--EXPECT--
 bool(true)
 bool(false)
diff --git a/ext/reflection/tests/022.phpt b/ext/reflection/tests/022.phpt
index 50dbd6ec74f..f2bdbfddd6c 100644
--- a/ext/reflection/tests/022.phpt
+++ b/ext/reflection/tests/022.phpt
@@ -11,6 +11,6 @@ $class = new ReflectionClass("Foo");
 var_dump($class->getConstant("c1"));
 var_dump($class->getConstant("c2"));
 ?>
---EXPECT--	
+--EXPECT--
 int(1)
 bool(false)
diff --git a/ext/reflection/tests/023.phpt b/ext/reflection/tests/023.phpt
index ab113659511..dfd43c0b8ca 100644
--- a/ext/reflection/tests/023.phpt
+++ b/ext/reflection/tests/023.phpt
@@ -17,7 +17,7 @@ class C2 extends C1 {
 $class = new ReflectionClass("C2");
 var_dump($class->getDefaultProperties());
 ?>
---EXPECT--	
+--EXPECT--
 array(5) {
   ["p4"]=>
   int(4)
diff --git a/ext/reflection/tests/024.phpt b/ext/reflection/tests/024.phpt
index a1c2c81a930..ae900e638f0 100644
--- a/ext/reflection/tests/024.phpt
+++ b/ext/reflection/tests/024.phpt
@@ -17,7 +17,7 @@ $x->p3 = 5;
 $obj = new ReflectionObject($x);
 echo $obj;
 ?>
---EXPECTF--	
+--EXPECTF--
 Object of class [ <user> class C1 ] {
   @@ %s024.php 2-6
 
diff --git a/ext/reflection/tests/025.phpt b/ext/reflection/tests/025.phpt
index 0259d66bd3c..0bcf3e0f5ce 100644
--- a/ext/reflection/tests/025.phpt
+++ b/ext/reflection/tests/025.phpt
@@ -49,7 +49,7 @@ var_dump($func->getNumberOfRequiredParameters());
 echo "Done\n";
 
 ?>
---EXPECTF--	
+--EXPECTF--
 /**
 hoho
 */
diff --git a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
index bbe5fdbaec4..6fe72c3b456 100644
--- a/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
@@ -7,7 +7,7 @@ TestFest PHP|Tek
 <?php
 if (!extension_loaded('reflection')) print 'skip';
 ?>
---FILE-- 
+--FILE--
 <?php
 $rc = new ReflectionClass("stdClass");
 $rc2 = clone($rc);
diff --git a/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt b/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt
index da276e68cfa..28769da707e 100644
--- a/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_FileInfo_basic.phpt
@@ -1,6 +1,6 @@
 --TEST--
 ReflectionClass::getFileName(), ReflectionClass::getStartLine(), ReflectionClass::getEndLine()
---FILE-- 
+--FILE--
 <?php
 //New instance of class C - defined below
 $rc = new ReflectionClass("C");
@@ -14,7 +14,7 @@ var_dump($rc->getStartLine());
 //Get the line number at the end of the definition of class C
 var_dump($rc->getEndLine());
 
-//Same tests as above but stdclass is internal - so all results should be false. 
+//Same tests as above but stdclass is internal - so all results should be false.
 $rc = new ReflectionClass("stdClass");
 var_dump($rc->getFileName());
 var_dump($rc->getStartLine());
diff --git a/ext/reflection/tests/ReflectionClass_FileInfo_error.phpt b/ext/reflection/tests/ReflectionClass_FileInfo_error.phpt
index b42be136cda..a4e5f955642 100644
--- a/ext/reflection/tests/ReflectionClass_FileInfo_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_FileInfo_error.phpt
@@ -1,6 +1,6 @@
 --TEST--
 ReflectionClass::getFileName(), ReflectionClass::getStartLine(), ReflectionClass::getEndLine() - bad params
---FILE-- 
+--FILE--
 <?php
 Class C { }
 
@@ -10,7 +10,7 @@ $methods = array("getFileName", "getStartLine", "getEndLine");
 foreach ($methods as $method) {
 	var_dump($rc->$method());
 	var_dump($rc->$method(null));
-	var_dump($rc->$method('X', 0));	
+	var_dump($rc->$method('X', 0));
 }
 ?>
 --EXPECTF--
diff --git a/ext/reflection/tests/ReflectionClass_constructor_002.phpt b/ext/reflection/tests/ReflectionClass_constructor_002.phpt
index 3685c639de9..64c299592d1 100644
--- a/ext/reflection/tests/ReflectionClass_constructor_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_constructor_002.phpt
@@ -5,43 +5,43 @@ ReflectionClass::__constructor() - bad arguments
 try {
 	var_dump(new ReflectionClass());
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n";  
+	echo $e->getMessage() . "\n";
 }
 
 try {
 	var_dump(new ReflectionClass(null));
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n";  
+	echo $e->getMessage() . "\n";
 }
 
 try {
 	var_dump(new ReflectionClass(true));
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n";  
+	echo $e->getMessage() . "\n";
 }
 
 try {
 	var_dump(new ReflectionClass(1));
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n";  
+	echo $e->getMessage() . "\n";
 }
 
 try {
 	var_dump(new ReflectionClass(array(1,2,3)));
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n";  
+	echo $e->getMessage() . "\n";
 }
 
 try {
 	var_dump(new ReflectionClass("stdClass", 1));
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n";  
+	echo $e->getMessage() . "\n";
 }
 
 try {
 	var_dump(new ReflectionClass("X"));
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n";  
+	echo $e->getMessage() . "\n";
 }
 
 ?>
diff --git a/ext/reflection/tests/ReflectionClass_export_basic1.phpt b/ext/reflection/tests/ReflectionClass_export_basic1.phpt
index 8729731f565..83c514adabb 100644
--- a/ext/reflection/tests/ReflectionClass_export_basic1.phpt
+++ b/ext/reflection/tests/ReflectionClass_export_basic1.phpt
@@ -2,7 +2,7 @@
 ReflectionClass::export() - various parameters
 --FILE--
 <?php
-Class A { 
+Class A {
 	public function privf(Exception $a) {}
 	public function pubf(A $a,
 						 $b,
diff --git a/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt b/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
index c572796ae8d..5db9d8f3d31 100644
--- a/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
@@ -48,7 +48,7 @@ class D1 extends C {
 class D2 extends C {
 }
 
-$classes = array('NewCtor', 'ExtendsNewCtor', 'OldCtor', 'ExtendsOldCtor', 
+$classes = array('NewCtor', 'ExtendsNewCtor', 'OldCtor', 'ExtendsOldCtor',
 				 'OldAndNewCtor', 'NewAndOldCtor', 'B', 'C', 'D1', 'D2', 'X', 'Y');
 
 foreach ($classes as $class) {
@@ -59,9 +59,9 @@ foreach ($classes as $class) {
 	}  else {
 		echo "No constructor for $class\n";
 	}
-	
-}				 
-				 
+
+}
+
 ?>
 --EXPECTF--
 Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; OldCtor has a deprecated constructor in %s on line %d
diff --git a/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt b/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt
index e19db811881..9ca0ae52f79 100644
--- a/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getDefaultProperties_001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-ReflectionClass::getDefaultProperties(), ReflectionClass::getStaticProperties() 
+ReflectionClass::getDefaultProperties(), ReflectionClass::getStaticProperties()
 --CREDITS--
 Robin Fernandes <robinf@php.net>
 Steve Seear <stevseea@php.net>
@@ -11,15 +11,15 @@ class A {
 	static public $statPubC = "stat pubC in A";
 	static protected $statProtC = "stat protC in A";
 	static private $statPrivC = "stat privC in A";
-	
+
 	static public $statPubA = "stat pubA in A";
 	static protected $statProtA = "stat protA in A";
 	static private $statPrivA = "stat privA in A";
-	
+
 	public $pubC = "pubC in A";
 	protected $protC = "protC in A";
 	private $privC = "privC in A";
-	
+
 	public $pubA = "pubA in A";
 	protected $protA = "protA in A";
 	private $privA = "privA in A";
@@ -32,22 +32,22 @@ class B extends A {
 
 	static public $statPubB = "stat pubB in B";
 	static protected $statProtB = "stat protB in B";
-	static private $statPrivB = "stat privB in B";	
-	
+	static private $statPrivB = "stat privB in B";
+
 	public $pubC = "pubC in B";
 	protected $protC = "protC in B";
 	private $privC = "privC in B";
 
 	public $pubB = "pubB in B";
 	protected $protB = "protB in B";
-	private $privB = "privB in B";	
+	private $privB = "privB in B";
 }
 
 class C extends B {
 	static public $statPubC = "stat pubC in C";
 	static protected $statProtC = "stat protC in C";
 	static private $statPrivC = "stat privC in C";
-	
+
 	public $pubC = "pubC in C";
 	protected $protC = "protC in C";
 	private $privC = "privC in C";
@@ -60,7 +60,7 @@ class X {
 
 	public $pubC = "pubC in X";
 	protected $protC = "protC in X";
-	private $privC = "privC in X";	
+	private $privC = "privC in X";
 }
 
 $classes = array('A', 'B', 'C', 'X');
@@ -68,7 +68,7 @@ foreach ($classes as $class) {
 	$rc = new ReflectionClass($class);
 	echo "\n\n---- Static properties in $class ----\n";
 	print_r($rc->getStaticProperties());
-	echo "\n\n---- Default properties in $class ----\n";	
+	echo "\n\n---- Default properties in $class ----\n";
 	print_r($rc->getDefaultProperties());
 }
 
diff --git a/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt b/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt
index 624829f0143..31e0e8e58b9 100644
--- a/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt
@@ -11,8 +11,8 @@ opcache.save_comments=1
 
 
 		My
-Doc 
-		* Comment 
+Doc
+		* Comment
 for A
 
 * */
@@ -49,8 +49,8 @@ final class G extends C implements I {} {}
 $classes = array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'I');
 foreach ($classes as $class) {
 	echo "\n\n---> Doc comment for class $class:\n";
-	$rc = new ReflectionClass($class);	
-	var_dump($rc->getDocComment());	
+	$rc = new ReflectionClass($class);
+	var_dump($rc->getDocComment());
 }
 
 
@@ -63,8 +63,8 @@ string(%d) "/**
 
 
 		My
-Doc 
-		* Comment 
+Doc
+		* Comment
 for A
 
 * */"
diff --git a/ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt b/ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt
index 998355cc7cb..4f783430818 100644
--- a/ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt
+++ b/ext/reflection/tests/ReflectionClass_getExtensionName_variation.phpt
@@ -7,7 +7,7 @@ Rein Velt <rein@velt.org>
 <?php
 
 	class myClass
-	{	
+	{
 		public $varX;
 		public $varY;
 	}
diff --git a/ext/reflection/tests/ReflectionClass_getExtension_variation.phpt b/ext/reflection/tests/ReflectionClass_getExtension_variation.phpt
index 5409504716b..f3697792db7 100644
--- a/ext/reflection/tests/ReflectionClass_getExtension_variation.phpt
+++ b/ext/reflection/tests/ReflectionClass_getExtension_variation.phpt
@@ -7,7 +7,7 @@ Rein Velt <rein@velt.org>
 <?php
 
 	class myClass
-	{	
+	{
 		public $varX;
 		public $varY;
 	}
diff --git a/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt b/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt
index 42136003e71..a622e87d2f2 100644
--- a/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getInterfaces_001.phpt
@@ -28,7 +28,7 @@ class C5 extends C4 implements I7 {}
 class C6 implements I1, I2, I3, I4, I5, I6, I7 {}
 
 
-$classes = array( 	'A0', 'A1', 'B0', 'B1', 
+$classes = array( 	'A0', 'A1', 'B0', 'B1',
 					'I0', 'I1', 'I2', 'I3', 'I4', 'I5', 'I6', 'I7',
 					'C0', 'C1', 'C2', 'C3', 'C4', 'C5', 'C6'	);
 
diff --git a/ext/reflection/tests/ReflectionClass_getMethod_001.phpt b/ext/reflection/tests/ReflectionClass_getMethod_001.phpt
index 780b558cc7e..59887991ecf 100644
--- a/ext/reflection/tests/ReflectionClass_getMethod_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getMethod_001.phpt
@@ -7,14 +7,14 @@ Steve Seear <stevseea@php.net>
 <?php
 class pubf {
 	public function f() {}
-	static public function s() {}	
+	static public function s() {}
 }
 class subpubf extends pubf {
 }
 
 class protf {
 	protected function f() {}
-	static protected function s() {}	
+	static protected function s() {}
 }
 class subprotf extends protf {
 }
@@ -26,7 +26,7 @@ class privf {
 class subprivf extends privf  {
 }
 
-$classes = array("pubf", "subpubf", "protf", "subprotf", 
+$classes = array("pubf", "subpubf", "protf", "subprotf",
 				 "privf", "subprivf");
 foreach($classes as $class) {
 	echo "Reflecting on class $class: \n";
@@ -34,14 +34,14 @@ foreach($classes as $class) {
 	echo "  --> Check for f(): ";
 	var_dump($rc->getMethod("f"));
 	echo "  --> Check for s(): ";
-	var_dump($rc->getMethod("s"));	
+	var_dump($rc->getMethod("s"));
 	echo "  --> Check for F(): ";
-	var_dump($rc->getMethod("F"));	
+	var_dump($rc->getMethod("F"));
 	echo "  --> Check for doesntExist(): ";
 	try {
 		var_dump($rc->getMethod("doesntExist"));
 	} catch (Exception $e) {
-		echo $e->getMessage() . "\n"; 
+		echo $e->getMessage() . "\n";
 	}
 }
 ?>
diff --git a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
index 2baabdedadf..f70e779e9f9 100644
--- a/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getMethod_002.phpt
@@ -14,42 +14,42 @@ echo "Check invalid params:\n";
 try {
 	var_dump($rc->getMethod());
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n"; 
+	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getMethod("f", "f"));
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n"; 
+	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getMethod(null));
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n"; 
+	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getMethod(1));
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n"; 
+	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getMethod(1.5));
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n"; 
+	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getMethod(true));
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n"; 
+	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getMethod(array(1,2,3)));
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n"; 
+	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getMethod(new C));
 } catch (Exception $e) {
-	echo $e->getMessage() . "\n"; 
+	echo $e->getMessage() . "\n";
 }
 
 
diff --git a/ext/reflection/tests/ReflectionClass_getMethods_001.phpt b/ext/reflection/tests/ReflectionClass_getMethods_001.phpt
index 7d4b6774c22..dca9adb56df 100644
--- a/ext/reflection/tests/ReflectionClass_getMethods_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getMethods_001.phpt
@@ -7,14 +7,14 @@ Steve Seear <stevseea@php.net>
 <?php
 class pubf {
 	public function f() {}
-	static public function s() {}	
+	static public function s() {}
 }
 class subpubf extends pubf {
 }
 
 class protf {
 	protected function f() {}
-	static protected function s() {}	
+	static protected function s() {}
 }
 class subprotf extends protf {
 }
@@ -26,7 +26,7 @@ class privf {
 class subprivf extends privf  {
 }
 
-$classes = array("pubf", "subpubf", "protf", "subprotf", 
+$classes = array("pubf", "subpubf", "protf", "subprotf",
 				 "privf", "subprivf");
 foreach($classes as $class) {
 	echo "Reflecting on class $class: \n";
diff --git a/ext/reflection/tests/ReflectionClass_getName_basic.phpt b/ext/reflection/tests/ReflectionClass_getName_basic.phpt
index 158413f158f..b80e24853aa 100644
--- a/ext/reflection/tests/ReflectionClass_getName_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_getName_basic.phpt
@@ -18,7 +18,7 @@ $r3 = new ReflectionClass("TrickClass");
 
 var_dump($r1->getName(), $r2->getName(), $r3->getName());
 
-?> 
+?>
 --EXPECTF--
 string(8) "stdClass"
 string(8) "stdClass"
diff --git a/ext/reflection/tests/ReflectionClass_getName_error.phpt b/ext/reflection/tests/ReflectionClass_getName_error.phpt
index 06cc4155be7..145704e7bcd 100644
--- a/ext/reflection/tests/ReflectionClass_getName_error.phpt
+++ b/ext/reflection/tests/ReflectionClass_getName_error.phpt
@@ -7,7 +7,7 @@ $r1 = new ReflectionClass("stdClass");
 
 var_dump($r1->getName('X'));
 var_dump($r1->getName('X', true));
-?> 
+?>
 --EXPECTF--
 Warning: ReflectionClass::getName() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
diff --git a/ext/reflection/tests/ReflectionClass_getProperties_001.phpt b/ext/reflection/tests/ReflectionClass_getProperties_001.phpt
index ed0b160b93b..3554af38909 100644
--- a/ext/reflection/tests/ReflectionClass_getProperties_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperties_001.phpt
@@ -14,7 +14,7 @@ class subpubf extends pubf {
 
 class protf {
 	protected $a;
-	static protected $s;	
+	static protected $s;
 }
 class subprotf extends protf {
 }
@@ -26,7 +26,7 @@ class privf {
 class subprivf extends privf  {
 }
 
-$classes = array("pubf", "subpubf", "protf", "subprotf", 
+$classes = array("pubf", "subpubf", "protf", "subprotf",
 				 "privf", "subprivf");
 foreach($classes as $class) {
 	echo "Reflecting on class $class: \n";
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_001.phpt b/ext/reflection/tests/ReflectionClass_getProperty_001.phpt
index fca68ed30f5..830608e0ca4 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_001.phpt
@@ -26,7 +26,7 @@ class privf {
 class subprivf extends privf  {
 }
 
-$classes = array("pubf", "subpubf", "protf", "subprotf", 
+$classes = array("pubf", "subpubf", "protf", "subprotf",
 				 "privf", "subprivf");
 foreach($classes as $class) {
 	echo "Reflecting on class $class: \n";
@@ -35,25 +35,25 @@ foreach($classes as $class) {
 		echo "  --> Check for s: ";
 		var_dump($rc->getProperty("s"));
 	} catch (exception $e) {
-		echo $e->getMessage() . "\n";	
+		echo $e->getMessage() . "\n";
 	}
 	try {
 		echo "  --> Check for a: ";
 		var_dump($rc->getProperty("a"));
 	} catch (exception $e) {
-		echo $e->getMessage() . "\n";	
-	}	
+		echo $e->getMessage() . "\n";
+	}
 	try {
 		echo "  --> Check for A: ";
 		var_dump($rc->getProperty("A"));
 	} catch (exception $e) {
-		echo $e->getMessage() . "\n";	
+		echo $e->getMessage() . "\n";
 	}
 	try {
 		echo "  --> Check for doesntExist: ";
 		var_dump($rc->getProperty("doesntExist"));
 	} catch (exception $e) {
-		echo $e->getMessage() . "\n";	
+		echo $e->getMessage() . "\n";
 	}
 
 }
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
index be7bb53bc87..cf4aca51ea5 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_002.phpt
@@ -14,42 +14,42 @@ echo "Check invalid params:\n";
 try {
 	var_dump($rc->getProperty());
 } catch (exception $e) {
-	echo $e->getMessage() . "\n";	
+	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getProperty("a", "a"));
 } catch (exception $e) {
-	echo $e->getMessage() . "\n";	
+	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getProperty(null));
 } catch (exception $e) {
-	echo $e->getMessage() . "\n";	
+	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getProperty(1));
 } catch (exception $e) {
-	echo $e->getMessage() . "\n";	
+	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getProperty(1.5));
 } catch (exception $e) {
-	echo $e->getMessage() . "\n";	
+	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getProperty(true));
 } catch (exception $e) {
-	echo $e->getMessage() . "\n";	
+	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getProperty(array(1,2,3)));
 } catch (exception $e) {
-	echo $e->getMessage() . "\n";	
+	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getProperty(new C));
 } catch (exception $e) {
-	echo $e->getMessage() . "\n";	
+	echo $e->getMessage() . "\n";
 }
 ?>
 --EXPECTF--
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_003.phpt b/ext/reflection/tests/ReflectionClass_getProperty_003.phpt
index 16c0c306ba5..98b824b747b 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_003.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_003.phpt
@@ -9,10 +9,10 @@ class A {
 	static public $pubC = "pubC in A";
 	static protected $protC = "protC in A";
 	static private $privC = "privC in A";
-	
+
 	static public $pubA = "pubA in A";
 	static protected $protA = "protA in A";
-	static private $privA = "privA in A";		
+	static private $privA = "privA in A";
 }
 
 class B extends A {
@@ -22,7 +22,7 @@ class B extends A {
 
 	static public $pubB = "pubB in B";
 	static protected $protB = "protB in B";
-	static private $privB = "privB in B";	
+	static private $privB = "privB in B";
 }
 
 class C extends B {
@@ -34,7 +34,7 @@ class C extends B {
 class X {
 	static public $pubC = "pubC in X";
 	static protected $protC = "protC in X";
-	static private $privC = "privC in X";	
+	static private $privC = "privC in X";
 }
 
 $myC = new C;
@@ -52,10 +52,10 @@ function showInfo($name) {
 	try {
 		var_dump($rp);
 		var_dump($rp->getValue($myC));
-	} catch (Exception $e) {		
+	} catch (Exception $e) {
 		echo $e->getMessage() . "\n";
 		return;
-	}		
+	}
 }
 
 
diff --git a/ext/reflection/tests/ReflectionClass_getProperty_004.phpt b/ext/reflection/tests/ReflectionClass_getProperty_004.phpt
index 89335f42c4e..d547f50539f 100644
--- a/ext/reflection/tests/ReflectionClass_getProperty_004.phpt
+++ b/ext/reflection/tests/ReflectionClass_getProperty_004.phpt
@@ -9,10 +9,10 @@ class A {
 	public $pubC = "pubC in A";
 	protected $protC = "protC in A";
 	private $privC = "privC in A";
-	
+
 	public $pubA = "pubA in A";
 	protected $protA = "protA in A";
-	private $privA = "privA in A";		
+	private $privA = "privA in A";
 }
 
 class B extends A {
@@ -22,7 +22,7 @@ class B extends A {
 
 	public $pubB = "pubB in B";
 	protected $protB = "protB in B";
-	private $privB = "privB in B";	
+	private $privB = "privB in B";
 }
 
 class C extends B {
@@ -34,7 +34,7 @@ class C extends B {
 class X {
 	public $pubC = "pubC in X";
 	protected $protC = "protC in X";
-	private $privC = "privC in X";	
+	private $privC = "privC in X";
 }
 
 $myC = new C;
@@ -52,10 +52,10 @@ function showInfo($name) {
 	try {
 		var_dump($rp);
 		var_dump($rp->getValue($myC));
-	} catch (Exception $e) {		
+	} catch (Exception $e) {
 		echo $e->getMessage() . "\n";
 		return;
-	}		
+	}
 }
 
 
diff --git a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt
index ab8afb8cb9f..365ec89ff14 100644
--- a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-ReflectionClass::getStaticPropertyValue() 
+ReflectionClass::getStaticPropertyValue()
 --CREDITS--
 Robin Fernandes <robinf@php.net>
 Steve Seear <stevseea@php.net>
@@ -42,7 +42,7 @@ try {
 
 try {
 	var_dump($rcA->getStaticPropertyValue("privateOverridden"));
-	echo "you should not see this";	
+	echo "you should not see this";
 } catch (Exception $e) {
 	echo $e->getMessage() . "\n";
 }
diff --git a/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt b/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt
index 6e6d4341c85..b4f4a1a88ac 100644
--- a/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasConstant_001.phpt
@@ -22,7 +22,7 @@ echo "Check absent constant: ";
 var_dump($rc->hasConstant("doesntExist"));
 
 
-$rd = new ReflectionClass("D");  
+$rd = new ReflectionClass("D");
 echo "Check inherited constant: ";
 var_dump($rd->hasConstant("myConst"));
 echo "Check absent constant: ";
diff --git a/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt b/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt
index 0ff2523d6ff..7f5d4ca2c86 100644
--- a/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasConstant_basic.phpt
@@ -3,7 +3,7 @@ ReflectionClass::hasConstant()
 --CREDITS--
 Marc Veldman <marc@ibuildings.nl>
 #testfest roosendaal on 2008-05-10
---FILE-- 
+--FILE--
 <?php
 //New instance of class C - defined below
 $rc = new ReflectionClass("C");
diff --git a/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt b/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt
index 81614bd9f80..b7519e551b5 100644
--- a/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasMethod_001.phpt
@@ -7,14 +7,14 @@ Steve Seear <stevseea@php.net>
 <?php
 class pubf {
 	public function f() {}
-	static public function s() {}	
+	static public function s() {}
 }
 class subpubf extends pubf {
 }
 
 class protf {
 	protected function f() {}
-	static protected function s() {}	
+	static protected function s() {}
 }
 class subprotf extends protf {
 }
@@ -26,7 +26,7 @@ class privf {
 class subprivf extends privf  {
 }
 
-$classes = array("pubf", "subpubf", "protf", "subprotf", 
+$classes = array("pubf", "subpubf", "protf", "subprotf",
 				 "privf", "subprivf");
 foreach($classes as $class) {
 	echo "Reflecting on class $class: \n";
@@ -34,9 +34,9 @@ foreach($classes as $class) {
 	echo "  --> Check for f(): ";
 	var_dump($rc->hasMethod("f"));
 	echo "  --> Check for s(): ";
-	var_dump($rc->hasMethod("s"));	
+	var_dump($rc->hasMethod("s"));
 	echo "  --> Check for F(): ";
-	var_dump($rc->hasMethod("F"));	
+	var_dump($rc->hasMethod("F"));
 	echo "  --> Check for doesntExist(): ";
 	var_dump($rc->hasMethod("doesntExist"));
 }
diff --git a/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt b/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt
index fa4ee482b25..025a11d2118 100644
--- a/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasMethod_basic.phpt
@@ -3,7 +3,7 @@ ReflectionClass::hasMethod()
 --CREDITS--
 Marc Veldman <marc@ibuildings.nl>
 #testfest roosendaal on 2008-05-10
---FILE-- 
+--FILE--
 <?php
 //New instance of class C - defined below
 $rc = new ReflectionClass("C");
diff --git a/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt
index 88c4cd509ae..cd4a4e048d6 100644
--- a/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasProperty_001.phpt
@@ -26,17 +26,17 @@ class privf {
 class subprivf extends privf  {
 }
 
-$classes = array("pubf", "subpubf", "protf", "subprotf", 
+$classes = array("pubf", "subpubf", "protf", "subprotf",
 				 "privf", "subprivf");
 foreach($classes as $class) {
 	echo "Reflecting on class $class: \n";
 	$rc = new ReflectionClass($class);
 	echo "  --> Check for s: ";
-	var_dump($rc->hasProperty("s"));	
+	var_dump($rc->hasProperty("s"));
 	echo "  --> Check for a: ";
 	var_dump($rc->hasProperty("a"));
 	echo "  --> Check for A: ";
-	var_dump($rc->hasProperty("A"));	
+	var_dump($rc->hasProperty("A"));
 	echo "  --> Check for doesntExist: ";
 	var_dump($rc->hasProperty("doesntExist"));
 }
diff --git a/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt b/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt
index d6dda7c2a39..c022caba2f9 100644
--- a/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_hasProperty_basic.phpt
@@ -3,7 +3,7 @@ ReflectionClass::hasProperty()
 --CREDITS--
 Marc Veldman <marc@ibuildings.nl>
 #testfest roosendaal on 2008-05-10
---FILE-- 
+--FILE--
 <?php
 //New instance of class C - defined below
 $rc = new ReflectionClass("C");
diff --git a/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt b/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt
index 9c2fdedddba..91398867ecd 100644
--- a/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_implementsInterface_001.phpt
@@ -12,7 +12,7 @@ class B extends A {}
 interface I2 extends I1 {}
 class C implements I2 {}
 
-$classNames = array('A', 'B', 'C', 'I1', 'I2'); 
+$classNames = array('A', 'B', 'C', 'I1', 'I2');
 
 foreach ($classNames as $className) {
 	$rcs[$className] = new ReflectionClass($className);
@@ -26,7 +26,7 @@ foreach ($rcs as $childName => $child) {
 			var_dump($child->implementsInterface($parent));
 		} catch (Exception $e) {
 			echo $e->getMessage() . "\n";
-		}		
+		}
 		echo "   - Using string argument: ";
 		try {
 			var_dump($child->implementsInterface($parentName));
diff --git a/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt b/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt
index 2da09449ff2..846ee9607b7 100644
--- a/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInstance_basic.phpt
@@ -22,7 +22,7 @@ foreach ($classes as $class) {
 
 	foreach ($instances as $name => $instance) {
 		echo "is $name a $class? ";
-		var_dump($rc->isInstance($instance));	
+		var_dump($rc->isInstance($instance));
 	}
 
 }
diff --git a/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt b/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt
index 6ebcfa99a9e..0d48513299f 100644
--- a/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInstantiable_basic.phpt
@@ -27,7 +27,7 @@ $classes = array("C", "iface", "ifaceImpl", "abstractClass", "D");
 foreach($classes  as $class ) {
 	$reflectionClass = new ReflectionClass($class);
 	echo "Is $class instantiable?  ";
-	var_dump($reflectionClass->IsInstantiable()); 
+	var_dump($reflectionClass->IsInstantiable());
 
 }
 
diff --git a/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt b/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt
index e334a90a728..1378edd3d2f 100644
--- a/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInstantiable_variation.phpt
@@ -36,7 +36,7 @@ $classes = array("noCtor", "publicCtorNew", "protectedCtorNew", "privateCtorNew"
 foreach($classes  as $class ) {
 	$reflectionClass = new ReflectionClass($class);
 	echo "Is $class instantiable?  ";
-	var_dump($reflectionClass->IsInstantiable()); 
+	var_dump($reflectionClass->IsInstantiable());
 }
 
 ?>
diff --git a/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt b/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt
index 2eaacb67f86..ca21cf77ef3 100644
--- a/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isInternal_basic.phpt
@@ -11,7 +11,7 @@ $r3 = new ReflectionClass("ReflectionProperty");
 $r4 = new ReflectionClass("Exception");
 $r5 = new ReflectionClass("C");
 
-var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(), 
+var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(),
 		 $r4->isInternal(), $r5->isInternal());
 ?>
 --EXPECTF--
diff --git a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
index 42dc647a021..8a0098ad8d6 100644
--- a/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
@@ -26,7 +26,7 @@ Class ExtendsIteratorAggregateImpl extends IterarorAggregateImpl {
 Class A {
 }
 
-$classes = array('Traversable', 'Iterator', 'IteratorAggregate', 'ExtendsIterator', 'ExtendsIteratorAggregate', 
+$classes = array('Traversable', 'Iterator', 'IteratorAggregate', 'ExtendsIterator', 'ExtendsIteratorAggregate',
 	  'IteratorImpl', 'IterarorAggregateImpl', 'ExtendsIteratorImpl', 'ExtendsIteratorAggregateImpl', 'A');
 
 foreach($classes as $class) {
diff --git a/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt b/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt
index 94fcf00ece9..b175d9656c5 100644
--- a/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isSubclassOf_basic.phpt
@@ -9,7 +9,7 @@ class C extends B {}
 interface I {}
 class X implements I {}
 
-$classNames = array('A', 'B', 'C', 'I', 'X'); 
+$classNames = array('A', 'B', 'C', 'I', 'X');
 
 foreach ($classNames as $className) {
 	$rcs[$className] = new ReflectionClass($className);
@@ -21,7 +21,7 @@ foreach ($rcs as $childName => $child) {
 		echo "   - Using object argument: ";
 		var_dump($child->isSubclassOf($parent));
 		echo "   - Using string argument: ";
-		var_dump($child->isSubclassOf($parentName)); 
+		var_dump($child->isSubclassOf($parentName));
 	}
 }
 ?>
diff --git a/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt b/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt
index af43fcefa4f..f3a84a9313c 100644
--- a/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt
+++ b/ext/reflection/tests/ReflectionClass_isUserDefined_basic.phpt
@@ -11,7 +11,7 @@ $r3 = new ReflectionClass("ReflectionProperty");
 $r4 = new ReflectionClass("Exception");
 $r5 = new ReflectionClass("C");
 
-var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(), 
+var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(),
 		 $r4->isUserDefined(), $r5->isUserDefined());
 ?>
 --EXPECTF--
diff --git a/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt b/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt
index 3ad654dd849..068710311d7 100644
--- a/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_newInstanceArgs_001.phpt
@@ -7,8 +7,8 @@ Steve Seear <stevseea@php.net>
 <?php
 class A {
 	public function A() {
-		echo "In constructor of class A\n"; 
-	}	
+		echo "In constructor of class A\n";
+	}
 }
 
 class B {
@@ -19,16 +19,16 @@ class B {
 
 class C {
 	protected function __construct() {
-		echo "In constructor of class C\n"; 
+		echo "In constructor of class C\n";
 	}
 }
 
 class D {
 	private function __construct() {
-		echo "In constructor of class D\n";		
+		echo "In constructor of class D\n";
 	}
 }
-class E {	
+class E {
 }
 
 
diff --git a/ext/reflection/tests/ReflectionClass_newInstance_001.phpt b/ext/reflection/tests/ReflectionClass_newInstance_001.phpt
index e29cc8734f4..c91d2ee9584 100644
--- a/ext/reflection/tests/ReflectionClass_newInstance_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_newInstance_001.phpt
@@ -7,8 +7,8 @@ Steve Seear <stevseea@php.net>
 <?php
 class A {
 	public function A() {
-		echo "In constructor of class A\n"; 
-	}	
+		echo "In constructor of class A\n";
+	}
 }
 
 class B {
@@ -19,16 +19,16 @@ class B {
 
 class C {
 	protected function __construct() {
-		echo "In constructor of class C\n"; 
+		echo "In constructor of class C\n";
 	}
 }
 
 class D {
 	private function __construct() {
-		echo "In constructor of class D\n";		
+		echo "In constructor of class D\n";
 	}
 }
-class E {	
+class E {
 }
 
 
diff --git a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt
index 0004f3ff5a7..bfefce369e0 100644
--- a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-ReflectionClass::setStaticPropertyValue() 
+ReflectionClass::setStaticPropertyValue()
 --CREDITS--
 Robin Fernandes <robinf@php.net>
 Steve Seear <stevseea@php.net>
@@ -43,7 +43,7 @@ try {
 
 try {
 	var_dump($rcA->setStaticPropertyValue("privateOverridden", "new value 9"));
-	echo "you should not see this";	
+	echo "you should not see this";
 } catch (Exception $e) {
 	echo $e->getMessage() . "\n";
 }
diff --git a/ext/reflection/tests/ReflectionFunction_getClosureScopeClass.phpt b/ext/reflection/tests/ReflectionFunction_getClosureScopeClass.phpt
index e32790c9237..682a0f5e322 100644
--- a/ext/reflection/tests/ReflectionFunction_getClosureScopeClass.phpt
+++ b/ext/reflection/tests/ReflectionFunction_getClosureScopeClass.phpt
@@ -4,7 +4,7 @@ Reflection::getClosureScopeClass()
 <?php
 if (!extension_loaded('reflection')) print 'skip';
 ?>
---FILE-- 
+--FILE--
 <?php
 $closure = function($param) { return "this is a closure"; };
 $rf = new ReflectionFunction($closure);
diff --git a/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt b/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt
index 47950257982..90a07b7eb9a 100644
--- a/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt
+++ b/ext/reflection/tests/ReflectionFunction_getClosureThis.phpt
@@ -4,7 +4,7 @@ Reflection::getClosureThis()
 <?php
 if (!extension_loaded('reflection')) print 'skip';
 ?>
---FILE-- 
+--FILE--
 <?php
 $closure = function($param) { return "this is a closure"; };
 $rf = new ReflectionFunction($closure);
diff --git a/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt b/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt
index 786be050c17..22f463b9af9 100644
--- a/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt
+++ b/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test ReflectionFunction::getClosure() function : basic functionality 
+Test ReflectionFunction::getClosure() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : public mixed ReflectionFunction::getClosure()
- * Description: Returns a dynamically created closure for the function 
+ * Description: Returns a dynamically created closure for the function
  * Source code: ext/reflection/php_reflection.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing ReflectionFunction::getClosure() : basic functionality ***\n";
diff --git a/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt b/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt
index df101fcd3ee..19c95789803 100644
--- a/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt
+++ b/ext/reflection/tests/ReflectionFunction_isClosure_basic.phpt
@@ -7,7 +7,7 @@ TestFest PHP|Tek
 <?php
 if (!extension_loaded('reflection')) print 'skip';
 ?>
---FILE-- 
+--FILE--
 <?php
 $closure = function($param) { return "this is a closure"; };
 $rc = new ReflectionFunction($closure);
diff --git a/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt b/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt
index 7b37b939e41..5643b2933f6 100644
--- a/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt
+++ b/ext/reflection/tests/ReflectionFunction_isDeprecated_basic.phpt
@@ -3,7 +3,7 @@ ReflectionFunction::isDeprecated
 --CREDITS--
 Stefan Koopmanschap <stefan@phpgg.nl>
 TestFest PHP|Tek
---FILE-- 
+--FILE--
 <?php
 // We currently don't have any deprecated functions :/
 $rc = new ReflectionFunction('var_dump');
diff --git a/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt b/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt
index 30189cf4de5..fe1af222eae 100644
--- a/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt
+++ b/ext/reflection/tests/ReflectionFunction_isDisabled_basic.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded('reflection')) print 'skip';
 ?>
 --INI--
 disable_functions=is_file
---FILE-- 
+--FILE--
 <?php
 $rc = new ReflectionFunction('is_file');
 var_dump($rc->isDisabled());
diff --git a/ext/reflection/tests/ReflectionMethod_basic1.phpt b/ext/reflection/tests/ReflectionMethod_basic1.phpt
index 75ab957690c..d403d2d2bea 100644
--- a/ext/reflection/tests/ReflectionMethod_basic1.phpt
+++ b/ext/reflection/tests/ReflectionMethod_basic1.phpt
@@ -31,17 +31,17 @@ class TestClass
     public function foo() {
         echo "Called foo()\n";
     }
-    
+
     static function stat() {
         echo "Called stat()\n";
     }
-    
+
     private function priv() {
         echo "Called priv()\n";
     }
-    
+
     protected function prot() {}
-    
+
     public function __destruct() {}
 }
 
diff --git a/ext/reflection/tests/ReflectionMethod_getClosureThis.phpt b/ext/reflection/tests/ReflectionMethod_getClosureThis.phpt
index 536f40c2e1c..561a9aed313 100644
--- a/ext/reflection/tests/ReflectionMethod_getClosureThis.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getClosureThis.phpt
@@ -4,7 +4,7 @@ Reflection::getClosureThis()
 <?php
 if (!extension_loaded('reflection')) print 'skip';
 ?>
---FILE-- 
+--FILE--
 <?php
 class StaticExample
 {
diff --git a/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt b/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt
index c97c41c738b..a755b4d548e 100644
--- a/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test ReflectionMethod::getClosure() function : basic functionality 
+Test ReflectionMethod::getClosure() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : public mixed ReflectionFunction::getClosure()
- * Description: Returns a dynamically created closure for the method 
+ * Description: Returns a dynamically created closure for the method
  * Source code: ext/reflection/php_reflection.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing ReflectionMethod::getClosure() : basic functionality ***\n";
diff --git a/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt b/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt
index 6afc70032a5..8e34d617316 100644
--- a/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getDeclaringClass_basic.phpt
@@ -17,7 +17,7 @@ var_dump($methodInfo->getDeclaringClass());
 $methodInfo = new ReflectionMethod('B', 'bar');
 var_dump($methodInfo->getDeclaringClass());
 
-?> 
+?>
 --EXPECTF--
 object(ReflectionClass)#%d (1) {
   ["name"]=>
diff --git a/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt b/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt
index e79092421de..2544b0e7ec0 100644
--- a/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt
+++ b/ext/reflection/tests/ReflectionMethod_getDocComment_basic.phpt
@@ -26,7 +26,7 @@ class A {
      * My Doc Comment for A::finalStatPubf
      */
 	final static public function finalStatPubf() {}
-	
+
 }
 
 
@@ -44,7 +44,7 @@ class B extends A {
     private function privf() {}
 
 
-    /** My Doc Comment for B::protStatf 
+    /** My Doc Comment for B::protStatf
 
 
 
@@ -100,7 +100,7 @@ string(%d) "/** *
 
 
 ---> Doc comment for B::protStatf():
-string(%d) "/** My Doc Comment for B::protStatf 
+string(%d) "/** My Doc Comment for B::protStatf
 
 
 
diff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_error1.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_error1.phpt
index eec5a3e618e..dbd128e18cf 100644
--- a/ext/reflection/tests/ReflectionMethod_invokeArgs_error1.phpt
+++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_error1.phpt
@@ -19,7 +19,7 @@ $methodWithArgs = new ReflectionMethod('TestClass', 'methodWithArgs');
 $testClassInstance = new TestClass();
 
 echo "\nMethod with args:\n";
-var_dump($methodWithArgs->invokeArgs($testClassInstance, array())); 
+var_dump($methodWithArgs->invokeArgs($testClassInstance, array()));
 
 ?>
 --EXPECTF--
diff --git a/ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt b/ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt
index 00214dcdc52..82c68bbabe2 100644
--- a/ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_FileInfo_basic.phpt
@@ -1,6 +1,6 @@
 --TEST--
 ReflectionObject::getFileName(), ReflectionObject::getStartLine(), ReflectionObject::getEndLine() - basic function
---FILE-- 
+--FILE--
 <?php
 $rc = new ReflectionObject(new C);
 var_dump($rc->getFileName());
diff --git a/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt b/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt
index d30e6771781..70ad24297dd 100644
--- a/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_FileInfo_error.phpt
@@ -1,6 +1,6 @@
 --TEST--
-ReflectionObject::getFileName(), ReflectionObject::getStartLine(), ReflectionObject::getEndLine() -invalid aparams 
---FILE-- 
+ReflectionObject::getFileName(), ReflectionObject::getStartLine(), ReflectionObject::getEndLine() -invalid aparams
+--FILE--
 <?php
 Class C { }
 
@@ -10,7 +10,7 @@ $methods = array("getFileName", "getStartLine", "getEndLine");
 foreach ($methods as $method) {
 	var_dump($rc->$method());
 	var_dump($rc->$method(null));
-	var_dump($rc->$method('X', 0));	
+	var_dump($rc->$method('X', 0));
 }
 ?>
 --EXPECTF--
diff --git a/ext/reflection/tests/ReflectionObject_export_basic3.phpt b/ext/reflection/tests/ReflectionObject_export_basic3.phpt
index 7c1da34c930..dfd3f2e8037 100644
--- a/ext/reflection/tests/ReflectionObject_export_basic3.phpt
+++ b/ext/reflection/tests/ReflectionObject_export_basic3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-ReflectionObject::export() - ensure dynamic property with same name as inherited private property is shown. 
+ReflectionObject::export() - ensure dynamic property with same name as inherited private property is shown.
 --FILE--
 <?php
 class C {
diff --git a/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt
index 6479ec90ed7..de7998698b9 100644
--- a/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_getConstants_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-ReflectionObject::getConstants() - basic function test 
+ReflectionObject::getConstants() - basic function test
 --FILE--
 <?php
 class C {
diff --git a/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt b/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
index 2fb43562bbf..aecc9b97d26 100644
--- a/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
@@ -48,7 +48,7 @@ class D1 extends C {
 class D2 extends C {
 }
 
-$classes = array('NewCtor', 'ExtendsNewCtor', 'OldCtor', 'ExtendsOldCtor', 
+$classes = array('NewCtor', 'ExtendsNewCtor', 'OldCtor', 'ExtendsOldCtor',
 				 'OldAndNewCtor', 'NewAndOldCtor', 'B', 'C', 'D1', 'D2', 'X', 'Y');
 
 foreach ($classes as $class) {
@@ -59,9 +59,9 @@ foreach ($classes as $class) {
 	}  else {
 		echo "No constructor for $class\n";
 	}
-	
-}				 
-				
+
+}
+
 ?>
 --EXPECTF--
 Deprecated: Methods with the same name as their class will not be constructors in a future version of PHP; OldCtor has a deprecated constructor in %s on line %d
diff --git a/ext/reflection/tests/ReflectionObject_getName_error1.phpt b/ext/reflection/tests/ReflectionObject_getName_error1.phpt
index 0d88c843988..9f50209b6b4 100644
--- a/ext/reflection/tests/ReflectionObject_getName_error1.phpt
+++ b/ext/reflection/tests/ReflectionObject_getName_error1.phpt
@@ -3,7 +3,7 @@ ReflectionObject::getName - forbid static invocation
 --FILE--
 <?php
 ReflectionObject::getName();
-?> 
+?>
 --EXPECTF--
 Fatal error: Uncaught Error: Non-static method ReflectionClass::getName() cannot be called statically in %s:2
 Stack trace:
diff --git a/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt b/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt
index ef605aad843..8437ac8e11e 100644
--- a/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstance_basic.phpt
@@ -16,7 +16,7 @@ foreach ($classes as $class) {
 	$ro = new ReflectionObject(new $class);
 	foreach ($instances as $name => $instance) {
 		echo "is $name a $class? ";
-		var_dump($ro->isInstance($instance));	
+		var_dump($ro->isInstance($instance));
 	}
 }
 
diff --git a/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt
index 4b8a6ec221c..478ac77633b 100644
--- a/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstantiable_basic.phpt
@@ -27,7 +27,7 @@ $classes = array("C", "ifaceImpl", "D");
 foreach($classes  as $class ) {
 	$ro = new ReflectionObject(new $class);
 	echo "Is $class instantiable?  ";
-	var_dump($ro->IsInstantiable()); 
+	var_dump($ro->IsInstantiable());
 }
 ?>
 --EXPECTF--
diff --git a/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt
index c77c039d4d5..f6d4c9d3d20 100644
--- a/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstantiable_error.phpt
@@ -6,7 +6,7 @@ class privateCtorOld {
 	private function privateCtorOld() {}
 	public static function reflectionObjectFactory() {
 		return new ReflectionObject(new self);
-	}	
+	}
 }
 $reflectionObject =  privateCtorOld::reflectionObjectFactory();
 
diff --git a/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt b/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt
index 1e5be592993..675bbdde8d8 100644
--- a/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInstantiable_variation.phpt
@@ -6,49 +6,49 @@ ReflectionObject::IsInstantiable() - variation - constructors
 class noCtor {
 	public static function reflectionObjectFactory() {
 		return new ReflectionObject(new self);
-	}	
+	}
 }
 
 class publicCtorNew {
 	public function __construct() {}
 	public static function reflectionObjectFactory() {
 		return new ReflectionObject(new self);
-	}	
+	}
 }
 
 class protectedCtorNew {
 	protected function __construct() {}
 	public static function reflectionObjectFactory() {
 		return new ReflectionObject(new self);
-	}	
+	}
 }
 
 class privateCtorNew {
 	private function __construct() {}
 	public static function reflectionObjectFactory() {
 		return new ReflectionObject(new self);
-	}	
+	}
 }
 
 class publicCtorOld {
 	public function publicCtorOld() {}
 	public static function reflectionObjectFactory() {
 		return new ReflectionObject(new self);
-	}	
+	}
 }
 
 class protectedCtorOld {
 	protected function protectedCtorOld() {}
 	public static function reflectionObjectFactory() {
 		return new ReflectionObject(new self);
-	}	
+	}
 }
 
 class privateCtorOld {
 	private function privateCtorOld() {}
 	public static function reflectionObjectFactory() {
 		return new ReflectionObject(new self);
-	}	
+	}
 }
 
 
@@ -57,7 +57,7 @@ $reflectionObjects = array(
 		publicCtorNew::reflectionObjectFactory(),
 		protectedCtorNew::reflectionObjectFactory(),
 		privateCtorNew::reflectionObjectFactory(),
-		publicCtorOld::reflectionObjectFactory(), 
+		publicCtorOld::reflectionObjectFactory(),
 		protectedCtorOld::reflectionObjectFactory(),
 		privateCtorOld::reflectionObjectFactory()
 	);
@@ -65,7 +65,7 @@ $reflectionObjects = array(
 foreach($reflectionObjects  as $reflectionObject ) {
 	$name = $reflectionObject->getName();
 	echo "Is $name instantiable? ";
-	var_dump($reflectionObject->IsInstantiable()); 
+	var_dump($reflectionObject->IsInstantiable());
 }
 ?>
 --EXPECTF--
diff --git a/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt b/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt
index 066bca70ee5..633812856f2 100644
--- a/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isInternal_basic.phpt
@@ -11,7 +11,7 @@ $r3 = new ReflectionObject(new ReflectionProperty('Exception', 'message'));
 $r4 = new ReflectionObject(new Exception);
 $r5 = new ReflectionObject(new C);
 
-var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(), 
+var_dump($r1->isInternal(), $r2->isInternal(), $r3->isInternal(),
 		 $r4->isInternal(), $r5->isInternal());
 
 ?>
diff --git a/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt b/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt
index e89066a7eaa..b3ec076fb64 100644
--- a/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isSubclassOf_basic.phpt
@@ -9,7 +9,7 @@ class C extends B {}
 interface I {}
 class X implements I {}
 
-$classNames = array('A', 'B', 'C', 'I', 'X'); 
+$classNames = array('A', 'B', 'C', 'I', 'X');
 
 //Create ReflectionClasses
 foreach ($classNames as $className) {
@@ -33,7 +33,7 @@ foreach ($ros as $childName => $child) {
 			var_dump($child->isSubclassOf($ros[$parentName]));
 		}
 		echo "   - Using string argument: ";
-		var_dump($child->isSubclassOf($parentName)); 
+		var_dump($child->isSubclassOf($parentName));
 	}
 }
 ?>
diff --git a/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt b/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt
index 4cb08fcb671..bb9e0e8bd19 100644
--- a/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt
+++ b/ext/reflection/tests/ReflectionObject_isUserDefined_basic.phpt
@@ -11,7 +11,7 @@ $r3 = new ReflectionObject(new ReflectionProperty('Exception', 'message'));
 $r4 = new ReflectionObject(new Exception);
 $r5 = new ReflectionObject(new C);
 
-var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(), 
+var_dump($r1->isUserDefined(), $r2->isUserDefined(), $r3->isUserDefined(),
 		 $r4->isUserDefined(), $r5->isUserDefined());
 
 ?>
diff --git a/ext/reflection/tests/ReflectionParameter_001.phpt b/ext/reflection/tests/ReflectionParameter_001.phpt
index dae3ac72358..71dc69ca4e1 100644
--- a/ext/reflection/tests/ReflectionParameter_001.phpt
+++ b/ext/reflection/tests/ReflectionParameter_001.phpt
@@ -9,11 +9,11 @@ class ReflectTestClass {
     public static function twoArgFunction($theIncrement, $anotherParam) {
         return ++$theIncrement;
     }
-    
+
     public function oneArgNonStatic($theParam) {
     	$theParam--;
     }
-    
+
     public function noArgs() {
     	echo "No arg function\n";
     }
diff --git a/ext/reflection/tests/ReflectionParameter_002.phpt b/ext/reflection/tests/ReflectionParameter_002.phpt
index 3b7df6f95bb..349e6f0ca9c 100644
--- a/ext/reflection/tests/ReflectionParameter_002.phpt
+++ b/ext/reflection/tests/ReflectionParameter_002.phpt
@@ -9,7 +9,7 @@ class ReflectTestClass {
     public static function staticMethod(&$paramOne, $anotherParam) {
         return ++$theIncrement;
     }
-    
+
     public function instanceMethod($firstParam, &$secondParam) {
       $firstParam = "Hello\n";
     }
diff --git a/ext/reflection/tests/ReflectionParameter_003.phpt b/ext/reflection/tests/ReflectionParameter_003.phpt
index f7ced9ad002..cc092bffcc5 100644
--- a/ext/reflection/tests/ReflectionParameter_003.phpt
+++ b/ext/reflection/tests/ReflectionParameter_003.phpt
@@ -7,13 +7,13 @@ Steve Seear <stevseea@php.net>
 <?php
 
 class ReflectTestClass {
-    public static function staticMethod($paramOne, $anotherParam = "bob", 
+    public static function staticMethod($paramOne, $anotherParam = "bob",
                                         &$thirdParam = "jack", $arrayParam = array('one')) {
         echo "hello from test\n";
         echo "third is $thirdParam\n";
         return ++$theIncrement;
     }
-    
+
 }
 
 $jane = "jane";
@@ -36,7 +36,7 @@ foreach($refParameters as $parameter) {
 	} else {
 	  echo "this parameter has no default value\n";
 	}
-	
+
 	/*
 	$val = 0;
 	try {
@@ -47,7 +47,7 @@ foreach($refParameters as $parameter) {
 		echo "\n";
 	}
 	*/
-	
+
 	echo "\n";
 }
 
diff --git a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
index 6c154558e91..1d7b79a68e1 100644
--- a/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
+++ b/ext/reflection/tests/ReflectionParameter_invalidMethodInConstructor.phpt
@@ -1,6 +1,6 @@
 --TEST--
 ReflectionParameter::__construct(): Invalid method as constructor
---FILE-- 
+--FILE--
 <?php
 
 // Invalid class name
diff --git a/ext/reflection/tests/ReflectionProperty_basic2.phpt b/ext/reflection/tests/ReflectionProperty_basic2.phpt
index 62938df1001..0491073aceb 100644
--- a/ext/reflection/tests/ReflectionProperty_basic2.phpt
+++ b/ext/reflection/tests/ReflectionProperty_basic2.phpt
@@ -35,7 +35,7 @@ reflectProperty("TestClass", "stat");
 reflectProperty("TestClass", "prot");
 reflectProperty("TestClass", "priv");
 
-?> 
+?>
 --EXPECTF--
 **********************************
 Reflecting on property TestClass::pub
diff --git a/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt b/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt
index d61480377c5..70dcfaf895f 100644
--- a/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt
+++ b/ext/reflection/tests/ReflectionProperty_constructor_variation1.phpt
@@ -5,14 +5,14 @@ ReflectionProperty::__construct(): ensure inherited private props can't be acces
 
 class C {
 	private $p = 1;
-	
+
 	static function testFromC() {
 		try {
 		  $rp = new ReflectionProperty("D", "p");
 		  var_dump($rp);
 		} catch (Exception $e) {
 			echo $e->getMessage();
-		}		
+		}
 	}
 }
 
@@ -23,7 +23,7 @@ class D extends C{
 		  var_dump($rp);
 		} catch (Exception $e) {
 			echo $e->getMessage();
-		}		
+		}
 	}
 }
 
diff --git a/ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt b/ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt
index bf525e1c4f0..c7c9366471c 100644
--- a/ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt
+++ b/ext/reflection/tests/ReflectionProperty_getDeclaringClass_variation1.phpt
@@ -16,7 +16,7 @@ var_dump($propInfo->getDeclaringClass());
 echo "Wrong number of params:\n";
 $propInfo->getDeclaringClass(1);
 
-?> 
+?>
 --EXPECTF--
 object(ReflectionClass)#%d (1) {
   ["name"]=>
diff --git a/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt b/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt
index fe888a83bcf..6d7ddbe8344 100644
--- a/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt
+++ b/ext/reflection/tests/ReflectionProperty_getModifiers.001.phpt
@@ -8,13 +8,13 @@ Steve Seear <stevseea@php.net>
 
 function reflectProperty($class, $property) {
 	$propInfo = new ReflectionProperty($class, $property);
-	
+
 	echo "**********************************\n";
 	echo "Reflecting on property $class::$property\n\n";
-	
+
 	echo "getModifiers():\n";
 	var_dump($propInfo->getModifiers());
-	
+
 	echo "\n**********************************\n";
 }
 
@@ -23,7 +23,7 @@ class TestClass
     public $pub;
     static public $stat = "static property";
     /**
- 	 * This property has a comment. 
+ 	 * This property has a comment.
  	 */
     protected $prot = 4;
     private $priv = "keepOut";
diff --git a/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt b/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt
index 22ee117cc8b..2aa630d9d03 100644
--- a/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt
+++ b/ext/reflection/tests/ReflectionProperty_isDefault_basic.phpt
@@ -28,7 +28,7 @@ echo "Wrong number of params:\n";
 $propInfo = new ReflectionProperty('TestClass', 'pub');
 $propInfo->isDefault(1);
 
-?> 
+?>
 --EXPECTF--
 **********************************
 Reflecting on property TestClass::pub
diff --git a/ext/reflection/tests/bug29268.phpt b/ext/reflection/tests/bug29268.phpt
index 0ab7e332b2f..9166bd3aa94 100644
--- a/ext/reflection/tests/bug29268.phpt
+++ b/ext/reflection/tests/bug29268.phpt
@@ -13,7 +13,7 @@ class B{
 }
 
 $ref = new reflectionMethod('B','doit');
-$parameters = $ref->getParameters();	
+$parameters = $ref->getParameters();
 foreach($parameters as $parameter)
 {
 	$class = $parameter->getClass();
diff --git a/ext/reflection/tests/bug29523.phpt b/ext/reflection/tests/bug29523.phpt
index e74403c6a63..fafc93ef403 100644
--- a/ext/reflection/tests/bug29523.phpt
+++ b/ext/reflection/tests/bug29523.phpt
@@ -11,7 +11,7 @@ function optionalTest(TestClass $a, TestClass $b, $c = 3)
 {
 }
 
-$function = new ReflectionFunction('optionalTest'); 
+$function = new ReflectionFunction('optionalTest');
 $numberOfNotOptionalParameters = 0;
 $numberOfOptionalParameters = 0;
 foreach($function->getParameters() as $parameter)
diff --git a/ext/reflection/tests/bug36337.phpt b/ext/reflection/tests/bug36337.phpt
index 369d5bef1a4..ebe64431a73 100644
--- a/ext/reflection/tests/bug36337.phpt
+++ b/ext/reflection/tests/bug36337.phpt
@@ -23,6 +23,6 @@ $x = new myEnum();
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 bool(false)
 Done
diff --git a/ext/reflection/tests/bug36434.phpt b/ext/reflection/tests/bug36434.phpt
index 9598a40b7b1..502ac741a90 100644
--- a/ext/reflection/tests/bug36434.phpt
+++ b/ext/reflection/tests/bug36434.phpt
@@ -26,6 +26,6 @@ foreach ($r->GetProperties() as $p)
 }
 
 ?>
---EXPECT--	
+--EXPECT--
 bar foo
 ancester ancester
diff --git a/ext/reflection/tests/bug37964.phpt b/ext/reflection/tests/bug37964.phpt
index 935119314fb..f3c161da8de 100644
--- a/ext/reflection/tests/bug37964.phpt
+++ b/ext/reflection/tests/bug37964.phpt
@@ -5,7 +5,7 @@ Reflection Bug #37964 (Reflection shows private methods of parent class)
 
 abstract class foobar {
 	private function test2() {
-	}	
+	}
 }
 class foo extends foobar {
 	private $foo = 1;
diff --git a/ext/reflection/tests/bug38194.phpt b/ext/reflection/tests/bug38194.phpt
index 1430ba45ae2..dfbfb671473 100644
--- a/ext/reflection/tests/bug38194.phpt
+++ b/ext/reflection/tests/bug38194.phpt
@@ -3,7 +3,7 @@ Reflection Bug #38194 (ReflectionClass::isSubclassOf() returns TRUE for the clas
 --FILE--
 <?php
 class ObjectOne { }
-  
+
 $objectClass = new ReflectionClass('ObjectOne');
 var_dump($objectClass->isSubclassOf($objectClass));
 ?>
diff --git a/ext/reflection/tests/bug38217.phpt b/ext/reflection/tests/bug38217.phpt
index b02c8210e50..46f2dc3e0e8 100644
--- a/ext/reflection/tests/bug38217.phpt
+++ b/ext/reflection/tests/bug38217.phpt
@@ -28,7 +28,7 @@ var_dump($class->newInstanceArgs(array('test')));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 object(ObjectOne)#%d (0) {
 }
 Exception: Too few arguments to function ObjectTwo::__construct(), 0 passed and exactly 1 expected
diff --git a/ext/reflection/tests/bug38653.phpt b/ext/reflection/tests/bug38653.phpt
index 68781d2aba1..b30635b779f 100644
--- a/ext/reflection/tests/bug38653.phpt
+++ b/ext/reflection/tests/bug38653.phpt
@@ -20,7 +20,7 @@ var_dump($foo->getConstant("no such const"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(10)
 string(0) ""
 string(4) "test"
diff --git a/ext/reflection/tests/bug39001.phpt b/ext/reflection/tests/bug39001.phpt
index 1ed675f029e..cf6e99b0939 100644
--- a/ext/reflection/tests/bug39001.phpt
+++ b/ext/reflection/tests/bug39001.phpt
@@ -21,7 +21,7 @@ var_dump($r->getProperty('protectedVar')->getDeclaringClass()->getName());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(7) "CParent"
 string(7) "CParent"
 Done
diff --git a/ext/reflection/tests/bug39067.phpt b/ext/reflection/tests/bug39067.phpt
index 8a7a6044e1b..7fa073ba3bb 100644
--- a/ext/reflection/tests/bug39067.phpt
+++ b/ext/reflection/tests/bug39067.phpt
@@ -37,7 +37,7 @@ var_dump($rc->getProperty('x')->getDeclaringClass()->getName());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(1) "C"
 string(1) "B"
 string(1) "A"
diff --git a/ext/reflection/tests/bug39884.phpt b/ext/reflection/tests/bug39884.phpt
index dbc57ee5210..1d0e04b0b9c 100644
--- a/ext/reflection/tests/bug39884.phpt
+++ b/ext/reflection/tests/bug39884.phpt
@@ -15,7 +15,7 @@ $test1->paramTest($test2);
 $refParam = new ReflectionParameter(array('stubParamTest', 'paramTest'), 'param');
 var_dump($refParam->getClass());
 ?>
---EXPECT--	
+--EXPECT--
 object(ReflectionClass)#4 (1) {
   ["name"]=>
   string(13) "stubParamTest"
diff --git a/ext/reflection/tests/bug40431.phpt b/ext/reflection/tests/bug40431.phpt
index 0c96e70faff..637b1457cd6 100644
--- a/ext/reflection/tests/bug40431.phpt
+++ b/ext/reflection/tests/bug40431.phpt
@@ -76,7 +76,7 @@ var_dump($props[0]->isProtected());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 === 1st test ===
 array(1) {
   [0]=>
diff --git a/ext/reflection/tests/bug40794.phpt b/ext/reflection/tests/bug40794.phpt
index bb93b91280c..fc2fb563d9c 100644
--- a/ext/reflection/tests/bug40794.phpt
+++ b/ext/reflection/tests/bug40794.phpt
@@ -20,7 +20,7 @@ var_dump($array);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {
   ["prop1"]=>
   string(1) "1"
diff --git a/ext/reflection/tests/bug41061.phpt b/ext/reflection/tests/bug41061.phpt
index 771cd408d9d..d907907dcfb 100644
--- a/ext/reflection/tests/bug41061.phpt
+++ b/ext/reflection/tests/bug41061.phpt
@@ -5,7 +5,7 @@ Reflection Bug #41061 ("visibility error" in ReflectionFunction::export())
 
 function foo() {
 }
- 
+
 class bar {
     private function foo() {
     }
diff --git a/ext/reflection/tests/bug41884.phpt b/ext/reflection/tests/bug41884.phpt
index f8c0a0a2bce..e707bdc1007 100644
--- a/ext/reflection/tests/bug41884.phpt
+++ b/ext/reflection/tests/bug41884.phpt
@@ -15,7 +15,7 @@ var_dump($class->getDefaultProperties());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(2) {
   ["fooStatic"]=>
   string(3) "foo"
diff --git a/ext/reflection/tests/bug42976.phpt b/ext/reflection/tests/bug42976.phpt
index 21aff8d4cca..0b147aa8112 100644
--- a/ext/reflection/tests/bug42976.phpt
+++ b/ext/reflection/tests/bug42976.phpt
@@ -18,12 +18,12 @@ $x = "x.original";
 $rc->newInstance($x); // causes crash
 var_dump($x);
 $x = "x.original";
-$rc->newInstanceArgs(array($x)); // causes crash	
+$rc->newInstanceArgs(array($x)); // causes crash
 var_dump($x);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(9) "x.changed"
 
 Warning: Parameter 1 to C::__construct() expected to be a reference, value given in %sbug42976.php on line 15
diff --git a/ext/reflection/tests/bug45571.phpt b/ext/reflection/tests/bug45571.phpt
index 4df542ede10..2aa56988793 100644
--- a/ext/reflection/tests/bug45571.phpt
+++ b/ext/reflection/tests/bug45571.phpt
@@ -7,7 +7,7 @@ Class A {
 	static private $a 	= 0;
 	static protected $b = 1;
 	static public $c 	= 2;
-	
+
 	private function f() {}
 	private static function sf() {}
 }
diff --git a/ext/reflection/tests/bug45765.phpt b/ext/reflection/tests/bug45765.phpt
index 7963a03eea8..80cb39d0ac8 100644
--- a/ext/reflection/tests/bug45765.phpt
+++ b/ext/reflection/tests/bug45765.phpt
@@ -9,16 +9,16 @@ class foo2 {
 
 class foo extends foo2 {
 	const BAR = "foo's bar";
-	
+
 	function test($a = self::BAR) {
 	}
-	
+
 	function test2($a = parent::BAR) {
 	}
 
 	function test3($a = foo::BAR) {
 	}
-	
+
 	function test4($a = foo2::BAR) {
 	}
 }
diff --git a/ext/reflection/tests/bug46064.phpt b/ext/reflection/tests/bug46064.phpt
index 510e71b00af..d8ee411905a 100644
--- a/ext/reflection/tests/bug46064.phpt
+++ b/ext/reflection/tests/bug46064.phpt
@@ -36,7 +36,7 @@ class bar extends test {
 	public function __construct() {
 		$this->foobar = 2;
 		$this->a = 200;
-		
+
 		$p = new reflectionproperty($this, 'foobar');
 		var_dump($p->getValue($this), $p->isDefault(), $p->isPublic());
 	}
diff --git a/ext/reflection/tests/bug46064_2.phpt b/ext/reflection/tests/bug46064_2.phpt
index 0b74708dff8..6ac72bbd270 100644
--- a/ext/reflection/tests/bug46064_2.phpt
+++ b/ext/reflection/tests/bug46064_2.phpt
@@ -3,7 +3,7 @@ Bug #46064.2 (Exception when creating ReflectionProperty object on dynamicly cre
 --FILE--
 <?php
 
-class foo { 
+class foo {
 }
 
 $x = new foo;
@@ -25,7 +25,7 @@ class test extends bar {
 
 	public function __construct() {
 		parent::__construct();
-		
+
 		$p = new reflectionobject($this);
 		var_dump($h = $p->getProperty('a'));
 		var_dump($h->isDefault(), $h->isProtected(), $h->isPrivate(), $h->isPublic(), $h->isStatic());
diff --git a/ext/reflection/tests/bug47254.phpt b/ext/reflection/tests/bug47254.phpt
index 38cdcd62b45..e3ce114c9c5 100644
--- a/ext/reflection/tests/bug47254.phpt
+++ b/ext/reflection/tests/bug47254.phpt
@@ -9,7 +9,7 @@ Testfest 2009 Munich
 class A
 {
 	protected function a() {}
-	
+
 }
 
 class B extends A
diff --git a/ext/reflection/tests/bug49719.phpt b/ext/reflection/tests/bug49719.phpt
index 215140a45a9..b27312e6cd3 100644
--- a/ext/reflection/tests/bug49719.phpt
+++ b/ext/reflection/tests/bug49719.phpt
@@ -13,10 +13,10 @@ class B extends A {
 try {
 	$b = new B;
 	$ref = new ReflectionClass($b);
-	
+
 	var_dump(property_exists('b', 'a'));
 	var_dump(property_exists($b, 'a'));
-	var_dump($ref->hasProperty('a'));	
+	var_dump($ref->hasProperty('a'));
 	var_dump($ref->getProperty('a'));
 } catch (Exception $e) {
 	var_dump($e->getMessage());
diff --git a/ext/reflection/tests/bug66430.phpt b/ext/reflection/tests/bug66430.phpt
index 6e35a0389ec..921e2c99d8e 100644
--- a/ext/reflection/tests/bug66430.phpt
+++ b/ext/reflection/tests/bug66430.phpt
@@ -5,7 +5,7 @@ Bug #66430: ReflectionFunction::invoke does not invoke closure with object scope
 
 class Alpha {
 	public $message = "Valid representation";
-	
+
 	public function bravo() {
 		return $this->message;
 	}
diff --git a/ext/reflection/tests/bug71767.phpt b/ext/reflection/tests/bug71767.phpt
index 8c4059abf4d..19d5bc50367 100644
--- a/ext/reflection/tests/bug71767.phpt
+++ b/ext/reflection/tests/bug71767.phpt
@@ -16,7 +16,7 @@ class Foo {
         /** wrong docblock */
         $arg
     ) {
-        
+
     }
 }
 
diff --git a/ext/reflection/tests/bug72174.phpt b/ext/reflection/tests/bug72174.phpt
index 94416d6153e..dacfc0e55e0 100644
--- a/ext/reflection/tests/bug72174.phpt
+++ b/ext/reflection/tests/bug72174.phpt
@@ -17,7 +17,7 @@ class Foo
         var_dump(__METHOD__);
         return true;
     }
-    
+
     public function __get($name)
     {
         var_dump(__METHOD__);
diff --git a/ext/reflection/tests/bug72661.phpt b/ext/reflection/tests/bug72661.phpt
index 40d14922b81..b1cb764beb6 100644
--- a/ext/reflection/tests/bug72661.phpt
+++ b/ext/reflection/tests/bug72661.phpt
@@ -2,7 +2,7 @@
 Bug #72661 (ReflectionType::__toString crashes with iterable)
 --FILE--
 <?php
-function test(iterable $arg) { } 
+function test(iterable $arg) { }
 
 var_dump((string)(new ReflectionParameter("test", 0))->getType());
 ?>
diff --git a/ext/reflection/tests/bug74949.phpt b/ext/reflection/tests/bug74949.phpt
index d69597efb86..2970c5911f6 100644
--- a/ext/reflection/tests/bug74949.phpt
+++ b/ext/reflection/tests/bug74949.phpt
@@ -14,7 +14,7 @@ echo $r, "\n";
 try  {
 	echo $r->getPrototype();
 } catch (Exception $e) {
-	echo $e->getMessage(), "\n";	
+	echo $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
diff --git a/ext/reflection/tests/closures_001.phpt b/ext/reflection/tests/closures_001.phpt
index 6cc7e6755cd..7efc7a4a73b 100644
--- a/ext/reflection/tests/closures_001.phpt
+++ b/ext/reflection/tests/closures_001.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Reflection on closures
---FILE-- 
+--FILE--
 <?php
 
 $closure = function($a, $b = 0) { };
diff --git a/ext/reflection/tests/closures_002.phpt b/ext/reflection/tests/closures_002.phpt
index e8b080f5cbb..62412a4052f 100644
--- a/ext/reflection/tests/closures_002.phpt
+++ b/ext/reflection/tests/closures_002.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Reflection on invokable objects
---FILE-- 
+--FILE--
 <?php
 
 class Test {
diff --git a/ext/reflection/tests/closures_003.phpt b/ext/reflection/tests/closures_003.phpt
index 4483dc06e3c..af975434cea 100644
--- a/ext/reflection/tests/closures_003.phpt
+++ b/ext/reflection/tests/closures_003.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Reflection on closures: Segfaults with getParameters() and getDeclaringFunction()
---FILE-- 
+--FILE--
 <?php
 
 $closure = function($a, $b = 0) { };
diff --git a/ext/reflection/tests/closures_003_v1.phpt b/ext/reflection/tests/closures_003_v1.phpt
index 1b8e1c4d0af..3c6f48772a1 100644
--- a/ext/reflection/tests/closures_003_v1.phpt
+++ b/ext/reflection/tests/closures_003_v1.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Reflection on closures: Segfaults with getParameters() and getDeclaringFunction()
---FILE-- 
+--FILE--
 <?php
 
 $closure = function($a, $b = 0) { };
diff --git a/ext/reflection/tests/closures_004.phpt b/ext/reflection/tests/closures_004.phpt
index 807aea1f385..5eeebb5ffdc 100644
--- a/ext/reflection/tests/closures_004.phpt
+++ b/ext/reflection/tests/closures_004.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Reflection on closures: Segfault with getClosure() on closure itself
---FILE-- 
+--FILE--
 <?php
 $closure = function() { echo "Invoked!\n"; };
 
diff --git a/ext/reflection/tests/property_exists.phpt b/ext/reflection/tests/property_exists.phpt
index c74b775bb72..d7ecefb775f 100644
--- a/ext/reflection/tests/property_exists.phpt
+++ b/ext/reflection/tests/property_exists.phpt
@@ -8,15 +8,15 @@ class A
 	public    $a = 1;
 	protected $b = 2;
 	private   $c = 3;
-	
+
 	public    $empty;
 	public    $init = 1;
-	
+
 	function __toString()
 	{
 		return 'obj(' . get_class($this) . ')';
 	}
-	
+
 	static function test($oc, $props)
 	{
 		echo '===' . __CLASS__ . "===\n";
@@ -30,7 +30,7 @@ class A
 class B extends A
 {
 	private   $c = 4;
-	
+
 	static function test($oc, $props)
 	{
 		echo '===' . __CLASS__ . "===\n";
@@ -44,7 +44,7 @@ class B extends A
 class C extends B
 {
 	private   $d = 5;
-	
+
 	static function test($oc, $props)
 	{
 		echo '===' . __CLASS__ . "===\n";
diff --git a/ext/reflection/tests/static_properties_002.phpt b/ext/reflection/tests/static_properties_002.phpt
index 218c629cdbf..a0db78bf2ae 100644
--- a/ext/reflection/tests/static_properties_002.phpt
+++ b/ext/reflection/tests/static_properties_002.phpt
@@ -5,11 +5,11 @@ Reflection and inheriting static properties
 
 class base {
 	static protected $prop = 2;
-	
+
 	static function show() {
 		echo __METHOD__ . '(' . self::$prop . ")\n";
 	}
-	
+
 	static function inc() {
 		base::$prop++;
 		echo __METHOD__ . "()\n";
@@ -18,7 +18,7 @@ class base {
 
 class derived extends base {
 	static public $prop = 2;
-	
+
 	static function show() {
 		echo __METHOD__ . '(' . self::$prop . ")\n";
 	}
diff --git a/ext/reflection/tests/traits002.phpt b/ext/reflection/tests/traits002.phpt
index b55b288aa07..3a4b2949618 100644
--- a/ext/reflection/tests/traits002.phpt
+++ b/ext/reflection/tests/traits002.phpt
@@ -7,7 +7,7 @@ abstract class foo {
 }
 
 trait bar {
-	
+
 }
 
 reflectionclass::export('foo');
diff --git a/ext/reflection/tests/traits003.phpt b/ext/reflection/tests/traits003.phpt
index c569a8e7235..7f878599083 100644
--- a/ext/reflection/tests/traits003.phpt
+++ b/ext/reflection/tests/traits003.phpt
@@ -7,11 +7,11 @@ abstract class foo {
 }
 
 trait bar {
-	
+
 }
 
 final class baz {
-	
+
 }
 
 $x = new ReflectionClass('foo');
diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt
index c38987edffe..68cea7314a9 100644
--- a/ext/session/tests/006.phpt
+++ b/ext/session/tests/006.phpt
@@ -26,7 +26,7 @@ class b {
         $this->a = &$a;
     }
 }
- 
+
 $a = new a();
 $b = new b($a);
 
diff --git a/ext/session/tests/026.phpt b/ext/session/tests/026.phpt
index cc9a8de22c4..b61039ee0c2 100644
--- a/ext/session/tests/026.phpt
+++ b/ext/session/tests/026.phpt
@@ -19,14 +19,14 @@ session_start();
 class a {
     public $test = "hallo";
 }
- 
+
 class b {
     public $a;
     function __construct(&$a) {
         $this->a = &$a;
     }
 }
- 
+
 $a = new a();
 $b = new b($a);
 
diff --git a/ext/session/tests/bug24592.phpt b/ext/session/tests/bug24592.phpt
index 9f6c3953178..3e651cdeec3 100644
--- a/ext/session/tests/bug24592.phpt
+++ b/ext/session/tests/bug24592.phpt
@@ -8,15 +8,15 @@ session.save_handler=files
 --FILE--
 <?php
 @session_start();
-        
+
 $foo = $_SESSION['foo'];
 $bar = $_SESSION['bar'];
-                        
+
 var_dump($foo, $bar, $_SESSION);
 
 $_SESSION['foo'] = $foo;
 $_SESSION['bar'] = $bar;
-                                        
+
 var_dump($_SESSION);
 ?>
 --EXPECTF--
diff --git a/ext/session/tests/bug31454.phpt b/ext/session/tests/bug31454.phpt
index dd609962143..89b70484771 100644
--- a/ext/session/tests/bug31454.phpt
+++ b/ext/session/tests/bug31454.phpt
@@ -12,7 +12,7 @@ session_set_save_handler(
 	array(&$arf, 'write'),
 	array(&$arf, 'destroy'),
 	array(&$arf, 'gc'));
-	
+
 echo "Done\n";
 ?>
 --EXPECTF--
diff --git a/ext/session/tests/bug61728.phpt b/ext/session/tests/bug61728.phpt
index 2780d7b7e2c..2e90829d557 100644
--- a/ext/session/tests/bug61728.phpt
+++ b/ext/session/tests/bug61728.phpt
@@ -3,7 +3,7 @@ Bug #61728 (PHP crash when calling ob_start in request_shutdown phase)
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
-<?php 
+<?php
 function output_html($ext) {
     return strlen($ext);
 }
diff --git a/ext/session/tests/bug69111.phpt b/ext/session/tests/bug69111.phpt
index ce14dc750c6..c7a6cada651 100644
--- a/ext/session/tests/bug69111.phpt
+++ b/ext/session/tests/bug69111.phpt
@@ -10,7 +10,7 @@ session_set_save_handler($sh);
 $savePath = ini_get('session.save_path');
 $sessionName = ini_get('session.name');
 
-// session_start(); // Uncommenting this makes it not crash when reading the session (see below), but it will not return any data. 
+// session_start(); // Uncommenting this makes it not crash when reading the session (see below), but it will not return any data.
 
 $sh->open($savePath, $sessionName);
 $sh->write("foo", "bar");
diff --git a/ext/session/tests/rfc1867_invalid_settings.phpt b/ext/session/tests/rfc1867_invalid_settings.phpt
index 1a989e979b7..526e0cbdd84 100644
--- a/ext/session/tests/rfc1867_invalid_settings.phpt
+++ b/ext/session/tests/rfc1867_invalid_settings.phpt
@@ -4,7 +4,7 @@ session rfc1867 invalid settings
 session.upload_progress.freq=-1
 error_log=
 --SKIPIF--
-<?php 
+<?php
 include('skipif.inc');
 ?>
 --FILE--
diff --git a/ext/session/tests/rfc1867_invalid_settings_2.phpt b/ext/session/tests/rfc1867_invalid_settings_2.phpt
index 9246e1dbbc6..15281942a02 100644
--- a/ext/session/tests/rfc1867_invalid_settings_2.phpt
+++ b/ext/session/tests/rfc1867_invalid_settings_2.phpt
@@ -4,7 +4,7 @@ session rfc1867 invalid settings 2
 session.upload_progress.freq=200%
 error_log=
 --SKIPIF--
-<?php 
+<?php
 include('skipif.inc');
 ?>
 --FILE--
diff --git a/ext/session/tests/session_cache_expire_basic.phpt b/ext/session/tests/session_cache_expire_basic.phpt
index 71664859379..bb5784c6756 100644
--- a/ext/session/tests/session_cache_expire_basic.phpt
+++ b/ext/session/tests/session_cache_expire_basic.phpt
@@ -7,10 +7,10 @@ Test session_cache_expire() function : basic functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : int session_cache_expire([int $new_cache_expire])
  * Description : Return current cache expire
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_cache_expire() : basic functionality ***\n";
diff --git a/ext/session/tests/session_cache_expire_error.phpt b/ext/session/tests/session_cache_expire_error.phpt
index 486ba787e5a..4a335e7f677 100644
--- a/ext/session/tests/session_cache_expire_error.phpt
+++ b/ext/session/tests/session_cache_expire_error.phpt
@@ -7,10 +7,10 @@ Test session_cache_expire() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : int session_cache_expire([int $new_cache_expire])
  * Description : Return current cache expire
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_cache_expire() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_cache_expire_variation1.phpt b/ext/session/tests/session_cache_expire_variation1.phpt
index 9d0ba27fea1..5389e88e17d 100644
--- a/ext/session/tests/session_cache_expire_variation1.phpt
+++ b/ext/session/tests/session_cache_expire_variation1.phpt
@@ -9,10 +9,10 @@ session.cache_expire=360
 
 ob_start();
 
-/* 
+/*
  * Prototype : int session_cache_expire([int $new_cache_expire])
  * Description : Return current cache expire
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_cache_expire() : variation ***\n";
diff --git a/ext/session/tests/session_cache_expire_variation2.phpt b/ext/session/tests/session_cache_expire_variation2.phpt
index f17f4711a90..f3a9ab3e1b1 100644
--- a/ext/session/tests/session_cache_expire_variation2.phpt
+++ b/ext/session/tests/session_cache_expire_variation2.phpt
@@ -7,10 +7,10 @@ Test session_cache_expire() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : int session_cache_expire([int $new_cache_expire])
  * Description : Return current cache expire
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_cache_expire() : variation ***\n";
diff --git a/ext/session/tests/session_cache_expire_variation3.phpt b/ext/session/tests/session_cache_expire_variation3.phpt
index c243c1f1156..2e36aafe6d7 100644
--- a/ext/session/tests/session_cache_expire_variation3.phpt
+++ b/ext/session/tests/session_cache_expire_variation3.phpt
@@ -7,10 +7,10 @@ Test session_cache_expire() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : int session_cache_expire([int $new_cache_expire])
  * Description : Return current cache expire
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_cache_expire() : variation ***\n";
diff --git a/ext/session/tests/session_cache_limiter_basic.phpt b/ext/session/tests/session_cache_limiter_basic.phpt
index 559a89143c1..96bc5eb1b7e 100644
--- a/ext/session/tests/session_cache_limiter_basic.phpt
+++ b/ext/session/tests/session_cache_limiter_basic.phpt
@@ -7,10 +7,10 @@ Test session_cache_limiter() function : basic functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_cache_limiter([string $cache_limiter])
  * Description : Get and/or set the current cache limiter
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_cache_limiter() : basic functionality ***\n";
diff --git a/ext/session/tests/session_cache_limiter_error.phpt b/ext/session/tests/session_cache_limiter_error.phpt
index df689d65fb8..b5bd42fdad2 100644
--- a/ext/session/tests/session_cache_limiter_error.phpt
+++ b/ext/session/tests/session_cache_limiter_error.phpt
@@ -7,10 +7,10 @@ Test session_cache_limiter() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_cache_limiter([string $cache_limiter])
  * Description : Get and/or set the current cache limiter
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_cache_limiter() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_cache_limiter_variation1.phpt b/ext/session/tests/session_cache_limiter_variation1.phpt
index 5af208a9099..ce9b011d264 100644
--- a/ext/session/tests/session_cache_limiter_variation1.phpt
+++ b/ext/session/tests/session_cache_limiter_variation1.phpt
@@ -9,10 +9,10 @@ session.cache_limiter=nocache
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_cache_limiter([string $cache_limiter])
  * Description : Get and/or set the current cache limiter
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_cache_limiter() : variation ***\n";
diff --git a/ext/session/tests/session_cache_limiter_variation2.phpt b/ext/session/tests/session_cache_limiter_variation2.phpt
index eb63d99dac5..58dc5da6c49 100644
--- a/ext/session/tests/session_cache_limiter_variation2.phpt
+++ b/ext/session/tests/session_cache_limiter_variation2.phpt
@@ -7,10 +7,10 @@ Test session_cache_limiter() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_cache_limiter([string $cache_limiter])
  * Description : Get and/or set the current cache limiter
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_cache_limiter() : variation ***\n";
diff --git a/ext/session/tests/session_cache_limiter_variation3.phpt b/ext/session/tests/session_cache_limiter_variation3.phpt
index 11d452d46a0..a55648a8511 100644
--- a/ext/session/tests/session_cache_limiter_variation3.phpt
+++ b/ext/session/tests/session_cache_limiter_variation3.phpt
@@ -7,10 +7,10 @@ Test session_cache_limiter() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_cache_limiter([string $cache_limiter])
  * Description : Get and/or set the current cache limiter
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_cache_limiter() : variation ***\n";
diff --git a/ext/session/tests/session_commit_basic.phpt b/ext/session/tests/session_commit_basic.phpt
index c72d3ba9270..3419a229a75 100644
--- a/ext/session/tests/session_commit_basic.phpt
+++ b/ext/session/tests/session_commit_basic.phpt
@@ -7,10 +7,10 @@ Test session_commit() function : basic functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_commit(void)
  * Description : Write session data and end session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_commit() : basic functionality ***\n";
diff --git a/ext/session/tests/session_commit_error.phpt b/ext/session/tests/session_commit_error.phpt
index 79fa72e67b5..c71cee34ebe 100644
--- a/ext/session/tests/session_commit_error.phpt
+++ b/ext/session/tests/session_commit_error.phpt
@@ -7,10 +7,10 @@ Test session_commit() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_commit(void)
  * Description : Write session data and end session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_commit() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_commit_variation1.phpt b/ext/session/tests/session_commit_variation1.phpt
index a58a5624834..f631111158d 100644
--- a/ext/session/tests/session_commit_variation1.phpt
+++ b/ext/session/tests/session_commit_variation1.phpt
@@ -7,10 +7,10 @@ Test session_commit() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_commit(void)
  * Description : Write session data and end session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_commit() : variation ***\n";
diff --git a/ext/session/tests/session_commit_variation2.phpt b/ext/session/tests/session_commit_variation2.phpt
index 9bde83ce0a4..91e09686410 100644
--- a/ext/session/tests/session_commit_variation2.phpt
+++ b/ext/session/tests/session_commit_variation2.phpt
@@ -7,10 +7,10 @@ Test session_commit() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_commit(void)
  * Description : Write session data and end session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_commit() : variation ***\n";
diff --git a/ext/session/tests/session_commit_variation3.phpt b/ext/session/tests/session_commit_variation3.phpt
index ed4618a04e4..e2d2c2409ee 100644
--- a/ext/session/tests/session_commit_variation3.phpt
+++ b/ext/session/tests/session_commit_variation3.phpt
@@ -9,10 +9,10 @@ session.auto_start=1
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_commit(void)
  * Description : Write session data and end session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_commit() : variation ***\n";
diff --git a/ext/session/tests/session_decode_basic.phpt b/ext/session/tests/session_decode_basic.phpt
index f8aa24305ae..1b7b6e0805b 100644
--- a/ext/session/tests/session_decode_basic.phpt
+++ b/ext/session/tests/session_decode_basic.phpt
@@ -7,10 +7,10 @@ Test session_decode() function : basic functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_decode(void)
  * Description : Decodes session data from a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_decode() : basic functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_decode_basic_serialize.phpt b/ext/session/tests/session_decode_basic_serialize.phpt
index dd88438e151..48893691aaf 100644
--- a/ext/session/tests/session_decode_basic_serialize.phpt
+++ b/ext/session/tests/session_decode_basic_serialize.phpt
@@ -7,10 +7,10 @@ Test session_decode() function : basic functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_decode(void)
  * Description : Decodes session data from a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_decode() : basic functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_decode_error.phpt b/ext/session/tests/session_decode_error.phpt
index 098ecce0799..72bc25976b0 100644
--- a/ext/session/tests/session_decode_error.phpt
+++ b/ext/session/tests/session_decode_error.phpt
@@ -7,10 +7,10 @@ Test session_decode() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_decode(void)
  * Description : Decodes session data from a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_decode() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_decode_error2.phpt b/ext/session/tests/session_decode_error2.phpt
index 37841deed8c..ff4e618a5ec 100644
--- a/ext/session/tests/session_decode_error2.phpt
+++ b/ext/session/tests/session_decode_error2.phpt
@@ -7,10 +7,10 @@ Test session_decode() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_decode(void)
  * Description : Decodes session data from a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_decode() : error functionality ***\n";
diff --git a/ext/session/tests/session_decode_variation1.phpt b/ext/session/tests/session_decode_variation1.phpt
index b2d06b1abb3..011bdee5b95 100644
--- a/ext/session/tests/session_decode_variation1.phpt
+++ b/ext/session/tests/session_decode_variation1.phpt
@@ -7,10 +7,10 @@ Test session_decode() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_decode(void)
  * Description : Decodes session data from a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_decode() : variation ***\n";
diff --git a/ext/session/tests/session_decode_variation2.phpt b/ext/session/tests/session_decode_variation2.phpt
index 1a9b6879008..0f88a28bd7e 100644
--- a/ext/session/tests/session_decode_variation2.phpt
+++ b/ext/session/tests/session_decode_variation2.phpt
@@ -7,10 +7,10 @@ Test session_decode() function : basic functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_decode(void)
  * Description : Decodes session data from a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_decode() : variation ***\n";
diff --git a/ext/session/tests/session_decode_variation3.phpt b/ext/session/tests/session_decode_variation3.phpt
index 3557efa46d6..a50feb0cf00 100644
--- a/ext/session/tests/session_decode_variation3.phpt
+++ b/ext/session/tests/session_decode_variation3.phpt
@@ -9,10 +9,10 @@ session.serialize_handler=blah
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_decode(void)
  * Description : Decodes session data from a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_decode() : variation ***\n";
diff --git a/ext/session/tests/session_decode_variation4.phpt b/ext/session/tests/session_decode_variation4.phpt
index 81642754f09..68c09370e45 100644
--- a/ext/session/tests/session_decode_variation4.phpt
+++ b/ext/session/tests/session_decode_variation4.phpt
@@ -7,10 +7,10 @@ Test session_decode() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_decode(void)
  * Description : Decodes session data from a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_decode() : variation ***\n";
diff --git a/ext/session/tests/session_destroy_error.phpt b/ext/session/tests/session_destroy_error.phpt
index a3e443e9d86..a03face43d9 100644
--- a/ext/session/tests/session_destroy_error.phpt
+++ b/ext/session/tests/session_destroy_error.phpt
@@ -7,10 +7,10 @@ Test session_destroy() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_destroy(void)
  * Description : Destroys all data registered to a session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_destroy() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_destroy_variation1.phpt b/ext/session/tests/session_destroy_variation1.phpt
index fdbdf08c574..bb3de056c04 100644
--- a/ext/session/tests/session_destroy_variation1.phpt
+++ b/ext/session/tests/session_destroy_variation1.phpt
@@ -7,10 +7,10 @@ Test session_destroy() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_destroy(void)
  * Description : Destroys all data registered to a session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_destroy() : variation ***\n";
diff --git a/ext/session/tests/session_destroy_variation2.phpt b/ext/session/tests/session_destroy_variation2.phpt
index c72c65bac9b..373647bffa9 100644
--- a/ext/session/tests/session_destroy_variation2.phpt
+++ b/ext/session/tests/session_destroy_variation2.phpt
@@ -7,10 +7,10 @@ Test session_destroy() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_destroy(void)
  * Description : Destroys all data registered to a session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_destroy() : variation ***\n";
diff --git a/ext/session/tests/session_destroy_variation3.phpt b/ext/session/tests/session_destroy_variation3.phpt
index b63c17e392f..f53d0420bdb 100644
--- a/ext/session/tests/session_destroy_variation3.phpt
+++ b/ext/session/tests/session_destroy_variation3.phpt
@@ -7,10 +7,10 @@ Test session_destroy() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_destroy(void)
  * Description : Destroys all data registered to a session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_destroy() : variation ***\n";
diff --git a/ext/session/tests/session_encode_basic.phpt b/ext/session/tests/session_encode_basic.phpt
index dfe40d204d0..de2a9c97ee8 100644
--- a/ext/session/tests/session_encode_basic.phpt
+++ b/ext/session/tests/session_encode_basic.phpt
@@ -9,10 +9,10 @@ serialize_precision=100
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_encode(void)
  * Description : Encodes the current session data as a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_encode() : basic functionality ***\n";
@@ -59,7 +59,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -68,7 +68,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_encode_error.phpt b/ext/session/tests/session_encode_error.phpt
index 955aff4d53d..54693963f1d 100644
--- a/ext/session/tests/session_encode_error.phpt
+++ b/ext/session/tests/session_encode_error.phpt
@@ -7,10 +7,10 @@ Test session_encode() function : basic functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_encode(void)
  * Description : Encodes the current session data as a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_encode() : basic functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_encode_error2.phpt b/ext/session/tests/session_encode_error2.phpt
index 056323ab76b..1a87eb14a31 100644
--- a/ext/session/tests/session_encode_error2.phpt
+++ b/ext/session/tests/session_encode_error2.phpt
@@ -7,10 +7,10 @@ Test session_encode() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_encode(void)
  * Description : Encodes the current session data as a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_encode() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_encode_variation1.phpt b/ext/session/tests/session_encode_variation1.phpt
index 26722783db8..cff175c1d1e 100644
--- a/ext/session/tests/session_encode_variation1.phpt
+++ b/ext/session/tests/session_encode_variation1.phpt
@@ -7,10 +7,10 @@ Test session_encode() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_encode(void)
  * Description : Encodes the current session data as a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_encode() : variation ***\n";
diff --git a/ext/session/tests/session_encode_variation2.phpt b/ext/session/tests/session_encode_variation2.phpt
index 93fab30d67a..a6d7331784e 100644
--- a/ext/session/tests/session_encode_variation2.phpt
+++ b/ext/session/tests/session_encode_variation2.phpt
@@ -9,10 +9,10 @@ session.auto_start=1
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_encode(void)
  * Description : Encodes the current session data as a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_encode() : variation ***\n";
diff --git a/ext/session/tests/session_encode_variation3.phpt b/ext/session/tests/session_encode_variation3.phpt
index 47b2441b302..5fcac542281 100644
--- a/ext/session/tests/session_encode_variation3.phpt
+++ b/ext/session/tests/session_encode_variation3.phpt
@@ -7,10 +7,10 @@ Test session_encode() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_encode(void)
  * Description : Encodes the current session data as a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_encode() : variation ***\n";
diff --git a/ext/session/tests/session_encode_variation4.phpt b/ext/session/tests/session_encode_variation4.phpt
index 89af6ebb21c..d34208dd9cc 100644
--- a/ext/session/tests/session_encode_variation4.phpt
+++ b/ext/session/tests/session_encode_variation4.phpt
@@ -7,10 +7,10 @@ Test session_encode() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_encode(void)
  * Description : Encodes the current session data as a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_encode() : variation ***\n";
diff --git a/ext/session/tests/session_encode_variation5.phpt b/ext/session/tests/session_encode_variation5.phpt
index d7639fadb17..ec9514b6504 100644
--- a/ext/session/tests/session_encode_variation5.phpt
+++ b/ext/session/tests/session_encode_variation5.phpt
@@ -7,10 +7,10 @@ Test session_encode() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_encode(void)
  * Description : Encodes the current session data as a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_encode() : variation ***\n";
diff --git a/ext/session/tests/session_encode_variation6.phpt b/ext/session/tests/session_encode_variation6.phpt
index c5f1f4bbc3a..4c3f0370fa4 100644
--- a/ext/session/tests/session_encode_variation6.phpt
+++ b/ext/session/tests/session_encode_variation6.phpt
@@ -7,10 +7,10 @@ Test session_encode() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_encode(void)
  * Description : Encodes the current session data as a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_encode() : variation ***\n";
diff --git a/ext/session/tests/session_encode_variation7.phpt b/ext/session/tests/session_encode_variation7.phpt
index 04cfe4439db..a982268c0ca 100644
--- a/ext/session/tests/session_encode_variation7.phpt
+++ b/ext/session/tests/session_encode_variation7.phpt
@@ -9,10 +9,10 @@ session.serialize_handler=php_binary
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_encode(void)
  * Description : Encodes the current session data as a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_encode() : variation ***\n";
diff --git a/ext/session/tests/session_encode_variation8.phpt b/ext/session/tests/session_encode_variation8.phpt
index 7ffa948620f..c84152cd13c 100644
--- a/ext/session/tests/session_encode_variation8.phpt
+++ b/ext/session/tests/session_encode_variation8.phpt
@@ -9,10 +9,10 @@ session.serialize_handler=blah
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_encode(void)
  * Description : Encodes the current session data as a string
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_encode() : variation ***\n";
diff --git a/ext/session/tests/session_get_cookie_params_basic.phpt b/ext/session/tests/session_get_cookie_params_basic.phpt
index 5d328550eae..77f2b138dfc 100644
--- a/ext/session/tests/session_get_cookie_params_basic.phpt
+++ b/ext/session/tests/session_get_cookie_params_basic.phpt
@@ -13,10 +13,10 @@ session.cookie_httponly=0
 
 ob_start();
 
-/* 
+/*
  * Prototype : array session_get_cookie_params(void)
  * Description : Get the session cookie parameters
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_get_cookie_params() : basic functionality ***\n";
diff --git a/ext/session/tests/session_get_cookie_params_error.phpt b/ext/session/tests/session_get_cookie_params_error.phpt
index 243536c39ef..0cf54efb029 100644
--- a/ext/session/tests/session_get_cookie_params_error.phpt
+++ b/ext/session/tests/session_get_cookie_params_error.phpt
@@ -7,10 +7,10 @@ Test session_get_cookie_params() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : array session_get_cookie_params(void)
  * Description : Get the session cookie parameters
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_get_cookie_params() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_get_cookie_params_variation1.phpt b/ext/session/tests/session_get_cookie_params_variation1.phpt
index bb921a56b17..03513c8e559 100644
--- a/ext/session/tests/session_get_cookie_params_variation1.phpt
+++ b/ext/session/tests/session_get_cookie_params_variation1.phpt
@@ -13,10 +13,10 @@ session.cookie_httponly=0
 
 ob_start();
 
-/* 
+/*
  * Prototype : array session_get_cookie_params(void)
  * Description : Get the session cookie parameters
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_get_cookie_params() : variation ***\n";
diff --git a/ext/session/tests/session_id_basic.phpt b/ext/session/tests/session_id_basic.phpt
index 852d2f9578e..2fc1f91e6e0 100644
--- a/ext/session/tests/session_id_basic.phpt
+++ b/ext/session/tests/session_id_basic.phpt
@@ -7,10 +7,10 @@ Test session_id() function : basic functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_id([string $id])
  * Description : Get and/or set the current session id
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_id() : basic functionality ***\n";
diff --git a/ext/session/tests/session_id_basic2.phpt b/ext/session/tests/session_id_basic2.phpt
index fd26c0e9ed8..5b6acb12517 100644
--- a/ext/session/tests/session_id_basic2.phpt
+++ b/ext/session/tests/session_id_basic2.phpt
@@ -7,10 +7,10 @@ Test session_id() function : basic functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_id([string $id])
  * Description : Get and/or set the current session id
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_id() : basic functionality ***\n";
diff --git a/ext/session/tests/session_id_error.phpt b/ext/session/tests/session_id_error.phpt
index 6337cb916dc..651092c01be 100644
--- a/ext/session/tests/session_id_error.phpt
+++ b/ext/session/tests/session_id_error.phpt
@@ -7,10 +7,10 @@ Test session_id() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_id([string $id])
  * Description : Get and/or set the current session id
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_id() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_id_error2.phpt b/ext/session/tests/session_id_error2.phpt
index 05284e797be..1349ba59f2f 100644
--- a/ext/session/tests/session_id_error2.phpt
+++ b/ext/session/tests/session_id_error2.phpt
@@ -7,10 +7,10 @@ Test session_id() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_id([string $id])
  * Description : Get and/or set the current session id
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_id() : error functionality ***\n";
diff --git a/ext/session/tests/session_id_error3.phpt b/ext/session/tests/session_id_error3.phpt
index fc291389d9e..79b75a1b774 100644
--- a/ext/session/tests/session_id_error3.phpt
+++ b/ext/session/tests/session_id_error3.phpt
@@ -7,10 +7,10 @@ Test session_id() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_id([string $id])
  * Description : Get and/or set the current session id
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_id() : error functionality ***\n";
diff --git a/ext/session/tests/session_module_name_basic.phpt b/ext/session/tests/session_module_name_basic.phpt
index 2daf6fc6208..8d8bf70573b 100644
--- a/ext/session/tests/session_module_name_basic.phpt
+++ b/ext/session/tests/session_module_name_basic.phpt
@@ -7,10 +7,10 @@ Test session_module_name() function : basic functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_module_name([string $module])
  * Description : Get and/or set the current session module
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_module_name() : basic functionality ***\n";
diff --git a/ext/session/tests/session_module_name_error.phpt b/ext/session/tests/session_module_name_error.phpt
index 08c080a1fa8..6940445969f 100644
--- a/ext/session/tests/session_module_name_error.phpt
+++ b/ext/session/tests/session_module_name_error.phpt
@@ -7,10 +7,10 @@ Test session_module_name() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_module_name([string $module])
  * Description : Get and/or set the current session module
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_module_name() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_module_name_variation1.phpt b/ext/session/tests/session_module_name_variation1.phpt
index 2034b7eff11..59d9112a553 100644
--- a/ext/session/tests/session_module_name_variation1.phpt
+++ b/ext/session/tests/session_module_name_variation1.phpt
@@ -7,10 +7,10 @@ Test session_module_name() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_module_name([string $module])
  * Description : Get and/or set the current session module
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_module_name() : variation ***\n";
diff --git a/ext/session/tests/session_module_name_variation2.phpt b/ext/session/tests/session_module_name_variation2.phpt
index aa7b33c7672..b14c0c2aac0 100644
--- a/ext/session/tests/session_module_name_variation2.phpt
+++ b/ext/session/tests/session_module_name_variation2.phpt
@@ -7,10 +7,10 @@ Test session_module_name() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_module_name([string $module])
  * Description : Get and/or set the current session module
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_module_name() : variation ***\n";
diff --git a/ext/session/tests/session_module_name_variation3.phpt b/ext/session/tests/session_module_name_variation3.phpt
index 09beaa4059f..b03173cecfa 100644
--- a/ext/session/tests/session_module_name_variation3.phpt
+++ b/ext/session/tests/session_module_name_variation3.phpt
@@ -11,14 +11,14 @@ session.save_handler=files
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_module_name([string $module])
  * Description : Get and/or set the current session module
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_module_name() : variation ***\n";
-function open($save_path, $session_name) { 
+function open($save_path, $session_name) {
     throw new Exception("Stop...!");
 }
 
diff --git a/ext/session/tests/session_module_name_variation4.phpt b/ext/session/tests/session_module_name_variation4.phpt
index e44d227f96d..4e2dcd7cbba 100644
--- a/ext/session/tests/session_module_name_variation4.phpt
+++ b/ext/session/tests/session_module_name_variation4.phpt
@@ -11,10 +11,10 @@ session.gc_maxlifetime=0
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_module_name([string $module])
  * Description : Get and/or set the current session module
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_module_name() : variation ***\n";
diff --git a/ext/session/tests/session_name_basic.phpt b/ext/session/tests/session_name_basic.phpt
index 8c3a9bbcd16..028c5c106be 100644
--- a/ext/session/tests/session_name_basic.phpt
+++ b/ext/session/tests/session_name_basic.phpt
@@ -11,10 +11,10 @@ session.save_handler=files
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_name([string $name])
  * Description : Get and/or set the current session name
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_name() : error functionality ***\n";
diff --git a/ext/session/tests/session_name_error.phpt b/ext/session/tests/session_name_error.phpt
index 9f0101d98b5..2d1f656b1d3 100644
--- a/ext/session/tests/session_name_error.phpt
+++ b/ext/session/tests/session_name_error.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_name([string $name])
  * Description : Get and/or set the current session name
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_name() : error functionality ***\n";
@@ -60,7 +60,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -69,7 +69,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_name_variation1.phpt b/ext/session/tests/session_name_variation1.phpt
index 7809e60b4d8..901a472e3c9 100644
--- a/ext/session/tests/session_name_variation1.phpt
+++ b/ext/session/tests/session_name_variation1.phpt
@@ -11,10 +11,10 @@ session.save_handler=files
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_name([string $name])
  * Description : Get and/or set the current session name
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_name() : variation ***\n";
diff --git a/ext/session/tests/session_name_variation2.phpt b/ext/session/tests/session_name_variation2.phpt
index 84bfeba7401..f355b79129e 100644
--- a/ext/session/tests/session_name_variation2.phpt
+++ b/ext/session/tests/session_name_variation2.phpt
@@ -3,16 +3,16 @@ Test session_name() function : variation
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
-session.name=blah 
+session.name=blah
 --FILE--
 <?php
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_name([string $name])
  * Description : Get and/or set the current session name
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_name() : variation ***\n";
diff --git a/ext/session/tests/session_regenerate_id_basic.phpt b/ext/session/tests/session_regenerate_id_basic.phpt
index cdf2bb1f2b2..7121500db1a 100644
--- a/ext/session/tests/session_regenerate_id_basic.phpt
+++ b/ext/session/tests/session_regenerate_id_basic.phpt
@@ -7,10 +7,10 @@ Test session_regenerate_id() function : basic functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_regenerate_id([bool $delete_old_session])
- * Description : Update the current session id with a newly generated one 
- * Source code : ext/session/session.c 
+ * Description : Update the current session id with a newly generated one
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_regenerate_id() : basic functionality ***\n";
diff --git a/ext/session/tests/session_regenerate_id_error.phpt b/ext/session/tests/session_regenerate_id_error.phpt
index 9c94d8564b1..b11f310b0b8 100644
--- a/ext/session/tests/session_regenerate_id_error.phpt
+++ b/ext/session/tests/session_regenerate_id_error.phpt
@@ -7,10 +7,10 @@ Test session_regenerate_id() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_regenerate_id([bool $delete_old_session])
- * Description : Update the current session id with a newly generated one 
- * Source code : ext/session/session.c 
+ * Description : Update the current session id with a newly generated one
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_regenerate_id() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_regenerate_id_variation1.phpt b/ext/session/tests/session_regenerate_id_variation1.phpt
index ca0ef35b100..a5670341afc 100644
--- a/ext/session/tests/session_regenerate_id_variation1.phpt
+++ b/ext/session/tests/session_regenerate_id_variation1.phpt
@@ -7,10 +7,10 @@ Test session_regenerate_id() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_regenerate_id([bool $delete_old_session])
- * Description : Update the current session id with a newly generated one 
- * Source code : ext/session/session.c 
+ * Description : Update the current session id with a newly generated one
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_regenerate_id() : variation ***\n";
diff --git a/ext/session/tests/session_save_path_basic.phpt b/ext/session/tests/session_save_path_basic.phpt
index 2895f46c0ba..08acf5a3f5d 100644
--- a/ext/session/tests/session_save_path_basic.phpt
+++ b/ext/session/tests/session_save_path_basic.phpt
@@ -11,10 +11,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_save_path([string $path])
  * Description : Get and/or set the current session save path
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_save_path() : error functionality ***\n";
diff --git a/ext/session/tests/session_save_path_error.phpt b/ext/session/tests/session_save_path_error.phpt
index 7a2061083a6..809f0a73209 100644
--- a/ext/session/tests/session_save_path_error.phpt
+++ b/ext/session/tests/session_save_path_error.phpt
@@ -12,10 +12,10 @@ session.save_handler=files
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_save_path([string $path])
  * Description : Get and/or set the current session save path
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_save_path() : error functionality ***\n";
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -71,7 +71,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_save_path_variation2.phpt b/ext/session/tests/session_save_path_variation2.phpt
index 60675aec3c8..b8fb86509f3 100644
--- a/ext/session/tests/session_save_path_variation2.phpt
+++ b/ext/session/tests/session_save_path_variation2.phpt
@@ -10,10 +10,10 @@ session.gc_probability=0
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_save_path([string $path])
  * Description : Get and/or set the current session save path
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_save_path() : variation ***\n";
diff --git a/ext/session/tests/session_save_path_variation3.phpt b/ext/session/tests/session_save_path_variation3.phpt
index 1d290d95b33..e369b12e0a6 100644
--- a/ext/session/tests/session_save_path_variation3.phpt
+++ b/ext/session/tests/session_save_path_variation3.phpt
@@ -10,10 +10,10 @@ session.gc_probability=0
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_save_path([string $path])
  * Description : Get and/or set the current session save path
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_save_path() : variation ***\n";
diff --git a/ext/session/tests/session_save_path_variation4.phpt b/ext/session/tests/session_save_path_variation4.phpt
index 8cbee49afbd..1cb86e1c308 100644
--- a/ext/session/tests/session_save_path_variation4.phpt
+++ b/ext/session/tests/session_save_path_variation4.phpt
@@ -12,10 +12,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : string session_save_path([string $path])
  * Description : Get and/or set the current session save path
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_save_path() : variation ***\n";
diff --git a/ext/session/tests/session_save_path_variation5.phpt b/ext/session/tests/session_save_path_variation5.phpt
index c015dcc95c4..1dd86f8afa9 100644
--- a/ext/session/tests/session_save_path_variation5.phpt
+++ b/ext/session/tests/session_save_path_variation5.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test session_save_path() function : variation
 --SKIPIF--
-<?php include('skipif.inc'); 
+<?php include('skipif.inc');
 if(substr(PHP_OS, 0, 3) == "WIN")
 	die("skip Not for Windows");
 ?>
@@ -13,10 +13,10 @@ session.name=PHPSESSID
 <?php
 
 ob_start();
-/* 
+/*
  * Prototype : string session_save_path([string $path])
  * Description : Get and/or set the current session save path
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_save_path() : variation ***\n";
diff --git a/ext/session/tests/session_set_cookie_params_basic.phpt b/ext/session/tests/session_set_cookie_params_basic.phpt
index a67aaa2bc4b..e40c4e77b70 100644
--- a/ext/session/tests/session_set_cookie_params_basic.phpt
+++ b/ext/session/tests/session_set_cookie_params_basic.phpt
@@ -7,10 +7,10 @@ Test session_set_cookie_params() function : basic functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]])
  * Description : Set the session cookie parameters
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_cookie_params() : basic functionality ***\n";
diff --git a/ext/session/tests/session_set_cookie_params_error.phpt b/ext/session/tests/session_set_cookie_params_error.phpt
index 9e68ab0359e..a1b12cac7b0 100644
--- a/ext/session/tests/session_set_cookie_params_error.phpt
+++ b/ext/session/tests/session_set_cookie_params_error.phpt
@@ -7,10 +7,10 @@ Test session_set_cookie_params() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]])
  * Description : Set the session cookie parameters
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_cookie_params() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_set_cookie_params_variation1.phpt b/ext/session/tests/session_set_cookie_params_variation1.phpt
index 93ac056d898..46ec780e9de 100644
--- a/ext/session/tests/session_set_cookie_params_variation1.phpt
+++ b/ext/session/tests/session_set_cookie_params_variation1.phpt
@@ -9,10 +9,10 @@ session.cookie_lifetime=3600
 
 ob_start();
 
-/* 
+/*
  * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]])
  * Description : Set the session cookie parameters
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_cookie_params() : variation ***\n";
diff --git a/ext/session/tests/session_set_cookie_params_variation2.phpt b/ext/session/tests/session_set_cookie_params_variation2.phpt
index 1bf9bae848c..07bb5cfdf52 100644
--- a/ext/session/tests/session_set_cookie_params_variation2.phpt
+++ b/ext/session/tests/session_set_cookie_params_variation2.phpt
@@ -9,10 +9,10 @@ session.cookie_path=/path
 
 ob_start();
 
-/* 
+/*
  * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]])
  * Description : Set the session cookie parameters
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_cookie_params() : variation ***\n";
diff --git a/ext/session/tests/session_set_cookie_params_variation3.phpt b/ext/session/tests/session_set_cookie_params_variation3.phpt
index 17d1e6a7713..5a4e2df8fd7 100644
--- a/ext/session/tests/session_set_cookie_params_variation3.phpt
+++ b/ext/session/tests/session_set_cookie_params_variation3.phpt
@@ -9,10 +9,10 @@ session.cookie_domain=foo
 
 ob_start();
 
-/* 
+/*
  * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]])
  * Description : Set the session cookie parameters
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_cookie_params() : variation ***\n";
diff --git a/ext/session/tests/session_set_cookie_params_variation4.phpt b/ext/session/tests/session_set_cookie_params_variation4.phpt
index 2b10f3cc82b..ab0de3bd8b7 100644
--- a/ext/session/tests/session_set_cookie_params_variation4.phpt
+++ b/ext/session/tests/session_set_cookie_params_variation4.phpt
@@ -9,10 +9,10 @@ session.cookie_secure=TRUE
 
 ob_start();
 
-/* 
+/*
  * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]])
  * Description : Set the session cookie parameters
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_cookie_params() : variation ***\n";
diff --git a/ext/session/tests/session_set_cookie_params_variation5.phpt b/ext/session/tests/session_set_cookie_params_variation5.phpt
index ffdd29db2d4..f630a5ff4a3 100644
--- a/ext/session/tests/session_set_cookie_params_variation5.phpt
+++ b/ext/session/tests/session_set_cookie_params_variation5.phpt
@@ -9,10 +9,10 @@ session.cookie_httponly=TRUE
 
 ob_start();
 
-/* 
+/*
  * Prototype : void session_set_cookie_params(int $lifetime [, string $path [, string $domain [, bool $secure [, bool $httponly]]]])
  * Description : Set the session cookie parameters
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_cookie_params() : variation ***\n";
diff --git a/ext/session/tests/session_set_save_handler_basic.phpt b/ext/session/tests/session_set_save_handler_basic.phpt
index 87156bea7f0..bf77e77a6e3 100644
--- a/ext/session/tests/session_set_save_handler_basic.phpt
+++ b/ext/session/tests/session_set_save_handler_basic.phpt
@@ -12,10 +12,10 @@ session.save_handler=files
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc)
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : basic functionality ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_001.phpt b/ext/session/tests/session_set_save_handler_class_001.phpt
index c46d07f9b72..94ab5f8247a 100644
--- a/ext/session/tests/session_set_save_handler_class_001.phpt
+++ b/ext/session/tests/session_set_save_handler_class_001.phpt
@@ -11,10 +11,10 @@ session.save_handler=files
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : basic class wrapping existing handler ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_002.phpt b/ext/session/tests/session_set_save_handler_class_002.phpt
index 880bc33425f..fe343766735 100644
--- a/ext/session/tests/session_set_save_handler_class_002.phpt
+++ b/ext/session/tests/session_set_save_handler_class_002.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : full handler implementation ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_003.phpt b/ext/session/tests/session_set_save_handler_class_003.phpt
index 29b38468512..b6b179913a6 100644
--- a/ext/session/tests/session_set_save_handler_class_003.phpt
+++ b/ext/session/tests/session_set_save_handler_class_003.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : inheritance ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_004.phpt b/ext/session/tests/session_set_save_handler_class_004.phpt
index 103b13baa7e..71ebff2ecaf 100644
--- a/ext/session/tests/session_set_save_handler_class_004.phpt
+++ b/ext/session/tests/session_set_save_handler_class_004.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : default object ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_005.phpt b/ext/session/tests/session_set_save_handler_class_005.phpt
index b195fc4a53a..e788ad11979 100644
--- a/ext/session/tests/session_set_save_handler_class_005.phpt
+++ b/ext/session/tests/session_set_save_handler_class_005.phpt
@@ -11,10 +11,10 @@ session.gc_probability=0
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : incomplete implementation ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_006.phpt b/ext/session/tests/session_set_save_handler_class_006.phpt
index 5830b6d4fa7..3f86437207a 100644
--- a/ext/session/tests/session_set_save_handler_class_006.phpt
+++ b/ext/session/tests/session_set_save_handler_class_006.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : using objects in close ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_007.phpt b/ext/session/tests/session_set_save_handler_class_007.phpt
index 55f722515ea..0416a894c66 100644
--- a/ext/session/tests/session_set_save_handler_class_007.phpt
+++ b/ext/session/tests/session_set_save_handler_class_007.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : manual shutdown, reopen ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_008.phpt b/ext/session/tests/session_set_save_handler_class_008.phpt
index 28cb692f0e1..da9611a8c71 100644
--- a/ext/session/tests/session_set_save_handler_class_008.phpt
+++ b/ext/session/tests/session_set_save_handler_class_008.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : manual shutdown ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_009.phpt b/ext/session/tests/session_set_save_handler_class_009.phpt
index a8b57dc5418..d878450540e 100644
--- a/ext/session/tests/session_set_save_handler_class_009.phpt
+++ b/ext/session/tests/session_set_save_handler_class_009.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : implicit shutdown ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_010.phpt b/ext/session/tests/session_set_save_handler_class_010.phpt
index 02304f4974b..2424a08d68d 100644
--- a/ext/session/tests/session_set_save_handler_class_010.phpt
+++ b/ext/session/tests/session_set_save_handler_class_010.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : manual shutdown function ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_011.phpt b/ext/session/tests/session_set_save_handler_class_011.phpt
index 7fa3657694a..d1f7dbe91fc 100644
--- a/ext/session/tests/session_set_save_handler_class_011.phpt
+++ b/ext/session/tests/session_set_save_handler_class_011.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : shutdown failure ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_012.phpt b/ext/session/tests/session_set_save_handler_class_012.phpt
index 3671cebe2be..c901385edb3 100644
--- a/ext/session/tests/session_set_save_handler_class_012.phpt
+++ b/ext/session/tests/session_set_save_handler_class_012.phpt
@@ -11,10 +11,10 @@ session.gc_probability=0
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : incorrect arguments for existing handler open ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_013.phpt b/ext/session/tests/session_set_save_handler_class_013.phpt
index f536aa72acc..c882e902049 100644
--- a/ext/session/tests/session_set_save_handler_class_013.phpt
+++ b/ext/session/tests/session_set_save_handler_class_013.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : incorrect arguments for existing handler close ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_014.phpt b/ext/session/tests/session_set_save_handler_class_014.phpt
index ba689cef02c..e9670829651 100644
--- a/ext/session/tests/session_set_save_handler_class_014.phpt
+++ b/ext/session/tests/session_set_save_handler_class_014.phpt
@@ -13,10 +13,10 @@ include('skipif.inc');
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : calling default handler when save_handler=user ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_015.phpt b/ext/session/tests/session_set_save_handler_class_015.phpt
index 3bef51be4ff..6eaccf460fe 100644
--- a/ext/session/tests/session_set_save_handler_class_015.phpt
+++ b/ext/session/tests/session_set_save_handler_class_015.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : register session handler but don't start  ***\n";
diff --git a/ext/session/tests/session_set_save_handler_class_017.phpt b/ext/session/tests/session_set_save_handler_class_017.phpt
index b8e7d7a7ad0..720541f3fcc 100644
--- a/ext/session/tests/session_set_save_handler_class_017.phpt
+++ b/ext/session/tests/session_set_save_handler_class_017.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandlerInterface $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() function: class with create_sid ***\n";
diff --git a/ext/session/tests/session_set_save_handler_closures.phpt b/ext/session/tests/session_set_save_handler_closures.phpt
index f427ebf9a51..77bbf6caff5 100644
--- a/ext/session/tests/session_set_save_handler_closures.phpt
+++ b/ext/session/tests/session_set_save_handler_closures.phpt
@@ -11,10 +11,10 @@ session.save_handler=files
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc)
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : using closures as callbacks ***\n";
diff --git a/ext/session/tests/session_set_save_handler_error.phpt b/ext/session/tests/session_set_save_handler_error.phpt
index bf9d25de591..2249d1e5a27 100644
--- a/ext/session/tests/session_set_save_handler_error.phpt
+++ b/ext/session/tests/session_set_save_handler_error.phpt
@@ -7,10 +7,10 @@ Test session_set_save_handler() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc)
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_set_save_handler_error2.phpt b/ext/session/tests/session_set_save_handler_error2.phpt
index 1f2a8b9e6a0..23df128f12a 100644
--- a/ext/session/tests/session_set_save_handler_error2.phpt
+++ b/ext/session/tests/session_set_save_handler_error2.phpt
@@ -9,10 +9,10 @@ error_reporting=0
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc)
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : error functionality ***\n";
diff --git a/ext/session/tests/session_set_save_handler_error3.phpt b/ext/session/tests/session_set_save_handler_error3.phpt
index 2f2659557b8..ecb5e5a91df 100644
--- a/ext/session/tests/session_set_save_handler_error3.phpt
+++ b/ext/session/tests/session_set_save_handler_error3.phpt
@@ -11,14 +11,14 @@ session.save_handler=files
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc)
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : error functionality ***\n";
-function open($save_path, $session_name) { 
+function open($save_path, $session_name) {
      throw new Exception("Do something bad..!");
 }
 
diff --git a/ext/session/tests/session_set_save_handler_error4.phpt b/ext/session/tests/session_set_save_handler_error4.phpt
index 4267195ee15..00fb2976e36 100644
--- a/ext/session/tests/session_set_save_handler_error4.phpt
+++ b/ext/session/tests/session_set_save_handler_error4.phpt
@@ -7,10 +7,10 @@ Test session_set_save_handler() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc)
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : error functionality ***\n";
diff --git a/ext/session/tests/session_set_save_handler_iface_001.phpt b/ext/session/tests/session_set_save_handler_iface_001.phpt
index 6943d59cbec..bfc9e2fa82a 100644
--- a/ext/session/tests/session_set_save_handler_iface_001.phpt
+++ b/ext/session/tests/session_set_save_handler_iface_001.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandlerInterface $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() function: interface ***\n";
diff --git a/ext/session/tests/session_set_save_handler_iface_002.phpt b/ext/session/tests/session_set_save_handler_iface_002.phpt
index 204d88c785b..0000c50add7 100644
--- a/ext/session/tests/session_set_save_handler_iface_002.phpt
+++ b/ext/session/tests/session_set_save_handler_iface_002.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandlerInterface $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() function: interface wrong ***\n";
diff --git a/ext/session/tests/session_set_save_handler_iface_003.phpt b/ext/session/tests/session_set_save_handler_iface_003.phpt
index 4d7ed3b7ee2..9e0ce336168 100644
--- a/ext/session/tests/session_set_save_handler_iface_003.phpt
+++ b/ext/session/tests/session_set_save_handler_iface_003.phpt
@@ -10,10 +10,10 @@ session.name=PHPSESSID
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(SessionHandlerInterface $handler [, bool $register_shutdown_function = true])
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() function: id interface ***\n";
diff --git a/ext/session/tests/session_set_save_handler_variation1.phpt b/ext/session/tests/session_set_save_handler_variation1.phpt
index fe1d2b0b5ae..3362adbac53 100644
--- a/ext/session/tests/session_set_save_handler_variation1.phpt
+++ b/ext/session/tests/session_set_save_handler_variation1.phpt
@@ -7,10 +7,10 @@ Test session_set_save_handler() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc)
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : variation ***\n";
diff --git a/ext/session/tests/session_set_save_handler_variation2.phpt b/ext/session/tests/session_set_save_handler_variation2.phpt
index 976d796f5ca..1e8a8f51c14 100644
--- a/ext/session/tests/session_set_save_handler_variation2.phpt
+++ b/ext/session/tests/session_set_save_handler_variation2.phpt
@@ -7,10 +7,10 @@ Test session_set_save_handler() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc)
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : variation ***\n";
diff --git a/ext/session/tests/session_set_save_handler_variation3.phpt b/ext/session/tests/session_set_save_handler_variation3.phpt
index 6afa753b901..9af87dd1700 100644
--- a/ext/session/tests/session_set_save_handler_variation3.phpt
+++ b/ext/session/tests/session_set_save_handler_variation3.phpt
@@ -9,10 +9,10 @@ session.auto_start=1
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc)
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : variation ***\n";
diff --git a/ext/session/tests/session_set_save_handler_variation4.phpt b/ext/session/tests/session_set_save_handler_variation4.phpt
index d897cfc1098..8f9951c1e8d 100644
--- a/ext/session/tests/session_set_save_handler_variation4.phpt
+++ b/ext/session/tests/session_set_save_handler_variation4.phpt
@@ -14,10 +14,10 @@ session.save_handler=files
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_set_save_handler(callback $open, callback $close, callback $read, callback $write, callback $destroy, callback $gc)
  * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_set_save_handler() : variation ***\n";
diff --git a/ext/session/tests/session_start_error.phpt b/ext/session/tests/session_start_error.phpt
index 5a0bcefc2a7..719e202c114 100644
--- a/ext/session/tests/session_start_error.phpt
+++ b/ext/session/tests/session_start_error.phpt
@@ -7,10 +7,10 @@ Test session_start() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_start(void)
  * Description : Initialize session data
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_start() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_start_variation1.phpt b/ext/session/tests/session_start_variation1.phpt
index e7eba3d28ba..d76bd8b0f3c 100644
--- a/ext/session/tests/session_start_variation1.phpt
+++ b/ext/session/tests/session_start_variation1.phpt
@@ -7,10 +7,10 @@ Test session_start() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_start(void)
  * Description : Initialize session data
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_start() : variation ***\n";
diff --git a/ext/session/tests/session_start_variation2.phpt b/ext/session/tests/session_start_variation2.phpt
index 6c9b29e3ec6..5ef9bbf79f0 100644
--- a/ext/session/tests/session_start_variation2.phpt
+++ b/ext/session/tests/session_start_variation2.phpt
@@ -7,10 +7,10 @@ Test session_start() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_start(void)
  * Description : Initialize session data
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_start() : variation ***\n";
diff --git a/ext/session/tests/session_start_variation3.phpt b/ext/session/tests/session_start_variation3.phpt
index 9ff1ff0139d..8f0b56306fe 100644
--- a/ext/session/tests/session_start_variation3.phpt
+++ b/ext/session/tests/session_start_variation3.phpt
@@ -7,10 +7,10 @@ Test session_start() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_start(void)
  * Description : Initialize session data
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_start() : variation ***\n";
diff --git a/ext/session/tests/session_start_variation4.phpt b/ext/session/tests/session_start_variation4.phpt
index 42895493a7b..328ce6fcebf 100644
--- a/ext/session/tests/session_start_variation4.phpt
+++ b/ext/session/tests/session_start_variation4.phpt
@@ -7,10 +7,10 @@ Test session_start() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_start(void)
  * Description : Initialize session data
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_start() : variation ***\n";
diff --git a/ext/session/tests/session_start_variation5.phpt b/ext/session/tests/session_start_variation5.phpt
index bbc987e3c84..a1b461f69fa 100644
--- a/ext/session/tests/session_start_variation5.phpt
+++ b/ext/session/tests/session_start_variation5.phpt
@@ -7,10 +7,10 @@ Test session_start() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_start(void)
  * Description : Initialize session data
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_start() : variation ***\n";
diff --git a/ext/session/tests/session_start_variation6.phpt b/ext/session/tests/session_start_variation6.phpt
index 56471cc7f33..e0f1eb782ae 100644
--- a/ext/session/tests/session_start_variation6.phpt
+++ b/ext/session/tests/session_start_variation6.phpt
@@ -7,10 +7,10 @@ Test session_start() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_start(void)
  * Description : Initialize session data
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_start() : variation ***\n";
diff --git a/ext/session/tests/session_start_variation7.phpt b/ext/session/tests/session_start_variation7.phpt
index be079f33503..b159ee89819 100644
--- a/ext/session/tests/session_start_variation7.phpt
+++ b/ext/session/tests/session_start_variation7.phpt
@@ -7,10 +7,10 @@ Test session_start() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_start(void)
  * Description : Initialize session data
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_start() : variation ***\n";
diff --git a/ext/session/tests/session_start_variation8.phpt b/ext/session/tests/session_start_variation8.phpt
index 93654752750..f37e1bf15f9 100644
--- a/ext/session/tests/session_start_variation8.phpt
+++ b/ext/session/tests/session_start_variation8.phpt
@@ -7,10 +7,10 @@ Test session_start() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_start(void)
  * Description : Initialize session data
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_start() : variation ***\n";
diff --git a/ext/session/tests/session_start_variation9.phpt b/ext/session/tests/session_start_variation9.phpt
index 2629b074b6a..e37c484ee0c 100644
--- a/ext/session/tests/session_start_variation9.phpt
+++ b/ext/session/tests/session_start_variation9.phpt
@@ -9,10 +9,10 @@ session.auto_start=1
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_start(void)
  * Description : Initialize session data
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_start() : variation ***\n";
diff --git a/ext/session/tests/session_unset_basic.phpt b/ext/session/tests/session_unset_basic.phpt
index 2e4d3bf5e86..fd79c93c9cc 100644
--- a/ext/session/tests/session_unset_basic.phpt
+++ b/ext/session/tests/session_unset_basic.phpt
@@ -7,10 +7,10 @@ Test session_unset() function : basic functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : void session_unset(void)
  * Description : Free all session variables
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_unset() : basic functionality ***\n";
diff --git a/ext/session/tests/session_unset_error.phpt b/ext/session/tests/session_unset_error.phpt
index e371bcb4096..c411cffa469 100644
--- a/ext/session/tests/session_unset_error.phpt
+++ b/ext/session/tests/session_unset_error.phpt
@@ -7,10 +7,10 @@ Test session_unset() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : void session_unset(void)
  * Description : Free all session variables
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_unset() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_unset_variation1.phpt b/ext/session/tests/session_unset_variation1.phpt
index 5c1fc2c701f..8235ef44fd2 100644
--- a/ext/session/tests/session_unset_variation1.phpt
+++ b/ext/session/tests/session_unset_variation1.phpt
@@ -7,10 +7,10 @@ Test session_unset() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : void session_unset(void)
  * Description : Free all session variables
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_unset() : variation ***\n";
diff --git a/ext/session/tests/session_write_close_basic.phpt b/ext/session/tests/session_write_close_basic.phpt
index 5b32f5c2662..f3695324dda 100644
--- a/ext/session/tests/session_write_close_basic.phpt
+++ b/ext/session/tests/session_write_close_basic.phpt
@@ -7,10 +7,10 @@ Test session_write_close() function : basic functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_write_close(void)
  * Description : Write session data and end session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_write_close() : basic functionality ***\n";
diff --git a/ext/session/tests/session_write_close_error.phpt b/ext/session/tests/session_write_close_error.phpt
index 102ac413822..5e48d8c0008 100644
--- a/ext/session/tests/session_write_close_error.phpt
+++ b/ext/session/tests/session_write_close_error.phpt
@@ -7,10 +7,10 @@ Test session_write_close() function : error functionality
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_write_close(void)
  * Description : Write session data and end session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_write_close() : error functionality ***\n";
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // Empty strings
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*18*/ "Nothing",
        'Nothing',
        $heredoc,
-       
+
        // Object data
 /*21*/ new classA(),
 
diff --git a/ext/session/tests/session_write_close_variation1.phpt b/ext/session/tests/session_write_close_variation1.phpt
index 53452b45b94..8242a1a4484 100644
--- a/ext/session/tests/session_write_close_variation1.phpt
+++ b/ext/session/tests/session_write_close_variation1.phpt
@@ -7,10 +7,10 @@ Test session_write_close() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_write_close(void)
  * Description : Write session data and end session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_write_close() : variation ***\n";
diff --git a/ext/session/tests/session_write_close_variation2.phpt b/ext/session/tests/session_write_close_variation2.phpt
index ac4f843caed..8cca89b773d 100644
--- a/ext/session/tests/session_write_close_variation2.phpt
+++ b/ext/session/tests/session_write_close_variation2.phpt
@@ -7,10 +7,10 @@ Test session_write_close() function : variation
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_write_close(void)
  * Description : Write session data and end session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_write_close() : variation ***\n";
diff --git a/ext/session/tests/session_write_close_variation3.phpt b/ext/session/tests/session_write_close_variation3.phpt
index 249b5730dfd..1a3afb73876 100644
--- a/ext/session/tests/session_write_close_variation3.phpt
+++ b/ext/session/tests/session_write_close_variation3.phpt
@@ -9,10 +9,10 @@ session.auto_start=1
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_write_close(void)
  * Description : Write session data and end session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_write_close() : variation ***\n";
diff --git a/ext/session/tests/session_write_close_variation4.phpt b/ext/session/tests/session_write_close_variation4.phpt
index f1a7cb59d91..abfd3d53bff 100644
--- a/ext/session/tests/session_write_close_variation4.phpt
+++ b/ext/session/tests/session_write_close_variation4.phpt
@@ -9,10 +9,10 @@ session.use_strict_mode=0
 
 ob_start();
 
-/* 
+/*
  * Prototype : bool session_write_close(void)
  * Description : Write session data and end session
- * Source code : ext/session/session.c 
+ * Source code : ext/session/session.c
  */
 
 echo "*** Testing session_write_close() : variation ***\n";
diff --git a/ext/session/tests/sessionhandler_open_001.phpt b/ext/session/tests/sessionhandler_open_001.phpt
index e6e913a6a57..2b8c3a49fba 100644
--- a/ext/session/tests/sessionhandler_open_001.phpt
+++ b/ext/session/tests/sessionhandler_open_001.phpt
@@ -3,7 +3,7 @@ Testing repated SessionHandler::open() calls
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
-<?php  
+<?php
 
 ini_set('session.save_handler', 'files');
 $x = new SessionHandler;
diff --git a/ext/shmop/tests/001.phpt b/ext/shmop/tests/001.phpt
index 5b798cd5ba4..a5ad01c3027 100644
--- a/ext/shmop/tests/001.phpt
+++ b/ext/shmop/tests/001.phpt
@@ -13,15 +13,15 @@ shmop extension test
 	$write_d2 = "test #2 append data to shared memory segment";
 
 	echo "shm open for create: ";
-	$shm_id = shmop_open($hex_shm_id, "n", 0644, 1024);   
+	$shm_id = shmop_open($hex_shm_id, "n", 0644, 1024);
 	if (!$shm_id) {
 		die("failed\n");
 	} else {
 		echo "ok\n";
 	}
-	
+
 	echo "shm size is: " . ($shm_size = shmop_size($shm_id)) . "\n";
-	
+
 	echo "shm write test #1: ";
 	$written = shmop_write($shm_id, $write_d1, 0);
 	if ($written != strlen($write_d1)) {
@@ -29,34 +29,34 @@ shmop extension test
 	} else {
 		echo "ok\n";
 	}
-	
+
 	echo "data in memory is: " . shmop_read($shm_id, 0, $written) . "\n";
 
 	shmop_close($shm_id);
-	
+
 	echo "shm open for read only: ";
-	$shm_id = shmop_open($hex_shm_id, "a", 0644, 1024);   
+	$shm_id = shmop_open($hex_shm_id, "a", 0644, 1024);
 	if (!$shm_id) {
 		echo "failed\n";
 	} else {
 		echo "ok\n";
 	}
-	
+
 	echo "data in memory is: " . shmop_read($shm_id, 0, $written) . "\n";
-	
+
 	/* try to append data to the shared memory segment, this should fail */
 	shmop_write($shm_id, $write_d1, $written);
 
 	shmop_close($shm_id);
-	
+
 	echo "shm open for read only: ";
-	$shm_id = shmop_open($hex_shm_id, "w", 0644, 1024);   
+	$shm_id = shmop_open($hex_shm_id, "w", 0644, 1024);
 	if (!$shm_id) {
 		echo "failed\n";
 	} else {
 		echo "ok\n";
 	}
-	
+
 	echo "shm write test #1: ";
 	$written = shmop_write($shm_id, $write_d2, $written);
 	if ($written != strlen($write_d2)) {
@@ -64,7 +64,7 @@ shmop extension test
 	} else {
 		echo "ok\n";
 	}
-	
+
 	echo "data in memory is: " . shmop_read($shm_id, 0, strlen($write_d1 . $write_d2)) . "\n";
 
 	echo "deletion of shm segment: ";
@@ -73,7 +73,7 @@ shmop extension test
 	} else {
 		echo "ok\n";
 	}
-	
+
 	shmop_close($shm_id);
 ?>
 --EXPECTF--
diff --git a/ext/simplexml/tests/000.phpt b/ext/simplexml/tests/000.phpt
index ae23dcfdd01..cf5b6baddd6 100644
--- a/ext/simplexml/tests/000.phpt
+++ b/ext/simplexml/tests/000.phpt
@@ -3,7 +3,7 @@ SimpleXML: var_dump()
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 $sxe = simplexml_load_file(dirname(__FILE__).'/000.xml');
 
diff --git a/ext/simplexml/tests/001-mb.phpt b/ext/simplexml/tests/001-mb.phpt
index ee4d6f085fc..ce358d33287 100644
--- a/ext/simplexml/tests/001-mb.phpt
+++ b/ext/simplexml/tests/001-mb.phpt
@@ -3,7 +3,7 @@ SimpleXML: Simple document
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 var_dump(simplexml_load_file(dirname(__FILE__).'/sxe��ガラスを食�られ��.xml'));
 
diff --git a/ext/simplexml/tests/001.phpt b/ext/simplexml/tests/001.phpt
index 0be77710e5f..7f37870efae 100644
--- a/ext/simplexml/tests/001.phpt
+++ b/ext/simplexml/tests/001.phpt
@@ -3,7 +3,7 @@ SimpleXML: Simple document
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 var_dump(simplexml_load_file(dirname(__FILE__).'/sxe.xml'));
 
diff --git a/ext/simplexml/tests/002.phpt b/ext/simplexml/tests/002.phpt
index 4f1f6b62240..1d8ba4032ac 100644
--- a/ext/simplexml/tests/002.phpt
+++ b/ext/simplexml/tests/002.phpt
@@ -3,7 +3,7 @@ SimpleXML: clone
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/simplexml/tests/003.phpt b/ext/simplexml/tests/003.phpt
index 105f616d60e..5b989b85d4b 100644
--- a/ext/simplexml/tests/003.phpt
+++ b/ext/simplexml/tests/003.phpt
@@ -3,7 +3,7 @@ SimpleXML: Entities
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/simplexml/tests/004.phpt b/ext/simplexml/tests/004.phpt
index 21cb5469e01..ffb4db0db6f 100644
--- a/ext/simplexml/tests/004.phpt
+++ b/ext/simplexml/tests/004.phpt
@@ -3,7 +3,7 @@ SimpleXML: CDATA
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 $sxe = simplexml_load_string(<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/simplexml/tests/005.phpt b/ext/simplexml/tests/005.phpt
index 14110654351..ee8cd1ff83d 100644
--- a/ext/simplexml/tests/005.phpt
+++ b/ext/simplexml/tests/005.phpt
@@ -3,7 +3,7 @@ SimpleXML: Text data
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 $sxe = simplexml_load_string(<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/simplexml/tests/006.phpt b/ext/simplexml/tests/006.phpt
index 72ad0c80893..bf4270f4495 100644
--- a/ext/simplexml/tests/006.phpt
+++ b/ext/simplexml/tests/006.phpt
@@ -3,7 +3,7 @@ SimpleXML: foreach
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 $sxe = simplexml_load_string(<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/simplexml/tests/007.phpt b/ext/simplexml/tests/007.phpt
index 51d7a847f7e..065e794c481 100644
--- a/ext/simplexml/tests/007.phpt
+++ b/ext/simplexml/tests/007.phpt
@@ -3,7 +3,7 @@ SimpleXML: Attributes
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/simplexml/tests/008.phpt b/ext/simplexml/tests/008.phpt
index f6c41f43e5a..dba2df58c79 100644
--- a/ext/simplexml/tests/008.phpt
+++ b/ext/simplexml/tests/008.phpt
@@ -1,9 +1,9 @@
 --TEST--
-SimpleXML: XPath 
+SimpleXML: XPath
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version='1.0'?>
@@ -25,9 +25,9 @@ EOF;
 $sxe = simplexml_load_string($xml);
 
 var_dump($sxe->xpath("elem1/elem2/elem3/elem4"));
-//valid expression 
+//valid expression
 var_dump($sxe->xpath("***"));
-//invalid expression 
+//invalid expression
 var_dump($sxe->xpath("**"));
 ?>
 --EXPECTF--
diff --git a/ext/simplexml/tests/009.phpt b/ext/simplexml/tests/009.phpt
index a76f3d11161..2800f3add95 100644
--- a/ext/simplexml/tests/009.phpt
+++ b/ext/simplexml/tests/009.phpt
@@ -1,9 +1,9 @@
 --TEST--
-SimpleXML: foreach 
+SimpleXML: foreach
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $sxe = simplexml_load_string(<<<EOF
 <?xml version='1.0'?>
 <!DOCTYPE sxe SYSTEM "notfound.dtd">
diff --git a/ext/simplexml/tests/009b.phpt b/ext/simplexml/tests/009b.phpt
index dba300c72fb..fd920e2e265 100644
--- a/ext/simplexml/tests/009b.phpt
+++ b/ext/simplexml/tests/009b.phpt
@@ -1,9 +1,9 @@
 --TEST--
-SimpleXML: foreach 
+SimpleXML: foreach
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $sxe = simplexml_load_string(<<<EOF
 <?xml version='1.0'?>
 <!DOCTYPE sxe SYSTEM "notfound.dtd">
diff --git a/ext/simplexml/tests/010.phpt b/ext/simplexml/tests/010.phpt
index 267780905b8..63daf800d18 100644
--- a/ext/simplexml/tests/010.phpt
+++ b/ext/simplexml/tests/010.phpt
@@ -3,7 +3,7 @@ SimpleXML: Simple Inheritance
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 class simplexml_inherited extends SimpleXMLElement
 {
diff --git a/ext/simplexml/tests/011.phpt b/ext/simplexml/tests/011.phpt
index 74ea4705cad..1d5c193f3b4 100644
--- a/ext/simplexml/tests/011.phpt
+++ b/ext/simplexml/tests/011.phpt
@@ -1,11 +1,11 @@
 --TEST--
 SimpleXML: echo/print
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded('simplexml')) print 'skip';
 ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version="1.0" encoding="ISO-8859-1" ?>
diff --git a/ext/simplexml/tests/012.phpt b/ext/simplexml/tests/012.phpt
index abbb10b8d3b..598aa3c17ab 100644
--- a/ext/simplexml/tests/012.phpt
+++ b/ext/simplexml/tests/012.phpt
@@ -1,11 +1,11 @@
 --TEST--
 SimpleXML: Attribute creation
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded('simplexml')) print 'skip';
 ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version="1.0" encoding="ISO-8859-1" ?>
diff --git a/ext/simplexml/tests/013.phpt b/ext/simplexml/tests/013.phpt
index 56c57dfbc2f..cf584614516 100644
--- a/ext/simplexml/tests/013.phpt
+++ b/ext/simplexml/tests/013.phpt
@@ -1,11 +1,11 @@
 --TEST--
 SimpleXML: Split text content
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded('simplexml')) print 'skip';
 ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version="1.0" encoding="ISO-8859-1" ?>
diff --git a/ext/simplexml/tests/014.phpt b/ext/simplexml/tests/014.phpt
index d1d736e7b59..b0c1dd952f9 100644
--- a/ext/simplexml/tests/014.phpt
+++ b/ext/simplexml/tests/014.phpt
@@ -3,7 +3,7 @@ SimpleXML: adding/removing attributes (direct)
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $xml =<<<EOF
 <people>
    <person name="Joe"></person>
diff --git a/ext/simplexml/tests/014a.phpt b/ext/simplexml/tests/014a.phpt
index 649828b4ddf..f778c25f128 100644
--- a/ext/simplexml/tests/014a.phpt
+++ b/ext/simplexml/tests/014a.phpt
@@ -3,7 +3,7 @@ SimpleXML: adding/removing attributes (single)
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $xml =<<<EOF
 <people>
    <person name="Joe"></person>
diff --git a/ext/simplexml/tests/014b.phpt b/ext/simplexml/tests/014b.phpt
index 034396751a2..0daa9c5c976 100644
--- a/ext/simplexml/tests/014b.phpt
+++ b/ext/simplexml/tests/014b.phpt
@@ -3,7 +3,7 @@ SimpleXML: adding/removing attributes (second)
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $xml =<<<EOF
 <people>
    <person name="Joe"></person>
diff --git a/ext/simplexml/tests/015.phpt b/ext/simplexml/tests/015.phpt
index 11e9cd55cda..d80d4d114c8 100644
--- a/ext/simplexml/tests/015.phpt
+++ b/ext/simplexml/tests/015.phpt
@@ -3,7 +3,7 @@ SimpleXML: accessing singular subnode as array
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $xml =<<<EOF
 <people>
    <person name="Joe"></person>
diff --git a/ext/simplexml/tests/016.phpt b/ext/simplexml/tests/016.phpt
index ab80a7a19aa..97981214dbe 100644
--- a/ext/simplexml/tests/016.phpt
+++ b/ext/simplexml/tests/016.phpt
@@ -3,7 +3,7 @@ SimpleXML: modifying attributes of singular subnode
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $xml =<<<EOF
 <people>
    <person name="Joe"></person>
diff --git a/ext/simplexml/tests/016a.phpt b/ext/simplexml/tests/016a.phpt
index 9797e293056..7cc8b33123d 100644
--- a/ext/simplexml/tests/016a.phpt
+++ b/ext/simplexml/tests/016a.phpt
@@ -3,7 +3,7 @@ SimpleXML: concatenating attributes
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $xml =<<<EOF
 <people>
    <person name="Foo"></person>
diff --git a/ext/simplexml/tests/018.phpt b/ext/simplexml/tests/018.phpt
index e5c810944e9..41a6f8259ca 100644
--- a/ext/simplexml/tests/018.phpt
+++ b/ext/simplexml/tests/018.phpt
@@ -3,7 +3,7 @@ SimpleXML: iteration through subnodes and attributes
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $xml =<<<EOF
 <people>
    <person name="Joe">
diff --git a/ext/simplexml/tests/019.phpt b/ext/simplexml/tests/019.phpt
index aec74ba42e7..db15a69ff7d 100644
--- a/ext/simplexml/tests/019.phpt
+++ b/ext/simplexml/tests/019.phpt
@@ -3,7 +3,7 @@ SimpleXML: foreach with children()
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 $sxe = simplexml_load_string(<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/simplexml/tests/020.phpt b/ext/simplexml/tests/020.phpt
index 9e91b5ac3a9..40d04a7927a 100644
--- a/ext/simplexml/tests/020.phpt
+++ b/ext/simplexml/tests/020.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Attribute compared to string
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?> 
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/021.phpt b/ext/simplexml/tests/021.phpt
index d5138685f5e..c2b38d30ae8 100644
--- a/ext/simplexml/tests/021.phpt
+++ b/ext/simplexml/tests/021.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SimpleXML: Element check
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; ?> 
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/simplexml/tests/022.phpt b/ext/simplexml/tests/022.phpt
index 2af4a1dd280..338b61d0ed4 100644
--- a/ext/simplexml/tests/022.phpt
+++ b/ext/simplexml/tests/022.phpt
@@ -3,7 +3,7 @@ SimpleXML: Attributes inside foreach
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/simplexml/tests/023.phpt b/ext/simplexml/tests/023.phpt
index 515a1460c9d..9ae6ec8813b 100644
--- a/ext/simplexml/tests/023.phpt
+++ b/ext/simplexml/tests/023.phpt
@@ -3,7 +3,7 @@ SimpleXML: Attributes with entities
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/simplexml/tests/026.phpt b/ext/simplexml/tests/026.phpt
index d6de94be3d1..4b1f8168ae2 100644
--- a/ext/simplexml/tests/026.phpt
+++ b/ext/simplexml/tests/026.phpt
@@ -3,7 +3,7 @@ SimpleXML: getName()
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $xml =<<<EOF
 <people>
   <person>Jane</person>
diff --git a/ext/simplexml/tests/027.phpt b/ext/simplexml/tests/027.phpt
index a531ccad46f..193456aacec 100644
--- a/ext/simplexml/tests/027.phpt
+++ b/ext/simplexml/tests/027.phpt
@@ -3,7 +3,7 @@ SimpleXML: Adding an elements
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $xml =<<<EOF
 <people></people>
 EOF;
diff --git a/ext/simplexml/tests/028.phpt b/ext/simplexml/tests/028.phpt
index 753056b9ad8..70a883e349b 100644
--- a/ext/simplexml/tests/028.phpt
+++ b/ext/simplexml/tests/028.phpt
@@ -3,7 +3,7 @@ SimpleXML: Adding an elements without text
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $xml =<<<EOF
 <people></people>
 EOF;
diff --git a/ext/simplexml/tests/029.phpt b/ext/simplexml/tests/029.phpt
index 86a4f308e3d..937f2863e73 100644
--- a/ext/simplexml/tests/029.phpt
+++ b/ext/simplexml/tests/029.phpt
@@ -3,7 +3,7 @@ SimpleXML: foreach and count
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $xml =<<<EOF
 <people>
   <person name="Joe"/>
diff --git a/ext/simplexml/tests/030.phpt b/ext/simplexml/tests/030.phpt
index 774a5f14595..4d27f40ed1e 100644
--- a/ext/simplexml/tests/030.phpt
+++ b/ext/simplexml/tests/030.phpt
@@ -3,7 +3,7 @@ SimpleXML: isset and unset by offset
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $xml =<<<EOF
 <root s:att1="b" att1="a" 
       xmlns:s="urn::test" xmlns:t="urn::test-t">
diff --git a/ext/simplexml/tests/031.phpt b/ext/simplexml/tests/031.phpt
index cd2d266ba1e..143e57f59e8 100644
--- a/ext/simplexml/tests/031.phpt
+++ b/ext/simplexml/tests/031.phpt
@@ -3,7 +3,7 @@ SimpleXML: addChild and addAttribute
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $xml =<<<EOF
 <root s:att1="b" att1="a" 
       xmlns:s="urn::test" xmlns:t="urn::test-t">
diff --git a/ext/simplexml/tests/032.phpt b/ext/simplexml/tests/032.phpt
index 48bc887ecc1..805954abaa4 100644
--- a/ext/simplexml/tests/032.phpt
+++ b/ext/simplexml/tests/032.phpt
@@ -3,7 +3,7 @@ SimpleXML: comparing instances
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $xml =<<<EOF
 <people>
   <person name="Joe"/>
diff --git a/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt b/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
index 15c81b2a9a4..d227a220e29 100644
--- a/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_addAttribute_basic.phpt
@@ -1,12 +1,12 @@
 --TEST--
 SimpleXMLElement->addAttribute()
---SKIPIF-- 
+--SKIPIF--
 <?php if (!extension_loaded("simplexml")) die("skip"); ?>
---FILE-- 
+--FILE--
 <?php
 	$simple = simplexml_load_file(dirname(__FILE__)."/book.xml");
 	$simple->addAttribute('type','novels');
-	
+
 	var_dump($simple->attributes());
 	echo "Done";
 ?>
diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
index fb7e6e90f00..ad33a532708 100644
--- a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
@@ -7,7 +7,7 @@ const XML_PARSE_RECOVER = 1;
 
 // we're not interested in checking concrete warnings regarding invalid XML
 $xml = @simplexml_load_string("XXXXXXX^", 'SimpleXMLElement', XML_PARSE_RECOVER);
-  
+
 // $xml is supposed to hold a SimpleXMLElement, but not FALSE/NULL
 var_dump($xml->xpath("BBBB"));
 ?>
diff --git a/ext/simplexml/tests/bug24392.phpt b/ext/simplexml/tests/bug24392.phpt
index 0a462e57701..5bd133fd731 100644
--- a/ext/simplexml/tests/bug24392.phpt
+++ b/ext/simplexml/tests/bug24392.phpt
@@ -3,7 +3,7 @@ Bug #24392 (empty namespaces causing confusion)
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip simplexml extension is not loaded"; ?>
 --FILE--
-<?php 
+<?php
 $s = simplexml_load_file(dirname(__FILE__).'/bug24392.xml');
 foreach ($s->item as $item) {
 	echo $item->title . "\n";
diff --git a/ext/simplexml/tests/bug36611.phpt b/ext/simplexml/tests/bug36611.phpt
index fdcfd4743c1..eb202671ca1 100644
--- a/ext/simplexml/tests/bug36611.phpt
+++ b/ext/simplexml/tests/bug36611.phpt
@@ -24,7 +24,7 @@ var_dump($val) ;
 
 ?>
 ===DONE===
---EXPECT--	
+--EXPECT--
 int(1)
 int(1)
 ===DONE===
diff --git a/ext/simplexml/tests/bug38347.phpt b/ext/simplexml/tests/bug38347.phpt
index 0ea7b5d2fef..c6b5bf7facd 100644
--- a/ext/simplexml/tests/bug38347.phpt
+++ b/ext/simplexml/tests/bug38347.phpt
@@ -19,7 +19,7 @@ iterate($xml->unknown);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 SimpleXMLElement Object
 (
 )
diff --git a/ext/simplexml/tests/bug38354.phpt b/ext/simplexml/tests/bug38354.phpt
index d2fcde11c2e..c78ba94fe31 100644
--- a/ext/simplexml/tests/bug38354.phpt
+++ b/ext/simplexml/tests/bug38354.phpt
@@ -10,14 +10,14 @@ $xml = simplexml_load_string(
 	<a href="javascript:alert(\'1\');"><strong>Item Two</strong></a>
 </code>'
 );
-	
+
 foreach ($xml->xpath("//*") as $element) {
 	var_dump($element->asXML());
 }
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(101) "<?xml version="1.0"?>
 <code>
 	<a href="javascript:alert('1');"><strong>Item Two</strong></a>
diff --git a/ext/simplexml/tests/bug38406.phpt b/ext/simplexml/tests/bug38406.phpt
index c64b52b8477..ea922294962 100644
--- a/ext/simplexml/tests/bug38406.phpt
+++ b/ext/simplexml/tests/bug38406.phpt
@@ -17,7 +17,7 @@ $item->$a = new stdclass;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 object(SimpleXMLElement)#%d (1) {
   [0]=>
   string(9) "something"
diff --git a/ext/simplexml/tests/bug38424.phpt b/ext/simplexml/tests/bug38424.phpt
index baab45fe545..560b613c014 100644
--- a/ext/simplexml/tests/bug38424.phpt
+++ b/ext/simplexml/tests/bug38424.phpt
@@ -21,6 +21,6 @@ $xml["a4"] = $str ;
 
 echo $xml->asXML();
 ?>
---EXPECT--	
+--EXPECT--
 <?xml version="1.0"?>
 <xml a1="abc &amp;amp; def" a2="abc &amp;amp; def" a3="abc &amp; def" a4="abc &amp; def"/>
diff --git a/ext/simplexml/tests/bug39662.phpt b/ext/simplexml/tests/bug39662.phpt
index ae15f2ef0a6..b07e90064fc 100644
--- a/ext/simplexml/tests/bug39662.phpt
+++ b/ext/simplexml/tests/bug39662.phpt
@@ -18,7 +18,7 @@ var_dump($clone->asXML());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 object(SimpleXMLElement)#%d (1) {
   [0]=>
   string(2) "
diff --git a/ext/simplexml/tests/bug39760.phpt b/ext/simplexml/tests/bug39760.phpt
index e781765fa04..409b43a316a 100644
--- a/ext/simplexml/tests/bug39760.phpt
+++ b/ext/simplexml/tests/bug39760.phpt
@@ -24,7 +24,7 @@ var_dump($test3);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 object(SimpleXMLElement)#%d (1) {
   [0]=>
   string(5) "text1"
diff --git a/ext/simplexml/tests/bug40451.phpt b/ext/simplexml/tests/bug40451.phpt
index afd78c769f9..cf44926a5eb 100644
--- a/ext/simplexml/tests/bug40451.phpt
+++ b/ext/simplexml/tests/bug40451.phpt
@@ -19,6 +19,6 @@ $add->Host->addAttribute('enable', 'true');
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 Warning: SimpleXMLElement::addAttribute(): Unable to locate parent Element in %s on line %d
 ===DONE===
diff --git a/ext/simplexml/tests/bug41175.phpt b/ext/simplexml/tests/bug41175.phpt
index db03da977ed..432f217b16a 100644
--- a/ext/simplexml/tests/bug41175.phpt
+++ b/ext/simplexml/tests/bug41175.phpt
@@ -12,7 +12,7 @@ echo $xml->asXML();
 
 ?>
 ===DONE===
---EXPECT--	
+--EXPECT--
 <?xml version="1.0"?>
 <img src="foo" alt=""/>
 ===DONE===
\ No newline at end of file
diff --git a/ext/simplexml/tests/bug46047.phpt b/ext/simplexml/tests/bug46047.phpt
index 0438154823f..75d69daabbe 100644
--- a/ext/simplexml/tests/bug46047.phpt
+++ b/ext/simplexml/tests/bug46047.phpt
@@ -4,7 +4,7 @@ Bug #46047 (SimpleXML converts empty nodes into object with nested array)
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
 <?php
-$xml = new SimpleXMLElement('<foo><bar><![CDATA[]]></bar><baz/></foo>', 
+$xml = new SimpleXMLElement('<foo><bar><![CDATA[]]></bar><baz/></foo>',
   LIBXML_NOCDATA);
 print_r($xml);
 
diff --git a/ext/simplexml/tests/bug46048.phpt b/ext/simplexml/tests/bug46048.phpt
index 97fc9ed0830..3a3e7d54ef3 100644
--- a/ext/simplexml/tests/bug46048.phpt
+++ b/ext/simplexml/tests/bug46048.phpt
@@ -13,7 +13,7 @@ $obj = simplexml_load_string($xml);
 print_r(get_object_vars($obj));
 ?>
 ===DONE===
---EXPECT--	
+--EXPECT--
 Array
 (
     [@attributes] => Array
diff --git a/ext/simplexml/tests/bug51615.phpt b/ext/simplexml/tests/bug51615.phpt
index c96b3ae7cad..b935414b80d 100644
--- a/ext/simplexml/tests/bug51615.phpt
+++ b/ext/simplexml/tests/bug51615.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #51615 (PHP crash with wrong HTML in SimpleXML)
 --SKIPIF--
-<?php if (!extension_loaded("simplexml")) print "skip"; 
+<?php if (!extension_loaded("simplexml")) print "skip";
  if (!extension_loaded("dom")) print "skip";
 ?>
 --FILE--
diff --git a/ext/simplexml/tests/feature55218.phpt b/ext/simplexml/tests/feature55218.phpt
index 25ea5343768..aba303b401f 100644
--- a/ext/simplexml/tests/feature55218.phpt
+++ b/ext/simplexml/tests/feature55218.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded("simplexml")) print "skip SimpleXML not present";
 if (!extension_loaded("libxml")) print "skip LibXML not present";
 ?>
 --FILE--
-<?php 
+<?php
 
 $x = new SimpleXMLElement(
 '<?xml version="1.0" standalone="yes"?>
diff --git a/ext/simplexml/tests/profile01.phpt b/ext/simplexml/tests/profile01.phpt
index 91b9544f66b..f9628fd52ba 100644
--- a/ext/simplexml/tests/profile01.phpt
+++ b/ext/simplexml/tests/profile01.phpt
@@ -3,7 +3,7 @@ SimpleXML [profile]: Accessing a simple node
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $root = simplexml_load_string('<?xml version="1.0"?>
 <root>
  <child>Hello</child>
diff --git a/ext/simplexml/tests/profile02.phpt b/ext/simplexml/tests/profile02.phpt
index 14b5bb86b28..f2e952bc36f 100644
--- a/ext/simplexml/tests/profile02.phpt
+++ b/ext/simplexml/tests/profile02.phpt
@@ -3,7 +3,7 @@ SimpleXML [profile]: Accessing an array of subnodes
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $root = simplexml_load_string('<?xml version="1.0"?>
 <root>
  <child>Hello</child>
diff --git a/ext/simplexml/tests/profile03.phpt b/ext/simplexml/tests/profile03.phpt
index 14f1c5fe888..6215ec57b01 100644
--- a/ext/simplexml/tests/profile03.phpt
+++ b/ext/simplexml/tests/profile03.phpt
@@ -3,7 +3,7 @@ SimpleXML [profile]: Accessing an attribute
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $root = simplexml_load_string('<?xml version="1.0"?>
 <root>
  <child attribute="Sample" />
diff --git a/ext/simplexml/tests/profile04.phpt b/ext/simplexml/tests/profile04.phpt
index 27714e99271..95907e8e65c 100644
--- a/ext/simplexml/tests/profile04.phpt
+++ b/ext/simplexml/tests/profile04.phpt
@@ -3,7 +3,7 @@ SimpleXML [profile]: Accessing a namespaced element
 --SKIPIF--
 <?php if (!extension_loaded("simplexml")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $root = simplexml_load_string('<?xml version="1.0"?>
 <root xmlns:reserved="reserved-ns">
  <reserved:child>Hello</reserved:child>
diff --git a/ext/simplexml/tests/simplexml_import_dom.phpt b/ext/simplexml/tests/simplexml_import_dom.phpt
index e108e0554d1..9908988ee07 100644
--- a/ext/simplexml/tests/simplexml_import_dom.phpt
+++ b/ext/simplexml/tests/simplexml_import_dom.phpt
@@ -4,7 +4,7 @@ SimpleXML [interop]: simplexml_import_dom
 <?php if (!extension_loaded("simplexml")) die("skip"); ?>
 <?php if (!extension_loaded("dom")) die("skip dom extension not loaded"); ?>
 --FILE--
-<?php 
+<?php
 $dom = new domDocument;
 $dom->load(dirname(__FILE__)."/book.xml");
 if(!$dom) {
diff --git a/ext/simplexml/tests/simplexml_load_file.phpt b/ext/simplexml/tests/simplexml_load_file.phpt
index 8dc6481f5dc..de3a839661c 100644
--- a/ext/simplexml/tests/simplexml_load_file.phpt
+++ b/ext/simplexml/tests/simplexml_load_file.phpt
@@ -1,11 +1,11 @@
 --TEST--
 simplexml_load_file()
---SKIPIF-- 
+--SKIPIF--
 <?php if (!extension_loaded("simplexml")) die("skip"); ?>
---FILE-- 
+--FILE--
 <?php
 	$simple = simplexml_load_file(dirname(__FILE__)."/book.xml");
-	
+
 	var_dump($simple);
 	echo "Done";
 ?>
diff --git a/ext/simplexml/tests/sxe_001.phpt b/ext/simplexml/tests/sxe_001.phpt
index be293efb392..fdc0335bd5f 100644
--- a/ext/simplexml/tests/sxe_001.phpt
+++ b/ext/simplexml/tests/sxe_001.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded("simplexml")) print "skip SimpleXML not present";
 if (!extension_loaded("libxml")) print "skip LibXML not present";
 ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/simplexml/tests/sxe_002.phpt b/ext/simplexml/tests/sxe_002.phpt
index aff3f838445..73db5967899 100644
--- a/ext/simplexml/tests/sxe_002.phpt
+++ b/ext/simplexml/tests/sxe_002.phpt
@@ -1,12 +1,12 @@
 --TEST--
 SPL: SimpleXMLIterator and recursion
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded('simplexml')) print 'skip';
 if (!extension_loaded("libxml")) print "skip LibXML not present";
 ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/simplexml/tests/sxe_003.phpt b/ext/simplexml/tests/sxe_003.phpt
index 8a45071dd2d..583242a61e9 100644
--- a/ext/simplexml/tests/sxe_003.phpt
+++ b/ext/simplexml/tests/sxe_003.phpt
@@ -1,12 +1,12 @@
 --TEST--
 SPL: SimpleXMLIterator and getChildren()
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded('simplexml')) print 'skip';
 if (!extension_loaded("libxml")) print "skip LibXML not present";
 ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/simplexml/tests/sxe_004.phpt b/ext/simplexml/tests/sxe_004.phpt
index ac4bcd8bf7f..c73346290f2 100644
--- a/ext/simplexml/tests/sxe_004.phpt
+++ b/ext/simplexml/tests/sxe_004.phpt
@@ -1,12 +1,12 @@
 --TEST--
 SPL: SimpleXMLIterator and overridden iterator methods()
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded('simplexml')) print 'skip';
 if (!extension_loaded("libxml")) print "skip LibXML not present";
 ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/simplexml/tests/sxe_005.phpt b/ext/simplexml/tests/sxe_005.phpt
index 8763085a091..d13d3d73d41 100644
--- a/ext/simplexml/tests/sxe_005.phpt
+++ b/ext/simplexml/tests/sxe_005.phpt
@@ -1,12 +1,12 @@
 --TEST--
 SPL: SimpleXMLIterator and overriden count()
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded('simplexml')) print 'skip';
 if (!extension_loaded("libxml")) print "skip LibXML not present";
 ?>
 --FILE--
-<?php 
+<?php
 
 $xml =<<<EOF
 <?xml version='1.0'?>
diff --git a/ext/skeleton/tests/001.phpt b/ext/skeleton/tests/001.phpt
index 88f57956508..74aebb08882 100644
--- a/ext/skeleton/tests/001.phpt
+++ b/ext/skeleton/tests/001.phpt
@@ -3,7 +3,7 @@ Check for extname presence
 --SKIPIF--
 <?php if (!extension_loaded("extname")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 echo "extname extension is available";
 /*
 	you can add regression tests for your extension here
diff --git a/ext/snmp/tests/bug60749.phpt b/ext/snmp/tests/bug60749.phpt
index 302f351c10c..3a9ae34b8bb 100644
--- a/ext/snmp/tests/bug60749.phpt
+++ b/ext/snmp/tests/bug60749.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Bug #60749: SNMP module should not strip non-standard SNMP port from hostname
 --CREDITS--
 Boris Lytochkin
diff --git a/ext/snmp/tests/bug64124.phpt b/ext/snmp/tests/bug64124.phpt
index 8b29a38c59b..b5b8f806034 100644
--- a/ext/snmp/tests/bug64124.phpt
+++ b/ext/snmp/tests/bug64124.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Bug #64124 IPv6 malformed
 --CREDITS--
 Boris Lytochkin
diff --git a/ext/snmp/tests/bug64159.phpt b/ext/snmp/tests/bug64159.phpt
index 52e53c957f7..0eee4e3295b 100644
--- a/ext/snmp/tests/bug64159.phpt
+++ b/ext/snmp/tests/bug64159.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Bug #64159: Truncated snmpget
 --CREDITS--
 Boris Lytochkin
diff --git a/ext/snmp/tests/bug72479.phpt b/ext/snmp/tests/bug72479.phpt
index 03087543602..c4bb621e66a 100644
--- a/ext/snmp/tests/bug72479.phpt
+++ b/ext/snmp/tests/bug72479.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Bug #72479: Use After Free Vulnerability in SNMP with GC and unserialize()
 --SKIPIF--
 <?php
diff --git a/ext/snmp/tests/generic_timeout_error.phpt b/ext/snmp/tests/generic_timeout_error.phpt
index c333a0d20b1..adcc3a7299a 100644
--- a/ext/snmp/tests/generic_timeout_error.phpt
+++ b/ext/snmp/tests/generic_timeout_error.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Generic timeout (wrong community)
 --CREDITS--
 Boris Lytochkin
diff --git a/ext/snmp/tests/ipv6.phpt b/ext/snmp/tests/ipv6.phpt
index aaa3304e879..1cda76565c5 100644
--- a/ext/snmp/tests/ipv6.phpt
+++ b/ext/snmp/tests/ipv6.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 IPv6 support
 --CREDITS--
 Boris Lytochkin
diff --git a/ext/snmp/tests/snmp-object-errno-errstr.phpt b/ext/snmp/tests/snmp-object-errno-errstr.phpt
index b6047af857f..0ab78b61e15 100644
--- a/ext/snmp/tests/snmp-object-errno-errstr.phpt
+++ b/ext/snmp/tests/snmp-object-errno-errstr.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 OO API: getErrno & getError methods
 --CREDITS--
 Boris Lytochkin
diff --git a/ext/snmp/tests/snmp-object-error.phpt b/ext/snmp/tests/snmp-object-error.phpt
index 2b81629d7e9..3b1ff5549f9 100644
--- a/ext/snmp/tests/snmp-object-error.phpt
+++ b/ext/snmp/tests/snmp-object-error.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 OO API: Generic errors
 --CREDITS--
 Boris Lytochkin
diff --git a/ext/snmp/tests/snmp-object-properties.phpt b/ext/snmp/tests/snmp-object-properties.phpt
index 40b69683df4..4f8bb24b08b 100644
--- a/ext/snmp/tests/snmp-object-properties.phpt
+++ b/ext/snmp/tests/snmp-object-properties.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 OO API: SNMP object properties
 --CREDITS--
 Boris Lytochkin
diff --git a/ext/snmp/tests/snmp-object-setSecurity_error.phpt b/ext/snmp/tests/snmp-object-setSecurity_error.phpt
index fc3a1b2269e..3fd14f2a5c3 100644
--- a/ext/snmp/tests/snmp-object-setSecurity_error.phpt
+++ b/ext/snmp/tests/snmp-object-setSecurity_error.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 OO API: SNMP::setSecurity (errors)
 --CREDITS--
 Boris Lytochkin
diff --git a/ext/snmp/tests/snmp-object.phpt b/ext/snmp/tests/snmp-object.phpt
index 40567dae9dd..df1c8dce0c4 100644
--- a/ext/snmp/tests/snmp-object.phpt
+++ b/ext/snmp/tests/snmp-object.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 OO API
 --CREDITS--
 Boris Lytochkin
diff --git a/ext/snmp/tests/snmp2_get.phpt b/ext/snmp/tests/snmp2_get.phpt
index 1463d949018..643fe17070d 100644
--- a/ext/snmp/tests/snmp2_get.phpt
+++ b/ext/snmp/tests/snmp2_get.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmp2_get
 --CREDITS--
 Olivier Doucet & Boris Lytochkin
diff --git a/ext/snmp/tests/snmp2_getnext.phpt b/ext/snmp/tests/snmp2_getnext.phpt
index 45701cbd132..72ce02d9456 100644
--- a/ext/snmp/tests/snmp2_getnext.phpt
+++ b/ext/snmp/tests/snmp2_getnext.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmp2_getnext
 --CREDITS--
 Olivier Doucet & Boris Lytochkin
diff --git a/ext/snmp/tests/snmp2_real_walk.phpt b/ext/snmp/tests/snmp2_real_walk.phpt
index a255a763f25..cd8897e02d7 100644
--- a/ext/snmp/tests/snmp2_real_walk.phpt
+++ b/ext/snmp/tests/snmp2_real_walk.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmp2_real_walk
 --CREDITS--
 Olivier Doucet Olivier Doucet Boris Lytochkin
diff --git a/ext/snmp/tests/snmp2_set-nomib.phpt b/ext/snmp/tests/snmp2_set-nomib.phpt
index af0baa3fdde..b62527acad7 100644
--- a/ext/snmp/tests/snmp2_set-nomib.phpt
+++ b/ext/snmp/tests/snmp2_set-nomib.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmp2_set (without MIBs loading)
 --CREDITS--
 Boris Lytockin
diff --git a/ext/snmp/tests/snmp2_set.phpt b/ext/snmp/tests/snmp2_set.phpt
index b833b9b504a..626ebdbd242 100644
--- a/ext/snmp/tests/snmp2_set.phpt
+++ b/ext/snmp/tests/snmp2_set.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmp2_set
 --CREDITS--
 Boris Lytochkin
diff --git a/ext/snmp/tests/snmp2_walk.phpt b/ext/snmp/tests/snmp2_walk.phpt
index 6d03693dac4..d5f89ad64c7 100644
--- a/ext/snmp/tests/snmp2_walk.phpt
+++ b/ext/snmp/tests/snmp2_walk.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmp2_walk
 --CREDITS--
 Olivier Doucet Olivier Doucet Boris Lytochkin
diff --git a/ext/snmp/tests/snmp3-error.phpt b/ext/snmp/tests/snmp3-error.phpt
index 3c0c4992219..2239f9fddc9 100644
--- a/ext/snmp/tests/snmp3-error.phpt
+++ b/ext/snmp/tests/snmp3-error.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 SNMPv3 Support (errors)
 --CREDITS--
 Boris Lytochkin
@@ -12,8 +12,8 @@ require_once(dirname(__FILE__).'/snmp_include.inc');
 
 echo "Checking error handling\n";
 
-//int snmp3_get(string host, string sec_name, string sec_level, string auth_protocol, 
-//              string auth_passphrase, string priv_protocol, string priv_passphrase, 
+//int snmp3_get(string host, string sec_name, string sec_level, string auth_protocol,
+//              string auth_passphrase, string priv_protocol, string priv_passphrase,
 //              string object_id [, int timeout [, int retries]]);
 
 var_dump(snmp3_get($hostname, $community, '', '', '', '', ''));
diff --git a/ext/snmp/tests/snmp3.phpt b/ext/snmp/tests/snmp3.phpt
index 49d205fc424..91eb92ea3bd 100644
--- a/ext/snmp/tests/snmp3.phpt
+++ b/ext/snmp/tests/snmp3.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 SNMPv3 Support
 --CREDITS--
 Boris Lytochkin
@@ -10,8 +10,8 @@ require_once(dirname(__FILE__).'/skipif.inc');
 <?php
 require_once(dirname(__FILE__).'/snmp_include.inc');
 
-//int snmp3_get(string host, string sec_name, string sec_level, string auth_protocol, 
-//              string auth_passphrase, string priv_protocol, string priv_passphrase, 
+//int snmp3_get(string host, string sec_name, string sec_level, string auth_protocol,
+//              string auth_passphrase, string priv_protocol, string priv_passphrase,
 //              string object_id [, int timeout [, int retries]]);
 
 echo "Working version\n";
diff --git a/ext/snmp/tests/snmp_get_quick_print.phpt b/ext/snmp/tests/snmp_get_quick_print.phpt
index 1876047d4f6..83cc574faa7 100644
--- a/ext/snmp/tests/snmp_get_quick_print.phpt
+++ b/ext/snmp/tests/snmp_get_quick_print.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmp_get_quick_print / snmp_set_quick_print
 --CREDITS--
 Olivier Doucet
diff --git a/ext/snmp/tests/snmp_get_valueretrieval.phpt b/ext/snmp/tests/snmp_get_valueretrieval.phpt
index 38937332b99..0c11c6420b4 100644
--- a/ext/snmp/tests/snmp_get_valueretrieval.phpt
+++ b/ext/snmp/tests/snmp_get_valueretrieval.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmp_get_valueretrieval / snmp_set_valueretrieval
 --CREDITS--
 Olivier Doucet
diff --git a/ext/snmp/tests/snmp_getvalue.phpt b/ext/snmp/tests/snmp_getvalue.phpt
index 178354a8cfb..7cc54287040 100644
--- a/ext/snmp/tests/snmp_getvalue.phpt
+++ b/ext/snmp/tests/snmp_getvalue.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmp_getvalue
 --CREDITS--
 Boris Lytochkin
diff --git a/ext/snmp/tests/snmp_read_mib.phpt b/ext/snmp/tests/snmp_read_mib.phpt
index 9a6d3b5e5bc..ef2edaeba16 100644
--- a/ext/snmp/tests/snmp_read_mib.phpt
+++ b/ext/snmp/tests/snmp_read_mib.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmp_read_mib
 --CREDITS--
 Olivier Doucet Olivier Doucet Boris Lytochkin
diff --git a/ext/snmp/tests/snmp_set_enum_print.phpt b/ext/snmp/tests/snmp_set_enum_print.phpt
index 97683444fe5..6f8dcce1c2d 100644
--- a/ext/snmp/tests/snmp_set_enum_print.phpt
+++ b/ext/snmp/tests/snmp_set_enum_print.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmp_set_enum_print
 --CREDITS--
 Olivier Doucet
diff --git a/ext/snmp/tests/snmp_set_oid_output_format.phpt b/ext/snmp/tests/snmp_set_oid_output_format.phpt
index 20a48d4fe12..06c2240a782 100644
--- a/ext/snmp/tests/snmp_set_oid_output_format.phpt
+++ b/ext/snmp/tests/snmp_set_oid_output_format.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmp_set_oid_output_format
 --CREDITS--
 Olivier Doucet
diff --git a/ext/snmp/tests/snmpget.phpt b/ext/snmp/tests/snmpget.phpt
index 576bef14e07..882a9e2117c 100644
--- a/ext/snmp/tests/snmpget.phpt
+++ b/ext/snmp/tests/snmpget.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmpget
 --CREDITS--
 Olivier Doucet & Boris Lytochkin
diff --git a/ext/snmp/tests/snmpgetnext.phpt b/ext/snmp/tests/snmpgetnext.phpt
index 2c868bfcd14..de5f8d8ccf1 100644
--- a/ext/snmp/tests/snmpgetnext.phpt
+++ b/ext/snmp/tests/snmpgetnext.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmpgetnext
 --CREDITS--
 Olivier Doucet & Boris Lytochkin
diff --git a/ext/snmp/tests/snmprealwalk.phpt b/ext/snmp/tests/snmprealwalk.phpt
index e3827ab1c7d..06bc4fd65fb 100644
--- a/ext/snmp/tests/snmprealwalk.phpt
+++ b/ext/snmp/tests/snmprealwalk.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmprealwalk
 --CREDITS--
 Olivier Doucet Olivier Doucet Boris Lytochkin
diff --git a/ext/snmp/tests/snmpset-nomib.phpt b/ext/snmp/tests/snmpset-nomib.phpt
index 7428e57c788..a042fe8ae02 100644
--- a/ext/snmp/tests/snmpset-nomib.phpt
+++ b/ext/snmp/tests/snmpset-nomib.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmpset (without MIBs loading)
 --CREDITS--
 Boris Lytochkin
diff --git a/ext/snmp/tests/snmpset.phpt b/ext/snmp/tests/snmpset.phpt
index 055b789d54b..8f61e022b98 100644
--- a/ext/snmp/tests/snmpset.phpt
+++ b/ext/snmp/tests/snmpset.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmpset
 --CREDITS--
 Olivier Doucet Olivier Doucet Boris Lytochkin
diff --git a/ext/snmp/tests/snmpwalk.phpt b/ext/snmp/tests/snmpwalk.phpt
index 12544eebd6e..26801f9991d 100644
--- a/ext/snmp/tests/snmpwalk.phpt
+++ b/ext/snmp/tests/snmpwalk.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Function snmpwalk
 --CREDITS--
 Olivier Doucet Olivier Doucet Boris Lytochkin
diff --git a/ext/snmp/tests/wrong_hostname.phpt b/ext/snmp/tests/wrong_hostname.phpt
index 23424764b80..29e8971e58f 100644
--- a/ext/snmp/tests/wrong_hostname.phpt
+++ b/ext/snmp/tests/wrong_hostname.phpt
@@ -1,4 +1,4 @@
---TEST--                                 
+--TEST--
 Wrong hostname
 --CREDITS--
 Boris Lytochkin
diff --git a/ext/soap/tests/bug73037.phpt b/ext/soap/tests/bug73037.phpt
index e68f6216078..4ceb694aeaf 100644
--- a/ext/soap/tests/bug73037.phpt
+++ b/ext/soap/tests/bug73037.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #73037 SoapServer reports Bad Request when gzipped, var 0
 --SKIPIF--
-<?php 
+<?php
 	require_once('skipif.inc');
 	if (!extension_loaded("zlib")) {
 		echo "skip zlib is required for this test";
@@ -92,7 +92,7 @@ Expect: 100-continue
 Content-Length: ${len}
 HDRS;
 		if ($b) {
-			$hdrs .="\nContent-Encoding: gzip";		
+			$hdrs .="\nContent-Encoding: gzip";
 		}
 		//echo "Headers sent:\n$hdrs\n\n";
 		$fp = fsockopen(PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT, $errno, $errstr, 5);
diff --git a/ext/soap/tests/bugs/bug28969.phpt b/ext/soap/tests/bugs/bug28969.phpt
index dd8c3a162c6..56c55382231 100644
--- a/ext/soap/tests/bugs/bug28969.phpt
+++ b/ext/soap/tests/bugs/bug28969.phpt
@@ -27,9 +27,9 @@ class LocalSoapClient extends SoapClient {
 
 }
 
-$x = new LocalSoapClient(NULL,array('location'=>'test://', 
+$x = new LocalSoapClient(NULL,array('location'=>'test://',
                                     'uri'=>'http://testuri.org',
-                                    'encoding'=>'ISO-8859-1')); 
+                                    'encoding'=>'ISO-8859-1'));
 var_dump($x->test());
 echo "ok\n";
 ?>
diff --git a/ext/soap/tests/bugs/bug29061.phpt b/ext/soap/tests/bugs/bug29061.phpt
index a85a7aa1ba2..0ded544b94f 100644
--- a/ext/soap/tests/bugs/bug29061.phpt
+++ b/ext/soap/tests/bugs/bug29061.phpt
@@ -6,8 +6,8 @@ Bug #29061 (soap extension segfaults)
 soap.wsdl_cache_enabled=0
 --FILE--
 <?php
-$client = new SoapClient(dirname(__FILE__)."/bug29061.wsdl", array("exceptions"=>0)); 
-$client->getQuote("ibm"); 
+$client = new SoapClient(dirname(__FILE__)."/bug29061.wsdl", array("exceptions"=>0));
+$client->getQuote("ibm");
 echo "ok\n";
 ?>
 --EXPECT--
diff --git a/ext/soap/tests/bugs/bug29109.phpt b/ext/soap/tests/bugs/bug29109.phpt
index 3b13974d073..f16b4c58518 100644
--- a/ext/soap/tests/bugs/bug29109.phpt
+++ b/ext/soap/tests/bugs/bug29109.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 $client = new SoapClient(dirname(__FILE__)."/bug29109.wsdl");
-var_dump($client->__getFunctions()); 
+var_dump($client->__getFunctions());
 ?>
 --EXPECT--
 array(1) {
diff --git a/ext/soap/tests/bugs/bug29236.phpt b/ext/soap/tests/bugs/bug29236.phpt
index 7b7628d3de7..659a8293dbd 100644
--- a/ext/soap/tests/bugs/bug29236.phpt
+++ b/ext/soap/tests/bugs/bug29236.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=1
 --FILE--
 <?php
 $client = new SoapClient(dirname(__FILE__)."/bug29236.wsdl");
-var_dump($client->__getFunctions()); 
+var_dump($client->__getFunctions());
 ?>
 --EXPECT--
 array(4) {
diff --git a/ext/soap/tests/bugs/bug29830.phpt b/ext/soap/tests/bugs/bug29830.phpt
index dc090f82cc1..adbbd7ffa55 100644
--- a/ext/soap/tests/bugs/bug29830.phpt
+++ b/ext/soap/tests/bugs/bug29830.phpt
@@ -5,13 +5,13 @@ Bug #29844 (SoapServer::setClass() should not export non-public methods)
 --FILE--
 <?php
 
-class hello_world {   
+class hello_world {
   public function hello($to) {
     return 'Hello ' . $to;
-  }    
+  }
   private function bye($to) {
     return 'Bye ' . $to;
-  }    
+  }
 }
 
 $server = new SoapServer(NULL, array("uri"=>"test://"));
diff --git a/ext/soap/tests/bugs/bug29839.phpt b/ext/soap/tests/bugs/bug29839.phpt
index 11d924ec785..8bead388fa9 100644
--- a/ext/soap/tests/bugs/bug29839.phpt
+++ b/ext/soap/tests/bugs/bug29839.phpt
@@ -29,7 +29,7 @@ class LocalSoapClient extends SoapClient {
 
 }
 
-$client = new LocalSoapClient(dirname(__FILE__)."/bug29839.wsdl", array("trace"=>1)); 
+$client = new LocalSoapClient(dirname(__FILE__)."/bug29839.wsdl", array("trace"=>1));
 $client->EchoString(array("value"=>"hello","lang"=>"en"));
 echo $client->__getLastRequest();
 echo $client->__getLastResponse();
diff --git a/ext/soap/tests/bugs/bug29844.phpt b/ext/soap/tests/bugs/bug29844.phpt
index a3006639b1a..26f1151a930 100644
--- a/ext/soap/tests/bugs/bug29844.phpt
+++ b/ext/soap/tests/bugs/bug29844.phpt
@@ -7,10 +7,10 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 
-class hello_world {   
+class hello_world {
   public function hello($to) {
     return 'Hello ' . $to;
-  }    
+  }
 }
 
 class LocalSoapClient extends SoapClient {
@@ -31,7 +31,7 @@ class LocalSoapClient extends SoapClient {
 
 }
 
-$client = new LocalSoapClient(dirname(__FILE__)."/bug29844.wsdl", array("trace"=>1)); 
+$client = new LocalSoapClient(dirname(__FILE__)."/bug29844.wsdl", array("trace"=>1));
 var_dump($client->hello('davey'));
 ?>
 --EXPECT--
diff --git a/ext/soap/tests/bugs/bug30045.phpt b/ext/soap/tests/bugs/bug30045.phpt
index 281f958202d..21889c2fd15 100644
--- a/ext/soap/tests/bugs/bug30045.phpt
+++ b/ext/soap/tests/bugs/bug30045.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #30045 (Cannot pass big integers (> 2147483647) in SOAP requests)
 --SKIPIF--
-<?php 
+<?php
   if (!extension_loaded('soap')) die('skip soap extension not available');
   if (!extension_loaded('simplexml')) die('skip simplexml extension not available');
 ?>
@@ -42,7 +42,7 @@ $soap = new LocalSoapClient(NULL, array("uri"=>"http://test-uri", "location"=>"t
 function test($type, $num) {
   global $soap;
   try {
-	  printf("  %0.0f\n    ", $num);  	
+	  printf("  %0.0f\n    ", $num);
 	  $ret = $soap->foo($type, new SoapVar($num, $type));
 	  printf("    %0.0f\n", $ret);
 	} catch (SoapFault $ex) {
@@ -127,7 +127,7 @@ test(XSD_LONG, 2147483647);
 test(XSD_LONG, 2147483648);
 test(XSD_LONG,  4294967296);
 test(XSD_LONG,  8589934592);
-test(XSD_LONG, 17179869184); 
+test(XSD_LONG, 17179869184);
 
 echo "\nunsignedLong\n";
 test(XSD_UNSIGNEDLONG,  2147483647);
diff --git a/ext/soap/tests/bugs/bug30106.phpt b/ext/soap/tests/bugs/bug30106.phpt
index 2104c6d409e..34448126230 100644
--- a/ext/soap/tests/bugs/bug30106.phpt
+++ b/ext/soap/tests/bugs/bug30106.phpt
@@ -16,7 +16,7 @@ class LocalSoapClient extends SoapClient {
   function __construct($wsdl, $options=array()) {
     parent::__construct($wsdl, $options);
     $this->server = new SoapServer($wsdl, $options);
-		$this->server->addFunction("getContinentList"); 
+		$this->server->addFunction("getContinentList");
   }
 
   function __doRequest($request, $location, $action, $version, $one_way = 0) {
diff --git a/ext/soap/tests/bugs/bug30799.phpt b/ext/soap/tests/bugs/bug30799.phpt
index fe7c8ca731c..92fd40f4520 100644
--- a/ext/soap/tests/bugs/bug30799.phpt
+++ b/ext/soap/tests/bugs/bug30799.phpt
@@ -8,7 +8,7 @@ class foo {
 	public    $a="a";
 	private   $b="b";
 	protected $c="c";
-		
+
 }
 
 $x = new SoapClient(NULL,array("location"=>"test://",
diff --git a/ext/soap/tests/bugs/bug30928.phpt b/ext/soap/tests/bugs/bug30928.phpt
index 0f473b359e8..e1fe17a3598 100644
--- a/ext/soap/tests/bugs/bug30928.phpt
+++ b/ext/soap/tests/bugs/bug30928.phpt
@@ -33,11 +33,11 @@ class LocalSoapClient extends SoapClient {
   }
 }
 
-$x = new LocalSoapClient(dirname(__FILE__)."/bug30928.wsdl", 
+$x = new LocalSoapClient(dirname(__FILE__)."/bug30928.wsdl",
                          array());
 var_dump($x->test(new foo()));
 
-$x = new LocalSoapClient(dirname(__FILE__)."/bug30928.wsdl", 
+$x = new LocalSoapClient(dirname(__FILE__)."/bug30928.wsdl",
                          array("classmap" => array('testType'=>'foo')));
 var_dump($x->test(new foo()));
 
diff --git a/ext/soap/tests/bugs/bug31695.phpt b/ext/soap/tests/bugs/bug31695.phpt
index 9def1037267..6d3fae0d253 100644
--- a/ext/soap/tests/bugs/bug31695.phpt
+++ b/ext/soap/tests/bugs/bug31695.phpt
@@ -14,7 +14,7 @@ class LocalSoapClient extends SoapClient {
   function __construct($wsdl, $options=array()) {
     parent::__construct($wsdl, $options);
     $this->server = new SoapServer($wsdl, $options);
-		$this->server->addFunction("Test"); 
+		$this->server->addFunction("Test");
   }
 
   function __doRequest($request, $location, $action, $version, $one_way = 0) {
@@ -31,7 +31,7 @@ $client = new LocalSoapClient(dirname(__FILE__)."/bug31695.wsdl");
 $client->Test("str");
 $client = new LocalSoapClient(dirname(__FILE__)."/bug31695.wsdl", array("location"=>"test://1"));
 $client->Test("str");
-$client->__soapCall("Test", 
+$client->__soapCall("Test",
                     array("arg1"),
                      array("location"=>"test://2"));
 $old = $client->__setLocation("test://3");
diff --git a/ext/soap/tests/bugs/bug32776.phpt b/ext/soap/tests/bugs/bug32776.phpt
index 6dc94661ae8..ae863bd3393 100644
--- a/ext/soap/tests/bugs/bug32776.phpt
+++ b/ext/soap/tests/bugs/bug32776.phpt
@@ -32,7 +32,7 @@ class LocalSoapClient extends SoapClient {
 
 }
 
-$x = new LocalSoapClient(dirname(__FILE__)."/bug32776.wsdl",array("trace"=>true,"exceptions"=>false)); 
+$x = new LocalSoapClient(dirname(__FILE__)."/bug32776.wsdl",array("trace"=>true,"exceptions"=>false));
 var_dump($x->test("Hello"));
 var_dump($d);
 var_dump($x->__getLastRequest());
diff --git a/ext/soap/tests/bugs/bug34453.phpt b/ext/soap/tests/bugs/bug34453.phpt
index 0f9543b7156..0a9dd80179c 100644
--- a/ext/soap/tests/bugs/bug34453.phpt
+++ b/ext/soap/tests/bugs/bug34453.phpt
@@ -29,7 +29,7 @@ class LocalSoapClient extends SoapClient {
 
 }
 
-$client = new LocalSoapClient(dirname(__FILE__)."/bug34453.wsdl", array("trace"=>1)); 
+$client = new LocalSoapClient(dirname(__FILE__)."/bug34453.wsdl", array("trace"=>1));
 $client->EchoString(array("value"=>"hello","lang"=>"en"));
 echo $client->__getLastRequest();
 echo $client->__getLastResponse();
diff --git a/ext/soap/tests/bugs/bug34657.phpt b/ext/soap/tests/bugs/bug34657.phpt
index 9b67ec69ad8..f7d0ea89ee2 100644
--- a/ext/soap/tests/bugs/bug34657.phpt
+++ b/ext/soap/tests/bugs/bug34657.phpt
@@ -1,12 +1,12 @@
 --TEST--
 Bug #34657 (If you get a communication problem when loading the WSDL, it fatal's)
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 if (extension_loaded("openssl")) {
-	/* 
-	 when openssl loaded, tcp stream is less verbose, so some error messages are missing 
-	 so let's skip the test in this case  
+	/*
+	 when openssl loaded, tcp stream is less verbose, so some error messages are missing
+	 so let's skip the test in this case
 	 */
 	die("skip OpenSSL extension required");
 }
diff --git a/ext/soap/tests/bugs/bug35142.phpt b/ext/soap/tests/bugs/bug35142.phpt
index 94c1aa954b7..2e523030a96 100644
--- a/ext/soap/tests/bugs/bug35142.phpt
+++ b/ext/soap/tests/bugs/bug35142.phpt
@@ -32,7 +32,7 @@ class TestSoapClient extends SoapClient {
 
 }
 
-$soapClient = new TestSoapClient($wsdl, 
+$soapClient = new TestSoapClient($wsdl,
 	array('trace' => 1, 'exceptions' => 0,
 		'classmap' => array('logOnEvent' => 'LogOnEvent',
 			'logOffEvent' => 'LogOffEvent',
diff --git a/ext/soap/tests/bugs/bug36226.phpt b/ext/soap/tests/bugs/bug36226.phpt
index 8c01c5b5d3f..1e398c0c2cd 100644
--- a/ext/soap/tests/bugs/bug36226.phpt
+++ b/ext/soap/tests/bugs/bug36226.phpt
@@ -32,7 +32,7 @@ class TestSoapClient extends SoapClient {
 
 }
 
-$soapClient = new TestSoapClient($wsdl, 
+$soapClient = new TestSoapClient($wsdl,
 	array('trace' => 1, 'exceptions' => 0,
 		'classmap' => array('logOnEvent' => 'LogOnEvent',
 			'logOffEvent' => 'LogOffEvent',
diff --git a/ext/soap/tests/bugs/bug36908.phpt b/ext/soap/tests/bugs/bug36908.phpt
index cd0ea8b2e50..2d2a46410c3 100644
--- a/ext/soap/tests/bugs/bug36908.phpt
+++ b/ext/soap/tests/bugs/bug36908.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #36908 (wsdl default value overrides value in soap request)
 --SKIPIF--
-<?php 
+<?php
   if (!extension_loaded('soap')) die('skip soap extension not available');
 ?>
 --INI--
diff --git a/ext/soap/tests/bugs/bug36999.phpt b/ext/soap/tests/bugs/bug36999.phpt
index 9fbb032d8f7..eed02ecf0bd 100644
--- a/ext/soap/tests/bugs/bug36999.phpt
+++ b/ext/soap/tests/bugs/bug36999.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #36999 (xsd:long values clamped to LONG_MAX instead of using double)
 --SKIPIF--
-<?php 
+<?php
   if (!extension_loaded('soap')) die('skip soap extension not available');
 ?>
 --INI--
diff --git a/ext/soap/tests/bugs/bug37013.phpt b/ext/soap/tests/bugs/bug37013.phpt
index 45f314293b7..7c0546ba2d6 100644
--- a/ext/soap/tests/bugs/bug37013.phpt
+++ b/ext/soap/tests/bugs/bug37013.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #37013 (server hangs when returning circular object references)
 --SKIPIF--
-<?php 
+<?php
   if (!extension_loaded('soap')) die('skip soap extension not available');
 ?>
 --INI--
diff --git a/ext/soap/tests/bugs/bug38005.phpt b/ext/soap/tests/bugs/bug38005.phpt
index 219696c263e..65578672777 100644
--- a/ext/soap/tests/bugs/bug38005.phpt
+++ b/ext/soap/tests/bugs/bug38005.phpt
@@ -31,7 +31,7 @@ $client = new TestSoapClient(NULL, array(
 	'uri' => "test://",
 	'location' => "test://",
 	'soap_version'=>SOAP_1_2,
-	'trace'=>1, 
+	'trace'=>1,
 	'exceptions'=>0));
 $res = $client->Test();
 echo($res->faultstring."\n");
diff --git a/ext/soap/tests/bugs/bug39815.phpt b/ext/soap/tests/bugs/bug39815.phpt
index 1adc50a2def..b1c031c9289 100644
--- a/ext/soap/tests/bugs/bug39815.phpt
+++ b/ext/soap/tests/bugs/bug39815.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Bug #39815 (to_zval_double() in ext/soap/php_encoding.c is not locale-independent)
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
-if (!function_exists('setlocale')) die('skip setlocale() not available'); 
+<?php
+require_once('skipif.inc');
+if (!function_exists('setlocale')) die('skip setlocale() not available');
 if (!@setlocale(LC_ALL, 'sv_SE', 'sv_SE.ISO8859-1')) die('skip sv_SE locale not available');
 if (!@setlocale(LC_ALL, 'en_US', 'en_US.ISO8859-1')) die('skip en_US locale not available');
 ?>
@@ -32,9 +32,9 @@ class LocalSoapClient extends SoapClient {
   }
 
 }
-$x = new LocalSoapClient(NULL,array('location'=>'test://', 
+$x = new LocalSoapClient(NULL,array('location'=>'test://',
                                    'uri'=>'http://testuri.org',
-                                   "trace"=>1)); 
+                                   "trace"=>1));
 setlocale(LC_ALL,"sv_SE","sv_SE.ISO8859-1");
 var_dump($x->test());
 echo $x->__getLastResponse();
diff --git a/ext/soap/tests/bugs/bug41004.phpt b/ext/soap/tests/bugs/bug41004.phpt
index 992c6b708dd..87ab88598ed 100644
--- a/ext/soap/tests/bugs/bug41004.phpt
+++ b/ext/soap/tests/bugs/bug41004.phpt
@@ -9,7 +9,7 @@ ini_set('soap.wsdl_cache_enabled', false);
 class EchoBean{
 	public $mandatoryElement;
 	public $optionalElement;
-	
+
 }
 
 class EchoRequest{
diff --git a/ext/soap/tests/bugs/bug42086.phpt b/ext/soap/tests/bugs/bug42086.phpt
index 6edc06f8793..35e5ef0e076 100644
--- a/ext/soap/tests/bugs/bug42086.phpt
+++ b/ext/soap/tests/bugs/bug42086.phpt
@@ -20,7 +20,7 @@ function firstFunctionWithoutParam() {
 	$ret->param	=	"firstFunctionWithoutParam";
 	return $ret;
 }
-	
+
 $server = new SoapServer(dirname(__FILE__).'/bug42086.wsdl',
 	array('features'=>SOAP_SINGLE_ELEMENT_ARRAYS));
 $server->addFunction('firstFunctionWithoutParam');
diff --git a/ext/soap/tests/bugs/bug42183.phpt b/ext/soap/tests/bugs/bug42183.phpt
index d34311f26ce..043487c9645 100644
--- a/ext/soap/tests/bugs/bug42183.phpt
+++ b/ext/soap/tests/bugs/bug42183.phpt
@@ -16,7 +16,7 @@ function test() {
 	return new PHPObject();
 }
 
-$server = new SoapServer(NULL, array('uri' => 'http://ws.sit.com', 
+$server = new SoapServer(NULL, array('uri' => 'http://ws.sit.com',
 	'classmap' => array('Object' => 'PHPObject')));
 $server->addFunction("test");
 ob_start();
diff --git a/ext/soap/tests/bugs/bug42326.phpt b/ext/soap/tests/bugs/bug42326.phpt
index 2e6c7c35010..a1d8d59fc0d 100644
--- a/ext/soap/tests/bugs/bug42326.phpt
+++ b/ext/soap/tests/bugs/bug42326.phpt
@@ -28,7 +28,7 @@ class SOAP_GetProductsResponse {
     public $products;
     function __construct(){
         $this->products = new SOAP_productDetailsType();
-        
+
     }
 }
 
diff --git a/ext/soap/tests/bugs/bug43045.phpt b/ext/soap/tests/bugs/bug43045.phpt
index a32acfe0ead..f4f3983800a 100644
--- a/ext/soap/tests/bugs/bug43045.phpt
+++ b/ext/soap/tests/bugs/bug43045.phpt
@@ -39,7 +39,7 @@ $client = new TestSoapClient(NULL, array(
 			"location" => "test://",
 			"uri"      => 'urn:TestSOAP',
 			"style"    => SOAP_RPC,
-			"use"      => SOAP_ENCODED                        
+			"use"      => SOAP_ENCODED
 			));
 var_dump($client->test(0.1));
 var_dump($client->test(NAN));
diff --git a/ext/soap/tests/bugs/bug46419.phpt b/ext/soap/tests/bugs/bug46419.phpt
index cb113e28d2e..d5f9751ed54 100644
--- a/ext/soap/tests/bugs/bug46419.phpt
+++ b/ext/soap/tests/bugs/bug46419.phpt
@@ -26,8 +26,8 @@ class LocalSoapClient extends SoapClient {
 
 }
 
-$x = new LocalSoapClient(NULL,array('location'=>'test://', 
-                                   'uri'=>'http://testuri.org')); 
+$x = new LocalSoapClient(NULL,array('location'=>'test://',
+                                   'uri'=>'http://testuri.org'));
 var_dump($x->bar());
 ?>
 --EXPECT--
diff --git a/ext/soap/tests/bugs/bug47273.phpt b/ext/soap/tests/bugs/bug47273.phpt
index 1cfb0f3cd96..85abf432da0 100644
--- a/ext/soap/tests/bugs/bug47273.phpt
+++ b/ext/soap/tests/bugs/bug47273.phpt
@@ -19,7 +19,7 @@ class SoapFaultTest
     	//  Test #1
         return 'Test #1 exception with some special chars: Äßö';
     }
-    public function test2() {    
+    public function test2() {
         //  Test #2
 	//throw new SoapFault('Server', 'Test #2 exception with some special chars: Äßö');
         throw new Exception('Test #2 exception with some special chars: Äßö');
diff --git a/ext/soap/tests/bugs/bug50698_2.phpt b/ext/soap/tests/bugs/bug50698_2.phpt
index 7ff667423ce..79bbb3bd807 100644
--- a/ext/soap/tests/bugs/bug50698_2.phpt
+++ b/ext/soap/tests/bugs/bug50698_2.phpt
@@ -15,7 +15,7 @@ try {
     } else {
         echo "Call: \"new SoapClient(dirname(__FILE__).'/bug50698_2.wsdl');\" threw a SoapFault with an incorrect faultcode or faultmessage.";
         print_r($e);
-    }    
+    }
 }
 ?>
 --EXPECT--
diff --git a/ext/soap/tests/bugs/bug50698_3.phpt b/ext/soap/tests/bugs/bug50698_3.phpt
index 6cee6a67ec4..341a4afb975 100644
--- a/ext/soap/tests/bugs/bug50698_3.phpt
+++ b/ext/soap/tests/bugs/bug50698_3.phpt
@@ -15,7 +15,7 @@ try {
     } else {
         echo "Call: \"new SoapClient(dirname(__FILE__).'/bug50698_3.wsdl');\" threw a SoapFault with an incorrect faultcode or faultmessage.";
         print_r($e);
-    }    
+    }
 }
 ?>
 --EXPECT--
diff --git a/ext/soap/tests/bugs/bug54911.phpt b/ext/soap/tests/bugs/bug54911.phpt
index 6913925f8ad..1cc4faf959b 100644
--- a/ext/soap/tests/bugs/bug54911.phpt
+++ b/ext/soap/tests/bugs/bug54911.phpt
@@ -7,8 +7,8 @@ Bug #54911 (Access to a undefined member in inherit SoapClient may cause Segment
     class XSoapClient extends SoapClient {
         function __doRequest($request, $location, $action, $version, $one_way=false) {
             echo self::$crash;
-        }   
-    }   
+        }
+    }
     $client = new XSoapClient(null, array('uri'=>'', 'location'=>''));
     $client->__soapCall('', array());
 ?>
diff --git a/ext/soap/tests/bugs/multiport.phpt b/ext/soap/tests/bugs/multiport.phpt
index 0b5e944514c..90799cf4920 100644
--- a/ext/soap/tests/bugs/multiport.phpt
+++ b/ext/soap/tests/bugs/multiport.phpt
@@ -6,7 +6,7 @@ Proper binding selection
 soap.wsdl_cache_enabled=0
 --FILE--
 <?php
-$client = new SoapClient(dirname(__FILE__).'/multiport.wsdl', 
+$client = new SoapClient(dirname(__FILE__).'/multiport.wsdl',
 	array('trace' => true, 'exceptions' => false));
 $response = $client->GetSessionId(array('userId'=>'user', 'password'=>'password'));
 echo $client->__getLastRequest();
diff --git a/ext/soap/tests/classmap001.phpt b/ext/soap/tests/classmap001.phpt
index 247a1ded7f9..7699aab2bc6 100644
--- a/ext/soap/tests/classmap001.phpt
+++ b/ext/soap/tests/classmap001.phpt
@@ -22,19 +22,19 @@ $GLOBALS['HTTP_RAW_POST_DATA']="
 </dotest>
  </env:Body>
 <env:Header/>
-</env:Envelope>";	
+</env:Envelope>";
 
 class test{
 	function dotest(book $book){
 		$classname=get_class($book);
 		return "Classname: ".$classname;
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 $options=Array(
 		'actor' =>'http://schema.nothing.com',
diff --git a/ext/soap/tests/classmap002.phpt b/ext/soap/tests/classmap002.phpt
index d79deb6d391..cbd74f2f746 100644
--- a/ext/soap/tests/classmap002.phpt
+++ b/ext/soap/tests/classmap002.phpt
@@ -17,13 +17,13 @@ class TestSoapClient extends SoapClient{
 </res>
 </ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
 EOF;
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 
 $options=Array(
diff --git a/ext/soap/tests/classmap003.phpt b/ext/soap/tests/classmap003.phpt
index 4d0118fef43..2f49bb4e344 100644
--- a/ext/soap/tests/classmap003.phpt
+++ b/ext/soap/tests/classmap003.phpt
@@ -14,7 +14,7 @@ class A {
 }
 
 class B extends A {
-  public $y; 
+  public $y;
   function __construct($a){
     parent::__construct($a);
     $this->y = $a + 1;
diff --git a/ext/soap/tests/schema/schema064.phpt b/ext/soap/tests/schema/schema064.phpt
index 899a2938fa8..913cbd16e05 100644
--- a/ext/soap/tests/schema/schema064.phpt
+++ b/ext/soap/tests/schema/schema064.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SOAP XML Schema 64: standard date/time types
 --SKIPIF--
-<?php 
+<?php
 if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
 	die('skip, windows has different TZ format');
 }
diff --git a/ext/soap/tests/server019.phpt b/ext/soap/tests/server019.phpt
index d36cff0887e..132b4dc1a50 100644
--- a/ext/soap/tests/server019.phpt
+++ b/ext/soap/tests/server019.phpt
@@ -1,9 +1,9 @@
 --TEST--
 SOAP Server 19: compressed request (gzip)
 --SKIPIF--
-<?php 
+<?php
 	if (php_sapi_name()=='cli') echo 'skip';
-	require_once('skipif.inc'); 
+	require_once('skipif.inc');
 	if (!extension_loaded('zlib')) die('skip zlib extension not available');
 ?>
 --INI--
diff --git a/ext/soap/tests/server020.phpt b/ext/soap/tests/server020.phpt
index b14978fd31f..69eb4f097b5 100644
--- a/ext/soap/tests/server020.phpt
+++ b/ext/soap/tests/server020.phpt
@@ -1,9 +1,9 @@
 --TEST--
 SOAP Server 20: compressed request (deflate)
 --SKIPIF--
-<?php 
+<?php
 	if (php_sapi_name()=='cli') echo 'skip';
-	require_once('skipif.inc'); 
+	require_once('skipif.inc');
 	if (!extension_loaded('zlib')) die('skip zlib extension not available');
 ?>
 --INI--
diff --git a/ext/soap/tests/server029.phpt b/ext/soap/tests/server029.phpt
index 26db9fd9cc1..b65b23fd063 100644
--- a/ext/soap/tests/server029.phpt
+++ b/ext/soap/tests/server029.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SOAP Server 29-CGI: new/addfunction/handle 
+SOAP Server 29-CGI: new/addfunction/handle
 --POST--
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <SOAP-ENV:Envelope
@@ -13,9 +13,9 @@ SOAP Server 29-CGI: new/addfunction/handle
   </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>
 --SKIPIF--
-<?php 
+<?php
 	if (php_sapi_name()=='cli') echo 'skip';
-	require_once('skipif.inc'); 
+	require_once('skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/ext/soap/tests/transport001.phpt b/ext/soap/tests/transport001.phpt
index 9ab0d3d9d18..a2733bd5dc3 100644
--- a/ext/soap/tests/transport001.phpt
+++ b/ext/soap/tests/transport001.phpt
@@ -26,8 +26,8 @@ class LocalSoapClient extends SoapClient {
 
 }
 
-$x = new LocalSoapClient(NULL,array('location'=>'test://', 
-                                   'uri'=>'http://testuri.org')); 
+$x = new LocalSoapClient(NULL,array('location'=>'test://',
+                                   'uri'=>'http://testuri.org'));
 var_dump($x->Add(3,4));
 echo "ok\n";
 ?>
diff --git a/ext/soap/tests/typemap001.phpt b/ext/soap/tests/typemap001.phpt
index b5ed31da857..3268c694ae4 100644
--- a/ext/soap/tests/typemap001.phpt
+++ b/ext/soap/tests/typemap001.phpt
@@ -23,7 +23,7 @@ $GLOBALS['HTTP_RAW_POST_DATA']="
 </ns1:dotest>
  </env:Body>
 <env:Header/>
-</env:Envelope>";	
+</env:Envelope>";
 
 function book_from_xml($xml) {
 	$sxe = simplexml_load_string($xml);
@@ -37,13 +37,13 @@ class test{
 	function dotest($book){
 		$classname=get_class($book);
 		return "Object: ".$classname. "(".$book->a.",".$book->b.")";
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 $options=Array(
 		'actor'   =>'http://schemas.nothing.com',
diff --git a/ext/soap/tests/typemap002.phpt b/ext/soap/tests/typemap002.phpt
index ceb00f1a191..41bbc1505e5 100644
--- a/ext/soap/tests/typemap002.phpt
+++ b/ext/soap/tests/typemap002.phpt
@@ -19,7 +19,7 @@ $GLOBALS['HTTP_RAW_POST_DATA']="
 </ns1:dotest2>
  </env:Body>
 <env:Header/>
-</env:Envelope>";	
+</env:Envelope>";
 
 function book_to_xml($book) {
 	return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>';
@@ -31,13 +31,13 @@ class test{
 		$book->a = "foo";
 		$book->b = "bar";
 		return $book;
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 
 $options=Array(
diff --git a/ext/soap/tests/typemap003.phpt b/ext/soap/tests/typemap003.phpt
index 63bb76cbcf3..85a63693132 100644
--- a/ext/soap/tests/typemap003.phpt
+++ b/ext/soap/tests/typemap003.phpt
@@ -18,13 +18,13 @@ class TestSoapClient extends SoapClient{
 </res>
 </ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
 EOF;
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 
 function book_from_xml($xml) {
diff --git a/ext/soap/tests/typemap004.phpt b/ext/soap/tests/typemap004.phpt
index 4fe15f7f9f2..ffd24c6a38c 100644
--- a/ext/soap/tests/typemap004.phpt
+++ b/ext/soap/tests/typemap004.phpt
@@ -10,13 +10,13 @@ class TestSoapClient extends SoapClient{
   function __doRequest($request, $location, $action, $version, $one_way = 0) {
   		echo $request;
   		exit;
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 
 function book_to_xml($book) {
diff --git a/ext/soap/tests/typemap005.phpt b/ext/soap/tests/typemap005.phpt
index 369d026b5ae..5a8319fab7e 100644
--- a/ext/soap/tests/typemap005.phpt
+++ b/ext/soap/tests/typemap005.phpt
@@ -23,7 +23,7 @@ $GLOBALS['HTTP_RAW_POST_DATA']="
 </ns1:dotest>
  </env:Body>
 <env:Header/>
-</env:Envelope>";	
+</env:Envelope>";
 
 function book_from_xml($xml) {
 	$sxe = simplexml_load_string($xml);
@@ -37,13 +37,13 @@ class test{
 	function dotest($book){
 		$classname=get_class($book);
 		return "Object: ".$classname. "(".$book->a.",".$book->b.")";
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 $options=Array(
 		'uri'     => "http://schemas.nothing.com",
diff --git a/ext/soap/tests/typemap006.phpt b/ext/soap/tests/typemap006.phpt
index 7ecf410ad83..9de9e245d2f 100644
--- a/ext/soap/tests/typemap006.phpt
+++ b/ext/soap/tests/typemap006.phpt
@@ -19,7 +19,7 @@ $GLOBALS['HTTP_RAW_POST_DATA']="
 </ns1:dotest2>
  </env:Body>
 <env:Header/>
-</env:Envelope>";	
+</env:Envelope>";
 
 function book_to_xml($book) {
 	return '<book xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>';
@@ -31,13 +31,13 @@ class test{
 		$book->a = "foo";
 		$book->b = "bar";
 		return new SoapVar($book, null, "book", "http://schemas.nothing.com");
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 
 $options=Array(
diff --git a/ext/soap/tests/typemap007.phpt b/ext/soap/tests/typemap007.phpt
index b3451f1daec..1dd2becb61a 100644
--- a/ext/soap/tests/typemap007.phpt
+++ b/ext/soap/tests/typemap007.phpt
@@ -18,13 +18,13 @@ class TestSoapClient extends SoapClient{
 </res>
 </ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
 EOF;
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 
 function book_from_xml($xml) {
diff --git a/ext/soap/tests/typemap008.phpt b/ext/soap/tests/typemap008.phpt
index 192f6dc0d26..4ba1fb5befb 100644
--- a/ext/soap/tests/typemap008.phpt
+++ b/ext/soap/tests/typemap008.phpt
@@ -10,13 +10,13 @@ class TestSoapClient extends SoapClient{
   function __doRequest($request, $location, $action, $version, $one_way = 0) {
   		echo $request;
   		exit;
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 
 function book_to_xml($book) {
diff --git a/ext/soap/tests/typemap009.phpt b/ext/soap/tests/typemap009.phpt
index ec5c38da2bc..7c7cd6fee71 100644
--- a/ext/soap/tests/typemap009.phpt
+++ b/ext/soap/tests/typemap009.phpt
@@ -22,7 +22,7 @@ $GLOBALS['HTTP_RAW_POST_DATA']="
 </ns1:dotest>
  </env:Body>
 <env:Header/>
-</env:Envelope>";	
+</env:Envelope>";
 
 function book_from_xml($xml) {
 	throw new SoapFault("Server", "Conversion Failed");
@@ -32,13 +32,13 @@ class test{
 	function dotest($book){
 		$classname=get_class($book);
 		return "Object: ".$classname. "(".$book->a.",".$book->b.")";
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 $options=Array(
 		'actor'   =>'http://schemas.nothing.com',
diff --git a/ext/soap/tests/typemap010.phpt b/ext/soap/tests/typemap010.phpt
index 4eba6345cbb..0d27ba49363 100644
--- a/ext/soap/tests/typemap010.phpt
+++ b/ext/soap/tests/typemap010.phpt
@@ -19,7 +19,7 @@ $GLOBALS['HTTP_RAW_POST_DATA']="
 </ns1:dotest2>
  </env:Body>
 <env:Header/>
-</env:Envelope>";	
+</env:Envelope>";
 
 function book_to_xml($book) {
 	throw new SoapFault("Server", "Conversion Fault");
@@ -31,13 +31,13 @@ class test{
 		$book->a = "foo";
 		$book->b = "bar";
 		return $book;
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 
 $options=Array(
diff --git a/ext/soap/tests/typemap011.phpt b/ext/soap/tests/typemap011.phpt
index 1e2addceeca..7d89b71e064 100644
--- a/ext/soap/tests/typemap011.phpt
+++ b/ext/soap/tests/typemap011.phpt
@@ -17,13 +17,13 @@ class TestSoapClient extends SoapClient{
 </res>
 </ns1:dotest2Response></SOAP-ENV:Body></SOAP-ENV:Envelope>
 EOF;
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 
 function book_from_xml($xml) {
diff --git a/ext/soap/tests/typemap012.phpt b/ext/soap/tests/typemap012.phpt
index 847957a9821..79e23190855 100644
--- a/ext/soap/tests/typemap012.phpt
+++ b/ext/soap/tests/typemap012.phpt
@@ -10,13 +10,13 @@ class TestSoapClient extends SoapClient{
   function __doRequest($request, $location, $action, $version, $one_way = 0) {
   		echo $request;
   		exit;
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 
 function book_to_xml($book) {
diff --git a/ext/soap/tests/typemap013.phpt b/ext/soap/tests/typemap013.phpt
index d873eb4d18d..4ebeac71d84 100644
--- a/ext/soap/tests/typemap013.phpt
+++ b/ext/soap/tests/typemap013.phpt
@@ -19,7 +19,7 @@ $GLOBALS['HTTP_RAW_POST_DATA']="
 </ns1:dotest2>
  </env:Body>
 <env:Header/>
-</env:Envelope>";	
+</env:Envelope>";
 
 function book_to_xml($book) {
 	return '<book xmlns="http://schemas.nothing.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><a xsi:type="xsd:string">'.$book->a.'!</a><b xsi:type="xsd:string">'.$book->b.'!</b></book>';
@@ -31,13 +31,13 @@ class test{
 		$book->a = "foo";
 		$book->b = "bar";
 		return $book;
-	}	
+	}
 }
 
 class book{
 	public $a="a";
 	public $b="c";
-		
+
 }
 
 $options=Array(
diff --git a/ext/sockets/tests/ipv4loop.phpt b/ext/sockets/tests/ipv4loop.phpt
index 920b27b66e3..4fed237b205 100644
--- a/ext/sockets/tests/ipv4loop.phpt
+++ b/ext/sockets/tests/ipv4loop.phpt
@@ -26,7 +26,7 @@ IPv4 Loopback test
 	if (!socket_listen($server, 2)) {
 		die('Unable to listen on socket');
 	}
-	
+
 	/* Connect to it */
 	$client = socket_create(AF_INET, SOCK_STREAM, getprotobyname('tcp'));
 	if (!$client) {
diff --git a/ext/sockets/tests/ipv6loop.phpt b/ext/sockets/tests/ipv6loop.phpt
index 4720cb49e40..307f61f0823 100644
--- a/ext/sockets/tests/ipv6loop.phpt
+++ b/ext/sockets/tests/ipv6loop.phpt
@@ -27,7 +27,7 @@ IPv6 Loopback test
 	if (!socket_listen($server, 2)) {
 		die('Unable to listen on socket');
 	}
-	
+
 	/* Connect to it */
 	$client = socket_create(AF_INET6, SOCK_STREAM, getprotobyname('tcp'));
 	if (!$client) {
diff --git a/ext/sockets/tests/socket_accept-wrongparams.phpt b/ext/sockets/tests/socket_accept-wrongparams.phpt
index 6bce05a78bf..644690d61c4 100644
--- a/ext/sockets/tests/socket_accept-wrongparams.phpt
+++ b/ext/sockets/tests/socket_accept-wrongparams.phpt
@@ -10,7 +10,7 @@ if (!extension_loaded('sockets')) {
 var_dump(socket_accept(null));
 --CREDITS--
 Till Klampaeckel, till@php.net
-Berlin TestFest 2009 
+Berlin TestFest 2009
 --EXPECTF--
 Warning: socket_accept() expects parameter 1 to be resource, null given in %s on line %d
 NULL
diff --git a/ext/sockets/tests/socket_bind.phpt b/ext/sockets/tests/socket_bind.phpt
index 7ea2df8e1c2..82ee1d1be3d 100644
--- a/ext/sockets/tests/socket_bind.phpt
+++ b/ext/sockets/tests/socket_bind.phpt
@@ -18,11 +18,11 @@ fa@php.net
     $s_c     = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
     $s_bind  = socket_bind($s_c, '0.0.0.0', 31330+$rand);
     var_dump($s_bind);
-    
+
     // Connect to destination address
     $s_conn  = socket_connect($s_c, 'www.php.net', 80);
     var_dump($s_conn);
-    
+
     // Write
     $request = 'GET / HTTP/1.1' . "\r\n";
     $s_write = socket_write($s_c, $request);
diff --git a/ext/sockets/tests/socket_bind_params.phpt b/ext/sockets/tests/socket_bind_params.phpt
index d68a62a4741..a6b122d0e8c 100644
--- a/ext/sockets/tests/socket_bind_params.phpt
+++ b/ext/sockets/tests/socket_bind_params.phpt
@@ -16,7 +16,7 @@ fa@php.net
     $s_w = socket_bind();
     var_dump($s_w);
     $s_w = socket_bind($s_c);
-    var_dump($s_w);    
+    var_dump($s_w);
     socket_close($s_c);
 
 ?>
diff --git a/ext/sockets/tests/socket_close_params.phpt b/ext/sockets/tests/socket_close_params.phpt
index a00330f5e57..9fe5d24eadb 100644
--- a/ext/sockets/tests/socket_close_params.phpt
+++ b/ext/sockets/tests/socket_close_params.phpt
@@ -13,7 +13,7 @@ fa@php.net
 <?php
     // wrong parameter count
     $s_c = socket_close();
-    var_dump($s_c);  
+    var_dump($s_c);
 ?>
 --EXPECTF--
 
diff --git a/ext/sockets/tests/socket_connect_error.phpt b/ext/sockets/tests/socket_connect_error.phpt
index 483763aed3f..99fa9f511f3 100644
--- a/ext/sockets/tests/socket_connect_error.phpt
+++ b/ext/sockets/tests/socket_connect_error.phpt
@@ -16,13 +16,13 @@ display_errors=1
 <?php
   // Test with no arguments
   $server = socket_create();
-  
+
   // Test with less arguments than required
   $server = socket_create(SOCK_STREAM, getprotobyname('tcp'));
-  
+
   // Test with non integer parameters
   $server = socket_create(array(), 1, 1);
-  
+
 ?>
 --EXPECTF--
 Warning: socket_create() expects exactly 3 parameters, 0 given in %s on line %d
diff --git a/ext/sockets/tests/socket_connect_params.phpt b/ext/sockets/tests/socket_connect_params.phpt
index 44f0ffdf51d..8ab55793074 100644
--- a/ext/sockets/tests/socket_connect_params.phpt
+++ b/ext/sockets/tests/socket_connect_params.phpt
@@ -11,14 +11,14 @@ fa@php.net
 ?>
 --FILE--
 <?php
-    $rand = rand(1,999); 
+    $rand = rand(1,999);
     $s_c = socket_create_listen(31330+$rand);
     // wrong parameter count
     $s_w = socket_connect();
     $s_w = socket_connect($s_c);
     $s_w = socket_connect($s_c, '0.0.0.0');
     $s_w = socket_connect($s_c, '0.0.0.0', 31330+$rand);
-    
+
     socket_close($s_c);
 
 ?>
diff --git a/ext/sockets/tests/socket_create_listen-win32.phpt b/ext/sockets/tests/socket_create_listen-win32.phpt
index 23bf963c5f7..f7306262f42 100644
--- a/ext/sockets/tests/socket_create_listen-win32.phpt
+++ b/ext/sockets/tests/socket_create_listen-win32.phpt
@@ -11,7 +11,7 @@ if (!extension_loaded('sockets')) {
 --FILE--
 <?php
 $sock = socket_create_listen(31338);
-socket_getsockname($sock, $addr, $port); 
+socket_getsockname($sock, $addr, $port);
 var_dump($addr, $port);
 --EXPECT--
 string(9) "127.0.0.1"
diff --git a/ext/sockets/tests/socket_create_listen.phpt b/ext/sockets/tests/socket_create_listen.phpt
index 76f29425877..7083b0a1b9a 100644
--- a/ext/sockets/tests/socket_create_listen.phpt
+++ b/ext/sockets/tests/socket_create_listen.phpt
@@ -11,7 +11,7 @@ if (!extension_loaded('sockets')) {
 --FILE--
 <?php
 $sock = socket_create_listen(31338);
-socket_getsockname($sock, $addr, $port); 
+socket_getsockname($sock, $addr, $port);
 var_dump($addr, $port);
 --EXPECT--
 string(7) "0.0.0.0"
diff --git a/ext/sockets/tests/socket_getpeername.phpt b/ext/sockets/tests/socket_getpeername.phpt
index 280fa2a1aa5..868f4c2d42e 100644
--- a/ext/sockets/tests/socket_getpeername.phpt
+++ b/ext/sockets/tests/socket_getpeername.phpt
@@ -15,7 +15,7 @@ fa@php.net
     $s_c     = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
     $s_bind  = socket_bind($s_c, '0.0.0.0', 31330+$rand);
     var_dump($s_bind);
-    
+
     // Connect to destination address
     $s_peer  = socket_getpeername($s_c, $ip, $port);
     var_dump($s_peer);
diff --git a/ext/sockets/tests/socket_getpeername_ipv4loop.phpt b/ext/sockets/tests/socket_getpeername_ipv4loop.phpt
index b948e0e7f4a..4cedc0f7dbc 100644
--- a/ext/sockets/tests/socket_getpeername_ipv4loop.phpt
+++ b/ext/sockets/tests/socket_getpeername_ipv4loop.phpt
@@ -4,13 +4,13 @@ ext/sockets - socket_getpeername_ipv4loop - basic test
 # TestFest 2009 - NorwayUG
 # $Id: socket_getpeername_ipv4loop.phpt 494 2009-06-09 20:38:05Z tatjana.andersen@redpill-linpro.com $
 --SKIPIF--
-<?php   
+<?php
         if (!extension_loaded('sockets')) {
                 die('skip sockets extension not available.');
         }
 ?>
 --FILE--
-<?php   
+<?php
 	/* Bind and connect sockets to localhost */
 	$localhost = '127.0.0.1';
 
diff --git a/ext/sockets/tests/socket_getpeername_ipv6loop.phpt b/ext/sockets/tests/socket_getpeername_ipv6loop.phpt
index 5d03e32ce00..86662fdee03 100644
--- a/ext/sockets/tests/socket_getpeername_ipv6loop.phpt
+++ b/ext/sockets/tests/socket_getpeername_ipv6loop.phpt
@@ -4,14 +4,14 @@ ext/sockets - socket_getpeername_ipv6loop - basic test
 # TestFest 2009 - NorwayUG
 # $Id: socket_getpeername_ipv6loop.phpt 494 2009-06-09 20:38:05Z tatjana.andersen@redpill-linpro.com $
 --SKIPIF--
-<?php   
+<?php
 if (!extension_loaded('sockets')) {
 	die('skip sockets extension not available.');
 }
 require 'ipv6_skipif.inc';
 ?>
 --FILE--
-<?php   
+<?php
 	/* Bind and connect sockets to localhost */
 	$localhost = '::1';
 
diff --git a/ext/sockets/tests/socket_getsockname.phpt b/ext/sockets/tests/socket_getsockname.phpt
index 877bef5016d..f3f392130c6 100644
--- a/ext/sockets/tests/socket_getsockname.phpt
+++ b/ext/sockets/tests/socket_getsockname.phpt
@@ -15,7 +15,7 @@ fa@php.net
     $s_c     = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
     $s_bind  = socket_bind($s_c, '0.0.0.0', 31330+$rand);
     var_dump($s_bind);
-    
+
     // Connect to destination address
     $s_conn  = socket_getsockname($s_c, $ip, $port);
     var_dump($s_conn);
diff --git a/ext/sockets/tests/socket_listen-wrongparams.phpt b/ext/sockets/tests/socket_listen-wrongparams.phpt
index b5e13548eb9..41d7ac1f108 100644
--- a/ext/sockets/tests/socket_listen-wrongparams.phpt
+++ b/ext/sockets/tests/socket_listen-wrongparams.phpt
@@ -11,7 +11,7 @@ if (!extension_loaded('sockets')) {
 --FILE--
 <?php
 var_dump(socket_listen(null));
-$socket = socket_create(AF_UNIX, SOCK_STREAM, 0); 
+$socket = socket_create(AF_UNIX, SOCK_STREAM, 0);
 var_dump(socket_listen($socket));
 --EXPECTF--
 Warning: socket_listen() expects parameter 1 to be resource, null given in %s on line %d
diff --git a/ext/sockets/tests/socket_listen_params.phpt b/ext/sockets/tests/socket_listen_params.phpt
index 65c11170fe7..a195b18aff9 100644
--- a/ext/sockets/tests/socket_listen_params.phpt
+++ b/ext/sockets/tests/socket_listen_params.phpt
@@ -13,7 +13,7 @@ fa@php.net
 <?php
     // wrong parameter count
     $s_c = socket_listen();
-    var_dump($s_c);  
+    var_dump($s_c);
 ?>
 --EXPECTF--
 
diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
index 6b46f33715f..fb9a311b174 100644
--- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
+++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
@@ -9,7 +9,7 @@ require 'ipv6_skipif.inc';
 
 if (!defined('IPPROTO_IPV6'))
 	die('skip IPv6 not available.');
-if (substr(PHP_OS, 0, 3) == 'WIN') 
+if (substr(PHP_OS, 0, 3) == 'WIN')
 	die('skip Not for the Windows!');
 /* Windows supports IPV6_RECVTCLASS and is able to receive the tclass via
  * WSARecvMsg (though only the top 6 bits seem to reported), but WSASendMsg
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
index 5aeaa0824fa..ced060e8a37 100644
--- a/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv4_udp.phpt
@@ -14,13 +14,13 @@ if (!extension_loaded('sockets')) {
     if (!socket_set_nonblock($socket)) {
         die('Unable to set nonblocking mode for socket');
     }
-    
+
     $address = '127.0.0.1';
     socket_sendto($socket, '', 1, 0, $address); // cause warning
     if (!socket_bind($socket, $address, 1223)) {
         die("Unable to bind to $address:1223");
     }
-	
+
 	var_dump(socket_recvfrom($socket, $buf, 12, 0, $from, $port)); //false (EAGAIN - no warning)
 
     $msg = "Ping!";
diff --git a/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt b/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt
index 75019cafac4..c44f58e793c 100644
--- a/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt
+++ b/ext/sockets/tests/socket_set_option_in6_pktinfo.phpt
@@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 }
 if (!defined('IPV6_PKTINFO')) {
     die('skip IPV6_PKTINFO not available.');
-} 
+}
 --FILE--
 <?php
 
diff --git a/ext/sockets/tests/socket_set_option_rcvtimeo.phpt b/ext/sockets/tests/socket_set_option_rcvtimeo.phpt
index ea14fd31693..57d8656e871 100644
--- a/ext/sockets/tests/socket_set_option_rcvtimeo.phpt
+++ b/ext/sockets/tests/socket_set_option_rcvtimeo.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test if socket_set_option() works, option:SO_RCVTIMEO
 --DESCRIPTION--
--wrong params 
--set/get params comparison 
+-wrong params
+-set/get params comparison
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
diff --git a/ext/sockets/tests/socket_set_option_sndtimeo.phpt b/ext/sockets/tests/socket_set_option_sndtimeo.phpt
index 6fd008c3ded..3be634341b0 100644
--- a/ext/sockets/tests/socket_set_option_sndtimeo.phpt
+++ b/ext/sockets/tests/socket_set_option_sndtimeo.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test if socket_set_option() works, option:SO_SNDTIMEO
 --DESCRIPTION--
--wrong params 
--set/get params comparison 
+-wrong params
+-set/get params comparison
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
diff --git a/ext/sockets/tests/unixloop.phpt b/ext/sockets/tests/unixloop.phpt
index 4a194448597..cd4afd65c75 100644
--- a/ext/sockets/tests/unixloop.phpt
+++ b/ext/sockets/tests/unixloop.phpt
@@ -27,7 +27,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 	if (!socket_listen($server, 2)) {
 		die('Unable to listen on socket');
 	}
-	
+
 	/* Connect to it */
 	$client = socket_create(AF_UNIX, SOCK_STREAM, 0);
 	if (!$client) {
diff --git a/ext/spl/examples/tests/dualiterator_001.phpt b/ext/spl/examples/tests/dualiterator_001.phpt
index 53c11537af1..b2462bb45f2 100644
--- a/ext/spl/examples/tests/dualiterator_001.phpt
+++ b/ext/spl/examples/tests/dualiterator_001.phpt
@@ -15,8 +15,8 @@ spl_autoload_register('spl_examples_autoload');
 function test($a, $b, $identical = false)
 {
 	var_dump(DualIterator::compareIterators(
-					new RecursiveArrayIterator($a), 
-					new RecursiveArrayIterator($b), 
+					new RecursiveArrayIterator($a),
+					new RecursiveArrayIterator($b),
 					$identical));
 }
 
diff --git a/ext/spl/tests/DirectoryIterator_by_reference.phpt b/ext/spl/tests/DirectoryIterator_by_reference.phpt
index 06127ec37b2..ffe7cd7b9e0 100644
--- a/ext/spl/tests/DirectoryIterator_by_reference.phpt
+++ b/ext/spl/tests/DirectoryIterator_by_reference.phpt
@@ -5,7 +5,7 @@ Havard Eide <nucleuz@gmail.com>
 #PHPTestFest2009 Norway 2009-06-09 \o/
 --FILE--
 <?php
-$it = new DirectoryIterator(__DIR__); 
+$it = new DirectoryIterator(__DIR__);
 foreach( $it as &$file ) {
 	echo $file . "\n";
 }
diff --git a/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt b/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt
index 36c72de191f..60203eb4a07 100644
--- a/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_count_param_SplDoublyLinkedList.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Create a SplDoublyLinkedList, call count() and pass a SplDoublyLinkedList object as the parameter. 
+Create a SplDoublyLinkedList, call count() and pass a SplDoublyLinkedList object as the parameter.
 --CREDITS--
 Philip Norton philipnorton42@gmail.com
 --FILE--
diff --git a/ext/spl/tests/SplDoublyLinkedList_debug-info.phpt b/ext/spl/tests/SplDoublyLinkedList_debug-info.phpt
index 3164b42206b..c5d10919ff4 100644
--- a/ext/spl/tests/SplDoublyLinkedList_debug-info.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_debug-info.phpt
@@ -6,12 +6,12 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
 <?php
 	// Create a new Doubly Linked List
 	$dll = new SplDoublyLinkedList();
-	
+
 	// Add some items to the list
 	$dll->push(1);
 	$dll->push(2);
 	$dll->push(3);
-	
+
 	// Check the debug info
 	print_r($dll);
 ?>
diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt
index 8d7aaf8c937..a05ba68f7ab 100644
--- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty-with-parameter.phpt
@@ -6,7 +6,7 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
 <?php
 	// Create a new Doubly Linked List
 	$dll = new SplDoublyLinkedList();
-	
+
 	var_dump($dll->isEmpty("test"));
 ?>
 --EXPECTF--
diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty.phpt
index f129385d079..4e9e2b33dea 100644
--- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_empty.phpt
@@ -6,7 +6,7 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
 <?php
 	// Create a new Doubly Linked List
 	$dll = new SplDoublyLinkedList();
-	
+
 	var_dump($dll->isEmpty());
 ?>
 --EXPECT--
diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt
index 6ea9198bf07..5e3d8e9ee27 100644
--- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.phpt
@@ -6,13 +6,13 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
 <?php
 	// Create a new Doubly Linked List
 	$dll = new SplDoublyLinkedList();
-	
+
 	// Add some items to the list
 	$dll->push(1);
 	$dll->push(2);
 	$dll->push(3);
 	//var_dump($dll);
-	
+
 	var_dump($dll->isEmpty("test"));
 ?>
 --EXPECTF--
diff --git a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty.phpt b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty.phpt
index cac1866bc18..4b308f345bd 100644
--- a/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_isEmpty_not-empty.phpt
@@ -6,13 +6,13 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
 <?php
 	// Create a new Doubly Linked List
 	$dll = new SplDoublyLinkedList();
-	
+
 	// Add some items to the list
 	$dll->push(1);
 	$dll->push(2);
 	$dll->push(3);
 	//var_dump($dll);
-	
+
 	var_dump($dll->isEmpty());
 ?>
 --EXPECT--
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt
index d3d1d7d9a9c..838100be1ee 100644
--- a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_negative-parameter.phpt
@@ -6,12 +6,12 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
 <?php
 	// Create a new Doubly Linked List
 	$dll = new SplDoublyLinkedList();
-	
+
 	// Add some items to the list
 	$dll->push(1);
 	$dll->push(2);
 	$dll->push(3);
-	
+
 	try {
 		$dll->offsetUnset(-1);
 	}
diff --git a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt
index aea73b93b4b..cd77f11aef7 100644
--- a/ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_offsetUnset_parameter-larger-num-elements.phpt
@@ -6,12 +6,12 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
 <?php
 	// Create a new Doubly Linked List
 	$dll = new SplDoublyLinkedList();
-	
+
 	// Add some items to the list
 	$dll->push(1);
 	$dll->push(2);
 	$dll->push(3);
-	
+
 	try {
 		$dll->offsetUnset(3);
 	}
diff --git a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
index f370159e3bc..6aba866669a 100644
--- a/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
+++ b/ext/spl/tests/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Create a SplDoublyLinkedList, call setIteratorMode() and pass a SplDoublyLinkedList object as the parameter. 
+Create a SplDoublyLinkedList, call setIteratorMode() and pass a SplDoublyLinkedList object as the parameter.
 --CREDITS--
 Philip Norton philipnorton42@gmail.com
 --FILE--
diff --git a/ext/spl/tests/SplFileObject_fflush_basic_001.phpt b/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
index 2d8a9c80444..b7b0c31dc63 100644
--- a/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
+++ b/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fflush function - basic test 
+SplFileObject::fflush function - basic test
 --FILE--
 <?php
 /*
diff --git a/ext/spl/tests/SplFileObject_fpassthru_basic.phpt b/ext/spl/tests/SplFileObject_fpassthru_basic.phpt
index 55b7481d950..0bd349fc926 100644
--- a/ext/spl/tests/SplFileObject_fpassthru_basic.phpt
+++ b/ext/spl/tests/SplFileObject_fpassthru_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fpassthru function - basic functionality test 
+SplFileObject::fpassthru function - basic functionality test
 --FILE--
 <?php
 $obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt
index 6780b242dd1..f5583a81951 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation1.phpt
@@ -7,8 +7,8 @@ Test fputcsv() : usage variations - with all parameters specified
 
 echo "*** Testing fputcsv() : with all parameters specified ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -29,13 +29,13 @@ $file = "$file_path/fputcsv_variation1.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $fo = new SplFileObject($file, 'w');
@@ -45,7 +45,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
 
     var_dump( $fo->fputcsv($csv_field, $delimiter, $enclosure) );
     // check the file pointer position and eof
@@ -53,13 +53,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( $fo->eof() );
     //close the file
     unset($fo);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($file) );
 
     //delete file
     unlink($file);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt
index 08a2461b4dd..57f5681517e 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation10.phpt
@@ -7,8 +7,8 @@ SplFileObject::fputcsv(): Usage variations -- with line without any CSV fields
 
 echo "*** Testing fputcsv() : with no CSV format in the field ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 
@@ -23,13 +23,13 @@ $file = "$file_path/fputcsv_variation10.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($fields as $field) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $fo = new SplFileObject($file, 'w');
@@ -37,22 +37,22 @@ foreach ($fields as $field) {
       $fo = new SplFileObject($file, $file_modes[$mode_counter]);
     }
     $csv_field = $field;
-    
+
     // write to a file in csv format
     var_dump( $fo->fputcsv($csv_field) );
-    
+
     // check the file pointer position and eof
     var_dump( $fo->ftell() );
     var_dump( $fo->eof() );
     //close the file
     unset($fo);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($file) );
 
     //delete file
     unlink($file);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt
index c85dd0a8cd7..ede8e594133 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation11.phpt
@@ -7,8 +7,8 @@ SplFileObject::fputcsv(): Usage variations -- with default enclosure value
 
 echo "*** Testing fputcsv() : with default enclosure value ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -29,13 +29,13 @@ $file = "$file_path/fputcsv_variation11.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $fo = new SplFileObject($file, 'w');
@@ -45,7 +45,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( $fo->fputcsv($csv_field, $delimiter) );
     // check the file pointer position and eof
@@ -53,13 +53,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( $fo->eof() );
     //close the file
     unset($fo);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($file) );
 
     //delete file
     unlink($file);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt
index 8bb47d3371d..c4bc9f112d9 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation12.phpt
@@ -8,8 +8,8 @@ SplFileObject::fputcsv(): Usage variations -- with default enclosure and differe
 
 echo "*** Testing fputcsv() : with default enclosure and different delimiter value ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -30,13 +30,13 @@ $file = "$file_path/fputcsv_variation12.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $fo = new SplFileObject($file, 'w');
@@ -46,7 +46,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-     
+
     // write to a file in csv format
     var_dump( $fo->fputcsv($csv_field, '+') );
     // check the file pointer position and eof
@@ -54,13 +54,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( $fo->eof() );
     //close the file
     unset($fo);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($file) );
 
     //delete file
     unlink($file);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
index b7c2a6381d9..9edaf571fe2 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fputcsv() : usage variations - with default enclosure & delimiter of two chars 
+Test fputcsv() : usage variations - with default enclosure & delimiter of two chars
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt
index 9c4c01f54f8..4b9e930c7c0 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation5.phpt
@@ -7,8 +7,8 @@ Test fputcsv() : usage variations - with default arguments value
 
 echo "*** Testing fputcsv() : with default arguments value ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -29,13 +29,13 @@ $file = "$file_path/fputcsv_variation5.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $fo = new SplFileObject($file, 'w');
@@ -45,7 +45,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( $fo->fputcsv($csv_field) );
     // check the file pointer position and eof
@@ -53,13 +53,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( $fo->eof() );
     //close the file
     unset($fo);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($file) );
 
     //delete file
     unlink($file);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt
index 6cbb880aaf4..842bb563d1c 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fputcsv() : usage variations - with different delimiter and enclosure 
+Test fputcsv() : usage variations - with different delimiter and enclosure
 --FILE--
 <?php
 
@@ -10,8 +10,8 @@ Test fputcsv() : usage variations - with different delimiter and enclosure
 
 echo "*** Testing fputcsv() : with different delimiter and enclosure ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -32,13 +32,13 @@ $file = "$file_path/fputcsv_variation6.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $fo = new SplFileObject($file, 'w');
@@ -48,7 +48,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( $fo->fputcsv($csv_field, '+', '%') );
     // check the file pointer position and eof
@@ -56,13 +56,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( $fo->eof() );
     //close the file
     unset($fo);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($file) );
 
     //delete file
     unlink($file);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt
index ceb438a9f18..0f9b8ce366f 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation7.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fputcsv() : usage variations - with different delimiter and same enclosure 
+Test fputcsv() : usage variations - with different delimiter and same enclosure
 --FILE--
 <?php
 
@@ -10,8 +10,8 @@ Test fputcsv() : usage variations - with different delimiter and same enclosure
 
 echo "*** Testing fputcsv() : with different delimiter and same enclosure ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -32,13 +32,13 @@ $file = "$file_path/fputcsv_variation7.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $fo = new SplFileObject($file, 'w');
@@ -48,7 +48,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( $fo->fputcsv($csv_field, '+', $enclosure) );
     // check the file pointer position and eof
@@ -56,13 +56,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( $fo->eof() );
     //close the file
     unset($fo);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($file) );
 
     //delete file
     unlink($file);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt
index f1a8cbf7b1c..64f32187ac9 100644
--- a/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt
+++ b/ext/spl/tests/SplFileObject_fputcsv_variation8.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fputcsv() : usage variations - with same delimiter and different enclosure 
+Test fputcsv() : usage variations - with same delimiter and different enclosure
 --FILE--
 <?php
 
@@ -10,8 +10,8 @@ Test fputcsv() : usage variations - with same delimiter and different enclosure
 
 echo "*** Testing fputcsv() : with same delimiter and different enclosure ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -32,13 +32,13 @@ $file = "$file_path/fputcsv_variation8.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $fo = new SplFileObject($file, 'w');
@@ -48,7 +48,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( $fo->fputcsv($csv_field, $delimiter, '+') );
     // check the file pointer position and eof
@@ -56,13 +56,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( $fo->eof() );
     //close the file
     unset($fo);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($file) );
 
     //delete file
     unlink($file);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/spl/tests/SplFileObject_fscanf_basic.phpt b/ext/spl/tests/SplFileObject_fscanf_basic.phpt
index 5279039f0c3..2f668ac73e0 100644
--- a/ext/spl/tests/SplFileObject_fscanf_basic.phpt
+++ b/ext/spl/tests/SplFileObject_fscanf_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fscanf function - basic functionality test 
+SplFileObject::fscanf function - basic functionality test
 --FILE--
 <?php
 $obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
diff --git a/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt b/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt
index a2eef604f19..831e855b856 100644
--- a/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt
+++ b/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::ftruncate function - truncating with stream that does not support truncation 
+SplFileObject::ftruncate function - truncating with stream that does not support truncation
 --FILE--
 <?php
 
@@ -21,7 +21,7 @@ $ftruncate_test = "";
 //end creating stream
 
 //open an SplFileObject using the above test stream
-$obj = New SplFileObject("SPLtest://ftruncate_test"); 
+$obj = New SplFileObject("SPLtest://ftruncate_test");
 try {
 	$obj->ftruncate(1);
 } catch (LogicException $e) {
diff --git a/ext/spl/tests/SplFileObject_fwrite_error_001.phpt b/ext/spl/tests/SplFileObject_fwrite_error_001.phpt
index 296a1f36c9b..0418086e9ee 100644
--- a/ext/spl/tests/SplFileObject_fwrite_error_001.phpt
+++ b/ext/spl/tests/SplFileObject_fwrite_error_001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fpassthru function - parameters test 
+SplFileObject::fpassthru function - parameters test
 --FILE--
 <?php
 $obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
diff --git a/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt b/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt
index 4e3de4bab2e..5c65a1b76bf 100644
--- a/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt
+++ b/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::getCsvControl function - basic test 
+SplFileObject::getCsvControl function - basic test
 --FILE--
 <?php
 $obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
diff --git a/ext/spl/tests/SplFileObject_rewind_error001.phpt b/ext/spl/tests/SplFileObject_rewind_error001.phpt
index 5f2379aa139..2e4aefb7a77 100644
--- a/ext/spl/tests/SplFileObject_rewind_error001.phpt
+++ b/ext/spl/tests/SplFileObject_rewind_error001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: SplFileObject::rewind() with a parameter. 
+SPL: SplFileObject::rewind() with a parameter.
 --CREDITS--
 Ricardo Oedietram <ricardo@odracir.nl>
 Erwin Poeze <erwin.poeze@gmail.com>
diff --git a/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt b/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt
index 034d4573188..aa2bde95c59 100644
--- a/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt
+++ b/ext/spl/tests/SplFixedArray_fromarray_indexes.phpt
@@ -4,7 +4,7 @@ Create a SplFixedArray from an array using the fromArray() function use the defa
 Philip Norton philipnorton42@gmail.com
 --FILE--
 <?php
-$array = SplFixedArray::fromArray(array(1 => 1, 
+$array = SplFixedArray::fromArray(array(1 => 1,
 										2 => '2',
 										3 => false));
 var_dump($array);
diff --git a/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt b/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt
index ecae2ab762e..29ea85c332d 100644
--- a/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt
+++ b/ext/spl/tests/SplFixedArray_fromarray_non_indexes.phpt
@@ -4,7 +4,7 @@ Create a SplFixedArray from an array using the fromArray() function don't try to
 Philip Norton philipnorton42@gmail.com
 --FILE--
 <?php
-$array = SplFixedArray::fromArray(array(1 => 1, 
+$array = SplFixedArray::fromArray(array(1 => 1,
 										2 => '2',
 										3 => false),
 									false);
diff --git a/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt b/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt
index 21976b552ca..346d85cc3a9 100644
--- a/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt
+++ b/ext/spl/tests/SplFixedArray_offsetUnset_string.phpt
@@ -6,17 +6,17 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
 <?php
 	// Create a fixed array
 	$fixedArray = new SplFixedArray(5);
-	
+
 	// Fill it up
-	for ($i=0; $i < 5; $i++) { 
+	for ($i=0; $i < 5; $i++) {
 		$fixedArray[$i] = "PHPNW Testfest";
 	}
-	
+
 	// remove an item
 	$fixedArray->offsetUnset("4");
-	
+
 	var_dump($fixedArray);
-	
+
 ?>
 --EXPECTF--
 object(SplFixedArray)#1 (5) {
diff --git a/ext/spl/tests/SplFixedArray_toArray_with-params.phpt b/ext/spl/tests/SplFixedArray_toArray_with-params.phpt
index 8864362c67b..4c72dca2356 100644
--- a/ext/spl/tests/SplFixedArray_toArray_with-params.phpt
+++ b/ext/spl/tests/SplFixedArray_toArray_with-params.phpt
@@ -6,12 +6,12 @@ PHPNW Testfest 2009 - Paul Court ( g@rgoyle.com )
 <?php
 	// Create a fixed array
 	$fixedArray = new SplFixedArray(5);
-	
+
 	// Fill it up
-	for ($i=0; $i < 5; $i++) { 
+	for ($i=0; $i < 5; $i++) {
 		$fixedArray[$i] = "PHPNW Testfest";
 	}
-	
+
 	// Test count() returns correct error when parameters are passed.
 	$fixedArray->count(1);
 ?>
diff --git a/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt b/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt
index 7c8cb7574cd..83b3e27d888 100644
--- a/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAllExcept_basic.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Check that SplObjectStorage::removeUncommon functions when receiving proper input 
+Check that SplObjectStorage::removeUncommon functions when receiving proper input
 --CREDITS--
 Matthew Turland (me@matthewturland.com)
 --FILE--
 <?php
 
-    $a = (object) 'a'; 
-    $b = (object) 'b'; 
-    $c = (object) 'c'; 
+    $a = (object) 'a';
+    $b = (object) 'b';
+    $c = (object) 'c';
 
    $foo = new SplObjectStorage;
     $foo->attach($a);
diff --git a/ext/spl/tests/arrayObject___construct_basic2.phpt b/ext/spl/tests/arrayObject___construct_basic2.phpt
index bd27c427742..9295f40e51f 100644
--- a/ext/spl/tests/arrayObject___construct_basic2.phpt
+++ b/ext/spl/tests/arrayObject___construct_basic2.phpt
@@ -8,7 +8,7 @@ class C {
 
 class MyArrayObject extends ArrayObject {
 	public $prop = 'MyArrayObject::prop.orig';
-}	
+}
 
 echo "--> Access prop on instance of ArrayObject:\n";
 $c = new C;
@@ -28,20 +28,20 @@ function testAccess($c, $ao) {
 
 	echo "  - Read:\n";
 	@var_dump($ao->prop, $ao['prop']);
-	
+
 	echo "  - Write:\n";
 	$ao->prop = 'changed1';
 	$ao['prop'] = 'changed2';
 	var_dump($ao->prop, $ao['prop']);
-	
+
 	echo "  - Isset:\n";
 	var_dump(isset($ao->prop), isset($ao['prop']));
-	
+
 	echo "  - Unset:\n";
 	unset($ao->prop);
 	unset($ao['prop']);
 	var_dump($ao->prop, $ao['prop']);
-	
+
 	echo "  - After:\n";
 	var_dump($ao, $c);
 }
diff --git a/ext/spl/tests/arrayObject___construct_basic3.phpt b/ext/spl/tests/arrayObject___construct_basic3.phpt
index 11a17a6dc46..fcd369af84b 100644
--- a/ext/spl/tests/arrayObject___construct_basic3.phpt
+++ b/ext/spl/tests/arrayObject___construct_basic3.phpt
@@ -8,7 +8,7 @@ class C {
 
 class MyArrayObject extends ArrayObject {
 	public $prop = 'MyArrayObject::prop.orig';
-}	
+}
 
 echo "\n--> Access prop on instance of ArrayObject with ArrayObject::STD_PROP_LIST:\n";
 $c = new C;
@@ -28,20 +28,20 @@ function testAccess($c, $ao) {
 
 	echo "  - Read:\n";
 	@var_dump($ao->prop, $ao['prop']);
-	
+
 	echo "  - Write:\n";
 	$ao->prop = 'changed1';
 	$ao['prop'] = 'changed2';
 	var_dump($ao->prop, $ao['prop']);
-	
+
 	echo "  - Isset:\n";
 	var_dump(isset($ao->prop), isset($ao['prop']));
-	
+
 	echo "  - Unset:\n";
 	unset($ao->prop);
 	unset($ao['prop']);
 	var_dump($ao->prop, $ao['prop']);
-	
+
 	echo "  - After:\n";
 	var_dump($ao, $c);
 }
diff --git a/ext/spl/tests/arrayObject___construct_basic4.phpt b/ext/spl/tests/arrayObject___construct_basic4.phpt
index b0809de0d4e..c136c949e24 100644
--- a/ext/spl/tests/arrayObject___construct_basic4.phpt
+++ b/ext/spl/tests/arrayObject___construct_basic4.phpt
@@ -8,7 +8,7 @@ class C {
 
 class MyArrayObject extends ArrayObject {
 	public $prop = 'MyArrayObject::prop.orig';
-}	
+}
 
 echo "\n--> Access prop on instance of ArrayObject with ArrayObject::ARRAY_AS_PROPS:\n";
 $c = new C;
@@ -28,20 +28,20 @@ function testAccess($c, $ao) {
 
 	echo "  - Read:\n";
 	@var_dump($ao->prop, $ao['prop']);
-	
+
 	echo "  - Write:\n";
 	$ao->prop = 'changed1';
 	$ao['prop'] = 'changed2';
 	var_dump($ao->prop, $ao['prop']);
-	
+
 	echo "  - Isset:\n";
 	var_dump(isset($ao->prop), isset($ao['prop']));
-	
+
 	echo "  - Unset:\n";
 	unset($ao->prop);
 	unset($ao['prop']);
 	var_dump($ao->prop, $ao['prop']);
-	
+
 	echo "  - After:\n";
 	var_dump($ao, $c);
 }
diff --git a/ext/spl/tests/arrayObject___construct_basic5.phpt b/ext/spl/tests/arrayObject___construct_basic5.phpt
index 8c44ee2ce44..0eb8904bac9 100644
--- a/ext/spl/tests/arrayObject___construct_basic5.phpt
+++ b/ext/spl/tests/arrayObject___construct_basic5.phpt
@@ -8,7 +8,7 @@ class C {
 
 class MyArrayObject extends ArrayObject {
 	public $prop = 'MyArrayObject::prop.orig';
-}	
+}
 
 echo "\n--> Access prop on instance of ArrayObject with ArrayObject::STD_PROP_LIST|ArrayObject::ARRAY_AS_PROPS:\n";
 $c = new C;
@@ -28,20 +28,20 @@ function testAccess($c, $ao) {
 
 	echo "  - Read:\n";
 	@var_dump($ao->prop, $ao['prop']);
-	
+
 	echo "  - Write:\n";
 	$ao->prop = 'changed1';
 	$ao['prop'] = 'changed2';
 	var_dump($ao->prop, $ao['prop']);
-	
+
 	echo "  - Isset:\n";
 	var_dump(isset($ao->prop), isset($ao['prop']));
-	
+
 	echo "  - Unset:\n";
 	unset($ao->prop);
 	unset($ao['prop']);
 	var_dump($ao->prop, $ao['prop']);
-	
+
 	echo "  - After:\n";
 	var_dump($ao, $c);
 }
diff --git a/ext/spl/tests/arrayObject___construct_basic6.phpt b/ext/spl/tests/arrayObject___construct_basic6.phpt
index 1c7ec36363b..3b9992dd997 100644
--- a/ext/spl/tests/arrayObject___construct_basic6.phpt
+++ b/ext/spl/tests/arrayObject___construct_basic6.phpt
@@ -5,7 +5,7 @@ SPL: ArrayObject::__construct: check impact of ArrayObject::STD_PROP_LIST on var
 class MyArrayObject extends ArrayObject {
 	private $priv1 = 'secret1';
 	public $pub1 = 'public1';
-} 
+}
 
 $ao = new ArrayObject(array(1,2,3));
 $ao->p = 1;
diff --git a/ext/spl/tests/arrayObject_asort_basic1.phpt b/ext/spl/tests/arrayObject_asort_basic1.phpt
index 6a523aec664..f095f6146c0 100644
--- a/ext/spl/tests/arrayObject_asort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_asort_basic1.phpt
@@ -4,9 +4,9 @@ SPL: Test ArrayObject::asort() function : basic functionality with array based s
 <?php
 /* Prototype  : int ArrayObject::asort()
  * Description: proto int ArrayIterator::asort()
- * Sort the entries by values. 
+ * Sort the entries by values.
  * Source code: ext/spl/spl_array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing ArrayObject::asort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_asort_basic2.phpt b/ext/spl/tests/arrayObject_asort_basic2.phpt
index d481d0c4ed6..6f2e8509eff 100644
--- a/ext/spl/tests/arrayObject_asort_basic2.phpt
+++ b/ext/spl/tests/arrayObject_asort_basic2.phpt
@@ -4,9 +4,9 @@ SPL: Test ArrayObject::asort() function : basic functionality with object based
 <?php
 /* Prototype  : int ArrayObject::asort()
  * Description: proto int ArrayIterator::asort()
- * Sort the entries by values. 
+ * Sort the entries by values.
  * Source code: ext/spl/spl_array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing ArrayObject::asort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_clone_basic1.phpt b/ext/spl/tests/arrayObject_clone_basic1.phpt
index dd4abf3ffb6..ed412c9a480 100644
--- a/ext/spl/tests/arrayObject_clone_basic1.phpt
+++ b/ext/spl/tests/arrayObject_clone_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: Cloning an instance of ArrayObject which wraps an array. 
+SPL: Cloning an instance of ArrayObject which wraps an array.
 --FILE--
 <?php
 $a = array(1,2);
diff --git a/ext/spl/tests/arrayObject_clone_basic2.phpt b/ext/spl/tests/arrayObject_clone_basic2.phpt
index 932eaed712e..c25041510b6 100644
--- a/ext/spl/tests/arrayObject_clone_basic2.phpt
+++ b/ext/spl/tests/arrayObject_clone_basic2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: Cloning an instance of ArrayObject which wraps an object. 
+SPL: Cloning an instance of ArrayObject which wraps an object.
 --FILE--
 <?php
 class C { }
diff --git a/ext/spl/tests/arrayObject_clone_basic3.phpt b/ext/spl/tests/arrayObject_clone_basic3.phpt
index f7ac89442ed..0ed3e011f83 100644
--- a/ext/spl/tests/arrayObject_clone_basic3.phpt
+++ b/ext/spl/tests/arrayObject_clone_basic3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: Cloning nested ArrayObjects. 
+SPL: Cloning nested ArrayObjects.
 --FILE--
 <?php
 class C {
diff --git a/ext/spl/tests/arrayObject_count_basic1.phpt b/ext/spl/tests/arrayObject_count_basic1.phpt
index a003c2cf67f..b0643d5754f 100644
--- a/ext/spl/tests/arrayObject_count_basic1.phpt
+++ b/ext/spl/tests/arrayObject_count_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: ArrayObject::count() and ArrayIterator::count() basic functionality. 
+SPL: ArrayObject::count() and ArrayIterator::count() basic functionality.
 --FILE--
 ==ArrayObject==
 <?php
diff --git a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt
index d89ca821a28..823256edbcc 100644
--- a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt
+++ b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt
@@ -5,7 +5,7 @@ SPL: ArrayObject::exchangeArray() basic usage with object as underlying data sto
 
 class C {
 	public $pub1 = 'public1';
-} 
+}
 
 echo "--> exchangeArray() with objects:\n";
 $original = new C;
diff --git a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt
index b23c1962244..472da4f860d 100644
--- a/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt
+++ b/ext/spl/tests/arrayObject_getIteratorClass_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: ArrayObject::getIteratorClass and ArrayObject::setIteratorClass basic functionality 
+SPL: ArrayObject::getIteratorClass and ArrayObject::setIteratorClass basic functionality
 --FILE--
 <?php
 class MyIterator extends ArrayIterator {
@@ -9,31 +9,31 @@ class MyIterator extends ArrayIterator {
 		echo "   In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
 
-	function rewind() { 
+	function rewind() {
 		$args = func_get_args();
 		echo "   In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 		return parent::rewind();
 	}
 
-	function valid() { 
+	function valid() {
 		$args = func_get_args();
 		echo "   In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 		return parent::valid();
 	}
-	
-	function current() { 
+
+	function current() {
 		$args = func_get_args();
 		echo "   In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 		return parent::current();
 	}
 
-	function next() { 
+	function next() {
 		$args = func_get_args();
 		echo "   In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 		return parent::next();
 	}
-	
-	function key() { 
+
+	function key() {
 		$args = func_get_args();
 		echo "   In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 		return parent::key();
diff --git a/ext/spl/tests/arrayObject_ksort_basic1.phpt b/ext/spl/tests/arrayObject_ksort_basic1.phpt
index 1e7aa01fe89..1718ccbe3bb 100644
--- a/ext/spl/tests/arrayObject_ksort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_ksort_basic1.phpt
@@ -1,12 +1,12 @@
 --TEST--
-SPL: Test ArrayObject::ksort() function : basic functionality with array based store 
+SPL: Test ArrayObject::ksort() function : basic functionality with array based store
 --FILE--
 <?php
 /* Prototype  : int ArrayObject::ksort()
  * Description: proto int ArrayIterator::ksort()
- * Sort the entries by key. 
+ * Sort the entries by key.
  * Source code: ext/spl/spl_array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing ArrayObject::ksort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_ksort_basic2.phpt b/ext/spl/tests/arrayObject_ksort_basic2.phpt
index 1464e737614..438310b6977 100644
--- a/ext/spl/tests/arrayObject_ksort_basic2.phpt
+++ b/ext/spl/tests/arrayObject_ksort_basic2.phpt
@@ -1,12 +1,12 @@
 --TEST--
-SPL: Test ArrayObject::ksort() function : basic functionality with object base store 
+SPL: Test ArrayObject::ksort() function : basic functionality with object base store
 --FILE--
 <?php
 /* Prototype  : int ArrayObject::ksort()
  * Description: proto int ArrayIterator::ksort()
- * Sort the entries by key. 
+ * Sort the entries by key.
  * Source code: ext/spl/spl_array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing ArrayObject::ksort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_magicMethods1.phpt b/ext/spl/tests/arrayObject_magicMethods1.phpt
index ec4812f1079..351f68214a0 100644
--- a/ext/spl/tests/arrayObject_magicMethods1.phpt
+++ b/ext/spl/tests/arrayObject_magicMethods1.phpt
@@ -8,24 +8,24 @@ class UsesMagic {
 	public $c = 3;
 
 	private $priv = 'secret';
-	
-	function __get($name) { 
+
+	function __get($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __set($name, $value) { 
+	function __set($name, $value) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __isset($name) { 
+	function __isset($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __unset($name) { 
+	function __unset($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	
+
 }
 
 $obj = new UsesMagic;
diff --git a/ext/spl/tests/arrayObject_magicMethods2.phpt b/ext/spl/tests/arrayObject_magicMethods2.phpt
index 691a9a1e6cf..18f0520fcda 100644
--- a/ext/spl/tests/arrayObject_magicMethods2.phpt
+++ b/ext/spl/tests/arrayObject_magicMethods2.phpt
@@ -8,24 +8,24 @@ class UsesMagic {
 	public $c = 3;
 
 	private $priv = 'secret';
-	
-	function __get($name) { 
+
+	function __get($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __set($name, $value) { 
+	function __set($name, $value) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __isset($name) { 
+	function __isset($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __unset($name) { 
+	function __unset($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	
+
 }
 
 $obj = new UsesMagic;
diff --git a/ext/spl/tests/arrayObject_magicMethods3.phpt b/ext/spl/tests/arrayObject_magicMethods3.phpt
index 6231ceabb7f..6771c468008 100644
--- a/ext/spl/tests/arrayObject_magicMethods3.phpt
+++ b/ext/spl/tests/arrayObject_magicMethods3.phpt
@@ -8,24 +8,24 @@ class UsesMagic {
 	public $c = 3;
 
 	private $priv = 'secret';
-	
-	function __get($name) { 
+
+	function __get($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __set($name, $value) { 
+	function __set($name, $value) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __isset($name) { 
+	function __isset($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __unset($name) { 
+	function __unset($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	
+
 }
 
 $obj = new UsesMagic;
diff --git a/ext/spl/tests/arrayObject_magicMethods4.phpt b/ext/spl/tests/arrayObject_magicMethods4.phpt
index 9580dc5ae72..d6a6292fc09 100644
--- a/ext/spl/tests/arrayObject_magicMethods4.phpt
+++ b/ext/spl/tests/arrayObject_magicMethods4.phpt
@@ -11,26 +11,26 @@ class C {
 }
 
 class UsesMagic extends ArrayObject {
-	
+
 	public $b = "This should not be in the storage";
 
-	function __get($name) { 
+	function __get($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __set($name, $value) { 
+	function __set($name, $value) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __isset($name) { 
+	function __isset($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __unset($name) { 
+	function __unset($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	
+
 }
 $obj = new C;
 $ao = new UsesMagic($obj);
diff --git a/ext/spl/tests/arrayObject_magicMethods5.phpt b/ext/spl/tests/arrayObject_magicMethods5.phpt
index 023086d83a5..fbc65e96bed 100644
--- a/ext/spl/tests/arrayObject_magicMethods5.phpt
+++ b/ext/spl/tests/arrayObject_magicMethods5.phpt
@@ -11,26 +11,26 @@ class C {
 }
 
 class UsesMagic extends ArrayObject {
-	
+
 	public $b = "This should appear in storage";
 
-	function __get($name) { 
+	function __get($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __set($name, $value) { 
+	function __set($name, $value) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __isset($name) { 
+	function __isset($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __unset($name) { 
+	function __unset($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	
+
 }
 $obj = new C;
 $ao = new UsesMagic($obj);
diff --git a/ext/spl/tests/arrayObject_magicMethods6.phpt b/ext/spl/tests/arrayObject_magicMethods6.phpt
index b43f56c2b06..243e0f53a81 100644
--- a/ext/spl/tests/arrayObject_magicMethods6.phpt
+++ b/ext/spl/tests/arrayObject_magicMethods6.phpt
@@ -11,26 +11,26 @@ class C {
 }
 
 class UsesMagic extends ArrayObject {
-	
+
 	public $b = "This should never appear in storage";
 
-	function __get($name) { 
+	function __get($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __set($name, $value) { 
+	function __set($name, $value) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __isset($name) { 
+	function __isset($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	function __unset($name) { 
+	function __unset($name) {
 		$args = func_get_args();
 		echo "In " . __METHOD__ . "(" . implode($args, ',') . ")\n";
 	}
-	
+
 }
 $obj = new C;
 $ao = new UsesMagic($obj, ArrayObject::ARRAY_AS_PROPS);
diff --git a/ext/spl/tests/arrayObject_natcasesort_basic1.phpt b/ext/spl/tests/arrayObject_natcasesort_basic1.phpt
index 62ad2ed4820..8ab2b55a01d 100644
--- a/ext/spl/tests/arrayObject_natcasesort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_natcasesort_basic1.phpt
@@ -1,12 +1,12 @@
 --TEST--
-SPL: Test ArrayObject::natcasesort() function : basic functionality 
+SPL: Test ArrayObject::natcasesort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int ArrayObject::natcasesort()
  * Description: proto int ArrayIterator::natcasesort()
- Sort the entries by values using case insensitive "natural order" algorithm. 
+ Sort the entries by values using case insensitive "natural order" algorithm.
  * Source code: ext/spl/spl_array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing ArrayObject::natcasesort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_natsort_basic1.phpt b/ext/spl/tests/arrayObject_natsort_basic1.phpt
index 1b4fd60f559..abf292f5e7c 100644
--- a/ext/spl/tests/arrayObject_natsort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_natsort_basic1.phpt
@@ -1,12 +1,12 @@
 --TEST--
-SPL: Test ArrayObject::natsort() function : basic functionality 
+SPL: Test ArrayObject::natsort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int ArrayObject::natsort()
  * Description: proto int ArrayIterator::natsort()
- Sort the entries by values using "natural order" algorithm. 
+ Sort the entries by values using "natural order" algorithm.
  * Source code: ext/spl/spl_array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing ArrayObject::natsort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_setFlags_basic1.phpt b/ext/spl/tests/arrayObject_setFlags_basic1.phpt
index 391b0eeae71..b8bf099dd6e 100644
--- a/ext/spl/tests/arrayObject_setFlags_basic1.phpt
+++ b/ext/spl/tests/arrayObject_setFlags_basic1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-SPL: ArrayObject::setFlags basic usage with ArrayObject::ARRAY_AS_PROPS. Currently fails on php.net due to bug 45622. 
+SPL: ArrayObject::setFlags basic usage with ArrayObject::ARRAY_AS_PROPS. Currently fails on php.net due to bug 45622.
 --FILE--
 <?php
 class C extends ArrayObject {
 	public $p = 'object property';
-}	
+}
 
 function access_p($ao) {
   // isset
   var_dump(isset($ao->p));
   // read
   var_dump($ao->p);
-  // write  
+  // write
   $ao->p = $ao->p . '.changed';
   var_dump($ao->p);
 }
diff --git a/ext/spl/tests/arrayObject_setFlags_basic2.phpt b/ext/spl/tests/arrayObject_setFlags_basic2.phpt
index 6eece74cbba..fe9111c90be 100644
--- a/ext/spl/tests/arrayObject_setFlags_basic2.phpt
+++ b/ext/spl/tests/arrayObject_setFlags_basic2.phpt
@@ -4,11 +4,11 @@ SPL: Ensure access to non-visible properties falls back to dimension access with
 <?php
 class C extends ArrayObject {
 	private $x = 'secret';
-	
+
 	static function go($c) {
 	  var_dump($c->x);
 	}
-}	
+}
 
 $c = new C(array('x'=>'public'));
 
diff --git a/ext/spl/tests/arrayObject_uasort_basic1.phpt b/ext/spl/tests/arrayObject_uasort_basic1.phpt
index 203edb6fb85..bb4440cdd7e 100644
--- a/ext/spl/tests/arrayObject_uasort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_uasort_basic1.phpt
@@ -1,12 +1,12 @@
 --TEST--
-SPL: Test ArrayObject::uasort() function : basic functionality 
+SPL: Test ArrayObject::uasort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int ArrayObject::uasort(callback cmp_function)
  * Description: proto int ArrayIterator::uasort(callback cmp_function)
- Sort the entries by values user defined function. 
+ Sort the entries by values user defined function.
  * Source code: ext/spl/spl_array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing ArrayObject::uasort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_uasort_error1.phpt b/ext/spl/tests/arrayObject_uasort_error1.phpt
index d7306c9c88c..11d96f233dc 100644
--- a/ext/spl/tests/arrayObject_uasort_error1.phpt
+++ b/ext/spl/tests/arrayObject_uasort_error1.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test ArrayObject::uasort() function : wrong arg count 
+Test ArrayObject::uasort() function : wrong arg count
 --FILE--
 <?php
 /* Prototype  : int ArrayObject::uasort(callback cmp_function)
  * Description: proto int ArrayIterator::uasort(callback cmp_function)
- Sort the entries by values user defined function. 
+ Sort the entries by values user defined function.
  * Source code: ext/spl/spl_array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $ao = new ArrayObject();
diff --git a/ext/spl/tests/arrayObject_uksort_basic1.phpt b/ext/spl/tests/arrayObject_uksort_basic1.phpt
index 1581589e43a..8aac0006fd9 100644
--- a/ext/spl/tests/arrayObject_uksort_basic1.phpt
+++ b/ext/spl/tests/arrayObject_uksort_basic1.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test ArrayObject::uksort() function : basic functionality 
+Test ArrayObject::uksort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int ArrayObject::uksort(callback cmp_function)
  * Description: proto int ArrayIterator::uksort(callback cmp_function)
- * Sort the entries by key using user defined function. 
+ * Sort the entries by key using user defined function.
  * Source code: ext/spl/spl_array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing ArrayObject::uksort() : basic functionality ***\n";
diff --git a/ext/spl/tests/arrayObject_uksort_error1.phpt b/ext/spl/tests/arrayObject_uksort_error1.phpt
index d019fc44008..1fdaf5b4867 100644
--- a/ext/spl/tests/arrayObject_uksort_error1.phpt
+++ b/ext/spl/tests/arrayObject_uksort_error1.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test ArrayObject::uksort() function : wrong arg count 
+Test ArrayObject::uksort() function : wrong arg count
 --FILE--
 <?php
 /* Prototype  : int ArrayObject::uksort(callback cmp_function)
  * Description: proto int ArrayIterator::uksort(callback cmp_function)
  Sort the entries by key using user defined function.
  * Source code: ext/spl/spl_array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $ao = new ArrayObject();
diff --git a/ext/spl/tests/array_003.phpt b/ext/spl/tests/array_003.phpt
index de4ce30f91f..94dcd7f5a25 100644
--- a/ext/spl/tests/array_003.phpt
+++ b/ext/spl/tests/array_003.phpt
@@ -3,8 +3,8 @@ SPL: ArrayObject from object
 --FILE--
 <?php
 
-// This test also needs to exclude the protected and private variables 
-// since they cannot be accessed from the external object which iterates 
+// This test also needs to exclude the protected and private variables
+// since they cannot be accessed from the external object which iterates
 // them.
 
 class test
@@ -12,7 +12,7 @@ class test
 	public    $pub = "public";
 	protected $pro = "protected";
 	private   $pri = "private";
-	
+
 	function __construct()
 	{
 		$this->imp = "implicit";
diff --git a/ext/spl/tests/array_005.phpt b/ext/spl/tests/array_005.phpt
index d7ef15db1ae..b0175e7e7a4 100644
--- a/ext/spl/tests/array_005.phpt
+++ b/ext/spl/tests/array_005.phpt
@@ -18,7 +18,7 @@ class Student
 	{
 		return $this->id . ', ' . $this->name;
 	}
-	
+
 	public function getId()
 	{
 		return $this->id;
@@ -34,7 +34,7 @@ class StudentIdFilter extends FilterIterator
 		FilterIterator::__construct($students->getIterator());
 		$this->id = $other->getId();
 	}
-	
+
 	public function accept()
 	{
 		echo "ACCEPT ".$this->current()->getId()." == ".$this->id."\n";
@@ -45,19 +45,19 @@ class StudentIdFilter extends FilterIterator
 class StudentList implements IteratorAggregate
 {
 	private $students;
-	
+
 	public function __construct()
 	{
 		$this->students = new ArrayObject(array());
 	}
-	
+
 	public function add(Student $student)
 	{
 		if (!$this->contains($student)) {
 			$this->students[] = $student;
 		}
 	}
-	
+
 	public function contains(Student $student)
 	{
 		foreach ($this->students as $s)
@@ -68,7 +68,7 @@ class StudentList implements IteratorAggregate
 		}
 		return false;
 	}
-	
+
 	public function getIterator() {
 		return $this->students->getIterator();
 	}
diff --git a/ext/spl/tests/array_007.phpt b/ext/spl/tests/array_007.phpt
index 7d9bf6afc1c..a55e04d0a56 100644
--- a/ext/spl/tests/array_007.phpt
+++ b/ext/spl/tests/array_007.phpt
@@ -3,8 +3,8 @@ SPL: ArrayObject/Iterator from IteratorAggregate
 --FILE--
 <?php
 
-// This test also needs to exclude the protected and private variables 
-// since they cannot be accessed from the external object which iterates 
+// This test also needs to exclude the protected and private variables
+// since they cannot be accessed from the external object which iterates
 // them.
 
 class test implements IteratorAggregate
@@ -12,12 +12,12 @@ class test implements IteratorAggregate
 	public    $pub = "public";
 	protected $pro = "protected";
 	private   $pri = "private";
-	
+
 	function __construct()
 	{
 		$this->imp = "implicit";
 	}
-	
+
 	function getIterator()
 	{
 		$it = new ArrayObject($this);
diff --git a/ext/spl/tests/array_009a.phpt b/ext/spl/tests/array_009a.phpt
index 396aa9b9e9c..f2078bcd417 100644
--- a/ext/spl/tests/array_009a.phpt
+++ b/ext/spl/tests/array_009a.phpt
@@ -9,7 +9,7 @@ class MyRecursiveArrayIterator extends ArrayIterator implements RecursiveIterato
 	{
 		return is_array($this->current());
 	}
-	
+
 	function getChildren()
 	{
 		return new MyRecursiveArrayIterator($this->current());
diff --git a/ext/spl/tests/array_013.phpt b/ext/spl/tests/array_013.phpt
index c2dc1f49891..6533819b688 100644
--- a/ext/spl/tests/array_013.phpt
+++ b/ext/spl/tests/array_013.phpt
@@ -6,7 +6,7 @@ SPL: ArrayIterator::append
 if (!class_exists('NoRewindIterator', false))
 {
 	require_once(dirname(__FILE__) . '/../examples/norewinditerator.inc');
-}                                               
+}
 
 echo "===Array===\n";
 
diff --git a/ext/spl/tests/array_017.phpt b/ext/spl/tests/array_017.phpt
index ed1286332cd..30d2b709156 100644
--- a/ext/spl/tests/array_017.phpt
+++ b/ext/spl/tests/array_017.phpt
@@ -36,7 +36,7 @@ class ArrayObjectEx extends ArrayObject
 	public    $pub1 = 1;
 	protected $pro1 = 2;
 	private   $pri1 = 3;
-	
+
 	function __construct($ar = array(), $flags = 0)
 	{
 		echo __METHOD__ . "()\n";
@@ -66,13 +66,13 @@ class ArrayObjectEx extends ArrayObject
 			var_dump(array($n => $v));
 		}
 	}
-	
+
 	function setFlags($flags)
 	{
 		echo __METHOD__ . "($flags)\n";
 		ArrayObject::setFlags($flags);
 	}
-	
+
 	function getIterator()
 	{
 		echo __METHOD__ . "()\n";
@@ -92,21 +92,21 @@ function check($obj, $flags)
 	$obj->show();
 
 	echo "===FOREACH===\n";
-	
+
 	$it = $obj->getIterator();
 	foreach($it as $n => $v)
 	{
 		var_dump(array($n => $v));
 	}
-	
+
 	echo "===PROPERTY===\n";
-	
+
 	var_dump($obj->pub1);
 	var_dump(isset($obj->a));
 	$obj->setFlags($flags | 2);
 	var_dump($obj->pub1);
 	var_dump(isset($obj->a));
-	
+
 	var_dump($it->pub2);
 	var_dump(isset($it->pub1));
 	$it->setFlags($flags | 2);
diff --git a/ext/spl/tests/array_021.phpt b/ext/spl/tests/array_021.phpt
index f2ae0c87e5d..cfe2bcb77d5 100644
--- a/ext/spl/tests/array_021.phpt
+++ b/ext/spl/tests/array_021.phpt
@@ -25,7 +25,7 @@ catch (Exception $e)
 
 ?>
 ===DONE===
---EXPECT--	
+--EXPECT--
 foo::seek(bar)
 got exception
 ===DONE===
diff --git a/ext/spl/tests/array_022.phpt b/ext/spl/tests/array_022.phpt
index 1ce6cae4ade..75eeb8884f5 100644
--- a/ext/spl/tests/array_022.phpt
+++ b/ext/spl/tests/array_022.phpt
@@ -44,7 +44,7 @@ var_dump($b);
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 ==ArrayObject===
 object(MyArrayObject)#%d (1) {
   ["bar"]=>
diff --git a/ext/spl/tests/bug32134.phpt b/ext/spl/tests/bug32134.phpt
index 5a880b321d1..7c3f810401a 100644
--- a/ext/spl/tests/bug32134.phpt
+++ b/ext/spl/tests/bug32134.phpt
@@ -2,7 +2,7 @@
 Bug #32134 (Overloading offsetGet/offsetSet)
 --FILE--
 <?php
-	
+
 class myArray extends ArrayIterator
 {
 
diff --git a/ext/spl/tests/bug33136.phpt b/ext/spl/tests/bug33136.phpt
index 121ff58ad7d..4d9a1506ca4 100644
--- a/ext/spl/tests/bug33136.phpt
+++ b/ext/spl/tests/bug33136.phpt
@@ -6,19 +6,19 @@ Bug #33136 (method offsetSet in class extended from ArrayObject crash PHP)
 class Collection extends ArrayObject
 {
 	private $data;
-	
+
 	function __construct()
 	{
 		$this->data = array();
 		parent::__construct($this->data);
 	}
-	
+
 	function offsetGet($index)
 	{
 		echo __METHOD__ . "($index)\n";
 		return parent::offsetGet($index);
 	}
-	
+
 	function offsetSet($index, $value)
 	{
 		echo __METHOD__ . "(" . (is_null($index) ? "NULL" : $index) . ",$value)\n";
diff --git a/ext/spl/tests/bug34548.phpt b/ext/spl/tests/bug34548.phpt
index 27c3094902e..399aa337880 100644
--- a/ext/spl/tests/bug34548.phpt
+++ b/ext/spl/tests/bug34548.phpt
@@ -26,7 +26,7 @@ print_r($foo->getArrayCopy());
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 Array
 (
     [0] => one
diff --git a/ext/spl/tests/bug36258.phpt b/ext/spl/tests/bug36258.phpt
index 60817d06ba4..428158c858c 100644
--- a/ext/spl/tests/bug36258.phpt
+++ b/ext/spl/tests/bug36258.phpt
@@ -13,7 +13,7 @@ foreach ($diriter as $key => $file) {
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 string(%d) "%s"
 string(%d) "%s"
 ===DONE===
diff --git a/ext/spl/tests/bug36825.phpt b/ext/spl/tests/bug36825.phpt
index 35de013a8f0..3b681672047 100644
--- a/ext/spl/tests/bug36825.phpt
+++ b/ext/spl/tests/bug36825.phpt
@@ -25,7 +25,7 @@ catch (Exception $e)
 
 ?>
 ===DONE===
---EXPECT--	
+--EXPECT--
 foo::offsetGet(bar)
 got exception
 ===DONE===
diff --git a/ext/spl/tests/bug37457.phpt b/ext/spl/tests/bug37457.phpt
index e66fa4d6ed5..a4caa517a99 100644
--- a/ext/spl/tests/bug37457.phpt
+++ b/ext/spl/tests/bug37457.phpt
@@ -6,13 +6,13 @@ Bug #37457 (Crash when an exception is thrown in accept() method of FilterIterat
 class Collection implements Iterator
 {
 	protected $array, $valid = false;
-	
+
 	public function __construct(array $a)
 	{
 		echo __METHOD__ . "\n";
 		$this->array = $a;
 	}
-	
+
 	public function current()
 	{
 		echo __METHOD__ . "\n";
diff --git a/ext/spl/tests/bug41691.phpt b/ext/spl/tests/bug41691.phpt
index 3cf3d8780c0..aa6d6657e0e 100644
--- a/ext/spl/tests/bug41691.phpt
+++ b/ext/spl/tests/bug41691.phpt
@@ -17,7 +17,7 @@ var_dump($a->exchangeArray(array('a'=>1,'b'=>1,'c'=>1)));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {
   ["a"]=>
   NULL
diff --git a/ext/spl/tests/bug41692.phpt b/ext/spl/tests/bug41692.phpt
index c9b7d8d60f0..6095a3800be 100644
--- a/ext/spl/tests/bug41692.phpt
+++ b/ext/spl/tests/bug41692.phpt
@@ -20,7 +20,7 @@ var_dump($bar);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 object(Bar)#%d (2) {
   ["foo":"Bar":private]=>
   array(3) {
diff --git a/ext/spl/tests/bug42703.phpt b/ext/spl/tests/bug42703.phpt
index 5c52763cd69..cf1180c242c 100644
--- a/ext/spl/tests/bug42703.phpt
+++ b/ext/spl/tests/bug42703.phpt
@@ -5,18 +5,18 @@ Bug #42703 (Exception raised in an iterator::current() causes segfault in Filter
 class BlaIterator implements Iterator
 {
 	public function rewind() { }
-	
+
 	public function next() { }
-	
+
 	public function valid() {
 		return true;
 	}
-	
+
 	public function current()
 	{
 	  throw new Exception('boo');
 	}
-	
+
 	public function key() { }
 }
 
diff --git a/ext/spl/tests/bug45216.phpt b/ext/spl/tests/bug45216.phpt
index b3c4aa51bff..99ea491e783 100644
--- a/ext/spl/tests/bug45216.phpt
+++ b/ext/spl/tests/bug45216.phpt
@@ -4,7 +4,7 @@ SPL: SplFileObject::fgetss (bug 45216)
 Perrick Penet <perrick@noparking.net>
 #testfest phpcampparis 2008-06-07
 --FILE--
-<?php 
+<?php
 $file = dirname(__FILE__) . '/foo.html';
 file_put_contents($file, 'text 0<div class="tested">text 1</div>');
 $handle = fopen($file, 'r');
diff --git a/ext/spl/tests/bug45614.phpt b/ext/spl/tests/bug45614.phpt
index 9ab3186a75e..d9e9207d285 100644
--- a/ext/spl/tests/bug45614.phpt
+++ b/ext/spl/tests/bug45614.phpt
@@ -9,7 +9,7 @@ class C {
 	public $pub2 = 'public2';
 	public $pub3 = 'public3';
 	public $pub4 = 'public4';
-} 
+}
 
 function showFirstTwoItems($it) {
   echo str_replace("\0", '\0', $it->key()) . " => " . $it->current() .
diff --git a/ext/spl/tests/bug45622.phpt b/ext/spl/tests/bug45622.phpt
index c8d16804c0c..1638000f09b 100644
--- a/ext/spl/tests/bug45622.phpt
+++ b/ext/spl/tests/bug45622.phpt
@@ -5,7 +5,7 @@ SPL: Bug #45622 (isset($arrayObject->p) misbehaves with ArrayObject::ARRAY_AS_PR
 
 class C extends ArrayObject {
 	public $p = 'object property';
-}	
+}
 
 $ao = new C(array('p'=>'array element'));
 $ao->setFlags(ArrayObject::ARRAY_AS_PROPS);
diff --git a/ext/spl/tests/bug45622b.phpt b/ext/spl/tests/bug45622b.phpt
index f101a8459da..879d6103019 100644
--- a/ext/spl/tests/bug45622b.phpt
+++ b/ext/spl/tests/bug45622b.phpt
@@ -13,7 +13,7 @@ $ao = new UsesMagic(array(), ArrayObject::ARRAY_AS_PROPS);
 echo "Doesn't trigger __get.\n";
 echo $ao->prop1;
 
-echo "Doesn't trigger __set.\n";    
+echo "Doesn't trigger __set.\n";
 $ao->prop2 = 'foo';
 
 echo "Doesn't trigger __unset.\n";
diff --git a/ext/spl/tests/bug49723.phpt b/ext/spl/tests/bug49723.phpt
index 221e8066118..1557cbc15d4 100644
--- a/ext/spl/tests/bug49723.phpt
+++ b/ext/spl/tests/bug49723.phpt
@@ -1,5 +1,5 @@
 --TEST--
-LimitIterator: do not seek if not needed 
+LimitIterator: do not seek if not needed
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/bug50579.phpt b/ext/spl/tests/bug50579.phpt
index e32262a743f..86d8d9c1b66 100644
--- a/ext/spl/tests/bug50579.phpt
+++ b/ext/spl/tests/bug50579.phpt
@@ -6,8 +6,8 @@ Bug #50579 (RegexIterator::REPLACE doesn't work)
 class foo extends ArrayIterator {
 	public function __construct( ) {
 		parent::__construct(array(
-		'test1'=>'test888', 
-		'test2'=>'what?', 
+		'test1'=>'test888',
+		'test2'=>'what?',
 		'test3'=>'test999'));
 	}
 }
@@ -17,7 +17,7 @@ $i->replacement = '[$0]';
 foreach ($i as $name=>$value) {
 	echo $name . '=>' . $value . "\n";
 }
-  
+
 $i->replacement = '$1';
 foreach ($i as $name=>$value) {
 	echo $name . '=>' . $value . "\n";
diff --git a/ext/spl/tests/bug52238.phpt b/ext/spl/tests/bug52238.phpt
index 667c0a497ad..53e53e97296 100644
--- a/ext/spl/tests/bug52238.phpt
+++ b/ext/spl/tests/bug52238.phpt
@@ -7,7 +7,7 @@ class Foo implements IteratorAggregate
     public function bar() {
         throw new Exception;
     }
-					        
+
     public function getIterator() {
         return new ArrayIterator($this->bar());
     }
diff --git a/ext/spl/tests/bug53515.phpt b/ext/spl/tests/bug53515.phpt
index 8ecb02b1e61..53ecd5c2aff 100644
--- a/ext/spl/tests/bug53515.phpt
+++ b/ext/spl/tests/bug53515.phpt
@@ -11,7 +11,7 @@ $a[''] = '';
 
 foreach ($a as $key => $value) {
  echo $key . ': ' . (is_null($value) ? 'null' : @"$value") .
-    ' array_key_exists: ' . (array_key_exists($key, $a) ? 'true' : 'false') . 
+    ' array_key_exists: ' . (array_key_exists($key, $a) ? 'true' : 'false') .
     ' property_exists: ' . (property_exists($o, $key) ? 'true' : 'false'),"\n";
 }
 
diff --git a/ext/spl/tests/bug60201.phpt b/ext/spl/tests/bug60201.phpt
index c77988eb132..351b0b08a52 100644
--- a/ext/spl/tests/bug60201.phpt
+++ b/ext/spl/tests/bug60201.phpt
@@ -4,7 +4,7 @@ Bug #60201 (SplFileObject::setCsvControl does not expose third argument via Refl
 <?php
 
 $method = new ReflectionMethod('SplFileObject', 'setCsvControl');
-$params = $method->getParameters(); 
+$params = $method->getParameters();
 var_dump($params);
 
 ?>
diff --git a/ext/spl/tests/bug62433.phpt b/ext/spl/tests/bug62433.phpt
index bfb3568bacb..e96af6e9880 100644
--- a/ext/spl/tests/bug62433.phpt
+++ b/ext/spl/tests/bug62433.phpt
@@ -11,7 +11,7 @@ var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '..', $dots));
 var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '.', $ndots));
 var_dump(in_array(__DIR__ . DIRECTORY_SEPARATOR . '..', $ndots));
 ?>
---EXPECT--	
+--EXPECT--
 bool(true)
 bool(true)
 bool(false)
diff --git a/ext/spl/tests/bug62904.phpt b/ext/spl/tests/bug62904.phpt
index 8ce0d7bc791..ae9151483a5 100644
--- a/ext/spl/tests/bug62904.phpt
+++ b/ext/spl/tests/bug62904.phpt
@@ -3,7 +3,7 @@ Bug #62904 (Crash when cloning an object which inherits SplFixedArray)
 --FILE--
 <?php
 
-class foo extends SplFixedArray {       
+class foo extends SplFixedArray {
     public function __construct($size) {
     }
 }
diff --git a/ext/spl/tests/bug64264.phpt b/ext/spl/tests/bug64264.phpt
index e7b695bd82f..90b3af84aa8 100644
--- a/ext/spl/tests/bug64264.phpt
+++ b/ext/spl/tests/bug64264.phpt
@@ -2,12 +2,12 @@
 Bug #64264 (SPLFixedArray toArray problem)
 --FILE--
 <?php
-class MyFixedArray extends \SplFixedArray {                                                                                                                                 
-    protected $foo;                                                                                                                                                         
-    protected $bar;                                                                                                                                                         
-}                                                                                                                                                                           
+class MyFixedArray extends \SplFixedArray {
+    protected $foo;
+    protected $bar;
+}
 
-$myFixedArr = new MyFixedArray(1);                                                                                                                                          
+$myFixedArr = new MyFixedArray(1);
 $myFixedArr[0] = 'foo';
 $myFixedArr->setSize(2);
 $myFixedArr[1] = 'bar';
diff --git a/ext/spl/tests/bug66834.phpt b/ext/spl/tests/bug66834.phpt
index 66686c771ab..eed26c815f4 100644
--- a/ext/spl/tests/bug66834.phpt
+++ b/ext/spl/tests/bug66834.phpt
@@ -4,7 +4,7 @@ SPL: Bug #66834
 <?php
 
 // overrides both offsetExists and offsetGet
-class ArrayObjectBoth extends ArrayObject 
+class ArrayObjectBoth extends ArrayObject
 {
 	public function offsetExists($offset) {
 		var_dump('Called: '.__METHOD__);
@@ -18,7 +18,7 @@ class ArrayObjectBoth extends ArrayObject
 }
 
 // overrides only offsetExists
-class ArrayObjectExists extends ArrayObject 
+class ArrayObjectExists extends ArrayObject
 {
 	public function offsetExists($offset) {
 		var_dump('Called: '.__METHOD__);
@@ -27,7 +27,7 @@ class ArrayObjectExists extends ArrayObject
 }
 
 // overrides only offsetGet
-class ArrayObjectGet extends ArrayObject 
+class ArrayObjectGet extends ArrayObject
 {
 	public function offsetGet($offset) {
 		var_dump('Called: '.__METHOD__);
diff --git a/ext/spl/tests/bug68479.phpt b/ext/spl/tests/bug68479.phpt
index e4e7976a9bf..a217f031d54 100644
--- a/ext/spl/tests/bug68479.phpt
+++ b/ext/spl/tests/bug68479.phpt
@@ -4,7 +4,7 @@ Bug #68479 (Escape parameter missing from SplFileObject::fputcsv)
 <?php
 
 $method = new ReflectionMethod('SplFileObject', 'fputcsv');
-$params = $method->getParameters(); 
+$params = $method->getParameters();
 var_dump($params);
 
 ?>
diff --git a/ext/spl/tests/bug71838.phpt b/ext/spl/tests/bug71838.phpt
index 44fc761ceb1..dc44625d8e0 100644
--- a/ext/spl/tests/bug71838.phpt
+++ b/ext/spl/tests/bug71838.phpt
@@ -9,7 +9,7 @@ class A extends SplObjectStorage {
     public function __construct() {
         $this->a = '123';
     }
-    
+
     public function getA() {
         return $this->a;
     }
diff --git a/ext/spl/tests/bug73471.phpt b/ext/spl/tests/bug73471.phpt
index 6fdbf187be1..43af0ac9659 100644
--- a/ext/spl/tests/bug73471.phpt
+++ b/ext/spl/tests/bug73471.phpt
@@ -11,5 +11,5 @@ foreach($events as $event){}
 $iterator->append($events2);
 ?>
 ===DONE===
---EXPECT--	
+--EXPECT--
 ===DONE===
diff --git a/ext/spl/tests/bug74519.phpt b/ext/spl/tests/bug74519.phpt
index 92efb6378a8..6492997b1ac 100644
--- a/ext/spl/tests/bug74519.phpt
+++ b/ext/spl/tests/bug74519.phpt
@@ -15,7 +15,7 @@ while($iterator->valid()) {
 }
 ?>
 ===DONE===
---EXPECT--	
+--EXPECT--
 2
 3
 4
diff --git a/ext/spl/tests/bug75173.phpt b/ext/spl/tests/bug75173.phpt
index a2cc9097b14..fa5d2ac3716 100644
--- a/ext/spl/tests/bug75173.phpt
+++ b/ext/spl/tests/bug75173.phpt
@@ -8,7 +8,7 @@ $it->append(new ArrayIterator(['foo']));
 
 foreach ($it as $item) {
     var_dump($item);
-    
+
     if ('foo' === $item) {
         $it->append(new ArrayIterator(['bar']));
     }
diff --git a/ext/spl/tests/bug76367.phpt b/ext/spl/tests/bug76367.phpt
index f34e8a39def..38aefbc922e 100644
--- a/ext/spl/tests/bug76367.phpt
+++ b/ext/spl/tests/bug76367.phpt
@@ -10,7 +10,7 @@ while($iter->valid()) {
 	    $iter->next();
 }
 
-var_dump($iter->current()); 
+var_dump($iter->current());
 ?>
 --EXPECT--
 NULL
diff --git a/ext/spl/tests/class_implements_basic.phpt b/ext/spl/tests/class_implements_basic.phpt
index 1170b214f8a..986b81e8bc0 100644
--- a/ext/spl/tests/class_implements_basic.phpt
+++ b/ext/spl/tests/class_implements_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-SPL: Test class_implements() function : basic 
+SPL: Test class_implements() function : basic
 --FILE--
 <?php
 /* Prototype  : array class_implements(mixed what [, bool autoload ])
- * Description: Return all classes and interfaces implemented by SPL 
+ * Description: Return all classes and interfaces implemented by SPL
  * Source code: ext/spl/php_spl.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing class_implements() : basic ***\n";
diff --git a/ext/spl/tests/class_implements_basic2.phpt b/ext/spl/tests/class_implements_basic2.phpt
index ea25e5b98d2..6eb3af4556b 100644
--- a/ext/spl/tests/class_implements_basic2.phpt
+++ b/ext/spl/tests/class_implements_basic2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-SPL: Test class_implements() function : basic 
+SPL: Test class_implements() function : basic
 --FILE--
 <?php
 /* Prototype  : array class_implements(mixed what [, bool autoload ])
- * Description: Return all classes and interfaces implemented by SPL 
+ * Description: Return all classes and interfaces implemented by SPL
  * Source code: ext/spl/php_spl.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing class_implements() : basic ***\n";
diff --git a/ext/spl/tests/class_implements_variation.phpt b/ext/spl/tests/class_implements_variation.phpt
index 4d9e88622d1..7498a14559b 100644
--- a/ext/spl/tests/class_implements_variation.phpt
+++ b/ext/spl/tests/class_implements_variation.phpt
@@ -3,9 +3,9 @@ SPL: Test class_implements() function : variation - no interfaces and autoload
 --FILE--
 <?php
 /* Prototype  : array class_implements(mixed what [, bool autoload ])
- * Description: Return all classes and interfaces implemented by SPL 
+ * Description: Return all classes and interfaces implemented by SPL
  * Source code: ext/spl/php_spl.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing class_implements() : variation ***\n";
diff --git a/ext/spl/tests/class_implements_variation1.phpt b/ext/spl/tests/class_implements_variation1.phpt
index d8a45ce6a64..9d876d3a361 100644
--- a/ext/spl/tests/class_implements_variation1.phpt
+++ b/ext/spl/tests/class_implements_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-SPL: Test class_implements() function : variation 
+SPL: Test class_implements() function : variation
 --FILE--
 <?php
 /* Prototype  : array class_implements(mixed what [, bool autoload ])
- * Description: Return all classes and interfaces implemented by SPL 
+ * Description: Return all classes and interfaces implemented by SPL
  * Source code: ext/spl/php_spl.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing class_implements() : variation ***\n";
@@ -96,7 +96,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       //resource
       'resource' => $res,
 );
diff --git a/ext/spl/tests/class_implements_variation2.phpt b/ext/spl/tests/class_implements_variation2.phpt
index f6953577f32..f840e789292 100644
--- a/ext/spl/tests/class_implements_variation2.phpt
+++ b/ext/spl/tests/class_implements_variation2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-SPL: Test class_implements() function : variation 
+SPL: Test class_implements() function : variation
 --FILE--
 <?php
 /* Prototype  : array class_implements(mixed what [, bool autoload ])
- * Description: Return all classes and interfaces implemented by SPL 
+ * Description: Return all classes and interfaces implemented by SPL
  * Source code: ext/spl/php_spl.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing class_implements() : variation ***\n";
@@ -96,7 +96,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       //resource
       'resource' => $res,
 );
diff --git a/ext/spl/tests/class_uses_basic.phpt b/ext/spl/tests/class_uses_basic.phpt
index 8aeb7b52a77..8cad9cab07c 100644
--- a/ext/spl/tests/class_uses_basic.phpt
+++ b/ext/spl/tests/class_uses_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-SPL: Test class_implements() function : basic 
+SPL: Test class_implements() function : basic
 --FILE--
 <?php
 /* Prototype  : array class_uses(mixed what [, bool autoload ])
  * Description: Return all traits used by a class
  * Source code: ext/spl/php_spl.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing class_uses() : basic ***\n";
diff --git a/ext/spl/tests/class_uses_basic2.phpt b/ext/spl/tests/class_uses_basic2.phpt
index a0ffe8b861f..be4bfa08d00 100644
--- a/ext/spl/tests/class_uses_basic2.phpt
+++ b/ext/spl/tests/class_uses_basic2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-SPL: Test class_uses() function : basic 
+SPL: Test class_uses() function : basic
 --FILE--
 <?php
 /* Prototype  : array class_uses(mixed what [, bool autoload ])
  * Description: Return all traits used by a class
  * Source code: ext/spl/php_spl.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing class_uses() : basic ***\n";
diff --git a/ext/spl/tests/class_uses_variation.phpt b/ext/spl/tests/class_uses_variation.phpt
index 3424e13397d..5df38cc2a42 100644
--- a/ext/spl/tests/class_uses_variation.phpt
+++ b/ext/spl/tests/class_uses_variation.phpt
@@ -5,7 +5,7 @@ SPL: Test class_uses() function : variation - no interfaces and autoload
 /* Prototype  : array class_uses(mixed what [, bool autoload ])
  * Description: Return all traits used by a class
  * Source code: ext/spl/php_spl.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing class_uses() : variation ***\n";
diff --git a/ext/spl/tests/class_uses_variation1.phpt b/ext/spl/tests/class_uses_variation1.phpt
index aa0ba35c941..be6aa9ac7f2 100644
--- a/ext/spl/tests/class_uses_variation1.phpt
+++ b/ext/spl/tests/class_uses_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-SPL: Test class_uses() function : variation 
+SPL: Test class_uses() function : variation
 --FILE--
 <?php
 /* Prototype  : array class_uses(mixed what [, bool autoload ])
  * Description: Return all traits used by a class
  * Source code: ext/spl/php_spl.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing class_uses() : variation ***\n";
@@ -96,7 +96,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       //resource
       'resource' => $res,
 );
diff --git a/ext/spl/tests/class_uses_variation2.phpt b/ext/spl/tests/class_uses_variation2.phpt
index 36c9623cb3a..ae6093f02ea 100644
--- a/ext/spl/tests/class_uses_variation2.phpt
+++ b/ext/spl/tests/class_uses_variation2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-SPL: Test class_uses() function : variation 
+SPL: Test class_uses() function : variation
 --FILE--
 <?php
 /* Prototype  : array class_uses(mixed what [, bool autoload ])
  * Description: Return all traits used by a class
  * Source code: ext/spl/php_spl.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing class_uses() : variation ***\n";
@@ -98,7 +98,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       //resource
       'resource' => $res,
 );
diff --git a/ext/spl/tests/countable_class_basic1.phpt b/ext/spl/tests/countable_class_basic1.phpt
index c64aad6b6d9..177afc8e5da 100644
--- a/ext/spl/tests/countable_class_basic1.phpt
+++ b/ext/spl/tests/countable_class_basic1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SPL: Test shape of interface Countable.
 --SKIPIF--
-<?php 
+<?php
 // Skip the test case if Standard PHP Library(spl) is not installed
   if( !extension_loaded('spl'))
   {
diff --git a/ext/spl/tests/fileobject_003.phpt b/ext/spl/tests/fileobject_003.phpt
index 6cc650b7b5f..822e21b9fa9 100644
--- a/ext/spl/tests/fileobject_003.phpt
+++ b/ext/spl/tests/fileobject_003.phpt
@@ -17,7 +17,7 @@ function test($name, $lc, $lp)
 	var_dump($o === $c);
 	var_dump($o == $c);
 	var_dump($o->getPathname() == $c->getPathname());
-	
+
 	try {
 		$f = new SplFileObject($name);
 		var_dump($name);
diff --git a/ext/spl/tests/fileobject_005.phpt b/ext/spl/tests/fileobject_005.phpt
index fa9e6db173e..781614abcc2 100644
--- a/ext/spl/tests/fileobject_005.phpt
+++ b/ext/spl/tests/fileobject_005.phpt
@@ -21,7 +21,7 @@ var_dump($fo->fgets(8));
 $fo->rewind();
 $fo->fwrite("blahlubba");
 
-// This should throw a warning and return NULL since an argument is missing 
+// This should throw a warning and return NULL since an argument is missing
 var_dump($fo->ftruncate());
 
 ?>
diff --git a/ext/spl/tests/fileobject_getbasename_basic.phpt b/ext/spl/tests/fileobject_getbasename_basic.phpt
index 34fecdc31c4..5fb7ffdec2a 100644
--- a/ext/spl/tests/fileobject_getbasename_basic.phpt
+++ b/ext/spl/tests/fileobject_getbasename_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: SplFileObject::getBasename 
+SPL: SplFileObject::getBasename
 --CREDITS--
 H�vard Eide <nucleuz at gmail.com>
 #Testfest php.no
diff --git a/ext/spl/tests/fileobject_getmaxlinelen_basic.phpt b/ext/spl/tests/fileobject_getmaxlinelen_basic.phpt
index b08a71190d6..49cf536f89d 100644
--- a/ext/spl/tests/fileobject_getmaxlinelen_basic.phpt
+++ b/ext/spl/tests/fileobject_getmaxlinelen_basic.phpt
@@ -7,8 +7,8 @@ H�vard Eide <nucleuz at gmail.com>
 include_path=.
 --FILE--
 <?php
-$s = new SplFileObject( __FILE__ ); 
-$s->setMaxLineLen( 7 );  
+$s = new SplFileObject( __FILE__ );
+$s->setMaxLineLen( 7 );
 echo $s->getMaxLineLen();
 ?>
 --EXPECT--
diff --git a/ext/spl/tests/fileobject_setmaxlinelen_basic.phpt b/ext/spl/tests/fileobject_setmaxlinelen_basic.phpt
index 1d81a6f6518..3af6f01a7f5 100644
--- a/ext/spl/tests/fileobject_setmaxlinelen_basic.phpt
+++ b/ext/spl/tests/fileobject_setmaxlinelen_basic.phpt
@@ -7,8 +7,8 @@ H�vard Eide <nucleuz at gmail.com>
 include_path=.
 --FILE--
 <?php
-$s = new SplFileObject( __FILE__ ); 
-$s->setMaxLineLen( 3);  
+$s = new SplFileObject( __FILE__ );
+$s->setMaxLineLen( 3);
 echo $s->getCurrentLine();
 ?>
 --EXPECT--
diff --git a/ext/spl/tests/filesystemiterator_flags.phpt b/ext/spl/tests/filesystemiterator_flags.phpt
index 635345655b3..c74129760c0 100644
--- a/ext/spl/tests/filesystemiterator_flags.phpt
+++ b/ext/spl/tests/filesystemiterator_flags.phpt
@@ -10,7 +10,7 @@ printflags($it);
 
 $it->setFlags(FileSystemIterator::CURRENT_AS_SELF |
 		FileSystemIterator::KEY_AS_FILENAME |
-		FileSystemIterator::SKIP_DOTS | 
+		FileSystemIterator::SKIP_DOTS |
 		FileSystemIterator::UNIX_PATHS);
 printflags($it);
 
diff --git a/ext/spl/tests/fixedarray_008.phpt b/ext/spl/tests/fixedarray_008.phpt
index 8775d61fff4..6d9c9cbf095 100644
--- a/ext/spl/tests/fixedarray_008.phpt
+++ b/ext/spl/tests/fixedarray_008.phpt
@@ -17,7 +17,7 @@ foreach ($a as $x) {
 		var_dump($x[0]);
 	} else {
 		var_dump($x);
-	}	
+	}
 }
 
 var_dump($a->getSize());
diff --git a/ext/spl/tests/fixedarray_010.phpt b/ext/spl/tests/fixedarray_010.phpt
index 472e8b07a23..7af3a831560 100644
--- a/ext/spl/tests/fixedarray_010.phpt
+++ b/ext/spl/tests/fixedarray_010.phpt
@@ -30,10 +30,10 @@ var_dump($a->getSize());
 
 $a = new SplFixedArray(3);
 
-$a[0] = "test"; 
-$a[1] = array(1,2,"blah"); 
-$a[2] = 1; 
-$a[0] = "test"; 
+$a[0] = "test";
+$a[1] = array(1,2,"blah");
+$a[2] = 1;
+$a[0] = "test";
 
 $a->setSize(0);
 var_dump($a->getSize());
diff --git a/ext/spl/tests/fixedarray_015.phpt b/ext/spl/tests/fixedarray_015.phpt
index b6f119ab1f7..11dca712a5e 100644
--- a/ext/spl/tests/fixedarray_015.phpt
+++ b/ext/spl/tests/fixedarray_015.phpt
@@ -11,6 +11,6 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Ok - SplFixedArray::__construct() expects parameter 1 to be integer, string given
 Done
diff --git a/ext/spl/tests/heap_corruption.phpt b/ext/spl/tests/heap_corruption.phpt
index 5e9dec78559..6b85681de53 100644
--- a/ext/spl/tests/heap_corruption.phpt
+++ b/ext/spl/tests/heap_corruption.phpt
@@ -9,7 +9,7 @@ Mike Sullivan <mikesul@php.net>
 class myHeap extends SplHeap
 {
 	public $allow_compare = true;
-	
+
 	public function compare($v1, $v2)
 	{
 		if ($this->allow_compare == true)
diff --git a/ext/spl/tests/iterator_001.phpt b/ext/spl/tests/iterator_001.phpt
index 26df62e85b2..f5bb6974d9c 100644
--- a/ext/spl/tests/iterator_001.phpt
+++ b/ext/spl/tests/iterator_001.phpt
@@ -44,7 +44,7 @@ class NumericArrayIterator implements Iterator
 		echo __METHOD__ . "\n";
 		$this->i++;
 	}
-	
+
 	public function greaterThan($comp)
 	{
 		echo get_class($this) . '::' . __FUNCTION__ . '(' . $comp . ")\n";
diff --git a/ext/spl/tests/iterator_002.phpt b/ext/spl/tests/iterator_002.phpt
index 527fe6b7768..61765421f17 100644
--- a/ext/spl/tests/iterator_002.phpt
+++ b/ext/spl/tests/iterator_002.phpt
@@ -9,7 +9,7 @@ class RecursiceArrayIterator extends ArrayIterator implements RecursiveIterator
 	{
 		return is_array($this->current());
 	}
-	
+
 	function getChildren()
 	{
 		return new RecursiceArrayIterator($this->current());
@@ -22,12 +22,12 @@ class CrashIterator extends FilterIterator implements RecursiveIterator
 	{
 		return true;
 	}
-	
+
 	function hasChildren()
 	{
 		return $this->getInnerIterator()->hasChildren();
 	}
-	
+
 	function getChildren()
 	{
 		return new RecursiceArrayIterator($this->getInnerIterator()->current());
diff --git a/ext/spl/tests/iterator_003.phpt b/ext/spl/tests/iterator_003.phpt
index 11d37b303b0..f119661f579 100644
--- a/ext/spl/tests/iterator_003.phpt
+++ b/ext/spl/tests/iterator_003.phpt
@@ -18,7 +18,7 @@ class Student
 	{
 		return $this->id . ', ' . $this->name;
 	}
-	
+
 	public function getId()
 	{
 		return $this->id;
@@ -34,7 +34,7 @@ class StudentIdFilter extends FilterIterator
 		FilterIterator::__construct($students->getIterator());
 		$this->id = $other->getId();
 	}
-	
+
 	public function accept()
 	{
 		echo "ACCEPT ".$this->current()->getId()." == ".$this->id."\n";
@@ -45,19 +45,19 @@ class StudentIdFilter extends FilterIterator
 class StudentList implements IteratorAggregate
 {
 	private $students;
-	
+
 	public function __construct()
 	{
 		$this->students = new ArrayObject(array());
 	}
-	
+
 	public function add(Student $student)
 	{
 		if (!$this->contains($student)) {
 			$this->students[] = $student;
 		}
 	}
-	
+
 	public function contains(Student $student)
 	{
 		foreach ($this->students as $s)
@@ -68,7 +68,7 @@ class StudentList implements IteratorAggregate
 		}
 		return false;
 	}
-	
+
 	public function getIterator() {
 		return new CachingIterator($this->students->getIterator(), true);
 	}
diff --git a/ext/spl/tests/iterator_022.phpt b/ext/spl/tests/iterator_022.phpt
index 8d055313ace..f0831d5799a 100644
--- a/ext/spl/tests/iterator_022.phpt
+++ b/ext/spl/tests/iterator_022.phpt
@@ -88,7 +88,7 @@ class RecursiveArrayIteratorIterator extends RecursiveIteratorIterator
 		}
 		return $res;
 	}
-	
+
 	function callGetChildren()
 	{
 		if ($this->over == 2)
diff --git a/ext/spl/tests/iterator_023.phpt b/ext/spl/tests/iterator_023.phpt
index 1b6b4685ec1..c11a7355cfa 100644
--- a/ext/spl/tests/iterator_023.phpt
+++ b/ext/spl/tests/iterator_023.phpt
@@ -88,7 +88,7 @@ class RecursiveArrayIteratorIterator extends RecursiveIteratorIterator
 		}
 		return $res;
 	}
-	
+
 	function callGetChildren()
 	{
 		if ($this->over == 2)
diff --git a/ext/spl/tests/iterator_025.phpt b/ext/spl/tests/iterator_025.phpt
index e582b1f39e8..623a4cbcf41 100644
--- a/ext/spl/tests/iterator_025.phpt
+++ b/ext/spl/tests/iterator_025.phpt
@@ -9,7 +9,7 @@ class MyRecursiveIteratorIterator extends RecursiveIteratorIterator
 	{
 		echo __METHOD__ . "()\n";
 	}
-	
+
 	function endIteration()
 	{
 		echo __METHOD__ . "()\n";
diff --git a/ext/spl/tests/iterator_031.phpt b/ext/spl/tests/iterator_031.phpt
index 8bd3ca7c54c..da91469f088 100644
--- a/ext/spl/tests/iterator_031.phpt
+++ b/ext/spl/tests/iterator_031.phpt
@@ -37,13 +37,13 @@ class MyAppendIterator extends AppendIterator
 		echo __METHOD__ . "\n";
 		return parent::valid();
 	}
-	
+
 	function append(Iterator $what)
 	{
 		echo __METHOD__ . "\n";
 		parent::append($what);
 	}
-	
+
 	function parent__construct()
 	{
 		parent::__construct();
diff --git a/ext/spl/tests/iterator_034.phpt b/ext/spl/tests/iterator_034.phpt
index 3329e744bdb..84b15d4eecb 100644
--- a/ext/spl/tests/iterator_034.phpt
+++ b/ext/spl/tests/iterator_034.phpt
@@ -23,7 +23,7 @@ class MyRecursiveArrayIterator extends RecursiveArrayIterator
 		echo __METHOD__ . "()\n";
 		return parent::getChildren();
 	}
-	
+
 	function rewind()
 	{
 		echo __METHOD__ . "()\n";
diff --git a/ext/spl/tests/iterator_035.phpt b/ext/spl/tests/iterator_035.phpt
index 307337431ab..e6d68fbea67 100644
--- a/ext/spl/tests/iterator_035.phpt
+++ b/ext/spl/tests/iterator_035.phpt
@@ -2,7 +2,7 @@
 SPL: ArrayIterator and values assigned by reference
 --FILE--
 <?php
-	
+
 $tmp = 1;
 
 $a = new ArrayIterator();
@@ -11,7 +11,7 @@ $a[] = &$tmp;
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Indirect modification of overloaded element of ArrayIterator has no effect in %s on line %d
 
 Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %s:%d
diff --git a/ext/spl/tests/iterator_036.phpt b/ext/spl/tests/iterator_036.phpt
index 0f668db53f3..a4ff7a214c8 100644
--- a/ext/spl/tests/iterator_036.phpt
+++ b/ext/spl/tests/iterator_036.phpt
@@ -17,6 +17,6 @@ test(new CachingIterator($ar, 0));
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 
 Fatal error: Method CachingIterator::__toString() must not throw an exception, caught BadMethodCallException: CachingIterator does not fetch string value (see CachingIterator::__construct) in %siterator_036.php on line %d
diff --git a/ext/spl/tests/iterator_037.phpt b/ext/spl/tests/iterator_037.phpt
index 2aa61bb03fa..3cbb0fd3419 100644
--- a/ext/spl/tests/iterator_037.phpt
+++ b/ext/spl/tests/iterator_037.phpt
@@ -89,7 +89,7 @@ catch (Exception $e)
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 ===1===
 int(1)
 string(1) "1"
diff --git a/ext/spl/tests/iterator_045.phpt b/ext/spl/tests/iterator_045.phpt
index d76b2d93ce3..c8ffae77a5e 100644
--- a/ext/spl/tests/iterator_045.phpt
+++ b/ext/spl/tests/iterator_045.phpt
@@ -27,7 +27,7 @@ class MyCachingIterator extends CachingIterator
 			$this->offsetSet($k, $v);
 		}
 	}
-	
+
 	function testUnset($ar)
 	{
 		echo __METHOD__ . "()\n";
@@ -37,7 +37,7 @@ class MyCachingIterator extends CachingIterator
 			$this->offsetUnset($v);
 		}
 	}
-	
+
 	function fill()
 	{
 		echo __METHOD__ . "()\n";
diff --git a/ext/spl/tests/iterator_049b.phpt b/ext/spl/tests/iterator_049b.phpt
index 03c7350fa23..5175f41c0c3 100644
Binary files a/ext/spl/tests/iterator_049b.phpt and b/ext/spl/tests/iterator_049b.phpt differ
diff --git a/ext/spl/tests/iterator_052.phpt b/ext/spl/tests/iterator_052.phpt
index 84b3eb993cd..4c8191fab76 100644
--- a/ext/spl/tests/iterator_052.phpt
+++ b/ext/spl/tests/iterator_052.phpt
@@ -6,7 +6,7 @@ SPL: RegexIterator::ALL_MATCHES
 class MyRegexIterator extends RegexIterator
 {
 	public $uk, $re;
-	
+
 	function __construct($it, $re, $mode, $flags = 0)
 	{
 		$this->uk = $flags & self::USE_KEY;
@@ -22,7 +22,7 @@ class MyRegexIterator extends RegexIterator
 			var_dump($v);
 		}
 	}
-	
+
 	function accept()
 	{
 		@preg_match_all($this->re, (string)($this->uk ? $this->key() : $this->current()), $sub);
diff --git a/ext/spl/tests/iterator_053.phpt b/ext/spl/tests/iterator_053.phpt
index 21c044c1b2d..fb8e1e5f149 100644
--- a/ext/spl/tests/iterator_053.phpt
+++ b/ext/spl/tests/iterator_053.phpt
@@ -6,7 +6,7 @@ SPL: RegexIterator::ALL_MATCHES
 class MyRegexIterator extends RegexIterator
 {
 	public $uk, $re;
-	
+
 	function __construct($it, $re, $mode, $flags = 0)
 	{
 		$this->uk = $flags & self::USE_KEY;
@@ -22,7 +22,7 @@ class MyRegexIterator extends RegexIterator
 			var_dump($v);
 		}
 	}
-	
+
 	function accept()
 	{
 		@preg_match_all($this->re, (string)($this->uk ? $this->key() : $this->current()), $sub);
diff --git a/ext/spl/tests/iterator_056.phpt b/ext/spl/tests/iterator_056.phpt
index b5213732c3a..ec49e6b740d 100644
--- a/ext/spl/tests/iterator_056.phpt
+++ b/ext/spl/tests/iterator_056.phpt
@@ -20,25 +20,25 @@ class myLimitIterator extends LimitIterator { }
 class myNoRewindIterator extends NoRewindIterator  {}
 
 try {
-	$it = new myFilterIterator();	
+	$it = new myFilterIterator();
 } catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
-	$it = new myCachingIterator();	
+	$it = new myCachingIterator();
 } catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
-	$it = new myRecursiveCachingIterator();	
+	$it = new myRecursiveCachingIterator();
 } catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
-	$it = new myParentIterator();	
+	$it = new myParentIterator();
 } catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
diff --git a/ext/spl/tests/iterator_057.phpt b/ext/spl/tests/iterator_057.phpt
index 602c1250155..61c1dfced61 100644
--- a/ext/spl/tests/iterator_057.phpt
+++ b/ext/spl/tests/iterator_057.phpt
@@ -5,8 +5,8 @@ Sebastian Schürmann
 --FILE--
 <?php
 /**
- * From Docs: Construct a new array iterator from anything that has a hash table. 
- * NULL, NOTHING is not a hash table ;) 
+ * From Docs: Construct a new array iterator from anything that has a hash table.
+ * NULL, NOTHING is not a hash table ;)
  */
 class myArrayIterator extends ArrayIterator {
 }
diff --git a/ext/spl/tests/iterator_058.phpt b/ext/spl/tests/iterator_058.phpt
index 3f65ecb7e4a..83d9d91feb6 100644
--- a/ext/spl/tests/iterator_058.phpt
+++ b/ext/spl/tests/iterator_058.phpt
@@ -5,16 +5,16 @@ Sebastian Schürmann
 --FILE--
 <?php
 class myIterator implements Iterator {
-	
+
 	function current() {}
 	function next() {}
-	function key() {}	
+	function key() {}
 	function valid() {}
 	function rewind() {}
-	
+
 }
 try {
-	$it = new myIterator();	
+	$it = new myIterator();
 } catch (InvalidArgumentException $e) {
 	echo 'InvalidArgumentException thrown';
 }
diff --git a/ext/spl/tests/iterator_062.phpt b/ext/spl/tests/iterator_062.phpt
index 59a1dfacf0a..3694cf19562 100644
--- a/ext/spl/tests/iterator_062.phpt
+++ b/ext/spl/tests/iterator_062.phpt
@@ -5,7 +5,7 @@ Sebastian Schürmann
 --FILE--
 <?php
 class myRecursiveIteratorIterator extends RecursiveIteratorIterator {
-	
+
 }
 
 try {
diff --git a/ext/spl/tests/iterator_069.phpt b/ext/spl/tests/iterator_069.phpt
index 1ee44785b3c..0c56f9fd3ac 100644
--- a/ext/spl/tests/iterator_069.phpt
+++ b/ext/spl/tests/iterator_069.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SPL: RecursiveIteratorIterator cannot be used with foreach by reference
 --FILE--
-<?php 
+<?php
 
 $arr = array(array(1,2));
 $arrOb = new ArrayObject($arr);
diff --git a/ext/spl/tests/iterator_071.phpt b/ext/spl/tests/iterator_071.phpt
index 8370906abb4..9f2cb6c604e 100644
--- a/ext/spl/tests/iterator_071.phpt
+++ b/ext/spl/tests/iterator_071.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SPL: RecursiveIteratorIterator - Test where the case is RS_SELF and mode is CHILD_FIRST
 --FILE--
-<?php 
+<?php
 
 $arr = array(array(1,2),2);
 $arrOb = new ArrayObject($arr);
@@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr);
 $recArrIt = new RecursiveArrayIterator($arrOb->getIterator());
 
 class MyRecursiveIteratorIterator extends RecursiveIteratorIterator {
-    
+
     function nextelement() {
     	echo __METHOD__."\n";
     }
diff --git a/ext/spl/tests/observer_001.phpt b/ext/spl/tests/observer_001.phpt
index e7d72b9e240..6408406ebf7 100644
--- a/ext/spl/tests/observer_001.phpt
+++ b/ext/spl/tests/observer_001.phpt
@@ -16,7 +16,7 @@ class ObserverImpl implements SplObserver
 	{
 		echo $this->name . '->' . __METHOD__ . '(' . $subject->getName() . ");\n";
 	}
-	
+
 	function getName()
 	{
 		return $this->name;
diff --git a/ext/spl/tests/observer_002.phpt b/ext/spl/tests/observer_002.phpt
index 5d006177f2e..504e7ca3f37 100644
--- a/ext/spl/tests/observer_002.phpt
+++ b/ext/spl/tests/observer_002.phpt
@@ -49,7 +49,7 @@ class ObserverImpl implements SplObserver
 	{
 		echo $this->name . '->' . __METHOD__ . '(' . $subject->getName() . ");\n";
 	}
-	
+
 	function getName()
 	{
 		return $this->name;
@@ -72,18 +72,18 @@ class SubjectImpl implements SplSubject
 		echo $this->name . '->' . __METHOD__ . '(' . $observer->getName() . ");\n";
 		$this->observers->attach($observer);
 	}
-	
+
 	function detach(SplObserver $observer)
 	{
 		echo $this->name . '->' . __METHOD__ . '(' . $observer->getName() . ");\n";
 		$this->observers->detach($observer);
 	}
-	
+
 	function count()
 	{
 		return $this->observers->count();
 	}
-	
+
 	function notify()
 	{
 		echo $this->name . '->' . __METHOD__ . "();\n";
@@ -97,7 +97,7 @@ class SubjectImpl implements SplSubject
 	{
 		return $this->name;
 	}
-	
+
 	function contains($obj)
 	{
 		return $this->observers->contains($obj);
diff --git a/ext/spl/tests/observer_003.phpt b/ext/spl/tests/observer_003.phpt
index 5e5da22e380..c7041051b83 100644
--- a/ext/spl/tests/observer_003.phpt
+++ b/ext/spl/tests/observer_003.phpt
@@ -6,7 +6,7 @@ SPL: SplObjectStorage serialization
 class TestClass
 {
 	public $test = 25;
-	
+
 	public function __construct($test = 42)
 	{
 		$this->test = $test;
diff --git a/ext/spl/tests/observer_004.phpt b/ext/spl/tests/observer_004.phpt
index 0bc2512d80f..a56c514615a 100644
--- a/ext/spl/tests/observer_004.phpt
+++ b/ext/spl/tests/observer_004.phpt
@@ -6,7 +6,7 @@ SPL: SplObjectStorage serialization & overloading
 class TestClass
 {
 	public $test = 25;
-	
+
 	public function __construct($test = 42)
 	{
 		$this->test = $test;
@@ -16,7 +16,7 @@ class TestClass
 class MyStorage extends SplObjectStorage
 {
 	public $bla = 25;
-	
+
 	public function __construct($bla = 26)
 	{
 		$this->bla = $bla;
diff --git a/ext/spl/tests/observer_005.phpt b/ext/spl/tests/observer_005.phpt
index 883602f51d6..fe490525b83 100644
--- a/ext/spl/tests/observer_005.phpt
+++ b/ext/spl/tests/observer_005.phpt
@@ -9,7 +9,7 @@ class TestClass
 	public    $pub = 25;
 	protected $pro = 26;
 	private   $pri = 27;
-	
+
 	public function __construct($pub = 42, $pro = 43, $pri = 44)
 	{
 		$this->pub = $pub;
@@ -28,7 +28,7 @@ class MyStorage extends SplObjectStorage
 	public    $pub = 25;
 	protected $pro = 26;
 	private   $pri = 27;
-	
+
 	public function __construct($pub = 52, $pro = 53, $pri = 54)
 	{
 		$this->pub = $pub;
diff --git a/ext/spl/tests/observer_006.phpt b/ext/spl/tests/observer_006.phpt
index 3cd84a742f6..f021dfb7f28 100644
--- a/ext/spl/tests/observer_006.phpt
+++ b/ext/spl/tests/observer_006.phpt
@@ -6,7 +6,7 @@ SPL: SplObjectStorage with accociatied information
 class TestClass
 {
 	public $test = 25;
-	
+
 	public function __construct($test = 42)
 	{
 		$this->test = $test;
@@ -16,7 +16,7 @@ class TestClass
 class MyStorage extends SplObjectStorage
 {
 	public $bla = 25;
-	
+
 	public function __construct($bla = 26)
 	{
 		$this->bla = $bla;
diff --git a/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt
index 7ed3b6eb342..cac0e2c4790 100644
--- a/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt
+++ b/ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SPL: RecursiveIteratorIterator - Exception thrown in beginchildren which should be handled in next()
 --FILE--
-<?php 
+<?php
 
 $arr = array(array(1,2),2);
 $arrOb = new ArrayObject($arr);
@@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr);
 $recArrIt = new RecursiveArrayIterator($arrOb->getIterator());
 
 class MyRecursiveIteratorIterator extends RecursiveIteratorIterator {
-    
+
     function beginchildren() {
     	throw new Exception;
     }
diff --git a/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt
index 0e3c1c1439b..1961517253d 100644
--- a/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt
+++ b/ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SPL: RecursiveIteratorIterator - Exception thrown in callHasChildren which should be handled in next()
 --FILE--
-<?php 
+<?php
 
 $arr = array(1,2);
 $arrOb = new ArrayObject($arr);
@@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr);
 $recArrIt = new RecursiveArrayIterator($arrOb->getIterator());
 
 class MyRecursiveIteratorIterator extends RecursiveIteratorIterator {
-    
+
     function callHasChildren() {
     	throw new Exception;
     }
diff --git a/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt b/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt
index 32617bf1086..941f92be822 100644
--- a/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt
+++ b/ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SPL: RecursiveIteratorIterator - Exception thrown in endchildren which should be handled in next()
 --FILE--
-<?php 
+<?php
 
 $arr = array(array(1,2));
 $arrOb = new ArrayObject($arr);
@@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr);
 $recArrIt = new RecursiveArrayIterator($arrOb->getIterator());
 
 class MyRecursiveIteratorIterator extends RecursiveIteratorIterator {
-    
+
     function endchildren() {
     	throw new Exception;
     }
diff --git a/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt b/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt
index a2c0d2ea1b8..dd4f038710d 100644
--- a/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt
+++ b/ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 SPL: RecursiveIteratorIterator - Exception thrown in nextelement which should be handled in next()
 --FILE--
-<?php 
+<?php
 
 $arr = array(1,2);
 $arrOb = new ArrayObject($arr);
@@ -9,7 +9,7 @@ $arrOb = new ArrayObject($arr);
 $recArrIt = new RecursiveArrayIterator($arrOb->getIterator());
 
 class MyRecursiveIteratorIterator extends RecursiveIteratorIterator {
-    
+
     function nextelement() {
     	throw new Exception;
     }
diff --git a/ext/spl/tests/regexiterator_setflags_exception.phpt b/ext/spl/tests/regexiterator_setflags_exception.phpt
index fdc8bca6495..44108c746d4 100644
--- a/ext/spl/tests/regexiterator_setflags_exception.phpt
+++ b/ext/spl/tests/regexiterator_setflags_exception.phpt
@@ -24,7 +24,7 @@ $rege = '/^a/';
 
 $r = new TestRegexIterator(new myIterator, $rege);
 
-try{	
+try{
 	$r->setFlags();
 }catch (Exception $e) {
 	echo $e->getMessage();
diff --git a/ext/spl/tests/regexiterator_setpregflags_exception.phpt b/ext/spl/tests/regexiterator_setpregflags_exception.phpt
index cc7c17c272f..c84af67d2b0 100644
--- a/ext/spl/tests/regexiterator_setpregflags_exception.phpt
+++ b/ext/spl/tests/regexiterator_setpregflags_exception.phpt
@@ -25,7 +25,7 @@ $rege = '/^a/';
 $r = new TestRegexIterator(new myIterator, $rege);
 
 
-try{	
+try{
 	$r->setPregFlags();
 }catch (Exception $e) {
 	echo $e->getMessage();
diff --git a/ext/spl/tests/spl_autoload_002.phpt b/ext/spl/tests/spl_autoload_002.phpt
index 2373d6dbbcb..778b22a7d00 100644
--- a/ext/spl/tests/spl_autoload_002.phpt
+++ b/ext/spl/tests/spl_autoload_002.phpt
@@ -1,8 +1,8 @@
 --TEST--
 SPL: spl_autoload_functions()
 --SKIPIF--
-<?php 
-if (spl_autoload_functions() !== false) die('skip __autoload() registered by php.ini'); 
+<?php
+if (spl_autoload_functions() !== false) die('skip __autoload() registered by php.ini');
 ?>
 --FILE--
 <?php
diff --git a/ext/spl/tests/spl_autoload_005.phpt b/ext/spl/tests/spl_autoload_005.phpt
index f4db521d52d..58c4d7ca8fa 100644
--- a/ext/spl/tests/spl_autoload_005.phpt
+++ b/ext/spl/tests/spl_autoload_005.phpt
@@ -11,7 +11,7 @@ class MyAutoLoader {
         {
         	echo __METHOD__ . "($className)\n";
         }
-        
+
         function autoThrow($className)
         {
         	echo __METHOD__ . "($className)\n";
diff --git a/ext/spl/tests/spl_autoload_008.phpt b/ext/spl/tests/spl_autoload_008.phpt
index 4b103518661..df795d02b68 100644
--- a/ext/spl/tests/spl_autoload_008.phpt
+++ b/ext/spl/tests/spl_autoload_008.phpt
@@ -18,7 +18,7 @@ class MyAutoLoader
 		echo __METHOD__ . "($className)\n";
 		throw new Exception('Bla');
 	}
-	
+
 	function dynaLoad($className)
 	{
 		echo __METHOD__ . "($className)\n";
@@ -49,9 +49,9 @@ foreach($funcs as $idx => $func)
 		if (count(spl_autoload_functions()))
 		{
 			echo "registered\n";
-			
+
 			var_dump(class_exists("NoExistingTestClass", true));
-		}		
+		}
 	}
 	catch (Exception $e)
 	{
diff --git a/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt b/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt
index dcb4287c45d..e00b25849c2 100644
--- a/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt
+++ b/ext/spl/tests/spl_caching_iterator_constructor_flags.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: CachingInterator constructor flag checks 
+SPL: CachingInterator constructor flag checks
 --CREDITS--
 Sean Burlington www.practicalweb.co.uk
 TestFest London May 2009
diff --git a/ext/spl/tests/spl_classes.phpt b/ext/spl/tests/spl_classes.phpt
index 172c4ab92d5..9d897c497dd 100644
--- a/ext/spl/tests/spl_classes.phpt
+++ b/ext/spl/tests/spl_classes.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: spl_classes() function 
+SPL: spl_classes() function
 --CREDITS--
 Sebastian Schürmann
 sebs@php.net
diff --git a/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt b/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt
index 8726f4b32a0..823c809f825 100644
--- a/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt
+++ b/ext/spl/tests/spl_heap_recoverfromcorruption_arguments.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: SplHeap check no arguments to be accepted on recoverFromCorruption 
+SPL: SplHeap check no arguments to be accepted on recoverFromCorruption
 --CREDITS--
 Rohan Abraham (rohanabrahams@gmail.com)
 TestFest London May 2009
diff --git a/ext/spl/tests/spl_iterator_getcallchildren.phpt b/ext/spl/tests/spl_iterator_getcallchildren.phpt
index 77b03b6b7fb..cbbd97bc6f3 100644
--- a/ext/spl/tests/spl_iterator_getcallchildren.phpt
+++ b/ext/spl/tests/spl_iterator_getcallchildren.phpt
@@ -16,7 +16,7 @@ var_dump($test->current());
 try {
   $output = $test->callGetChildren();
 } catch (InvalidArgumentException $ilae){
-  $output = null;  
+  $output = null;
   print "invalid argument exception\n";
 }
 var_dump($output);
diff --git a/ext/spl/tests/spl_iterator_iterator_constructor.phpt b/ext/spl/tests/spl_iterator_iterator_constructor.phpt
index 4c3fae25a29..e9dfc3c0ce5 100644
--- a/ext/spl/tests/spl_iterator_iterator_constructor.phpt
+++ b/ext/spl/tests/spl_iterator_iterator_constructor.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: IteratorInterator constructor checks 
+SPL: IteratorInterator constructor checks
 --CREDITS--
 Sean Burlington www.practicalweb.co.uk
 TestFest London May 2009
diff --git a/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt b/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
index a34b5577d9d..5a478c1e49e 100644
--- a/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
+++ b/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: Test on RecursiveIteratorIterator key function checking switch statements 
+SPL: Test on RecursiveIteratorIterator key function checking switch statements
 --CREDITS--
 Rohan Abraham (rohanabrahams@gmail.com)
 TestFest London May 2009
diff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt
index f72493215f1..99b1fc27d73 100644
--- a/ext/standard/tests/array/005.phpt
+++ b/ext/standard/tests/array/005.phpt
@@ -16,7 +16,7 @@ $str = "abc";
 /* Various combinations of arrays to be used for the test */
 $mixed_array = array(
   array(),
-  array( 1,2,3,4,5,6,7,8,9 ), 
+  array( 1,2,3,4,5,6,7,8,9 ),
   array( "One", "_Two", "Three", "Four", "Five" ),
   array( 6, "six", 7, "seven", 8, "eight", 9, "nine" ),
   array( "a" => "aaa", "A" => "AAA", "c" => "ccc", "d" => "ddd", "e" => "eee" ),
@@ -52,13 +52,13 @@ var_dump( array_shift($empty_array) );
 echo "\n*** Testing with various array inputs ***\n";
 
 $counter = 1;
-foreach( $mixed_array as $sub_array ) { 
+foreach( $mixed_array as $sub_array ) {
   echo "\n-- Input Array for Iteration $counter is -- \n";
   print_r( $sub_array );
   echo "\nOutput after shift is :\n";
   var_dump( array_shift($sub_array) );
   $counter++;
-} 
+}
 
 /*Checking for internal array pointer beint reset when shift is called */
 
diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt
index e0618ad70ee..c338265b5ed 100644
--- a/ext/standard/tests/array/009.phpt
+++ b/ext/standard/tests/array/009.phpt
@@ -2,7 +2,7 @@
 Test key(), current(), next() & reset() functions
 --FILE--
 <?php
-/* Prototype & Usage: 
+/* Prototype & Usage:
    mixed key ( array &$array ) -> returns the index element of the current array position
    mixed current ( array &$array ) -> returns the current element in the array
    mixed next ( array &$array ) -> similar to current() but advances the internal pointer to next element
@@ -19,16 +19,16 @@ $basic_arrays = array (
   array('d' => 'drink', 'p' => 'port', 's' => 'set'),   // another associative array
   array(1 => 'One', 2 => 'two', 3 => "three")           // associative array with key as integers
 );
-            
+
 $varient_arrays = array (
    array(),    // empty array
    array(""),  // array with null string
-   array(NULL),// array with NULL 
+   array(NULL),// array with NULL
    array(null),// array with null
    array(NULL, true, null, "", 1), // mixed array
-   array(-1.5 => "test", -2 => "rest", 2.5 => "two", 
+   array(-1.5 => "test", -2 => "rest", 2.5 => "two",
          "" => "string", 0 => "zero", "" => "" ) // mixed array
-);  
+);
 
 echo "*** Testing basic operations ***\n";
 $loop_count = 1;
@@ -69,7 +69,7 @@ foreach ($varient_arrays as $sub_array )  {
   echo "\n";
 }
 
-/*test these functions on array which is already unset */ 
+/*test these functions on array which is already unset */
 echo "\n-- Testing variation: when array is unset --\n";
 $unset_array = array (1);
 unset($unset_array);
@@ -94,7 +94,7 @@ var_dump( current($temp_array, $temp_array) );
 var_dump( reset($temp_array, $temp_array) );
 var_dump( next($temp_array, $temp_array) );
 
-// invalid args type, valid argument: array 
+// invalid args type, valid argument: array
 $int_var = 1;
 $float_var = 1.5;
 $string = "string";
@@ -116,7 +116,7 @@ var_dump( reset($string) );
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing basic operations ***
 -- Iteration 1 --
 int(0)
diff --git a/ext/standard/tests/array/array_change_key_case.phpt b/ext/standard/tests/array/array_change_key_case.phpt
index 31234582522..0721c00623d 100644
--- a/ext/standard/tests/array/array_change_key_case.phpt
+++ b/ext/standard/tests/array/array_change_key_case.phpt
@@ -3,10 +3,10 @@ Test array_change_key_case() function
 --FILE--
 <?php
 /* Prototype: array array_change_key_case ( array $input [, int $case] )
-   Description: Changes the keys in the input array to be all lowercase 
-   or uppercase. The change depends on the last optional case parameter. 
+   Description: Changes the keys in the input array to be all lowercase
+   or uppercase. The change depends on the last optional case parameter.
    You can pass two constants there, CASE_UPPER and CASE_LOWER(default).
-   The function will leave number indices as is. 
+   The function will leave number indices as is.
 */
 $arrays = array (
   array (),
@@ -30,7 +30,7 @@ $arrays = array (
   array ("ONE" => 1, "TWO" => 2),
   array ("OnE" => 1, "TWO" => 2),
   array ("oNe" => 1, "TWO" => 2),
-  array ("one" => 1, "TwO" => 2),  
+  array ("one" => 1, "TwO" => 2),
   array ("ONE" => 1, "TwO" => 2),
   array ("OnE" => 1, "TwO" => 2),
   array ("oNe" => 1, "TwO" => 2),
diff --git a/ext/standard/tests/array/array_change_key_case_variation.phpt b/ext/standard/tests/array/array_change_key_case_variation.phpt
index 2a6148e251b..cad38e4ac7f 100644
--- a/ext/standard/tests/array/array_change_key_case_variation.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation.phpt
@@ -6,17 +6,17 @@ Test array_change_key_case() function - 2
 $item = array ("one" => 1, "two" => 2, "THREE" => 3, "FOUR" => "four");
 
 /* use 'case' argument other than CASE_LOWER & CASE_UPPER */
-var_dump(array_change_key_case($item, "CASE_UPPER")); 
-var_dump(array_change_key_case($item, 5)); 
+var_dump(array_change_key_case($item, "CASE_UPPER"));
+var_dump(array_change_key_case($item, 5));
 
 /* when keys are different in terms of only case */
 /* should return one value key pair with key being in lowercase */
-var_dump( array_change_key_case( array("ONE" => 1, "one" => 3, "One" => 4) ) ); 
-var_dump( array_change_key_case( array("ONE" => 1, "one" => 6, "One" => 5), "CASE_UPPER" ) ); 
+var_dump( array_change_key_case( array("ONE" => 1, "one" => 3, "One" => 4) ) );
+var_dump( array_change_key_case( array("ONE" => 1, "one" => 6, "One" => 5), "CASE_UPPER" ) );
 
 /* should return one value key pair with key being in uppercase */
-var_dump( array_change_key_case( array("ONE" => 1, "one" => 2, "One" => 3), CASE_UPPER ) ); 
-var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 ) ); 
+var_dump( array_change_key_case( array("ONE" => 1, "one" => 2, "One" => 3), CASE_UPPER ) );
+var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 ) );
 
 echo "end\n";
 ?>
diff --git a/ext/standard/tests/array/array_change_key_case_variation1.phpt b/ext/standard/tests/array/array_change_key_case_variation1.phpt
index 86653930f1b..8a7c8053901 100644
--- a/ext/standard/tests/array/array_change_key_case_variation1.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation1.phpt
@@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - Pass different data t
 --FILE--
 <?php
 /* Prototype  : array array_change_key_case(array $input [, int $case])
- * Description: Retuns an array with all string keys lowercased [or uppercased] 
+ * Description: Retuns an array with all string keys lowercased [or uppercased]
  * Source code: ext/standard/array.c
  */
 
@@ -58,7 +58,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -68,7 +68,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_change_key_case_variation2.phpt b/ext/standard/tests/array/array_change_key_case_variation2.phpt
index f2a93852342..cd1bff844db 100644
--- a/ext/standard/tests/array/array_change_key_case_variation2.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation2.phpt
@@ -5,7 +5,7 @@ Test array_change_key_case() function : usage variations - Pass different data t
 --FILE--
 <?php
 /* Prototype  : array array_change_key_case(array $input [, int $case])
- * Description: Retuns an array with all string keys lowercased [or uppercased] 
+ * Description: Retuns an array with all string keys lowercased [or uppercased]
  * Source code: ext/standard/array.c
  */
 
@@ -56,7 +56,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
diff --git a/ext/standard/tests/array/array_change_key_case_variation3.phpt b/ext/standard/tests/array/array_change_key_case_variation3.phpt
index 596703385c1..a82b14ec17a 100644
--- a/ext/standard/tests/array/array_change_key_case_variation3.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation3.phpt
@@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - different data types
 --FILE--
 <?php
 /* Prototype  : array array_change_key_case(array $input [, int $case])
- * Description: Retuns an array with all string keys lowercased [or uppercased] 
+ * Description: Retuns an array with all string keys lowercased [or uppercased]
  * Source code: ext/standard/array.c
  */
 
@@ -40,7 +40,7 @@ $inputs = array(
        -10.5 => 'negative',
        .5 => 'half',
        ),
-       
+
        'extreme floats' => array(
        12.3456789000e6 => 'large',
        12.3456789000E-10 => 'small',
@@ -49,7 +49,7 @@ $inputs = array(
        // null data
 /*3*/ 'null uppercase' => array(
        NULL => 'null 1',
-       ), 
+       ),
        'null lowercase' => array(
        null => 'null 2',
        ),
@@ -63,7 +63,7 @@ $inputs = array(
        TRUE => 'uppert',
        FALSE => 'upperf',
        ),
-       
+
        // empty data
 /*5*/ 'empty double quotes' => array(
        "" => 'emptyd',
diff --git a/ext/standard/tests/array/array_change_key_case_variation4.phpt b/ext/standard/tests/array/array_change_key_case_variation4.phpt
index ad9ad75a387..3bd3035c63b 100644
--- a/ext/standard/tests/array/array_change_key_case_variation4.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation4.phpt
@@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - different int values
 --FILE--
 <?php
 /* Prototype  : array array_change_key_case(array $input [, int $case])
- * Description: Retuns an array with all string keys lowercased [or uppercased] 
+ * Description: Retuns an array with all string keys lowercased [or uppercased]
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_change_key_case_variation5.phpt b/ext/standard/tests/array/array_change_key_case_variation5.phpt
index aa3852a41fd..9caac063b69 100644
--- a/ext/standard/tests/array/array_change_key_case_variation5.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation5.phpt
@@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - position of internal
 --FILE--
 <?php
 /* Prototype  : array array_change_key_case(array $input [, int $case])
- * Description: Retuns an array with all string keys lowercased [or uppercased] 
+ * Description: Retuns an array with all string keys lowercased [or uppercased]
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_change_key_case_variation6.phpt b/ext/standard/tests/array/array_change_key_case_variation6.phpt
index d4371d3459b..bf61248f3f9 100644
--- a/ext/standard/tests/array/array_change_key_case_variation6.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation6.phpt
@@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - multidimensional arra
 --FILE--
 <?php
 /* Prototype  : array array_change_key_case(array $input [, int $case])
- * Description: Retuns an array with all string keys lowercased [or uppercased] 
+ * Description: Retuns an array with all string keys lowercased [or uppercased]
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_change_key_case_variation7.phpt b/ext/standard/tests/array/array_change_key_case_variation7.phpt
index 8cbc23a12f1..2b7926d28af 100644
--- a/ext/standard/tests/array/array_change_key_case_variation7.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation7.phpt
@@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - referenced variables
 --FILE--
 <?php
 /* Prototype  : array array_change_key_case(array $input [, int $case])
- * Description: Retuns an array with all string keys lowercased [or uppercased] 
+ * Description: Retuns an array with all string keys lowercased [or uppercased]
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_change_key_case_variation8.phpt b/ext/standard/tests/array/array_change_key_case_variation8.phpt
index 361480008a9..7bd5a8dead6 100644
--- a/ext/standard/tests/array/array_change_key_case_variation8.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation8.phpt
@@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : array array_change_key_case(array $input [, int $case])
- * Description: Retuns an array with all string keys lowercased [or uppercased] 
+ * Description: Retuns an array with all string keys lowercased [or uppercased]
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_chunk2.phpt b/ext/standard/tests/array/array_chunk2.phpt
index 2560332bf5d..6d8b74545e4 100644
--- a/ext/standard/tests/array/array_chunk2.phpt
+++ b/ext/standard/tests/array/array_chunk2.phpt
@@ -6,11 +6,11 @@ $input_array = array('a', 'b', 'c', 'd', 'e');
 var_dump(array_chunk($input_array, 0));
 var_dump(array_chunk($input_array, 0, true));
 var_dump(array_chunk($input_array, 1));
-var_dump(array_chunk($input_array, 1, true));	
+var_dump(array_chunk($input_array, 1, true));
 var_dump(array_chunk($input_array, 2));
-var_dump(array_chunk($input_array, 2, true));	
+var_dump(array_chunk($input_array, 2, true));
 var_dump(array_chunk($input_array, 10));
-var_dump(array_chunk($input_array, 10, true));	
+var_dump(array_chunk($input_array, 10, true));
 ?>
 --EXPECTF--
 Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
diff --git a/ext/standard/tests/array/array_chunk_basic1.phpt b/ext/standard/tests/array/array_chunk_basic1.phpt
index 56a90f479b0..c16d2988e32 100644
--- a/ext/standard/tests/array/array_chunk_basic1.phpt
+++ b/ext/standard/tests/array/array_chunk_basic1.phpt
@@ -20,19 +20,19 @@ $input_arrays = array (
 
   // associative arrays - key as string
   array('key1' => 1, "key2" => 2, "key3" => 3),
- 
+
   // associative arrays - key as numeric
   array(1 => 'one', 2 => "two", 3 => "three"),
 
-  // array containing elements with/witout keys 
+  // array containing elements with/witout keys
   array(1 => 'one','two', 3 => 'three', 4, "five" => 5)
 
-); 
+);
 
 $count = 1;
 // loop through each element of the array for input
-foreach ($input_arrays as $input_array){ 
-  echo "\n-- Iteration $count --\n";  
+foreach ($input_arrays as $input_array){
+  echo "\n-- Iteration $count --\n";
   var_dump( array_chunk($input_array, $size) );
   $count++;
 }
diff --git a/ext/standard/tests/array/array_chunk_basic2.phpt b/ext/standard/tests/array/array_chunk_basic2.phpt
index f96d863e12d..3ef9851b0e4 100644
--- a/ext/standard/tests/array/array_chunk_basic2.phpt
+++ b/ext/standard/tests/array/array_chunk_basic2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_chunk() function : basic functionality - 'preserve_keys' as true/false 
+Test array_chunk() function : basic functionality - 'preserve_keys' as true/false
 --FILE--
 <?php
 /* Prototype  : array array_chunk(array $array, int $size [, bool $preserve_keys])
@@ -20,18 +20,18 @@ $input_arrays = array(
 
   // associative arrays - key as string
   array('key1' => 1, "key2" => 2, "key3" => 3),
- 
+
   // associative arrays - key as numeric
   array(1 => 'one', 2 => "two", 3 => "three"),
 
   // array containing elements with/without keys
   array(1 => 'one','two', 3 => 'three', 4, "five" => 5)
-); 
+);
 
 $count = 1;
 // loop through each element of the array for input
-foreach ($input_arrays as $input_array){ 
-  echo "\n-- Iteration $count --\n";  
+foreach ($input_arrays as $input_array){
+  echo "\n-- Iteration $count --\n";
   var_dump( array_chunk($input_array, $size, true) );
   var_dump( array_chunk($input_array, $size, false) );
   $count++;
diff --git a/ext/standard/tests/array/array_chunk_error.phpt b/ext/standard/tests/array/array_chunk_error.phpt
index 5197945994f..d2cbbe16e39 100644
--- a/ext/standard/tests/array/array_chunk_error.phpt
+++ b/ext/standard/tests/array/array_chunk_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_chunk() function : error conditions 
+Test array_chunk() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_chunk(array input, int size [, bool preserve_keys])
- * Description: Split array into chunks 
+ * Description: Split array into chunks
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_chunk_variation1.phpt b/ext/standard/tests/array/array_chunk_variation1.phpt
index 0535c126ba7..cc53bd56549 100644
--- a/ext/standard/tests/array/array_chunk_variation1.phpt
+++ b/ext/standard/tests/array/array_chunk_variation1.phpt
@@ -1,20 +1,20 @@
 --TEST--
-Test array_chunk() function : usage variations - unexpected values for 'array' argument 
+Test array_chunk() function : usage variations - unexpected values for 'array' argument
 --FILE--
 <?php
 /* Prototype  : proto array array_chunk(array $array, int $size [, bool $preserve_keys])
  * Description: Split array into chunks
- *              Chunks an array into size  large chunks. 
+ *              Chunks an array into size  large chunks.
  * Source code: ext/standard/array.c
 */
 
 /*
-* Testing array_chunk() function with unexpected values for 'array' argument 
+* Testing array_chunk() function with unexpected values for 'array' argument
 */
 
 echo "*** Testing array_chunk() : usage variations ***\n";
 
-// Initialise function arguments 
+// Initialise function arguments
 $size = 10;
 
 //get an unset variable
diff --git a/ext/standard/tests/array/array_chunk_variation2.phpt b/ext/standard/tests/array/array_chunk_variation2.phpt
index 2a3ef6ed85e..738249eae18 100644
--- a/ext/standard/tests/array/array_chunk_variation2.phpt
+++ b/ext/standard/tests/array/array_chunk_variation2.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test array_chunk() function : usage variations - unexpected values for 'size' argument 
+Test array_chunk() function : usage variations - unexpected values for 'size' argument
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only");
 --FILE--
 <?php
 /* Prototype  : array array_chunk(array $array, int $size [, bool $preserve_keys])
- * Description: Split array into chunks 
+ * Description: Split array into chunks
               : Chunks an array into size  large chunks
  * Source code: ext/standard/array.c
 */
 
 /*
-* Testing array_chunk() function with unexpected values for 'size' argument 
+* Testing array_chunk() function with unexpected values for 'size' argument
 */
 
 echo "*** Testing array_chunk() : usage variations ***\n";
diff --git a/ext/standard/tests/array/array_chunk_variation3.phpt b/ext/standard/tests/array/array_chunk_variation3.phpt
index 452006a44d9..542172cab61 100644
--- a/ext/standard/tests/array/array_chunk_variation3.phpt
+++ b/ext/standard/tests/array/array_chunk_variation3.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test array_chunk() function : usage variations - unexpected values for 'preserve_keys' 
+Test array_chunk() function : usage variations - unexpected values for 'preserve_keys'
 --FILE--
 <?php
 /* Prototype  : array array_chunk(array $array, int $size [, bool $preserve_keys])
- * Description: Split array into chunks 
+ * Description: Split array into chunks
  * Source code: ext/standard/array.c
 */
 
 /*
-* Testing array_chunk() function with unexpected values for 'preserve_keys' 
+* Testing array_chunk() function with unexpected values for 'preserve_keys'
 */
 
 echo "*** Testing array_chunk() : usage variations ***\n";
diff --git a/ext/standard/tests/array/array_chunk_variation4.phpt b/ext/standard/tests/array/array_chunk_variation4.phpt
index 7f04f51bff4..e7d83899b74 100644
--- a/ext/standard/tests/array/array_chunk_variation4.phpt
+++ b/ext/standard/tests/array/array_chunk_variation4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_chunk() function : usage variations - array with diff. sub arrays  
+Test array_chunk() function : usage variations - array with diff. sub arrays
 --FILE--
 <?php
 /* Prototype  : array array_chunk(array $array, int $size [, bool $preserve_keys])
@@ -18,18 +18,18 @@ $size = 2;
 
 // input array
 $input_array = array (
-  "array1" => array(), 
-  "array2" => array(1, 2, 3), 
-  "array3" =>  array(1) 
+  "array1" => array(),
+  "array2" => array(1, 2, 3),
+  "array3" =>  array(1)
 );
 
-echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as defualt --\n"; 
+echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as defualt --\n";
 var_dump( array_chunk($input_array, $size) );
 
-echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = true --\n"; 
+echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = true --\n";
 var_dump( array_chunk($input_array, $size, true) );
 
-echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = false --\n"; 
+echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = false --\n";
 var_dump( array_chunk($input_array, $size, false) );
 
 echo "Done";
diff --git a/ext/standard/tests/array/array_chunk_variation5.phpt b/ext/standard/tests/array/array_chunk_variation5.phpt
index 8d360928228..50050892e70 100644
--- a/ext/standard/tests/array/array_chunk_variation5.phpt
+++ b/ext/standard/tests/array/array_chunk_variation5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_chunk() function : usage variations - different 'size' values  
+Test array_chunk() function : usage variations - different 'size' values
 --FILE--
 <?php
 /* Prototype  : array array_chunk(array $array, int $size [, bool $preserve_keys])
diff --git a/ext/standard/tests/array/array_chunk_variation6.phpt b/ext/standard/tests/array/array_chunk_variation6.phpt
index f44eb396040..ae81301fcef 100644
--- a/ext/standard/tests/array/array_chunk_variation6.phpt
+++ b/ext/standard/tests/array/array_chunk_variation6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_chunk() function : usage variations - different arrays  
+Test array_chunk() function : usage variations - different arrays
 --FILE--
 <?php
 /* Prototype  : array array_chunk(array $array, int $size [, bool $preserve_keys])
@@ -9,10 +9,10 @@ Test array_chunk() function : usage variations - different arrays
 */
 
 /*
- * Testing array_chunk() function with following conditions 
+ * Testing array_chunk() function with following conditions
  *   1. array without elements
  *   2. associative array with duplicate keys
- *   3. array with one element 
+ *   3. array with one element
 */
 
 echo "*** Testing array_chunk() : usage variations ***\n";
@@ -25,7 +25,7 @@ $input_arrays = array (
 
   // array with one element
   "array2" => array(1),
-  
+
   // associative array with duplicate keys
   "array3" => array("a" => 1, "b" => 2, "c" => 3, "a" => 4, "d" => 5)
 
diff --git a/ext/standard/tests/array/array_chunk_variation7.phpt b/ext/standard/tests/array/array_chunk_variation7.phpt
index c8a71964f15..7ba5c279bf6 100644
--- a/ext/standard/tests/array/array_chunk_variation7.phpt
+++ b/ext/standard/tests/array/array_chunk_variation7.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_chunk() function : usage variations - references  
+Test array_chunk() function : usage variations - references
 --FILE--
 <?php
 /* Prototype  : array array_chunk(array $array, int $size [, bool $preserve_keys])
@@ -9,7 +9,7 @@ Test array_chunk() function : usage variations - references
 */
 
 /*
- * Testing array_chunk() function with following conditions 
+ * Testing array_chunk() function with following conditions
  *   1. input array containing references
 */
 
@@ -21,9 +21,9 @@ echo "\n-- Testing array_chunk(), input array containing references \n";
 
 $numbers=array(1, 2, 3, 4);
 // reference array
-$input_array = array ( 
-  "one" => &$numbers[0], 
-  "two" => &$numbers[1], 
+$input_array = array (
+  "one" => &$numbers[0],
+  "two" => &$numbers[1],
   "three" => &$numbers[2],
   "four" => &$numbers[3]
 );
diff --git a/ext/standard/tests/array/array_combine_basic.phpt b/ext/standard/tests/array/array_combine_basic.phpt
index 5d855cfec68..52a6237c2da 100644
--- a/ext/standard/tests/array/array_combine_basic.phpt
+++ b/ext/standard/tests/array/array_combine_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test array_combine() function : basic functionality 
+Test array_combine() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array array_combine(array $keys, array $values)
- * Description: Creates an array by using the elements of the first parameter as keys 
- *              and the elements of the second as the corresponding values 
+ * Description: Creates an array by using the elements of the first parameter as keys
+ *              and the elements of the second as the corresponding values
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_combine_error1.phpt b/ext/standard/tests/array/array_combine_error1.phpt
index aa5a1afe1b3..efb4e68cf62 100644
--- a/ext/standard/tests/array/array_combine_error1.phpt
+++ b/ext/standard/tests/array/array_combine_error1.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test array_combine() function : error conditions 
+Test array_combine() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_combine(array $keys, array $values)
- * Description: Creates an array by using the elements of the first parameter as keys 
- *              and the elements of the second as the corresponding values 
+ * Description: Creates an array by using the elements of the first parameter as keys
+ *              and the elements of the second as the corresponding values
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_combine_error2.phpt b/ext/standard/tests/array/array_combine_error2.phpt
index 4224f1c8eb3..2d820a0d218 100644
--- a/ext/standard/tests/array/array_combine_error2.phpt
+++ b/ext/standard/tests/array/array_combine_error2.phpt
@@ -3,8 +3,8 @@ Test array_combine() function : error conditions - empty array
 --FILE--
 <?php
 /* Prototype  : array array_combine(array $keys, array $values)
- * Description: Creates an array by using the elements of the first parameter as keys 
- *              and the elements of the second as the corresponding values 
+ * Description: Creates an array by using the elements of the first parameter as keys
+ *              and the elements of the second as the corresponding values
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_combine_variation1.phpt b/ext/standard/tests/array/array_combine_variation1.phpt
index f369171c7ba..0240af2dce2 100644
--- a/ext/standard/tests/array/array_combine_variation1.phpt
+++ b/ext/standard/tests/array/array_combine_variation1.phpt
@@ -3,8 +3,8 @@ Test array_combine() function : usage variations - unexpected values for 'keys'
 --FILE--
 <?php
 /* Prototype  : array array_combine(array $keys, array $values)
- * Description: Creates an array by using the elements of the first parameter as keys 
- *              and the elements of the second as the corresponding values 
+ * Description: Creates an array by using the elements of the first parameter as keys
+ *              and the elements of the second as the corresponding values
  * Source code: ext/standard/array.c
 */
 
@@ -16,7 +16,7 @@ Test array_combine() function : usage variations - unexpected values for 'keys'
 
 echo "*** Testing array_combine() : Passing non-array values to \$keys argument ***\n";
 
-// Initialise $values argument 
+// Initialise $values argument
 $values = array(1, 2);
 
 //get an unset variable
diff --git a/ext/standard/tests/array/array_combine_variation2.phpt b/ext/standard/tests/array/array_combine_variation2.phpt
index ed637bb4380..41821d3f74d 100644
--- a/ext/standard/tests/array/array_combine_variation2.phpt
+++ b/ext/standard/tests/array/array_combine_variation2.phpt
@@ -3,8 +3,8 @@ Test array_combine() function : usage variations - unexpected values for 'values
 --FILE--
 <?php
 /* Prototype  : array array_combine(array $keys, array $values)
- * Description: Creates an array by using the elements of the first parameter as keys 
- *              and the elements of the second as the corresponding values 
+ * Description: Creates an array by using the elements of the first parameter as keys
+ *              and the elements of the second as the corresponding values
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_combine_variation3.phpt b/ext/standard/tests/array/array_combine_variation3.phpt
index 1381fe0f4c9..9e2e27cd08a 100644
--- a/ext/standard/tests/array/array_combine_variation3.phpt
+++ b/ext/standard/tests/array/array_combine_variation3.phpt
@@ -9,7 +9,7 @@ Test array_combine() function : usage variations - different arrays(Bug#43424)
 */
 
 /*
-* Passing different types of arrays to both $keys and $values arguments and testing whether 
+* Passing different types of arrays to both $keys and $values arguments and testing whether
 * array_combine() behaves in an expected way with the arguments passed to the function
 */
 
diff --git a/ext/standard/tests/array/array_combine_variation4.phpt b/ext/standard/tests/array/array_combine_variation4.phpt
index bcd8428ceee..dd3187a1f04 100644
--- a/ext/standard/tests/array/array_combine_variation4.phpt
+++ b/ext/standard/tests/array/array_combine_variation4.phpt
@@ -10,7 +10,7 @@ Test array_combine() function : usage variations - associative array with differ
 
 /*
  * Testing the functionality of array_combine() by passing different
- * associative arrays having different possible keys to $keys argument and 
+ * associative arrays having different possible keys to $keys argument and
  * associative arrays having different possible keys to $values argument.
 */
 
@@ -70,7 +70,7 @@ $arrays = array (
 
 // array to be passsed to $arr2 argument
 $arr2 = array(0 => 0, 2 => "float", 4 => "f3", 33333333 => "f4",
-              "\tHello" => 111, 2.2, 'color', "Hello world" => "string", 
+              "\tHello" => 111, 2.2, 'color', "Hello world" => "string",
               "pen\n" => 33, new classA() => 11, 133 => "int");
 
 // loop through each sub-array within $arrays to check the behavior of array_combine()
diff --git a/ext/standard/tests/array/array_combine_variation5.phpt b/ext/standard/tests/array/array_combine_variation5.phpt
index 4d9f1857862..db5c90df34e 100644
--- a/ext/standard/tests/array/array_combine_variation5.phpt
+++ b/ext/standard/tests/array/array_combine_variation5.phpt
@@ -60,8 +60,8 @@ $arrays = array (
 /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp),
 
        // array with mixed values
-/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", 
-             'resource' => $fp, "int" => 133, "float" => 444.432, 
+/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit",
+             'resource' => $fp, "int" => 133, "float" => 444.432,
              "unset" => @$unset_var, "heredoc" => $heredoc)
 );
 
diff --git a/ext/standard/tests/array/array_combine_variation6.phpt b/ext/standard/tests/array/array_combine_variation6.phpt
index 94c7b4d664a..5bd3652a4eb 100644
--- a/ext/standard/tests/array/array_combine_variation6.phpt
+++ b/ext/standard/tests/array/array_combine_variation6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_combine() function : usage variations - binary safe checking 
+Test array_combine() function : usage variations - binary safe checking
 --FILE--
 <?php
 /* Prototype  : array array_combine(array $keys, array $values)
@@ -9,8 +9,8 @@ Test array_combine() function : usage variations - binary safe checking
 */
 
 /*
-* Testing the behavior of array_combine() by passing array with 
-* binary values for $keys and $values argument. 
+* Testing the behavior of array_combine() by passing array with
+* binary values for $keys and $values argument.
 */
 
 echo "*** Testing array_combine() : binary safe checking ***\n";
diff --git a/ext/standard/tests/array/array_count_values2.phpt b/ext/standard/tests/array/array_count_values2.phpt
index 8dc9b231253..549b77d9f2f 100644
--- a/ext/standard/tests/array/array_count_values2.phpt
+++ b/ext/standard/tests/array/array_count_values2.phpt
@@ -2,18 +2,18 @@
 basic array_count_values test
 --FILE--
 <?php
-$array1 = array(1, 
-				"hello", 
-				1, 
-				"world", 
-				"hello", 
-				"", 
-				"rabbit", 
-				"foo", 
-				"Foo", 
-				TRUE, 
-				FALSE, 
-				NULL, 
+$array1 = array(1,
+				"hello",
+				1,
+				"world",
+				"hello",
+				"",
+				"rabbit",
+				"foo",
+				"Foo",
+				TRUE,
+				FALSE,
+				NULL,
 				0);
 var_dump(array_count_values($array1));
 ?>
diff --git a/ext/standard/tests/array/array_count_values_error.phpt b/ext/standard/tests/array/array_count_values_error.phpt
index 843e34ee594..5578693bebd 100644
--- a/ext/standard/tests/array/array_count_values_error.phpt
+++ b/ext/standard/tests/array/array_count_values_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_count_values() function : Invalid parameters 
+Test array_count_values() function : Invalid parameters
 --FILE--
 <?php
 /* Prototype  : proto array array_count_values(array input)
- * Description: Return the value as key and the frequency of that value in input as value 
+ * Description: Return the value as key and the frequency of that value in input as value
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/array/array_count_values_variation.phpt b/ext/standard/tests/array/array_count_values_variation.phpt
index 1d614b452ad..1fb36f79e0f 100644
--- a/ext/standard/tests/array/array_count_values_variation.phpt
+++ b/ext/standard/tests/array/array_count_values_variation.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_count_values() function : Test all normal parameter variations 
+Test array_count_values() function : Test all normal parameter variations
 --FILE--
 <?php
 /* Prototype  : proto array array_count_values(array input)
- * Description: Return the value as key and the frequency of that value in input as value 
+ * Description: Return the value as key and the frequency of that value in input as value
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/array/array_diff_assoc.phpt b/ext/standard/tests/array/array_diff_assoc.phpt
index 29db107d65a..509c632ba54 100644
--- a/ext/standard/tests/array/array_diff_assoc.phpt
+++ b/ext/standard/tests/array/array_diff_assoc.phpt
@@ -1,6 +1,6 @@
 --TEST--
 basic array_diff_assoc test
---FILE--	
+--FILE--
 <?php
 $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red", "");
 $array2 = array("a" => "green", "yellow", "red", TRUE);
diff --git a/ext/standard/tests/array/array_diff_assoc_basic.phpt b/ext/standard/tests/array/array_diff_assoc_basic.phpt
index c6b3aef00b9..ecf0c7079ee 100644
--- a/ext/standard/tests/array/array_diff_assoc_basic.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_basic.phpt
@@ -3,8 +3,8 @@ Test array_diff_assoc() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array array_diff_assoc(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are not 
- * present in any of the others arguments but do additional checks whether the keys are equal 
+ * Description: Returns the entries of $arr1 that have values which are not
+ * present in any of the others arguments but do additional checks whether the keys are equal
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_assoc_error.phpt b/ext/standard/tests/array/array_diff_assoc_error.phpt
index 211907c726d..e3513a9346a 100644
--- a/ext/standard/tests/array/array_diff_assoc_error.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_error.phpt
@@ -3,8 +3,8 @@ Test array_diff_assoc() function : error conditions - pass array_diff_assoc() to
 --FILE--
 <?php
 /* Prototype  : array array_diff_assoc(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of arr1 that have values which are not present 
- * in any of the others arguments but do additional checks whether the keys are equal 
+ * Description: Returns the entries of arr1 that have values which are not present
+ * in any of the others arguments but do additional checks whether the keys are equal
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt
index b6c63794b3d..92f86a608a0 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation1.phpt
@@ -3,15 +3,15 @@ Test array_diff_assoc() function : usage variations  - unexpected values for 'ar
 --FILE--
 <?php
 /* Prototype  : array array_diff_assoc(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are not present 
- * in any of the others arguments but do additional checks whether the keys are equal 
- * Source code: ext/standard/array.c 
+ * Description: Returns the entries of $arr1 that have values which are not present
+ * in any of the others arguments but do additional checks whether the keys are equal
+ * Source code: ext/standard/array.c
  */
 
 /*
  * Pass array_diff_assoc arguments that are not arrays in place of $arr1
  */
- 
+
 echo "*** Testing array_diff_assoc() : usage variations ***\n";
 
 $array = array(1, 2, 3);
@@ -36,7 +36,7 @@ EOT;
 // get a resource variable
 $fp = fopen(__FILE__, "r");
 
-//array of unexpected values to be passed to $arr1 argument 
+//array of unexpected values to be passed to $arr1 argument
 $inputs = array(
 
        // int data
@@ -61,7 +61,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -70,11 +70,11 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // binary data
 /*21*/ b"binary",
 	   (binary)"binary",
-	   
+
        // object data
 /*23*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_diff_assoc_variation10.phpt b/ext/standard/tests/array/array_diff_assoc_variation10.phpt
index 0687ed8a5bf..c2f052e83a4 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation10.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation10.phpt
@@ -3,9 +3,9 @@ Test array_diff_assoc() function : usage variations - binary safe check
 --FILE--
 <?php
 /* Prototype  : array array_diff_assoc(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of arr1 that have values which are not 
- * present in any of the others arguments but do additional checks whether 
- * the keys are equal 
+ * Description: Returns the entries of arr1 that have values which are not
+ * present in any of the others arguments but do additional checks whether
+ * the keys are equal
  * Source code: ext/standard/array.c
  */
 
@@ -15,15 +15,15 @@ Test array_diff_assoc() function : usage variations - binary safe check
 
 echo "*** Testing array_diff_assoc() : usage variations ***\n";
 
-$array1 = array( b"1", 
-                 b"hello", 
-                 "world", 
-                 "str1" => "hello", 
+$array1 = array( b"1",
+                 b"hello",
+                 "world",
+                 "str1" => "hello",
                  "str2" => "world");
 
 $array2 = array( b"1" => 'hello',
                  b"world",
-                 "hello", 
+                 "hello",
                  'test');
 
 var_dump(array_diff_assoc($array1, $array2));
diff --git a/ext/standard/tests/array/array_diff_assoc_variation2.phpt b/ext/standard/tests/array/array_diff_assoc_variation2.phpt
index 5de94424e89..0ea6480b9ea 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation2.phpt
@@ -3,9 +3,9 @@ Test array_diff_assoc() function : usage variations  - unexpected values for 'ar
 --FILE--
 <?php
 /* Prototype  : array array_diff_assoc(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of arr1 that have values which are not present 
- * in any of the others arguments but do additional checks whether the keys are equal 
- * Source code: ext/standard/array.c 
+ * Description: Returns the entries of arr1 that have values which are not present
+ * in any of the others arguments but do additional checks whether the keys are equal
+ * Source code: ext/standard/array.c
  */
 
 /*
@@ -36,7 +36,7 @@ EOT;
 // get a resource variable
 $fp = fopen(__FILE__, "r");
 
-//array of unexpected values to be passed to $arr1 argument 
+//array of unexpected values to be passed to $arr1 argument
 $inputs = array(
 
        // int data
@@ -61,7 +61,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -70,11 +70,11 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // binary data
 /*21*/ b"binary",
 	   (binary)"binary",
-	   
+
        // object data
 /*23*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_diff_assoc_variation3.phpt b/ext/standard/tests/array/array_diff_assoc_variation3.phpt
index 1d4aaf2e436..36d31b078be 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation3.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation3.phpt
@@ -3,15 +3,15 @@ Test array_diff_assoc() function : variation - array containing different data t
 --FILE--
 <?php
 /* Prototype  : array array_diff_assoc(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of arr1 that have values which are not present 
- * in any of the others arguments but do additional checks whether the keys are equal 
- * Source code: ext/standard/array.c 
+ * Description: Returns the entries of arr1 that have values which are not present
+ * in any of the others arguments but do additional checks whether the keys are equal
+ * Source code: ext/standard/array.c
  */
 
 /*
  * Test how array_diff_assoc() compares indexed arrays containing different data types
  */
- 
+
 echo "\n*** Testing array_diff_assoc() : usage variations ***\n";
 
 $array = array(1, 2, 3);
@@ -33,12 +33,12 @@ $heredoc = <<<EOT
 hello world
 EOT;
 
-//array of different data types to be passed to $arr1 argument 
+//array of different data types to be passed to $arr1 argument
 $inputs = array(
 
        // int data
 /*1*/
-'int' => array(       
+'int' => array(
 	   0,
        1,
        12345,
@@ -46,7 +46,7 @@ $inputs = array(
 
        // float data
 /*2*/
-'float' => array(       
+'float' => array(
        10.5,
        -10.5,
        12.3456789000e10,
@@ -66,7 +66,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE),
-       
+
        // empty data
 /*5*/
 'empty' => array(
@@ -79,13 +79,13 @@ $inputs = array(
        "string",
        'string',
        $heredoc),
-       
+
        // binary data
 /*7*/
 'binary' => array(
        b"binary",
 	   (binary)"binary"),
-	   
+
        // object data
 /*8*/
 'object' => array(
diff --git a/ext/standard/tests/array/array_diff_assoc_variation4.phpt b/ext/standard/tests/array/array_diff_assoc_variation4.phpt
index 34e979ab299..cd1aafedef0 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation4.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation4.phpt
@@ -4,16 +4,16 @@ Test array_diff_assoc() function : usage variations - arrays with different data
 
 <?php
 /* Prototype  : array array_diff_assoc(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of arr1 that have values which are not present 
- * in any of the others arguments but do additional checks whether the keys are equal 
- * Source code: ext/standard/array.c 
+ * Description: Returns the entries of arr1 that have values which are not present
+ * in any of the others arguments but do additional checks whether the keys are equal
+ * Source code: ext/standard/array.c
  */
 
 /*
  * Test how array_diff_assoc() compares arrays containing different data types
  * as keys
  */
- 
+
 echo "\n*** Testing array_diff_assoc() : usage variations ***\n";
 
 $array = array(1, 2, 3);
@@ -32,7 +32,7 @@ $inputs = array(
 
        // int data
 /*1*/
-'int' => array(       
+'int' => array(
        0 => 'zero',
        1 => 'one',
        12345 => 'positive',
@@ -40,7 +40,7 @@ $inputs = array(
 
        // float data
 /*2*/
-'float' => array(       
+'float' => array(
        10.5 => 'float 1',
        -10.5 => 'float 2',
        .5 => 'float 3'),
@@ -58,7 +58,7 @@ $inputs = array(
        false => 'boolf',
        TRUE => 'boolT',
        FALSE => 'boolF'),
-       
+
        // empty data
 /*5*/
 'empty' => array(
@@ -71,7 +71,7 @@ $inputs = array(
       "string" => 'stringd',
       'string' => 'strings',
       $heredoc => 'stringh'),
-       
+
        // binary data
 /*7*/
 'binary' => array(
diff --git a/ext/standard/tests/array/array_diff_assoc_variation5.phpt b/ext/standard/tests/array/array_diff_assoc_variation5.phpt
index c89c656421a..c949191c1f6 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation5.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation5.phpt
@@ -3,8 +3,8 @@ Test array_diff_assoc() function : usage variations - compare integers, floats a
 --FILE--
 <?php
 /* Prototype  : array array_diff_assoc(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of arr1 that have values which are not present 
- * in any of the others arguments but do additional checks whether the keys are equal 
+ * Description: Returns the entries of arr1 that have values which are not present
+ * in any of the others arguments but do additional checks whether the keys are equal
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_assoc_variation6.phpt b/ext/standard/tests/array/array_diff_assoc_variation6.phpt
index d6190b658a6..5c3f617c477 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation6.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation6.phpt
@@ -3,65 +3,65 @@ Test array_diff_assoc() function : usage variations - strict string comparison c
 --FILE--
 <?php
 /* Prototype  : array array_diff_assoc(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are not 
- * present in any of the others arguments but do additional checks whether the keys are equal 
+ * Description: Returns the entries of $arr1 that have values which are not
+ * present in any of the others arguments but do additional checks whether the keys are equal
  * Source code: ext/standard/array.c
  */
 
 /*
  * Test how array_diff_assoc behaves
- * 1. When comparing an array that has similar elements 
+ * 1. When comparing an array that has similar elements
  *    but has been created in a different order
  * 2. When doing a strict comparison of string representation
  */
 
 echo "*** Testing array_diff_assoc() : usage variations ***\n";
 
-$array = array ('zero', 
-                1 => 1, 
+$array = array ('zero',
+                1 => 1,
                 'two' => 2.00000000000001);
-                
+
 $inputs = array (
 
 //default keys => string values
 /*1*/	array('2.00000000000001', '1', 'zero', 'a'),
-	
+
 //numeric keys => string values
-/*2*/	array(2 => '2.00000000000001', 
-	          1 => '1', 
-	          0 => 'zero', 
+/*2*/	array(2 => '2.00000000000001',
+	          1 => '1',
+	          0 => 'zero',
 	          3 => 'a'),
 
 //string keys => string values
-/*3*/	array('2' => '2.00000000000001', 
-	          '1' => '1', 
-	          '0' => 'zero', 
+/*3*/	array('2' => '2.00000000000001',
+	          '1' => '1',
+	          '0' => 'zero',
 	          '3' => 'a') ,
-	
+
 //default keys => numeric values
 /*4*/	array(2, 1, 0),
-	
+
 //numeric keys => numeric values
 /*5*/	array(2 => 2,
 	          1 => 1,
 	          0 => 0),
-	       
+
 //string keys => numeric values
-/*6*/	array('two' => 2, 
-	          '1' => 1, 
+/*6*/	array('two' => 2,
+	          '1' => 1,
 	          '0' => 0),
-	          
+
 //defualt keys => float values
 /*7*/	array(2.00000000000001, 1.00, 0.01E-9),
-	          
+
 //numeric keys => float values
 /*8*/	array(2 => 2.00000000000001,
 	          1 =>  1.00,
 	          0 => 0.01E-9),
-	          
+
 //string keys => float values
-/*9*/	array ('two' => 2.00000000000001, 
-	           '1' => 1.00, 
+/*9*/	array ('two' => 2.00000000000001,
+	           '1' => 1.00,
 	           '0' =>0.01E-9)
 );
 
diff --git a/ext/standard/tests/array/array_diff_assoc_variation7.phpt b/ext/standard/tests/array/array_diff_assoc_variation7.phpt
index 6fab0aebfd6..a2de41bc081 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation7.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation7.phpt
@@ -4,8 +4,8 @@ Test array_diff_assoc() function : usage variations - arrays containing referenc
 
 <?php
 /* Prototype  : array array_diff_assoc(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are not 
- * present in any of the others arguments but do additional checks whether the keys are equal 
+ * Description: Returns the entries of $arr1 that have values which are not
+ * present in any of the others arguments but do additional checks whether the keys are equal
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_assoc_variation8.phpt b/ext/standard/tests/array/array_diff_assoc_variation8.phpt
index 3189c11f257..0acab2a20eb 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation8.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation8.phpt
@@ -3,9 +3,9 @@ Test array_diff_assoc() function : usage variations - array containing duplicate
 --FILE--
 <?php
 /* Prototype  : array array_diff_assoc(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are not 
- * present in any of the others arguments but do additional checks whether 
- * the keys are equal 
+ * Description: Returns the entries of $arr1 that have values which are not
+ * present in any of the others arguments but do additional checks whether
+ * the keys are equal
  * Source code: ext/standard/array.c
  */
 
@@ -21,8 +21,8 @@ echo "*** Testing array_diff_assoc() : variation ***\n";
 $array_index = array('a', 'b', 'c', 0 => 'd', 'b');   //duplicate key (0), duplicate value (b)
 $array_assoc = array ('2' => 'c',   //same key=>value pair, different order
                       '1' => 'b',
-                      '0' => 'a', 
-                      'b' => '3',   //key and value from array_index swapped 
+                      '0' => 'a',
+                      'b' => '3',   //key and value from array_index swapped
                       'c' => 2);    //same as above, using integer
 
 var_dump(array_diff_assoc($array_index, $array_assoc));
diff --git a/ext/standard/tests/array/array_diff_assoc_variation9.phpt b/ext/standard/tests/array/array_diff_assoc_variation9.phpt
index 5ab62326590..56e0a0bd431 100644
--- a/ext/standard/tests/array/array_diff_assoc_variation9.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation9.phpt
@@ -3,14 +3,14 @@ Test array_diff_assoc() function : usage variations - compare multidimensional a
 --FILE--
 <?php
 /* Prototype  : array array_diff_assoc(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are not 
- * present in any of the others arguments but do additional checks whether 
- * the keys are equal 
+ * Description: Returns the entries of $arr1 that have values which are not
+ * present in any of the others arguments but do additional checks whether
+ * the keys are equal
  * Source code: ext/standard/array.c
  */
 
 /*
- * Test how array_diff_assoc behaves when comparing 
+ * Test how array_diff_assoc behaves when comparing
  * multi-dimensional arrays
  */
 
@@ -24,7 +24,7 @@ $array2 = array('sub_arraya' => array (1, 3, 5),
 echo "-- Compare two 2-D arrays --\n";
 var_dump(array_diff_assoc($array1, $array2));
 var_dump(array_diff_assoc($array2, $array1));
-     
+
 echo "\n-- Compare subarrays from two 2-D arrays --\n";
 var_dump(array_diff_assoc($array1['sub_array1'], $array2['sub_arraya']));
 var_dump(array_diff_assoc($array2['sub_arraya'], $array1['sub_array1']));
diff --git a/ext/standard/tests/array/array_diff_basic.phpt b/ext/standard/tests/array/array_diff_basic.phpt
index 30aead657c9..668f6fe3e7c 100644
--- a/ext/standard/tests/array/array_diff_basic.phpt
+++ b/ext/standard/tests/array/array_diff_basic.phpt
@@ -3,8 +3,8 @@ Test array_diff() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array array_diff(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are not present 
- * in any of the others arguments. 
+ * Description: Returns the entries of $arr1 that have values which are not present
+ * in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_error.phpt b/ext/standard/tests/array/array_diff_error.phpt
index 019cffb1ef9..67c1b6fcc45 100644
--- a/ext/standard/tests/array/array_diff_error.phpt
+++ b/ext/standard/tests/array/array_diff_error.phpt
@@ -3,13 +3,13 @@ Test array_diff() function : error conditions - too few arguments passed to func
 --FILE--
 <?php
 /* Prototype  : array array_diff(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are 
- * not present in any of the others arguments. 
+ * Description: Returns the entries of $arr1 that have values which are
+ * not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
 /*
- * Test array_diff with less than the expected number of arguments 
+ * Test array_diff with less than the expected number of arguments
  */
 
 echo "*** Testing array_diff() : error conditions ***\n";
diff --git a/ext/standard/tests/array/array_diff_key_basic.phpt b/ext/standard/tests/array/array_diff_key_basic.phpt
index 6f6fcb9a4dc..40d02d47852 100644
--- a/ext/standard/tests/array/array_diff_key_basic.phpt
+++ b/ext/standard/tests/array/array_diff_key_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_diff_key() : basic functionality 
+Test array_diff_key() : basic functionality
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/array/array_diff_key_error.phpt b/ext/standard/tests/array/array_diff_key_error.phpt
index 90168f5de66..05d5cf3c276 100644
--- a/ext/standard/tests/array/array_diff_key_error.phpt
+++ b/ext/standard/tests/array/array_diff_key_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_diff_key() function : error conditions 
+Test array_diff_key() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_diff_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_key_variation1.phpt b/ext/standard/tests/array/array_diff_key_variation1.phpt
index 52b703fb772..ef9414c1b31 100644
--- a/ext/standard/tests/array/array_diff_key_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation1.phpt
@@ -3,7 +3,7 @@ Test array_diff_key() function : usage variation - Passing unexpected values to
 --FILE--
 <?php
 /* Prototype  : array array_diff_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_key_variation2.phpt b/ext/standard/tests/array/array_diff_key_variation2.phpt
index 737ee2e57f4..af4738db684 100644
--- a/ext/standard/tests/array/array_diff_key_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation2.phpt
@@ -3,7 +3,7 @@ Test array_diff_key() function : usage variation - Passing unexpected values to
 --FILE--
 <?php
 /* Prototype  : array array_diff_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_key_variation3.phpt b/ext/standard/tests/array/array_diff_key_variation3.phpt
index 28f4c055293..a710b3bd06a 100644
--- a/ext/standard/tests/array/array_diff_key_variation3.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation3.phpt
@@ -3,7 +3,7 @@ Test array_diff_key() function : usage variation - Passing unexpected values to
 --FILE--
 <?php
 /* Prototype  : array array_diff_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_key_variation4.phpt b/ext/standard/tests/array/array_diff_key_variation4.phpt
index d3ef45c4608..d72e70ba5fd 100644
--- a/ext/standard/tests/array/array_diff_key_variation4.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation4.phpt
@@ -3,14 +3,14 @@ Test array_diff_key() function : usage variation - Passing integer indexed array
 --FILE--
 <?php
 /* Prototype  : array array_diff_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
 echo "*** Testing array_diff_key() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(-07 => '-07', 0xA => '0xA'); 
+$input_array = array(-07 => '-07', 0xA => '0xA');
 
 $input_arrays = array(
       'decimal indexed' => array(10 => '10', '-17' => '-17'),
diff --git a/ext/standard/tests/array/array_diff_key_variation5.phpt b/ext/standard/tests/array/array_diff_key_variation5.phpt
index f777953c592..72dca968264 100644
--- a/ext/standard/tests/array/array_diff_key_variation5.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation5.phpt
@@ -3,15 +3,15 @@ Test array_diff_key() function : usage variation - Passing float indexed array
 --FILE--
 <?php
 /* Prototype  : array array_diff_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
 echo "*** Testing array_diff_key() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20'); 
-$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5'); 
+$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20');
+$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5');
 
 echo "\n-- Testing array_diff_key() function with float indexed array --\n";
 // loop through each element of the array for arr1
diff --git a/ext/standard/tests/array/array_diff_key_variation6.phpt b/ext/standard/tests/array/array_diff_key_variation6.phpt
index 48334fc0a93..b98b5b54e8f 100644
--- a/ext/standard/tests/array/array_diff_key_variation6.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation6.phpt
@@ -3,14 +3,14 @@ Test array_diff_key() function : usage variation - Passing boolean indexed array
 --FILE--
 <?php
 /* Prototype  : array array_diff_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
 echo "*** Testing array_diff_key() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); 
+$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0);
 $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF');
 
 echo "\n-- Testing array_diff_key() function with boolean indexed array --\n";
diff --git a/ext/standard/tests/array/array_diff_key_variation7.phpt b/ext/standard/tests/array/array_diff_key_variation7.phpt
index c2e806c0096..53807cb1159 100644
--- a/ext/standard/tests/array/array_diff_key_variation7.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation7.phpt
@@ -3,14 +3,14 @@ Test array_diff_key() function : usage variation - Passing null,unset and undefi
 --FILE--
 <?php
 /* Prototype  : array array_diff_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
 echo "*** Testing array_diff_key() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(10 => '10', "" => 'empty'); 
+$input_array = array(10 => '10', "" => 'empty');
 
 //get an unset variable
 $unset_var = 10;
@@ -27,7 +27,7 @@ foreach($input_arrays as $key =>$value) {
       // loop through each element of the array for arr1
       var_dump( array_diff_key($input_array, $value) );
       var_dump( array_diff_key($value, $input_array) );
-}      
+}
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_diff_key_variation8.phpt b/ext/standard/tests/array/array_diff_key_variation8.phpt
index 3242e6970ba..25b445d00a4 100644
--- a/ext/standard/tests/array/array_diff_key_variation8.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation8.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_diff_key() function : usage variation - Passing multi-dimensional array 
+Test array_diff_key() function : usage variation - Passing multi-dimensional array
 --FILE--
 <?php
 /* Prototype  : array array_diff_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
@@ -13,19 +13,19 @@ echo "*** Testing array_diff_key() : usage variation ***\n";
 $array1 = array(
 
 	  'first' => array('blue' => 1, 'red' => 2),
-              
+
       'second' => array('yellow' => 7),
-              
+
       'third' => array(0 => 'zero'),
 );
 
 $array2 = array (
 
 	  'first' => array('blue' => 1, 'red' => 2,),
-              
+
       'second' => array('cyan' => 8),
-              
-      'fourth' => array(2 => 'two'), 
+
+      'fourth' => array(2 => 'two'),
 );
 
 echo "\n-- Testing array_diff_key() function with multi dimensional array --\n";
diff --git a/ext/standard/tests/array/array_diff_uassoc_basic.phpt b/ext/standard/tests/array/array_diff_uassoc_basic.phpt
index 6a96be6b7c6..419b916fd89 100644
--- a/ext/standard/tests/array/array_diff_uassoc_basic.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-array_diff_uassoc(): Basic test 
+array_diff_uassoc(): Basic test
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/array/array_diff_uassoc_error.phpt b/ext/standard/tests/array/array_diff_uassoc_error.phpt
index 0f9f82464cc..d90c80f20b7 100644
--- a/ext/standard/tests/array/array_diff_uassoc_error.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_diff_uassoc() function : error conditions 
+Test array_diff_uassoc() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
index 75494c7e5a0..95da2ecb3cc 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt
@@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Passing unexpected values
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation10.phpt b/ext/standard/tests/array/array_diff_uassoc_variation10.phpt
index 57b17d1bcff..018973da52e 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation10.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation10.phpt
@@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Passing float indexed arra
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
@@ -11,13 +11,13 @@ Test array_diff_uassoc() function : usage variation - Passing float indexed arra
 echo "*** Testing array_diff_uassoc() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20'); 
-$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5'); 
+$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20', -20 => '-20');
+$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -10.5 => '-10.5', 0.5 => '0.5');
 
 echo "\n-- Testing array_diff_key() function with float indexed array --\n";
 var_dump( array_diff_uassoc($input_array, $float_indx_array, "strcasecmp") );
 var_dump( array_diff_uassoc($float_indx_array, $input_array, "strcasecmp") );
-    
+
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt
index b77df32796a..3d984899e07 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt
@@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Passing boolean indexed ar
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
@@ -11,13 +11,13 @@ Test array_diff_uassoc() function : usage variation - Passing boolean indexed ar
 echo "*** Testing array_diff_uassoc() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); 
+$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0);
 $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF');
 
 echo "\n-- Testing array_diff_key() function with float indexed array --\n";
 var_dump( array_diff_uassoc($input_array, $boolean_indx_array, "strcasecmp") );
 var_dump( array_diff_uassoc($boolean_indx_array, $input_array, "strcasecmp") );
-    
+
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt
index 9d48231a3f2..6106bfd3c08 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt
@@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Passing null,unset and und
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
@@ -11,7 +11,7 @@ Test array_diff_uassoc() function : usage variation - Passing null,unset and und
 echo "*** Testing array_diff_uassoc() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(10 => '10', "" => ''); 
+$input_array = array(10 => '10', "" => '');
 
 //get an unset variable
 $unset_var = 10;
@@ -27,8 +27,8 @@ foreach($input_arrays as $key =>$value) {
       echo "\n--$key--\n";
       var_dump( array_diff_uassoc($input_array, $value, "strcasecmp") );
       var_dump( array_diff_uassoc($value, $input_array, "strcasecmp") );
-}      
-    
+}
+
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation13.phpt b/ext/standard/tests/array/array_diff_uassoc_variation13.phpt
index 92194262ab9..f817452be22 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation13.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation13.phpt
@@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variations - arrays containing referen
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation14.phpt b/ext/standard/tests/array/array_diff_uassoc_variation14.phpt
index a98a2800dac..f8fc5a4b4b7 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation14.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation14.phpt
@@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation -Passing classWithoutToStrin
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt
index 1d3f6a43251..073602c48a2 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt
@@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation -Passing unexpected values t
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation3.phpt b/ext/standard/tests/array/array_diff_uassoc_variation3.phpt
index 3218dd3b6c9..6f413f623e6 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation3.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation3.phpt
@@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation -Passing unexpected values t
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation4.phpt b/ext/standard/tests/array/array_diff_uassoc_variation4.phpt
index ab8744981b3..0943a42e6a6 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation4.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation4.phpt
@@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation -Passing unexpected values a
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation5.phpt b/ext/standard/tests/array/array_diff_uassoc_variation5.phpt
index c35b2ebd9d5..5961b959252 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation5.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation5.phpt
@@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Comparing integers and flo
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation6.phpt b/ext/standard/tests/array/array_diff_uassoc_variation6.phpt
index ad4e8ffda7f..12285bc3904 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation6.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation6.phpt
@@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Comparing floating points
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation7.phpt b/ext/standard/tests/array/array_diff_uassoc_variation7.phpt
index da2030cf128..fde67266c4b 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation7.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation7.phpt
@@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Comparing strings containi
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation8.phpt b/ext/standard/tests/array/array_diff_uassoc_variation8.phpt
index d450def21b8..21b671131cb 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation8.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation8.phpt
@@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Comparing integers with st
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
diff --git a/ext/standard/tests/array/array_diff_uassoc_variation9.phpt b/ext/standard/tests/array/array_diff_uassoc_variation9.phpt
index 72746bb9043..09450ff47cc 100644
--- a/ext/standard/tests/array/array_diff_uassoc_variation9.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_variation9.phpt
@@ -3,7 +3,7 @@ Test array_diff_uassoc() function : usage variation - Passing integer indexed ar
 --FILE--
 <?php
 /* Prototype  : array array_diff_uassoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Computes the difference of arrays with additional index check which is performed by a 
+ * Description: Computes the difference of arrays with additional index check which is performed by a
  * 				user supplied callback function
  * Source code: ext/standard/array.c
  */
@@ -11,7 +11,7 @@ Test array_diff_uassoc() function : usage variation - Passing integer indexed ar
 echo "*** Testing array_diff_uassoc() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(10 => 10, 12 => 12); 
+$input_array = array(10 => 10, 12 => 12);
 
 $input_arrays = array(
       'decimal indexed' => array(10 => 10, -17 => -17),
@@ -23,8 +23,8 @@ foreach($input_arrays as $key =>$value) {
       echo "\n--$key--\n";
       var_dump( array_diff_uassoc($input_array, $value, "strcasecmp") );
       var_dump( array_diff_uassoc($value, $input_array, "strcasecmp") );
-} 
-     
+}
+
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_diff_ukey_basic.phpt b/ext/standard/tests/array/array_diff_ukey_basic.phpt
index 7ac309a01e9..3dde1646af6 100644
--- a/ext/standard/tests/array/array_diff_ukey_basic.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-array_diff_ukey() : Basic test. 
+array_diff_ukey() : Basic test.
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/array/array_diff_ukey_error.phpt b/ext/standard/tests/array/array_diff_ukey_error.phpt
index 1a73bdfd5f9..92b6ce0f2c7 100644
--- a/ext/standard/tests/array/array_diff_ukey_error.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test array_diff_ukey() function : error conditions 
+Test array_diff_ukey() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
 echo "*** Testing array_diff_ukey() : error conditions ***\n";
 
-// Initialize 
+// Initialize
 $array1 = array('blue'  => 1, 'red'  => 2, 'green'  => 3, 'purple' => 4);
 $array2 = array('green' => 5, 'blue' => 6, 'yellow' => 7, 'cyan'   => 8);
 $extra_arg = 10;
diff --git a/ext/standard/tests/array/array_diff_ukey_variation1.phpt b/ext/standard/tests/array/array_diff_ukey_variation1.phpt
index 9a849e0ebf6..e2234595ad1 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation1.phpt
@@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing unexpected values to
 --FILE--
 <?php
 /* Prototype  : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_ukey_variation10.phpt b/ext/standard/tests/array/array_diff_ukey_variation10.phpt
index 58a040b0a76..09b4a702372 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation10.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation10.phpt
@@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing non-existing functio
 --FILE--
 <?php
 /* Prototype  : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_ukey_variation11.phpt b/ext/standard/tests/array/array_diff_ukey_variation11.phpt
index 0ad3fbac5e8..074be3bae8c 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation11.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation11.phpt
@@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing class without string
 --FILE--
 <?php
 /* Prototype  : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. User supplied function is used for comparing the keys. This function is like array_udiff() but works on the keys instead of the values. The associativity is preserved. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. User supplied function is used for comparing the keys. This function is like array_udiff() but works on the keys instead of the values. The associativity is preserved.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_ukey_variation2.phpt b/ext/standard/tests/array/array_diff_ukey_variation2.phpt
index 19eab4d62a0..6831ba12a70 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation2.phpt
@@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing unexpected values to
 --FILE--
 <?php
 /* Prototype  : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_ukey_variation3.phpt b/ext/standard/tests/array/array_diff_ukey_variation3.phpt
index f7a2ea8620f..309dae45a46 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation3.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation3.phpt
@@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing unexpected values to
 --FILE--
 <?php
 /* Prototype  : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_ukey_variation4.phpt b/ext/standard/tests/array/array_diff_ukey_variation4.phpt
index a0399c2fa45..b34083308e5 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation4.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation4.phpt
@@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing unexpected values to
 --FILE--
 <?php
 /* Prototype  : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_ukey_variation5.phpt b/ext/standard/tests/array/array_diff_ukey_variation5.phpt
index fb0c97af092..8f96ad6f40a 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation5.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation5.phpt
@@ -3,7 +3,7 @@ Test array_diff_ukey() function : usage variation - Passing multi-dimensional ar
 --FILE--
 <?php
 /* Prototype  : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. User supplied function is used for comparing the keys. This function is like array_udiff() but works on the keys instead of the values. The associativity is preserved. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. User supplied function is used for comparing the keys. This function is like array_udiff() but works on the keys instead of the values. The associativity is preserved.
  * Source code: ext/standard/array.c
  */
 
@@ -13,19 +13,19 @@ echo "*** Testing array_diff_ukey() : usage variation ***\n";
 $array1 = array(
 
 	  'first' => array('blue' => 1, 'red' => 2),
-              
+
       'second' => array('yellow' => 7),
-              
+
       'third' => array(0 => 'zero'),
 );
 
 $array2 = array (
 
 	  'first' => array('blue' => 1, 'red' => 2,),
-              
+
       'second' => array('cyan' => 8),
-              
-      'fourth' => array(2 => 'two'), 
+
+      'fourth' => array(2 => 'two'),
 );
 
 echo "\n-- Testing array_diff_ukey() function with multi dimensional array --\n";
diff --git a/ext/standard/tests/array/array_diff_ukey_variation6.phpt b/ext/standard/tests/array/array_diff_ukey_variation6.phpt
index 2188a88dda3..c6bb1ccbc63 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation6.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation6.phpt
@@ -3,14 +3,14 @@ Test array_diff_ukey() function : usage variation - Passing integer indexed arra
 --FILE--
 <?php
 /* Prototype  : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
 echo "*** Testing array_diff_ukey() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(-07 => '-07', 0xA => '0xA'); 
+$input_array = array(-07 => '-07', 0xA => '0xA');
 
 $input_arrays = array(
       'decimal indexed' => array(10 => '10', '-17' => '-17'),
diff --git a/ext/standard/tests/array/array_diff_ukey_variation7.phpt b/ext/standard/tests/array/array_diff_ukey_variation7.phpt
index 88888d6b372..03f18ee967a 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation7.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation7.phpt
@@ -3,15 +3,15 @@ Test array_diff_ukey() function : usage variation - Passing float indexed array
 --FILE--
 <?php
 /* Prototype  : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
 echo "*** Testing array_diff_ukey() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20'); 
-$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -30.5 => '-30.5'); 
+$input_array = array(0 => '0', 10 => '10', -10 => '-10', 20 =>'20');
+$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5', -30.5 => '-30.5');
 
 function key_compare_func($key1, $key2)
 {
diff --git a/ext/standard/tests/array/array_diff_ukey_variation8.phpt b/ext/standard/tests/array/array_diff_ukey_variation8.phpt
index 9bb94989965..26830f3f4e0 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation8.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation8.phpt
@@ -3,14 +3,14 @@ Test array_diff_ukey() function : usage variation - Passing boolean indexed arra
 --FILE--
 <?php
 /* Prototype  : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
 echo "*** Testing array_diff_ukey() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0); 
+$input_array = array(0 => '0', 1 => '1', -10 => '-10', 'true' => 1, 'false' => 0);
 $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF');
 
 function key_compare_func($key1, $key2)
diff --git a/ext/standard/tests/array/array_diff_ukey_variation9.phpt b/ext/standard/tests/array/array_diff_ukey_variation9.phpt
index 024f5f42470..1bfbddad156 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation9.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation9.phpt
@@ -3,14 +3,14 @@ Test array_diff_ukey() function : usage variation - Passing null,unset and undef
 --FILE--
 <?php
 /* Prototype  : array array_diff_ukey(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have keys which are not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
 echo "*** Testing array_diff_ukey() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(10 => '10', "" => 'empty'); 
+$input_array = array(10 => '10', "" => 'empty');
 
 //get an unset variable
 $unset_var = 10;
@@ -26,7 +26,7 @@ foreach($input_arrays as $key =>$value) {
       echo "\n--$key--\n";
       var_dump( array_diff_ukey($value, $input_array, 'strcasecmp') );
       var_dump( array_diff_ukey($input_array, $value, 'strcasecmp') );
-}      
+}
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/array/array_diff_variation1.phpt b/ext/standard/tests/array/array_diff_variation1.phpt
index f9a34b0a593..06cb3d69815 100644
--- a/ext/standard/tests/array/array_diff_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_variation1.phpt
@@ -3,8 +3,8 @@ Test array_diff() function : usage variations - unexpected values for 'arr1' arg
 --FILE--
 <?php
 /* Prototype  : array array_diff(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are not 
- * present in any of the others arguments. 
+ * Description: Returns the entries of $arr1 that have values which are not
+ * present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
@@ -61,7 +61,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -70,11 +70,11 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // binary data
 /*21*/ b"binary",
 	   (binary)"binary",
-	   
+
        // object data
 /*23*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_diff_variation10.phpt b/ext/standard/tests/array/array_diff_variation10.phpt
index 9442b946d9e..f93a1f5353c 100644
--- a/ext/standard/tests/array/array_diff_variation10.phpt
+++ b/ext/standard/tests/array/array_diff_variation10.phpt
@@ -3,8 +3,8 @@ Test array_diff() function : usage variations - binary safe checking
 --FILE--
 <?php
 /* Prototype  : array array_diff(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are 
- * not present in any of the others arguments. 
+ * Description: Returns the entries of $arr1 that have values which are
+ * not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
@@ -15,15 +15,15 @@ Test array_diff() function : usage variations - binary safe checking
 echo "*** Testing array_diff() : usage variations ***\n";
 
 
-$array1 = array( b"1", 
-                 b"hello", 
-                 "world", 
-                 "str1" => "hello", 
+$array1 = array( b"1",
+                 b"hello",
+                 "world",
+                 "str1" => "hello",
                  "str2" => "world");
 
 $array2 = array( b"1" => 'hello',
                  b"world",
-                 "hello", 
+                 "hello",
                  'test');
 
 var_dump(array_diff($array1, $array2));
diff --git a/ext/standard/tests/array/array_diff_variation2.phpt b/ext/standard/tests/array/array_diff_variation2.phpt
index be68c40c2f8..70bfc05fc0a 100644
--- a/ext/standard/tests/array/array_diff_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_variation2.phpt
@@ -3,8 +3,8 @@ Test array_diff() function : usage variations - unexpected values for 'arr2' arg
 --FILE--
 <?php
 /* Prototype  : array array_diff(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are 
- * not present in any of the others arguments. 
+ * Description: Returns the entries of $arr1 that have values which are
+ * not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
@@ -61,7 +61,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -70,7 +70,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-              
+
        // binary data
 /*21*/ b"binary",
 	   (binary)"binary",
diff --git a/ext/standard/tests/array/array_diff_variation3.phpt b/ext/standard/tests/array/array_diff_variation3.phpt
index 84f73fd287f..4d02598717d 100644
--- a/ext/standard/tests/array/array_diff_variation3.phpt
+++ b/ext/standard/tests/array/array_diff_variation3.phpt
@@ -3,8 +3,8 @@ Test array_diff() function : usage variations  - array with different data types
 --FILE--
 <?php
 /* Prototype  : array array_diff(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are not 
- * present in any of the others arguments. 
+ * Description: Returns the entries of $arr1 that have values which are not
+ * present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
@@ -50,7 +50,7 @@ $values = array(
        .5),
 
 /*4*/
-"null" => array(      
+"null" => array(
       // null data
       NULL,
       null),
@@ -64,7 +64,7 @@ $values = array(
       FALSE),
 
 /*6*/
-"empty" => array(      
+"empty" => array(
       // empty data
       "",
       ''),
@@ -75,20 +75,20 @@ $values = array(
       "string",
       'string',
       $heredoc),
-      
-/*8*/      
+
+/*8*/
 "binary" => array(
        // binary data
        b"binary",
 	   (binary)"binary"),
-	   
-/*9*/	   
+
+/*9*/
 "undefined" => array(
       // undefined data
       @$undefined_var),
 
 /*10*/
-"unset" => array(      
+"unset" => array(
       // unset data
       @$unset_var)
 );
diff --git a/ext/standard/tests/array/array_diff_variation4.phpt b/ext/standard/tests/array/array_diff_variation4.phpt
index 75b01adaa17..cb0dcc315a9 100644
--- a/ext/standard/tests/array/array_diff_variation4.phpt
+++ b/ext/standard/tests/array/array_diff_variation4.phpt
@@ -3,8 +3,8 @@ Test array_diff() function : usage variations  - array with different data types
 --FILE--
 <?php
 /* Prototype  : array array_diff(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are not 
- * present in any of the others arguments. 
+ * Description: Returns the entries of $arr1 that have values which are not
+ * present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
@@ -50,7 +50,7 @@ $values = array(
        .5),
 
 /*4*/
-"null" => array(      
+"null" => array(
       // null data
       NULL,
       null),
@@ -64,7 +64,7 @@ $values = array(
       FALSE),
 
 /*6*/
-"empty" => array(      
+"empty" => array(
       // empty data
       "",
       ''),
@@ -75,20 +75,20 @@ $values = array(
       "string",
       'string',
       $heredoc),
-      
-/*8*/      
+
+/*8*/
 "binary" => array(
        // binary data
        b"binary",
 	   (binary)"binary"),
-	   
-/*9*/	   
+
+/*9*/
 "undefined" => array(
       // undefined data
       @$undefined_var),
 
 /*10*/
-"unset" => array(      
+"unset" => array(
       // unset data
       @$unset_var)
 );
diff --git a/ext/standard/tests/array/array_diff_variation5.phpt b/ext/standard/tests/array/array_diff_variation5.phpt
index cb6b5d3dabe..d9e97f5606e 100644
--- a/ext/standard/tests/array/array_diff_variation5.phpt
+++ b/ext/standard/tests/array/array_diff_variation5.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_diff() function : usage variations - comparing integers, float 
+Test array_diff() function : usage variations - comparing integers, float
 and string array values
 --FILE--
 <?php
 /* Prototype  : array array_diff(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are not 
- * present in any of the others arguments. 
+ * Description: Returns the entries of $arr1 that have values which are not
+ * present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
@@ -18,7 +18,7 @@ echo "*** Testing array_diff() : usage variations ***\n";
 $arr_int = array(1, 2, 3);
 $arr_float = array(1.00, 2.00, 3.00);
 $arr_int_str = array('1', '2', '3');
-$arr_float_str = array('1.00', '2.00', '3.00');	
+$arr_float_str = array('1.00', '2.00', '3.00');
 
 print "-- Compare integers and floats: --\n";
 var_dump(array_diff($arr_int, $arr_float));
diff --git a/ext/standard/tests/array/array_diff_variation6.phpt b/ext/standard/tests/array/array_diff_variation6.phpt
index 8ea84bb9da4..23aeff6332e 100644
--- a/ext/standard/tests/array/array_diff_variation6.phpt
+++ b/ext/standard/tests/array/array_diff_variation6.phpt
@@ -3,8 +3,8 @@ Test array_diff() function : usage variations - array containing duplicate keys
 --FILE--
 <?php
 /* Prototype  : array array_diff(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are not 
- * present in any of the others arguments. 
+ * Description: Returns the entries of $arr1 that have values which are not
+ * present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
@@ -20,8 +20,8 @@ echo "*** Testing array_diff() : usage variations ***\n";
 $array_index = array('a', 'b', 'c', 0 => 'd', 'b');   //duplicate key (0), duplicate value (b)
 $array_assoc = array ('2' => 'c',   //same key=>value pair, different order
                       '1' => 'b',
-                      '0' => 'a', 
-                      'b' => '3',   //key and value from array_index swapped 
+                      '0' => 'a',
+                      'b' => '3',   //key and value from array_index swapped
                       'c' => 2);    //same as above, using integer
 
 var_dump(array_diff($array_index, $array_assoc));
diff --git a/ext/standard/tests/array/array_diff_variation7.phpt b/ext/standard/tests/array/array_diff_variation7.phpt
index c53cbb3d1c8..3577c9d14b7 100644
--- a/ext/standard/tests/array/array_diff_variation7.phpt
+++ b/ext/standard/tests/array/array_diff_variation7.phpt
@@ -3,8 +3,8 @@ Test array_diff() function : usage variations - arrays containing referenced var
 --FILE--
 <?php
 /* Prototype  : array array_diff(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of $arr1 that have values which are not 
- * present in any of the others arguments. 
+ * Description: Returns the entries of $arr1 that have values which are not
+ * present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_variation8.phpt b/ext/standard/tests/array/array_diff_variation8.phpt
index 99f9614d72c..9d768fa7317 100644
--- a/ext/standard/tests/array/array_diff_variation8.phpt
+++ b/ext/standard/tests/array/array_diff_variation8.phpt
@@ -4,7 +4,7 @@ Test array_diff() function : usage variations - associative arrays contianing di
 <?php
 /* Prototype  : array array_diff(array $arr1, array $arr2 [, array ...])
  * Description: Returns the entries of $arr1 that have values which are
- * not present in any of the others arguments. 
+ * not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_diff_variation9.phpt b/ext/standard/tests/array/array_diff_variation9.phpt
index 83302378f07..05b6a1eb026 100644
--- a/ext/standard/tests/array/array_diff_variation9.phpt
+++ b/ext/standard/tests/array/array_diff_variation9.phpt
@@ -5,8 +5,8 @@ error_reporting=E_ALL & ~E_NOTICE
 --FILE--
 <?php
 /* Prototype  : array array_diff(array $arr1, array $arr2 [, array ...])
- * Description: Returns the entries of arr1 that have values which are 
- * not present in any of the others arguments. 
+ * Description: Returns the entries of arr1 that have values which are
+ * not present in any of the others arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_fill_basic.phpt b/ext/standard/tests/array/array_fill_basic.phpt
index 309c9ca073f..a6ef4c4a68f 100644
--- a/ext/standard/tests/array/array_fill_basic.phpt
+++ b/ext/standard/tests/array/array_fill_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_fill() function : basic functionality 
+Test array_fill() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto array array_fill(int start_key, int num, mixed val)
- * Description: Create an array containing num elements starting with index start_key each initialized to val 
+ * Description: Create an array containing num elements starting with index start_key each initialized to val
  * Source code: ext/standard/array.c
  */
 
@@ -18,7 +18,7 @@ HERE_DOC;
 
 // array of possible valid values for 'val' argument
 $values = array (
-  
+
   /* 1  */  NULL,
             0,
             1,
@@ -38,7 +38,7 @@ for($i = 0; $i < count($values); $i ++)
   var_dump( array_fill($start_key,$num,$val) );
 
   $counter++;
-}  
+}
 
 echo "Done";
 ?>
diff --git a/ext/standard/tests/array/array_fill_error.phpt b/ext/standard/tests/array/array_fill_error.phpt
index 33ee2b3858a..2fbdb850c35 100644
--- a/ext/standard/tests/array/array_fill_error.phpt
+++ b/ext/standard/tests/array/array_fill_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_fill() function : error conditions 
+Test array_fill() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto array array_fill(int start_key, int num, mixed val)
- * Description: Create an array containing num elements starting with index start_key each initialized to val 
+ * Description: Create an array containing num elements starting with index start_key each initialized to val
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_fill_keys_error.phpt b/ext/standard/tests/array/array_fill_keys_error.phpt
index 012a729d62b..59a2301c111 100644
--- a/ext/standard/tests/array/array_fill_keys_error.phpt
+++ b/ext/standard/tests/array/array_fill_keys_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_fill_keys() function : error conditions 
+Test array_fill_keys() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto array array_fill_keys(array keys, mixed val)
- * Description: Create an array using the elements of the first parameter as keys each initialized to val 
+ * Description: Create an array using the elements of the first parameter as keys each initialized to val
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_fill_keys() : error conditions ***\n";
diff --git a/ext/standard/tests/array/array_fill_keys_variation1.phpt b/ext/standard/tests/array/array_fill_keys_variation1.phpt
index 9fab89d7f2f..234aa6ef696 100644
--- a/ext/standard/tests/array/array_fill_keys_variation1.phpt
+++ b/ext/standard/tests/array/array_fill_keys_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_fill_keys() function : variation of parameter 
+Test array_fill_keys() function : variation of parameter
 --FILE--
 <?php
 /* Prototype  : proto array array_fill_keys(array keys, mixed val)
- * Description: Create an array using the elements of the first parameter as keys each initialized to val 
+ * Description: Create an array using the elements of the first parameter as keys each initialized to val
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
diff --git a/ext/standard/tests/array/array_fill_keys_variation2.phpt b/ext/standard/tests/array/array_fill_keys_variation2.phpt
index 4f3681aaf42..e44fa9570a9 100644
--- a/ext/standard/tests/array/array_fill_keys_variation2.phpt
+++ b/ext/standard/tests/array/array_fill_keys_variation2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_fill_keys() function : variation of parameter 
+Test array_fill_keys() function : variation of parameter
 --FILE--
 <?php
 /* Prototype  : proto array array_fill_keys(array keys, mixed val)
- * Description: Create an array using the elements of the first parameter as keys each initialized to val 
+ * Description: Create an array using the elements of the first parameter as keys each initialized to val
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /* Testing with reference types for the arguments */
diff --git a/ext/standard/tests/array/array_fill_keys_variation3.phpt b/ext/standard/tests/array/array_fill_keys_variation3.phpt
index 5c57823ba71..601c7b11fea 100644
--- a/ext/standard/tests/array/array_fill_keys_variation3.phpt
+++ b/ext/standard/tests/array/array_fill_keys_variation3.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_fill_keys() function : variation of parameter 
+Test array_fill_keys() function : variation of parameter
 --FILE--
 <?php
 /* Prototype  : proto array array_fill_keys(array keys, mixed val)
- * Description: Create an array using the elements of the first parameter as keys each initialized to val 
+ * Description: Create an array using the elements of the first parameter as keys each initialized to val
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /* Testing with unexpected argument types */
diff --git a/ext/standard/tests/array/array_fill_keys_variation4.phpt b/ext/standard/tests/array/array_fill_keys_variation4.phpt
index 209443db085..086a10df2ac 100644
--- a/ext/standard/tests/array/array_fill_keys_variation4.phpt
+++ b/ext/standard/tests/array/array_fill_keys_variation4.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_fill_keys() function : variation of parameter 
+Test array_fill_keys() function : variation of parameter
 --FILE--
 <?php
 /* Prototype  : proto array array_fill_keys(array keys, mixed val)
- * Description: Create an array using the elements of the first parameter as keys each initialized to val 
+ * Description: Create an array using the elements of the first parameter as keys each initialized to val
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /* Testing with unexpected argument types */
diff --git a/ext/standard/tests/array/array_fill_object.phpt b/ext/standard/tests/array/array_fill_object.phpt
index aa1db044cc0..c784b544150 100644
--- a/ext/standard/tests/array/array_fill_object.phpt
+++ b/ext/standard/tests/array/array_fill_object.phpt
@@ -3,7 +3,7 @@ Test array_fill() function : usage variations - various object values for 'val'
 --FILE--
 <?php
 /* Prototype  : array array_fill(int $start_key, int $num, mixed $val)
- * Description: Create an array containing num elements starting with index start_key each initialized to val 
+ * Description: Create an array containing num elements starting with index start_key each initialized to val
  * Source code: ext/standard/array.c
  */
 
@@ -13,7 +13,7 @@ Test array_fill() function : usage variations - various object values for 'val'
 
 echo "*** Testing array_fill() : usage variations ***\n";
 
-// Initialise function arguments not being substituted 
+// Initialise function arguments not being substituted
 $start_key = 0;
 $num = 2;
 
@@ -22,7 +22,7 @@ class Test
 {
 }
 
-//class with public member, static member , constant and consturctor to initialize the public member 
+//class with public member, static member , constant and consturctor to initialize the public member
 class Test1
 {
   const test1_constant = "test1";
@@ -78,14 +78,14 @@ class Child_test2 extends Test2
   }
 }
 
-// class with protected member, static member, constant and consturctor to initialize the protected member 
+// class with protected member, static member, constant and consturctor to initialize the protected member
 class Test3
 {
   const test3_constant = "test3";
   public static $test3_static = 0;
   protected $member1;
   var $var1 = 30;
-  var $var2; 
+  var $var2;
 
   function __construct($value1 , $value2)
   {
@@ -127,7 +127,7 @@ class Test4
 class Child_test4 extends Test4
 {
   var $var1;
-  
+
   function __construct($value1 , $value2 , $value3 , $value4)
   {
     parent::__construct($value1 , $value2 , $value3);
@@ -135,14 +135,14 @@ class Child_test4 extends Test4
   }
 }
 
-// abstract class with public, private, protected members 
+// abstract class with public, private, protected members
 abstract class AbstractClass
 {
   public $member1;
   private $member2;
   protected $member3;
   var $var1 = 30;
-  
+
   abstract protected function display();
 }
 
@@ -173,7 +173,7 @@ class Template1 implements iTemplate
 
 //array of object values for 'val' argument
 $objects = array(
-  
+
   /* 1  */  new Test(),
             new Test1(100 , 101),
             new Child_test1(100 , 101 , 102),
@@ -187,7 +187,7 @@ $objects = array(
   /* 11 */  new Template1()
 );
 
-// loop through each element of the array for 'val' argument 
+// loop through each element of the array for 'val' argument
 // check the working of array_fill()
 echo "--- Testing array_fill() with different object values for 'val' argument ---\n";
 $counter = 1;
diff --git a/ext/standard/tests/array/array_fill_variation1.phpt b/ext/standard/tests/array/array_fill_variation1.phpt
index 684949fe959..1d779840cd7 100644
--- a/ext/standard/tests/array/array_fill_variation1.phpt
+++ b/ext/standard/tests/array/array_fill_variation1.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : proto array array_fill(int start_key, int num, mixed val)
- * Description: Create an array containing num elements starting with index start_key each initialized to val 
+ * Description: Create an array containing num elements starting with index start_key each initialized to val
  * Source code: ext/standard/array.c
  */
 
@@ -17,7 +17,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 
 echo "*** Testing array_fill() : usage variations ***\n";
 
-// Initialise function arguments not being substituted 
+// Initialise function arguments not being substituted
 $num = 2;
 $val = 100;
 
@@ -60,13 +60,13 @@ $values = array(
   /* 11 */  NULL,
             null,
 
-            // boolean values 
+            // boolean values
   /* 13 */  true,
             false,
             TRUE,
             FALSE,
 
-            // empty string 
+            // empty string
   /* 17 */  "",
             '',
 
@@ -80,14 +80,14 @@ $values = array(
             // undefined  variable
             @$undefined_var,
 
-            // unset variable 
+            // unset variable
             @$unset_var,
 
             // resource variable
   /* 24 */  $fp
 );
 
-// loop through each element of the array for start_key 
+// loop through each element of the array for start_key
 // check the working of array_fill()
 echo "--- Testing array_fill() with different values for 'start_key' arg ---\n";
 $counter = 1;
@@ -95,9 +95,9 @@ for($index = 0; $index < count($values); $index ++)
 {
   echo "-- Iteration $counter --\n";
   $start_key = $values[$index];
- 
+
   var_dump( array_fill($start_key,$num,$val) );
- 
+
   $counter ++;
 }
 
diff --git a/ext/standard/tests/array/array_fill_variation1_64bit.phpt b/ext/standard/tests/array/array_fill_variation1_64bit.phpt
index 6cbec86f608..53a2eaee0df 100644
--- a/ext/standard/tests/array/array_fill_variation1_64bit.phpt
+++ b/ext/standard/tests/array/array_fill_variation1_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : proto array array_fill(int start_key, int num, mixed val)
- * Description: Create an array containing num elements starting with index start_key each initialized to val 
+ * Description: Create an array containing num elements starting with index start_key each initialized to val
  * Source code: ext/standard/array.c
  */
 
@@ -17,7 +17,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 
 echo "*** Testing array_fill() : usage variations ***\n";
 
-// Initialise function arguments not being substituted 
+// Initialise function arguments not being substituted
 $num = 2;
 $val = 100;
 
@@ -60,13 +60,13 @@ $values = array(
   /* 11 */  NULL,
             null,
 
-            // boolean values 
+            // boolean values
   /* 13 */  true,
             false,
             TRUE,
             FALSE,
 
-            // empty string 
+            // empty string
   /* 17 */  "",
             '',
 
@@ -80,14 +80,14 @@ $values = array(
             // undefined  variable
             @$undefined_var,
 
-            // unset variable 
+            // unset variable
             @$unset_var,
 
             // resource variable
   /* 24 */  $fp
 );
 
-// loop through each element of the array for start_key 
+// loop through each element of the array for start_key
 // check the working of array_fill()
 echo "--- Testing array_fill() with different values for 'start_key' arg ---\n";
 $counter = 1;
@@ -95,9 +95,9 @@ for($index = 0; $index < count($values); $index ++)
 {
   echo "-- Iteration $counter --\n";
   $start_key = $values[$index];
- 
+
   var_dump( array_fill($start_key,$num,$val) );
- 
+
   $counter ++;
 }
 
diff --git a/ext/standard/tests/array/array_fill_variation2.phpt b/ext/standard/tests/array/array_fill_variation2.phpt
index 953615edf5f..d9ecd139a6a 100644
--- a/ext/standard/tests/array/array_fill_variation2.phpt
+++ b/ext/standard/tests/array/array_fill_variation2.phpt
@@ -1,19 +1,19 @@
 --TEST--
-Test array_fill() function : usage variations  - unexpected values for 'num' argument 
+Test array_fill() function : usage variations  - unexpected values for 'num' argument
 --FILE--
 <?php
 /* Prototype  : proto array array_fill(int start_key, int num, mixed val)
- * Description: Create an array containing num elements starting with index start_key each initialized to val 
+ * Description: Create an array containing num elements starting with index start_key each initialized to val
  * Source code: ext/standard/array.c
  */
 
 /*
- * testing array_fill() by passing different unexpected values for 'num' argument  
+ * testing array_fill() by passing different unexpected values for 'num' argument
  */
 
 echo "*** Testing array_fill() : usage variations ***\n";
 
-// Initialise function arguments not being substituted 
+// Initialise function arguments not being substituted
 $start_key = 0;
 $val = 100;
 
@@ -88,7 +88,7 @@ for($index = 0; $index < count($values); $index ++)
   $num = $values[$index];
 
   var_dump( array_fill($start_key,$num,$val) );
- 
+
   $counter ++;
 }
 
diff --git a/ext/standard/tests/array/array_fill_variation3.phpt b/ext/standard/tests/array/array_fill_variation3.phpt
index 4a463a9c0ed..9c1857c61d4 100644
--- a/ext/standard/tests/array/array_fill_variation3.phpt
+++ b/ext/standard/tests/array/array_fill_variation3.phpt
@@ -3,7 +3,7 @@ Test array_fill() function : usage variations  - unexpected values for 'val' arg
 --FILE--
 <?php
 /* Prototype  : array array_fill(int $start_key, int $num, mixed $val)
- * Description: Create an array containing num elements starting with index start_key each initialized to val 
+ * Description: Create an array containing num elements starting with index start_key each initialized to val
  * Source code: ext/standard/array.c
  */
 
@@ -13,7 +13,7 @@ Test array_fill() function : usage variations  - unexpected values for 'val' arg
 
 echo "*** Testing array_fill() : usage variations ***\n";
 
-// Initialise function arguments not being substituted 
+// Initialise function arguments not being substituted
 $start_key = 0;
 $num = 2;
 
@@ -32,22 +32,22 @@ class test
 }
 
 
-//array of different values for 'val' argument  
+//array of different values for 'val' argument
 $values = array(
             // empty string
   /* 1  */  "",
             '',
-            // objects 
+            // objects
   /* 3  */  new test(),
 
-            // undefined variable 
+            // undefined variable
             @$undefined_var,
 
-            // unset variable  
+            // unset variable
   /* 5  */  @$unset_var,
 );
 
-// loop through each element of the array for 'val' argument 
+// loop through each element of the array for 'val' argument
 // check the working of array_fill()
 echo "--- Testing array_fill() with different values for 'val' argument ---\n";
 $counter = 1;
@@ -55,9 +55,9 @@ for($index = 0; $index < count($values); $index ++)
 {
   echo "-- Iteration $counter --\n";
   $val = $values[$index];
-  
+
   var_dump( array_fill($start_key , $num , $val) );
- 
+
   $counter++;
 }
 
diff --git a/ext/standard/tests/array/array_fill_variation4.phpt b/ext/standard/tests/array/array_fill_variation4.phpt
index 13b566a7dba..b750677e65f 100644
--- a/ext/standard/tests/array/array_fill_variation4.phpt
+++ b/ext/standard/tests/array/array_fill_variation4.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_fill() function : usage variations - using return value of array_fill for 'val' argument 
+Test array_fill() function : usage variations - using return value of array_fill for 'val' argument
 --FILE--
 <?php
 /* Prototype  : proto array array_fill(int start_key, int num, mixed val)
- * Description: Create an array containing num elements starting with index start_key each initialized to val 
+ * Description: Create an array containing num elements starting with index start_key each initialized to val
  * Source code: ext/standard/array.c
  */
 
@@ -17,7 +17,7 @@ $heredoc = <<<HERE_DOC
 Hello
 HERE_DOC;
 
-// array of possible valid values for 'val' argument 
+// array of possible valid values for 'val' argument
 $values = array (
 
   /* 1  */  NULL,
@@ -26,7 +26,7 @@ $values = array (
   /* 4  */  1.0,
             'hi',
             "hi",
-  /* 7  */  $heredoc 
+  /* 7  */  $heredoc
 );
 
 echo "*** Filling 2 dimensional array with all basic valid values ***\n";
@@ -35,11 +35,11 @@ for($i =0; $i < count($values); $i ++)
 {
   echo "-- Iteration $counter --\n";
   $val = $values[$i];
- 
+
   var_dump( array_fill($start_key,$num,array_fill($start_key,$num,$val)) );
-  
+
   $counter++;
-}  
+}
 
 echo "Done";
 ?>
diff --git a/ext/standard/tests/array/array_fill_variation5.phpt b/ext/standard/tests/array/array_fill_variation5.phpt
index 10fcc9c2eb4..c8b67a7def9 100644
--- a/ext/standard/tests/array/array_fill_variation5.phpt
+++ b/ext/standard/tests/array/array_fill_variation5.phpt
@@ -3,7 +3,7 @@ Test array_fill() function : usage variations - different types of array values
 --FILE--
 <?php
 /* Prototype  : array array_fill(int $start_key, int $num, mixed $val)
- * Description: Create an array containing num elements starting with index start_key each initialized to val 
+ * Description: Create an array containing num elements starting with index start_key each initialized to val
  * Source code: ext/standard/array.c
  */
 
@@ -13,14 +13,14 @@ Test array_fill() function : usage variations - different types of array values
 
 echo "*** Testing array_fill() : usage variations ***\n";
 
-// Initialise function arguments not being substituted 
+// Initialise function arguments not being substituted
 $start_key = 0;
 $num = 2;
 
 
-//array of different types of array values for 'val' argument  
+//array of different types of array values for 'val' argument
 $values = array(
-           
+
   /* 1  */  array(),
             array(1 , 2 , 3 , 4),
             array(1 => "Hi" , 2 => "Hello"),
@@ -32,11 +32,11 @@ $values = array(
             array( true => "red" , FALSE => "green" ),
   /* 10 */  array( 1 => "Hi" , "color" => "red" , 'item' => 'pen'),
             array( NULL => "Hi", '1' => "Hello" , "1" => "Green"),
-            array( ""=>1, "color" => "green"), 
+            array( ""=>1, "color" => "green"),
   /* 13 */  array('Saffron' , 'White' , 'Green')
 );
 
-// loop through each element of the values array for 'val' argument 
+// loop through each element of the values array for 'val' argument
 // check the working of array_fill()
 echo "--- Testing array_fill() with different types of array values for 'val' argument ---\n";
 $counter = 1;
@@ -44,7 +44,7 @@ for($i = 0; $i < count($values); $i++)
 {
   echo "-- Iteration $counter --\n";
   $val = $values[$i];
-  
+
   var_dump( array_fill($start_key , $num , $val) );
 
   $counter++;
diff --git a/ext/standard/tests/array/array_filter.phpt b/ext/standard/tests/array/array_filter.phpt
index 94f8e39331e..ba27a59c963 100644
--- a/ext/standard/tests/array/array_filter.phpt
+++ b/ext/standard/tests/array/array_filter.phpt
@@ -31,7 +31,7 @@ var_dump(array_filter("", null));
 var_dump(array_filter($array1, 1));
 
 echo '== DONE ==';
-?> 
+?>
 --EXPECTF--
 Odd :
 array(3) {
diff --git a/ext/standard/tests/array/array_filter_basic.phpt b/ext/standard/tests/array/array_filter_basic.phpt
index daec07bacdf..0b59c1cb75a 100644
--- a/ext/standard/tests/array/array_filter_basic.phpt
+++ b/ext/standard/tests/array/array_filter_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_filter() function : basic functionality 
+Test array_filter() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array array_filter(array $input [, callback $callback])
- * Description: Filters elements from the array via the callback. 
+ * Description: Filters elements from the array via the callback.
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_filter_error.phpt b/ext/standard/tests/array/array_filter_error.phpt
index 3f8f51bc14a..14fb78fb12b 100644
--- a/ext/standard/tests/array/array_filter_error.phpt
+++ b/ext/standard/tests/array/array_filter_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_filter() function : error conditions 
+Test array_filter() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_filter(array $input [, callback $callback])
- * Description: Filters elements from the array via the callback. 
+ * Description: Filters elements from the array via the callback.
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_filter_object.phpt b/ext/standard/tests/array/array_filter_object.phpt
index de782fe69b5..3ea93e56023 100644
--- a/ext/standard/tests/array/array_filter_object.phpt
+++ b/ext/standard/tests/array/array_filter_object.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_filter() function : object functionality 
+Test array_filter() function : object functionality
 --FILE--
 <?php
 /* Prototype  : array array_filter(array $input [, callback $callback])
- * Description: Filters elements from the array via the callback. 
+ * Description: Filters elements from the array via the callback.
  * Source code: ext/standard/array.c
 */
 
@@ -42,7 +42,7 @@ abstract class AbstractClass
 class ChildClass extends AbstractClass
 {
   private $var3;
-  public function emptyMethod() { 
+  public function emptyMethod() {
     echo "defined in child";
   }
 }
@@ -51,7 +51,7 @@ class ChildClass extends AbstractClass
 class FinalClass
 {
   private $var4;
-  final function finalMethod() { 
+  final function finalMethod() {
     echo 'This can not be overloaded';
   }
 }
@@ -79,8 +79,8 @@ function always_false($input)
 
 // 'input' array containing objects as elements
 $input = array(
-  new SimpleClass(), 
-  new EmptyClass(), 
+  new SimpleClass(),
+  new EmptyClass(),
   new ChildClass(),
   new FinalClass(),
   new StaticClass()
diff --git a/ext/standard/tests/array/array_filter_variation1.phpt b/ext/standard/tests/array/array_filter_variation1.phpt
index c96e876e5d4..e257844f261 100644
--- a/ext/standard/tests/array/array_filter_variation1.phpt
+++ b/ext/standard/tests/array/array_filter_variation1.phpt
@@ -3,7 +3,7 @@ Test array_filter() function : usage variations - Unexpected values for 'input'
 --FILE--
 <?php
 /* Prototype  : array array_filter(array $input [, callback $callback])
- * Description: Filters elements from the array via the callback. 
+ * Description: Filters elements from the array via the callback.
  * Source code: ext/standard/array.c
 */
 
@@ -76,7 +76,7 @@ $input_values = array(
 
         // object data
 /*20*/  new MyClass(),
- 
+
         // resource data
         $fp,
 
diff --git a/ext/standard/tests/array/array_filter_variation10.phpt b/ext/standard/tests/array/array_filter_variation10.phpt
index b23618794ea..4749fe8e45d 100644
--- a/ext/standard/tests/array/array_filter_variation10.phpt
+++ b/ext/standard/tests/array/array_filter_variation10.phpt
@@ -3,7 +3,7 @@ Test array_filter() function : usage variations - using the array keys inside 'c
 --FILE--
 <?php
 /* Prototype  : array array_filter(array $input [, callback $callback [, bool $use_type = ARRAY_FILTER_USE_VALUE]])
- * Description: Filters elements from the array via the callback. 
+ * Description: Filters elements from the array via the callback.
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_filter_variation2.phpt b/ext/standard/tests/array/array_filter_variation2.phpt
index 1aa262ba62b..d47761f4701 100644
--- a/ext/standard/tests/array/array_filter_variation2.phpt
+++ b/ext/standard/tests/array/array_filter_variation2.phpt
@@ -3,7 +3,7 @@ Test array_filter() function : usage variations - Unexpected values for 'callbac
 --FILE--
 <?php
 /* Prototype  : array array_filter(array $input [, callback $callback])
- * Description: Filters elements from the array via the callback. 
+ * Description: Filters elements from the array via the callback.
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_filter_variation3.phpt b/ext/standard/tests/array/array_filter_variation3.phpt
index e22697a978a..70ad689f4d0 100644
--- a/ext/standard/tests/array/array_filter_variation3.phpt
+++ b/ext/standard/tests/array/array_filter_variation3.phpt
@@ -3,7 +3,7 @@ Test array_filter() function : usage variations - Different types of array for '
 --FILE--
 <?php
 /* Prototype  : array array_filter(array $input [, callback $callback])
- * Description: Filters elements from the array via the callback. 
+ * Description: Filters elements from the array via the callback.
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_filter_variation4.phpt b/ext/standard/tests/array/array_filter_variation4.phpt
index 7f028b15520..9dee494be4c 100644
--- a/ext/standard/tests/array/array_filter_variation4.phpt
+++ b/ext/standard/tests/array/array_filter_variation4.phpt
@@ -3,7 +3,7 @@ Test array_filter() function : usage variations - Different types of 'callback'
 --FILE--
 <?php
 /* Prototype  : array array_filter(array $input [, callback $callback])
- * Description: Filters elements from the array via the callback. 
+ * Description: Filters elements from the array via the callback.
  * Source code: ext/standard/array.c
 */
 
@@ -46,7 +46,7 @@ var_dump( array_filter($input, "callback3") );
 // callback function with parameter and with return value
 function callback4($input)
 {
-  if($input > 0 ) { 
+  if($input > 0 ) {
     return true;
   }
   else {
diff --git a/ext/standard/tests/array/array_filter_variation5.phpt b/ext/standard/tests/array/array_filter_variation5.phpt
index 66b140a2240..1f267908eaa 100644
--- a/ext/standard/tests/array/array_filter_variation5.phpt
+++ b/ext/standard/tests/array/array_filter_variation5.phpt
@@ -3,12 +3,12 @@ Test array_filter() function : usage variations - 'input' argument with differen
 --FILE--
 <?php
 /* Prototype  : array array_filter(array $input [, callback $callback])
- * Description: Filters elements from the array via the callback. 
+ * Description: Filters elements from the array via the callback.
  * Source code: ext/standard/array.c
 */
 
 /*
-* With default callback function argument, array_filter() removes elements which are interpreted as false 
+* With default callback function argument, array_filter() removes elements which are interpreted as false
 * Here Testing all the false array element possibilities
 */
 
@@ -55,13 +55,13 @@ $input = array(
 );
 
 // With default callback function
-var_dump( array_filter($input) );  
+var_dump( array_filter($input) );
 
 // With callback function which returns always true
-var_dump( array_filter($input, 'always_true') ); 
+var_dump( array_filter($input, 'always_true') );
 
 // With callback function which returns always false
-var_dump( array_filter($input, 'always_false') );  
+var_dump( array_filter($input, 'always_false') );
 
 echo "Done"
 ?>
diff --git a/ext/standard/tests/array/array_filter_variation6.phpt b/ext/standard/tests/array/array_filter_variation6.phpt
index 1020c28aad4..df13dc2d12a 100644
--- a/ext/standard/tests/array/array_filter_variation6.phpt
+++ b/ext/standard/tests/array/array_filter_variation6.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_filter() function : usage variations - 'input' array containing references 
+Test array_filter() function : usage variations - 'input' array containing references
 --FILE--
 <?php
 /* Prototype  : array array_filter(array $input [, callback $callback])
- * Description: Filters elements from the array via the callback. 
+ * Description: Filters elements from the array via the callback.
  * Source code: ext/standard/array.c
 */
 
@@ -29,7 +29,7 @@ function callback($input)
     return false;
   }
 }
-  
+
 // initializing variables
 $value1 = array(1, 2, 8);
 $value2 = array(5, 6, 4);
@@ -39,7 +39,7 @@ $input = array(&$value1, 10, &$value2, 'value');
 var_dump( array_filter($input, 'callback') );
 
 // with default 'callback' argument
-var_dump( array_filter($input) ); 
+var_dump( array_filter($input) );
 
 echo "Done"
 ?>
diff --git a/ext/standard/tests/array/array_filter_variation7.phpt b/ext/standard/tests/array/array_filter_variation7.phpt
index 79fb574e230..1e46800c5dd 100644
--- a/ext/standard/tests/array/array_filter_variation7.phpt
+++ b/ext/standard/tests/array/array_filter_variation7.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_filter() function : usage variations - anonymous callback functions 
+Test array_filter() function : usage variations - anonymous callback functions
 --FILE--
 <?php
 /* Prototype  : array array_filter(array $input [, callback $callback])
- * Description: Filters elements from the array via the callback. 
+ * Description: Filters elements from the array via the callback.
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_filter_variation8.phpt b/ext/standard/tests/array/array_filter_variation8.phpt
index 4440b3324ec..7fc1fd798d8 100644
--- a/ext/standard/tests/array/array_filter_variation8.phpt
+++ b/ext/standard/tests/array/array_filter_variation8.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_filter() function : usage variations - Callback function with different return values 
+Test array_filter() function : usage variations - Callback function with different return values
 --FILE--
 <?php
 /* Prototype  : array array_filter(array $input [, callback $callback])
- * Description: Filters elements from the array via the callback. 
+ * Description: Filters elements from the array via the callback.
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_filter_variation9.phpt b/ext/standard/tests/array/array_filter_variation9.phpt
index 81554f13e1f..ed89d13d35b 100644
--- a/ext/standard/tests/array/array_filter_variation9.phpt
+++ b/ext/standard/tests/array/array_filter_variation9.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_filter() function : usage variations - built-in functions as 'callback' argument 
+Test array_filter() function : usage variations - built-in functions as 'callback' argument
 --FILE--
 <?php
 /* Prototype  : array array_filter(array $input [, callback $callback])
- * Description: Filters elements from the array via the callback. 
+ * Description: Filters elements from the array via the callback.
  * Source code: ext/standard/array.c
 */
 
@@ -24,7 +24,7 @@ var_dump( array_filter($input, 'chr') );
 // using language construct 'echo' as 'callback'
 var_dump( array_filter($input, 'echo') );
 
-// using language construct 'exit' as 'callback' 
+// using language construct 'exit' as 'callback'
 var_dump( array_filter($input, 'exit') );
 
 echo "Done"
diff --git a/ext/standard/tests/array/array_flip.phpt b/ext/standard/tests/array/array_flip.phpt
index c268f5aaf60..ab8cf271b10 100644
--- a/ext/standard/tests/array/array_flip.phpt
+++ b/ext/standard/tests/array/array_flip.phpt
@@ -2,15 +2,15 @@
 basic array_flip test
 --FILE--
 <?php
-$trans = array("a" => 1, 
-               "b" => 1, 
-               "c" => 2, 
-               "z" => 0, 
-               "d" => TRUE, 
-               "E" => FALSE, 
-               "F" => NULL, 
-               0 => "G", 
-               1 => "h", 
+$trans = array("a" => 1,
+               "b" => 1,
+               "c" => 2,
+               "z" => 0,
+               "d" => TRUE,
+               "E" => FALSE,
+               "F" => NULL,
+               0 => "G",
+               1 => "h",
                2 => "i");
 $trans = array_flip($trans);
 var_dump($trans);
diff --git a/ext/standard/tests/array/array_flip_basic.phpt b/ext/standard/tests/array/array_flip_basic.phpt
index 08a63fb66b8..c704b295fee 100644
--- a/ext/standard/tests/array/array_flip_basic.phpt
+++ b/ext/standard/tests/array/array_flip_basic.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test array_flip() function : basic functionality 
+Test array_flip() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array array_flip(array $input)
- * Description: Return array with key <-> value flipped 
+ * Description: Return array with key <-> value flipped
  * Source code: ext/standard/array.c
 */
 
 echo "*** Testing array_flip() : basic functionality ***\n";
 
 // array with default keys - numeric values
-$input = array(1, 2);   
+$input = array(1, 2);
 var_dump( array_flip($input) );
 
 // array with default keys - string values
@@ -18,7 +18,7 @@ $input = array('value1', "value2");
 var_dump( array_flip($input) );
 
 // associative arrays - key as string
-$input = array('key1' => 1, "key2" => 2); 
+$input = array('key1' => 1, "key2" => 2);
 var_dump( array_flip($input) );
 
 // associative arrays - key as numeric
diff --git a/ext/standard/tests/array/array_flip_error.phpt b/ext/standard/tests/array/array_flip_error.phpt
index 3aa0f98271a..c193a00896e 100644
--- a/ext/standard/tests/array/array_flip_error.phpt
+++ b/ext/standard/tests/array/array_flip_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_flip() function : error conditions 
+Test array_flip() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_flip(array $input)
- * Description: Return array with key <-> value flipped 
+ * Description: Return array with key <-> value flipped
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_flip_variation1.phpt b/ext/standard/tests/array/array_flip_variation1.phpt
index f03c3774221..5dd84e600b5 100644
--- a/ext/standard/tests/array/array_flip_variation1.phpt
+++ b/ext/standard/tests/array/array_flip_variation1.phpt
@@ -3,7 +3,7 @@ Test array_flip() function : usage variations - unexpected values for 'input' ar
 --FILE--
 <?php
 /* Prototype  : array array_flip(array $input)
- * Description: Return array with key <-> value flipped 
+ * Description: Return array with key <-> value flipped
  * Source code: ext/standard/array.c
 */
 
@@ -24,7 +24,7 @@ class MyClass
 
 //resource variable
 $fp = fopen(__FILE__,'r');
-    
+
 //array of values for 'input' argument
 $values = array(
           // int data
diff --git a/ext/standard/tests/array/array_flip_variation2.phpt b/ext/standard/tests/array/array_flip_variation2.phpt
index 997c391306e..8d86210f0f6 100644
Binary files a/ext/standard/tests/array/array_flip_variation2.phpt and b/ext/standard/tests/array/array_flip_variation2.phpt differ
diff --git a/ext/standard/tests/array/array_flip_variation3.phpt b/ext/standard/tests/array/array_flip_variation3.phpt
index 1d56dfa6e04..b1159d43820 100644
Binary files a/ext/standard/tests/array/array_flip_variation3.phpt and b/ext/standard/tests/array/array_flip_variation3.phpt differ
diff --git a/ext/standard/tests/array/array_flip_variation4.phpt b/ext/standard/tests/array/array_flip_variation4.phpt
index 2420c7e00fd..b8badb0caad 100644
--- a/ext/standard/tests/array/array_flip_variation4.phpt
+++ b/ext/standard/tests/array/array_flip_variation4.phpt
@@ -3,7 +3,7 @@ Test array_flip() function : usage variations - 'input' argument with different
 --FILE--
 <?php
 /* Prototype  : array array_flip(array $input)
- * Description: Return array with key <-> value flipped 
+ * Description: Return array with key <-> value flipped
  * Source code: ext/standard/array.c
 */
 
@@ -38,7 +38,7 @@ $input = array(
   'bool_value2' => false,
   'bool_value3' => TRUE,
   'bool_value4' => FALSE,
-  
+
   // null values
   'null_value1' => null,
 
@@ -51,7 +51,7 @@ $input = array(
   // resource value
   'resource_value' => $fp,
 );
-  
+
 var_dump( array_flip($input) );
 
 // closing resource
diff --git a/ext/standard/tests/array/array_flip_variation5.phpt b/ext/standard/tests/array/array_flip_variation5.phpt
index 29222a12ce0..f39a49069ac 100644
--- a/ext/standard/tests/array/array_flip_variation5.phpt
+++ b/ext/standard/tests/array/array_flip_variation5.phpt
@@ -3,7 +3,7 @@ Test array_flip() function : usage variations - 'input' argument with repeatitiv
 --FILE--
 <?php
 /* Prototype  : array array_flip(array $input)
- * Description: Return array with key <-> value flipped 
+ * Description: Return array with key <-> value flipped
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_intersect_assoc_basic.phpt b/ext/standard/tests/array/array_intersect_assoc_basic.phpt
index bf0f2195a1f..d509487ec54 100644
--- a/ext/standard/tests/array/array_intersect_assoc_basic.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test array_intersect_assoc() function : basic functionality 
+Test array_intersect_assoc() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array array_intersect_assoc(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. 
- * Keys are used to do more restrictive check 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments.
+ * Keys are used to do more restrictive check
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_intersect_assoc_error.phpt b/ext/standard/tests/array/array_intersect_assoc_error.phpt
index c371071b38b..a06dbddefee 100644
--- a/ext/standard/tests/array/array_intersect_assoc_error.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_error.phpt
@@ -3,8 +3,8 @@ Test array_intersect_assoc() function : error conditions(Bug#43197)
 --FILE--
 <?php
 /* Prototype  : array array_intersect_assoc(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. 
- * Keys are used to do more restrictive check 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments.
+ * Keys are used to do more restrictive check
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
index 713ed82f978..9c372c9522d 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
@@ -20,7 +20,7 @@ echo "*** Testing array_intersect_assoc() : Passing non-array values to \$arr1 a
 $arr2 = array(1, 2);
 
 // additional array to be passed for intersection
-$arr3 = array(1, 2, "one" => 1, "two" => 2); 
+$arr3 = array(1, 2, "one" => 1, "two" => 2);
 
 // get an unset variable
 $unset_var = 10;
@@ -71,7 +71,7 @@ $arrays = array(
        // empty data
 /*16*/ "",
        '',
- 
+
        // string data
 /*18*/ "string",
        'string',
@@ -94,7 +94,7 @@ $arrays = array(
 $iterator = 1;
 foreach($arrays as $unexpected_value) {
   echo "\n-- Iteration $iterator --";
-  
+
   // Calling array_intersect_assoc() with default arguments
   var_dump( array_intersect_assoc($unexpected_value, $arr2) );
 
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt
index 9bce974a9dd..b230271be45 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_intersect_assoc() function : usage variations - binary safe checking 
+Test array_intersect_assoc() function : usage variations - binary safe checking
 --FILE--
 <?php
 /* Prototype  : array array_intersect_assoc(array $arr1, array $arr2 [, array $...])
@@ -9,8 +9,8 @@ Test array_intersect_assoc() function : usage variations - binary safe checking
 */
 
 /*
-* Testing the behavior of array_intersect_assoc() by passing array with 
-* binary values for $arr1 and $arr2 argument. 
+* Testing the behavior of array_intersect_assoc() by passing array with
+* binary values for $arr1 and $arr2 argument.
 */
 
 echo "*** Testing array_intersect_assoc() : binary safe checking ***\n";
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
index e82e7cfecd6..06597216865 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
@@ -71,7 +71,7 @@ $arrays = array(
        // empty data
 /*16*/ "",
        '',
- 
+
        // string data
 /*18*/ "string",
        'string',
@@ -94,7 +94,7 @@ $arrays = array(
 $iterator = 1;
 foreach($arrays as $unexpected_value) {
   echo "\n-- Iteration $iterator --";
-  
+
   // Calling array_intersect_assoc() with default arguments
   var_dump( array_intersect_assoc($arr1,$unexpected_value) );
 
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
index e3f0ae08ec2..06cafe629c7 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
@@ -9,7 +9,7 @@ Test array_intersect_assoc() function : usage variations - different arrays for
 */
 
 /*
-* Passing different types of arrays to $arr1 argument and testing whether 
+* Passing different types of arrays to $arr1 argument and testing whether
 * array_intersect_assoc() behaves in an expected way with the other arguments passed to the function
 * The $arr2 argument passed is a fixed array.
 */
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt
index 9eb342f8e78..6e15acf1145 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt
@@ -9,8 +9,8 @@ Test array_intersect_assoc() function : usage variations - different arrays for
 */
 
 /*
-* Passing different types of arrays to $arr2 argument and testing whether 
-* array_intersect_assoc() behaves in an expected way with the other arguments passed to the function.  
+* Passing different types of arrays to $arr2 argument and testing whether
+* array_intersect_assoc() behaves in an expected way with the other arguments passed to the function.
 * The $arr1 argument passed is a fixed array.
 */
 
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation5.phpt b/ext/standard/tests/array/array_intersect_assoc_variation5.phpt
index 7d8e09eb2d3..b4fe47ea5e3 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation5.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation5.phpt
@@ -60,7 +60,7 @@ $arrays = array (
 
 // array to be passsed to $arr2 argument
 $arr2 = array(0 => 0, 2 => "float", 4 => "f3", 33333333 => "f4",
-              "\tHello" => 111, 2.2, 'color', "Hello world" => "string", 
+              "\tHello" => 111, 2.2, 'color', "Hello world" => "string",
               "pen\n" => 33,  133 => "int");
 
 // loop through each sub-array within $arrrays to check the behavior of array_intersect_assoc()
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation6.phpt b/ext/standard/tests/array/array_intersect_assoc_variation6.phpt
index 75806225ca7..0c49a2cc46b 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation6.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation6.phpt
@@ -49,7 +49,7 @@ $arrays = array (
              "\v\fworld" => 2.2, "pen\n" => 33),
        array("hello", $heredoc => "string"), // heredoc
 
-       // array with  unset variable 
+       // array with  unset variable
 /*10*/ array( @$unset_var => "hello"),
 
        // array with mixed keys
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation7.phpt b/ext/standard/tests/array/array_intersect_assoc_variation7.phpt
index ba2f79a7ecb..ca803e50a96 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation7.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation7.phpt
@@ -60,15 +60,15 @@ $arrays = array (
 /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp),
 
        // array with mixed values
-/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", 
-             'resource' => $fp, "int" => 133, "float" => 444.432, 
+/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit",
+             'resource' => $fp, "int" => 133, "float" => 444.432,
              "unset" => @$unset_var, "heredoc" => $heredoc)
 );
 
 // array to be passsed to $arr2 argument
-$arr2 = array(0 => "0", 1, "two" => 2, "float" => 2.3333, "f1" => 1.2, 
-              "f4" => 33333333.333, 111 => "\tHello", 3.3 => 'pen\n', '\v\fworld',  
-              "heredoc" => "Hello world", 11 => new classA(), "resource" => $fp, 
+$arr2 = array(0 => "0", 1, "two" => 2, "float" => 2.3333, "f1" => 1.2,
+              "f4" => 33333333.333, 111 => "\tHello", 3.3 => 'pen\n', '\v\fworld',
+              "heredoc" => "Hello world", 11 => new classA(), "resource" => $fp,
               "int" => 133, 222 => "fruit");
 
 // loop through each sub-array within $arrrays to check the behavior of array_intersect_assoc()
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation8.phpt b/ext/standard/tests/array/array_intersect_assoc_variation8.phpt
index 6ec8fb08d75..a287f4742ff 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation8.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation8.phpt
@@ -60,8 +60,8 @@ $arrays = array (
 /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp),
 
        // array with mixed values
-/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", 
-             'resource' => $fp, "int" => 133, "float" => 444.432, 
+/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit",
+             'resource' => $fp, "int" => 133, "float" => 444.432,
              "unset" => @$unset_var, "heredoc" => $heredoc)
 );
 
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation9.phpt b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt
index 338d40936e2..26a491ad64f 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation9.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_intersect_assoc() function : usage variations - two dimensional arrays for $arr1 and $arr2 arguments 
+Test array_intersect_assoc() function : usage variations - two dimensional arrays for $arr1 and $arr2 arguments
 --FILE--
 <?php
 /* Prototype  : array array_intersect_assoc(array $arr1, array $arr2 [, array $...])
@@ -10,7 +10,7 @@ Test array_intersect_assoc() function : usage variations - two dimensional array
 
 /*
 * Testing the behavior of array_intersect_assoc() by passing 2-D arrays
-* to both $arr1 and $arr2 argument. 
+* to both $arr1 and $arr2 argument.
 * Optional argument takes the same value as that of $arr1
 */
 
@@ -18,7 +18,7 @@ echo "*** Testing array_intersect_assoc() : passing two dimensional array to bot
 
 // two dimensional arrays for $arr1 and $arr2 argument
 $arr1 = array (
-  
+
   // arrays with default keys
   array(1, 2, "hello", 'world'),
   array(1, 2, 3, 4),
@@ -26,7 +26,7 @@ $arr1 = array (
   // arrays with explicit keys
   array(1 => "one", 2 => "two", 3 => "three"),
   array("ten" => 10, "twenty" => 20.00, "thirty" => 30)
-);  
+);
 
 $arr2 = array (
   array(1, 2, 3, 4),
diff --git a/ext/standard/tests/array/array_intersect_basic.phpt b/ext/standard/tests/array/array_intersect_basic.phpt
index fde5782c902..702260b49f7 100644
--- a/ext/standard/tests/array/array_intersect_basic.phpt
+++ b/ext/standard/tests/array/array_intersect_basic.phpt
@@ -3,12 +3,12 @@ Test array_intersect() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array array_intersect(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments
  * Source code: ext/standard/array.c
 */
 
 /*
-* Testing the behavior of array_intersect() by passing different arrays for the arguments. 
+* Testing the behavior of array_intersect() by passing different arrays for the arguments.
 * Function is tested by passing associative array as well as array with default keys.
 */
 
diff --git a/ext/standard/tests/array/array_intersect_error.phpt b/ext/standard/tests/array/array_intersect_error.phpt
index 46f77ac9bd3..373a0ddbe0e 100644
--- a/ext/standard/tests/array/array_intersect_error.phpt
+++ b/ext/standard/tests/array/array_intersect_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_intersect() function : error conditions 
+Test array_intersect() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_intersect(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_intersect_key_basic.phpt b/ext/standard/tests/array/array_intersect_key_basic.phpt
index fc6e177f54c..c24a4c1b082 100644
--- a/ext/standard/tests/array/array_intersect_key_basic.phpt
+++ b/ext/standard/tests/array/array_intersect_key_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-array_intersect_key(): Basic Test  
+array_intersect_key(): Basic Test
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/array/array_intersect_key_error.phpt b/ext/standard/tests/array/array_intersect_key_error.phpt
index 9509e97b9c8..10ad8ad3423 100644
--- a/ext/standard/tests/array/array_intersect_key_error.phpt
+++ b/ext/standard/tests/array/array_intersect_key_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_intersect_key() function : error conditions 
+Test array_intersect_key() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_intersect_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. 
+ * Description: Returns the entries of arr1 that have keys which are present in all the other arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_intersect_key_variation1.phpt b/ext/standard/tests/array/array_intersect_key_variation1.phpt
index 8c245e446b8..026d203b53a 100644
--- a/ext/standard/tests/array/array_intersect_key_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation1.phpt
@@ -3,7 +3,7 @@ Test array_intersect_key() function : usage variation - Passing unexpected value
 --FILE--
 <?php
 /* Prototype  : array array_intersect_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. 
+ * Description: Returns the entries of arr1 that have keys which are present in all the other arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_intersect_key_variation2.phpt b/ext/standard/tests/array/array_intersect_key_variation2.phpt
index 3c33debebe7..fa3458b6a8e 100644
--- a/ext/standard/tests/array/array_intersect_key_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation2.phpt
@@ -3,7 +3,7 @@ Test array_intersect_key() function : usage variation - Passing unexpected value
 --FILE--
 <?php
 /* Prototype  : array array_intersect_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. 
+ * Description: Returns the entries of arr1 that have keys which are present in all the other arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_intersect_key_variation3.phpt b/ext/standard/tests/array/array_intersect_key_variation3.phpt
index 8fd3d3c77fd..3c0e697e962 100644
--- a/ext/standard/tests/array/array_intersect_key_variation3.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation3.phpt
@@ -3,7 +3,7 @@ Test array_intersect_key() function : usage variation - Passing unexpected value
 --FILE--
 <?php
 /* Prototype  : array array_intersect_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. 
+ * Description: Returns the entries of arr1 that have keys which are present in all the other arguments.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_intersect_key_variation4.phpt b/ext/standard/tests/array/array_intersect_key_variation4.phpt
index 1d3d97602c0..27ee1069dd1 100644
--- a/ext/standard/tests/array/array_intersect_key_variation4.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation4.phpt
@@ -3,14 +3,14 @@ Test array_intersect_key() function : usage variation - Passing integer indexed
 --FILE--
 <?php
 /* Prototype  : array array_intersect_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. 
+ * Description: Returns the entries of arr1 that have keys which are present in all the other arguments.
  * Source code: ext/standard/array.c
  */
 
 echo "*** Testing array_intersect_key() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(0 => '0', -1 => '-1' , 02 => 'two', -07 => '-07', 0xA => '0xA', -0xC => '-0xc'); 
+$input_array = array(0 => '0', -1 => '-1' , 02 => 'two', -07 => '-07', 0xA => '0xA', -0xC => '-0xc');
 
 $input_arrays = array(
       'decimal indexed' => array(10 => '10', '-17' => '-17'),
diff --git a/ext/standard/tests/array/array_intersect_key_variation5.phpt b/ext/standard/tests/array/array_intersect_key_variation5.phpt
index c286de6e3f6..461a1e8590a 100644
--- a/ext/standard/tests/array/array_intersect_key_variation5.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation5.phpt
@@ -3,15 +3,15 @@ Test array_intersect_key() function : usage variation - Passing float indexed ar
 --FILE--
 <?php
 /* Prototype  : array array_intersect_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. 
+ * Description: Returns the entries of arr1 that have keys which are present in all the other arguments.
  * Source code: ext/standard/array.c
  */
 
 echo "*** Testing array_intersect_key() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(0 => '0', 10 => '10' , -10 => '-10'); 
-$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5' , -10.5 => '-10.5', 0.5 => '0.5'); 
+$input_array = array(0 => '0', 10 => '10' , -10 => '-10');
+$float_indx_array = array(0.0 => '0.0', 10.5 => '10.5' , -10.5 => '-10.5', 0.5 => '0.5');
 
 echo "\n-- Testing array_intersect_key() function with float indexed array --\n";
 var_dump( array_intersect_key($input_array, $float_indx_array) );
diff --git a/ext/standard/tests/array/array_intersect_key_variation6.phpt b/ext/standard/tests/array/array_intersect_key_variation6.phpt
index 823b0707d90..344cb7bf6f6 100644
--- a/ext/standard/tests/array/array_intersect_key_variation6.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation6.phpt
@@ -3,14 +3,14 @@ Test array_intersect_key() function : usage variation - Passing boolean indexed
 --FILE--
 <?php
 /* Prototype  : array array_intersect_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. 
+ * Description: Returns the entries of arr1 that have keys which are present in all the other arguments.
  * Source code: ext/standard/array.c
  */
 
 echo "*** Testing array_intersect_key() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(0 => '0', 1 => '1' , -10 => '-10'); 
+$input_array = array(0 => '0', 1 => '1' , -10 => '-10');
 $boolean_indx_array = array(true => 'boolt', false => 'boolf', TRUE => 'boolT', FALSE => 'boolF');
 
 echo "\n-- Testing array_intersect_key() function with boolean indexed array --\n";
diff --git a/ext/standard/tests/array/array_intersect_key_variation7.phpt b/ext/standard/tests/array/array_intersect_key_variation7.phpt
index fe4446a2435..2deb99b4d4f 100644
--- a/ext/standard/tests/array/array_intersect_key_variation7.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation7.phpt
@@ -3,14 +3,14 @@ Test array_intersect_key() function : usage variation - Passing null,unset and u
 --FILE--
 <?php
 /* Prototype  : array array_intersect_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. 
+ * Description: Returns the entries of arr1 that have keys which are present in all the other arguments.
  * Source code: ext/standard/array.c
  */
 
 echo "*** Testing array_intersect_key() : usage variation ***\n";
 
 // Initialise function arguments not being substituted (if any)
-$input_array = array(0 => '0', 1 => '1' , -10 => '-10' , null => 'null'); 
+$input_array = array(0 => '0', 1 => '1' , -10 => '-10' , null => 'null');
 //get an unset variable
 $unset_var = 10;
 unset ($unset_var);
@@ -25,7 +25,7 @@ foreach($input_arrays as $key =>$value) {
       echo "\n--$key--\n";
       var_dump( array_intersect_key($input_array, $value) );
       var_dump( array_intersect_key($value,$input_array ) );
-}      
+}
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_intersect_key_variation8.phpt b/ext/standard/tests/array/array_intersect_key_variation8.phpt
index 2b889b59652..e3d8898c837 100644
--- a/ext/standard/tests/array/array_intersect_key_variation8.phpt
+++ b/ext/standard/tests/array/array_intersect_key_variation8.phpt
@@ -3,7 +3,7 @@ Test array_intersect_key() function : usage variation - Passing Multi dimensiona
 --FILE--
 <?php
 /* Prototype  : array array_intersect_key(array arr1, array arr2 [, array ...])
- * Description: Returns the entries of arr1 that have keys which are present in all the other arguments. 
+ * Description: Returns the entries of arr1 that have keys which are present in all the other arguments.
  * Source code: ext/standard/array.c
  */
 
@@ -13,22 +13,22 @@ echo "*** Testing array_intersect_key() : usage variation ***\n";
 $array1 = array(
 
 	  'first' => array('blue'  => 1, 'red'  => 2),
-              
+
       'second' => array('yellow' => 7),
-              
+
       'third' => array(0 =>'zero'),
 );
 
 $array2 = array (
 
 	  'first' => array('blue'  => 1, 'red'  => 2,),
-              
+
       'second' => array('cyan'   => 8),
-              
-      'fourth' => array(2 => 'two'), 
+
+      'fourth' => array(2 => 'two'),
 );
 var_dump( array_intersect_key($array1, $array2) );
-var_dump( array_intersect_key($array2,$array1 ) ); 
+var_dump( array_intersect_key($array2,$array1 ) );
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_intersect_uassoc_error.phpt b/ext/standard/tests/array/array_intersect_uassoc_error.phpt
index ae7acb133bc..f7ee0303edb 100644
--- a/ext/standard/tests/array/array_intersect_uassoc_error.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_intersect_uassoc() function : error conditions 
+Test array_intersect_uassoc() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_intersect_uassoc(array arr1, array arr2 [, array ...], callback key_compare_func)
@@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : error conditions
 
 echo "*** Testing array_intersect_uassoc() : error conditions ***\n";
 
-// Initialise function arguments 
+// Initialise function arguments
 $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red");
 $array2 = array("a" => "green", "yellow", "red");
 $array3 = array("a"=>"green", "brown");
diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt
index 86dec03d2d3..ac825682b00 100644
--- a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt
@@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing unexpected va
 
 echo "*** Testing array_intersect_uassoc() : usage variation ***\n";
 
-// Initialise function arguments 
+// Initialise function arguments
 $array2 = array("a" => "green", "yellow", "red");
 $array3 = array("a"=>"green", "brown");
 
diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt
index aa0c82d158f..09759a607dc 100644
--- a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt
@@ -18,11 +18,11 @@ class MyClass
 	static function static_compare_func($a, $b) {
 		return strcasecmp($a, $b);
 	}
-    
+
 	public function class_compare_func($a, $b) {
 		return strcasecmp($a, $b);
 	}
-	
+
 }
 
 echo "\n-- Testing array_intersect_uassoc() function using class with static method as callback --\n";
diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt
index cf2611aeb9a..c880f7a057e 100644
--- a/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation11.phpt
@@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing class without
 
 echo "*** Testing array_intersect_uassoc() : usage variation ***\n";
 
-// Initialise function arguments 
+// Initialise function arguments
 $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red");
 $array2 = array("a" => "green", "yellow", "red");
 $array3 = array("a"=>"green", "brown");
diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt
index 51341bb45e3..dd3cd05dc03 100644
--- a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt
@@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing unexpected va
 
 echo "*** Testing array_intersect_uassoc() : usage variation ***\n";
 
-// Initialise function arguments 
+// Initialise function arguments
 $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red");
 $array3 = array("a"=>"green", "brown");
 
diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt
index f596e9c32b7..edda0b5ef96 100644
--- a/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt
@@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing unexpected va
 
 echo "*** Testing array_intersect_uassoc() : usage variation ***\n";
 
-// Initialise function arguments 
+// Initialise function arguments
 $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red");
 $array2 = array("a" => "green", "yellow", "red");
 
diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation4.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation4.phpt
index e5d0f565689..d998721bd80 100644
--- a/ext/standard/tests/array/array_intersect_uassoc_variation4.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_variation4.phpt
@@ -9,7 +9,7 @@ Test array_intersect_uassoc() function : usage variation - Passing unexpected va
 
 echo "*** Testing array_intersect_uassoc() : usage variation ***\n";
 
-// Initialise function arguments 
+// Initialise function arguments
 $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red");
 $array2 = array("a" => "green", "yellow", "red");
 $array3 = array("a"=>"green", "brown");
diff --git a/ext/standard/tests/array/array_intersect_ukey_basic.phpt b/ext/standard/tests/array/array_intersect_ukey_basic.phpt
index db21b9b01ea..57ed1322fe5 100644
--- a/ext/standard/tests/array/array_intersect_ukey_basic.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-array_intersect_ukey(): Basic test.  
+array_intersect_ukey(): Basic test.
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/array/array_intersect_ukey_error.phpt b/ext/standard/tests/array/array_intersect_ukey_error.phpt
index bb052fbf761..793ec3d2523 100644
--- a/ext/standard/tests/array/array_intersect_ukey_error.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_intersect_ukey() function : error conditions 
+Test array_intersect_ukey() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func)
- * Description: Computes the intersection of arrays using a callback function on the keys for comparison. 
+ * Description: Computes the intersection of arrays using a callback function on the keys for comparison.
  * Source code: ext/standard/array.c
  */
 
@@ -19,7 +19,7 @@ function key_compare_func($key1, $key2)
     if ($key1 == $key2)
         return 0;
     else
-        return ($key1 > $key2)? 1:-1; 
+        return ($key1 > $key2)? 1:-1;
 }
 
 //Test array_intersect_ukey with one more than the expected number of arguments
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt
index 70120578005..0f97998078f 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt
@@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing unexpected valu
 --FILE--
 <?php
 /* Prototype  : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func)
- * Description: Computes the intersection of arrays using a callback function on the keys for comparison. 
+ * Description: Computes the intersection of arrays using a callback function on the keys for comparison.
  * Source code: ext/standard/array.c
  */
 
@@ -19,7 +19,7 @@ function key_compare_func($key1, $key2)
     if ($key1 == $key2)
         return 0;
     else
-        return ($key1 > $key2)? 1:-1; 
+        return ($key1 > $key2)? 1:-1;
 }
 
 //get an unset variable
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation10.phpt b/ext/standard/tests/array/array_intersect_ukey_variation10.phpt
index 69a6500d2f6..7156bf5404d 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation10.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation10.phpt
@@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing class without s
 --FILE--
 <?php
 /* Prototype  : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func)
- * Description: Computes the intersection of arrays using a callback function on the keys for comparison. 
+ * Description: Computes the intersection of arrays using a callback function on the keys for comparison.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt
index b7a1b078f94..42f3947c069 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt
@@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing unexpected valu
 --FILE--
 <?php
 /* Prototype  : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func)
- * Description: Computes the intersection of arrays using a callback function on the keys for comparison. 
+ * Description: Computes the intersection of arrays using a callback function on the keys for comparison.
  * Source code: ext/standard/array.c
  */
 
@@ -19,7 +19,7 @@ function key_compare_func($key1, $key2)
     if ($key1 == $key2)
         return 0;
     else
-        return ($key1 > $key2)? 1:-1; 
+        return ($key1 > $key2)? 1:-1;
 }
 
 //get an unset variable
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation3.phpt b/ext/standard/tests/array/array_intersect_ukey_variation3.phpt
index 1236bcd3df2..d99059e52d1 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation3.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation3.phpt
@@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing unexpected valu
 --FILE--
 <?php
 /* Prototype  : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func)
- * Description: Computes the intersection of arrays using a callback function on the keys for comparison. 
+ * Description: Computes the intersection of arrays using a callback function on the keys for comparison.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation4.phpt b/ext/standard/tests/array/array_intersect_ukey_variation4.phpt
index 88eff1e89e1..b595bceb7c6 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation4.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation4.phpt
@@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing unexpected valu
 --FILE--
 <?php
 /* Prototype  : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func)
- * Description: Computes the intersection of arrays using a callback function on the keys for comparison. 
+ * Description: Computes the intersection of arrays using a callback function on the keys for comparison.
  * Source code: ext/standard/array.c
  */
 
@@ -20,7 +20,7 @@ function key_compare_func($key1, $key2)
     if ($key1 == $key2)
         return 0;
     else
-        return ($key1 > $key2)? 1:-1; 
+        return ($key1 > $key2)? 1:-1;
 }
 
 //get an unset variable
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt
index c1520fbb640..59fb1c48d09 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt
@@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Intersection of integer
 --FILE--
 <?php
 /* Prototype  : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func)
- * Description: Computes the intersection of arrays using a callback function on the keys for comparison. 
+ * Description: Computes the intersection of arrays using a callback function on the keys for comparison.
  * Source code: ext/standard/array.c
  */
 
@@ -21,7 +21,7 @@ function key_compare_func($key1, $key2)
     if ($key1 == $key2)
         return 0;
     else
-        return ($key1 > $key2)? 1:-1; 
+        return ($key1 > $key2)? 1:-1;
 }
 
 echo "\n-- Result of integers and floating point intersection --\n";
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt
index a918660e424..cc9d8bbd15f 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt
@@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Intersection of floatin
 --FILE--
 <?php
 /* Prototype  : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func)
- * Description: Computes the intersection of arrays using a callback function on the keys for comparison. 
+ * Description: Computes the intersection of arrays using a callback function on the keys for comparison.
  * Source code: ext/standard/array.c
  */
 
@@ -20,7 +20,7 @@ function key_compare_func($key1, $key2)
     if ($key1 == $key2)
         return 0;
     else
-        return ($key1 > $key2)? 1:-1; 
+        return ($key1 > $key2)? 1:-1;
 }
 
 echo "\n-- Result of floating points and strings containing integers intersection --\n";
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt
index 75b601c11fa..af5e002a69a 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt
@@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Intersection of strings
 --FILE--
 <?php
 /* Prototype  : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func)
- * Description: Computes the intersection of arrays using a callback function on the keys for comparison. 
+ * Description: Computes the intersection of arrays using a callback function on the keys for comparison.
  * Source code: ext/standard/array.c
  */
 
@@ -21,7 +21,7 @@ function key_compare_func($key1, $key2)
     if ($key1 == $key2)
         return 0;
     else
-        return ($key1 > $key2)? 1:-1; 
+        return ($key1 > $key2)? 1:-1;
 }
 
 echo "\n-- Result of strings containing integers intersection --\n";
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt
index 89286f8986b..c686899aad3 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt
@@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing non-existing fu
 --FILE--
 <?php
 /* Prototype  : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func)
- * Description: Computes the intersection of arrays using a callback function on the keys for comparison. 
+ * Description: Computes the intersection of arrays using a callback function on the keys for comparison.
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt
index fe130a86f65..15abb928413 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt
@@ -3,7 +3,7 @@ Test array_intersect_ukey() function : usage variation - Passing class/object me
 --FILE--
 <?php
 /* Prototype  : array array_intersect_ukey(array arr1, array arr2 [, array ...], callback key_compare_func)
- * Description: Computes the intersection of arrays using a callback function on the keys for comparison. 
+ * Description: Computes the intersection of arrays using a callback function on the keys for comparison.
  * Source code: ext/standard/array.c
  */
 
@@ -18,11 +18,11 @@ class MyClass
 	static function static_compare_func($key1, $key2) {
 		return strcasecmp($key1, $key2);
 	}
-    
+
 	public function class_compare_func($key1, $key2) {
 		return strcasecmp($key1, $key2);
 	}
-	
+
 }
 
 echo "\n-- Testing array_intersect_ukey() function using class with static method as callback --\n";
diff --git a/ext/standard/tests/array/array_intersect_variation1.phpt b/ext/standard/tests/array/array_intersect_variation1.phpt
index ca203ff4651..7e737b05127 100644
--- a/ext/standard/tests/array/array_intersect_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_variation1.phpt
@@ -3,7 +3,7 @@ Test array_intersect() function : usage variations - unexpected values for 'arr1
 --FILE--
 <?php
 /* Prototype  : array array_intersect(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments
  * Source code: ext/standard/array.c
 */
 
@@ -19,7 +19,7 @@ echo "*** Testing array_intersect() : Passing non-array values to \$arr1 argumen
 $arr2 = array(1, 2);
 
 // array to be passed to optional argument
-$arr3 = array(1, 2, "one" => 1, "two" => 2); 
+$arr3 = array(1, 2, "one" => 1, "two" => 2);
 
 // get an unset variable
 $unset_var = 10;
@@ -70,7 +70,7 @@ $arrays = array(
        // empty data
 /*16*/ "",
        '',
- 
+
        // string data
 /*18*/ "string",
        'string',
@@ -93,7 +93,7 @@ $arrays = array(
 $iterator = 1;
 foreach($arrays as $unexpected_value) {
   echo "\n-- Iterator $iterator --";
-  
+
   // Calling array_intersect() with default arguments
   var_dump( array_intersect($unexpected_value,$arr2) );
 
diff --git a/ext/standard/tests/array/array_intersect_variation10.phpt b/ext/standard/tests/array/array_intersect_variation10.phpt
index e193f97d465..df395b053ce 100644
--- a/ext/standard/tests/array/array_intersect_variation10.phpt
+++ b/ext/standard/tests/array/array_intersect_variation10.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test array_intersect() function : usage variations - binary safe checking 
+Test array_intersect() function : usage variations - binary safe checking
 --FILE--
 <?php
 /* Prototype  : array array_intersect(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments
  * Source code: ext/standard/array.c
 */
 
 /*
-* Testing the behavior of array_intersect() by passing array with 
-* binary values for $arr1 and $arr2 argument. 
+* Testing the behavior of array_intersect() by passing array with
+* binary values for $arr1 and $arr2 argument.
 */
 
 echo "*** Testing array_intersect() : binary safe checking ***\n";
diff --git a/ext/standard/tests/array/array_intersect_variation2.phpt b/ext/standard/tests/array/array_intersect_variation2.phpt
index b690fc9958a..e973a5d93ae 100644
--- a/ext/standard/tests/array/array_intersect_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_variation2.phpt
@@ -3,7 +3,7 @@ Test array_intersect() function : usage variations - unexpected values for 'arr2
 --FILE--
 <?php
 /* Prototype  : array array_intersect(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments
  * Source code: ext/standard/array.c
 */
 
@@ -70,7 +70,7 @@ $arrays = array(
        // empty data
 /*16*/ "",
        '',
- 
+
        // string data
 /*18*/ "string",
        'string',
@@ -93,7 +93,7 @@ $arrays = array(
 $iterator = 1;
 foreach($arrays as $unexpected_value) {
   echo "\n-- Iterator $iterator --";
-  
+
   // Calling array_intersect() with default arguments
   var_dump( array_intersect($arr1,$unexpected_value) );
 
diff --git a/ext/standard/tests/array/array_intersect_variation3.phpt b/ext/standard/tests/array/array_intersect_variation3.phpt
index c404e58bab3..451bda072c6 100644
--- a/ext/standard/tests/array/array_intersect_variation3.phpt
+++ b/ext/standard/tests/array/array_intersect_variation3.phpt
@@ -3,12 +3,12 @@ Test array_intersect() function : usage variations - different arrays for 'arr1'
 --FILE--
 <?php
 /* Prototype  : array array_intersect(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments
  * Source code: ext/standard/array.c
 */
 
 /*
-* Passing different types of arrays to $arr1 argument and testing whether 
+* Passing different types of arrays to $arr1 argument and testing whether
 * array_intersect() behaves in expected way with the other arguments passed to the function
 * The $arr2 argument is a fixed array.
 */
diff --git a/ext/standard/tests/array/array_intersect_variation4.phpt b/ext/standard/tests/array/array_intersect_variation4.phpt
index 66624a66cdf..4fbd478ccfc 100644
--- a/ext/standard/tests/array/array_intersect_variation4.phpt
+++ b/ext/standard/tests/array/array_intersect_variation4.phpt
@@ -3,13 +3,13 @@ Test array_intersect() function : usage variations - different arrays for 'arr2'
 --FILE--
 <?php
 /* Prototype  : array array_intersect(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments
  * Source code: ext/standard/array.c
 */
 
 /*
-* Passing different types of arrays to $arr2 argument and testing whether 
-* array_intersect() behaves in expected way with the other arguments passed to the function.  
+* Passing different types of arrays to $arr2 argument and testing whether
+* array_intersect() behaves in expected way with the other arguments passed to the function.
 * The $arr1 argument is a fixed array.
 */
 
diff --git a/ext/standard/tests/array/array_intersect_variation5.phpt b/ext/standard/tests/array/array_intersect_variation5.phpt
index 9aaedeb382c..c3caaa16305 100644
--- a/ext/standard/tests/array/array_intersect_variation5.phpt
+++ b/ext/standard/tests/array/array_intersect_variation5.phpt
@@ -3,7 +3,7 @@ Test array_intersect() function : usage variations - assoc array with diff keys
 --FILE--
 <?php
 /* Prototype  : array array_intersect(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_intersect_variation6.phpt b/ext/standard/tests/array/array_intersect_variation6.phpt
index 48d01f7d540..3bb9a5388e1 100644
--- a/ext/standard/tests/array/array_intersect_variation6.phpt
+++ b/ext/standard/tests/array/array_intersect_variation6.phpt
@@ -3,7 +3,7 @@ Test array_intersect() function : usage variations - assoc array with diff keys
 --FILE--
 <?php
 /* Prototype  : array array_intersect(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments
  * Source code: ext/standard/array.c
 */
 
@@ -48,7 +48,7 @@ $arrays = array (
              "\v\fworld" => 2.2, "pen\n" => 33),
        array("hello", $heredoc => "string"), // heredoc
 
-       // array with unset variable 
+       // array with unset variable
 /*10*/ array( @$unset_var => "hello"),
 
        // array with mixed keys
diff --git a/ext/standard/tests/array/array_intersect_variation7.phpt b/ext/standard/tests/array/array_intersect_variation7.phpt
index da1088c5edd..4da1b9b7aca 100644
--- a/ext/standard/tests/array/array_intersect_variation7.phpt
+++ b/ext/standard/tests/array/array_intersect_variation7.phpt
@@ -3,7 +3,7 @@ Test array_intersect() function : usage variations - assoc array with diff value
 --FILE--
 <?php
 /* Prototype  : array array_intersect(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments
  * Source code: ext/standard/array.c
 */
 
@@ -59,13 +59,13 @@ $arrays = array (
 /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp),
 
        // array with mixed values
-/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", 
-             'resource' => $fp, "int" => 133, "float" => 444.432, 
+/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit",
+             'resource' => $fp, "int" => 133, "float" => 444.432,
              "unset" => @$unset_var, "heredoc" => $heredoc)
 );
 
 // array to be passsed to $arr2 argument
-$arr2 = array(1, 2, 1.2, 2.3333, "col\tor", '\v\fworld', $fp, 
+$arr2 = array(1, 2, 1.2, 2.3333, "col\tor", '\v\fworld', $fp,
               "Hello world", $heredoc, new classA(), 444.432, "fruit");
 
 // loop through each sub-array within $arrrays to check the behavior of array_intersect()
diff --git a/ext/standard/tests/array/array_intersect_variation8.phpt b/ext/standard/tests/array/array_intersect_variation8.phpt
index 91eae49aabe..2934fe09a4e 100644
--- a/ext/standard/tests/array/array_intersect_variation8.phpt
+++ b/ext/standard/tests/array/array_intersect_variation8.phpt
@@ -3,7 +3,7 @@ Test array_intersect() function : usage variations - assoc array with diff value
 --FILE--
 <?php
 /* Prototype  : array array_intersect(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments
  * Source code: ext/standard/array.c
 */
 
@@ -59,13 +59,13 @@ $arrays = array (
 /*10*/ array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp),
 
        // array with mixed values
-/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", 
-             'resource' => $fp, "int" => 133, "float" => 444.432, 
+/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit",
+             'resource' => $fp, "int" => 133, "float" => 444.432,
              "unset" => @$unset_var, "heredoc" => $heredoc)
 );
 
 // array to be passsed to $arr1 argument
-$arr1 = array(1, 2, 1.2, 2.3333, "col\tor", '\v\fworld', $fp, 
+$arr1 = array(1, 2, 1.2, 2.3333, "col\tor", '\v\fworld', $fp,
               "Hello world", $heredoc, new classA(), 444.432, "fruit");
 
 // loop through each sub-array within $arrrays to check the behavior of array_intersect()
diff --git a/ext/standard/tests/array/array_intersect_variation9.phpt b/ext/standard/tests/array/array_intersect_variation9.phpt
index 0dba1af6d36..6c7c956ea73 100644
--- a/ext/standard/tests/array/array_intersect_variation9.phpt
+++ b/ext/standard/tests/array/array_intersect_variation9.phpt
@@ -3,13 +3,13 @@ Test array_intersect() function : usage variations - two dimensional arrays for
 --FILE--
 <?php
 /* Prototype  : array array_intersect(array $arr1, array $arr2 [, array $...])
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments
  * Source code: ext/standard/array.c
 */
 
 /*
 * Testing the behavior of array_intersect() by passing 2-D arrays
-* to both $arr1 and $arr2 argument. 
+* to both $arr1 and $arr2 argument.
 * Optional argument takes the same value as that of $arr1
 */
 
@@ -17,7 +17,7 @@ echo "*** Testing array_intersect() : passing two dimensional array to both \$ar
 
 // two dimensional arrays for $arr1 and $arr2 argument
 $arr1 = array (
-  
+
   // arrays with default keys
   array(1, 2, "hello", 'world'),
   array(1, 2, 3, 4),
@@ -25,7 +25,7 @@ $arr1 = array (
   // arrays with explicit keys
   array(1 => "one", 2 => "two", 3 => "three"),
   array("ten" => 10, "twenty" => 20.00, "thirty" => 30)
-);  
+);
 
 $arr2 = array (
   array(1, 2, 3, 4),
diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt
index ef40f846ad5..63bcf82d938 100644
--- a/ext/standard/tests/array/array_key_exists.phpt
+++ b/ext/standard/tests/array/array_key_exists.phpt
@@ -2,13 +2,13 @@
 Test array_key_exists() function
 --FILE--
 <?php
-/* Prototype: 
+/* Prototype:
  *  bool array_key_exists ( mixed $key, array $search );
  * Description:
- *  Returns TRUE if the given key is set in the array. 
- *  key can be any value possible for an array index. 
+ *  Returns TRUE if the given key is set in the array.
+ *  key can be any value possible for an array index.
  *  Also also works on objects.
- */ 
+ */
 
 echo "*** Testing basic functionalities ***\n";
 /* Arrays with regular values */
@@ -22,9 +22,9 @@ $search_arrays = array(
            array(0 => 'Zero', 1 => 'One', 2 => 'Two', 3 => "Three" ),
            array(0.1 => 'Zero', 1.1 => 'One', 2.2 => 'Two', 3.3 => "Three" )
           );
-/* keys to search in $search_arrays. $keys[0] 
+/* keys to search in $search_arrays. $keys[0]
    is the key to be searched in $search_arrays[0] and so on */
-$keys = array( 1, 'a', 2, 4, "Name", "Red", 0, 3 ); 
+$keys = array( 1, 'a', 2, 4, "Name", "Red", 0, 3 );
 
 $key_counter = 0;
 foreach ($search_arrays as $search_array) {
@@ -48,7 +48,7 @@ foreach ($search_arrays as $search_array) {
     var_dump( array_key_exists($key, $search_array) );
   }
 }
-// arrays with variation in elements  
+// arrays with variation in elements
 $search_arrays_v = array (
                      array(),
                      array(NULL),
@@ -71,24 +71,24 @@ foreach ($search_arrays_v as $search_array) {
 echo "\n*** Testing error conditions ***\n";
 //Zeor args
 var_dump( array_key_exists() );
-// first args as array 
+// first args as array
 var_dump( array_key_exists(array(), array()) );
 // second args as string
-var_dump( array_key_exists("", "") ); 
+var_dump( array_key_exists("", "") );
 // second args a integer
-var_dump( array_key_exists(1, 1) ); 
+var_dump( array_key_exists(1, 1) );
 // second args as NULL
-var_dump( array_key_exists(1, NULL) ); 
+var_dump( array_key_exists(1, NULL) );
 // second args as boolean
-var_dump( array_key_exists(1, true) ); 
+var_dump( array_key_exists(1, true) );
 // first args as boolean
-var_dump( array_key_exists(false, true) ); 
-// second args as float 
-var_dump( array_key_exists(false, 17.5) ); 
-// args more than expected 
-var_dump( array_key_exists(1, array(), array()) ); 
+var_dump( array_key_exists(false, true) );
+// second args as float
+var_dump( array_key_exists(false, 17.5) );
+// args more than expected
+var_dump( array_key_exists(1, array(), array()) );
 // first argument as floating point value
-var_dump( array_key_exists(17.5, array(1,23) ) ) ; 
+var_dump( array_key_exists(17.5, array(1,23) ) ) ;
 
 echo "\n*** Testing operation on objects ***\n";
 class key_check
@@ -118,7 +118,7 @@ var_dump(array_key_exists("var", $key_check_obj->arr)); //found,  key is in memb
 var_dump( array_key_exists($key_check_obj, $key_check_obj) );
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing basic functionalities ***
 -- Iteration 1 --
 bool(true)
diff --git a/ext/standard/tests/array/array_key_exists_basic.phpt b/ext/standard/tests/array/array_key_exists_basic.phpt
index 6fbd415dc55..1c40fdb809d 100644
--- a/ext/standard/tests/array/array_key_exists_basic.phpt
+++ b/ext/standard/tests/array/array_key_exists_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_key_exists() function : basic functionality 
+Test array_key_exists() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool array_key_exists(mixed $key, array $search)
- * Description: Checks if the given key or index exists in the array 
+ * Description: Checks if the given key or index exists in the array
  * Source code: ext/standard/array.c
  * Alias to functions: key_exists
  */
diff --git a/ext/standard/tests/array/array_key_exists_error.phpt b/ext/standard/tests/array/array_key_exists_error.phpt
index 8b189c80e17..1691cc5fa1b 100644
--- a/ext/standard/tests/array/array_key_exists_error.phpt
+++ b/ext/standard/tests/array/array_key_exists_error.phpt
@@ -3,7 +3,7 @@ Test array_key_exists() function : error conditions - Pass incorrect number of a
 --FILE--
 <?php
 /* Prototype  : bool array_key_exists(mixed $key, array $search)
- * Description: Checks if the given key or index exists in the array 
+ * Description: Checks if the given key or index exists in the array
  * Source code: ext/standard/array.c
  * Alias to functions: key_exists
  */
diff --git a/ext/standard/tests/array/array_key_exists_object1.phpt b/ext/standard/tests/array/array_key_exists_object1.phpt
index 3b263df474c..e00d414d712 100644
--- a/ext/standard/tests/array/array_key_exists_object1.phpt
+++ b/ext/standard/tests/array/array_key_exists_object1.phpt
@@ -3,7 +3,7 @@ Test array_key_exists() function : object functionality
 --FILE--
 <?php
 /* Prototype  : bool array_key_exists(mixed $key, array $search)
- * Description: Checks if the given key or index exists in the array 
+ * Description: Checks if the given key or index exists in the array
  * Source code: ext/standard/array.c
  * Alias to functions: key_exists
  */
@@ -18,7 +18,7 @@ class myClass {
 	var $var1;
 	var $var2;
 	var $var3;
-	
+
 	function __construct($a, $b, $c = null) {
 		$this->var1 = $a;
 		$this->var2 = $b;
diff --git a/ext/standard/tests/array/array_key_exists_object2.phpt b/ext/standard/tests/array/array_key_exists_object2.phpt
index 4a790e9d378..fac71b9487f 100644
--- a/ext/standard/tests/array/array_key_exists_object2.phpt
+++ b/ext/standard/tests/array/array_key_exists_object2.phpt
@@ -3,7 +3,7 @@ Test array_key_exists() function : object functionality - different visibilities
 --FILE--
 <?php
 /* Prototype  : bool array_key_exists(mixed $key, array $search)
- * Description: Checks if the given key or index exists in the array 
+ * Description: Checks if the given key or index exists in the array
  * Source code: ext/standard/array.c
  * Alias to functions: key_exists
  */
@@ -18,7 +18,7 @@ class myClass {
 	public $var1;
 	protected $var2;
 	private $var3;
-	
+
 	function __construct($a, $b, $c = null) {
 		$this->var1 = $a;
 		$this->var2 = $b;
diff --git a/ext/standard/tests/array/array_key_exists_variation1.phpt b/ext/standard/tests/array/array_key_exists_variation1.phpt
index 2f50d3e86f4..b989160db78 100644
--- a/ext/standard/tests/array/array_key_exists_variation1.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation1.phpt
@@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - Pass different data types
 --FILE--
 <?php
 /* Prototype  : bool array_key_exists(mixed $key, array $search)
- * Description: Checks if the given key or index exists in the array 
+ * Description: Checks if the given key or index exists in the array
  * Source code: ext/standard/array.c
  * Alias to functions: key_exists
  */
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*19*/ "key",
        'key',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_key_exists_variation2.phpt b/ext/standard/tests/array/array_key_exists_variation2.phpt
index b58ca445c93..62bd4d2ae83 100644
--- a/ext/standard/tests/array/array_key_exists_variation2.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation2.phpt
@@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - Pass different data types
 --FILE--
 <?php
 /* Prototype  : bool array_key_exists(mixed $key, array $search)
- * Description: Checks if the given key or index exists in the array 
+ * Description: Checks if the given key or index exists in the array
  * Source code: ext/standard/array.c
  * Alias to functions: key_exists
  */
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_key_exists_variation3.phpt b/ext/standard/tests/array/array_key_exists_variation3.phpt
index e8a52a70595..0517d4c24e6 100644
--- a/ext/standard/tests/array/array_key_exists_variation3.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation3.phpt
@@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - floats and casting to ints
 --FILE--
 <?php
 /* Prototype  : bool array_key_exists(mixed $key, array $search)
- * Description: Checks if the given key or index exists in the array 
+ * Description: Checks if the given key or index exists in the array
  * Source code: ext/standard/array.c
  * Alias to functions: key_exists
  */
diff --git a/ext/standard/tests/array/array_key_exists_variation4.phpt b/ext/standard/tests/array/array_key_exists_variation4.phpt
index 84dfeb93731..efd3a139241 100644
--- a/ext/standard/tests/array/array_key_exists_variation4.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation4.phpt
@@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - referenced variables
 --FILE--
 <?php
 /* Prototype  : bool array_key_exists(mixed $key, array $search)
- * Description: Checks if the given key or index exists in the array 
+ * Description: Checks if the given key or index exists in the array
  * Source code: ext/standard/array.c
  * Alias to functions: key_exists
  */
diff --git a/ext/standard/tests/array/array_key_exists_variation5.phpt b/ext/standard/tests/array/array_key_exists_variation5.phpt
index 9c15759fc76..2098ca33ac1 100644
--- a/ext/standard/tests/array/array_key_exists_variation5.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation5.phpt
@@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - multidimensional arrays
 --FILE--
 <?php
 /* Prototype  : bool array_key_exists(mixed $key, array $search)
- * Description: Checks if the given key or index exists in the array 
+ * Description: Checks if the given key or index exists in the array
  * Source code: ext/standard/array.c
  * Alias to functions: key_exists
  */
@@ -14,8 +14,8 @@ Test array_key_exists() function : usage variations - multidimensional arrays
 
 echo "*** Testing array_key_exists() : usage variations ***\n";
 
-$multi_array = array ('zero' => 'val1', 
-                      'one' => 'val2', 
+$multi_array = array ('zero' => 'val1',
+                      'one' => 'val2',
                       'sub1' => array (1, 2, 3));
 
 echo "\n-- Attempt to match key in sub-array --\n";
diff --git a/ext/standard/tests/array/array_key_exists_variation6.phpt b/ext/standard/tests/array/array_key_exists_variation6.phpt
index d19e58e764c..09fe30d9580 100644
--- a/ext/standard/tests/array/array_key_exists_variation6.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation6.phpt
@@ -3,13 +3,13 @@ Test array_key_exists() function : usage variations -  equality test for certain
 --FILE--
 <?php
 /* Prototype  : bool array_key_exists(mixed $key, array $search)
- * Description: Checks if the given key or index exists in the array 
+ * Description: Checks if the given key or index exists in the array
  * Source code: ext/standard/array.c
  * Alias to functions: key_exists
  */
 
 /*
- * Pass certain data types that can be taken as a key in an array 
+ * Pass certain data types that can be taken as a key in an array
  * and test whether array_key_exists(() thinks they are equal and therefore
  * returns true when searching for them
  */
@@ -18,10 +18,10 @@ echo "*** Testing array_key_exists() : usage variations ***\n";
 
 $unset = 10;
 unset($unset);
-$array = array ('null' => null, 
-                'NULL' => NULL, 
-                'empty single quoted string' => '', 
-                "empty double quoted string" => "", 
+$array = array ('null' => null,
+                'NULL' => NULL,
+                'empty single quoted string' => '',
+                "empty double quoted string" => "",
                 'undefined variable' => @$undefined,
                 'unset variable' => @$unset);
 
@@ -30,7 +30,7 @@ foreach($array as $name => $input) {
 	$iterator = 1;
 	echo "\n-- Key in \$search array is : $name --\n";
 	$search[$input] = 'test';
-	
+
 	//iterate through array again to see which values are considered equal
 	foreach($array as $key) {
 		echo "Iteration $iterator:  ";
diff --git a/ext/standard/tests/array/array_key_exists_variation7.phpt b/ext/standard/tests/array/array_key_exists_variation7.phpt
index 845c1e54ba4..8d9beacc75b 100644
--- a/ext/standard/tests/array/array_key_exists_variation7.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation7.phpt
@@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - position of internal array
 --FILE--
 <?php
 /* Prototype  : bool array_key_exists(mixed $key, array $search)
- * Description: Checks if the given key or index exists in the array 
+ * Description: Checks if the given key or index exists in the array
  * Source code: ext/standard/array.c
  * Alias to functions: key_exists
  */
diff --git a/ext/standard/tests/array/array_key_exists_variation8.phpt b/ext/standard/tests/array/array_key_exists_variation8.phpt
index d5bad62e2cb..70da85fd18f 100644
--- a/ext/standard/tests/array/array_key_exists_variation8.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation8.phpt
@@ -3,7 +3,7 @@ Test array_key_exists() function : usage variations - array keys are different d
 --FILE--
 <?php
 /* Prototype  : bool array_key_exists(mixed $key, array $search)
- * Description: Checks if the given key or index exists in the array 
+ * Description: Checks if the given key or index exists in the array
  * Source code: ext/standard/array.c
  * Alias to functions: key_exists
  */
@@ -42,7 +42,7 @@ $inputs = array(
        -10.5 => 'negative',
        .5 => 'half',
        ),
-       
+
        'extreme floats' => array(
        12.3456789000e10 => 'large',
        12.3456789000E-10 => 'small',
@@ -51,7 +51,7 @@ $inputs = array(
        // null data
 /*3*/ 'null uppercase' => array(
        NULL => 'null 1',
-       ), 
+       ),
        'null lowercase' => array(
        null => 'null 2',
        ),
@@ -65,7 +65,7 @@ $inputs = array(
        TRUE => 'uppert',
        FALSE => 'upperf',
        ),
-       
+
        // empty data
 /*5*/ 'empty double quotes' => array(
        "" => 'emptyd',
diff --git a/ext/standard/tests/array/array_keys_variation_001.phpt b/ext/standard/tests/array/array_keys_variation_001.phpt
index 1891c131cb1..3e2b13381a0 100644
--- a/ext/standard/tests/array/array_keys_variation_001.phpt
+++ b/ext/standard/tests/array/array_keys_variation_001.phpt
@@ -5,14 +5,14 @@ Test array_keys() function (variation - 1)
 
 echo "\n*** Testing array_keys() on various arrays ***";
 $arrays = array(
-  array(), 
+  array(),
   array(0),
-  array( array() ), 
-  array("Hello" => "World"), 
-  array("" => ""),  
+  array( array() ),
+  array("Hello" => "World"),
+  array("" => ""),
   array(1,2,3, "d" => array(4,6, "d")),
   array("a" => 1, "b" => 2, "c" =>3, "d" => array()),
-  array(0 => 0, 1 => 1, 2 => 2, 3 => 3),  
+  array(0 => 0, 1 => 1, 2 => 2, 3 => 3),
   array(0.001=>3.000, 1.002=>2, 1.999=>3, "a"=>3, 3=>5, "5"=>3.000),
   array(TRUE => TRUE, FALSE => FALSE, NULL => NULL, "\x000", "\000"),
   array("a" => "abcd", "a" => "", "ab" => -6, "cd" => -0.5 ),
@@ -23,7 +23,7 @@ $i = 0;
 /* loop through to test array_keys() with different arrays */
 foreach ($arrays as $array) {
   echo "\n-- Iteration $i --\n";
-  var_dump(array_keys($array)); 
+  var_dump(array_keys($array));
   $i++;
 }
 
diff --git a/ext/standard/tests/array/array_keys_variation_002.phpt b/ext/standard/tests/array/array_keys_variation_002.phpt
index d5df95b8289..204f214ef96 100644
--- a/ext/standard/tests/array/array_keys_variation_002.phpt
+++ b/ext/standard/tests/array/array_keys_variation_002.phpt
@@ -11,7 +11,7 @@ echo "\n*** Testing array_keys() on range of values ***\n";
 $arr_range = array(
   2147483647 => 1,
   2147483648 => 2,
-  -2147483647 => 3, 
+  -2147483647 => 3,
   -2147483648 => 4,
   -2147483649 => 5,
   -0 => 6,
diff --git a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt
index c0a034ec3e2..532c6d054a4 100644
--- a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt
+++ b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt
@@ -11,7 +11,7 @@ echo "\n*** Testing array_keys() on range of values ***\n";
 $arr_range = array(
   2147483647 => 1,
   2147483648 => 2,
-  -2147483647 => 3, 
+  -2147483647 => 3,
   -2147483648 => 4,
   -2147483649 => 5,
   -0 => 6,
diff --git a/ext/standard/tests/array/array_keys_variation_003.phpt b/ext/standard/tests/array/array_keys_variation_003.phpt
index 5ccf542b698..f5e6f265e08 100644
--- a/ext/standard/tests/array/array_keys_variation_003.phpt
+++ b/ext/standard/tests/array/array_keys_variation_003.phpt
@@ -9,7 +9,7 @@ $types_arr = array(
   FALSE => FALSE,
   1 => 1,
   0 => 0,
-  -1 => -1, 
+  -1 => -1,
   "1" => "1",
   "0" => "0",
   "-1" => "-1",
@@ -21,7 +21,7 @@ $types_arr = array(
 $values = array(TRUE, FALSE, 1, 0, -1, "1", "0", "-1",  NULL, array(), "php", "");
 foreach ($values as $value){
 	var_dump($value);
-	var_dump(array_keys($types_arr, $value)); 
+	var_dump(array_keys($types_arr, $value));
 }
 
 echo "Done\n";
diff --git a/ext/standard/tests/array/array_keys_variation_004.phpt b/ext/standard/tests/array/array_keys_variation_004.phpt
index 1a4f0fcca1c..47262e28487 100644
--- a/ext/standard/tests/array/array_keys_variation_004.phpt
+++ b/ext/standard/tests/array/array_keys_variation_004.phpt
@@ -9,7 +9,7 @@ $types_arr = array(
   FALSE => FALSE,
   1 => 1,
   0 => 0,
-  -1 => -1, 
+  -1 => -1,
   "1" => "1",
   "0" => "0",
   "-1" => "-1",
diff --git a/ext/standard/tests/array/array_keys_variation_005.phpt b/ext/standard/tests/array/array_keys_variation_005.phpt
index 9a912d68ed8..ec6aff8d2cf 100644
--- a/ext/standard/tests/array/array_keys_variation_005.phpt
+++ b/ext/standard/tests/array/array_keys_variation_005.phpt
@@ -8,9 +8,9 @@ $resource1 = fopen( __FILE__, "r");
 $resource2 = opendir( "." );
 
 /* creating an array with resource types as elements */
-$arr_resource = array($resource1, $resource2); 
+$arr_resource = array($resource1, $resource2);
 
-var_dump(array_keys($arr_resource, $resource1));  // loose type checking 
+var_dump(array_keys($arr_resource, $resource1));  // loose type checking
 var_dump(array_keys($arr_resource, $resource1, TRUE));  // strict type checking
 var_dump(array_keys($arr_resource, $resource2));  // loose type checking
 var_dump(array_keys($arr_resource, $resource2, TRUE));  // strict type checking
diff --git a/ext/standard/tests/array/array_map_001.phpt b/ext/standard/tests/array/array_map_001.phpt
index 7d313b59f6d..cd95e6c991b 100644
--- a/ext/standard/tests/array/array_map_001.phpt
+++ b/ext/standard/tests/array/array_map_001.phpt
@@ -5,18 +5,18 @@ array_map() and exceptions in the callback
 
 $a = array(1,2,3);
 
-function foo() { 
-	throw new exception(1); 
-} 
+function foo() {
+	throw new exception(1);
+}
 
-try { 
-	array_map("foo", $a, array(2,3)); 
+try {
+	array_map("foo", $a, array(2,3));
 } catch (Exception $e) {
 	var_dump("exception caught!");
 }
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(17) "exception caught!"
 Done
diff --git a/ext/standard/tests/array/array_map_object2.phpt b/ext/standard/tests/array/array_map_object2.phpt
index c98b2cf29ce..7cfb528bf28 100644
--- a/ext/standard/tests/array/array_map_object2.phpt
+++ b/ext/standard/tests/array/array_map_object2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_map() function : object functionality - with non-existent class and method 
+Test array_map() function : object functionality - with non-existent class and method
 --FILE--
 <?php
 /* Prototype  : array array_map  ( callback $callback  , array $arr1  [, array $...  ] )
diff --git a/ext/standard/tests/array/array_map_object3.phpt b/ext/standard/tests/array/array_map_object3.phpt
index 9424c441104..114d1d31349 100644
--- a/ext/standard/tests/array/array_map_object3.phpt
+++ b/ext/standard/tests/array/array_map_object3.phpt
@@ -29,7 +29,7 @@ class ParentClass
   }
 }
 
-class ChildClass extends ParentClass 
+class ChildClass extends ParentClass
 {
   var $parent_obj;
   public function __construct ( ) {
diff --git a/ext/standard/tests/array/array_map_variation10.phpt b/ext/standard/tests/array/array_map_variation10.phpt
index effda06745a..2eb0d115e01 100644
--- a/ext/standard/tests/array/array_map_variation10.phpt
+++ b/ext/standard/tests/array/array_map_variation10.phpt
@@ -3,7 +3,7 @@ Test array_map() function : usage variations - anonymous callback function
 --FILE--
 <?php
 /* Prototype  : array array_map  ( callback $callback  , array $arr1  [, array $...  ] )
- * Description: Applies the callback to the elements of the given arrays 
+ * Description: Applies the callback to the elements of the given arrays
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_map_variation11.phpt b/ext/standard/tests/array/array_map_variation11.phpt
index 9cad3668d53..8ed879c45ce 100644
--- a/ext/standard/tests/array/array_map_variation11.phpt
+++ b/ext/standard/tests/array/array_map_variation11.phpt
@@ -3,7 +3,7 @@ Test array_map() function : usage variations - with recursive callback
 --FILE--
 <?php
 /* Prototype  : array array_map  ( callback $callback  , array $arr1  [, array $...  ] )
- * Description: Applies the callback to the elements of the given arrays 
+ * Description: Applies the callback to the elements of the given arrays
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_map_variation12.phpt b/ext/standard/tests/array/array_map_variation12.phpt
index 5c6d9fb97a6..b258c2d31b9 100644
--- a/ext/standard/tests/array/array_map_variation12.phpt
+++ b/ext/standard/tests/array/array_map_variation12.phpt
@@ -3,7 +3,7 @@ Test array_map() function : usage variations - built-in function as callback
 --FILE--
 <?php
 /* Prototype  : array array_map  ( callback $callback  , array $arr1  [, array $...  ] )
- * Description: Applies the callback to the elements of the given arrays 
+ * Description: Applies the callback to the elements of the given arrays
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_map_variation13.phpt b/ext/standard/tests/array/array_map_variation13.phpt
index 94babdf9633..9f7173dfebc 100644
--- a/ext/standard/tests/array/array_map_variation13.phpt
+++ b/ext/standard/tests/array/array_map_variation13.phpt
@@ -3,7 +3,7 @@ Test array_map() function : usage variations - callback function with different
 --FILE--
 <?php
 /* Prototype  : array array_map  ( callback $callback  , array $arr1  [, array $...  ] )
- * Description: Applies the callback to the elements of the given arrays 
+ * Description: Applies the callback to the elements of the given arrays
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_map_variation17.phpt b/ext/standard/tests/array/array_map_variation17.phpt
index d9440bb2c17..1cfbdd7beb5 100644
--- a/ext/standard/tests/array/array_map_variation17.phpt
+++ b/ext/standard/tests/array/array_map_variation17.phpt
@@ -3,7 +3,7 @@ Test array_map() function : usage variations - unexpected values for 'callback'
 --FILE--
 <?php
 /* Prototype  : array array_map  ( callback $callback  , array $arr1  [, array $...  ] )
- * Description: Applies the callback to the elements of the given arrays 
+ * Description: Applies the callback to the elements of the given arrays
  * Source code: ext/standard/array.c
  */
 
@@ -47,7 +47,7 @@ $unexpected_callbacks = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*14*/ "",
        '',
diff --git a/ext/standard/tests/array/array_map_variation18.phpt b/ext/standard/tests/array/array_map_variation18.phpt
index d0a23d72c67..8e1a8625871 100644
--- a/ext/standard/tests/array/array_map_variation18.phpt
+++ b/ext/standard/tests/array/array_map_variation18.phpt
@@ -67,7 +67,7 @@ $unexpected_inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -76,7 +76,7 @@ $unexpected_inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_map_variation4.phpt b/ext/standard/tests/array/array_map_variation4.phpt
index fcc4090632f..d99a529e3a7 100644
--- a/ext/standard/tests/array/array_map_variation4.phpt
+++ b/ext/standard/tests/array/array_map_variation4.phpt
@@ -61,8 +61,8 @@ $arrays = array (
        array(new classA() => 11, @$unset_var => "hello", $fp => 'resource'),
 
        // array with mixed values
-/*11*/ array('hello' => 1, new classA() => 2, "fruit" => 2.2, 
-              $fp => 'resource', 133 => "int", 444.432 => "float", 
+/*11*/ array('hello' => 1, new classA() => 2, "fruit" => 2.2,
+              $fp => 'resource', 133 => "int", 444.432 => "float",
               @$unset_var => "unset", $heredoc => "heredoc")
 );
 
diff --git a/ext/standard/tests/array/array_map_variation5.phpt b/ext/standard/tests/array/array_map_variation5.phpt
index 55f15692110..e286095576a 100644
--- a/ext/standard/tests/array/array_map_variation5.phpt
+++ b/ext/standard/tests/array/array_map_variation5.phpt
@@ -61,8 +61,8 @@ $arrays = array (
        array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp),
 
        // array with mixed values
-/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", 
-             'resource' => $fp, "int" => 133, "float" => 444.432, 
+/*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit",
+             'resource' => $fp, "int" => 133, "float" => 444.432,
              "unset" => @$unset_var, "heredoc" => $heredoc)
 );
 
diff --git a/ext/standard/tests/array/array_map_variation6.phpt b/ext/standard/tests/array/array_map_variation6.phpt
index 2409a5763cc..566fd95e0b6 100644
--- a/ext/standard/tests/array/array_map_variation6.phpt
+++ b/ext/standard/tests/array/array_map_variation6.phpt
@@ -3,7 +3,7 @@ Test array_map() function : usage variations - array having subarrays
 --FILE--
 <?php
 /* Prototype  : array array_map  ( callback $callback  , array $arr1  [, array $...  ] )
- * Description: Applies the callback to the elements of the given arrays 
+ * Description: Applies the callback to the elements of the given arrays
  * Source code: ext/standard/array.c
  */
 
@@ -25,7 +25,7 @@ $arr1 = array(
   array('a', 'b'),
   array(1, 2, 'a', 'b'),
   array(1 => 'a', 'b' => 2)
-);  
+);
 
 var_dump( array_map('callback', $arr1));
 echo "Done";
diff --git a/ext/standard/tests/array/array_map_variation7.phpt b/ext/standard/tests/array/array_map_variation7.phpt
index 8f88a0f88ce..dc29fdf7700 100644
--- a/ext/standard/tests/array/array_map_variation7.phpt
+++ b/ext/standard/tests/array/array_map_variation7.phpt
@@ -3,7 +3,7 @@ Test array_map() function : usage variations - arrays of different size
 --FILE--
 <?php
 /* Prototype  : array array_map  ( callback $callback  , array $arr1  [, array $...  ] )
- * Description: Applies the callback to the elements of the given arrays 
+ * Description: Applies the callback to the elements of the given arrays
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt
index 30830de2b30..c8c0551344d 100644
--- a/ext/standard/tests/array/array_merge.phpt
+++ b/ext/standard/tests/array/array_merge.phpt
@@ -16,7 +16,7 @@ $begin_array = array(
   array( -2.44444 => 12),
   array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL,	"d" => -2.344),
   array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL,1 => -2.344),
-  array( NULL, 1.23 => "Hi", "string" => "hello", 
+  array( NULL, 1.23 => "Hi", "string" => "hello",
   array("" => "World", "-2.34" => "a", "0" => "b"))
 );
 
@@ -26,8 +26,8 @@ $end_array   = array(
   array( "" => "string"),
   array( -2.44444 => 12),
   array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344),
-  array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL, 1=> -2.344), 
-  array( NULL, 1.23 => "Hi", "string" => "hello", 
+  array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL, 1=> -2.344),
+  array( NULL, 1.23 => "Hi", "string" => "hello",
          array("" => "World", "-2.34" => "a", "0" => "b"))
 );
 
@@ -41,22 +41,22 @@ foreach($begin_array as $first) {
     $result = array_merge($first, $second);
     print_r($result);
     $count_inner++;
-  }			
+  }
   $count_outer++;
 }
 
 
 echo "\n*** Testing array_merge() with three or more arrays ***\n";
-var_dump( array_merge( $end_array[0], 
-                       $end_array[5], 
+var_dump( array_merge( $end_array[0],
+                       $end_array[5],
                        $end_array[4],
                        $end_array[6]
                      )
         );
 
-var_dump( array_merge( $end_array[0], 
-                       $end_array[5], 
-                       array("array on fly"), 
+var_dump( array_merge( $end_array[0],
+                       $end_array[5],
+                       array("array on fly"),
                        array("nullarray" => array())
                      )
         );
@@ -64,7 +64,7 @@ var_dump( array_merge( $end_array[0],
 
 echo "\n*** Testing single array argument ***\n";
 /* Empty array */
-var_dump(array_merge(array())); 
+var_dump(array_merge(array()));
 
 /* associative array with string keys, which will not be re-indexed */
 var_dump(array_merge($begin_array[4]));
@@ -86,7 +86,7 @@ var_dump(array_merge($begin_array[0], $begin_array[1], 100));
 var_dump(array_merge($begin_array[0], $begin_array[1], $arr4));
 
 echo "Done\n";
-?> 
+?>
 --EXPECTF--
 *** Testing array_merge() basic functionality ***
 
diff --git a/ext/standard/tests/array/array_merge_basic.phpt b/ext/standard/tests/array/array_merge_basic.phpt
index c4dc69638e1..9836a131a9c 100644
--- a/ext/standard/tests/array/array_merge_basic.phpt
+++ b/ext/standard/tests/array/array_merge_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_merge() function : basic functionality 
+Test array_merge() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array array_merge(array $arr1, array $arr2 [, array $...])
- * Description: Merges elements from passed arrays into one array 
+ * Description: Merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_merge_error.phpt b/ext/standard/tests/array/array_merge_error.phpt
index a017c27530f..38e672e32c7 100644
--- a/ext/standard/tests/array/array_merge_error.phpt
+++ b/ext/standard/tests/array/array_merge_error.phpt
@@ -3,7 +3,7 @@ Test array_merge() function : error conditions - Pass incorrect number of args
 --FILE--
 <?php
 /* Prototype  : array array_merge(array $arr1, array $arr2 [, array $...])
- * Description: Merges elements from passed arrays into one array 
+ * Description: Merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_merge_recursive_basic1.phpt b/ext/standard/tests/array/array_merge_recursive_basic1.phpt
index a86a8510ae7..c1cf40b8450 100644
--- a/ext/standard/tests/array/array_merge_recursive_basic1.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_basic1.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_merge_recursive() function : basic functionality - array with default keys 
+Test array_merge_recursive() function : basic functionality - array with default keys
 --FILE--
 <?php
 /* Prototype  : array array_merge_recursive(array $arr1[, array $...])
- * Description: Recursively merges elements from passed arrays into one array 
+ * Description: Recursively merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_merge_recursive_basic2.phpt b/ext/standard/tests/array/array_merge_recursive_basic2.phpt
index 3f8c62e7abc..e52d087322f 100644
--- a/ext/standard/tests/array/array_merge_recursive_basic2.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_basic2.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_merge_recursive() function : basic functionality - associative arrays 
+Test array_merge_recursive() function : basic functionality - associative arrays
 --FILE--
 <?php
 /* Prototype  : array array_merge_recursive(array $arr1[, array $...])
- * Description: Recursively merges elements from passed arrays into one array 
+ * Description: Recursively merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_merge_recursive_error.phpt b/ext/standard/tests/array/array_merge_recursive_error.phpt
index d7d717297e9..ffa9cc998e6 100644
--- a/ext/standard/tests/array/array_merge_recursive_error.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_merge_recursive() function : error conditions 
+Test array_merge_recursive() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_merge_recursive(array $arr1[, array $...])
- * Description: Recursively merges elements from passed arrays into one array 
+ * Description: Recursively merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_merge_recursive_variation1.phpt b/ext/standard/tests/array/array_merge_recursive_variation1.phpt
index 75e0c2086df..1d9a3d813f2 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation1.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation1.phpt
@@ -8,7 +8,7 @@ Test array_merge_recursive() function : usage variations - unexpected values for
 */
 
 /*
- * Passing non array values to 'arr1' argument of array_merge_recursive() and see 
+ * Passing non array values to 'arr1' argument of array_merge_recursive() and see
  * that the function outputs proper warning messages wherever expected.
 */
 
@@ -82,22 +82,22 @@ $arrays = array (
 /*24*/ new A()
 );
 
-// initialise the second argument 
+// initialise the second argument
 $arr2 = array(1, array("hello", 'world'));
 
 // loop through each element of $arrays and check the behavior of array_merge_recursive()
 $iterator = 1;
 foreach($arrays as $arr1) {
   echo "\n-- Iteration $iterator --";
-  
+
   // with default argument
   echo "\n-- With default argument --";
   var_dump( array_merge_recursive($arr1) );
- 
+
   // with more arguments
   echo "-- With more arguments --";
   var_dump( array_merge_recursive($arr1, $arr2) );
- 
+
   $iterator++;
 }
 
diff --git a/ext/standard/tests/array/array_merge_recursive_variation10.phpt b/ext/standard/tests/array/array_merge_recursive_variation10.phpt
index 42d315eb89a..387f604a054 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation10.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation10.phpt
@@ -8,21 +8,21 @@ Test array_merge_recursive() function : usage variations - two dimensional array
 */
 
 /*
- * Testing the functionality of array_merge_recursive() by passing 
+ * Testing the functionality of array_merge_recursive() by passing
  * two dimensional arrays for $arr1 argument.
 */
 
 echo "*** Testing array_merge_recursive() : two dimensional array for \$arr1 argument ***\n";
 
 // initialize the 2-d array
-$arr1 = array( 
+$arr1 = array(
   array(1, 2, 3, 1),
   "array" => array("hello", "world", "str1" => "hello", "str2" => 'world'),
   array(1 => "one", 2 => "two", "one", 'two'),
   array(1, 2, 3, 1)
 );
 
-// initialize the second argument 
+// initialize the second argument
 $arr2 = array(1, "hello", "array" => array("hello", 'world'));
 
 echo "-- Passing the entire 2-d array --\n";
diff --git a/ext/standard/tests/array/array_merge_recursive_variation2.phpt b/ext/standard/tests/array/array_merge_recursive_variation2.phpt
index 83f23747413..48ad02877f0 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation2.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation2.phpt
@@ -8,7 +8,7 @@ Test array_merge_recursive() function : usage variations - unexpected values for
 */
 
 /*
- * Passing non array values to 'arr2' argument of array_merge_recursive() and see 
+ * Passing non array values to 'arr2' argument of array_merge_recursive() and see
  * that the function outputs proper warning messages wherever expected.
 */
 
diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt
index 76bf913918d..d63037d8987 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt
@@ -92,7 +92,7 @@ foreach($arrays as $arr1) {
 
   $iterator++;
 }
-  
+
 echo "Done";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_merge_recursive_variation4.phpt b/ext/standard/tests/array/array_merge_recursive_variation4.phpt
index b497acec7ef..f73dd9c6286 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation4.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation4.phpt
@@ -53,7 +53,7 @@ $arrays = array (
 /*8*/ array(new classA() => 11, @$unset_var => array("unset"), $fp => 'resource', 11, "hello")
 );
 
-// initialise the second array 
+// initialise the second array
 $arr2 = array( 1 => "one", 2, "string" => "hello", "array" => array("a", "b", "c"));
 
 // loop through each sub array of $arrays and check the behavior of array_merge_recursive()
@@ -74,7 +74,7 @@ foreach($arrays as $arr1) {
 
 // close the file resource used
 fclose($fp);
-  
+
 echo "Done";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_merge_recursive_variation5.phpt b/ext/standard/tests/array/array_merge_recursive_variation5.phpt
index 3b251220ea7..34cdfe409fe 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation5.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation5.phpt
@@ -53,7 +53,7 @@ $arrays = array (
 /*8*/  array(11 => new classA(), "string" => @$unset_var, "resource" => $fp, new classA(), $fp),
 );
 
-// initialise the second array 
+// initialise the second array
 $arr2 = array( 1 => "one", 2, "string" => "hello", "array" => array("a", "b", "c"));
 
 // loop through each sub array of $arrays and check the behavior of array_merge_recursive()
@@ -74,7 +74,7 @@ foreach($arrays as $arr1) {
 
 // close the file resource used
 fclose($fp);
-  
+
 echo "Done";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_merge_recursive_variation6.phpt b/ext/standard/tests/array/array_merge_recursive_variation6.phpt
index 8e460ba3669..56c67916c7f 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation6.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation6.phpt
@@ -8,7 +8,7 @@ Test array_merge_recursive() function : usage variations - array with duplicate
 */
 
 /*
- * Testing the functionality of array_merge_recursive() by passing 
+ * Testing the functionality of array_merge_recursive() by passing
  * array having duplicate keys.
 */
 
diff --git a/ext/standard/tests/array/array_merge_recursive_variation7.phpt b/ext/standard/tests/array/array_merge_recursive_variation7.phpt
index b244e7d6b87..fce0cb10708 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation7.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation7.phpt
@@ -8,7 +8,7 @@ Test array_merge_recursive() function : usage variations - array with reference
 */
 
 /*
- * Testing the functionality of array_merge_recursive() by passing 
+ * Testing the functionality of array_merge_recursive() by passing
  * array having reference variables.
 */
 
diff --git a/ext/standard/tests/array/array_merge_recursive_variation8.phpt b/ext/standard/tests/array/array_merge_recursive_variation8.phpt
index 6ad2f6989fc..482bab1f72f 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation8.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation8.phpt
@@ -18,7 +18,7 @@ $arr1 = array(b"1", b"hello" => "hello", b"world", "str1" => b"hello", "str2" =>
 
 // initialize the second argument
 $arr2 = array(b"str1" => b"binary", b"hello" => "binary", b"str2" => b"binary");
- 
+
 echo "-- With default argument --\n";
 var_dump( array_merge_recursive($arr1) );
 
diff --git a/ext/standard/tests/array/array_merge_recursive_variation9.phpt b/ext/standard/tests/array/array_merge_recursive_variation9.phpt
index d51d2f89085..e3bd8a173ff 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation9.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation9.phpt
@@ -8,7 +8,7 @@ Test array_merge_recursive() function : usage variations - common key and value(
 */
 
 /*
- * Testing the functionality of array_merge_recursive() by passing 
+ * Testing the functionality of array_merge_recursive() by passing
  * arrays having common key and value.
 */
 
diff --git a/ext/standard/tests/array/array_merge_variation1.phpt b/ext/standard/tests/array/array_merge_variation1.phpt
index 1ce71debb0f..02c82e23205 100644
--- a/ext/standard/tests/array/array_merge_variation1.phpt
+++ b/ext/standard/tests/array/array_merge_variation1.phpt
@@ -3,7 +3,7 @@ Test array_merge() function : usage variations - Pass different data types to $a
 --FILE--
 <?php
 /* Prototype  : array array_merge(array $arr1, array $arr2 [, array $...])
- * Description: Merges elements from passed arrays into one array 
+ * Description: Merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
  */
 
@@ -61,7 +61,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -71,7 +71,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_merge_variation10.phpt b/ext/standard/tests/array/array_merge_variation10.phpt
index 7f08a4bb78b..47b06f10baa 100644
--- a/ext/standard/tests/array/array_merge_variation10.phpt
+++ b/ext/standard/tests/array/array_merge_variation10.phpt
@@ -3,11 +3,11 @@ Test array_merge() function : usage variations - position of internal array poin
 --FILE--
 <?php
 /* Prototype  : array array_merge(array $arr1, array $arr2 [, array $...])
- * Description: Merges elements from passed arrays into one array 
+ * Description: Merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
  */
 
-/* 
+/*
  * Check the position of the internal array pointer after calling array_merge().
  * This test is also passing more than two arguments to array_merge().
  */
diff --git a/ext/standard/tests/array/array_merge_variation2.phpt b/ext/standard/tests/array/array_merge_variation2.phpt
index 4ebbeb92b9c..2db4dfddefe 100644
--- a/ext/standard/tests/array/array_merge_variation2.phpt
+++ b/ext/standard/tests/array/array_merge_variation2.phpt
@@ -3,7 +3,7 @@ Test array_merge() function : usage variations - Pass different data types as $a
 --FILE--
 <?php
 /* Prototype  : array array_merge(array $arr1, array $arr2 [, array $...])
- * Description: Merges elements from passed arrays into one array 
+ * Description: Merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
  */
 
@@ -61,7 +61,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -71,7 +71,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_merge_variation3.phpt b/ext/standard/tests/array/array_merge_variation3.phpt
index 717968adb81..89121dd0d0f 100644
--- a/ext/standard/tests/array/array_merge_variation3.phpt
+++ b/ext/standard/tests/array/array_merge_variation3.phpt
@@ -3,7 +3,7 @@ Test array_merge() function : usage variations - arrays of diff. data types
 --FILE--
 <?php
 /* Prototype  : array array_merge(array $arr1, array $arr2 [, array $...])
- * Description: Merges elements from passed arrays into one array 
+ * Description: Merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
  */
 
@@ -70,13 +70,13 @@ $inputs = array(
        TRUE,
        FALSE,
        ),
-       
+
        // empty data
 /*5*/ 'empty string' => array(
        "",
        '',
        ),
-       
+
 /*6*/ 'empty array' => array(
        ),
 
@@ -86,7 +86,7 @@ $inputs = array(
        'string',
        $heredoc,
        ),
-       
+
        // object data
 /*8*/ 'object' => array(
        new classA(),
diff --git a/ext/standard/tests/array/array_merge_variation4.phpt b/ext/standard/tests/array/array_merge_variation4.phpt
index e4eb2570cd7..24eee4c2578 100644
--- a/ext/standard/tests/array/array_merge_variation4.phpt
+++ b/ext/standard/tests/array/array_merge_variation4.phpt
@@ -3,12 +3,12 @@ Test array_merge() function : usage variations - Diff. data types as array keys
 --FILE--
 <?php
 /* Prototype  : array array_merge(array $arr1, array $arr2 [, array $...])
- * Description: Merges elements from passed arrays into one array 
+ * Description: Merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
  */
 
 /*
- * Pass an array with different data types as keys to test how array_merge 
+ * Pass an array with different data types as keys to test how array_merge
  * adds it onto an existing array
  */
 
@@ -43,7 +43,7 @@ $inputs = array(
        -10.5 => 'negative',
        .5 => 'half',
        ),
-       
+
 /*3*/  'extreme floats' => array(
        12.3456789000e10 => 'large',
        12.3456789000E-10 => 'small',
@@ -52,8 +52,8 @@ $inputs = array(
        // null data
 /*4*/  'null uppercase' => array(
        NULL => 'null 1',
-       ), 
-       
+       ),
+
 /*5*/  'null lowercase' => array(
        null => 'null 2',
        ),
@@ -63,17 +63,17 @@ $inputs = array(
        true => 'lowert',
        false => 'lowerf',
        ),
-       
+
 /*7*/  'bool uppercase' => array(
        TRUE => 'uppert',
        FALSE => 'upperf',
        ),
-       
+
        // empty data
 /*8*/ 'empty double quotes' => array(
        "" => 'emptyd',
        ),
-       
+
 /*9*/  'empty single quotes' => array(
        '' => 'emptys',
        ),
diff --git a/ext/standard/tests/array/array_merge_variation5.phpt b/ext/standard/tests/array/array_merge_variation5.phpt
index eca6078e6a6..d2989ea6cc9 100644
--- a/ext/standard/tests/array/array_merge_variation5.phpt
+++ b/ext/standard/tests/array/array_merge_variation5.phpt
@@ -3,7 +3,7 @@ Test array_merge() function : usage variations - numeric keys
 --FILE--
 <?php
 /* Prototype  : array array_merge(array $arr1, array $arr2 [, array $...])
- * Description: Merges elements from passed arrays into one array 
+ * Description: Merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_merge_variation6.phpt b/ext/standard/tests/array/array_merge_variation6.phpt
index 13b346eb3f6..8612e8e9abe 100644
--- a/ext/standard/tests/array/array_merge_variation6.phpt
+++ b/ext/standard/tests/array/array_merge_variation6.phpt
@@ -3,7 +3,7 @@ Test array_merge() function : usage variations - string keys
 --FILE--
 <?php
 /* Prototype  : array array_merge(array $arr1, array $arr2 [, array $...])
- * Description: Merges elements from passed arrays into one array 
+ * Description: Merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_merge_variation7.phpt b/ext/standard/tests/array/array_merge_variation7.phpt
index 00943f3ea4c..d2ddeb6a013 100644
--- a/ext/standard/tests/array/array_merge_variation7.phpt
+++ b/ext/standard/tests/array/array_merge_variation7.phpt
@@ -3,7 +3,7 @@ Test array_merge() function : usage variations - Mixed keys
 --FILE--
 <?php
 /* Prototype  : array array_merge(array $arr1, array $arr2 [, array $...])
- * Description: Merges elements from passed arrays into one array 
+ * Description: Merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_merge_variation8.phpt b/ext/standard/tests/array/array_merge_variation8.phpt
index a4cdea74fee..e2a02e10dab 100644
--- a/ext/standard/tests/array/array_merge_variation8.phpt
+++ b/ext/standard/tests/array/array_merge_variation8.phpt
@@ -3,7 +3,7 @@ Test array_merge() function : usage variations - multi-dimensional arrays
 --FILE--
 <?php
 /* Prototype  : array array_merge(array $arr1, array $arr2 [, array $...])
- * Description: Merges elements from passed arrays into one array 
+ * Description: Merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_merge_variation9.phpt b/ext/standard/tests/array/array_merge_variation9.phpt
index 69e0401a0e6..144f08c44be 100644
--- a/ext/standard/tests/array/array_merge_variation9.phpt
+++ b/ext/standard/tests/array/array_merge_variation9.phpt
@@ -3,7 +3,7 @@ Test array_merge() function : usage variations - referenced variables
 --FILE--
 <?php
 /* Prototype  : array array_merge(array $arr1, array $arr2 [, array $...])
- * Description: Merges elements from passed arrays into one array 
+ * Description: Merges elements from passed arrays into one array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_multisort_basic1.phpt b/ext/standard/tests/array/array_multisort_basic1.phpt
index ab7db944635..c317a1e025f 100644
--- a/ext/standard/tests/array/array_multisort_basic1.phpt
+++ b/ext/standard/tests/array/array_multisort_basic1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_multisort() function : basic functionality 
+Test array_multisort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : basic functionality ***\n";
diff --git a/ext/standard/tests/array/array_multisort_basic2.phpt b/ext/standard/tests/array/array_multisort_basic2.phpt
index 4a46072e65b..85a90f9274b 100644
--- a/ext/standard/tests/array/array_multisort_basic2.phpt
+++ b/ext/standard/tests/array/array_multisort_basic2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_multisort() function : basic functionality 
+Test array_multisort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : basic functionality - renumbering of numeric keys ***\n";
diff --git a/ext/standard/tests/array/array_multisort_case.phpt b/ext/standard/tests/array/array_multisort_case.phpt
index 6be42edf578..35faa08f238 100644
--- a/ext/standard/tests/array/array_multisort_case.phpt
+++ b/ext/standard/tests/array/array_multisort_case.phpt
@@ -3,9 +3,9 @@ Test array_multisort() function : case-sensitive
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : case-sensitive\n";
diff --git a/ext/standard/tests/array/array_multisort_error.phpt b/ext/standard/tests/array/array_multisort_error.phpt
index 5956630f845..7dcb5c12b5c 100644
--- a/ext/standard/tests/array/array_multisort_error.phpt
+++ b/ext/standard/tests/array/array_multisort_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_multisort() function : error conditions 
+Test array_multisort() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : error conditions ***\n";
diff --git a/ext/standard/tests/array/array_multisort_incase.phpt b/ext/standard/tests/array/array_multisort_incase.phpt
index 951cce4927c..c15785b69c2 100644
--- a/ext/standard/tests/array/array_multisort_incase.phpt
+++ b/ext/standard/tests/array/array_multisort_incase.phpt
@@ -3,9 +3,9 @@ Test array_multisort() function : case-insensitive
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : case-insensitive\n";
diff --git a/ext/standard/tests/array/array_multisort_natural.phpt b/ext/standard/tests/array/array_multisort_natural.phpt
index e7910882e48..2d9b7f18385 100644
--- a/ext/standard/tests/array/array_multisort_natural.phpt
+++ b/ext/standard/tests/array/array_multisort_natural.phpt
@@ -3,9 +3,9 @@ Test array_multisort() function : natural sorting
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : natural sorting\n";
diff --git a/ext/standard/tests/array/array_multisort_natural_case.phpt b/ext/standard/tests/array/array_multisort_natural_case.phpt
index d59e4931b61..7795bacd944 100644
--- a/ext/standard/tests/array/array_multisort_natural_case.phpt
+++ b/ext/standard/tests/array/array_multisort_natural_case.phpt
@@ -3,9 +3,9 @@ Test array_multisort() function : natural sorting case-sensitive
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : natural sorting case-sensitive\n";
diff --git a/ext/standard/tests/array/array_multisort_natural_incase.phpt b/ext/standard/tests/array/array_multisort_natural_incase.phpt
index 87514058a93..73e2fe25144 100644
--- a/ext/standard/tests/array/array_multisort_natural_incase.phpt
+++ b/ext/standard/tests/array/array_multisort_natural_incase.phpt
@@ -3,9 +3,9 @@ Test array_multisort() function : natural sorting case-insensitive
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : natural sorting case-insensitive\n";
diff --git a/ext/standard/tests/array/array_multisort_variation1.phpt b/ext/standard/tests/array/array_multisort_variation1.phpt
index 93c265922e5..5e84548d7ed 100644
--- a/ext/standard/tests/array/array_multisort_variation1.phpt
+++ b/ext/standard/tests/array/array_multisort_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_multisort() function : usage variation 
+Test array_multisort() function : usage variation
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_multisort_variation10.phpt b/ext/standard/tests/array/array_multisort_variation10.phpt
index 71c44942706..34c7ad4b29e 100644
--- a/ext/standard/tests/array/array_multisort_variation10.phpt
+++ b/ext/standard/tests/array/array_multisort_variation10.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_multisort() function : usage variation - testing with anonymous arrary arguments 
+Test array_multisort() function : usage variation - testing with anonymous arrary arguments
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : Testing with anonymous arguments ***\n";
diff --git a/ext/standard/tests/array/array_multisort_variation2.phpt b/ext/standard/tests/array/array_multisort_variation2.phpt
index 86210eeb492..8c26a8347be 100644
--- a/ext/standard/tests/array/array_multisort_variation2.phpt
+++ b/ext/standard/tests/array/array_multisort_variation2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_multisort() function : usage variation 
+Test array_multisort() function : usage variation
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_multisort_variation3.phpt b/ext/standard/tests/array/array_multisort_variation3.phpt
index b2cdb05ece3..28130e31fd2 100644
--- a/ext/standard/tests/array/array_multisort_variation3.phpt
+++ b/ext/standard/tests/array/array_multisort_variation3.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_multisort() function : usage variation 
+Test array_multisort() function : usage variation
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_multisort_variation4.phpt b/ext/standard/tests/array/array_multisort_variation4.phpt
index 5d11fb3ac06..fc123d75443 100644
--- a/ext/standard/tests/array/array_multisort_variation4.phpt
+++ b/ext/standard/tests/array/array_multisort_variation4.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_multisort() function : usage variation - testing with multiple array arguments 
+Test array_multisort() function : usage variation - testing with multiple array arguments
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : Testing  with multiple array arguments ***\n";
diff --git a/ext/standard/tests/array/array_multisort_variation5.phpt b/ext/standard/tests/array/array_multisort_variation5.phpt
index 76d7092c210..0458e7a4fbe 100644
--- a/ext/standard/tests/array/array_multisort_variation5.phpt
+++ b/ext/standard/tests/array/array_multisort_variation5.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_multisort() function : usage variation - testing with multiple array arguments 
+Test array_multisort() function : usage variation - testing with multiple array arguments
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : Testing  all array sort specifiers ***\n";
diff --git a/ext/standard/tests/array/array_multisort_variation6.phpt b/ext/standard/tests/array/array_multisort_variation6.phpt
index 4e2a62227df..6261f8db6ae 100644
--- a/ext/standard/tests/array/array_multisort_variation6.phpt
+++ b/ext/standard/tests/array/array_multisort_variation6.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_multisort() function : usage variation - testing with multiple array arguments 
+Test array_multisort() function : usage variation - testing with multiple array arguments
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : Testing  all array sort specifiers ***\n";
diff --git a/ext/standard/tests/array/array_multisort_variation7.phpt b/ext/standard/tests/array/array_multisort_variation7.phpt
index 10980be5926..87c2f4170ee 100644
--- a/ext/standard/tests/array/array_multisort_variation7.phpt
+++ b/ext/standard/tests/array/array_multisort_variation7.phpt
@@ -3,9 +3,9 @@ Test array_multisort() function : usage variation - test sort order of all types
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : usage variation  - test sort order of all types***\n";
diff --git a/ext/standard/tests/array/array_multisort_variation8.phpt b/ext/standard/tests/array/array_multisort_variation8.phpt
index 6b50e0ebbb2..41dd8eebc69 100644
--- a/ext/standard/tests/array/array_multisort_variation8.phpt
+++ b/ext/standard/tests/array/array_multisort_variation8.phpt
@@ -3,9 +3,9 @@ Test array_multisort() function : usage variation - test sort order of all types
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : usage variation  - test sort order of all types***\n";
diff --git a/ext/standard/tests/array/array_multisort_variation9.phpt b/ext/standard/tests/array/array_multisort_variation9.phpt
index cc4b8d147b0..8d422b78c07 100644
--- a/ext/standard/tests/array/array_multisort_variation9.phpt
+++ b/ext/standard/tests/array/array_multisort_variation9.phpt
@@ -3,9 +3,9 @@ Test array_multisort() function : usage variation - test sort order of all types
 --FILE--
 <?php
 /* Prototype  : bool array_multisort(array ar1 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]] [, array ar2 [, SORT_ASC|SORT_DESC [, SORT_REGULAR|SORT_NUMERIC|SORT_STRING|SORT_NATURAL|SORT_FLAG_CASE]], ...])
- * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL 
+ * Description: Sort multiple arrays at once similar to how ORDER BY clause works in SQL
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_multisort() : usage variation  - test sort order of all types***\n";
diff --git a/ext/standard/tests/array/array_pad.phpt b/ext/standard/tests/array/array_pad.phpt
index add9b3c8e51..c2675167306 100644
--- a/ext/standard/tests/array/array_pad.phpt
+++ b/ext/standard/tests/array/array_pad.phpt
@@ -20,7 +20,7 @@ var_dump(array_pad("", 2000000, 0));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: array_pad() expects exactly 3 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/standard/tests/array/array_pad_error.phpt b/ext/standard/tests/array/array_pad_error.phpt
index 63b4c83bf00..d0dc9ccb7f3 100644
--- a/ext/standard/tests/array/array_pad_error.phpt
+++ b/ext/standard/tests/array/array_pad_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_pad() function : error conditions 
+Test array_pad() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_pad(array $input, int $pad_size, mixed $pad_value)
- * Description: Returns a copy of input array padded with pad_value to size pad_size 
+ * Description: Returns a copy of input array padded with pad_value to size pad_size
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_pad_variation1.phpt b/ext/standard/tests/array/array_pad_variation1.phpt
index 80385791866..3fb93fa8344 100644
--- a/ext/standard/tests/array/array_pad_variation1.phpt
+++ b/ext/standard/tests/array/array_pad_variation1.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_pad() function : usage variations - unexpected values for 'input' argument 
+Test array_pad() function : usage variations - unexpected values for 'input' argument
 --FILE--
 <?php
 /* Prototype  : array array_pad(array $input, int $pad_size, mixed $pad_value)
- * Description: Returns a copy of input array padded with pad_value to size pad_size 
+ * Description: Returns a copy of input array padded with pad_value to size pad_size
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_pad_variation2.phpt b/ext/standard/tests/array/array_pad_variation2.phpt
index 130255caa9a..42782fa2054 100644
--- a/ext/standard/tests/array/array_pad_variation2.phpt
+++ b/ext/standard/tests/array/array_pad_variation2.phpt
@@ -5,7 +5,7 @@ Test array_pad() function : usage variations - unexpected values for 'pad_size'
 --FILE--
 <?php
 /* Prototype  : array array_pad(array $input, int $pad_size, mixed $pad_value)
- * Description: Returns a copy of input array padded with pad_value to size pad_size 
+ * Description: Returns a copy of input array padded with pad_value to size pad_size
  * Source code: ext/standard/array.c
 */
 
@@ -71,7 +71,7 @@ $pad_sizes = array(
 
        // object data
 /*21*/ new classA(),
- 
+
        // undefined data
 /*22*/ @$undefined_var,
 
diff --git a/ext/standard/tests/array/array_pad_variation3.phpt b/ext/standard/tests/array/array_pad_variation3.phpt
index 75df1182204..e948fce989c 100644
--- a/ext/standard/tests/array/array_pad_variation3.phpt
+++ b/ext/standard/tests/array/array_pad_variation3.phpt
@@ -3,11 +3,11 @@ Test array_pad() function : usage variations - possible values for 'pad_value' a
 --FILE--
 <?php
 /* Prototype  : array array_pad(array $input, int $pad_size, mixed $pad_value)
- * Description: Returns a copy of input array padded with pad_value to size pad_size 
+ * Description: Returns a copy of input array padded with pad_value to size pad_size
  * Source code: ext/standard/array.c
 */
 
-/* 
+/*
 * Testing array_pad() function for expected behavior by passing
 * different possible values for $pad_value argument.
 * $input and $pad_size arguments take fixed value.
@@ -97,7 +97,7 @@ $pad_values = array(
 
        // unset data
 /*30*/ @$unset_var,
-  
+
        // resource variable
 /*31*/ $fp,
 
diff --git a/ext/standard/tests/array/array_pop.phpt b/ext/standard/tests/array/array_pop.phpt
index 34a5c54268b..a6a563fca31 100644
--- a/ext/standard/tests/array/array_pop.phpt
+++ b/ext/standard/tests/array/array_pop.phpt
@@ -32,13 +32,13 @@ echo "\n*** Normal testing with various array inputs ***\n";
 
 $counter = 1;
 foreach( $mixed_array as $sub_array )
-{ 
+{
  echo "\n-- Input Array for Iteration $counter is --\n";
  print_r( $sub_array );
  echo "\nOutput after Pop is :\n";
  var_dump( array_pop($sub_array) );
  $counter++;
-} 
+}
 
 echo"\nDone";
 ?>
diff --git a/ext/standard/tests/array/array_product_error.phpt b/ext/standard/tests/array/array_product_error.phpt
index 79f7cb4a084..3ef23b92108 100644
--- a/ext/standard/tests/array/array_product_error.phpt
+++ b/ext/standard/tests/array/array_product_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_product() function : error conditions 
+Test array_product() function : error conditions
 --FILE--
 <?php
 /* Prototype  : mixed array_product(array input)
- * Description: Returns the product of the array entries 
+ * Description: Returns the product of the array entries
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_product() : error conditions ***\n";
diff --git a/ext/standard/tests/array/array_product_variation1.phpt b/ext/standard/tests/array/array_product_variation1.phpt
index cd2ed71ae6b..b8f2013dc3d 100644
--- a/ext/standard/tests/array/array_product_variation1.phpt
+++ b/ext/standard/tests/array/array_product_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_product() function : variation 
+Test array_product() function : variation
 --FILE--
 <?php
 /* Prototype  : mixed array_product(array input)
- * Description: Returns the product of the array entries 
+ * Description: Returns the product of the array entries
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_product() : variation - using non numeric values ***\n";
@@ -15,7 +15,7 @@ class A {
 }
 $fp = fopen(__FILE__, "r");
 
-$types = array("boolean (true)" => true, "boolean (false)" => false, 
+$types = array("boolean (true)" => true, "boolean (false)" => false,
        "string" => "hello", "numeric string" =>  "12",
        "resource" => $fp, "object" => new A(), "null" => null,
        "array" => array(3,2));
diff --git a/ext/standard/tests/array/array_product_variation2.phpt b/ext/standard/tests/array/array_product_variation2.phpt
index c4c47d86a2b..410f2c827e2 100644
--- a/ext/standard/tests/array/array_product_variation2.phpt
+++ b/ext/standard/tests/array/array_product_variation2.phpt
@@ -3,9 +3,9 @@ Test array_product() function : variation
 --FILE--
 <?php
 /* Prototype  : mixed array_product(array input)
- * Description: Returns the product of the array entries 
+ * Description: Returns the product of the array entries
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_product() : variations ***\n";
diff --git a/ext/standard/tests/array/array_product_variation3.phpt b/ext/standard/tests/array/array_product_variation3.phpt
index dc8609ebd80..c60d47a9dba 100644
--- a/ext/standard/tests/array/array_product_variation3.phpt
+++ b/ext/standard/tests/array/array_product_variation3.phpt
@@ -3,9 +3,9 @@ Test array_product() function : variation
 --FILE--
 <?php
 /* Prototype  : mixed array_product(array input)
- * Description: Returns the product of the array entries 
+ * Description: Returns the product of the array entries
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_product() : variations - negative numbers***\n";
diff --git a/ext/standard/tests/array/array_product_variation4.phpt b/ext/standard/tests/array/array_product_variation4.phpt
index 9f83c5646bd..c3ff22c3c7a 100644
--- a/ext/standard/tests/array/array_product_variation4.phpt
+++ b/ext/standard/tests/array/array_product_variation4.phpt
@@ -3,9 +3,9 @@ Test array_product() function : variation
 --FILE--
 <?php
 /* Prototype  : mixed array_product(array input)
- * Description: Returns the product of the array entries 
+ * Description: Returns the product of the array entries
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_product() : variations ***\n";
diff --git a/ext/standard/tests/array/array_product_variation5.phpt b/ext/standard/tests/array/array_product_variation5.phpt
index 5031000192a..6d595280fd8 100644
--- a/ext/standard/tests/array/array_product_variation5.phpt
+++ b/ext/standard/tests/array/array_product_variation5.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_product() function : usage variation 
+Test array_product() function : usage variation
 --FILE--
 <?php
 /* Prototype  : mixed array_product(array input)
- * Description: Returns the product of the array entries 
+ * Description: Returns the product of the array entries
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_product() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_push.phpt b/ext/standard/tests/array/array_push.phpt
index cea77f4c3cb..da2442f4546 100644
--- a/ext/standard/tests/array/array_push.phpt
+++ b/ext/standard/tests/array/array_push.phpt
@@ -54,13 +54,13 @@ echo "\n*** Testing with various array inputs ***\n";
 
 $counter = 1;
 foreach( $mixed_array as $sub_array )
-{ 
+{
  echo "\n-- Input Array for Iteration $counter is --\n";
  print_r( $sub_array );
  echo "\nOutput after push is :\n";
  var_dump( array_push($sub_array, 22, "abc") );
  $counter++;
-} 
+}
 
 /* Checking for return value and the new array formed from push operation */
 echo "\n*** Checking for return value and the new array formed from push operation ***\n";
diff --git a/ext/standard/tests/array/array_push_basic.phpt b/ext/standard/tests/array/array_push_basic.phpt
index 5ccf037dabe..8dbefbea42c 100644
--- a/ext/standard/tests/array/array_push_basic.phpt
+++ b/ext/standard/tests/array/array_push_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_push() function : basic functionality 
+Test array_push() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int array_push(array $stack, mixed $var [, mixed $...])
- * Description: Pushes elements onto the end of the array 
+ * Description: Pushes elements onto the end of the array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_push_error1.phpt b/ext/standard/tests/array/array_push_error1.phpt
index fe26fb697e7..9a7d6f3fc8a 100644
--- a/ext/standard/tests/array/array_push_error1.phpt
+++ b/ext/standard/tests/array/array_push_error1.phpt
@@ -3,7 +3,7 @@ Test array_push() function : error conditions - Pass incorrect number of args
 --FILE--
 <?php
 /* Prototype  : int array_push(array $stack, mixed $var [, mixed $...])
- * Description: Pushes elements onto the end of the array 
+ * Description: Pushes elements onto the end of the array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_push_error2.phpt b/ext/standard/tests/array/array_push_error2.phpt
index 5d7b655a426..c50683b7804 100644
--- a/ext/standard/tests/array/array_push_error2.phpt
+++ b/ext/standard/tests/array/array_push_error2.phpt
@@ -3,7 +3,7 @@ Test array_push() function : error conditions - max int value as key
 --FILE--
 <?php
 /* Prototype  : int array_push(array $stack, mixed $var [, mixed $...])
- * Description: Pushes elements onto the end of the array 
+ * Description: Pushes elements onto the end of the array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_push_variation1.phpt b/ext/standard/tests/array/array_push_variation1.phpt
index 94b9ec8811f..9bb9c8dc844 100644
--- a/ext/standard/tests/array/array_push_variation1.phpt
+++ b/ext/standard/tests/array/array_push_variation1.phpt
@@ -3,7 +3,7 @@ Test array_push() function : usage variations - Pass different data types as $st
 --FILE--
 <?php
 /* Prototype  : int array_push(array $stack, mixed $var [, mixed $...])
- * Description: Pushes elements onto the end of the array 
+ * Description: Pushes elements onto the end of the array
  * Source code: ext/standard/array.c
  */
 
@@ -61,7 +61,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -71,7 +71,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_push_variation2.phpt b/ext/standard/tests/array/array_push_variation2.phpt
index 7fefcfa49a8..3a3a54c80f0 100644
--- a/ext/standard/tests/array/array_push_variation2.phpt
+++ b/ext/standard/tests/array/array_push_variation2.phpt
@@ -3,7 +3,7 @@ Test array_push() function : usage variations - Pass different data types as $va
 --FILE--
 <?php
 /* Prototype  : int array_push(array $stack, mixed $var [, mixed $...])
- * Description: Pushes elements onto the end of the array 
+ * Description: Pushes elements onto the end of the array
  * Source code: ext/standard/array.c
  */
 
@@ -61,7 +61,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -71,7 +71,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_push_variation3.phpt b/ext/standard/tests/array/array_push_variation3.phpt
index 2bc71a76960..e42bdada592 100644
--- a/ext/standard/tests/array/array_push_variation3.phpt
+++ b/ext/standard/tests/array/array_push_variation3.phpt
@@ -3,7 +3,7 @@ Test array_push() function : usage variations - multidimensional arrays
 --FILE--
 <?php
 /* Prototype  : int array_push(array $stack, mixed $var [, mixed $...])
- * Description: Pushes elements onto the end of the array 
+ * Description: Pushes elements onto the end of the array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_push_variation5.phpt b/ext/standard/tests/array/array_push_variation5.phpt
index 4b6f39975da..99b5f133366 100644
--- a/ext/standard/tests/array/array_push_variation5.phpt
+++ b/ext/standard/tests/array/array_push_variation5.phpt
@@ -3,7 +3,7 @@ Test array_push() function : usage variations - position of internal array point
 --FILE--
 <?php
 /* Prototype  : int array_push(array $stack, mixed $var [, mixed $...])
- * Description: Pushes elements onto the end of the array 
+ * Description: Pushes elements onto the end of the array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_push_variation6.phpt b/ext/standard/tests/array/array_push_variation6.phpt
index 19afebb7477..60d82bff280 100644
--- a/ext/standard/tests/array/array_push_variation6.phpt
+++ b/ext/standard/tests/array/array_push_variation6.phpt
@@ -3,7 +3,7 @@ Test array_push() function : usage variations - array keys are different data ty
 --FILE--
 <?php
 /* Prototype  : int array_push(array $stack, mixed $var [, mixed $...])
- * Description: Pushes elements onto the end of the array 
+ * Description: Pushes elements onto the end of the array
  * Source code: ext/standard/array.c
  */
 
@@ -42,7 +42,7 @@ $inputs = array(
        -10.5 => 'negative',
        .5 => 'half',
        ),
-       
+
        'extreme floats' => array(
        12.3456789000e10 => 'large',
        12.3456789000E-10 => 'small',
@@ -51,7 +51,7 @@ $inputs = array(
        // null data
 /*3*/ 'null uppercase' => array(
        NULL => 'null 1',
-       ), 
+       ),
        'null lowercase' => array(
        null => 'null 2',
        ),
@@ -65,7 +65,7 @@ $inputs = array(
        TRUE => 'uppert',
        FALSE => 'upperf',
        ),
-       
+
        // empty data
 /*5*/ 'empty double quotes' => array(
        "" => 'emptyd',
diff --git a/ext/standard/tests/array/array_rand.phpt b/ext/standard/tests/array/array_rand.phpt
index c158b0f74b2..c36ab3de7ae 100644
--- a/ext/standard/tests/array/array_rand.phpt
+++ b/ext/standard/tests/array/array_rand.phpt
@@ -15,7 +15,7 @@ var_dump(array_rand(array(1,2,3), 2));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: array_rand() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 
diff --git a/ext/standard/tests/array/array_rand_basic1.phpt b/ext/standard/tests/array/array_rand_basic1.phpt
index 30b5b5ce9ad..46d265aa990 100644
--- a/ext/standard/tests/array/array_rand_basic1.phpt
+++ b/ext/standard/tests/array/array_rand_basic1.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_rand() function : basic functionality - array with default keys 
+Test array_rand() function : basic functionality - array with default keys
 --FILE--
 <?php
 /* Prototype  : mixed array_rand(array $input [, int $num_req])
- * Description: Return key/keys for random entry/entries in the array 
+ * Description: Return key/keys for random entry/entries in the array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_rand_basic2.phpt b/ext/standard/tests/array/array_rand_basic2.phpt
index e18fede4bd3..4ff93c8652b 100644
--- a/ext/standard/tests/array/array_rand_basic2.phpt
+++ b/ext/standard/tests/array/array_rand_basic2.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_rand() function : basic functionality - with associative array for 'input' argument 
+Test array_rand() function : basic functionality - with associative array for 'input' argument
 --FILE--
 <?php
 /* Prototype  : mixed array_rand(array $input [, int $num_req])
- * Description: Return key/keys for random entry/entries in the array 
+ * Description: Return key/keys for random entry/entries in the array
  * Source code: ext/standard/array.c
 */
 
@@ -16,7 +16,7 @@ echo "*** Testing array_rand() : with associative array ***\n";
 
 // Initialise the 'input' and 'num_req' variables
 $input = array(
-  'one' => 1, 'two' => 2, 'three' => 3, 
+  'one' => 1, 'two' => 2, 'three' => 3,
   'FoUr' => 'four', '#5' => 5, 'SIX' => 'six',
   "seven" => 7, "#8" => "eight", "nine" => "NINE"
 );
diff --git a/ext/standard/tests/array/array_rand_error.phpt b/ext/standard/tests/array/array_rand_error.phpt
index 30cc85ae6c7..2ffae12178d 100644
--- a/ext/standard/tests/array/array_rand_error.phpt
+++ b/ext/standard/tests/array/array_rand_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_rand() function : error conditions 
+Test array_rand() function : error conditions
 --FILE--
 <?php
 /* Prototype  : mixed array_rand(array input [, int num_req])
- * Description: Return key/keys for random entry/entries in the array 
+ * Description: Return key/keys for random entry/entries in the array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_rand_variation1.phpt b/ext/standard/tests/array/array_rand_variation1.phpt
index 636c489402c..02439739444 100644
--- a/ext/standard/tests/array/array_rand_variation1.phpt
+++ b/ext/standard/tests/array/array_rand_variation1.phpt
@@ -3,7 +3,7 @@ Test array_rand() function : usage variations - unexpected values for 'input' pa
 --FILE--
 <?php
 /* Prototype  : mixed array_rand(array input [, int num_req])
- * Description: Return key/keys for random entry/entries in the array 
+ * Description: Return key/keys for random entry/entries in the array
  * Source code: ext/standard/array.c
 */
 
@@ -28,7 +28,7 @@ $fp = fopen(__FILE__, "r");
 class test
 {
   var $t = 10;
-  function __toString() 
+  function __toString()
   {
     return "object";
   }
@@ -48,8 +48,8 @@ $values = array(
         -10.5,
         12.3456789000e10,
         12.3456789000E-10,
-        .5,   
-      
+        .5,
+
         // null data
 /*10*/  NULL,
         null,
@@ -81,14 +81,14 @@ $values = array(
 /*23*/  @$unset_var,
 );
 
-/* loop through each element of the array to test array_rand() function 
+/* loop through each element of the array to test array_rand() function
  * for different values for 'input' argument
 */
 $count = 1;
 foreach($values as $value) {
   echo "\n-- Iteration $count --\n";
   var_dump( array_rand($value,$num_req) );
-  $count++; 
+  $count++;
 };
 
 // closing the resource
diff --git a/ext/standard/tests/array/array_rand_variation2.phpt b/ext/standard/tests/array/array_rand_variation2.phpt
index 96abce5b51a..250370fef8c 100644
--- a/ext/standard/tests/array/array_rand_variation2.phpt
+++ b/ext/standard/tests/array/array_rand_variation2.phpt
@@ -5,7 +5,7 @@ Test array_rand() function : usage variations - unexpected values for 'num_req'
 --FILE--
 <?php
 /* Prototype  : mixed array_rand(array input [, int num_req])
- * Description: Return key/keys for random entry/entries in the array 
+ * Description: Return key/keys for random entry/entries in the array
  * Source code: ext/standard/array.c
 */
 
@@ -82,7 +82,7 @@ $values = array(
 $count = 1;
 foreach($values as $value) {
   echo "\n-- Iteration $count --\n";
-  var_dump( array_rand($input,$value) );  
+  var_dump( array_rand($input,$value) );
   $count++;
 };
 
diff --git a/ext/standard/tests/array/array_rand_variation3.phpt b/ext/standard/tests/array/array_rand_variation3.phpt
index 81194a135d5..6c656ef55e5 100644
--- a/ext/standard/tests/array/array_rand_variation3.phpt
+++ b/ext/standard/tests/array/array_rand_variation3.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test array_rand() function : usage variation - with MultiDimensional array 
+Test array_rand() function : usage variation - with MultiDimensional array
 --FILE--
 <?php
 /* Prototype  : mixed array_rand(array $input [, int $num_req])
- * Description: Return key/keys for random entry/entries in the array 
+ * Description: Return key/keys for random entry/entries in the array
  * Source code: ext/standard/array.c
 */
 
 /*
-* Test behaviour of array_rand() function when multi-dimensional array 
+* Test behaviour of array_rand() function when multi-dimensional array
 * is passed to 'input' argument
 */
 
@@ -20,12 +20,12 @@ $input = array(
 /*1*/  array(1, 2, 0, -0, -1, -2),
 
        // array with float values
-       array(1.23, -1.23, 0.34, -0.34, 0e2, 2e-3, -2e2, -40e-2),             
-               
-       // array with single quoted strings 
+       array(1.23, -1.23, 0.34, -0.34, 0e2, 2e-3, -2e2, -40e-2),
+
+       // array with single quoted strings
 /*3*/  array('one', '123numbers', 'hello\tworld', 'hello world\0', '12.34floatnum'),
 
-       // array with double quoted strings 
+       // array with double quoted strings
        array("one","123numbers", "hello\tworld", "hello world\0", "12.34floatnum"),
 
        // array with bool values
@@ -33,7 +33,7 @@ $input = array(
 
        // array with hexa values
        array(0x123, -0x123, 0xabc, 0xABC, 0xab),
- 
+
        // array with null values
 /*7*/  array(null, NULL, "\0", Null, NuLl)
 
diff --git a/ext/standard/tests/array/array_rand_variation4.phpt b/ext/standard/tests/array/array_rand_variation4.phpt
index 74dada0aa0a..27f16200037 100644
--- a/ext/standard/tests/array/array_rand_variation4.phpt
+++ b/ext/standard/tests/array/array_rand_variation4.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_rand() function : usage variation - with associative arrays for 'input' parameter 
+Test array_rand() function : usage variation - with associative arrays for 'input' parameter
 --FILE--
 <?php
 /* Prototype  : mixed array_rand(array $input [, int $num_req])
- * Description: Return key/keys for random entry/entries in the array 
+ * Description: Return key/keys for random entry/entries in the array
  * Source code: ext/standard/array.c
 */
 
@@ -16,12 +16,12 @@ echo "*** Testing array_rand() : with associative arrays ***\n";
 
 // initialise associative arrays
 $asso_arrays = array(
-    
+
        // array with numeric keys
 /*1*/  array(1 => 'one', 2 => 2, 1234567890 => 'big', -1 => 'negative key',
              2.3 => 'float key', 0 => "zero key", 0.2 => 'decimal key',
              2e2 => 'exp key1', -2e3 => 'negative exp key'),
-      
+
        // array with string keys
        array('one' => 1, "two" => 2.0, "three" => 'three',
              '12twelve' => 12.00, "" => 'empty string', " " => "space key"),
@@ -29,7 +29,7 @@ $asso_arrays = array(
        // array with hexa values as keys
 /*3*/  array(0xabc => 2748, 0x12f => '303', 0xff => "255", -0xff => "-255"),
 
-       // array with octal values as keys 
+       // array with octal values as keys
        array(0123 => 83, 012 => 10, 010 => "8", -034 => "-28", 0012 => '10'),
 
        // array with bool values as keys
@@ -42,7 +42,7 @@ $asso_arrays = array(
              "\t" => "tab as key", "'" => 'single quote as key',
              '"' => 'double quote as key', "\0" => "null char as key")
 );
-       
+
 /* looping to test array_rand() function with different arrays having
  * different types of keys
 */
@@ -59,10 +59,10 @@ foreach($asso_arrays as $input) {
   var_dump( array_rand($input, 1) );  // with $num_req=1
   echo"\nWith num_req = 2\n";
   var_dump( array_rand($input, 2) );  // with $num_req=2
- 
+
   $counter++;
 }  // end of for loop
- 
+
 
 echo "Done";
 ?>
diff --git a/ext/standard/tests/array/array_rand_variation5.phpt b/ext/standard/tests/array/array_rand_variation5.phpt
index 44f5cd85734..7c4043e4640 100644
--- a/ext/standard/tests/array/array_rand_variation5.phpt
+++ b/ext/standard/tests/array/array_rand_variation5.phpt
@@ -3,13 +3,13 @@ Test array_rand() function : usage variation - invalid values for 'req_num' para
 --FILE--
 <?php
 /* Prototype  : mixed array_rand(array $input [, int $num_req])
- * Description: Return key/keys for random entry/entries in the array 
+ * Description: Return key/keys for random entry/entries in the array
  * Source code: ext/standard/array.c
 */
 
 /*
-* Test behaviour of array_rand() function when associative array and 
-* various invalid values are passed to the 'input' and 'req_num' 
+* Test behaviour of array_rand() function when associative array and
+* various invalid values are passed to the 'input' and 'req_num'
 * parameters respectively
 */
 
@@ -22,9 +22,9 @@ $input = array(
   0xabc => 2748, 0x12f => '303', 0xff => "255",
   0123 => 83, 012 => 10, 010 => "8"
 );
-       
+
 // Testing array_rand() function with various invalid 'req_num' values
-// with valid num_req values  
+// with valid num_req values
 echo"\n-- With default num_req value --\n";
 var_dump( array_rand($input) );  // with default $num_req value
 echo"\n-- With num_req = 1 --\n";
@@ -39,7 +39,7 @@ echo"\n-- With num_req = -2 --\n";
 var_dump( array_rand($input, -2) );  // with $num_req=-2
 echo"\n-- With num_req more than number of members in 'input' array --\n";
 var_dump( array_rand($input, 13) );  // with $num_req=13
- 
+
 
 echo "Done";
 ?>
diff --git a/ext/standard/tests/array/array_rand_variation6.phpt b/ext/standard/tests/array/array_rand_variation6.phpt
index 3f1fea28cd5..d60630eb324 100644
--- a/ext/standard/tests/array/array_rand_variation6.phpt
+++ b/ext/standard/tests/array/array_rand_variation6.phpt
@@ -3,7 +3,7 @@ Test array_rand() function : usage variation - with heredoc string as key in the
 --FILE--
 <?php
 /* Prototype  : mixed array_rand(array $input [, int $num_req])
- * Description: Return key/keys for random entry/entries in the array 
+ * Description: Return key/keys for random entry/entries in the array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_reduce.phpt b/ext/standard/tests/array/array_reduce.phpt
index 94ecca61303..1ec9885da89 100644
--- a/ext/standard/tests/array/array_reduce.phpt
+++ b/ext/standard/tests/array/array_reduce.phpt
@@ -36,7 +36,7 @@ $initial = null;
 var_dump(array_reduce($array, 'reduce_null', $initial), $initial);
 
 echo "\nDone";
-?> 
+?>
 --EXPECTF--
 *** Testing array_reduce() to integer ***
 int(61)
diff --git a/ext/standard/tests/array/array_reduce_error.phpt b/ext/standard/tests/array/array_reduce_error.phpt
index 954aa43d769..88070dee554 100644
--- a/ext/standard/tests/array/array_reduce_error.phpt
+++ b/ext/standard/tests/array/array_reduce_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_reduce() function : error conditions 
+Test array_reduce() function : error conditions
 --FILE--
 <?php
 /* Prototype  : mixed array_reduce(array input, mixed callback [, int initial])
- * Description: Iteratively reduce the array to a single value via the callback. 
+ * Description: Iteratively reduce the array to a single value via the callback.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_reduce() : error conditions ***\n";
diff --git a/ext/standard/tests/array/array_reduce_variation1.phpt b/ext/standard/tests/array/array_reduce_variation1.phpt
index adffeb53d4c..96268f66056 100644
--- a/ext/standard/tests/array/array_reduce_variation1.phpt
+++ b/ext/standard/tests/array/array_reduce_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_reduce() function : variation 
+Test array_reduce() function : variation
 --FILE--
 <?php
 /* Prototype  : mixed array_reduce(array input, mixed callback [, int initial])
- * Description: Iteratively reduce the array to a single value via the callback. 
+ * Description: Iteratively reduce the array to a single value via the callback.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_reduce() : variation ***\n";
diff --git a/ext/standard/tests/array/array_reduce_variation2.phpt b/ext/standard/tests/array/array_reduce_variation2.phpt
index 35b2d38f408..853ceb946bc 100644
--- a/ext/standard/tests/array/array_reduce_variation2.phpt
+++ b/ext/standard/tests/array/array_reduce_variation2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_reduce() function : variation - invalid parameters 
+Test array_reduce() function : variation - invalid parameters
 --FILE--
 <?php
 /* Prototype  : mixed array_reduce(array input, mixed callback [, int initial])
- * Description: Iteratively reduce the array to a single value via the callback. 
+ * Description: Iteratively reduce the array to a single value via the callback.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_reduce() : variation - invalid parameters ***\n";
diff --git a/ext/standard/tests/array/array_reduce_variation3.phpt b/ext/standard/tests/array/array_reduce_variation3.phpt
index f6301026b32..87b0c3ae9bb 100644
--- a/ext/standard/tests/array/array_reduce_variation3.phpt
+++ b/ext/standard/tests/array/array_reduce_variation3.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_reduce() function : variation - object callbacks 
+Test array_reduce() function : variation - object callbacks
 --FILE--
 <?php
 /* Prototype  : mixed array_reduce(array input, mixed callback [, int initial])
- * Description: Iteratively reduce the array to a single value via the callback. 
+ * Description: Iteratively reduce the array to a single value via the callback.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_reduce() : variation - object callbacks ***\n";
diff --git a/ext/standard/tests/array/array_reverse_basic1.phpt b/ext/standard/tests/array/array_reverse_basic1.phpt
index f41e0a3f49d..84f841318c6 100644
--- a/ext/standard/tests/array/array_reverse_basic1.phpt
+++ b/ext/standard/tests/array/array_reverse_basic1.phpt
@@ -3,12 +3,12 @@ Test array_reverse() function : basic functionality - simple array for 'array' a
 --FILE--
 <?php
 /* Prototype  : array array_reverse(array $array [, bool $preserve_keys])
- * Description: Return input as a new array with the order of the entries reversed 
+ * Description: Return input as a new array with the order of the entries reversed
  * Source code: ext/standard/array.c
 */
 
 /*
- * Testing array_reverse() by giving a simple array for $array argument 
+ * Testing array_reverse() by giving a simple array for $array argument
 */
 
 echo "*** Testing array_reverse() : basic functionality ***\n";
diff --git a/ext/standard/tests/array/array_reverse_basic2.phpt b/ext/standard/tests/array/array_reverse_basic2.phpt
index 9f41f0b486d..a9b52cd320f 100644
--- a/ext/standard/tests/array/array_reverse_basic2.phpt
+++ b/ext/standard/tests/array/array_reverse_basic2.phpt
@@ -3,7 +3,7 @@ Test array_reverse() function : basic functionality - associative array for 'arr
 --FILE--
 <?php
 /* Prototype  : array array_reverse(array $array [, bool $preserve_keys])
- * Description: Return input as a new array with the order of the entries reversed 
+ * Description: Return input as a new array with the order of the entries reversed
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_reverse_error.phpt b/ext/standard/tests/array/array_reverse_error.phpt
index faf7e8243f3..bfa9c5130be 100644
--- a/ext/standard/tests/array/array_reverse_error.phpt
+++ b/ext/standard/tests/array/array_reverse_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_reverse() function : error conditions 
+Test array_reverse() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_reverse(array $array [, bool $preserve_keys])
- * Description: Return input as a new array with the order of the entries reversed 
+ * Description: Return input as a new array with the order of the entries reversed
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_reverse_variation1.phpt b/ext/standard/tests/array/array_reverse_variation1.phpt
index c528387603c..82c797e5fe9 100644
--- a/ext/standard/tests/array/array_reverse_variation1.phpt
+++ b/ext/standard/tests/array/array_reverse_variation1.phpt
@@ -58,12 +58,12 @@ $arrays = array (
        // empty data
 /*16*/ "",
        '',
-      
+
        // string data
        'Hello world',
        "Hello world",
        $heredoc_string,
-  
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_reverse_variation4.phpt b/ext/standard/tests/array/array_reverse_variation4.phpt
index e3f0254f52d..88f36ea0257 100644
--- a/ext/standard/tests/array/array_reverse_variation4.phpt
+++ b/ext/standard/tests/array/array_reverse_variation4.phpt
@@ -43,18 +43,18 @@ $arrays = array (
        array(0 => "0"),
        array(1 => "1"),
        array(1 => "1", 2 => "2", 3 => "3", 4 => "4"),
- 
+
        // arrays with float keys
 /*5*/  array(2.3333 => "float"),
        array(1.2 => "f1", 3.33 => "f2", 4.89999922839999 => "f3", 33333333.333333 => "f4"),
-  
+
        // arrays with string keys
        array("\tHello" => 111, "re\td" => "color", "\v\fworld" => 2.2, "pen\n" => 33),
 /*8*/  array("\tHello" => 111, "re\td" => "color", "\v\fworld" => 2.2, "pen\n" => 33),
        array("hello", $heredoc => "string"), // heredoc
 
        // array with object, unset variable and resource variable
-       array(new classA() => 11, @$unset_var => "hello", $fp => 'resource'), 
+       array(new classA() => 11, @$unset_var => "hello", $fp => 'resource'),
 
        // array with mixed values
 /*11*/ array('hello' => 1, new classA() => 2, "fruit" => 2.2, $fp => 'resource', 133 => "int", 444.432 => "float", @$unset_var => "unset", $heredoc => "heredoc")
diff --git a/ext/standard/tests/array/array_reverse_variation5.phpt b/ext/standard/tests/array/array_reverse_variation5.phpt
index 6c4c9522407..dbd316ab8a2 100644
--- a/ext/standard/tests/array/array_reverse_variation5.phpt
+++ b/ext/standard/tests/array/array_reverse_variation5.phpt
@@ -46,18 +46,18 @@ $arrays = array (
        array('0' => 0),
        array("1" => 1),
        array("one" => 1, 'two' => 2, "three" => 3, 4 => 4),
- 
+
        // arrays with float values
 /*5*/  array("float" => 2.3333),
        array("f1" => 1.2, 'f2' => 3.33, 3 => 4.89999922839999, 'f4' => 33333333.333333),
-  
+
        // arrays with string values
        array(111 => "\tHello", "red" => "col\tor", 2 => "\v\fworld", 3.3 =>  "pen\n"),
-/*8*/  array(111 => '\tHello', "red" => 'col\tor', 2 => '\v\fworld', 3.3 =>  'pen\n'), 
+/*8*/  array(111 => '\tHello', "red" => 'col\tor', 2 => '\v\fworld', 3.3 =>  'pen\n'),
        array(1 => "hello", "heredoc" => $heredoc),
 
        // array with object, unset variable and resource variable
-       array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp), 
+       array(11 => new classA(), "unset" => @$unset_var, "resource" => $fp),
 
        // array with mixed values
 /*11*/ array(1 => 'hello', 2 => new classA(), 222 => "fruit", 'resource' => $fp, "int" => 133, "float" => 444.432, "unset" => @$unset_var, "heredoc" => $heredoc)
diff --git a/ext/standard/tests/array/array_reverse_variation6.phpt b/ext/standard/tests/array/array_reverse_variation6.phpt
index ae1e195ca63..7c222b92863 100644
--- a/ext/standard/tests/array/array_reverse_variation6.phpt
+++ b/ext/standard/tests/array/array_reverse_variation6.phpt
@@ -15,7 +15,7 @@ echo "*** Testing array_reverse() : usage variations ***\n";
 
 // Initializing the 2-d arrays
 $two_dimensional_array = array(
-     
+
   // associative array
   array('color' => 'red', 'item' => 'pen', 'place' => 'LA'),
 
@@ -24,7 +24,7 @@ $two_dimensional_array = array(
 
    // combination of numeric and associative arrays
    array('a' => 'green', 'red', 'brown', 33, 88, 'orange', 'item' => 'ball')
-); 
+);
 
 // calling array_reverse() with various types of 2-d arrays
 // with default arguments
diff --git a/ext/standard/tests/array/array_search1.phpt b/ext/standard/tests/array/array_search1.phpt
index 26377d218f8..f3fcf872f4b 100644
--- a/ext/standard/tests/array/array_search1.phpt
+++ b/ext/standard/tests/array/array_search1.phpt
@@ -18,7 +18,7 @@ var_dump(array_search(-1,$a, true));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: array_search() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 
diff --git a/ext/standard/tests/array/array_search_variation1.phpt b/ext/standard/tests/array/array_search_variation1.phpt
index 96395013bbe..43f38880210 100644
--- a/ext/standard/tests/array/array_search_variation1.phpt
+++ b/ext/standard/tests/array/array_search_variation1.phpt
@@ -19,7 +19,7 @@ $arrays = array (
   array(TRUE, FALSE),
   array("", array()),
   array("abcd\x00abcd\x00abcd"),
-  array("abcd\tabcd\nabcd\rabcd\0abcdefghij") 
+  array("abcd\tabcd\nabcd\rabcd\0abcdefghij")
 );
 
 $array_compare = array (
@@ -49,15 +49,15 @@ foreach($arrays as $array) {
   foreach($array_compare as $compare) {
     echo "-- Iteration $counter --\n";
     //strict option OFF
-    var_dump(array_search($compare,$array));  
+    var_dump(array_search($compare,$array));
     //strict option ON
-    var_dump(array_search($compare,$array,TRUE));  
+    var_dump(array_search($compare,$array,TRUE));
     //strict option OFF
-    var_dump(array_search($compare,$array,FALSE));  
+    var_dump(array_search($compare,$array,FALSE));
     $counter++;
  }
 }
-		
+
 echo "Done\n";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_search_variation2.phpt b/ext/standard/tests/array/array_search_variation2.phpt
index da90de0cb7e..2609ed82f70 100644
--- a/ext/standard/tests/array/array_search_variation2.phpt
+++ b/ext/standard/tests/array/array_search_variation2.phpt
@@ -16,10 +16,10 @@ $misc_array = array (
   'a',
   'key' =>'d',
   3,
-  ".001" =>-67, 
+  ".001" =>-67,
   "-.051" =>"k",
   0.091 =>"-.08",
-  "e" =>"5", 
+  "e" =>"5",
   "y" =>NULL,
   NULL =>"",
   0,
@@ -39,11 +39,11 @@ $counter = 1;
 foreach($array_type as $type) {
   echo "-- Iteration $counter --\n";
   //loose type checking
-  var_dump( array_search($type,$misc_array ) );  
+  var_dump( array_search($type,$misc_array ) );
   //strict type checking
-  var_dump( array_search($type,$misc_array,true) );  
+  var_dump( array_search($type,$misc_array,true) );
   //loose type checking
-  var_dump( array_search($type,$misc_array,false) );  
+  var_dump( array_search($type,$misc_array,false) );
   $counter++;
 }
 
diff --git a/ext/standard/tests/array/array_search_variation3.phpt b/ext/standard/tests/array/array_search_variation3.phpt
index 8af089a72c4..41b0b5bb206 100644
--- a/ext/standard/tests/array/array_search_variation3.phpt
+++ b/ext/standard/tests/array/array_search_variation3.phpt
@@ -11,7 +11,7 @@ Test array_search() function : usage variations - haystack as sub-array/object
 /* checking for sub-arrays with array_search() */
 echo "*** Testing sub-arrays with array_search() ***\n";
 $sub_array = array (
-  "one", 
+  "one",
   array(1, 2 => "two", "three" => 3),
   4 => "four",
   "five" => 5,
@@ -19,7 +19,7 @@ $sub_array = array (
 );
 var_dump( array_search("four", $sub_array) );
 //checking for element in a sub-array
-var_dump( array_search(3, $sub_array[1]) ); 
+var_dump( array_search(3, $sub_array[1]) );
 var_dump( array_search(array('','i'), $sub_array) );
 
 /* checking for objects in array_search() */
@@ -33,11 +33,11 @@ class array_search_check {
 
 $array_search_obj = new array_search_check();  //creating new object
 //error: as wrong datatype for second argument
-var_dump( array_search("array_var", $array_search_obj) ); 
+var_dump( array_search("array_var", $array_search_obj) );
 //error: as wrong datatype for second argument
-var_dump( array_search("foo", $array_search_obj) ); 
+var_dump( array_search("foo", $array_search_obj) );
 //element found as "one" exists in array $array_var
-var_dump( array_search("one", $array_search_obj->array_var) ); 
+var_dump( array_search("one", $array_search_obj->array_var) );
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/array_search_variation4.phpt b/ext/standard/tests/array/array_search_variation4.phpt
index 7feb2ef1476..425872afccb 100644
--- a/ext/standard/tests/array/array_search_variation4.phpt
+++ b/ext/standard/tests/array/array_search_variation4.phpt
@@ -20,38 +20,38 @@ $dir_handle = opendir( dirname(__FILE__) );
 $resources = array($file_handle, $dir_handle);
 
 // search for resouce type in the resource array
-var_dump( array_search($file_handle, $resources, true) ); 
+var_dump( array_search($file_handle, $resources, true) );
 //checking for (int) type resource
-var_dump( array_search((int)$dir_handle, $resources, true) ); 
+var_dump( array_search((int)$dir_handle, $resources, true) );
 
 /* Miscellenous input check  */
 echo "\n*** Testing miscelleneos inputs with array_search() ***\n";
 //matching "Good" in array(0,"hello"), result:true in loose type check
-var_dump( array_search("Good", array(0,"hello")) ); 
-//false in strict mode 
-var_dump( array_search("Good", array(0,"hello"), TRUE) ); 
+var_dump( array_search("Good", array(0,"hello")) );
+//false in strict mode
+var_dump( array_search("Good", array(0,"hello"), TRUE) );
 
 //matching integer 0 in array("this"), result:true in loose type check
-var_dump( array_search(0, array("this")) );  
+var_dump( array_search(0, array("this")) );
 // false in strict mode
-var_dump( array_search(0, array("this")),TRUE ); 
+var_dump( array_search(0, array("this")),TRUE );
 
 //matching string "this" in array(0), result:true in loose type check
-var_dump( array_search("this", array(0)) );  
+var_dump( array_search("this", array(0)) );
 // false in stric mode
-var_dump( array_search("this", array(0), TRUE) ); 
+var_dump( array_search("this", array(0), TRUE) );
 
 //checking for type FALSE in multidimensional array with loose checking, result:false in loose type check
-var_dump( array_search(FALSE, 
-                   array("a"=> TRUE, "b"=> TRUE, 
-                         array("c"=> TRUE, "d"=>TRUE) 
-                        ) 
-                  ) 
-        ); 
+var_dump( array_search(FALSE,
+                   array("a"=> TRUE, "b"=> TRUE,
+                         array("c"=> TRUE, "d"=>TRUE)
+                        )
+                  )
+        );
 
 //matching string having integer in beginning, result:true in loose type check
-var_dump( array_search('123abc', array(123)) );  
-var_dump( array_search('123abc', array(123), TRUE) ); // false in strict mode 
+var_dump( array_search('123abc', array(123)) );
+var_dump( array_search('123abc', array(123), TRUE) ); // false in strict mode
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/array_shift_basic.phpt b/ext/standard/tests/array/array_shift_basic.phpt
index 2bb4ae93ae2..8e9cb97c28c 100644
--- a/ext/standard/tests/array/array_shift_basic.phpt
+++ b/ext/standard/tests/array/array_shift_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_shift() function : basic functionality 
+Test array_shift() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : mixed array_shift(array &$stack)
- * Description: Pops an element off the beginning of the array 
+ * Description: Pops an element off the beginning of the array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_shift_error.phpt b/ext/standard/tests/array/array_shift_error.phpt
index fcfb931f10c..c44124df056 100644
--- a/ext/standard/tests/array/array_shift_error.phpt
+++ b/ext/standard/tests/array/array_shift_error.phpt
@@ -3,8 +3,8 @@ Test array_shift() function : error conditions - Pass incorrect number of args
 --FILE--
 <?php
 /* Prototype  : mixed array_shift(array &$stack)
- * Description: Pops an element off the beginning of the array 
- * Source code: ext/standard/array.c 
+ * Description: Pops an element off the beginning of the array
+ * Source code: ext/standard/array.c
  */
 
 /*
diff --git a/ext/standard/tests/array/array_shift_variation1.phpt b/ext/standard/tests/array/array_shift_variation1.phpt
index 4c60a45fdf4..681c1169eaf 100644
--- a/ext/standard/tests/array/array_shift_variation1.phpt
+++ b/ext/standard/tests/array/array_shift_variation1.phpt
@@ -3,7 +3,7 @@ Test array_shift() function : usage variations - Pass different data types as $s
 --FILE--
 <?php
 /* Prototype  : mixed array_shift(array &$stack)
- * Description: Pops an element off the beginning of the array 
+ * Description: Pops an element off the beginning of the array
  * Source code: ext/standard/array.c
  */
 
@@ -58,7 +58,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -67,7 +67,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_shift_variation2.phpt b/ext/standard/tests/array/array_shift_variation2.phpt
index 2b3adc605ff..7f5d618e749 100644
--- a/ext/standard/tests/array/array_shift_variation2.phpt
+++ b/ext/standard/tests/array/array_shift_variation2.phpt
@@ -3,7 +3,7 @@ Test array_shift() function : usage variations - Pass arrays of different data t
 --FILE--
 <?php
 /* Prototype  : mixed array_shift(array &$stack)
- * Description: Pops an element off the beginning of the array 
+ * Description: Pops an element off the beginning of the array
  * Source code: ext/standard/array.c
  */
 
@@ -67,13 +67,13 @@ $inputs = array(
        TRUE,
        FALSE,
        ),
-       
+
        // empty data
 /*5*/ 'empty string' => array(
        "",
        '',
        ),
-       
+
 /*6*/ 'empty array' => array(
        ),
 
@@ -83,7 +83,7 @@ $inputs = array(
        'string',
        $heredoc,
        ),
-       
+
        // object data
 /*8*/ 'object' => array(
        new classA(),
diff --git a/ext/standard/tests/array/array_shift_variation3.phpt b/ext/standard/tests/array/array_shift_variation3.phpt
index cc260c63051..a1a26970724 100644
--- a/ext/standard/tests/array/array_shift_variation3.phpt
+++ b/ext/standard/tests/array/array_shift_variation3.phpt
@@ -3,7 +3,7 @@ Test array_shift() function : usage variations - Pass array with different data
 --FILE--
 <?php
 /* Prototype  : mixed array_shift(array &$stack)
- * Description: Pops an element off the beginning of the array 
+ * Description: Pops an element off the beginning of the array
  * Source code: ext/standard/array.c
  */
 
@@ -39,7 +39,7 @@ $inputs = array(
        -10.5 => 'negative',
        .5 => 'half',
        ),
-       
+
 /*3*/  'extreme floats' => array(
        12.3456789000e10 => 'large',
        12.3456789000E-10 => 'small',
@@ -48,8 +48,8 @@ $inputs = array(
        // null data
 /*4*/  'null uppercase' => array(
        NULL => 'null 1',
-       ), 
-       
+       ),
+
 /*5*/  'null lowercase' => array(
        null => 'null 2',
        ),
@@ -59,17 +59,17 @@ $inputs = array(
        true => 'lowert',
        false => 'lowerf',
        ),
-       
+
 /*7*/  'bool uppercase' => array(
        TRUE => 'uppert',
        FALSE => 'upperf',
        ),
-       
+
        // empty data
 /*8*/  'empty double quotes' => array(
        "" => 'emptyd',
        ),
-       
+
 /*9*/  'empty single quotes' => array(
        '' => 'emptys',
        ),
diff --git a/ext/standard/tests/array/array_shift_variation4.phpt b/ext/standard/tests/array/array_shift_variation4.phpt
index f27681561a9..5cc0e48c945 100644
--- a/ext/standard/tests/array/array_shift_variation4.phpt
+++ b/ext/standard/tests/array/array_shift_variation4.phpt
@@ -3,7 +3,7 @@ Test array_shift() function : usage variations - multi-dimensional arrays
 --FILE--
 <?php
 /* Prototype  : mixed array_shift(array &$stack)
- * Description: Pops an element off the beginning of the array 
+ * Description: Pops an element off the beginning of the array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_shift_variation5.phpt b/ext/standard/tests/array/array_shift_variation5.phpt
index 58eab552470..faae551cc22 100644
--- a/ext/standard/tests/array/array_shift_variation5.phpt
+++ b/ext/standard/tests/array/array_shift_variation5.phpt
@@ -3,14 +3,14 @@ Test array_shift() function : usage variations - call recursively
 --FILE--
 <?php
 /* Prototype  : mixed array_shift(array &$stack)
- * Description: Pops an element off the beginning of the array 
+ * Description: Pops an element off the beginning of the array
  * Source code: ext/standard/array.c
  */
 
 /*
- * Use the result of one call to array_shift 
+ * Use the result of one call to array_shift
  * as the $stack argument of another call to array_shift()
- * When done in one statement causes strict error messages. 
+ * When done in one statement causes strict error messages.
  */
 
 echo "*** Testing array_shift() : usage variations ***\n";
diff --git a/ext/standard/tests/array/array_shift_variation6.phpt b/ext/standard/tests/array/array_shift_variation6.phpt
index 9033e7d17c1..73b5de148e4 100644
--- a/ext/standard/tests/array/array_shift_variation6.phpt
+++ b/ext/standard/tests/array/array_shift_variation6.phpt
@@ -3,7 +3,7 @@ Test array_shift() function : usage variations - Referenced arrays
 --FILE--
 <?php
 /* Prototype  : mixed array_shift(array &$stack)
- * Description: Pops an element off the beginning of the array 
+ * Description: Pops an element off the beginning of the array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_shift_variation7.phpt b/ext/standard/tests/array/array_shift_variation7.phpt
index 9367cacbc9b..2d6d5070f6e 100644
--- a/ext/standard/tests/array/array_shift_variation7.phpt
+++ b/ext/standard/tests/array/array_shift_variation7.phpt
@@ -3,7 +3,7 @@ Test array_shift() function : usage variations - position of internal pointer
 --FILE--
 <?php
 /* Prototype  : mixed array_shift(array &$stack)
- * Description: Pops an element off the beginning of the array 
+ * Description: Pops an element off the beginning of the array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_shift_variation8.phpt b/ext/standard/tests/array/array_shift_variation8.phpt
index 2f2fba5bd72..a48d9078965 100644
--- a/ext/standard/tests/array/array_shift_variation8.phpt
+++ b/ext/standard/tests/array/array_shift_variation8.phpt
@@ -3,15 +3,15 @@ Test array_shift() function : usage variations - maintaining referenced elements
 --FILE--
 <?php
 /* Prototype  : mixed array_shift(array &$stack)
- * Description: Pops an element off the beginning of the array 
+ * Description: Pops an element off the beginning of the array
  * Source code: ext/standard/array.c
  */
 
 /*
  * From a comment left by Traps on 09-Jul-2007 on the array_shift documentation page:
- * For those that may be trying to use array_shift() with an array containing references 
- * (e.g. working with linked node trees), beware that array_shift() may not work as you expect: 
- * it will return a *copy* of the first element of the array, 
+ * For those that may be trying to use array_shift() with an array containing references
+ * (e.g. working with linked node trees), beware that array_shift() may not work as you expect:
+ * it will return a *copy* of the first element of the array,
  * and not the element itself, so your reference will be lost.
  * The solution is to reference the first element before removing it with array_shift():
  */
diff --git a/ext/standard/tests/array/array_shuffle_basic.phpt b/ext/standard/tests/array/array_shuffle_basic.phpt
index fdf932605be..0bfa2e030e2 100644
--- a/ext/standard/tests/array/array_shuffle_basic.phpt
+++ b/ext/standard/tests/array/array_shuffle_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-array_shuffle(): Test return type and value for expected input 
+array_shuffle(): Test return type and value for expected input
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/array/array_slice_basic.phpt b/ext/standard/tests/array/array_slice_basic.phpt
index a4cbe46751d..8094b412da7 100644
--- a/ext/standard/tests/array/array_slice_basic.phpt
+++ b/ext/standard/tests/array/array_slice_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_slice() function : basic functionality 
+Test array_slice() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]])
- * Description: Returns elements specified by offset and length 
+ * Description: Returns elements specified by offset and length
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_slice_error.phpt b/ext/standard/tests/array/array_slice_error.phpt
index 0e8f1c75718..94acd08a96d 100644
--- a/ext/standard/tests/array/array_slice_error.phpt
+++ b/ext/standard/tests/array/array_slice_error.phpt
@@ -3,7 +3,7 @@ Test array_slice() function : error conditions - Pass incorrect number of args
 --FILE--
 <?php
 /* Prototype  : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]])
- * Description: Returns elements specified by offset and length 
+ * Description: Returns elements specified by offset and length
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_slice_variation10.phpt b/ext/standard/tests/array/array_slice_variation10.phpt
index 85c521d6d3c..4da35640768 100644
--- a/ext/standard/tests/array/array_slice_variation10.phpt
+++ b/ext/standard/tests/array/array_slice_variation10.phpt
@@ -3,7 +3,7 @@ Test array_slice() function : usage variations - position of internal array poin
 --FILE--
 <?php
 /* Prototype  : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]])
- * Description: Returns elements specified by offset and length 
+ * Description: Returns elements specified by offset and length
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_slice_variation11.phpt b/ext/standard/tests/array/array_slice_variation11.phpt
index de6ebe1d451..20e0d34e12b 100644
--- a/ext/standard/tests/array/array_slice_variation11.phpt
+++ b/ext/standard/tests/array/array_slice_variation11.phpt
@@ -3,7 +3,7 @@ Test array_slice() function : usage variations - Pass different data types as $i
 --FILE--
 <?php
 /* Prototype  : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]])
- * Description: Returns elements specified by offset and length 
+ * Description: Returns elements specified by offset and length
  * Source code: ext/standard/array.c
  */
 
@@ -61,7 +61,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -71,7 +71,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_slice_variation2.phpt b/ext/standard/tests/array/array_slice_variation2.phpt
index 792a1d732cb..c212039c79d 100644
--- a/ext/standard/tests/array/array_slice_variation2.phpt
+++ b/ext/standard/tests/array/array_slice_variation2.phpt
@@ -5,7 +5,7 @@ Test array_slice() function : usage variations - Pass different data types as $o
 --FILE--
 <?php
 /* Prototype  : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]])
- * Description: Returns elements specified by offset and length 
+ * Description: Returns elements specified by offset and length
  * Source code: ext/standard/array.c
  */
 
@@ -63,7 +63,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
diff --git a/ext/standard/tests/array/array_slice_variation3.phpt b/ext/standard/tests/array/array_slice_variation3.phpt
index bdcb7591a29..b4a42eac98b 100644
--- a/ext/standard/tests/array/array_slice_variation3.phpt
+++ b/ext/standard/tests/array/array_slice_variation3.phpt
@@ -5,7 +5,7 @@ Test array_slice() function : usage variations - Pass different data types as $l
 --FILE--
 <?php
 /* Prototype  : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]])
- * Description: Returns elements specified by offset and length 
+ * Description: Returns elements specified by offset and length
  * Source code: ext/standard/array.c
  */
 
@@ -53,7 +53,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
diff --git a/ext/standard/tests/array/array_slice_variation4.phpt b/ext/standard/tests/array/array_slice_variation4.phpt
index f093d2db898..e77fc4c5e00 100644
--- a/ext/standard/tests/array/array_slice_variation4.phpt
+++ b/ext/standard/tests/array/array_slice_variation4.phpt
@@ -3,7 +3,7 @@ Test array_slice() function : usage variations - Pass different data types as $p
 --FILE--
 <?php
 /* Prototype  : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]])
- * Description: Returns elements specified by offset and length 
+ * Description: Returns elements specified by offset and length
  * Source code: ext/standard/array.c
  */
 
@@ -60,7 +60,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -70,7 +70,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_slice_variation5.phpt b/ext/standard/tests/array/array_slice_variation5.phpt
index ed5c82f18fc..698bd2b2576 100644
--- a/ext/standard/tests/array/array_slice_variation5.phpt
+++ b/ext/standard/tests/array/array_slice_variation5.phpt
@@ -3,7 +3,7 @@ Test array_slice() function : usage variations - Pass different integers as $off
 --FILE--
 <?php
 /* Prototype  : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]])
- * Description: Returns elements specified by offset and length 
+ * Description: Returns elements specified by offset and length
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_slice_variation6.phpt b/ext/standard/tests/array/array_slice_variation6.phpt
index e32abfcbce2..84ef9b27c88 100644
--- a/ext/standard/tests/array/array_slice_variation6.phpt
+++ b/ext/standard/tests/array/array_slice_variation6.phpt
@@ -3,7 +3,7 @@ Test array_slice() function : usage variations - pass different int values as $l
 --FILE--
 <?php
 /* Prototype  : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]])
- * Description: Returns elements specified by offset and length 
+ * Description: Returns elements specified by offset and length
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_slice_variation7.phpt b/ext/standard/tests/array/array_slice_variation7.phpt
index abf517d1f22..32f02fa055c 100644
--- a/ext/standard/tests/array/array_slice_variation7.phpt
+++ b/ext/standard/tests/array/array_slice_variation7.phpt
@@ -3,7 +3,7 @@ Test array_slice() function : usage variations - different data types as keys in
 --FILE--
 <?php
 /* Prototype  : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]])
- * Description: Returns elements specified by offset and length 
+ * Description: Returns elements specified by offset and length
  * Source code: ext/standard/array.c
  */
 
@@ -44,7 +44,7 @@ $inputs = array(
        -10.5 => 'negative',
        .5 => 'half',
        ),
-       
+
 /*3*/  'extreme floats' => array(
        12.3456789000e6 => 'large',
        12.3456789000E-10 => 'small',
@@ -53,8 +53,8 @@ $inputs = array(
        // null data
 /*4*/ 'null uppercase' => array(
        NULL => 'null 1',
-       ), 
-       
+       ),
+
 /*5*/  'null lowercase' => array(
        null => 'null 2',
        ),
@@ -64,17 +64,17 @@ $inputs = array(
        true => 'lowert',
        false => 'lowerf',
        ),
-       
+
 /*7*/  'bool uppercase' => array(
        TRUE => 'uppert',
        FALSE => 'upperf',
        ),
-       
+
        // empty data
 /*8*/ 'empty double quotes' => array(
        "" => 'emptyd',
        ),
-       
+
 /*9*/  'empty single quotes' => array(
        '' => 'emptys',
        ),
diff --git a/ext/standard/tests/array/array_slice_variation8.phpt b/ext/standard/tests/array/array_slice_variation8.phpt
index aece410c02b..90d4645f491 100644
--- a/ext/standard/tests/array/array_slice_variation8.phpt
+++ b/ext/standard/tests/array/array_slice_variation8.phpt
@@ -3,12 +3,12 @@ Test array_slice() function : usage variations - multidimensional arrays
 --FILE--
 <?php
 /* Prototype  : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]])
- * Description: Returns elements specified by offset and length 
+ * Description: Returns elements specified by offset and length
  * Source code: ext/standard/array.c
  */
 
 /*
- * Test array_slice when passed 
+ * Test array_slice when passed
  * 1. a two-dimensional array as $input argument
  * 2. a sub-array as $input argument
  */
diff --git a/ext/standard/tests/array/array_slice_variation9.phpt b/ext/standard/tests/array/array_slice_variation9.phpt
index 7ae9238d47c..5fe0a7cb8eb 100644
--- a/ext/standard/tests/array/array_slice_variation9.phpt
+++ b/ext/standard/tests/array/array_slice_variation9.phpt
@@ -3,7 +3,7 @@ Test array_slice() function : usage variations - referenced variables
 --FILE--
 <?php
 /* Prototype  : array array_slice(array $input, int $offset [, int $length [, bool $preserve_keys]])
- * Description: Returns elements specified by offset and length 
+ * Description: Returns elements specified by offset and length
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_splice_basic.phpt b/ext/standard/tests/array/array_splice_basic.phpt
index e96303d13a8..9a96ccb362a 100644
--- a/ext/standard/tests/array/array_splice_basic.phpt
+++ b/ext/standard/tests/array/array_splice_basic.phpt
@@ -2,10 +2,10 @@
 Test array_splice(): basic functionality
 --FILE--
 <?php
-/* 
+/*
  * proto array array_splice(array input, int offset [, int length [, array replacement]])
  * Function is implemented in ext/standard/array.c
-*/ 
+*/
 
 echo "*** Testing array_splice() basic operations ***\n";
 echo "test truncation \n";
diff --git a/ext/standard/tests/array/array_splice_errors.phpt b/ext/standard/tests/array/array_splice_errors.phpt
index 0d4e8da421a..da385d23610 100644
--- a/ext/standard/tests/array/array_splice_errors.phpt
+++ b/ext/standard/tests/array/array_splice_errors.phpt
@@ -2,10 +2,10 @@
 Test array_splice() function : error conditions
 --FILE--
 <?php
-/* 
+/*
  * proto array array_splice(array input, int offset [, int length [, array replacement]])
  * Function is implemented in ext/standard/array.c
-*/ 
+*/
 
 echo "\n*** Testing error conditions of array_splice() ***\n";
 
diff --git a/ext/standard/tests/array/array_splice_variation1.phpt b/ext/standard/tests/array/array_splice_variation1.phpt
index 9ba94f66330..ecd6f67eb02 100644
--- a/ext/standard/tests/array/array_splice_variation1.phpt
+++ b/ext/standard/tests/array/array_splice_variation1.phpt
@@ -2,10 +2,10 @@
 Test array_splice() function : usage variations - references
 --FILE--
 <?php
-/* 
+/*
  * proto array array_splice(array input, int offset [, int length [, array replacement]])
  * Function is implemented in ext/standard/array.c
-*/ 
+*/
 
 
 echo "test behaviour when input array is in a reference set\n";
diff --git a/ext/standard/tests/array/array_splice_variation2.phpt b/ext/standard/tests/array/array_splice_variation2.phpt
index 516339c7e86..42692918d10 100644
--- a/ext/standard/tests/array/array_splice_variation2.phpt
+++ b/ext/standard/tests/array/array_splice_variation2.phpt
@@ -2,10 +2,10 @@
 Test array_splice() function : usage variations - additional parameters
 --FILE--
 <?php
-/* 
+/*
  * proto array array_splice(array input, int offset [, int length [, array replacement]])
  * Function is implemented in ext/standard/array.c
-*/ 
+*/
 
 $array=array(0,1,2);
 var_dump (array_splice($array,1,1,3,4,5,6,7,8,9));
diff --git a/ext/standard/tests/array/array_splice_variation3.phpt b/ext/standard/tests/array/array_splice_variation3.phpt
index 33ec80e5a81..9c1a7c86abb 100644
--- a/ext/standard/tests/array/array_splice_variation3.phpt
+++ b/ext/standard/tests/array/array_splice_variation3.phpt
@@ -2,10 +2,10 @@
 Test array_splice() function : usage variations - lengths and offsets
 --FILE--
 <?php
-/* 
+/*
  * proto array array_splice(array input, int offset [, int length [, array replacement]])
  * Function is implemented in ext/standard/array.c
-*/ 
+*/
 
 echo "*** array_splice() function : usage variations - lengths and offsets\n";
 
diff --git a/ext/standard/tests/array/array_splice_variation4.phpt b/ext/standard/tests/array/array_splice_variation4.phpt
index d1cc501c6b7..ddd966780e6 100644
--- a/ext/standard/tests/array/array_splice_variation4.phpt
+++ b/ext/standard/tests/array/array_splice_variation4.phpt
@@ -2,10 +2,10 @@
 Test array_splice() function : usage variations - non array replacement values
 --FILE--
 <?php
-/* 
+/*
  * proto array array_splice(array input, int offset [, int length [, array replacement]])
  * Function is implemented in ext/standard/array.c
-*/ 
+*/
 
 function test_splice ($replacement)
 {
diff --git a/ext/standard/tests/array/array_sum_basic.phpt b/ext/standard/tests/array/array_sum_basic.phpt
index c178853d750..1f41dd03348 100644
--- a/ext/standard/tests/array/array_sum_basic.phpt
+++ b/ext/standard/tests/array/array_sum_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_sum() function : basic functionality 
+Test array_sum() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : mixed array_sum(array &input)
- * Description: Returns the sum of the array entries 
+ * Description: Returns the sum of the array entries
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_sum_error.phpt b/ext/standard/tests/array/array_sum_error.phpt
index 209405d3d30..0433fca4dc3 100644
--- a/ext/standard/tests/array/array_sum_error.phpt
+++ b/ext/standard/tests/array/array_sum_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_sum() function : error conditions 
+Test array_sum() function : error conditions
 --FILE--
 <?php
 /* Prototype  : mixed array_sum(array &input)
- * Description: Returns the sum of the array entries 
+ * Description: Returns the sum of the array entries
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_sum_variation1.phpt b/ext/standard/tests/array/array_sum_variation1.phpt
index afe24a92e92..00540d16bc2 100644
--- a/ext/standard/tests/array/array_sum_variation1.phpt
+++ b/ext/standard/tests/array/array_sum_variation1.phpt
@@ -3,12 +3,12 @@ Test array_sum() function : usage variations - unexpected values for 'input' arg
 --FILE--
 <?php
 /* Prototype  : mixed array_sum(array $input)
- * Description: Returns the sum of the array entries 
+ * Description: Returns the sum of the array entries
  * Source code: ext/standard/array.c
 */
 
 /*
-* Passing different scalar/nonscalar values as 'input' argument to array_sum() 
+* Passing different scalar/nonscalar values as 'input' argument to array_sum()
 */
 
 echo "*** Testing array_sum() : unexpected values for 'input' ***\n";
diff --git a/ext/standard/tests/array/array_sum_variation2.phpt b/ext/standard/tests/array/array_sum_variation2.phpt
index 56d91314930..1f9b021256c 100644
--- a/ext/standard/tests/array/array_sum_variation2.phpt
+++ b/ext/standard/tests/array/array_sum_variation2.phpt
@@ -3,7 +3,7 @@ Test array_sum() function : usage variations - array with different integer valu
 --FILE--
 <?php
 /* Prototype  : mixed array_sum(array &input)
- * Description: Returns the sum of the array entries 
+ * Description: Returns the sum of the array entries
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_sum_variation3.phpt b/ext/standard/tests/array/array_sum_variation3.phpt
index 9d32c2c386d..8c7151e220b 100644
--- a/ext/standard/tests/array/array_sum_variation3.phpt
+++ b/ext/standard/tests/array/array_sum_variation3.phpt
@@ -3,7 +3,7 @@ Test array_sum() function : usage variations - array with different float values
 --FILE--
 <?php
 /* Prototype  : mixed array_sum(array $input)
- * Description: Returns the sum of the array entries 
+ * Description: Returns the sum of the array entries
  * Source code: ext/standard/array.c
 */
 
@@ -26,7 +26,7 @@ $float_input = array( 1.2E2, 23.4E3, -4.1E2, 0.2E2, 2.1E-2, .5E3);
 var_dump( array_sum($float_input) );
 
 // Mixed float array
-$float_input = array( 
+$float_input = array(
   1.2,
   0.5
   -5.8,
@@ -39,7 +39,7 @@ $float_input = array(
 );
 echo "-- Mixed float array --\n";
 var_dump( array_sum($float_input) );
-                     
+
 echo "Done"
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_sum_variation4.phpt b/ext/standard/tests/array/array_sum_variation4.phpt
index 4959deee7d4..8dd6976eee3 100644
--- a/ext/standard/tests/array/array_sum_variation4.phpt
+++ b/ext/standard/tests/array/array_sum_variation4.phpt
@@ -3,12 +3,12 @@ Test array_sum() function : usage variations - array with duplicate values
 --FILE--
 <?php
 /* Prototype  : mixed array_sum(array $input)
- * Description: Returns the sum of the array entries 
+ * Description: Returns the sum of the array entries
  * Source code: ext/standard/array.c
 */
 
 /*
-* Checking array_sum() with integer and float array containing duplicate values 
+* Checking array_sum() with integer and float array containing duplicate values
 */
 
 echo "*** Testing array_sum() : array with duplicate values ***\n";
diff --git a/ext/standard/tests/array/array_sum_variation5.phpt b/ext/standard/tests/array/array_sum_variation5.phpt
index 9068c4565ed..ec2dac63420 100644
--- a/ext/standard/tests/array/array_sum_variation5.phpt
+++ b/ext/standard/tests/array/array_sum_variation5.phpt
@@ -3,7 +3,7 @@ Test array_sum() function : usage variations - array with reference variables as
 --FILE--
 <?php
 /* Prototype  : mixed array_sum(array $input)
- * Description: Returns the sum of the array entries 
+ * Description: Returns the sum of the array entries
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_sum_variation6.phpt b/ext/standard/tests/array/array_sum_variation6.phpt
index ba67cfd4993..99666493184 100644
--- a/ext/standard/tests/array/array_sum_variation6.phpt
+++ b/ext/standard/tests/array/array_sum_variation6.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test array_sum() function : usage variations - associative array 
+Test array_sum() function : usage variations - associative array
 --FILE--
 <?php
 /* Prototype  : mixed array_sum(array $input)
- * Description: Returns the sum of the array entries 
+ * Description: Returns the sum of the array entries
  * Source code: ext/standard/array.c
 */
 
 /*
-* Testing array_sum() with associative array as 'input' argument 
+* Testing array_sum() with associative array as 'input' argument
 */
 
 echo "*** Testing array_sum() : with associative array ***\n";
diff --git a/ext/standard/tests/array/array_sum_variation7.phpt b/ext/standard/tests/array/array_sum_variation7.phpt
index d30987535b0..74e262bd0a1 100644
--- a/ext/standard/tests/array/array_sum_variation7.phpt
+++ b/ext/standard/tests/array/array_sum_variation7.phpt
@@ -3,7 +3,7 @@ Test array_sum() function : usage variations - 'input' array with unexpected val
 --FILE--
 <?php
 /* Prototype  : mixed array_sum(array $input)
- * Description: Returns the sum of the array entries 
+ * Description: Returns the sum of the array entries
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_udiff_assoc_basic.phpt b/ext/standard/tests/array/array_udiff_assoc_basic.phpt
index d115bcc3266..26c4f317615 100644
--- a/ext/standard/tests/array/array_udiff_assoc_basic.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-array_udiff_assoc(): Test return type and value for expected input 
+array_udiff_assoc(): Test return type and value for expected input
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/array/array_udiff_assoc_error.phpt b/ext/standard/tests/array/array_udiff_assoc_error.phpt
index ec1cc062ed5..ae7c3b9586c 100644
--- a/ext/standard/tests/array/array_udiff_assoc_error.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff_assoc() function : error conditions 
+Test array_udiff_assoc() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff_assoc() : error conditions ***\n";
diff --git a/ext/standard/tests/array/array_udiff_assoc_variation.phpt b/ext/standard/tests/array/array_udiff_assoc_variation.phpt
index 465c5008fd2..9528cf69cdc 100644
--- a/ext/standard/tests/array/array_udiff_assoc_variation.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_variation.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff_assoc() function : variation 
+Test array_udiff_assoc() function : variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff_assoc() : variation - testing with multiple array arguments ***\n";
diff --git a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
index 9886d73baa6..b512e3c797f 100644
--- a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff_assoc() function : usage variation 
+Test array_udiff_assoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff_assoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt
index 18484a7ad28..418c0f0b7d4 100644
--- a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff_assoc() function : usage variation 
+Test array_udiff_assoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff_assoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_udiff_assoc_variation3.phpt b/ext/standard/tests/array/array_udiff_assoc_variation3.phpt
index e693afff876..0f4da2c29dd 100644
--- a/ext/standard/tests/array/array_udiff_assoc_variation3.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_variation3.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff_assoc() function : usage variation 
+Test array_udiff_assoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff_assoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_udiff_assoc_variation4.phpt b/ext/standard/tests/array/array_udiff_assoc_variation4.phpt
index 0bf3e2dbbe1..375b35915fc 100644
--- a/ext/standard/tests/array/array_udiff_assoc_variation4.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_variation4.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff_assoc() function : usage variation 
+Test array_udiff_assoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff_assoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt
index 6b7f0144674..7543d782bfb 100644
--- a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff_assoc() function : usage variation - incorrect comparison functions 
+Test array_udiff_assoc() function : usage variation - incorrect comparison functions
 --FILE--
 <?php
 /* Prototype  : array array_udiff_assoc(array arr1, array arr2 [, array ...], callback key_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys are compared by user supplied function.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
diff --git a/ext/standard/tests/array/array_udiff_basic.phpt b/ext/standard/tests/array/array_udiff_basic.phpt
index 5dbece34cc2..f5348852bf8 100644
--- a/ext/standard/tests/array/array_udiff_basic.phpt
+++ b/ext/standard/tests/array/array_udiff_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-array_udiff():Test return type and value for expected input 
+array_udiff():Test return type and value for expected input
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/array/array_udiff_error.phpt b/ext/standard/tests/array/array_udiff_error.phpt
index dc9657756e8..7eb7e3b0684 100644
--- a/ext/standard/tests/array/array_udiff_error.phpt
+++ b/ext/standard/tests/array/array_udiff_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff() function : error conditions 
+Test array_udiff() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff() : error conditions ***\n";
diff --git a/ext/standard/tests/array/array_udiff_uassoc_basic.phpt b/ext/standard/tests/array/array_udiff_uassoc_basic.phpt
index 51b4bc17592..9f7e1794986 100644
--- a/ext/standard/tests/array/array_udiff_uassoc_basic.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-array_udiff_uassoc(): Test return type and value for expected input 
+array_udiff_uassoc(): Test return type and value for expected input
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/array/array_udiff_uassoc_error.phpt b/ext/standard/tests/array/array_udiff_uassoc_error.phpt
index e7d27e65dbc..76dbf16dbab 100644
--- a/ext/standard/tests/array/array_udiff_uassoc_error.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff_uassoc() function : error conditions 
+Test array_udiff_uassoc() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff_uassoc() : error conditions ***\n";
diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt
index a48d56d4da0..e5c95c6661a 100644
--- a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff_uassoc() function : usage variation 
+Test array_udiff_uassoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff_uassoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt
index c205da73f23..af066b70bf4 100644
--- a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff_uassoc() function : usage variation 
+Test array_udiff_uassoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff_uassoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt
index 76afda098bb..bf19c533cb1 100644
--- a/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_variation3.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff_uassoc() function : usage variation 
+Test array_udiff_uassoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff_uassoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt
index 0beb15ff775..7be89f4c6f8 100644
--- a/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_variation4.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff_uassoc() function : usage variation 
+Test array_udiff_uassoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff_uassoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt
index 87c70718562..ccfb9e8712f 100644
--- a/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff_uassoc() function : usage variation 
+Test array_udiff_uassoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff_uassoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt
index bf2c0f3d2d5..e07ee91d495 100644
--- a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff_uassoc() function : usage variation 
+Test array_udiff_uassoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff_uassoc(array arr1, array arr2 [, array ...], callback data_comp_func, callback key_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments but do additional checks whether the keys are equal. Keys and elements are compared by user supplied functions.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff_uassoc() : usage variation - differing comparison functions***\n";
diff --git a/ext/standard/tests/array/array_udiff_variation1.phpt b/ext/standard/tests/array/array_udiff_variation1.phpt
index d2c0e240994..4c0824d9bcc 100644
--- a/ext/standard/tests/array/array_udiff_variation1.phpt
+++ b/ext/standard/tests/array/array_udiff_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff() function : usage variation 
+Test array_udiff() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_udiff_variation2.phpt b/ext/standard/tests/array/array_udiff_variation2.phpt
index fd2c12d8ac6..40954dca67a 100644
--- a/ext/standard/tests/array/array_udiff_variation2.phpt
+++ b/ext/standard/tests/array/array_udiff_variation2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff() function : usage variation 
+Test array_udiff() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_udiff_variation3.phpt b/ext/standard/tests/array/array_udiff_variation3.phpt
index aeeee89bf1d..294686b22af 100644
--- a/ext/standard/tests/array/array_udiff_variation3.phpt
+++ b/ext/standard/tests/array/array_udiff_variation3.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff() function : usage variation 
+Test array_udiff() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_udiff_variation4.phpt b/ext/standard/tests/array/array_udiff_variation4.phpt
index 09dec4f9ec8..1968312ce24 100644
--- a/ext/standard/tests/array/array_udiff_variation4.phpt
+++ b/ext/standard/tests/array/array_udiff_variation4.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff() function : usage variation 
+Test array_udiff() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_udiff_variation5.phpt b/ext/standard/tests/array/array_udiff_variation5.phpt
index ce6362fc08e..02438fa927e 100644
--- a/ext/standard/tests/array/array_udiff_variation5.phpt
+++ b/ext/standard/tests/array/array_udiff_variation5.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_udiff() function : usage variation 
+Test array_udiff() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_udiff(array arr1, array arr2 [, array ...], callback data_comp_func)
- * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function. 
+ * Description: Returns the entries of arr1 that have values which are not present in any of the others arguments. Elements are compared by user supplied function.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_udiff() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_assoc_basic.phpt b/ext/standard/tests/array/array_uintersect_assoc_basic.phpt
index d3645c7ceaa..a7e313ecf7b 100644
--- a/ext/standard/tests/array/array_uintersect_assoc_basic.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-array_uintersect_assoc(): Test return type and value for expected input 
+array_uintersect_assoc(): Test return type and value for expected input
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt b/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt
index f0c7ecc802d..6a54b3bfc75 100644
--- a/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt
@@ -5,7 +5,7 @@ Test array_uintersect_assoc() function : basic functionality - testing with mult
 /* Prototype  : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func)
  * Description: U
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect_assoc() : basic functionality - testing with multiple array arguments ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_assoc_error.phpt b/ext/standard/tests/array/array_uintersect_assoc_error.phpt
index 73fc61e3973..d27f9f76063 100644
--- a/ext/standard/tests/array/array_uintersect_assoc_error.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect_assoc() function : error conditions 
+Test array_uintersect_assoc() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func)
  * Description: U
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect_assoc() : error conditions ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt
index 45d0a8da7cf..f9d6249d818 100644
--- a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect_assoc() function : usage variation 
+Test array_uintersect_assoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func)
  * Description: U
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect_assoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt
index a421c252ada..f5771e63967 100644
--- a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect_assoc() function : usage variation 
+Test array_uintersect_assoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func)
  * Description: U
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect_assoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt
index a76fca0f5c3..29d2694ddba 100644
--- a/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_variation3.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect_assoc() function : usage variation 
+Test array_uintersect_assoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func)
  * Description: U
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect_assoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt
index abff23ad505..6729a78d7b4 100644
--- a/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect_assoc() function : usage variation 
+Test array_uintersect_assoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func)
  * Description: U
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect_assoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt
index bebe5b52c97..07b9259c8c7 100644
--- a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect_assoc() function : usage variation - differing comparison functions 
+Test array_uintersect_assoc() function : usage variation - differing comparison functions
 --FILE--
 <?php
 /* Prototype  : array array_uintersect_assoc(array arr1, array arr2 [, array ...], callback data_compare_func)
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect_assoc() : usage variation - differing comparison functions***\n";
diff --git a/ext/standard/tests/array/array_uintersect_basic.phpt b/ext/standard/tests/array/array_uintersect_basic.phpt
index 4965d599baf..5334b1da85a 100644
--- a/ext/standard/tests/array/array_uintersect_basic.phpt
+++ b/ext/standard/tests/array/array_uintersect_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-array_uintersect(): Test return type and value for expected input 
+array_uintersect(): Test return type and value for expected input
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/array/array_uintersect_error.phpt b/ext/standard/tests/array/array_uintersect_error.phpt
index 1b25db4345e..3c7696108a5 100644
--- a/ext/standard/tests/array/array_uintersect_error.phpt
+++ b/ext/standard/tests/array/array_uintersect_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect() function : error conditions 
+Test array_uintersect() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func)
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect() : error conditions ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt b/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt
index 5e1ea1a7d98..a9d3f14adf2 100644
--- a/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-array_uintersect_uassoc(): Test return type and value for expected input 
+array_uintersect_uassoc(): Test return type and value for expected input
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/array/array_uintersect_uassoc_error.phpt b/ext/standard/tests/array/array_uintersect_uassoc_error.phpt
index c7391eeda98..bdf503c9ed4 100644
--- a/ext/standard/tests/array/array_uintersect_uassoc_error.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect_uassoc() function : error conditions 
+Test array_uintersect_uassoc() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func)
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect_uassoc() : error conditions ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt
index 764c584b2ee..e6709f364d4 100644
--- a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect_uassoc() function : usage variation 
+Test array_uintersect_uassoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func)
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect_uassoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt
index 2efa93d0cb3..922778fadb9 100644
--- a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect_uassoc() function : usage variation 
+Test array_uintersect_uassoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func)
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect_uassoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt
index 860a1661a6c..16ffec717f7 100644
--- a/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_variation3.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect_uassoc() function : usage variation 
+Test array_uintersect_uassoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func)
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect_uassoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt
index a3963184c32..ce7eb49a641 100644
--- a/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_variation4.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect_uassoc() function : usage variation 
+Test array_uintersect_uassoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func)
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect_uassoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt
index 061ac60ed80..c46a036d19d 100644
--- a/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect_uassoc() function : usage variation 
+Test array_uintersect_uassoc() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func)
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect_uassoc() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt
index a5317c1c0d9..c548b8bc9e0 100644
--- a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect_uassoc() function : usage variation - incorrect callbacks 
+Test array_uintersect_uassoc() function : usage variation - incorrect callbacks
 --FILE--
 <?php
 /* Prototype  : array array_uintersect_uassoc(array arr1, array arr2 [, array ...], callback data_compare_func, callback key_compare_func)
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks. 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Keys are used to do more restrictive check. Both data and keys are compared by using user-supplied callbacks.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect_uassoc() : usage variation - incorrect callbacks ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_variation1.phpt b/ext/standard/tests/array/array_uintersect_variation1.phpt
index 0663a958f1f..e9879a115b2 100644
--- a/ext/standard/tests/array/array_uintersect_variation1.phpt
+++ b/ext/standard/tests/array/array_uintersect_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect() function : usage variation 
+Test array_uintersect() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func)
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_variation2.phpt b/ext/standard/tests/array/array_uintersect_variation2.phpt
index 79f4cd09c89..36f315a4c06 100644
--- a/ext/standard/tests/array/array_uintersect_variation2.phpt
+++ b/ext/standard/tests/array/array_uintersect_variation2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect() function : usage variation 
+Test array_uintersect() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func)
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_variation3.phpt b/ext/standard/tests/array/array_uintersect_variation3.phpt
index 707ba113c8b..a4f670addbd 100644
--- a/ext/standard/tests/array/array_uintersect_variation3.phpt
+++ b/ext/standard/tests/array/array_uintersect_variation3.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect() function : usage variation 
+Test array_uintersect() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func)
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_variation4.phpt b/ext/standard/tests/array/array_uintersect_variation4.phpt
index 45207b3c12c..efff02389d6 100644
--- a/ext/standard/tests/array/array_uintersect_variation4.phpt
+++ b/ext/standard/tests/array/array_uintersect_variation4.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect() function : usage variation 
+Test array_uintersect() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func)
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect() : usage variation ***\n";
diff --git a/ext/standard/tests/array/array_uintersect_variation5.phpt b/ext/standard/tests/array/array_uintersect_variation5.phpt
index 642ebc00775..83263594dad 100644
--- a/ext/standard/tests/array/array_uintersect_variation5.phpt
+++ b/ext/standard/tests/array/array_uintersect_variation5.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test array_uintersect() function : usage variation - differing comparison functions 
+Test array_uintersect() function : usage variation - differing comparison functions
 --FILE--
 <?php
 /* Prototype  : array array_uintersect(array arr1, array arr2 [, array ...], callback data_compare_func)
- * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback. 
+ * Description: Returns the entries of arr1 that have values which are present in all the other arguments. Data is compared by using an user-supplied callback.
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing array_uintersect() : usage variation - differing comparison functions***\n";
diff --git a/ext/standard/tests/array/array_unique_basic.phpt b/ext/standard/tests/array/array_unique_basic.phpt
index 58d3acf1be3..41e3f371877 100644
--- a/ext/standard/tests/array/array_unique_basic.phpt
+++ b/ext/standard/tests/array/array_unique_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_unique() function : basic functionality 
+Test array_unique() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array array_unique(array $input)
- * Description: Removes duplicate values from array 
+ * Description: Removes duplicate values from array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_unique_error.phpt b/ext/standard/tests/array/array_unique_error.phpt
index 9da3dfcad6b..256dd63ba39 100644
--- a/ext/standard/tests/array/array_unique_error.phpt
+++ b/ext/standard/tests/array/array_unique_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_unique() function : error conditions 
+Test array_unique() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array array_unique(array $input)
- * Description: Removes duplicate values from array 
+ * Description: Removes duplicate values from array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_unique_variation1.phpt b/ext/standard/tests/array/array_unique_variation1.phpt
index bac29276cce..9fe882b4b26 100644
--- a/ext/standard/tests/array/array_unique_variation1.phpt
+++ b/ext/standard/tests/array/array_unique_variation1.phpt
@@ -3,12 +3,12 @@ Test array_unique() function : usage variations - unexpected values for 'input'
 --FILE--
 <?php
 /* Prototype  : array array_unique(array $input)
- * Description: Removes duplicate values from array 
+ * Description: Removes duplicate values from array
  * Source code: ext/standard/array.c
 */
 
 /*
- * Passing non array values to 'input' argument of array_unique() and see 
+ * Passing non array values to 'input' argument of array_unique() and see
  * that the function outputs proper warning messages wherever expected.
 */
 
diff --git a/ext/standard/tests/array/array_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt
index 62dfab4568e..7a960d4c66b 100644
--- a/ext/standard/tests/array/array_unique_variation2.phpt
+++ b/ext/standard/tests/array/array_unique_variation2.phpt
@@ -3,7 +3,7 @@ Test array_unique() function : usage variations - different arrays for 'input' a
 --FILE--
 <?php
 /* Prototype  : array array_unique(array $input)
- * Description: Removes duplicate values from array 
+ * Description: Removes duplicate values from array
  * Source code: ext/standard/array.c
 */
 
@@ -77,7 +77,7 @@ foreach($inputs as $input) {
   var_dump( array_unique($input, SORT_STRING) );
   $iterator++;
 }
-  
+
 echo "Done";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_unique_variation3.phpt b/ext/standard/tests/array/array_unique_variation3.phpt
index 49103c81543..95cd1887d1d 100644
--- a/ext/standard/tests/array/array_unique_variation3.phpt
+++ b/ext/standard/tests/array/array_unique_variation3.phpt
@@ -3,7 +3,7 @@ Test array_unique() function : usage variations - associative array with differe
 --FILE--
 <?php
 /* Prototype  : array array_unique(array $input)
- * Description: Removes duplicate values from array 
+ * Description: Removes duplicate values from array
  * Source code: ext/standard/array.c
 */
 
@@ -62,7 +62,7 @@ foreach($inputs as $input) {
 }
 
 fclose($fp);
-  
+
 echo "Done";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_unique_variation4.phpt b/ext/standard/tests/array/array_unique_variation4.phpt
index a1fc13e94d9..752ebf54eaf 100644
--- a/ext/standard/tests/array/array_unique_variation4.phpt
+++ b/ext/standard/tests/array/array_unique_variation4.phpt
@@ -3,7 +3,7 @@ Test array_unique() function : usage variations - associative array with differe
 --FILE--
 <?php
 /* Prototype  : array array_unique(array $input)
- * Description: Removes duplicate values from array 
+ * Description: Removes duplicate values from array
  * Source code: ext/standard/array.c
 */
 
@@ -62,7 +62,7 @@ foreach($inputs as $input) {
 }
 
 fclose($fp);
-  
+
 echo "Done";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_unique_variation5.phpt b/ext/standard/tests/array/array_unique_variation5.phpt
index 5e3f7c36d05..bb69f2e9c7d 100644
--- a/ext/standard/tests/array/array_unique_variation5.phpt
+++ b/ext/standard/tests/array/array_unique_variation5.phpt
@@ -3,12 +3,12 @@ Test array_unique() function : usage variations - array with duplicate keys
 --FILE--
 <?php
 /* Prototype  : array array_unique(array $input)
- * Description: Removes duplicate values from array 
+ * Description: Removes duplicate values from array
  * Source code: ext/standard/array.c
 */
 
 /*
- * Testing the functionality of array_unique() by passing 
+ * Testing the functionality of array_unique() by passing
  * array having duplicate keys as values.
 */
 
diff --git a/ext/standard/tests/array/array_unique_variation6.phpt b/ext/standard/tests/array/array_unique_variation6.phpt
index 15a46518b7c..5ec452758a9 100644
--- a/ext/standard/tests/array/array_unique_variation6.phpt
+++ b/ext/standard/tests/array/array_unique_variation6.phpt
@@ -3,12 +3,12 @@ Test array_unique() function : usage variations - array with reference variables
 --FILE--
 <?php
 /* Prototype  : array array_unique(array $input)
- * Description: Removes duplicate values from array 
+ * Description: Removes duplicate values from array
  * Source code: ext/standard/array.c
 */
 
 /*
- * Testing the functionality of array_unique() by passing 
+ * Testing the functionality of array_unique() by passing
  * array having reference variables as values.
 */
 
diff --git a/ext/standard/tests/array/array_unique_variation7.phpt b/ext/standard/tests/array/array_unique_variation7.phpt
index e998a73c6cc..b0cb2825e1a 100644
--- a/ext/standard/tests/array/array_unique_variation7.phpt
+++ b/ext/standard/tests/array/array_unique_variation7.phpt
@@ -3,7 +3,7 @@ Test array_unique() function : usage variations - binary safe checking
 --FILE--
 <?php
 /* Prototype  : array array_unique(array $input)
- * Description: Removes duplicate values from array 
+ * Description: Removes duplicate values from array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_unique_variation8.phpt b/ext/standard/tests/array/array_unique_variation8.phpt
index 8b67adfbab0..d8a318dd934 100644
--- a/ext/standard/tests/array/array_unique_variation8.phpt
+++ b/ext/standard/tests/array/array_unique_variation8.phpt
@@ -3,19 +3,19 @@ Test array_unique() function : usage variations - two dimensional arrays
 --FILE--
 <?php
 /* Prototype  : array array_unique(array $input)
- * Description: Removes duplicate values from array 
+ * Description: Removes duplicate values from array
  * Source code: ext/standard/array.c
 */
 
 /*
- * Testing the functionality of array_unique() by passing 
+ * Testing the functionality of array_unique() by passing
  * two dimensional arrays for $input argument.
 */
 
 echo "*** Testing array_unique() : two dimensional array for \$input argument ***\n";
 
 // initialize the 2-d array
-$input = array( 
+$input = array(
   array(1, 2, 3, 1),
   array("hello", "world", "str1" => "hello", "str2" => 'world'),
   array(1 => "one", 2 => "two", "one", 'two'),
diff --git a/ext/standard/tests/array/array_unshift.phpt b/ext/standard/tests/array/array_unshift.phpt
index ebcf19041f1..9b474277a95 100644
--- a/ext/standard/tests/array/array_unshift.phpt
+++ b/ext/standard/tests/array/array_unshift.phpt
@@ -14,7 +14,7 @@ var_dump($a);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(1)
 array(1) {
   [0]=>
diff --git a/ext/standard/tests/array/array_unshift_basic1.phpt b/ext/standard/tests/array/array_unshift_basic1.phpt
index 97ea8955473..7a0b7ba3b2c 100644
--- a/ext/standard/tests/array/array_unshift_basic1.phpt
+++ b/ext/standard/tests/array/array_unshift_basic1.phpt
@@ -3,11 +3,11 @@ Test array_unshift() function : basic functionality - array with default keys fo
 --FILE--
 <?php
 /* Prototype  : int array_unshift(array $array, mixed $var [, mixed ...])
- * Description: Pushes elements onto the beginning of the array 
+ * Description: Pushes elements onto the beginning of the array
  * Source code: ext/standard/array.c
 */
 
-/* 
+/*
  * Testing array_unshift() by giving array with default keys for $array argument
 */
 
diff --git a/ext/standard/tests/array/array_unshift_basic2.phpt b/ext/standard/tests/array/array_unshift_basic2.phpt
index e4fd2e00aba..b8576ddcd99 100644
--- a/ext/standard/tests/array/array_unshift_basic2.phpt
+++ b/ext/standard/tests/array/array_unshift_basic2.phpt
@@ -3,11 +3,11 @@ Test array_unshift() function : basic functionality - associative arrays for 'ar
 --FILE--
 <?php
 /* Prototype  : int array_unshift(array $array, mixed $var [, mixed ...])
- * Description: Pushes elements onto the beginning of the array 
+ * Description: Pushes elements onto the beginning of the array
  * Source code: ext/standard/array.c
 */
 
-/* 
+/*
  * Testing array_unshift() by giving associative arrays for $array argument
 */
 
diff --git a/ext/standard/tests/array/array_unshift_error.phpt b/ext/standard/tests/array/array_unshift_error.phpt
index 1381111ec41..18646f376eb 100644
--- a/ext/standard/tests/array/array_unshift_error.phpt
+++ b/ext/standard/tests/array/array_unshift_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_unshift() function : error conditions 
+Test array_unshift() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int array_unshift(array $array, mixed $var [, mixed ...])
- * Description: Pushes elements onto the beginning of the array 
+ * Description: Pushes elements onto the beginning of the array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_unshift_object.phpt b/ext/standard/tests/array/array_unshift_object.phpt
index e6155373dd3..856c4ed85a2 100644
--- a/ext/standard/tests/array/array_unshift_object.phpt
+++ b/ext/standard/tests/array/array_unshift_object.phpt
@@ -8,7 +8,7 @@ Test array_unshift() function : passing object for 'var' argument
 */
 
 /*
- * Testing the functionality of array_unshift() by passing 
+ * Testing the functionality of array_unshift() by passing
  * an object to the $var argument
 */
 
diff --git a/ext/standard/tests/array/array_unshift_variation1.phpt b/ext/standard/tests/array/array_unshift_variation1.phpt
index 67e572df603..cb4ac0bd7b3 100644
--- a/ext/standard/tests/array/array_unshift_variation1.phpt
+++ b/ext/standard/tests/array/array_unshift_variation1.phpt
@@ -3,7 +3,7 @@ Test array_unshift() function : usage variations - unexpected values for 'array'
 --FILE--
 <?php
 /* Prototype  : int array_unshift(array $array, mixed $var [, mixed ...])
- * Description: Pushes elements onto the beginning of the array 
+ * Description: Pushes elements onto the beginning of the array
  * Source code: ext/standard/array.c
 */
 
@@ -91,7 +91,7 @@ foreach($arrays as $array) {
   echo "\n-- Iteration $iterator --";
 
   /* with default arguments */
-  // returns element count in the resulting array after arguments are pushed to 
+  // returns element count in the resulting array after arguments are pushed to
   // beginning of the given array
   $temp_array = $array;
   var_dump( array_unshift($temp_array, $var) );
diff --git a/ext/standard/tests/array/array_unshift_variation2.phpt b/ext/standard/tests/array/array_unshift_variation2.phpt
index 064309b53f2..8339043dd44 100644
--- a/ext/standard/tests/array/array_unshift_variation2.phpt
+++ b/ext/standard/tests/array/array_unshift_variation2.phpt
@@ -3,7 +3,7 @@ Test array_unshift() function : usage variations - all possible values for 'var'
 --FILE--
 <?php
 /* Prototype  : int array_unshift(array $array, mixed $var [, mixed ...])
- * Description: Pushes elements onto the beginning of the array 
+ * Description: Pushes elements onto the beginning of the array
  * Source code: ext/standard/array.c
 */
 
@@ -16,7 +16,7 @@ echo "*** Testing array_unshift() : all possible values for \$var argument ***\n
 // array to be passed to $array argument
 $array = array('f' => "first", "s" => 'second', 1, 2.222);
 
-// get a class 
+// get a class
 class classA
 {
   public function __toString() {
@@ -44,7 +44,7 @@ $vars = array(
        1,
        12345,
        -2345,
- 
+
        // float data
 /*5*/  10.5,
        -10.5,
@@ -58,7 +58,7 @@ $vars = array(
        array(1),
        array(1, 2),
        array('color' => 'red', 'item' => 'pen'),
- 
+
        // null data
 /*15*/ NULL,
        null,
@@ -68,7 +68,7 @@ $vars = array(
        false,
        TRUE,
        FALSE,
- 
+
        // empty data
 /*21*/ "",
        '',
@@ -86,7 +86,7 @@ $vars = array(
 
        // unset data
        @$unset_var,
- 
+
        // resource variable
 /*29*/ $fp
 );
@@ -103,7 +103,7 @@ foreach($vars as $var) {
   var_dump( array_unshift($temp_array, $var) );
 
   // dump the resulting array
-  var_dump($temp_array);  
+  var_dump($temp_array);
 
   /* with optional arguments */
   // returns element count in the resulting array after arguments are pushed to
diff --git a/ext/standard/tests/array/array_unshift_variation3.phpt b/ext/standard/tests/array/array_unshift_variation3.phpt
index 286cb290b88..fa4f6b58531 100644
--- a/ext/standard/tests/array/array_unshift_variation3.phpt
+++ b/ext/standard/tests/array/array_unshift_variation3.phpt
@@ -8,7 +8,7 @@ Test array_unshift() function : usage variations - different array values for 'a
 */
 
 /*
- * Testing the behavior of array_unshift() by passing different types of arrays 
+ * Testing the behavior of array_unshift() by passing different types of arrays
  * to $array argument to which the $var arguments will be prepended
 */
 
diff --git a/ext/standard/tests/array/array_unshift_variation4.phpt b/ext/standard/tests/array/array_unshift_variation4.phpt
index 25c9159a116..64bf3a8d824 100644
--- a/ext/standard/tests/array/array_unshift_variation4.phpt
+++ b/ext/standard/tests/array/array_unshift_variation4.phpt
@@ -8,7 +8,7 @@ Test array_unshift() function : usage variations - assoc. array with diff. keys
 */
 
 /*
- * Testing the functionality of array_unshift() by passing different 
+ * Testing the functionality of array_unshift() by passing different
  * associative arrays having different possible keys to $array argument.
  * The $var argument passed is a fixed value
 */
@@ -52,13 +52,13 @@ $arrays = array (
        // arrays with float keys
 /*5*/  array(2.3333 => "float"),
        array(1.2 => "f1", 3.33 => "f2",
-             4.89999922839999 => "f3", 
+             4.89999922839999 => "f3",
              33333333.333333 => "f4"),
 
        // arrays with string keys
 /*7*/  array('\tHello' => 111, 're\td' => "color",
              '\v\fworld' => 2.2, 'pen\n' => 33),
-       array("\tHello" => 111, "re\td" => "color", 
+       array("\tHello" => 111, "re\td" => "color",
              "\v\fworld" => 2.2, "pen\n" => 33),
        array("hello", $heredoc => "string"), // heredoc
 
diff --git a/ext/standard/tests/array/array_unshift_variation5.phpt b/ext/standard/tests/array/array_unshift_variation5.phpt
index 7f083694af1..0cc30648642 100644
--- a/ext/standard/tests/array/array_unshift_variation5.phpt
+++ b/ext/standard/tests/array/array_unshift_variation5.phpt
@@ -2,7 +2,7 @@
 Test array_unshift() function : usage variations - assoc. array with diff values for 'array' argument
 --INI--
 precision=12
---FILE-- 
+--FILE--
 <?php
 /* Prototype  : int array_unshift(array $array, mixed $var [, mixed ...])
  * Description: Pushes elements onto the beginning of the array
@@ -14,11 +14,11 @@ precision=12
  * associative arrays having different possible values to $array argument.
  * The $var argument passed is a fixed value
 */
- 
+
 echo "*** Testing array_unshift() : associative array with different values ***\n";
 
 // get an unset variable
-$unset_var = 10; 
+$unset_var = 10;
 unset ($unset_var);
 
 // get a resource variable
@@ -74,7 +74,7 @@ foreach($arrays as $array) {
 
   /* with default argument */
   // returns element count in the resulting array after arguments are pushed to
-  // beginning of the given array 
+  // beginning of the given array
   $temp_array = $array;
   var_dump( array_unshift($temp_array, $var) );
 
@@ -83,7 +83,7 @@ foreach($arrays as $array) {
 
   /* with optional arguments */
   // returns element count in the resulting array after arguments are pushed to
-  // beginning of the given array 
+  // beginning of the given array
   $temp_array = $array;
   var_dump( array_unshift($temp_array, $var, "hello", 'world') );
 
diff --git a/ext/standard/tests/array/array_unshift_variation6.phpt b/ext/standard/tests/array/array_unshift_variation6.phpt
index 47da53be96b..62a83929a2b 100644
--- a/ext/standard/tests/array/array_unshift_variation6.phpt
+++ b/ext/standard/tests/array/array_unshift_variation6.phpt
@@ -10,7 +10,7 @@ Test array_unshift() function : usage variations - two dimensional arrays for 'a
 /*
  * Testing the functionality of array_unshift() by giving two-dimensional
  * arrays and also sub-arrays within the two-dimensional array for $array argument.
- * The $var argument passed is a fixed value 
+ * The $var argument passed is a fixed value
 */
 
 echo "*** Testing array_unshift() : two dimensional arrays for \$array argument ***\n";
@@ -43,7 +43,7 @@ var_dump( array_unshift($temp_array, $var) );  // whole 2-d array
 var_dump($temp_array);
 
 /* With optional arguments */
-// returns element count in the resulting array after arguments are pushed to 
+// returns element count in the resulting array after arguments are pushed to
 // beginning of the given array
 $temp_array = $two_dimensional_array;
 var_dump( array_unshift($temp_array, $var, "hello", 'world') );  // whole 2-d array
@@ -63,7 +63,7 @@ var_dump( array_unshift($temp_array, $var) );  // sub array
 var_dump($temp_array);
 
 /* With optional arguments */
-// returns element count in the resulting array after arguments are pushed to 
+// returns element count in the resulting array after arguments are pushed to
 // beginning of the given array
 $temp_array = $two_dimensional_array[0];
 var_dump( array_unshift($temp_array, $var, "hello", 'world') );  // sub array
diff --git a/ext/standard/tests/array/array_unshift_variation7.phpt b/ext/standard/tests/array/array_unshift_variation7.phpt
index 9a94eca9d11..099aa390d7c 100644
--- a/ext/standard/tests/array/array_unshift_variation7.phpt
+++ b/ext/standard/tests/array/array_unshift_variation7.phpt
@@ -9,7 +9,7 @@ Test array_unshift() function : usage variations - double quoted strings for 'va
 
 /*
  * Testing the functionality of array_unshift() by passing different
- * double quoted strings for $var argument that is prepended to the array 
+ * double quoted strings for $var argument that is prepended to the array
  * passed through $array argument
 */
 
@@ -37,7 +37,7 @@ foreach($vars as $var) {
   // returns element count in the resulting array after arguments are pushed to
   // beginning of the given array
   var_dump( array_unshift($temp_array, $var) );
-  
+
 // dump the resulting array
   var_dump($temp_array);
 
@@ -46,7 +46,7 @@ foreach($vars as $var) {
   // beginning of the given array
   $temp_array = $array;
   var_dump( array_unshift($temp_array, $var, "hello", 'world') );
-  
+
   // dump the resulting array
   var_dump($temp_array);
   $iterator++;
diff --git a/ext/standard/tests/array/array_unshift_variation8.phpt b/ext/standard/tests/array/array_unshift_variation8.phpt
index a64349c8668..baa1be38a1a 100644
--- a/ext/standard/tests/array/array_unshift_variation8.phpt
+++ b/ext/standard/tests/array/array_unshift_variation8.phpt
@@ -9,7 +9,7 @@ Test array_unshift() function : usage variations - single quoted strings for 'va
 
 /*
  * Testing the functionality of array_unshift() by passing different
- * single quoted strings for $var argument that is prepended to the array 
+ * single quoted strings for $var argument that is prepended to the array
  * passed through $array argument
 */
 
@@ -32,12 +32,12 @@ $iterator = 1;
 foreach($vars as $var) {
   echo "-- Iteration $iterator --\n";
   $temp_array = $array;  // assign $array to another temporary $temp_array
-  
+
   /* with default argument */
   // returns element count in the resulting array after arguments are pushed to
   // beginning of the given array
   var_dump( array_unshift($temp_array, $var) );
-  
+
   // dump the resulting array
   var_dump($temp_array);
 
diff --git a/ext/standard/tests/array/array_unshift_variation9.phpt b/ext/standard/tests/array/array_unshift_variation9.phpt
index b6440f899e6..96c5790ff09 100644
--- a/ext/standard/tests/array/array_unshift_variation9.phpt
+++ b/ext/standard/tests/array/array_unshift_variation9.phpt
@@ -9,7 +9,7 @@ Test array_unshift() function : usage variations - heredoc strings for 'var' arg
 
 /*
  * Testing the functionality of array_unshift() by passing different
- * heredoc strings for $var argument that is prepended to the array 
+ * heredoc strings for $var argument that is prepended to the array
  * passed through $array argument
 */
 
@@ -18,13 +18,13 @@ echo "*** Testing array_unshift() : heredoc strings for \$var argument ***\n";
 // heredoc with empty value
 $empty_string = <<<EOT
 EOT;
-  
+
 // heredoc with blank line
 $blank_line = <<<EOT
 
 
 EOT;
-  
+
 // heredoc with multiline string
 $multiline_string = <<<EOT
 hello world
@@ -77,7 +77,7 @@ foreach($vars as $var) {
   // returns element count in the resulting array after arguments are pushed to
   // beginning of the given array
   var_dump( array_unshift($temp_array, $var) );
-  
+
   // dump the resulting array
   var_dump($temp_array);
 
@@ -86,7 +86,7 @@ foreach($vars as $var) {
   // beginning of the given array
   $temp_array = $array;
   var_dump( array_unshift($temp_array, $var, "hello", 'world') );
-  
+
   // dump the resulting array
   var_dump($temp_array);
   $iterator++;
diff --git a/ext/standard/tests/array/array_values.phpt b/ext/standard/tests/array/array_values.phpt
index e5e46ca3f72..c14b0ecae26 100644
Binary files a/ext/standard/tests/array/array_values.phpt and b/ext/standard/tests/array/array_values.phpt differ
diff --git a/ext/standard/tests/array/array_values_basic.phpt b/ext/standard/tests/array/array_values_basic.phpt
index 9cbdf07b812..d155c6e1285 100644
--- a/ext/standard/tests/array/array_values_basic.phpt
+++ b/ext/standard/tests/array/array_values_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_values() function : basic functionality 
+Test array_values() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array array_values(array $input)
- * Description: Return just the values from the input array 
+ * Description: Return just the values from the input array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_values_error.phpt b/ext/standard/tests/array/array_values_error.phpt
index 07d682c9e1e..40256185a12 100644
--- a/ext/standard/tests/array/array_values_error.phpt
+++ b/ext/standard/tests/array/array_values_error.phpt
@@ -3,7 +3,7 @@ Test array_values() function : error conditions - Pass incorrect number of funct
 --FILE--
 <?php
 /* Prototype  : array array_values(array $input)
- * Description: Return just the values from the input array 
+ * Description: Return just the values from the input array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_values_errors.phpt b/ext/standard/tests/array/array_values_errors.phpt
index c8133dde35f..5f88f9aa8dc 100644
--- a/ext/standard/tests/array/array_values_errors.phpt
+++ b/ext/standard/tests/array/array_values_errors.phpt
@@ -16,7 +16,7 @@ var_dump( array_values(new stdclass) );  // object
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing error conditions ***
 
 Warning: array_values() expects exactly 1 parameter, 0 given in %s on line %d
diff --git a/ext/standard/tests/array/array_values_variation.phpt b/ext/standard/tests/array/array_values_variation.phpt
index 15da1a621eb..15eb77dac03 100644
--- a/ext/standard/tests/array/array_values_variation.phpt
+++ b/ext/standard/tests/array/array_values_variation.phpt
@@ -19,8 +19,8 @@ var_dump( array_values($arr_resource) );
 
 echo "\n*** Testing array_values() with range checking ***\n";
 $arr_range = array(
-  2147483647, 
-  2147483648, 
+  2147483647,
+  2147483648,
   -2147483647,
   -2147483648,
   -0,
@@ -35,7 +35,7 @@ var_dump( array_values(array()) );  // null array
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing array_values() with resource type ***
 array(2) {
   [0]=>
diff --git a/ext/standard/tests/array/array_values_variation1.phpt b/ext/standard/tests/array/array_values_variation1.phpt
index 516beec6f62..eb1ff7aef72 100644
--- a/ext/standard/tests/array/array_values_variation1.phpt
+++ b/ext/standard/tests/array/array_values_variation1.phpt
@@ -3,7 +3,7 @@ Test array_values() function : usage variations - Pass different data types as $
 --FILE--
 <?php
 /* Prototype  : array array_values(array $input)
- * Description: Return just the values from the input array 
+ * Description: Return just the values from the input array
  * Source code: ext/standard/array.c
  */
 
@@ -58,7 +58,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -68,7 +68,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/array_values_variation2.phpt b/ext/standard/tests/array/array_values_variation2.phpt
index c7e9ad3f718..81e575494b6 100644
--- a/ext/standard/tests/array/array_values_variation2.phpt
+++ b/ext/standard/tests/array/array_values_variation2.phpt
@@ -3,7 +3,7 @@ Test array_values() function : usage variations - arrays of different data types
 --FILE--
 <?php
 /* Prototype  : array array_values(array $input)
- * Description: Return just the values from the input array 
+ * Description: Return just the values from the input array
  * Source code: ext/standard/array.c
  */
 
@@ -66,13 +66,13 @@ $inputs = array(
        TRUE,
        FALSE,
        ),
-       
+
        // empty data
 /*5*/ 'empty string' => array(
        "",
        '',
        ),
-       
+
 /*6*/ 'empty array' => array(
        ),
 
@@ -82,7 +82,7 @@ $inputs = array(
        'string',
        $heredoc,
        ),
-       
+
        // object data
 /*8*/ 'object' => array(
        new classA(),
diff --git a/ext/standard/tests/array/array_values_variation3.phpt b/ext/standard/tests/array/array_values_variation3.phpt
index 5c74c0d47df..5afa0d2c424 100644
--- a/ext/standard/tests/array/array_values_variation3.phpt
+++ b/ext/standard/tests/array/array_values_variation3.phpt
@@ -3,7 +3,7 @@ Test array_values() function : usage variations - array keys different data type
 --FILE--
 <?php
 /* Prototype  : array array_values(array $input)
- * Description: Return just the values from the input array 
+ * Description: Return just the values from the input array
  * Source code: ext/standard/array.c
  */
 
@@ -40,7 +40,7 @@ $inputs = array(
        -10.5 => 'negative',
        .5 => 'half',
        ),
-       
+
 /*3*/  'extreme floats' => array(
        12.3456789000e10 => 'large',
        12.3456789000E-10 => 'small',
@@ -49,8 +49,8 @@ $inputs = array(
        // null data
 /*4*/ 'null uppercase' => array(
        NULL => 'null 1',
-       ), 
-       
+       ),
+
 /*5*/  'null lowercase' => array(
        null => 'null 2',
        ),
@@ -60,17 +60,17 @@ $inputs = array(
        true => 'lowert',
        false => 'lowerf',
        ),
-       
+
 /*7*/  'bool uppercase' => array(
        TRUE => 'uppert',
        FALSE => 'upperf',
        ),
-       
+
        // empty data
 /*8*/ 'empty double quotes' => array(
        "" => 'emptyd',
        ),
-       
+
 /*9*/  'empty single quotes' => array(
        '' => 'emptys',
        ),
diff --git a/ext/standard/tests/array/array_values_variation4.phpt b/ext/standard/tests/array/array_values_variation4.phpt
index 9c35331fddb..9f23dac1ede 100644
--- a/ext/standard/tests/array/array_values_variation4.phpt
+++ b/ext/standard/tests/array/array_values_variation4.phpt
@@ -3,7 +3,7 @@ Test array_values() function : usage variations - multi-dimensional arrays
 --FILE--
 <?php
 /* Prototype  : array array_values(array $input)
- * Description: Return just the values from the input array 
+ * Description: Return just the values from the input array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_values_variation5.phpt b/ext/standard/tests/array/array_values_variation5.phpt
index d65b4674d3e..96d4bd00e40 100644
--- a/ext/standard/tests/array/array_values_variation5.phpt
+++ b/ext/standard/tests/array/array_values_variation5.phpt
@@ -3,7 +3,7 @@ Test array_values() function : usage variations - internal array pointer
 --FILE--
 <?php
 /* Prototype  : array array_values(array $input)
- * Description: Return just the values from the input array 
+ * Description: Return just the values from the input array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_values_variation6.phpt b/ext/standard/tests/array/array_values_variation6.phpt
index 8c4479ca6ff..9b9e182424d 100644
--- a/ext/standard/tests/array/array_values_variation6.phpt
+++ b/ext/standard/tests/array/array_values_variation6.phpt
@@ -3,7 +3,7 @@ Test array_values() function : usage variations - Referenced variables
 --FILE--
 <?php
 /* Prototype  : array array_values(array $input)
- * Description: Return just the values from the input array 
+ * Description: Return just the values from the input array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_values_variation7.phpt b/ext/standard/tests/array/array_values_variation7.phpt
index 660809357d9..d8253c7c023 100644
--- a/ext/standard/tests/array/array_values_variation7.phpt
+++ b/ext/standard/tests/array/array_values_variation7.phpt
@@ -3,7 +3,7 @@ Test array_values() function : usage variations - Internal order check
 --FILE--
 <?php
 /* Prototype  : array array_values(array $input)
- * Description: Return just the values from the input array 
+ * Description: Return just the values from the input array
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/array_values_variation_64bit.phpt b/ext/standard/tests/array/array_values_variation_64bit.phpt
index 8b1e2c0b0e7..066d35da845 100644
--- a/ext/standard/tests/array/array_values_variation_64bit.phpt
+++ b/ext/standard/tests/array/array_values_variation_64bit.phpt
@@ -19,8 +19,8 @@ var_dump( array_values($arr_resource) );
 
 echo "\n*** Testing array_values() with range checking ***\n";
 $arr_range = array(
-  2147483647, 
-  2147483648, 
+  2147483647,
+  2147483648,
   -2147483647,
   -2147483648,
   -0,
@@ -34,7 +34,7 @@ var_dump( array_values(array(1,2,3)) );
 var_dump( array_values(array()) );  // null array
 
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing array_values() with resource type ***
 array(2) {
   [0]=>
diff --git a/ext/standard/tests/array/array_walk.phpt b/ext/standard/tests/array/array_walk.phpt
index 35ef02e15e4..5808f4b9482 100644
--- a/ext/standard/tests/array/array_walk.phpt
+++ b/ext/standard/tests/array/array_walk.phpt
@@ -30,7 +30,7 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/standard/tests/array/array_walk_basic1.phpt b/ext/standard/tests/array/array_walk_basic1.phpt
index e4bdf1b895f..bb106b1fba9 100644
--- a/ext/standard/tests/array/array_walk_basic1.phpt
+++ b/ext/standard/tests/array/array_walk_basic1.phpt
@@ -3,7 +3,7 @@ Test array_walk() function : basic functionality - regular array
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -13,7 +13,7 @@ echo "*** Testing array_walk() : basic functionality ***\n";
 $fruits = array("lemon", "orange", "banana", "apple");
 
 /*  Prototype : test_print(mixed $item, mixed $key)
- *  Parameters : item - item in key/item pair 
+ *  Parameters : item - item in key/item pair
  *               key - key in key/item pair
  *  Description : prints the array values with keys
  */
@@ -21,16 +21,16 @@ function test_print($item, $key)
 {
    // dump the arguments to check that they are passed
    // with proper type
-   var_dump($item); // value 
-   var_dump($key);  // key 
+   var_dump($item); // value
+   var_dump($key);  // key
    echo "\n"; // new line to separate the output between each element
 }
 function with_userdata($item, $key, $user_data)
 {
    // dump the arguments to check that they are passed
    // with proper type
-   var_dump($item); // value 
-   var_dump($key);  // key 
+   var_dump($item); // value
+   var_dump($key);  // key
    var_dump($user_data); // user supplied data
    echo "\n"; // new line to separate the output between each element
 }
diff --git a/ext/standard/tests/array/array_walk_basic2.phpt b/ext/standard/tests/array/array_walk_basic2.phpt
index 3ef15605e71..ee5b4e9925c 100644
--- a/ext/standard/tests/array/array_walk_basic2.phpt
+++ b/ext/standard/tests/array/array_walk_basic2.phpt
@@ -3,7 +3,7 @@ Test array_walk() function : basic functionality - associative array
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -14,11 +14,11 @@ $fruits = array("d" => "lemon", "a" => "orange", "b" => "banana", "c" => "apple"
 
 // User defined callback functions
 /*  Prototype : test_alter(mixed $item, mixed $key, string $prefix)
- *  Parameters : item - value in key/value pair 
+ *  Parameters : item - value in key/value pair
  *               key - key in key/value pair
- *               prefix - string to be added 
+ *               prefix - string to be added
  *  Description : alters the array values by appending prefix string
- */ 
+ */
 function test_alter(&$item, $key, $prefix)
 {
   // dump the arguments to check that they are passed
@@ -30,7 +30,7 @@ function test_alter(&$item, $key, $prefix)
 }
 
 /*  Prototype : test_print(mixed $item, mixed $key)
- *  Parameters : item - value in key/value pair 
+ *  Parameters : item - value in key/value pair
  *               key - key in key/value pair
  *  Description : prints the array values with keys
  */
diff --git a/ext/standard/tests/array/array_walk_closure.phpt b/ext/standard/tests/array/array_walk_closure.phpt
index 4e22bb89464..3799fde1cca 100644
--- a/ext/standard/tests/array/array_walk_closure.phpt
+++ b/ext/standard/tests/array/array_walk_closure.phpt
@@ -93,7 +93,7 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/standard/tests/array/array_walk_error1.phpt b/ext/standard/tests/array/array_walk_error1.phpt
index 334dfe4ef75..fb77e92e8a2 100644
--- a/ext/standard/tests/array/array_walk_error1.phpt
+++ b/ext/standard/tests/array/array_walk_error1.phpt
@@ -3,7 +3,7 @@ Test array_walk() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_walk_error2.phpt b/ext/standard/tests/array/array_walk_error2.phpt
index fd3cbf5037c..a4026180fbf 100644
--- a/ext/standard/tests/array/array_walk_error2.phpt
+++ b/ext/standard/tests/array/array_walk_error2.phpt
@@ -3,7 +3,7 @@ Test array_walk() function : error conditions - callback parameters
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -35,12 +35,12 @@ try {
 
 // expected: Warning is suppressed
 try {
-	var_dump( @array_walk($input, "callback1") );  
+	var_dump( @array_walk($input, "callback1") );
 } catch (Throwable $e) {
 	echo "Exception: " . $e->getMessage() . "\n";
 }
 try {
-	var_dump( @array_walk($input, "callback2", 4) );  
+	var_dump( @array_walk($input, "callback2", 4) );
 } catch (Throwable $e) {
 	echo "Exception: " . $e->getMessage() . "\n";
 }
diff --git a/ext/standard/tests/array/array_walk_object1.phpt b/ext/standard/tests/array/array_walk_object1.phpt
index 3bd83fdab25..cd06ea30965 100644
--- a/ext/standard/tests/array/array_walk_object1.phpt
+++ b/ext/standard/tests/array/array_walk_object1.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_walk() function : object functionality  
+Test array_walk() function : object functionality
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -40,10 +40,10 @@ class MyClass
     $this->pub_value = $setVal;
     $this->pro_value = $setVal;
   }
-};    
+};
 
 // object for 'input' argument
-$input = new MyClass(10); 
+$input = new MyClass(10);
 
 var_dump( array_walk($input, "callback", 1));
 
diff --git a/ext/standard/tests/array/array_walk_object2.phpt b/ext/standard/tests/array/array_walk_object2.phpt
index 61d05297531..89442078b14 100644
--- a/ext/standard/tests/array/array_walk_object2.phpt
+++ b/ext/standard/tests/array/array_walk_object2.phpt
@@ -3,7 +3,7 @@ Test array_walk() function : object functionality - array of objects
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -21,7 +21,7 @@ echo "*** Testing array_walk() : array of objects ***\n";
  * Description : Function adds the addvalue to each element of an array
 */
 function callback_private($value, $key, $addValue)
-{ 
+{
   echo "value : ";
   var_dump($value->getValue());
   echo "key : ";
@@ -58,7 +58,7 @@ class MyClass
   {
     return $this->pro_value;
   }
-};    
+};
 
 // array containing objects of MyClass
 $input = array (
@@ -73,7 +73,7 @@ var_dump( array_walk($input, "callback_private", 1));
 echo "-- For public member --\n";
 var_dump( array_walk($input, "callback_public"));
 echo "-- For protected member --\n";
-var_dump( array_walk($input, "callback_protected")); 
+var_dump( array_walk($input, "callback_protected"));
 
 echo "Done"
 ?>
diff --git a/ext/standard/tests/array/array_walk_objects.phpt b/ext/standard/tests/array/array_walk_objects.phpt
index f9214d25a5d..fc04304fc5e 100644
--- a/ext/standard/tests/array/array_walk_objects.phpt
+++ b/ext/standard/tests/array/array_walk_objects.phpt
@@ -3,8 +3,8 @@ array_walk() and objects
 --FILE--
 <?php
 
-function walk($key, $value) { 
-	var_dump($value, $key); 
+function walk($key, $value) {
+	var_dump($value, $key);
 }
 
 class test {
@@ -28,7 +28,7 @@ array_walk($var, "walk");
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(3) "foo"
 string(3) "foo"
 string(3) "bar"
diff --git a/ext/standard/tests/array/array_walk_rec_objects.phpt b/ext/standard/tests/array/array_walk_rec_objects.phpt
index d2fa9b86eb0..a83c227a3bf 100644
--- a/ext/standard/tests/array/array_walk_rec_objects.phpt
+++ b/ext/standard/tests/array/array_walk_rec_objects.phpt
@@ -3,8 +3,8 @@ array_walk_recursive() and objects
 --FILE--
 <?php
 
-function walk($key, $value) { 
-	var_dump($value, $key); 
+function walk($key, $value) {
+	var_dump($value, $key);
 }
 
 class test {
@@ -28,7 +28,7 @@ array_walk_recursive($var, "walk");
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(3) "foo"
 string(3) "foo"
 string(3) "bar"
diff --git a/ext/standard/tests/array/array_walk_recursive1.phpt b/ext/standard/tests/array/array_walk_recursive1.phpt
index 65939d5eec3..a030011f7c4 100644
--- a/ext/standard/tests/array/array_walk_recursive1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive1.phpt
@@ -30,7 +30,7 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: array_walk_recursive() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/standard/tests/array/array_walk_recursive_basic1.phpt b/ext/standard/tests/array/array_walk_recursive_basic1.phpt
index df192b6a796..606861565c0 100644
--- a/ext/standard/tests/array/array_walk_recursive_basic1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_basic1.phpt
@@ -3,7 +3,7 @@ Test array_walk_recursive() function : basic functionality - regular array
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -13,7 +13,7 @@ echo "*** Testing array_walk_recursive() : basic functionality ***\n";
 $fruits = array("lemon", array("orange", "banana"), array("apple"));
 
 /*  Prototype : test_print(mixed $item, mixed $key)
- *  Parameters : item - item in key/item pair 
+ *  Parameters : item - item in key/item pair
  *               key - key in key/item pair
  *  Description : prints the array values with keys
  */
@@ -21,16 +21,16 @@ function test_print($item, $key)
 {
    // dump the arguments to check that they are passed
    // with proper type
-   var_dump($item); // value 
-   var_dump($key);  // key 
+   var_dump($item); // value
+   var_dump($key);  // key
    echo "\n"; // new line to separate the output between each element
 }
 function with_userdata($item, $key, $user_data)
 {
    // dump the arguments to check that they are passed
    // with proper type
-   var_dump($item); // value 
-   var_dump($key);  // key 
+   var_dump($item); // value
+   var_dump($key);  // key
    var_dump($user_data); // user supplied data
    echo "\n"; // new line to separate the output between each element
 }
diff --git a/ext/standard/tests/array/array_walk_recursive_basic2.phpt b/ext/standard/tests/array/array_walk_recursive_basic2.phpt
index a049c0b812f..ac5c35440f1 100644
--- a/ext/standard/tests/array/array_walk_recursive_basic2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_basic2.phpt
@@ -3,7 +3,7 @@ Test array_walk_recursive() function : basic functionality - associative array
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -14,11 +14,11 @@ $fruits = array("a" => "lemon", "b" => array( "c" => "orange", "d" => "banana"),
 
 // User defined callback functions
 /*  Prototype : test_alter(mixed $item, mixed $key, string $prefix)
- *  Parameters : item - value in key/value pair 
+ *  Parameters : item - value in key/value pair
  *               key - key in key/value pair
- *               prefix - string to be added 
+ *               prefix - string to be added
  *  Description : alters the array values by appending prefix string
- */ 
+ */
 function test_alter(&$item, $key, $prefix)
 {
   // dump the arguments to check that they are passed
@@ -30,7 +30,7 @@ function test_alter(&$item, $key, $prefix)
 }
 
 /*  Prototype : test_print(mixed $item, mixed $key)
- *  Parameters : item - value in key/value pair 
+ *  Parameters : item - value in key/value pair
  *               key - key in key/value pair
  *  Description : prints the array values with keys
  */
diff --git a/ext/standard/tests/array/array_walk_recursive_error1.phpt b/ext/standard/tests/array/array_walk_recursive_error1.phpt
index 75966e8833f..b149eecbfd7 100644
--- a/ext/standard/tests/array/array_walk_recursive_error1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_error1.phpt
@@ -3,7 +3,7 @@ Test array_walk_recursive() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_walk_recursive_error2.phpt b/ext/standard/tests/array/array_walk_recursive_error2.phpt
index 5a077c68869..b162a1c9dcd 100644
--- a/ext/standard/tests/array/array_walk_recursive_error2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_error2.phpt
@@ -3,7 +3,7 @@ Test array_walk_recursive() function : error conditions - callback parameters
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -35,12 +35,12 @@ try {
 
 // expected: Warning is suppressed
 try {
-	var_dump( @array_walk_recursive($input, "callback1") );  
+	var_dump( @array_walk_recursive($input, "callback1") );
 } catch (Throwable $e) {
 	echo "Exception: " . $e->getMessage() . "\n";
 }
 try {
-	var_dump( @array_walk_recursive($input, "callback2", 4) );  
+	var_dump( @array_walk_recursive($input, "callback2", 4) );
 } catch (Throwable $e) {
 	echo "Exception: " . $e->getMessage() . "\n";
 }
diff --git a/ext/standard/tests/array/array_walk_recursive_object1.phpt b/ext/standard/tests/array/array_walk_recursive_object1.phpt
index 5c01c55817d..0bfbeee0676 100644
--- a/ext/standard/tests/array/array_walk_recursive_object1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_object1.phpt
@@ -3,11 +3,11 @@ Test array_walk_recursive() function : object functionality
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
-/* Passing object in place of an 'input' argument to test object functionality 
+/* Passing object in place of an 'input' argument to test object functionality
  */
 echo "*** Testing array_walk_recursive() : object functionality ***\n";
 
@@ -38,10 +38,10 @@ class MyClass
     $this->pub_value = $setVal;
     $this->pro_value = $setVal;
   }
-};    
+};
 
 // object for 'input' argument
-$input = new MyClass(10); 
+$input = new MyClass(10);
 
 var_dump( array_walk_recursive($input, "callback", 1));
 
diff --git a/ext/standard/tests/array/array_walk_recursive_object2.phpt b/ext/standard/tests/array/array_walk_recursive_object2.phpt
index aa12fe869af..89e8feb71cb 100644
--- a/ext/standard/tests/array/array_walk_recursive_object2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_object2.phpt
@@ -3,7 +3,7 @@ Test array_walk_recursive() function : object functionality - array of objects
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -21,7 +21,7 @@ echo "*** Testing array_walk_recursive() : array of objects ***\n";
  * Description : Function adds the addvalue to each element of an array
 */
 function callback_private($value, $key, $addValue)
-{ 
+{
   echo "value : ";
   var_dump($value->getValue());
   echo "key : ";
@@ -58,7 +58,7 @@ class MyClass
   {
     return $this->pro_value;
   }
-};    
+};
 
 // array containing objects of MyClass
 $input = array (
@@ -75,7 +75,7 @@ var_dump( array_walk_recursive($input, "callback_private", 1));
 echo "-- For public member --\n";
 var_dump( array_walk_recursive($input, "callback_public"));
 echo "-- For protected member --\n";
-var_dump( array_walk_recursive($input, "callback_protected")); 
+var_dump( array_walk_recursive($input, "callback_protected"));
 
 echo "Done"
 ?>
diff --git a/ext/standard/tests/array/array_walk_recursive_variation1.phpt b/ext/standard/tests/array/array_walk_recursive_variation1.phpt
index 9ed67925985..daea816456c 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation1.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_walk_recursive() function : usage variations - unexpected values for 'input' argument 
+Test array_walk_recursive() function : usage variations - unexpected values for 'input' argument
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -65,7 +65,7 @@ $input_values = array(
 
          // empty data
 /* 16*/  "",
-         '', 
+         '',
 
          // string data
 /* 18*/  "string",
diff --git a/ext/standard/tests/array/array_walk_recursive_variation2.phpt b/ext/standard/tests/array/array_walk_recursive_variation2.phpt
index bef44b59ad6..5c8c56dcc2d 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation2.phpt
@@ -3,7 +3,7 @@ Test array_walk_recursive() function : usage variations - unexpected values in p
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_walk_recursive_variation3.phpt b/ext/standard/tests/array/array_walk_recursive_variation3.phpt
index 9abdc0b5c23..2a056acb26d 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation3.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation3.phpt
@@ -3,7 +3,7 @@ Test array_walk_recursive() function : usage variations - 'input' array with dif
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -29,11 +29,11 @@ echo "*** Testing array_walk_recursive() : 'input' array with different values**
 
 // different arrays as input
 $input_values = array(
-  
+
        // integer values
 /*1*/  array(array(1, 0, -10), array(023, -041), array(0x5A, 0X1F, -0x6E)),
-  
-       // float value 
+
+       // float value
        array(array(3.4, 0.8, -2.9), array(6.25e2, 8.20E-3)),
 
        // string values
@@ -58,7 +58,7 @@ $input_values = array(
 for($count = 0; $count < count($input_values); $count++) {
   echo "\n-- Iteration ".($count + 1)." --\n";
   var_dump( array_walk_recursive($input_values[$count], "print_value", $count+1));
-}  
+}
 echo "Done"
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_walk_recursive_variation4.phpt b/ext/standard/tests/array/array_walk_recursive_variation4.phpt
index 4db34979a4e..009148633ba 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation4.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation4.phpt
@@ -3,12 +3,12 @@ Test array_walk_recursive() function : usage variations - 'input' array with sub
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
 /*
- * Testing array_walk_recursive() with an array having subarrays as elements 
+ * Testing array_walk_recursive() with an array having subarrays as elements
 */
 
 echo "*** Testing array_walk_recursive() : array with subarray ***\n";
diff --git a/ext/standard/tests/array/array_walk_recursive_variation5.phpt b/ext/standard/tests/array/array_walk_recursive_variation5.phpt
index 688da57f017..666ead212c5 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation5.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation5.phpt
@@ -3,7 +3,7 @@ Test array_walk_recursive() function : usage variations - 'input' argument conta
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_walk_recursive_variation6.phpt b/ext/standard/tests/array/array_walk_recursive_variation6.phpt
index 747eb7403c4..423102dc552 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation6.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation6.phpt
@@ -3,12 +3,12 @@ Test array_walk_recursive() function : usage variations - 'input' argument as di
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
 /*
- * Passing 'input' argument as an associative array 
+ * Passing 'input' argument as an associative array
  *    with Numeric & string keys
 */
 
@@ -16,14 +16,14 @@ echo "*** Testing array_walk_recursive() : 'input' as an associative array ***\n
 
 // callback functions
 /* Prototype : for_numeric( int $value, int $key, int $user_data)
- * Parameters : $value - value from key/value pair of the array 
+ * Parameters : $value - value from key/value pair of the array
  *              $key - key from key/value pair of the array
  *              $user_data - data to be added to 'value'
  * Description : Function adds values with keys & user_data
  */
 function for_numeric($value, $key, $user_data)
 {
-  // dump the input values to see if they are 
+  // dump the input values to see if they are
   // passed with correct type
   var_dump($key);
   var_dump($value);
@@ -38,7 +38,7 @@ function for_numeric($value, $key, $user_data)
  */
 function for_string($value, $key)
 {
-  // dump the input values to see if they are 
+  // dump the input values to see if they are
   // passed with correct type
   var_dump($key);
   var_dump($value);
@@ -52,7 +52,7 @@ function for_string($value, $key)
  */
 function for_mixed($value, $key)
 {
-  // dump the input values to see if they are 
+  // dump the input values to see if they are
   // passed with correct type
   var_dump($key);
   var_dump($value);
diff --git a/ext/standard/tests/array/array_walk_recursive_variation7.phpt b/ext/standard/tests/array/array_walk_recursive_variation7.phpt
index bc0d2059009..06dc1aaa090 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation7.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation7.phpt
@@ -3,7 +3,7 @@ Test array_walk_recursive() function : usage variations - anonymous callback fun
 --FILE--
 <?php
 /* Prototype  : proto bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -30,7 +30,7 @@ echo "-- Anonymous function with three arguments --\n";
 var_dump( array_walk_recursive($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 10));
 
 echo "-- Anonymous function with one more argument --\n";
-var_dump( array_walk_recursive($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 20, 30)); 
+var_dump( array_walk_recursive($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 20, 30));
 
 echo "-- Anonymous function with null argument --\n";
 var_dump( array_walk_recursive( $input, function() { echo "1\n"; }));
diff --git a/ext/standard/tests/array/array_walk_recursive_variation8.phpt b/ext/standard/tests/array/array_walk_recursive_variation8.phpt
index 671fcdb375b..2db8067fe09 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation8.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation8.phpt
@@ -3,7 +3,7 @@ Test array_walk_recursive() function : usage variations - buit-in function as ca
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_walk_recursive_variation9.phpt b/ext/standard/tests/array/array_walk_recursive_variation9.phpt
index f18fe248c11..73619ada195 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation9.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation9.phpt
@@ -3,7 +3,7 @@ Test array_walk_recursive() function : usage variations - different callback fun
 --FILE--
 <?php
 /* Prototype  : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -46,7 +46,7 @@ function callback_no_parameter()
 var_dump( array_walk_recursive($input, 'callback_no_parameter'));
 
 echo "-- passing one more parameter to function with two parameters --\n";
-var_dump( array_walk_recursive($input, 'callback_two_parameter', 10)); 
+var_dump( array_walk_recursive($input, 'callback_two_parameter', 10));
 
 echo "Done"
 ?>
diff --git a/ext/standard/tests/array/array_walk_variation1.phpt b/ext/standard/tests/array/array_walk_variation1.phpt
index a45ce4da03d..f9d8782ed4c 100644
--- a/ext/standard/tests/array/array_walk_variation1.phpt
+++ b/ext/standard/tests/array/array_walk_variation1.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test array_walk() function : usage variations - unexpected values for 'input' argument 
+Test array_walk() function : usage variations - unexpected values for 'input' argument
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -65,7 +65,7 @@ $input_values = array(
 
          // empty data
 /* 16*/  "",
-         '', 
+         '',
 
          // string data
 /* 18*/  "string",
diff --git a/ext/standard/tests/array/array_walk_variation2.phpt b/ext/standard/tests/array/array_walk_variation2.phpt
index 5cfee36cb42..1780f66bae2 100644
--- a/ext/standard/tests/array/array_walk_variation2.phpt
+++ b/ext/standard/tests/array/array_walk_variation2.phpt
@@ -3,7 +3,7 @@ Test array_walk() function : usage variations - unexpected values in place of 'f
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_walk_variation3.phpt b/ext/standard/tests/array/array_walk_variation3.phpt
index 9ff7d5dfac9..5f33bc1f152 100644
--- a/ext/standard/tests/array/array_walk_variation3.phpt
+++ b/ext/standard/tests/array/array_walk_variation3.phpt
@@ -3,7 +3,7 @@ Test array_walk() function : usage variations - 'input' array with different val
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -29,11 +29,11 @@ echo "*** Testing array_walk() : 'input' array with different values***\n";
 
 // different arrays as input
 $input_values = array(
-  
+
        // integer values
 /*1*/  array(1, 0, -10, 023, -041, 0x5A, 0X1F, -0x6E),
-  
-       // float value 
+
+       // float value
        array(3.4, 0.8, -2.9, 6.25e2, 8.20E-3),
 
        // string values
@@ -58,7 +58,7 @@ $input_values = array(
 for($count = 0; $count < count($input_values); $count++) {
   echo "\n-- Iteration ".($count + 1)." --\n";
   var_dump( array_walk($input_values[$count], "print_value", $count+1));
-}  
+}
 echo "Done"
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/array_walk_variation4.phpt b/ext/standard/tests/array/array_walk_variation4.phpt
index 868732daaff..a94338209ae 100644
--- a/ext/standard/tests/array/array_walk_variation4.phpt
+++ b/ext/standard/tests/array/array_walk_variation4.phpt
@@ -3,12 +3,12 @@ Test array_walk() function : usage variations - 'input' array with subarray
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
 /*
- * Testing array_walk() with an array having subarrays as elements 
+ * Testing array_walk() with an array having subarrays as elements
 */
 
 echo "*** Testing array_walk() : array with subarray ***\n";
diff --git a/ext/standard/tests/array/array_walk_variation5.phpt b/ext/standard/tests/array/array_walk_variation5.phpt
index b5d262a7338..a3b910d3baf 100644
--- a/ext/standard/tests/array/array_walk_variation5.phpt
+++ b/ext/standard/tests/array/array_walk_variation5.phpt
@@ -3,7 +3,7 @@ Test array_walk() function : usage variations - 'input' argument containing refe
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_walk_variation6.phpt b/ext/standard/tests/array/array_walk_variation6.phpt
index c1f23233ec9..5b5711c647f 100644
--- a/ext/standard/tests/array/array_walk_variation6.phpt
+++ b/ext/standard/tests/array/array_walk_variation6.phpt
@@ -3,12 +3,12 @@ Test array_walk() function : usage variations - 'input' argument as diff. associ
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
 /*
- * Passing 'input' argument as an associative array 
+ * Passing 'input' argument as an associative array
  *    with Numeric & string keys
 */
 
@@ -16,14 +16,14 @@ echo "*** Testing array_walk() : 'input' as an associative array ***\n";
 
 // callback functions
 /* Prototype : for_numeric( int $value, int $key, int $user_data)
- * Parameters : $value - value from key/value pair of the array 
+ * Parameters : $value - value from key/value pair of the array
  *              $key - key from key/value pair of the array
  *              $user_data - data to be added to 'value'
  * Description : Function adds values with keys & user_data
  */
 function for_numeric($value, $key, $user_data)
 {
-  // dump the input values to see if they are 
+  // dump the input values to see if they are
   // passed with correct type
   var_dump($key);
   var_dump($value);
@@ -38,7 +38,7 @@ function for_numeric($value, $key, $user_data)
  */
 function for_string($value, $key)
 {
-  // dump the input values to see if they are 
+  // dump the input values to see if they are
   // passed with correct type
   var_dump($key);
   var_dump($value);
@@ -52,7 +52,7 @@ function for_string($value, $key)
  */
 function for_mixed($value, $key)
 {
-  // dump the input values to see if they are 
+  // dump the input values to see if they are
   // passed with correct type
   var_dump($key);
   var_dump($value);
diff --git a/ext/standard/tests/array/array_walk_variation7.phpt b/ext/standard/tests/array/array_walk_variation7.phpt
index 692f2766287..671ad44309c 100644
--- a/ext/standard/tests/array/array_walk_variation7.phpt
+++ b/ext/standard/tests/array/array_walk_variation7.phpt
@@ -3,7 +3,7 @@ Test array_walk() function : usage variations - anonymous callback function
 --FILE--
 <?php
 /* Prototype  : proto bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -30,7 +30,7 @@ echo "-- Anonymous function with three arguments --\n";
 var_dump( array_walk($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 10));
 
 echo "-- Anonymous function with one more argument --\n";
-var_dump( array_walk($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 20, 30)); 
+var_dump( array_walk($input, function($value, $key, $user_data) { var_dump($key); var_dump($value); var_dump($user_data); echo "\n"; }, 20, 30));
 
 echo "-- Anonymous function with null argument --\n";
 var_dump( array_walk( $input, function() { echo "1\n"; }));
diff --git a/ext/standard/tests/array/array_walk_variation8.phpt b/ext/standard/tests/array/array_walk_variation8.phpt
index 56a60e6b0f4..829baf1add2 100644
--- a/ext/standard/tests/array/array_walk_variation8.phpt
+++ b/ext/standard/tests/array/array_walk_variation8.phpt
@@ -3,7 +3,7 @@ Test array_walk() function : usage variations - buit-in function as callback
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/array_walk_variation9.phpt b/ext/standard/tests/array/array_walk_variation9.phpt
index 37077841af3..65ef50cc8e7 100644
--- a/ext/standard/tests/array/array_walk_variation9.phpt
+++ b/ext/standard/tests/array/array_walk_variation9.phpt
@@ -3,7 +3,7 @@ Test array_walk() function : usage variations - different callback functions
 --FILE--
 <?php
 /* Prototype  : bool array_walk(array $input, string $funcname [, mixed $userdata])
- * Description: Apply a user function to every member of an array 
+ * Description: Apply a user function to every member of an array
  * Source code: ext/standard/array.c
 */
 
@@ -46,7 +46,7 @@ function callback_no_parameter()
 var_dump( array_walk($input, 'callback_no_parameter'));
 
 echo "-- passing one more parameter to function with two parameters --\n";
-var_dump( array_walk($input, 'callback_two_parameter', 10)); 
+var_dump( array_walk($input, 'callback_two_parameter', 10));
 
 echo "Done"
 ?>
diff --git a/ext/standard/tests/array/arsort_basic.phpt b/ext/standard/tests/array/arsort_basic.phpt
index 24799ab771a..87c5138835b 100644
--- a/ext/standard/tests/array/arsort_basic.phpt
+++ b/ext/standard/tests/array/arsort_basic.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test arsort() function : basic functionality   
+Test arsort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool arsort ( array &$array [, int $sort_flags] )
  * Description: Sort an array and maintain index association
-                Elements will be arranged from highest to lowest when this function has completed. 
+                Elements will be arranged from highest to lowest when this function has completed.
  * Source code: ext/standard/array.c
 */
 
 /*
- * Testing arsort() by providing integer/string arrays to check the basic functionality 
+ * Testing arsort() by providing integer/string arrays to check the basic functionality
  * with following flag values.
  *  flag value as default
  *  SORT_REGULAR - compare items normally
@@ -19,13 +19,13 @@ Test arsort() function : basic functionality
 
 echo "*** Testing arsort() : basic functionality ***\n";
 
-// an array containing unsorted string values with indices  
+// an array containing unsorted string values with indices
 $unsorted_strings = array(
 	"l" => "lemon", "o" => "orange",
 	"O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20",
 	"b" => "banana",
 );
-// an array containing unsorted numeric values with indices 
+// an array containing unsorted numeric values with indices
 $unsorted_numerics =  array( 1 => 100, 2 => 33, 3 => 555, 4 => 22 );
 
 echo "\n-- Testing arsort() by supplying string array, 'flag' value is default --\n";
diff --git a/ext/standard/tests/array/arsort_error.phpt b/ext/standard/tests/array/arsort_error.phpt
index 676d8265ed9..5a24815697f 100644
--- a/ext/standard/tests/array/arsort_error.phpt
+++ b/ext/standard/tests/array/arsort_error.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test arsort() function : error conditions 
+Test arsort() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool arsort(array &array_arg [, int sort_flags])
- * Description: Sort an array 
+ * Description: Sort an array
  * Source code: ext/standard/array.c
 */
 
 /*
-* Testing arsort() function with all possible error conditions 
+* Testing arsort() function with all possible error conditions
 */
 
 echo "*** Testing arsort() : error conditions ***\n";
diff --git a/ext/standard/tests/array/arsort_object1.phpt b/ext/standard/tests/array/arsort_object1.phpt
index f73696392ea..75cee2de5b0 100644
--- a/ext/standard/tests/array/arsort_object1.phpt
+++ b/ext/standard/tests/array/arsort_object1.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test arsort() function : object functionality - sort objects  
+Test arsort() function : object functionality - sort objects
 --FILE--
 <?php
 /* Prototype  : bool arsort ( array &$array [, int $asort_flags] )
- * Description: Sort an array and maintain index association.  
+ * Description: Sort an array and maintain index association.
                 Elements will be arranged from highest to lowest when this function has completed.
  * Source code: ext/standard/array.c
 */
 
 /*
- * testing arsort() by providing integer/string object arrays with following flag values 
+ * testing arsort() by providing integer/string object arrays with following flag values
  * 1. Defualt flag value
  * 2. SORT_REGULAR - compare items normally
 */
@@ -44,14 +44,14 @@ class for_string_arsort
 }
 
 // array of integer objects
-$unsorted_int_obj = array ( 
+$unsorted_int_obj = array (
   1 => new for_integer_arsort(11), 2 =>  new for_integer_asort(66),
   3 => new for_integer_arsort(23), 4 => new for_integer_asort(-5),
   5 => new for_integer_arsort(0.001), 6 => new for_integer_asort(0)
 );
 
 // array of string objects
-$unsorted_str_obj = array ( 
+$unsorted_str_obj = array (
   "a" => new for_string_arsort("axx"), "b" => new for_string_asort("t"),
   "c" => new for_string_arsort("w"), "d" => new for_string_asort("py"),
   "e" => new for_string_arsort("apple"), "f" => new for_string_asort("Orange"),
diff --git a/ext/standard/tests/array/arsort_object2.phpt b/ext/standard/tests/array/arsort_object2.phpt
index f5ed3336232..338c8524462 100644
--- a/ext/standard/tests/array/arsort_object2.phpt
+++ b/ext/standard/tests/array/arsort_object2.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test arsort() function : object functionality - sorting objects with diff. accessibility of member vars 
+Test arsort() function : object functionality - sorting objects with diff. accessibility of member vars
 --FILE--
 <?php
 /* Prototype  : bool arsort ( array &$array [, int $asort_flags] )
- * Description: Sort an array and maintain index association.  
+ * Description: Sort an array and maintain index association.
                 Elements will be arranged from highest to lowest when this function has completed.
  * Source code: ext/standard/array.c
 */
 
 /*
- * testing arsort() by providing integer/string object arrays with following flag values 
+ * testing arsort() by providing integer/string object arrays with following flag values
  * 1. Defualt flag value
    2. SORT_REGULAR - compare items normally
 */
@@ -21,7 +21,7 @@ class for_integer_arsort
 {
   public $public_class_value;
   private $private_class_value;
-  protected $protected_class_value; 
+  protected $protected_class_value;
   // initializing object member value
   function __construct($value1, $value2,$value3){
     $this->public_class_value = $value1;
@@ -36,7 +36,7 @@ class for_string_arsort
 {
   public $public_class_value;
   private $private_class_value;
-  protected $protected_class_value; 
+  protected $protected_class_value;
   // initializing object member value
   function __construct($value1, $value2,$value3){
     $this->public_class_value = $value1;
@@ -51,13 +51,13 @@ class for_string_arsort
 }
 
 // array of integer objects
-$unsorted_int_obj = array ( 
+$unsorted_int_obj = array (
   1 => new for_integer_arsort(11, 33,2), 2 =>  new for_integer_asort(44, 66,3),
   3 => new for_integer_arsort(23, 32,6), 4 => new for_integer_asort(-88, -5,-4),
 );
 
 // array of string objects
-$unsorted_str_obj = array ( 
+$unsorted_str_obj = array (
   "a" => new for_string_arsort("axx","AXX","d"), "b" => new for_string_asort("T", "t","q"),
   "c" => new for_string_arsort("w", "W","c"), "d" => new for_string_asort("PY", "py","s"),
 );
diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt
index acf39e75e6b..7deb964b9db 100644
--- a/ext/standard/tests/array/arsort_variation1.phpt
+++ b/ext/standard/tests/array/arsort_variation1.phpt
@@ -4,7 +4,7 @@ Test arsort() function : usage variations - unexpected values for 'array_arg' ar
 <?php
 /* Prototype  : bool arsort(array &array_arg [, int sort_flags])
  * Description: Sort an array and maintain index association
-                Elements will be arranged from highest to lowest when this function has completed. 
+                Elements will be arranged from highest to lowest when this function has completed.
  * Source code: ext/standard/array.c
 */
 
@@ -76,7 +76,7 @@ $unexpected_values = array (
 // loop though each element of the array and check the working of arsort()
 // when $array argument is supplied with different values from $unexpected_values
 echo "\n-- Testing arsort() by supplying different unexpected values for 'array' argument --\n";
-echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
+echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n";
 
 $counter = 1;
 for($index = 0; $index < count($unexpected_values); $index ++) {
diff --git a/ext/standard/tests/array/arsort_variation10.phpt b/ext/standard/tests/array/arsort_variation10.phpt
index ec483df3ad1..bd249531e77 100644
--- a/ext/standard/tests/array/arsort_variation10.phpt
+++ b/ext/standard/tests/array/arsort_variation10.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test arsort() function : usage variations - sort octal values 
+Test arsort() function : usage variations - sort octal values
 --FILE--
 <?php
 /* Prototype  : bool arsort ( array &$array [, int $sort_flags] )
- * Description: Sort an array and maintain index association. 
+ * Description: Sort an array and maintain index association.
                 Elements will be arranged from highest to lowest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -18,8 +18,8 @@ Test arsort() function : usage variations - sort octal values
 echo "*** Testing arsort() : usage variations ***\n";
 
 // an array contains unsorted octal values
-$unsorted_oct_array = array ( 
-   01235 => 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772, 
+$unsorted_oct_array = array (
+   01235 => 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772,
    077 => 077, -066 => -066, -0345 => -0345, 0 => 0
 );
 
diff --git a/ext/standard/tests/array/arsort_variation11.phpt b/ext/standard/tests/array/arsort_variation11.phpt
index 0ab1c8abf56..b70c3ad6c4c 100644
Binary files a/ext/standard/tests/array/arsort_variation11.phpt and b/ext/standard/tests/array/arsort_variation11.phpt differ
diff --git a/ext/standard/tests/array/arsort_variation2.phpt b/ext/standard/tests/array/arsort_variation2.phpt
index 1db1efe25d6..901c03950f2 100644
--- a/ext/standard/tests/array/arsort_variation2.phpt
+++ b/ext/standard/tests/array/arsort_variation2.phpt
@@ -78,7 +78,7 @@ for($index = 0; $index < count($unexpected_values); $index ++) {
   echo "-- Iteration $counter --\n";
   $value = $unexpected_values [$index];
   $temp_array = $unsorted_values;
-  var_dump( arsort($temp_array, $value) ); 
+  var_dump( arsort($temp_array, $value) );
   var_dump($temp_array);
   $counter++;
 }
diff --git a/ext/standard/tests/array/arsort_variation3.phpt b/ext/standard/tests/array/arsort_variation3.phpt
index 765efe874d1..9f8d47f47ca 100644
--- a/ext/standard/tests/array/arsort_variation3.phpt
+++ b/ext/standard/tests/array/arsort_variation3.phpt
@@ -3,7 +3,7 @@ Test arsort() function : usage variations - sort integer/float values
 --FILE--
 <?php
 /* Prototype  : bool arsort ( array &$array [, int $sort_flags] )
- * Description: Sort an array and maintain index association 
+ * Description: Sort an array and maintain index association
                 Elements will be arranged from highest to lowest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -27,7 +27,7 @@ $various_arrays = array(
 
   // mixed value array
   array(1 => .0001, 2 => .0021, 3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, 8 => -.9, 9 => 10.6E-2, 10 => -10.6E-2, 11 => 33),
- 
+
   // array values contains minimum and maximum ranges
   array(1 => 2147483647, 2 => 2147483648, 3 => -2147483647, 4 => -2147483648, 5 => -0, 6 => 0, 7 => -2147483649)
 );
@@ -42,20 +42,20 @@ echo "\n-- Testing arsort() by supplying various integer/float arrays --\n";
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With default sort_flag -\n"; 
-  $temp_array = $array; 
+  echo "- With default sort_flag -\n";
+  $temp_array = $array;
   var_dump(arsort($temp_array) );
   var_dump($temp_array);
 
   // loop through $flag_value array and setting all possible flag values
   foreach($flag_value as $key => $flag){
     echo "- Sort_flag = $key -\n";
-    $temp_array = $array; 
+    $temp_array = $array;
     var_dump(arsort($temp_array, $flag) );
     var_dump($temp_array);
-  }  
+  }
   $count++;
-} 
+}
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/arsort_variation4.phpt b/ext/standard/tests/array/arsort_variation4.phpt
index a76a180f408..2d72a6d7760 100644
--- a/ext/standard/tests/array/arsort_variation4.phpt
+++ b/ext/standard/tests/array/arsort_variation4.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test arsort() function : usage variations - sort reference variables   
+Test arsort() function : usage variations - sort reference variables
 --FILE--
 <?php
 /* Prototype  : bool arsort ( array &$array [, int $sort_flags] )
- * Description: Sort an array and maintain index association. 
+ * Description: Sort an array and maintain index association.
                 Elements will be arranged from highest to lowest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -21,7 +21,7 @@ $value1 = 100;
 $value2 = 33;
 $value3 = 555;
 
-// an array containing integer references 
+// an array containing integer references
 $unsorted_numerics =  array( 1 => &$value1 , 2 => &$value2, 3 => &$value3);
 
 echo "\n-- Testing arsort() by supplying reference variable array, 'flag' value is defualt --\n";
diff --git a/ext/standard/tests/array/arsort_variation5.phpt b/ext/standard/tests/array/arsort_variation5.phpt
index 187d43c4825..acdff90957c 100644
--- a/ext/standard/tests/array/arsort_variation5.phpt
+++ b/ext/standard/tests/array/arsort_variation5.phpt
@@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool arsort ( array &$array [, int $asort_flags] )
- * Description: Sort an array and maintain index association 
+ * Description: Sort an array and maintain index association
                 Elements will be arranged from highest to lowest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -23,14 +23,14 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 echo "*** Testing arsort() : usage variations ***\n";
 
 $various_arrays = array (
-  // group of escape sequences 
-  array ("null"=>  null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", 
-        "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", 
+  // group of escape sequences
+  array ("null"=>  null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e",
+        "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh",
         "\ddd" => "\ddd", "\v" => "\v"
         ),
 
-  // array contains combination of capital/small letters 
-  array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", 
+  // array contains combination of capital/small letters
+  array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test",
         'T' => "TTTT", 't' => "ttt", 'w' => "ww", 'x' => "x", 'X' => "X", 'o' => "oraNGe",
         'B' => "BANANA"
         )
diff --git a/ext/standard/tests/array/arsort_variation6.phpt b/ext/standard/tests/array/arsort_variation6.phpt
index 687b20a7147..32e732dd4a8 100644
--- a/ext/standard/tests/array/arsort_variation6.phpt
+++ b/ext/standard/tests/array/arsort_variation6.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test arsort() function : usage variations - sort hexadecimal values 
+Test arsort() function : usage variations - sort hexadecimal values
 --FILE--
 <?php
 /* Prototype  : bool arsort ( array &$array [, int $asort_flags] )
- * Description: Sort an array and maintain index association. 
+ * Description: Sort an array and maintain index association.
                 Elements will be arranged from highest to lowest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -17,7 +17,7 @@ Test arsort() function : usage variations - sort hexadecimal values
 
 echo "*** Testing arsort() : usage variations ***\n";
 
-// an array contains unsorted hexadecimal values  
+// an array contains unsorted hexadecimal values
 // There are multiple keys which are duplicate and the later should be picked
 $unsorted_hex_array = array ( 0x1AB => 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB,
                               0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa
diff --git a/ext/standard/tests/array/arsort_variation7.phpt b/ext/standard/tests/array/arsort_variation7.phpt
index dc661b572e6..b4bbdd0d0e2 100644
--- a/ext/standard/tests/array/arsort_variation7.phpt
+++ b/ext/standard/tests/array/arsort_variation7.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test arsort() function : usage variations - sort bool values 
+Test arsort() function : usage variations - sort bool values
 --FILE--
 <?php
 /* Prototype  : bool arsort ( array &$array [, int $sort_flags] )
- * Description: This function arsorts an array. 
+ * Description: This function arsorts an array.
                 Elements will be arranged from highest to lowest when this function has completed.
  * Source code: ext/standard/array.c
 */
diff --git a/ext/standard/tests/array/arsort_variation8.phpt b/ext/standard/tests/array/arsort_variation8.phpt
index c2473160c96..87593d54379 100644
--- a/ext/standard/tests/array/arsort_variation8.phpt
+++ b/ext/standard/tests/array/arsort_variation8.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test arsort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as default/SORT_REGULAR 
+Test arsort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as default/SORT_REGULAR
 --FILE--
 <?php
 /* Prototype  : bool arsort ( array &$array [, int $sort_flags] )
- * Description: Sort an array and maintain index association. 
+ * Description: Sort an array and maintain index association.
                 Elements will be arranged from highest to lowest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -29,7 +29,7 @@ $various_arrays = array (
   "array[2]" => array("data[2,0]" => 44, "data[2,1]" => 11, "sub_array[2][0] " => array(64,61) ),
 
   // array contains sub arrays
-  "array[3]" => array ( "sub_array[3][0]" => array(33,-5,6), "sub_array[3][1]" => array(11), 
+  "array[3]" => array ( "sub_array[3][0]" => array(33,-5,6), "sub_array[3][1]" => array(11),
                         "sub_array[3][2]" => array(22,-55), "sub_array[3][3]" => array() )
 );
 
@@ -39,8 +39,8 @@ echo "\n-- Testing arsort() by supplying various arrays containing sub arrays --
 
 // loop through to test arsort() with different arrays
 foreach ($various_arrays as $array) {
- 
-  echo "\n-- Iteration $count --\n"; 
+
+  echo "\n-- Iteration $count --\n";
   // testing arsort() function by supplying different arrays, flag value is default
   echo "- With default sort_flag -\n";
   $temp_array = $array;
diff --git a/ext/standard/tests/array/arsort_variation9.phpt b/ext/standard/tests/array/arsort_variation9.phpt
index 1e319e783c9..2e746e2fa4c 100644
--- a/ext/standard/tests/array/arsort_variation9.phpt
+++ b/ext/standard/tests/array/arsort_variation9.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test arsort() function : usage variations - sorting arrays with/without keys, 'sort_flags' as default/SORT_REGULAR  
+Test arsort() function : usage variations - sorting arrays with/without keys, 'sort_flags' as default/SORT_REGULAR
 --FILE--
 <?php
 /* Prototype  : bool arsort ( array &$array [, int $sort_flags] )
- * Description: Sort an array and maintain index association. 
+ * Description: Sort an array and maintain index association.
                 Elements will be arranged from highest to lowest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -30,8 +30,8 @@ $various_arrays = array (
 $count = 1;
 echo "\n-- Testing arsort() by supplying various arrays with key values --\n";
 
-// loop through to test arsort() with different arrays, 
-// to test the new keys for the elements in the sorted array 
+// loop through to test arsort() with different arrays,
+// to test the new keys for the elements in the sorted array
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
diff --git a/ext/standard/tests/array/asort_basic.phpt b/ext/standard/tests/array/asort_basic.phpt
index b80d31d37f0..4bc5ce02356 100644
--- a/ext/standard/tests/array/asort_basic.phpt
+++ b/ext/standard/tests/array/asort_basic.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test asort() function : basic functionality   
+Test asort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool asort ( array &$array [, int $sort_flags] )
  * Description: Sort an array and maintain index association
-                Elements will be arranged from lowest to highest when this function has completed. 
+                Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
 
 /*
- * Testing asort() by providing integer/string arrays to check the basic functionality 
+ * Testing asort() by providing integer/string arrays to check the basic functionality
  * with following flag values.
  *  flag value as default
  *  SORT_REGULAR - compare items normally
@@ -19,13 +19,13 @@ Test asort() function : basic functionality
 
 echo "*** Testing asort() : basic functionality ***\n";
 
-// an array containing unsorted string values with indices  
+// an array containing unsorted string values with indices
 $unsorted_strings = array(
 	"l" => "lemon", "o" => "orange",
 	"O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20",
 	"b" => "banana",
 );
-// an array containing unsorted numeric values with indices 
+// an array containing unsorted numeric values with indices
 $unsorted_numerics =  array( 1 => 100, 2 => 33, 3 => 555, 4 => 22 );
 
 echo "\n-- Testing asort() by supplying string array, 'flag' value is default --\n";
diff --git a/ext/standard/tests/array/asort_error.phpt b/ext/standard/tests/array/asort_error.phpt
index ef2329585bf..821663fa641 100644
--- a/ext/standard/tests/array/asort_error.phpt
+++ b/ext/standard/tests/array/asort_error.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test asort() function : error conditions 
+Test asort() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool asort(array &array_arg [, int sort_flags])
- * Description: Sort an array 
+ * Description: Sort an array
  * Source code: ext/standard/array.c
 */
 
 /*
-* Testing asort() function with all possible error conditions 
+* Testing asort() function with all possible error conditions
 */
 
 echo "*** Testing asort() : error conditions ***\n";
diff --git a/ext/standard/tests/array/asort_object1.phpt b/ext/standard/tests/array/asort_object1.phpt
index ad54675d649..21984de67e6 100644
--- a/ext/standard/tests/array/asort_object1.phpt
+++ b/ext/standard/tests/array/asort_object1.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test asort() function : object functionality - sort objects  
+Test asort() function : object functionality - sort objects
 --FILE--
 <?php
 /* Prototype  : bool asort ( array &$array [, int $asort_flags] )
- * Description: Sort an array and maintain index association.  
+ * Description: Sort an array and maintain index association.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
 
 /*
- * testing asort() by providing integer/string object arrays with following flag values 
+ * testing asort() by providing integer/string object arrays with following flag values
  * 1. Defualt flag value
  * 2. SORT_REGULAR - compare items normally
 */
@@ -44,14 +44,14 @@ class for_string_asort
 }
 
 // array of integer objects
-$unsorted_int_obj = array ( 
+$unsorted_int_obj = array (
   1 => new for_integer_asort(11), 2 =>  new for_integer_asort(66),
   3 => new for_integer_asort(23), 4 => new for_integer_asort(-5),
   5 => new for_integer_asort(0.001), 6 => new for_integer_asort(0)
 );
 
 // array of string objects
-$unsorted_str_obj = array ( 
+$unsorted_str_obj = array (
   "a" => new for_string_asort("axx"), "b" => new for_string_asort("t"),
   "c" => new for_string_asort("w"), "d" => new for_string_asort("py"),
   "e" => new for_string_asort("apple"), "f" => new for_string_asort("Orange"),
diff --git a/ext/standard/tests/array/asort_object2.phpt b/ext/standard/tests/array/asort_object2.phpt
index be761205b2a..8f2a6661462 100644
--- a/ext/standard/tests/array/asort_object2.phpt
+++ b/ext/standard/tests/array/asort_object2.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test asort() function : object functionality - sorting objects with diff. accessibility of member vars 
+Test asort() function : object functionality - sorting objects with diff. accessibility of member vars
 --FILE--
 <?php
 /* Prototype  : bool asort ( array &$array [, int $asort_flags] )
- * Description: Sort an array and maintain index association.  
+ * Description: Sort an array and maintain index association.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
 
 /*
- * testing asort() by providing integer/string object arrays with following flag values 
+ * testing asort() by providing integer/string object arrays with following flag values
  * 1. Defualt flag value
    2. SORT_REGULAR - compare items normally
 */
@@ -21,7 +21,7 @@ class for_integer_asort
 {
   public $public_class_value;
   private $private_class_value;
-  protected $protected_class_value; 
+  protected $protected_class_value;
   // initializing object member value
   function __construct($value1, $value2,$value3){
     $this->public_class_value = $value1;
@@ -36,7 +36,7 @@ class for_string_asort
 {
   public $public_class_value;
   private $private_class_value;
-  protected $protected_class_value; 
+  protected $protected_class_value;
   // initializing object member value
   function __construct($value1, $value2,$value3){
     $this->public_class_value = $value1;
@@ -51,13 +51,13 @@ class for_string_asort
 }
 
 // array of integer objects
-$unsorted_int_obj = array ( 
+$unsorted_int_obj = array (
   1 => new for_integer_asort(11, 33,2), 2 =>  new for_integer_asort(44, 66,3),
   3 => new for_integer_asort(23, 32,6), 4 => new for_integer_asort(-88, -5,-4),
 );
 
 // array of string objects
-$unsorted_str_obj = array ( 
+$unsorted_str_obj = array (
   "a" => new for_string_asort("axx","AXX","d"), "b" => new for_string_asort("T", "t","q"),
   "c" => new for_string_asort("w", "W","c"), "d" => new for_string_asort("PY", "py","s"),
 );
diff --git a/ext/standard/tests/array/asort_variation1.phpt b/ext/standard/tests/array/asort_variation1.phpt
index 1713f12919b..15c4faa67ae 100644
--- a/ext/standard/tests/array/asort_variation1.phpt
+++ b/ext/standard/tests/array/asort_variation1.phpt
@@ -4,7 +4,7 @@ Test asort() function : usage variations - unexpected values for 'array_arg' arg
 <?php
 /* Prototype  : bool asort(array &array_arg [, int sort_flags])
  * Description: Sort an array and maintain index association
-                Elements will be arranged from lowest to highest when this function has completed. 
+                Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
 
@@ -76,7 +76,7 @@ $unexpected_values = array (
 // loop though each element of the array and check the working of asort()
 // when $array argument is supplied with different values from $unexpected_values
 echo "\n-- Testing asort() by supplying different unexpected values for 'array' argument --\n";
-echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
+echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n";
 
 $counter = 1;
 for($index = 0; $index < count($unexpected_values); $index ++) {
diff --git a/ext/standard/tests/array/asort_variation10.phpt b/ext/standard/tests/array/asort_variation10.phpt
index f51945bf9e9..39b05c17000 100644
--- a/ext/standard/tests/array/asort_variation10.phpt
+++ b/ext/standard/tests/array/asort_variation10.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test asort() function : usage variations - sort octal values 
+Test asort() function : usage variations - sort octal values
 --FILE--
 <?php
 /* Prototype  : bool asort ( array &$array [, int $sort_flags] )
- * Description: Sort an array and maintain index association. 
+ * Description: Sort an array and maintain index association.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -18,8 +18,8 @@ Test asort() function : usage variations - sort octal values
 echo "*** Testing asort() : usage variations ***\n";
 
 // an array contains unsorted octal values
-$unsorted_oct_array = array ( 
-   01235 => 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772, 
+$unsorted_oct_array = array (
+   01235 => 01235, 0321 => 0321, 0345 => 0345, 066 => 066, 0772 => 0772,
    077 => 077, -066 => -066, -0345 => -0345, 0 => 0
 );
 
diff --git a/ext/standard/tests/array/asort_variation11.phpt b/ext/standard/tests/array/asort_variation11.phpt
index 013865f2c2d..6872ca235ce 100644
Binary files a/ext/standard/tests/array/asort_variation11.phpt and b/ext/standard/tests/array/asort_variation11.phpt differ
diff --git a/ext/standard/tests/array/asort_variation2.phpt b/ext/standard/tests/array/asort_variation2.phpt
index ce2247f8943..c35d112034f 100644
--- a/ext/standard/tests/array/asort_variation2.phpt
+++ b/ext/standard/tests/array/asort_variation2.phpt
@@ -78,7 +78,7 @@ for($index = 0; $index < count($unexpected_values); $index ++) {
   echo "-- Iteration $counter --\n";
   $value = $unexpected_values [$index];
   $temp_array = $unsorted_values;
-  var_dump( asort($temp_array, $value) ); 
+  var_dump( asort($temp_array, $value) );
   var_dump($temp_array);
   $counter++;
 }
diff --git a/ext/standard/tests/array/asort_variation3.phpt b/ext/standard/tests/array/asort_variation3.phpt
index a9d3f6afa3e..4ad106b6583 100644
--- a/ext/standard/tests/array/asort_variation3.phpt
+++ b/ext/standard/tests/array/asort_variation3.phpt
@@ -3,7 +3,7 @@ Test asort() function : usage variations - sort integer/float values
 --FILE--
 <?php
 /* Prototype  : bool asort ( array &$array [, int $sort_flags] )
- * Description: Sort an array and maintain index association 
+ * Description: Sort an array and maintain index association
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -27,7 +27,7 @@ $various_arrays = array(
 
   // mixed value array
   array(1 => .0001, 2 => .0021, 3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, 8 => -.9, 9 => 10.6E-2, 10 => -10.6E-2, 11 => 33),
- 
+
   // array values contains minimum and maximum ranges
   array(1 => 2147483647, 2 => 2147483648, 3 => -2147483647, 4 => -2147483648, 5 => -0, 6 => 0, 7 => -2147483649)
 );
@@ -42,20 +42,20 @@ echo "\n-- Testing asort() by supplying various integer/float arrays --\n";
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With default sort_flag -\n"; 
-  $temp_array = $array; 
+  echo "- With default sort_flag -\n";
+  $temp_array = $array;
   var_dump(asort($temp_array) );
   var_dump($temp_array);
 
   // loop through $flag_value array and setting all possible flag values
   foreach($flag_value as $key => $flag){
     echo "- Sort_flag = $key -\n";
-    $temp_array = $array; 
+    $temp_array = $array;
     var_dump(asort($temp_array, $flag) );
     var_dump($temp_array);
-  }  
+  }
   $count++;
-} 
+}
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/asort_variation4.phpt b/ext/standard/tests/array/asort_variation4.phpt
index 9fd76009ffc..222ed2d1d0e 100644
--- a/ext/standard/tests/array/asort_variation4.phpt
+++ b/ext/standard/tests/array/asort_variation4.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test asort() function : usage variations - sort reference variables   
+Test asort() function : usage variations - sort reference variables
 --FILE--
 <?php
 /* Prototype  : bool asort ( array &$array [, int $sort_flags] )
- * Description: Sort an array and maintain index association. 
+ * Description: Sort an array and maintain index association.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -21,7 +21,7 @@ $value1 = 100;
 $value2 = 33;
 $value3 = 555;
 
-// an array containing integer references 
+// an array containing integer references
 $unsorted_numerics =  array( 1 => &$value1 , 2 => &$value2, 3 => &$value3);
 
 echo "\n-- Testing asort() by supplying reference variable array, 'flag' value is defualt --\n";
diff --git a/ext/standard/tests/array/asort_variation5.phpt b/ext/standard/tests/array/asort_variation5.phpt
index 3d6a12ef27f..ae7c3c47843 100644
--- a/ext/standard/tests/array/asort_variation5.phpt
+++ b/ext/standard/tests/array/asort_variation5.phpt
@@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool asort ( array &$array [, int $asort_flags] )
- * Description: Sort an array and maintain index association 
+ * Description: Sort an array and maintain index association
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -23,14 +23,14 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 echo "*** Testing asort() : usage variations ***\n";
 
 $various_arrays = array (
-  // group of escape sequences 
-  array ("null"=>  null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", 
-        "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", 
+  // group of escape sequences
+  array ("null"=>  null, "NULL" => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e",
+        "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh",
         "\ddd" => "\ddd", "\v" => "\v"
         ),
 
-  // array contains combination of capital/small letters 
-  array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test", 
+  // array contains combination of capital/small letters
+  array ('l' => "lemoN", 'O' => "Orange", 'b' => "banana", 'a' => "apple", 'Te' => "Test",
         'T' => "TTTT", 't' => "ttt", 'w' => "ww", 'x' => "x", 'X' => "X", 'o' => "oraNGe",
         'B' => "BANANA"
         )
diff --git a/ext/standard/tests/array/asort_variation6.phpt b/ext/standard/tests/array/asort_variation6.phpt
index 117f30d38b4..3d9b5e5070d 100644
--- a/ext/standard/tests/array/asort_variation6.phpt
+++ b/ext/standard/tests/array/asort_variation6.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test asort() function : usage variations - sort hexadecimal values 
+Test asort() function : usage variations - sort hexadecimal values
 --FILE--
 <?php
 /* Prototype  : bool asort ( array &$array [, int $asort_flags] )
- * Description: Sort an array and maintain index association. 
+ * Description: Sort an array and maintain index association.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -17,7 +17,7 @@ Test asort() function : usage variations - sort hexadecimal values
 
 echo "*** Testing asort() : usage variations ***\n";
 
-// an array contains unsorted hexadecimal values  
+// an array contains unsorted hexadecimal values
 // There are multiple keys which are duplicate and the later should be picked
 $unsorted_hex_array = array ( 0x1AB => 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB,
                               0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa
diff --git a/ext/standard/tests/array/asort_variation7.phpt b/ext/standard/tests/array/asort_variation7.phpt
index c078eb042cd..10c03cb8403 100644
--- a/ext/standard/tests/array/asort_variation7.phpt
+++ b/ext/standard/tests/array/asort_variation7.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test asort() function : usage variations - sort bool values 
+Test asort() function : usage variations - sort bool values
 --FILE--
 <?php
 /* Prototype  : bool asort ( array &$array [, int $sort_flags] )
- * Description: This function asorts an array. 
+ * Description: This function asorts an array.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
diff --git a/ext/standard/tests/array/asort_variation8.phpt b/ext/standard/tests/array/asort_variation8.phpt
index 561cc7d708e..9e8c2c92965 100644
--- a/ext/standard/tests/array/asort_variation8.phpt
+++ b/ext/standard/tests/array/asort_variation8.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test asort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as default/SORT_REGULAR 
+Test asort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as default/SORT_REGULAR
 --FILE--
 <?php
 /* Prototype  : bool asort ( array &$array [, int $sort_flags] )
- * Description: Sort an array and maintain index association. 
+ * Description: Sort an array and maintain index association.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -29,7 +29,7 @@ $various_arrays = array (
   "array[2]" => array("data[2,0]" => 44, "data[2,1]" => 11, "sub_array[2][0] " => array(64,61) ),
 
   // array contains sub arrays
-  "array[3]" => array ( "sub_array[3][0]" => array(33,-5,6), "sub_array[3][1]" => array(11), 
+  "array[3]" => array ( "sub_array[3][0]" => array(33,-5,6), "sub_array[3][1]" => array(11),
                         "sub_array[3][2]" => array(22,-55), "sub_array[3][3]" => array() )
 );
 
@@ -39,8 +39,8 @@ echo "\n-- Testing asort() by supplying various arrays containing sub arrays --\
 
 // loop through to test asort() with different arrays
 foreach ($various_arrays as $array) {
- 
-  echo "\n-- Iteration $count --\n"; 
+
+  echo "\n-- Iteration $count --\n";
   // testing asort() function by supplying different arrays, flag value is default
   echo "- With default sort_flag -\n";
   $temp_array = $array;
diff --git a/ext/standard/tests/array/asort_variation9.phpt b/ext/standard/tests/array/asort_variation9.phpt
index 85ef679daa9..60b647b5d53 100644
--- a/ext/standard/tests/array/asort_variation9.phpt
+++ b/ext/standard/tests/array/asort_variation9.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test asort() function : usage variations - sorting arrays with/without keys, 'sort_flags' as default/SORT_REGULAR  
+Test asort() function : usage variations - sorting arrays with/without keys, 'sort_flags' as default/SORT_REGULAR
 --FILE--
 <?php
 /* Prototype  : bool asort ( array &$array [, int $sort_flags] )
- * Description: Sort an array and maintain index association. 
+ * Description: Sort an array and maintain index association.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -30,8 +30,8 @@ $various_arrays = array (
 $count = 1;
 echo "\n-- Testing asort() by supplying various arrays with key values --\n";
 
-// loop through to test asort() with different arrays, 
-// to test the new keys for the elements in the sorted array 
+// loop through to test asort() with different arrays,
+// to test the new keys for the elements in the sorted array
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
diff --git a/ext/standard/tests/array/bug21998.phpt b/ext/standard/tests/array/bug21998.phpt
index aa52dc590a1..e1bb0033ead 100644
--- a/ext/standard/tests/array/bug21998.phpt
+++ b/ext/standard/tests/array/bug21998.phpt
@@ -7,11 +7,11 @@ $a = array("a", "b", "c");
 
 var_dump(key($a));
 var_dump(array_pop($a));
-var_dump(key($a));      
+var_dump(key($a));
 var_dump(array_pop($a));
-var_dump(key($a));      
+var_dump(key($a));
 var_dump(array_pop($a));
-var_dump(key($a));      
+var_dump(key($a));
 
 ?>
 --EXPECT--
diff --git a/ext/standard/tests/array/bug22463.phpt b/ext/standard/tests/array/bug22463.phpt
index dcede511bb4..7993ac2576a 100644
--- a/ext/standard/tests/array/bug22463.phpt
+++ b/ext/standard/tests/array/bug22463.phpt
@@ -8,7 +8,7 @@ function a($ary) {
 }
 
 function cb($v, $elem) {
-	return $v + a($elem); 
+	return $v + a($elem);
 }
 
 $ary = array(
diff --git a/ext/standard/tests/array/bug24198.phpt b/ext/standard/tests/array/bug24198.phpt
index b1cd5230267..a1a30afb6d3 100644
--- a/ext/standard/tests/array/bug24198.phpt
+++ b/ext/standard/tests/array/bug24198.phpt
@@ -2,9 +2,9 @@
 Bug #24198 (array_merge_recursive() invalid recursion detection)
 --FILE--
 <?php
-$c = array('a' => 'aa','b' => 'bb'); 
+$c = array('a' => 'aa','b' => 'bb');
 
-var_dump(array_merge_recursive($c, $c)); 
+var_dump(array_merge_recursive($c, $c));
 ?>
 --EXPECT--
 array(2) {
diff --git a/ext/standard/tests/array/bug24980.phpt b/ext/standard/tests/array/bug24980.phpt
index b9e04fd67f3..6c97562f6ce 100644
--- a/ext/standard/tests/array/bug24980.phpt
+++ b/ext/standard/tests/array/bug24980.phpt
@@ -9,7 +9,7 @@ function add_up($running_total, $current_value)
 	$running_total += $current_value * $current_value;
 	return $running_total;
 }
-                        
+
 $numbers = array (2,3,5,7);
 $total = array_reduce($numbers, 'add_up');
 print "Total is $total\n";
@@ -21,7 +21,7 @@ function foo ($a, $b)
 	return $a . $b;
 }
 var_dump(array_reduce($a, "foo"));
-                        
+
 /* test #3: basic test (used to leak memory) */
 function rsum($v, $w)
 {
diff --git a/ext/standard/tests/array/bug30074.phpt b/ext/standard/tests/array/bug30074.phpt
index 7720fe00067..289e802c00f 100644
--- a/ext/standard/tests/array/bug30074.phpt
+++ b/ext/standard/tests/array/bug30074.phpt
@@ -3,7 +3,7 @@ Bug #30074 (EG(uninitialized_zval_ptr) gets set to reference using EXTR_REFS, af
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_NOTICE);   // We don't want the notice for $undefined
-$result = extract(array('a'=>$undefined), EXTR_REFS); 
+$result = extract(array('a'=>$undefined), EXTR_REFS);
 var_dump(array($a));
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/bug30833.phpt b/ext/standard/tests/array/bug30833.phpt
index 728a659d8fe..c79c33fa74d 100644
--- a/ext/standard/tests/array/bug30833.phpt
+++ b/ext/standard/tests/array/bug30833.phpt
@@ -13,7 +13,7 @@ var_dump($foo);
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 array(2) {
   [0]=>
   string(3) "abc"
diff --git a/ext/standard/tests/array/bug33382.phpt b/ext/standard/tests/array/bug33382.phpt
index e54b984fd03..0153da90bda 100644
--- a/ext/standard/tests/array/bug33382.phpt
+++ b/ext/standard/tests/array/bug33382.phpt
@@ -11,7 +11,7 @@ var_dump(array_reverse($array));
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 array(5) {
   [0]=>
   int(5)
diff --git a/ext/standard/tests/array/bug34066.phpt b/ext/standard/tests/array/bug34066.phpt
index 023f4176fc1..9110379d9d7 100644
--- a/ext/standard/tests/array/bug34066.phpt
+++ b/ext/standard/tests/array/bug34066.phpt
@@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix)
 }
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 gen_xml(prefix=/Docs/)
 gen_xml(prefix=/Docs/@)
 /Docs/@Version=1.0
diff --git a/ext/standard/tests/array/bug34066_1.phpt b/ext/standard/tests/array/bug34066_1.phpt
index 6d0f7f84e93..2f0a361aa07 100644
--- a/ext/standard/tests/array/bug34066_1.phpt
+++ b/ext/standard/tests/array/bug34066_1.phpt
@@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix)
 }
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 gen_xml(prefix=/Docs/)
 /Docs/Version=1.0
 gen_xml(prefix=/Docs/) end
diff --git a/ext/standard/tests/array/bug35014.phpt b/ext/standard/tests/array/bug35014.phpt
index 9250c03e108..f858bf107b7 100644
--- a/ext/standard/tests/array/bug35014.phpt
+++ b/ext/standard/tests/array/bug35014.phpt
@@ -22,7 +22,7 @@ foreach ($tests as $v) {
 	var_dump(array_product($v));
 }
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: array_product() expects parameter 1 to be array, string given in %s on line %d
 NULL
 int(1)
diff --git a/ext/standard/tests/array/bug35014_64bit.phpt b/ext/standard/tests/array/bug35014_64bit.phpt
index efd791ac993..5caf48c6ee4 100644
--- a/ext/standard/tests/array/bug35014_64bit.phpt
+++ b/ext/standard/tests/array/bug35014_64bit.phpt
@@ -22,7 +22,7 @@ foreach ($tests as $v) {
 	var_dump(array_product($v));
 }
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: array_product() expects parameter 1 to be array, string given in %s on line %d
 NULL
 int(1)
diff --git a/ext/standard/tests/array/bug35022.phpt b/ext/standard/tests/array/bug35022.phpt
index e3f5386482f..07138f138d5 100644
--- a/ext/standard/tests/array/bug35022.phpt
+++ b/ext/standard/tests/array/bug35022.phpt
@@ -13,7 +13,7 @@ foo($state);
 reset($state);
 var_dump( key($state), current($state) );
 ?>
---EXPECT--	
+--EXPECT--
 three => 3
 two => 2
 one => 1
diff --git a/ext/standard/tests/array/bug35821.phpt b/ext/standard/tests/array/bug35821.phpt
index d7abc7773b0..be48ca85702 100644
--- a/ext/standard/tests/array/bug35821.phpt
+++ b/ext/standard/tests/array/bug35821.phpt
@@ -21,7 +21,7 @@ array_map(array('Element', 'CallBack'), $arr);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 
 Fatal error: Uncaught Exception in %s:%d
 Stack trace:
diff --git a/ext/standard/tests/array/bug36975.phpt b/ext/standard/tests/array/bug36975.phpt
index 7912fffca4c..67a34325d05 100644
--- a/ext/standard/tests/array/bug36975.phpt
+++ b/ext/standard/tests/array/bug36975.phpt
@@ -2,13 +2,13 @@
 Bug #36975 (natcasesort() causes array_pop() to misbehave)
 --FILE--
 <?php
-$a = array('aa', 'aa', 'bb', 'bb', 'cc', 'cc');                  
+$a = array('aa', 'aa', 'bb', 'bb', 'cc', 'cc');
 $test = natcasesort($a);
-if ($test) {                                                            
-  echo "natcasesort success!\n";                                        
-}                                                                       
-$val = array_pop($a);                                            
-$a[] = $val;                                                     
+if ($test) {
+  echo "natcasesort success!\n";
+}
+$val = array_pop($a);
+$a[] = $val;
 var_dump($a);
 
 $b = array(1 => 'foo', 0 => 'baz');
diff --git a/ext/standard/tests/array/bug38464.phpt b/ext/standard/tests/array/bug38464.phpt
index 42f7a6ab545..5480109ba20 100644
--- a/ext/standard/tests/array/bug38464.phpt
+++ b/ext/standard/tests/array/bug38464.phpt
@@ -5,7 +5,7 @@ Bug #38464 (array_count_values() mishandles numeric strings)
 $array = array('-000', ' 001', 1, ' 123', '+123');
 var_dump(array_count_values($array));
 ?>
---EXPECT--	
+--EXPECT--
 array(5) {
   ["-000"]=>
   int(1)
diff --git a/ext/standard/tests/array/bug39576.phpt b/ext/standard/tests/array/bug39576.phpt
index f94aa3a2be2..bb58e791834 100644
--- a/ext/standard/tests/array/bug39576.phpt
+++ b/ext/standard/tests/array/bug39576.phpt
@@ -32,7 +32,7 @@ array_intersect_key (
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Notice: Only variables should be passed by reference in %s on line %d
 object(Test)#%d (4) {
   ["_table"]=>
diff --git a/ext/standard/tests/array/bug40191.phpt b/ext/standard/tests/array/bug40191.phpt
index 244ce787afb..db239487ea4 100644
--- a/ext/standard/tests/array/bug40191.phpt
+++ b/ext/standard/tests/array/bug40191.phpt
@@ -15,7 +15,7 @@ var_dump($arr);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: array_unique() expects parameter 1 to be array, object given in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/array/bug40709.phpt b/ext/standard/tests/array/bug40709.phpt
index 7e132ba3d4c..93836d0398d 100644
--- a/ext/standard/tests/array/bug40709.phpt
+++ b/ext/standard/tests/array/bug40709.phpt
@@ -19,7 +19,7 @@ echo "result for arr2: ".array_reduce($arr2,'CommaSeparatedList')."\n";
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 result for arr1: 1,2,3
 result for arr2: 1
 result for arr1: 1,2,3
diff --git a/ext/standard/tests/array/bug41121.phpt b/ext/standard/tests/array/bug41121.phpt
index a03bdaf4ce9..b2d133ef13e 100644
--- a/ext/standard/tests/array/bug41121.phpt
+++ b/ext/standard/tests/array/bug41121.phpt
@@ -12,8 +12,8 @@ var_dump(range(2147483400, 2147483600, 100));
 var_dump( range(2147483646, 2147483648, 1 ) );
 var_dump( range(2147483646, 2147483657, 1 ) );
 var_dump( range(2147483630, 2147483646, 5 ) );
- 
-// negative steps  
+
+// negative steps
 var_dump( range(-2147483645, -2147483648, 1 ) );
 var_dump( range(-2147483645, -2147483649, 1 ) );
 var_dump( range(-2147483630, -2147483646, 5 ) );
@@ -23,7 +23,7 @@ var_dump(range(2147483647, 2147483645, 1 ));
 var_dump(range(2147483648, 2147483645, 1 ));
 
 ?>
---EXPECT--	
+--EXPECT--
 array(3) {
   [0]=>
   int(2147483400)
diff --git a/ext/standard/tests/array/bug41686.phpt b/ext/standard/tests/array/bug41686.phpt
index 9f1384eddd4..4c41607d347 100644
--- a/ext/standard/tests/array/bug41686.phpt
+++ b/ext/standard/tests/array/bug41686.phpt
@@ -6,17 +6,17 @@ $a = array(1,2,3);
 $b = array('a'=>1,'b'=>1,'c'=>2);
 
 var_dump(
-		array_slice($a, 1), 
+		array_slice($a, 1),
 		array_slice($a, 1, 2, TRUE),
-		array_slice($a, 1, NULL, TRUE), 
-		array_slice($b, 1), 
-		array_slice($b, 1, 2, TRUE), 
+		array_slice($a, 1, NULL, TRUE),
+		array_slice($b, 1),
+		array_slice($b, 1, 2, TRUE),
 		array_slice($b, 1, NULL, TRUE)
 );
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 array(2) {
   [0]=>
   int(2)
diff --git a/ext/standard/tests/array/bug42850.phpt b/ext/standard/tests/array/bug42850.phpt
index 3baec831bd6..16063bbdfcf 100644
--- a/ext/standard/tests/array/bug42850.phpt
+++ b/ext/standard/tests/array/bug42850.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Bug #42850 (array_walk_recursive() leaves references) 
+Bug #42850 (array_walk_recursive() leaves references)
 --FILE--
 <?php
 
 // Bug #42850
 $data = array ('key1' => 'val1', array('key2' => 'val2'));
-function apply_dumb($item, $key) {}; 
+function apply_dumb($item, $key) {};
 var_dump($data);
 array_walk_recursive($data, 'apply_dumb');
 $data2 = $data;
diff --git a/ext/standard/tests/array/bug43495.phpt b/ext/standard/tests/array/bug43495.phpt
index 8b8f3a6edb3..522ff1903b5 100644
--- a/ext/standard/tests/array/bug43495.phpt
+++ b/ext/standard/tests/array/bug43495.phpt
@@ -8,7 +8,7 @@ $a["key1"]["key2"]["key3"]=&$a;
 $b=array("key1"=>array("key2"=>array()));
 $b["key1"]["key2"]["key3"]=&$b;
 
-array_merge_recursive($a,$b); 
+array_merge_recursive($a,$b);
 
 /* Break recursion */
 $a["key1"]["key2"]["key3"] = null;
diff --git a/ext/standard/tests/array/bug48484.phpt b/ext/standard/tests/array/bug48484.phpt
index 0b4afe277a4..5688c0cad8b 100644
--- a/ext/standard/tests/array/bug48484.phpt
+++ b/ext/standard/tests/array/bug48484.phpt
@@ -4,5 +4,5 @@ Bug 48484 (array_product() always returns 0 for an empty array)
 <?php
 var_dump(array_product(array()));
 ?>
---EXPECT--	
+--EXPECT--
 int(1)
diff --git a/ext/standard/tests/array/bug50006_1.phpt b/ext/standard/tests/array/bug50006_1.phpt
index 3df67f3a4bd..13d70bc42a4 100644
--- a/ext/standard/tests/array/bug50006_1.phpt
+++ b/ext/standard/tests/array/bug50006_1.phpt
@@ -5,7 +5,7 @@ Bug #50006 (Segfault caused by uksort()) - usort variant
 
 $data = array(
     'bar-bazbazbaz.',
-    'bar-bazbazbaz-', 
+    'bar-bazbazbaz-',
     'foo'
 );
 usort($data, 'magic_sort_cmp');
diff --git a/ext/standard/tests/array/bug50006_2.phpt b/ext/standard/tests/array/bug50006_2.phpt
index 48bb751703a..04e799eaff5 100644
--- a/ext/standard/tests/array/bug50006_2.phpt
+++ b/ext/standard/tests/array/bug50006_2.phpt
@@ -5,7 +5,7 @@ Bug #50006 (Segfault caused by uksort()) - uasort variant
 
 $data = array(
     'bar-bazbazbaz.',
-    'bar-bazbazbaz-', 
+    'bar-bazbazbaz-',
     'foo'
 );
 uasort($data, 'magic_sort_cmp');
diff --git a/ext/standard/tests/array/bug61058.phpt b/ext/standard/tests/array/bug61058.phpt
index 1f0f6fe630d..f5e06a4a02d 100644
--- a/ext/standard/tests/array/bug61058.phpt
+++ b/ext/standard/tests/array/bug61058.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #61058 (array_fill leaks if start index is PHP_INT_MAX)
 --FILE--
-<?php 
+<?php
 array_fill(PHP_INT_MAX, 2, '*');
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/bug65304.phpt b/ext/standard/tests/array/bug65304.phpt
index e5c9dfc5e6a..8ed4c5081b9 100644
--- a/ext/standard/tests/array/bug65304.phpt
+++ b/ext/standard/tests/array/bug65304.phpt
@@ -5,6 +5,6 @@ Bug #65304 (Use of max int in array_sum)
 var_dump(array_sum(array(PHP_INT_MAX, 1)));
 var_dump(PHP_INT_MAX + 1);
 ?>
---EXPECTF--	
+--EXPECTF--
 float(%s)
 float(%s)
diff --git a/ext/standard/tests/array/bug68553.phpt b/ext/standard/tests/array/bug68553.phpt
index 91c5b080a9e..fbee975d17a 100644
--- a/ext/standard/tests/array/bug68553.phpt
+++ b/ext/standard/tests/array/bug68553.phpt
@@ -8,7 +8,7 @@ while ($i--) {
 	$fd = fopen(__FILE__, "r");
 	fclose($fd);
 }
-$a = [ 
+$a = [
 	['a' => 10],
 	['a' => 20],
 	['a' => true],
diff --git a/ext/standard/tests/array/bug70713.phpt b/ext/standard/tests/array/bug70713.phpt
index 4e2792ab4bf..7cd0a0f113f 100644
--- a/ext/standard/tests/array/bug70713.phpt
+++ b/ext/standard/tests/array/bug70713.phpt
@@ -8,12 +8,12 @@ class obj
 	function __tostring()
 	{
 		global $arr;
-		
+
 		$arr = 1;
 		for ($i = 0; $i < 5; $i++) {
 			$v[$i] = 'hi'.$i;
 		}
-		
+
 		return 'hi';
 	}
 }
diff --git a/ext/standard/tests/array/bug71220.phpt b/ext/standard/tests/array/bug71220.phpt
index 28b5c08a8a8..49e5bb77192 100644
--- a/ext/standard/tests/array/bug71220.phpt
+++ b/ext/standard/tests/array/bug71220.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #71220 (Null pointer deref (segfault) in compact via ob_start)
 --FILE--
-<?php 
+<?php
 ob_start("compact");
 ob_end_clean();
 ?>
diff --git a/ext/standard/tests/array/compact_basic.phpt b/ext/standard/tests/array/compact_basic.phpt
index 53a946e12ac..9f4021a409c 100644
--- a/ext/standard/tests/array/compact_basic.phpt
+++ b/ext/standard/tests/array/compact_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test compact() function : basic functionality 
+Test compact() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto array compact(mixed var_names [, mixed ...])
- * Description: Creates a hash containing variables and their values 
+ * Description: Creates a hash containing variables and their values
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/array/compact_error.phpt b/ext/standard/tests/array/compact_error.phpt
index a7ef54597ed..9216ac9ba67 100644
--- a/ext/standard/tests/array/compact_error.phpt
+++ b/ext/standard/tests/array/compact_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test compact() function : error conditions 
+Test compact() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto array compact(mixed var_names [, mixed ...])
- * Description: Creates a hash containing variables and their values 
+ * Description: Creates a hash containing variables and their values
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/array/count_basic.phpt b/ext/standard/tests/array/count_basic.phpt
index 45f63d6a491..766592585a1 100644
--- a/ext/standard/tests/array/count_basic.phpt
+++ b/ext/standard/tests/array/count_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test count() function : basic functionality 
+Test count() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int count(mixed $var [, int $mode])
- * Description: Count the number of elements in a variable (usually an array) 
+ * Description: Count the number of elements in a variable (usually an array)
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/count_error.phpt b/ext/standard/tests/array/count_error.phpt
index 76f7213645e..32d15edc6fc 100644
--- a/ext/standard/tests/array/count_error.phpt
+++ b/ext/standard/tests/array/count_error.phpt
@@ -3,7 +3,7 @@ Test count() function : error conditions - pass incorrect number of args
 --FILE--
 <?php
 /* Prototype  : int count(mixed var [, int mode])
- * Description: Count the number of elements in a variable (usually an array) 
+ * Description: Count the number of elements in a variable (usually an array)
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/count_recursive.phpt b/ext/standard/tests/array/count_recursive.phpt
index b903d8b1892..1e73bef27a8 100644
--- a/ext/standard/tests/array/count_recursive.phpt
+++ b/ext/standard/tests/array/count_recursive.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test count() function 
+Test count() function
 --SKIPIF--
 <?php if (!extension_loaded("spl")) die("skip no SPL extension"); ?>
 --FILE--
@@ -48,9 +48,9 @@ $count_array = array(
   array( "a" => 1, "b" => -2.344, "b" => "string", "c" => NULL, "d" => -2.344),
   array( 4 => 1, 3 => -2.344, "3" => "string", "2" => NULL,
          1 => -2.344, array()),
-  array( TRUE => TRUE, FALSE => FALSE, "" => "", " " => " ", 
+  array( TRUE => TRUE, FALSE => FALSE, "" => "", " " => " ",
 	 NULL => NULL, "\x000" => "\x000", "\000" => "\000"),
-  array( NULL, 1.23 => "Hi", "string" => "hello", 
+  array( NULL, 1.23 => "Hi", "string" => "hello",
          array("" => "World", "-2.34" => "a", "0" => "b"))
 );
 
@@ -58,14 +58,14 @@ $i = 0;
 foreach ($count_array as $count_value) {
   echo "\n-- Iteration $i --\n";
   print "COUNT_NORMAL is ".count($count_value, COUNT_NORMAL)."\n";
-  print "COUNT_RECURSIVE is ".count($count_value, COUNT_RECURSIVE)."\n";  
+  print "COUNT_RECURSIVE is ".count($count_value, COUNT_RECURSIVE)."\n";
   $i++;
 }
 
 
 /* Testing count() by passing constant with no second argument */
 print "\n-- Testing count() on constants with no second argument --\n";
-print "COUNT_NORMAL: should be 1, is ".count(100)."\n"; 
+print "COUNT_NORMAL: should be 1, is ".count(100)."\n";
 print "COUNT_NORMAL: should be 1, is ".count(-23.45)."\n";
 
 print "\n-- Testing count() on NULL and Unset variables --\n";
@@ -106,13 +106,13 @@ echo "\n-- Testing count() on arrays containing references --\n";
 $arr = array(1, array("a", "b", "c"));
 $arr[2] = &$arr[1];
 
-$mode_arr = array( COUNT_NORMAL, COUNT_RECURSIVE, 0, 1, -1, -1.45, 2, TRUE, 
+$mode_arr = array( COUNT_NORMAL, COUNT_RECURSIVE, 0, 1, -1, -1.45, 2, TRUE,
                    FALSE, NULL);
 for( $i =0; $i < count( $mode_arr ); $i++) {
   echo "For mode '$mode_arr[$i]' count is => ";
   var_dump(count($arr, $mode_arr[$i]));
 }
-  
+
 
 echo "\n-- Testing error conditions --";
 var_dump( count() );  // No. of args = 0
diff --git a/ext/standard/tests/array/count_variation1.phpt b/ext/standard/tests/array/count_variation1.phpt
index a58473c2190..5152f65445f 100644
--- a/ext/standard/tests/array/count_variation1.phpt
+++ b/ext/standard/tests/array/count_variation1.phpt
@@ -3,7 +3,7 @@ Test count() function : usage variations - Pass different data types as $var arg
 --FILE--
 <?php
 /* Prototype  : int count(mixed $var [, int $mode])
- * Description: Count the number of elements in a variable (usually an array) 
+ * Description: Count the number of elements in a variable (usually an array)
  * Source code: ext/standard/array.c
  */
 
@@ -58,7 +58,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -67,7 +67,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/standard/tests/array/count_variation2.phpt b/ext/standard/tests/array/count_variation2.phpt
index b3d583866ca..67c8938ecac 100644
--- a/ext/standard/tests/array/count_variation2.phpt
+++ b/ext/standard/tests/array/count_variation2.phpt
@@ -5,7 +5,7 @@ Test count() function : usage variations - Pass different data types as $mode ar
 --FILE--
 <?php
 /* Prototype  : int count(mixed $var [, int $mode])
- * Description: Count the number of elements in a variable (usually an array) 
+ * Description: Count the number of elements in a variable (usually an array)
  * Source code: ext/standard/array.c
  */
 
@@ -63,7 +63,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -72,7 +72,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/standard/tests/array/count_variation3.phpt b/ext/standard/tests/array/count_variation3.phpt
index e11b4c2449c..417e2e20ccc 100644
--- a/ext/standard/tests/array/count_variation3.phpt
+++ b/ext/standard/tests/array/count_variation3.phpt
@@ -3,7 +3,7 @@ Test count() function : usage variations - Infinitely recursive array
 --FILE--
 <?php
 /* Prototype  : int count(mixed $var [, int $mode])
- * Description: Count the number of elements in a variable (usually an array) 
+ * Description: Count the number of elements in a variable (usually an array)
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/current_basic.phpt b/ext/standard/tests/array/current_basic.phpt
index cec6959778f..f95ca85d192 100644
--- a/ext/standard/tests/array/current_basic.phpt
+++ b/ext/standard/tests/array/current_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test current() function : basic functionality 
+Test current() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : mixed current(array $array_arg)
- * Description: Return the element currently pointed to by the internal array pointer 
+ * Description: Return the element currently pointed to by the internal array pointer
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/current_variation1.phpt b/ext/standard/tests/array/current_variation1.phpt
index 580f6dddc06..39918cc4b18 100644
--- a/ext/standard/tests/array/current_variation1.phpt
+++ b/ext/standard/tests/array/current_variation1.phpt
@@ -60,7 +60,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -69,7 +69,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/standard/tests/array/current_variation2.phpt b/ext/standard/tests/array/current_variation2.phpt
index 49769cea3f3..d839370962c 100644
--- a/ext/standard/tests/array/current_variation2.phpt
+++ b/ext/standard/tests/array/current_variation2.phpt
@@ -67,13 +67,13 @@ $inputs = array(
        TRUE,
        FALSE,
        ),
-       
+
        // empty data
 /*5*/ 'empty string' => array(
        "",
        '',
        ),
-       
+
 /*6*/ 'empty array' => array(
        ),
 
@@ -83,7 +83,7 @@ $inputs = array(
        'string',
        $heredoc,
        ),
-       
+
        // object data
 /*8*/ 'object' => array(
        new classA(),
diff --git a/ext/standard/tests/array/each.phpt b/ext/standard/tests/array/each.phpt
index f1b6f76ea6b..74e571160ea 100644
Binary files a/ext/standard/tests/array/each.phpt and b/ext/standard/tests/array/each.phpt differ
diff --git a/ext/standard/tests/array/each_basic.phpt b/ext/standard/tests/array/each_basic.phpt
index b12b4c19f77..cd38682dc70 100644
--- a/ext/standard/tests/array/each_basic.phpt
+++ b/ext/standard/tests/array/each_basic.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test each() function : basic functionality 
+Test each() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array each(array $arr)
- * Description: Return the currently pointed key..value pair in the passed array, 
- * and advance the pointer to the next element 
+ * Description: Return the currently pointed key..value pair in the passed array,
+ * and advance the pointer to the next element
  * Source code: Zend/zend_builtin_functions.c
  */
 
 /*
- * Test basic functionality of each() 
+ * Test basic functionality of each()
  */
 
 echo "*** Testing each() : basic functionality ***\n";
diff --git a/ext/standard/tests/array/each_error.phpt b/ext/standard/tests/array/each_error.phpt
index 0806bee674a..88055ce589e 100644
--- a/ext/standard/tests/array/each_error.phpt
+++ b/ext/standard/tests/array/each_error.phpt
@@ -3,8 +3,8 @@ Test each() function : error conditions - pass incorrect number of args
 --FILE--
 <?php
 /* Prototype  : array each(array $arr)
- * Description: Return the currently pointed key..value pair in the passed array, 
- * and advance the pointer to the next element 
+ * Description: Return the currently pointed key..value pair in the passed array,
+ * and advance the pointer to the next element
  * Source code: Zend/zend_builtin_functions.c
  */
 
diff --git a/ext/standard/tests/array/each_variation1.phpt b/ext/standard/tests/array/each_variation1.phpt
index becdfc45456..a9e27cf3f9a 100644
--- a/ext/standard/tests/array/each_variation1.phpt
+++ b/ext/standard/tests/array/each_variation1.phpt
@@ -4,7 +4,7 @@ Test each() function : usage variations - Pass different data types as $arr arg
 <?php
 /* Prototype  : array each(array $arr)
  * Description: Return the currently pointed key..value pair in the passed array,
- * and advance the pointer to the next element 
+ * and advance the pointer to the next element
  * Source code: Zend/zend_builtin_functions.c
  */
 
@@ -59,7 +59,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -69,7 +69,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/each_variation2.phpt b/ext/standard/tests/array/each_variation2.phpt
index 73b1ba27468..e3dff968ff0 100644
--- a/ext/standard/tests/array/each_variation2.phpt
+++ b/ext/standard/tests/array/each_variation2.phpt
@@ -4,7 +4,7 @@ Test each() function : usage variations - arrays of different data types
 <?php
 /* Prototype  : array each(array $arr)
  * Description: Return the currently pointed key..value pair in the passed array,
- * and advance the pointer to the next element 
+ * and advance the pointer to the next element
  * Source code: Zend/zend_builtin_functions.c
  */
 
@@ -67,13 +67,13 @@ $inputs = array(
        TRUE,
        FALSE,
        ),
-       
+
        // empty data
 /*5*/ 'empty string' => array(
        "",
        '',
        ),
-       
+
 /*6*/ 'empty array' => array(
        ),
 
@@ -83,7 +83,7 @@ $inputs = array(
        'string',
        $heredoc,
        ),
-       
+
        // object data
 /*8*/ 'object' => array(
        new classA(),
diff --git a/ext/standard/tests/array/each_variation3.phpt b/ext/standard/tests/array/each_variation3.phpt
index 375615643f9..8a0773f0b57 100644
--- a/ext/standard/tests/array/each_variation3.phpt
+++ b/ext/standard/tests/array/each_variation3.phpt
@@ -4,7 +4,7 @@ Test each() function : usage variations - keys of different data types
 <?php
 /* Prototype  : array each(array $arr)
  * Description: Return the currently pointed key..value pair in the passed array,
- * and advance the pointer to the next element 
+ * and advance the pointer to the next element
  * Source code: Zend/zend_builtin_functions.c
  */
 
@@ -40,7 +40,7 @@ $inputs = array(
        -10.5 => 'negative',
        .5 => 'half',
        ),
-       
+
 /*3*/  'extreme floats' => array(
        12.3456789000e6 => 'large',
        12.3456789000E-10 => 'small',
@@ -49,8 +49,8 @@ $inputs = array(
        // null data
 /*4*/ 'null uppercase' => array(
        NULL => 'null 1',
-       ), 
-       
+       ),
+
 /*5*/  'null lowercase' => array(
        null => 'null 2',
        ),
@@ -60,17 +60,17 @@ $inputs = array(
        true => 'lowert',
        false => 'lowerf',
        ),
-       
+
 /*7*/  'bool uppercase' => array(
        TRUE => 'uppert',
        FALSE => 'upperf',
        ),
-       
+
        // empty data
 /*8*/ 'empty double quotes' => array(
        "" => 'emptyd',
        ),
-       
+
 /*9*/  'empty single quotes' => array(
        '' => 'emptys',
        ),
diff --git a/ext/standard/tests/array/each_variation4.phpt b/ext/standard/tests/array/each_variation4.phpt
index 14b55361353..7cddd3e5c3c 100644
--- a/ext/standard/tests/array/each_variation4.phpt
+++ b/ext/standard/tests/array/each_variation4.phpt
@@ -4,7 +4,7 @@ Test each() function : usage variations - Referenced variables
 <?php
 /* Prototype  : array each(array $arr)
  * Description: Return the currently pointed key..value pair in the passed array,
- * and advance the pointer to the next element 
+ * and advance the pointer to the next element
  * Source code: Zend/zend_builtin_functions.c
  */
 
diff --git a/ext/standard/tests/array/each_variation5.phpt b/ext/standard/tests/array/each_variation5.phpt
index b6c39538a32..b06e344eb86 100644
--- a/ext/standard/tests/array/each_variation5.phpt
+++ b/ext/standard/tests/array/each_variation5.phpt
@@ -4,7 +4,7 @@ Test each() function : usage variations - Multi-dimensional arrays
 <?php
 /* Prototype  : array each(array $arr)
  * Description: Return the currently pointed key..value pair in the passed array,
- * and advance the pointer to the next element 
+ * and advance the pointer to the next element
  * Source code: Zend/zend_builtin_functions.c
  */
 
diff --git a/ext/standard/tests/array/each_variation6.phpt b/ext/standard/tests/array/each_variation6.phpt
index ba0f2657c8a..c36f9bb8810 100644
--- a/ext/standard/tests/array/each_variation6.phpt
+++ b/ext/standard/tests/array/each_variation6.phpt
@@ -4,7 +4,7 @@ Test each() function : usage variations - Internal array pointer
 <?php
 /* Prototype  : array each(array $arr)
  * Description: Return the currently pointed key..value pair in the passed array,
- * and advance the pointer to the next element 
+ * and advance the pointer to the next element
  * Source code: Zend/zend_builtin_functions.c
  */
 
diff --git a/ext/standard/tests/array/end.phpt b/ext/standard/tests/array/end.phpt
index a99f90beb8d..e7f312646e9 100644
--- a/ext/standard/tests/array/end.phpt
+++ b/ext/standard/tests/array/end.phpt
@@ -29,14 +29,14 @@ $arrays = array (
   array(0x7FFFFFFF, -0x80000000, 017777777777, -020000000000 ),
   array(-.6700000E+3, -4.10003E+3, 1e-5, -1E+5, 000002.00 )
 );
-/* loop through $arrays to print the last element of each sub-array */ 
+/* loop through $arrays to print the last element of each sub-array */
 echo "*** Testing end() on different arrays ***\n";
 $counter = 1;
 foreach ($arrays as $sub_array){
   echo "-- Iteration $counter --\n";
   var_dump( end($sub_array) );
   /* ensure that internal pointer is moved to last element */
-  var_dump( current($sub_array) ); 
+  var_dump( current($sub_array) );
   $counter++;
 }
 
@@ -50,19 +50,19 @@ var_dump( end($test_array[1]) );
 echo "\n*** Testing end() when array elements are deleted ***\n";
 $array_test = array("a", "b", "d", 7, "u" => "U", -4, "-.008" => "neg.008");
 
-// remove first element from array 
+// remove first element from array
 echo "\n-- Remove first element from array --\n";
 unset($array_test[0]);
 var_dump( end($array_test) );
 
-// remove last element from array, rewind and check end() 
+// remove last element from array, rewind and check end()
 echo "\n-- Remove last element from array --\n";
 unset($array_test['-.008']);
 var_dump( end($array_test) );
 reset( $array_test );
 var_dump( end($array_test) );
 
-// remove any element  !first, !last, rewind and check end() 
+// remove any element  !first, !last, rewind and check end()
 echo "\n-- Remove any element from array apart from first and last element --\n";
 unset($array_test[7]);
 var_dump( end($array_test) );
diff --git a/ext/standard/tests/array/end_64bit.phpt b/ext/standard/tests/array/end_64bit.phpt
index 23d410ee1b5..9bfd03a88f0 100644
--- a/ext/standard/tests/array/end_64bit.phpt
+++ b/ext/standard/tests/array/end_64bit.phpt
@@ -29,14 +29,14 @@ $arrays = array (
   array(0x7FFFFFFF, -0x80000000, 017777777777, -020000000000 ),
   array(-.6700000E+3, -4.10003E+3, 1e-5, -1E+5, 000002.00 )
 );
-/* loop through $arrays to print the last element of each sub-array */ 
+/* loop through $arrays to print the last element of each sub-array */
 echo "*** Testing end() on different arrays ***\n";
 $counter = 1;
 foreach ($arrays as $sub_array){
   echo "-- Iteration $counter --\n";
   var_dump( end($sub_array) );
   /* ensure that internal pointer is moved to last element */
-  var_dump( current($sub_array) ); 
+  var_dump( current($sub_array) );
   $counter++;
 }
 
@@ -50,19 +50,19 @@ var_dump( end($test_array[1]) );
 echo "\n*** Testing end() when array elements are deleted ***\n";
 $array_test = array("a", "b", "d", 7, "u" => "U", -4, "-.008" => "neg.008");
 
-// remove first element from array 
+// remove first element from array
 echo "\n-- Remove first element from array --\n";
 unset($array_test[0]);
 var_dump( end($array_test) );
 
-// remove last element from array, rewind and check end() 
+// remove last element from array, rewind and check end()
 echo "\n-- Remove last element from array --\n";
 unset($array_test['-.008']);
 var_dump( end($array_test) );
 reset( $array_test );
 var_dump( end($array_test) );
 
-// remove any element  !first, !last, rewind and check end() 
+// remove any element  !first, !last, rewind and check end()
 echo "\n-- Remove any element from array apart from first and last element --\n";
 unset($array_test[7]);
 var_dump( end($array_test) );
diff --git a/ext/standard/tests/array/end_basic.phpt b/ext/standard/tests/array/end_basic.phpt
index 5a6606d3817..aa899eb939d 100644
--- a/ext/standard/tests/array/end_basic.phpt
+++ b/ext/standard/tests/array/end_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test end() function : basic functionality 
+Test end() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : mixed end(array $array_arg)
- * Description: Advances array argument's internal pointer to the last element and return it 
+ * Description: Advances array argument's internal pointer to the last element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/end_error.phpt b/ext/standard/tests/array/end_error.phpt
index 96e84295588..9673a128ad6 100644
--- a/ext/standard/tests/array/end_error.phpt
+++ b/ext/standard/tests/array/end_error.phpt
@@ -3,7 +3,7 @@ Test end() function : error conditions - Pass incorrect number of args
 --FILE--
 <?php
 /* Prototype  : mixed end(array $array_arg)
- * Description: Advances array argument's internal pointer to the last element and return it 
+ * Description: Advances array argument's internal pointer to the last element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/end_variation1.phpt b/ext/standard/tests/array/end_variation1.phpt
index c5704faaf54..3dffd793ca5 100644
--- a/ext/standard/tests/array/end_variation1.phpt
+++ b/ext/standard/tests/array/end_variation1.phpt
@@ -3,7 +3,7 @@ Test end() function : usage variations - Pass different data types as $array_arg
 --FILE--
 <?php
 /* Prototype  : mixed end(array $array_arg)
- * Description: Advances array argument's internal pointer to the last element and return it 
+ * Description: Advances array argument's internal pointer to the last element and return it
  * Source code: ext/standard/array.c
  */
 
@@ -59,7 +59,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -69,7 +69,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/end_variation2.phpt b/ext/standard/tests/array/end_variation2.phpt
index 180f7cdfbdd..98884a01478 100644
--- a/ext/standard/tests/array/end_variation2.phpt
+++ b/ext/standard/tests/array/end_variation2.phpt
@@ -3,7 +3,7 @@ Test end() function : usage variations - Multi-dimensional arrays
 --FILE--
 <?php
 /* Prototype  : mixed end(array $array_arg)
- * Description: Advances array argument's internal pointer to the last element and return it 
+ * Description: Advances array argument's internal pointer to the last element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/end_variation3.phpt b/ext/standard/tests/array/end_variation3.phpt
index cd1e2d0ec54..3309d04edd0 100644
--- a/ext/standard/tests/array/end_variation3.phpt
+++ b/ext/standard/tests/array/end_variation3.phpt
@@ -3,7 +3,7 @@ Test end() function : usage variations - Referenced variables
 --FILE--
 <?php
 /* Prototype  : mixed end(array $array_arg)
- * Description: Advances array argument's internal pointer to the last element and return it 
+ * Description: Advances array argument's internal pointer to the last element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/extract_error.phpt b/ext/standard/tests/array/extract_error.phpt
index 96cad9d2621..ffea1ef18ca 100644
--- a/ext/standard/tests/array/extract_error.phpt
+++ b/ext/standard/tests/array/extract_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extract() function (error conditions) 
+Test extract() function (error conditions)
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/array/extract_variation1.phpt b/ext/standard/tests/array/extract_variation1.phpt
index 0e66c0e0914..0560e9e9c90 100644
--- a/ext/standard/tests/array/extract_variation1.phpt
+++ b/ext/standard/tests/array/extract_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extract() function (variation 1) 
+Test extract() function (variation 1)
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/array/extract_variation10.phpt b/ext/standard/tests/array/extract_variation10.phpt
index 6e4565dc8c7..bc0adf903e8 100644
--- a/ext/standard/tests/array/extract_variation10.phpt
+++ b/ext/standard/tests/array/extract_variation10.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extract() function - ensure EXTR_REFS doesn't mess with isRef flag on COW references to array elements.  
+Test extract() function - ensure EXTR_REFS doesn't mess with isRef flag on COW references to array elements.
 --FILE--
 <?php
 $a = array('foo' => 'original.foo');
diff --git a/ext/standard/tests/array/extract_variation11.phpt b/ext/standard/tests/array/extract_variation11.phpt
index dfab4ddbba8..b26207b970e 100644
--- a/ext/standard/tests/array/extract_variation11.phpt
+++ b/ext/standard/tests/array/extract_variation11.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extract() function - ensure EXTR_REFS works when array is referenced and keys clash with variables in current scope. 
+Test extract() function - ensure EXTR_REFS works when array is referenced and keys clash with variables in current scope.
 --FILE--
 <?php
 $a = array('foo' => 'original.foo');
diff --git a/ext/standard/tests/array/extract_variation2.phpt b/ext/standard/tests/array/extract_variation2.phpt
index 570e75f0761..99d1016a701 100644
--- a/ext/standard/tests/array/extract_variation2.phpt
+++ b/ext/standard/tests/array/extract_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extract() function (variation 2) 
+Test extract() function (variation 2)
 --FILE--
 <?php
 
@@ -27,7 +27,7 @@ foreach ( $mixed_array as $sub_array ) {
   var_dump ( extract($sub_array, EXTR_PREFIX_INVALID, "ssd"));
   var_dump ( extract($sub_array, EXTR_PREFIX_SAME, "sss"));
   var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "bb"));
-  var_dump ( extract($sub_array, EXTR_PREFIX_ALL, ""));  // "_" taken as default prefix 
+  var_dump ( extract($sub_array, EXTR_PREFIX_ALL, ""));  // "_" taken as default prefix
   var_dump ( extract($sub_array, EXTR_PREFIX_IF_EXISTS, "bb"));
 }
 
diff --git a/ext/standard/tests/array/extract_variation3.phpt b/ext/standard/tests/array/extract_variation3.phpt
index 2dcb775fe71..1a1265922ab 100644
--- a/ext/standard/tests/array/extract_variation3.phpt
+++ b/ext/standard/tests/array/extract_variation3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extract() function (variation 3) 
+Test extract() function (variation 3)
 --FILE--
 <?php
 
@@ -27,7 +27,7 @@ foreach ( $mixed_array as $sub_array ) {
   var_dump ( extract($sub_array, EXTR_PREFIX_INVALID, "ssd"));
   var_dump ( extract($sub_array, EXTR_PREFIX_SAME, "sss"));
   var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "bb"));
-  var_dump ( extract($sub_array, EXTR_PREFIX_ALL, ""));  // "_" taken as default prefix 
+  var_dump ( extract($sub_array, EXTR_PREFIX_ALL, ""));  // "_" taken as default prefix
   var_dump ( extract($sub_array, EXTR_PREFIX_IF_EXISTS, "bb"));
 }
 
diff --git a/ext/standard/tests/array/extract_variation4.phpt b/ext/standard/tests/array/extract_variation4.phpt
index 11528f4b871..b9600b68abc 100644
--- a/ext/standard/tests/array/extract_variation4.phpt
+++ b/ext/standard/tests/array/extract_variation4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extract() function (variation 4) 
+Test extract() function (variation 4)
 --FILE--
 <?php
 
@@ -27,7 +27,7 @@ foreach ( $mixed_array as $sub_array ) {
   var_dump ( extract($sub_array, EXTR_PREFIX_INVALID, "ssd"));
   var_dump ( extract($sub_array, EXTR_PREFIX_SAME, "sss"));
   var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "bb"));
-  var_dump ( extract($sub_array, EXTR_PREFIX_ALL, ""));  // "_" taken as default prefix 
+  var_dump ( extract($sub_array, EXTR_PREFIX_ALL, ""));  // "_" taken as default prefix
   var_dump ( extract($sub_array, EXTR_PREFIX_IF_EXISTS, "bb"));
 }
 
diff --git a/ext/standard/tests/array/extract_variation5.phpt b/ext/standard/tests/array/extract_variation5.phpt
index 4a3e95bbb74..3e405797e08 100644
--- a/ext/standard/tests/array/extract_variation5.phpt
+++ b/ext/standard/tests/array/extract_variation5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extract() function (variation 5) 
+Test extract() function (variation 5)
 --FILE--
 <?php
 
@@ -26,7 +26,7 @@ foreach ( $mixed_array as $sub_array ) {
   var_dump ( extract($sub_array, EXTR_PREFIX_INVALID, "ssd"));
   var_dump ( extract($sub_array, EXTR_PREFIX_SAME, "sss"));
   var_dump ( extract($sub_array, EXTR_PREFIX_ALL, "bb"));
-  var_dump ( extract($sub_array, EXTR_PREFIX_ALL, ""));  // "_" taken as default prefix 
+  var_dump ( extract($sub_array, EXTR_PREFIX_ALL, ""));  // "_" taken as default prefix
   var_dump ( extract($sub_array, EXTR_PREFIX_IF_EXISTS, "bb"));
 }
 
diff --git a/ext/standard/tests/array/extract_variation6.phpt b/ext/standard/tests/array/extract_variation6.phpt
index 7eac67e16e7..e552b533259 100644
--- a/ext/standard/tests/array/extract_variation6.phpt
+++ b/ext/standard/tests/array/extract_variation6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extract() function (variation 6) 
+Test extract() function (variation 6)
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/array/extract_variation7.phpt b/ext/standard/tests/array/extract_variation7.phpt
index 653941dc9b9..c27b019e50f 100644
--- a/ext/standard/tests/array/extract_variation7.phpt
+++ b/ext/standard/tests/array/extract_variation7.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extract() function (variation 7) 
+Test extract() function (variation 7)
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/array/extract_variation8.phpt b/ext/standard/tests/array/extract_variation8.phpt
index 0d15fd494e7..0b33f63eb15 100644
--- a/ext/standard/tests/array/extract_variation8.phpt
+++ b/ext/standard/tests/array/extract_variation8.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extract() function (variation 8) 
+Test extract() function (variation 8)
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/array/extract_variation9.phpt b/ext/standard/tests/array/extract_variation9.phpt
index 4d42a697624..1d4518bdf44 100644
--- a/ext/standard/tests/array/extract_variation9.phpt
+++ b/ext/standard/tests/array/extract_variation9.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test extract() function (variation 9) 
+Test extract() function (variation 9)
 --FILE--
 <?php
 /* Using Class and objects */
diff --git a/ext/standard/tests/array/in_array_errors.phpt b/ext/standard/tests/array/in_array_errors.phpt
index 13a6cdb4ccf..62b67c8db96 100644
--- a/ext/standard/tests/array/in_array_errors.phpt
+++ b/ext/standard/tests/array/in_array_errors.phpt
@@ -4,7 +4,7 @@ Test in_array() function : error conditions
 <?php
 /*
  * Prototype  : bool in_array ( mixed $needle, array $haystack [, bool $strict] )
- * Description: Searches haystack for needle and returns TRUE  
+ * Description: Searches haystack for needle and returns TRUE
  *              if it is found in the array, FALSE otherwise.
  * Source Code: ext/standard/array.c
 */
diff --git a/ext/standard/tests/array/in_array_variation1.phpt b/ext/standard/tests/array/in_array_variation1.phpt
index 470738bcf58..dc8d233a7e2 100644
--- a/ext/standard/tests/array/in_array_variation1.phpt
+++ b/ext/standard/tests/array/in_array_variation1.phpt
@@ -4,7 +4,7 @@ Test in_array() function : usage variations - different needdle values
 <?php
 /*
  * Prototype  : bool in_array ( mixed $needle, array $haystack [, bool $strict] )
- * Description: Searches haystack for needle and returns TRUE  
+ * Description: Searches haystack for needle and returns TRUE
  *              if it is found in the array, FALSE otherwise.
  * Source Code: ext/standard/array.c
 */
@@ -20,7 +20,7 @@ $arrays = array (
   array(TRUE, FALSE),
   array("", array()),
   array("abcd\x00abcd\x00abcd"),
-  array("abcd\tabcd\nabcd\rabcd\0abcdefghij") 
+  array("abcd\tabcd\nabcd\rabcd\0abcdefghij")
 );
 
 $array_compare = array (
@@ -50,15 +50,15 @@ foreach($arrays as $array) {
   foreach($array_compare as $compare) {
     echo "-- Iteration $counter --\n";
     //strict option OFF
-    var_dump(in_array($compare,$array));  
+    var_dump(in_array($compare,$array));
     //strict option ON
-    var_dump(in_array($compare,$array,TRUE));  
+    var_dump(in_array($compare,$array,TRUE));
     //strict option OFF
-    var_dump(in_array($compare,$array,FALSE));  
+    var_dump(in_array($compare,$array,FALSE));
     $counter++;
  }
 }
-		
+
 echo "Done\n";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/in_array_variation2.phpt b/ext/standard/tests/array/in_array_variation2.phpt
index ee1267f4e27..a394b6035e5 100644
--- a/ext/standard/tests/array/in_array_variation2.phpt
+++ b/ext/standard/tests/array/in_array_variation2.phpt
@@ -4,7 +4,7 @@ Test in_array() function : usage variations - different haystack values
 <?php
 /*
  * Prototype  : bool in_array ( mixed $needle, array $haystack [, bool $strict] )
- * Description: Searches haystack for needle and returns TRUE  
+ * Description: Searches haystack for needle and returns TRUE
  *              if it is found in the array, FALSE otherwise.
  * Source Code: ext/standard/array.c
 */
@@ -16,10 +16,10 @@ $misc_array = array (
   'a',
   'key' =>'d',
   3,
-  ".001" =>-67, 
+  ".001" =>-67,
   "-.051" =>"k",
   0.091 =>"-.08",
-  "e" =>"5", 
+  "e" =>"5",
   "y" =>NULL,
   NULL =>"",
   0,
@@ -39,11 +39,11 @@ $counter = 1;
 foreach($array_type as $type) {
   echo "-- Iteration $counter --\n";
   //loose type checking
-  var_dump( in_array($type,$misc_array ) );  
+  var_dump( in_array($type,$misc_array ) );
   //strict type checking
-  var_dump( in_array($type,$misc_array,true) );  
+  var_dump( in_array($type,$misc_array,true) );
   //loose type checking
-  var_dump( in_array($type,$misc_array,false) );  
+  var_dump( in_array($type,$misc_array,false) );
   $counter++;
 }
 
diff --git a/ext/standard/tests/array/in_array_variation3.phpt b/ext/standard/tests/array/in_array_variation3.phpt
index c8b6445cd16..f07d1dea899 100644
--- a/ext/standard/tests/array/in_array_variation3.phpt
+++ b/ext/standard/tests/array/in_array_variation3.phpt
@@ -4,7 +4,7 @@ Test in_array() function : usage variations - haystack as sub-array/object
 <?php
 /*
  * Prototype  : bool in_array ( mixed $needle, array $haystack [, bool $strict] )
- * Description: Searches haystack for needle and returns TRUE  
+ * Description: Searches haystack for needle and returns TRUE
  *              if it is found in the array, FALSE otherwise.
  * Source Code: ext/standard/array.c
 */
@@ -14,7 +14,7 @@ Test in_array() function : usage variations - haystack as sub-array/object
 /* checking for sub-arrays with in_array() */
 echo "*** Testing sub-arrays with in_array() ***\n";
 $sub_array = array (
-  "one", 
+  "one",
   array(1, 2 => "two", "three" => 3),
   4 => "four",
   "five" => 5,
@@ -22,7 +22,7 @@ $sub_array = array (
 );
 var_dump( in_array("four", $sub_array) );
 //checking for element in a sub-array
-var_dump( in_array(3, $sub_array[1]) ); 
+var_dump( in_array(3, $sub_array[1]) );
 var_dump( in_array(array('','i'), $sub_array) );
 
 /* checking for objects in in_array() */
@@ -36,11 +36,11 @@ class in_array_check {
 
 $in_array_obj = new in_array_check();  //creating new object
 //error: as wrong datatype for second argument
-var_dump( in_array("array_var", $in_array_obj) ); 
+var_dump( in_array("array_var", $in_array_obj) );
 //error: as wrong datatype for second argument
-var_dump( in_array("foo", $in_array_obj) ); 
+var_dump( in_array("foo", $in_array_obj) );
 //element found as "one" exists in array $array_var
-var_dump( in_array("one", $in_array_obj->array_var) ); 
+var_dump( in_array("one", $in_array_obj->array_var) );
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/in_array_variation4.phpt b/ext/standard/tests/array/in_array_variation4.phpt
index 9a5312b2687..e166bdfad5c 100644
--- a/ext/standard/tests/array/in_array_variation4.phpt
+++ b/ext/standard/tests/array/in_array_variation4.phpt
@@ -4,7 +4,7 @@ Test in_array() function : usage variations - haystack as resource/multi dimensi
 <?php
 /*
  * Prototype  : bool in_array ( mixed $needle, array $haystack [, bool $strict] )
- * Description: Searches haystack for needle and returns TRUE  
+ * Description: Searches haystack for needle and returns TRUE
  *              if it is found in the array, FALSE otherwise.
  * Source Code: ext/standard/array.c
 */
@@ -23,38 +23,38 @@ $dir_handle = opendir( dirname(__FILE__) );
 $resources = array($file_handle, $dir_handle);
 
 // search for resouce type in the resource array
-var_dump( in_array($file_handle, $resources, true) ); 
+var_dump( in_array($file_handle, $resources, true) );
 //checking for (int) type resource
-var_dump( in_array((int)$dir_handle, $resources, true) ); 
+var_dump( in_array((int)$dir_handle, $resources, true) );
 
 /* Miscellenous input check  */
 echo "\n*** Testing miscelleneos inputs with in_array() ***\n";
 //matching "Good" in array(0,"hello"), result:true in loose type check
-var_dump( in_array("Good", array(0,"hello")) ); 
-//false in strict mode 
-var_dump( in_array("Good", array(0,"hello"), TRUE) ); 
+var_dump( in_array("Good", array(0,"hello")) );
+//false in strict mode
+var_dump( in_array("Good", array(0,"hello"), TRUE) );
 
 //matching integer 0 in array("this"), result:true in loose type check
-var_dump( in_array(0, array("this")) );  
+var_dump( in_array(0, array("this")) );
 // false in strict mode
-var_dump( in_array(0, array("this")),TRUE ); 
+var_dump( in_array(0, array("this")),TRUE );
 
 //matching string "this" in array(0), result:true in loose type check
-var_dump( in_array("this", array(0)) );  
+var_dump( in_array("this", array(0)) );
 // false in stric mode
-var_dump( in_array("this", array(0), TRUE) ); 
+var_dump( in_array("this", array(0), TRUE) );
 
 //checking for type FALSE in multidimensional array with loose checking, result:false in loose type check
-var_dump( in_array(FALSE, 
-                   array("a"=> TRUE, "b"=> TRUE, 
-                         array("c"=> TRUE, "d"=>TRUE) 
-                        ) 
-                  ) 
-        ); 
+var_dump( in_array(FALSE,
+                   array("a"=> TRUE, "b"=> TRUE,
+                         array("c"=> TRUE, "d"=>TRUE)
+                        )
+                  )
+        );
 
 //matching string having integer in beginning, result:true in loose type check
-var_dump( in_array('123abc', array(123)) );  
-var_dump( in_array('123abc', array(123), TRUE) ); // false in strict mode 
+var_dump( in_array('123abc', array(123)) );
+var_dump( in_array('123abc', array(123), TRUE) ); // false in strict mode
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/key_basic.phpt b/ext/standard/tests/array/key_basic.phpt
index 8fdca1966c2..4d5b15b340c 100644
--- a/ext/standard/tests/array/key_basic.phpt
+++ b/ext/standard/tests/array/key_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test key() function : basic functionality 
+Test key() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : mixed key(array $array_arg)
diff --git a/ext/standard/tests/array/key_exists_basic.phpt b/ext/standard/tests/array/key_exists_basic.phpt
index 40d982da210..b4b7771f630 100644
--- a/ext/standard/tests/array/key_exists_basic.phpt
+++ b/ext/standard/tests/array/key_exists_basic.phpt
@@ -6,7 +6,7 @@ Francesco Fullone ff@ideato.it
 --FILE--
 <?php
 echo "*** test key_exists() by calling it with its expected arguments ***\n";
-$a = array('bar' => 1);  
+$a = array('bar' => 1);
 var_dump(key_exists('bar', $a));
 var_dump(key_exists('foo', $a));
 --EXPECTF--
diff --git a/ext/standard/tests/array/key_exists_error.phpt b/ext/standard/tests/array/key_exists_error.phpt
index 1bbd41e20e2..a1af3910bae 100644
--- a/ext/standard/tests/array/key_exists_error.phpt
+++ b/ext/standard/tests/array/key_exists_error.phpt
@@ -8,7 +8,7 @@ Francesco Fullone ff@ideato.it
 
 echo "*** Test by calling method or function with incorrect numbers of arguments ***\n";
 
-$a = array('bar' => 1);  
+$a = array('bar' => 1);
 var_dump(key_exists());
 var_dump(key_exists('foo', $a, 'baz'));
 
diff --git a/ext/standard/tests/array/key_exists_variation1.phpt b/ext/standard/tests/array/key_exists_variation1.phpt
index 94ea8d45f7d..0baa17eff7d 100644
--- a/ext/standard/tests/array/key_exists_variation1.phpt
+++ b/ext/standard/tests/array/key_exists_variation1.phpt
@@ -6,7 +6,7 @@ Francesco Fullone ff@ideato.it
 --FILE--
 <?php
 echo "*** test key_exists() by calling it with its expected arguments ***\n";
-$a = array('bar' => 1, 'foo' => array('bar' => 2, 'baz' => 3));  
+$a = array('bar' => 1, 'foo' => array('bar' => 2, 'baz' => 3));
 var_dump(key_exists('baz', $a));
 var_dump(key_exists('baz', $a['foo']));
 --EXPECTF--
diff --git a/ext/standard/tests/array/key_exists_variation2.phpt b/ext/standard/tests/array/key_exists_variation2.phpt
index 5f5ab86a4fe..8afeaa86151 100644
--- a/ext/standard/tests/array/key_exists_variation2.phpt
+++ b/ext/standard/tests/array/key_exists_variation2.phpt
@@ -8,25 +8,25 @@ Francesco Fullone ff@ideato.it
 echo "*** test key_exists() by using mixed type of arrays ***\n";
 
 // there is not a index = 0 element
-$a = array(1 => 'bar', 'foo' => 'baz');  
+$a = array(1 => 'bar', 'foo' => 'baz');
 var_dump(key_exists(0, $a));
 
 echo "integer\n";
 // 1 has index = 0
-$b = array(1, 'foo' => 'baz');  
+$b = array(1, 'foo' => 'baz');
 var_dump(key_exists(0, $b));
 
 // 42 has index = 0, netherless its position is the latest
-$c = array('foo' => 'baz', 42);  
+$c = array('foo' => 'baz', 42);
 var_dump(key_exists(0, $c));
 
 echo "string\n";
 // 'bar' has index = 0, netherless it is a string
-$d = array('bar', 'foo' => 'baz');  
+$d = array('bar', 'foo' => 'baz');
 var_dump(key_exists(0, $d));
 
 // 'baz' has index = 0, netherless its position is the latest
-$e = array('foo' => 'baz', 'baz');  
+$e = array('foo' => 'baz', 'baz');
 var_dump(key_exists(0, $e));
 
 echo "obj\n";
@@ -38,21 +38,21 @@ class ObjectA
 $obj = new ObjectA();
 
 // object has index = 0, netherless its position is the latest
-$f = array('foo' => 'baz', $obj);  
+$f = array('foo' => 'baz', $obj);
 var_dump(key_exists(0, $f));
 
 // object has index = 0, netherless its position is the first
-$g = array($obj, 'foo' => 'baz');  
+$g = array($obj, 'foo' => 'baz');
 var_dump(key_exists(0, $g));
 
 echo "stream resource\n";
 // stream resource has index = 0, netherless its position is the first
 $st = fopen('php://memory', '+r');
-$h = array($st, 'foo' => 'baz');  
+$h = array($st, 'foo' => 'baz');
 var_dump(key_exists(0, $h));
 
 // stream resource has index = 0, netherless its position is the latest
-$i = array('foo' => 'baz', $st);  
+$i = array('foo' => 'baz', $st);
 var_dump(key_exists(0, $i));
 
 --EXPECTF--
diff --git a/ext/standard/tests/array/key_variation1.phpt b/ext/standard/tests/array/key_variation1.phpt
index 42565ba8e40..bf0a1ef6148 100644
--- a/ext/standard/tests/array/key_variation1.phpt
+++ b/ext/standard/tests/array/key_variation1.phpt
@@ -3,7 +3,7 @@ Test key() function : usage variations - Pass different data types as $array_arg
 --FILE--
 <?php
 /* Prototype  : mixed key(array $array_arg)
- * Description: Return the key of the element currently pointed to by the internal array pointer 
+ * Description: Return the key of the element currently pointed to by the internal array pointer
  * Source code: ext/standard/array.c
  */
 
@@ -59,7 +59,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -69,7 +69,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/key_variation2.phpt b/ext/standard/tests/array/key_variation2.phpt
index 35389062bb7..e9bcb75d68f 100644
--- a/ext/standard/tests/array/key_variation2.phpt
+++ b/ext/standard/tests/array/key_variation2.phpt
@@ -3,7 +3,7 @@ Test key() function : usage variations
 --FILE--
 <?php
 /* Prototype  : mixed key(array $array_arg)
- * Description: Return the key of the element currently pointed to by the internal array pointer 
+ * Description: Return the key of the element currently pointed to by the internal array pointer
  * Source code: ext/standard/array.c
  */
 
@@ -39,7 +39,7 @@ $inputs = array(
        -10.5 => 'negative',
        .5 => 'half',
        ),
-       
+
 /*3*/  'extreme floats' => array(
        12.3456789000e6 => 'large',
        12.3456789000E-10 => 'small',
@@ -48,8 +48,8 @@ $inputs = array(
        // null data
 /*4*/ 'null uppercase' => array(
        NULL => 'null 1',
-       ), 
-       
+       ),
+
 /*5*/  'null lowercase' => array(
        null => 'null 2',
        ),
@@ -59,17 +59,17 @@ $inputs = array(
        true => 'lowert',
        false => 'lowerf',
        ),
-       
+
 /*7*/  'bool uppercase' => array(
        TRUE => 'uppert',
        FALSE => 'upperf',
        ),
-       
+
        // empty data
 /*8*/ 'empty double quotes' => array(
        "" => 'emptyd',
        ),
-       
+
 /*9*/  'empty single quotes' => array(
        '' => 'emptys',
        ),
diff --git a/ext/standard/tests/array/key_variation3.phpt b/ext/standard/tests/array/key_variation3.phpt
index a231917814e..2d8058d51cb 100644
--- a/ext/standard/tests/array/key_variation3.phpt
+++ b/ext/standard/tests/array/key_variation3.phpt
@@ -3,7 +3,7 @@ Test key() function : usage variations
 --FILE--
 <?php
 /* Prototype  : mixed key(array $array_arg)
- * Description: Return the key of the element currently pointed to by the internal array pointer 
+ * Description: Return the key of the element currently pointed to by the internal array pointer
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/key_variation4.phpt b/ext/standard/tests/array/key_variation4.phpt
index 147d55aa13b..27421c2f636 100644
--- a/ext/standard/tests/array/key_variation4.phpt
+++ b/ext/standard/tests/array/key_variation4.phpt
@@ -3,7 +3,7 @@ Test key() function : usage variations
 --FILE--
 <?php
 /* Prototype  : mixed key(array $array_arg)
- * Description: Return the key of the element currently pointed to by the internal array pointer 
+ * Description: Return the key of the element currently pointed to by the internal array pointer
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/krsort_basic.phpt b/ext/standard/tests/array/krsort_basic.phpt
index 27361eb96d4..6f007359139 100644
--- a/ext/standard/tests/array/krsort_basic.phpt
+++ b/ext/standard/tests/array/krsort_basic.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test krsort() function : basic functionality   
+Test krsort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool krsort ( array &$array [, int $sort_flags] )
- * Description: Sort an array by key in reverse order, maintaining key to data correlation 			
+ * Description: Sort an array by key in reverse order, maintaining key to data correlation
  * Source code: ext/standard/array.c
 */
 
 /*
- * Testing krsort() by providing array of integer/string values to check the basic functionality 
+ * Testing krsort() by providing array of integer/string values to check the basic functionality
  * with following flag values :
  *  1.flag value as defualt
  *  2.SORT_REGULAR - compare items normally
@@ -18,14 +18,14 @@ Test krsort() function : basic functionality
 
 echo "*** Testing krsort() : basic functionality ***\n";
 
-// an array containing unsorted string values with indices  
-$unsorted_strings =   array( "lemon" => "l", "orange" => "o", "banana" => "b" ); 
+// an array containing unsorted string values with indices
+$unsorted_strings =   array( "lemon" => "l", "orange" => "o", "banana" => "b" );
 $unsorted_strings = array(
 	"l" => "lemon", "o" => "orange",
 	"O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20",
 	"b" => "banana",
 );
-// an array containing unsorted numeric values with indices 
+// an array containing unsorted numeric values with indices
 $unsorted_numerics =  array( 100 => 4, 33 => 3, 555 => 2, 22 => 1 );
 
 echo "\n-- Testing krsort() by supplying string array, 'flag' value is defualt --\n";
diff --git a/ext/standard/tests/array/krsort_error.phpt b/ext/standard/tests/array/krsort_error.phpt
index 1bca5f928db..250d9da03be 100644
--- a/ext/standard/tests/array/krsort_error.phpt
+++ b/ext/standard/tests/array/krsort_error.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test krsort() function : error conditions 
+Test krsort() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool krsort(array &array_arg [, int asort_flags])
- * Description: Sort an array 
+ * Description: Sort an array
  * Source code: ext/standard/array.c
 */
 
 /*
-* Testing krsort() function with all possible error conditions 
+* Testing krsort() function with all possible error conditions
 */
 
 echo "*** Testing krsort() : error conditions ***\n";
@@ -28,7 +28,7 @@ foreach($flags as $key => $flag){
   echo "\n- Sort flag = $key -\n";
   $temp_array = $array_arg;
   var_dump( krsort($temp_array,$flag, $extra_arg) );
-  var_dump($temp_array); 
+  var_dump($temp_array);
 }
 
 echo "Done";
diff --git a/ext/standard/tests/array/krsort_object.phpt b/ext/standard/tests/array/krsort_object.phpt
index 6236595796c..308be2cc261 100644
--- a/ext/standard/tests/array/krsort_object.phpt
+++ b/ext/standard/tests/array/krsort_object.phpt
@@ -3,7 +3,7 @@ Test krsort() function : object functionality - sort objects
 --FILE--
 <?php
 /* Prototype  : bool krsort ( array &$array [, int $sort_flags] )
- * Description: Sort an array by key in reverse order, maintaining key to data correlation  
+ * Description: Sort an array by key in reverse order, maintaining key to data correlation
  * Source code: ext/standard/array.c
 */
 /*
@@ -41,14 +41,14 @@ class StringObject
 }
 
 // array of integer objects with different key values
-$unsorted_int_obj = array ( 
+$unsorted_int_obj = array (
   10 => new IntegerObject(11), 20 =>  new IntegerObject(66),
   3 => new IntegerObject(23), 4 => new IntegerObject(-5),
   50 => new IntegerObject(0.001), 6 => new IntegerObject(0)
 );
 
 // array of string objects with different key values
-$unsorted_str_obj = array ( 
+$unsorted_str_obj = array (
   "axx" => new StringObject("axx"), "t" => new StringObject("t"),
   "w" => new StringObject("w"), "py" => new StringObject("py"),
   "apple" => new StringObject("apple"), "Orange" => new StringObject("Orange"),
diff --git a/ext/standard/tests/array/krsort_variation1.phpt b/ext/standard/tests/array/krsort_variation1.phpt
index 7275a22c8b8..9a30c4ec1ee 100644
--- a/ext/standard/tests/array/krsort_variation1.phpt
+++ b/ext/standard/tests/array/krsort_variation1.phpt
@@ -74,7 +74,7 @@ $unexpected_values = array (
 // loop though each element of the array and check the working of krsort()
 // when $array argument is supplied with different values from $unexpected_values
 echo "\n-- Testing krsort() by supplying different unexpected values for 'array' argument --\n";
-echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
+echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n";
 
 $counter = 1;
 for($index = 0; $index < count($unexpected_values); $index ++) {
diff --git a/ext/standard/tests/array/krsort_variation10.phpt b/ext/standard/tests/array/krsort_variation10.phpt
index f56d2870b89..32e9b8b3ef6 100644
--- a/ext/standard/tests/array/krsort_variation10.phpt
+++ b/ext/standard/tests/array/krsort_variation10.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test krsort() function : usage variations - sort heredoc strings  
+Test krsort() function : usage variations - sort heredoc strings
 --FILE--
 <?php
 /* Prototype  : bool krsort ( array &$array [, int $sort_flags] )
@@ -32,7 +32,7 @@ Test this!!!
 EOT;
 
 $array = array (
-  $simple_heredoc1 => "Heredoc", 
+  $simple_heredoc1 => "Heredoc",
   $simple_heredoc2 => "HEREDOC",
   $multiline_heredoc => "heredoc string\twith!@# and 123\nTest this!!!"
 );
diff --git a/ext/standard/tests/array/krsort_variation2.phpt b/ext/standard/tests/array/krsort_variation2.phpt
index 1f0b331ce83..b754021bb59 100644
--- a/ext/standard/tests/array/krsort_variation2.phpt
+++ b/ext/standard/tests/array/krsort_variation2.phpt
@@ -3,7 +3,7 @@ Test krsort() function : usage variations - unexpected values for 'sort_flags' a
 --FILE--
 <?php
 /* Prototype  : bool krsort(array &array_arg [, int sort_flags])
- * Description: Sort an array by key in reverse order, maintaining key to data correlation 
+ * Description: Sort an array by key in reverse order, maintaining key to data correlation
  * Source code: ext/standard/array.c
 */
 
@@ -77,7 +77,7 @@ for($index = 0; $index < count($unexpected_values); $index ++) {
   echo "-- Iteration $counter --\n";
   $value = $unexpected_values [$index];
   $temp_array = $unsorted_values;
-  var_dump( krsort($temp_array, $value) ); 
+  var_dump( krsort($temp_array, $value) );
   var_dump($temp_array);
   $counter++;
 }
diff --git a/ext/standard/tests/array/krsort_variation3.phpt b/ext/standard/tests/array/krsort_variation3.phpt
index 8f411a97392..63c46ce02b6 100644
--- a/ext/standard/tests/array/krsort_variation3.phpt
+++ b/ext/standard/tests/array/krsort_variation3.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test krsort() function : usage variations - sort integer/float values 
+Test krsort() function : usage variations - sort integer/float values
 --FILE--
 <?php
 /* Prototype  : bool krsort ( array &$array [, int $sort_flags] )
- * Description: Sort an array by key in reverse order, maintaining key to data correlation 
+ * Description: Sort an array by key in reverse order, maintaining key to data correlation
  * Source code: ext/standard/array.c
 */
 
@@ -23,7 +23,7 @@ $various_arrays = array(
   array(1 => 11, -2 => -11, 3 => 21, -4 => -21, 5 => 31, -6 => -31, 7 => 0, 8 => 41, -10 =>-41),
 
   // float key values
-  array(1.0 => 10.5, 0.2 => -10.5, 3.1 => 10.5e2, 4 => 10.6E-2, .5 => .5, 6 => .0001, -7 => -.1), 
+  array(1.0 => 10.5, 0.2 => -10.5, 3.1 => 10.5e2, 4 => 10.6E-2, .5 => .5, 6 => .0001, -7 => -.1),
 
   // mixed value array with different types of keys
   array(1 => .0001, 2 => .0021, -3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, -8 => -.9, 9 => 10.6E-2,
@@ -40,20 +40,20 @@ echo "\n-- Testing krsort() by supplying various integer/float arrays --\n";
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With defualt sort flag -\n"; 
-  $temp_array = $array; 
+  echo "- With defualt sort flag -\n";
+  $temp_array = $array;
   var_dump(krsort($temp_array) );
   var_dump($temp_array);
 
   // loop through $flags array and call krsort() with all possible sort flag values
   foreach($flags as $key => $flag){
     echo "- Sort flag = $key -\n";
-    $temp_array = $array; 
+    $temp_array = $array;
     var_dump(krsort($temp_array, $flag) );
     var_dump($temp_array);
-  }  
+  }
   $count++;
-} 
+}
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/krsort_variation4.phpt b/ext/standard/tests/array/krsort_variation4.phpt
index 3df924ac825..335cbea003b 100644
--- a/ext/standard/tests/array/krsort_variation4.phpt
+++ b/ext/standard/tests/array/krsort_variation4.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test krsort() function : usage variations - sort octal values  
+Test krsort() function : usage variations - sort octal values
 --FILE--
 <?php
 /* Prototype  : bool krsort ( array &$array [, int $sort_flags] )
- * Description: Sort an array by key in reverse order, maintaining key to data correlation. 
+ * Description: Sort an array by key in reverse order, maintaining key to data correlation.
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/krsort_variation5.phpt b/ext/standard/tests/array/krsort_variation5.phpt
index 0fa1e9c68fb..7abe5504c57 100644
--- a/ext/standard/tests/array/krsort_variation5.phpt
+++ b/ext/standard/tests/array/krsort_variation5.phpt
@@ -24,13 +24,13 @@ echo "*** Testing krsort() : usage variations ***\n";
 
 $various_arrays = array (
   // diff. escape sequence chars with key values
-  array ( null =>  null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", 
-          "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", 
+  array ( null =>  null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e",
+          "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh",
           "\ddd" => "\ddd", "\v" => "\v"
         ),
 
   // array containing different strings with key values
-  array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", 
+  array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test",
           't' => "TTTT", 'T' => "ttt", 'W' => "ww", 'X' => "x", 'x' => "X", 'O' => "oraNGe",
           'B' => "BANANA"
         )
diff --git a/ext/standard/tests/array/krsort_variation6.phpt b/ext/standard/tests/array/krsort_variation6.phpt
index 167d0ee7d64..c0c789fd2bc 100644
--- a/ext/standard/tests/array/krsort_variation6.phpt
+++ b/ext/standard/tests/array/krsort_variation6.phpt
@@ -3,7 +3,7 @@ Test krsort() function : usage variations - sort hexadecimal values
 --FILE--
 <?php
 /* Prototype  : bool krsort ( array &$array [, int $sort_flags] )
- * Description: Sort an array by key in reverse order, maintaining key to data correlation. 
+ * Description: Sort an array by key in reverse order, maintaining key to data correlation.
  * Source code: ext/standard/array.c
 */
 
@@ -17,8 +17,8 @@ Test krsort() function : usage variations - sort hexadecimal values
 
 echo "*** Testing krsort() : usage variations ***\n";
 
-// an array containing unsorted hexadecimal values with keys  
-$unsorted_hex_array = array ( 
+// an array containing unsorted hexadecimal values with keys
+$unsorted_hex_array = array (
   0x1AB => 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB,
   0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa
 );
diff --git a/ext/standard/tests/array/krsort_variation7.phpt b/ext/standard/tests/array/krsort_variation7.phpt
index 9ba3fc54470..c08d89ec20f 100644
--- a/ext/standard/tests/array/krsort_variation7.phpt
+++ b/ext/standard/tests/array/krsort_variation7.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test krsort() function : usage variations - sort array with diff. sub arrays 
+Test krsort() function : usage variations - sort array with diff. sub arrays
 --FILE--
 <?php
 /* Prototype  : bool krsort ( array &$array [, int $sort_flags] )
- * Description: Sort an array by key, maintaining key to data correlation 
+ * Description: Sort an array by key, maintaining key to data correlation
  * Source code: ext/standard/array.c
 */
 
 /*
- * testing krsort() by providing arrays contains sub arrays for $array argument 
+ * testing krsort() by providing arrays contains sub arrays for $array argument
  * with flowing flag values
  *  1.flag  value as defualt
  *  2.SORT_REGULAR - compare items normally
@@ -16,7 +16,7 @@ Test krsort() function : usage variations - sort array with diff. sub arrays
 
 echo "*** Testing krsort() : usage variations ***\n";
 
-// array with diff sub arrays to be sorted 
+// array with diff sub arrays to be sorted
 $various_arrays = array (
   // null array
   1  => array(),
@@ -28,7 +28,7 @@ $various_arrays = array (
   3 => array(4 => 44, 1 => 11, 3 => array(64,61) ),
 
   // array contains sub arrays
-  4 => array ( 3 => array(33,-5,6), 1 => array(11), 
+  4 => array ( 3 => array(33,-5,6), 1 => array(11),
                2 => array(22,-55), 0  => array() )
 );
 
@@ -38,8 +38,8 @@ echo "\n-- Testing krsort() by supplying various arrays containing sub arrays --
 
 // loop through to test krsort() with different arrays
 foreach ($various_arrays as $array) {
- 
-  echo "\n-- Iteration $count --\n"; 
+
+  echo "\n-- Iteration $count --\n";
   echo "- With defualt sort flag -\n";
   $temp_array = $array;
   var_dump( krsort($temp_array) );
diff --git a/ext/standard/tests/array/krsort_variation8.phpt b/ext/standard/tests/array/krsort_variation8.phpt
index f5a40cbeed7..50a9d63e57c 100644
Binary files a/ext/standard/tests/array/krsort_variation8.phpt and b/ext/standard/tests/array/krsort_variation8.phpt differ
diff --git a/ext/standard/tests/array/krsort_variation9.phpt b/ext/standard/tests/array/krsort_variation9.phpt
index 1b8ae5dd361..52b857b9721 100644
--- a/ext/standard/tests/array/krsort_variation9.phpt
+++ b/ext/standard/tests/array/krsort_variation9.phpt
@@ -3,7 +3,7 @@ Test krsort() function : usage variations - sort array with/without key values
 --FILE--
 <?php
 /* Prototype  : bool krsort ( array &$array [, int $sort_flags] )
- * Description: Sort an array by key in reverse order, maintaining key to data correlation. 
+ * Description: Sort an array by key in reverse order, maintaining key to data correlation.
  * Source code: ext/standard/array.c
 */
 
@@ -30,7 +30,7 @@ $various_arrays = array (
 $count = 1;
 echo "\n-- Testing krsort() by supplying various arrays with/without key values --\n";
 
-// loop through to test krsort() with different arrays, 
+// loop through to test krsort() with different arrays,
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
diff --git a/ext/standard/tests/array/ksort_basic.phpt b/ext/standard/tests/array/ksort_basic.phpt
index dd9f7a21582..c8837588134 100644
--- a/ext/standard/tests/array/ksort_basic.phpt
+++ b/ext/standard/tests/array/ksort_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test ksort() function : basic functionality   
+Test ksort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool ksort ( array &$array [, int $sort_flags] )
- * Description: Sort an array by key, maintaining key to data correlation 			
+ * Description: Sort an array by key, maintaining key to data correlation
  * Source code: ext/standard/array.c
 */
 
@@ -17,13 +17,13 @@ Test ksort() function : basic functionality
 
 echo "*** Testing ksort() : basic functionality ***\n";
 
-// an array containing unsorted string values with indices  
+// an array containing unsorted string values with indices
 $unsorted_strings =   array(
 	"l" => "lemon", "o" => "orange",
 	"O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20",
 	"b" => "banana",
 );
-// an array containing unsorted numeric values with indices 
+// an array containing unsorted numeric values with indices
 $unsorted_numerics =  array( 100 => 4, 33 => 3, 555 => 2, 22 => 1 );
 
 echo "\n-- Testing ksort() by supplying string array, 'flag' value is defualt --\n";
diff --git a/ext/standard/tests/array/ksort_error.phpt b/ext/standard/tests/array/ksort_error.phpt
index f2b102ae014..7631e9ee0ec 100644
--- a/ext/standard/tests/array/ksort_error.phpt
+++ b/ext/standard/tests/array/ksort_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test ksort() function : error conditions 
+Test ksort() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool ksort(array &array_arg [, int sort_flags])
@@ -8,7 +8,7 @@ Test ksort() function : error conditions
 */
 
 /*
-* Testing ksort() function with all possible error conditions 
+* Testing ksort() function with all possible error conditions
 */
 
 echo "*** Testing ksort() : error conditions ***\n";
diff --git a/ext/standard/tests/array/ksort_object.phpt b/ext/standard/tests/array/ksort_object.phpt
index 2d76026aa49..e1930327888 100644
--- a/ext/standard/tests/array/ksort_object.phpt
+++ b/ext/standard/tests/array/ksort_object.phpt
@@ -3,13 +3,13 @@ Test ksort() function : object functionality - sort objects
 --FILE--
 <?php
 /* Prototype  : bool ksort ( array &$array [, int $sort_flags] )
- * Description: Sort an array by key, maintaining key to data correlation.  
+ * Description: Sort an array by key, maintaining key to data correlation.
  * Source code: ext/standard/array.c
 */
 /*
- * testing ksort() by providing array ofinteger/string objects with following flag values: 
+ * testing ksort() by providing array ofinteger/string objects with following flag values:
  *  1.SORT_NUMERIC - compare items numerically
- *  2.SORT_STRING - compare items as strings 
+ *  2.SORT_STRING - compare items as strings
 */
 
 echo "*** Testing ksort() : object functionality ***\n";
@@ -42,14 +42,14 @@ class StringObject
 }
 
 // array of integer objects
-$unsorted_int_obj = array ( 
+$unsorted_int_obj = array (
   11 => new IntegerObject(11), 66 =>  new IntegerObject(66),
   23 => new IntegerObject(23), -5 => new IntegerObject(-5),
   1 => new IntegerObject(0.001), 0 => new IntegerObject(0)
 );
 
 // array of string objects
-$unsorted_str_obj = array ( 
+$unsorted_str_obj = array (
   "axx" => new StringObject("axx"), "t" => new StringObject("t"),
   "w" => new StringObject("w"), "py" => new StringObject("py"),
   "apple" => new StringObject("apple"), "Orange" => new StringObject("Orange"),
diff --git a/ext/standard/tests/array/ksort_variation1.phpt b/ext/standard/tests/array/ksort_variation1.phpt
index a22954db782..df3b294240b 100644
--- a/ext/standard/tests/array/ksort_variation1.phpt
+++ b/ext/standard/tests/array/ksort_variation1.phpt
@@ -74,7 +74,7 @@ $unexpected_values = array (
 // loop though each element of the array and check the working of ksort()
 // when $array argument is supplied with different values from $unexpected_values
 echo "\n-- Testing ksort() by supplying different unexpected values for 'array' argument --\n";
-echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
+echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n";
 
 $counter = 1;
 for($index = 0; $index < count($unexpected_values); $index ++) {
diff --git a/ext/standard/tests/array/ksort_variation10.phpt b/ext/standard/tests/array/ksort_variation10.phpt
index 051bc306153..1037042a7f1 100644
--- a/ext/standard/tests/array/ksort_variation10.phpt
+++ b/ext/standard/tests/array/ksort_variation10.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test ksort() function : usage variations - sort octal values 
+Test ksort() function : usage variations - sort octal values
 --FILE--
 <?php
 /* Prototype  : bool ksort ( array &$array [, int $sort_flags] )
- * Description: Sort an array by key, maintaining key to data correlation. 
+ * Description: Sort an array by key, maintaining key to data correlation.
  * Source code: ext/standard/array.c
 */
 
@@ -17,8 +17,8 @@ Test ksort() function : usage variations - sort octal values
 echo "*** Testing ksort() : usage variations ***\n";
 
 // an array containing unsorted octal values
-$unsorted_oct_array = array ( 
-  01235 => 01, 0321 => 02, 0345 => 03, 066 => 04, 0772 => 05, 
+$unsorted_oct_array = array (
+  01235 => 01, 0321 => 02, 0345 => 03, 066 => 04, 0772 => 05,
   077 => 06, -066 => -01, -0345 => -02, 0 => 0
 );
 
diff --git a/ext/standard/tests/array/ksort_variation11.phpt b/ext/standard/tests/array/ksort_variation11.phpt
index 347df65c4ff..4dfdad05fe8 100644
--- a/ext/standard/tests/array/ksort_variation11.phpt
+++ b/ext/standard/tests/array/ksort_variation11.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test ksort() function : usage variations - sort heredoc strings  
+Test ksort() function : usage variations - sort heredoc strings
 --FILE--
 <?php
 /* Prototype  : bool ksort ( array &$array [, int $sort_flags] )
@@ -17,7 +17,7 @@ Test ksort() function : usage variations - sort heredoc strings
 
 echo "*** Testing ksort() : usage variations ***\n";
 
-// Different heredoc strings to be sorted 
+// Different heredoc strings to be sorted
 $simple_heredoc1 =<<<EOT
 Heredoc
 EOT;
@@ -32,7 +32,7 @@ Test this!!!
 EOT;
 
 $array = array (
-  $simple_heredoc1 => "Heredoc", 
+  $simple_heredoc1 => "Heredoc",
   $simple_heredoc2 => "HEREDOC",
   $multiline_heredoc => "heredoc string\twith!@# and 123\nTest this!!!"
 );
diff --git a/ext/standard/tests/array/ksort_variation2.phpt b/ext/standard/tests/array/ksort_variation2.phpt
index 830181d9932..3ad987ccf44 100644
--- a/ext/standard/tests/array/ksort_variation2.phpt
+++ b/ext/standard/tests/array/ksort_variation2.phpt
@@ -3,7 +3,7 @@ Test ksort() function : usage variations - unexpected values for 'sort_flags' ar
 --FILE--
 <?php
 /* Prototype  : bool ksort(array &array_arg [, int sort_flags])
- * Description: Sort an array by key, maintaining key to data correlation 
+ * Description: Sort an array by key, maintaining key to data correlation
  * Source code: ext/standard/array.c
 */
 
@@ -77,7 +77,7 @@ for($index = 0; $index < count($unexpected_values); $index ++) {
   echo "-- Iteration $counter --\n";
   $value = $unexpected_values [$index];
   $temp_array = $unsorted_values;
-  var_dump( ksort($temp_array, $value) ); 
+  var_dump( ksort($temp_array, $value) );
   var_dump($temp_array);
   $counter++;
 }
diff --git a/ext/standard/tests/array/ksort_variation3.phpt b/ext/standard/tests/array/ksort_variation3.phpt
index 4029b9b8d3f..0ee73deb7ba 100644
--- a/ext/standard/tests/array/ksort_variation3.phpt
+++ b/ext/standard/tests/array/ksort_variation3.phpt
@@ -3,7 +3,7 @@ Test ksort() function : usage variations - sort integer/float values
 --FILE--
 <?php
 /* Prototype  : bool ksort ( array &$array [, int $sort_flags] )
- * Description: Sort an array by key, maintaining key to data correlation 
+ * Description: Sort an array by key, maintaining key to data correlation
  * Source code: ext/standard/array.c
 */
 
@@ -23,10 +23,10 @@ $various_arrays = array(
   array(1 => 11, -2 => -11, 3 => 21, -4 => -21, 5 => 31, -6 => -31, 7 => 0, 8 => 41, -10 =>-41),
 
   // float key values
-  array(1.0 => 10.5, 0.2 => -10.5, 3.1 => 10.5e2, 4 => 10.6E-2, .5 => .5, 6 => .0001, -7 => -.1), 
+  array(1.0 => 10.5, 0.2 => -10.5, 3.1 => 10.5e2, 4 => 10.6E-2, .5 => .5, 6 => .0001, -7 => -.1),
 
   // mixed value array with different types of keys
-  array(1 => .0001, 2 => .0021, -3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, -8 => -.9, 
+  array(1 => .0001, 2 => .0021, -3 => -.01, 4 => -1, 5 => 0, 6 => .09, 7 => 2, -8 => -.9,
         9 => 10.6E-2, -10 => -10.6E-2, 11 => 33)
 );
 
@@ -40,20 +40,20 @@ echo "\n-- Testing ksort() by supplying various integer/float arrays --\n";
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With defualt sort flag -\n"; 
-  $temp_array = $array; 
+  echo "- With defualt sort flag -\n";
+  $temp_array = $array;
   var_dump(ksort($temp_array) );
   var_dump($temp_array);
 
   // loop through $flags array and call ksort() with all possible sort flag values
   foreach($flags as $key => $flag){
     echo "- Sort flag = $key -\n";
-    $temp_array = $array; 
+    $temp_array = $array;
     var_dump(ksort($temp_array, $flag) );
     var_dump($temp_array);
-  }  
+  }
   $count++;
-} 
+}
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/ksort_variation5.phpt b/ext/standard/tests/array/ksort_variation5.phpt
index 6e6a38b0a50..eed437fd5b7 100644
--- a/ext/standard/tests/array/ksort_variation5.phpt
+++ b/ext/standard/tests/array/ksort_variation5.phpt
@@ -24,13 +24,13 @@ echo "*** Testing ksort() : usage variations ***\n";
 
 $various_arrays = array (
   // diff. escape sequence chars with key values
-  array ( null =>  null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e", 
-          "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh", 
+  array ( null =>  null, NULL => NULL, "\a" => "\a", "\cx" => "\cx", "\e" => "\e",
+          "\f" => "\f", "\n" =>"\n", "\r" => "\r", "\t" => "\t", "\xhh" => "\xhh",
           "\ddd" => "\ddd", "\v" => "\v"
         ),
 
   // array containing different strings with key values
-  array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test", 
+  array ( 'Lemon' => "lemoN", 'o' => "Orange", 'B' => "banana", 'Apple' => "apple", 'te' => "Test",
           't' => "TTTT", 'T' => "ttt", 'W' => "ww", 'X' => "x", 'x' => "X", 'O' => "oraNGe",
           'B' => "BANANA"
         )
diff --git a/ext/standard/tests/array/ksort_variation6.phpt b/ext/standard/tests/array/ksort_variation6.phpt
index 1243ab12364..4ecf7a28ae1 100644
--- a/ext/standard/tests/array/ksort_variation6.phpt
+++ b/ext/standard/tests/array/ksort_variation6.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test ksort() function : usage variations - sort hexadecimal values 
+Test ksort() function : usage variations - sort hexadecimal values
 --FILE--
 <?php
 /* Prototype  : bool ksort ( array &$array [, int $sort_flags] )
- * Description: Sort an array by key, maintaining key to data correlation. 
+ * Description: Sort an array by key, maintaining key to data correlation.
  * Source code: ext/standard/array.c
 */
 
@@ -16,9 +16,9 @@ Test ksort() function : usage variations - sort hexadecimal values
 
 echo "*** Testing ksort() : usage variations ***\n";
 
-// an array containng unsorted hexadecimal values with keys  
+// an array containng unsorted hexadecimal values with keys
 // There are multiple keys which are duplicate and the later should be picked
-$unsorted_hex_array = array ( 
+$unsorted_hex_array = array (
   0x1AB => 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF => 0xFF, 0x2AA => 0x2AA, 0xBB => 0xBB,
   0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa
 );
diff --git a/ext/standard/tests/array/ksort_variation7.phpt b/ext/standard/tests/array/ksort_variation7.phpt
index a0f454bbd1f..1d6d58960f8 100644
--- a/ext/standard/tests/array/ksort_variation7.phpt
+++ b/ext/standard/tests/array/ksort_variation7.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test ksort() function : usage variations - sort array with diff. sub arrays 
+Test ksort() function : usage variations - sort array with diff. sub arrays
 --FILE--
 <?php
 /* Prototype  : bool ksort ( array &$array [, int $sort_flags] )
- * Description: Sort an array by key, maintaining key to data correlation 
+ * Description: Sort an array by key, maintaining key to data correlation
  * Source code: ext/standard/array.c
 */
 
 /*
- * testing ksort() by providing arrays containing sub arrays for $array argument 
+ * testing ksort() by providing arrays containing sub arrays for $array argument
  * with flowing flag values:
  *  1. flag value as defualt
  *  2. SORT_REGULAR - compare items normally
@@ -16,7 +16,7 @@ Test ksort() function : usage variations - sort array with diff. sub arrays
 
 echo "*** Testing ksort() : usage variations ***\n";
 
-// array with diff sub arrays to be sorted 
+// array with diff sub arrays to be sorted
 $various_arrays = array (
   // null array
   1  => array(),
@@ -28,7 +28,7 @@ $various_arrays = array (
   3 => array(4 => 44, 1 => 11, 3 => array(64,61) ),
 
   // array contains sub arrays
-  4 => array ( 3 => array(33,-5,6), 1 => array(11), 
+  4 => array ( 3 => array(33,-5,6), 1 => array(11),
                2 => array(22,-55), 0  => array() )
 );
 
@@ -38,8 +38,8 @@ echo "\n-- Testing ksort() by supplying various arrays containing sub arrays --\
 
 // loop through to test ksort() with different arrays
 foreach ($various_arrays as $array) {
- 
-  echo "\n-- Iteration $count --\n"; 
+
+  echo "\n-- Iteration $count --\n";
   echo "- With defualt sort flag -\n";
   $temp_array = $array;
   var_dump( ksort($temp_array) );
diff --git a/ext/standard/tests/array/ksort_variation8.phpt b/ext/standard/tests/array/ksort_variation8.phpt
index f827883ce98..58f6a7aeb1d 100644
Binary files a/ext/standard/tests/array/ksort_variation8.phpt and b/ext/standard/tests/array/ksort_variation8.phpt differ
diff --git a/ext/standard/tests/array/ksort_variation9.phpt b/ext/standard/tests/array/ksort_variation9.phpt
index 8aa1e2f29d3..39c672bbf59 100644
--- a/ext/standard/tests/array/ksort_variation9.phpt
+++ b/ext/standard/tests/array/ksort_variation9.phpt
@@ -3,12 +3,12 @@ Test ksort() function : usage variations - sorting arrays with/without keys
 --FILE--
 <?php
 /* Prototype  : bool ksort ( array &$array [, int $sort_flags] )
- * Description: Sort an array by key, maintaining key to data correlation. 
+ * Description: Sort an array by key, maintaining key to data correlation.
  * Source code: ext/standard/array.c
 */
 
 /*
- * Testing ksort() by providing arrays  with/without key values for $array argument with following flag values: 
+ * Testing ksort() by providing arrays  with/without key values for $array argument with following flag values:
  *  1.flag value as defualt
  *  2.SORT_REGULAR - compare items normally
  */
@@ -29,7 +29,7 @@ $various_arrays = array (
 $count = 1;
 echo "\n-- Testing ksort() by supplying various arrays with/without key values --\n";
 
-// loop through to test ksort() with different arrays, 
+// loop through to test ksort() with different arrays,
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
diff --git a/ext/standard/tests/array/max.phpt b/ext/standard/tests/array/max.phpt
index 555d2d04c84..ae4f304eae8 100644
--- a/ext/standard/tests/array/max.phpt
+++ b/ext/standard/tests/array/max.phpt
@@ -19,7 +19,7 @@ var_dump(max(0, true, false, true));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: max() expects at least 1 parameter, 0 given in %s on line 3
 NULL
 
diff --git a/ext/standard/tests/array/max_basic.phpt b/ext/standard/tests/array/max_basic.phpt
index f3042122934..c880810cb33 100644
--- a/ext/standard/tests/array/max_basic.phpt
+++ b/ext/standard/tests/array/max_basic.phpt
@@ -2,10 +2,10 @@
 Test return type and value for expected input max()
 --FILE--
 <?php
-/* 
+/*
  * proto mixed max(mixed arg1 [, mixed arg2 [, mixed ...]])
  * Function is implemented in ext/standard/array.c
-*/ 
+*/
 
 echo "\n*** Testing sequences of numbers ***\n";
 
diff --git a/ext/standard/tests/array/max_basiclong_64bit.phpt b/ext/standard/tests/array/max_basiclong_64bit.phpt
index 1eb7e31cdc0..95116b16c27 100644
--- a/ext/standard/tests/array/max_basiclong_64bit.phpt
+++ b/ext/standard/tests/array/max_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -MAX_64Bit - 1);
@@ -25,8 +25,8 @@ $longVals = array(
 );
 
    var_dump(max($arrayVals));
-   var_dump(max($longVals));   
-   
+   var_dump(max($longVals));
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/array/max_error.phpt b/ext/standard/tests/array/max_error.phpt
index b20a3c08f6d..a8736a3d887 100644
--- a/ext/standard/tests/array/max_error.phpt
+++ b/ext/standard/tests/array/max_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for min()
 --FILE--
 <?php
-/* 
+/*
  * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]])
  * Function is implemented in ext/standard/array.c
-*/ 
+*/
 
 
 echo "\n*** Testing Error Conditions ***\n";
diff --git a/ext/standard/tests/array/max_variation1.phpt b/ext/standard/tests/array/max_variation1.phpt
index a32ceb8fc27..44fa010c31a 100644
--- a/ext/standard/tests/array/max_variation1.phpt
+++ b/ext/standard/tests/array/max_variation1.phpt
@@ -2,10 +2,10 @@
 Test variations in usage of max()
 --FILE--
 <?php
-/* 
+/*
  * proto mixed max(mixed arg1 [, mixed arg2 [, mixed ...]])
  * Function is implemented in ext/standard/array.c
-*/ 
+*/
 
 echo "\n*** Testing boundary conditions ***\n";
 var_dump(max(2147483645, 2147483646) );
diff --git a/ext/standard/tests/array/max_variation2.phpt b/ext/standard/tests/array/max_variation2.phpt
index 9abcda53c3f..a020d5e422d 100644
--- a/ext/standard/tests/array/max_variation2.phpt
+++ b/ext/standard/tests/array/max_variation2.phpt
@@ -2,10 +2,10 @@
 Test variations in usage of max()
 --FILE--
 <?php
-/* 
+/*
  * proto mixed max(mixed arg1 [, mixed arg2 [, mixed ...]])
  * Function is implemented in ext/standard/array.c
-*/ 
+*/
 
 echo "\n*** Testing arrays  ***\n";
 
diff --git a/ext/standard/tests/array/min.phpt b/ext/standard/tests/array/min.phpt
index 3a77ee8a0da..cb8c7cfdcae 100644
--- a/ext/standard/tests/array/min.phpt
+++ b/ext/standard/tests/array/min.phpt
@@ -19,7 +19,7 @@ var_dump(min(0, true, false, true));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: min() expects at least 1 parameter, 0 given in %s on line 3
 NULL
 
diff --git a/ext/standard/tests/array/min_basic.phpt b/ext/standard/tests/array/min_basic.phpt
index 34f853fedbe..f76770f40dd 100644
--- a/ext/standard/tests/array/min_basic.phpt
+++ b/ext/standard/tests/array/min_basic.phpt
@@ -2,10 +2,10 @@
 Test return type and value for expected input min()
 --FILE--
 <?php
-/* 
+/*
  * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]])
  * Function is implemented in ext/standard/array.c
-*/ 
+*/
 
 echo "\n*** Testing sequences of numbers ***\n";
 
diff --git a/ext/standard/tests/array/min_basiclong_64bit.phpt b/ext/standard/tests/array/min_basiclong_64bit.phpt
index 52f63f39163..526d77a27a0 100644
--- a/ext/standard/tests/array/min_basiclong_64bit.phpt
+++ b/ext/standard/tests/array/min_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -MAX_64Bit - 1);
@@ -25,8 +25,8 @@ $longVals = array(
 );
 
    var_dump(min($arrayVals));
-   var_dump(min($longVals));   
-   
+   var_dump(min($longVals));
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/array/min_error.phpt b/ext/standard/tests/array/min_error.phpt
index dc472bc2584..deb84f276db 100644
--- a/ext/standard/tests/array/min_error.phpt
+++ b/ext/standard/tests/array/min_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for min()
 --FILE--
 <?php
-/* 
+/*
  * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]])
  * Function is implemented in ext/standard/array.c
-*/ 
+*/
 
 
 echo "\n*** Testing Error Conditions ***\n";
diff --git a/ext/standard/tests/array/min_variation1.phpt b/ext/standard/tests/array/min_variation1.phpt
index 9e24bd66a17..a9c31f615fe 100644
--- a/ext/standard/tests/array/min_variation1.phpt
+++ b/ext/standard/tests/array/min_variation1.phpt
@@ -2,10 +2,10 @@
 Test variations in usage of min()
 --FILE--
 <?php
-/* 
+/*
  * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]])
  * Function is implemented in ext/standard/array.c
-*/ 
+*/
 
 echo "\n*** Testing boundary conditions ***\n";
 var_dump(min(2147483645, 2147483646) );
diff --git a/ext/standard/tests/array/min_variation2.phpt b/ext/standard/tests/array/min_variation2.phpt
index a8b215209f2..eff810e8696 100644
--- a/ext/standard/tests/array/min_variation2.phpt
+++ b/ext/standard/tests/array/min_variation2.phpt
@@ -2,10 +2,10 @@
 Test variations in usage of min()
 --FILE--
 <?php
-/* 
+/*
  * proto mixed min(mixed arg1 [, mixed arg2 [, mixed ...]])
  * Function is implemented in ext/standard/array.c
-*/ 
+*/
 
 echo "\n*** Testing arrays  ***\n";
 
diff --git a/ext/standard/tests/array/natcasesort_basic.phpt b/ext/standard/tests/array/natcasesort_basic.phpt
index 2c173a6becf..a2bee698294 100644
--- a/ext/standard/tests/array/natcasesort_basic.phpt
+++ b/ext/standard/tests/array/natcasesort_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test natcasesort() function : basic functionality 
+Test natcasesort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool natcasesort(array &$array_arg)
diff --git a/ext/standard/tests/array/natcasesort_object1.phpt b/ext/standard/tests/array/natcasesort_object1.phpt
index aab98a45d8a..ec733adaf95 100644
--- a/ext/standard/tests/array/natcasesort_object1.phpt
+++ b/ext/standard/tests/array/natcasesort_object1.phpt
@@ -32,7 +32,7 @@ class for_string_natcasesort
 
 
 // array of string objects
-$unsorted_str_obj = array ( 
+$unsorted_str_obj = array (
   new for_string_natcasesort("axx"), new for_string_natcasesort("t"),
   new for_string_natcasesort("w"), new for_string_natcasesort("py"),
   new for_string_natcasesort("apple"), new for_string_natcasesort("Orange"),
diff --git a/ext/standard/tests/array/natcasesort_variation1.phpt b/ext/standard/tests/array/natcasesort_variation1.phpt
index cd4938b6954..347522063d4 100644
--- a/ext/standard/tests/array/natcasesort_variation1.phpt
+++ b/ext/standard/tests/array/natcasesort_variation1.phpt
@@ -58,7 +58,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -68,7 +68,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/natcasesort_variation11.phpt b/ext/standard/tests/array/natcasesort_variation11.phpt
index 98158f15d0b..af501f07bc2 100644
--- a/ext/standard/tests/array/natcasesort_variation11.phpt
+++ b/ext/standard/tests/array/natcasesort_variation11.phpt
@@ -39,7 +39,7 @@ $inputs = array(
        -10.5 => 'negative',
        .5 => 'half',
        ),
-       
+
 /*3*/  'extreme floats' => array(
        12.3456789000e6 => 'large',
        12.3456789000E-10 => 'small',
@@ -48,8 +48,8 @@ $inputs = array(
        // null data
 /*4*/  'null uppercase' => array(
        NULL => 'null 1',
-       ), 
-       
+       ),
+
 /*5*/  'null lowercase' => array(
        null => 'null 2',
        ),
@@ -59,17 +59,17 @@ $inputs = array(
        true => 'lowert',
        false => 'lowerf',
        ),
-       
+
 /*7*/  'bool uppercase' => array(
        TRUE => 'uppert',
        FALSE => 'upperf',
        ),
-       
+
        // empty data
 /*8*/ 'empty double quotes' => array(
        "" => 'emptyd',
        ),
-       
+
 /*9*/  'empty single quotes' => array(
        '' => 'emptys',
        ),
@@ -90,14 +90,14 @@ $inputs = array(
 /*12*/ 'unset' => array(
        @$unset_var => 'unset',
        ),
-       
+
        // duplicate values
 /*13*/ 'duplicate' => array(
        'foo' => 'bar',
        'baz' => 'bar',
        'hello' => 'world'
        ),
-       
+
 );
 
 // loop through each element of $inputs to check the behavior of natcasesort()
diff --git a/ext/standard/tests/array/natcasesort_variation2.phpt b/ext/standard/tests/array/natcasesort_variation2.phpt
index 8a05c12f932..a38dbedfe48 100644
--- a/ext/standard/tests/array/natcasesort_variation2.phpt
+++ b/ext/standard/tests/array/natcasesort_variation2.phpt
@@ -67,13 +67,13 @@ $inputs = array(
        TRUE,
        FALSE,
        ),
-       
+
        // empty data
 /*5*/ 'empty string' => array(
        "",
        '',
        ),
-       
+
 /*6*/ 'empty array' => array(
        ),
 
@@ -83,7 +83,7 @@ $inputs = array(
        'string',
        $heredoc,
        ),
-       
+
        // object data
 /*8*/ 'object' => array(
        new classA(),
diff --git a/ext/standard/tests/array/natcasesort_variation3.phpt b/ext/standard/tests/array/natcasesort_variation3.phpt
index 452e886995c..31b0d47ae96 100644
--- a/ext/standard/tests/array/natcasesort_variation3.phpt
+++ b/ext/standard/tests/array/natcasesort_variation3.phpt
@@ -27,7 +27,7 @@ $inputs = array (
 
   // mixed value array
   array(.0001, .0021, -.01, -1, 0, .09, 2, -.9, 10.6E-2, -10.6E-2, 33),
- 
+
   // array values contains minimum and maximum ranges
   array(2147483647, 2147483648, -2147483647, -2147483648, -0, 0, -2147483649)
 );
diff --git a/ext/standard/tests/array/natcasesort_variation9.phpt b/ext/standard/tests/array/natcasesort_variation9.phpt
index cc403782389..8929e407842 100644
Binary files a/ext/standard/tests/array/natcasesort_variation9.phpt and b/ext/standard/tests/array/natcasesort_variation9.phpt differ
diff --git a/ext/standard/tests/array/next_basic.phpt b/ext/standard/tests/array/next_basic.phpt
index fe8b70c88b6..f66f14adf51 100644
--- a/ext/standard/tests/array/next_basic.phpt
+++ b/ext/standard/tests/array/next_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test next() function : basic functionality 
+Test next() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : mixed next(array $array_arg)
- * Description: Move array argument's internal pointer to the next element and return it 
+ * Description: Move array argument's internal pointer to the next element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/next_error.phpt b/ext/standard/tests/array/next_error.phpt
index f7b78357cb7..11e7cb12ded 100644
--- a/ext/standard/tests/array/next_error.phpt
+++ b/ext/standard/tests/array/next_error.phpt
@@ -3,7 +3,7 @@ Test next() function : error conditions - Pass incorrect number of arguments
 --FILE--
 <?php
 /* Prototype  : mixed next(array $array_arg)
- * Description: Move array argument's internal pointer to the next element and return it 
+ * Description: Move array argument's internal pointer to the next element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/next_variation1.phpt b/ext/standard/tests/array/next_variation1.phpt
index e8a2530e42a..b87f3f9e155 100644
--- a/ext/standard/tests/array/next_variation1.phpt
+++ b/ext/standard/tests/array/next_variation1.phpt
@@ -3,7 +3,7 @@ Test next() function : usage variation - Pass different data types as $array_arg
 --FILE--
 <?php
 /* Prototype  : mixed next(array $array_arg)
- * Description: Move array argument's internal pointer to the next element and return it 
+ * Description: Move array argument's internal pointer to the next element and return it
  * Source code: ext/standard/array.c
  */
 
@@ -58,7 +58,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -68,7 +68,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/next_variation2.phpt b/ext/standard/tests/array/next_variation2.phpt
index e7505096d9a..49cb21a1daa 100644
--- a/ext/standard/tests/array/next_variation2.phpt
+++ b/ext/standard/tests/array/next_variation2.phpt
@@ -3,7 +3,7 @@ Test next() function : usage variation - Mulit-dimensional arrays
 --FILE--
 <?php
 /* Prototype  : mixed next(array $array_arg)
- * Description: Move array argument's internal pointer to the next element and return it 
+ * Description: Move array argument's internal pointer to the next element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/prev_basic.phpt b/ext/standard/tests/array/prev_basic.phpt
index 8c1450dd3c8..2cfdc226747 100644
--- a/ext/standard/tests/array/prev_basic.phpt
+++ b/ext/standard/tests/array/prev_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test prev() function : basic functionality 
+Test prev() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : mixed prev(array $array_arg)
- * Description: Move array argument's internal pointer to the previous element and return it 
+ * Description: Move array argument's internal pointer to the previous element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/prev_error1.phpt b/ext/standard/tests/array/prev_error1.phpt
index bea245196ea..0b9b15814eb 100644
--- a/ext/standard/tests/array/prev_error1.phpt
+++ b/ext/standard/tests/array/prev_error1.phpt
@@ -3,7 +3,7 @@ Test prev() function : error conditions - Pass incorrect number of arguments
 --FILE--
 <?php
 /* Prototype  : mixed prev(array $array_arg)
- * Description: Move array argument's internal pointer to the previous element and return it 
+ * Description: Move array argument's internal pointer to the previous element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/prev_error2.phpt b/ext/standard/tests/array/prev_error2.phpt
index 851cf0a9499..37049cf854a 100644
--- a/ext/standard/tests/array/prev_error2.phpt
+++ b/ext/standard/tests/array/prev_error2.phpt
@@ -3,7 +3,7 @@ prev - ensure warning is received when passing an indirect temporary.
 --FILE--
 <?php
 /* Prototype  : mixed prev(array $array_arg)
- * Description: Move array argument's internal pointer to the previous element and return it 
+ * Description: Move array argument's internal pointer to the previous element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/prev_error3.phpt b/ext/standard/tests/array/prev_error3.phpt
index dfac24eacbf..8f91507131e 100644
--- a/ext/standard/tests/array/prev_error3.phpt
+++ b/ext/standard/tests/array/prev_error3.phpt
@@ -3,7 +3,7 @@ prev - ensure we cannot pass a temporary
 --FILE--
 <?php
 /* Prototype  : mixed prev(array $array_arg)
- * Description: Move array argument's internal pointer to the previous element and return it 
+ * Description: Move array argument's internal pointer to the previous element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/prev_variation1.phpt b/ext/standard/tests/array/prev_variation1.phpt
index aacb57d9c6d..6d1a79409f2 100644
--- a/ext/standard/tests/array/prev_variation1.phpt
+++ b/ext/standard/tests/array/prev_variation1.phpt
@@ -3,7 +3,7 @@ Test prev() function : usage variation - Pass different data types as $array_arg
 --FILE--
 <?php
 /* Prototype  : mixed prev(array $array_arg)
- * Description: Move array argument's internal pointer to the previous element and return it 
+ * Description: Move array argument's internal pointer to the previous element and return it
  * Source code: ext/standard/array.c
  */
 
@@ -58,7 +58,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -68,7 +68,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/prev_variation2.phpt b/ext/standard/tests/array/prev_variation2.phpt
index 0ce087781e3..3bb30f7cb3a 100644
--- a/ext/standard/tests/array/prev_variation2.phpt
+++ b/ext/standard/tests/array/prev_variation2.phpt
@@ -3,7 +3,7 @@ Test prev() function : usage variation - Multi-dimensional arrays
 --FILE--
 <?php
 /* Prototype  : mixed prev(array $array_arg)
- * Description: Move array argument's internal pointer to the previous element and return it 
+ * Description: Move array argument's internal pointer to the previous element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/range.phpt b/ext/standard/tests/array/range.phpt
index 9fd0f5ed456..cce50b31550 100644
--- a/ext/standard/tests/array/range.phpt
+++ b/ext/standard/tests/array/range.phpt
@@ -13,13 +13,13 @@ var_dump( range(1, 10) );
 echo "\n-- An array of elements from high to low --\n";
 var_dump( range(10, 1) );
 
-echo "\n-- Numeric Strings as Low and High --\n";	
+echo "\n-- Numeric Strings as Low and High --\n";
 echo "-- An array of elements from low to high --\n";
 var_dump( range("1", "10") );
 echo "\n-- An array of elements from high to low --\n";
 var_dump( range("10", "1") );
 
-echo "\n-- Chars as Low and High --\n";	
+echo "\n-- Chars as Low and High --\n";
 echo "-- An array of elements from low to high --\n";
 var_dump( range("a", "z") );
 echo "\n-- An array of elements from high to low --\n";
@@ -29,19 +29,19 @@ echo "\n-- Low and High are equal --\n";
 var_dump( range(5, 5) );
 var_dump( range("q", "q") );
 
-echo "\n-- floats as Low and High --\n";	
+echo "\n-- floats as Low and High --\n";
 var_dump( range(5.1, 10.1) );
 var_dump( range(10.1, 5.1) );
 
 var_dump( range("5.1", "10.1") );
 var_dump( range("10.1", "5.1") );
 
-echo "\n-- Passing step with Low and High --\n";	
+echo "\n-- Passing step with Low and High --\n";
 var_dump( range(1, 2, 0.1) );
 var_dump( range(2, 1, 0.1) );
 
 var_dump( range(1, 2, "0.1") );
-var_dump( range("1", "2", 0.1) ); 
+var_dump( range("1", "2", 0.1) );
 
 echo "\n-- Testing basic string with step --\n";
 var_dump( range("abcd", "mnop", 2) );
diff --git a/ext/standard/tests/array/range_errors.phpt b/ext/standard/tests/array/range_errors.phpt
index 45c30f5acf3..b63e9874bf0 100644
--- a/ext/standard/tests/array/range_errors.phpt
+++ b/ext/standard/tests/array/range_errors.phpt
@@ -7,7 +7,7 @@ precision=14
 
 echo "\n*** Testing error conditions ***\n";
 
-echo "\n-- Testing ( (low < high) && (step = 0) ) --"; 
+echo "\n-- Testing ( (low < high) && (step = 0) ) --";
 var_dump( range(1, 2, 0) );
 var_dump( range("a", "b", 0) );
 
@@ -21,11 +21,11 @@ var_dump( range(1.0, 7.0, 6.5) );
 echo "\n\n-- Testing ( (low > high) && (low-high < step) ) --";
 var_dump( range(7.0, 1.0, 6.5) );
 
-echo "\n-- Testing Invalid number of arguments --";        
+echo "\n-- Testing Invalid number of arguments --";
 var_dump( range() );  // No.of args = 0
 var_dump( range(1) );  // No.of args < expected
 var_dump( range(1,2,3,4) );  // No.of args > expected
-var_dump( range(-1, -2, 2) );  
+var_dump( range(-1, -2, 2) );
 var_dump( range("a", "j", "z") );
 var_dump( range(0, 1, "140962482048819216326.24") );
 var_dump( range(0, 1, "140962482048819216326.24.") );
diff --git a/ext/standard/tests/array/reset_basic.phpt b/ext/standard/tests/array/reset_basic.phpt
index d376e68a219..e698e5c4f21 100644
--- a/ext/standard/tests/array/reset_basic.phpt
+++ b/ext/standard/tests/array/reset_basic.phpt
@@ -3,7 +3,7 @@ Test reset() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : mixed reset(array $array_arg)
- * Description: Set array argument's internal pointer to the first element and return it 
+ * Description: Set array argument's internal pointer to the first element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/reset_error.phpt b/ext/standard/tests/array/reset_error.phpt
index c71608112c3..abab8af635f 100644
--- a/ext/standard/tests/array/reset_error.phpt
+++ b/ext/standard/tests/array/reset_error.phpt
@@ -3,7 +3,7 @@ Test reset() function : error conditions - Pass incorrect number of args
 --FILE--
 <?php
 /* Prototype  : mixed reset(array $array_arg)
- * Description: Set array argument's internal pointer to the first element and return it 
+ * Description: Set array argument's internal pointer to the first element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/reset_variation1.phpt b/ext/standard/tests/array/reset_variation1.phpt
index d4b3212ef28..51fb7cd431b 100644
--- a/ext/standard/tests/array/reset_variation1.phpt
+++ b/ext/standard/tests/array/reset_variation1.phpt
@@ -3,7 +3,7 @@ Test reset() function : usage variations - Pass different data types as $array_a
 --FILE--
 <?php
 /* Prototype  : mixed reset(array $array_arg)
- * Description: Set array argument's internal pointer to the first element and return it 
+ * Description: Set array argument's internal pointer to the first element and return it
  * Source code: ext/standard/array.c
  */
 
@@ -58,7 +58,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -68,7 +68,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/reset_variation2.phpt b/ext/standard/tests/array/reset_variation2.phpt
index 1384affa946..de371ffeab0 100644
--- a/ext/standard/tests/array/reset_variation2.phpt
+++ b/ext/standard/tests/array/reset_variation2.phpt
@@ -3,7 +3,7 @@ Test reset() function : usage variations - unset first element
 --FILE--
 <?php
 /* Prototype  : mixed reset(array $array_arg)
- * Description: Set array argument's internal pointer to the first element and return it 
+ * Description: Set array argument's internal pointer to the first element and return it
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/reset_variation3.phpt b/ext/standard/tests/array/reset_variation3.phpt
index 29f965abe12..ad21ced4d22 100644
--- a/ext/standard/tests/array/reset_variation3.phpt
+++ b/ext/standard/tests/array/reset_variation3.phpt
@@ -3,12 +3,12 @@ Test reset() function : usage variations - Referenced variables
 --FILE--
 <?php
 /* Prototype  : mixed reset(array $array_arg)
- * Description: Set array argument's internal pointer to the first element and return it 
+ * Description: Set array argument's internal pointer to the first element and return it
  * Source code: ext/standard/array.c
  */
 
 /*
- * Reference two arrays to each other then call reset() to test position of 
+ * Reference two arrays to each other then call reset() to test position of
  * internal pointer in both arrays
  */
 
diff --git a/ext/standard/tests/array/rsort_basic.phpt b/ext/standard/tests/array/rsort_basic.phpt
index 34fcbb7034f..9d11b022b78 100644
--- a/ext/standard/tests/array/rsort_basic.phpt
+++ b/ext/standard/tests/array/rsort_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test rsort() function : basic functionality 
+Test rsort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool rsort(array &$array_arg [, int $sort_flags])
- * Description: Sort an array in reverse order 
+ * Description: Sort an array in reverse order
  * Source code: ext/standard/array.c
  */
 
@@ -13,13 +13,13 @@ Test rsort() function : basic functionality
 
 echo "*** Testing rsort() : basic functionality ***\n";
 
-// associative array containing unsorted string values  
+// associative array containing unsorted string values
 $unsorted_strings = array(
 	"l" => "lemon", "o" => "orange",
 	"O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20",
 	"b" => "banana",
 );
- 
+
 // array with default keys containing unsorted numeric values
 $unsorted_numerics =  array( 100, 33, 555, 22 );
 
diff --git a/ext/standard/tests/array/rsort_error.phpt b/ext/standard/tests/array/rsort_error.phpt
index 6f6f2f97620..247ec79cb25 100644
--- a/ext/standard/tests/array/rsort_error.phpt
+++ b/ext/standard/tests/array/rsort_error.phpt
@@ -3,7 +3,7 @@ Test rsort() function : error conditions - Pass incorrect number of args
 --FILE--
 <?php
 /* Prototype  : bool rsort(array &$array_arg [, int $sort_flags])
- * Description: Sort an array in reverse order 
+ * Description: Sort an array in reverse order
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/rsort_object1.phpt b/ext/standard/tests/array/rsort_object1.phpt
index 98f7cfec162..dbaf1751f00 100644
--- a/ext/standard/tests/array/rsort_object1.phpt
+++ b/ext/standard/tests/array/rsort_object1.phpt
@@ -3,7 +3,7 @@ Test rsort() function : object functionality
 --FILE--
 <?php
 /* Prototype  : bool rsort(array &$array_arg [, int $sort_flags])
- * Description: Sort an array in reverse order 
+ * Description: Sort an array in reverse order
  * Source code: ext/standard/array.c
  */
 
@@ -41,14 +41,14 @@ class for_string_rsort
 }
 
 // array of integer objects
-$unsorted_int_obj = array( 
+$unsorted_int_obj = array(
   new for_integer_rsort(11), new for_integer_rsort(66),
   new for_integer_rsort(23), new for_integer_rsort(-5),
   new for_integer_rsort(0.001), new for_integer_rsort(0)
 );
 
 // array of string objects
-$unsorted_str_obj = array ( 
+$unsorted_str_obj = array (
   new for_string_rsort("axx"), new for_string_rsort("t"),
   new for_string_rsort("w"), new for_string_rsort("py"),
   new for_string_rsort("apple"), new for_string_rsort("Orange"),
diff --git a/ext/standard/tests/array/rsort_object2.phpt b/ext/standard/tests/array/rsort_object2.phpt
index 57acdc61fec..75a8fbb7abf 100644
--- a/ext/standard/tests/array/rsort_object2.phpt
+++ b/ext/standard/tests/array/rsort_object2.phpt
@@ -3,7 +3,7 @@ Test rsort() function : object functionality - different visibilities
 --FILE--
 <?php
 /* Prototype  : bool rsort(array &$array_arg [, int $sort_flags])
- * Description: Sort an array in reverse order 
+ * Description: Sort an array in reverse order
  * Source code: ext/standard/array.c
  */
 
@@ -51,7 +51,7 @@ class for_string_rsort
 
 // array of integer objects
 
-$unsorted_int_obj = array( 
+$unsorted_int_obj = array(
   new for_integer_rsort(11,33,30),
   new for_integer_rsort(66,44,4),
   new for_integer_rsort(-88,-5,5),
@@ -59,8 +59,8 @@ $unsorted_int_obj = array(
 );
 
 // array of string objects
-$unsorted_str_obj = array ( 
-  new for_string_rsort("axx","AXX","ass"), 
+$unsorted_str_obj = array (
+  new for_string_rsort("axx","AXX","ass"),
   new for_string_rsort("t","eee","abb"),
   new for_string_rsort("w","W", "c"),
   new for_string_rsort("py","PY", "pt"),
diff --git a/ext/standard/tests/array/rsort_variation1.phpt b/ext/standard/tests/array/rsort_variation1.phpt
index 86d14818602..17c0385eedc 100644
--- a/ext/standard/tests/array/rsort_variation1.phpt
+++ b/ext/standard/tests/array/rsort_variation1.phpt
@@ -3,7 +3,7 @@ Test rsort() function : usage variations - Pass different data types as $array_a
 --FILE--
 <?php
 /* Prototype  : bool rsort(array &$array_arg [, int $sort_flags])
- * Description: Sort an array in reverse order 
+ * Description: Sort an array in reverse order
  * Source code: ext/standard/array.c
  */
 
@@ -58,7 +58,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -67,7 +67,7 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
diff --git a/ext/standard/tests/array/rsort_variation10.phpt b/ext/standard/tests/array/rsort_variation10.phpt
index ccf886b0703..f057c9e0658 100644
--- a/ext/standard/tests/array/rsort_variation10.phpt
+++ b/ext/standard/tests/array/rsort_variation10.phpt
@@ -3,7 +3,7 @@ Test rsort() function : usage variations - Octal values
 --FILE--
 <?php
 /* Prototype  : bool rsort(array &$array_arg [, int $sort_flags])
- * Description: Sort an array in reverse order 
+ * Description: Sort an array in reverse order
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/rsort_variation11.phpt b/ext/standard/tests/array/rsort_variation11.phpt
index a2f0fdc3e4f..f918a997979 100644
Binary files a/ext/standard/tests/array/rsort_variation11.phpt and b/ext/standard/tests/array/rsort_variation11.phpt differ
diff --git a/ext/standard/tests/array/rsort_variation2.phpt b/ext/standard/tests/array/rsort_variation2.phpt
index d91b09c1ca2..c3990ccd201 100644
--- a/ext/standard/tests/array/rsort_variation2.phpt
+++ b/ext/standard/tests/array/rsort_variation2.phpt
@@ -5,7 +5,7 @@ Test rsort() function : usage variations - Pass different data types as $sort_fl
 --FILE--
 <?php
 /* Prototype  : bool rsort(array &$array_arg [, int $sort_flags])
- * Description: Sort an array in reverse order 
+ * Description: Sort an array in reverse order
  * Source code: ext/standard/array.c
  */
 
@@ -64,7 +64,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -73,7 +73,7 @@ $inputs = array(
 /*18*/ "SORT_NUMERIC",
        'SORT_NUMERIC',
        $heredoc,
-       
+
        // object data
 /*21*/ new classA(),
 
@@ -91,14 +91,14 @@ $inputs = array(
 $iterator = 1;
 foreach($inputs as $input) {
   echo "\n-- Iteration $iterator --\n";
-  
+
   //create temporary array in case rsort() works
   $temp = $array_arg;
-  
+
   var_dump( rsort($temp, $input) );
   var_dump($temp);
   $iterator++;
-  
+
   $temp = null;
 };
 
diff --git a/ext/standard/tests/array/rsort_variation3.phpt b/ext/standard/tests/array/rsort_variation3.phpt
index f8c002a6f78..2edad3eaecd 100644
--- a/ext/standard/tests/array/rsort_variation3.phpt
+++ b/ext/standard/tests/array/rsort_variation3.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : bool rsort(array &$array_arg [, int $sort_flags])
- * Description: Sort an array in reverse order 
+ * Description: Sort an array in reverse order
  * Source code: ext/standard/array.c
  */
 
@@ -42,20 +42,20 @@ $count = 1;
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With Defualt sort flag -\n"; 
-  $temp_array = $array; 
+  echo "- With Defualt sort flag -\n";
+  $temp_array = $array;
   var_dump(rsort($temp_array) );
   var_dump($temp_array);
 
   // loop through $flag_value array and setting all possible flag values
   foreach($flag_value as $key => $flag){
     echo "- Sort flag = $key -\n";
-    $temp_array = $array; 
+    $temp_array = $array;
     var_dump(rsort($temp_array, $flag) );
     var_dump($temp_array);
-  }  
+  }
   $count++;
-} 
+}
 
 echo "Done";
 ?>
diff --git a/ext/standard/tests/array/rsort_variation4.phpt b/ext/standard/tests/array/rsort_variation4.phpt
index 226284d329a..0960edd36ca 100644
--- a/ext/standard/tests/array/rsort_variation4.phpt
+++ b/ext/standard/tests/array/rsort_variation4.phpt
@@ -3,12 +3,12 @@ Test rsort() function : usage variations - referenced variables
 --FILE--
 <?php
 /* Prototype  : bool rsort(array &$array_arg [, int $sort_flags])
- * Description: Sort an array in reverse order 
+ * Description: Sort an array in reverse order
  * Source code: ext/standard/array.c
  */
 
 /*
- * Test behaviour of rsort() when: 
+ * Test behaviour of rsort() when:
  * 1. passed an array of referenced variables
  * 2. $array_arg is a reference to another array
  * 3. $array_arg is passed by reference
@@ -20,7 +20,7 @@ $value1 = 100;
 $value2 = 33;
 $value3 = 555;
 
-// an array containing integer references 
+// an array containing integer references
 $unsorted_numerics =  array( &$value1 , &$value2, &$value3);
 
 echo "\n-- 'flag' value is defualt --\n";
diff --git a/ext/standard/tests/array/rsort_variation5.phpt b/ext/standard/tests/array/rsort_variation5.phpt
index c0184e83b9f..4cc1c526225 100644
--- a/ext/standard/tests/array/rsort_variation5.phpt
+++ b/ext/standard/tests/array/rsort_variation5.phpt
@@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool rsort(array &$array_arg [, int $sort_flags])
- * Description: Sort an array in reverse order 
+ * Description: Sort an array in reverse order
  * Source code: ext/standard/array.c
  */
 
@@ -41,7 +41,7 @@ foreach ($various_arrays as $array) {
 	// loop through $flags array and setting all possible flag values
 	foreach($flags as $key => $flag){
 		echo "- Sort flag = $key -\n";
-		
+
 		$temp_array = $array;
 		var_dump(rsort($temp_array, $flag) );
 		var_dump($temp_array);
diff --git a/ext/standard/tests/array/rsort_variation6.phpt b/ext/standard/tests/array/rsort_variation6.phpt
index 559a1ebaf70..59b43a8fcba 100644
--- a/ext/standard/tests/array/rsort_variation6.phpt
+++ b/ext/standard/tests/array/rsort_variation6.phpt
@@ -3,7 +3,7 @@ Test rsort() function : usage variations - Hexadecimal vales
 --FILE--
 <?php
 /* Prototype  : bool rsort(array &$array_arg [, int $sort_flags])
- * Description: Sort an array in reverse order 
+ * Description: Sort an array in reverse order
  * Source code: ext/standard/array.c
  */
 
@@ -13,7 +13,7 @@ Test rsort() function : usage variations - Hexadecimal vales
 
 echo "*** Testing rsort() : variation ***\n";
 
-// an array contains unsorted hexadecimal values  
+// an array contains unsorted hexadecimal values
 $unsorted_hex_array = array(0x1AB, 0xFFF, 0xF, 0xFF, 0x2AA, 0xBB, 0x1ab, 0xff, -0xFF, 0, -0x2aa);
 
 echo "\n-- 'flag' value is defualt  --\n";
diff --git a/ext/standard/tests/array/rsort_variation7.phpt b/ext/standard/tests/array/rsort_variation7.phpt
index a996bf6db34..2c04a143f1a 100644
--- a/ext/standard/tests/array/rsort_variation7.phpt
+++ b/ext/standard/tests/array/rsort_variation7.phpt
@@ -3,7 +3,7 @@ Test rsort() function : usage variations - boolean values
 --FILE--
 <?php
 /* Prototype  : bool rsort(array &$array_arg [, int $sort_flags])
- * Description: Sort an array in reverse order 
+ * Description: Sort an array in reverse order
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/rsort_variation8.phpt b/ext/standard/tests/array/rsort_variation8.phpt
index a4f94b5f0f3..3b5e9b686f6 100644
--- a/ext/standard/tests/array/rsort_variation8.phpt
+++ b/ext/standard/tests/array/rsort_variation8.phpt
@@ -3,7 +3,7 @@ Test rsort() function : usage variations - multi-dimensional arrays
 --FILE--
 <?php
 /* Prototype  : bool rsort(array &$array_arg [, int $sort_flags])
- * Description: Sort an array in reverse order 
+ * Description: Sort an array in reverse order
  * Source code: ext/standard/array.c
  */
 
@@ -33,14 +33,14 @@ $count = 1;
 
 // loop through to test rsort() with different arrays
 foreach ($various_arrays as $array) {
- 
-  echo "\n-- Iteration $count --\n"; 
-  
+
+  echo "\n-- Iteration $count --\n";
+
   echo "\n-- 'flag' value is default --\n";
   $temp_array = $array;
   var_dump(rsort($temp_array) );
   var_dump($temp_array);
-  
+
   echo "\n-- 'flag' value is SORT_REGULAR --\n";
   $temp_array = $array;
   var_dump(rsort($temp_array, SORT_REGULAR) );
diff --git a/ext/standard/tests/array/rsort_variation9.phpt b/ext/standard/tests/array/rsort_variation9.phpt
index 023d401314f..53fc8d4c0b7 100644
--- a/ext/standard/tests/array/rsort_variation9.phpt
+++ b/ext/standard/tests/array/rsort_variation9.phpt
@@ -3,7 +3,7 @@ Test rsort() function : usage variations - mixed associative arrays
 --FILE--
 <?php
 /* Prototype  : bool rsort(array &$array_arg [, int $sort_flags])
- * Description: Sort an array in reverse order 
+ * Description: Sort an array in reverse order
  * Source code: ext/standard/array.c
  */
 
@@ -35,8 +35,8 @@ $various_arrays = array(
 
 $count = 1;
 
-// loop through to test rsort() with different arrays, 
-// to test the new keys for the elements in the sorted array 
+// loop through to test rsort() with different arrays,
+// to test the new keys for the elements in the sorted array
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
diff --git a/ext/standard/tests/array/shuffle_basic1.phpt b/ext/standard/tests/array/shuffle_basic1.phpt
index d601f5433c0..e29dec92202 100644
--- a/ext/standard/tests/array/shuffle_basic1.phpt
+++ b/ext/standard/tests/array/shuffle_basic1.phpt
@@ -3,7 +3,7 @@ Test shuffle() function : basic functionality - array with default keys
 --FILE--
 <?php
 /* Prototype  : bool shuffle(array $array_arg)
- * Description: Randomly shuffle the contents of an array 
+ * Description: Randomly shuffle the contents of an array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/shuffle_basic2.phpt b/ext/standard/tests/array/shuffle_basic2.phpt
index cb127d23ef6..8977e349f95 100644
--- a/ext/standard/tests/array/shuffle_basic2.phpt
+++ b/ext/standard/tests/array/shuffle_basic2.phpt
@@ -3,12 +3,12 @@ Test shuffle() function : basic functionality -  with associative array
 --FILE--
 <?php
 /* Prototype  : bool shuffle(array $array_arg)
- * Description: Randomly shuffle the contents of an array 
+ * Description: Randomly shuffle the contents of an array
  * Source code: ext/standard/array.c
 */
 
 /*
-* Test behaviour of shuffle when an associative array is 
+* Test behaviour of shuffle when an associative array is
 * passed to the 'array_arg' argument and check for the
 * changes in the input array by printing the input array
 * before and after shuffle() function is applied on it
diff --git a/ext/standard/tests/array/shuffle_error.phpt b/ext/standard/tests/array/shuffle_error.phpt
index 833b3903637..27bf2609495 100644
--- a/ext/standard/tests/array/shuffle_error.phpt
+++ b/ext/standard/tests/array/shuffle_error.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test shuffle() function : error conditions 
+Test shuffle() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool shuffle(array $array_arg)
- * Description: Randomly shuffle the contents of an array 
+ * Description: Randomly shuffle the contents of an array
  * Source code: ext/standard/array.c
 */
 
 /* Test shuffle() to see that warning messages are emitted
- * when invalid number of arguments are passed to the function 
+ * when invalid number of arguments are passed to the function
 */
 
 echo "*** Testing shuffle() : error conditions ***\n";
@@ -23,7 +23,7 @@ $array_arg = array(1, "two" => 2);
 $extra_arg = 10;
 var_dump( shuffle($array_arg, $extra_arg) );
 
-// printing the input array to check that it is not affected 
+// printing the input array to check that it is not affected
 // by above shuffle() function calls
 echo "\n-- original input array --\n";
 var_dump( $array_arg );
diff --git a/ext/standard/tests/array/shuffle_variation1.phpt b/ext/standard/tests/array/shuffle_variation1.phpt
index 6ecbd387fe0..9712d761136 100644
--- a/ext/standard/tests/array/shuffle_variation1.phpt
+++ b/ext/standard/tests/array/shuffle_variation1.phpt
@@ -3,7 +3,7 @@ Test shuffle() function : usage variations  - unexpected values for 'array_arg'
 --FILE--
 <?php
 /* Prototype  : bool shuffle(array $array_arg)
- * Description: Randomly shuffle the contents of an array 
+ * Description: Randomly shuffle the contents of an array
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/shuffle_variation2.phpt b/ext/standard/tests/array/shuffle_variation2.phpt
index a0cb6b632e6..b0394338ea7 100644
--- a/ext/standard/tests/array/shuffle_variation2.phpt
+++ b/ext/standard/tests/array/shuffle_variation2.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test shuffle() function : usage variation - with MultiDimensional array 
+Test shuffle() function : usage variation - with MultiDimensional array
 --FILE--
 <?php
 /* Prototype  : bool shuffle(array $array_arg)
- * Description: Randomly shuffle the contents of an array 
+ * Description: Randomly shuffle the contents of an array
  * Source code: ext/standard/array.c
 */
 
@@ -26,7 +26,7 @@ $array_arg = array(
 
 );
 
-// calling shuffle() function with multi-dimensional array 
+// calling shuffle() function with multi-dimensional array
 var_dump( shuffle($array_arg) );
 echo "\nThe output array is:\n";
 var_dump( $array_arg );
@@ -37,9 +37,9 @@ echo "\n*** Testing shuffle() with arrays having different types of values ***\n
 $counter = 1;
 for($i=0; $i<=6; $i++) {
   echo "\n-- Iteration $counter --\n";
-  var_dump( shuffle($array_arg[$i]) );  
+  var_dump( shuffle($array_arg[$i]) );
   echo "\nThe output array is:\n";
-  var_dump( $array_arg[$i] ); 
+  var_dump( $array_arg[$i] );
   $counter++;
 }
 
diff --git a/ext/standard/tests/array/shuffle_variation3.phpt b/ext/standard/tests/array/shuffle_variation3.phpt
index 1cb4e4d1eb5..68dad4a4712 100644
--- a/ext/standard/tests/array/shuffle_variation3.phpt
+++ b/ext/standard/tests/array/shuffle_variation3.phpt
@@ -3,7 +3,7 @@ Test shuffle() function : usage variation - arrays with diff types of values
 --FILE--
 <?php
 /* Prototype  : bool shuffle(array $array_arg)
- * Description: Randomly shuffle the contents of an array 
+ * Description: Randomly shuffle the contents of an array
  * Source code: ext/standard/array.c
 */
 
@@ -53,9 +53,9 @@ echo "\n*** Testing shuffle() with arrays having different types of values ***\n
 $counter = 1;
 foreach($array_arg as $arr) {
   echo "\n-- Iteration $counter --\n";
-  var_dump( shuffle($arr) );  
+  var_dump( shuffle($arr) );
   echo "\nThe output array is:\n";
-  var_dump( $arr ); 
+  var_dump( $arr );
   $counter++;
 }
 
diff --git a/ext/standard/tests/array/shuffle_variation4.phpt b/ext/standard/tests/array/shuffle_variation4.phpt
index 399197c19b0..2b5f80b71e8 100644
--- a/ext/standard/tests/array/shuffle_variation4.phpt
+++ b/ext/standard/tests/array/shuffle_variation4.phpt
@@ -3,12 +3,12 @@ Test shuffle() function : usage variation - associative arrays with diff types o
 --FILE--
 <?php
 /* Prototype  : bool shuffle(array $array_arg)
- * Description: Randomly shuffle the contents of an array 
+ * Description: Randomly shuffle the contents of an array
  * Source code: ext/standard/array.c
 */
 
 /*
-* Test behaviour of shuffle() function when associative arrays 
+* Test behaviour of shuffle() function when associative arrays
 * having different types of values, are passed to 'array_arg' argument
 */
 
@@ -56,9 +56,9 @@ echo "\n*** Testing shuffle() with arrays having different types of values ***\n
 $counter = 1;
 foreach($array_arg as $arr) {
   echo "\n-- Iteration $counter --\n";
-  var_dump( shuffle($arr) );  
+  var_dump( shuffle($arr) );
   echo "\nThe output array is:\n";
-  var_dump( $arr ); 
+  var_dump( $arr );
   $counter++;
 }
 
diff --git a/ext/standard/tests/array/shuffle_variation5.phpt b/ext/standard/tests/array/shuffle_variation5.phpt
index ca2c1ac90e0..e7a7db1be53 100644
--- a/ext/standard/tests/array/shuffle_variation5.phpt
+++ b/ext/standard/tests/array/shuffle_variation5.phpt
@@ -3,12 +3,12 @@ Test shuffle() function : usage variation - arrays with diff heredoc strings
 --FILE--
 <?php
 /* Prototype  : bool shuffle(array $array_arg)
- * Description: Randomly shuffle the contents of an array 
+ * Description: Randomly shuffle the contents of an array
  * Source code: ext/standard/array.c
 */
 
 /*
-* Test behaviour of shuffle() when an array of heredoc strings is passed to 
+* Test behaviour of shuffle() when an array of heredoc strings is passed to
 * 'array_arg' argument of the function
 */
 
@@ -64,15 +64,15 @@ $heredoc_asso_array = array(
 
 // test shuffle() with array containing heredoc strings as values
 echo "\n-- with array of heredoc strings --\n";
-var_dump( shuffle($heredoc_array) );  
+var_dump( shuffle($heredoc_array) );
 echo "\nThe output array is:\n";
-var_dump( $heredoc_array );  
+var_dump( $heredoc_array );
 
-// test shuffle() with array containing heredoc strings as its keys 
+// test shuffle() with array containing heredoc strings as its keys
 echo "\n-- with array having heredoc strings as keys --\n";
-var_dump( shuffle($heredoc_asso_array) );  
+var_dump( shuffle($heredoc_asso_array) );
 echo "\nThe output array is:\n";
-var_dump( $heredoc_asso_array );  
+var_dump( $heredoc_asso_array );
 
 echo "Done";
 ?>
diff --git a/ext/standard/tests/array/sizeof_basic1.phpt b/ext/standard/tests/array/sizeof_basic1.phpt
index ac86cbf8d70..c292199cb9d 100644
--- a/ext/standard/tests/array/sizeof_basic1.phpt
+++ b/ext/standard/tests/array/sizeof_basic1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test sizeof() function : basic functionality - for scalar types 
+Test sizeof() function : basic functionality - for scalar types
 --FILE--
 <?php
 /* Prototype  : int sizeof(mixed $var[, int $mode] )
- * Description: Counts an elements in an array. If Standard PHP library is 
+ * Description: Counts an elements in an array. If Standard PHP library is
  *              installed, it will return the properties of an object.
  * Source code: ext/standard/basic_functions.c
  * Alias to functions: count()
  */
 
-/* Testing the sizeof() for some of the scalar types(integer, float) values 
+/* Testing the sizeof() for some of the scalar types(integer, float) values
  * in default, COUNT_NORMAL and COUNT_RECURSIVE modes.
- */ 
+ */
 
 echo "*** Testing sizeof() : basic functionality ***\n";
 
diff --git a/ext/standard/tests/array/sizeof_basic2.phpt b/ext/standard/tests/array/sizeof_basic2.phpt
index b56682c31a4..3dfbc7c6623 100644
--- a/ext/standard/tests/array/sizeof_basic2.phpt
+++ b/ext/standard/tests/array/sizeof_basic2.phpt
@@ -3,17 +3,17 @@ Test sizeof() function : basic functionality - for non-scalar type(array)
 --FILE--
 <?php
 /* Prototype  : int sizeof(mixed $var[, int $mode] )
- * Description: Counts an elements in an array. If Standard PHP library is 
+ * Description: Counts an elements in an array. If Standard PHP library is
  *              installed, it will return the properties of an object.
  * Source code: ext/standard/basic_functions.c
  * Alias to functions: count()
  */
 
-/* Testing the sizeof() for non-scalar type(array) value 
+/* Testing the sizeof() for non-scalar type(array) value
  * in default, COUNT_NORMAL and COUNT_RECURSIVE modes.
  * Sizeof() has been tested for simple integer, string,
  * indexed and mixed arrays.
- */ 
+ */
 
 echo "*** Testing sizeof() : basic functionality ***\n";
 
diff --git a/ext/standard/tests/array/sizeof_error.phpt b/ext/standard/tests/array/sizeof_error.phpt
index c6274830cfb..3a9ce1b6293 100644
--- a/ext/standard/tests/array/sizeof_error.phpt
+++ b/ext/standard/tests/array/sizeof_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test sizeof() function : error conditions 
+Test sizeof() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int sizeof(mixed $var[, int $mode] )
- * Description: Counts an elements in an array. If Standard PHP Library is installed, 
+ * Description: Counts an elements in an array. If Standard PHP Library is installed,
  * it will return the properties of an object.
  * Source code: ext/standard/basic_functions.c
  * Alias to functions: count()
diff --git a/ext/standard/tests/array/sizeof_object1.phpt b/ext/standard/tests/array/sizeof_object1.phpt
index 4705996054d..f734887a59b 100644
--- a/ext/standard/tests/array/sizeof_object1.phpt
+++ b/ext/standard/tests/array/sizeof_object1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test sizeof() function : object functionality - object with Countable interface
 --SKIPIF--
-<?php 
+<?php
 // Skip the test case if Standard PHP Library(spl) is not installed
   if( !extension_loaded('spl'))
   {
@@ -11,7 +11,7 @@ Test sizeof() function : object functionality - object with Countable interface
 --FILE--
 <?php
 /* Prototype  : int sizeof($mixed var[, int $mode])
- * Description: Counts an elements in an array. If Standard PHP library is installed, 
+ * Description: Counts an elements in an array. If Standard PHP library is installed,
  * it will return the properties of an object.
  * Source code: ext/standard/basic_functions.c
  * Alias to functions: count()
@@ -20,12 +20,12 @@ Test sizeof() function : object functionality - object with Countable interface
 echo "*** Testing sizeof() : object functionality ***\n";
 
 echo "-- Testing sizeof() with an object which implements Countable interface --\n";
-class sizeof_class implements Countable 
+class sizeof_class implements Countable
 {
   public $member1;
   private $member2;
   protected $member3;
- 
+
   public function count()
   {
     return 3; // return the count of member variables in the object
diff --git a/ext/standard/tests/array/sizeof_object2.phpt b/ext/standard/tests/array/sizeof_object2.phpt
index 404443ae59f..c81018f6358 100644
--- a/ext/standard/tests/array/sizeof_object2.phpt
+++ b/ext/standard/tests/array/sizeof_object2.phpt
@@ -15,11 +15,11 @@ echo "--- Testing sizeof() with objects which doesn't implement Countable interf
 
 // class without member
 class test
-{ 
+{
   // no members
 }
 
-// class with only members and with out member functions 
+// class with only members and with out member functions
 class test1
 {
   public $member1;
@@ -33,7 +33,7 @@ class test1
 // class with only member functions
 class test2
 {
-  // no data members 
+  // no data members
 
   public function display()
   {
@@ -53,7 +53,7 @@ abstract class abstract_class
 {
   public $member1;
   private $member2;
- 
+
   abstract protected function display();
 }
 
@@ -83,7 +83,7 @@ for($i = 0; $i < count($objects); $i++)
   echo "Default Mode: ";
   var_dump( sizeof($var) );
   echo "\n";
-  
+
   echo "COUNT_NORMAL Mode: ";
   var_dump( sizeof($var, COUNT_NORMAL) );
   echo "\n";
@@ -91,7 +91,7 @@ for($i = 0; $i < count($objects); $i++)
   echo "COUNT_RECURSIVE Mode: ";
   var_dump( sizeof($var, COUNT_RECURSIVE) );
   echo "\n";
- 
+
   $counter++;
 }
 
diff --git a/ext/standard/tests/array/sizeof_variation1.phpt b/ext/standard/tests/array/sizeof_variation1.phpt
index 5917a798e1b..e98c3342671 100644
--- a/ext/standard/tests/array/sizeof_variation1.phpt
+++ b/ext/standard/tests/array/sizeof_variation1.phpt
@@ -15,7 +15,7 @@ echo "--- Testing sizeof() for all scalar types in default,COUNT_NORMAL and COUN
 // get a resource variable
 $fp = fopen(__FILE__, "r");
 
-// array containing all scalar types 
+// array containing all scalar types
 $values = array (
            // int values
   /* 1  */  0,
@@ -27,27 +27,27 @@ $values = array (
             12.3456789000e10,
             12.3456789000E-10,
   /* 7  */  .5,
-            
+
             // NULL values
   /* 8  */  NULL,
             null,
 
-            // boolean values 
+            // boolean values
   /* 10 */  TRUE,
             FALSE,
             true,
   /* 13 */  false,
 
-            // string data 
+            // string data
   /* 14 */  "",
-            '',  
+            '',
             "string",
   /* 17 */  'string',
 
-            // undefined variable 
+            // undefined variable
             @$undefined_var,
 
-            // resource variable 
+            // resource variable
   /* 19 */  $fp
 );
 
@@ -56,8 +56,8 @@ $counter = 1;
 for($i = 0; $i < count($values); $i++)
 {
   echo "-- Iteration $counter --\n";
- 
-  $var = $values[$i]; 
+
+  $var = $values[$i];
 
   echo "Default Mode: ";
   var_dump( sizeof($var) );
diff --git a/ext/standard/tests/array/sizeof_variation2.phpt b/ext/standard/tests/array/sizeof_variation2.phpt
index a2245797806..ba31157ff18 100644
--- a/ext/standard/tests/array/sizeof_variation2.phpt
+++ b/ext/standard/tests/array/sizeof_variation2.phpt
@@ -3,7 +3,7 @@ Test sizeof() function : usage variations - different array values for 'var' arg
 --FILE--
 <?php
 /* Prototype  : int sizeof($mixed var[, int $mode])
- * Description: Counts an elements in an array. If Standard PHP library is installed, 
+ * Description: Counts an elements in an array. If Standard PHP library is installed,
  * it will return the properties of an object.
  * Source code: ext/standard/basic_functions.c
  * Alias to functions: count()
@@ -16,7 +16,7 @@ $fp = fopen(__FILE__, "r");
 
 echo "--- Testing sizeof() with different array values for 'var' argument ---\n";
 
-// array containing different types of array values for 'var' argument 
+// array containing different types of array values for 'var' argument
 $values = array (
   /* 1  */  array($fp, "resource" => $fp),
             array(1, array(3, 4, array(6, array(8)))),
@@ -32,9 +32,9 @@ $values = array (
             array(false => 'red', true => 'pen' ),
             array('color' => "red", "item" => 'pen', 1 => "Hi", "" => "Hello" ),
   /* 14 */  array($fp, "resource1" => $fp, 'resource2' => $fp, array( $fp, 'type' => $fp) )
-);   
+);
 
-// loop through each element of the values array for 'var' argument 
+// loop through each element of the values array for 'var' argument
 // check the working of sizeof()
 $counter = 1;
 for($i = 0; $i < count($values); $i++)
@@ -42,10 +42,10 @@ for($i = 0; $i < count($values); $i++)
   echo "-- Iteration $counter --\n";
   $var = $values[$i];
 
-  echo "Default Mode: "; 
+  echo "Default Mode: ";
   var_dump( sizeof($var) );
   echo "\n";
-  
+
   echo "COUNT_NORMAL Mode: ";
   var_dump( sizeof($var, COUNT_NORMAL) );
   echo "\n";
@@ -56,7 +56,7 @@ for($i = 0; $i < count($values); $i++)
 
   $counter++;
 }
-         
+
 echo "Done";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/array/sizeof_variation3.phpt b/ext/standard/tests/array/sizeof_variation3.phpt
index ba8afb83e69..8b5a7e1d54c 100644
--- a/ext/standard/tests/array/sizeof_variation3.phpt
+++ b/ext/standard/tests/array/sizeof_variation3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test sizeof() function : usage variations - checking for infinite recursion in COUNT_RECURSIVE mode 
+Test sizeof() function : usage variations - checking for infinite recursion in COUNT_RECURSIVE mode
 --FILE--
 <?php
 /* Prototype  : int sizeof($mixed var[, int $mode])
diff --git a/ext/standard/tests/array/sizeof_variation4.phpt b/ext/standard/tests/array/sizeof_variation4.phpt
index 63fc05bd46d..465b8181745 100644
--- a/ext/standard/tests/array/sizeof_variation4.phpt
+++ b/ext/standard/tests/array/sizeof_variation4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test sizeof() function : usage variations - all kinds of unset variables for 'var' argument 
+Test sizeof() function : usage variations - all kinds of unset variables for 'var' argument
 --FILE--
 <?php
 /* Prototype  : int sizeof($mixed var[, int $mode])
@@ -15,11 +15,11 @@ echo "--- Testing sizeof() for all kinds of unset variables in default, Normal a
 
 // class declaration
 class test
-{  
+{
   public $member1;
 }
 
-// get an resource variable 
+// get an resource variable
 $fp = fopen(__FILE__, "r");
 
 // array containing different types of variables
@@ -54,21 +54,21 @@ $values = array (
   /* 20 */  $fp
 );
 
-// loop through the each element of the $values array for 'var' argument 
+// loop through the each element of the $values array for 'var' argument
 // and check the functionality of sizeof()
 $counter = 1;
 foreach($values as $value)
 {
   echo "-- Iteration $counter --\n";
- 
-  // unset the variable 
+
+  // unset the variable
   unset($value);
 
   // now check the size of unset variable when different modes are given
   echo "Default Mode: ";
   var_dump( sizeof($value) );
   echo "\n";
- 
+
   echo "COUNT_NORMAL Mode: ";
   var_dump( sizeof($value, COUNT_NORMAL) );
   echo "\n";
diff --git a/ext/standard/tests/array/sizeof_variation5.phpt b/ext/standard/tests/array/sizeof_variation5.phpt
index 675017fd1fb..1c487045c65 100644
--- a/ext/standard/tests/array/sizeof_variation5.phpt
+++ b/ext/standard/tests/array/sizeof_variation5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test sizeof() function : usage variations - different values for 'mode' argument 
+Test sizeof() function : usage variations - different values for 'mode' argument
 --FILE--
 <?php
 /* Prototype  : int sizeof($mixed var[, int $mode])
@@ -52,15 +52,15 @@ $mode_values = array (
             new test(),
   /* 22 */  $fp
 );
-  
-// loop through the each element of $modes_array for 'mode' argument 
+
+// loop through the each element of $modes_array for 'mode' argument
 // and check the working of sizeof()
 $counter = 1;
 for($i = 0; $i < count($mode_values); $i++)
 {
   echo "-- Iteration $counter --\n";
   $mode = $mode_values[$i];
-  
+
   var_dump( sizeof($array1, $mode) );
 
   $counter++;
diff --git a/ext/standard/tests/array/sort_basic.phpt b/ext/standard/tests/array/sort_basic.phpt
index 460b572fc14..5c6c412bee7 100644
--- a/ext/standard/tests/array/sort_basic.phpt
+++ b/ext/standard/tests/array/sort_basic.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test sort() function : basic functionality   
+Test sort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool sort ( array &$array [, int $sort_flags] )
- * Description: This function sorts an array. 
+ * Description: This function sorts an array.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
 
 /*
- * Testing sort() by providing arrays with default keys and assoc arrays 
+ * Testing sort() by providing arrays with default keys and assoc arrays
  * to check the basic functionality with following flag values.
  *  flag value as defualt
  *  SORT_REGULAR - compare items normally
@@ -19,13 +19,13 @@ Test sort() function : basic functionality
 
 echo "*** Testing sort() : basic functionality ***\n";
 
-// associative array containing unsorted string values  
+// associative array containing unsorted string values
 $unsorted_strings = array(
 	"l" => "lemon", "o" => "orange",
 	"O" => "Orange", "O1" => "Orange1", "o2" => "orange2", "O3" => "Orange3", "o20" => "orange20",
 	"b" => "banana",
 );
- 
+
 // array with default keys containing unsorted numeric values
 $unsorted_numerics =  array( 100, 33, 555, 22 );
 
diff --git a/ext/standard/tests/array/sort_error.phpt b/ext/standard/tests/array/sort_error.phpt
index 4864ef33df2..7c7ecb11056 100644
--- a/ext/standard/tests/array/sort_error.phpt
+++ b/ext/standard/tests/array/sort_error.phpt
@@ -1,14 +1,14 @@
 --TEST--
-Test sort() function : error conditions 
+Test sort() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool sort(array &array_arg [, int sort_flags])
- * Description: Sort an array 
+ * Description: Sort an array
  * Source code: ext/standard/array.c
 */
 
 /*
-* Testing sort() function with all possible error conditions 
+* Testing sort() function with all possible error conditions
 */
 
 echo "*** Testing sort() : error conditions ***\n";
@@ -27,7 +27,7 @@ $extra_arg = 10;
 foreach($flag_value as $key => $flag){
   echo "\nSort flag = $key\n";
   var_dump( sort($array_arg,$flag, $extra_arg) );
-   
+
   // dump the input array to ensure that it wasn't changed
   var_dump($array_arg);
 }
diff --git a/ext/standard/tests/array/sort_object1.phpt b/ext/standard/tests/array/sort_object1.phpt
index caa9c8dbb64..a55a0962a8a 100644
--- a/ext/standard/tests/array/sort_object1.phpt
+++ b/ext/standard/tests/array/sort_object1.phpt
@@ -3,7 +3,7 @@ Test sort() function : object functionality - sorting objects, 'sort_flags' as d
 --FILE--
 <?php
 /* Prototype  : bool sort ( array &$array [, int $sort_flags] )
- * Description: This function sorts an array. 
+ * Description: This function sorts an array.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -41,14 +41,14 @@ class for_string_sort
 }
 
 // array of integer objects
-$unsorted_int_obj = array( 
+$unsorted_int_obj = array(
   new for_integer_sort(11), new for_integer_sort(66),
   new for_integer_sort(23), new for_integer_sort(-5),
   new for_integer_sort(0.001), new for_integer_sort(0)
 );
 
 // array of string objects
-$unsorted_str_obj = array ( 
+$unsorted_str_obj = array (
   new for_string_sort("axx"), new for_string_sort("t"),
   new for_string_sort("w"), new for_string_sort("py"),
   new for_string_sort("apple"), new for_string_sort("Orange"),
diff --git a/ext/standard/tests/array/sort_object2.phpt b/ext/standard/tests/array/sort_object2.phpt
index 93b0fa2e8bc..7e13cf8abf3 100644
--- a/ext/standard/tests/array/sort_object2.phpt
+++ b/ext/standard/tests/array/sort_object2.phpt
@@ -3,7 +3,7 @@ Test sort() function : object functionality - sorting objects with diff. accessi
 --FILE--
 <?php
 /* Prototype  : bool sort ( array &$array [, int $sort_flags] )
- * Description: This function sorts an array. 
+ * Description: This function sorts an array.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -19,13 +19,13 @@ class for_integer_sort
 {
   public $public_class_value;
   private $private_class_value;
-  protected $protected_class_value;   
+  protected $protected_class_value;
 
   // initializing object member value
   function __construct($value1, $value2,$value3){
     $this->public_class_value = $value1;
     $this->private_class_value = $value2;
-    $this->protected_class_value = $value3; 
+    $this->protected_class_value = $value3;
   }
 }
 
@@ -50,7 +50,7 @@ class for_string_sort
 }
 
 // array of integer objects
-$unsorted_int_obj = array( 
+$unsorted_int_obj = array(
   new for_integer_sort(11,33,30),
   new for_integer_sort(66,44,4),
   new for_integer_sort(-88,-5,5),
@@ -58,8 +58,8 @@ $unsorted_int_obj = array(
 );
 
 // array of string objects
-$unsorted_str_obj = array ( 
-  new for_string_sort("axx","AXX","ass"), 
+$unsorted_str_obj = array (
+  new for_string_sort("axx","AXX","ass"),
   new for_string_sort("t","eee","abb"),
   new for_string_sort("w","W", "c"),
   new for_string_sort("py","PY", "pt"),
diff --git a/ext/standard/tests/array/sort_variation1.phpt b/ext/standard/tests/array/sort_variation1.phpt
index c9d0958da3d..f3eba1265d9 100644
--- a/ext/standard/tests/array/sort_variation1.phpt
+++ b/ext/standard/tests/array/sort_variation1.phpt
@@ -3,7 +3,7 @@ Test sort() function : usage variations - unexpected values for 'array_arg' argu
 --FILE--
 <?php
 /* Prototype  : bool sort(array &array_arg [, int $sort_flags])
- * Description: Sort an array 
+ * Description: Sort an array
  * Source code: ext/standard/array.c
 */
 
@@ -73,9 +73,9 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of sort()
-// when $array argument is supplied with different values from $unexpected_values 
+// when $array argument is supplied with different values from $unexpected_values
 echo "\n-- Testing sort() by supplying different unexpected values for 'array' argument --\n";
-echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
+echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n";
 
 $counter = 1;
 for($index = 0; $index < count($unexpected_values); $index ++) {
diff --git a/ext/standard/tests/array/sort_variation10.phpt b/ext/standard/tests/array/sort_variation10.phpt
index 0a5a58044ae..24619158692 100644
--- a/ext/standard/tests/array/sort_variation10.phpt
+++ b/ext/standard/tests/array/sort_variation10.phpt
@@ -3,7 +3,7 @@ Test sort() function : usage variations - sort octal values
 --FILE--
 <?php
 /* Prototype  : bool sort ( array &$array [, int $sort_flags] )
- * Description: This function sorts an array. 
+ * Description: This function sorts an array.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -12,7 +12,7 @@ Test sort() function : usage variations - sort octal values
  * testing sort() by providing different octal array for $array argument
  * with following flag values
  * 1.flag value as defualt
- * 2.SORT_REGULAR - compare items normally		
+ * 2.SORT_REGULAR - compare items normally
  * 3.SORT_NUMERIC - compare items numerically
 */
 
diff --git a/ext/standard/tests/array/sort_variation11.phpt b/ext/standard/tests/array/sort_variation11.phpt
index bcab4bc9986..0c1b8494889 100644
Binary files a/ext/standard/tests/array/sort_variation11.phpt and b/ext/standard/tests/array/sort_variation11.phpt differ
diff --git a/ext/standard/tests/array/sort_variation2.phpt b/ext/standard/tests/array/sort_variation2.phpt
index 48ffa1975ac..ef16f058928 100644
--- a/ext/standard/tests/array/sort_variation2.phpt
+++ b/ext/standard/tests/array/sort_variation2.phpt
@@ -3,7 +3,7 @@ Test sort() function : usage variations - unexpected values for 'sort_flags' arg
 --FILE--
 <?php
 /* Prototype  : bool sort(array &array_arg [, int $sort_flags])
- * Description: Sort an array 
+ * Description: Sort an array
  * Source code: ext/standard/array.c
 */
 
@@ -79,8 +79,8 @@ for($index = 0; $index < count($unexpected_values); $index ++) {
   // sort the array, retain a temp. copy of input array for next iteration
   $value = $unexpected_values [$index];
   $temp_array = $unsorted_values;
-  var_dump( sort($temp_array, $value) ); 
-  
+  var_dump( sort($temp_array, $value) );
+
   //dump the sorted array
   var_dump($temp_array);
   $counter++;
diff --git a/ext/standard/tests/array/sort_variation3.phpt b/ext/standard/tests/array/sort_variation3.phpt
index 1ad058d4e9c..3aec6dcdb14 100644
--- a/ext/standard/tests/array/sort_variation3.phpt
+++ b/ext/standard/tests/array/sort_variation3.phpt
@@ -3,7 +3,7 @@ Test sort() function : usage variations - sort integer/float values
 --FILE--
 <?php
 /* Prototype  : bool sort ( array &$array [, int $sort_flags] )
- * Description: This function sorts an array. 
+ * Description: This function sorts an array.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -29,7 +29,7 @@ $various_arrays = array (
 
   // mixed value array
   array(.0001, .0021, -.01, -1, 0, .09, 2, -.9, 10.6E-2, -10.6E-2, 33),
- 
+
   // array values contains minimum and maximum ranges
   array(2147483647, 2147483648, -2147483647, -2147483648, -0, 0, -2147483649)
 );
@@ -44,20 +44,20 @@ echo "\n-- Testing sort() by supplying various integer/float arrays --\n";
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With Defualt sort flag -\n"; 
-  $temp_array = $array; 
+  echo "- With Defualt sort flag -\n";
+  $temp_array = $array;
   var_dump(sort($temp_array) );
   var_dump($temp_array);
 
   // loop through $flag_value array and setting all possible flag values
   foreach($flag_value as $key => $flag){
     echo "- Sort flag = $key -\n";
-    $temp_array = $array; 
+    $temp_array = $array;
     var_dump(sort($temp_array, $flag) );
     var_dump($temp_array);
-  }  
+  }
   $count++;
-} 
+}
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/sort_variation4.phpt b/ext/standard/tests/array/sort_variation4.phpt
index 82e3d9708f3..cdc067a0e88 100644
--- a/ext/standard/tests/array/sort_variation4.phpt
+++ b/ext/standard/tests/array/sort_variation4.phpt
@@ -3,7 +3,7 @@ Test sort() function : usage variations - sort reference values
 --FILE--
 <?php
 /* Prototype  : bool sort ( array &$array [, int $sort_flags] )
- * Description: This function sorts an array. 
+ * Description: This function sorts an array.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -21,7 +21,7 @@ $value1 = 100;
 $value2 = 33;
 $value3 = 555;
 
-// an array containing integer references 
+// an array containing integer references
 $unsorted_numerics =  array( &$value1 , &$value2, &$value3);
 
 echo "\n-- Testing sort() by supplying reference variable array, 'flag' value is defualt --\n";
diff --git a/ext/standard/tests/array/sort_variation5.phpt b/ext/standard/tests/array/sort_variation5.phpt
index a06c22c7511..48bda9599b3 100644
--- a/ext/standard/tests/array/sort_variation5.phpt
+++ b/ext/standard/tests/array/sort_variation5.phpt
@@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool sort ( array &$array [, int $sort_flags] )
- * Description: This function sorts an array. 
+ * Description: This function sorts an array.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -23,10 +23,10 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 echo "*** Testing sort() : usage variations ***\n";
 
 $various_arrays = array (
-  // group of escape sequences 
+  // group of escape sequences
   array(null, NULL, "\a", "\cx", "\e", "\f", "\n", "\r", "\t", "\xhh", "\ddd", "\v"),
 
-  // array contains combination of capital/small letters 
+  // array contains combination of capital/small letters
   array("lemoN", "Orange", "banana", "apple", "Test", "TTTT", "ttt", "ww", "x", "X", "oraNGe", "BANANA")
 );
 
diff --git a/ext/standard/tests/array/sort_variation6.phpt b/ext/standard/tests/array/sort_variation6.phpt
index 7a93f0e5fe1..01e2106d0e2 100644
--- a/ext/standard/tests/array/sort_variation6.phpt
+++ b/ext/standard/tests/array/sort_variation6.phpt
@@ -3,7 +3,7 @@ Test sort() function : usage variations - sort hexadecimal values
 --FILE--
 <?php
 /* Prototype  : bool sort ( array &$array [, int $sort_flags] )
- * Description: This function sorts an array. 
+ * Description: This function sorts an array.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -17,7 +17,7 @@ Test sort() function : usage variations - sort hexadecimal values
 
 echo "*** Testing sort() : usage variations ***\n";
 
-// an array contains unsorted hexadecimal values  
+// an array contains unsorted hexadecimal values
 $unsorted_hex_array = array(0x1AB, 0xFFF, 0xF, 0xFF, 0x2AA, 0xBB, 0x1ab, 0xff, -0xFF, 0, -0x2aa);
 
 echo "\n-- Testing sort() by supplying hexadecimal value array, 'flag' value is defualt  --\n";
diff --git a/ext/standard/tests/array/sort_variation7.phpt b/ext/standard/tests/array/sort_variation7.phpt
index 19d888a76a6..c2a36639fb1 100644
--- a/ext/standard/tests/array/sort_variation7.phpt
+++ b/ext/standard/tests/array/sort_variation7.phpt
@@ -3,7 +3,7 @@ Test sort() function : usage variations - sort boolean values
 --FILE--
 <?php
 /* Prototype  : bool sort ( array &$array [, int $sort_flags] )
- * Description: This function sorts an array. 
+ * Description: This function sorts an array.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
diff --git a/ext/standard/tests/array/sort_variation8.phpt b/ext/standard/tests/array/sort_variation8.phpt
index 9a330313f9e..077285a0547 100644
--- a/ext/standard/tests/array/sort_variation8.phpt
+++ b/ext/standard/tests/array/sort_variation8.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test sort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as defualt/SORT_REGULAR 
+Test sort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as defualt/SORT_REGULAR
 --FILE--
 <?php
 /* Prototype  : bool sort ( array &$array [, int $sort_flags] )
- * Description: This function sorts an array. 
+ * Description: This function sorts an array.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -37,8 +37,8 @@ echo "\n-- Testing sort() by supplying various arrays containing sub arrays --\n
 
 // loop through to test sort() with different arrays
 foreach ($various_arrays as $array) {
- 
-  echo "\n-- Iteration $count --\n"; 
+
+  echo "\n-- Iteration $count --\n";
   // testing sort() function by supplying different arrays, flag value is defualt
   echo "- With Defualt sort flag -\n";
   $temp_array = $array;
diff --git a/ext/standard/tests/array/sort_variation9.phpt b/ext/standard/tests/array/sort_variation9.phpt
index faab1666c4b..ad3030483d1 100644
--- a/ext/standard/tests/array/sort_variation9.phpt
+++ b/ext/standard/tests/array/sort_variation9.phpt
@@ -3,7 +3,7 @@ Test sort() function : usage variations - sort diff. associative arrays, 'sort_f
 --FILE--
 <?php
 /* Prototype  : bool sort ( array &$array [, int $sort_flags] )
- * Description: This function sorts an array. 
+ * Description: This function sorts an array.
                 Elements will be arranged from lowest to highest when this function has completed.
  * Source code: ext/standard/array.c
 */
@@ -33,8 +33,8 @@ $various_arrays = array(
 $count = 1;
 echo "\n-- Testing sort() by supplying various arrays with key values --\n";
 
-// loop through to test sort() with different arrays, 
-// to test the new keys for the elements in the sorted array 
+// loop through to test sort() with different arrays,
+// to test the new keys for the elements in the sorted array
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
diff --git a/ext/standard/tests/array/uasort_basic1.phpt b/ext/standard/tests/array/uasort_basic1.phpt
index 70dd04c0c94..70179935c62 100644
--- a/ext/standard/tests/array/uasort_basic1.phpt
+++ b/ext/standard/tests/array/uasort_basic1.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test uasort() function : basic functionality 
+Test uasort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/uasort_basic2.phpt b/ext/standard/tests/array/uasort_basic2.phpt
index c5ca0f13c87..0e154dbeaea 100644
--- a/ext/standard/tests/array/uasort_basic2.phpt
+++ b/ext/standard/tests/array/uasort_basic2.phpt
@@ -3,7 +3,7 @@ Test uasort() function : basic functionality - duplicate values
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/uasort_error.phpt b/ext/standard/tests/array/uasort_error.phpt
index cc2dd3a2175..a517e4a511d 100644
--- a/ext/standard/tests/array/uasort_error.phpt
+++ b/ext/standard/tests/array/uasort_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test uasort() function : error conditions 
+Test uasort() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 */
 
 echo "*** Testing uasort() : error conditions ***\n";
 
-// comparison function 
+// comparison function
 /* Prototype : int cmp(mixed $value1, mixed $value2)
  * Parameters : $value1 and $value2 - values to be compared
  * Return value : 0 - if both values are same
@@ -30,7 +30,7 @@ function cmp($value1, $value2)
   }
 }
 
-// Initialize 'array_arg' 
+// Initialize 'array_arg'
 $array_arg = array(0 => 1, 1 => 10, 2 => 'string', 3 => 3, 4 => 2, 5 => 100, 6 => 25);
 
 // With zero arguments
diff --git a/ext/standard/tests/array/uasort_object1.phpt b/ext/standard/tests/array/uasort_object1.phpt
index 5d5b0b52c2f..b728a1ffdd3 100644
--- a/ext/standard/tests/array/uasort_object1.phpt
+++ b/ext/standard/tests/array/uasort_object1.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test uasort() function : object functionality 
+Test uasort() function : object functionality
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 */
 
@@ -49,7 +49,7 @@ function multiple_cmp($value1, $value2)
 class SimpleClass1
 {
   private $int_value;
-  
+
   public function __construct($value) {
     $this->int_value = $value;
   }
@@ -68,7 +68,7 @@ class SimpleClass2
   }
   public function getValue() {
     return $this->int_value;
-  }  
+  }
 }
 
 // array of SimpleClass objects with only one member
diff --git a/ext/standard/tests/array/uasort_object2.phpt b/ext/standard/tests/array/uasort_object2.phpt
index b6862b75887..26fa6f11b41 100644
--- a/ext/standard/tests/array/uasort_object2.phpt
+++ b/ext/standard/tests/array/uasort_object2.phpt
@@ -1,18 +1,18 @@
 --TEST--
-Test uasort() function : object functionality - sort diff. objects 
+Test uasort() function : object functionality - sort diff. objects
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 *
 
 /*
  * This testcase tests uasort() functionality with different objects
- * Objects of different classes: 
+ * Objects of different classes:
  *  simple class,
  *  child class,
- *  empty class & 
+ *  empty class &
  *  static class
  */
 
@@ -43,11 +43,11 @@ function cmp_function($value1, $value2)
 class SimpleClass
 {
   private $int_value;
-  
+
   public function __construct($value) {
     $this->int_value = $value;
   }
-  
+
 }
 
 // Class without any member
diff --git a/ext/standard/tests/array/uasort_variation1.phpt b/ext/standard/tests/array/uasort_variation1.phpt
index ce20666c964..aae2f33167d 100644
--- a/ext/standard/tests/array/uasort_variation1.phpt
+++ b/ext/standard/tests/array/uasort_variation1.phpt
@@ -3,7 +3,7 @@ Test uasort() function : usage variations - unexpected values for 'array_arg' ar
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 */
 
@@ -60,7 +60,7 @@ $input_values = array(
        // null data
 /*10*/ NULL,
        null,
-      
+
        // boolean data
 /*12*/ true,
        false,
@@ -80,7 +80,7 @@ $input_values = array(
 
        // undefined data
        @$undefined_var,
- 
+
        // unset data
 /*22*/ @$unset_var,
 );
diff --git a/ext/standard/tests/array/uasort_variation10.phpt b/ext/standard/tests/array/uasort_variation10.phpt
index e0c5e72f7e1..2bebad7114a 100644
--- a/ext/standard/tests/array/uasort_variation10.phpt
+++ b/ext/standard/tests/array/uasort_variation10.phpt
@@ -3,7 +3,7 @@ Test uasort() function : usage variations - sort array with reference variables
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 */
 
@@ -35,7 +35,7 @@ function cmp_function($value1, $value2)
 echo "*** Testing uasort() : 'array_arg' with elements as reference ***\n";
 
 // different variables which are used as elements of 'array_arg'
-$value1 = -5; 
+$value1 = -5;
 $value2 = 100;
 $value3 = 0;
 $value4 = &$value1;
diff --git a/ext/standard/tests/array/uasort_variation11.phpt b/ext/standard/tests/array/uasort_variation11.phpt
index 50357dec5c3..6744661efee 100644
--- a/ext/standard/tests/array/uasort_variation11.phpt
+++ b/ext/standard/tests/array/uasort_variation11.phpt
@@ -3,7 +3,7 @@ Test uasort() function : usage variations - different associative arrays
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 */
 
@@ -19,7 +19,7 @@ echo "*** Testing uasort() : sorting different associative arrays ***\n";
  * Return value : 0 - if both values are same
  *                1 - if value1 is greater than value2
  *               -1 - if value1 is less than value2
- * Description : compares value1 and value2 
+ * Description : compares value1 and value2
  */
 function cmp($value1, $value2)
 {
diff --git a/ext/standard/tests/array/uasort_variation2.phpt b/ext/standard/tests/array/uasort_variation2.phpt
index 62832454106..e5278fbab75 100644
--- a/ext/standard/tests/array/uasort_variation2.phpt
+++ b/ext/standard/tests/array/uasort_variation2.phpt
@@ -3,7 +3,7 @@ Test uasort() function : usage variations - unexpected values for 'cmp_function'
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/uasort_variation3.phpt b/ext/standard/tests/array/uasort_variation3.phpt
index 9147d59916e..47023e44bfc 100644
Binary files a/ext/standard/tests/array/uasort_variation3.phpt and b/ext/standard/tests/array/uasort_variation3.phpt differ
diff --git a/ext/standard/tests/array/uasort_variation4.phpt b/ext/standard/tests/array/uasort_variation4.phpt
index 8f0a2db0775..5d89a217021 100644
--- a/ext/standard/tests/array/uasort_variation4.phpt
+++ b/ext/standard/tests/array/uasort_variation4.phpt
@@ -3,7 +3,7 @@ Test uasort() function : usage variations - sort different numeric values
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/uasort_variation5.phpt b/ext/standard/tests/array/uasort_variation5.phpt
index e6996a55feb..b398d627093 100644
--- a/ext/standard/tests/array/uasort_variation5.phpt
+++ b/ext/standard/tests/array/uasort_variation5.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test uasort() function : usage variations - sort diff. strings 
+Test uasort() function : usage variations - sort diff. strings
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 */
 
@@ -33,7 +33,7 @@ function cmp_function($value1, $value2)
   }
 }
 
-// Different heredoc strings to be sorted 
+// Different heredoc strings to be sorted
 $empty_heredoc =<<<EOT
 EOT;
 
@@ -64,7 +64,7 @@ var_dump($single_quoted_values);
 
 // Double quoted strings
 $double_quoted_values = array(
-  0 => " ", 1 => "test", 3 => "Hello", 4 => "HELLO", 
+  0 => " ", 1 => "test", 3 => "Hello", 4 => "HELLO",
   5 => "", 6 => "\t", 7 => "0", 8 => "123Hello", 9 => "\"", 10 => "@#$%"
 );
 echo "-- Sorting Double Quoted String values --\n";
diff --git a/ext/standard/tests/array/uasort_variation6.phpt b/ext/standard/tests/array/uasort_variation6.phpt
index 1c0b9277642..bcc71382701 100644
--- a/ext/standard/tests/array/uasort_variation6.phpt
+++ b/ext/standard/tests/array/uasort_variation6.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test uasort() function : usage variations - sort array having subarrays 
+Test uasort() function : usage variations - sort array having subarrays
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/uasort_variation7.phpt b/ext/standard/tests/array/uasort_variation7.phpt
index e37d9efe6b0..d6db7fcc30b 100644
--- a/ext/standard/tests/array/uasort_variation7.phpt
+++ b/ext/standard/tests/array/uasort_variation7.phpt
@@ -3,7 +3,7 @@ Test uasort() function : usage variations - anonymous function as 'cmp_function'
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 */
 
diff --git a/ext/standard/tests/array/uasort_variation8.phpt b/ext/standard/tests/array/uasort_variation8.phpt
index dd0a7a39136..2bb2b465125 100644
--- a/ext/standard/tests/array/uasort_variation8.phpt
+++ b/ext/standard/tests/array/uasort_variation8.phpt
@@ -3,14 +3,14 @@ Test uasort() function : usage variations - built-in function as 'cmp_function'
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 */
 
 /*
 * Passing different built-in library functions in place of 'cmp_function'
 *   valid comparison functions: strcmp() & strcasecmp()
-*   language constructs:  echo & exit 
+*   language constructs:  echo & exit
 */
 
 echo "*** Testing uasort() : built in function as 'cmp_function' ***\n";
@@ -19,7 +19,7 @@ $array_arg = array("b" => "Banana", "m" => "Mango", "a" => "apple", "p" => "Pine
 $builtin_fun_arg = $array_arg;
 $languageConstruct_fun_arg = $array_arg;
 
-// Testing library functions as comparison function 
+// Testing library functions as comparison function
 echo "-- Testing uasort() with built-in 'cmp_function': strcasecmp() --\n";
 var_dump( uasort($builtin_fun_arg, 'strcasecmp') );  // expecting: bool(true)
 var_dump($builtin_fun_arg);
diff --git a/ext/standard/tests/array/uasort_variation9.phpt b/ext/standard/tests/array/uasort_variation9.phpt
index 85578b02070..53f32b848d6 100644
--- a/ext/standard/tests/array/uasort_variation9.phpt
+++ b/ext/standard/tests/array/uasort_variation9.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test uasort() function : usage variations - 'cmp_function' with reference argument 
+Test uasort() function : usage variations - 'cmp_function' with reference argument
 --FILE--
 <?php
 /* Prototype  : bool uasort(array $array_arg, string $cmp_function)
- * Description: Sort an array with a user-defined comparison function and maintain index association 
+ * Description: Sort an array with a user-defined comparison function and maintain index association
  * Source code: ext/standard/array.c
 */
 
@@ -14,7 +14,7 @@ echo "*** Testing uasort() : 'cmp_function' with reference arguments ***\n";
 
 // comparison function
 /* Prototype : int cmp(mixed &$value1, mixed &$value2)
- * Parameters : $value1 and $value2 - values received by reference 
+ * Parameters : $value1 and $value2 - values received by reference
  * Return value : 0 - if both values are same
  *                1 - if value1 is greater than value2
  *               -1 - if value1 is less than value2
diff --git a/ext/standard/tests/array/uksort_error.phpt b/ext/standard/tests/array/uksort_error.phpt
index 241ed2f8286..db9fdea0887 100644
--- a/ext/standard/tests/array/uksort_error.phpt
+++ b/ext/standard/tests/array/uksort_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test uksort() function : error conditions 
+Test uksort() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool uksort(array array_arg, string cmp_function)
- * Description: Sort an array by keys using a user-defined comparison function 
+ * Description: Sort an array by keys using a user-defined comparison function
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing uksort() : error conditions ***\n";
diff --git a/ext/standard/tests/array/uksort_variation1.phpt b/ext/standard/tests/array/uksort_variation1.phpt
index fdb85c2efb0..75bef3fdcc7 100644
--- a/ext/standard/tests/array/uksort_variation1.phpt
+++ b/ext/standard/tests/array/uksort_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test uksort() function : usage variation 
+Test uksort() function : usage variation
 --FILE--
 <?php
 /* Prototype  : bool uksort(array array_arg, string cmp_function)
- * Description: Sort an array by keys using a user-defined comparison function 
+ * Description: Sort an array by keys using a user-defined comparison function
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing uksort() : usage variation ***\n";
diff --git a/ext/standard/tests/array/uksort_variation2.phpt b/ext/standard/tests/array/uksort_variation2.phpt
index 2f5b8b5d89d..5ac32f02b86 100644
--- a/ext/standard/tests/array/uksort_variation2.phpt
+++ b/ext/standard/tests/array/uksort_variation2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test uksort() function : usage variation 
+Test uksort() function : usage variation
 --FILE--
 <?php
 /* Prototype  : bool uksort(array array_arg, string cmp_function)
- * Description: Sort an array by keys using a user-defined comparison function 
+ * Description: Sort an array by keys using a user-defined comparison function
  * Source code: ext/standard/array.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing uksort() : usage variation ***\n";
diff --git a/ext/standard/tests/array/unexpected_array_mod_bug.phpt b/ext/standard/tests/array/unexpected_array_mod_bug.phpt
index 2762ebd8309..08774c09a4c 100644
--- a/ext/standard/tests/array/unexpected_array_mod_bug.phpt
+++ b/ext/standard/tests/array/unexpected_array_mod_bug.phpt
@@ -3,7 +3,7 @@ Crash when function parameter modified via reference
 --FILE--
 <?php
 function usercompare($a,$b) {
-  unset($GLOBALS['my_var'][2]); 
+  unset($GLOBALS['my_var'][2]);
   return $a <=> $b;
 }
 $my_var = array(1 => "entry_1",
diff --git a/ext/standard/tests/array/usort_basic.phpt b/ext/standard/tests/array/usort_basic.phpt
index eaf30188de4..c25f2a7525d 100644
--- a/ext/standard/tests/array/usort_basic.phpt
+++ b/ext/standard/tests/array/usort_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test usort() function : basic functionality 
+Test usort() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/usort_error1.phpt b/ext/standard/tests/array/usort_error1.phpt
index 70c555e3466..222b9c62a65 100644
--- a/ext/standard/tests/array/usort_error1.phpt
+++ b/ext/standard/tests/array/usort_error1.phpt
@@ -3,7 +3,7 @@ Test usort() function : error conditions - Pass incorrect number of arguments
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/usort_error2.phpt b/ext/standard/tests/array/usort_error2.phpt
index 7bf0f659e03..d0ccd362215 100644
--- a/ext/standard/tests/array/usort_error2.phpt
+++ b/ext/standard/tests/array/usort_error2.phpt
@@ -3,7 +3,7 @@ Test usort() function : error conditions - Pass unknown 'cmp_function'
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
@@ -28,7 +28,7 @@ function cmp($value1, $value2)
   }
 }
 
-// Initialize 'array_arg' 
+// Initialize 'array_arg'
 $array_arg = array(0 => 1, 1 => 10, 2 => 'string', 3 => 3, 4 => 2, 5 => 100, 6 => 25);
 $extra_arg = 10;
 
diff --git a/ext/standard/tests/array/usort_object1.phpt b/ext/standard/tests/array/usort_object1.phpt
index 0e87443d1c0..8fccc490472 100644
--- a/ext/standard/tests/array/usort_object1.phpt
+++ b/ext/standard/tests/array/usort_object1.phpt
@@ -3,7 +3,7 @@ Test usort() function : object functionality - different number of properties
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/usort_object2.phpt b/ext/standard/tests/array/usort_object2.phpt
index 00d302f35ba..3226741da4f 100644
--- a/ext/standard/tests/array/usort_object2.phpt
+++ b/ext/standard/tests/array/usort_object2.phpt
@@ -3,12 +3,12 @@ Test usort() function : object functionality - Different types of classes
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
 /*
- * Pass an array of objects which are either: 
+ * Pass an array of objects which are either:
  * 1. Empty
  * 2. Static
  * 2. Inherited
diff --git a/ext/standard/tests/array/usort_variation1.phpt b/ext/standard/tests/array/usort_variation1.phpt
index d793089410a..f2aeb54a6b9 100644
--- a/ext/standard/tests/array/usort_variation1.phpt
+++ b/ext/standard/tests/array/usort_variation1.phpt
@@ -3,7 +3,7 @@ Test usort() function : usage variations - Pass different data types as $array_a
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
@@ -72,7 +72,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -82,7 +82,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/array/usort_variation10.phpt b/ext/standard/tests/array/usort_variation10.phpt
index b343419ce14..d1de536b847 100644
--- a/ext/standard/tests/array/usort_variation10.phpt
+++ b/ext/standard/tests/array/usort_variation10.phpt
@@ -3,7 +3,7 @@ Test usort() function : usage variations - duplicate keys and values
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
@@ -26,8 +26,8 @@ function cmp($value1, $value2)
 }
 
 // Array with duplicate string and integer keys and values
-$array_arg = array(0 => 2,     "a" => 8, "d" => 9, 
-                   3 => 3,     5 => 2,   "o" => 6, 
+$array_arg = array(0 => 2,     "a" => 8, "d" => 9,
+                   3 => 3,     5 => 2,   "o" => 6,
                    "z" => -99, 0 => 1,   "z" => 3);
 
 echo "\n-- Array with duplicate keys --\n";
diff --git a/ext/standard/tests/array/usort_variation2.phpt b/ext/standard/tests/array/usort_variation2.phpt
index 70d21649ce0..fa5d463ade5 100644
--- a/ext/standard/tests/array/usort_variation2.phpt
+++ b/ext/standard/tests/array/usort_variation2.phpt
@@ -3,7 +3,7 @@ Test usort() function : usage variations - Pass different data types as $cmp_fun
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/usort_variation3.phpt b/ext/standard/tests/array/usort_variation3.phpt
index 3758fe9c9a6..d01a2fcc0e0 100644
--- a/ext/standard/tests/array/usort_variation3.phpt
+++ b/ext/standard/tests/array/usort_variation3.phpt
@@ -3,7 +3,7 @@ Test usort() function : usage variations - diff. array values
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
@@ -27,32 +27,32 @@ function cmp_function($value1, $value2)
 }
 
 // different heredoc strings
-  
+
 // single line heredoc string
 $simple_heredoc = <<<EOT2
 simple
 EOT2;
-  
+
 // multiline heredoc string
 $multiline_heredoc = <<<EOT3
 multiline heredoc with 123
 and speci@! ch@r..\ncheck\talso
 EOT3;
-  
+
 $array_arg = array(
   // numeric keys
   -2 => 9,
-  8.9 => 8, 
+  8.9 => 8,
   012 => 7,
   0x34 => 6,
 
   // string keys
   'key' => 5,  //single quoted key
-  "two" => 4,  //double quoted key 
+  "two" => 4,  //double quoted key
   " " => 0,  // space as key
-  
+
   // bool keys
-  TRUE => 100, 
+  TRUE => 100,
   FALSE => 25,
 
   // null keys
@@ -65,7 +65,7 @@ $array_arg = array(
   //heredoc keys
   $simple_heredoc => 75,
   $multiline_heredoc => 200,
-  
+
   // default key
   1,
 );
diff --git a/ext/standard/tests/array/usort_variation4.phpt b/ext/standard/tests/array/usort_variation4.phpt
index 36624b7c3c7..0c66516bf18 100644
--- a/ext/standard/tests/array/usort_variation4.phpt
+++ b/ext/standard/tests/array/usort_variation4.phpt
@@ -3,7 +3,7 @@ Test usort() function : usage variations - numeric data
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
@@ -27,16 +27,16 @@ function cmp_function($value1, $value2)
 }
 
 // Int array
-$int_values = array(0 => 3,   1 => 2,   3 => 100, 
-                    4 => 150, 5 => 25,  6 => 350, 
+$int_values = array(0 => 3,   1 => 2,   3 => 100,
+                    4 => 150, 5 => 25,  6 => 350,
                     7 => 0,   8 => -3,  9 => -1200);
-                    
+
 echo "\n-- Sorting Integer array --\n";
 var_dump( usort($int_values, 'cmp_function') );
 var_dump($int_values);
 
 // Octal array
-$octal_values = array(0 => 056, 1 => 023,  2 => 00, 
+$octal_values = array(0 => 056, 1 => 023,  2 => 00,
                       3 => 015, 4 => -045, 5 => 01,  6 => -07);
 
 echo "\n-- Sorting Octal array --\n";
@@ -44,17 +44,17 @@ var_dump( usort($octal_values, 'cmp_function') );
 var_dump($octal_values);
 
 // Hexadecimal array
-$hex_values = array(0 => 0xAE,  1 => 0x2B, 2 => 0X10, 
+$hex_values = array(0 => 0xAE,  1 => 0x2B, 2 => 0X10,
                     3 => -0xCF, 4 => 0X12, 5 => -0XF2);
-                    
+
 echo "\n-- Sorting Hex array --\n";
 var_dump( usort($hex_values, 'cmp_function') );
 var_dump($hex_values);
 
 // Float array
-$float_values = array( 0 => 10.2, 1 => 2.4, 2 => -3.4, 
+$float_values = array( 0 => 10.2, 1 => 2.4, 2 => -3.4,
                        3 => 0,    4 => 0.5, 5 => 7.3e3, 6 => -9.34E-2);
-                       
+
 echo "\n-- Sorting Float array --\n";
 var_dump( usort($float_values, 'cmp_function') );
 var_dump($float_values);
diff --git a/ext/standard/tests/array/usort_variation5.phpt b/ext/standard/tests/array/usort_variation5.phpt
index 922321c2377..b8660e1438c 100644
--- a/ext/standard/tests/array/usort_variation5.phpt
+++ b/ext/standard/tests/array/usort_variation5.phpt
@@ -3,7 +3,7 @@ Test usort() function : usage variations - string data
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
@@ -26,7 +26,7 @@ function cmp_function($value1, $value2)
   }
 }
 
-// Different heredoc strings to be sorted 
+// Different heredoc strings to be sorted
 $empty_heredoc =<<<EOT
 EOT;
 
@@ -46,7 +46,7 @@ EOT;
 // Single quoted strings
 $single_quoted_values = array(
   0 => ' ',  1 => 'test', 3 => 'Hello', 4 => 'HELLO',
-  5 => '',   6 => '\t',   7 => '0',     8 => '123Hello', 
+  5 => '',   6 => '\t',   7 => '0',     8 => '123Hello',
   9 => '\'', 10 => '@#$%'
 );
 
@@ -56,8 +56,8 @@ var_dump($single_quoted_values);
 
 // Double quoted strings
 $double_quoted_values = array(
-  0 => " ",  1 => "test", 3 => "Hello", 4 => "HELLO", 
-  5 => "",   6 => "\t",   7 => "0",     8 => "123Hello", 
+  0 => " ",  1 => "test", 3 => "Hello", 4 => "HELLO",
+  5 => "",   6 => "\t",   7 => "0",     8 => "123Hello",
   9 => "\"", 10 => "@#$%"
 );
 
@@ -66,7 +66,7 @@ var_dump( usort($double_quoted_values, 'cmp_function') );
 var_dump($double_quoted_values);
 
 // Heredoc strings
-$heredoc_values = array(0 => $empty_heredoc,   1 => $simple_heredoc1, 
+$heredoc_values = array(0 => $empty_heredoc,   1 => $simple_heredoc1,
                         2 => $simple_heredoc2, 3 => $multiline_heredoc);
 
 echo "\n-- Sorting Heredoc String values --\n";
diff --git a/ext/standard/tests/array/usort_variation6.phpt b/ext/standard/tests/array/usort_variation6.phpt
index 3eb2eaa8529..740da53f782 100644
--- a/ext/standard/tests/array/usort_variation6.phpt
+++ b/ext/standard/tests/array/usort_variation6.phpt
@@ -3,7 +3,7 @@ Test usort() function : usage variations - multi-dimensional arrays
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/usort_variation7.phpt b/ext/standard/tests/array/usort_variation7.phpt
index 171e751df2e..edc9bb4f04c 100644
--- a/ext/standard/tests/array/usort_variation7.phpt
+++ b/ext/standard/tests/array/usort_variation7.phpt
@@ -3,7 +3,7 @@ Test usort() function : usage variations - Anonymous comparison function
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
diff --git a/ext/standard/tests/array/usort_variation8.phpt b/ext/standard/tests/array/usort_variation8.phpt
index 87107f80090..ab3532e8a77 100644
--- a/ext/standard/tests/array/usort_variation8.phpt
+++ b/ext/standard/tests/array/usort_variation8.phpt
@@ -3,7 +3,7 @@ Test usort() function : usage variations - use built in functions as $cmp_functi
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
@@ -16,10 +16,10 @@ Test usort() function : usage variations - use built in functions as $cmp_functi
 echo "*** Testing usort() : usage variation ***\n";
 
 // Initializing variables
-$array_arg = array("b" => "Banana", "m" => "Mango", "a" => "apple", 
+$array_arg = array("b" => "Banana", "m" => "Mango", "a" => "apple",
                    "p" => "Pineapple", "o" => "orange");
 
-// Testing library functions as comparison function 
+// Testing library functions as comparison function
 echo "\n-- Testing usort() with built-in 'cmp_function': strcasecmp() --\n";
 $temp_array1 = $array_arg;
 var_dump( usort($temp_array1, 'strcasecmp') );
diff --git a/ext/standard/tests/array/usort_variation9.phpt b/ext/standard/tests/array/usort_variation9.phpt
index 6a067992e72..538befa902d 100644
--- a/ext/standard/tests/array/usort_variation9.phpt
+++ b/ext/standard/tests/array/usort_variation9.phpt
@@ -3,7 +3,7 @@ Test usort() function : usage variations - referenced variables
 --FILE--
 <?php
 /* Prototype  : bool usort(array $array_arg, string $cmp_function)
- * Description: Sort an array by values using a user-defined comparison function 
+ * Description: Sort an array by values using a user-defined comparison function
  * Source code: ext/standard/array.c
  */
 
@@ -27,7 +27,7 @@ function cmp_function($value1, $value2)
 }
 
 // different variables which are used as elements of $array_arg
-$value1 = -5; 
+$value1 = -5;
 $value2 = 100;
 $value3 = 0;
 $value4 = &$value1;
diff --git a/ext/standard/tests/assert/assert.phpt b/ext/standard/tests/assert/assert.phpt
index 44fb6091dbc..08e1188d60c 100644
--- a/ext/standard/tests/assert/assert.phpt
+++ b/ext/standard/tests/assert/assert.phpt
@@ -4,13 +4,13 @@ assert()
 error_reporting = 2039
 assert.active = 0
 assert.warning = 1
-assert.callback = 
+assert.callback =
 assert.bail = 0
 assert.quiet_eval = 0
 --FILE--
 <?php
 function a($file,$line,$myev)
-{ 
+{
 	echo "assertion failed $line,\"$myev\"\n";
 }
 
diff --git a/ext/standard/tests/assert/assert03.phpt b/ext/standard/tests/assert/assert03.phpt
index 74cdb6eda79..80c42df473f 100644
--- a/ext/standard/tests/assert/assert03.phpt
+++ b/ext/standard/tests/assert/assert03.phpt
@@ -3,30 +3,30 @@ assert() - set callback using ini_set()
 --INI--
 assert.active = 1
 assert.warning = 0
-assert.callback = 
+assert.callback =
 assert.bail = 0
 assert.quiet_eval = 1
 --FILE--
 <?php
 function a($file,$line,$myev)
-{ 
+{
 	        echo "assertion failed - a - $line,\"$myev\"\n";
 }
- 
+
 function b($file,$line,$myev)
-{ 
+{
 	        echo "assertion failed - b - $line,\"$myev\"\n";
 }
- 
+
 assert_options(ASSERT_ACTIVE,1);
 assert_options(ASSERT_QUIET_EVAL,1);
 assert_options(ASSERT_WARNING,0);
- 
+
 $a = 0;
- 
+
 assert_options(ASSERT_CALLBACK,"a");
 assert('$a != 0');
- 
+
  /* Modify call back using ini_set() */
 ini_set("assert.callback", "b");
 assert('$a != 0');
diff --git a/ext/standard/tests/assert/assert04.phpt b/ext/standard/tests/assert/assert04.phpt
index 9364a3e0a55..17606a8c272 100644
--- a/ext/standard/tests/assert/assert04.phpt
+++ b/ext/standard/tests/assert/assert04.phpt
@@ -3,7 +3,7 @@ misc assert() tests tests
 --INI--
 assert.active = 1
 assert.warning = 1
-assert.callback = 
+assert.callback =
 assert.bail = 0
 assert.quiet_eval = 0
 --FILE--
@@ -11,29 +11,29 @@ assert.quiet_eval = 0
 /* Assert not active */
 assert_options(ASSERT_ACTIVE, 0);
 assert(1);
- 
- 
+
+
 /* Wrong parameter count in assert */
 assert_options(ASSERT_ACTIVE, 1);
 assert(2, "failure", 3);
- 
+
 /* Wrong parameter count in assert_options */
 assert_options(ASSERT_ACTIVE, 0, 2);
- 
+
 /* Wrong parameter name in assert_options */
 $test="ASSERT_FRED";
 assert_options($test, 1);
- 
+
 /* Assert false */
 assert(0);
- 
- 
+
+
 /* Assert false and bail*/
 assert_options(ASSERT_BAIL, 1);
 assert(0);
- 
+
 echo "not reached\n";
- 
+
 ?>
 --EXPECTF--
 Warning: assert() expects at most 2 parameters, 3 given in %s on line %d
diff --git a/ext/standard/tests/assert/assert_basic.phpt b/ext/standard/tests/assert/assert_basic.phpt
index 7db2a13b19a..73b3e732061 100644
--- a/ext/standard/tests/assert/assert_basic.phpt
+++ b/ext/standard/tests/assert/assert_basic.phpt
@@ -8,7 +8,7 @@ assert.bail = 0
 assert.quiet_eval = 0
 --FILE--
 <?php
-function f1() 
+function f1()
 {
 	echo "f1 called\n";
 }
@@ -18,7 +18,7 @@ var_dump($r2=assert($sa));
 $sa = "0 == 0";
 var_dump($r2=assert($sa));
 
-//Non string assert 
+//Non string assert
 var_dump($r2=assert(0));
 var_dump($r2=assert(1));
 --EXPECTF--
diff --git a/ext/standard/tests/assert/assert_basic1.phpt b/ext/standard/tests/assert/assert_basic1.phpt
index 8aed519246c..12806384166 100644
--- a/ext/standard/tests/assert/assert_basic1.phpt
+++ b/ext/standard/tests/assert/assert_basic1.phpt
@@ -8,7 +8,7 @@ assert.bail = 0
 assert.quiet_eval = 0
 --FILE--
 <?php
-function f1() 
+function f1()
 {
 	echo "f1 called\n";
 }
@@ -19,7 +19,7 @@ var_dump($r2=assert($sa));
 $sa = "0 == 0";
 var_dump($r2=assert($sa));
 
-//Non string assert 
+//Non string assert
 var_dump($r2=assert(0));
 var_dump($r2=assert(1));
 --EXPECTF--
diff --git a/ext/standard/tests/assert/assert_basic2.phpt b/ext/standard/tests/assert/assert_basic2.phpt
index 42c59b1b9a6..d6c150d0d0c 100644
--- a/ext/standard/tests/assert/assert_basic2.phpt
+++ b/ext/standard/tests/assert/assert_basic2.phpt
@@ -8,19 +8,19 @@ assert.bail = 0
 assert.quiet_eval = 0
 --FILE--
 <?php
-function f2() 
+function f2()
 {
 	echo "f2 called\n";
 }
 
-function f1() 
+function f1()
 {
 	echo "f1 called\n";
 }
-	
+
 var_dump($o = assert_options(ASSERT_CALLBACK));
 assert(0);
-  
+
 var_dump($o= assert_options(ASSERT_CALLBACK, "f2"));
 var_dump($n= assert_options(ASSERT_CALLBACK));
 assert(0);
diff --git a/ext/standard/tests/assert/assert_basic3.phpt b/ext/standard/tests/assert/assert_basic3.phpt
index 044356c312d..a7fd990cbe1 100644
--- a/ext/standard/tests/assert/assert_basic3.phpt
+++ b/ext/standard/tests/assert/assert_basic3.phpt
@@ -8,7 +8,7 @@ assert.quiet_eval = 1
 assert.bail = 0
 --FILE--
 <?php
-function f1() 
+function f1()
 {
 	echo "f1 called\n";
 }
diff --git a/ext/standard/tests/assert/assert_basic4.phpt b/ext/standard/tests/assert/assert_basic4.phpt
index 2f112345947..40b4e94de1d 100644
--- a/ext/standard/tests/assert/assert_basic4.phpt
+++ b/ext/standard/tests/assert/assert_basic4.phpt
@@ -8,7 +8,7 @@ assert.quiet_eval = 0
 assert.callback = f1
 --FILE--
 <?php
-// Check the initial settings for all assert_options 
+// Check the initial settings for all assert_options
 
 //Using assert_options;
 echo "Initial values: assert_options(ASSERT_ACTIVE) => [".assert_options(ASSERT_ACTIVE)."]\n";
diff --git a/ext/standard/tests/assert/assert_basic5.phpt b/ext/standard/tests/assert/assert_basic5.phpt
index ac84a158f90..f4943cdf162 100644
--- a/ext/standard/tests/assert/assert_basic5.phpt
+++ b/ext/standard/tests/assert/assert_basic5.phpt
@@ -8,7 +8,7 @@ assert.bail = 0
 assert.quiet_eval = 0
 --FILE--
 <?php
-function f1() 
+function f1()
 {
 	echo "f1 called\n";
 }
diff --git a/ext/standard/tests/assert/assert_basic6.phpt b/ext/standard/tests/assert/assert_basic6.phpt
index e9b3f04b047..eb817db69b6 100644
--- a/ext/standard/tests/assert/assert_basic6.phpt
+++ b/ext/standard/tests/assert/assert_basic6.phpt
@@ -8,7 +8,7 @@ assert.quiet_eval = 1
 assert.bail = 0
 --FILE--
 <?php
-function f1($message) 
+function f1($message)
 {
 	echo "f1 called\n";
 }
diff --git a/ext/standard/tests/assert/assert_error.phpt b/ext/standard/tests/assert/assert_error.phpt
index 5e2519ab37d..6e040607656 100644
--- a/ext/standard/tests/assert/assert_error.phpt
+++ b/ext/standard/tests/assert/assert_error.phpt
@@ -8,7 +8,7 @@ assert.bail = 0
 assert.quiet_eval = 0
 --FILE--
 <?php
-function f1() 
+function f1()
 {
 	echo "f1 called\n";
 }
diff --git a/ext/standard/tests/assert/assert_error1.phpt b/ext/standard/tests/assert/assert_error1.phpt
index 6d7248c8ec3..191f0354aa4 100644
--- a/ext/standard/tests/assert/assert_error1.phpt
+++ b/ext/standard/tests/assert/assert_error1.phpt
@@ -8,7 +8,7 @@ assert.quiet_eval = 1
 assert.bail = 0
 --FILE--
 <?php
-function f1() 
+function f1()
 {
 	echo "f1 called\n";
 }
diff --git a/ext/standard/tests/assert/assert_error2.phpt b/ext/standard/tests/assert/assert_error2.phpt
index aea86f5726e..d1b6f1745f9 100644
--- a/ext/standard/tests/assert/assert_error2.phpt
+++ b/ext/standard/tests/assert/assert_error2.phpt
@@ -10,7 +10,7 @@ error_reporting = -1
 display_errors = 1
 --FILE--
 <?php
-function f1($script, $line, $message, $user_message) 
+function f1($script, $line, $message, $user_message)
 {
 	echo "f1 called\n";
 }
diff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt
index a23d468f7bb..1ea52b0b9e2 100644
--- a/ext/standard/tests/assert/assert_variation.phpt
+++ b/ext/standard/tests/assert/assert_variation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-assert() - variation  - test callback options using ini_get/ini_set/assert_options 
+assert() - variation  - test callback options using ini_get/ini_set/assert_options
 --INI--
 assert.active = 1
 assert.warning = 0
@@ -8,15 +8,15 @@ assert.bail = 0
 assert.quiet_eval = 0
 --FILE--
 <?php
-function f1() 
+function f1()
 {
 	echo "f1 called\n";
 }
-function f2() 
+function f2()
 {
 	echo "f2 called\n";
 }
-function f3() 
+function f3()
 {
 	echo "f3 called\n";
 }
diff --git a/ext/standard/tests/bug64370_var1.phpt b/ext/standard/tests/bug64370_var1.phpt
index aca46a594d1..87172c9b60b 100644
--- a/ext/standard/tests/bug64370_var1.phpt
+++ b/ext/standard/tests/bug64370_var1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test bug #64370 microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'] 
+Test bug #64370 microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']
 --FILE--
 <?php
 echo "\$_SERVER['REQUEST_TIME']: {$_SERVER['REQUEST_TIME']}\n";
diff --git a/ext/standard/tests/bug75220.phpt b/ext/standard/tests/bug75220.phpt
index f5820a12dd0..0fdc6aa79a3 100644
--- a/ext/standard/tests/bug75220.phpt
+++ b/ext/standard/tests/bug75220.phpt
@@ -15,7 +15,7 @@ class A extends B
 		var_dump(is_callable('parent::foo'));
 		var_dump(is_callable(array('parent', 'foo')));
 	}
-	
+
 	function __call($func, $args)
 	{
 	}
diff --git a/ext/standard/tests/class_object/class_exists_basic_001.phpt b/ext/standard/tests/class_object/class_exists_basic_001.phpt
index 208a895e6bd..cd05a4e9c30 100644
--- a/ext/standard/tests/class_object/class_exists_basic_001.phpt
+++ b/ext/standard/tests/class_object/class_exists_basic_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test class_exists() function : basic functionality 
+Test class_exists() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto bool class_exists(string classname [, bool autoload])
- * Description: Checks if the class exists 
+ * Description: Checks if the class exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing class_exists() : basic functionality ***\n";
diff --git a/ext/standard/tests/class_object/class_exists_error_001.phpt b/ext/standard/tests/class_object/class_exists_error_001.phpt
index 99c0b89b3c7..0c9a1214700 100644
--- a/ext/standard/tests/class_object/class_exists_error_001.phpt
+++ b/ext/standard/tests/class_object/class_exists_error_001.phpt
@@ -3,9 +3,9 @@ Test class_exists() function : error conditions (wrong number of arguments)
 --FILE--
 <?php
 /* Prototype  : proto bool class_exists(string classname [, bool autoload])
- * Description: Checks if the class exists 
+ * Description: Checks if the class exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /**
diff --git a/ext/standard/tests/class_object/class_exists_variation_001.phpt b/ext/standard/tests/class_object/class_exists_variation_001.phpt
index b847c0285c2..561a77fa2c0 100644
--- a/ext/standard/tests/class_object/class_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/class_exists_variation_001.phpt
@@ -3,9 +3,9 @@ Test class_exists() function : usage variations - unexpected types for argument
 --FILE--
 <?php
 /* Prototype  : proto bool class_exists(string classname [, bool autoload])
- * Description: Checks if the class exists 
+ * Description: Checks if the class exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 spl_autoload_register(function ($className) {
diff --git a/ext/standard/tests/class_object/class_exists_variation_002.phpt b/ext/standard/tests/class_object/class_exists_variation_002.phpt
index ee6832cf3eb..bd00e17d4df 100644
--- a/ext/standard/tests/class_object/class_exists_variation_002.phpt
+++ b/ext/standard/tests/class_object/class_exists_variation_002.phpt
@@ -3,9 +3,9 @@ Test class_exists() function : usage variations  - unexpected types for argument
 --FILE--
 <?php
 /* Prototype  : proto bool class_exists(string classname [, bool autoload])
- * Description: Checks if the class exists 
+ * Description: Checks if the class exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 spl_autoload_register(function ($className) {
diff --git a/ext/standard/tests/class_object/class_exists_variation_003.phpt b/ext/standard/tests/class_object/class_exists_variation_003.phpt
index 0745601452c..32895d393db 100644
--- a/ext/standard/tests/class_object/class_exists_variation_003.phpt
+++ b/ext/standard/tests/class_object/class_exists_variation_003.phpt
@@ -3,9 +3,9 @@ Test class_exists() function : usage variations  - case sensitivity
 --FILE--
 <?php
 /* Prototype  : proto bool class_exists(string classname [, bool autoload])
- * Description: Checks if the class exists 
+ * Description: Checks if the class exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 class caseSensitivityTest {}
diff --git a/ext/standard/tests/class_object/get_class_error_001.phpt b/ext/standard/tests/class_object/get_class_error_001.phpt
index 555099502dd..34814aecd4a 100644
--- a/ext/standard/tests/class_object/get_class_error_001.phpt
+++ b/ext/standard/tests/class_object/get_class_error_001.phpt
@@ -3,9 +3,9 @@ Test get_class() function : error conditions - wrong number of arguments.
 --FILE--
 <?php
 /* Prototype  : proto string get_class([object object])
- * Description: Retrieves the class name 
+ * Description: Retrieves the class name
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing get_class() : error conditions ***\n";
diff --git a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt
index b2b87af4eca..876438f74ca 100644
--- a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt
+++ b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_class_methods() function : basic functionality 
+Test get_class_methods() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto array get_class_methods(mixed class)
- * Description: Returns an array of method names for class or class instance. 
+ * Description: Returns an array of method names for class or class instance.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -18,7 +18,7 @@ class C {
 	function f() {}
 	function g() {}
 	function h() {}
-} 
+}
 
 echo "Argument is class name:\n";
 var_dump( get_class_methods("C") );
diff --git a/ext/standard/tests/class_object/get_class_methods_basic_002.phpt b/ext/standard/tests/class_object/get_class_methods_basic_002.phpt
index 441bb45d6dd..2647a777f84 100644
--- a/ext/standard/tests/class_object/get_class_methods_basic_002.phpt
+++ b/ext/standard/tests/class_object/get_class_methods_basic_002.phpt
@@ -3,9 +3,9 @@ Test get_class_methods() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto array get_class_methods(mixed class)
- * Description: Returns an array of method names for class or class instance. 
+ * Description: Returns an array of method names for class or class instance.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -16,7 +16,7 @@ class C {
 	private function privC() {}
 	protected function protC() {}
 	public function pubC() {}
-	
+
 	public static function testFromC() {
 		echo "Accessing C from C:\n";
 		var_dump(get_class_methods("C"));
@@ -31,7 +31,7 @@ class D extends C {
 	private function privD() {}
 	protected function protD() {}
 	public function pubD() {}
-	
+
 	public static function testFromD() {
 		echo "Accessing C from D:\n";
 		var_dump(get_class_methods("C"));
@@ -46,7 +46,7 @@ class X {
 	private function privX() {}
 	protected function protX() {}
 	public function pubX() {}
-	
+
 	public static function testFromX() {
 		echo "Accessing C from X:\n";
 		var_dump(get_class_methods("C"));
diff --git a/ext/standard/tests/class_object/get_class_methods_basic_003.phpt b/ext/standard/tests/class_object/get_class_methods_basic_003.phpt
index b64f702b855..d8063ec779b 100644
--- a/ext/standard/tests/class_object/get_class_methods_basic_003.phpt
+++ b/ext/standard/tests/class_object/get_class_methods_basic_003.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_class_methods() function : basic functionality 
+Test get_class_methods() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto array get_class_methods(mixed class)
- * Description: Returns an array of method names for class or class instance. 
+ * Description: Returns an array of method names for class or class instance.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -23,10 +23,10 @@ class C implements I {
 	private function privC() {}
 	protected function protC() {}
 	public function pubC() {}
-	
+
 	public static function testFromC() {
 		echo "Accessing I from C:\n";
-		var_dump(get_class_methods("I"));	
+		var_dump(get_class_methods("I"));
 		echo "Accessing C from C:\n";
 		var_dump(get_class_methods("C"));
 	}
diff --git a/ext/standard/tests/class_object/get_class_methods_error_001.phpt b/ext/standard/tests/class_object/get_class_methods_error_001.phpt
index e606ab69372..9888c26ae02 100644
--- a/ext/standard/tests/class_object/get_class_methods_error_001.phpt
+++ b/ext/standard/tests/class_object/get_class_methods_error_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_class_methods() function : error conditions 
+Test get_class_methods() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto array get_class_methods(mixed class)
- * Description: Returns an array of method names for class or class instance. 
+ * Description: Returns an array of method names for class or class instance.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt
index 8cdef12a7b9..abc23952098 100644
--- a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt
+++ b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt
@@ -3,9 +3,9 @@ Test get_class_methods() function : usage variations  - unexpected types
 --FILE--
 <?php
 /* Prototype  : proto array get_class_methods(mixed class)
- * Description: Returns an array of method names for class or class instance. 
+ * Description: Returns an array of method names for class or class instance.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
diff --git a/ext/standard/tests/class_object/get_class_methods_variation_002.phpt b/ext/standard/tests/class_object/get_class_methods_variation_002.phpt
index 60b944c69cb..2eae7f75d89 100644
--- a/ext/standard/tests/class_object/get_class_methods_variation_002.phpt
+++ b/ext/standard/tests/class_object/get_class_methods_variation_002.phpt
@@ -3,9 +3,9 @@ Test get_class_methods() function : usage variations  - case sensitivity
 --FILE--
 <?php
 /* Prototype  : proto array get_class_methods(mixed class)
- * Description: Returns an array of method names for class or class instance. 
+ * Description: Returns an array of method names for class or class instance.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing get_class_methods() : usage variations ***\n";
diff --git a/ext/standard/tests/class_object/get_class_variation_001.phpt b/ext/standard/tests/class_object/get_class_variation_001.phpt
index 3987968e904..ad0686b837d 100644
--- a/ext/standard/tests/class_object/get_class_variation_001.phpt
+++ b/ext/standard/tests/class_object/get_class_variation_001.phpt
@@ -3,9 +3,9 @@ Test get_class() function : usage variations  - passing unexpected types.
 --FILE--
 <?php
 /* Prototype  : proto string get_class([object object])
- * Description: Retrieves the class name 
+ * Description: Retrieves the class name
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing get_class() : usage variations ***\n";
diff --git a/ext/standard/tests/class_object/get_class_variation_002.phpt b/ext/standard/tests/class_object/get_class_variation_002.phpt
index 1ee35298182..ab6421104a9 100644
--- a/ext/standard/tests/class_object/get_class_variation_002.phpt
+++ b/ext/standard/tests/class_object/get_class_variation_002.phpt
@@ -3,9 +3,9 @@ Test get_class() function : usage variations  - ensure class name case is preser
 --FILE--
 <?php
 /* Prototype  : proto string get_class([object object])
- * Description: Retrieves the class name 
+ * Description: Retrieves the class name
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 class caseSensitivityTest {}
diff --git a/ext/standard/tests/class_object/get_class_vars_variation1.phpt b/ext/standard/tests/class_object/get_class_vars_variation1.phpt
index 649e9ae5af4..5ade3f240fd 100644
--- a/ext/standard/tests/class_object/get_class_vars_variation1.phpt
+++ b/ext/standard/tests/class_object/get_class_vars_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_class_vars() function : usage variation 
+Test get_class_vars() function : usage variation
 --FILE--
 <?php
 /* Prototype  : array get_class_vars(string class_name)
- * Description: Returns an array of default properties of the class. 
+ * Description: Returns an array of default properties of the class.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing get_class_vars() : usage variation ***\n";
diff --git a/ext/standard/tests/class_object/get_class_vars_variation2.phpt b/ext/standard/tests/class_object/get_class_vars_variation2.phpt
index fad5716745e..8f6923d6004 100644
--- a/ext/standard/tests/class_object/get_class_vars_variation2.phpt
+++ b/ext/standard/tests/class_object/get_class_vars_variation2.phpt
@@ -1,18 +1,18 @@
 --TEST--
-Test get_class_vars() function : testing visibility 
+Test get_class_vars() function : testing visibility
 --FILE--
 <?php
 /* Prototype  : array get_class_vars(string class_name)
- * Description: Returns an array of default properties of the class. 
+ * Description: Returns an array of default properties of the class.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 class Ancestor {
   function test() {
     var_dump(get_class_vars("Tester"));
   }
-  
+
   static function testStatic() {
     var_dump(get_class_vars("Tester"));
   }
@@ -22,15 +22,15 @@ class Tester extends Ancestor {
   public $pub = "public var";
   protected $prot = "protected var";
   private $priv = "private var";
-  
+
   static public $pubs = "public static var";
   static protected $prots = "protected static var";
   static private $privs = "private static var";
-  
+
   function test() {
     var_dump(get_class_vars("Tester"));
   }
-  
+
   static function testStatic() {
     var_dump(get_class_vars("Tester"));
   }
@@ -40,7 +40,7 @@ class Child extends Tester {
   function test() {
     var_dump(get_class_vars("Tester"));
   }
-  
+
   static function testStatic() {
     var_dump(get_class_vars("Tester"));
   }
diff --git a/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt b/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt
index 123e9772cc9..bede42a7622 100644
--- a/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt
+++ b/ext/standard/tests/class_object/get_declared_classes_basic_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_declared_classes() function : basic functionality 
+Test get_declared_classes() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto array get_declared_classes()
- * Description: Returns an array of all declared classes. 
+ * Description: Returns an array of all declared classes.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
@@ -17,7 +17,7 @@ var_dump(get_declared_classes());
 
 foreach (get_declared_classes() as $class) {
 	if (!class_exists($class)) {
-		echo "Error: $class is not a valid class.\n"; 
+		echo "Error: $class is not a valid class.\n";
 	}
 }
 
diff --git a/ext/standard/tests/class_object/get_declared_classes_error_001.phpt b/ext/standard/tests/class_object/get_declared_classes_error_001.phpt
index ff01feb360b..7132410fb86 100644
--- a/ext/standard/tests/class_object/get_declared_classes_error_001.phpt
+++ b/ext/standard/tests/class_object/get_declared_classes_error_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_declared_classes() function : error conditions 
+Test get_declared_classes() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto array get_declared_classes()
- * Description: Returns an array of all declared classes. 
+ * Description: Returns an array of all declared classes.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing get_declared_classes() : error conditions ***\n";
diff --git a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt
index 3853bb62292..6929d741c6c 100644
--- a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt
+++ b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_declared_classes() function : testing autoloaded classes 
+Test get_declared_classes() function : testing autoloaded classes
 --FILE--
 <?php
 /* Prototype  : proto array get_declared_classes()
- * Description: Returns an array of all declared classes. 
+ * Description: Returns an array of all declared classes.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
diff --git a/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt b/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt
index a0ec7151873..0fd665b250b 100644
--- a/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt
+++ b/ext/standard/tests/class_object/get_declared_interfaces_basic_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_declared_interfaces() function : basic functionality 
+Test get_declared_interfaces() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto array get_declared_interfaces()
- * Description: Returns an array of all declared interfaces. 
+ * Description: Returns an array of all declared interfaces.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
@@ -17,7 +17,7 @@ var_dump(get_declared_interfaces());
 
 foreach (get_declared_interfaces() as $interface) {
 	if (!interface_exists($interface)) {
-		echo "Error: $interface is not a valid interface.\n"; 
+		echo "Error: $interface is not a valid interface.\n";
 	}
 }
 
diff --git a/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt b/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt
index 63b02b85c35..1b11981492d 100644
--- a/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt
+++ b/ext/standard/tests/class_object/get_declared_interfaces_error_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_declared_interfaces() function : error conditions 
+Test get_declared_interfaces() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto array get_declared_interfaces()
- * Description: Returns an array of all declared interfaces. 
+ * Description: Returns an array of all declared interfaces.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing get_declared_interfaces() : error conditions ***\n";
diff --git a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt
index 12c92df7fa1..f8d2a124185 100644
--- a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt
+++ b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt
@@ -3,9 +3,9 @@ Test get_declared_interfaces() function : autoloading of interfaces
 --FILE--
 <?php
 /* Prototype  : proto array get_declared_interfaces()
- * Description: Returns an array of all declared interfaces. 
+ * Description: Returns an array of all declared interfaces.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
diff --git a/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt b/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt
index 69d8de9c317..27962d6c56d 100644
--- a/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt
+++ b/ext/standard/tests/class_object/get_declared_traits_basic_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_declared_traits() function : basic functionality 
+Test get_declared_traits() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto array get_declared_traits()
- * Description: Returns an array of all declared traits. 
+ * Description: Returns an array of all declared traits.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
@@ -19,7 +19,7 @@ var_dump(get_declared_traits());
 
 foreach (get_declared_traits() as $trait) {
 	if (!trait_exists($trait)) {
-		echo "Error: $trait is not a valid trait.\n"; 
+		echo "Error: $trait is not a valid trait.\n";
 	}
 }
 
diff --git a/ext/standard/tests/class_object/get_declared_traits_error_001.phpt b/ext/standard/tests/class_object/get_declared_traits_error_001.phpt
index 0d35fa6d136..522ad36a1b6 100644
--- a/ext/standard/tests/class_object/get_declared_traits_error_001.phpt
+++ b/ext/standard/tests/class_object/get_declared_traits_error_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_declared_traits() function : error conditions 
+Test get_declared_traits() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto array get_declared_traits()
- * Description: Returns an array of all declared traits. 
+ * Description: Returns an array of all declared traits.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing get_declared_traits() : error conditions ***\n";
diff --git a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt
index 6ea3edfa79d..a0df5d8071d 100644
--- a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt
+++ b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt
@@ -3,9 +3,9 @@ Test get_declared_traits() function : testing autoloaded traits
 --FILE--
 <?php
 /* Prototype  : proto array get_declared_traits()
- * Description: Returns an array of all declared traits. 
+ * Description: Returns an array of all declared traits.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
diff --git a/ext/standard/tests/class_object/get_object_vars_basic_001.phpt b/ext/standard/tests/class_object/get_object_vars_basic_001.phpt
index 38ed74fb07b..9a7de5c7ce6 100644
--- a/ext/standard/tests/class_object/get_object_vars_basic_001.phpt
+++ b/ext/standard/tests/class_object/get_object_vars_basic_001.phpt
@@ -3,46 +3,46 @@ get_object_vars(): visibility from static methods (target object passed as arg)
 --FILE--
 <?php
 /* Prototype  : proto array get_object_vars(object obj)
- * Description: Returns an array of object properties 
+ * Description: Returns an array of object properties
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 Class A {
 	private $hiddenPriv = 'A::hiddenPriv';
 
 	public static function test($b) {
-		echo __METHOD__ . "\n"; 
+		echo __METHOD__ . "\n";
 		var_dump(get_object_vars($b));
 	}
 }
 
 Class B extends A {
-	private $hiddenPriv = 'B::hiddenPriv';	
+	private $hiddenPriv = 'B::hiddenPriv';
 	private $priv = 'B::priv';
 	protected $prot = 'B::prot';
 	public $pub = 'B::pub';
 
 	public static function test($b) {
-		echo __METHOD__ . "\n";		
+		echo __METHOD__ . "\n";
 		var_dump(get_object_vars($b));
-	} 
+	}
 }
 
 Class C extends B {
 	private $hiddenPriv = 'C::hiddenPriv';
-	
+
 	public static function test($b) {
-		echo __METHOD__ . "\n";		
+		echo __METHOD__ . "\n";
 		var_dump(get_object_vars($b));
-	} 
+	}
 }
 
 Class X {
 	public static function test($b) {
-		echo __METHOD__ . "\n";		
+		echo __METHOD__ . "\n";
 		var_dump(get_object_vars($b));
-	} 
+	}
 }
 
 
diff --git a/ext/standard/tests/class_object/get_object_vars_basic_002.phpt b/ext/standard/tests/class_object/get_object_vars_basic_002.phpt
index 910926bc1f5..08d33bab05c 100644
--- a/ext/standard/tests/class_object/get_object_vars_basic_002.phpt
+++ b/ext/standard/tests/class_object/get_object_vars_basic_002.phpt
@@ -3,30 +3,30 @@ get_object_vars(): visibility from non static methods (target object passed as a
 --FILE--
 <?php
 /* Prototype  : proto array get_object_vars(object obj)
- * Description: Returns an array of object properties 
+ * Description: Returns an array of object properties
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 Class A {
 	private $hiddenPriv = 'A::hiddenPriv';
 
 	public function testA($b) {
-		echo __METHOD__ . "\n"; 
+		echo __METHOD__ . "\n";
 		var_dump(get_object_vars($b));
-	} 
+	}
 }
 
 Class B extends A {
-	private $hiddenPriv = 'B::hiddenPriv';	
+	private $hiddenPriv = 'B::hiddenPriv';
 	private $priv = 'B::priv';
 	protected $prot = 'B::prot';
 	public $pub = 'B::pub';
 
 	public function testB($b) {
-		echo __METHOD__ . "\n";		
+		echo __METHOD__ . "\n";
 		var_dump(get_object_vars($b));
-	} 
+	}
 }
 
 
diff --git a/ext/standard/tests/class_object/get_object_vars_error_001.phpt b/ext/standard/tests/class_object/get_object_vars_error_001.phpt
index 2cb37f4a912..c25ded8bb2a 100644
--- a/ext/standard/tests/class_object/get_object_vars_error_001.phpt
+++ b/ext/standard/tests/class_object/get_object_vars_error_001.phpt
@@ -3,9 +3,9 @@ Test get_object_vars() function : error conditions - wrong number of args
 --FILE--
 <?php
 /* Prototype  : proto array get_object_vars(object obj)
- * Description: Returns an array of object properties 
+ * Description: Returns an array of object properties
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing get_object_vars() : error conditions ***\n";
diff --git a/ext/standard/tests/class_object/get_object_vars_variation_001.phpt b/ext/standard/tests/class_object/get_object_vars_variation_001.phpt
index 89fbc53e93f..40a5595af49 100644
--- a/ext/standard/tests/class_object/get_object_vars_variation_001.phpt
+++ b/ext/standard/tests/class_object/get_object_vars_variation_001.phpt
@@ -3,9 +3,9 @@ get_object_vars() - ensure statics are not shown
 --FILE--
 <?php
 /* Prototype  : proto array get_object_vars(object obj)
- * Description: Returns an array of object properties 
+ * Description: Returns an array of object properties
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 Class A {
diff --git a/ext/standard/tests/class_object/get_object_vars_variation_002.phpt b/ext/standard/tests/class_object/get_object_vars_variation_002.phpt
index 73478de79a1..cb69836c9b1 100644
--- a/ext/standard/tests/class_object/get_object_vars_variation_002.phpt
+++ b/ext/standard/tests/class_object/get_object_vars_variation_002.phpt
@@ -3,9 +3,9 @@ get_object_vars() - ensure references are preserved
 --FILE--
 <?php
 /* Prototype  : proto array get_object_vars(object obj)
- * Description: Returns an array of object properties 
+ * Description: Returns an array of object properties
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $obj = new stdClass;
diff --git a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt
index 6121d0d9796..fbcb21fbea4 100644
--- a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt
+++ b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt
@@ -3,9 +3,9 @@ Test get_object_vars() function : usage variations  - unexpected types for argum
 --FILE--
 <?php
 /* Prototype  : proto array get_object_vars(object obj)
- * Description: Returns an array of object properties 
+ * Description: Returns an array of object properties
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing get_object_vars() : usage variations ***\n";
diff --git a/ext/standard/tests/class_object/get_parent_class_error_001.phpt b/ext/standard/tests/class_object/get_parent_class_error_001.phpt
index 40c3dba2794..ed0644dce73 100644
--- a/ext/standard/tests/class_object/get_parent_class_error_001.phpt
+++ b/ext/standard/tests/class_object/get_parent_class_error_001.phpt
@@ -3,9 +3,9 @@ Test get_parent_class() function : error conditions - wrong number of args.
 --FILE--
 <?php
 /* Prototype  : proto string get_parent_class([mixed object])
- * Description: Retrieves the parent class name for object or class or current scope. 
+ * Description: Retrieves the parent class name for object or class or current scope.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing get_parent_class() : error conditions ***\n";
diff --git a/ext/standard/tests/class_object/get_parent_class_variation_001.phpt b/ext/standard/tests/class_object/get_parent_class_variation_001.phpt
index 6f2e32805bd..24859620d0b 100644
--- a/ext/standard/tests/class_object/get_parent_class_variation_001.phpt
+++ b/ext/standard/tests/class_object/get_parent_class_variation_001.phpt
@@ -3,9 +3,9 @@ Test get_parent_class() function : variation - case sensitivity
 --FILE--
 <?php
 /* Prototype  : proto string get_parent_class([mixed object])
- * Description: Retrieves the parent class name for object or class or current scope. 
+ * Description: Retrieves the parent class name for object or class or current scope.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 //  Note: basic use cases in Zend/tests/010.phpt
diff --git a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt
index 97f848168d5..8dde525ae82 100644
--- a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt
+++ b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt
@@ -3,9 +3,9 @@ Test get_parent_class() function : usage variations  - unexpected argument type.
 --FILE--
 <?php
 /* Prototype  : proto string get_parent_class([mixed object])
- * Description: Retrieves the parent class name for object or class or current scope. 
+ * Description: Retrieves the parent class name for object or class or current scope.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 spl_autoload_register(function ($className) {
diff --git a/ext/standard/tests/class_object/interface_exists_error.phpt b/ext/standard/tests/class_object/interface_exists_error.phpt
index bf95a430505..312665267fa 100644
--- a/ext/standard/tests/class_object/interface_exists_error.phpt
+++ b/ext/standard/tests/class_object/interface_exists_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test interface_exists() function : error conditions 
+Test interface_exists() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool interface_exists(string classname [, bool autoload])
- * Description: Checks if the class exists 
+ * Description: Checks if the class exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing interface_exists() : error conditions ***\n";
diff --git a/ext/standard/tests/class_object/interface_exists_variation1.phpt b/ext/standard/tests/class_object/interface_exists_variation1.phpt
index 34d0e1e6b02..f265d0085cf 100644
--- a/ext/standard/tests/class_object/interface_exists_variation1.phpt
+++ b/ext/standard/tests/class_object/interface_exists_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test interface_exists() function : usage variation 
+Test interface_exists() function : usage variation
 --FILE--
 <?php
 /* Prototype  : bool interface_exists(string classname [, bool autoload])
- * Description: Checks if the class exists 
+ * Description: Checks if the class exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing interface_exists() : usage variation ***\n";
diff --git a/ext/standard/tests/class_object/interface_exists_variation2.phpt b/ext/standard/tests/class_object/interface_exists_variation2.phpt
index 4137d8a0f90..cfdb4dee178 100644
--- a/ext/standard/tests/class_object/interface_exists_variation2.phpt
+++ b/ext/standard/tests/class_object/interface_exists_variation2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test interface_exists() function : usage variation 
+Test interface_exists() function : usage variation
 --FILE--
 <?php
 /* Prototype  : bool interface_exists(string classname [, bool autoload])
- * Description: Checks if the class exists 
+ * Description: Checks if the class exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing interface_exists() : usage variation ***\n";
diff --git a/ext/standard/tests/class_object/interface_exists_variation3.phpt b/ext/standard/tests/class_object/interface_exists_variation3.phpt
index 5119945bac8..dd6cec3c2ab 100644
--- a/ext/standard/tests/class_object/interface_exists_variation3.phpt
+++ b/ext/standard/tests/class_object/interface_exists_variation3.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test interface_exists() function : autoloaded interface 
+Test interface_exists() function : autoloaded interface
 --FILE--
 <?php
 /* Prototype  : bool interface_exists(string classname [, bool autoload])
- * Description: Checks if the class exists 
+ * Description: Checks if the class exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing interface_exists() : autoloaded interface ***\n";
diff --git a/ext/standard/tests/class_object/interface_exists_variation4.phpt b/ext/standard/tests/class_object/interface_exists_variation4.phpt
index ca787396f76..9cff2e9ccc2 100644
--- a/ext/standard/tests/class_object/interface_exists_variation4.phpt
+++ b/ext/standard/tests/class_object/interface_exists_variation4.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test interface_exists() function : test autoload default value 
+Test interface_exists() function : test autoload default value
 --FILE--
 <?php
 /* Prototype  : bool interface_exists(string classname [, bool autoload])
- * Description: Checks if the class exists 
+ * Description: Checks if the class exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing interface_exists() : test autoload default value ***\n";
diff --git a/ext/standard/tests/class_object/is_a.phpt b/ext/standard/tests/class_object/is_a.phpt
index 99794cafb29..8e7f7a79da8 100644
--- a/ext/standard/tests/class_object/is_a.phpt
+++ b/ext/standard/tests/class_object/is_a.phpt
@@ -6,22 +6,22 @@ is_a and is_subclass_of behaviour (with and without autoload)
 interface if_a {
 	function f_a();
 }
-	
+
 interface if_b extends if_a {
 	function f_b();
 }
 
 class base {
 	function _is_a($sub) {
-		
+
 		echo "\n>>> With Defined class\n";
 		echo str_pad('is_a( OBJECT:'.get_class($this).', '.$sub.') = ', 60) . (is_a($this, $sub) ? 'yes' : 'no')."\n";
 		echo str_pad('is_a( STRING:'.get_class($this).', '.$sub.') = ', 60). (is_a(get_class($this), $sub) ? 'yes' : 'no')."\n";
-		echo str_pad('is_a( STRING:'.get_class($this).', '.$sub.', true) = ', 60). (is_a(get_class($this), $sub, true) ? 'yes' : 'no')."\n";		
+		echo str_pad('is_a( STRING:'.get_class($this).', '.$sub.', true) = ', 60). (is_a(get_class($this), $sub, true) ? 'yes' : 'no')."\n";
 		echo str_pad('is_subclass_of( OBJECT:'.get_class($this).', '.$sub.') = ', 60).  (is_subclass_of($this, $sub) ? 'yes' : 'no')."\n";
 		echo str_pad('is_subclass_of( STRING:'.get_class($this).', '.$sub.') = ', 60). (is_subclass_of(get_class($this), $sub) ? 'yes' : 'no')."\n";
 		echo str_pad('is_subclass_of( STRING:'.get_class($this).', '.$sub.',false) = ', 60). (is_subclass_of(get_class($this), $sub , false) ? 'yes' : 'no')."\n";
-		 
+
 		// with autoload options..
 		echo ">>> With Undefined\n";
 		echo  str_pad('is_a( STRING:undefB, '.$sub.',true) = ', 60). (is_a('undefB', $sub, true) ? 'yes' : 'no')."\n";
@@ -31,8 +31,8 @@ class base {
 	}
 	function test() {
 		echo $this->_is_a('base');
-		echo $this->_is_a('derived_a');  
-		echo $this->_is_a('if_a'); 
+		echo $this->_is_a('derived_a');
+		echo $this->_is_a('if_a');
 		echo $this->_is_a('undefA');
 		echo "\n";
 	}
@@ -75,7 +75,7 @@ $t->test();
 
 $t = new derived_b();
 $t->test();
- 
+
 
 
 
diff --git a/ext/standard/tests/class_object/is_a_error_001.phpt b/ext/standard/tests/class_object/is_a_error_001.phpt
index 6518a03c0f9..3f5c7e01c40 100644
--- a/ext/standard/tests/class_object/is_a_error_001.phpt
+++ b/ext/standard/tests/class_object/is_a_error_001.phpt
@@ -5,9 +5,9 @@ error_reporting=E_ALL | E_STRICT | E_DEPRECATED
 --FILE--
 <?php
 /* Prototype  : proto bool is_a(object object, string class_name, bool allow_string)
- * Description: Returns true if the object is of this class or has this class as one of its parents 
+ * Description: Returns true if the object is of this class or has this class as one of its parents
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing is_a() : error conditions ***\n";
diff --git a/ext/standard/tests/class_object/is_a_variation_001.phpt b/ext/standard/tests/class_object/is_a_variation_001.phpt
index d449fd3797b..a81fb1e2df9 100644
--- a/ext/standard/tests/class_object/is_a_variation_001.phpt
+++ b/ext/standard/tests/class_object/is_a_variation_001.phpt
@@ -1,15 +1,15 @@
 --TEST--
 Test is_a() function : usage variations  - wrong type for arg 1
 --INI--
-error_reporting=E_ALL | E_STRICT | E_DEPRECATED 
+error_reporting=E_ALL | E_STRICT | E_DEPRECATED
 --FILE--
 <?php
 /* Prototype  : proto bool is_a(object object, string class_name)
- * Description: Returns true if the object is of this class or has this class as one of its parents 
+ * Description: Returns true if the object is of this class or has this class as one of its parents
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
-// Note: basic use cases in Zend/tests/is_a.phpt 
+// Note: basic use cases in Zend/tests/is_a.phpt
 echo "*** Testing is_a() : usage variations ***\n";
 
 // Initialise function arguments not being substituted (if any)
@@ -59,7 +59,7 @@ $values = array(
       // string data
       "string",
       'String',
-      
+
       // undefined data
       $undefined_var,
 
diff --git a/ext/standard/tests/class_object/is_a_variation_002.phpt b/ext/standard/tests/class_object/is_a_variation_002.phpt
index a34c325d871..b4dc4631fa2 100644
--- a/ext/standard/tests/class_object/is_a_variation_002.phpt
+++ b/ext/standard/tests/class_object/is_a_variation_002.phpt
@@ -1,13 +1,13 @@
 --TEST--
 Test is_a() function : usage variations  - wrong type for arg 2
 --INI--
-error_reporting=E_ALL | E_STRICT | E_DEPRECATED 
+error_reporting=E_ALL | E_STRICT | E_DEPRECATED
 --FILE--
 <?php
 /* Prototype  : proto bool is_a(object object, string class_name)
- * Description: Returns true if the object is of this class or has this class as one of its parents 
+ * Description: Returns true if the object is of this class or has this class as one of its parents
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 class C {
diff --git a/ext/standard/tests/class_object/is_a_variation_003.phpt b/ext/standard/tests/class_object/is_a_variation_003.phpt
index 1258647bc12..af0f2a8a76b 100644
--- a/ext/standard/tests/class_object/is_a_variation_003.phpt
+++ b/ext/standard/tests/class_object/is_a_variation_003.phpt
@@ -5,9 +5,9 @@ error_reporting=E_ALL | E_STRICT | E_DEPRECATED
 --FILE--
 <?php
 /* Prototype  : proto bool is_a(object object, string class_name)
- * Description: Returns true if the object is of this class or has this class as one of its parents 
+ * Description: Returns true if the object is of this class or has this class as one of its parents
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing is_a() : usage variations ***\n";
diff --git a/ext/standard/tests/class_object/is_subclass_of_error_001.phpt b/ext/standard/tests/class_object/is_subclass_of_error_001.phpt
index 987dcd47be5..878a4584e35 100644
--- a/ext/standard/tests/class_object/is_subclass_of_error_001.phpt
+++ b/ext/standard/tests/class_object/is_subclass_of_error_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test is_subclass_of() function : wrong number of args 
+Test is_subclass_of() function : wrong number of args
 --FILE--
 <?php
 /* Prototype  : proto bool is_subclass_of(object object, string class_name)
- * Description: Returns true if the object has this class as one of its parents 
+ * Description: Returns true if the object has this class as one of its parents
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing is_subclass_of() : error conditions ***\n";
diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt
index b1cb553abdc..d65bfcbc26b 100644
--- a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt
+++ b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt
@@ -3,9 +3,9 @@ Test is_subclass_of() function : usage variations  - unexpected type for arg 1
 --FILE--
 <?php
 /* Prototype  : proto bool is_subclass_of(object object, string class_name)
- * Description: Returns true if the object has this class as one of its parents 
+ * Description: Returns true if the object has this class as one of its parents
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 // Note: basic use cases in Zend/tests/is_a.phpt
 spl_autoload_register(function ($className) {
diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt
index 85f697654d1..a7ebab59c54 100644
--- a/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt
+++ b/ext/standard/tests/class_object/is_subclass_of_variation_002.phpt
@@ -3,9 +3,9 @@ Test is_subclass_of() function : usage variations  - unexpected type for arg 2
 --FILE--
 <?php
 /* Prototype  : proto bool is_subclass_of(object object, string class_name)
- * Description: Returns true if the object has this class as one of its parents 
+ * Description: Returns true if the object has this class as one of its parents
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 spl_autoload_register(function ($className) {
diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt
index d4aef123494..81878c12c5a 100644
--- a/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt
+++ b/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt
@@ -3,9 +3,9 @@ Test is_subclass_of() function : usage variations  - case sensitivity
 --FILE--
 <?php
 /* Prototype  : proto bool is_subclass_of(object object, string class_name)
- * Description: Returns true if the object has this class as one of its parents 
+ * Description: Returns true if the object has this class as one of its parents
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing is_subclass_of() : usage variations ***\n";
diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt
index adecd5003dd..0a4c5752580 100644
--- a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt
+++ b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt
@@ -3,9 +3,9 @@ Test is_subclass_of() function : usage variations  - unexpected type for arg 1 w
 --FILE--
 <?php
 /* Prototype  : proto bool is_subclass_of(object object, string class_name)
- * Description: Returns true if the object has this class as one of its parents 
+ * Description: Returns true if the object has this class as one of its parents
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 // Note: basic use cases in Zend/tests/is_a.phpt
 spl_autoload_register(function ($className) {
diff --git a/ext/standard/tests/class_object/method_exists_basic_001.phpt b/ext/standard/tests/class_object/method_exists_basic_001.phpt
index 2f11e4c46e7..7449f88572b 100644
--- a/ext/standard/tests/class_object/method_exists_basic_001.phpt
+++ b/ext/standard/tests/class_object/method_exists_basic_001.phpt
@@ -3,9 +3,9 @@ method_exists() on userspace classes; static & non-static methods with various v
 --FILE--
 <?php
 /* Prototype  : proto bool is_subclass_of(object object, string class_name)
- * Description: Returns true if the object has this class as one of its parents 
+ * Description: Returns true if the object has this class as one of its parents
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 Class B {
@@ -14,7 +14,7 @@ Class B {
 	private function inherit_priv() {}
 	static public function inherit_static_pub() {}
 	static protected function inherit_static_prot() {}
-	static private function inherit_static_priv() {}	
+	static private function inherit_static_priv() {}
 }
 
 Class C extends B {
diff --git a/ext/standard/tests/class_object/method_exists_basic_002.phpt b/ext/standard/tests/class_object/method_exists_basic_002.phpt
index f6b62aa2653..bdaad02edfb 100644
--- a/ext/standard/tests/class_object/method_exists_basic_002.phpt
+++ b/ext/standard/tests/class_object/method_exists_basic_002.phpt
@@ -3,9 +3,9 @@ method_exists() on internal classes
 --FILE--
 <?php
 /* Prototype  : proto bool is_subclass_of(object object, string class_name)
- * Description: Returns true if the object has this class as one of its parents 
+ * Description: Returns true if the object has this class as one of its parents
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo " ---(Internal classes, using string class name)---\n";
diff --git a/ext/standard/tests/class_object/method_exists_basic_003.phpt b/ext/standard/tests/class_object/method_exists_basic_003.phpt
index 3ac17951499..2b3b04bb20d 100644
--- a/ext/standard/tests/class_object/method_exists_basic_003.phpt
+++ b/ext/standard/tests/class_object/method_exists_basic_003.phpt
@@ -3,13 +3,13 @@ method_exists() on non-existent class, with __autoload().
 --FILE--
 <?php
 /* Prototype  : proto bool is_subclass_of(object object, string class_name)
- * Description: Returns true if the object has this class as one of its parents 
+ * Description: Returns true if the object has this class as one of its parents
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 spl_autoload_register(function ($name) {
-	echo "In autoload($name)\n"; 
+	echo "In autoload($name)\n";
 });
 
 var_dump(method_exists('UndefC', 'func'));
diff --git a/ext/standard/tests/class_object/method_exists_error_001.phpt b/ext/standard/tests/class_object/method_exists_error_001.phpt
index 929d84a76fc..de1edfe04a7 100644
--- a/ext/standard/tests/class_object/method_exists_error_001.phpt
+++ b/ext/standard/tests/class_object/method_exists_error_001.phpt
@@ -3,9 +3,9 @@ Test method_exists() function : error conditions - wrong number of args
 --FILE--
 <?php
 /* Prototype  : proto bool method_exists(object object, string method)
- * Description: Checks if the class method exists 
+ * Description: Checks if the class method exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing method_exists() : error conditions ***\n";
diff --git a/ext/standard/tests/class_object/method_exists_variation_001.phpt b/ext/standard/tests/class_object/method_exists_variation_001.phpt
index b41a1a11aed..4accebe20af 100644
--- a/ext/standard/tests/class_object/method_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/method_exists_variation_001.phpt
@@ -3,9 +3,9 @@ Test method_exists() function : usage variations  - unexpected type for arg 1
 --FILE--
 <?php
 /* Prototype  : proto bool method_exists(object object, string method)
- * Description: Checks if the class method exists 
+ * Description: Checks if the class method exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 spl_autoload_register(function ($className) {
diff --git a/ext/standard/tests/class_object/method_exists_variation_002.phpt b/ext/standard/tests/class_object/method_exists_variation_002.phpt
index 5c924bdc5a0..ad97d49df7e 100644
--- a/ext/standard/tests/class_object/method_exists_variation_002.phpt
+++ b/ext/standard/tests/class_object/method_exists_variation_002.phpt
@@ -3,9 +3,9 @@ Test method_exists() function : usage variations  - unexpected type for arg 2
 --FILE--
 <?php
 /* Prototype  : proto bool method_exists(object object, string method)
- * Description: Checks if the class method exists 
+ * Description: Checks if the class method exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 spl_autoload_register(function ($className) {
diff --git a/ext/standard/tests/class_object/method_exists_variation_003.phpt b/ext/standard/tests/class_object/method_exists_variation_003.phpt
index debe5a35e97..7357aaf6c03 100644
--- a/ext/standard/tests/class_object/method_exists_variation_003.phpt
+++ b/ext/standard/tests/class_object/method_exists_variation_003.phpt
@@ -3,9 +3,9 @@ Test method_exists() function : variation - Case sensitivity
 --FILE--
 <?php
 /* Prototype  : proto bool method_exists(object object, string method)
- * Description: Checks if the class method exists 
+ * Description: Checks if the class method exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing method_exists() : variation ***\n";
diff --git a/ext/standard/tests/class_object/property_exists_error.phpt b/ext/standard/tests/class_object/property_exists_error.phpt
index e40e08b32aa..e4564cbfa81 100644
--- a/ext/standard/tests/class_object/property_exists_error.phpt
+++ b/ext/standard/tests/class_object/property_exists_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test property_exists() function : error conditions 
+Test property_exists() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool property_exists(mixed object_or_class, string property_name)
- * Description: Checks if the object or class has a property 
+ * Description: Checks if the object or class has a property
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing property_exists() : error conditions ***\n";
diff --git a/ext/standard/tests/class_object/property_exists_variation1.phpt b/ext/standard/tests/class_object/property_exists_variation1.phpt
index 18304406218..430b9dd34a6 100644
--- a/ext/standard/tests/class_object/property_exists_variation1.phpt
+++ b/ext/standard/tests/class_object/property_exists_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test property_exists() function : class auto loading  
+Test property_exists() function : class auto loading
 --FILE--
 <?php
 /* Prototype  : bool property_exists(mixed object_or_class, string property_name)
- * Description: Checks if the object or class has a property 
+ * Description: Checks if the object or class has a property
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing property_exists() : class auto loading ***\n";
diff --git a/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt b/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt
index 6a8e55bda08..818f15695dc 100644
--- a/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt
+++ b/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt
@@ -3,9 +3,9 @@ Test trait_exists() function : usage variations  - case sensitivity
 --FILE--
 <?php
 /* Prototype  : proto bool trait_exists(string traitname [, bool autoload])
- * Description: Checks if the trait exists 
+ * Description: Checks if the trait exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 trait caseSensitivityTest {}
diff --git a/ext/standard/tests/class_object/trait_exists_basic_001.phpt b/ext/standard/tests/class_object/trait_exists_basic_001.phpt
index 6e1d45227da..be530972fa6 100644
--- a/ext/standard/tests/class_object/trait_exists_basic_001.phpt
+++ b/ext/standard/tests/class_object/trait_exists_basic_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test trait_exists() function : basic functionality 
+Test trait_exists() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto bool trait_exists(string traitname [, bool autoload])
- * Description: Checks if the trait exists 
+ * Description: Checks if the trait exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing trait_exists() : basic functionality ***\n";
diff --git a/ext/standard/tests/class_object/trait_exists_error_001.phpt b/ext/standard/tests/class_object/trait_exists_error_001.phpt
index b80f06ed2a1..70d18513dbf 100644
--- a/ext/standard/tests/class_object/trait_exists_error_001.phpt
+++ b/ext/standard/tests/class_object/trait_exists_error_001.phpt
@@ -3,9 +3,9 @@ Test trait_exists() function : error conditions (wrong number of arguments)
 --FILE--
 <?php
 /* Prototype  : proto bool trait_exists(string traitname [, bool autoload])
- * Description: Checks if the trait exists 
+ * Description: Checks if the trait exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /**
diff --git a/ext/standard/tests/class_object/trait_exists_variation_001.phpt b/ext/standard/tests/class_object/trait_exists_variation_001.phpt
index 4fd2b8d5afe..b51126c1ede 100644
--- a/ext/standard/tests/class_object/trait_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/trait_exists_variation_001.phpt
@@ -3,9 +3,9 @@ Test trait_exists() function : usage variations - unexpected types for argument
 --FILE--
 <?php
 /* Prototype  : proto bool trait_exists(string traitname [, bool autoload])
- * Description: Checks if the trait exists 
+ * Description: Checks if the trait exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 spl_autoload_register(function ($traitName) {
diff --git a/ext/standard/tests/class_object/trait_exists_variation_002.phpt b/ext/standard/tests/class_object/trait_exists_variation_002.phpt
index 50f2a0256ff..43e68bfa135 100644
--- a/ext/standard/tests/class_object/trait_exists_variation_002.phpt
+++ b/ext/standard/tests/class_object/trait_exists_variation_002.phpt
@@ -3,9 +3,9 @@ Test trait_exists() function : usage variations  - unexpected types for argument
 --FILE--
 <?php
 /* Prototype  : proto bool trait_exists(string traitname [, bool autoload])
- * Description: Checks if the trait exists 
+ * Description: Checks if the trait exists
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 spl_autoload_register(function ($traitName) {
diff --git a/ext/standard/tests/dir/chdir_basic-win32-mb.phpt b/ext/standard/tests/dir/chdir_basic-win32-mb.phpt
index 8d5b2ff9863..3cd5d71761d 100644
--- a/ext/standard/tests/dir/chdir_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/chdir_basic-win32-mb.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test chdir() function : basic functionality 
+Test chdir() function : basic functionality
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool chdir(string $directory)
- * Description: Change the current directory 
+ * Description: Change the current directory
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/chdir_basic.phpt b/ext/standard/tests/dir/chdir_basic.phpt
index 81d3c7c9d1a..4e189880760 100644
--- a/ext/standard/tests/dir/chdir_basic.phpt
+++ b/ext/standard/tests/dir/chdir_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test chdir() function : basic functionality 
+Test chdir() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool chdir(string $directory)
- * Description: Change the current directory 
+ * Description: Change the current directory
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/chdir_error1.phpt b/ext/standard/tests/dir/chdir_error1.phpt
index 0f57ff5b2a8..794bd5c7570 100644
--- a/ext/standard/tests/dir/chdir_error1.phpt
+++ b/ext/standard/tests/dir/chdir_error1.phpt
@@ -3,7 +3,7 @@ Test chdir() function : error conditions - Incorrect number of arguments
 --FILE--
 <?php
 /* Prototype  : bool chdir(string $directory)
- * Description: Change the current directory 
+ * Description: Change the current directory
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/chdir_error2-win32-mb.phpt b/ext/standard/tests/dir/chdir_error2-win32-mb.phpt
index 2b23c906445..4f6272ce4ff 100644
--- a/ext/standard/tests/dir/chdir_error2-win32-mb.phpt
+++ b/ext/standard/tests/dir/chdir_error2-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool chdir(string $directory)
- * Description: Change the current directory 
+ * Description: Change the current directory
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/chdir_error2.phpt b/ext/standard/tests/dir/chdir_error2.phpt
index a3bbb63e6d6..6c322a2e3aa 100644
--- a/ext/standard/tests/dir/chdir_error2.phpt
+++ b/ext/standard/tests/dir/chdir_error2.phpt
@@ -3,7 +3,7 @@ Test chdir() function : error conditions - Non-existent directory
 --FILE--
 <?php
 /* Prototype  : bool chdir(string $directory)
- * Description: Change the current directory 
+ * Description: Change the current directory
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt b/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt
index 90402f4c494..5b9fa164864 100644
--- a/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt
+++ b/ext/standard/tests/dir/chdir_variation1-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool chdir(string $directory)
- * Description: Change the current directory 
+ * Description: Change the current directory
  * Source code: ext/standard/dir.c
  */
 
@@ -31,11 +31,11 @@ unset ($unset_var);
 // get a class
 class classA {
 	var $dir_path;
-	
+
 	function __construct($dir) {
 		$this->dir_path = $dir;
 	}
-	
+
 	public function __toString() {
 		return "$this->dir_path";
 	}
@@ -74,7 +74,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -84,7 +84,7 @@ $inputs = array(
 /*19*/ "$dir_path",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA($dir_path),
 
diff --git a/ext/standard/tests/dir/chdir_variation1.phpt b/ext/standard/tests/dir/chdir_variation1.phpt
index c4c0431ccc9..f456f1e1a76 100644
--- a/ext/standard/tests/dir/chdir_variation1.phpt
+++ b/ext/standard/tests/dir/chdir_variation1.phpt
@@ -3,7 +3,7 @@ Test chdir() function : usage variations - different data type as $directory arg
 --FILE--
 <?php
 /* Prototype  : bool chdir(string $directory)
- * Description: Change the current directory 
+ * Description: Change the current directory
  * Source code: ext/standard/dir.c
  */
 
@@ -25,11 +25,11 @@ unset ($unset_var);
 // get a class
 class classA {
 	var $dir_path;
-	
+
 	function __construct($dir) {
 		$this->dir_path = $dir;
 	}
-	
+
 	public function __toString() {
 		return "$this->dir_path";
 	}
@@ -68,7 +68,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -78,7 +78,7 @@ $inputs = array(
 /*19*/ "$dir_path",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA($dir_path),
 
diff --git a/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt b/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt
index f28d57ab4f6..0d67b0fbc35 100644
--- a/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/chdir_variation2-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool chdir(string $directory)
- * Description: Change the current directory 
+ * Description: Change the current directory
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/chdir_variation2.phpt b/ext/standard/tests/dir/chdir_variation2.phpt
index 9ca6a977487..097ab56e00f 100644
--- a/ext/standard/tests/dir/chdir_variation2.phpt
+++ b/ext/standard/tests/dir/chdir_variation2.phpt
@@ -3,7 +3,7 @@ Test chdir() function : usage variations - relative paths
 --FILE--
 <?php
 /* Prototype  : bool chdir(string $directory)
- * Description: Change the current directory 
+ * Description: Change the current directory
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/closedir_basic-win32-mb.phpt b/ext/standard/tests/dir/closedir_basic-win32-mb.phpt
index 2602e292ff6..8515756b175 100644
--- a/ext/standard/tests/dir/closedir_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/closedir_basic-win32-mb.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test closedir() function : basic functionality 
+Test closedir() function : basic functionality
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : void closedir([resource $dir_handle])
- * Description: Close directory connection identified by the dir_handle 
+ * Description: Close directory connection identified by the dir_handle
  * Source code: ext/standard/dir.c
  * Alias to functions: close
  */
diff --git a/ext/standard/tests/dir/closedir_basic.phpt b/ext/standard/tests/dir/closedir_basic.phpt
index 49080bb6a2d..2ef1aa7814b 100644
--- a/ext/standard/tests/dir/closedir_basic.phpt
+++ b/ext/standard/tests/dir/closedir_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test closedir() function : basic functionality 
+Test closedir() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : void closedir([resource $dir_handle])
- * Description: Close directory connection identified by the dir_handle 
+ * Description: Close directory connection identified by the dir_handle
  * Source code: ext/standard/dir.c
  * Alias to functions: close
  */
diff --git a/ext/standard/tests/dir/closedir_error-win32-mb.phpt b/ext/standard/tests/dir/closedir_error-win32-mb.phpt
index 04c614e33df..e5ca80b7d25 100644
--- a/ext/standard/tests/dir/closedir_error-win32-mb.phpt
+++ b/ext/standard/tests/dir/closedir_error-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : void closedir([resource $dir_handle])
- * Description: Close directory connection identified by the dir_handle 
+ * Description: Close directory connection identified by the dir_handle
  * Source code: ext/standard/dir.c
  * Alias to functions: close
  */
diff --git a/ext/standard/tests/dir/closedir_error.phpt b/ext/standard/tests/dir/closedir_error.phpt
index c2f7647ff94..b7ec7e3a790 100644
--- a/ext/standard/tests/dir/closedir_error.phpt
+++ b/ext/standard/tests/dir/closedir_error.phpt
@@ -3,7 +3,7 @@ Test closedir() function : error conditions - Pass incorrect number of arguments
 --FILE--
 <?php
 /* Prototype  : void closedir([resource $dir_handle])
- * Description: Close directory connection identified by the dir_handle 
+ * Description: Close directory connection identified by the dir_handle
  * Source code: ext/standard/dir.c
  * Alias to functions: close
  */
diff --git a/ext/standard/tests/dir/closedir_variation1.phpt b/ext/standard/tests/dir/closedir_variation1.phpt
index bf8dbbff9c7..09f7b95c452 100644
--- a/ext/standard/tests/dir/closedir_variation1.phpt
+++ b/ext/standard/tests/dir/closedir_variation1.phpt
@@ -3,7 +3,7 @@ Test closedir() function : usage variations - different data types as $dir_handl
 --FILE--
 <?php
 /* Prototype  : void closedir([resource $dir_handle])
- * Description: Close directory connection identified by the dir_handle 
+ * Description: Close directory connection identified by the dir_handle
  * Source code: ext/standard/dir.c
  * Alias to functions: close
  */
@@ -56,7 +56,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt b/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt
index 26b4a5b8b70..f46a99b8727 100644
--- a/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/closedir_variation2-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : void closedir([resource $dir_handle])
- * Description: Close directory connection identified by the dir_handle 
+ * Description: Close directory connection identified by the dir_handle
  * Source code: ext/standard/dir.c
  * Alias to functions: close
  */
diff --git a/ext/standard/tests/dir/closedir_variation2.phpt b/ext/standard/tests/dir/closedir_variation2.phpt
index 2437868d629..303d47c84ec 100644
--- a/ext/standard/tests/dir/closedir_variation2.phpt
+++ b/ext/standard/tests/dir/closedir_variation2.phpt
@@ -3,7 +3,7 @@ Test closedir() function : usage variations - close directory handle twice
 --FILE--
 <?php
 /* Prototype  : void closedir([resource $dir_handle])
- * Description: Close directory connection identified by the dir_handle 
+ * Description: Close directory connection identified by the dir_handle
  * Source code: ext/standard/dir.c
  * Alias to functions: close
  */
diff --git a/ext/standard/tests/dir/closedir_variation3.phpt b/ext/standard/tests/dir/closedir_variation3.phpt
index b9b5e67e7a4..7d7fdcbf0e5 100644
--- a/ext/standard/tests/dir/closedir_variation3.phpt
+++ b/ext/standard/tests/dir/closedir_variation3.phpt
@@ -3,7 +3,7 @@ Test closedir() function : usage variations - close a file pointer
 --FILE--
 <?php
 /* Prototype  : void closedir([resource $dir_handle])
- * Description: Close directory connection identified by the dir_handle 
+ * Description: Close directory connection identified by the dir_handle
  * Source code: ext/standard/dir.c
  * Alias to functions: close
  */
diff --git a/ext/standard/tests/dir/dir_basic-win32-mb.phpt b/ext/standard/tests/dir/dir_basic-win32-mb.phpt
index d562c0b7e30..d6c8ebca8f0 100644
--- a/ext/standard/tests/dir/dir_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/dir_basic-win32-mb.phpt
@@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 ?>
 --FILE--
 <?php
-/* 
+/*
  * Prototype  : object dir(string $directory[, resource $context])
  * Description: Directory class with properties, handle and class and methods read, rewind and close
  * Source code: ext/standard/dir.c
diff --git a/ext/standard/tests/dir/dir_basic.phpt b/ext/standard/tests/dir/dir_basic.phpt
index da364b9b60b..68ac552a6f0 100644
--- a/ext/standard/tests/dir/dir_basic.phpt
+++ b/ext/standard/tests/dir/dir_basic.phpt
@@ -2,7 +2,7 @@
 Test dir() function : basic functionality
 --FILE--
 <?php
-/* 
+/*
  * Prototype  : object dir(string $directory[, resource $context])
  * Description: Directory class with properties, handle and class and methods read, rewind and close
  * Source code: ext/standard/dir.c
diff --git a/ext/standard/tests/dir/dir_error.phpt b/ext/standard/tests/dir/dir_error.phpt
index f2ef25cc87c..5bdf181b507 100644
--- a/ext/standard/tests/dir/dir_error.phpt
+++ b/ext/standard/tests/dir/dir_error.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Test dir() function : error conditions 
+Test dir() function : error conditions
 --FILE--
 <?php
-/* 
+/*
  * Prototype  : object dir(string $directory[, resource $context])
  * Description: Directory class with properties, handle and class and methods read, rewind and close
  * Source code: ext/standard/dir.c
diff --git a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
index a2d482f43ea..1fd6e61693e 100644
--- a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt
@@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 ?>
 --FILE--
 <?php
-/* 
+/*
  * Prototype  : object dir(string $directory[, resource $context])
  * Description: Directory class with properties, handle and class and methods read, rewind and close
  * Source code: ext/standard/dir.c
diff --git a/ext/standard/tests/dir/dir_variation2.phpt b/ext/standard/tests/dir/dir_variation2.phpt
index 24f429f1875..940dbcff37c 100644
--- a/ext/standard/tests/dir/dir_variation2.phpt
+++ b/ext/standard/tests/dir/dir_variation2.phpt
@@ -2,7 +2,7 @@
 Test dir() function : usage variations - unexpected value for 'context' argument
 --FILE--
 <?php
-/* 
+/*
  * Prototype  : object dir(string $directory[, resource $context])
  * Description: Directory class with properties, handle and class and methods read, rewind and close
  * Source code: ext/standard/dir.c
diff --git a/ext/standard/tests/dir/dir_variation3.phpt b/ext/standard/tests/dir/dir_variation3.phpt
index f8d325874ea..91dc5047131 100644
--- a/ext/standard/tests/dir/dir_variation3.phpt
+++ b/ext/standard/tests/dir/dir_variation3.phpt
@@ -17,7 +17,7 @@ unlink($filename);
 ?>
 --FILE--
 <?php
-/* 
+/*
  * Prototype  : object dir(string $directory[, resource $context])
  * Description: Directory class with properties, handle and class and methods read, rewind and close
  * Source code: ext/standard/dir.c
@@ -57,7 +57,7 @@ $permission_values = array(
 for($count = 0; $count < count($permission_values); $count++) {
   echo "\n-- Iteration ".($count + 1)." --\n";
 
-  // try to remove the dir if exists  & create 
+  // try to remove the dir if exists  & create
   $file_path = dirname(__FILE__);
   $dir_path = $file_path."/dir_variation3";
   @chmod ($dir_path, 0777); // change dir permission to allow all operation
@@ -71,7 +71,7 @@ for($count = 0; $count < count($permission_values); $count++) {
 
   // try to get dir handle
   $d = dir($dir_path);
-  var_dump($d);   // dump the handle 
+  var_dump($d);   // dump the handle
 
   // try read directory, expected : false
   echo "-- reading contents --\n";
diff --git a/ext/standard/tests/dir/dir_variation4-win32-mb.phpt b/ext/standard/tests/dir/dir_variation4-win32-mb.phpt
index 156b8365622..71fe0b29790 100644
--- a/ext/standard/tests/dir/dir_variation4-win32-mb.phpt
+++ b/ext/standard/tests/dir/dir_variation4-win32-mb.phpt
@@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 ?>
 --FILE--
 <?php
-/* 
+/*
  * Prototype  : object dir(string $directory[, resource $context])
  * Description: Directory class with properties, handle and class and methods read, rewind and close
  * Source code: ext/standard/dir.c
diff --git a/ext/standard/tests/dir/dir_variation4.phpt b/ext/standard/tests/dir/dir_variation4.phpt
index 62b10b2a86d..ae574137541 100644
--- a/ext/standard/tests/dir/dir_variation4.phpt
+++ b/ext/standard/tests/dir/dir_variation4.phpt
@@ -2,7 +2,7 @@
 Test dir() function : usage variations - operate on previously opened directory
 --FILE--
 <?php
-/* 
+/*
  * Prototype  : object dir(string $directory[, resource $context])
  * Description: Directory class with properties, handle and class and methods read, rewind and close
  * Source code: ext/standard/dir.c
diff --git a/ext/standard/tests/dir/dir_variation5.phpt b/ext/standard/tests/dir/dir_variation5.phpt
index c7450eafc0e..ea040bed8a0 100644
--- a/ext/standard/tests/dir/dir_variation5.phpt
+++ b/ext/standard/tests/dir/dir_variation5.phpt
@@ -8,14 +8,14 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 ?>
 --FILE--
 <?php
-/* 
+/*
  * Prototype  : object dir(string $directory[, resource $context])
  * Description: Directory class with properties, handle and class and methods read, rewind and close
  * Source code: ext/standard/dir.c
  */
 
 /*
- * Passing a file as argument to dir() function instead of a directory 
+ * Passing a file as argument to dir() function instead of a directory
  * and checking if proper warning message is generated.
  */
 
diff --git a/ext/standard/tests/dir/dir_variation6.phpt b/ext/standard/tests/dir/dir_variation6.phpt
index 71cbf1fa17e..3fdfc789e26 100644
--- a/ext/standard/tests/dir/dir_variation6.phpt
+++ b/ext/standard/tests/dir/dir_variation6.phpt
@@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 ?>
 --FILE--
 <?php
-/* 
+/*
  * Prototype  : object dir(string $directory[, resource $context])
  * Description: Directory class with properties, handle and class and methods read, rewind and close
  * Source code: ext/standard/dir.c
diff --git a/ext/standard/tests/dir/dir_variation7.phpt b/ext/standard/tests/dir/dir_variation7.phpt
index ca168f90aaa..ebf4a9ac241 100644
--- a/ext/standard/tests/dir/dir_variation7.phpt
+++ b/ext/standard/tests/dir/dir_variation7.phpt
@@ -17,13 +17,13 @@ unlink($filename);
 ?>
 --FILE--
 <?php
-/* 
+/*
  * Prototype  : object dir(string $directory[, resource $context])
  * Description: Directory class with properties, handle and class and methods read, rewind and close
  * Source code: ext/standard/dir.c
  */
 
-/* 
+/*
  * remove the execute permission from the parent dir and test dir() on child dir
  *   1) remove write & execute permission from the 1st parent and test dir()
  *   2) remove execute permission from 2nd parent and test dir()
diff --git a/ext/standard/tests/dir/dir_variation8.phpt b/ext/standard/tests/dir/dir_variation8.phpt
index 5ecf4499230..4e7bd13f2f9 100644
--- a/ext/standard/tests/dir/dir_variation8.phpt
+++ b/ext/standard/tests/dir/dir_variation8.phpt
@@ -8,14 +8,14 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 ?>
 --FILE--
 <?php
-/* 
+/*
  * Prototype  : object dir(string $directory[, resource $context])
  * Description: Directory class with properties, handle and class and methods read, rewind and close
  * Source code: ext/standard/dir.c
  */
 
-/* 
- * Create more than one temporary directory & subdirectory and check if dir() function can open 
+/*
+ * Create more than one temporary directory & subdirectory and check if dir() function can open
  * those directories when wildcard characters are used to refer to them.
  */
 
@@ -31,7 +31,7 @@ $sub_dir_path = $dir_path."/sub_dir1";
 
 /* with different wildcard characters */
 
-echo "-- wildcard = '*' --\n"; 
+echo "-- wildcard = '*' --\n";
 var_dump( dir($file_path."/dir_var*") );
 var_dump( dir($file_path."/*") );
 
diff --git a/ext/standard/tests/dir/dir_variation9.phpt b/ext/standard/tests/dir/dir_variation9.phpt
index 458d0b896f6..3756ffd42d1 100644
--- a/ext/standard/tests/dir/dir_variation9.phpt
+++ b/ext/standard/tests/dir/dir_variation9.phpt
@@ -8,13 +8,13 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 ?>
 --FILE--
 <?php
-/* 
+/*
  * Prototype  : object dir(string $directory[, resource $context])
  * Description: Directory class with properties, handle and class and methods read, rewind and close
  * Source code: ext/standard/dir.c
  */
 
-/* 
+/*
  * Checking the behavior of dir() function by passing directories which
  * have valid and invalid relative path.
  */
diff --git a/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt b/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt
index 7ebbaa470fb..f3d2a6d1d47 100644
--- a/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/getcwd_basic-win32-mb.phpt
@@ -9,8 +9,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : mixed getcwd(void)
- * Description: Gets the current directory 
- * Source code: ext/standard/dir.c 
+ * Description: Gets the current directory
+ * Source code: ext/standard/dir.c
  */
 
 /*
diff --git a/ext/standard/tests/dir/getcwd_basic.phpt b/ext/standard/tests/dir/getcwd_basic.phpt
index ef720d09596..f09eb7165ab 100644
--- a/ext/standard/tests/dir/getcwd_basic.phpt
+++ b/ext/standard/tests/dir/getcwd_basic.phpt
@@ -3,8 +3,8 @@ Test getcwd() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : mixed getcwd(void)
- * Description: Gets the current directory 
- * Source code: ext/standard/dir.c 
+ * Description: Gets the current directory
+ * Source code: ext/standard/dir.c
  */
 
 /*
diff --git a/ext/standard/tests/dir/getcwd_error.phpt b/ext/standard/tests/dir/getcwd_error.phpt
index 153f3036779..1fcfa47a9d9 100644
--- a/ext/standard/tests/dir/getcwd_error.phpt
+++ b/ext/standard/tests/dir/getcwd_error.phpt
@@ -3,7 +3,7 @@ Test getcwd() function : error conditions - Incorrect number of arguments
 --FILE--
 <?php
 /* Prototype  : mixed getcwd(void)
- * Description: Gets the current directory 
+ * Description: Gets the current directory
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/opendir_basic-win32-mb.phpt b/ext/standard/tests/dir/opendir_basic-win32-mb.phpt
index f9d06bfdb7d..ab332d05e21 100644
--- a/ext/standard/tests/dir/opendir_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_basic-win32-mb.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test opendir() function : basic functionality 
+Test opendir() function : basic functionality
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/opendir_basic.phpt b/ext/standard/tests/dir/opendir_basic.phpt
index 17ada17ea67..373d25c470c 100644
--- a/ext/standard/tests/dir/opendir_basic.phpt
+++ b/ext/standard/tests/dir/opendir_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test opendir() function : basic functionality 
+Test opendir() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/opendir_error1-win32-mb.phpt b/ext/standard/tests/dir/opendir_error1-win32-mb.phpt
index e363de48069..59ab389e10b 100644
--- a/ext/standard/tests/dir/opendir_error1-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_error1-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/opendir_error1.phpt b/ext/standard/tests/dir/opendir_error1.phpt
index 92b8eee1bd7..ccfed4bf059 100644
--- a/ext/standard/tests/dir/opendir_error1.phpt
+++ b/ext/standard/tests/dir/opendir_error1.phpt
@@ -3,7 +3,7 @@ Test opendir() function : error conditions - Incorrect number of args
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/opendir_error2.phpt b/ext/standard/tests/dir/opendir_error2.phpt
index 1c724097b09..9156585938c 100644
--- a/ext/standard/tests/dir/opendir_error2.phpt
+++ b/ext/standard/tests/dir/opendir_error2.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
index 3d54638e0df..0ba47020818 100644
--- a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
@@ -33,7 +33,7 @@ unset ($unset_var);
 // get a class
 class classA
 {
-	public function __toString() 
+	public function __toString()
 	{
 		return "Class A object";
 	}
@@ -72,7 +72,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -82,7 +82,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/dir/opendir_variation2.phpt b/ext/standard/tests/dir/opendir_variation2.phpt
index 7728aa37579..7c4822a2c4a 100644
--- a/ext/standard/tests/dir/opendir_variation2.phpt
+++ b/ext/standard/tests/dir/opendir_variation2.phpt
@@ -3,7 +3,7 @@ Test opendir() function : usage variations - different data types as $context ar
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
@@ -27,7 +27,7 @@ unset ($unset_var);
 // get a class
 class classA
 {
-	public function __toString() 
+	public function __toString()
 	{
 		return "Class A object";
 	}
@@ -66,7 +66,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -76,7 +76,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt
index 74d0a6b9828..6ffd12aaff1 100644
--- a/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_variation3-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/opendir_variation3.phpt b/ext/standard/tests/dir/opendir_variation3.phpt
index 3de0dd3701a..1e9a62f3941 100644
--- a/ext/standard/tests/dir/opendir_variation3.phpt
+++ b/ext/standard/tests/dir/opendir_variation3.phpt
@@ -3,7 +3,7 @@ Test opendir() function : usage variations - open a directory twice
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt
index 901b13c4a8b..d77b1156c30 100644
--- a/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_variation4-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/opendir_variation4.phpt b/ext/standard/tests/dir/opendir_variation4.phpt
index b20641740b9..3a42c8d9c1a 100644
--- a/ext/standard/tests/dir/opendir_variation4.phpt
+++ b/ext/standard/tests/dir/opendir_variation4.phpt
@@ -3,7 +3,7 @@ Test opendir() function : usage variations - different relative paths
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/opendir_variation5.phpt b/ext/standard/tests/dir/opendir_variation5.phpt
index f9bb38c68ec..b5fc83caba0 100644
--- a/ext/standard/tests/dir/opendir_variation5.phpt
+++ b/ext/standard/tests/dir/opendir_variation5.phpt
@@ -18,7 +18,7 @@ unlink($filename);
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/opendir_variation6-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation6-win32-mb.phpt
index f54a2ad4ae0..caca6a05046 100644
--- a/ext/standard/tests/dir/opendir_variation6-win32-mb.phpt
+++ b/ext/standard/tests/dir/opendir_variation6-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
@@ -28,7 +28,7 @@ mkdir($sub_dir_path);
 
 // with different wildcard characters
 
-echo "\n-- Wildcard = '*' --\n"; 
+echo "\n-- Wildcard = '*' --\n";
 var_dump( opendir($file_path . "/opendir_var*") );
 var_dump( opendir($file_path . "/*") );
 
diff --git a/ext/standard/tests/dir/opendir_variation6-win32.phpt b/ext/standard/tests/dir/opendir_variation6-win32.phpt
index f54a2ad4ae0..caca6a05046 100644
--- a/ext/standard/tests/dir/opendir_variation6-win32.phpt
+++ b/ext/standard/tests/dir/opendir_variation6-win32.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
@@ -28,7 +28,7 @@ mkdir($sub_dir_path);
 
 // with different wildcard characters
 
-echo "\n-- Wildcard = '*' --\n"; 
+echo "\n-- Wildcard = '*' --\n";
 var_dump( opendir($file_path . "/opendir_var*") );
 var_dump( opendir($file_path . "/*") );
 
diff --git a/ext/standard/tests/dir/opendir_variation6.phpt b/ext/standard/tests/dir/opendir_variation6.phpt
index f3fc0bd6df9..e16235ba872 100644
--- a/ext/standard/tests/dir/opendir_variation6.phpt
+++ b/ext/standard/tests/dir/opendir_variation6.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
@@ -28,7 +28,7 @@ mkdir($sub_dir_path);
 
 // with different wildcard characters
 
-echo "\n-- Wildcard = '*' --\n"; 
+echo "\n-- Wildcard = '*' --\n";
 var_dump( opendir($file_path . "/opendir_var*") );
 var_dump( opendir($file_path . "/*") );
 
diff --git a/ext/standard/tests/dir/opendir_variation7.phpt b/ext/standard/tests/dir/opendir_variation7.phpt
index 2ad41b1d310..a75859b9fc6 100644
--- a/ext/standard/tests/dir/opendir_variation7.phpt
+++ b/ext/standard/tests/dir/opendir_variation7.phpt
@@ -18,7 +18,7 @@ unlink($filename);
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
- * Description: Open a directory and return a dir_handle 
+ * Description: Open a directory and return a dir_handle
  * Source code: ext/standard/dir.c
  */
 
@@ -68,7 +68,7 @@ foreach ($permission_values as $perm) {
 	var_dump( chmod($dir_path, $perm) );
 
 	var_dump($dh = opendir($dir_path));
-	
+
 	if (is_resource($dh)) {
 		closedir($dh);
 	}
diff --git a/ext/standard/tests/dir/readdir_basic-win32-mb.phpt b/ext/standard/tests/dir/readdir_basic-win32-mb.phpt
index 90cb81a27d7..f9a7db632dd 100644
--- a/ext/standard/tests/dir/readdir_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/readdir_basic-win32-mb.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test readdir() function : basic functionality 
+Test readdir() function : basic functionality
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.C
  */
 
diff --git a/ext/standard/tests/dir/readdir_basic.phpt b/ext/standard/tests/dir/readdir_basic.phpt
index 572a9a07993..c6d1d79d792 100644
--- a/ext/standard/tests/dir/readdir_basic.phpt
+++ b/ext/standard/tests/dir/readdir_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test readdir() function : basic functionality 
+Test readdir() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.C
  */
 
diff --git a/ext/standard/tests/dir/readdir_error-win32-mb.phpt b/ext/standard/tests/dir/readdir_error-win32-mb.phpt
index 13889872596..21eaad4b067 100644
--- a/ext/standard/tests/dir/readdir_error-win32-mb.phpt
+++ b/ext/standard/tests/dir/readdir_error-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.c
  */
 
@@ -38,7 +38,7 @@ closedir($dir_handle);
 <?php
 $path = dirname(__FILE__) . "/��ガラスを食�られ��readdir_error";
 rmdir($path);
-?> 
+?>
 --EXPECTF--
 *** Testing readdir() : error conditions ***
 
diff --git a/ext/standard/tests/dir/readdir_error.phpt b/ext/standard/tests/dir/readdir_error.phpt
index 23ba3dfa63c..24fbad37a9e 100644
--- a/ext/standard/tests/dir/readdir_error.phpt
+++ b/ext/standard/tests/dir/readdir_error.phpt
@@ -3,7 +3,7 @@ Test readdir() function : error conditions - Incorrect number of args
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.c
  */
 
@@ -32,7 +32,7 @@ closedir($dir_handle);
 <?php
 $path = dirname(__FILE__) . "/readdir_error";
 rmdir($path);
-?> 
+?>
 --EXPECTF--
 *** Testing readdir() : error conditions ***
 
diff --git a/ext/standard/tests/dir/readdir_variation1.phpt b/ext/standard/tests/dir/readdir_variation1.phpt
index 2815e8d26ff..d392e67114b 100644
--- a/ext/standard/tests/dir/readdir_variation1.phpt
+++ b/ext/standard/tests/dir/readdir_variation1.phpt
@@ -3,7 +3,7 @@ Test readdir() function : usage variations - different data types as $dir_handle
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.c
  */
 
@@ -55,7 +55,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -65,7 +65,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt
index bde6d6f1c80..a9d5d64fef1 100644
--- a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/readdir_variation2.phpt b/ext/standard/tests/dir/readdir_variation2.phpt
index c689ed90eee..f35792d8a39 100644
--- a/ext/standard/tests/dir/readdir_variation2.phpt
+++ b/ext/standard/tests/dir/readdir_variation2.phpt
@@ -3,7 +3,7 @@ Test readdir() function : usage variations - empty directories
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt
index a00e83769fd..f38afb6df90 100644
--- a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt
+++ b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test readdir() function : usage variations - sub-directories 
+Test readdir() function : usage variations - sub-directories
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.c
  */
 
@@ -34,7 +34,7 @@ create_files($path_sub, 2);
 
 $dir_handle = opendir($path_top);
 while(FALSE !== ($file = readdir($dir_handle))) {
-	
+
 	// different OS order files differently so will
 	// store file names into an array so can use sorted in expected output
 	$contents[] = $file;
diff --git a/ext/standard/tests/dir/readdir_variation3.phpt b/ext/standard/tests/dir/readdir_variation3.phpt
index 4e73e741ece..b304a8cf7c9 100644
--- a/ext/standard/tests/dir/readdir_variation3.phpt
+++ b/ext/standard/tests/dir/readdir_variation3.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test readdir() function : usage variations - sub-directories 
+Test readdir() function : usage variations - sub-directories
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.c
  */
 
@@ -28,7 +28,7 @@ create_files($path_sub, 2);
 
 $dir_handle = opendir($path_top);
 while(FALSE !== ($file = readdir($dir_handle))) {
-	
+
 	// different OS order files differently so will
 	// store file names into an array so can use sorted in expected output
 	$contents[] = $file;
diff --git a/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt
index 6540d8e571f..1c766a51d53 100644
--- a/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt
+++ b/ext/standard/tests/dir/readdir_variation4-win32-mb.phpt
@@ -9,12 +9,12 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.c
  */
 
 /*
- * Pass a directory handle pointing to a directory that contains 
+ * Pass a directory handle pointing to a directory that contains
  * files with different file names to test how readdir() reads them
  */
 
@@ -42,7 +42,7 @@ $inputs = array(
        12.3456789000e10,
        12.3456789000E-10,
        .5,
-       
+
        // empty data
 /*10*/ "",
        array(),
@@ -66,11 +66,11 @@ foreach($inputs as $key => $input) {
 echo "\n-- Call to readdir() --\n";
 $dir_handle = opendir($dir_path);
 while(FALSE !== ($file = readdir($dir_handle))){
-	
+
 	// different OS order files differently so will
 	// store file names into an array so can use sorted in expected output
 	$contents[] = $file;
-	
+
 	// remove files while going through directory
 	@unlink($dir_path . $file);
 }
diff --git a/ext/standard/tests/dir/readdir_variation4.phpt b/ext/standard/tests/dir/readdir_variation4.phpt
index 9b04a986a67..acbb8f32abb 100644
--- a/ext/standard/tests/dir/readdir_variation4.phpt
+++ b/ext/standard/tests/dir/readdir_variation4.phpt
@@ -3,12 +3,12 @@ Test readdir() function : usage variations - different file names
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.c
  */
 
 /*
- * Pass a directory handle pointing to a directory that contains 
+ * Pass a directory handle pointing to a directory that contains
  * files with different file names to test how readdir() reads them
  */
 
@@ -36,7 +36,7 @@ $inputs = array(
        12.3456789000e10,
        12.3456789000E-10,
        .5,
-       
+
        // empty data
 /*10*/ "",
        array(),
@@ -60,11 +60,11 @@ foreach($inputs as $key => $input) {
 echo "\n-- Call to readdir() --\n";
 $dir_handle = opendir($dir_path);
 while(FALSE !== ($file = readdir($dir_handle))){
-	
+
 	// different OS order files differently so will
 	// store file names into an array so can use sorted in expected output
 	$contents[] = $file;
-	
+
 	// remove files while going through directory
 	@unlink($dir_path . $file);
 }
diff --git a/ext/standard/tests/dir/readdir_variation5.phpt b/ext/standard/tests/dir/readdir_variation5.phpt
index 8c12f13dfba..0ed40964a6a 100644
--- a/ext/standard/tests/dir/readdir_variation5.phpt
+++ b/ext/standard/tests/dir/readdir_variation5.phpt
@@ -18,7 +18,7 @@ unlink($filename);
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.c
  */
 
@@ -55,7 +55,7 @@ $permission_values = array(
 $iterator = 1;
 foreach($permission_values as $perm) {
 	echo "\n-- Iteration $iterator --\n";
-	
+
 	if (is_dir($dir_path)) {
 		chmod ($dir_path, 0777); // change dir permission to allow all operation
 		rmdir ($dir_path);
diff --git a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt
index db5de283027..8201e21f7ac 100644
--- a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt
+++ b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/readdir_variation6.phpt b/ext/standard/tests/dir/readdir_variation6.phpt
index eec673e73c8..f1692e3bc20 100644
--- a/ext/standard/tests/dir/readdir_variation6.phpt
+++ b/ext/standard/tests/dir/readdir_variation6.phpt
@@ -3,7 +3,7 @@ Test readdir() function : usage variations - operate on previously opened direct
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/readdir_variation7.phpt b/ext/standard/tests/dir/readdir_variation7.phpt
index bff87ced0db..2cd23b8bfce 100644
--- a/ext/standard/tests/dir/readdir_variation7.phpt
+++ b/ext/standard/tests/dir/readdir_variation7.phpt
@@ -3,7 +3,7 @@ Test readdir() function : usage variations - use file pointers
 --FILE--
 <?php
 /* Prototype  : string readdir([resource $dir_handle])
- * Description: Read directory entry from dir_handle 
+ * Description: Read directory entry from dir_handle
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt
index bec721d3c56..aaf01aab098 100644
--- a/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/rewinddir_basic-win32-mb.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test rewinddir() function : basic functionality 
+Test rewinddir() function : basic functionality
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : void rewinddir([resource $dir_handle])
- * Description: Rewind dir_handle back to the start 
+ * Description: Rewind dir_handle back to the start
  * Source code: ext/standard/dir.c
  * Alias to functions: rewind
  */
diff --git a/ext/standard/tests/dir/rewinddir_basic.phpt b/ext/standard/tests/dir/rewinddir_basic.phpt
index 2d1f783f575..3571808f85f 100644
--- a/ext/standard/tests/dir/rewinddir_basic.phpt
+++ b/ext/standard/tests/dir/rewinddir_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test rewinddir() function : basic functionality 
+Test rewinddir() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : void rewinddir([resource $dir_handle])
- * Description: Rewind dir_handle back to the start 
+ * Description: Rewind dir_handle back to the start
  * Source code: ext/standard/dir.c
  * Alias to functions: rewind
  */
diff --git a/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt
index bc107704a08..9fa264ba4c8 100644
--- a/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt
+++ b/ext/standard/tests/dir/rewinddir_error-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : void rewinddir([resource $dir_handle])
- * Description: Rewind dir_handle back to the start 
+ * Description: Rewind dir_handle back to the start
  * Source code: ext/standard/dir.c
  * Alias to functions: rewind
  */
diff --git a/ext/standard/tests/dir/rewinddir_error.phpt b/ext/standard/tests/dir/rewinddir_error.phpt
index b3bb02bca39..2019c4a457b 100644
--- a/ext/standard/tests/dir/rewinddir_error.phpt
+++ b/ext/standard/tests/dir/rewinddir_error.phpt
@@ -3,7 +3,7 @@ Test rewinddir() function : error conditions - incorrect number of args
 --FILE--
 <?php
 /* Prototype  : void rewinddir([resource $dir_handle])
- * Description: Rewind dir_handle back to the start 
+ * Description: Rewind dir_handle back to the start
  * Source code: ext/standard/dir.c
  * Alias to functions: rewind
  */
diff --git a/ext/standard/tests/dir/rewinddir_variation1.phpt b/ext/standard/tests/dir/rewinddir_variation1.phpt
index b4f52bbab1c..41c11a2ae77 100644
--- a/ext/standard/tests/dir/rewinddir_variation1.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation1.phpt
@@ -3,7 +3,7 @@ Test rewinddir() function : usage variations - different data types as $dir_hand
 --FILE--
 <?php
 /* Prototype  : void rewinddir([resource $dir_handle])
- * Description: Rewind dir_handle back to the start 
+ * Description: Rewind dir_handle back to the start
  * Source code: ext/standard/dir.c
  * Alias to functions: rewind
  */
@@ -56,7 +56,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt b/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt
index a3f5e8ecc9b..b8f36d7eb22 100644
--- a/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation2-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : void rewinddir([resource $dir_handle])
- * Description: Rewind dir_handle back to the start 
+ * Description: Rewind dir_handle back to the start
  * Source code: ext/standard/dir.c
  * Alias to functions: rewind
  */
diff --git a/ext/standard/tests/dir/rewinddir_variation2.phpt b/ext/standard/tests/dir/rewinddir_variation2.phpt
index 6b06a56d950..aa186412921 100644
--- a/ext/standard/tests/dir/rewinddir_variation2.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation2.phpt
@@ -3,7 +3,7 @@ Test rewinddir() function : usage variations - operate on a closed directory
 --FILE--
 <?php
 /* Prototype  : void rewinddir([resource $dir_handle])
- * Description: Rewind dir_handle back to the start 
+ * Description: Rewind dir_handle back to the start
  * Source code: ext/standard/dir.c
  * Alias to functions: rewind
  */
diff --git a/ext/standard/tests/dir/rewinddir_variation3.phpt b/ext/standard/tests/dir/rewinddir_variation3.phpt
index 2a2af89e630..a1ec7f80d42 100644
--- a/ext/standard/tests/dir/rewinddir_variation3.phpt
+++ b/ext/standard/tests/dir/rewinddir_variation3.phpt
@@ -3,7 +3,7 @@ Test rewinddir() function : usage variations - file pointers
 --FILE--
 <?php
 /* Prototype  : void rewinddir([resource $dir_handle])
- * Description: Rewind dir_handle back to the start 
+ * Description: Rewind dir_handle back to the start
  * Source code: ext/standard/dir.c
  * Alias to functions: rewind
  */
diff --git a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt
index a089a0afa3d..8c81f3d45bd 100644
--- a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test scandir() function : basic functionality 
+Test scandir() function : basic functionality
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/scandir_basic.phpt b/ext/standard/tests/dir/scandir_basic.phpt
index 7a044da5291..75252dd85fb 100644
--- a/ext/standard/tests/dir/scandir_basic.phpt
+++ b/ext/standard/tests/dir/scandir_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test scandir() function : basic functionality 
+Test scandir() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/scandir_error1-win32-mb.phpt b/ext/standard/tests/dir/scandir_error1-win32-mb.phpt
index 6c1ce72a445..dcb15d46a01 100644
--- a/ext/standard/tests/dir/scandir_error1-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_error1-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/scandir_error1.phpt b/ext/standard/tests/dir/scandir_error1.phpt
index 7fbffba0cc8..f603b696c93 100644
--- a/ext/standard/tests/dir/scandir_error1.phpt
+++ b/ext/standard/tests/dir/scandir_error1.phpt
@@ -3,7 +3,7 @@ Test scandir() function : error conditions - Incorrect number of args
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/scandir_error2.phpt b/ext/standard/tests/dir/scandir_error2.phpt
index b5bfc28c8ef..2044471c66c 100644
--- a/ext/standard/tests/dir/scandir_error2.phpt
+++ b/ext/standard/tests/dir/scandir_error2.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/scandir_variation1.phpt b/ext/standard/tests/dir/scandir_variation1.phpt
index ccd5bb967a4..6b664a2d2e8 100644
--- a/ext/standard/tests/dir/scandir_variation1.phpt
+++ b/ext/standard/tests/dir/scandir_variation1.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
@@ -64,7 +64,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -74,7 +74,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt
index b031a91505b..b24c2ce5508 100644
--- a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/scandir_variation10.phpt b/ext/standard/tests/dir/scandir_variation10.phpt
index 412836b2baa..b182e9e9921 100644
--- a/ext/standard/tests/dir/scandir_variation10.phpt
+++ b/ext/standard/tests/dir/scandir_variation10.phpt
@@ -3,7 +3,7 @@ Test scandir() function : usage variations - different sorting constants
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/scandir_variation2-mb.phpt b/ext/standard/tests/dir/scandir_variation2-mb.phpt
index 9e9df978024..fd22c6ccc57 100644
--- a/ext/standard/tests/dir/scandir_variation2-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation2-mb.phpt
@@ -5,7 +5,7 @@ Test scandir() function : usage variations - diff data types as $sorting_order a
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
@@ -64,7 +64,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -74,7 +74,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/dir/scandir_variation2.phpt b/ext/standard/tests/dir/scandir_variation2.phpt
index bed9512e777..bb4bbccbb2d 100644
--- a/ext/standard/tests/dir/scandir_variation2.phpt
+++ b/ext/standard/tests/dir/scandir_variation2.phpt
@@ -5,7 +5,7 @@ Test scandir() function : usage variations - diff data types as $sorting_order a
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
@@ -64,7 +64,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -74,7 +74,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
index c2b2ed5a179..64bc90c9e7f 100644
--- a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
@@ -69,7 +69,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -79,7 +79,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/dir/scandir_variation3.phpt b/ext/standard/tests/dir/scandir_variation3.phpt
index 5be4466bfcf..1bad23871f7 100644
--- a/ext/standard/tests/dir/scandir_variation3.phpt
+++ b/ext/standard/tests/dir/scandir_variation3.phpt
@@ -3,7 +3,7 @@ Test scandir() function : usage variations - diff data types as $context arg
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
@@ -63,7 +63,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -73,7 +73,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt
index 4c85dd75cf6..b5b33e79236 100644
--- a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/scandir_variation4.phpt b/ext/standard/tests/dir/scandir_variation4.phpt
index f756cf1ee6f..dd6415841a0 100644
--- a/ext/standard/tests/dir/scandir_variation4.phpt
+++ b/ext/standard/tests/dir/scandir_variation4.phpt
@@ -3,7 +3,7 @@ Test scandir() function : usage variations - different relative paths
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/scandir_variation5.phpt b/ext/standard/tests/dir/scandir_variation5.phpt
index d6d3c79e40a..a17e8a5d357 100644
--- a/ext/standard/tests/dir/scandir_variation5.phpt
+++ b/ext/standard/tests/dir/scandir_variation5.phpt
@@ -18,7 +18,7 @@ unlink($filename);
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
@@ -30,7 +30,7 @@ unlink($filename);
 
 echo "*** Testing scandir() : usage variations ***\n";
 
-/* 
+/*
  * create the temporary directory :
  * scandir_variation5  ( parent )
  *  |-> sub_dir     ( sub parent )
diff --git a/ext/standard/tests/dir/scandir_variation6.phpt b/ext/standard/tests/dir/scandir_variation6.phpt
index 754c6152908..c4467d15363 100644
--- a/ext/standard/tests/dir/scandir_variation6.phpt
+++ b/ext/standard/tests/dir/scandir_variation6.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
@@ -29,7 +29,7 @@ mkdir($sub_dir_path);
 
 // with different wildcard characters
 
-echo "\n-- Wildcard = '*' --\n"; 
+echo "\n-- Wildcard = '*' --\n";
 var_dump( scandir($file_path . "/scandir_var*") );
 var_dump( scandir($file_path . "/*") );
 
diff --git a/ext/standard/tests/dir/scandir_variation7.phpt b/ext/standard/tests/dir/scandir_variation7.phpt
index c7f77651d3c..c2d8686d819 100644
--- a/ext/standard/tests/dir/scandir_variation7.phpt
+++ b/ext/standard/tests/dir/scandir_variation7.phpt
@@ -18,7 +18,7 @@ unlink($filename);
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
@@ -53,7 +53,7 @@ $permission_values = array(
 $iterator = 1;
 foreach ($permission_values as $perm) {
 	echo "\n-- Iteration $iterator --\n";
-	
+
 	// Remove the directory if already exists
 	if (is_dir($dir_path)){
 		chmod ($dir_path, 0777); // change dir permission to allow all operation
@@ -63,7 +63,7 @@ foreach ($permission_values as $perm) {
 
 	// change the dir permisson to test dir on it
 	var_dump( chmod($dir_path, $perm) );
-	
+
 	var_dump(scandir($dir_path));
 	$iterator++;
 }
diff --git a/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt
index f30645da45d..9fead1e4550 100644
--- a/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation8-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
@@ -42,7 +42,7 @@ $inputs = array(
        12.3456789000e10,
        12.3456789000E-10,
        .5,
-       
+
        // empty data
 /*10*/ "",
        array(),
diff --git a/ext/standard/tests/dir/scandir_variation8.phpt b/ext/standard/tests/dir/scandir_variation8.phpt
index 4e96e04a4e4..9311d030c12 100644
--- a/ext/standard/tests/dir/scandir_variation8.phpt
+++ b/ext/standard/tests/dir/scandir_variation8.phpt
@@ -3,7 +3,7 @@ Test scandir() function : usage variations - different file names
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
@@ -36,7 +36,7 @@ $inputs = array(
        12.3456789000e10,
        12.3456789000E-10,
        .5,
-       
+
        // empty data
 /*10*/ "",
        array(),
diff --git a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt
index 686eca43a6f..f2ec130e5dd 100644
--- a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt
+++ b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt
@@ -9,7 +9,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/dir/scandir_variation9.phpt b/ext/standard/tests/dir/scandir_variation9.phpt
index 2b1904c98f5..21091b96843 100644
--- a/ext/standard/tests/dir/scandir_variation9.phpt
+++ b/ext/standard/tests/dir/scandir_variation9.phpt
@@ -3,7 +3,7 @@ Test scandir() function : usage variations - different ints as $sorting_order ar
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
- * Description: List files & directories inside the specified path 
+ * Description: List files & directories inside the specified path
  * Source code: ext/standard/dir.c
  */
 
diff --git a/ext/standard/tests/directory/DirectoryClass_basic_001.phpt b/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
index 0accb2c85f1..73aac5b43c8 100644
--- a/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
+++ b/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
@@ -2,7 +2,7 @@
 Directory class behaviour.
 --FILE--
 <?php
-/* 
+/*
  * Prototype: object dir(string directory[, resource context])
  * Description: Directory class with properties, handle and class and methods read, rewind and close
  * Class is defined in ext/standard/dir.c
diff --git a/ext/standard/tests/directory/bug74589_utf8.phpt b/ext/standard/tests/directory/bug74589_utf8.phpt
index 686e005b8a9..deba03c582e 100644
--- a/ext/standard/tests/directory/bug74589_utf8.phpt
+++ b/ext/standard/tests/directory/bug74589_utf8.phpt
@@ -33,7 +33,7 @@ echo shell_exec("$php -n $test_file");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 string(%d) "%sbug74589_新建文件夹"
 string(%d) "%sbug74589_新建文件夹%etest.php"
 bool(true)
diff --git a/ext/standard/tests/file/004.phpt b/ext/standard/tests/file/004.phpt
index f1fab47ac32..3fead8b2150 100644
--- a/ext/standard/tests/file/004.phpt
+++ b/ext/standard/tests/file/004.phpt
@@ -20,7 +20,7 @@ file_put_contents() test
 		echo 'FAIL';
 	}
 	echo "\n";
-	
+
 	$old_int = $int = time() / 1000;
 	$ret = file_put_contents("TEST3", $int);
 	echo "Float Test: ";
@@ -30,7 +30,7 @@ file_put_contents() test
 		echo 'FAIL';
 	}
 	echo "\n";
-	
+
 	$ret = file_put_contents("TEST4", __FILE__);
 	echo "Bool Test: ";
 	if ($ret !== FALSE && md5(__FILE__) == md5_file("TEST4")) {
@@ -39,7 +39,7 @@ file_put_contents() test
 		echo 'FAIL';
 	}
 	echo "\n";
-	
+
 	$ret = @file_put_contents("TEST5", $_SERVER);
 	echo "Array Test: ";
 	if ($ret !== FALSE && @md5(implode('', $_SERVER)) == md5_file("TEST5")) {
diff --git a/ext/standard/tests/file/005_basic.phpt b/ext/standard/tests/file/005_basic.phpt
index 5ed1118902f..329fd157739 100644
--- a/ext/standard/tests/file/005_basic.phpt
+++ b/ext/standard/tests/file/005_basic.phpt
@@ -39,7 +39,7 @@ echo "\n*** Done ***\n";
 unlink(dirname(__FILE__)."/005_basic.tmp");
 unlink(dirname(__FILE__)."/005_basic");
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing the basic functionality with file ***
 %d:%s:%s:%d:%d:%d
 %d:%s:%s:%d:%d:%d
diff --git a/ext/standard/tests/file/005_error.phpt b/ext/standard/tests/file/005_error.phpt
index 20ba3a7fc09..6ac22914dbd 100644
--- a/ext/standard/tests/file/005_error.phpt
+++ b/ext/standard/tests/file/005_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fileatime(), filemtime(), filectime() & touch() functions : error conditions 
+Test fileatime(), filemtime(), filectime() & touch() functions : error conditions
 --FILE--
 <?php
 /*
@@ -56,7 +56,7 @@ var_dump( touch(__FILE__, 10, 100, 123) );
 
 echo "\nDone";
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing error conditions ***
 
 -- Testing with  Non-existing files --
diff --git a/ext/standard/tests/file/005_variation-win32.phpt b/ext/standard/tests/file/005_variation-win32.phpt
index ffcdc33cd68..68fa209b24c 100644
--- a/ext/standard/tests/file/005_variation-win32.phpt
+++ b/ext/standard/tests/file/005_variation-win32.phpt
@@ -10,12 +10,12 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 <?php
 /*
    Prototype: int fileatime ( string $filename );
-   Description: Returns the time the file was last accessed, or FALSE 
+   Description: Returns the time the file was last accessed, or FALSE
      in case of an error. The time is returned as a Unix timestamp.
 
    Prototype: int filemtime ( string $filename );
-   Description: Returns the time the file was last modified, or FALSE 
-     in case of an error. 
+   Description: Returns the time the file was last modified, or FALSE
+     in case of an error.
 
    Prototype: int filectime ( string $filename );
    Description: Returns the time the file was last changed, or FALSE
@@ -31,13 +31,13 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
    Description: Prints access, modification and change times of a file
 */
 function stat_fn( $filename ) {
-  echo "-- File access time is => "; 
+  echo "-- File access time is => ";
   print( @date( 'Y:M:D:H:i:s', fileatime($filename) ) )."\n";
   clearstatcache();
-  echo "-- File modification time is => "; 
+  echo "-- File modification time is => ";
   print( @date( 'Y:M:D:H:i:s', filemtime($filename) ) )."\n";
   clearstatcache();
-  echo "-- inode change time is => "; 
+  echo "-- inode change time is => ";
   print( @date( 'Y:M:D:H:i:s', filectime($filename) ) )."\n";
   clearstatcache();
 
@@ -45,7 +45,7 @@ function stat_fn( $filename ) {
 
 echo "*** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***\n";
 $file_path = dirname(__FILE__);
-// create files 
+// create files
 $file_handle = fopen("$file_path/005_variation1.tmp", "w");
 fclose($file_handle);
 stat_fn("$file_path/005_variation1.tmp");
@@ -120,7 +120,7 @@ stat_fn($file_name2);
 sleep(2);
 
 /* set to access(creation time of the file) time */
-var_dump( touch($file_name2, @date(fileatime($file_name2))) ); 
+var_dump( touch($file_name2, @date(fileatime($file_name2))) );
 stat_fn($file_name2);
 sleep(2);
 
@@ -134,8 +134,8 @@ var_dump( touch($file_name2, 10) );
 stat_fn($file_name2);
 var_dump( touch($file_name2, 10, 20) );
 stat_fn($file_name2);
- 
-/* touch() after renaming the file */ 
+
+/* touch() after renaming the file */
 rename($file_name2, "$file_path/005_variation_touch_new.tmp");
 stat_fn("$file_path/005_variation_touch_new.tmp");
 
diff --git a/ext/standard/tests/file/005_variation.phpt b/ext/standard/tests/file/005_variation.phpt
index 7e5eedc2b16..f2bf19f6a33 100644
--- a/ext/standard/tests/file/005_variation.phpt
+++ b/ext/standard/tests/file/005_variation.phpt
@@ -13,12 +13,12 @@ if (getenv("SKIP_SLOW_TESTS")) {
 <?php
 /*
    Prototype: int fileatime ( string $filename );
-   Description: Returns the time the file was last accessed, or FALSE 
+   Description: Returns the time the file was last accessed, or FALSE
      in case of an error. The time is returned as a Unix timestamp.
 
    Prototype: int filemtime ( string $filename );
-   Description: Returns the time the file was last modified, or FALSE 
-     in case of an error. 
+   Description: Returns the time the file was last modified, or FALSE
+     in case of an error.
 
    Prototype: int filectime ( string $filename );
    Description: Returns the time the file was last changed, or FALSE
@@ -34,13 +34,13 @@ if (getenv("SKIP_SLOW_TESTS")) {
    Description: Prints access, modification and change times of a file
 */
 function stat_fn( $filename ) {
-  echo "-- File access time is => "; 
+  echo "-- File access time is => ";
   print( @date( 'Y:M:D:H:i:s', fileatime($filename) ) )."\n";
   clearstatcache();
-  echo "-- File modification time is => "; 
+  echo "-- File modification time is => ";
   print( @date( 'Y:M:D:H:i:s', filemtime($filename) ) )."\n";
   clearstatcache();
-  echo "-- inode change time is => "; 
+  echo "-- inode change time is => ";
   print( @date( 'Y:M:D:H:i:s', filectime($filename) ) )."\n";
   clearstatcache();
 
@@ -48,7 +48,7 @@ function stat_fn( $filename ) {
 
 echo "*** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***\n";
 $file_path = dirname(__FILE__);
-// create files 
+// create files
 $file_handle = fopen("$file_path/005_variation1.tmp", "w");
 fclose($file_handle);
 stat_fn("$file_path/005_variation1.tmp");
@@ -135,7 +135,7 @@ stat_fn($file_name2);
 sleep(2);
 
 /* set to access(creation time of the file) time */
-var_dump( touch($file_name2, @date(fileatime($file_name2))) ); 
+var_dump( touch($file_name2, @date(fileatime($file_name2))) );
 stat_fn($file_name2);
 sleep(2);
 
@@ -149,8 +149,8 @@ var_dump( touch($file_name2, 10) );
 stat_fn($file_name2);
 var_dump( touch($file_name2, 10, 20) );
 stat_fn($file_name2);
- 
-/* touch() after renaming the file */ 
+
+/* touch() after renaming the file */
 rename($file_name2, "$file_path/005_variation_touch_new.tmp");
 stat_fn("$file_path/005_variation_touch_new.tmp");
 
diff --git a/ext/standard/tests/file/005_variation2-win32.phpt b/ext/standard/tests/file/005_variation2-win32.phpt
index 8508ecf7fb7..63b3c1db67e 100644
--- a/ext/standard/tests/file/005_variation2-win32.phpt
+++ b/ext/standard/tests/file/005_variation2-win32.phpt
@@ -12,12 +12,12 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 <?php
 /*
    Prototype: int fileatime ( string $filename );
-   Description: Returns the time the file was last accessed, or FALSE 
+   Description: Returns the time the file was last accessed, or FALSE
      in case of an error. The time is returned as a Unix timestamp.
 
    Prototype: int filemtime ( string $filename );
-   Description: Returns the time the file was last modified, or FALSE 
-     in case of an error. 
+   Description: Returns the time the file was last modified, or FALSE
+     in case of an error.
 
    Prototype: int filectime ( string $filename );
    Description: Returns the time the file was last changed, or FALSE
@@ -34,16 +34,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 */
 function stat_fn( $filename ) {
   echo "\n-- File '$filename' --\n";
-  echo "-- File access time is => "; 
+  echo "-- File access time is => ";
   echo fileatime($filename)."\n";
   clearstatcache();
-  echo "-- File modification time is => "; 
+  echo "-- File modification time is => ";
   echo filemtime($filename)."\n";
   clearstatcache();
-  echo "-- inode change time is => "; 
+  echo "-- inode change time is => ";
   echo filectime($filename)."\n";
   clearstatcache();
-  
+
 
 }
 
diff --git a/ext/standard/tests/file/005_variation2.phpt b/ext/standard/tests/file/005_variation2.phpt
index 6d4ca5e83d1..f365174a845 100644
--- a/ext/standard/tests/file/005_variation2.phpt
+++ b/ext/standard/tests/file/005_variation2.phpt
@@ -12,12 +12,12 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 <?php
 /*
    Prototype: int fileatime ( string $filename );
-   Description: Returns the time the file was last accessed, or FALSE 
+   Description: Returns the time the file was last accessed, or FALSE
      in case of an error. The time is returned as a Unix timestamp.
 
    Prototype: int filemtime ( string $filename );
-   Description: Returns the time the file was last modified, or FALSE 
-     in case of an error. 
+   Description: Returns the time the file was last modified, or FALSE
+     in case of an error.
 
    Prototype: int filectime ( string $filename );
    Description: Returns the time the file was last changed, or FALSE
@@ -34,16 +34,16 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 */
 function stat_fn( $filename ) {
   echo "\n-- File '$filename' --\n";
-  echo "-- File access time is => "; 
+  echo "-- File access time is => ";
   echo fileatime($filename)."\n";
   clearstatcache();
-  echo "-- File modification time is => "; 
+  echo "-- File modification time is => ";
   echo filemtime($filename)."\n";
   clearstatcache();
-  echo "-- inode change time is => "; 
+  echo "-- inode change time is => ";
   echo filectime($filename)."\n";
   clearstatcache();
-  
+
 
 }
 
diff --git a/ext/standard/tests/file/006_basic.phpt b/ext/standard/tests/file/006_basic.phpt
index 213442c15f9..733be71126e 100644
--- a/ext/standard/tests/file/006_basic.phpt
+++ b/ext/standard/tests/file/006_basic.phpt
@@ -29,7 +29,7 @@ unlink($filename);
 */
 $path = dirname(__FILE__);
 
-echo "*** Testing fileperms(), chmod() with files and dirs ***\n"; 
+echo "*** Testing fileperms(), chmod() with files and dirs ***\n";
 fopen($path."/perm.tmp", "w");
 var_dump( chmod($path."/perm.tmp", 0755 ) );
 printf("%o", fileperms($path."/perm.tmp") );
diff --git a/ext/standard/tests/file/006_error.phpt b/ext/standard/tests/file/006_error.phpt
index 04cc274ecc3..c35eba21287 100644
--- a/ext/standard/tests/file/006_error.phpt
+++ b/ext/standard/tests/file/006_error.phpt
@@ -24,7 +24,7 @@ unlink($filename);
   Description: Returns the permissions on the file, or FALSE in case of an error
 
   Prototype: bool chmod ( string $filename, int $mode )
-  Description: Attempts to change the mode of the file specified by 
+  Description: Attempts to change the mode of the file specified by
     filename to that given in mode
 */
 
diff --git a/ext/standard/tests/file/006_variation1.phpt b/ext/standard/tests/file/006_variation1.phpt
index b752d21feab..e2ec2f1a224 100644
--- a/ext/standard/tests/file/006_variation1.phpt
+++ b/ext/standard/tests/file/006_variation1.phpt
@@ -19,12 +19,12 @@ unlink($filename);
 ?>
 --FILE--
 <?php
-/* 
+/*
   Prototype: int fileperms ( string $filename );
   Description: Returns the permissions on the file, or FALSE in case of an error
 
   Prototype: bool chmod ( string $filename, int $mode );
-  Description: Attempts to change the mode of the file specified by 
+  Description: Attempts to change the mode of the file specified by
                filename to that given in mode
 */
 
@@ -40,7 +40,7 @@ $count = 1;
 echo "-- Testing all permission from octal 0000 to octal 0777 on file and dir --\n";
 for($mode = 0000; $mode <= 0777; $mode++) {
   echo "-- Iteration $count --\n";
-  var_dump( chmod($file_name, $mode) ); 
+  var_dump( chmod($file_name, $mode) );
   printf("%o", fileperms($file_name) );
   echo "\n";
   clearstatcache();
@@ -61,7 +61,7 @@ chmod(dirname(__FILE__)."/006_variation1", 0777);
 unlink(dirname(__FILE__)."/006_variation1.tmp");
 rmdir(dirname(__FILE__)."/006_variation1");
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing fileperms() & chmod() : usage variations ***
 -- Testing all permission from octal 0000 to octal 0777 on file and dir --
 -- Iteration 1 --
diff --git a/ext/standard/tests/file/006_variation2.phpt b/ext/standard/tests/file/006_variation2.phpt
index 7c5d2c838b1..5219cf84c3c 100644
--- a/ext/standard/tests/file/006_variation2.phpt
+++ b/ext/standard/tests/file/006_variation2.phpt
@@ -19,12 +19,12 @@ unlink($filename);
 ?>
 --FILE--
 <?php
-/* 
+/*
   Prototype: int fileperms ( string $filename );
   Description: Returns the permissions on the file, or FALSE in case of an error
 
   Prototype: bool chmod ( string $filename, int $mode );
-  Description: Attempts to change the mode of the file specified by 
+  Description: Attempts to change the mode of the file specified by
                filename to that given in mode
 */
 
@@ -72,7 +72,7 @@ foreach($perms_array as $permission) {
   printf("%o", fileperms($file_name) );
   echo "\n";
   clearstatcache();
- 
+
   var_dump( chmod($dir_name, $permission) );
   printf("%o", fileperms($dir_name) );
   echo "\n";
@@ -88,7 +88,7 @@ chmod(dirname(__FILE__)."/006_variation2", 0777);
 unlink(dirname(__FILE__)."/006_variation2.tmp");
 rmdir(dirname(__FILE__)."/006_variation2");
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing fileperms() & chmod() : usage variations ***
 
 *** Testing fileperms(), chmod() with miscellaneous permissions ***
diff --git a/ext/standard/tests/file/007_basic.phpt b/ext/standard/tests/file/007_basic.phpt
index ceb9b29943b..9fb473b3683 100644
--- a/ext/standard/tests/file/007_basic.phpt
+++ b/ext/standard/tests/file/007_basic.phpt
@@ -2,8 +2,8 @@
 Test fopen(), fclose() & feof() functions: basic functionality
 --FILE--
 <?php
-/* 
- Prototype: resource fopen(string $filename, string $mode 
+/*
+ Prototype: resource fopen(string $filename, string $mode
                             [, bool $use_include_path [, resource $context]] );
  Description: Opens file or URL.
 
diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt
index 80cc657d5d8..1e94e903590 100644
--- a/ext/standard/tests/file/007_error.phpt
+++ b/ext/standard/tests/file/007_error.phpt
@@ -13,8 +13,8 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
  Description: Closes an open file pointer
 
  Prototype: bool feof ( resource $handle )
- Description: Returns TRUE if the file pointer is at EOF or an error occurs 
-   (including socket timeout); otherwise returns FALSE. 
+ Description: Returns TRUE if the file pointer is at EOF or an error occurs
+   (including socket timeout); otherwise returns FALSE.
 */
 
 echo "*** Testing error conditions for fopen(), fclsoe() & feof() ***\n";
@@ -29,7 +29,7 @@ $fp = fopen(__FILE__, "r");
 fclose($fp);
 var_dump( fclose($fp) ); // closed handle
 var_dump( fclose(__FILE__) ); // invalid handle
-var_dump( fclose() ); // zero argument 
+var_dump( fclose() ); // zero argument
 
 //feof()
 var_dump( feof($fp) );  // closed handle
diff --git a/ext/standard/tests/file/007_variation1.phpt b/ext/standard/tests/file/007_variation1.phpt
index 6cba1466554..2731b3bdc97 100644
--- a/ext/standard/tests/file/007_variation1.phpt
+++ b/ext/standard/tests/file/007_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "r" mode 
+Test fopen and fclose() functions - usage variations - "r" mode
 --FILE--
 <?php
 /*
@@ -35,7 +35,7 @@ var_dump( fread($file_handle, 100) );  //Check for read operation
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; fails; expected: 0 bytes
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation1.tmp");
diff --git a/ext/standard/tests/file/007_variation10.phpt b/ext/standard/tests/file/007_variation10.phpt
index 2981ef7d4ca..3093535e642 100644
--- a/ext/standard/tests/file/007_variation10.phpt
+++ b/ext/standard/tests/file/007_variation10.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "r+t" mode 
+Test fopen and fclose() functions - usage variations - "r+t" mode
 --FILE--
 <?php
 /*
@@ -37,7 +37,7 @@ var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes;
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation10.tmp");
diff --git a/ext/standard/tests/file/007_variation11-win32-mb.phpt b/ext/standard/tests/file/007_variation11-win32-mb.phpt
index 68a0e8ccd0b..68b8396639c 100644
--- a/ext/standard/tests/file/007_variation11-win32-mb.phpt
+++ b/ext/standard/tests/file/007_variation11-win32-mb.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "wt" mode 
+Test fopen and fclose() functions - usage variations - "wt" mode
 --SKIPIF--
 <?php
 if( substr(PHP_OS, 0, 3) != "WIN" )
@@ -54,7 +54,7 @@ clearstatcache();
 unlink($file);  //Deleting the file
 fclose( fopen($file, "wt") );  //Opening the non-existing file in "wt" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 $file_path = dirname(__FILE__);
diff --git a/ext/standard/tests/file/007_variation11-win32.phpt b/ext/standard/tests/file/007_variation11-win32.phpt
index a567b72b03e..242b38cadab 100644
--- a/ext/standard/tests/file/007_variation11-win32.phpt
+++ b/ext/standard/tests/file/007_variation11-win32.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "wt" mode 
+Test fopen and fclose() functions - usage variations - "wt" mode
 --SKIPIF--
 <?php
 if( substr(PHP_OS, 0, 3) != "WIN" )
@@ -54,7 +54,7 @@ clearstatcache();
 unlink($file);  //Deleting the file
 fclose( fopen($file, "wt") );  //Opening the non-existing file in "wt" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation11.tmp");
diff --git a/ext/standard/tests/file/007_variation11.phpt b/ext/standard/tests/file/007_variation11.phpt
index c884f47f42a..92ec32eb22e 100644
--- a/ext/standard/tests/file/007_variation11.phpt
+++ b/ext/standard/tests/file/007_variation11.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "wt" mode 
+Test fopen and fclose() functions - usage variations - "wt" mode
 --SKIPIF--
 <?php
 if( substr(PHP_OS, 0, 3) == "WIN" )
@@ -54,7 +54,7 @@ clearstatcache();
 unlink($file);  //Deleting the file
 fclose( fopen($file, "wt") );  //Opening the non-existing file in "wt" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation11.tmp");
diff --git a/ext/standard/tests/file/007_variation12-win32.phpt b/ext/standard/tests/file/007_variation12-win32.phpt
index d3d26e2996b..87bfc45c493 100644
--- a/ext/standard/tests/file/007_variation12-win32.phpt
+++ b/ext/standard/tests/file/007_variation12-win32.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "w+t" mode 
+Test fopen and fclose() functions - usage variations - "w+t" mode
 --SKIPIF--
 <?php
 if( substr(PHP_OS, 0, 3) != "WIN" )
@@ -54,7 +54,7 @@ clearstatcache();
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w+t") );  //Opening the non-existing file in "w+t" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation12.tmp");
diff --git a/ext/standard/tests/file/007_variation12.phpt b/ext/standard/tests/file/007_variation12.phpt
index c56605ac62e..43ca4f78ffe 100644
--- a/ext/standard/tests/file/007_variation12.phpt
+++ b/ext/standard/tests/file/007_variation12.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "w+t" mode 
+Test fopen and fclose() functions - usage variations - "w+t" mode
 --SKIPIF--
 <?php
 if( substr(PHP_OS, 0, 3) == "WIN" )
@@ -54,7 +54,7 @@ clearstatcache();
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w+t") );  //Opening the non-existing file in "w+t" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation12.tmp");
diff --git a/ext/standard/tests/file/007_variation13-win32.phpt b/ext/standard/tests/file/007_variation13-win32.phpt
index fabcde90cce..6c6d22f64e7 100644
--- a/ext/standard/tests/file/007_variation13-win32.phpt
+++ b/ext/standard/tests/file/007_variation13-win32.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "at" mode 
+Test fopen and fclose() functions - usage variations - "at" mode
 --SKIPIF--
 <?php
 if( substr(PHP_OS, 0, 3) != "WIN" )
@@ -46,7 +46,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si
 unlink($file);  //Deleting the file
 fclose( fopen($file, "at") );  //Opening the non-existing file in "at" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation13.tmp");
diff --git a/ext/standard/tests/file/007_variation13.phpt b/ext/standard/tests/file/007_variation13.phpt
index 9d3e6265b54..6c416d11031 100644
--- a/ext/standard/tests/file/007_variation13.phpt
+++ b/ext/standard/tests/file/007_variation13.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "at" mode 
+Test fopen and fclose() functions - usage variations - "at" mode
 --SKIPIF--
 <?php
 if( substr(PHP_OS, 0, 3) == "WIN" )
@@ -46,7 +46,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si
 unlink($file);  //Deleting the file
 fclose( fopen($file, "at") );  //Opening the non-existing file in "at" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation13.tmp");
diff --git a/ext/standard/tests/file/007_variation14.phpt b/ext/standard/tests/file/007_variation14.phpt
index ebcad6d8308..af07d1652ad 100644
--- a/ext/standard/tests/file/007_variation14.phpt
+++ b/ext/standard/tests/file/007_variation14.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "a+t" mode 
+Test fopen and fclose() functions - usage variations - "a+t" mode
 --FILE--
 <?php
 /*
@@ -40,7 +40,7 @@ var_dump( get_resource_type($file_handle) );  //Check whether resource is lost a
 unlink($file);  //Deleting the file
 fclose( fopen($file, "a+t") );  //Opening the non-existing file in "a+t" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation14.tmp");
diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt
index 960ee03e91f..e3a7e0d8b4c 100644
--- a/ext/standard/tests/file/007_variation15.phpt
+++ b/ext/standard/tests/file/007_variation15.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "xt" mode 
+Test fopen and fclose() functions - usage variations - "xt" mode
 --FILE--
 <?php
 /*
@@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "xt" mode
 /* Test fopen() and fclose(): Opening the file in "xt" mode,
    checking for the file creation, write & read operations,
    checking for the file pointer position,
-   checking for the warning msg when trying to open an existing file in "xt" mode,  
+   checking for the warning msg when trying to open an existing file in "xt" mode,
    and fclose function
 */
 $file_path = dirname(__FILE__);
@@ -33,11 +33,11 @@ var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes;
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file 
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 $file_handle = fopen($file, "xt");  //Opening the existing data file in 'xt' mode to check for the warning message
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation15.tmp");
diff --git a/ext/standard/tests/file/007_variation16.phpt b/ext/standard/tests/file/007_variation16.phpt
index 633299dedf1..c48776a4cdc 100644
--- a/ext/standard/tests/file/007_variation16.phpt
+++ b/ext/standard/tests/file/007_variation16.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "x+t" mode 
+Test fopen and fclose() functions - usage variations - "x+t" mode
 --FILE--
 <?php
 /*
@@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x+t" mode
 /* Test fopen() and fclose(): Opening the file in "x+t" mode,
    checking for the file creation, write & read operations,
    checking for the file pointer position,
-   checking for the warning msg when trying to open an existing file in "x+t" mode,  
+   checking for the warning msg when trying to open an existing file in "x+t" mode,
    and fclose function
 */
 $file_path = dirname(__FILE__);
@@ -37,7 +37,7 @@ var_dump( ftell($file_handle) );  //File pointer position after read operation,
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 $file_handle = fopen($file, "x+t");  //Opening the existing data file in "x+t" mode to check for the warning message
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation16.tmp");
diff --git a/ext/standard/tests/file/007_variation17.phpt b/ext/standard/tests/file/007_variation17.phpt
index d3408e9dbb9..716dbbacb72 100644
--- a/ext/standard/tests/file/007_variation17.phpt
+++ b/ext/standard/tests/file/007_variation17.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "rb" mode 
+Test fopen and fclose() functions - usage variations - "rb" mode
 --FILE--
 <?php
 /*
@@ -35,7 +35,7 @@ var_dump( fread($file_handle, 100) );  //Check for read operation
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; fails; expected: 0 bytes
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation17.tmp");
diff --git a/ext/standard/tests/file/007_variation18.phpt b/ext/standard/tests/file/007_variation18.phpt
index 88350b8426c..5d9b1ea2128 100644
--- a/ext/standard/tests/file/007_variation18.phpt
+++ b/ext/standard/tests/file/007_variation18.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "r+b" mode 
+Test fopen and fclose() functions - usage variations - "r+b" mode
 --FILE--
 <?php
 /*
@@ -37,7 +37,7 @@ var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes;
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation18.tmp");
diff --git a/ext/standard/tests/file/007_variation19.phpt b/ext/standard/tests/file/007_variation19.phpt
index 0731d454bb0..ebb19a0b2e6 100644
--- a/ext/standard/tests/file/007_variation19.phpt
+++ b/ext/standard/tests/file/007_variation19.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "wb" mode 
+Test fopen and fclose() functions - usage variations - "wb" mode
 --FILE--
 <?php
 /*
@@ -49,7 +49,7 @@ clearstatcache();
 unlink($file);  //Deleting the file
 fclose( fopen($file, "wb") );  //Opening the non-existing file in "wb" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation19.tmp");
diff --git a/ext/standard/tests/file/007_variation2.phpt b/ext/standard/tests/file/007_variation2.phpt
index deb51266ee2..d456214c279 100644
--- a/ext/standard/tests/file/007_variation2.phpt
+++ b/ext/standard/tests/file/007_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "r+" mode 
+Test fopen and fclose() functions - usage variations - "r+" mode
 --FILE--
 <?php
 /*
@@ -37,7 +37,7 @@ var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes;
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation2.tmp");
diff --git a/ext/standard/tests/file/007_variation20.phpt b/ext/standard/tests/file/007_variation20.phpt
index 3eddec42580..26c5bb71529 100644
--- a/ext/standard/tests/file/007_variation20.phpt
+++ b/ext/standard/tests/file/007_variation20.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "w+b" mode 
+Test fopen and fclose() functions - usage variations - "w+b" mode
 --FILE--
 <?php
 /*
@@ -49,7 +49,7 @@ clearstatcache();
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w+b") );  //Opening the non-existing file in "w+b" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation20.tmp");
diff --git a/ext/standard/tests/file/007_variation21.phpt b/ext/standard/tests/file/007_variation21.phpt
index c70aaad7844..62d7f845686 100644
--- a/ext/standard/tests/file/007_variation21.phpt
+++ b/ext/standard/tests/file/007_variation21.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "ab" mode 
+Test fopen and fclose() functions - usage variations - "ab" mode
 --FILE--
 <?php
 /*
@@ -41,7 +41,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si
 unlink($file);  //Deleting the file
 fclose( fopen($file, "ab") );  //Opening the non-existing file in "ab" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation21.tmp");
diff --git a/ext/standard/tests/file/007_variation22.phpt b/ext/standard/tests/file/007_variation22.phpt
index 63deee4f842..106cd4b6f4d 100644
--- a/ext/standard/tests/file/007_variation22.phpt
+++ b/ext/standard/tests/file/007_variation22.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "a+b" mode 
+Test fopen and fclose() functions - usage variations - "a+b" mode
 --FILE--
 <?php
 /*
@@ -40,7 +40,7 @@ var_dump( get_resource_type($file_handle) );  //Check whether resource is lost a
 unlink($file);  //Deleting the file
 fclose( fopen($file, "a+b") );  //Opening the non-existing file in "a+b" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation22.tmp");
diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt
index 3d1634de298..5144f0765f5 100644
--- a/ext/standard/tests/file/007_variation23.phpt
+++ b/ext/standard/tests/file/007_variation23.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "xb" mode 
+Test fopen and fclose() functions - usage variations - "xb" mode
 --FILE--
 <?php
 /*
@@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "xb" mode
 /* Test fopen() and fclose(): Opening the file in "xb" mode,
    checking for the file creation, write & read operations,
    checking for the file pointer position,
-   checking for the warning msg when trying to open an existing file in "xb" mode,  
+   checking for the warning msg when trying to open an existing file in "xb" mode,
    and fclose function
 */
 $file_path = dirname(__FILE__);
@@ -33,11 +33,11 @@ var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes;
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file 
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 $file_handle = fopen($file, "xb");  //Opening the existing data file in 'xb' mode to check for the warning message
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation23.tmp");
diff --git a/ext/standard/tests/file/007_variation24.phpt b/ext/standard/tests/file/007_variation24.phpt
index d898ba7b52b..b9c819f0a5c 100644
--- a/ext/standard/tests/file/007_variation24.phpt
+++ b/ext/standard/tests/file/007_variation24.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "x+b" mode 
+Test fopen and fclose() functions - usage variations - "x+b" mode
 --FILE--
 <?php
 /*
@@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x+b" mode
 /* Test fopen() and fclose(): Opening the file in "x+b" mode,
    checking for the file creation, write & read operations,
    checking for the file pointer position,
-   checking for the warning msg when trying to open an existing file in "x+b" mode,  
+   checking for the warning msg when trying to open an existing file in "x+b" mode,
    and fclose function
 */
 $file_path = dirname(__FILE__);
@@ -37,7 +37,7 @@ var_dump( ftell($file_handle) );  //File pointer position after read operation,
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 $file_handle = fopen($file, "x+b");  //Opening the existing data file in "x+b" mode to check for the warning message
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation24.tmp");
diff --git a/ext/standard/tests/file/007_variation3.phpt b/ext/standard/tests/file/007_variation3.phpt
index f4ae03658fa..b2a276cacf6 100644
--- a/ext/standard/tests/file/007_variation3.phpt
+++ b/ext/standard/tests/file/007_variation3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "w" mode 
+Test fopen and fclose() functions - usage variations - "w" mode
 --FILE--
 <?php
 /*
@@ -49,7 +49,7 @@ clearstatcache();
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w") );  //Opening the non-existing file in "w" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation3.tmp");
diff --git a/ext/standard/tests/file/007_variation4.phpt b/ext/standard/tests/file/007_variation4.phpt
index 0dabc5b9ad0..417974d3be4 100644
--- a/ext/standard/tests/file/007_variation4.phpt
+++ b/ext/standard/tests/file/007_variation4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "w+" mode 
+Test fopen and fclose() functions - usage variations - "w+" mode
 --FILE--
 <?php
 /*
@@ -49,7 +49,7 @@ clearstatcache();
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w+") );  //Opening the non-existing file in "w+" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation4.tmp");
diff --git a/ext/standard/tests/file/007_variation5.phpt b/ext/standard/tests/file/007_variation5.phpt
index 51e366d2913..4c54f473b20 100644
--- a/ext/standard/tests/file/007_variation5.phpt
+++ b/ext/standard/tests/file/007_variation5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "a" mode 
+Test fopen and fclose() functions - usage variations - "a" mode
 --FILE--
 <?php
 /*
@@ -41,7 +41,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si
 unlink($file);  //Deleting the file
 fclose( fopen($file, "a") );  //Opening the non-existing file in "a" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation5.tmp");
diff --git a/ext/standard/tests/file/007_variation6.phpt b/ext/standard/tests/file/007_variation6.phpt
index 92c01717519..47bd3628d4a 100644
--- a/ext/standard/tests/file/007_variation6.phpt
+++ b/ext/standard/tests/file/007_variation6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "a+" mode 
+Test fopen and fclose() functions - usage variations - "a+" mode
 --FILE--
 <?php
 /*
@@ -40,7 +40,7 @@ var_dump( get_resource_type($file_handle) );  //Check whether resource is lost a
 unlink($file);  //Deleting the file
 fclose( fopen($file, "a+") );  //Opening the non-existing file in "a+" mode, which will be created
 var_dump( file_exists($file) );  //Check for the existence of file
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation6.tmp");
diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt
index 69f9a731cff..24bf9720cd2 100644
--- a/ext/standard/tests/file/007_variation7.phpt
+++ b/ext/standard/tests/file/007_variation7.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "x" mode 
+Test fopen and fclose() functions - usage variations - "x" mode
 --FILE--
 <?php
 /*
@@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x" mode
 /* Test fopen() and fclose(): Opening the file in "x" mode,
    checking for the file creation, write & read operations,
    checking for the file pointer position,
-   checking for the warning msg when trying to open an existing file in "x" mode,  
+   checking for the warning msg when trying to open an existing file in "x" mode,
    and fclose function
 */
 $file_path = dirname(__FILE__);
@@ -33,11 +33,11 @@ var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes;
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file 
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 $file_handle = fopen($file, "x");  //Opening the existing data file in 'x' mode to check for the warning message
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation7.tmp");
diff --git a/ext/standard/tests/file/007_variation8.phpt b/ext/standard/tests/file/007_variation8.phpt
index fae6932048c..a57c76bd675 100644
--- a/ext/standard/tests/file/007_variation8.phpt
+++ b/ext/standard/tests/file/007_variation8.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "x+" mode 
+Test fopen and fclose() functions - usage variations - "x+" mode
 --FILE--
 <?php
 /*
@@ -17,7 +17,7 @@ Test fopen and fclose() functions - usage variations - "x+" mode
 /* Test fopen() and fclose(): Opening the file in "x+" mode,
    checking for the file creation, write & read operations,
    checking for the file pointer position,
-   checking for the warning msg when trying to open an existing file in "x+" mode,  
+   checking for the warning msg when trying to open an existing file in "x+" mode,
    and fclose function
 */
 $file_path = dirname(__FILE__);
@@ -37,7 +37,7 @@ var_dump( ftell($file_handle) );  //File pointer position after read operation,
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 $file_handle = fopen($file, "x+");  //Opening the existing data file in "x+" mode to check for the warning message
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation8.tmp");
diff --git a/ext/standard/tests/file/007_variation9.phpt b/ext/standard/tests/file/007_variation9.phpt
index ab5f1ca01dc..7d8ebbee912 100644
--- a/ext/standard/tests/file/007_variation9.phpt
+++ b/ext/standard/tests/file/007_variation9.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen and fclose() functions - usage variations - "rt" mode 
+Test fopen and fclose() functions - usage variations - "rt" mode
 --FILE--
 <?php
 /*
@@ -35,7 +35,7 @@ var_dump( fread($file_handle, 100) );  //Check for read operation
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; fails; expected: 0 bytes
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
-echo "*** Done ***\n"; 
+echo "*** Done ***\n";
 --CLEAN--
 <?php
 unlink(dirname(__FILE__)."/007_variation9.tmp");
diff --git a/ext/standard/tests/file/basename-win32.phpt b/ext/standard/tests/file/basename-win32.phpt
index 5fd0f9659f5..996b060ceac 100644
--- a/ext/standard/tests/file/basename-win32.phpt
+++ b/ext/standard/tests/file/basename-win32.phpt
@@ -10,10 +10,10 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 ?>
 --FILE--
 <?php
-/* 
+/*
  * proto string basename(string path [, string suffix])
  * Function is implemented in ext/standard/string.c
- */ 
+ */
 $file_paths = array (
   /* simple paths */
   array("bar"),
@@ -33,15 +33,15 @@ $file_paths = array (
   array("bar.zip", "bar.zip"),
   array("\\foo\\bar.zip", ".zip"),
   array("foo\\bar.zip", ".zip"),
-  array("\\bar.zip", ".zip"),  
+  array("\\bar.zip", ".zip"),
 
   /* paths with suffix and trailing slashes with suffix removal*/
   array("bar.zip\\", ".zip"),
   array("\\bar.zip\\", ".zip"),
   array("\\foo\\bar.zip\\", ".zip"),
   array("foo\\bar.zip\\", ".zip"),
-  array("\\bar.zip\\", ".zip"),  
-  
+  array("\\bar.zip\\", ".zip"),
+
   /* paths with basename only suffix, with suffix removal*/
   array("\\.zip", ".zip"),
   array(".zip", ".zip"),
@@ -90,7 +90,7 @@ $file_path_variations = array (
   /* path with spaces */
   array(" "),
   array(' '),
-  
+
   /* empty paths */
   array(""),
   array(''),
@@ -104,8 +104,8 @@ function check_basename( $path_arrays ) {
      if( 1 == count($path) ) { // no suffix provided
        var_dump( basename($path[0]) );
      } else { // path as well as suffix provided,
-       var_dump( basename($path[0], $path[1]) );    
-     } 
+       var_dump( basename($path[0], $path[1]) );
+     }
    }
 }
 
@@ -116,13 +116,13 @@ echo "\n*** Testing possible variations in path and suffix ***\n";
 check_basename( $file_path_variations );
 
 echo "\n*** Testing error conditions ***\n";
-// zero arguments 
+// zero arguments
 var_dump( basename() );
 
 // more than expected no. of arguments
 var_dump( basename("\\blah\\tmp\\bar.zip", ".zip", ".zip") );
 
-// passing invalid type arguments 
+// passing invalid type arguments
 $object = new stdclass;
 var_dump( basename( array("string\\bar") ) );
 var_dump( basename( array("string\\bar"), "bar" ) );
diff --git a/ext/standard/tests/file/basename.phpt b/ext/standard/tests/file/basename.phpt
index c0e7498f14c..a9b4389b5a5 100644
Binary files a/ext/standard/tests/file/basename.phpt and b/ext/standard/tests/file/basename.phpt differ
diff --git a/ext/standard/tests/file/basename_basic-win32.phpt b/ext/standard/tests/file/basename_basic-win32.phpt
index f575c5aa691..ceccf9eef70 100644
--- a/ext/standard/tests/file/basename_basic-win32.phpt
+++ b/ext/standard/tests/file/basename_basic-win32.phpt
@@ -52,7 +52,7 @@ $file_paths = array (
   /* path with spaces */
   " ",
   ' ',
-  
+
   /* empty paths */
   "",
   '',
diff --git a/ext/standard/tests/file/basename_basic.phpt b/ext/standard/tests/file/basename_basic.phpt
index 68aefb2a3a3..6354b2acd73 100644
--- a/ext/standard/tests/file/basename_basic.phpt
+++ b/ext/standard/tests/file/basename_basic.phpt
@@ -52,7 +52,7 @@ $file_paths = array (
   /* path with spaces */
   " ",
   ' ',
-  
+
   /* empty paths */
   "",
   '',
diff --git a/ext/standard/tests/file/basename_error.phpt b/ext/standard/tests/file/basename_error.phpt
index 53c53cf8b94..3a123029c06 100644
--- a/ext/standard/tests/file/basename_error.phpt
+++ b/ext/standard/tests/file/basename_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test basename() function : error conditions 
+Test basename() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string basename(string path [, string suffix])
- * Description: Returns the filename component of the path 
+ * Description: Returns the filename component of the path
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing basename() : error conditions ***\n";
diff --git a/ext/standard/tests/file/basename_variation1-win32.phpt b/ext/standard/tests/file/basename_variation1-win32.phpt
index 0f4293e0b0d..eb2a4ff497d 100644
--- a/ext/standard/tests/file/basename_variation1-win32.phpt
+++ b/ext/standard/tests/file/basename_variation1-win32.phpt
@@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 <?php
 
 $prefixes = array (
-	
+
     // drive letters
 	"A:/",
     "Z:/",
@@ -31,7 +31,7 @@ $paths = array (
 
 	"foo",
 	"foo/",
-    "foo\\",    
+    "foo\\",
     "foo.bar",
     "foo.bar/",
     "foo.bar\\",
diff --git a/ext/standard/tests/file/basename_variation1.phpt b/ext/standard/tests/file/basename_variation1.phpt
index 93582389d4f..ea7cdfe8b72 100644
--- a/ext/standard/tests/file/basename_variation1.phpt
+++ b/ext/standard/tests/file/basename_variation1.phpt
@@ -10,7 +10,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 <?php
 
 $prefixes = array (
-	
+
     // drive letters
 	"A:/",
     "Z:/",
@@ -31,7 +31,7 @@ $paths = array (
 
 	"foo",
 	"foo/",
-    "foo\\",    
+    "foo\\",
     "foo.bar",
     "foo.bar/",
     "foo.bar\\",
diff --git a/ext/standard/tests/file/basename_variation2-win32.phpt b/ext/standard/tests/file/basename_variation2-win32.phpt
index 5e9961b98f7..43d6de50609 100644
--- a/ext/standard/tests/file/basename_variation2-win32.phpt
+++ b/ext/standard/tests/file/basename_variation2-win32.phpt
@@ -13,7 +13,7 @@ $paths = array (
 
 	"foo",
 	"foo/",
-    "foo\\",    
+    "foo\\",
     "foo.bar",
     "foo.bar/",
     "foo.bar\\",
@@ -35,13 +35,13 @@ $suffixes = array (
     "foo/bar",
     "foo\\bar",
     "/",
-    "\\",	
+    "\\",
 );
 
 foreach ($paths as $path) {
 	foreach ($suffixes as $suffix) {
 		echo "basename for path $path, supplying suffix $suffix is:\n";
-		var_dump(basename($path, $suffix));		
+		var_dump(basename($path, $suffix));
 	}
 }
 
diff --git a/ext/standard/tests/file/basename_variation2.phpt b/ext/standard/tests/file/basename_variation2.phpt
index 96cfd65057c..195b98a6d39 100644
--- a/ext/standard/tests/file/basename_variation2.phpt
+++ b/ext/standard/tests/file/basename_variation2.phpt
@@ -13,7 +13,7 @@ $paths = array (
 
 	"foo",
 	"foo/",
-    "foo\\",    
+    "foo\\",
     "foo.bar",
     "foo.bar/",
     "foo.bar\\",
@@ -35,13 +35,13 @@ $suffixes = array (
     "foo/bar",
     "foo\\bar",
     "/",
-    "\\",	
+    "\\",
 );
 
 foreach ($paths as $path) {
 	foreach ($suffixes as $suffix) {
 		echo "basename for path $path, supplying suffix $suffix is:\n";
-		var_dump(basename($path, $suffix));		
+		var_dump(basename($path, $suffix));
 	}
 }
 
diff --git a/ext/standard/tests/file/basename_variation3.phpt b/ext/standard/tests/file/basename_variation3.phpt
index f01f550a7d9..684e538d768 100644
--- a/ext/standard/tests/file/basename_variation3.phpt
+++ b/ext/standard/tests/file/basename_variation3.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test basename() function : first parameter type variations 
+Test basename() function : first parameter type variations
 --FILE--
 <?php
 /* Prototype  : string basename(string path [, string suffix])
- * Description: Returns the filename component of the path 
+ * Description: Returns the filename component of the path
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing basename() : usage variation ***\n";
diff --git a/ext/standard/tests/file/basename_variation4.phpt b/ext/standard/tests/file/basename_variation4.phpt
index 88ce61a93da..2bb94870dfe 100644
--- a/ext/standard/tests/file/basename_variation4.phpt
+++ b/ext/standard/tests/file/basename_variation4.phpt
@@ -3,9 +3,9 @@ Test basename() function : second parameter type variation
 --FILE--
 <?php
 /* Prototype  : string basename(string path [, string suffix])
- * Description: Returns the filename component of the path 
+ * Description: Returns the filename component of the path
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing basename() : usage variation ***\n";
diff --git a/ext/standard/tests/file/bug22414.phpt b/ext/standard/tests/file/bug22414.phpt
index fcd85489f32..abc6e475856 100644
--- a/ext/standard/tests/file/bug22414.phpt
+++ b/ext/standard/tests/file/bug22414.phpt
@@ -8,14 +8,14 @@ output_handler=
 	$php = getenv('TEST_PHP_EXECUTABLE');
 	$tmpfile = tempnam(__DIR__, 'phpt');
 	$args = ' -n -dsafe_mode=off ';
-	
+
 	/* Regular Data Test */
 	passthru($php . $args . ' -r " echo \"HELLO\"; "');
 
 	echo "\n";
 
 	/* Binary Data Test */
-	
+
 	if (substr(PHP_OS, 0, 3) != 'WIN') {
 		$cmd = $php . $args . ' -r \"readfile(@getenv(\'TEST_PHP_EXECUTABLE\')); \"';
 		$cmd = $php . $args . ' -r \' passthru("'.$cmd.'"); \' > '.$tmpfile ;
@@ -30,7 +30,7 @@ output_handler=
 	} else {
 		echo "Does not work\n";
 	}
-	
+
 	@unlink($tmpfile);
 ?>
 --EXPECT--
diff --git a/ext/standard/tests/file/bug24482.phpt b/ext/standard/tests/file/bug24482.phpt
index 9d0568af332..9fe4d2d9ee5 100644
--- a/ext/standard/tests/file/bug24482.phpt
+++ b/ext/standard/tests/file/bug24482.phpt
@@ -26,13 +26,13 @@ closedir($dh);
 
 if (count($dirs) != count($globdirs)) {
 	echo "Directory count mismatch\n";
-	
+
 	echo "glob found:\n";
-	sort($globdirs);	
+	sort($globdirs);
 	var_dump($globdirs);
-	
+
 	echo "opendir/readdir/isdir found:\n";
-	sort($dirs);	
+	sort($dirs);
 	var_dump($dirs);
 } else {
 	echo "OK\n";
diff --git a/ext/standard/tests/file/bug26938.phpt b/ext/standard/tests/file/bug26938.phpt
index a68d5728d77..d1ad6b65264 100644
--- a/ext/standard/tests/file/bug26938.phpt
+++ b/ext/standard/tests/file/bug26938.phpt
@@ -6,14 +6,14 @@ $out = array();
 $status = -1;
 $php = getenv('TEST_PHP_EXECUTABLE');
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	exec($php . ' -n -r \'' 
+	exec($php . ' -n -r \''
 	     . '$lengths = array(10,20000,10000,5,10000,3);'
 	     . 'foreach($lengths as $length) {'
 	     . '  for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
 	     . '  print "\n";'
 	     . '}\'', $out, $status);
 } else {
-	exec($php . ' -n -r "' 
+	exec($php . ' -n -r "'
 	     . '$lengths = array(10,20000,10000,5,10000,3);'
 	     . 'foreach($lengths as $length) {'
 	     . '  for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
diff --git a/ext/standard/tests/file/bug27508.phpt b/ext/standard/tests/file/bug27508.phpt
index 26959ec5116..e342a173488 100644
--- a/ext/standard/tests/file/bug27508.phpt
+++ b/ext/standard/tests/file/bug27508.phpt
@@ -4,8 +4,8 @@ Bug #27508 (userspace wrappers have bogus eof indicator)
 <?php # vim:ft=php
 class FileStream {
     public $fp;
-   
-    function stream_open($path, $mode, $options, &$opened_path) 
+
+    function stream_open($path, $mode, $options, &$opened_path)
     {
         $url = urldecode(substr($path, 9));
         $this->fp = fopen($url, $mode);
@@ -13,22 +13,22 @@ class FileStream {
         return true;
     }
 
-    function stream_read($count) 
+    function stream_read($count)
     {
         return fread($this->fp, $count);
     }
 
-    function stream_write($data) 
+    function stream_write($data)
     {
         return fwrite($this->fp, $data);
     }
 
-    function stream_tell() 
+    function stream_tell()
     {
         return ftell($this->fp);
     }
 
-    function stream_eof() 
+    function stream_eof()
     {
         if (!$this->fp) {
             return true;
@@ -36,7 +36,7 @@ class FileStream {
         return feof($this->fp);
     }
 
-    function stream_seek($offset, $whence) 
+    function stream_seek($offset, $whence)
     {
         return fseek($this->fp, $offset, $whence) == 0 ? true : false;
     }
diff --git a/ext/standard/tests/file/bug30362.phpt b/ext/standard/tests/file/bug30362.phpt
index 1c2b4be979a..59fe02ad06c 100644
--- a/ext/standard/tests/file/bug30362.phpt
+++ b/ext/standard/tests/file/bug30362.phpt
@@ -11,7 +11,7 @@ for ($i = 0; ($i < 10) && !feof($resource); ++$i ) {
     echo $line . "\n";
 }
 fclose($resource);
-        
+
 ?>
 --EXPECT--
 111
diff --git a/ext/standard/tests/file/bug35740.phpt b/ext/standard/tests/file/bug35740.phpt
index 3526b249734..184dff264f6 100644
--- a/ext/standard/tests/file/bug35740.phpt
+++ b/ext/standard/tests/file/bug35740.phpt
@@ -7,7 +7,7 @@ include (dirname(__FILE__));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: include(%s): failed to open stream: %s in %s on line %d
 
 Warning: include(): Failed opening '%s' for inclusion (include_path='%s') in %s on line %d
diff --git a/ext/standard/tests/file/bug35781.phpt b/ext/standard/tests/file/bug35781.phpt
index 5dc684a65df..fc14816f40c 100644
--- a/ext/standard/tests/file/bug35781.phpt
+++ b/ext/standard/tests/file/bug35781.phpt
@@ -4,7 +4,7 @@ Bug #35781 (stream_filter_append() causes segfault)
 <?php
 
 $filename = dirname(__FILE__)."/bug35781.txt";
-	
+
 $fp = fopen($filename, "w");
 stream_filter_append($fp, "string.rot13", -49);
 fwrite($fp, "This is a test\n");
@@ -18,7 +18,7 @@ var_dump(file_get_contents($filename));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(15) "Guvf vf n grfg
 "
 Done
diff --git a/ext/standard/tests/file/bug37158.phpt b/ext/standard/tests/file/bug37158.phpt
index 48df46cc639..68a07c15393 100644
--- a/ext/standard/tests/file/bug37158.phpt
+++ b/ext/standard/tests/file/bug37158.phpt
@@ -4,8 +4,8 @@ Bug #37158 (if userspace stream is present, fread() reads in 8192 max, otherwise
 <?php
 
 class VariableStream {
-   
-   function stream_open($path, $mode, $options, &$opened_path) 
+
+   function stream_open($path, $mode, $options, &$opened_path)
    {
        return true;
    }
@@ -33,7 +33,7 @@ unlink($file);
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(26) "size of contents 1 = 20000"
 string(26) "size of contents 2 = 40960"
 Done
diff --git a/ext/standard/tests/file/bug38086.phpt b/ext/standard/tests/file/bug38086.phpt
index d92289ef6eb..0544e06692c 100644
--- a/ext/standard/tests/file/bug38086.phpt
+++ b/ext/standard/tests/file/bug38086.phpt
@@ -37,7 +37,7 @@ unlink($new_file);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(%d)
 string(134) "Nabgure qnl
 Jura gur cnvaf bs yvsr jba'g one zl jnl
diff --git a/ext/standard/tests/file/bug38450.phpt b/ext/standard/tests/file/bug38450.phpt
index 2b59f50750f..6fd653de449 100644
--- a/ext/standard/tests/file/bug38450.phpt
+++ b/ext/standard/tests/file/bug38450.phpt
@@ -101,7 +101,7 @@ var_dump($myvar);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(12) "constructor!"
 line1
 line2
diff --git a/ext/standard/tests/file/bug38450_1.phpt b/ext/standard/tests/file/bug38450_1.phpt
index 07ca7166f31..5cbcba303c5 100644
--- a/ext/standard/tests/file/bug38450_1.phpt
+++ b/ext/standard/tests/file/bug38450_1.phpt
@@ -101,7 +101,7 @@ var_dump($myvar);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(12) "constructor!"
 line1
 line2
diff --git a/ext/standard/tests/file/bug38450_2.phpt b/ext/standard/tests/file/bug38450_2.phpt
index 64c9f8d94a2..318a2a3eb92 100644
--- a/ext/standard/tests/file/bug38450_2.phpt
+++ b/ext/standard/tests/file/bug38450_2.phpt
@@ -101,7 +101,7 @@ var_dump($myvar);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 
 Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %s on line %d
 
diff --git a/ext/standard/tests/file/bug38450_3.phpt b/ext/standard/tests/file/bug38450_3.phpt
index a72a00310dc..0bcaeb2a89f 100644
--- a/ext/standard/tests/file/bug38450_3.phpt
+++ b/ext/standard/tests/file/bug38450_3.phpt
@@ -101,7 +101,7 @@ var_dump($myvar);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %sbug38450_3.php on line %d
 
 Fatal error: Uncaught ArgumentCountError: Too few arguments to function VariableStream::__construct(), 0 passed and exactly 1 expected in %sbug38450_3.php:7
diff --git a/ext/standard/tests/file/bug39551.phpt b/ext/standard/tests/file/bug39551.phpt
index c047a306ece..8cd8ca8a67f 100644
--- a/ext/standard/tests/file/bug39551.phpt
+++ b/ext/standard/tests/file/bug39551.phpt
@@ -20,5 +20,5 @@ stream_get_contents($s);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Done
diff --git a/ext/standard/tests/file/bug39673.phpt b/ext/standard/tests/file/bug39673.phpt
index 00c29b28dad..f12f2e04448 100644
--- a/ext/standard/tests/file/bug39673.phpt
+++ b/ext/standard/tests/file/bug39673.phpt
@@ -28,7 +28,7 @@ foreach ($offsets as $offset) {
 @unlink($filename);
 echo "Done\n";
 ?>
---EXPECTF-- 
+--EXPECTF--
 int(1)
 int(13824)
 int(0)
diff --git a/ext/standard/tests/file/bug40374.phpt b/ext/standard/tests/file/bug40374.phpt
index 327289eba26..c1f1bc57967 100644
--- a/ext/standard/tests/file/bug40374.phpt
+++ b/ext/standard/tests/file/bug40374.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #40374 (php_shutdown_temporary_directory() tries to free local value) 
+Bug #40374 (php_shutdown_temporary_directory() tries to free local value)
 --FILE--
 <?php
 
@@ -12,6 +12,6 @@ unlink($file);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(%d) "%s"
 Done
diff --git a/ext/standard/tests/file/bug41693.phpt b/ext/standard/tests/file/bug41693.phpt
index 6c7ff5bf4ba..ea074fa4fdd 100644
--- a/ext/standard/tests/file/bug41693.phpt
+++ b/ext/standard/tests/file/bug41693.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #41693 (scandir() allows empty directory names) 
+Bug #41693 (scandir() allows empty directory names)
 --FILE--
 <?php
 
@@ -7,7 +7,7 @@ var_dump(scandir(''));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: scandir(): Directory name cannot be empty in %s on line %d
 bool(false)
 Done
diff --git a/ext/standard/tests/file/bug41815.phpt b/ext/standard/tests/file/bug41815.phpt
index f77468d96d1..5411000fc10 100644
--- a/ext/standard/tests/file/bug41815.phpt
+++ b/ext/standard/tests/file/bug41815.phpt
@@ -22,6 +22,6 @@ fclose($reader);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 OK
 Done
diff --git a/ext/standard/tests/file/bug66509.phpt b/ext/standard/tests/file/bug66509.phpt
index 0e414f23214..ff49a554a41 100644
--- a/ext/standard/tests/file/bug66509.phpt
+++ b/ext/standard/tests/file/bug66509.phpt
@@ -4,9 +4,9 @@ Bug #66509 (copy() showing $context parameter as required)
 <?php
 
 $r = new \ReflectionFunction('copy');
- 
+
 foreach($r->getParameters() as $p) {
-    var_dump($p->isOptional());	
+    var_dump($p->isOptional());
 }
 ?>
 --EXPECT--
diff --git a/ext/standard/tests/file/bug72035.phpt b/ext/standard/tests/file/bug72035.phpt
index a2abbb7f35e..feb4eb9acda 100644
--- a/ext/standard/tests/file/bug72035.phpt
+++ b/ext/standard/tests/file/bug72035.phpt
@@ -24,7 +24,7 @@ $cmd = "$cgi -n -C $fl";
 $desc = array(0 => array("pipe", "r"));
 $proc = proc_open($cmd, $desc, $pipes, getcwd(), array());
 if (is_resource($proc)) {
-	echo stream_get_contents($pipes[0]);	
+	echo stream_get_contents($pipes[0]);
 
 	proc_close($proc);
 }
diff --git a/ext/standard/tests/file/chmod_error.phpt b/ext/standard/tests/file/chmod_error.phpt
index f4cae3b5cfa..3b234c741ff 100644
--- a/ext/standard/tests/file/chmod_error.phpt
+++ b/ext/standard/tests/file/chmod_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test chmod() function : error conditions 
+Test chmod() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool chmod(string filename, int mode)
- * Description: Change file mode 
+ * Description: Change file mode
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing chmod() : error conditions ***\n";
diff --git a/ext/standard/tests/file/chmod_variation2-win32-mb.phpt b/ext/standard/tests/file/chmod_variation2-win32-mb.phpt
index abfb3e6f4c7..c7732a2926e 100644
--- a/ext/standard/tests/file/chmod_variation2-win32-mb.phpt
+++ b/ext/standard/tests/file/chmod_variation2-win32-mb.phpt
@@ -32,7 +32,7 @@ var_dump(chmod($filepath, 0777));
 var_dump(chmod("./$test_dirname/bad_dir/../../$filename", 0755));
 clearstatcache();
 printf("%o\n", fileperms($filepath) & PERMISSIONS_MASK);
- 
+
 echo "\nchmod() on a relative path from a different working directory\n";
 chdir($test_dirname);
 var_dump(chmod("../$filename", 0777));
diff --git a/ext/standard/tests/file/chmod_variation2-win32.phpt b/ext/standard/tests/file/chmod_variation2-win32.phpt
index bc379ffcf72..2298f652ce1 100644
--- a/ext/standard/tests/file/chmod_variation2-win32.phpt
+++ b/ext/standard/tests/file/chmod_variation2-win32.phpt
@@ -32,7 +32,7 @@ var_dump(chmod($filepath, 0777));
 var_dump(chmod("./$test_dirname/bad_dir/../../$filename", 0755));
 clearstatcache();
 printf("%o\n", fileperms($filepath) & PERMISSIONS_MASK);
- 
+
 echo "\nchmod() on a relative path from a different working directory\n";
 chdir($test_dirname);
 var_dump(chmod("../$filename", 0777));
diff --git a/ext/standard/tests/file/chmod_variation2.phpt b/ext/standard/tests/file/chmod_variation2.phpt
index b193acfaf7a..c7a3db0fe7a 100644
--- a/ext/standard/tests/file/chmod_variation2.phpt
+++ b/ext/standard/tests/file/chmod_variation2.phpt
@@ -32,7 +32,7 @@ var_dump(chmod($filepath, 0777));
 var_dump(chmod("./$test_dirname/bad_dir/../../$filename", 0755));
 clearstatcache();
 printf("%o\n", fileperms($filepath) & PERMISSIONS_MASK);
- 
+
 echo "\nchmod() on a linked file\n";
 $linkname = "somelink";
 var_dump(symlink($filepath, $linkname));
diff --git a/ext/standard/tests/file/chmod_variation3.phpt b/ext/standard/tests/file/chmod_variation3.phpt
index 7c637b8560b..13d2f1f6676 100644
--- a/ext/standard/tests/file/chmod_variation3.phpt
+++ b/ext/standard/tests/file/chmod_variation3.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test chmod() function : first parameter variation 
+Test chmod() function : first parameter variation
 --FILE--
 <?php
 /* Prototype  : bool chmod(string filename, int mode)
- * Description: Change file mode 
+ * Description: Change file mode
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing chmod() : usage variation ***\n";
diff --git a/ext/standard/tests/file/chmod_variation4.phpt b/ext/standard/tests/file/chmod_variation4.phpt
index 1fa5ad53ff8..08dbc7ab083 100644
--- a/ext/standard/tests/file/chmod_variation4.phpt
+++ b/ext/standard/tests/file/chmod_variation4.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test chmod() function : second parameter variation 
+Test chmod() function : second parameter variation
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only");
 --FILE--
 <?php
 /* Prototype  : bool chmod(string filename, int mode)
- * Description: Change file mode 
+ * Description: Change file mode
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing chmod() : usage variation ***\n";
diff --git a/ext/standard/tests/file/copy_basic.phpt b/ext/standard/tests/file/copy_basic.phpt
index 32788f9f74c..d23a27839ae 100644
--- a/ext/standard/tests/file/copy_basic.phpt
+++ b/ext/standard/tests/file/copy_basic.phpt
@@ -7,7 +7,7 @@ Test copy() function: basic functionality
  *              Returns TRUE on success or FALSE on failure.
  */
 
-echo "*** Testing copy() function: to copy file from source to destination --\n"; 
+echo "*** Testing copy() function: to copy file from source to destination --\n";
 
 var_dump( file_exists(__FILE__) );
 
diff --git a/ext/standard/tests/file/copy_error.phpt b/ext/standard/tests/file/copy_error.phpt
index 96072ebfbad..ad723370e42 100644
--- a/ext/standard/tests/file/copy_error.phpt
+++ b/ext/standard/tests/file/copy_error.phpt
@@ -7,7 +7,7 @@ Test copy() function: error conditions
  *              Returns TRUE on success or FALSE on failure.
  */
 
-echo "*** Testing copy() function: error conditions --\n"; 
+echo "*** Testing copy() function: error conditions --\n";
 /* Invalid args */
 var_dump( copy("/no/file", "file") );
 
diff --git a/ext/standard/tests/file/copy_variation1.phpt b/ext/standard/tests/file/copy_variation1.phpt
index 7cf20fd7494..aa1584b98a1 100644
--- a/ext/standard/tests/file/copy_variation1.phpt
+++ b/ext/standard/tests/file/copy_variation1.phpt
@@ -7,7 +7,7 @@ Test copy() function: usage variations - destination file names(numerics/strings
      Returns TRUE on success or FALSE on failure.
 */
 
-/* Test copy() function: In creation of destination file names containing numerics/strings 
+/* Test copy() function: In creation of destination file names containing numerics/strings
      and checking the existence and size of destination files
 */
 
diff --git a/ext/standard/tests/file/copy_variation10.phpt b/ext/standard/tests/file/copy_variation10.phpt
index c5cbc84254b..1298cffc9a3 100644
--- a/ext/standard/tests/file/copy_variation10.phpt
+++ b/ext/standard/tests/file/copy_variation10.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test copy() function: usage variations - identical names 
+Test copy() function: usage variations - identical names
 --FILE--
 <?php
 /* Prototype: bool copy ( string $source, string $dest );
@@ -17,8 +17,8 @@ $file_handle =  fopen($file, "w");
 fwrite($file_handle, str_repeat("Hello2world...\n", 100));
 fclose($file_handle);
 
-var_dump( copy($file, $file) ); 
-var_dump( file_exists($file) );  
+var_dump( copy($file, $file) );
+var_dump( file_exists($file) );
 var_dump( filesize($file) );
 
 echo "*** Done ***\n";
diff --git a/ext/standard/tests/file/copy_variation11.phpt b/ext/standard/tests/file/copy_variation11.phpt
index b01dab08900..aabaa4cd4ec 100644
--- a/ext/standard/tests/file/copy_variation11.phpt
+++ b/ext/standard/tests/file/copy_variation11.phpt
@@ -28,7 +28,7 @@ var_dump( filesize($dir) );  //size of destination before copy
 clearstatcache();
 
 echo "\n-- Now applying copy() operation --\n";
-var_dump( copy($file, $dir) );  //expected: bool(false) 
+var_dump( copy($file, $dir) );  //expected: bool(false)
 
 var_dump( file_exists($file) );  //expected: bool(true)
 var_dump( file_exists($dir) );  //expected: bool(true)
diff --git a/ext/standard/tests/file/copy_variation14.phpt b/ext/standard/tests/file/copy_variation14.phpt
index 6eb8fe3ee40..1c30d361a08 100644
--- a/ext/standard/tests/file/copy_variation14.phpt
+++ b/ext/standard/tests/file/copy_variation14.phpt
@@ -7,7 +7,7 @@ Test copy() function: usage variations - non existing src/dest
      Returns TRUE on success or FALSE on failure.
 */
 
-/* Test copy(): Trying to create a copy of non-existing source in an existing destination 
+/* Test copy(): Trying to create a copy of non-existing source in an existing destination
      and an existing source in non-existing destiantion */
 
 $file_path = dirname(__FILE__);
diff --git a/ext/standard/tests/file/copy_variation15.phpt b/ext/standard/tests/file/copy_variation15.phpt
index fdc84e989a9..546cbbb2f2f 100644
--- a/ext/standard/tests/file/copy_variation15.phpt
+++ b/ext/standard/tests/file/copy_variation15.phpt
@@ -40,7 +40,7 @@ chmod($dir, 0555);  //dir without write permissions
 
 $dest = $dir."/copy_copy_variation15.tmp";
 
-var_dump( copy($file, $dir."/copy_copy_variation15.tmp") ); 
+var_dump( copy($file, $dir."/copy_copy_variation15.tmp") );
 var_dump( file_exists($dir."/copy_copy_variation15_dir.tmp") );
 var_dump( filesize($file) );  //size of source
 
diff --git a/ext/standard/tests/file/copy_variation16-win32.phpt b/ext/standard/tests/file/copy_variation16-win32.phpt
index eff56a1ec79..c2cb464a996 100644
--- a/ext/standard/tests/file/copy_variation16-win32.phpt
+++ b/ext/standard/tests/file/copy_variation16-win32.phpt
@@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN")
      Returns TRUE on success or FALSE on failure.
 */
 
-/* Test copy() function: Trying to create copy of source file 
+/* Test copy() function: Trying to create copy of source file
      into different destination dir paths given in various notations */
 
 echo "*** Testing copy() function: copying data file across directories ***\n";
diff --git a/ext/standard/tests/file/copy_variation16.phpt b/ext/standard/tests/file/copy_variation16.phpt
index e36fee1d666..1ef9da1ae69 100644
--- a/ext/standard/tests/file/copy_variation16.phpt
+++ b/ext/standard/tests/file/copy_variation16.phpt
@@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN")
      Returns TRUE on success or FALSE on failure.
 */
 
-/* Test copy() function: Trying to create copy of source file 
+/* Test copy() function: Trying to create copy of source file
      into different destination dir paths given in various notations */
 
 echo "*** Testing copy() function: copying data file across directories ***\n";
diff --git a/ext/standard/tests/file/copy_variation17.phpt b/ext/standard/tests/file/copy_variation17.phpt
index 2dfe94c6e9a..73ccc718407 100644
--- a/ext/standard/tests/file/copy_variation17.phpt
+++ b/ext/standard/tests/file/copy_variation17.phpt
@@ -32,11 +32,11 @@ $dest_file_name = $dir."/copy_copy_variation17.tmp";
 
 $count = 1;
 foreach($src_file_names as $src_file_name) {
-  var_dump( copy($src_file_name, $dest_file_name) ); 
+  var_dump( copy($src_file_name, $dest_file_name) );
   var_dump( file_exists($dest_file_name) );
 
   if( file_exists($dest_file_name) ) {
-  var_dump( filesize($dest_file_name) );  //size of destination 
+  var_dump( filesize($dest_file_name) );  //size of destination
   unlink($dest_file_name);
   }
 
diff --git a/ext/standard/tests/file/copy_variation18.phpt b/ext/standard/tests/file/copy_variation18.phpt
index 53467af8a3c..534902d7d49 100644
--- a/ext/standard/tests/file/copy_variation18.phpt
+++ b/ext/standard/tests/file/copy_variation18.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test copy() function: usage variations - stat after copy 
+Test copy() function: usage variations - stat after copy
 --FILE--
 <?php
 /* Prototype: bool copy ( string $source, string $dest );
@@ -27,13 +27,13 @@ $stat_before_copy = stat($src_file_name);
 clearstatcache();
 
 echo "Copy operation => ";
-var_dump( copy($src_file_name, $dest_file_name) ); 
+var_dump( copy($src_file_name, $dest_file_name) );
 
 $stat_after_copy = stat($src_file_name);
 clearstatcache();
 
 // compare all stat fields except access time
-$stat_keys_to_compare = array("dev", "ino", "mode", "nlink", "uid", "gid", 
+$stat_keys_to_compare = array("dev", "ino", "mode", "nlink", "uid", "gid",
                        "rdev", "size", "mtime", "ctime",
                        "blksize", "blocks");
 
diff --git a/ext/standard/tests/file/copy_variation2-win32-mb.phpt b/ext/standard/tests/file/copy_variation2-win32-mb.phpt
index 95688c97c51..cb7c96fa0bb 100644
--- a/ext/standard/tests/file/copy_variation2-win32-mb.phpt
+++ b/ext/standard/tests/file/copy_variation2-win32-mb.phpt
@@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 
 echo "*** Test copy() function: destination file names containing special characters ***\n";
 $file_path = dirname(__FILE__);
-$src_file_name = $file_path."/copy_variation2��ガラスを食�られ��.tmp"; 
+$src_file_name = $file_path."/copy_variation2��ガラスを食�られ��.tmp";
 $file_handle = fopen($src_file_name, "w");
 fwrite( $file_handle, str_repeat("Hello2World...\n", 100) );
 fclose($file_handle);
@@ -27,7 +27,7 @@ fclose($file_handle);
 $dest_files = array(
 
   /* File names containing special(non-alpha numeric) characters */
-  "_copy_variation2.tmp", 
+  "_copy_variation2.tmp",
   "@copy_variation2.tmp",
   "#copy_variation2.tmp",
   "+copy_variation2.tmp",
diff --git a/ext/standard/tests/file/copy_variation2-win32.phpt b/ext/standard/tests/file/copy_variation2-win32.phpt
index 82235ba8144..029c6c5f8e9 100644
--- a/ext/standard/tests/file/copy_variation2-win32.phpt
+++ b/ext/standard/tests/file/copy_variation2-win32.phpt
@@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 
 echo "*** Test copy() function: destination file names containing special characters ***\n";
 $file_path = dirname(__FILE__);
-$src_file_name = $file_path."/copy_variation2.tmp"; 
+$src_file_name = $file_path."/copy_variation2.tmp";
 $file_handle = fopen($src_file_name, "w");
 fwrite( $file_handle, str_repeat("Hello2World...\n", 100) );
 fclose($file_handle);
@@ -27,7 +27,7 @@ fclose($file_handle);
 $dest_files = array(
 
   /* File names containing special(non-alpha numeric) characters */
-  "_copy_variation2.tmp", 
+  "_copy_variation2.tmp",
   "@copy_variation2.tmp",
   "#copy_variation2.tmp",
   "+copy_variation2.tmp",
diff --git a/ext/standard/tests/file/copy_variation2.phpt b/ext/standard/tests/file/copy_variation2.phpt
index a9b36803d9b..681a00750cb 100644
--- a/ext/standard/tests/file/copy_variation2.phpt
+++ b/ext/standard/tests/file/copy_variation2.phpt
@@ -18,7 +18,7 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 
 echo "*** Test copy() function: destination file names containing special characters ***\n";
 $file_path = dirname(__FILE__);
-$src_file_name = $file_path."/copy_variation2.tmp"; 
+$src_file_name = $file_path."/copy_variation2.tmp";
 $file_handle = fopen($src_file_name, "w");
 fwrite( $file_handle, str_repeat("Hello2World...\n", 100) );
 fclose($file_handle);
@@ -27,7 +27,7 @@ fclose($file_handle);
 $dest_files = array(
 
   /* File names containing special(non-alpha numeric) characters */
-  "_copy_variation2.tmp", 
+  "_copy_variation2.tmp",
   "@copy_variation2.tmp",
   "#copy_variation2.tmp",
   "+copy_variation2.tmp",
diff --git a/ext/standard/tests/file/copy_variation3-win32.phpt b/ext/standard/tests/file/copy_variation3-win32.phpt
index 5055c297f6e..259412f4603 100644
--- a/ext/standard/tests/file/copy_variation3-win32.phpt
+++ b/ext/standard/tests/file/copy_variation3-win32.phpt
@@ -30,7 +30,7 @@ $dest_files = array(
   "copy variation3.tmp",  //file name containing blank space
   " copy_variation3.tmp",  //file name starts with blank space
   "copy\tvariation3.tmp",
-  " ",  //blank space as file name 
+  " ",  //blank space as file name
 );
 
 echo "Size of the source file before copy operation => ";
@@ -43,9 +43,9 @@ foreach($dest_files as $dest_file) {
 
   echo "\n-- Iteration $count --\n";
   $dest_file_name = $dest_file;
-  
+
   echo "Copy operation => ";
-  var_dump( copy($src_file_name, $dest_file_name) );  
+  var_dump( copy($src_file_name, $dest_file_name) );
 
   echo "Existence of destination file => ";
   var_dump( file_exists($dest_file_name) );
diff --git a/ext/standard/tests/file/copy_variation3.phpt b/ext/standard/tests/file/copy_variation3.phpt
index 56f797bc953..3bc0bfd139a 100644
--- a/ext/standard/tests/file/copy_variation3.phpt
+++ b/ext/standard/tests/file/copy_variation3.phpt
@@ -30,7 +30,7 @@ $dest_files = array(
   "copy variation3.tmp",  //file name containing blank space
   " copy_variation3.tmp",  //file name starts with blank space
   "copy\tvariation3.tmp",
-  " ",  //blank space as file name 
+  " ",  //blank space as file name
 );
 
 echo "Size of the source file before copy operation => ";
@@ -43,9 +43,9 @@ foreach($dest_files as $dest_file) {
 
   echo "\n-- Iteration $count --\n";
   $dest_file_name = $dest_file;
-  
+
   echo "Copy operation => ";
-  var_dump( copy($src_file_name, $dest_file_name) );  
+  var_dump( copy($src_file_name, $dest_file_name) );
 
   echo "Existence of destination file => ";
   var_dump( file_exists($dest_file_name) );
diff --git a/ext/standard/tests/file/copy_variation4.phpt b/ext/standard/tests/file/copy_variation4.phpt
index 47152d4239c..f856d1665ab 100644
Binary files a/ext/standard/tests/file/copy_variation4.phpt and b/ext/standard/tests/file/copy_variation4.phpt differ
diff --git a/ext/standard/tests/file/copy_variation5-win32.phpt b/ext/standard/tests/file/copy_variation5-win32.phpt
index 48e85eaf022..1245191806b 100644
--- a/ext/standard/tests/file/copy_variation5-win32.phpt
+++ b/ext/standard/tests/file/copy_variation5-win32.phpt
@@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN")
      Returns TRUE on success or FALSE on failure.
 */
 
-/* Test copy() function: Checking case sensitivity in creation of destination file names 
+/* Test copy() function: Checking case sensitivity in creation of destination file names
      and the existence and size of destination files
 */
 
@@ -27,7 +27,7 @@ fclose($file_handle);
 $dest_files = array(
 
   /* Checking case sensitiveness */
-  "COPY.tmp", 
+  "COPY.tmp",
   "COPY.TMP",
   "CopY.TMP"
 );
diff --git a/ext/standard/tests/file/copy_variation5.phpt b/ext/standard/tests/file/copy_variation5.phpt
index c480fcc3bf1..df13f4bd1a7 100644
--- a/ext/standard/tests/file/copy_variation5.phpt
+++ b/ext/standard/tests/file/copy_variation5.phpt
@@ -12,7 +12,7 @@ if( (stristr(PHP_OS, "Darwin")) || (stristr(PHP_OS, "Win")) )
      Returns TRUE on success or FALSE on failure.
 */
 
-/* Test copy() function: Checking case sensitivity in creation of destination file names 
+/* Test copy() function: Checking case sensitivity in creation of destination file names
      and the existence and size of destination files
 */
 
diff --git a/ext/standard/tests/file/copy_variation6-win32.phpt b/ext/standard/tests/file/copy_variation6-win32.phpt
index 524b21d377c..9d4fb9d9c9d 100644
--- a/ext/standard/tests/file/copy_variation6-win32.phpt
+++ b/ext/standard/tests/file/copy_variation6-win32.phpt
@@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) != "WIN")
      Returns TRUE on success or FALSE on failure.
 */
 
-/* Test copy() function: Trying to create copy of source file 
+/* Test copy() function: Trying to create copy of source file
      into different destination dir paths given in various notations */
 
 echo "*** Test copy() function: copying file across directories ***\n";
diff --git a/ext/standard/tests/file/copy_variation6.phpt b/ext/standard/tests/file/copy_variation6.phpt
index 3213c6b4368..2ce9bb30727 100644
--- a/ext/standard/tests/file/copy_variation6.phpt
+++ b/ext/standard/tests/file/copy_variation6.phpt
@@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN")
      Returns TRUE on success or FALSE on failure.
 */
 
-/* Test copy() function: Trying to create copy of source file 
+/* Test copy() function: Trying to create copy of source file
      into different destination dir paths given in various notations */
 
 echo "*** Test copy() function: copying file across directories ***\n";
diff --git a/ext/standard/tests/file/copy_variation8.phpt b/ext/standard/tests/file/copy_variation8.phpt
index 63f57f3a25a..52ad6892ae0 100644
--- a/ext/standard/tests/file/copy_variation8.phpt
+++ b/ext/standard/tests/file/copy_variation8.phpt
@@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN")
      Returns TRUE on success or FALSE on failure.
 */
 
-/* Trying to copy the links across dir paths given in various notations 
+/* Trying to copy the links across dir paths given in various notations
      and dirs having limited access */
 
 echo "*** Testing copy() function: copying links across different directories ***\n";
diff --git a/ext/standard/tests/file/copy_variation9.phpt b/ext/standard/tests/file/copy_variation9.phpt
index 34d5b907d97..e2817aaef3c 100644
--- a/ext/standard/tests/file/copy_variation9.phpt
+++ b/ext/standard/tests/file/copy_variation9.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test copy() function: usage variations - destination file access perms 
+Test copy() function: usage variations - destination file access perms
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == 'WIN')
diff --git a/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt b/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt
index 87f85230b54..1e7f016e7f1 100644
--- a/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt
+++ b/ext/standard/tests/file/directory_wrapper_fstat_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function fstat() on directory wrapper 
+Test function fstat() on directory wrapper
 --FILE--
 <?php
 $d = dirname(__FILE__);
diff --git a/ext/standard/tests/file/dirname_basic-win32.phpt b/ext/standard/tests/file/dirname_basic-win32.phpt
index 61a6e33f5a0..ed59582b1bd 100644
--- a/ext/standard/tests/file/dirname_basic-win32.phpt
+++ b/ext/standard/tests/file/dirname_basic-win32.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test dirname() function : basic functionality 
+Test dirname() function : basic functionality
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : string dirname(string path)
- * Description: Returns the directory name component of the path 
+ * Description: Returns the directory name component of the path
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing dirname() : basic functionality ***\n";
@@ -49,7 +49,7 @@ $paths = array(
 			' c:',
 			'		c:\test\adir\afile.txt',
 			'/usr',
-			'/usr/',			
+			'/usr/',
 			);
 
 foreach ($paths as $path) {
diff --git a/ext/standard/tests/file/dirname_basic.phpt b/ext/standard/tests/file/dirname_basic.phpt
index 8f1944e2c7e..1934e8ed0d3 100644
--- a/ext/standard/tests/file/dirname_basic.phpt
+++ b/ext/standard/tests/file/dirname_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test dirname() function : basic functionality 
+Test dirname() function : basic functionality
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : string dirname(string path)
- * Description: Returns the directory name component of the path 
+ * Description: Returns the directory name component of the path
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing dirname() : basic functionality ***\n";
@@ -49,7 +49,7 @@ $paths = array(
 			' c:',
 			'		c:\test\adir\afile.txt',
 			'/usr',
-			'/usr/'			
+			'/usr/'
 			);
 
 foreach ($paths as $path) {
diff --git a/ext/standard/tests/file/dirname_error.phpt b/ext/standard/tests/file/dirname_error.phpt
index 515a3988d5c..4181823b92d 100644
--- a/ext/standard/tests/file/dirname_error.phpt
+++ b/ext/standard/tests/file/dirname_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test dirname() function : error conditions 
+Test dirname() function : error conditions
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : string dirname(string path)
- * Description: Returns the directory name component of the path 
+ * Description: Returns the directory name component of the path
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing dirname() : error conditions ***\n";
diff --git a/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt b/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt
index 283834e8ce2..2bb227b5c26 100644
--- a/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt
+++ b/ext/standard/tests/file/dirname_no_path_normalization-win32.phpt
@@ -19,7 +19,7 @@ if (strlen($s) >= 10000) {
 	print "ERROR: " . PHP_EOL;
 	var_dump(dirname($s));
 	var_dump(strlen($s));
-} 
+}
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/file/dirname_variation1.phpt b/ext/standard/tests/file/dirname_variation1.phpt
index 15041ffd535..fd7aec12107 100644
--- a/ext/standard/tests/file/dirname_variation1.phpt
+++ b/ext/standard/tests/file/dirname_variation1.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test dirname() function : usage variation 
+Test dirname() function : usage variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : string dirname(string path)
- * Description: Returns the directory name component of the path 
+ * Description: Returns the directory name component of the path
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing dirname() : usage variation ***\n";
diff --git a/ext/standard/tests/file/disk.phpt b/ext/standard/tests/file/disk.phpt
index 6eef4b4a772..a048af6ccbf 100644
--- a/ext/standard/tests/file/disk.phpt
+++ b/ext/standard/tests/file/disk.phpt
@@ -25,7 +25,7 @@ var_dump(disk_total_space("/some/path/here"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: disk_free_space() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
diff --git a/ext/standard/tests/file/disk_free_space_basic.phpt b/ext/standard/tests/file/disk_free_space_basic.phpt
index 57446b6ee03..9dbbea4e314 100644
--- a/ext/standard/tests/file/disk_free_space_basic.phpt
+++ b/ext/standard/tests/file/disk_free_space_basic.phpt
@@ -10,23 +10,23 @@ memory_limit=32M
 <?php
 /*
  *  Prototype: float disk_free_space( string directory )
- *  Description: Given a string containing a directory, this function 
- *               will return the number of bytes available on the corresponding 
+ *  Description: Given a string containing a directory, this function
+ *               will return the number of bytes available on the corresponding
  *               filesystem or disk partition
  */
 
 $file_path = dirname(__FILE__);
 
 echo "*** Testing with existing directory ***\n";
-var_dump( disk_free_space($file_path) ); 
-var_dump( diskfreespace($file_path) ); 
+var_dump( disk_free_space($file_path) );
+var_dump( diskfreespace($file_path) );
 
 echo "*** Testing with newly created directory ***\n";
 $dir = "/disk_free_space";
 mkdir($file_path.$dir);
 echo" \n Free Space before writing to a file\n";
-$space1 =  disk_free_space($file_path.$dir); 
-var_dump( $space1 ); 
+$space1 =  disk_free_space($file_path.$dir);
+var_dump( $space1 );
 
 $fh = fopen($file_path.$dir."/disk_free_space.tmp", "a");
 $data = str_repeat("x", 0xffff);
@@ -34,8 +34,8 @@ fwrite($fh, $data);
 fclose($fh);
 
 echo "\n Free Space after writing to a file\n";
-$space2 =  disk_free_space($file_path.$dir); 
-var_dump( $space2 ); 
+$space2 =  disk_free_space($file_path.$dir);
+var_dump( $space2 );
 
 if($space1 > $space2 )
   echo "\n Free Space Value Is Correct\n";
@@ -45,7 +45,7 @@ else {
 }
 
 echo "*** Testing with Binary Input ***\n";
-var_dump( disk_free_space(b"$file_path") ); 
+var_dump( disk_free_space(b"$file_path") );
 
 echo"\n--- Done ---";
 ?>
diff --git a/ext/standard/tests/file/disk_free_space_error-win32.phpt b/ext/standard/tests/file/disk_free_space_error-win32.phpt
index 21e7bf653db..27a1c0def68 100644
--- a/ext/standard/tests/file/disk_free_space_error-win32.phpt
+++ b/ext/standard/tests/file/disk_free_space_error-win32.phpt
@@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' )
 /*
  *  Prototype: float disk_free_space( string directory )
  *  Description: Given a string containing a directory, this function will
- *               return the number of bytes available on the corresponding 
+ *               return the number of bytes available on the corresponding
  *               filesystem or disk partition
  */
 
diff --git a/ext/standard/tests/file/disk_free_space_error.phpt b/ext/standard/tests/file/disk_free_space_error.phpt
index ab2ad090812..a62954c74f9 100644
--- a/ext/standard/tests/file/disk_free_space_error.phpt
+++ b/ext/standard/tests/file/disk_free_space_error.phpt
@@ -9,8 +9,8 @@ if(substr(PHP_OS, 0, 3) == 'WIN')
 <?php
 /*
  *  Prototype: float disk_free_space( string directory )
- *  Description: Given a string containing a directory, this function will 
- *               return the number of bytes available on the corresponding 
+ *  Description: Given a string containing a directory, this function will
+ *               return the number of bytes available on the corresponding
  *               filesystem or disk partition
  */
 
diff --git a/ext/standard/tests/file/disk_free_space_variation.phpt b/ext/standard/tests/file/disk_free_space_variation.phpt
index adb1acaf829..e59079eac0c 100644
--- a/ext/standard/tests/file/disk_free_space_variation.phpt
+++ b/ext/standard/tests/file/disk_free_space_variation.phpt
@@ -4,7 +4,7 @@ Test disk_free_space and its alias diskfreespace() functions : Usage Variations
 <?php
 /*
  *  Prototype: float disk_free_space( string directory )
- *  Description: Given a string containing a directory, this function 
+ *  Description: Given a string containing a directory, this function
  *               will return the number of bytes available on the corresponding
  *               filesystem or disk partition
  */
@@ -12,11 +12,11 @@ Test disk_free_space and its alias diskfreespace() functions : Usage Variations
 $file_path = dirname(__FILE__);
 
 echo "*** Testing with a directory ***\n";
-var_dump( disk_free_space($file_path."/..") ); 
-var_dump( diskfreespace($file_path."/..") ); 
+var_dump( disk_free_space($file_path."/..") );
+var_dump( diskfreespace($file_path."/..") );
 
 echo "\nTesting for the return type ***\n";
-$return_value = disk_free_space($file_path); 
+$return_value = disk_free_space($file_path);
 var_dump( is_float($return_value) );
 
 echo "\n*** Testing with different directory combinations ***";
diff --git a/ext/standard/tests/file/disk_total_space_basic.phpt b/ext/standard/tests/file/disk_total_space_basic.phpt
index cfef2a42452..b2cb79edfd5 100644
--- a/ext/standard/tests/file/disk_total_space_basic.phpt
+++ b/ext/standard/tests/file/disk_total_space_basic.phpt
@@ -4,7 +4,7 @@ Test disk_total_space() function : basic functionality
 <?php
 /*
  *  Prototype: float disk_total_space( string $directory );
- *  Description: given a string containing a directory, this function will 
+ *  Description: given a string containing a directory, this function will
  *               return the total number of bytes on the corresponding filesyatem
  *               or disk partition.
  */
diff --git a/ext/standard/tests/file/disk_total_space_error-win32.phpt b/ext/standard/tests/file/disk_total_space_error-win32.phpt
index a3ea183194b..3fe54b53204 100644
--- a/ext/standard/tests/file/disk_total_space_error-win32.phpt
+++ b/ext/standard/tests/file/disk_total_space_error-win32.phpt
@@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' )
 /*
  *  Prototype: float disk_total_space( string $directory );
  *  Description: given a string containing a directory, this function
- *               will return the total number of bytes on the corresponding 
+ *               will return the total number of bytes on the corresponding
  *               filesystem or disk partition
  */
 
diff --git a/ext/standard/tests/file/disk_total_space_error.phpt b/ext/standard/tests/file/disk_total_space_error.phpt
index b60ad6048f2..de37851d267 100644
--- a/ext/standard/tests/file/disk_total_space_error.phpt
+++ b/ext/standard/tests/file/disk_total_space_error.phpt
@@ -9,8 +9,8 @@ if(substr(PHP_OS, 0, 3) == 'WIN')
 <?php
 /*
  *  Prototype: float disk_total_space( string $directory );
- *  Description: given a string containing a directory, this function 
- *               will return the total number of bytes on the corresponding 
+ *  Description: given a string containing a directory, this function
+ *               will return the total number of bytes on the corresponding
  *               filesystem or disk partition
  */
 
diff --git a/ext/standard/tests/file/disk_total_space_variation.phpt b/ext/standard/tests/file/disk_total_space_variation.phpt
index ba2ceb2d1b9..4e94774a740 100644
--- a/ext/standard/tests/file/disk_total_space_variation.phpt
+++ b/ext/standard/tests/file/disk_total_space_variation.phpt
@@ -4,18 +4,18 @@ Testing disk_total_space() functions : Usage Variations.
 <?php
 /*
  *  Prototype: float disk_total_space( string directory )
- *  Description: given a string containing a directory, this function 
- *               will return the total number of bytes on the corresponding 
+ *  Description: given a string containing a directory, this function
+ *               will return the total number of bytes on the corresponding
  *               filesystem or disk partition.
  */
 
 $file_path = dirname(__FILE__);
 
 echo "*** Testing with a directory ***\n";
-var_dump( disk_total_space($file_path."/..") ); 
+var_dump( disk_total_space($file_path."/..") );
 
 echo "\nTesting for the return type ***\n";
-$return_value = disk_total_space($file_path); 
+$return_value = disk_total_space($file_path);
 var_dump( is_float($return_value) );
 
 echo "\n*** Testing with different directory combinations ***";
@@ -54,7 +54,7 @@ foreach($dirs_arr as $dir1) {
 }
 
 echo "*** Testing with Binary Input ***\n";
-var_dump( disk_total_space(b"$file_path") ); 
+var_dump( disk_total_space(b"$file_path") );
 
 echo"\n--- Done ---";
 ?>
diff --git a/ext/standard/tests/file/feof_basic.phpt b/ext/standard/tests/file/feof_basic.phpt
index 78774e58e9d..2fc2e4b8553 100644
--- a/ext/standard/tests/file/feof_basic.phpt
+++ b/ext/standard/tests/file/feof_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test feof() function : basic functionality 
+Test feof() function : basic functionality
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : proto bool feof(resource fp)
- * Description: Test for end-of-file on a file pointer 
+ * Description: Test for end-of-file on a file pointer
  * Source code: ext/standard/file.c
  * Alias to functions: gzeof
  */
@@ -31,7 +31,7 @@ while (!feof($h)) {
    $lastline = fgets($h);
 }
 echo $previousLine;
-var_dump($lastline); // this should be false 
+var_dump($lastline); // this should be false
 fclose($h);
 
 $tmpFile2 = __FILE__.".tmp2";
diff --git a/ext/standard/tests/file/fflush_error.phpt b/ext/standard/tests/file/fflush_error.phpt
index a334d8fea14..8cf9981b34c 100644
--- a/ext/standard/tests/file/fflush_error.phpt
+++ b/ext/standard/tests/file/fflush_error.phpt
@@ -21,7 +21,7 @@ $filename = "$file_path/fflush_error.tmp";
 $file_handle = fopen($filename, "w");
 if($file_handle == false)
   exit("Error:failed to open file $filename");
-   
+
 var_dump( fflush($file_handle, $file_handle) );
 fclose($file_handle);
 
diff --git a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt
index 80b8dedb655..a085e47a526 100644
--- a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt
+++ b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt
@@ -23,7 +23,7 @@ $file_modes = array("w", "wb", "wt", "w+", "w+b", "w+t",
                     "a", "ab", "at", "a+","a+b", "a+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t");
 
-$file_name = "$file_path/fflush_variation��ガラスを食�られ��1.tmp"; 
+$file_name = "$file_path/fflush_variation��ガラスを食�られ��1.tmp";
 
 $count = 1;
 
@@ -31,26 +31,26 @@ foreach( $file_types as $type ) {
   echo "-- Iteration $count with file containing $type Data--\n";
   foreach( $file_modes as $mode ) {
     echo "-- File opened in $mode mode --\n";
-    
+
     // creating the file except for x mode
     if( substr($mode, 0, 1) != "x" ) {
       $file_handle = fopen($file_name, "w");
       if($file_handle == false)
         exit("Error:failed to open file $file_name");
-      
+
       // filling the file some data if mode is append mode
-      if( substr($mode, 0, 1) == "a") 
+      if( substr($mode, 0, 1) == "a")
         fill_file($file_handle, $type, 10);
       fclose($file_handle);
-    } 
-  
-    // opening the file in different modes 
+    }
+
+    // opening the file in different modes
     $file_handle = fopen($file_name, $mode);
-    if($file_handle == false) 
+    if($file_handle == false)
       exit("Error:failed to open file $file_name");
-    
+
     // writing data to the file
-    var_dump( fill_file($file_handle, $type, 50) ); 
+    var_dump( fill_file($file_handle, $type, 50) );
     var_dump( fflush($file_handle) );
     fclose($file_handle);
 
diff --git a/ext/standard/tests/file/fflush_variation1-win32.phpt b/ext/standard/tests/file/fflush_variation1-win32.phpt
index 0b6b096a34c..b0e85fea170 100644
--- a/ext/standard/tests/file/fflush_variation1-win32.phpt
+++ b/ext/standard/tests/file/fflush_variation1-win32.phpt
@@ -23,7 +23,7 @@ $file_modes = array("w", "wb", "wt", "w+", "w+b", "w+t",
                     "a", "ab", "at", "a+","a+b", "a+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t");
 
-$file_name = "$file_path/fflush_variation1.tmp"; 
+$file_name = "$file_path/fflush_variation1.tmp";
 
 $count = 1;
 
@@ -31,26 +31,26 @@ foreach( $file_types as $type ) {
   echo "-- Iteration $count with file containing $type Data--\n";
   foreach( $file_modes as $mode ) {
     echo "-- File opened in $mode mode --\n";
-    
+
     // creating the file except for x mode
     if( substr($mode, 0, 1) != "x" ) {
       $file_handle = fopen($file_name, "w");
       if($file_handle == false)
         exit("Error:failed to open file $file_name");
-      
+
       // filling the file some data if mode is append mode
-      if( substr($mode, 0, 1) == "a") 
+      if( substr($mode, 0, 1) == "a")
         fill_file($file_handle, $type, 10);
       fclose($file_handle);
-    } 
-  
-    // opening the file in different modes 
+    }
+
+    // opening the file in different modes
     $file_handle = fopen($file_name, $mode);
-    if($file_handle == false) 
+    if($file_handle == false)
       exit("Error:failed to open file $file_name");
-    
+
     // writing data to the file
-    var_dump( fill_file($file_handle, $type, 50) ); 
+    var_dump( fill_file($file_handle, $type, 50) );
     var_dump( fflush($file_handle) );
     fclose($file_handle);
 
diff --git a/ext/standard/tests/file/fflush_variation1.phpt b/ext/standard/tests/file/fflush_variation1.phpt
index 2ecf7ea919e..7c91a7a23d6 100644
--- a/ext/standard/tests/file/fflush_variation1.phpt
+++ b/ext/standard/tests/file/fflush_variation1.phpt
@@ -23,7 +23,7 @@ $file_modes = array("w", "wb", "wt", "w+", "w+b", "w+t",
                     "a", "ab", "at", "a+","a+b", "a+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t");
 
-$file_name = "$file_path/fflush_variation1.tmp"; 
+$file_name = "$file_path/fflush_variation1.tmp";
 
 $count = 1;
 
@@ -31,7 +31,7 @@ foreach( $file_types as $type ) {
   echo "-- Iteration $count with file containing $type Data--\n";
   foreach( $file_modes as $mode ) {
     echo "-- File opened in $mode mode --\n";
-    
+
     // creating the file except for x mode
     if( substr($mode, 0, 1) != "x" ) {
       $file_handle = fopen($file_name, "w");
@@ -39,19 +39,19 @@ foreach( $file_types as $type ) {
       exit("Error:failed to open file $file_name");
 
     // filling the file with some data if mode is append mode
-    if( substr($mode, 0, 1) == "a") 
+    if( substr($mode, 0, 1) == "a")
       fill_file($file_handle, $type, 10);
     fclose($file_handle);
 
-    } 
-  
-    // opening the file in different modes 
+    }
+
+    // opening the file in different modes
     $file_handle = fopen($file_name, $mode);
-    if($file_handle == false) 
+    if($file_handle == false)
       exit("Error:failed to open file $file_name");
-    
+
     // writing data to the file
-    var_dump( fill_file($file_handle, $type, 50) ); 
+    var_dump( fill_file($file_handle, $type, 50) );
     var_dump( fflush($file_handle) );
     fclose($file_handle);
 
diff --git a/ext/standard/tests/file/fflush_variation2.phpt b/ext/standard/tests/file/fflush_variation2.phpt
index 651c7164396..2b28367b009 100644
--- a/ext/standard/tests/file/fflush_variation2.phpt
+++ b/ext/standard/tests/file/fflush_variation2.phpt
@@ -35,14 +35,14 @@ foreach( $file_types as $type ) {
     $file_handle = fopen($file_name, "w");
     if($file_handle == false)
       exit("Error:failed to open file $file_name");
-  
+
     //fill the file with some data if mode is append mode
-    if( substr($mode, 0, 1) == "a" ) 
-      fill_file($file_handle, $type, 10); 
-  
+    if( substr($mode, 0, 1) == "a" )
+      fill_file($file_handle, $type, 10);
+
     //close the file
     fclose($file_handle);
-  
+
     // creating the sym link
     var_dump( symlink($file_name, $symlink_name) );
     $file_handle = fopen($symlink_name, $mode);
@@ -50,10 +50,10 @@ foreach( $file_types as $type ) {
       exit("Error:failed to open link $symlink_name");
 
     // filling data into the file
-    var_dump( fill_file($file_handle, $type, 50) ); 
+    var_dump( fill_file($file_handle, $type, 50) );
     var_dump( fflush($file_handle) );
     fclose($file_handle);
-    
+
     // reading the data from the file
     var_dump( readfile($symlink_name) );
 
diff --git a/ext/standard/tests/file/fflush_variation3.phpt b/ext/standard/tests/file/fflush_variation3.phpt
index 6dfd49bc404..73f27eae31b 100644
--- a/ext/standard/tests/file/fflush_variation3.phpt
+++ b/ext/standard/tests/file/fflush_variation3.phpt
@@ -29,28 +29,28 @@ $count = 1;
 foreach( $file_types as $type ) {
   echo "-- Iteration $count with file containing $type data --\n";
   foreach( $file_modes as $mode ) {
-    
+
     // creating the file
     $file_handle = fopen($file_name, "w");
     if($file_handle == false)
       exit("Error:failed to open file $file_name");
 
-    // fill the fill with some data if mode is append mode 
-    if( substr($mode, 0, 1) == "a" ) 
-      fill_file($file_handle, $type, 10); 
+    // fill the fill with some data if mode is append mode
+    if( substr($mode, 0, 1) == "a" )
+      fill_file($file_handle, $type, 10);
 
     // fclose($file_handle);
-   
+
     // creating hard link to the file
     var_dump( link($file_name, $link_name) );
-  
+
     // opening the file in different modes
     $file_handle = fopen($link_name, $mode);
     if($file_handle == false)
       exit("Error:failed to open link $link_name");
-  
+
     // writing data to the file
-    var_dump( fill_file($file_handle, $type, 50) ); 
+    var_dump( fill_file($file_handle, $type, 50) );
     var_dump( fflush($file_handle) );
     fclose($file_handle);
 
diff --git a/ext/standard/tests/file/fflush_variation4.phpt b/ext/standard/tests/file/fflush_variation4.phpt
index f98616c3d81..29faeab3cbb 100644
--- a/ext/standard/tests/file/fflush_variation4.phpt
+++ b/ext/standard/tests/file/fflush_variation4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fflush() function: usage variations - file opened in read-only mode 
+Test fflush() function: usage variations - file opened in read-only mode
 --FILE--
 <?php
 /*  Prototype: bool fflush ( resource $handle );
@@ -14,7 +14,7 @@ require $file_path.'/file.inc';
 echo "*** Testing fflush(): with file handles of files opened in various read modes ***\n";
 $file_modes = array("r", "rb", "rt");
 
-$file_name = "$file_path/fflush_variation4.tmp"; 
+$file_name = "$file_path/fflush_variation4.tmp";
 
 $count = 1;
 
@@ -26,14 +26,14 @@ foreach( $file_modes as $mode ) {
   if($file_handle == false)
     exit("Error:failed to open file $file_name");
   fclose($file_handle);
-  
+
   // opening the file in different read modes
   $file_handle = fopen($file_name, $mode);
-  if($file_handle == false) 
+  if($file_handle == false)
     exit("Error:failed to open file $file_name");
   var_dump( fflush($file_handle) );
   fclose($file_handle);
-  
+
   unlink($file_name);
   $count++;
 }
diff --git a/ext/standard/tests/file/fgetc_basic.phpt b/ext/standard/tests/file/fgetc_basic.phpt
index 7851e432f31..01f01f2361f 100644
--- a/ext/standard/tests/file/fgetc_basic.phpt
+++ b/ext/standard/tests/file/fgetc_basic.phpt
@@ -6,7 +6,7 @@ Test fgetc() function : basic functionality
  Prototype: string fgetc ( resource $handle );
  Description: Gets character from file pointer
 */
-// include the header for common test function 
+// include the header for common test function
 include ("file.inc");
 
 echo "*** Testing fgetc() : basic operations ***\n";
@@ -20,9 +20,9 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou
   echo "--- Outerloop iteration ";
   echo $outerloop_counter + 1;
   echo " ---\n";
-  // create file file 
+  // create file file
   create_files(dirname(__FILE__), 1, $file_content_types[$outerloop_counter], 0755, 1, "w", "fgetc_basic", 1);
- 
+
   //open the file in different modes and check the working of fgetc
   for($innerloop_counter = 0; $innerloop_counter < count($file_modes); $innerloop_counter++) {
     echo "-- Innerloop iteration ";
@@ -30,7 +30,7 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou
     echo " of Outerloop Iteration ";
     echo $outerloop_counter + 1;
     echo " --\n";
-     
+
     // open the file using the $file_modes
     $filename = dirname(__FILE__)."/fgetc_basic1.tmp"; // file name that is created by create_files
     echo "-- Testing fgetc() : file opened using $file_modes[$innerloop_counter] mode --\n";
@@ -40,20 +40,20 @@ for($outerloop_counter = 0; $outerloop_counter < count($file_content_types); $ou
       exit();
     }
 
-    // perform the read file at least 6 char and check 
+    // perform the read file at least 6 char and check
     for( $counter = 1; $counter <= 6; $counter++ ) {
       // read data from the file and check, file pointer position, feof etc
       var_dump( fgetc($file_handle) ); // read a char
       var_dump( ftell($file_handle) ); // file pointer position
       var_dump( feof($file_handle) );  // is it eof()
-      var_dump($file_handle); // dump the $file_handle to see if any thing got modifed 
+      var_dump($file_handle); // dump the $file_handle to see if any thing got modifed
     } // end of for
-    
-    // close the file 
+
+    // close the file
     fclose ( $file_handle);
 
   } // end of innerloop for
-  
+
   // delete the file
   delete_files(dirname(__FILE__), 1, "fgetc_basic", 1, ".tmp");
 
diff --git a/ext/standard/tests/file/fgetc_variation1.phpt b/ext/standard/tests/file/fgetc_variation1.phpt
index 03258cac5de..9930f7a4e50 100644
--- a/ext/standard/tests/file/fgetc_variation1.phpt
+++ b/ext/standard/tests/file/fgetc_variation1.phpt
@@ -6,12 +6,12 @@ Test fgetc() function : usage variations - read when file pointer at EOF
  Prototype: string fgetc ( resource $handle );
  Description: Gets character from file pointer
 */
-// include the header for common test function 
+// include the header for common test function
 include ("file.inc");
 
 echo "*** Testing fgetc() : usage variations ***\n";
 echo "-- Testing fgetc() with file whose file pointer is pointing to EOF --\n";
-// create a file 
+// create a file
 create_files(dirname(__FILE__), 1, "text_with_new_line", 0755, 1, "w", "fgetc_variation");
 
 $filename = dirname(__FILE__)."/fgetc_variation1.tmp";
@@ -20,9 +20,9 @@ $filename = dirname(__FILE__)."/fgetc_variation1.tmp";
 $file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t");
 $loop_counter =0;
 for(; $loop_counter < count($file_modes); $loop_counter++) {
-  // print the hearder 
+  // print the hearder
   echo "-- File opened in mode : $file_modes[$loop_counter] --\n";
-  // open the file 
+  // open the file
   $file_handle = fopen ($filename, $file_modes[$loop_counter]);
   if (!$file_handle) {
     echo "Error: failed to open file $filename! \n";
@@ -33,11 +33,11 @@ for(; $loop_counter < count($file_modes); $loop_counter++) {
   var_dump( fseek($file_handle, 0, SEEK_END) ); // set file pointer to eof
   var_dump( feof($file_handle) );  // expected false
   var_dump( ftell($file_handle) );  // ensure that file pointer is at eof
-  var_dump( fgetc($file_handle) ); // try n read a char, none expected 
+  var_dump( fgetc($file_handle) ); // try n read a char, none expected
   var_dump( feof($file_handle) ); // ensure that file pointer is at eof
   var_dump( ftell($file_handle) ); // file pointer position
 
-  // close the file handle 
+  // close the file handle
   fclose($file_handle);
 }
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetc_variation2.phpt b/ext/standard/tests/file/fgetc_variation2.phpt
index 169f00ac2c2..d444209af42 100644
--- a/ext/standard/tests/file/fgetc_variation2.phpt
+++ b/ext/standard/tests/file/fgetc_variation2.phpt
@@ -11,8 +11,8 @@ Test fgetc() function : usage variations - closed handle
     - closed file handle
     - unset file handle
 */
- 
-// include the header for common test function 
+
+// include the header for common test function
 include ("file.inc");
 
 echo "*** Testing fgetc() : usage variations ***\n";
diff --git a/ext/standard/tests/file/fgetc_variation3.phpt b/ext/standard/tests/file/fgetc_variation3.phpt
index 64efaa6cfd7..0d795688ad8 100644
--- a/ext/standard/tests/file/fgetc_variation3.phpt
+++ b/ext/standard/tests/file/fgetc_variation3.phpt
@@ -12,7 +12,7 @@ Test fgetc() function : usage variations - write only modes (Bug #42036)
     a, ab, at,
     x, xb, xt
 */
-// include the header for common test function 
+// include the header for common test function
 include ("file.inc");
 
 echo "*** Testing fgetc() with file opened in write only mode ***\n";
@@ -31,8 +31,8 @@ foreach ($file_modes as $file_mode ) {
   fwrite($file_handle, $data);
 
   // rewind the file pointer to beginning of the file
-  var_dump( rewind($file_handle) ); 
-  var_dump( ftell($file_handle) ); 
+  var_dump( rewind($file_handle) );
+  var_dump( ftell($file_handle) );
   var_dump( feof($file_handle) );
 
   // read from file
@@ -44,7 +44,7 @@ foreach ($file_modes as $file_mode ) {
   fclose($file_handle);
 
   // delete the file
-  unlink($filename); 
+  unlink($filename);
 }
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetc_variation4.phpt b/ext/standard/tests/file/fgetc_variation4.phpt
index cb6f0cdce57..717e78010b9 100644
--- a/ext/standard/tests/file/fgetc_variation4.phpt
+++ b/ext/standard/tests/file/fgetc_variation4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fgetc() function : usage variations - different read modes 
+Test fgetc() function : usage variations - different read modes
 --FILE--
 <?php
 /*
@@ -13,8 +13,8 @@ Test fgetc() function : usage variations - different read modes
 echo "*** Testing fgetc() : usage variations ***\n";
 echo "-- Testing fgetc() with files opened with different read modes --\n";
 
-$file_modes = array( "a+", "a+b", "a+t", 
-                     "x+", "x+b", "x+t", 
+$file_modes = array( "a+", "a+b", "a+t",
+                     "x+", "x+b", "x+t",
                      "w+", "w+b", "w+t" );
 
 $filename = dirname(__FILE__)."/fgetc_variation4.tmp";
@@ -30,8 +30,8 @@ foreach ($file_modes as $file_mode ) {
   fwrite($file_handle, $data);
 
   // rewind the file pointer to beginning of the file
-  var_dump( rewind($file_handle) ); 
-  var_dump( ftell($file_handle) ); 
+  var_dump( rewind($file_handle) );
+  var_dump( ftell($file_handle) );
   var_dump( feof($file_handle) );
 
   // read from file, at least 7 chars
@@ -45,7 +45,7 @@ foreach ($file_modes as $file_mode ) {
   fclose($file_handle);
 
   // delete the file
-  unlink($filename); 
+  unlink($filename);
 }
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation1.phpt b/ext/standard/tests/file/fgetcsv_variation1.phpt
index 969c9c03488..5fc8108a623 100644
--- a/ext/standard/tests/file/fgetcsv_variation1.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation1.phpt
@@ -2,7 +2,7 @@
 Test fgetcsv() : usage variations - with all parameters specified
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with all parameters specified
 
 echo "*** Testing fgetcsv() : with all parameters specified ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation1.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -50,7 +50,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     fwrite($file_handle, $csv_field . "\n");
     // write another line of text and a blank line
     // this will be used to test, if the fgetcsv() read more than a line and its
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -67,22 +67,22 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
-      
-    // use the right delimiter and enclosure with max length 
+
+    // use the right delimiter and enclosure with max length
     var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
-      
+
     // close the file
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation10.phpt b/ext/standard/tests/file/fgetcsv_variation10.phpt
index 60a401bb868..41388fb00ce 100644
--- a/ext/standard/tests/file/fgetcsv_variation10.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation10.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Test fgetcsv() : usage variations - file pointer pointing to EOF 
+Test fgetcsv() : usage variations - file pointer pointing to EOF
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -11,7 +11,7 @@ Test fgetcsv() : usage variations - file pointer pointing to EOF
 
 echo "*** Testing fgetcsv() : with file pointer pointing to EOF ***\n";
 
-/* the array is with  three elements in it. Each element should be read as 
+/* the array is with  three elements in it. Each element should be read as
    1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
@@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation10.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -58,34 +58,34 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
-    } 
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+    }
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
-    // set the file pointer to EOF 
-    var_dump( fseek($file_handle, 0, SEEK_END) );      
+    // set the file pointer to EOF
+    var_dump( fseek($file_handle, 0, SEEK_END) );
 
     // call fgetcsv() to parse csv fields
 
-    // now file pointer should point to end of the file, try reading again 
+    // now file pointer should point to end of the file, try reading again
     var_dump( feof($file_handle) );
-    var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) ); 
+    var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
-    var_dump( fgetcsv($file_handle) ); // with default args 
+    var_dump( fgetcsv($file_handle) ); // with default args
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
-    
+
     // close the file
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation11.phpt b/ext/standard/tests/file/fgetcsv_variation11.phpt
index d5741248fb1..c555cf532ab 100644
--- a/ext/standard/tests/file/fgetcsv_variation11.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation11.phpt
@@ -2,18 +2,18 @@
 Test fgetcsv() : usage variations - with different enclosure but same delimiter
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
 
-/* Testing fgetcsv() by reading from a file when different enclosure that is not 
+/* Testing fgetcsv() by reading from a file when different enclosure that is not
    present in the data being read and delimiter which is present in the data  */
 
 echo "*** Testing fgetcsv() : with different enclosure but same delimiter char ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -33,7 +33,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation11.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -67,8 +67,8 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
 
@@ -85,7 +85,7 @@ foreach ($csv_lists as $csv_list) {
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation12.phpt b/ext/standard/tests/file/fgetcsv_variation12.phpt
index 31686844684..6ae6ae61b11 100644
--- a/ext/standard/tests/file/fgetcsv_variation12.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation12.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various read and append modes) 
+Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various read and append modes)
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various
 
 echo "*** Testing fgetcsv() : with two chars as enclosure & delimiter ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -49,7 +49,7 @@ foreach ($csv_lists as $csv_list) {
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
     fwrite($file_handle, $csv_field . "\n");
- 
+
     // write another line of text and a blank line
     // this will be used to test, if the fgetcsv() read more than a line and its
     // working when only a blank line is read
@@ -57,7 +57,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -65,12 +65,12 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
 
-    // use delimiter & enclosure char of two chars 
+    // use delimiter & enclosure char of two chars
     fseek($file_handle, 0, SEEK_SET);
     $del = "++";
     $enc = "%%";
@@ -78,12 +78,12 @@ foreach ($csv_lists as $csv_list) {
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
-    
+
     // close the file
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation13.phpt b/ext/standard/tests/file/fgetcsv_variation13.phpt
index f191a26379a..b7c7b6b3737 100644
--- a/ext/standard/tests/file/fgetcsv_variation13.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation13.phpt
@@ -3,7 +3,7 @@ Test fgetcsv() : usage variations - with line without any csv fields
 
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -19,7 +19,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation13.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
@@ -37,7 +37,7 @@ $loop_counter = 1;
     fwrite($file_handle, "This is line of text without csv fields\n");
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -45,10 +45,10 @@ $loop_counter = 1;
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
 
-     
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
+
+
     // read the line which is without csv fields, provide delimiter and see the working of fgetcsv
     $fp_pos = ftell($file_handle);
     var_dump( fgetcsv($file_handle) );
@@ -60,7 +60,7 @@ $loop_counter = 1;
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/file/fgetcsv_variation14.phpt b/ext/standard/tests/file/fgetcsv_variation14.phpt
index 14c72a24b14..44eb066e9ca 100644
--- a/ext/standard/tests/file/fgetcsv_variation14.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation14.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Test fgetcsv() : usage variations - reading the blank line 
+Test fgetcsv() : usage variations - reading the blank line
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -18,7 +18,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation14.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
@@ -36,7 +36,7 @@ $loop_counter = 1;
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -44,8 +44,8 @@ $loop_counter = 1;
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
 
@@ -65,7 +65,7 @@ $loop_counter = 1;
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/file/fgetcsv_variation15.phpt b/ext/standard/tests/file/fgetcsv_variation15.phpt
index c6859497eea..212f197745d 100644
--- a/ext/standard/tests/file/fgetcsv_variation15.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation15.phpt
@@ -2,7 +2,7 @@
 Test fgetcsv() : usage variations - with default enclosure
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with default enclosure
 
 echo "*** Testing fgetcsv() : with default enclosure ***\n";
 
-/* the array is with two elements in it. Each element should be read as 
-   1st element is delimiter & 2nd element is csv fields 
+/* the array is with two elements in it. Each element should be read as
+   1st element is delimiter & 2nd element is csv fields
 */
 $csv_lists = array (
   array(',', 'water,fruit'),
@@ -28,7 +28,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation15.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -61,8 +61,8 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
 
@@ -75,7 +75,7 @@ foreach ($csv_lists as $csv_list) {
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation16.phpt b/ext/standard/tests/file/fgetcsv_variation16.phpt
index 9cfdd724609..4768cf27705 100644
--- a/ext/standard/tests/file/fgetcsv_variation16.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation16.phpt
@@ -2,19 +2,19 @@
 Test fgetcsv() : usage variations - with default enclosure & length as 0
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
 
-/* Testing fgetcsv() to read a file when provided with default enclosure character 
-   and length value equal to zero  
+/* Testing fgetcsv() to read a file when provided with default enclosure character
+   and length value equal to zero
 */
 
 echo "*** Testing fgetcsv() : with default enclosure & length as 0 ***\n";
 
-/* the array is with two elements in it. Each element should be read as 
-   1st element is delimiter & 2nd element is csv fields 
+/* the array is with two elements in it. Each element should be read as
+   1st element is delimiter & 2nd element is csv fields
 */
 $csv_lists = array (
   array(',', 'water,fruit'),
@@ -30,7 +30,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation16.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -63,14 +63,14 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
 
-    // use length as 0 
+    // use length as 0
     fseek($file_handle, 0, SEEK_SET);
-    var_dump( fgetcsv($file_handle, 0, $delimiter) );  
+    var_dump( fgetcsv($file_handle, 0, $delimiter) );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
@@ -79,7 +79,7 @@ foreach ($csv_lists as $csv_list) {
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation17.phpt b/ext/standard/tests/file/fgetcsv_variation17.phpt
index b8d918659f6..75cb1c5ced8 100644
--- a/ext/standard/tests/file/fgetcsv_variation17.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation17.phpt
@@ -2,7 +2,7 @@
 Test fgetcsv() : usage variations - with default enclosure & length less than line size
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -13,8 +13,8 @@ Test fgetcsv() : usage variations - with default enclosure & length less than li
 
 echo "*** Testing fgetcsv() : with default enclosure & length less than line size ***\n";
 
-/* the array is with two elements in it. Each element should be read as 
-   1st element is delimiter & 2nd element is csv fields 
+/* the array is with two elements in it. Each element should be read as
+   1st element is delimiter & 2nd element is csv fields
 */
 $csv_lists = array (
   array(',', 'water,fruit'),
@@ -30,7 +30,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation17.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -63,29 +63,29 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
 
-    // use length as less than the actual size of the line 
+    // use length as less than the actual size of the line
     fseek($file_handle, 0, SEEK_SET);
     var_dump( fgetcsv($file_handle, 9, $delimiter) );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
 
-    // read rest of the line 
+    // read rest of the line
     var_dump( fgetcsv($file_handle, 1024, $delimiter) );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
-      
+
     // close the file
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation18.phpt b/ext/standard/tests/file/fgetcsv_variation18.phpt
index f0ebcb7fae3..a5889ee77d4 100644
--- a/ext/standard/tests/file/fgetcsv_variation18.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation18.phpt
@@ -2,19 +2,19 @@
 Test fgetcsv() : usage variations - with default enclosure and different delimiter
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
 
-/* Testing fgetcsv() to read a file when provided with default enclosure character 
+/* Testing fgetcsv() to read a file when provided with default enclosure character
    and with delimiter character which is not in the line being read by fgetcsv()
 */
 
 echo "*** Testing fgetcsv() : with default enclosure and different delimiter ***\n";
 
-/* the array is with two elements in it. Each element should be read as 
-   1st element is delimiter & 2nd element is csv fields 
+/* the array is with two elements in it. Each element should be read as
+   1st element is delimiter & 2nd element is csv fields
 */
 $csv_lists = array (
   array(',', 'water,fruit'),
@@ -30,7 +30,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation18.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -63,24 +63,24 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
-      
-    // use different delimiter than existing in file 
+
+    // use different delimiter than existing in file
     fseek($file_handle, 0, SEEK_SET);
     $del = "+";
     var_dump( fgetcsv($file_handle, 1024, $del) );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
-      
+
     // close the file
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation19.phpt b/ext/standard/tests/file/fgetcsv_variation19.phpt
index cb510099bd3..5200b5e8e1b 100644
--- a/ext/standard/tests/file/fgetcsv_variation19.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation19.phpt
@@ -2,20 +2,20 @@
 Test fgetcsv() : usage variations - with default enclosure & delimiter of two chars
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
 
 /*
-   Testing fgetcsv() to read a file when provided with default enclosure character 
-   and with delimiter of two characters 
+   Testing fgetcsv() to read a file when provided with default enclosure character
+   and with delimiter of two characters
 */
 
 echo "*** Testing fgetcsv() : with default enclosure & delimiter of two chars ***\n";
 
-/* the array is with two elements in it. Each element should be read as 
-   1st element is delimiter & 2nd element is csv fields 
+/* the array is with two elements in it. Each element should be read as
+   1st element is delimiter & 2nd element is csv fields
 */
 $csv_lists = array (
   array(',', 'water,fruit'),
@@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation19.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -64,24 +64,24 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
-      
-    // use delimiter & enclosure char of two chars 
+
+    // use delimiter & enclosure char of two chars
     fseek($file_handle, 0, SEEK_SET);
     $del = "++";
     var_dump( fgetcsv($file_handle, 1024, $del) );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
-     
+
     // close the file
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation2.phpt b/ext/standard/tests/file/fgetcsv_variation2.phpt
index d1e446d1f92..40fb910cf94 100644
--- a/ext/standard/tests/file/fgetcsv_variation2.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation2.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Test fgetcsv() : usage variations - with length as 0 
+Test fgetcsv() : usage variations - with length as 0
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with length as 0
 
 echo "*** Testing fgetcsv() : with length as 0 ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation2.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -67,12 +67,12 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
-      
-    // use length as 0 
+
+    // use length as 0
     fseek($file_handle, 0, SEEK_SET);
     var_dump( fgetcsv($file_handle, 0, $delimiter, $enclosure) );
     // check the file pointer position and if eof
@@ -83,7 +83,7 @@ foreach ($csv_lists as $csv_list) {
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation20.phpt b/ext/standard/tests/file/fgetcsv_variation20.phpt
index 70bd8acbb00..5027d13a785 100644
--- a/ext/standard/tests/file/fgetcsv_variation20.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation20.phpt
@@ -2,16 +2,16 @@
 Test fgetcsv() : usage variations - with default enclosure, line without any csv fields
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
 
-/* 
+/*
   Testing fgetcsv() to read a line without any csv fields from a file
   when provided with default enclosure value
 */
-   
+
 echo "*** Testing fgetcsv() : with default enclosure, line without any csv fields ***\n";
 
 $filename = dirname(__FILE__) . '/fgetcsv_variation20.tmp';
@@ -20,7 +20,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation20.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
@@ -34,11 +34,11 @@ $loop_counter = 1;
       echo "Error: failed to create file $filename!\n";
       exit();
     }
-    // write line of text 
+    // write line of text
     fwrite($file_handle, "This is line of text without csv fields\n");
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -46,11 +46,11 @@ $loop_counter = 1;
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
-      
+
     // read the line which is without csv fields, provide delimiter and see the working of fgetcsv
     $fp_pos = ftell($file_handle);
     var_dump( fgetcsv($file_handle, 1024) );
@@ -62,7 +62,7 @@ $loop_counter = 1;
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/file/fgetcsv_variation21.phpt b/ext/standard/tests/file/fgetcsv_variation21.phpt
index ae8c4f1ef65..6acbbf4f886 100644
--- a/ext/standard/tests/file/fgetcsv_variation21.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation21.phpt
@@ -2,13 +2,13 @@
 Test fgetcsv() : usage variations - with default enclosure, blank line
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
 
 /*
-  Testing fgetcsv() to read a file containing blank line when provided with 
+  Testing fgetcsv() to read a file containing blank line when provided with
   default enclosure argument
 */
 
@@ -20,7 +20,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation21.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
@@ -38,7 +38,7 @@ $loop_counter = 1;
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -46,11 +46,11 @@ $loop_counter = 1;
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
-     
+
     // read the line which is a blank line to see the working of fgetcsv
     $fp_pos = ftell($file_handle);
     var_dump( fgetcsv($file_handle, 1024, '+') );
@@ -62,7 +62,7 @@ $loop_counter = 1;
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/file/fgetcsv_variation22.phpt b/ext/standard/tests/file/fgetcsv_variation22.phpt
index 9f35c1c1c3f..ed4e129eb51 100644
--- a/ext/standard/tests/file/fgetcsv_variation22.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation22.phpt
@@ -2,7 +2,7 @@
 Test fgetcsv() : usage variations - with default enclosure, file pointer pointing at end of file
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with default enclosure, file pointer pointin
 
 echo "*** Testing fgetcsv() : with default enclosure, file pointer pointing at end of file ***\n";
 
-/* the array is with two elements in it. Each element should be read as 
-   1st element is delimiter & 2nd element is csv fields 
+/* the array is with two elements in it. Each element should be read as
+   1st element is delimiter & 2nd element is csv fields
 */
 $csv_lists = array (
   array(',', 'water,fruit'),
@@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation22.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -60,18 +60,18 @@ foreach ($csv_lists as $csv_list) {
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
-    } 
-     
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
-    
+    }
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
+
     // set the file pointer to EOF
     var_dump( fseek($file_handle, 0, SEEK_END) );
 
     // call fgetcsv() to parse csv fields
 
-    // now file pointer should point to end of the file, try reading again 
+    // now file pointer should point to end of the file, try reading again
     var_dump( feof($file_handle) );
-    var_dump( fgetcsv($file_handle, 1024, $delimiter) ); // with length, delimiter 
+    var_dump( fgetcsv($file_handle, 1024, $delimiter) ); // with length, delimiter
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
@@ -79,7 +79,7 @@ foreach ($csv_lists as $csv_list) {
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation23.phpt b/ext/standard/tests/file/fgetcsv_variation23.phpt
index b766f1e0629..a9b51f06a57 100644
--- a/ext/standard/tests/file/fgetcsv_variation23.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation23.phpt
@@ -2,7 +2,7 @@
 Test fgetcsv() : usage variations - empty file
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -12,7 +12,7 @@ Test fgetcsv() : usage variations - empty file
 echo "*** Testing fgetcsv() : reading from file which is having zero content ***\n";
 
 // try reading from file which is having zero content
-// create the file and then open in read mode and try reading 
+// create the file and then open in read mode and try reading
 $filename = dirname(__FILE__) . '/fgetcsv_variation23.tmp';
 $fp = fopen ($filename, "w");
 fclose($fp);
diff --git a/ext/standard/tests/file/fgetcsv_variation24.phpt b/ext/standard/tests/file/fgetcsv_variation24.phpt
index cdfadceb70e..154c6f91048 100644
--- a/ext/standard/tests/file/fgetcsv_variation24.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation24.phpt
@@ -2,20 +2,20 @@
 Test fgetcsv() : usage variations - two chars as enclosure & delimiter (various write modes)
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
 
 /*
-   Testing fgetcsv() to read from a file opened in various write modes and 
+   Testing fgetcsv() to read from a file opened in various write modes and
    enclosure argument with two characters
 */
 
 echo "*** Testing fgetcsv() : with two chars as enclosure & delimiter ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -67,12 +67,12 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
 
-    // use delimiter & enclosure char of two chars 
+    // use delimiter & enclosure char of two chars
     fseek($file_handle, 0, SEEK_SET);
     $del = "++";
     $enc = "%%";
@@ -80,12 +80,12 @@ foreach ($csv_lists as $csv_list) {
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
-    
+
     // close the file
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation25.phpt b/ext/standard/tests/file/fgetcsv_variation25.phpt
index 52e830cb5b9..9ba0aa15ed2 100644
--- a/ext/standard/tests/file/fgetcsv_variation25.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation25.phpt
@@ -2,20 +2,20 @@
 Test fgetcsv() : usage variations - with negative length value along with enclosure and delimiter
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
 
-/* 
-   Testing fgetcsv() to read from a file when provided with negative length argument 
+/*
+   Testing fgetcsv() to read from a file when provided with negative length argument
    along with delimiter and enclosure arguments
 */
- 
+
 echo "*** Testing fgetcsv() : with negative length value ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation25.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     fwrite($file_handle, $csv_field . "\n");
     // write another line of text and a blank line
     // this will be used to test, if the fgetcsv() read more than a line and its
@@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -70,22 +70,22 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
-      
-    // use the right delimiter and enclosure with negative length 
+
+    // use the right delimiter and enclosure with negative length
     var_dump( fgetcsv($file_handle, -10, $delimiter, $enclosure) );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
-      
+
     // close the file
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation26.phpt b/ext/standard/tests/file/fgetcsv_variation26.phpt
index c042eb49313..53077f3372c 100644
--- a/ext/standard/tests/file/fgetcsv_variation26.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation26.phpt
@@ -2,7 +2,7 @@
 Test fgetcsv() : usage variations - reading files opened in write only mode (Bug #42036)
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - reading files opened in write only mode (Bug
 
 echo "*** Testing fgetcsv() : reading the files opened in write only mode ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -38,7 +38,7 @@ foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     // create the file and add the content with has csv fields
     $file_handle = fopen($filename, $file_modes[$mode_counter] );
-    
+
     if ( !$file_handle ) {
       echo "Error: failed to create file $filename!\n";
       exit();
@@ -46,7 +46,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     fwrite($file_handle, $csv_field . "\n");
     // write another line of text and a blank line
     // this will be used to test, if the fgetcsv() read more than a line and its
@@ -56,22 +56,22 @@ foreach ($csv_lists as $csv_list) {
 
     // rewind the file pointer to bof
       rewind($file_handle);
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
-      
-    // use the right delimiter and enclosure with max length 
+
+    // use the right delimiter and enclosure with max length
     var_dump( fgetcsv($file_handle, 1024, $delimiter, $enclosure) );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
-      
+
     // close the file
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation27.phpt b/ext/standard/tests/file/fgetcsv_variation27.phpt
index a215e90a3fd..ff10286b4cb 100644
--- a/ext/standard/tests/file/fgetcsv_variation27.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation27.phpt
@@ -2,20 +2,20 @@
 Test fgetcsv() : usage variations - with negative length value along with delimiter and no enclosure
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
 
-/* 
-   Testing fgetcsv() to read from a file when provided with negative length argument 
+/*
+   Testing fgetcsv() to read from a file when provided with negative length argument
    along with delimiter and no enclosure arguments
 */
- 
+
 echo "*** Testing fgetcsv() : with negative length value ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation27.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     fwrite($file_handle, $csv_field . "\n");
     // write another line of text and a blank line
     // this will be used to test, if the fgetcsv() read more than a line and its
@@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -70,22 +70,22 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
-      
-    // use the right delimiter and enclosure with negative length 
+
+    // use the right delimiter and enclosure with negative length
     var_dump( fgetcsv($file_handle, -10, $delimiter) );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
-      
+
     // close the file
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation28.phpt b/ext/standard/tests/file/fgetcsv_variation28.phpt
index 4e6fed31718..4facbcf1ea9 100644
--- a/ext/standard/tests/file/fgetcsv_variation28.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation28.phpt
@@ -2,20 +2,20 @@
 Test fgetcsv() : usage variations - with negative length value along with neither enclosure and nor delimiter
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
 
-/* 
-   Testing fgetcsv() to read from a file when provided with negative length argument 
+/*
+   Testing fgetcsv() to read from a file when provided with negative length argument
    along with neither delimiter nor enclosure argument
 */
- 
+
 echo "*** Testing fgetcsv() : with negative length value ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation28.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     fwrite($file_handle, $csv_field . "\n");
     // write another line of text and a blank line
     // this will be used to test, if the fgetcsv() read more than a line and its
@@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -70,22 +70,22 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
-      
-    // use the right delimiter and enclosure with negative length 
+
+    // use the right delimiter and enclosure with negative length
     var_dump( fgetcsv($file_handle, -10) );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
-      
+
     // close the file
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation29.phpt b/ext/standard/tests/file/fgetcsv_variation29.phpt
index 04208603215..df4ee6c6f57 100644
--- a/ext/standard/tests/file/fgetcsv_variation29.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation29.phpt
@@ -2,7 +2,7 @@
 Test fgetcsv() : usage variations - with only file handle as argument, file pointer pointing at end of file
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with only file handle as argument, file poin
 
 echo "*** Testing fgetcsv() : with file handle as only argument and file pointer pointing at end of file ***\n";
 
-/* the array is with two elements in it. Each element should be read as 
-   1st element is delimiter & 2nd element is csv fields 
+/* the array is with two elements in it. Each element should be read as
+   1st element is delimiter & 2nd element is csv fields
 */
 $csv_lists = array (
   array(',', 'water,fruit'),
@@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation29.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -57,22 +57,22 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
-    } 
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+    }
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // set the file pointer to EOF
     var_dump( fseek($file_handle, 0, SEEK_END) );
 
     // call fgetcsv() to parse csv fields
 
-    // now file pointer should point to end of the file, try reading again 
+    // now file pointer should point to end of the file, try reading again
     var_dump( feof($file_handle) );
-    var_dump( fgetcsv($file_handle) );  
+    var_dump( fgetcsv($file_handle) );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
@@ -80,7 +80,7 @@ foreach ($csv_lists as $csv_list) {
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation3.phpt b/ext/standard/tests/file/fgetcsv_variation3.phpt
index 8cde39da20a..20507973db7 100644
--- a/ext/standard/tests/file/fgetcsv_variation3.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation3.phpt
@@ -2,7 +2,7 @@
 Test fgetcsv() : usage variations - with delimiter as NULL
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with delimiter as NULL
 
 echo "*** Testing fgetcsv() : with delimiter as NULL ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation3.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -67,12 +67,12 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
 
-    // use length as 0 
+    // use length as 0
     fseek($file_handle, 0, SEEK_SET);
     var_dump( fgetcsv($file_handle, 1024, NULL, $enclosure) );
     // check the file pointer position and if eof
@@ -83,7 +83,7 @@ foreach ($csv_lists as $csv_list) {
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation30.phpt b/ext/standard/tests/file/fgetcsv_variation30.phpt
index e474b2d5462..2cb570c8dc3 100644
--- a/ext/standard/tests/file/fgetcsv_variation30.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation30.phpt
@@ -2,7 +2,7 @@
 Test fgetcsv() : usage variations - with file handle and length, file pointer pointing at end of file
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with file handle and length, file pointer po
 
 echo "*** Testing fgetcsv() : with file handle and length arguments, file pointer pointing at end of file ***\n";
 
-/* the array is with two elements in it. Each element should be read as 
-   1st element is delimiter & 2nd element is csv fields 
+/* the array is with two elements in it. Each element should be read as
+   1st element is delimiter & 2nd element is csv fields
 */
 $csv_lists = array (
   array(',', 'water,fruit'),
@@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation30.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -60,18 +60,18 @@ foreach ($csv_lists as $csv_list) {
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
-    } 
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+    }
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // set the file pointer to EOF
     var_dump( fseek($file_handle, 0, SEEK_END) );
- 
+
     // call fgetcsv() to parse csv fields
 
-    // now file pointer should point to end of the file, try reading again 
+    // now file pointer should point to end of the file, try reading again
     var_dump( feof($file_handle) );
-    var_dump( fgetcsv($file_handle, 1024) ); 
+    var_dump( fgetcsv($file_handle, 1024) );
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
@@ -79,7 +79,7 @@ foreach ($csv_lists as $csv_list) {
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation31.phpt b/ext/standard/tests/file/fgetcsv_variation31.phpt
index 7d1e90e1f95..d4e3d8a43d4 100644
--- a/ext/standard/tests/file/fgetcsv_variation31.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation31.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Test fgetcsv() : usage variations - with length and enclosure, file pointer pointing at end of file 
+Test fgetcsv() : usage variations - with length and enclosure, file pointer pointing at end of file
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -14,8 +14,8 @@ Test fgetcsv() : usage variations - with length and enclosure, file pointer poin
 
 echo "*** Testing fgetcsv() : with enclosure argument, file pointer pointing at end of file ***\n";
 
-/* the array is with two elements in it. Each element should be read as 
-   1st element is delimiter & 2nd element is csv fields 
+/* the array is with two elements in it. Each element should be read as
+   1st element is delimiter & 2nd element is csv fields
 */
 $csv_lists = array (
   array(',', 'water,fruit'),
@@ -31,7 +31,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation31.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -57,23 +57,23 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
-    } 
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+    }
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // set the file pointer to EOF
     var_dump( fseek($file_handle, 0, SEEK_END) );
-  
+
     // call fgetcsv() to parse csv fields
 
-    // now file pointer should point to end of the file, try reading again 
+    // now file pointer should point to end of the file, try reading again
     var_dump( feof($file_handle) );
     $enc = 'z';
-    var_dump( fgetcsv($file_handle, 1024, $delimiter, $enc ) ); // with length, delimiter 
+    var_dump( fgetcsv($file_handle, 1024, $delimiter, $enc ) ); // with length, delimiter
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
@@ -81,7 +81,7 @@ foreach ($csv_lists as $csv_list) {
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation4.phpt b/ext/standard/tests/file/fgetcsv_variation4.phpt
index da945daa70b..e42163bd982 100644
--- a/ext/standard/tests/file/fgetcsv_variation4.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation4.phpt
@@ -2,7 +2,7 @@
 Test fgetcsv() : usage variations - with enclosure as NULL
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with enclosure as NULL
 
 echo "*** Testing fgetcsv() : with enclosure as NULL ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation4.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -66,12 +66,12 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
 
-    // use length as 0 
+    // use length as 0
     fseek($file_handle, 0, SEEK_SET);
     var_dump( fgetcsv($file_handle, 0, $delimiter, NULL) );
     // check the file pointer position and if eof
@@ -82,7 +82,7 @@ foreach ($csv_lists as $csv_list) {
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation5.phpt b/ext/standard/tests/file/fgetcsv_variation5.phpt
index d3564e40154..ff18d6fe13a 100644
--- a/ext/standard/tests/file/fgetcsv_variation5.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation5.phpt
@@ -2,20 +2,20 @@
 Test fgetcsv() : usage variations - with delimiter & enclosure as NULL
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
 
 /*
-   Testing fgetcsv() to read from a file when provided with delimiter and 
+   Testing fgetcsv() to read from a file when provided with delimiter and
    enclosure values both as NULL
  */
 
 echo "*** Testing fgetcsv() : with delimiter & enclosure as NULL ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation5.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -69,8 +69,8 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
 
@@ -84,7 +84,7 @@ foreach ($csv_lists as $csv_list) {
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation6.phpt b/ext/standard/tests/file/fgetcsv_variation6.phpt
index 844dd7c5190..95db326598c 100644
--- a/ext/standard/tests/file/fgetcsv_variation6.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation6.phpt
@@ -2,20 +2,20 @@
 Test fgetcsv() : usage variations - with length less than line size
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
 
-/* 
+/*
   Testing fgetcsv() to read from a file when provided with the length argument
   value less than the line size
 */
 
 echo "*** Testing fgetcsv() : with length less than line size ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation6.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -69,12 +69,12 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
 
-    // use length as less than the actual size of the line 
+    // use length as less than the actual size of the line
     fseek($file_handle, 0, SEEK_SET);
     var_dump( fgetcsv($file_handle, 9, $delimiter, $enclosure) );
     // check the file pointer position and if eof
@@ -90,7 +90,7 @@ foreach ($csv_lists as $csv_list) {
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation7.phpt b/ext/standard/tests/file/fgetcsv_variation7.phpt
index 271a55b0090..2854dc766fe 100644
--- a/ext/standard/tests/file/fgetcsv_variation7.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation7.phpt
@@ -2,7 +2,7 @@
 Test fgetcsv() : usage variations - with default arguments value
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
@@ -11,8 +11,8 @@ Test fgetcsv() : usage variations - with default arguments value
 
 echo "*** Testing fgetcsv() : with default arguments value ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -32,7 +32,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation7.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -66,12 +66,12 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
 
-    // use only default arguments 
+    // use only default arguments
     fseek($file_handle, 0, SEEK_SET);
     var_dump( fgetcsv($file_handle) );
     // check the file pointer position and if eof
@@ -82,7 +82,7 @@ foreach ($csv_lists as $csv_list) {
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation8.phpt b/ext/standard/tests/file/fgetcsv_variation8.phpt
index bf06d29b403..cd518cb1441 100644
--- a/ext/standard/tests/file/fgetcsv_variation8.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation8.phpt
@@ -2,20 +2,20 @@
 Test fgetcsv() : usage variations - with different delimiter and enclosure
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
 
-/* 
+/*
   Testing fgetcsv() to read from a file when provided with values of delimiter and
   enclosure that are not present in the line read by fgetcsv()
 */
 
 echo "*** Testing fgetcsv() : with different delimiter and enclosure ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation8.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -70,12 +70,12 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
 
-    // use different delimiter and enclosure than existing in file 
+    // use different delimiter and enclosure than existing in file
     fseek($file_handle, 0, SEEK_SET);
     $del = "+";
     $enc = "%";
@@ -83,12 +83,12 @@ foreach ($csv_lists as $csv_list) {
     // check the file pointer position and if eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
-      
+
     // close the file
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgetcsv_variation9.phpt b/ext/standard/tests/file/fgetcsv_variation9.phpt
index 294241e6cd9..dd0d788f6c0 100644
--- a/ext/standard/tests/file/fgetcsv_variation9.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation9.phpt
@@ -2,20 +2,20 @@
 Test fgetcsv() : usage variations - with different delimiter but same enclosure
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fgetcsv ( resource $handle [, int $length [, string $delimiter [, string $enclosure]]] );
  Description: Gets line from file pointer and parse for CSV fields
 */
 
-/* 
+/*
    Testing fgetcsv() to read from a file when the delimiter argument value is not
    present in the line being read by the fgetcsv()
 */
 
 echo "*** Testing fgetcsv() : with different delimiter but same enclosure ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -35,7 +35,7 @@ $filename = dirname(__FILE__) . '/fgetcsv_variation9.tmp';
 $file_modes = array ("r","rb", "rt", "r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
@@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to beginning of the file 
+    // else rewind the file pointer to beginning of the file
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
@@ -69,11 +69,11 @@ foreach ($csv_lists as $csv_list) {
       // rewind the file pointer to bof
       rewind($file_handle);
     }
-      
-    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n"; 
+
+    echo "\n-- Testing fgetcsv() with file opened using $file_modes[$mode_counter] mode --\n";
 
     // call fgetcsv() to parse csv fields
-      
+
     // use different delimiter but same enclosure char
     fseek($file_handle, 0, SEEK_SET);
     $del = "+";
@@ -86,7 +86,7 @@ foreach ($csv_lists as $csv_list) {
     fclose($file_handle);
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgets_basic.phpt b/ext/standard/tests/file/fgets_basic.phpt
index 9865f1fc9ac..90515577c46 100644
--- a/ext/standard/tests/file/fgets_basic.phpt
+++ b/ext/standard/tests/file/fgets_basic.phpt
@@ -29,7 +29,7 @@ foreach($file_modes as $file_mode) {
     }
 
     echo "-- fgets() with default length, file pointer at 0 --\n";
-    var_dump( fgets($file_handle) ); // with default length 
+    var_dump( fgets($file_handle) ); // with default length
     var_dump( ftell($file_handle) ); // ensure the file pointer position
     var_dump( feof($file_handle) );  // enusre if eof set
 
diff --git a/ext/standard/tests/file/fgets_error.phpt b/ext/standard/tests/file/fgets_error.phpt
index 5a62252b782..f139d332943 100644
--- a/ext/standard/tests/file/fgets_error.phpt
+++ b/ext/standard/tests/file/fgets_error.phpt
@@ -17,13 +17,13 @@ echo "-- Testing fgets() with more than expected number of arguments --\n";
 $fp = fopen(__FILE__, "r");
 var_dump( fgets($fp, 10, $fp) );
 
-// invalid length argument 
+// invalid length argument
 echo "-- Testing fgets() with invalid length arguments --\n";
-$len = 0; 
+$len = 0;
 var_dump( fgets($fp, $len) );
 $len = -10;
 var_dump( fgets($fp, $len) );
-$len = 1; 
+$len = 1;
 var_dump( fgets($fp, $len) ); // return length - 1 always, expect false
 
 
diff --git a/ext/standard/tests/file/fgets_variation1.phpt b/ext/standard/tests/file/fgets_variation1.phpt
index 68a20e89923..78fa390eadc 100644
--- a/ext/standard/tests/file/fgets_variation1.phpt
+++ b/ext/standard/tests/file/fgets_variation1.phpt
@@ -11,7 +11,7 @@ Test fgets() function : usage variations - write only modes (Bug #42036)
     a, ab, at,
     x, xb, xt
 */
-// include the header for common test function 
+// include the header for common test function
 include ("file.inc");
 
 echo "*** Testing fgets() with file opened in write only mode ***\n";
@@ -30,8 +30,8 @@ foreach ($file_modes as $file_mode ) {
   fwrite($file_handle, $data);
 
   // rewind the file pointer to beginning of the file
-  var_dump( rewind($file_handle) ); 
-  var_dump( ftell($file_handle) ); 
+  var_dump( rewind($file_handle) );
+  var_dump( ftell($file_handle) );
   var_dump( feof($file_handle) );
 
   // read from file
@@ -43,7 +43,7 @@ foreach ($file_modes as $file_mode ) {
   fclose($file_handle);
 
   // delete the file
-  unlink($filename); 
+  unlink($filename);
 }
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fgets_variation2.phpt b/ext/standard/tests/file/fgets_variation2.phpt
index 201755b69cb..fcd85ce6e01 100644
--- a/ext/standard/tests/file/fgets_variation2.phpt
+++ b/ext/standard/tests/file/fgets_variation2.phpt
@@ -11,8 +11,8 @@ Test fgets() function : usage variations - closed handle
     - closed file handle
     - unset file handle
 */
- 
-// include the header for common test function 
+
+// include the header for common test function
 include ("file.inc");
 
 echo "*** Testing fgets() : usage variations ***\n";
diff --git a/ext/standard/tests/file/fgets_variation3.phpt b/ext/standard/tests/file/fgets_variation3.phpt
index b39ba0c6afa..655e25523bb 100644
--- a/ext/standard/tests/file/fgets_variation3.phpt
+++ b/ext/standard/tests/file/fgets_variation3.phpt
@@ -12,7 +12,7 @@ include ("file.inc");
 
 $file_modes = array("w+", "w+b", "w+t",
                     "a+", "a+b", "a+t",
-                    "x+", "x+b", "x+t"); 
+                    "x+", "x+b", "x+t");
 
 $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric");
 
@@ -29,7 +29,7 @@ foreach($file_modes as $file_mode) {
     /* create files with $file_content_type */
     $file_handle = fopen($filename, $file_mode);
     $data = fill_file($file_handle, $file_content_type, 50);
- 
+
     if ( !$file_handle ) {
       echo "Error: failed to open file $filename!";
       exit();
@@ -40,7 +40,7 @@ foreach($file_modes as $file_mode) {
     rewind($file_handle);
 
     var_dump( ftell($file_handle) );
-    var_dump( fgets($file_handle) ); // with default length 
+    var_dump( fgets($file_handle) ); // with default length
     var_dump( ftell($file_handle) ); // ensure the file pointer position
     var_dump( feof($file_handle) );  // enusre if eof set
 
diff --git a/ext/standard/tests/file/fgets_variation4-win32-mb.phpt b/ext/standard/tests/file/fgets_variation4-win32-mb.phpt
index b5786df58c6..a172a72779f 100644
--- a/ext/standard/tests/file/fgets_variation4-win32-mb.phpt
+++ b/ext/standard/tests/file/fgets_variation4-win32-mb.phpt
@@ -18,7 +18,7 @@ include ("file.inc");
 
 $file_modes = array("w+", "w+b", "w+t",
                     "a+", "a+b", "a+t",
-                    "x+", "x+b", "x+t"); 
+                    "x+", "x+b", "x+t");
 
 $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric");
 
diff --git a/ext/standard/tests/file/fgets_variation4-win32.phpt b/ext/standard/tests/file/fgets_variation4-win32.phpt
index 6d2bbf6caf8..99620d9f027 100644
--- a/ext/standard/tests/file/fgets_variation4-win32.phpt
+++ b/ext/standard/tests/file/fgets_variation4-win32.phpt
@@ -18,7 +18,7 @@ include ("file.inc");
 
 $file_modes = array("w+", "w+b", "w+t",
                     "a+", "a+b", "a+t",
-                    "x+", "x+b", "x+t"); 
+                    "x+", "x+b", "x+t");
 
 $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric");
 
diff --git a/ext/standard/tests/file/fgets_variation4.phpt b/ext/standard/tests/file/fgets_variation4.phpt
index 4ffa3f19750..0c678c257dc 100644
--- a/ext/standard/tests/file/fgets_variation4.phpt
+++ b/ext/standard/tests/file/fgets_variation4.phpt
@@ -18,7 +18,7 @@ include ("file.inc");
 
 $file_modes = array("w+", "w+b", "w+t",
                     "a+", "a+b", "a+t",
-                    "x+", "x+b", "x+t"); 
+                    "x+", "x+b", "x+t");
 
 $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric");
 
diff --git a/ext/standard/tests/file/fgets_variation5.phpt b/ext/standard/tests/file/fgets_variation5.phpt
index 4a1ed9f0391..261db1d12cd 100644
--- a/ext/standard/tests/file/fgets_variation5.phpt
+++ b/ext/standard/tests/file/fgets_variation5.phpt
@@ -12,7 +12,7 @@ include ("file.inc");
 
 $file_modes = array("w+", "w+b", "w+t",
                     "a+", "a+b", "a+t",
-                    "x+", "x+b", "x+t"); 
+                    "x+", "x+b", "x+t");
 
 $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric");
 
diff --git a/ext/standard/tests/file/fgets_variation6-win32.phpt b/ext/standard/tests/file/fgets_variation6-win32.phpt
index 0334050aaa8..c14659a1362 100644
--- a/ext/standard/tests/file/fgets_variation6-win32.phpt
+++ b/ext/standard/tests/file/fgets_variation6-win32.phpt
@@ -18,7 +18,7 @@ include ("file.inc");
 
 $file_modes = array("w+", "w+b", "w+t",
                     "a+", "a+b", "a+t",
-                    "x+", "x+b", "x+t"); 
+                    "x+", "x+b", "x+t");
 
 $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric");
 
diff --git a/ext/standard/tests/file/fgets_variation6.phpt b/ext/standard/tests/file/fgets_variation6.phpt
index 69215d9020c..dba2b76ca7b 100644
--- a/ext/standard/tests/file/fgets_variation6.phpt
+++ b/ext/standard/tests/file/fgets_variation6.phpt
@@ -18,7 +18,7 @@ include ("file.inc");
 
 $file_modes = array("w+", "w+b", "w+t",
                     "a+", "a+b", "a+t",
-                    "x+", "x+b", "x+t"); 
+                    "x+", "x+b", "x+t");
 
 $file_content_types = array("numeric", "text", "text_with_new_line", "alphanumeric");
 
diff --git a/ext/standard/tests/file/fgetss.phpt b/ext/standard/tests/file/fgetss.phpt
index 2e2bb6b71c7..907eca72dbf 100644
--- a/ext/standard/tests/file/fgetss.phpt
+++ b/ext/standard/tests/file/fgetss.phpt
@@ -38,7 +38,7 @@ var_dump(fgetss($fp, 0));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(18) "askasdfasdfaaaaaa
 "
 string(6) "dddddd"
diff --git a/ext/standard/tests/file/fgetss1.phpt b/ext/standard/tests/file/fgetss1.phpt
index 58dd00c11ab..2ae3abf3556 100644
--- a/ext/standard/tests/file/fgetss1.phpt
+++ b/ext/standard/tests/file/fgetss1.phpt
@@ -36,7 +36,7 @@ echo "Done\n";
 $filename = dirname(__FILE__)."/fgetss1.html";
 unlink($filename);
 ?>
---EXPECTF--	
+--EXPECTF--
 string(21) "askasdfasdf<b>aaaaaa
 "
 string(6) "dddddd"
diff --git a/ext/standard/tests/file/fgetss_basic1.phpt b/ext/standard/tests/file/fgetss_basic1.phpt
index 4c5881d5881..e7b6a5776d5 100644
--- a/ext/standard/tests/file/fgetss_basic1.phpt
+++ b/ext/standard/tests/file/fgetss_basic1.phpt
@@ -9,7 +9,7 @@ Test fgetss() function : Basic functionality - read modes only
 
 /* test fgetss with all read modes */
 
-// include the common file related test functions 
+// include the common file related test functions
 include ("file.inc");
 
 echo "*** Testing fgetss() : Basic operations ***\n";
@@ -32,33 +32,33 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
   echo "\n-- Testing fgetss() with file opened using $file_modes[$mode_counter] mode --\n";
 
   /* create an empty file and write the strings with tags */
-  $filename = dirname(__FILE__)."/fgetss_basic1.tmp"; 
+  $filename = dirname(__FILE__)."/fgetss_basic1.tmp";
   create_file ($filename); //create an empty file
-  file_put_contents($filename, $string_with_tags); 
+  file_put_contents($filename, $string_with_tags);
   $file_handle = fopen($filename, $file_modes[$mode_counter]);
   if(!$file_handle) {
     echo "Error: failed to open file $filename!\n";
     exit();
   }
-  
-  rewind($file_handle); 
-  /* read entire file and strip tags */ 
+
+  rewind($file_handle);
+  /* read entire file and strip tags */
   echo "-- fgetss() with default length, file pointer at 0 --\n";
   var_dump( fgetss($file_handle) ); // no length and allowable tags provided, reads entire file
   var_dump( ftell($file_handle) );
   var_dump( feof($file_handle) );
- 
+
   rewind($file_handle);
   /* read entire file and strip tags tags */
   echo "-- fgets() with length = 30, file pointer at 0 --\n";
   var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file
   var_dump( ftell($file_handle) ); // checking file pointer position initially
   var_dump( feof($file_handle) ); // confirm file pointer is not at eof
- 
-  // close the file 
+
+  // close the file
   fclose($file_handle);
- 
-  // delete the file 
+
+  // delete the file
   delete_file($filename);
 } // end of for - mode_counter
 
diff --git a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt
index 7edf7bcbd19..3a3fbb09ab5 100644
--- a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt
+++ b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt
@@ -32,7 +32,7 @@ EOT;
 if(substr(PHP_OS, 0, 3) == "WIN")  {
 	$string_with_tags = str_replace("\r",'', $string_with_tags);
 }
-$filename = dirname(__FILE__)."/fgetss_basic2��ガラスを食�られ��.tmp"; 
+$filename = dirname(__FILE__)."/fgetss_basic2��ガラスを食�られ��.tmp";
 
 /* try reading the file opened in different modes of reading */
 $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t");
@@ -47,7 +47,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     echo "Error: failed to open file $filename!\n";
     exit();
   }
-  
+
   // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
@@ -66,11 +66,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
   var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file
   var_dump( ftell($file_handle) ); // checking file pointer position initially
   var_dump( feof($file_handle) ); // confirm file pointer is not at eof
- 
-  // close the file 
+
+  // close the file
   fclose($file_handle);
-   
-  // delete the file 
+
+  // delete the file
   unlink($filename);
 } // end of for - mode_counter
 
diff --git a/ext/standard/tests/file/fgetss_basic2-win32.phpt b/ext/standard/tests/file/fgetss_basic2-win32.phpt
index ca6f40cb942..ff8f4d6b557 100644
--- a/ext/standard/tests/file/fgetss_basic2-win32.phpt
+++ b/ext/standard/tests/file/fgetss_basic2-win32.phpt
@@ -32,7 +32,7 @@ EOT;
 if(substr(PHP_OS, 0, 3) == "WIN")  {
 	$string_with_tags = str_replace("\r",'', $string_with_tags);
 }
-$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; 
+$filename = dirname(__FILE__)."/fgetss_basic2.tmp";
 
 /* try reading the file opened in different modes of reading */
 $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t");
@@ -47,7 +47,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     echo "Error: failed to open file $filename!\n";
     exit();
   }
-  
+
   // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
@@ -66,11 +66,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
   var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file
   var_dump( ftell($file_handle) ); // checking file pointer position initially
   var_dump( feof($file_handle) ); // confirm file pointer is not at eof
- 
-  // close the file 
+
+  // close the file
   fclose($file_handle);
-   
-  // delete the file 
+
+  // delete the file
   unlink($filename);
 } // end of for - mode_counter
 
diff --git a/ext/standard/tests/file/fgetss_basic2.phpt b/ext/standard/tests/file/fgetss_basic2.phpt
index 86be24810e4..ccc02966b66 100644
--- a/ext/standard/tests/file/fgetss_basic2.phpt
+++ b/ext/standard/tests/file/fgetss_basic2.phpt
@@ -30,7 +30,7 @@ is a heredoc string. <pg>ksklnm@@$$&$&^%&^%&^%&</pg>
 <html> html </html> <?php echo "php"; ?>
 EOT;
 
-$filename = dirname(__FILE__)."/fgetss_basic2.tmp"; 
+$filename = dirname(__FILE__)."/fgetss_basic2.tmp";
 
 /* try reading the file opened in different modes of reading */
 $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t");
@@ -45,7 +45,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     echo "Error: failed to open file $filename!\n";
     exit();
   }
-  
+
   // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
@@ -64,11 +64,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
   var_dump( fgetss($file_handle ,30) ); // length parameter given,not reading entire file
   var_dump( ftell($file_handle) ); // checking file pointer position initially
   var_dump( feof($file_handle) ); // confirm file pointer is not at eof
- 
-  // close the file 
+
+  // close the file
   fclose($file_handle);
-   
-  // delete the file 
+
+  // delete the file
   unlink($filename);
 } // end of for - mode_counter
 
diff --git a/ext/standard/tests/file/fgetss_error.phpt b/ext/standard/tests/file/fgetss_error.phpt
index 2640d279007..7c99f73a25f 100644
--- a/ext/standard/tests/file/fgetss_error.phpt
+++ b/ext/standard/tests/file/fgetss_error.phpt
@@ -17,14 +17,14 @@ echo "-- Testing fgetss() with more than expected number of arguments --\n";
 $fp = fopen(__FILE__, "r");
 var_dump( fgetss($fp, 100, '<p><a>', $fp) );
 
-// invalid length argument 
+// invalid length argument
 echo "-- Testing fgetss() with invalid length arguments --\n";
-$len = 0; 
+$len = 0;
 $allowable_tags = '<p><a>';
 var_dump( fgetss($fp, $len, $allowable_tags) );
 $len = -10;
 var_dump( fgetss($fp, $len, $allowable_tags) );
-$len = 1; 
+$len = 1;
 var_dump( fgetss($fp, $len, $allowable_tags) ); // return length - 1 always, expect false
 
 // test invalid arguments : non-resources
diff --git a/ext/standard/tests/file/fgetss_variation1-win32.phpt b/ext/standard/tests/file/fgetss_variation1-win32.phpt
index 7cd49333bf0..b189b1b5a1f 100644
--- a/ext/standard/tests/file/fgetss_variation1-win32.phpt
+++ b/ext/standard/tests/file/fgetss_variation1-win32.phpt
@@ -19,7 +19,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
     x, xb, xt
 */
 
-// include the common file related test functions 
+// include the common file related test functions
 include ("file.inc");
 
 echo "*** Testing fgetss() : usage variations ***\n";
@@ -55,23 +55,23 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     echo "Error: failed to open file $filename!\n";
     exit();
   }
-  
+
   // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
   var_dump( feof($file_handle) );
 
-  /* read entire file and strip tags */ 
+  /* read entire file and strip tags */
   echo "-- fgetss() with default length, file pointer at 0 , expected : no character should be read --\n";
   var_dump( fgetss($file_handle) ); // expected : no character should be read
   var_dump( ftell($file_handle) ); //ensure that file pointer position is not changed
   var_dump( feof($file_handle) ); // check if end of file pointer is set
-  
-  // close the file 
+
+  // close the file
   fclose($file_handle);
-   
-  // delete the file 
+
+  // delete the file
   delete_file($filename);
 } // end of for - mode_counter
 
diff --git a/ext/standard/tests/file/fgetss_variation1.phpt b/ext/standard/tests/file/fgetss_variation1.phpt
index 5a0556a198a..54826fad668 100644
--- a/ext/standard/tests/file/fgetss_variation1.phpt
+++ b/ext/standard/tests/file/fgetss_variation1.phpt
@@ -19,7 +19,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
     x, xb, xt
 */
 
-// include the common file related test functions 
+// include the common file related test functions
 include ("file.inc");
 
 echo "*** Testing fgetss() : usage variations ***\n";
@@ -51,23 +51,23 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     echo "Error: failed to open file $filename!\n";
     exit();
   }
-  
+
   // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
   var_dump( feof($file_handle) );
 
-  /* read entire file and strip tags */ 
+  /* read entire file and strip tags */
   echo "-- fgetss() with default length, file pointer at 0 , expected : no character should be read --\n";
   var_dump( fgetss($file_handle) ); // expected : no character should be read
   var_dump( ftell($file_handle) ); //ensure that file pointer position is not changed
   var_dump( feof($file_handle) ); // check if end of file pointer is set
-  
-  // close the file 
+
+  // close the file
   fclose($file_handle);
-   
-  // delete the file 
+
+  // delete the file
   delete_file($filename);
 } // end of for - mode_counter
 
diff --git a/ext/standard/tests/file/fgetss_variation2.phpt b/ext/standard/tests/file/fgetss_variation2.phpt
index a436e8c4b37..43bebab6e1f 100644
--- a/ext/standard/tests/file/fgetss_variation2.phpt
+++ b/ext/standard/tests/file/fgetss_variation2.phpt
@@ -7,7 +7,7 @@ Test fgetss() function : usage variations - read modes
  Description: Gets line from file pointer and strip HTML tags
 */
 
-// include the common file related test functions 
+// include the common file related test functions
 include ("file.inc");
 
 /*Test fgetss() with all read modes , reading line by line with allowable tags: <test>, <html>, <?> */
@@ -27,7 +27,7 @@ this text contains some html tags <body> body </body> <br> br </br>
 this is the line with \n character. 
 EOT;
 
-$filename = dirname(__FILE__)."/fgetss_variation2.tmp"; 
+$filename = dirname(__FILE__)."/fgetss_variation2.tmp";
 
 /* try reading the file opened in different modes of reading */
 $file_modes = array("r","rb", "rt","r+", "r+b", "r+t");
@@ -37,7 +37,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
 
   /* create an empty file and write the strings with tags */
   create_file ($filename); //create an empty file
-  file_put_contents($filename, $string_with_tags); 
+  file_put_contents($filename, $string_with_tags);
   $file_handle = fopen($filename, $file_modes[$mode_counter]);
   if(!$file_handle) {
     echo "Error: failed to open file $filename!\n";
@@ -49,7 +49,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
   var_dump( feof($file_handle) );
-   
+
   /* rewind the file and read the file  line by line with allowable tags */
   echo "-- Reading line by line with allowable tags: <test>, <html>, <?> --\n";
   rewind($file_handle);
@@ -60,10 +60,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
      var_dump( ftell($file_handle) );  // check the file pointer position
      var_dump( feof($file_handle) );  // check if eof reached
   }
- 
-  // close the file 
-  fclose($file_handle); 
-  // delete the file 
+
+  // close the file
+  fclose($file_handle);
+  // delete the file
   delete_file($filename);
 } // end of for - mode_counter
 
diff --git a/ext/standard/tests/file/fgetss_variation3-win32.phpt b/ext/standard/tests/file/fgetss_variation3-win32.phpt
index fc7561dff59..1987592bbce 100644
--- a/ext/standard/tests/file/fgetss_variation3-win32.phpt
+++ b/ext/standard/tests/file/fgetss_variation3-win32.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fgetss() function : usage variations - read/write modes 
+Test fgetss() function : usage variations - read/write modes
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
@@ -39,7 +39,7 @@ if(substr(PHP_OS, 0, 3) == "WIN")  {
 	$string_with_tags = str_replace("\r",'', $string_with_tags);
 }
 
-$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; 
+$filename = dirname(__FILE__)."/fgetss_variation3.tmp";
 
 /* try reading the file opened in different modes of reading */
 $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t");
@@ -54,7 +54,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     echo "Error: failed to open file $filename!\n";
     exit();
   }
-  
+
   // rewind the file pointer to beginning of the file
   rewind($file_handle);
   var_dump( ftell($file_handle) );
@@ -70,11 +70,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
      var_dump( ftell($file_handle) );  // check the file pointer position
      var_dump( feof($file_handle) );  // check if eof reached
   }
- 
-  // close the file 
+
+  // close the file
   fclose($file_handle);
-   
-  // delete the file 
+
+  // delete the file
   unlink($filename);
 } // end of for - mode_counter
 
diff --git a/ext/standard/tests/file/fgetss_variation3.phpt b/ext/standard/tests/file/fgetss_variation3.phpt
index e6f63c310f2..4e3bc73fbe7 100644
--- a/ext/standard/tests/file/fgetss_variation3.phpt
+++ b/ext/standard/tests/file/fgetss_variation3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fgetss() function : usage variations - read/write modes 
+Test fgetss() function : usage variations - read/write modes
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
@@ -35,7 +35,7 @@ this text contains some html tags <body> body </body> <br> br </br>
 this is the line with \n character. 
 EOT;
 
-$filename = dirname(__FILE__)."/fgetss_variation3.tmp"; 
+$filename = dirname(__FILE__)."/fgetss_variation3.tmp";
 
 /* try reading the file opened in different modes of reading */
 $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t");
@@ -50,7 +50,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     echo "Error: failed to open file $filename!\n";
     exit();
   }
-  
+
   // rewind the file pointer to beginning of the file
   rewind($file_handle);
   var_dump( ftell($file_handle) );
@@ -66,11 +66,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
      var_dump( ftell($file_handle) );  // check the file pointer position
      var_dump( feof($file_handle) );  // check if eof reached
   }
- 
-  // close the file 
+
+  // close the file
   fclose($file_handle);
-   
-  // delete the file 
+
+  // delete the file
   unlink($filename);
 } // end of for - mode_counter
 
diff --git a/ext/standard/tests/file/fgetss_variation4.phpt b/ext/standard/tests/file/fgetss_variation4.phpt
index b93bc6afd07..f455e8b3af6 100644
--- a/ext/standard/tests/file/fgetss_variation4.phpt
+++ b/ext/standard/tests/file/fgetss_variation4.phpt
@@ -12,7 +12,7 @@ if(substr(PHP_OS, 0, 3) == "WIN")
  Description: Gets line from file pointer and strip HTML tags
 */
 
-// include the common file related test functions 
+// include the common file related test functions
 include ("file.inc");
 
 echo "*** Testing fgetss() : usage variations  ***\n";
@@ -30,7 +30,7 @@ this text contains some html tags <body> body </body> <br> br </br>
 this is the line with \n character. 
 EOT;
 
-$filename = dirname(__FILE__)."/fgetss_variation4.tmp"; 
+$filename = dirname(__FILE__)."/fgetss_variation4.tmp";
 
 /* try reading the file opened in different modes of reading */
 $file_modes = array("r","rb", "rt","r+", "r+b", "r+t");
@@ -40,7 +40,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
 
   /* create an empty file and write the strings with tags */
   create_file ($filename); //create an empty file
-  file_put_contents($filename, $string_with_tags); 
+  file_put_contents($filename, $string_with_tags);
   $file_handle = fopen($filename, $file_modes[$mode_counter]);
   if(!$file_handle) {
     echo "Error: failed to open file $filename!\n";
@@ -52,7 +52,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
   var_dump( feof($file_handle) );
-  
+
   echo "-- Reading when file pointer points to EOF --\n";
   var_dump( fseek($file_handle,0,SEEK_END) ); // now file pointer at end
   var_dump( ftell($file_handle) ); //ensure file pointer at end
@@ -64,10 +64,10 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
   var_dump( fgetss($file_handle, 80, "<test>, <html>, <?>") );
   var_dump( ftell($file_handle) );  // find out file position
   var_dump( feof($file_handle) );   // ensure that file pointer is at eof
- 
-  // close the file 
-  fclose($file_handle); 
-  // delete the file 
+
+  // close the file
+  fclose($file_handle);
+  // delete the file
   delete_file($filename);
 } // end of for - mode_counter
 
diff --git a/ext/standard/tests/file/fgetss_variation5-win32.phpt b/ext/standard/tests/file/fgetss_variation5-win32.phpt
index a2d4a705e81..52eaef629a2 100644
--- a/ext/standard/tests/file/fgetss_variation5-win32.phpt
+++ b/ext/standard/tests/file/fgetss_variation5-win32.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fgetss() function : usage variations - read/write modes, file pointer at EOF 
+Test fgetss() function : usage variations - read/write modes, file pointer at EOF
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
@@ -37,7 +37,7 @@ if(substr(PHP_OS, 0, 3) == "WIN")  {
 	$string_with_tags = str_replace("\r",'', $string_with_tags);
 }
 
-$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; 
+$filename = dirname(__FILE__)."/fgetss_variation5.tmp";
 
 /* try reading the file opened in different modes of reading */
 $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t");
@@ -70,11 +70,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
   var_dump( ftell($file_handle) );  // find out file position
   var_dump( feof($file_handle) );   // ensure that file pointer is at eof
 
- 
-  // close the file 
+
+  // close the file
   fclose($file_handle);
-   
-  // delete the file 
+
+  // delete the file
   unlink($filename);
 } // end of for - mode_counter
 
diff --git a/ext/standard/tests/file/fgetss_variation5.phpt b/ext/standard/tests/file/fgetss_variation5.phpt
index c499d598b22..91d0b5c1145 100644
--- a/ext/standard/tests/file/fgetss_variation5.phpt
+++ b/ext/standard/tests/file/fgetss_variation5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fgetss() function : usage variations - read/write modes, file pointer at EOF 
+Test fgetss() function : usage variations - read/write modes, file pointer at EOF
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
@@ -34,7 +34,7 @@ this text contains some html tags <body> body </body> <br> br </br>
 this is the line with \n character. 
 EOT;
 
-$filename = dirname(__FILE__)."/fgetss_variation5.tmp"; 
+$filename = dirname(__FILE__)."/fgetss_variation5.tmp";
 
 /* try reading the file opened in different modes of reading */
 $file_modes = array("w+","w+b", "w+t","a+", "a+b", "a+t","x+","x+b","x+t");
@@ -67,11 +67,11 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
   var_dump( ftell($file_handle) );  // find out file position
   var_dump( feof($file_handle) );   // ensure that file pointer is at eof
 
- 
-  // close the file 
+
+  // close the file
   fclose($file_handle);
-   
-  // delete the file 
+
+  // delete the file
   unlink($filename);
 } // end of for - mode_counter
 
diff --git a/ext/standard/tests/file/file_basic.phpt b/ext/standard/tests/file/file_basic.phpt
index 97a592fd0c1..77d87dd820e 100644
--- a/ext/standard/tests/file/file_basic.phpt
+++ b/ext/standard/tests/file/file_basic.phpt
@@ -2,7 +2,7 @@
 Test file() function : basic functionality
 --FILE--
 <?php
-/* 
+/*
  * Prototype: array file ( string filename [,int use-include_path [,resource context]] );
  * Description: Reads entire file into an array
  *              Returns the  file in an array
diff --git a/ext/standard/tests/file/file_error.phpt b/ext/standard/tests/file/file_error.phpt
index 31189672d30..fdf02fe109e 100644
--- a/ext/standard/tests/file/file_error.phpt
+++ b/ext/standard/tests/file/file_error.phpt
@@ -2,7 +2,7 @@
 Test file() function : error conditions
 --FILE--
 <?php
-/* 
+/*
    Prototype: array file ( string filename [,int use-include_path [,resource context]] );
    Description: Reads entire file into an array
                 Returns the  file in an array
@@ -18,7 +18,7 @@ var_dump( file($filename, $filename, $filename, $filename) );  // more than expe
 var_dump( file($filename, "INCORRECT_FLAG", NULL) );  //  Incorrect flag
 var_dump( file($filename, 10, NULL) );  //  Incorrect flag
 
-var_dump( file("temp.tmp") );  // non existing filename 
+var_dump( file("temp.tmp") );  // non existing filename
 fclose($file_handle);
 
 echo "\n--- Done ---";
diff --git a/ext/standard/tests/file/file_exists_error.phpt b/ext/standard/tests/file/file_exists_error.phpt
index b20b2fe3a01..7d98e4d0a5f 100644
--- a/ext/standard/tests/file/file_exists_error.phpt
+++ b/ext/standard/tests/file/file_exists_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test file_exists() function : error conditions 
+Test file_exists() function : error conditions
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : proto bool file_exists(string filename)
- * Description: Returns true if filename exists 
+ * Description: Returns true if filename exists
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_exists() : error conditions ***\n";
diff --git a/ext/standard/tests/file/file_exists_variation1.phpt b/ext/standard/tests/file/file_exists_variation1.phpt
index 35c86a2808b..7e3fda394d0 100644
--- a/ext/standard/tests/file/file_exists_variation1.phpt
+++ b/ext/standard/tests/file/file_exists_variation1.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : proto bool file_exists(string filename)
- * Description: Returns true if filename exists 
+ * Description: Returns true if filename exists
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_exists() : usage variations ***\n";
diff --git a/ext/standard/tests/file/file_get_contents_error.phpt b/ext/standard/tests/file/file_get_contents_error.phpt
index 631a138a07f..f06628f5161 100644
--- a/ext/standard/tests/file/file_get_contents_error.phpt
+++ b/ext/standard/tests/file/file_get_contents_error.phpt
@@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype: string file_get_contents( string $filename{, bool $use_include_path[,
- *                                      resource $context[, int $offset[, int $maxlen]]]] ) 
+ *                                      resource $context[, int $offset[, int $maxlen]]]] )
  * Description: Reads entire file into a string
  */
 
@@ -28,7 +28,7 @@ print( file_get_contents($file_path."/file1.tmp", false, $file_handle, 1, 2, "ex
 
 echo "\n-- Testing for invalid negative maxlen values --";
 var_dump( file_get_contents($file_path."/file1.tmp", FALSE, $file_handle, 0, -5) );
-   
+
 delete_files($file_path, 1);
 fclose($file_handle);
 unlink($file_path."/file_put_contents_error.tmp");
diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt
index 72fe1215334..b2a09798e31 100644
--- a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt
+++ b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt
@@ -3,7 +3,7 @@ Test file-get_contents() and file_put_contents() functions : error conditions
 --FILE--
 <?php
 /* Prototype: string file_get_contents( string $filename{, bool $use_include_path[,
- *                                      resource $context[, int $offset[, int $maxlen]]]] ) 
+ *                                      resource $context[, int $offset[, int $maxlen]]]] )
  * Description: Reads entire file into a string
  */
 
@@ -31,7 +31,7 @@ print( file_get_contents("abc.tmp", false, $file_handle, 1, 2, "extra_argument")
 echo "\n-- Testing for invalid negative maxlen values --";
 file_put_contents($file_path."/file_put_contents1.tmp", "Garbage data in the file");
 var_dump( file_get_contents($file_path."/file_put_contents1.tmp", FALSE, NULL, 0, -5) );
-   
+
 fclose($file_handle);
 
 echo "\n*** Done ***\n";
diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt
index 1bac1c98641..1ad7f5203c6 100644
--- a/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt
+++ b/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt
@@ -3,7 +3,7 @@ Test file_get_contents() and file_put_contents() functions : usage variations -
 
 --FILE--
 <?php
-/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, 
+/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[,
  *                                      resource $context[, int $offset[, int $maxlen]]]] )
  * Description: Reads entire file into a string
  */
@@ -36,7 +36,7 @@ echo "--- Done ---";
 ?>
 --CLEAN--
 <?php
-//Deleting the temporary file 
+//Deleting the temporary file
 
 $file_path = dirname(__FILE__);
 unlink($file_path."/file_put_contents_variation1.tmp");
diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt
index fc2281dca09..af9ccbb714e 100644
--- a/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt
+++ b/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt
@@ -3,7 +3,7 @@ Test file_get_contents() and file_put_contents() functions : usage variations -
 
 --FILE--
 <?php
-/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[, 
+/* Prototype: string file_get_contents( string $filename[, bool $use_include_path[,
  *                                      resource $context[, int $offset[, int $maxlen]]]] )
  * Description: Reads entire file into a string
  */
diff --git a/ext/standard/tests/file/file_get_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_variation1.phpt
index ddc926180de..12bfd325ae7 100644
--- a/ext/standard/tests/file/file_get_contents_variation1.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation1.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])
- * Description: Read the entire file into a string 
+ * Description: Read the entire file into a string
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_get_contents() : variation ***\n";
@@ -40,7 +40,7 @@ function runtest() {
    fclose($h);
    $line = file_get_contents($filename, true);
    echo "$line\n";
-   unlink($secondFile);  
+   unlink($secondFile);
 }
 
 ?>
diff --git a/ext/standard/tests/file/file_get_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_variation2.phpt
index 510ec12aedb..12d740c5f01 100644
--- a/ext/standard/tests/file/file_get_contents_variation2.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation2.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])
- * Description: Read the entire file into a string 
+ * Description: Read the entire file into a string
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_get_contents() : variation ***\n";
@@ -41,7 +41,7 @@ function runtest() {
    fclose($h);
    $line = file_get_contents($filename, true);
    echo "$line\n";
-   unlink($scriptLocFile);  
+   unlink($scriptLocFile);
 }
 
 ?>
diff --git a/ext/standard/tests/file/file_get_contents_variation3.phpt b/ext/standard/tests/file/file_get_contents_variation3.phpt
index f485b0ecf58..a302bf3e2f2 100644
--- a/ext/standard/tests/file/file_get_contents_variation3.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation3.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])
- * Description: Read the entire file into a string 
+ * Description: Read the entire file into a string
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_get_contents() : usage variation ***\n";
diff --git a/ext/standard/tests/file/file_get_contents_variation4.phpt b/ext/standard/tests/file/file_get_contents_variation4.phpt
index ecceb28093c..f6f3c3a9c5c 100644
--- a/ext/standard/tests/file/file_get_contents_variation4.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation4.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])
- * Description: Read the entire file into a string 
+ * Description: Read the entire file into a string
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_get_contents() : usage variation ***\n";
@@ -107,10 +107,10 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       //non context resource
       'file resource' => $fileRes,
-      
+
       //valid stream context
       'stream context' => $strContext,
 );
diff --git a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
index 26ba22a47e9..b63c0a11839 100644
--- a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test file_get_contents() function : usage variation 
+Test file_get_contents() function : usage variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -7,9 +7,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])
- * Description: Read the entire file into a string 
+ * Description: Read the entire file into a string
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_get_contents() : usage variation ***\n";
diff --git a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
index 66f51895a9f..c02acb90d5a 100644
--- a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test file_get_contents() function : usage variation 
+Test file_get_contents() function : usage variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -7,9 +7,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])
- * Description: Read the entire file into a string 
+ * Description: Read the entire file into a string
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_get_contents() : usage variation ***\n";
diff --git a/ext/standard/tests/file/file_get_contents_variation6.phpt b/ext/standard/tests/file/file_get_contents_variation6.phpt
index 25a122e1bca..e8baf08eebc 100644
--- a/ext/standard/tests/file/file_get_contents_variation6.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation6.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test file_get_contents() function : usage variation 
+Test file_get_contents() function : usage variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])
- * Description: Read the entire file into a string 
+ * Description: Read the entire file into a string
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_get_contents() : usage variation ***\n";
diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt
index cc8eb40f491..27ddea0060f 100644
--- a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])
- * Description: Read the entire file into a string 
+ * Description: Read the entire file into a string
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_get_contents() : variation ***\n";
@@ -35,14 +35,14 @@ $allDirs = array(
   "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir,
   "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir,
   "$absSubDir\\BADDIR",
-  
+
   // relative paths
   $mainDir."\\".$subDir,
-  $mainDir."\\\\".$subDir, 
-   $mainDir."\\\\\\".$subDir, 
+  $mainDir."\\\\".$subDir,
+   $mainDir."\\\\\\".$subDir,
   ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir,
-  "BADDIR",  
-  
+  "BADDIR",
+
   // unixifed path
   $unixifiedDir,
 );
diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt
index d350b4b0377..baad767d6f1 100644
--- a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])
- * Description: Read the entire file into a string 
+ * Description: Read the entire file into a string
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_get_contents() : variation ***\n";
@@ -35,14 +35,14 @@ $allDirs = array(
   "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir,
   "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir,
   "$absSubDir\\BADDIR",
-  
+
   // relative paths
   $mainDir."\\".$subDir,
-  $mainDir."\\\\".$subDir, 
-   $mainDir."\\\\\\".$subDir, 
+  $mainDir."\\\\".$subDir,
+   $mainDir."\\\\\\".$subDir,
   ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir,
-  "BADDIR",  
-  
+  "BADDIR",
+
   // unixifed path
   $unixifiedDir,
 );
diff --git a/ext/standard/tests/file/file_get_contents_variation7.phpt b/ext/standard/tests/file/file_get_contents_variation7.phpt
index 17c55b61351..0fb662b0a81 100644
--- a/ext/standard/tests/file/file_get_contents_variation7.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation7.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])
- * Description: Read the entire file into a string 
+ * Description: Read the entire file into a string
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_get_contents() : variation ***\n";
@@ -29,14 +29,14 @@ $allDirs = array(
   "$absSubDir/../../".$mainDir."/./".$subDir,
   "$absSubDir/..///".$subDir."//..//../".$subDir,
   "$absSubDir/BADDIR",
-  
+
   // relative paths
   $mainDir."/".$subDir,
-  $mainDir."//".$subDir, 
-   $mainDir."///".$subDir, 
+  $mainDir."//".$subDir,
+   $mainDir."///".$subDir,
   "./".$mainDir."/../".$mainDir."/".$subDir,
-  "BADDIR",  
-  
+  "BADDIR",
+
 );
 
 $filename = 'FileGetContentsVar7.tmp';
diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
index bb62eb47fb1..4928404098f 100644
--- a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
@@ -11,14 +11,14 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])
- * Description: Read the entire file into a string 
+ * Description: Read the entire file into a string
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_get_contents() : variation ***\n";
 
-/* An array of filenames */ 
+/* An array of filenames */
 $names_arr = array(
   /* Invalid args */
   "-1" => -1,
@@ -30,8 +30,8 @@ $names_arr = array(
   "\\0" => "\0",
   "array()" => array(),
 
-  /* prefix with path separator of a non existing directory*/ 
-  "/no/such/file/dir" => "/no/such/file/dir", 
+  /* prefix with path separator of a non existing directory*/
+  "/no/such/file/dir" => "/no/such/file/dir",
   "php/php"=> "php/php"
 
 );
diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt
index 5b325b0e984..97a3495d543 100644
--- a/ext/standard/tests/file/file_get_contents_variation8.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation8.phpt
@@ -11,15 +11,15 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])
- * Description: Read the entire file into a string 
+ * Description: Read the entire file into a string
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_get_contents() : variation ***\n";
-/* An array of filenames */ 
+/* An array of filenames */
 $names_arr = array(
-  /* Invalid args */ 
+  /* Invalid args */
   -1,
   TRUE,
   FALSE,
@@ -30,7 +30,7 @@ $names_arr = array(
   array(),
 
   /* prefix with path separator of a non existing directory*/
-  "/no/such/file/dir", 
+  "/no/such/file/dir",
   "php/php"
 
 );
diff --git a/ext/standard/tests/file/file_get_contents_variation9.phpt b/ext/standard/tests/file/file_get_contents_variation9.phpt
index 7e500e8c56e..f4188c21021 100644
--- a/ext/standard/tests/file/file_get_contents_variation9.phpt
+++ b/ext/standard/tests/file/file_get_contents_variation9.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : string file_get_contents(string filename [, bool use_include_path [, resource context [, long offset [, long maxlen]]]])
- * Description: Read the entire file into a string 
+ * Description: Read the entire file into a string
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_get_contents() : variation ***\n";
diff --git a/ext/standard/tests/file/file_put_contents.phpt b/ext/standard/tests/file/file_put_contents.phpt
index 4566c37567d..1607ab1bdef 100644
--- a/ext/standard/tests/file/file_put_contents.phpt
+++ b/ext/standard/tests/file/file_put_contents.phpt
@@ -21,7 +21,7 @@ var_dump(file_put_contents($file, "string", 0, $fp));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: file_put_contents(): supplied resource is not a valid stream resource in %s on line %d
 bool(false)
 bool(false)
diff --git a/ext/standard/tests/file/file_put_contents_variation1.phpt b/ext/standard/tests/file/file_put_contents_variation1.phpt
index 35d193095c2..f9a2d0e7e22 100644
--- a/ext/standard/tests/file/file_put_contents_variation1.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation1.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : int file_put_contents(string file, mixed data [, int flags [, resource context]])
- * Description: Write/Create a file with contents data and return the number of bytes written 
+ * Description: Write/Create a file with contents data and return the number of bytes written
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_put_contents() : variation ***\n";
@@ -28,7 +28,7 @@ echo filesize($filename)."\n";
 readfile($filename);
 echo "\n";
 unlink($filename);
- 
+
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/file/file_put_contents_variation2.phpt b/ext/standard/tests/file/file_put_contents_variation2.phpt
index 753e2875040..ae56486d5fe 100644
--- a/ext/standard/tests/file/file_put_contents_variation2.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation2.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test file_put_contents() function : usage variation - different data types to write 
+Test file_put_contents() function : usage variation - different data types to write
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : int file_put_contents(string file, mixed data [, int flags [, resource context]])
- * Description: Write/Create a file with contents data and return the number of bytes written 
+ * Description: Write/Create a file with contents data and return the number of bytes written
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_put_contents() : usage variation ***\n";
diff --git a/ext/standard/tests/file/file_put_contents_variation3.phpt b/ext/standard/tests/file/file_put_contents_variation3.phpt
index bf454ca08cb..1506726dc4f 100644
--- a/ext/standard/tests/file/file_put_contents_variation3.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation3.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : int file_put_contents(string file, mixed data [, int flags [, resource context]])
- * Description: Write/Create a file with contents data and return the number of bytes written 
+ * Description: Write/Create a file with contents data and return the number of bytes written
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_put_contents() : usage variation ***\n";
@@ -106,10 +106,10 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       //non context resource
       'file resource' => $fileRes,
-      
+
       //valid stream context
       'stream context' => $strContext,
 );
diff --git a/ext/standard/tests/file/file_put_contents_variation4.phpt b/ext/standard/tests/file/file_put_contents_variation4.phpt
index 62d814c9fdf..339e9b73a7c 100644
--- a/ext/standard/tests/file/file_put_contents_variation4.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation4.phpt
@@ -5,15 +5,15 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : int file_put_contents(string file, mixed data [, int flags [, resource context]])
- * Description: Write/Create a file with contents data and return the number of bytes written 
+ * Description: Write/Create a file with contents data and return the number of bytes written
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
 require_once('fopen_include_path.inc');
 
-$thisTestDir = basename(__FILE__, ".php") . ".dir"; 
+$thisTestDir = basename(__FILE__, ".php") . ".dir";
 mkdir($thisTestDir);
 chdir($thisTestDir);
 
@@ -35,7 +35,7 @@ rmdir($thisTestDir);
 
 function runtest() {
    global $filename;
-   //correct php53 behaviour is to ingnore the FILE_USE_INCLUDE_PATH unless the file alread exists 
+   //correct php53 behaviour is to ingnore the FILE_USE_INCLUDE_PATH unless the file alread exists
    // in the include path. In this case it doesn't so the file should be written in the current dir.
    file_put_contents($filename, "File in include path", FILE_USE_INCLUDE_PATH);
    $line = file_get_contents($filename);
diff --git a/ext/standard/tests/file/file_put_contents_variation5.phpt b/ext/standard/tests/file/file_put_contents_variation5.phpt
index fe1961d16cf..fed872f8a30 100644
--- a/ext/standard/tests/file/file_put_contents_variation5.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation5.phpt
@@ -10,7 +10,7 @@ $thisTestDir = dirname(__FILE__) . '/' .basename(__FILE__, ".php") . ".directory
 mkdir($thisTestDir);
 chdir($thisTestDir);
 
-$filename = basename(__FILE__, ".php") . ".tmp"; 
+$filename = basename(__FILE__, ".php") . ".tmp";
 $scriptLocFile = dirname(__FILE__)."/".$filename;
 
 $newpath = "rubbish";
@@ -35,9 +35,9 @@ function runtest() {
       echo "Fail - this is PHP52 behaviour\n";
       unlink($scriptLocFile);
    }else {
-      $line = file_get_contents($filename); 
+      $line = file_get_contents($filename);
       echo "$line\n";
-      unlink($filename);     
+      unlink($filename);
    }
 }
 ?>
diff --git a/ext/standard/tests/file/file_put_contents_variation6.phpt b/ext/standard/tests/file/file_put_contents_variation6.phpt
index a0977faff8a..7f963a01fe4 100644
--- a/ext/standard/tests/file/file_put_contents_variation6.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation6.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : int file_put_contents(string file, mixed data [, int flags [, resource context]])
- * Description: Write/Create a file with contents data and return the number of bytes written 
+ * Description: Write/Create a file with contents data and return the number of bytes written
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_put_contents() : variation ***\n";
@@ -37,14 +37,14 @@ rmdir($thisTestDir);
 function runtest() {
    global $filename;
 
-   //correct php53 behaviour is to ignore the FILE_USE_INCLUDE_PATH unless the file already exists 
+   //correct php53 behaviour is to ignore the FILE_USE_INCLUDE_PATH unless the file already exists
    // in the include path. In this case it doesn't so the file should be written in the current dir.
 
    file_put_contents($filename, "File in include path", FILE_USE_INCLUDE_PATH);
-   file_put_contents($filename, ". This was appended", FILE_USE_INCLUDE_PATH | FILE_APPEND);  
+   file_put_contents($filename, ". This was appended", FILE_USE_INCLUDE_PATH | FILE_APPEND);
    $line = file_get_contents($filename);
    echo "$line\n";
-   unlink($filename); 
+   unlink($filename);
 }
 
 ?>
diff --git a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt
index e1a94a2043b..d4ee0585fdc 100644
--- a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : int file_put_contents(string file, mixed data [, int flags [, resource context]])
- * Description: Write/Create a file with contents data and return the number of bytes written 
+ * Description: Write/Create a file with contents data and return the number of bytes written
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_put_contents() : usage variation ***\n";
@@ -39,14 +39,14 @@ $allDirs = array(
   "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir,
   "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir,
   "$absSubDir\\BADDIR",
-  
+
   // relative paths
   $mainDir."\\".$subDir,
-  $mainDir."\\\\".$subDir, 
-   $mainDir."\\\\\\".$subDir, 
+  $mainDir."\\\\".$subDir,
+   $mainDir."\\\\\\".$subDir,
   ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir,
-  "BADDIR",  
-  
+  "BADDIR",
+
   // unixifed path
   $unixifiedDir,
 );
@@ -73,7 +73,7 @@ for($i = 0; $i<count($allDirs); $i++) {
   else {
      echo "No data written\n";
   }
-      
+
 }
 
 chdir($old_dir_path);
diff --git a/ext/standard/tests/file/file_put_contents_variation7.phpt b/ext/standard/tests/file/file_put_contents_variation7.phpt
index b1b2face607..94cfa627d3d 100644
--- a/ext/standard/tests/file/file_put_contents_variation7.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation7.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : int file_put_contents(string file, mixed data [, int flags [, resource context]])
- * Description: Write/Create a file with contents data and return the number of bytes written 
+ * Description: Write/Create a file with contents data and return the number of bytes written
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_put_contents() : usage variation ***\n";
@@ -33,14 +33,14 @@ $allDirs = array(
   "$absSubDir/../../".$mainDir."/./".$subDir,
   "$absSubDir/..///".$subDir."//..//../".$subDir,
   "$absSubDir/BADDIR",
-  
+
   // relative paths
   $mainDir."/".$subDir,
-  $mainDir."//".$subDir, 
-   $mainDir."///".$subDir, 
+  $mainDir."//".$subDir,
+   $mainDir."///".$subDir,
   "./".$mainDir."/../".$mainDir."/".$subDir,
-  "BADDIR",  
-  
+  "BADDIR",
+
 );
 
 $filename = 'FileGetContentsVar7.tmp';
@@ -65,7 +65,7 @@ for($i = 0; $i<count($allDirs); $i++) {
   else {
      echo "No data written\n";
   }
-      
+
 }
 
 chdir($old_dir_path);
diff --git a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
index 92fe7b3d6af..095980b5362 100644
--- a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
@@ -10,14 +10,14 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : int file_put_contents(string file, mixed data [, int flags [, resource context]])
- * Description: Write/Create a file with contents data and return the number of bytes written 
+ * Description: Write/Create a file with contents data and return the number of bytes written
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_put_contents() : usage variation ***\n";
 
-/* An array of filenames */ 
+/* An array of filenames */
 $names_arr = array(
   "-1" => -1,
   "TRUE" => TRUE,
@@ -28,8 +28,8 @@ $names_arr = array(
   "\\0" => "\0",
   "array()" => array(),
 
-  /* prefix with path separator of a non existing directory*/ 
-  "/no/such/file/dir" => "/no/such/file/dir", 
+  /* prefix with path separator of a non existing directory*/
+  "/no/such/file/dir" => "/no/such/file/dir",
   "php/php"=> "php/php"
 
 );
@@ -42,7 +42,7 @@ foreach($names_arr as $key =>$value) {
      	 unlink($value);
   	  } else {
          echo "Failed to write data to: $key\n";
-      }	
+      }
 };
 
 ?>
diff --git a/ext/standard/tests/file/file_put_contents_variation8.phpt b/ext/standard/tests/file/file_put_contents_variation8.phpt
index 3cd92c5ec8a..20a2861bca9 100644
Binary files a/ext/standard/tests/file/file_put_contents_variation8.phpt and b/ext/standard/tests/file/file_put_contents_variation8.phpt differ
diff --git a/ext/standard/tests/file/file_put_contents_variation9.phpt b/ext/standard/tests/file/file_put_contents_variation9.phpt
index 79a42fe9b1f..64a5a67e33f 100644
--- a/ext/standard/tests/file/file_put_contents_variation9.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation9.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : int file_put_contents(string file, mixed data [, int flags [, resource context]])
- * Description: Write/Create a file with contents data and return the number of bytes written 
+ * Description: Write/Create a file with contents data and return the number of bytes written
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file_put_contents() : usage variation ***\n";
@@ -34,7 +34,7 @@ run_test($softlink);
 
 //can only create a hardlink if the file exists.
 file_put_contents($filename,"");
-link($filename, $hardlink); 
+link($filename, $hardlink);
 run_test($hardlink);
 
 unlink($chainlink);
diff --git a/ext/standard/tests/file/file_variation.phpt b/ext/standard/tests/file/file_variation.phpt
index 506575fde79..80f5503cd6f 100644
--- a/ext/standard/tests/file/file_variation.phpt
+++ b/ext/standard/tests/file/file_variation.phpt
@@ -2,7 +2,7 @@
 Test file() function : usage variations
 --FILE--
 <?php
-/* 
+/*
  *  Prototype: array file ( string filename [,int use-include_path [,resource context]] );
  *  Description: Reads entire file into an array
                  Returns the  file in an array
@@ -17,8 +17,8 @@ foreach( $data_array as $data ) {
    echo "--Iteration $count --\n";
    $fh  = fopen($file_path."/file_variation.tmp", "w");
    fwrite($fh, $data);
-   var_dump( file($file_path."/file_variation.tmp", FILE_IGNORE_NEW_LINES) ); 
-   var_dump( file($file_path."/file_variation.tmp", FILE_SKIP_EMPTY_LINES) ); 
+   var_dump( file($file_path."/file_variation.tmp", FILE_IGNORE_NEW_LINES) );
+   var_dump( file($file_path."/file_variation.tmp", FILE_SKIP_EMPTY_LINES) );
    $count++;
    fclose($fh);
 }
diff --git a/ext/standard/tests/file/file_variation2.phpt b/ext/standard/tests/file/file_variation2.phpt
index ab37ea5c45f..9c3ad0e546b 100644
--- a/ext/standard/tests/file/file_variation2.phpt
+++ b/ext/standard/tests/file/file_variation2.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test file() function : first parameter variation 
+Test file() function : first parameter variation
 --FILE--
 <?php
 /* Prototype  : array file(string filename [, int flags[, resource context]])
- * Description: Read entire file into an array 
+ * Description: Read entire file into an array
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file() : usage variation ***\n";
diff --git a/ext/standard/tests/file/file_variation3.phpt b/ext/standard/tests/file/file_variation3.phpt
index f61c3c257ed..9001a843182 100644
--- a/ext/standard/tests/file/file_variation3.phpt
+++ b/ext/standard/tests/file/file_variation3.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test file() function : second parameter variation 
+Test file() function : second parameter variation
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only");
 --FILE--
 <?php
 /* Prototype  : array file(string filename [, int flags[, resource context]])
- * Description: Read entire file into an array 
+ * Description: Read entire file into an array
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file() : usage variation ***\n";
diff --git a/ext/standard/tests/file/file_variation4.phpt b/ext/standard/tests/file/file_variation4.phpt
index 04ddc91600b..084fc9db564 100644
--- a/ext/standard/tests/file/file_variation4.phpt
+++ b/ext/standard/tests/file/file_variation4.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test file() function : third parameter variation 
+Test file() function : third parameter variation
 --FILE--
 <?php
 /* Prototype  : array file(string filename [, int flags[, resource context]])
- * Description: Read entire file into an array 
+ * Description: Read entire file into an array
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file() : usage variation ***\n";
@@ -107,7 +107,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // file stream resource
       'file stream resource' => $file_stream_resource,
 );
diff --git a/ext/standard/tests/file/file_variation5.phpt b/ext/standard/tests/file/file_variation5.phpt
index 1f15491118b..b8badd0e422 100644
--- a/ext/standard/tests/file/file_variation5.phpt
+++ b/ext/standard/tests/file/file_variation5.phpt
@@ -25,7 +25,7 @@ var_dump(file("./$test_dirname/../$filename"));
 
 echo "\nfile() on a path containing .. with invalid directories\n";
 var_dump(file("./$test_dirname/bad_dir/../../$filename"));
- 
+
 echo "\nfile() on a linked file\n";
 $linkname = "somelink";
 var_dump(symlink($filepath, $linkname));
diff --git a/ext/standard/tests/file/file_variation8-win32.phpt b/ext/standard/tests/file/file_variation8-win32.phpt
index ca3be36b560..6debeaac7ef 100644
--- a/ext/standard/tests/file/file_variation8-win32.phpt
+++ b/ext/standard/tests/file/file_variation8-win32.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : array file(string filename [, int flags[, resource context]])
- * Description: Read entire file into an array 
+ * Description: Read entire file into an array
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file() : variation ***\n";
@@ -35,14 +35,14 @@ $allDirs = array(
   "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir,
   "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir,
   "$absSubDir\\BADDIR",
-  
+
   // relative paths
   $mainDir."\\".$subDir,
-  $mainDir."\\\\".$subDir, 
-   $mainDir."\\\\\\".$subDir, 
+  $mainDir."\\\\".$subDir,
+   $mainDir."\\\\\\".$subDir,
   ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir,
-  "BADDIR",  
-  
+  "BADDIR",
+
   // unixifed path
   $unixifiedDir,
 );
diff --git a/ext/standard/tests/file/file_variation8.phpt b/ext/standard/tests/file/file_variation8.phpt
index be18fcb032e..b4f1311ef09 100644
--- a/ext/standard/tests/file/file_variation8.phpt
+++ b/ext/standard/tests/file/file_variation8.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : array file(string filename [, int flags[, resource context]])
- * Description: Read entire file into an array 
+ * Description: Read entire file into an array
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file() : variation ***\n";
@@ -29,14 +29,14 @@ $allDirs = array(
   "$absSubDir/../../".$mainDir."/./".$subDir,
   "$absSubDir/..///".$subDir."//..//../".$subDir,
   "$absSubDir/BADDIR",
-  
+
   // relative paths
   $mainDir."/".$subDir,
-  $mainDir."//".$subDir, 
-   $mainDir."///".$subDir, 
+  $mainDir."//".$subDir,
+   $mainDir."///".$subDir,
   "./".$mainDir."/../".$mainDir."/".$subDir,
-  "BADDIR",  
-  
+  "BADDIR",
+
 );
 
 $filename = 'FileGetContentsVar7.tmp';
diff --git a/ext/standard/tests/file/file_variation9.phpt b/ext/standard/tests/file/file_variation9.phpt
index 9ddd1e62098..b95f9962e72 100644
--- a/ext/standard/tests/file/file_variation9.phpt
+++ b/ext/standard/tests/file/file_variation9.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : array file(string filename [, int flags[, resource context]])
- * Description: Read entire file into an array 
+ * Description: Read entire file into an array
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing file() : variation ***\n";
@@ -21,7 +21,7 @@ $contents = array(
    "File has\r\nmultiple crlfs\n\r\n"
    );
 
-@unlink($testfile);   
+@unlink($testfile);
 foreach ($contents as $content) {
     $h = fopen($testfile, "w");
     fwrite($h, $content);
diff --git a/ext/standard/tests/file/filegroup_basic.phpt b/ext/standard/tests/file/filegroup_basic.phpt
index 36333b21ba9..2c8216a0adc 100644
--- a/ext/standard/tests/file/filegroup_basic.phpt
+++ b/ext/standard/tests/file/filegroup_basic.phpt
@@ -12,7 +12,7 @@ if( substr(PHP_OS, 0, 3) == 'WIN') {
  * Description: Returns the group ID of the file, or FALSE in case of an error.
  */
 
-echo "*** Testing filegroup(): basic functionality ***\n"; 
+echo "*** Testing filegroup(): basic functionality ***\n";
 
 echo "-- Testing with the file or directory created by owner --\n";
 
diff --git a/ext/standard/tests/file/filegroup_variation1.phpt b/ext/standard/tests/file/filegroup_variation1.phpt
index ee76477ac80..4b4a9aa00e2 100644
--- a/ext/standard/tests/file/filegroup_variation1.phpt
+++ b/ext/standard/tests/file/filegroup_variation1.phpt
@@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
  * Description: Returns the group ID of the file, or FALSE in case of an error.
  */
 
-/* Creating soft and hard links to a file and applying filegroup() on links */ 
+/* Creating soft and hard links to a file and applying filegroup() on links */
 
 $file_path = dirname(__FILE__);
 fclose( fopen($file_path."/filegroup_variation1.tmp", "w") );
diff --git a/ext/standard/tests/file/filegroup_variation2.phpt b/ext/standard/tests/file/filegroup_variation2.phpt
index afac40c9ab0..966a9f43b76 100644
--- a/ext/standard/tests/file/filegroup_variation2.phpt
+++ b/ext/standard/tests/file/filegroup_variation2.phpt
@@ -23,12 +23,12 @@ $filenames = array(
   FALSE,
   NULL,
   $file_handle,
-  
+
   /* scalars */
   1234,
   0
 );
-   
+
 /* loop through to test each element the above array */
 foreach( $filenames as $filename ) {
   var_dump( filegroup($filename) );
diff --git a/ext/standard/tests/file/filegroup_variation3.phpt b/ext/standard/tests/file/filegroup_variation3.phpt
index b275944f782..ebefeb7e3f2 100644
--- a/ext/standard/tests/file/filegroup_variation3.phpt
+++ b/ext/standard/tests/file/filegroup_variation3.phpt
@@ -28,7 +28,7 @@ $files_arr = array(
   "/filegroup_variation3//filegroup_variation3.tmp",
   "//filegroup_variation3//filegroup_variation3.tmp",
   "/filegroup_variation3/*.tmp",
-  "filegroup_variation3/filegroup*.tmp", 
+  "filegroup_variation3/filegroup*.tmp",
 
   /* Testing Binary safe */
   "/filegroup_variation3/filegroup_variation3.tmp".chr(0),
diff --git a/ext/standard/tests/file/fileinode_basic.phpt b/ext/standard/tests/file/fileinode_basic.phpt
index 98e5cf08361..c7fc77e7d51 100644
--- a/ext/standard/tests/file/fileinode_basic.phpt
+++ b/ext/standard/tests/file/fileinode_basic.phpt
@@ -2,7 +2,7 @@
 Test fileinode() function: Basic functionality
 --FILE--
 <?php
-/* 
+/*
 Prototype: int fileinode ( string $filename );
 Description: Returns the inode number of the file, or FALSE in case of an error.
 */
diff --git a/ext/standard/tests/file/fileinode_error.phpt b/ext/standard/tests/file/fileinode_error.phpt
index eb5d79e0c35..892121cc96b 100644
--- a/ext/standard/tests/file/fileinode_error.phpt
+++ b/ext/standard/tests/file/fileinode_error.phpt
@@ -2,7 +2,7 @@
 Test fileinode() function: Error conditions
 --FILE--
 <?php
-/* 
+/*
 Prototype: int fileinode ( string $filename );
 Description: Returns the inode number of the file, or FALSE in case of an error.
 */
diff --git a/ext/standard/tests/file/fileinode_variation.phpt b/ext/standard/tests/file/fileinode_variation.phpt
index 1fac953098b..9504766d9de 100644
--- a/ext/standard/tests/file/fileinode_variation.phpt
+++ b/ext/standard/tests/file/fileinode_variation.phpt
@@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 ?>
 --FILE--
 <?php
-/* 
+/*
 Prototype: int fileinode ( string $filename );
 Description: Returns the inode number of the file, or FALSE in case of an error.
 */
diff --git a/ext/standard/tests/file/fileinode_variation1.phpt b/ext/standard/tests/file/fileinode_variation1.phpt
index d251cc3f85a..4961db19a67 100644
--- a/ext/standard/tests/file/fileinode_variation1.phpt
+++ b/ext/standard/tests/file/fileinode_variation1.phpt
@@ -9,12 +9,12 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 }
 --FILE--
 <?php
-/* 
+/*
 Prototype: int fileinode ( string $filename );
 Description: Returns the inode number of the file, or FALSE in case of an error.
 */
 
-/* Creating soft and hard links to a file and applying fileinode() on links */ 
+/* Creating soft and hard links to a file and applying fileinode() on links */
 
 $file_path = dirname(__FILE__);
 fclose( fopen($file_path."/fileinode_variation1.tmp", "w") );
diff --git a/ext/standard/tests/file/fileinode_variation2.phpt b/ext/standard/tests/file/fileinode_variation2.phpt
index e8e7af6a6e9..447c189e044 100644
--- a/ext/standard/tests/file/fileinode_variation2.phpt
+++ b/ext/standard/tests/file/fileinode_variation2.phpt
@@ -4,7 +4,7 @@ Test fileinode() function: usage variations - invalid filenames
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
-/* 
+/*
 Prototype: int fileinode ( string $filename );
 Description: Returns the inode number of the file, or FALSE in case of an error.
 */
@@ -24,12 +24,12 @@ $filenames = array(
   FALSE,
   NULL,
   $file_handle,
-  
+
   /* scalars */
   1234,
   0
 );
-   
+
 /* loop through to test each element the above array */
 foreach( $filenames as $filename ) {
   var_dump( fileinode($filename) );
diff --git a/ext/standard/tests/file/fileinode_variation3.phpt b/ext/standard/tests/file/fileinode_variation3.phpt
index ca84864b594..2f51e8f595a 100644
--- a/ext/standard/tests/file/fileinode_variation3.phpt
+++ b/ext/standard/tests/file/fileinode_variation3.phpt
@@ -4,7 +4,7 @@ Test fileinode() function: usage variations - diff. path notations
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
-/* 
+/*
 Prototype: int fileinode ( string $filename );
 Description: Returns the inode number of the file, or FALSE in case of an error.
 */
@@ -29,7 +29,7 @@ $files_arr = array(
   "/fileinode_variation3//fileinode_variation3.tmp",
   "//fileinode_variation3//fileinode_variation3.tmp",
   "/fileinode_variation3/*.tmp",
-  "fileinode_variation3/fileinode*.tmp", 
+  "fileinode_variation3/fileinode*.tmp",
 
   /* Testing Binary safe */
   "/fileinode_variation3/fileinode_variation3.tmp".chr(0),
diff --git a/ext/standard/tests/file/fileowner_basic.phpt b/ext/standard/tests/file/fileowner_basic.phpt
index 5b5ff9a900e..05e4c16ef83 100644
--- a/ext/standard/tests/file/fileowner_basic.phpt
+++ b/ext/standard/tests/file/fileowner_basic.phpt
@@ -7,7 +7,7 @@ Test fileowner() function: basic functionality
  *              FALSE in case of an error.
  */
 
-echo "*** Testing fileowner(): basic functionality ***\n"; 
+echo "*** Testing fileowner(): basic functionality ***\n";
 
 echo "-- Testing with the file or directory created by owner --\n";
 var_dump( fileowner(__FILE__) );
diff --git a/ext/standard/tests/file/fileowner_variation1.phpt b/ext/standard/tests/file/fileowner_variation1.phpt
index b70ac366d20..e40175d1bd5 100644
--- a/ext/standard/tests/file/fileowner_variation1.phpt
+++ b/ext/standard/tests/file/fileowner_variation1.phpt
@@ -14,7 +14,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
  *              FALSE in case of an error.
  */
 
-/* Creating soft and hard links to a file and applying fileowner() on links */ 
+/* Creating soft and hard links to a file and applying fileowner() on links */
 
 $file_path = dirname(__FILE__);
 fclose( fopen($file_path."/fileowner_variation1.tmp", "w") );
diff --git a/ext/standard/tests/file/fileowner_variation2.phpt b/ext/standard/tests/file/fileowner_variation2.phpt
index feff7678799..83eeb6d5c07 100644
--- a/ext/standard/tests/file/fileowner_variation2.phpt
+++ b/ext/standard/tests/file/fileowner_variation2.phpt
@@ -24,12 +24,12 @@ $filenames = array(
   FALSE,
   NULL,
   $file_handle,
-  
+
   /* scalars */
   1234,
   0
 );
-   
+
 /* loop through to test each element the above array */
 foreach( $filenames as $filename ) {
   var_dump( fileowner($filename) );
diff --git a/ext/standard/tests/file/fileowner_variation3.phpt b/ext/standard/tests/file/fileowner_variation3.phpt
index 6f91c31d113..5768f528f1b 100644
--- a/ext/standard/tests/file/fileowner_variation3.phpt
+++ b/ext/standard/tests/file/fileowner_variation3.phpt
@@ -29,7 +29,7 @@ $files_arr = array(
   "/fileowner_variation3//fileowner_variation3.tmp",
   "//fileowner_variation3//fileowner_variation3.tmp",
   "/fileowner_variation3/*.tmp",
-  "fileowner_variation3/fileowner*.tmp", 
+  "fileowner_variation3/fileowner*.tmp",
 
   /* Testing Binary safe */
   "/fileowner_variation3/fileowner_variation3.tmp".chr(0),
diff --git a/ext/standard/tests/file/fileperms_variation1.phpt b/ext/standard/tests/file/fileperms_variation1.phpt
index e90cf8784f4..fdcedcac59f 100644
--- a/ext/standard/tests/file/fileperms_variation1.phpt
+++ b/ext/standard/tests/file/fileperms_variation1.phpt
@@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
  * Description: Returns the group ID of the file, or FALSE in case of an error.
  */
 
-/* Creating soft and hard links to a file and applying fileperms() on links */ 
+/* Creating soft and hard links to a file and applying fileperms() on links */
 
 $file_path = dirname(__FILE__);
 fclose( fopen($file_path."/fileperms_variation1.tmp", "w") );
diff --git a/ext/standard/tests/file/fileperms_variation2.phpt b/ext/standard/tests/file/fileperms_variation2.phpt
index 47c0c6593ac..f9b190bcf81 100644
--- a/ext/standard/tests/file/fileperms_variation2.phpt
+++ b/ext/standard/tests/file/fileperms_variation2.phpt
@@ -23,12 +23,12 @@ $filenames = array(
   FALSE,
   NULL,
   $file_handle,
-  
+
   /* scalars */
   1234,
   0
 );
-   
+
 /* loop through to test each element the above array */
 foreach( $filenames as $filename ) {
   var_dump( fileperms($filename) );
diff --git a/ext/standard/tests/file/fileperms_variation3.phpt b/ext/standard/tests/file/fileperms_variation3.phpt
index 575fe11a2f0..6ae97d1601b 100644
--- a/ext/standard/tests/file/fileperms_variation3.phpt
+++ b/ext/standard/tests/file/fileperms_variation3.phpt
@@ -28,7 +28,7 @@ $files_arr = array(
   "/fileperms_variation3//fileperms_variation3.tmp",
   "//fileperms_variation3//fileperms_variation3.tmp",
   "/fileperms_variation3/*.tmp",
-  "fileperms_variation3/fileperms*.tmp", 
+  "fileperms_variation3/fileperms*.tmp",
 
   /* Testing Binary safe */
   "/fileperms_variation3/fileperms_variation3.tmp".chr(0),
diff --git a/ext/standard/tests/file/filesize_basic.phpt b/ext/standard/tests/file/filesize_basic.phpt
index 58041b95c3a..5a11259b6b7 100644
--- a/ext/standard/tests/file/filesize_basic.phpt
+++ b/ext/standard/tests/file/filesize_basic.phpt
@@ -2,14 +2,14 @@
 Test filesize() function: basic functionaity
 --FILE--
 <?php
-/* 
+/*
  * Prototype: int filesize ( string $filename );
- * Description: Returns the size of the file in bytes, or FALSE 
+ * Description: Returns the size of the file in bytes, or FALSE
  *              (and generates an error of level E_WARNING) in case of an error.
  */
 
 
-echo "*** Testing size of files and directories with filesize() ***\n"; 
+echo "*** Testing size of files and directories with filesize() ***\n";
 
 $file_path = dirname(__FILE__);
 
@@ -30,7 +30,7 @@ $file_path = dirname(__FILE__);
 $file_name = $file_path."/filesize_basic.tmp";
 unlink($file_name);
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing size of files and directories with filesize() ***
 int(%d)
 int(%d)
diff --git a/ext/standard/tests/file/filesize_error.phpt b/ext/standard/tests/file/filesize_error.phpt
index 6d8cfa86934..0060e66f554 100644
--- a/ext/standard/tests/file/filesize_error.phpt
+++ b/ext/standard/tests/file/filesize_error.phpt
@@ -2,9 +2,9 @@
 Test filesize() function: error conditions
 --FILE--
 <?php
-/* 
+/*
  * Prototype   : int filesize ( string $filename );
- * Description : Returns the size of the file in bytes, or FALSE 
+ * Description : Returns the size of the file in bytes, or FALSE
  *               (and generates an error of level E_WARNING) in case of an error.
  */
 
@@ -23,7 +23,7 @@ echo "\n";
 
 echo "*** Done ***\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing filesize(): error conditions ***
 Warning: filesize(): stat failed for /no/such/file in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt
index 14975feb494..66e193c201f 100644
--- a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt
+++ b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt
@@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 }
 --FILE--
 <?php
-/* 
+/*
  Prototype   : int filesize ( string $filename );
- Description : Returns the size of the file in bytes, or FALSE 
+ Description : Returns the size of the file in bytes, or FALSE
    (and generates an error of level E_WARNING) in case of an error.
 */
 
 $file_path = dirname(__FILE__);
 require($file_path."/file.inc");
 
-echo "*** Testing filesize(): usage variations ***\n"; 
+echo "*** Testing filesize(): usage variations ***\n";
 
 echo "*** Checking filesize() with different size of files ***\n";
 for($size = 1; $size <10000; $size = $size+1000)
diff --git a/ext/standard/tests/file/filesize_variation1-win32.phpt b/ext/standard/tests/file/filesize_variation1-win32.phpt
index e9ff053361b..18aeaddafd7 100644
--- a/ext/standard/tests/file/filesize_variation1-win32.phpt
+++ b/ext/standard/tests/file/filesize_variation1-win32.phpt
@@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 }
 --FILE--
 <?php
-/* 
+/*
  Prototype   : int filesize ( string $filename );
- Description : Returns the size of the file in bytes, or FALSE 
+ Description : Returns the size of the file in bytes, or FALSE
    (and generates an error of level E_WARNING) in case of an error.
 */
 
 $file_path = dirname(__FILE__);
 require($file_path."/file.inc");
 
-echo "*** Testing filesize(): usage variations ***\n"; 
+echo "*** Testing filesize(): usage variations ***\n";
 
 echo "*** Checking filesize() with different size of files ***\n";
 for($size = 1; $size <10000; $size = $size+1000)
diff --git a/ext/standard/tests/file/filesize_variation1.phpt b/ext/standard/tests/file/filesize_variation1.phpt
index 0a490cd7e6a..d8d3aff27aa 100644
--- a/ext/standard/tests/file/filesize_variation1.phpt
+++ b/ext/standard/tests/file/filesize_variation1.phpt
@@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 }
 --FILE--
 <?php
-/* 
+/*
  Prototype   : int filesize ( string $filename );
- Description : Returns the size of the file in bytes, or FALSE 
+ Description : Returns the size of the file in bytes, or FALSE
    (and generates an error of level E_WARNING) in case of an error.
 */
 
 $file_path = dirname(__FILE__);
 require($file_path."/file.inc");
 
-echo "*** Testing filesize(): usage variations ***\n"; 
+echo "*** Testing filesize(): usage variations ***\n";
 
 echo "*** Checking filesize() with different size of files ***\n";
 for($size = 1; $size <10000; $size = $size+1000)
diff --git a/ext/standard/tests/file/filesize_variation2-win32.phpt b/ext/standard/tests/file/filesize_variation2-win32.phpt
index 544e3aa408f..71577d83013 100644
--- a/ext/standard/tests/file/filesize_variation2-win32.phpt
+++ b/ext/standard/tests/file/filesize_variation2-win32.phpt
@@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 }
 --FILE--
 <?php
-/* 
+/*
  Prototype   : int filesize ( string $filename );
- Description : Returns the size of the file in bytes, or FALSE 
+ Description : Returns the size of the file in bytes, or FALSE
    (and generates an error of level E_WARNING) in case of an error.
 */
 
 $file_path = dirname(__FILE__);
 require($file_path."/file.inc");
 
-echo "*** Testing filesize(): usage variations ***\n"; 
+echo "*** Testing filesize(): usage variations ***\n";
 
 echo "\n*** Testing size of a dir, sub-dir and file with filesize() ***\n";
 echo "-- Creating a base dir, and checking its size --\n";
@@ -24,7 +24,7 @@ mkdir( $file_path."/filesize_variation2");
 var_dump( filesize( $file_path."/filesize_variation2"));
 clearstatcache();
 
-echo "-- Creating a file inside base dir, and checking dir & file size --\n"; 
+echo "-- Creating a file inside base dir, and checking dir & file size --\n";
 create_files($file_path."/filesize_variation2", 1, "numeric", 0755, 1, "w", "filesize_variation", 2);
 var_dump( filesize( $file_path."/filesize_variation2"));
 clearstatcache();
diff --git a/ext/standard/tests/file/filesize_variation2.phpt b/ext/standard/tests/file/filesize_variation2.phpt
index 8a7594ee79e..03794516606 100644
--- a/ext/standard/tests/file/filesize_variation2.phpt
+++ b/ext/standard/tests/file/filesize_variation2.phpt
@@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 }
 --FILE--
 <?php
-/* 
+/*
  Prototype   : int filesize ( string $filename );
- Description : Returns the size of the file in bytes, or FALSE 
+ Description : Returns the size of the file in bytes, or FALSE
    (and generates an error of level E_WARNING) in case of an error.
 */
 
 $file_path = dirname(__FILE__);
 require($file_path."/file.inc");
 
-echo "*** Testing filesize(): usage variations ***\n"; 
+echo "*** Testing filesize(): usage variations ***\n";
 
 echo "\n*** Testing size of a dir, sub-dir and file with filesize() ***\n";
 echo "-- Creating a base dir, and checking its size --\n";
@@ -24,7 +24,7 @@ mkdir( $file_path."/filesize_variation2");
 var_dump( filesize( $file_path."/filesize_variation2"));
 clearstatcache();
 
-echo "-- Creating a file inside base dir, and checking dir & file size --\n"; 
+echo "-- Creating a file inside base dir, and checking dir & file size --\n";
 create_files($file_path."/filesize_variation2", 1, "numeric", 0755, 1, "w", "filesize_variation");
 var_dump( filesize( $file_path."/filesize_variation2"));
 clearstatcache();
diff --git a/ext/standard/tests/file/filesize_variation3-win32.phpt b/ext/standard/tests/file/filesize_variation3-win32.phpt
index 94ba6f478af..215c7676163 100644
--- a/ext/standard/tests/file/filesize_variation3-win32.phpt
+++ b/ext/standard/tests/file/filesize_variation3-win32.phpt
@@ -7,15 +7,15 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 }
 --FILE--
 <?php
-/* 
+/*
  Prototype   : int filesize ( string $filename );
- Description : Returns the size of the file in bytes, or FALSE 
+ Description : Returns the size of the file in bytes, or FALSE
    (and generates an error of level E_WARNING) in case of an error.
 */
 
 $file_path = dirname(__FILE__);
 
-echo "*** Testing filesize(): usage variations ***\n"; 
+echo "*** Testing filesize(): usage variations ***\n";
 $filename =  $file_path."/filesize_variation3.tmp";
 $file_handle = fopen($filename, "w");
 fwrite($file_handle, str_repeat("Hello,World ", 1000) ); // create file of size 12000 bytes
diff --git a/ext/standard/tests/file/filesize_variation3.phpt b/ext/standard/tests/file/filesize_variation3.phpt
index 67d46998d2a..604887d1165 100644
--- a/ext/standard/tests/file/filesize_variation3.phpt
+++ b/ext/standard/tests/file/filesize_variation3.phpt
@@ -7,15 +7,15 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 }
 --FILE--
 <?php
-/* 
+/*
  Prototype   : int filesize ( string $filename );
- Description : Returns the size of the file in bytes, or FALSE 
+ Description : Returns the size of the file in bytes, or FALSE
    (and generates an error of level E_WARNING) in case of an error.
 */
 
 $file_path = dirname(__FILE__);
 
-echo "*** Testing filesize(): usage variations ***\n"; 
+echo "*** Testing filesize(): usage variations ***\n";
 $filename =  $file_path."/filesize_variation3.tmp";
 $file_handle = fopen($filename, "w");
 fwrite($file_handle, str_repeat("Hello,World ", 1000) ); // create file of size 12000 bytes
diff --git a/ext/standard/tests/file/filesize_variation4-win32.phpt b/ext/standard/tests/file/filesize_variation4-win32.phpt
index 5f20f4210d8..08e141707e4 100644
--- a/ext/standard/tests/file/filesize_variation4-win32.phpt
+++ b/ext/standard/tests/file/filesize_variation4-win32.phpt
@@ -7,16 +7,16 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 }
 --FILE--
 <?php
-/* 
+/*
  Prototype   : int filesize ( string $filename );
- Description : Returns the size of the file in bytes, or FALSE 
+ Description : Returns the size of the file in bytes, or FALSE
    (and generates an error of level E_WARNING) in case of an error.
 */
 
 $file_path = dirname(__FILE__);
 require($file_path."/file.inc");
 
-echo "*** Testing filesize(): usage variations ***\n"; 
+echo "*** Testing filesize(): usage variations ***\n";
 echo "\n*** Testing filesize() with data written using different file modes and by creating holes in file ***\n";
 
 $filename = $file_path."/filesize_variation4.tmp";
diff --git a/ext/standard/tests/file/filesize_variation4.phpt b/ext/standard/tests/file/filesize_variation4.phpt
index 29f85fc243c..0770f1d2bad 100644
--- a/ext/standard/tests/file/filesize_variation4.phpt
+++ b/ext/standard/tests/file/filesize_variation4.phpt
@@ -7,9 +7,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 }
 --FILE--
 <?php
-/* 
+/*
  Prototype   : int filesize ( string $filename );
- Description : Returns the size of the file in bytes, or FALSE 
+ Description : Returns the size of the file in bytes, or FALSE
    (and generates an error of level E_WARNING) in case of an error.
 */
 
@@ -17,7 +17,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 
 $file_path = dirname(__FILE__);
 
-echo "*** Testing filesize(): usage variations ***\n"; 
+echo "*** Testing filesize(): usage variations ***\n";
 echo "\n*** Testing filesize() with data written using different file modes and by creating holes in file ***\n";
 
 $filename = $file_path."/filesize_variation4.tmp";
diff --git a/ext/standard/tests/file/filesize_variation5.phpt b/ext/standard/tests/file/filesize_variation5.phpt
index 638f8ba8ed3..9d1338481db 100644
--- a/ext/standard/tests/file/filesize_variation5.phpt
+++ b/ext/standard/tests/file/filesize_variation5.phpt
@@ -4,13 +4,13 @@ Test filesize() function: usage variations - size of files
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
-/* 
+/*
  * Prototype   : int filesize ( string $filename );
- * Description : Returns the size of the file in bytes, or FALSE 
+ * Description : Returns the size of the file in bytes, or FALSE
  *               (and generates an error of level E_WARNING) in case of an error.
  */
 
-echo "*** Testing filesize(): usage variations ***\n"; 
+echo "*** Testing filesize(): usage variations ***\n";
 
 /* null, false, "", " " */
 var_dump( filesize(NULL) );
@@ -20,7 +20,7 @@ var_dump( filesize(' ') );
 var_dump( filesize('|') );
 echo "*** Done ***\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing filesize(): usage variations ***
 bool(false)
 bool(false)
diff --git a/ext/standard/tests/file/filestat.phpt b/ext/standard/tests/file/filestat.phpt
index d02f9f2a105..f6031219c72 100644
--- a/ext/standard/tests/file/filestat.phpt
+++ b/ext/standard/tests/file/filestat.phpt
@@ -29,7 +29,7 @@ var_dump(filectime("/no/such/file/or/dir"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(%d)
 int(%d)
 int(%d)
diff --git a/ext/standard/tests/file/filetype_basic.phpt b/ext/standard/tests/file/filetype_basic.phpt
index 4a6d3b2bc27..b8ff92f18a5 100644
--- a/ext/standard/tests/file/filetype_basic.phpt
+++ b/ext/standard/tests/file/filetype_basic.phpt
@@ -5,7 +5,7 @@ Test filetype() function: Basic functionality
 /*
 Prototype: string filetype ( string $filename );
 Description: Returns the type of the file. Possible values are fifo, char,
-             dir, block, link, file, and unknown. 
+             dir, block, link, file, and unknown.
 */
 
 echo "*** Testing filetype() with files and dirs ***\n";
diff --git a/ext/standard/tests/file/filetype_error.phpt b/ext/standard/tests/file/filetype_error.phpt
index b9652720110..b49a5286c67 100644
--- a/ext/standard/tests/file/filetype_error.phpt
+++ b/ext/standard/tests/file/filetype_error.phpt
@@ -5,7 +5,7 @@ Test filetype() function: Error conditions
 /*
 Prototype: string filetype ( string $filename );
 Description: Returns the type of the file. Possible values are fifo, char,
-             dir, block, link, file, and unknown. 
+             dir, block, link, file, and unknown.
 */
 
 echo "*** Testing error conditions ***";
diff --git a/ext/standard/tests/file/filetype_variation.phpt b/ext/standard/tests/file/filetype_variation.phpt
index 3308cee20da..4a96b71e1c2 100644
--- a/ext/standard/tests/file/filetype_variation.phpt
+++ b/ext/standard/tests/file/filetype_variation.phpt
@@ -14,7 +14,7 @@ if (!function_exists("posix_mkfifo")) {
 /*
 Prototype: string filetype ( string $filename );
 Description: Returns the type of the file. Possible values are fifo, char,
-             dir, block, link, file, and unknown. 
+             dir, block, link, file, and unknown.
 */
 
 echo "*** Testing filetype() with various types ***\n";
diff --git a/ext/standard/tests/file/filetype_variation2.phpt b/ext/standard/tests/file/filetype_variation2.phpt
index 125b48c02c0..df86f677636 100644
--- a/ext/standard/tests/file/filetype_variation2.phpt
+++ b/ext/standard/tests/file/filetype_variation2.phpt
@@ -9,14 +9,14 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 }
 if (!file_exists("/dev/null")) {
     die('skip /dev/null not available');
-}    
+}
 ?>
 --FILE--
 <?php
 /*
 Prototype: string filetype ( string $filename );
 Description: Returns the type of the file. Possible values are fifo, char,
-             dir, block, link, file, and unknown. 
+             dir, block, link, file, and unknown.
 */
 
 echo "-- Checking for char --\n";
diff --git a/ext/standard/tests/file/filetype_variation3.phpt b/ext/standard/tests/file/filetype_variation3.phpt
index 9a1a68f784d..e02cafced8d 100644
--- a/ext/standard/tests/file/filetype_variation3.phpt
+++ b/ext/standard/tests/file/filetype_variation3.phpt
@@ -16,7 +16,7 @@ if (!file_exists("/dev/ram0")) {
 /*
 Prototype: string filetype ( string $filename );
 Description: Returns the type of the file. Possible values are fifo, char,
-             dir, block, link, file, and unknown. 
+             dir, block, link, file, and unknown.
 */
 
 echo "-- Checking for block --\n";
diff --git a/ext/standard/tests/file/flock.phpt b/ext/standard/tests/file/flock.phpt
index ab08de52564..23302701135 100644
--- a/ext/standard/tests/file/flock.phpt
+++ b/ext/standard/tests/file/flock.phpt
@@ -40,7 +40,7 @@ echo "Done\n";
 $file = dirname(__FILE__)."/flock.dat";
 unlink($file);
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: flock() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/standard/tests/file/flock_basic.phpt b/ext/standard/tests/file/flock_basic.phpt
index d218cee5ef2..99b1ba1c597 100644
--- a/ext/standard/tests/file/flock_basic.phpt
+++ b/ext/standard/tests/file/flock_basic.phpt
@@ -2,13 +2,13 @@
 Test flock() function: Basic functionality
 --FILE--
 <?php
-/* 
+/*
 Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]);
-Description: PHP supports a portable way of locking complete files 
+Description: PHP supports a portable way of locking complete files
   in an advisory way
 */
 
-echo "*** Testing flock() fun with file and dir ***\n"; 
+echo "*** Testing flock() fun with file and dir ***\n";
 $file_path = dirname(__FILE__);
 
 $file_handle = fopen("$file_path/lock.tmp", "w");
@@ -30,7 +30,7 @@ rmdir("$file_path/dir");
 
 echo "\n*** Done ***\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing flock() fun with file and dir ***
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt
index 81e42f3fe65..afb68b53374 100644
--- a/ext/standard/tests/file/flock_error.phpt
+++ b/ext/standard/tests/file/flock_error.phpt
@@ -2,9 +2,9 @@
 Test flock() function: Error conditions
 --FILE--
 <?php
-/* 
+/*
 Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]);
-Description: PHP supports a portable way of locking complete files 
+Description: PHP supports a portable way of locking complete files
   in an advisory way
 */
 
@@ -23,7 +23,7 @@ $operations = array(
   array(),
   "string",
   "",
-  "\0" 
+  "\0"
 );
 
 $i = 0;
@@ -55,7 +55,7 @@ echo "\n*** Done ***\n";
 $file = dirname(__FILE__)."/flock.tmp";
 unlink($file);
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing error conditions ***
 
 --- Iteration 0 ---
diff --git a/ext/standard/tests/file/flock_variation.phpt b/ext/standard/tests/file/flock_variation.phpt
index af67ab402a9..ff0a4bbe617 100644
--- a/ext/standard/tests/file/flock_variation.phpt
+++ b/ext/standard/tests/file/flock_variation.phpt
@@ -2,9 +2,9 @@
 Test flock() function: Variations
 --FILE--
 <?php
-/* 
+/*
 Prototype: bool flock(resource $handle, int $operation [, int &$wouldblock]);
-Description: PHP supports a portable way of locking complete files 
+Description: PHP supports a portable way of locking complete files
   in an advisory way
 */
 
@@ -21,7 +21,7 @@ $operations = array(
   LOCK_EX|LOCK_NB,
   LOCK_SH|LOCK_EX,
   LOCK_UN,
-  1, 
+  1,
   2,
   2.234,
   TRUE
@@ -64,7 +64,7 @@ fclose($fp);
 
 echo "\n*** Done ***\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing flock() fun with the various operation and 
             wouldblock values                                ***
 --- Outer iteration 0 ---
diff --git a/ext/standard/tests/file/fnmatch_error.phpt b/ext/standard/tests/file/fnmatch_error.phpt
index 5277874ba67..61ddb2e09cc 100644
--- a/ext/standard/tests/file/fnmatch_error.phpt
+++ b/ext/standard/tests/file/fnmatch_error.phpt
@@ -8,8 +8,8 @@ if (!function_exists('fnmatch'))
 --FILE--
 <?php
 /* Prototype: bool fnmatch ( string $pattern, string $string [, int $flags] )
-   Description: fnmatch() checks if the passed string would match 
-     the given shell wildcard pattern. 
+   Description: fnmatch() checks if the passed string would match
+     the given shell wildcard pattern.
 */
 
 echo "*** Testing error conditions for fnmatch() ***";
diff --git a/ext/standard/tests/file/fnmatch_variation.phpt b/ext/standard/tests/file/fnmatch_variation.phpt
index 6d28528c1ce..b3607be58b9 100644
--- a/ext/standard/tests/file/fnmatch_variation.phpt
+++ b/ext/standard/tests/file/fnmatch_variation.phpt
@@ -8,8 +8,8 @@ if (!function_exists('fnmatch'))
 --FILE--
 <?php
 /* Prototype: bool fnmatch ( string $pattern, string $string [, int $flags] )
-   Description: fnmatch() checks if the passed string would match 
-     the given shell wildcard pattern. 
+   Description: fnmatch() checks if the passed string would match
+     the given shell wildcard pattern.
 */
 
 echo "*** Testing fnmatch() with file and various patterns ***\n";
@@ -43,7 +43,7 @@ $pattern_arr = array(
 17 => "?match?",
 18 => "match.tmp",
 19 => "/match.tmp",
-20 => "/match.tmp/", 
+20 => "/match.tmp/",
 21 => 'match.tmp',
 22 => 'match.tmp\0',
 23 => "match.tmp\0",
diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt
index c949f86fa25..bbae6f839af 100644
--- a/ext/standard/tests/file/fopen_variation10-win32.phpt
+++ b/ext/standard/tests/file/fopen_variation10-win32.phpt
@@ -15,9 +15,9 @@ if (!is_writable('c:\\fopen_variation10.tmp')) {
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing fopen() : variation ***\n";
@@ -30,18 +30,18 @@ mkdir('c:\\'.$rootdir);
 
 $unixifiedDir = '/'.substr(str_replace('\\','/',$testdir),3);
 
-$paths = array('c:\\', 
-               'c:', 
-               'c', 
-               '\\', 
-               '/', 
-               'c:'.$rootdir, 
-               'c:adir', 
-               'c:\\/', 
+$paths = array('c:\\',
+               'c:',
+               'c',
+               '\\',
+               '/',
+               'c:'.$rootdir,
+               'c:adir',
+               'c:\\/',
                'c:\\'.$rootdir.'\\/',
-               'c:\\'.$rootdir.'\\', 
+               'c:\\'.$rootdir.'\\',
                'c:\\'.$rootdir.'/',
-               $unixifiedDir, 
+               $unixifiedDir,
                '/sortout');
 
 $file = "fopen_variation10.tmp";
diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt
index 61a2f60ecf7..28db5ca7808 100644
--- a/ext/standard/tests/file/fopen_variation11-win32.phpt
+++ b/ext/standard/tests/file/fopen_variation11-win32.phpt
@@ -14,9 +14,9 @@ if (!is_writable('c:\\fopen_variation10.tmp')) {
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing fopen() : variation ***\n";
@@ -29,18 +29,18 @@ mkdir('c:\\'.$rootdir);
 
 $unixifiedDir = '/'.substr(str_replace('\\','/',$testdir),3);
 
-$paths = array('c:\\', 
-               'c:', 
-               'c', 
-               '\\', 
-               '/', 
-               'c:'.$rootdir, 
-               'c:adir', 
-               'c:\\/', 
+$paths = array('c:\\',
+               'c:',
+               'c',
+               '\\',
+               '/',
+               'c:'.$rootdir,
+               'c:adir',
+               'c:\\/',
                'c:\\'.$rootdir.'\\/',
-               'c:\\'.$rootdir.'\\', 
+               'c:\\'.$rootdir.'\\',
                'c:\\'.$rootdir.'/',
-               $unixifiedDir, 
+               $unixifiedDir,
                '/sortout');
 
 $file = "fopen_variation11.tmp";
diff --git a/ext/standard/tests/file/fopen_variation12.phpt b/ext/standard/tests/file/fopen_variation12.phpt
index c207ec1836b..e39ecedf874 100644
--- a/ext/standard/tests/file/fopen_variation12.phpt
+++ b/ext/standard/tests/file/fopen_variation12.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 set_include_path("rubbish");
@@ -16,12 +16,12 @@ restore_include_path();
 
 
 function testme() {
-	$tmpfile = basename(__FILE__, ".php") . ".tmp"; 
+	$tmpfile = basename(__FILE__, ".php") . ".tmp";
 	$h = fopen($tmpfile, "w", true);
 	fwrite($h, "This is the test file");
 	fclose($h);
-	
-	
+
+
 	$h = @fopen($tmpfile, "r");
 	if ($h === false) {
 	   echo "Not created in working dir\n";
@@ -31,9 +31,9 @@ function testme() {
 	   fclose($h);
 	   unlink($tmpfile);
 	}
-	
 
-	$scriptDirFile = dirname(__FILE__).'/'.$tmpfile; 
+
+	$scriptDirFile = dirname(__FILE__).'/'.$tmpfile;
 	$h = @fopen($scriptDirFile, "r");
 	if ($h === false) {
 	   echo "Not created in script dir\n";
@@ -41,7 +41,7 @@ function testme() {
 	else {
 	   echo "created in script dir\n";
 	   fclose($h);
-	   unlink($scriptDirFile);   
+	   unlink($scriptDirFile);
 	}
 }
 ?>
diff --git a/ext/standard/tests/file/fopen_variation13.phpt b/ext/standard/tests/file/fopen_variation13.phpt
index d540d70006c..76cf084029b 100644
--- a/ext/standard/tests/file/fopen_variation13.phpt
+++ b/ext/standard/tests/file/fopen_variation13.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 require_once('fopen_include_path.inc');
@@ -28,13 +28,13 @@ function runtest() {
     $tempDir = 'fopen_variation13.dir.tmp';
 	$tmpfile = 'fopen_variation13.tmp';
 	$absFile = getcwd().'/'.$tempDir.'/'.$tmpfile;
-	
+
 	mkdir($tempDir);
 	$h = fopen($absFile, "w", true);
 	fwrite($h, "This is the test file");
 	fclose($h);
-	
-	
+
+
 	$h = fopen($absFile, "r");
 	if ($h === false) {
 	   echo "Not created absolute location\n";
@@ -45,7 +45,7 @@ function runtest() {
 	}
     unlink($absFile);
     rmdir($tempDir);
-	
+
 }
 ?>
 ===DONE===
diff --git a/ext/standard/tests/file/fopen_variation14-win32.phpt b/ext/standard/tests/file/fopen_variation14-win32.phpt
index 554d8c6ded9..8c4c23fb30a 100644
--- a/ext/standard/tests/file/fopen_variation14-win32.phpt
+++ b/ext/standard/tests/file/fopen_variation14-win32.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing fopen() : variation ***\n";
@@ -53,15 +53,15 @@ function runtest($fileURIs) {
    $iteration = 0;
    foreach($fileURIs as $fileURI) {
       echo "--- READ: $fileURI ---\n";
-   
+
       $readData = "read:$iteration";
       $writeData = "write:$iteration";
-      
+
       // create the file and test read
       $h = fopen($absFile, 'w');
       fwrite($h, $readData);
       fclose($h);
-      
+
       $h = fopen($fileURI, 'r');
       if ($h !== false) {
          if (fread($h, 4096) != $readData) {
@@ -73,14 +73,14 @@ function runtest($fileURIs) {
          fclose($h);
       }
       unlink($absFile);
-      
-      echo "--- WRITE: $fileURI ---\n";   
+
+      echo "--- WRITE: $fileURI ---\n";
       // create the file to test write
       $h = fopen($fileURI, 'w');
       if ($h !== false) {
 	      fwrite($h, $writeData);
 	      fclose($h);
-	      
+
 	      $h = fopen($absFile, 'r');
 	      if ($h !== false) {
 	         if (fread($h, 4096) != $writeData) {
diff --git a/ext/standard/tests/file/fopen_variation14.phpt b/ext/standard/tests/file/fopen_variation14.phpt
index aa4e05b8921..b62bedfe68b 100644
--- a/ext/standard/tests/file/fopen_variation14.phpt
+++ b/ext/standard/tests/file/fopen_variation14.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing fopen() : variation ***\n";
@@ -45,15 +45,15 @@ function runtest($fileURIs) {
    $iteration = 0;
    foreach($fileURIs as $fileURI) {
       echo "--- READ: $fileURI ---\n";
-   
+
       $readData = "read:$iteration";
       $writeData = "write:$iteration";
-      
+
       // create the file and test read
       $h = fopen($absFile, 'w');
       fwrite($h, $readData);
       fclose($h);
-      
+
       $h = fopen($fileURI, 'r');
       if ($h !== false) {
          if (fread($h, 4096) != $readData) {
@@ -65,14 +65,14 @@ function runtest($fileURIs) {
          fclose($h);
       }
       unlink($absFile);
-      
-      echo "--- WRITE: $fileURI ---\n";   
+
+      echo "--- WRITE: $fileURI ---\n";
       // create the file to test write
       $h = fopen($fileURI, 'w');
       if ($h !== false) {
 	      fwrite($h, $writeData);
 	      fclose($h);
-	      
+
 	      $h = fopen($absFile, 'r');
 	      if ($h !== false) {
 	         if (fread($h, 4096) != $writeData) {
diff --git a/ext/standard/tests/file/fopen_variation15-win32.phpt b/ext/standard/tests/file/fopen_variation15-win32.phpt
index 8599306eda6..0dd3d23857c 100644
--- a/ext/standard/tests/file/fopen_variation15-win32.phpt
+++ b/ext/standard/tests/file/fopen_variation15-win32.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing fopen() : variation ***\n";
@@ -57,15 +57,15 @@ function runtest($fileURIs) {
    $iteration = 0;
    foreach($fileURIs as $fileURI) {
       echo "--- READ: $fileURI ---\n";
-   
+
       $readData = "read:$iteration";
       $writeData = "write:$iteration";
-      
+
       // create the file and test read
       $h = fopen($absFile, 'w');
       fwrite($h, $readData);
       fclose($h);
-      
+
       $h = fopen($fileURI, 'r', true);
       if ($h !== false) {
          if (fread($h, 4096) != $readData) {
@@ -77,14 +77,14 @@ function runtest($fileURIs) {
          fclose($h);
       }
       unlink($absFile);
-      
-      echo "--- WRITE: $fileURI ---\n";   
+
+      echo "--- WRITE: $fileURI ---\n";
       // create the file to test write
       $h = fopen($fileURI, 'w', true);
       if ($h !== false) {
 	      fwrite($h, $writeData);
 	      fclose($h);
-	      
+
 	      $h = fopen($absFile, 'r');
 	      if ($h !== false) {
 	         if (fread($h, 4096) != $writeData) {
diff --git a/ext/standard/tests/file/fopen_variation15.phpt b/ext/standard/tests/file/fopen_variation15.phpt
index 24b01fbe8c0..3dca66841f0 100644
--- a/ext/standard/tests/file/fopen_variation15.phpt
+++ b/ext/standard/tests/file/fopen_variation15.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing fopen() : variation ***\n";
@@ -49,15 +49,15 @@ function runtest($fileURIs) {
    $iteration = 0;
    foreach($fileURIs as $fileURI) {
       echo "--- READ: $fileURI ---\n";
-   
+
       $readData = "read:$iteration";
       $writeData = "write:$iteration";
-      
+
       // create the file and test read
       $h = fopen($absFile, 'w');
       fwrite($h, $readData);
       fclose($h);
-      
+
       $h = fopen($fileURI, 'r', true);
       if ($h !== false) {
          if (fread($h, 4096) != $readData) {
@@ -69,14 +69,14 @@ function runtest($fileURIs) {
          fclose($h);
       }
       unlink($absFile);
-      
-      echo "--- WRITE: $fileURI ---\n";   
+
+      echo "--- WRITE: $fileURI ---\n";
       // create the file to test write
       $h = fopen($fileURI, 'w', true);
       if ($h !== false) {
 	      fwrite($h, $writeData);
 	      fclose($h);
-	      
+
 	      $h = fopen($absFile, 'r');
 	      if ($h !== false) {
 	         if (fread($h, 4096) != $writeData) {
diff --git a/ext/standard/tests/file/fopen_variation16.phpt b/ext/standard/tests/file/fopen_variation16.phpt
index 8b793f78588..023586c3968 100644
--- a/ext/standard/tests/file/fopen_variation16.phpt
+++ b/ext/standard/tests/file/fopen_variation16.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 require_once('fopen_include_path.inc');
@@ -31,18 +31,18 @@ rmdir($thisTestDir);
 
 function runtest() {
     global $dir1;
-       
+
     $extraDir = "extraDir16";
 
     mkdir($dir1.'/'.$extraDir);
     mkdir($extraDir);
-    
+
 	$tmpfile = $extraDir.'/fopen_variation16.tmp';
 
 	$h = fopen($tmpfile, "w+", true);
 	fwrite($h, "This is the test file");
 	fclose($h);
-	
+
 	$h = @fopen($dir1.'/'.$tmpfile, "r");
 	if ($h === false) {
 	   echo "Not created in dir1\n";
@@ -60,10 +60,10 @@ function runtest() {
 	   echo "found file - not in dir1\n";
 	   fclose($h);
 	}
-	
-	unlink($tmpfile);   
-    rmdir($dir1.'/'.$extraDir);	
-    rmdir($extraDir);	
+
+	unlink($tmpfile);
+    rmdir($dir1.'/'.$extraDir);
+    rmdir($extraDir);
 }
 ?>
 ===DONE===
diff --git a/ext/standard/tests/file/fopen_variation17.phpt b/ext/standard/tests/file/fopen_variation17.phpt
index 461807d26ff..429650564bc 100644
--- a/ext/standard/tests/file/fopen_variation17.phpt
+++ b/ext/standard/tests/file/fopen_variation17.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test fopen() function : variation: use include path create and read a file (relative) 
+Test fopen() function : variation: use include path create and read a file (relative)
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 require_once('fopen_include_path.inc');
@@ -31,17 +31,17 @@ rmdir($thisTestDir);
 
 function runtest() {
     global $dir1;
-       
+
     $extraDir = "extraDir17";
 
     mkdir($dir1.'/'.$extraDir);
     mkdir($extraDir);
-    
+
 	$tmpfile = $extraDir . '/' . basename(__FILE__, ".php") . ".tmp";
 	$h = fopen($tmpfile, "w+", true);
 	fwrite($h, "This is the test file");
 	fclose($h);
-	
+
 	$h = @fopen($dir1.'/'.$tmpfile, "r");
 	if ($h === false) {
 	   echo "Not created in dir1\n";
@@ -59,10 +59,10 @@ function runtest() {
 	   echo "found file for reading\n";
 	   fclose($h);
 	}
-	
-	unlink($tmpfile);   
-        rmdir($dir1.'/'.$extraDir);	
-        rmdir($extraDir);	
+
+	unlink($tmpfile);
+        rmdir($dir1.'/'.$extraDir);
+        rmdir($extraDir);
 }
 ?>
 ===DONE===
diff --git a/ext/standard/tests/file/fopen_variation19.phpt b/ext/standard/tests/file/fopen_variation19.phpt
index 031ba45734e..069ce111708 100644
--- a/ext/standard/tests/file/fopen_variation19.phpt
+++ b/ext/standard/tests/file/fopen_variation19.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $tmpDir = 'fopenVar19.Dir';
diff --git a/ext/standard/tests/file/fopen_variation3.phpt b/ext/standard/tests/file/fopen_variation3.phpt
index 3467a3a606f..74304716237 100644
--- a/ext/standard/tests/file/fopen_variation3.phpt
+++ b/ext/standard/tests/file/fopen_variation3.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing fopen() : usage variation ***\n";
diff --git a/ext/standard/tests/file/fopen_variation4.phpt b/ext/standard/tests/file/fopen_variation4.phpt
index 38f5fefe62b..c6bc089912b 100644
--- a/ext/standard/tests/file/fopen_variation4.phpt
+++ b/ext/standard/tests/file/fopen_variation4.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing fopen() : usage variation ***\n";
@@ -103,7 +103,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       //file resource
       'file resource' => $fileresource
 );
diff --git a/ext/standard/tests/file/fopen_variation5.phpt b/ext/standard/tests/file/fopen_variation5.phpt
index 1fccbb70a98..039722e7823 100644
--- a/ext/standard/tests/file/fopen_variation5.phpt
+++ b/ext/standard/tests/file/fopen_variation5.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
@@ -40,7 +40,7 @@ chdir($workingDir);
 
 //define the files to go into these directories, create one in dir2
 echo "\n--- testing include path ---\n";
-set_include_path($newIncludePath);   
+set_include_path($newIncludePath);
 $modes = array("r", "r+", "rt");
 foreach($modes as $mode) {
     test_fopen($mode);
@@ -60,7 +60,7 @@ rmdir($thisTestDir);
 
 function test_fopen($mode) {
    global $scriptFile, $secondFile, $firstFile, $filename;
-   
+
    // create a file in the middle directory
    $h = fopen($secondFile, "w");
    fwrite($h, "in dir2");
@@ -77,44 +77,44 @@ function test_fopen($mode) {
    $h = fopen($firstFile, "w");
    fwrite($h, "in dir1");
    fclose($h);
-   
+
    //should now read dir1 file
    $h = fopen($filename, $mode, true);
    fpassthru($h);
    fclose($h);
    echo "\n";
-   
+
    // create a file in working directory
    $h = fopen($filename, "w");
    fwrite($h, "in working dir");
    fclose($h);
-   
+
    //should still read dir1 file
    $h = fopen($filename, $mode, true);
    fpassthru($h);
    fclose($h);
    echo "\n";
-   
+
    unlink($firstFile);
    unlink($secondFile);
-   
+
    //should read the file in working dir
    $h = fopen($filename, $mode, true);
    fpassthru($h);
    fclose($h);
    echo "\n";
-   
+
    // create a file in the script directory
    $h = fopen($scriptFile, "w");
    fwrite($h, "in script dir");
    fclose($h);
-   
+
    //should read the file in script dir
    $h = fopen($filename, $mode, true);
    fpassthru($h);
    fclose($h);
    echo "\n";
-     
+
    //cleanup
    unlink($filename);
    unlink($scriptFile);
diff --git a/ext/standard/tests/file/fopen_variation6.phpt b/ext/standard/tests/file/fopen_variation6.phpt
index 3a99212afee..7bfb7c0ef59 100644
--- a/ext/standard/tests/file/fopen_variation6.phpt
+++ b/ext/standard/tests/file/fopen_variation6.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test fopen() function : variation: use include path and stream context relative/absolute file 
+Test fopen() function : variation: use include path and stream context relative/absolute file
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing fopen() : variation ***\n";
diff --git a/ext/standard/tests/file/fopen_variation7.phpt b/ext/standard/tests/file/fopen_variation7.phpt
index f5c1048c07d..9cb40a00198 100644
--- a/ext/standard/tests/file/fopen_variation7.phpt
+++ b/ext/standard/tests/file/fopen_variation7.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 require_once('fopen_include_path.inc');
@@ -34,8 +34,8 @@ function runtest() {
 	$h = fopen($tmpfile, "w", true);
 	fwrite($h, "This is the test file");
 	fclose($h);
-	
-	
+
+
 	$h = @fopen($tmpfile, "r");
 	if ($h === false) {
 	   echo "Not created in working dir\n";
@@ -45,7 +45,7 @@ function runtest() {
 	   fclose($h);
 	   unlink($tmpfile);
 	}
-	
+
 	$h = @fopen($dir1.'/'.$tmpfile, "r");
 	if ($h === false) {
 	   echo "Not created in dir1\n";
@@ -53,7 +53,7 @@ function runtest() {
 	else {
 	   echo "created in dir1\n";
 	   fclose($h);
-	   unlink($dir1.'/'.$tmpfile);   
+	   unlink($dir1.'/'.$tmpfile);
 	}
 }
 ?>
diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt
index eecaec7b4c5..5eb415bc14a 100644
--- a/ext/standard/tests/file/fopen_variation8.phpt
+++ b/ext/standard/tests/file/fopen_variation8.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
@@ -40,7 +40,7 @@ chdir($workingDir);
 
 //define the files to go into these directories, create one in dir2
 echo "\n--- testing include path ---\n";
-set_include_path($newIncludePath);   
+set_include_path($newIncludePath);
 $modes = array("r", "r+", "rt");
 foreach($modes as $mode) {
     test_fopen($mode);
@@ -59,7 +59,7 @@ rmdir($thisTestDir);
 
 function test_fopen($mode) {
    global $scriptFile, $secondFile, $firstFile, $filename;
-   
+
    // create a file in the middle directory
    $h = fopen($secondFile, "w");
    fwrite($h, "in dir2");
@@ -76,44 +76,44 @@ function test_fopen($mode) {
    $h = fopen($firstFile, "w");
    fwrite($h, "in dir1");
    fclose($h);
-   
+
    //should now read dir1 file
    $h = fopen($filename, $mode, true);
    fpassthru($h);
    fclose($h);
    echo "\n";
-   
+
    // create a file in working directory
    $h = fopen($filename, "w");
    fwrite($h, "in working dir");
    fclose($h);
-   
+
    //should read the dir1 file
    $h = fopen($filename, $mode, true);
    fpassthru($h);
    fclose($h);
    echo "\n";
-   
+
    unlink($firstFile);
    unlink($secondFile);
-   
+
    //should read the working dir file
    $h = fopen($filename, $mode, true);
    fpassthru($h);
    fclose($h);
    echo "\n";
-   
+
    // create a file in the script directory
    $h = fopen($scriptFile, "w");
    fwrite($h, "in script dir");
    fclose($h);
-   
+
    //should read the file in script dir
    $h = fopen($filename, $mode, true);
    fpassthru($h);
    fclose($h);
    echo "\n";
-     
+
    //cleanup
    unlink($filename);
    unlink($scriptFile);
diff --git a/ext/standard/tests/file/fopen_variation9.phpt b/ext/standard/tests/file/fopen_variation9.phpt
index 5d1ca139f40..bee941eb945 100644
--- a/ext/standard/tests/file/fopen_variation9.phpt
+++ b/ext/standard/tests/file/fopen_variation9.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : resource fopen(string filename, string mode [, bool use_include_path [, resource context]])
- * Description: Open a file or a URL and return a file pointer 
+ * Description: Open a file or a URL and return a file pointer
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 require_once('fopen_include_path.inc');
@@ -34,8 +34,8 @@ function runtest() {
 	$h = fopen($tmpfile, "w", true);
 	fwrite($h, "This is the test file");
 	fclose($h);
-	
-	
+
+
 	$h = @fopen($tmpfile, "r");
 	if ($h === false) {
 	   echo "Not created in working dir\n";
@@ -45,7 +45,7 @@ function runtest() {
 	   fclose($h);
 	   unlink($tmpfile);
 	}
-	
+
 	$h = @fopen('dir1/'.$tmpfile, "r");
 	if ($h === false) {
 	   echo "Not created in dir1\n";
@@ -53,7 +53,7 @@ function runtest() {
 	else {
 	   echo "created in dir1\n";
 	   fclose($h);
-	   unlink('dir1/'.$tmpfile);   
+	   unlink('dir1/'.$tmpfile);
 	}
 }
 ?>
diff --git a/ext/standard/tests/file/fopencookie.phpt b/ext/standard/tests/file/fopencookie.phpt
index cd6bed89cf0..79922e31e11 100644
--- a/ext/standard/tests/file/fopencookie.phpt
+++ b/ext/standard/tests/file/fopencookie.phpt
@@ -20,12 +20,12 @@ fopencookie detected and working (or cast mechanism works)
 class userstream {
 	public $position = 0;
 	public $data = "If you can read this, it worked";
-	
+
 	function stream_open($path, $mode, $options, &$opened_path)
 	{
 		return true;
 	}
-	
+
 	function stream_read($count)
 	{
 		$ret = substr($this->data, $this->position, $count);
diff --git a/ext/standard/tests/file/fpassthru_basic.phpt b/ext/standard/tests/file/fpassthru_basic.phpt
index 8924b27dd22..8555f3782a1 100644
--- a/ext/standard/tests/file/fpassthru_basic.phpt
+++ b/ext/standard/tests/file/fpassthru_basic.phpt
@@ -2,7 +2,7 @@
 Test fpassthru() function: Basic functionality
 --FILE--
 <?php
-/* 
+/*
 Prototype: int fpassthru ( resource $handle );
 Description: Reads to EOF on the given file pointer from the current position
   and writes the results to the output buffer.
diff --git a/ext/standard/tests/file/fpassthru_error.phpt b/ext/standard/tests/file/fpassthru_error.phpt
index 958397b0e54..64d24d60b54 100644
--- a/ext/standard/tests/file/fpassthru_error.phpt
+++ b/ext/standard/tests/file/fpassthru_error.phpt
@@ -2,7 +2,7 @@
 Test fpassthru() function: Error conditions
 --FILE--
 <?php
-/* 
+/*
 Prototype: int fpassthru ( resource $handle );
 Description: Reads to EOF on the given file pointer from the current position
   and writes the results to the output buffer.
diff --git a/ext/standard/tests/file/fpassthru_variation.phpt b/ext/standard/tests/file/fpassthru_variation.phpt
index 749eefb4c8f..f27f959074a 100644
--- a/ext/standard/tests/file/fpassthru_variation.phpt
+++ b/ext/standard/tests/file/fpassthru_variation.phpt
@@ -2,7 +2,7 @@
 Test fpassthru() function: Variations
 --FILE--
 <?php
-/* 
+/*
 Prototype: int fpassthru ( resource $handle );
 Description: Reads to EOF on the given file pointer from the current position
   and writes the results to the output buffer.
@@ -22,7 +22,7 @@ $file_read = fopen($file_name, "r");
 $offset_arr = array(
   /* Positive offsets */
   0,
-  1, 
+  1,
   5,
   10,
   20,
@@ -30,10 +30,10 @@ $offset_arr = array(
   35,
   36,
   70,
-  /* Negative offsets, the file pointer should be at the end of file 
+  /* Negative offsets, the file pointer should be at the end of file
   to get data */
-  -1, 
-  -5, 
+  -1,
+  -5,
   -10,
   -20,
   -35,
@@ -48,12 +48,12 @@ for( $i=0; $i<count($offset_arr); $i++ ) {
     var_dump(fpassthru($file_read) );
     rewind( $file_read );
   }else
-    { 
+    {
       fseek($file_read, $offset_arr[$i], SEEK_END);
       var_dump( fpassthru($file_read) );
       rewind( $file_read );
-    } 
-} 
+    }
+}
 
 fclose($file_read);  // closing the handle
 
diff --git a/ext/standard/tests/file/fpassthru_variation1.phpt b/ext/standard/tests/file/fpassthru_variation1.phpt
index f952cdbc8c5..9af128298ac 100644
--- a/ext/standard/tests/file/fpassthru_variation1.phpt
+++ b/ext/standard/tests/file/fpassthru_variation1.phpt
@@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : proto int fpassthru(resource fp)
- * Description: Output all remaining data from a file pointer 
+ * Description: Output all remaining data from a file pointer
  * Source code: ext/standard/file.c
  * Alias to functions: gzpassthru
  */
diff --git a/ext/standard/tests/file/fputcsv_error.phpt b/ext/standard/tests/file/fputcsv_error.phpt
index 1e6ba94edd4..ca958da3d7f 100644
--- a/ext/standard/tests/file/fputcsv_error.phpt
+++ b/ext/standard/tests/file/fputcsv_error.phpt
@@ -5,7 +5,7 @@ Test fputcsv() function : error conditions
 /*
  Prototype: int fputcsv ( resource $handle [, array $fields [, string $delimiter [, string $enclosure]]] );
  Description:fputcsv() formats a line (passed as a fields array) as CSV and write it to the specified file
-   handle. Returns the length of the written string, or FALSE on failure. 
+   handle. Returns the length of the written string, or FALSE on failure.
 */
 
 echo "*** Testing error conditions ***\n";
diff --git a/ext/standard/tests/file/fputcsv_variation1.phpt b/ext/standard/tests/file/fputcsv_variation1.phpt
index 68df33c8ecd..bad44ea0c3e 100644
--- a/ext/standard/tests/file/fputcsv_variation1.phpt
+++ b/ext/standard/tests/file/fputcsv_variation1.phpt
@@ -2,17 +2,17 @@
 Test fputcsv() : usage variations - with all parameters specified
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] );
- Description: Format line as CSV and write to the file pointer 
+ Description: Format line as CSV and write to the file pointer
 */
 
 /* Testing fputcsv() to write to a file when all its parameters are provided */
 
 echo "*** Testing fputcsv() : with all parameters specified ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation1.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $file_handle = fopen($filename, "w");
@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
 
     var_dump( fputcsv($file_handle, $csv_field, $delimiter, $enclosure) );
     // check the file pointer position and eof
@@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( feof($file_handle) );
     //close the file
     fclose($file_handle);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($filename) );
 
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fputcsv_variation10.phpt b/ext/standard/tests/file/fputcsv_variation10.phpt
index 21d845ffa76..69fcadbfb6e 100644
--- a/ext/standard/tests/file/fputcsv_variation10.phpt
+++ b/ext/standard/tests/file/fputcsv_variation10.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test fputcsv() : usage variations - with line without any csv fields 
+Test fputcsv() : usage variations - with line without any csv fields
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] );
- Description: Format line as CSV and write to the file pointer 
+ Description: Format line as CSV and write to the file pointer
 */
 
 
@@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with line without any csv fields
 
 echo "*** Testing fputcsv() : with no CSV format in the field ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 
@@ -28,13 +28,13 @@ $filename = "$file_path/fputcsv_variation10.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($fields as $field) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $file_handle = fopen($filename, "w");
@@ -46,22 +46,22 @@ foreach ($fields as $field) {
       exit();
     }
     $csv_field = $field;
-    
+
     // write to a file in csv format
     var_dump( fputcsv($file_handle, $csv_field) );
-    
+
     // check the file pointer position and eof
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );
     //close the file
     fclose($file_handle);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($filename) );
 
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fputcsv_variation11.phpt b/ext/standard/tests/file/fputcsv_variation11.phpt
index 770b89b7119..83e80adba2f 100644
--- a/ext/standard/tests/file/fputcsv_variation11.phpt
+++ b/ext/standard/tests/file/fputcsv_variation11.phpt
@@ -1,18 +1,18 @@
 --TEST--
-Test fputcsv() : usage variations - with default enclosure value 
+Test fputcsv() : usage variations - with default enclosure value
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] );
- Description: Format line as CSV and write to the file pointer 
+ Description: Format line as CSV and write to the file pointer
 */
 
 /* Testing fputcsv() to write to a file when default enclosure value is provided */
 
 echo "*** Testing fputcsv() : with default enclosure value ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation11.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $file_handle = fopen($filename, "w");
@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( fputcsv($file_handle, $csv_field, $delimiter) );
     // check the file pointer position and eof
@@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( feof($file_handle) );
     //close the file
     fclose($file_handle);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($filename) );
 
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fputcsv_variation12.phpt b/ext/standard/tests/file/fputcsv_variation12.phpt
index 24fe5c46584..f1779656860 100644
--- a/ext/standard/tests/file/fputcsv_variation12.phpt
+++ b/ext/standard/tests/file/fputcsv_variation12.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test fputcsv() : usage variations - with default enclosure and different delimiter 
+Test fputcsv() : usage variations - with default enclosure and different delimiter
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] );
- Description: Format line as CSV and write to the file pointer 
+ Description: Format line as CSV and write to the file pointer
 */
 
 /* Testing fputcsv() to write to a file when default enclosure value and delimiter value
@@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with default enclosure and different delimit
 
 echo "*** Testing fputcsv() : with default enclosure and different delimiter value ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -34,13 +34,13 @@ $filename = "$file_path/fputcsv_variation12.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $file_handle = fopen($filename, "w");
@@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-     
+
     // write to a file in csv format
     var_dump( fputcsv($file_handle, $csv_field, '+') );
     // check the file pointer position and eof
@@ -62,13 +62,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( feof($file_handle) );
     //close the file
     fclose($file_handle);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($filename) );
 
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fputcsv_variation13.phpt b/ext/standard/tests/file/fputcsv_variation13.phpt
index a8a350b222a..0518cb74352 100644
--- a/ext/standard/tests/file/fputcsv_variation13.phpt
+++ b/ext/standard/tests/file/fputcsv_variation13.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test fputcsv() : usage variations - with default enclosure & delimiter of two chars 
+Test fputcsv() : usage variations - with default enclosure & delimiter of two chars
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] );
- Description: Format line as CSV and write to the file pointer 
+ Description: Format line as CSV and write to the file pointer
 */
 
 /* Testing fputcsv() to write to a file when default enclosure value and delimiter
@@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with default enclosure & delimiter of two ch
 
 echo "*** Testing fputcsv() : with default enclosure & delimiter of two chars ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -34,13 +34,13 @@ $filename = "$file_path/fputcsv_variation13.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $file_handle = fopen($filename, "w");
@@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( fputcsv($file_handle, $csv_field, '++') );
     // check the file pointer position and eof
@@ -62,13 +62,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( feof($file_handle) );
     //close the file
     fclose($file_handle);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($filename) );
 
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fputcsv_variation14.phpt b/ext/standard/tests/file/fputcsv_variation14.phpt
index 36a4975c125..2cbbf517ede 100644
--- a/ext/standard/tests/file/fputcsv_variation14.phpt
+++ b/ext/standard/tests/file/fputcsv_variation14.phpt
@@ -2,9 +2,9 @@
 Test fputcsv() : usage variations - with enclosure & delimiter of two chars(read only modes)
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] );
- Description: Format line as CSV and write to the file pointer 
+ Description: Format line as CSV and write to the file pointer
 */
 
 /* Testing fputcsv() to write to a file when default enclosure value and delimiter
@@ -12,8 +12,8 @@ Test fputcsv() : usage variations - with enclosure & delimiter of two chars(read
 
 echo "*** Testing fputcsv() : with enclosure & delimiter of two chars and file opened in read mode ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -51,8 +51,8 @@ foreach ($csv_lists as $csv_list) {
       exit();
     }
     fclose($file_handle);
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // add the content with has csv fields
       $file_handle = fopen($filename, $file_modes[$mode_counter] );
     if ( !$file_handle ) {
@@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( fputcsv($file_handle, $csv_field, '++', '%%') );
     // check the file pointer position and eof
@@ -70,13 +70,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( feof($file_handle) );
     //close the file
     fclose($file_handle);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($filename) );
 
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fputcsv_variation2.phpt b/ext/standard/tests/file/fputcsv_variation2.phpt
index 3ec4e91f2a7..5cbaed0fdd0 100644
--- a/ext/standard/tests/file/fputcsv_variation2.phpt
+++ b/ext/standard/tests/file/fputcsv_variation2.phpt
@@ -2,17 +2,17 @@
 Test fputcsv() : usage variations - with delimiter as NULL
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] );
- Description: Format line as CSV and write to the file pointer 
+ Description: Format line as CSV and write to the file pointer
 */
 
 /* Testing fputcsv() to write to a file when delimiter is NULL */
 
 echo "*** Testing fputcsv() : with delimiter as NULL ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation2.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $file_handle = fopen($filename, "w");
@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( fputcsv($file_handle, $csv_field, NULL, $enclosure) );
     // check the file pointer position and eof
@@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( feof($file_handle) );
     //close the file
     fclose($file_handle);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($filename) );
 
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fputcsv_variation3.phpt b/ext/standard/tests/file/fputcsv_variation3.phpt
index 14a2503eca3..f184ffabf25 100644
--- a/ext/standard/tests/file/fputcsv_variation3.phpt
+++ b/ext/standard/tests/file/fputcsv_variation3.phpt
@@ -2,17 +2,17 @@
 Test fputcsv() : usage variations - with enclosure as NULL
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] );
- Description: Format line as CSV and write to the file pointer 
+ Description: Format line as CSV and write to the file pointer
 */
 
 /* Testing fputcsv() to write to a file when enclosure is NULL */
 
 echo "*** Testing fputcsv() : with enclosure as NULL ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation3.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $file_handle = fopen($filename, "w");
@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( fputcsv($file_handle, $csv_field, $delimiter, NULL) );
     // check the file pointer position and eof
@@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( feof($file_handle) );
     //close the file
     fclose($file_handle);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($filename) );
 
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fputcsv_variation4.phpt b/ext/standard/tests/file/fputcsv_variation4.phpt
index bc374ad3974..02c7485d7ee 100644
--- a/ext/standard/tests/file/fputcsv_variation4.phpt
+++ b/ext/standard/tests/file/fputcsv_variation4.phpt
@@ -2,17 +2,17 @@
 Test fputcsv() : usage variations - with delimiter and enclosure as NULL
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] );
- Description: Format line as CSV and write to the file pointer 
+ Description: Format line as CSV and write to the file pointer
 */
 
 /* Testing fputcsv() to write to a file when delimiter and enclosure is NULL */
 
 echo "*** Testing fputcsv() : with delimiter and enclosure as NULL ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation4.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $file_handle = fopen($filename, "w");
@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( fputcsv($file_handle, $csv_field, NULL, NULL) );
     // check the file pointer position and eof
@@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( feof($file_handle) );
     //close the file
     fclose($file_handle);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($filename) );
 
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fputcsv_variation5.phpt b/ext/standard/tests/file/fputcsv_variation5.phpt
index 9d78854d714..49f6d81d104 100644
--- a/ext/standard/tests/file/fputcsv_variation5.phpt
+++ b/ext/standard/tests/file/fputcsv_variation5.phpt
@@ -2,17 +2,17 @@
 Test fputcsv() : usage variations - with default arguments value
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] );
- Description: Format line as CSV and write to the file pointer 
+ Description: Format line as CSV and write to the file pointer
 */
 
 /* Testing fputcsv() to write to a file when default arguments values are considered */
 
 echo "*** Testing fputcsv() : with default arguments value ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -33,13 +33,13 @@ $filename = "$file_path/fputcsv_variation5.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $file_handle = fopen($filename, "w");
@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( fputcsv($file_handle, $csv_field) );
     // check the file pointer position and eof
@@ -61,13 +61,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( feof($file_handle) );
     //close the file
     fclose($file_handle);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($filename) );
 
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fputcsv_variation6.phpt b/ext/standard/tests/file/fputcsv_variation6.phpt
index f30ce24f403..5de601707c1 100644
--- a/ext/standard/tests/file/fputcsv_variation6.phpt
+++ b/ext/standard/tests/file/fputcsv_variation6.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test fputcsv() : usage variations - with different delimiter and enclosure 
+Test fputcsv() : usage variations - with different delimiter and enclosure
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] );
- Description: Format line as CSV and write to the file pointer 
+ Description: Format line as CSV and write to the file pointer
 */
 
 /*
@@ -14,8 +14,8 @@ Test fputcsv() : usage variations - with different delimiter and enclosure
 
 echo "*** Testing fputcsv() : with different delimiter and enclosure ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -36,13 +36,13 @@ $filename = "$file_path/fputcsv_variation6.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $file_handle = fopen($filename, "w");
@@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( fputcsv($file_handle, $csv_field, '+', '%') );
     // check the file pointer position and eof
@@ -64,13 +64,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( feof($file_handle) );
     //close the file
     fclose($file_handle);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($filename) );
 
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fputcsv_variation7.phpt b/ext/standard/tests/file/fputcsv_variation7.phpt
index 8329251d73a..789825de526 100644
--- a/ext/standard/tests/file/fputcsv_variation7.phpt
+++ b/ext/standard/tests/file/fputcsv_variation7.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test fputcsv() : usage variations - with different delimiter and same enclosure 
+Test fputcsv() : usage variations - with different delimiter and same enclosure
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] );
- Description: Format line as CSV and write to the file pointer 
+ Description: Format line as CSV and write to the file pointer
 */
 
 /*
@@ -14,8 +14,8 @@ Test fputcsv() : usage variations - with different delimiter and same enclosure
 
 echo "*** Testing fputcsv() : with different delimiter and same enclosure ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -36,13 +36,13 @@ $filename = "$file_path/fputcsv_variation7.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $file_handle = fopen($filename, "w");
@@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( fputcsv($file_handle, $csv_field, '+', $enclosure) );
     // check the file pointer position and eof
@@ -64,13 +64,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( feof($file_handle) );
     //close the file
     fclose($file_handle);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($filename) );
 
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fputcsv_variation8.phpt b/ext/standard/tests/file/fputcsv_variation8.phpt
index 096f37908af..74c10852d88 100644
--- a/ext/standard/tests/file/fputcsv_variation8.phpt
+++ b/ext/standard/tests/file/fputcsv_variation8.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test fputcsv() : usage variations - with same delimiter and different enclosure 
+Test fputcsv() : usage variations - with same delimiter and different enclosure
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] );
- Description: Format line as CSV and write to the file pointer 
+ Description: Format line as CSV and write to the file pointer
 */
 
 /*
@@ -14,8 +14,8 @@ Test fputcsv() : usage variations - with same delimiter and different enclosure
 
 echo "*** Testing fputcsv() : with same delimiter and different enclosure ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -36,13 +36,13 @@ $filename = "$file_path/fputcsv_variation8.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $file_handle = fopen($filename, "w");
@@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( fputcsv($file_handle, $csv_field, $delimiter, '+') );
     // check the file pointer position and eof
@@ -64,13 +64,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( feof($file_handle) );
     //close the file
     fclose($file_handle);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($filename) );
 
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fputcsv_variation9.phpt b/ext/standard/tests/file/fputcsv_variation9.phpt
index 386d7bd1e7b..c4c560971a1 100644
--- a/ext/standard/tests/file/fputcsv_variation9.phpt
+++ b/ext/standard/tests/file/fputcsv_variation9.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test fputcsv() : usage variations - two chars as enclosure & delimiter 
+Test fputcsv() : usage variations - two chars as enclosure & delimiter
 --FILE--
 <?php
-/* 
+/*
  Prototype: array fputcsv ( resource $handle , array $fields [, string $delimiter [, string $enclosure]]] );
- Description: Format line as CSV and write to the file pointer 
+ Description: Format line as CSV and write to the file pointer
 */
 
 
@@ -12,8 +12,8 @@ Test fputcsv() : usage variations - two chars as enclosure & delimiter
 
 echo "*** Testing fputcsv() : with two chars as enclosure & delimiter ***\n";
 
-/* the array is with three elements in it. Each element should be read as 
-   1st element is delimiter, 2nd element is enclosure 
+/* the array is with three elements in it. Each element should be read as
+   1st element is delimiter, 2nd element is enclosure
    and 3rd element is csv fields
 */
 $csv_lists = array (
@@ -34,13 +34,13 @@ $filename = "$file_path/fputcsv_variation9.tmp";
 $file_modes = array ("r+", "r+b", "r+t",
                      "a+", "a+b", "a+t",
                      "w+", "w+b", "w+t",
-                     "x+", "x+b", "x+t"); 
+                     "x+", "x+b", "x+t");
 
 $loop_counter = 1;
 foreach ($csv_lists as $csv_list) {
   for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
-    
-    echo "\n-- file opened in $file_modes[$mode_counter] --\n";  
+
+    echo "\n-- file opened in $file_modes[$mode_counter] --\n";
     // create the file and add the content with has csv fields
     if ( strstr($file_modes[$mode_counter], "r") ) {
       $file_handle = fopen($filename, "w");
@@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) {
     $delimiter = $csv_list[0];
     $enclosure = $csv_list[1];
     $csv_field = $csv_list[2];
-    
+
     // write to a file in csv format
     var_dump( fputcsv($file_handle, $csv_field, '++', '%%'
 ) );
@@ -63,13 +63,13 @@ foreach ($csv_lists as $csv_list) {
     var_dump( feof($file_handle) );
     //close the file
     fclose($file_handle);
-    
-    // print the file contents 
+
+    // print the file contents
     var_dump( file_get_contents($filename) );
 
     //delete file
     unlink($filename);
-  } //end of mode loop 
+  } //end of mode loop
 } // end of foreach
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fread_basic.phpt b/ext/standard/tests/file/fread_basic.phpt
index 44e534241c8..c88491f17c5 100644
--- a/ext/standard/tests/file/fread_basic.phpt
+++ b/ext/standard/tests/file/fread_basic.phpt
@@ -4,19 +4,19 @@ Test fread() function : basic functionality
 <?php
 /*
  Prototype: string fread ( resource $handle [, int $length] );
- Description: reads up to length bytes from the file pointer referenced by handle. 
-   Reading stops when up to length bytes have been read, EOF (end of file) is 
-   reached, (for network streams) when a packet becomes available, or (after 
+ Description: reads up to length bytes from the file pointer referenced by handle.
+   Reading stops when up to length bytes have been read, EOF (end of file) is
+   reached, (for network streams) when a packet becomes available, or (after
    opening userspace stream) when 8192 bytes have been read whichever comes first.
 */
 
 // include the file.inc for common functions for test
 include ("file.inc");
 
-/* Function : function check_size(string $data, int $expect_size) 
+/* Function : function check_size(string $data, int $expect_size)
    Description : Check the length of the data, and compare the size with $expect_size
      $data : Text data.
-     $expect_size : Expected data length 
+     $expect_size : Expected data length
 */
 function check_size($data, $expect_size) {
 
@@ -29,36 +29,36 @@ function check_size($data, $expect_size) {
 
 
 echo "*** Testing fread() basic operations ***\n";
-/* 
+/*
  test fread with file opened in "r" and "rb" mode only
- Content with numeric and strings with it 
+ Content with numeric and strings with it
 */
 $file_modes = array( "r", "rb", "rt", "r+", "r+b", "r+t");
 $file_content_types = array("numeric","text","text_with_new_line","alphanumeric");
 
  foreach($file_content_types as $file_content_type) {
    echo "\n-- Testing fread) with file having data of type ". $file_content_type ." --\n";
-   /* create files with $file_content_type */ 
+   /* create files with $file_content_type */
    create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_basic");
    $filename = dirname(__FILE__)."/fread_basic1.tmp"; // this is name of the file created by create_files()
-  
+
   /* open the file using $files_modes and perform fread() on it */
-   for($inner_loop_counter = 0; 
-       $inner_loop_counter < count($file_modes); 
+   for($inner_loop_counter = 0;
+       $inner_loop_counter < count($file_modes);
        $inner_loop_counter++) {
-    
+
     echo "-- File opened in mode ".$file_modes[$inner_loop_counter]." --\n";
     $file_handle = fopen($filename, $file_modes[$inner_loop_counter]);
     if (!$file_handle) {
        echo "Error: failed to fopen() file: $filename!";
        exit();
     }
- 
-    /* read file by giving the acutal length, check the length and content by calculating the 
-      hash using md5() function 
+
+    /* read file by giving the acutal length, check the length and content by calculating the
+      hash using md5() function
     */
     /* Reading 1024 bytes from file, expecting 1024 bytes */ ;
-    
+
     var_dump(ftell($file_handle));
     var_dump( feof($file_handle) );
     echo "Reading 1024 bytes from file, expecting 1024 bytes ... ";
@@ -68,7 +68,7 @@ $file_content_types = array("numeric","text","text_with_new_line","alphanumeric"
     var_dump( feof($file_handle) );
     var_dump( md5($data_from_file) ); // calculate the hash and dump it
 
-    /* read file by giving size more than its size */   
+    /* read file by giving size more than its size */
     var_dump(rewind($file_handle));
     var_dump(ftell($file_handle));
     var_dump( feof($file_handle) );
@@ -94,7 +94,7 @@ $file_content_types = array("numeric","text","text_with_new_line","alphanumeric"
     var_dump(fclose($file_handle)); // now close the file
   } // end of inner for loop
 
-  // delete the file created 
+  // delete the file created
   delete_file($filename); // delete file with name
 } // end of outer foreach loop
 echo "Done\n";
diff --git a/ext/standard/tests/file/fread_error.phpt b/ext/standard/tests/file/fread_error.phpt
index 4917d2ef47f..5fbb9bef29d 100644
--- a/ext/standard/tests/file/fread_error.phpt
+++ b/ext/standard/tests/file/fread_error.phpt
@@ -4,14 +4,14 @@ Test fread() function : error conditions
 <?php
 /*
  Prototype: string fread ( resource $handle [, int $length] );
- Description: reads up to length bytes from the file pointer referenced by handle. 
-   Reading stops when up to length bytes have been read, EOF (end of file) is 
-   reached, (for network streams) when a packet becomes available, or (after 
+ Description: reads up to length bytes from the file pointer referenced by handle.
+   Reading stops when up to length bytes have been read, EOF (end of file) is
+   reached, (for network streams) when a packet becomes available, or (after
    opening userspace stream) when 8192 bytes have been read whichever comes first.
 */
 
 echo "*** Testing error conditions ***\n";
-$filename = __FILE__; 
+$filename = __FILE__;
 $file_handle = fopen($filename, "r");
 
 // zero argument
@@ -22,9 +22,9 @@ var_dump( fread() );
 echo "-- Testing fread() with more than expected number of arguments --\n";
 var_dump( fread($file_handle, 10, $file_handle) );
 
-// invalid length argument 
+// invalid length argument
 echo "-- Testing fread() with invalid length arguments --\n";
-$len = 0; 
+$len = 0;
 var_dump( fread($file_handle, $len) );
 $len = -10;
 var_dump( fread($file_handle, $len) );
diff --git a/ext/standard/tests/file/fread_fwrite_basic.phpt b/ext/standard/tests/file/fread_fwrite_basic.phpt
index 0f5c4ed763e..d930e55a71e 100644
--- a/ext/standard/tests/file/fread_fwrite_basic.phpt
+++ b/ext/standard/tests/file/fread_fwrite_basic.phpt
@@ -5,16 +5,16 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 
-/* 
+/*
  * proto int fwrite(resource fp, string str [, int length])
  * Function is implemented in ext/standard/file.c
- */ 
- 
+ */
+
  /*
  Prototype: string fread ( resource $handle [, int $length] );
- Description: reads up to length bytes from the file pointer referenced by handle. 
-   Reading stops when up to length bytes have been read, EOF (end of file) is 
-   reached, (for network streams) when a packet becomes available, or (after 
+ Description: reads up to length bytes from the file pointer referenced by handle.
+   Reading stops when up to length bytes have been read, EOF (end of file) is
+   reached, (for network streams) when a packet becomes available, or (after
    opening userspace stream) when 8192 bytes have been read whichever comes first.
 */
 
diff --git a/ext/standard/tests/file/fread_variation1.phpt b/ext/standard/tests/file/fread_variation1.phpt
index c46dbe2a3c7..dbc786758bb 100644
--- a/ext/standard/tests/file/fread_variation1.phpt
+++ b/ext/standard/tests/file/fread_variation1.phpt
@@ -4,9 +4,9 @@ Test fread() function : usage variations - read some/all chars, read/write modes
 <?php
 /*
  Prototype: string fread ( resource $handle [, int $length] );
- Description: reads up to length bytes from the file pointer referenced by handle. 
-   Reading stops when up to length bytes have been read, EOF (end of file) is 
-   reached, (for network streams) when a packet becomes available, or (after 
+ Description: reads up to length bytes from the file pointer referenced by handle.
+   Reading stops when up to length bytes have been read, EOF (end of file) is
+   reached, (for network streams) when a packet becomes available, or (after
    opening userspace stream) when 8192 bytes have been read whichever comes first.
 */
 
@@ -18,8 +18,8 @@ Test fread() function : usage variations - read some/all chars, read/write modes
 include ("file.inc");
 
 /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size)
-   Description : Read data from file of size $read_size and verifies that $expected_size no. of 
-                 bytes are read. 
+   Description : Read data from file of size $read_size and verifies that $expected_size no. of
+                 bytes are read.
      $file_handle : File Handle
      $read_size   : No. of bytes to be read.
      $expect_size : Expected data length
@@ -47,7 +47,7 @@ function check_read($file_handle, $read_size, $expect_size) {
 
   return $data_from_file;
 }
- 
+
 echo "*** Testing fread() : usage variations ***\n";
 
 $file_modes = array("a+","a+b","a+t",
@@ -65,7 +65,7 @@ foreach($file_content_types as $file_content_type) {
        /* create files with $file_content_type */
        create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation");
     }
-    
+
     $filename = dirname(__FILE__)."/fread_variation1.tmp"; // this is name of the file created by create_files()
     echo "-- File opened in mode ".$file_mode." --\n";
     $file_handle = fopen($filename, $file_mode);
diff --git a/ext/standard/tests/file/fread_variation2.phpt b/ext/standard/tests/file/fread_variation2.phpt
index 23813a66722..1dc87c537c9 100644
--- a/ext/standard/tests/file/fread_variation2.phpt
+++ b/ext/standard/tests/file/fread_variation2.phpt
@@ -4,9 +4,9 @@ Test fread() function : usage variations - read some/all chars, write only mode
 <?php
 /*
  Prototype: string fread ( resource $handle [, int $length] );
- Description: reads up to length bytes from the file pointer referenced by handle. 
-   Reading stops when up to length bytes have been read, EOF (end of file) is 
-   reached, (for network streams) when a packet becomes available, or (after 
+ Description: reads up to length bytes from the file pointer referenced by handle.
+   Reading stops when up to length bytes have been read, EOF (end of file) is
+   reached, (for network streams) when a packet becomes available, or (after
    opening userspace stream) when 8192 bytes have been read whichever comes first.
 */
 
@@ -16,8 +16,8 @@ Test fread() function : usage variations - read some/all chars, write only mode
 include ("file.inc");
 
 /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size)
-   Description : Read data from file of size $read_size and verifies that $expected_size no. of 
-                 bytes are read. 
+   Description : Read data from file of size $read_size and verifies that $expected_size no. of
+                 bytes are read.
      $file_handle : File Handle
      $read_size   : No. of bytes to be read.
      $expect_size : Expected data length
@@ -27,7 +27,7 @@ function check_read($file_handle, $read_size, $expect_size) {
   // print file pointer position before read
   var_dump( ftell($file_handle) );
   var_dump( feof($file_handle) );
-  
+
   // read the data of size $read_size
   echo "Reading $read_size bytes from file, expecting $expect_size bytes ... ";
   $data_from_file = fread($file_handle, $read_size);
@@ -46,7 +46,7 @@ function check_read($file_handle, $read_size, $expect_size) {
 
   return $data_from_file;
 }
- 
+
 echo "*** Testing fread() : usage variations ***\n";
 
 $file_modes = array("a","ab","at",
diff --git a/ext/standard/tests/file/fread_variation3-win32-mb.phpt b/ext/standard/tests/file/fread_variation3-win32-mb.phpt
index a39842ce5b6..7afa2cae31f 100644
--- a/ext/standard/tests/file/fread_variation3-win32-mb.phpt
+++ b/ext/standard/tests/file/fread_variation3-win32-mb.phpt
@@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 <?php
 /*
  Prototype: string fread ( resource $handle [, int $length] );
- Description: reads up to length bytes from the file pointer referenced by handle. 
-   Reading stops when up to length bytes have been read, EOF (end of file) is 
-   reached, (for network streams) when a packet becomes available, or (after 
+ Description: reads up to length bytes from the file pointer referenced by handle.
+   Reading stops when up to length bytes have been read, EOF (end of file) is
+   reached, (for network streams) when a packet becomes available, or (after
    opening userspace stream) when 8192 bytes have been read whichever comes first.
 */
 
@@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 include ("file.inc");
 
 /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size)
-   Description : Read data from file of size $read_size and verifies that $expected_size no. of 
-                 bytes are read. 
+   Description : Read data from file of size $read_size and verifies that $expected_size no. of
+                 bytes are read.
      $file_handle : File Handle
      $read_size   : No. of bytes to be read.
      $expect_size : Expected data length
@@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) {
   // print file pointer position before read
   var_dump( ftell($file_handle) );
   var_dump( feof($file_handle) );
-  
+
   // read the data of size $read_size
   echo "Reading $read_size bytes from file, expecting $expect_size bytes ... ";
   $data_from_file = fread($file_handle, $read_size);
@@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) {
 
   return $data_from_file;
 }
- 
+
 echo "*** Testing fread() : usage variations ***\n";
 
 $file_modes = array("a+","a+b","a+t",
@@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) {
        /* create files with $file_content_type */
        create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "��ガラスを食�られ��fread_variation", 3);
     }
-    
+
     $filename = dirname(__FILE__)."/��ガラスを食�られ��fread_variation3.tmp"; // this is name of the file created by create_files()
     echo "-- File opened in mode ".$file_mode." --\n";
     $file_handle = fopen($filename, $file_mode);
diff --git a/ext/standard/tests/file/fread_variation3-win32.phpt b/ext/standard/tests/file/fread_variation3-win32.phpt
index 5491555d1f2..2d2518a1c1a 100644
--- a/ext/standard/tests/file/fread_variation3-win32.phpt
+++ b/ext/standard/tests/file/fread_variation3-win32.phpt
@@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 <?php
 /*
  Prototype: string fread ( resource $handle [, int $length] );
- Description: reads up to length bytes from the file pointer referenced by handle. 
-   Reading stops when up to length bytes have been read, EOF (end of file) is 
-   reached, (for network streams) when a packet becomes available, or (after 
+ Description: reads up to length bytes from the file pointer referenced by handle.
+   Reading stops when up to length bytes have been read, EOF (end of file) is
+   reached, (for network streams) when a packet becomes available, or (after
    opening userspace stream) when 8192 bytes have been read whichever comes first.
 */
 
@@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 include ("file.inc");
 
 /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size)
-   Description : Read data from file of size $read_size and verifies that $expected_size no. of 
-                 bytes are read. 
+   Description : Read data from file of size $read_size and verifies that $expected_size no. of
+                 bytes are read.
      $file_handle : File Handle
      $read_size   : No. of bytes to be read.
      $expect_size : Expected data length
@@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) {
   // print file pointer position before read
   var_dump( ftell($file_handle) );
   var_dump( feof($file_handle) );
-  
+
   // read the data of size $read_size
   echo "Reading $read_size bytes from file, expecting $expect_size bytes ... ";
   $data_from_file = fread($file_handle, $read_size);
@@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) {
 
   return $data_from_file;
 }
- 
+
 echo "*** Testing fread() : usage variations ***\n";
 
 $file_modes = array("a+","a+b","a+t",
@@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) {
        /* create files with $file_content_type */
        create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 3);
     }
-    
+
     $filename = dirname(__FILE__)."/fread_variation3.tmp"; // this is name of the file created by create_files()
     echo "-- File opened in mode ".$file_mode." --\n";
     $file_handle = fopen($filename, $file_mode);
diff --git a/ext/standard/tests/file/fread_variation3.phpt b/ext/standard/tests/file/fread_variation3.phpt
index 949e7b88697..80a6caa626f 100644
--- a/ext/standard/tests/file/fread_variation3.phpt
+++ b/ext/standard/tests/file/fread_variation3.phpt
@@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 <?php
 /*
  Prototype: string fread ( resource $handle [, int $length] );
- Description: reads up to length bytes from the file pointer referenced by handle. 
-   Reading stops when up to length bytes have been read, EOF (end of file) is 
-   reached, (for network streams) when a packet becomes available, or (after 
+ Description: reads up to length bytes from the file pointer referenced by handle.
+   Reading stops when up to length bytes have been read, EOF (end of file) is
+   reached, (for network streams) when a packet becomes available, or (after
    opening userspace stream) when 8192 bytes have been read whichever comes first.
 */
 
@@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 include ("file.inc");
 
 /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size)
-   Description : Read data from file of size $read_size and verifies that $expected_size no. of 
-                 bytes are read. 
+   Description : Read data from file of size $read_size and verifies that $expected_size no. of
+                 bytes are read.
      $file_handle : File Handle
      $read_size   : No. of bytes to be read.
      $expect_size : Expected data length
@@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) {
   // print file pointer position before read
   var_dump( ftell($file_handle) );
   var_dump( feof($file_handle) );
-  
+
   // read the data of size $read_size
   echo "Reading $read_size bytes from file, expecting $expect_size bytes ... ";
   $data_from_file = fread($file_handle, $read_size);
@@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) {
 
   return $data_from_file;
 }
- 
+
 echo "*** Testing fread() : usage variations ***\n";
 
 $file_modes = array("a+","a+b","a+t",
@@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) {
        /* create files with $file_content_type */
        create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 3);
     }
-    
+
     $filename = dirname(__FILE__)."/fread_variation3.tmp"; // this is name of the file created by create_files()
     echo "-- File opened in mode ".$file_mode." --\n";
     $file_handle = fopen($filename, $file_mode);
diff --git a/ext/standard/tests/file/fread_variation4-win32.phpt b/ext/standard/tests/file/fread_variation4-win32.phpt
index 77d733a50e4..288dcfc66cc 100644
--- a/ext/standard/tests/file/fread_variation4-win32.phpt
+++ b/ext/standard/tests/file/fread_variation4-win32.phpt
@@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 <?php
 /*
  Prototype: string fread ( resource $handle [, int $length] );
- Description: reads up to length bytes from the file pointer referenced by handle. 
-   Reading stops when up to length bytes have been read, EOF (end of file) is 
-   reached, (for network streams) when a packet becomes available, or (after 
+ Description: reads up to length bytes from the file pointer referenced by handle.
+   Reading stops when up to length bytes have been read, EOF (end of file) is
+   reached, (for network streams) when a packet becomes available, or (after
    opening userspace stream) when 8192 bytes have been read whichever comes first.
 */
 
@@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 include ("file.inc");
 
 /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size)
-   Description : Read data from file of size $read_size and verifies that $expected_size no. of 
-                 bytes are read. 
+   Description : Read data from file of size $read_size and verifies that $expected_size no. of
+                 bytes are read.
      $file_handle : File Handle
      $read_size   : No. of bytes to be read.
      $expect_size : Expected data length
@@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) {
   // print file pointer position before read
   var_dump( ftell($file_handle) );
   var_dump( feof($file_handle) );
-  
+
   // read the data of size $read_size
   echo "Reading $read_size bytes from file, expecting $expect_size bytes ... ";
   $data_from_file = fread($file_handle, $read_size);
@@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) {
 
   return $data_from_file;
 }
- 
+
 echo "*** Testing fread() : usage variations ***\n";
 
 $file_modes = array("a","ab","at",
@@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) {
        /* create files with $file_content_type */
        create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 4);
     }
-    
+
     $filename = dirname(__FILE__)."/fread_variation4.tmp"; // this is name of the file created by create_files()
     echo "-- File opened in mode ".$file_mode." --\n";
     $file_handle = fopen($filename, $file_mode);
diff --git a/ext/standard/tests/file/fread_variation4.phpt b/ext/standard/tests/file/fread_variation4.phpt
index fdff8de704e..d3f3356b17c 100644
--- a/ext/standard/tests/file/fread_variation4.phpt
+++ b/ext/standard/tests/file/fread_variation4.phpt
@@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 <?php
 /*
  Prototype: string fread ( resource $handle [, int $length] );
- Description: reads up to length bytes from the file pointer referenced by handle. 
-   Reading stops when up to length bytes have been read, EOF (end of file) is 
-   reached, (for network streams) when a packet becomes available, or (after 
+ Description: reads up to length bytes from the file pointer referenced by handle.
+   Reading stops when up to length bytes have been read, EOF (end of file) is
+   reached, (for network streams) when a packet becomes available, or (after
    opening userspace stream) when 8192 bytes have been read whichever comes first.
 */
 
@@ -20,8 +20,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 include ("file.inc");
 
 /* Function : function check_read(resource $file_handle, int $read_size, int $expect_size)
-   Description : Read data from file of size $read_size and verifies that $expected_size no. of 
-                 bytes are read. 
+   Description : Read data from file of size $read_size and verifies that $expected_size no. of
+                 bytes are read.
      $file_handle : File Handle
      $read_size   : No. of bytes to be read.
      $expect_size : Expected data length
@@ -31,7 +31,7 @@ function check_read($file_handle, $read_size, $expect_size) {
   // print file pointer position before read
   var_dump( ftell($file_handle) );
   var_dump( feof($file_handle) );
-  
+
   // read the data of size $read_size
   echo "Reading $read_size bytes from file, expecting $expect_size bytes ... ";
   $data_from_file = fread($file_handle, $read_size);
@@ -49,7 +49,7 @@ function check_read($file_handle, $read_size, $expect_size) {
 
   return $data_from_file;
 }
- 
+
 echo "*** Testing fread() : usage variations ***\n";
 
 $file_modes = array("a","ab","at",
@@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type) {
        /* create files with $file_content_type */
        create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fread_variation", 4);
     }
-    
+
     $filename = dirname(__FILE__)."/fread_variation4.tmp"; // this is name of the file created by create_files()
     echo "-- File opened in mode ".$file_mode." --\n";
     $file_handle = fopen($filename, $file_mode);
diff --git a/ext/standard/tests/file/fscanf.phpt b/ext/standard/tests/file/fscanf.phpt
index 700439fcb5f..6d3d0a5b961 100644
--- a/ext/standard/tests/file/fscanf.phpt
+++ b/ext/standard/tests/file/fscanf.phpt
@@ -63,7 +63,7 @@ echo "Done\n";
 $filename = dirname(__FILE__)."/fscanf.dat";
 unlink($filename);
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: fscanf() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt
index 1a80d193486..fe351960dd1 100644
--- a/ext/standard/tests/file/fscanf_error.phpt
+++ b/ext/standard/tests/file/fscanf_error.phpt
@@ -13,7 +13,7 @@ $file_path = dirname(__FILE__);
 
 $filename = "$file_path/fscanf_error.tmp";
 $file_handle = fopen($filename, 'w');
-if ($file_handle == false) 
+if ($file_handle == false)
   exit("Error:failed to open file $filename");
 fwrite($file_handle, "hello world");
 fclose($file_handle);
@@ -23,7 +23,7 @@ var_dump( fscanf() );
 
 // single argument
 $file_handle = fopen($filename, 'r');
-if ($file_handle == false) 
+if ($file_handle == false)
   exit("Error:failed to open file $filename");
 var_dump( fscanf($file_handle) );
 fclose($file_handle);
@@ -33,7 +33,7 @@ var_dump( fscanf($file_handle, "%s") );
 
 // number of formats in format strings not matching the no of variables
 $file_handle = fopen($filename, 'r');
-if ($file_handle == false) 
+if ($file_handle == false)
   exit("Error:failed to open file $filename");
 var_dump( fscanf($file_handle, "%d%s%f", $int_var, $string_var) );
 fclose($file_handle);
@@ -47,10 +47,10 @@ $invalid_formats = array( $undefined_var, undefined_constant,
 // looping to use various invalid formats with fscanf()
 foreach($invalid_formats as $format)  {
   $file_handle = fopen($filename, 'r');
-  if ($file_handle == false) 
+  if ($file_handle == false)
     exit("Error:failed to open file $filename");
   var_dump( fscanf($file_handle, $format) );
-  fclose($file_handle); 
+  fclose($file_handle);
 }
 
 echo "\n*** Done ***";
diff --git a/ext/standard/tests/file/fscanf_variation1.phpt b/ext/standard/tests/file/fscanf_variation1.phpt
index b0c41e5f848..57b2918b1ee 100644
--- a/ext/standard/tests/file/fscanf_variation1.phpt
+++ b/ext/standard/tests/file/fscanf_variation1.phpt
@@ -23,7 +23,7 @@ if($file_handle == false)
 @fwrite($file_handle, 12345);
 fclose($file_handle);
 
-// open file for reading 
+// open file for reading
 $file_handle = fopen($filename, "r");
 // capturing the return value from fscanf() called without third argument
 $return_value = fscanf($file_handle, "%s");
@@ -36,7 +36,7 @@ echo "\n*** Done ***";
 <?php
 $file_path = dirname(__FILE__);
 $filename = "$file_path/fscanf_variation1.tmp";
-unlink($filename); 
+unlink($filename);
 ?>
 --EXPECTF--
 *** Testing fscanf(): for its return type without third argument ***
diff --git a/ext/standard/tests/file/fscanf_variation10.phpt b/ext/standard/tests/file/fscanf_variation10.phpt
index a46c1128799..9ab441610c7 100644
--- a/ext/standard/tests/file/fscanf_variation10.phpt
+++ b/ext/standard/tests/file/fscanf_variation10.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - float formats with resource 
+Test fscanf() function: usage variations - float formats with resource
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with resource
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different float format types with resource ***\n"; 
+echo "*** Test fscanf(): different float format types with resource ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation10.tmp";
@@ -24,14 +24,14 @@ if($file_handle == false)
 // resource type variable
 $fp = fopen (__FILE__, "r");
 $dfp = opendir ( dirname(__FILE__) );
-  
+
 // array of resource types
 $resource_types = array (
   $fp,
   $dfp
 );
 
-$float_formats = array( "%f", 
+$float_formats = array( "%f",
                       "%hf", "%lf", "%Lf",
                       " %f", "%f ", "% f",
                       "\t%f", "\n%f", "%4f",
diff --git a/ext/standard/tests/file/fscanf_variation11.phpt b/ext/standard/tests/file/fscanf_variation11.phpt
index 27de2ae5df7..7b5168011fb 100644
--- a/ext/standard/tests/file/fscanf_variation11.phpt
+++ b/ext/standard/tests/file/fscanf_variation11.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - float formats with arrays 
+Test fscanf() function: usage variations - float formats with arrays
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with arrays
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different float format types with arrays ***\n"; 
+echo "*** Test fscanf(): different float format types with arrays ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation11.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation12.phpt b/ext/standard/tests/file/fscanf_variation12.phpt
index 33bfb67db0c..8968fc33973 100644
--- a/ext/standard/tests/file/fscanf_variation12.phpt
+++ b/ext/standard/tests/file/fscanf_variation12.phpt
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with strings
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different float format types with strings ***\n"; 
+echo "*** Test fscanf(): different float format types with strings ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation12.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation13.phpt b/ext/standard/tests/file/fscanf_variation13.phpt
index 49525b484c2..89da5567f40 100644
--- a/ext/standard/tests/file/fscanf_variation13.phpt
+++ b/ext/standard/tests/file/fscanf_variation13.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - float formats with boolean 
+Test fscanf() function: usage variations - float formats with boolean
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with boolean
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different float format types with boolean data ***\n"; 
+echo "*** Test fscanf(): different float format types with boolean data ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation13.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation14.phpt b/ext/standard/tests/file/fscanf_variation14.phpt
index 2b497c9f5bb..a49e8391df6 100644
--- a/ext/standard/tests/file/fscanf_variation14.phpt
+++ b/ext/standard/tests/file/fscanf_variation14.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - string formats with strings 
+Test fscanf() function: usage variations - string formats with strings
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with strings
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different string format types with different string ***\n"; 
+echo "*** Test fscanf(): different string format types with different string ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation14.tmp";
@@ -65,7 +65,7 @@ $valid_strings = array(
 );
 
 // various string formats
-$string_formats = array( "%s", 
+$string_formats = array( "%s",
                          "%hs", "%ls", "%Ls",
                          " %s", "%s ", "% s",
                          "\t%s", "\n%s", "%4s",
diff --git a/ext/standard/tests/file/fscanf_variation15.phpt b/ext/standard/tests/file/fscanf_variation15.phpt
index 76422dbc8c2..a6dc720b916 100644
--- a/ext/standard/tests/file/fscanf_variation15.phpt
+++ b/ext/standard/tests/file/fscanf_variation15.phpt
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with float values
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different string format types with float values ***\n"; 
+echo "*** Test fscanf(): different string format types with float values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation15.tmp";
@@ -23,8 +23,8 @@ if($file_handle == false)
 // array of float type values
 
 $float_values = array (
-  -2147483649, 
-  2147483648,  
+  -2147483649,
+  2147483648,
   -0x80000001, // float value, beyond max negative int
   0x800000001, // float value, beyond max positive int
   020000000001, // float value, beyond max positive int
diff --git a/ext/standard/tests/file/fscanf_variation16.phpt b/ext/standard/tests/file/fscanf_variation16.phpt
index 8025767bc18..df4ebaa4760 100644
--- a/ext/standard/tests/file/fscanf_variation16.phpt
+++ b/ext/standard/tests/file/fscanf_variation16.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - string formats with resource 
+Test fscanf() function: usage variations - string formats with resource
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with resource
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different string format types with resource ***\n"; 
+echo "*** Test fscanf(): different string format types with resource ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation16.tmp";
@@ -24,7 +24,7 @@ if($file_handle == false)
 // resource type variable
 $fp = fopen (__FILE__, "r");
 $dfp = opendir ( dirname(__FILE__) );
-  
+
 // array of resource types
 $resource_types = array (
   $fp,
diff --git a/ext/standard/tests/file/fscanf_variation17.phpt b/ext/standard/tests/file/fscanf_variation17.phpt
index 2db8871c2b4..899d5580576 100644
--- a/ext/standard/tests/file/fscanf_variation17.phpt
+++ b/ext/standard/tests/file/fscanf_variation17.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - string formats with arrays 
+Test fscanf() function: usage variations - string formats with arrays
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with arrays
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different string format types with arrays ***\n"; 
+echo "*** Test fscanf(): different string format types with arrays ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation17.tmp";
@@ -37,7 +37,7 @@ $array_types = array (
 );
 
 $string_formats = array( "%s",
-                         "%hs", "%ls", "%Ls", 
+                         "%hs", "%ls", "%Ls",
                          " %s", "%s ", "% s",
                          "\t%s", "\n%s", "%4s",
                          "%30s", "%[a-zA-Z0-9]", "%*s");
diff --git a/ext/standard/tests/file/fscanf_variation18.phpt b/ext/standard/tests/file/fscanf_variation18.phpt
index e80606a3fc9..5babc5479f7 100644
--- a/ext/standard/tests/file/fscanf_variation18.phpt
+++ b/ext/standard/tests/file/fscanf_variation18.phpt
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with integer values
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different string format types with integer values ***\n"; 
+echo "*** Test fscanf(): different string format types with integer values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation18.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation19.phpt b/ext/standard/tests/file/fscanf_variation19.phpt
index 08edc522b4f..0cf07076fe5 100644
--- a/ext/standard/tests/file/fscanf_variation19.phpt
+++ b/ext/standard/tests/file/fscanf_variation19.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - string formats with boolean 
+Test fscanf() function: usage variations - string formats with boolean
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - string formats with boolean
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different string format types with boolean data ***\n"; 
+echo "*** Test fscanf(): different string format types with boolean data ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation19.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation2.phpt b/ext/standard/tests/file/fscanf_variation2.phpt
index 55978b95e67..b5001524600 100644
--- a/ext/standard/tests/file/fscanf_variation2.phpt
+++ b/ext/standard/tests/file/fscanf_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - integer formats with integer values 
+Test fscanf() function: usage variations - integer formats with integer values
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with integer values
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different integer format types with different integer values ***\n"; 
+echo "*** Test fscanf(): different integer format types with different integer values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation2.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation20.phpt b/ext/standard/tests/file/fscanf_variation20.phpt
index cb34edd23cd..d8a28334f36 100644
--- a/ext/standard/tests/file/fscanf_variation20.phpt
+++ b/ext/standard/tests/file/fscanf_variation20.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - char formats with integer values 
+Test fscanf() function: usage variations - char formats with integer values
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with integer values
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different char format types with different integer values ***\n"; 
+echo "*** Test fscanf(): different char format types with different integer values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation20.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation21.phpt b/ext/standard/tests/file/fscanf_variation21.phpt
index 51381ce4799..42e05aaf049 100644
--- a/ext/standard/tests/file/fscanf_variation21.phpt
+++ b/ext/standard/tests/file/fscanf_variation21.phpt
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with float values
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different char format types with float values ***\n"; 
+echo "*** Test fscanf(): different char format types with float values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation21.tmp";
@@ -23,8 +23,8 @@ if($file_handle == false)
 // array of float type values
 
 $float_values = array (
-  -2147483649, 
-  2147483648,  
+  -2147483649,
+  2147483648,
   -0x80000001, // float value, beyond max negative int
   0x800000001, // float value, beyond max positive int
   020000000001, // float value, beyond max positive int
diff --git a/ext/standard/tests/file/fscanf_variation22.phpt b/ext/standard/tests/file/fscanf_variation22.phpt
index a3809500a69..50bb9e0d1da 100644
--- a/ext/standard/tests/file/fscanf_variation22.phpt
+++ b/ext/standard/tests/file/fscanf_variation22.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - char formats with resource 
+Test fscanf() function: usage variations - char formats with resource
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with resource
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different char format types with resource ***\n"; 
+echo "*** Test fscanf(): different char format types with resource ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation22.tmp";
@@ -24,14 +24,14 @@ if($file_handle == false)
 // resource type variable
 $fp = fopen (__FILE__, "r");
 $dfp = opendir ( dirname(__FILE__) );
-  
+
 // array of resource types
 $resource_types = array (
   $fp,
   $dfp
 );
 
-$char_formats = array( "%c", 
+$char_formats = array( "%c",
 		       "%hc", "%lc", "%Lc",
 		       " %c", "%c ", "% c",
 		       "\t%c", "\n%c", "%4c",
diff --git a/ext/standard/tests/file/fscanf_variation23.phpt b/ext/standard/tests/file/fscanf_variation23.phpt
index d536c28fded..d429377e706 100644
--- a/ext/standard/tests/file/fscanf_variation23.phpt
+++ b/ext/standard/tests/file/fscanf_variation23.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - char formats with arrays 
+Test fscanf() function: usage variations - char formats with arrays
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with arrays
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different char format types with arrays ***\n"; 
+echo "*** Test fscanf(): different char format types with arrays ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation23.tmp";
@@ -39,7 +39,7 @@ $array_types = array (
 $char_formats = array( "%c",
 		       "%hc", "%lc", "%Lc",
 		       " %c", "%c ", "% c",
-		       "\t%c", "\n%c", "%4c", 
+		       "\t%c", "\n%c", "%4c",
 		       "%30c", "%[a-zA-Z@#$&0-9]", "%*c");
 
 $counter = 1;
diff --git a/ext/standard/tests/file/fscanf_variation24.phpt b/ext/standard/tests/file/fscanf_variation24.phpt
index ddca007ccfb..8be8354023e 100644
--- a/ext/standard/tests/file/fscanf_variation24.phpt
+++ b/ext/standard/tests/file/fscanf_variation24.phpt
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with strings
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different char format types with strings ***\n"; 
+echo "*** Test fscanf(): different char format types with strings ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation24.tmp";
@@ -43,9 +43,9 @@ $strings = array (
 );
 
 $char_formats = array( "%c",
-		       "%hc", "%lc", "%Lc", 
+		       "%hc", "%lc", "%Lc",
 		       " %c", "%c ", "% c",
-		       "\t%c", "\n%c", "%4c", 
+		       "\t%c", "\n%c", "%4c",
 		       "%30c", "%[a-zA-Z@#$&0-9]", "%*c");
 
 $counter = 1;
diff --git a/ext/standard/tests/file/fscanf_variation25.phpt b/ext/standard/tests/file/fscanf_variation25.phpt
index d874aba45eb..c8391d8388f 100644
--- a/ext/standard/tests/file/fscanf_variation25.phpt
+++ b/ext/standard/tests/file/fscanf_variation25.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - char formats with boolean 
+Test fscanf() function: usage variations - char formats with boolean
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with boolean
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different char format types with boolean data ***\n"; 
+echo "*** Test fscanf(): different char format types with boolean data ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation25.tmp";
@@ -31,7 +31,7 @@ $bool_types = array (
 $char_formats = array( "%c",
 		       "%hc", "%lc", "%Lc",
 		       " %c", "%c ", "% c",
-		       "\t%c", "\n%c", "%4c", 
+		       "\t%c", "\n%c", "%4c",
 		       "%30c", "%[a-zA-Z@#$&0-9]", "%*c");
 
 $counter = 1;
diff --git a/ext/standard/tests/file/fscanf_variation26.phpt b/ext/standard/tests/file/fscanf_variation26.phpt
index 1a883f479b8..788427188c3 100644
--- a/ext/standard/tests/file/fscanf_variation26.phpt
+++ b/ext/standard/tests/file/fscanf_variation26.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - char formats with chars 
+Test fscanf() function: usage variations - char formats with chars
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - char formats with chars
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different char format types with chars ***\n"; 
+echo "*** Test fscanf(): different char format types with chars ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation26.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation27.phpt b/ext/standard/tests/file/fscanf_variation27.phpt
index 137471e248c..8982b73e2dd 100644
--- a/ext/standard/tests/file/fscanf_variation27.phpt
+++ b/ext/standard/tests/file/fscanf_variation27.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - octal formats with integer values 
+Test fscanf() function: usage variations - octal formats with integer values
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with integer values
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different octal format types with different integer values ***\n"; 
+echo "*** Test fscanf(): different octal format types with different integer values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation27.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation28.phpt b/ext/standard/tests/file/fscanf_variation28.phpt
index 97f72089fe3..c96377b0275 100644
--- a/ext/standard/tests/file/fscanf_variation28.phpt
+++ b/ext/standard/tests/file/fscanf_variation28.phpt
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with float values
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different octal format types with float values ***\n"; 
+echo "*** Test fscanf(): different octal format types with float values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation28.tmp";
@@ -23,8 +23,8 @@ if($file_handle == false)
 // array of float type values
 
 $float_values = array (
-  -2147483649, 
-  2147483648,  
+  -2147483649,
+  2147483648,
   -0x80000001, // float value, beyond max negative int
   0x800000001, // float value, beyond max positive int
   020000000001, // float value, beyond max positive int
@@ -41,7 +41,7 @@ $float_values = array (
 );
 
 $octal_formats = array( "%o",
-                        "%ho", "%lo", "%Lo", 
+                        "%ho", "%lo", "%Lo",
                         " %o", "%o ", "% o",
                         "\t%o", "\n%o", "%4o",
                         "%30o", "%[0-7]", "%*o"
diff --git a/ext/standard/tests/file/fscanf_variation29.phpt b/ext/standard/tests/file/fscanf_variation29.phpt
index ce7083bc089..80b52654dbb 100644
--- a/ext/standard/tests/file/fscanf_variation29.phpt
+++ b/ext/standard/tests/file/fscanf_variation29.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - octal formats with resource 
+Test fscanf() function: usage variations - octal formats with resource
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with resource
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different octal format types with resource ***\n"; 
+echo "*** Test fscanf(): different octal format types with resource ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation29.tmp";
@@ -24,7 +24,7 @@ if($file_handle == false)
 // resource type variable
 $fp = fopen (__FILE__, "r");
 $dfp = opendir ( dirname(__FILE__) );
-  
+
 // array of resource types
 $resource_types = array (
   $fp,
@@ -33,7 +33,7 @@ $resource_types = array (
 
 $octal_formats = array(  "%o",
 			 "%ho", "%lo", "%Lo",
-			 " %o", "%o ", "% o", 
+			 " %o", "%o ", "% o",
 			 "\t%o", "\n%o", "%4o",
 			 "%30o", "%[0-7]", "%*o"
   		 );
diff --git a/ext/standard/tests/file/fscanf_variation3.phpt b/ext/standard/tests/file/fscanf_variation3.phpt
index 8faff9d091e..8ea8c8674af 100644
--- a/ext/standard/tests/file/fscanf_variation3.phpt
+++ b/ext/standard/tests/file/fscanf_variation3.phpt
@@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) {
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different integer format types with float values ***\n"; 
+echo "*** Test fscanf(): different integer format types with float values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation3.tmp";
@@ -29,8 +29,8 @@ if($file_handle == false)
 // array of float type values
 
 $float_values = array (
-  -2147483649, 
-  2147483648,  
+  -2147483649,
+  2147483648,
   -0x80000001, // float value, beyond max negative int
   0x800000001, // float value, beyond max positive int
   020000000001, // float value, beyond max positive int
diff --git a/ext/standard/tests/file/fscanf_variation30.phpt b/ext/standard/tests/file/fscanf_variation30.phpt
index b4cb350ed65..7303454175b 100644
--- a/ext/standard/tests/file/fscanf_variation30.phpt
+++ b/ext/standard/tests/file/fscanf_variation30.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - octal formats with arrays 
+Test fscanf() function: usage variations - octal formats with arrays
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with arrays
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different octal format types with arrays ***\n"; 
+echo "*** Test fscanf(): different octal format types with arrays ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation30.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation31.phpt b/ext/standard/tests/file/fscanf_variation31.phpt
index f6bc7465f58..6ba47b6a510 100644
--- a/ext/standard/tests/file/fscanf_variation31.phpt
+++ b/ext/standard/tests/file/fscanf_variation31.phpt
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with strings
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different octal format types with strings ***\n"; 
+echo "*** Test fscanf(): different octal format types with strings ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation31.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation32.phpt b/ext/standard/tests/file/fscanf_variation32.phpt
index 52e45405d08..b1f0b248b5f 100644
--- a/ext/standard/tests/file/fscanf_variation32.phpt
+++ b/ext/standard/tests/file/fscanf_variation32.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - octal formats with boolean 
+Test fscanf() function: usage variations - octal formats with boolean
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - octal formats with boolean
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different octal format types with boolean data ***\n"; 
+echo "*** Test fscanf(): different octal format types with boolean data ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation32.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation33.phpt b/ext/standard/tests/file/fscanf_variation33.phpt
index b36598c72c9..a01f5e761ab 100644
--- a/ext/standard/tests/file/fscanf_variation33.phpt
+++ b/ext/standard/tests/file/fscanf_variation33.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - hexa formats with integer values 
+Test fscanf() function: usage variations - hexa formats with integer values
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
@@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) {
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different hexa format types with different integer values ***\n"; 
+echo "*** Test fscanf(): different hexa format types with different integer values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation33.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation34.phpt b/ext/standard/tests/file/fscanf_variation34.phpt
index 2acdc8ba1b8..77437efc999 100644
--- a/ext/standard/tests/file/fscanf_variation34.phpt
+++ b/ext/standard/tests/file/fscanf_variation34.phpt
@@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) {
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different hexa format types with float values ***\n"; 
+echo "*** Test fscanf(): different hexa format types with float values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation34.tmp";
@@ -29,8 +29,8 @@ if($file_handle == false)
 // array of float type values
 
 $float_values = array (
-  -2147483649, 
-  2147483648,  
+  -2147483649,
+  2147483648,
   -0x80000001, // float value, beyond max negative int
   0x800000001, // float value, beyond max positive int
   020000000001, // float value, beyond max positive int
diff --git a/ext/standard/tests/file/fscanf_variation35.phpt b/ext/standard/tests/file/fscanf_variation35.phpt
index 1f98bd8f420..0e98f95022e 100644
--- a/ext/standard/tests/file/fscanf_variation35.phpt
+++ b/ext/standard/tests/file/fscanf_variation35.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - hexa formats with resource 
+Test fscanf() function: usage variations - hexa formats with resource
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with resource
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different hexa format types with resource ***\n"; 
+echo "*** Test fscanf(): different hexa format types with resource ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation35.tmp";
@@ -24,7 +24,7 @@ if($file_handle == false)
 // resource type variable
 $fp = fopen (__FILE__, "r");
 $dfp = opendir ( dirname(__FILE__) );
-  
+
 // array of resource types
 $resource_types = array (
   $fp,
diff --git a/ext/standard/tests/file/fscanf_variation36.phpt b/ext/standard/tests/file/fscanf_variation36.phpt
index 44ff29536ed..3bf065fde0f 100644
--- a/ext/standard/tests/file/fscanf_variation36.phpt
+++ b/ext/standard/tests/file/fscanf_variation36.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - hexa formats with arrays 
+Test fscanf() function: usage variations - hexa formats with arrays
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with arrays
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different hexa format types with arrays ***\n"; 
+echo "*** Test fscanf(): different hexa format types with arrays ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation36.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation37.phpt b/ext/standard/tests/file/fscanf_variation37.phpt
index 7ab302dd391..43668fff4f3 100644
--- a/ext/standard/tests/file/fscanf_variation37.phpt
+++ b/ext/standard/tests/file/fscanf_variation37.phpt
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with strings
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different hexa format types with strings ***\n"; 
+echo "*** Test fscanf(): different hexa format types with strings ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation37.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation38.phpt b/ext/standard/tests/file/fscanf_variation38.phpt
index 32a7f77b421..58327b867e3 100644
--- a/ext/standard/tests/file/fscanf_variation38.phpt
+++ b/ext/standard/tests/file/fscanf_variation38.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - hexa formats with boolean 
+Test fscanf() function: usage variations - hexa formats with boolean
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - hexa formats with boolean
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different hexa format types with boolean data ***\n"; 
+echo "*** Test fscanf(): different hexa format types with boolean data ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation38.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation39.phpt b/ext/standard/tests/file/fscanf_variation39.phpt
index 1ed250c36cb..42a8c515d81 100644
--- a/ext/standard/tests/file/fscanf_variation39.phpt
+++ b/ext/standard/tests/file/fscanf_variation39.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - unsigned int formats with integer values 
+Test fscanf() function: usage variations - unsigned int formats with integer values
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
@@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) {
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different unsigned int format types with different integer values ***\n"; 
+echo "*** Test fscanf(): different unsigned int format types with different integer values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation39.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation4.phpt b/ext/standard/tests/file/fscanf_variation4.phpt
index 0d9cd9dd43a..b1ceb085f3a 100644
--- a/ext/standard/tests/file/fscanf_variation4.phpt
+++ b/ext/standard/tests/file/fscanf_variation4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - integer formats with resource 
+Test fscanf() function: usage variations - integer formats with resource
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with resource
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different integer format types with resource ***\n"; 
+echo "*** Test fscanf(): different integer format types with resource ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation4.tmp";
@@ -25,7 +25,7 @@ if($file_handle == false)
 // resource type variable
 $fp = fopen (__FILE__, "r");
 $dfp = opendir ( dirname(__FILE__) );
-  
+
 // array of resource types
 $resource_types = array (
   $fp,
diff --git a/ext/standard/tests/file/fscanf_variation40.phpt b/ext/standard/tests/file/fscanf_variation40.phpt
index f3a0c96a711..13240075614 100644
--- a/ext/standard/tests/file/fscanf_variation40.phpt
+++ b/ext/standard/tests/file/fscanf_variation40.phpt
@@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) {
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different unsigned format types with float values ***\n"; 
+echo "*** Test fscanf(): different unsigned format types with float values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation40.tmp";
@@ -29,8 +29,8 @@ if($file_handle == false)
 // array of float type values
 
 $float_values = array (
-  -2147483649, 
-  2147483648,  
+  -2147483649,
+  2147483648,
   -0x80000001, // float value, beyond max negative int
   0x800000001, // float value, beyond max positive int
   020000000001, // float value, beyond max positive int
diff --git a/ext/standard/tests/file/fscanf_variation41.phpt b/ext/standard/tests/file/fscanf_variation41.phpt
index 080ce98054d..507eac335cc 100644
--- a/ext/standard/tests/file/fscanf_variation41.phpt
+++ b/ext/standard/tests/file/fscanf_variation41.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - unsigned formats with resource 
+Test fscanf() function: usage variations - unsigned formats with resource
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with resource
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different unsigned format types with resource ***\n"; 
+echo "*** Test fscanf(): different unsigned format types with resource ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation41.tmp";
@@ -24,7 +24,7 @@ if($file_handle == false)
 // resource type variable
 $fp = fopen (__FILE__, "r");
 $dfp = opendir ( dirname(__FILE__) );
-  
+
 // array of resource types
 $resource_types = array (
   $fp,
diff --git a/ext/standard/tests/file/fscanf_variation42.phpt b/ext/standard/tests/file/fscanf_variation42.phpt
index 978187c7333..fc8f8b89cab 100644
--- a/ext/standard/tests/file/fscanf_variation42.phpt
+++ b/ext/standard/tests/file/fscanf_variation42.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - unsigned formats with arrays 
+Test fscanf() function: usage variations - unsigned formats with arrays
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with arrays
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different unsigned format types with arrays ***\n"; 
+echo "*** Test fscanf(): different unsigned format types with arrays ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation42.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation43.phpt b/ext/standard/tests/file/fscanf_variation43.phpt
index 8a0052f1222..e77ea08cfc2 100644
--- a/ext/standard/tests/file/fscanf_variation43.phpt
+++ b/ext/standard/tests/file/fscanf_variation43.phpt
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with strings
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different unsigned format types with strings ***\n"; 
+echo "*** Test fscanf(): different unsigned format types with strings ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation43.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation44.phpt b/ext/standard/tests/file/fscanf_variation44.phpt
index 0b30b61f207..fa51b5bca43 100644
--- a/ext/standard/tests/file/fscanf_variation44.phpt
+++ b/ext/standard/tests/file/fscanf_variation44.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - unsigned formats with boolean 
+Test fscanf() function: usage variations - unsigned formats with boolean
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - unsigned formats with boolean
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different unsigned format types with boolean data ***\n"; 
+echo "*** Test fscanf(): different unsigned format types with boolean data ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation44.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation45.phpt b/ext/standard/tests/file/fscanf_variation45.phpt
index 9186e62f8e4..7795dd6cf4d 100644
--- a/ext/standard/tests/file/fscanf_variation45.phpt
+++ b/ext/standard/tests/file/fscanf_variation45.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - scientific formats with integer values 
+Test fscanf() function: usage variations - scientific formats with integer values
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with integer value
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different scientific format types with different integer values ***\n"; 
+echo "*** Test fscanf(): different scientific format types with different integer values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation45.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation46.phpt b/ext/standard/tests/file/fscanf_variation46.phpt
index 7145c8637aa..c3cd8e0b7b4 100644
--- a/ext/standard/tests/file/fscanf_variation46.phpt
+++ b/ext/standard/tests/file/fscanf_variation46.phpt
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with float values
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different scientific format types with float values ***\n"; 
+echo "*** Test fscanf(): different scientific format types with float values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation46.tmp";
@@ -23,8 +23,8 @@ if($file_handle == false)
 // array of float type values
 
 $float_values = array (
-  -2147483649, 
-  2147483648,  
+  -2147483649,
+  2147483648,
   -0x80000001, // float value, beyond max negative int
   0x800000001, // float value, beyond max positive int
   020000000001, // float value, beyond max positive int
diff --git a/ext/standard/tests/file/fscanf_variation47.phpt b/ext/standard/tests/file/fscanf_variation47.phpt
index 7010571a42e..cf30d4b9c23 100644
--- a/ext/standard/tests/file/fscanf_variation47.phpt
+++ b/ext/standard/tests/file/fscanf_variation47.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - scientific formats with resource 
+Test fscanf() function: usage variations - scientific formats with resource
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with resource
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different scientific format types with resource ***\n"; 
+echo "*** Test fscanf(): different scientific format types with resource ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation47.tmp";
@@ -24,7 +24,7 @@ if($file_handle == false)
 // resource type variable
 $fp = fopen (__FILE__, "r");
 $dfp = opendir ( dirname(__FILE__) );
-  
+
 // array of resource types
 $resource_types = array (
   $fp,
diff --git a/ext/standard/tests/file/fscanf_variation48.phpt b/ext/standard/tests/file/fscanf_variation48.phpt
index 5b61e5b71e3..b2412fa9b83 100644
--- a/ext/standard/tests/file/fscanf_variation48.phpt
+++ b/ext/standard/tests/file/fscanf_variation48.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - scientific formats with arrays 
+Test fscanf() function: usage variations - scientific formats with arrays
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with arrays
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different scientific format types with arrays ***\n"; 
+echo "*** Test fscanf(): different scientific format types with arrays ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation48.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation49.phpt b/ext/standard/tests/file/fscanf_variation49.phpt
index 4e314fb7cec..a681cc01e3e 100644
--- a/ext/standard/tests/file/fscanf_variation49.phpt
+++ b/ext/standard/tests/file/fscanf_variation49.phpt
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with strings
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different scientific format types with strings ***\n"; 
+echo "*** Test fscanf(): different scientific format types with strings ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation49.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation5.phpt b/ext/standard/tests/file/fscanf_variation5.phpt
index 750e604586d..a39d0b8ae11 100644
--- a/ext/standard/tests/file/fscanf_variation5.phpt
+++ b/ext/standard/tests/file/fscanf_variation5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - integer formats with arrays 
+Test fscanf() function: usage variations - integer formats with arrays
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with arrays
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different integer format types with arrays ***\n"; 
+echo "*** Test fscanf(): different integer format types with arrays ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation5.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation50.phpt b/ext/standard/tests/file/fscanf_variation50.phpt
index e46dbdb3472..af406a147a0 100644
--- a/ext/standard/tests/file/fscanf_variation50.phpt
+++ b/ext/standard/tests/file/fscanf_variation50.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - scientific formats with boolean 
+Test fscanf() function: usage variations - scientific formats with boolean
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - scientific formats with boolean
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different scientific format types with boolean data ***\n"; 
+echo "*** Test fscanf(): different scientific format types with boolean data ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation50.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation51.phpt b/ext/standard/tests/file/fscanf_variation51.phpt
index 0f5ab5a6122..46663364d07 100644
--- a/ext/standard/tests/file/fscanf_variation51.phpt
+++ b/ext/standard/tests/file/fscanf_variation51.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - file opened in write only mode 
+Test fscanf() function: usage variations - file opened in write only mode
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - file opened in write only mode
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): to read from a file opened in write only mode ***\n"; 
+echo "*** Test fscanf(): to read from a file opened in write only mode ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation51.tmp";
@@ -39,7 +39,7 @@ $modes = array("w", "wb", "wt",
 $counter = 1;
 // reading the values from file using different integer formats
 foreach($modes as $mode) {
-  
+
   $file_handle = fopen($filename, $mode);
   if($file_handle == false) {
     exit("Error:failed to open file $filename");
diff --git a/ext/standard/tests/file/fscanf_variation52.phpt b/ext/standard/tests/file/fscanf_variation52.phpt
index bf82ab8e43c..974ddef8f1c 100644
--- a/ext/standard/tests/file/fscanf_variation52.phpt
+++ b/ext/standard/tests/file/fscanf_variation52.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - empty file 
+Test fscanf() function: usage variations - empty file
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - empty file
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): to read an empty file ***\n"; 
+echo "*** Test fscanf(): to read an empty file ***\n";
 
 // various formats
 $formats = array( "%d", "%f", "%e", "%u", " %s", "%x", "%o");
@@ -28,7 +28,7 @@ $modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
 $counter = 1;
 // reading the values from file using different integer formats
 foreach($modes as $mode) {
-  
+
   // create an empty file
   $filename = "$file_path/fscanf_variation52.tmp";
   $file_handle = fopen($filename, "w");
diff --git a/ext/standard/tests/file/fscanf_variation53.phpt b/ext/standard/tests/file/fscanf_variation53.phpt
index a553a966934..3cd273488dc 100644
--- a/ext/standard/tests/file/fscanf_variation53.phpt
+++ b/ext/standard/tests/file/fscanf_variation53.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - file pointer pointing to EOF 
+Test fscanf() function: usage variations - file pointer pointing to EOF
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - file pointer pointing to EOF
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): to read a file when file pointer is pointing to EOF ***\n"; 
+echo "*** Test fscanf(): to read a file when file pointer is pointing to EOF ***\n";
 
 // various formats
 $formats = array( "%d", "%f", "%e", "%u", " %s", "%x", "%o");
@@ -28,16 +28,16 @@ $modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
 $counter = 1;
 // reading the values from file using different integer formats
 foreach($modes as $mode) {
-  
+
   // create an empty file
   $filename = "$file_path/fscanf_variation53.tmp";
   $file_handle = fopen($filename, "w");
   if($file_handle == false)
     exit("Error:failed to open file $filename");
- 
+
   //writing data to the file
   @fwrite($file_handle, "Sample text\n");
-  
+
   // writing a blank line
   @fwrite($file_handle, "\n");
 
@@ -50,14 +50,14 @@ foreach($modes as $mode) {
     exit("Error:failed to open file $filename");
   }
   echo "\n-- iteration $counter --\n";
- 
+
   // current location
   var_dump( ftell($file_handle) );
- 
+
   // set the file pointer to eof
   var_dump( fseek($file_handle, 0, SEEK_END) );
-  
-  // current location  
+
+  // current location
   var_dump( ftell($file_handle) );
 
   foreach($formats as $format) {
diff --git a/ext/standard/tests/file/fscanf_variation54.phpt b/ext/standard/tests/file/fscanf_variation54.phpt
index 0937e5b5569..72ba7c84a27 100644
--- a/ext/standard/tests/file/fscanf_variation54.phpt
+++ b/ext/standard/tests/file/fscanf_variation54.phpt
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - objects
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): to read objects from a file ***\n"; 
+echo "*** Test fscanf(): to read objects from a file ***\n";
 
 // declare a class
 class foo
@@ -43,7 +43,7 @@ $formats = array( "%d", "%f", "%e", "%u", " %s", "%x", "%o");
 
 $counter = 1;
 
-// opening file for read  
+// opening file for read
 $file_handle = fopen($filename, "r");
   if($file_handle == false) {
     exit("Error:failed to open file $filename");
diff --git a/ext/standard/tests/file/fscanf_variation55.phpt b/ext/standard/tests/file/fscanf_variation55.phpt
index 1777f797b2c..ec65ec42362 100644
--- a/ext/standard/tests/file/fscanf_variation55.phpt
+++ b/ext/standard/tests/file/fscanf_variation55.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - tracking file pointer while reading 
+Test fscanf() function: usage variations - tracking file pointer while reading
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
@@ -21,7 +21,7 @@ if (PHP_INT_SIZE != 4) {
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): tracking file pointer along with reading data from file ***\n"; 
+echo "*** Test fscanf(): tracking file pointer along with reading data from file ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation55.tmp";
@@ -32,17 +32,17 @@ if($file_handle == false)
 // different valid data
 $valid_data = array(
   12345,            // integer value
-  -12345,           
+  -12345,
   123.45,	    // float value
-  -123.45,	   
+  -123.45,
   0x123B,           // hexadecimal value
   0x12ab,
   0123,             // octal value
-  -0123,            
+  -0123,
   "abcde",          // string
   'abcde',
   10e3,             // exponential value
-  10e-3           
+  10e-3
 );
 // various formats
 $int_formats = array( "%d", "%f", "%s", "%o", "%x", "%u", "%c", "%e");
@@ -72,14 +72,14 @@ foreach($modes as $mode) {
   // reading different data from file using different formats
   foreach($int_formats as $int_format) {
     // current file pointer position
-    var_dump( ftell($file_handle) ); 
+    var_dump( ftell($file_handle) );
     // rewind the file so that for every foreach iteration the file pointer starts from bof
     rewind($file_handle);
     // current file pointer position after rewind operation
-    var_dump( ftell($file_handle) ); 
+    var_dump( ftell($file_handle) );
     echo "\n-- iteration $counter --\n";
     while( !feof($file_handle) ) {
-      var_dump( ftell($file_handle) ); 
+      var_dump( ftell($file_handle) );
       var_dump( fscanf($file_handle,$int_format) );
     }
     $counter++;
diff --git a/ext/standard/tests/file/fscanf_variation6.phpt b/ext/standard/tests/file/fscanf_variation6.phpt
index 74446f0851d..0a6c908b2d1 100644
--- a/ext/standard/tests/file/fscanf_variation6.phpt
+++ b/ext/standard/tests/file/fscanf_variation6.phpt
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with strings
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different integer format types with strings ***\n"; 
+echo "*** Test fscanf(): different integer format types with strings ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation6.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation7.phpt b/ext/standard/tests/file/fscanf_variation7.phpt
index 33354e7faa4..64661938207 100644
--- a/ext/standard/tests/file/fscanf_variation7.phpt
+++ b/ext/standard/tests/file/fscanf_variation7.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - integer formats with boolean 
+Test fscanf() function: usage variations - integer formats with boolean
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - integer formats with boolean
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different integer format types with boolean data ***\n"; 
+echo "*** Test fscanf(): different integer format types with boolean data ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation7.tmp";
diff --git a/ext/standard/tests/file/fscanf_variation8.phpt b/ext/standard/tests/file/fscanf_variation8.phpt
index b1f5f4e554e..25958dc70d8 100644
--- a/ext/standard/tests/file/fscanf_variation8.phpt
+++ b/ext/standard/tests/file/fscanf_variation8.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fscanf() function: usage variations - float formats with float values 
+Test fscanf() function: usage variations - float formats with float values
 --FILE--
 <?php
 
@@ -12,7 +12,7 @@ Test fscanf() function: usage variations - float formats with float values
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different float format types with different float values ***\n"; 
+echo "*** Test fscanf(): different float format types with different float values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation8.tmp";
@@ -55,7 +55,7 @@ $valid_floats = array(
 );
 
 // various float formats
-$float_formats = array( "%f", 
+$float_formats = array( "%f",
                         "%hf", "%lf", "%Lf",
                         " %f", "%f ", "% f",
                         "\t%f", "\n%f", "%4f",
diff --git a/ext/standard/tests/file/fscanf_variation9.phpt b/ext/standard/tests/file/fscanf_variation9.phpt
index e4cc6fa3b31..331d8f9c2ff 100644
--- a/ext/standard/tests/file/fscanf_variation9.phpt
+++ b/ext/standard/tests/file/fscanf_variation9.phpt
@@ -18,7 +18,7 @@ if (PHP_INT_SIZE != 4) {
 
 $file_path = dirname(__FILE__);
 
-echo "*** Test fscanf(): different float format types with integer values ***\n"; 
+echo "*** Test fscanf(): different float format types with integer values ***\n";
 
 // create a file
 $filename = "$file_path/fscanf_variation9.tmp";
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt
index a9a54aba144..7167504ce8e 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt
@@ -42,7 +42,7 @@ foreach($file_content_types as $file_content_type){
     // set the file pointer to 0
     var_dump( rewind($file_handle) ); // Confirm file pointer moves correctly
     var_dump( ftell($file_handle) ); // confirm the file pointer position
- 
+
     foreach($whence_set as $whence){
       echo "-- Testing fseek() with whence = $whence_string[$whence] --\n";
       var_dump( fseek($file_handle,10,$whence) ); //expecting int(0)
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt
index 1bd95c3450f..e1ceb79c942 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt
@@ -24,7 +24,7 @@ include ("file.inc");
 /* Testing fseek(),ftell(),rewind() functions on all write and create with write modes */
 
 echo "*** Testing fseek(), ftell(), rewind() : basic operations ***\n";
-$file_modes = array( "w","wb","wt","w+","w+b","w+t", 
+$file_modes = array( "w","wb","wt","w+","w+b","w+t",
                      "x","xb","xt","x+","x+b","x+t");
 
 $file_content_types = array("text_with_new_line","alphanumeric");
@@ -52,7 +52,7 @@ foreach($file_content_types as $file_content_type){
     fwrite($file_handle,$data_to_be_written);
 
     // set file pointer to 0
-    var_dump( rewind($file_handle) ); // set to beginning of file 
+    var_dump( rewind($file_handle) ); // set to beginning of file
     var_dump( ftell($file_handle) );
 
     foreach($whence_set as $whence){
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt
index e25ebe09461..80c465d475b 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt
@@ -24,7 +24,7 @@ include ("file.inc");
 /* Testing fseek(),ftell(),rewind() functions on all write and create with write modes */
 
 echo "*** Testing fseek(), ftell(), rewind() : basic operations ***\n";
-$file_modes = array( "w","wb","wt","w+","w+b","w+t", 
+$file_modes = array( "w","wb","wt","w+","w+b","w+t",
                      "x","xb","xt","x+","x+b","x+t");
 
 $file_content_types = array("text_with_new_line","alphanumeric");
@@ -52,7 +52,7 @@ foreach($file_content_types as $file_content_type){
     fwrite($file_handle,$data_to_be_written);
 
     // set file pointer to 0
-    var_dump( rewind($file_handle) ); // set to beginning of file 
+    var_dump( rewind($file_handle) ); // set to beginning of file
     var_dump( ftell($file_handle) );
 
     foreach($whence_set as $whence){
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt
index ede0c432455..d3f2f44447a 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt
@@ -23,7 +23,7 @@ include ("file.inc");
 /* Testing fseek(),ftell(),rewind() functions on all write and create with write modes */
 
 echo "*** Testing fseek(), ftell(), rewind() : basic operations ***\n";
-$file_modes = array( "w","wb","wt","w+","w+b","w+t", 
+$file_modes = array( "w","wb","wt","w+","w+b","w+t",
                      "x","xb","xt","x+","x+b","x+t");
 
 $file_content_types = array("text_with_new_line","alphanumeric");
@@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){
     fwrite($file_handle,$data_to_be_written);
 
     // set file pointer to 0
-    var_dump( rewind($file_handle) ); // set to beginning of file 
+    var_dump( rewind($file_handle) ); // set to beginning of file
     var_dump( ftell($file_handle) );
 
     foreach($whence_set as $whence){
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
index 9a3a2d51542..0d91f80c83f 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fseek(), ftell() & rewind() functions : error conditions - fseek() 
+Test fseek(), ftell() & rewind() functions : error conditions - fseek()
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt
index 7f6b2b4a8ba..cffc6293bb9 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt
@@ -15,9 +15,9 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r & a modes,
 // include the file.inc for common functions for test
 include ("file.inc");
 
-/* Testing fseek(),ftell(),rewind() functions 
+/* Testing fseek(),ftell(),rewind() functions
      1. All read and append modes
-     2. Testing fseek() without using argument whence 
+     2. Testing fseek() without using argument whence
 */
 echo "*** Testing fseek(), ftell(), rewind() : default whence & all r and a modes ***\n";
 $file_modes = array( "r","rb","rt","r+","r+b","r+t",
@@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type){
     }
     echo "-- Testing fseek() without using argument whence --\n";
     foreach($offset as $count){
-      var_dump( fseek($file_handle, $count) ); 
+      var_dump( fseek($file_handle, $count) );
       var_dump( ftell($file_handle) ); // confirm the file pointer position
       var_dump( feof($file_handle) ); //ensure that file pointer is not at end
     } //end of offset loop
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt
index cb51150dcf0..92d18cfc9f4 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt
@@ -20,13 +20,13 @@ if( substr(PHP_OS, 0, 3) != "WIN" )
 // include the file.inc for common functions for test
 include ("file.inc");
 
-/* Testing fseek(),ftell(),rewind() functions 
+/* Testing fseek(),ftell(),rewind() functions
      1. All  write and create with write modes
-     2. Testing fseek() without using argument whence 
+     2. Testing fseek() without using argument whence
 */
 
 echo "*** Testing fseek(), ftell(), rewind() : default whence & all w and x modes ***\n";
-$file_modes = array( "w","wb","wt","w+","w+b","w+t", 
+$file_modes = array( "w","wb","wt","w+","w+b","w+t",
                      "x","xb","xt","x+","x+b","x+t");
 $file_content_types = array( "text_with_new_line","alphanumeric");
 
@@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type){
 
     echo "-- Testing fseek() without using argument whence --\n";
     foreach($offset as $count){
-      var_dump( fseek($file_handle,$count) ); 
+      var_dump( fseek($file_handle,$count) );
       var_dump( ftell($file_handle) ); // confirm the file pointer position
       var_dump( feof($file_handle) ); //ensure that file pointer is not at end
     } //end of offset loop
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt
index c2179fcaee6..7796200877d 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt
@@ -20,13 +20,13 @@ if( substr(PHP_OS, 0, 3) == "WIN" )
 // include the file.inc for common functions for test
 include ("file.inc");
 
-/* Testing fseek(),ftell(),rewind() functions 
+/* Testing fseek(),ftell(),rewind() functions
      1. All  write and create with write modes
-     2. Testing fseek() without using argument whence 
+     2. Testing fseek() without using argument whence
 */
 
 echo "*** Testing fseek(), ftell(), rewind() : default whence & all w and x modes ***\n";
-$file_modes = array( "w","wb","wt","w+","w+b","w+t", 
+$file_modes = array( "w","wb","wt","w+","w+b","w+t",
                      "x","xb","xt","x+","x+b","x+t");
 $file_content_types = array( "text_with_new_line","alphanumeric");
 
@@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type){
 
     echo "-- Testing fseek() without using argument whence --\n";
     foreach($offset as $count){
-      var_dump( fseek($file_handle,$count) ); 
+      var_dump( fseek($file_handle,$count) );
       var_dump( ftell($file_handle) ); // confirm the file pointer position
       var_dump( feof($file_handle) ); //ensure that file pointer is not at end
     } //end of offset loop
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt
index 4b84d409f2c..7ba6a5ac992 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt
@@ -15,7 +15,7 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r and a mode
 // include the file.inc for common functions for test
 include ("file.inc");
 
-/* Testing fseek(),ftell(),rewind() functions 
+/* Testing fseek(),ftell(),rewind() functions
      1. All read and append modes
      2. Testing fseek() with whence = SEEK_SET
 */
@@ -45,7 +45,7 @@ foreach($file_content_types as $file_content_type){
       exit();
     }
     foreach($offset as $count){
-      var_dump( fseek($file_handle,$count,SEEK_SET) ); 
+      var_dump( fseek($file_handle,$count,SEEK_SET) );
       var_dump( ftell($file_handle) ); // confirm the file pointer position
       var_dump( feof($file_handle) ); //ensure that file pointer is not at end
     } //end of offset loop
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt
index 1bb55b53b3a..38844d37348 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt
@@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) != "WIN" )
 // include the file.inc for common functions for test
 include ("file.inc");
 
-/* Testing fseek(),ftell(),rewind() functions 
+/* Testing fseek(),ftell(),rewind() functions
      1. All  write and create with write modes
-     2. Testing fseek() with whence = SEEK_SET 
+     2. Testing fseek() with whence = SEEK_SET
 */
 echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all w and x modes ***\n";
 $file_modes = array( "w","wb","wt","w+","w+b","w+t",
@@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){
     rewind($file_handle);
 
     foreach($offset as $count){
-      var_dump( fseek($file_handle,$count,SEEK_SET) ); 
+      var_dump( fseek($file_handle,$count,SEEK_SET) );
       var_dump( ftell($file_handle) ); // confirm the file pointer position
       var_dump( feof($file_handle) ); //ensure that file pointer is not at end
     } //end of offset loop
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt
index 3c84f3eb7c6..5751b2b36a0 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt
@@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) == "WIN" )
 // include the file.inc for common functions for test
 include ("file.inc");
 
-/* Testing fseek(),ftell(),rewind() functions 
+/* Testing fseek(),ftell(),rewind() functions
      1. All  write and create with write modes
-     2. Testing fseek() with whence = SEEK_SET 
+     2. Testing fseek() with whence = SEEK_SET
 */
 echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all w and x modes ***\n";
 $file_modes = array( "w","wb","wt","w+","w+b","w+t",
@@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){
     rewind($file_handle);
 
     foreach($offset as $count){
-      var_dump( fseek($file_handle,$count,SEEK_SET) ); 
+      var_dump( fseek($file_handle,$count,SEEK_SET) );
       var_dump( ftell($file_handle) ); // confirm the file pointer position
       var_dump( feof($file_handle) ); //ensure that file pointer is not at end
     } //end of offset loop
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt
index 75f281291dd..3f12211b1f1 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt
@@ -15,7 +15,7 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r & a modes,
 // include the file.inc for common functions for test
 include ("file.inc");
 
-/* Testing fseek(),ftell(),rewind() functions 
+/* Testing fseek(),ftell(),rewind() functions
      1. All read and append modes
      2. Testing fseek() with whence = SEEK_CUR
 */
@@ -32,7 +32,7 @@ $filename = dirname(__FILE__)."/fseek_ftell_rewind_variation5.tmp"; // this is n
 /* open the file using $files_modes and perform fseek(),ftell() and rewind() on it */
 foreach($file_content_types as $file_content_type){
   echo "-- File having data of type ". $file_content_type ." --\n";
- 
+
   foreach($file_modes as $file_mode) {
     echo "-- File opened in mode ".$file_mode." --\n";
     create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 512, "w", "fseek_ftell_rewind_variation"
@@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type){
     }
     rewind($file_handle);
     foreach($offset as $count){
-      var_dump( fseek($file_handle,$count,SEEK_CUR) ); 
+      var_dump( fseek($file_handle,$count,SEEK_CUR) );
       var_dump( ftell($file_handle) ); // confirm the file pointer position
       var_dump( feof($file_handle) ); //ensure that file pointer is not at end
     } //end of offset loop
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt
index 8c84e7e386b..f7850c1cf32 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt
@@ -20,7 +20,7 @@ if( substr(PHP_OS, 0, 3) != "WIN" )
 // include the file.inc for common functions for test
 include ("file.inc");
 
-/* Testing fseek(),ftell(),rewind() functions 
+/* Testing fseek(),ftell(),rewind() functions
      1. All  write and create with write modes
      2. Testing fseek() with whence = SEEK_CUR
 */
@@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){
     rewind($file_handle);
 
     foreach($offset as $count){
-      var_dump( fseek($file_handle,$count,SEEK_CUR) ); 
+      var_dump( fseek($file_handle,$count,SEEK_CUR) );
       var_dump( ftell($file_handle) ); // confirm the file pointer position
       var_dump( feof($file_handle) ); //ensure that file pointer is not at end
     } //end of offset loop
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt
index 4de9b3f6888..4fdbd51aa53 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt
@@ -20,7 +20,7 @@ if( substr(PHP_OS, 0, 3) == "WIN" )
 // include the file.inc for common functions for test
 include ("file.inc");
 
-/* Testing fseek(),ftell(),rewind() functions 
+/* Testing fseek(),ftell(),rewind() functions
      1. All  write and create with write modes
      2. Testing fseek() with whence = SEEK_CUR
 */
@@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){
     rewind($file_handle);
 
     foreach($offset as $count){
-      var_dump( fseek($file_handle,$count,SEEK_CUR) ); 
+      var_dump( fseek($file_handle,$count,SEEK_CUR) );
       var_dump( ftell($file_handle) ); // confirm the file pointer position
       var_dump( feof($file_handle) ); //ensure that file pointer is not at end
     } //end of offset loop
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt
index f0e8e4619f7..646b8b659af 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt
@@ -15,7 +15,7 @@ Test fseek(), ftell() & rewind() functions : usage variations - all r and a mode
 // include the file.inc for common functions for test
 include ("file.inc");
 
-/* Testing fseek(),ftell(),rewind() functions 
+/* Testing fseek(),ftell(),rewind() functions
      1. All read and append modes
      2. Testing fseek() with whence = SEEK_END
 */
@@ -44,11 +44,11 @@ foreach($file_content_types as $file_content_type){
     }
     rewind($file_handle);
     foreach($offset as $count){
-      var_dump( fseek($file_handle,$count,SEEK_END) ); 
+      var_dump( fseek($file_handle,$count,SEEK_END) );
       var_dump( ftell($file_handle) ); // confirm the file pointer position
       var_dump( feof($file_handle) ); //ensure that file pointer is not at end
     } //end of offset loop
-    
+
     //close the file and check the size, the size will have increased
     // by 10 bytes because of holes
     fclose($file_handle);
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt
index c6ba6c430f2..6065abdc51e 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt
@@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) != "WIN" )
 // include the file.inc for common functions for test
 include ("file.inc");
 
-/* Testing fseek(),ftell(),rewind() functions 
+/* Testing fseek(),ftell(),rewind() functions
      1. All  write and create with write modes
-     2. Testing fseek() with whence = SEEK_END 
+     2. Testing fseek() with whence = SEEK_END
 */
 echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes ***\n";
 
@@ -52,11 +52,11 @@ foreach($file_content_types as $file_content_type){
     rewind($file_handle);
 
     foreach($offset as $count){
-      var_dump( fseek($file_handle,$count,SEEK_END) ); 
+      var_dump( fseek($file_handle,$count,SEEK_END) );
       var_dump( ftell($file_handle) ); // confirm the file pointer position
       var_dump( feof($file_handle) ); //ensure that file pointer is not at end
     } //end of offset loop
-    
+
     //close the file and check the size
     fclose($file_handle);
     var_dump( filesize($filename) );
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt
index b4a0fa97f35..42ca9d41efa 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt
@@ -20,9 +20,9 @@ if( substr(PHP_OS, 0, 3) == "WIN" )
 // include the file.inc for common functions for test
 include ("file.inc");
 
-/* Testing fseek(),ftell(),rewind() functions 
+/* Testing fseek(),ftell(),rewind() functions
      1. All  write and create with write modes
-     2. Testing fseek() with whence = SEEK_END 
+     2. Testing fseek() with whence = SEEK_END
 */
 echo "*** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes ***\n";
 
@@ -52,11 +52,11 @@ foreach($file_content_types as $file_content_type){
     rewind($file_handle);
 
     foreach($offset as $count){
-      var_dump( fseek($file_handle,$count,SEEK_END) ); 
+      var_dump( fseek($file_handle,$count,SEEK_END) );
       var_dump( ftell($file_handle) ); // confirm the file pointer position
       var_dump( feof($file_handle) ); //ensure that file pointer is not at end
     } //end of offset loop
-    
+
     //close the file and check the size
     fclose($file_handle);
     var_dump( filesize($filename) );
diff --git a/ext/standard/tests/file/fseek_variation1.phpt b/ext/standard/tests/file/fseek_variation1.phpt
index 914c6d0e42a..ec698a41080 100644
--- a/ext/standard/tests/file/fseek_variation1.phpt
+++ b/ext/standard/tests/file/fseek_variation1.phpt
@@ -5,7 +5,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : proto int fseek(resource fp, int offset [, int whence])
- * Description: Seek on a file pointer 
+ * Description: Seek on a file pointer
  * Source code: ext/standard/file.c
  * Alias to functions: gzseek
  */
@@ -62,9 +62,9 @@ $values = array(
       // string data
       "string",
       'string',
-      
+
       // object data
-      new testClass(),      
+      new testClass(),
 
       // undefined data
       $undefined_var,
diff --git a/ext/standard/tests/file/fseek_variation2.phpt b/ext/standard/tests/file/fseek_variation2.phpt
index cb88c03525b..3a5cd9db7cd 100644
--- a/ext/standard/tests/file/fseek_variation2.phpt
+++ b/ext/standard/tests/file/fseek_variation2.phpt
@@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : proto int fseek(resource fp, int offset [, int whence])
- * Description: Seek on a file pointer 
+ * Description: Seek on a file pointer
  * Source code: ext/standard/file.c
  * Alias to functions: gzseek
  */
diff --git a/ext/standard/tests/file/fseek_variation3.phpt b/ext/standard/tests/file/fseek_variation3.phpt
index edb0b3a3b07..20507539861 100644
--- a/ext/standard/tests/file/fseek_variation3.phpt
+++ b/ext/standard/tests/file/fseek_variation3.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test fseek() function : variation functionality beyond file boundaries 
+Test fseek() function : variation functionality beyond file boundaries
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : proto int fseek(resource fp, int offset [, int whence])
- * Description: Seek on a file pointer 
+ * Description: Seek on a file pointer
  * Source code: ext/standard/file.c
  * Alias to functions: gzseek
  */
diff --git a/ext/standard/tests/file/fstat.phpt b/ext/standard/tests/file/fstat.phpt
index 96924af0777..94ba9c5abf8 100644
--- a/ext/standard/tests/file/fstat.phpt
+++ b/ext/standard/tests/file/fstat.phpt
@@ -13,7 +13,7 @@ var_dump(fstat($fp));
 @unlink($filename);
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(26) {
   [0]=>
   int(%i)
diff --git a/ext/standard/tests/file/fstat_error.phpt b/ext/standard/tests/file/fstat_error.phpt
index d75ddb9a76b..c3c15295ddb 100644
--- a/ext/standard/tests/file/fstat_error.phpt
+++ b/ext/standard/tests/file/fstat_error.phpt
@@ -3,7 +3,7 @@ Test function fstat() by calling it more than or less than its expected argument
 --FILE--
 <?php
 $fp = fopen (__FILE__, 'r');
-$extra_arg = 'nothing'; 
+$extra_arg = 'nothing';
 
 var_dump(fstat( $fp, $extra_arg ) );
 var_dump(fstat());
diff --git a/ext/standard/tests/file/ftruncate.phpt b/ext/standard/tests/file/ftruncate.phpt
index acc4e8afa30..67b070c8363 100644
Binary files a/ext/standard/tests/file/ftruncate.phpt and b/ext/standard/tests/file/ftruncate.phpt differ
diff --git a/ext/standard/tests/file/ftruncate_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt
index 3ccd32a2d40..112a1ce6e88 100644
--- a/ext/standard/tests/file/ftruncate_error.phpt
+++ b/ext/standard/tests/file/ftruncate_error.phpt
@@ -17,18 +17,18 @@ echo "\n Initial file size = ".filesize($filename)."\n";
 
 echo "-- Testing ftruncate() with less than expected number of arguments --\n";
 
-// zero arguments 
+// zero arguments
 var_dump( ftruncate() );
 
 // arguments less than expected numbers
 var_dump( ftruncate( $file_handle ) );
-// check the first size 
+// check the first size
 var_dump( filesize($filename) );
 
 echo "-- Testing ftruncate() with more than expected number of arguments --\n";
-// more than expected number of arguments 
+// more than expected number of arguments
 var_dump( ftruncate($file_handle, 10, 20) );
-// check the first size 
+// check the first size
 var_dump( filesize($filename) );
 
 // test invalid arguments : non-resources
@@ -53,18 +53,18 @@ echo "-- Testing ftruncate() with closed/unset file handle --\n";
 // ftruncate on close file handle
 fclose($file_handle);
 var_dump( ftruncate($file_handle,10) );
-// check the first size 
+// check the first size
 var_dump( filesize($filename) );
 
 // ftruncate on a file handle which is unset
 $fp = fopen($filename, "w");
 unset($fp); //unset file handle
 var_dump( ftruncate(@$fp,10));
-// check the first size 
+// check the first size
 var_dump( filesize($filename) );
 
 echo "Done\n";
-?> 
+?>
 --CLEAN--
 <?php
 $filename = dirname(__FILE__)."/ftruncate_error.tmp";
diff --git a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt
index 36994cb182d..6e7d0d7e60f 100644
--- a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt
+++ b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt
@@ -19,7 +19,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
@@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) {
    clearstatcache(); // clear previous size value in cache
    var_dump( filesize($filename) ); // check the file size, should be 0
 
-   //delete all files created 
+   //delete all files created
    delete_file($filename);
  } //end of inner for loop
 }//end of outer foreach loop
diff --git a/ext/standard/tests/file/ftruncate_variation1-win32.phpt b/ext/standard/tests/file/ftruncate_variation1-win32.phpt
index dbf1896d270..7b99f4b2524 100644
--- a/ext/standard/tests/file/ftruncate_variation1-win32.phpt
+++ b/ext/standard/tests/file/ftruncate_variation1-win32.phpt
@@ -19,7 +19,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
@@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) {
    clearstatcache(); // clear previous size value in cache
    var_dump( filesize($filename) ); // check the file size, should be 0
 
-   //delete all files created 
+   //delete all files created
    delete_file($filename);
  } //end of inner for loop
 }//end of outer foreach loop
diff --git a/ext/standard/tests/file/ftruncate_variation1.phpt b/ext/standard/tests/file/ftruncate_variation1.phpt
index cf51e2092c5..ddcbd92534e 100644
--- a/ext/standard/tests/file/ftruncate_variation1.phpt
+++ b/ext/standard/tests/file/ftruncate_variation1.phpt
@@ -19,7 +19,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
@@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) {
    clearstatcache(); // clear previous size value in cache
    var_dump( filesize($filename) ); // check the file size, should be 0
 
-   //delete all files created 
+   //delete all files created
    delete_file($filename);
  } //end of inner for loop
 }//end of outer foreach loop
diff --git a/ext/standard/tests/file/ftruncate_variation2-win32.phpt b/ext/standard/tests/file/ftruncate_variation2-win32.phpt
index 7b2e0b42ee3..65a0b85b400 100644
--- a/ext/standard/tests/file/ftruncate_variation2-win32.phpt
+++ b/ext/standard/tests/file/ftruncate_variation2-win32.phpt
@@ -19,7 +19,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) {
 
  for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
    echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n";
-   
+
    // create 1 file with some contents
    $filename = dirname(__FILE__)."/ftruncate_variation2.tmp";
    if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) {
@@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
diff --git a/ext/standard/tests/file/ftruncate_variation2.phpt b/ext/standard/tests/file/ftruncate_variation2.phpt
index e01a167a380..821ed151bd5 100644
--- a/ext/standard/tests/file/ftruncate_variation2.phpt
+++ b/ext/standard/tests/file/ftruncate_variation2.phpt
@@ -19,7 +19,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) {
 
  for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
    echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n";
-   
+
    // create 1 file with some contents
    $filename = dirname(__FILE__)."/ftruncate_variation2.tmp";
    if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) {
@@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
diff --git a/ext/standard/tests/file/ftruncate_variation3-win32.phpt b/ext/standard/tests/file/ftruncate_variation3-win32.phpt
index d9aa40e6e76..885a8b35a58 100644
--- a/ext/standard/tests/file/ftruncate_variation3-win32.phpt
+++ b/ext/standard/tests/file/ftruncate_variation3-win32.phpt
@@ -19,7 +19,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
    rewind($file_handle); // file pointer to 0
 
    echo "-- Testing ftruncate(): truncate file to half of its current size --\n";
-   /* truncate it to half of its current size */ 
+   /* truncate it to half of its current size */
    $new_size = filesize($filename)/2;
    var_dump( filesize($filename) );  // current filesize
    var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/ftruncate_variation3.phpt b/ext/standard/tests/file/ftruncate_variation3.phpt
index cdbeb8e57f9..219fba16c56 100644
--- a/ext/standard/tests/file/ftruncate_variation3.phpt
+++ b/ext/standard/tests/file/ftruncate_variation3.phpt
@@ -19,7 +19,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
    rewind($file_handle); // file pointer to 0
 
    echo "-- Testing ftruncate(): truncate file to half of its current size --\n";
-   /* truncate it to half of its current size */ 
+   /* truncate it to half of its current size */
    $new_size = filesize($filename)/2;
    var_dump( filesize($filename) );  // current filesize
    var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/ftruncate_variation4-win32.phpt b/ext/standard/tests/file/ftruncate_variation4-win32.phpt
index 5bf5f679b6f..18d5138baf7 100644
--- a/ext/standard/tests/file/ftruncate_variation4-win32.phpt
+++ b/ext/standard/tests/file/ftruncate_variation4-win32.phpt
@@ -19,7 +19,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
@@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type) {
    echo "-- Testing ftruncate(): try truncating file to a negative size --\n";
    /* try to truncate it to a negative size, size should not change*/
 
-   $new_size = -1000; 
+   $new_size = -1000;
    var_dump( filesize($filename) );  // current filesize
    var_dump( ftell($file_handle) );
    var_dump( ftruncate($file_handle, $new_size) ); // truncate it
diff --git a/ext/standard/tests/file/ftruncate_variation4.phpt b/ext/standard/tests/file/ftruncate_variation4.phpt
index ef0ee219962..077b46fd051 100644
--- a/ext/standard/tests/file/ftruncate_variation4.phpt
+++ b/ext/standard/tests/file/ftruncate_variation4.phpt
@@ -19,7 +19,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
@@ -53,7 +53,7 @@ foreach($file_content_types as $file_content_type) {
    echo "-- Testing ftruncate(): try truncating file to a negative size --\n";
    /* try to truncate it to a negative size, size should not change*/
 
-   $new_size = -1000; 
+   $new_size = -1000;
    var_dump( filesize($filename) );  // current filesize
    var_dump( ftell($file_handle) );
    var_dump( ftruncate($file_handle, $new_size) ); // truncate it
diff --git a/ext/standard/tests/file/ftruncate_variation5-win32.phpt b/ext/standard/tests/file/ftruncate_variation5-win32.phpt
index eb45ffcdacb..4415cf54e84 100644
--- a/ext/standard/tests/file/ftruncate_variation5-win32.phpt
+++ b/ext/standard/tests/file/ftruncate_variation5-win32.phpt
@@ -19,7 +19,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) {
 
  for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
    echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n";
-  
+
    // create 1 file with some contents
    $filename = dirname(__FILE__)."/ftruncate_variation5.tmp";
    if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) {
@@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
@@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) {
    fclose($file_handle);
    clearstatcache(); // clear previous size value in cache
    var_dump( filesize($filename) ); // new file size = actual size, no change
- 
+
    //delete all files created
    delete_file($filename);
  }//end of inner for loop
diff --git a/ext/standard/tests/file/ftruncate_variation5.phpt b/ext/standard/tests/file/ftruncate_variation5.phpt
index 5d282d13de2..11083df58b6 100644
--- a/ext/standard/tests/file/ftruncate_variation5.phpt
+++ b/ext/standard/tests/file/ftruncate_variation5.phpt
@@ -19,7 +19,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -31,7 +31,7 @@ foreach($file_content_types as $file_content_type) {
 
  for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
    echo "-- Testing ftruncate() with file opening using $file_modes[$mode_counter] mode --\n";
-  
+
    // create 1 file with some contents
    $filename = dirname(__FILE__)."/ftruncate_variation5.tmp";
    if( strstr($file_modes[$mode_counter], "x") || strstr($file_modes[$mode_counter], "w") ) {
@@ -44,7 +44,7 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
@@ -62,7 +62,7 @@ foreach($file_content_types as $file_content_type) {
    fclose($file_handle);
    clearstatcache(); // clear previous size value in cache
    var_dump( filesize($filename) ); // new file size = actual size, no change
- 
+
    //delete all files created
    delete_file($filename);
  }//end of inner for loop
diff --git a/ext/standard/tests/file/ftruncate_variation6-win32.phpt b/ext/standard/tests/file/ftruncate_variation6-win32.phpt
index 0815092e2b0..d231ed18a49 100644
--- a/ext/standard/tests/file/ftruncate_variation6-win32.phpt
+++ b/ext/standard/tests/file/ftruncate_variation6-win32.phpt
@@ -21,7 +21,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -46,15 +46,15 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
    rewind($file_handle); // file pointer to 0
- 
+
    echo "-- Testing ftruncate(): truncate to smaller size and display the file content --\n";
    /* try to truncate it and display the file content */
-  
+
    $new_size = 15;
    var_dump( filesize($filename) );  // current filesize
    var_dump( ftell($file_handle) );
@@ -66,8 +66,8 @@ foreach($file_content_types as $file_content_type) {
    var_dump( feof($file_handle) );
    fclose($file_handle);
    clearstatcache(); // clear previous size value in cache
-   var_dump( filesize($filename) ); 
-    
+   var_dump( filesize($filename) );
+
    //delete all files created
    delete_file( $filename );
  }//end of inner for loop
diff --git a/ext/standard/tests/file/ftruncate_variation6.phpt b/ext/standard/tests/file/ftruncate_variation6.phpt
index e9d5eb3c941..9f72333b3a7 100644
--- a/ext/standard/tests/file/ftruncate_variation6.phpt
+++ b/ext/standard/tests/file/ftruncate_variation6.phpt
@@ -21,7 +21,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -46,15 +46,15 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
    rewind($file_handle); // file pointer to 0
- 
+
    echo "-- Testing ftruncate(): truncate to smaller size and display the file content --\n";
    /* try to truncate it and display the file content */
-  
+
    $new_size = 15;
    var_dump( filesize($filename) );  // current filesize
    var_dump( ftell($file_handle) );
@@ -66,8 +66,8 @@ foreach($file_content_types as $file_content_type) {
    var_dump( feof($file_handle) );
    fclose($file_handle);
    clearstatcache(); // clear previous size value in cache
-   var_dump( filesize($filename) ); 
-    
+   var_dump( filesize($filename) );
+
    //delete all files created
    delete_file( $filename );
  }//end of inner for loop
diff --git a/ext/standard/tests/file/ftruncate_variation7-win32.phpt b/ext/standard/tests/file/ftruncate_variation7-win32.phpt
index dc3a4cc10bd..84e13a9b97e 100644
--- a/ext/standard/tests/file/ftruncate_variation7-win32.phpt
+++ b/ext/standard/tests/file/ftruncate_variation7-win32.phpt
@@ -20,7 +20,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -45,15 +45,15 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
-   rewind($file_handle); // file pointer to 0 
- 
+   rewind($file_handle); // file pointer to 0
+
    echo "-- Testing ftruncate(): File pointer at the end --\n";
    /* try to truncate it to while file pointer at the end */
-   fseek($file_handle, 0, SEEK_END);  
+   fseek($file_handle, 0, SEEK_END);
    $new_size = 200;
    var_dump( filesize($filename) );  // current filesize
    var_dump( ftell($file_handle) );
@@ -62,8 +62,8 @@ foreach($file_content_types as $file_content_type) {
    var_dump( feof($file_handle) );
    fclose($file_handle);
    clearstatcache(); // clear previous size value in cache
-   var_dump( filesize($filename) ); 
- 
+   var_dump( filesize($filename) );
+
    //delete all files created
    delete_file($filename);
  }//end of inner for loop
diff --git a/ext/standard/tests/file/ftruncate_variation7.phpt b/ext/standard/tests/file/ftruncate_variation7.phpt
index 5b38adf8bfb..90181723a52 100644
--- a/ext/standard/tests/file/ftruncate_variation7.phpt
+++ b/ext/standard/tests/file/ftruncate_variation7.phpt
@@ -20,7 +20,7 @@ include ("file.inc");
 echo "*** Testing ftruncate() : usage variations ***\n";
 
 /* test ftruncate with file opened in different modes */
-$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t", 
+$file_modes = array("r", "rb", "rt", "r+", "r+b", "r+t",
                     "w", "wb", "wt", "w+", "w+b", "w+t",
                     "x", "xb", "xt", "x+", "x+b", "x+t",
                     "a", "ab", "at", "a+", "a+b", "a+t");
@@ -45,15 +45,15 @@ foreach($file_content_types as $file_content_type) {
      $file_handle = fopen($filename, $file_modes[$mode_counter]);
    }
    if (!$file_handle) {
-     echo "Error: failed to open file $filename!\n"; 
+     echo "Error: failed to open file $filename!\n";
      exit();
    }
 
-   rewind($file_handle); // file pointer to 0 
- 
+   rewind($file_handle); // file pointer to 0
+
    echo "-- Testing ftruncate(): File pointer at the end --\n";
    /* try to truncate it to while file pointer at the end */
-   fseek($file_handle, 0, SEEK_END);  
+   fseek($file_handle, 0, SEEK_END);
    $new_size = 200;
    var_dump( filesize($filename) );  // current filesize
    var_dump( ftell($file_handle) );
@@ -62,8 +62,8 @@ foreach($file_content_types as $file_content_type) {
    var_dump( feof($file_handle) );
    fclose($file_handle);
    clearstatcache(); // clear previous size value in cache
-   var_dump( filesize($filename) ); 
- 
+   var_dump( filesize($filename) );
+
    //delete all files created
    delete_file($filename);
  }//end of inner for loop
diff --git a/ext/standard/tests/file/fwrite.phpt b/ext/standard/tests/file/fwrite.phpt
index 7f12ebb1ee9..443710b99d0 100644
--- a/ext/standard/tests/file/fwrite.phpt
+++ b/ext/standard/tests/file/fwrite.phpt
@@ -29,7 +29,7 @@ var_dump(file_get_contents($filename));
 @unlink($filename);
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: fwrite() expects at least 2 parameters, 1 given in %s on line %d
 bool(false)
 
diff --git a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt
index a65d81efb84..e3bb39a62bf 100644
--- a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt
+++ b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt
@@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) {
   echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n";
   $filename = dirname(__FILE__)."/fwrite_basic-win32��ガラスを食�られ��.tmp"; // this is name of the file
 
-  for($inner_loop_counter = 0; 
-      $inner_loop_counter < count($file_modes); 
+  for($inner_loop_counter = 0;
+      $inner_loop_counter < count($file_modes);
       $inner_loop_counter++) {
      echo "--  File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n";
      /* open the file using $files_modes and perform fwrite() on it */
@@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) {
      $data_to_be_written="";
      fill_buffer($data_to_be_written, $file_content_type, 1024);  //get the data of size 1024
 
-    /* Write the data in to the file, verify the write by checking file pointer position, 
+    /* Write the data in to the file, verify the write by checking file pointer position,
        eof position, and data. */
     // writing 100 bytes
     var_dump( ftell($file_handle) );  // Expecting 0
     var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100)
     var_dump( feof($file_handle) );  // expected : false
     var_dump( ftell($file_handle) );  //expected: 100
-   
+
     // trying to write more than the available data, available 1024 bytes but trying 2048
     var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024)
     var_dump( feof($file_handle) );  // expected : false
@@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) {
     var_dump( fclose($file_handle) ); //expected : true
     clearstatcache();//clears file status cache
     var_dump( filesize($filename) );  // expected:  2148
-    var_dump(md5(file_get_contents($filename))); // hash the output 
+    var_dump(md5(file_get_contents($filename))); // hash the output
 
   } // end of inner for loop
 
diff --git a/ext/standard/tests/file/fwrite_basic-win32.phpt b/ext/standard/tests/file/fwrite_basic-win32.phpt
index 81d9360276d..52d3d033c10 100644
--- a/ext/standard/tests/file/fwrite_basic-win32.phpt
+++ b/ext/standard/tests/file/fwrite_basic-win32.phpt
@@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) {
   echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n";
   $filename = dirname(__FILE__)."/fwrite_basic-win32.tmp"; // this is name of the file
 
-  for($inner_loop_counter = 0; 
-      $inner_loop_counter < count($file_modes); 
+  for($inner_loop_counter = 0;
+      $inner_loop_counter < count($file_modes);
       $inner_loop_counter++) {
      echo "--  File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n";
      /* open the file using $files_modes and perform fwrite() on it */
@@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) {
      $data_to_be_written="";
      fill_buffer($data_to_be_written, $file_content_type, 1024);  //get the data of size 1024
 
-    /* Write the data in to the file, verify the write by checking file pointer position, 
+    /* Write the data in to the file, verify the write by checking file pointer position,
        eof position, and data. */
     // writing 100 bytes
     var_dump( ftell($file_handle) );  // Expecting 0
     var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100)
     var_dump( feof($file_handle) );  // expected : false
     var_dump( ftell($file_handle) );  //expected: 100
-   
+
     // trying to write more than the available data, available 1024 bytes but trying 2048
     var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024)
     var_dump( feof($file_handle) );  // expected : false
@@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) {
     var_dump( fclose($file_handle) ); //expected : true
     clearstatcache();//clears file status cache
     var_dump( filesize($filename) );  // expected:  2148
-    var_dump(md5(file_get_contents($filename))); // hash the output 
+    var_dump(md5(file_get_contents($filename))); // hash the output
 
   } // end of inner for loop
 
diff --git a/ext/standard/tests/file/fwrite_basic.phpt b/ext/standard/tests/file/fwrite_basic.phpt
index c568b7c8748..e11606ade3a 100644
--- a/ext/standard/tests/file/fwrite_basic.phpt
+++ b/ext/standard/tests/file/fwrite_basic.phpt
@@ -31,8 +31,8 @@ foreach($file_content_types as $file_content_type) {
   echo "\n-- Testing fwrite() with file having data of type ". $file_content_type ." --\n";
   $filename = dirname(__FILE__)."/fwrite_basic.tmp"; // this is name of the file
 
-  for($inner_loop_counter = 0; 
-      $inner_loop_counter < count($file_modes); 
+  for($inner_loop_counter = 0;
+      $inner_loop_counter < count($file_modes);
       $inner_loop_counter++) {
      echo "--  File opened in mode : " . $file_modes[$inner_loop_counter]. " --\n";
      /* open the file using $files_modes and perform fwrite() on it */
@@ -44,14 +44,14 @@ foreach($file_content_types as $file_content_type) {
      $data_to_be_written="";
      fill_buffer($data_to_be_written, $file_content_type, 1024);  //get the data of size 1024
 
-    /* Write the data in to the file, verify the write by checking file pointer position, 
+    /* Write the data in to the file, verify the write by checking file pointer position,
        eof position, and data. */
     // writing 100 bytes
     var_dump( ftell($file_handle) );  // Expecting 0
     var_dump( fwrite($file_handle, $data_to_be_written, 100)); //int(100)
     var_dump( feof($file_handle) );  // expected : false
     var_dump( ftell($file_handle) );  //expected: 100
-   
+
     // trying to write more than the available data, available 1024 bytes but trying 2048
     var_dump( fwrite($file_handle, $data_to_be_written, 2048)); //int(1024)
     var_dump( feof($file_handle) );  // expected : false
@@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type) {
     var_dump( fclose($file_handle) ); //expected : true
     clearstatcache();//clears file status cache
     var_dump( filesize($filename) );  // expected:  2148
-    var_dump(md5(file_get_contents($filename))); // hash the output 
+    var_dump(md5(file_get_contents($filename))); // hash the output
 
   } // end of inner for loop
 
diff --git a/ext/standard/tests/file/fwrite_error.phpt b/ext/standard/tests/file/fwrite_error.phpt
index 119302a13a8..6af00e1121c 100644
--- a/ext/standard/tests/file/fwrite_error.phpt
+++ b/ext/standard/tests/file/fwrite_error.phpt
@@ -19,7 +19,7 @@ $filename = dirname(__FILE__)."/fwrite_error.tmp";
 
 echo "-- Testing fwrite() with less than expected number of arguments --\n";
 // zero argument
-var_dump( fwrite() ); 
+var_dump( fwrite() );
 // less than expected, 1 arg
 $file_handle  = fopen ( $filename, "w");
 var_dump( fwrite($file_handle) );
@@ -52,14 +52,14 @@ for($loop_counter = 1; $loop_counter <= count($invalid_args); $loop_counter++) {
   var_dump( fwrite($invalid_args[$loop_counter - 1], 10) );
 }
 
-// fwrite() on a file handle which is already closed 
+// fwrite() on a file handle which is already closed
 echo "-- Testing fwrite() with closed/unset file handle --\n";
 fclose($file_handle);
 var_dump(fwrite($file_handle,"data"));
 
-// fwrite on a file handle which is unset 
+// fwrite on a file handle which is unset
 $fp = fopen($filename, "w");
-unset($fp); //unset file handle 
+unset($fp); //unset file handle
 var_dump( fwrite(@$fp,"data"));
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt
index e43a04dfd67..c109aeef0f2 100644
--- a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt
+++ b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt
@@ -50,7 +50,7 @@ foreach($file_content_types as $file_content_type) {
 
     $data_to_be_written="";
     fill_buffer($data_to_be_written,$file_content_type,1024);  //get the data of size 1024
-    
+
     /*  Write the data into the file, verify it by checking the file pointer position, eof position,
         filesize & by displaying the content */
 
diff --git a/ext/standard/tests/file/fwrite_variation1-win32.phpt b/ext/standard/tests/file/fwrite_variation1-win32.phpt
index 1091aeb60be..38d35e3612e 100644
--- a/ext/standard/tests/file/fwrite_variation1-win32.phpt
+++ b/ext/standard/tests/file/fwrite_variation1-win32.phpt
@@ -50,7 +50,7 @@ foreach($file_content_types as $file_content_type) {
 
     $data_to_be_written="";
     fill_buffer($data_to_be_written,$file_content_type,1024);  //get the data of size 1024
-    
+
     /*  Write the data into the file, verify it by checking the file pointer position, eof position,
         filesize & by displaying the content */
 
diff --git a/ext/standard/tests/file/fwrite_variation1.phpt b/ext/standard/tests/file/fwrite_variation1.phpt
index 44f69392e46..133405a5f1e 100644
--- a/ext/standard/tests/file/fwrite_variation1.phpt
+++ b/ext/standard/tests/file/fwrite_variation1.phpt
@@ -36,7 +36,7 @@ foreach($file_content_types as $file_content_type) {
   /* open the file using $files_modes and perform fwrite() on it */
   foreach($file_modes as $file_mode) {
     echo "-- Opening file in $file_mode --\n";
-    
+
     // create the temp file with content of type $file_content_type
     $filename = dirname(__FILE__)."/fwrite_variation1.tmp"; // this is name of the file
     create_files ( dirname(__FILE__), 1, $file_content_type, 0755, 1, "w", "fwrite_variation");
@@ -50,14 +50,14 @@ foreach($file_content_types as $file_content_type) {
     $data_to_be_written="";
     fill_buffer($data_to_be_written,$file_content_type,1024);  //get the data of size 1024
 
-    /*  Write the data into the file, verify it by checking the file pointer position, eof position, 
+    /*  Write the data into the file, verify it by checking the file pointer position, eof position,
         filesize & by displaying the content */
 
     var_dump( ftell($file_handle) );  // expected: 0
-    var_dump( fwrite($file_handle, $data_to_be_written )); 
+    var_dump( fwrite($file_handle, $data_to_be_written ));
     var_dump( ftell($file_handle) );  // expected: 0
-    var_dump( feof($file_handle) );  // expected: false 
-  
+    var_dump( feof($file_handle) );  // expected: false
+
     // move the file pointer to end of the file and try fwrite()
     fseek($file_handle, SEEK_END, 0);
     var_dump( ftell($file_handle) );  // expecting 1024
diff --git a/ext/standard/tests/file/fwrite_variation2-win32.phpt b/ext/standard/tests/file/fwrite_variation2-win32.phpt
index 8545db96916..d8a6afdfd14 100644
--- a/ext/standard/tests/file/fwrite_variation2-win32.phpt
+++ b/ext/standard/tests/file/fwrite_variation2-win32.phpt
@@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) {
     $data_to_be_written="";
     fill_buffer($data_to_be_written,$file_content_type,1024);  //get the data of size 1024
 
-    /*  Write the data into the file, verify it by checking the file pointer position, eof position, 
+    /*  Write the data into the file, verify it by checking the file pointer position, eof position,
         filesize & by displaying the content */
 
     /*overwrite first 400 bytes in the file*/
diff --git a/ext/standard/tests/file/fwrite_variation2.phpt b/ext/standard/tests/file/fwrite_variation2.phpt
index 34804b69595..ee445448f49 100644
--- a/ext/standard/tests/file/fwrite_variation2.phpt
+++ b/ext/standard/tests/file/fwrite_variation2.phpt
@@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) {
     $data_to_be_written="";
     fill_buffer($data_to_be_written,$file_content_type,1024);  //get the data of size 1024
 
-    /*  Write the data into the file, verify it by checking the file pointer position, eof position, 
+    /*  Write the data into the file, verify it by checking the file pointer position, eof position,
         filesize & by displaying the content */
 
     /*overwrite first 400 bytes in the file*/
@@ -61,14 +61,14 @@ foreach($file_content_types as $file_content_type) {
     var_dump( feof($file_handle) );  //Expecting bool(false)
 
     /*overwrite data in middle of the file*/
-    fseek($file_handle, SEEK_SET, 1024/2 ); 
+    fseek($file_handle, SEEK_SET, 1024/2 );
     var_dump( ftell($file_handle));  // expected: 1024/2
     var_dump( fwrite($file_handle, $data_to_be_written, 200) );
     var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );  //Expecting bool(false)
 
     /* write at the end of the file */
-    fseek($file_handle, SEEK_END, 0); 
+    fseek($file_handle, SEEK_END, 0);
     var_dump( ftell($file_handle) );  // expected: 1024
     var_dump( feof($file_handle) );
     var_dump( fwrite($file_handle, $data_to_be_written, 200) );
diff --git a/ext/standard/tests/file/fwrite_variation3-win32.phpt b/ext/standard/tests/file/fwrite_variation3-win32.phpt
index 125f88df7ea..47cfd18e0a7 100644
--- a/ext/standard/tests/file/fwrite_variation3-win32.phpt
+++ b/ext/standard/tests/file/fwrite_variation3-win32.phpt
@@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) {
     $data_to_be_written="";
     fill_buffer($data_to_be_written,$file_content_type,1024);  //get the data of size 1024
 
-    /*  Write the data into the file, verify it by checking the file pointer position, eof position, 
+    /*  Write the data into the file, verify it by checking the file pointer position, eof position,
         filesize & by displaying the content */
     // append the data to the file, starting from current position of the file pointer
     var_dump( ftell($file_handle) ); // expected: 1024
diff --git a/ext/standard/tests/file/fwrite_variation3.phpt b/ext/standard/tests/file/fwrite_variation3.phpt
index 7d635fdae92..a3c8a769647 100644
--- a/ext/standard/tests/file/fwrite_variation3.phpt
+++ b/ext/standard/tests/file/fwrite_variation3.phpt
@@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type) {
     $data_to_be_written="";
     fill_buffer($data_to_be_written,$file_content_type,1024);  //get the data of size 1024
 
-    /*  Write the data into the file, verify it by checking the file pointer position, eof position, 
+    /*  Write the data into the file, verify it by checking the file pointer position, eof position,
         filesize & by displaying the content */
 
     // append the data to the file, starting from current position of the file pointer
@@ -64,9 +64,9 @@ foreach($file_content_types as $file_content_type) {
     fseek($file_handle, SEEK_SET, (1024 + 400)/2 );
     var_dump( ftell($file_handle));  // expected: (1024 + 400)/2
     var_dump( fwrite($file_handle, $data_to_be_written, 200) );
-    var_dump( ftell($file_handle) ); 
+    var_dump( ftell($file_handle) );
     var_dump( feof($file_handle) );  //Expecting bool(false)
-       
+
     /* check the filesize and display file content */
     // close the file, get the size and content of the file.
     var_dump( fclose($file_handle) );
diff --git a/ext/standard/tests/file/fwrite_variation4-win32.phpt b/ext/standard/tests/file/fwrite_variation4-win32.phpt
index ed2114e2720..76d1385babc 100644
--- a/ext/standard/tests/file/fwrite_variation4-win32.phpt
+++ b/ext/standard/tests/file/fwrite_variation4-win32.phpt
@@ -49,7 +49,7 @@ foreach($file_content_types as $file_content_type) {
     $data_to_be_written="";
     fill_buffer($data_to_be_written,$file_content_type,1024);  //get the data of size 1024
 
-    /*  Write the data into the file, verify it by checking the file pointer position, eof position, 
+    /*  Write the data into the file, verify it by checking the file pointer position, eof position,
         filesize & by displaying the content */
     // write data to the file
     var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fwrite_variation4.phpt b/ext/standard/tests/file/fwrite_variation4.phpt
index eefc2f88373..39eeae13fc3 100644
--- a/ext/standard/tests/file/fwrite_variation4.phpt
+++ b/ext/standard/tests/file/fwrite_variation4.phpt
@@ -49,7 +49,7 @@ foreach($file_content_types as $file_content_type) {
     $data_to_be_written="";
     fill_buffer($data_to_be_written,$file_content_type,1024);  //get the data of size 1024
 
-    /*  Write the data into the file, verify it by checking the file pointer position, eof position, 
+    /*  Write the data into the file, verify it by checking the file pointer position, eof position,
         filesize & by displaying the content */
     // write data to the file
     var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fwrite_variation5.phpt b/ext/standard/tests/file/fwrite_variation5.phpt
index b12af3182bb..7afa91216e5 100644
--- a/ext/standard/tests/file/fwrite_variation5.phpt
+++ b/ext/standard/tests/file/fwrite_variation5.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test fwrite() function : usage variation 
+Test fwrite() function : usage variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : int fwrite(resource fp, string str [, int length])
- * Description: Binary-safe file write 
+ * Description: Binary-safe file write
  * Source code: ext/standard/file.c
  * Alias to functions: bzwrite fputs gzwrite
  */
diff --git a/ext/standard/tests/file/get_current_user.phpt b/ext/standard/tests/file/get_current_user.phpt
index b67195b6292..f23d2fabef5 100644
--- a/ext/standard/tests/file/get_current_user.phpt
+++ b/ext/standard/tests/file/get_current_user.phpt
@@ -8,7 +8,7 @@ var_dump(get_current_user());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: get_current_user() expects exactly 0 parameters, 1 given in %s on line %d
 NULL
 string(%d) %s
diff --git a/ext/standard/tests/file/include_streams.phpt b/ext/standard/tests/file/include_streams.phpt
index 05b16238cd5..ecd47f418e5 100644
--- a/ext/standard/tests/file/include_streams.phpt
+++ b/ext/standard/tests/file/include_streams.phpt
@@ -8,7 +8,7 @@ $data1 = $data2 = $data3 = $data4 = $data5 = $data6 = <<<'EOD'
 EOD;
 /*<?*/
 
-class mystream 
+class mystream
 {
 	public $path;
 	public $mode;
@@ -20,7 +20,7 @@ class mystream
 	function url_stat($path, $flags) {
 		return array();
 	}
-	
+
 	function stream_stat() {
 		return array();
 	}
@@ -32,7 +32,7 @@ class mystream
 		$this->options = $options;
 
 		$split = parse_url($path);
-		if ($split["host"] !== "GLOBALS" || 
+		if ($split["host"] !== "GLOBALS" ||
 		    empty($split["path"]) ||
 		    empty($GLOBALS[substr($split["path"],1)])) {
 		    return false;
@@ -43,7 +43,7 @@ class mystream
 			$this->position = strlen($GLOBALS[$this->varname]);
 		else
 			$this->position = 0;
-		
+
 		return true;
 	}
 
diff --git a/ext/standard/tests/file/include_userstream_001.phpt b/ext/standard/tests/file/include_userstream_001.phpt
index d805afd2049..d769a4f3b24 100644
--- a/ext/standard/tests/file/include_userstream_001.phpt
+++ b/ext/standard/tests/file/include_userstream_001.phpt
@@ -15,7 +15,7 @@ class test {
 			$this->pos = strlen($this->data);
 		else
 			$this->po = 0;
-		
+
 		return true;
 	}
 
diff --git a/ext/standard/tests/file/include_userstream_002.phpt b/ext/standard/tests/file/include_userstream_002.phpt
index 4841d39c518..cc1887c446a 100644
--- a/ext/standard/tests/file/include_userstream_002.phpt
+++ b/ext/standard/tests/file/include_userstream_002.phpt
@@ -20,7 +20,7 @@ class test {
 			$this->pos = strlen($this->data);
 		else
 			$this->po = 0;
-		
+
 		return true;
 	}
 
diff --git a/ext/standard/tests/file/include_userstream_003.phpt b/ext/standard/tests/file/include_userstream_003.phpt
index 2b439cfa259..470982d9b81 100644
--- a/ext/standard/tests/file/include_userstream_003.phpt
+++ b/ext/standard/tests/file/include_userstream_003.phpt
@@ -20,7 +20,7 @@ class test {
 			$this->pos = strlen($this->data);
 		else
 			$this->po = 0;
-		
+
 		return true;
 	}
 
diff --git a/ext/standard/tests/file/is_dir_variation2.phpt b/ext/standard/tests/file/is_dir_variation2.phpt
index 65efeab9a14..76b8e8bc0c7 100644
--- a/ext/standard/tests/file/is_dir_variation2.phpt
+++ b/ext/standard/tests/file/is_dir_variation2.phpt
@@ -24,14 +24,14 @@ mkdir($dirname);
 var_dump( is_dir($dirname) );
 clearstatcache();
 
-echo "-- With symlink --\n"; 
+echo "-- With symlink --\n";
 symlink($file_path."/is_dir_variation2", $file_path."/is_dir_variation2_symlink");
-var_dump( is_dir($file_path."/is_dir_variation2_symlink") );  //is_dir() resolves symlinks 
+var_dump( is_dir($file_path."/is_dir_variation2_symlink") );  //is_dir() resolves symlinks
 clearstatcache();
 
 echo "-- With hardlink --";
 link($file_path."/is_dir_variation2", $file_path."/is_dir_variation2_link"); //Not permitted to create hard-link to a dir
-var_dump( is_dir($file_path."/is_dir_variation2_link") ); 
+var_dump( is_dir($file_path."/is_dir_variation2_link") );
 clearstatcache();
 
 echo "\n*** Testing is_dir() with file and links to a file ***\n";
@@ -41,7 +41,7 @@ fclose( fopen($filename, "w") );
 var_dump( is_dir($filename) );
 clearstatcache();
 
-echo "-- With symlink --\n"; 
+echo "-- With symlink --\n";
 symlink($file_path."/is_dir_variation2.tmp", $file_path."/is_dir_variation2_symlink.tmp");
 var_dump( is_dir($file_path."/is_dir_variation2_symlink.tmp") );
 clearstatcache();
diff --git a/ext/standard/tests/file/is_dir_variation3.phpt b/ext/standard/tests/file/is_dir_variation3.phpt
index 41826ad7ecd..20703741177 100644
--- a/ext/standard/tests/file/is_dir_variation3.phpt
+++ b/ext/standard/tests/file/is_dir_variation3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test is_dir() function: usage variations - invalid arguments 
+Test is_dir() function: usage variations - invalid arguments
 --FILE--
 <?php
 /* Prototype: bool is_dir ( string $dirname );
diff --git a/ext/standard/tests/file/is_executable_basic.phpt b/ext/standard/tests/file/is_executable_basic.phpt
index c0a04e64bbb..b5ee6645664 100644
--- a/ext/standard/tests/file/is_executable_basic.phpt
+++ b/ext/standard/tests/file/is_executable_basic.phpt
@@ -32,7 +32,7 @@ $filename = dirname(__FILE__)."/is_executable.tmp";
 create_file($filename);
 
 $counter = 1;
-/* loop to check if the file with new mode is executable 
+/* loop to check if the file with new mode is executable
    using is_executable() */
 for($mode = 0000; $mode <= 0777; $mode++) {
   echo "-- Changing mode of file to $mode --\n";
diff --git a/ext/standard/tests/file/is_executable_variation1.phpt b/ext/standard/tests/file/is_executable_variation1.phpt
index 231f1bff3fb..1cd0a8d209e 100644
--- a/ext/standard/tests/file/is_executable_variation1.phpt
+++ b/ext/standard/tests/file/is_executable_variation1.phpt
@@ -35,19 +35,19 @@ $files_arr = array(
   /* Testing file with double slashes */
   "$file_path/is_executable_variation1//bar.tmp",
   "$file_path/is_executable_variation1/*.tmp",
-  "$file_path/is_executable_variation1/b*.tmp", 
+  "$file_path/is_executable_variation1/b*.tmp",
 
   /* Testing Binary safe */
   "$file_path/is_executable_variation1".chr(0)."bar.temp",
   "$file_path".chr(0)."is_executable_variation1/bar.temp",
   "$file_path/is_executable_variation1x000/",
-  
+
   /* Testing directories */
   ".",  // current directory, exp: bool(true)
   "$file_path/is_executable_variation1"  // temp directory, exp: bool(true)
 );
 $counter = 1;
-/* loop through to test each element in the above array 
+/* loop through to test each element in the above array
    is an executable file */
 foreach($files_arr as $file) {
   echo "-- Iteration $counter --\n";
diff --git a/ext/standard/tests/file/is_executable_variation2.phpt b/ext/standard/tests/file/is_executable_variation2.phpt
index fc804d652aa..fe9cb8f366f 100644
--- a/ext/standard/tests/file/is_executable_variation2.phpt
+++ b/ext/standard/tests/file/is_executable_variation2.phpt
@@ -5,7 +5,7 @@ Test is_executable() function: usage variations - file/dir with diff. perms
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip not for windows');
 }
-// Skip if being run by root 
+// Skip if being run by root
 $filename = dirname(__FILE__)."/is_readable_root_check.tmp";
 $fp = fopen($filename, 'w');
 fclose($fp);
diff --git a/ext/standard/tests/file/is_executable_variation3.phpt b/ext/standard/tests/file/is_executable_variation3.phpt
index 925f9963c09..b9f734d4483 100644
--- a/ext/standard/tests/file/is_executable_variation3.phpt
+++ b/ext/standard/tests/file/is_executable_variation3.phpt
@@ -41,7 +41,7 @@ $invalid_files = array(
   @array(),
   @$file_handle
 );
-/* loop through to test each element in the above array 
+/* loop through to test each element in the above array
    is an executable file */
 foreach( $invalid_files as $invalid_file ) {
   var_dump( is_executable($invalid_file) );
diff --git a/ext/standard/tests/file/is_file_variation1.phpt b/ext/standard/tests/file/is_file_variation1.phpt
index 92bff954c6e..8f09e93aa6a 100644
--- a/ext/standard/tests/file/is_file_variation1.phpt
+++ b/ext/standard/tests/file/is_file_variation1.phpt
@@ -7,7 +7,7 @@ Test is_file() function: usage variations - diff. files
      Returns TRUE if the filename exists and is a regular file
 */
 
-/* Testing is_file() with file containing data, truncating its size 
+/* Testing is_file() with file containing data, truncating its size
      and the file created by touch() */
 
 $file_path = dirname(__FILE__);
diff --git a/ext/standard/tests/file/is_file_variation2.phpt b/ext/standard/tests/file/is_file_variation2.phpt
index dbe74da6170..cbe15ada71f 100644
--- a/ext/standard/tests/file/is_file_variation2.phpt
+++ b/ext/standard/tests/file/is_file_variation2.phpt
@@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
      Returns TRUE if the filename exists and is a regular file
 */
 
-/* Creating soft and hard links to a file and applying is_file() on links */ 
+/* Creating soft and hard links to a file and applying is_file() on links */
 
 $file_path = dirname(__FILE__);
 fclose( fopen($file_path."/is_file_variation2.tmp", "w") );
diff --git a/ext/standard/tests/file/is_file_variation3.phpt b/ext/standard/tests/file/is_file_variation3.phpt
index 2a13e467792..6a6d76f793e 100644
--- a/ext/standard/tests/file/is_file_variation3.phpt
+++ b/ext/standard/tests/file/is_file_variation3.phpt
@@ -22,12 +22,12 @@ $filenames = array(
   FALSE,
   NULL,
   $file_handle,
-  
+
   /* scalars */
   1234,
   0
 );
-   
+
 /* loop through to test each element the above array */
 foreach( $filenames as $filename ) {
   var_dump( is_file($filename) );
diff --git a/ext/standard/tests/file/is_file_variation4.phpt b/ext/standard/tests/file/is_file_variation4.phpt
index b927446b7ca..505331d2c94 100644
--- a/ext/standard/tests/file/is_file_variation4.phpt
+++ b/ext/standard/tests/file/is_file_variation4.phpt
@@ -27,7 +27,7 @@ $files_arr = array(
   "/is_file_variation4//is_file_variation4.tmp",
   "//is_file_variation4//is_file_variation4.tmp",
   "/is_file_variation4/*.tmp",
-  "is_file_variation4/is_file*.tmp", 
+  "is_file_variation4/is_file*.tmp",
 
   /* Testing Binary safe */
   "/is_file_variation4/is_file_variation4.tmp".chr(0),
diff --git a/ext/standard/tests/file/is_readable_variation1.phpt b/ext/standard/tests/file/is_readable_variation1.phpt
index 5becac00a24..0ba2324f9a2 100644
--- a/ext/standard/tests/file/is_readable_variation1.phpt
+++ b/ext/standard/tests/file/is_readable_variation1.phpt
@@ -44,19 +44,19 @@ $files_arr = array(
   "$file_path/is_readable_variation1//bar.tmp",
   "$file_path//is_readable_variation1//bar.tmp",
   "$file_path/is_readable_variation1/*.tmp",
-  "$file_path/is_readable_variation1/b*.tmp", 
+  "$file_path/is_readable_variation1/b*.tmp",
 
   /* Testing Binary safe */
   "$file_path/is_readable_variation1".chr(0)."bar.tmp",
   "$file_path".chr(0)."is_readable_variation1/bar.tmp",
   "$file_path".chr(0)."is_readable_variation1/bar.tmp",
-  
+
   /* Testing directories */
   ".",  // current directory, exp: bool(true)
   "$file_path/is_readable_variation1"  // temp directory, exp: bool(true)
 );
 $counter = 1;
-/* loop through to test each element in the above array 
+/* loop through to test each element in the above array
    is a writable file */
 foreach($files_arr as $file) {
   echo "-- Iteration $counter --\n";
diff --git a/ext/standard/tests/file/is_readable_variation3.phpt b/ext/standard/tests/file/is_readable_variation3.phpt
index dc4d3b16f39..3de5f1623ec 100644
--- a/ext/standard/tests/file/is_readable_variation3.phpt
+++ b/ext/standard/tests/file/is_readable_variation3.phpt
@@ -40,7 +40,7 @@ $misc_files = array(
   @array(),
   @$file_handle
 );
-/* loop through to test each element in the above array 
+/* loop through to test each element in the above array
    is a readable file */
 foreach( $misc_files as $misc_file ) {
   var_dump( is_readable($misc_file) );
diff --git a/ext/standard/tests/file/is_writable_variation1.phpt b/ext/standard/tests/file/is_writable_variation1.phpt
index 718c7fb8e96..f5cdf6a8a0c 100644
--- a/ext/standard/tests/file/is_writable_variation1.phpt
+++ b/ext/standard/tests/file/is_writable_variation1.phpt
@@ -46,19 +46,19 @@ $files_arr = array(
   "$file_path/is_writable_variation1//bar.tmp",
   "$file_path//is_writable_variation1//bar.tmp",
   "$file_path/is_writable_variation1/*.tmp",
-  "$file_path/is_writable_variation1/b*.tmp", 
+  "$file_path/is_writable_variation1/b*.tmp",
 
   /* Testing Binary safe */
   "$file_path/is_writable_variation1".chr(0)."bar.tmp",
   "$file_path".chr(0)."is_writable_variation1/bar.tmp",
   "$file_path".chr(0)."is_writable_variation1/bar.tmp",
-  
+
   /* Testing directories */
   ".",  // current directory, exp: bool(true)
   "$file_path/is_writable_variation1"  // temp directory, exp: bool(true)
 );
 $counter = 1;
-/* loop through to test each element in the above array 
+/* loop through to test each element in the above array
    is a writable file */
 foreach($files_arr as $file) {
   echo "-- Iteration $counter --\n";
diff --git a/ext/standard/tests/file/is_writable_variation3.phpt b/ext/standard/tests/file/is_writable_variation3.phpt
index 66a80abf1ee..6b79934760c 100644
--- a/ext/standard/tests/file/is_writable_variation3.phpt
+++ b/ext/standard/tests/file/is_writable_variation3.phpt
@@ -38,7 +38,7 @@ $misc_files = array(
   @array(),
   @$file_handle
 );
-/* loop through to test each element in the above array 
+/* loop through to test each element in the above array
    is a writable file */
 foreach( $misc_files as $misc_file ) {
   var_dump( is_writable($misc_file) );
diff --git a/ext/standard/tests/file/lchown_basic.phpt b/ext/standard/tests/file/lchown_basic.phpt
index f2aff597c55..ed8f96dde42 100644
--- a/ext/standard/tests/file/lchown_basic.phpt
+++ b/ext/standard/tests/file/lchown_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test lchown() function : basic functionality 
+Test lchown() function : basic functionality
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') die('skip no windows support');
@@ -10,7 +10,7 @@ if (!function_exists("posix_getuid")) die("skip no posix_getuid()");
 /* Prototype  : bool lchown (string filename, mixed user)
  * Description: Change file owner of a symlink
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing lchown() : basic functionality ***\n";
diff --git a/ext/standard/tests/file/lchown_error.phpt b/ext/standard/tests/file/lchown_error.phpt
index 8632495b397..f4b4f5089e2 100644
--- a/ext/standard/tests/file/lchown_error.phpt
+++ b/ext/standard/tests/file/lchown_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test lchown() function : error functionality 
+Test lchown() function : error functionality
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') die('skip no windows support');
@@ -19,7 +19,7 @@ unlink($filename);
 /* Prototype  : bool lchown (string filename, mixed user)
  * Description: Change file owner of a symlink
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing lchown() : error functionality ***\n";
diff --git a/ext/standard/tests/file/lstat_stat_basic.phpt b/ext/standard/tests/file/lstat_stat_basic.phpt
index 0d1476d68d5..ec11e2f8390 100644
--- a/ext/standard/tests/file/lstat_stat_basic.phpt
+++ b/ext/standard/tests/file/lstat_stat_basic.phpt
@@ -54,8 +54,8 @@ sleep(2);
 $new_file_stat = stat($filename);
 clearstatcache();
 
-// stat contains 13 different values stored twice, can be accessed using 
-// numeric and named keys, compare them to see they are same  
+// stat contains 13 different values stored twice, can be accessed using
+// numeric and named keys, compare them to see they are same
 echo "*** Testing stat() and lstat() : validating the values stored in stat ***\n";
 // Initial stat values
 var_dump( compare_self_stat($file_stat) ); //expect true
@@ -66,7 +66,7 @@ var_dump( compare_self_stat($link_stat) ); // expect true
 var_dump( compare_self_stat($new_file_stat) ); //expect true
 var_dump( compare_self_stat($new_dir_stat) );  // expect true
 
-// compare the two stat values, initial stat and stat recorded after 
+// compare the two stat values, initial stat and stat recorded after
 // creating files and link, also dump the value of stats
 echo "*** Testing stat() and lstat() : comparing stats (recorded before and after file/link creation) ***\n";
 echo "-- comparing difference in dir stats before and after creating file in it --\n";
diff --git a/ext/standard/tests/file/lstat_stat_error.phpt b/ext/standard/tests/file/lstat_stat_error.phpt
index 385167fe32f..8f290a32e3d 100644
--- a/ext/standard/tests/file/lstat_stat_error.phpt
+++ b/ext/standard/tests/file/lstat_stat_error.phpt
@@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 */
 
 echo "*** Testing lstat() for error conditions ***\n";
-$file_path = dirname(__FILE__); 
+$file_path = dirname(__FILE__);
 var_dump( lstat() );  // args < expected
 var_dump( lstat(__FILE__, 2) );  // args > expected
 var_dump( lstat("$file_path/temp.tmp") ); // non existing file
diff --git a/ext/standard/tests/file/lstat_stat_variation1.phpt b/ext/standard/tests/file/lstat_stat_variation1.phpt
index 30ce9b7217e..9335ce9ef8a 100644
--- a/ext/standard/tests/file/lstat_stat_variation1.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation1.phpt
@@ -34,11 +34,11 @@ clearstatcache();
 var_dump( rename($old_filename, $new_filename) );
 $new_stat = stat($new_filename);
 
-// compare the self stat 
+// compare the self stat
 var_dump( compare_self_stat($old_stat) );
 var_dump( compare_self_stat($new_stat) );
 
-// compare the two stats 
+// compare the two stats
 var_dump( compare_stats($old_stat, $old_stat, $all_stat_keys) );
 // clear the cache
 clearstatcache();
diff --git a/ext/standard/tests/file/lstat_stat_variation12.phpt b/ext/standard/tests/file/lstat_stat_variation12.phpt
index 8e1edd66c73..f9413f768fe 100644
--- a/ext/standard/tests/file/lstat_stat_variation12.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation12.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test lstat() and stat() functions: usage variations - effects of is_link()  
+Test lstat() and stat() functions: usage variations - effects of is_link()
 --SKIPIF--
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
diff --git a/ext/standard/tests/file/lstat_stat_variation13.phpt b/ext/standard/tests/file/lstat_stat_variation13.phpt
index 288e0b5ecfb..17b6262a52f 100644
--- a/ext/standard/tests/file/lstat_stat_variation13.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation13.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test lstat() and stat() functions: usage variations - file opened using w and r mode 
+Test lstat() and stat() functions: usage variations - file opened using w and r mode
 --SKIPIF--
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
diff --git a/ext/standard/tests/file/lstat_stat_variation14.phpt b/ext/standard/tests/file/lstat_stat_variation14.phpt
index 517f77e3f54..41106a80fc0 100644
--- a/ext/standard/tests/file/lstat_stat_variation14.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation14.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test lstat() and stat() functions: usage variations - hardlink  
+Test lstat() and stat() functions: usage variations - hardlink
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
@@ -28,7 +28,7 @@ fclose($fp);
 
 echo "*** Checking lstat() and stat() on hard link ***\n";
 $linkname = "$file_path/lstat_stat_variation14_hard.tmp";
-//ensure that link doesn't exists 
+//ensure that link doesn't exists
 @unlink($linkname);
 
 // create the link
diff --git a/ext/standard/tests/file/lstat_stat_variation18.phpt b/ext/standard/tests/file/lstat_stat_variation18.phpt
index 6ee563d6845..4ac01f20352 100644
--- a/ext/standard/tests/file/lstat_stat_variation18.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation18.phpt
@@ -38,15 +38,15 @@ class names {
 // directory name stored in an object
 $dir_name = new names("$file_path/lstat_stat_variation18");
 
-// file name stored in an object 
+// file name stored in an object
 $file_name = new names("$file_path/lstat_stat_variation18.tmp");
 
 echo "\n-- Testing stat() on filename stored inside an object --\n";
-// dump the stat returned value 
+// dump the stat returned value
 var_dump( stat($file_name->var_name) );
 
 echo "\n-- Testing stat() on directory name stored inside an object --\n";
-// dump the stat returned value 
+// dump the stat returned value
 var_dump( stat($dir_name->var_name) );
 
 echo "\n--- Done ---";
diff --git a/ext/standard/tests/file/lstat_stat_variation19.phpt b/ext/standard/tests/file/lstat_stat_variation19.phpt
index c481575ce98..fedf0bd1541 100644
--- a/ext/standard/tests/file/lstat_stat_variation19.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation19.phpt
@@ -32,7 +32,7 @@ echo "*** Testing stat() with filename & directory name stored inside an array *
 
 // array with default numeric index
 $names = array(
-  "$file_path/lstat_stat_variation19.tmp", 
+  "$file_path/lstat_stat_variation19.tmp",
   "$file_path/lstat_stat_variation19"
 );
 
diff --git a/ext/standard/tests/file/lstat_stat_variation2.phpt b/ext/standard/tests/file/lstat_stat_variation2.phpt
index e7d704a20b3..aaf77b9e3dd 100644
--- a/ext/standard/tests/file/lstat_stat_variation2.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation2.phpt
@@ -37,7 +37,7 @@ var_dump( compare_self_stat($old_stat) );
 var_dump( compare_self_stat($new_stat) );
 
 // compare the two stats - all except ctime
-$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 
+$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12,
                        "dev", "ino", "mode", "nlink", "uid", "gid",
                        "rdev", "size", "atime", "mtime", "blksize", "blocks");
 var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) );
diff --git a/ext/standard/tests/file/lstat_stat_variation20.phpt b/ext/standard/tests/file/lstat_stat_variation20.phpt
index 8dcd70c7981..ad0f586f1b3 100644
--- a/ext/standard/tests/file/lstat_stat_variation20.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation20.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test lstat() and stat() functions: usage variations - link names stored in array/object 
+Test lstat() and stat() functions: usage variations - link names stored in array/object
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
@@ -37,8 +37,8 @@ class names {
 // link name stored in an object
 $link_object = new names("$file_path/lstat_stat_variation20_link.tmp");
 
-// link name stored in side an array 
-// with default numeric key 
+// link name stored in side an array
+// with default numeric key
 $link_array = array("$file_path/lstat_stat_variation20_link.tmp");
 
 // with string key index
diff --git a/ext/standard/tests/file/lstat_stat_variation3.phpt b/ext/standard/tests/file/lstat_stat_variation3.phpt
index e7bae3abb4e..43f8bf61876 100644
--- a/ext/standard/tests/file/lstat_stat_variation3.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation3.phpt
@@ -41,7 +41,7 @@ var_dump( compare_self_stat($old_stat) );
 var_dump( compare_self_stat($new_stat) );
 
 // compare the two stats - all except ctime
-$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 
+$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12,
                        "dev", "ino", "mode", "nlink", "uid", "gid",
                        "rdev", "size", "atime", "mtime", "blksize", "blocks");
 var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) );
diff --git a/ext/standard/tests/file/lstat_stat_variation5.phpt b/ext/standard/tests/file/lstat_stat_variation5.phpt
index d0c096ef19c..9e03e5c7d99 100644
--- a/ext/standard/tests/file/lstat_stat_variation5.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation5.phpt
@@ -26,7 +26,7 @@ require "$file_path/file.inc";
 /* create temp directory */
 
 $dir_name = "$file_path/lstat_stat_variation5";
-@rmdir($dir_name);  //ensure that dir doesn't exists 
+@rmdir($dir_name);  //ensure that dir doesn't exists
 mkdir($dir_name);  // temp dir
 
 // touch a directory and check stat, there should be difference in atime
diff --git a/ext/standard/tests/file/lstat_stat_variation6.phpt b/ext/standard/tests/file/lstat_stat_variation6.phpt
index 7e557d034a2..ea2b92f9755 100644
--- a/ext/standard/tests/file/lstat_stat_variation6.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test lstat() and stat() functions: usage variations - effects of touch() on link 
+Test lstat() and stat() functions: usage variations - effects of touch() on link
 --SKIPIF--
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
diff --git a/ext/standard/tests/file/lstat_stat_variation8.phpt b/ext/standard/tests/file/lstat_stat_variation8.phpt
index b0f170d1f20..8cf15a2feea 100644
--- a/ext/standard/tests/file/lstat_stat_variation8.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation8.phpt
@@ -19,7 +19,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 $file_path = dirname(__FILE__);
 require "$file_path/file.inc";
 
-/* test the effects on stats with creating file/subdir in a dir 
+/* test the effects on stats with creating file/subdir in a dir
 */
 
 /* create temp file */
diff --git a/ext/standard/tests/file/lstat_stat_variation9.phpt b/ext/standard/tests/file/lstat_stat_variation9.phpt
index 63c6ff8a765..4d9e52f903a 100644
--- a/ext/standard/tests/file/lstat_stat_variation9.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation9.phpt
@@ -18,7 +18,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 $file_path = dirname(__FILE__);
 require "$file_path/file.inc";
 
-/* test the effects on stats by deleting file/subdir from a dir 
+/* test the effects on stats by deleting file/subdir from a dir
 */
 
 echo "*** Testing stat() for comparing stats after the deletion of subdir and file ***\n";
diff --git a/ext/standard/tests/file/mkdir-001.phpt b/ext/standard/tests/file/mkdir-001.phpt
index d1a7cebfa7d..5a758bb6125 100644
--- a/ext/standard/tests/file/mkdir-001.phpt
+++ b/ext/standard/tests/file/mkdir-001.phpt
@@ -20,7 +20,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-001"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/mkdir-002.phpt b/ext/standard/tests/file/mkdir-002.phpt
index d149098df07..92c05e941df 100644
--- a/ext/standard/tests/file/mkdir-002.phpt
+++ b/ext/standard/tests/file/mkdir-002.phpt
@@ -30,7 +30,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-002"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 string(%d) "%s
diff --git a/ext/standard/tests/file/mkdir-003.phpt b/ext/standard/tests/file/mkdir-003.phpt
index fdd49f340f0..dde6b35550f 100644
--- a/ext/standard/tests/file/mkdir-003.phpt
+++ b/ext/standard/tests/file/mkdir-003.phpt
@@ -17,7 +17,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-003"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/mkdir-004.phpt b/ext/standard/tests/file/mkdir-004.phpt
index 45c275106a0..eb6c55ac1d5 100644
--- a/ext/standard/tests/file/mkdir-004.phpt
+++ b/ext/standard/tests/file/mkdir-004.phpt
@@ -17,7 +17,7 @@ var_dump(rmdir("/testdir"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/mkdir-005.phpt b/ext/standard/tests/file/mkdir-005.phpt
index af2387ca73e..b8f104fb793 100644
--- a/ext/standard/tests/file/mkdir-005.phpt
+++ b/ext/standard/tests/file/mkdir-005.phpt
@@ -18,7 +18,7 @@ var_dump(rmdir("./testdir"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/mkdir_variation1-win32.phpt b/ext/standard/tests/file/mkdir_variation1-win32.phpt
index 17f54926cb5..cee03858cb8 100644
--- a/ext/standard/tests/file/mkdir_variation1-win32.phpt
+++ b/ext/standard/tests/file/mkdir_variation1-win32.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]])
- * Description: Create a directory 
+ * Description: Create a directory
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mkdir() : usage variation ***\n";
@@ -71,7 +71,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // other
       // php.net bug outputs message File Exists
       'single space' => ' ',
diff --git a/ext/standard/tests/file/mkdir_variation1.phpt b/ext/standard/tests/file/mkdir_variation1.phpt
index b5254034be1..c77c66b5312 100644
--- a/ext/standard/tests/file/mkdir_variation1.phpt
+++ b/ext/standard/tests/file/mkdir_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir() function : usage variation: try invalid pathname 
+Test mkdir() function : usage variation: try invalid pathname
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]])
- * Description: Create a directory 
+ * Description: Create a directory
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mkdir() : usage variation ***\n";
@@ -71,7 +71,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // other
       'single space' => ' ',
 );
diff --git a/ext/standard/tests/file/mkdir_variation2.phpt b/ext/standard/tests/file/mkdir_variation2.phpt
index 67316f2c148..430c36ec99c 100644
--- a/ext/standard/tests/file/mkdir_variation2.phpt
+++ b/ext/standard/tests/file/mkdir_variation2.phpt
@@ -7,9 +7,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]])
- * Description: Create a directory 
+ * Description: Create a directory
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mkdir() : usage variation ***\n";
diff --git a/ext/standard/tests/file/mkdir_variation3.phpt b/ext/standard/tests/file/mkdir_variation3.phpt
index 7622e5f6120..482c3c02061 100644
--- a/ext/standard/tests/file/mkdir_variation3.phpt
+++ b/ext/standard/tests/file/mkdir_variation3.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]])
- * Description: Create a directory 
+ * Description: Create a directory
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mkdir() : usage variation ***\n";
diff --git a/ext/standard/tests/file/mkdir_variation4.phpt b/ext/standard/tests/file/mkdir_variation4.phpt
index deb6ff4a450..c44a530e1e1 100644
--- a/ext/standard/tests/file/mkdir_variation4.phpt
+++ b/ext/standard/tests/file/mkdir_variation4.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]])
- * Description: Create a directory 
+ * Description: Create a directory
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mkdir() : usage variation ***\n";
@@ -104,7 +104,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // non stream context resource
       'file resource' => $fileRes,
 );
diff --git a/ext/standard/tests/file/mkdir_variation5-win32.phpt b/ext/standard/tests/file/mkdir_variation5-win32.phpt
index c7ebd518da9..b805dee3bef 100644
--- a/ext/standard/tests/file/mkdir_variation5-win32.phpt
+++ b/ext/standard/tests/file/mkdir_variation5-win32.phpt
@@ -6,13 +6,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 <?php
 if(substr(PHP_OS, 0, 3) != "WIN")
   die("skip Only valid for Windows");
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]])
- * Description: Create a directory 
+ * Description: Create a directory
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mkdir() : variation ***\n";
@@ -29,35 +29,35 @@ $dirs = array(
              $workDir.'\\'.$subDir,
              '.\\'.$workDir.'\\'.$subDir,
              $workDir.'\\..\\'.$workDir.'\\'.$subDir,
-             
+
              // relative bad path
              $workDir.'\\..\\BADDIR\\'.$subDir,
              'BADDIR\\'.$subDir,
-             
+
              //absolute
              $cwd.'\\'.$workDir.'\\'.$subDir,
              $cwd.'\\.\\'.$workDir.'\\'.$subDir,
              $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$subDir,
 
-             //absolute bad path             
+             //absolute bad path
              $cwd.'\\BADDIR\\'.$subDir,
-             
+
              //trailing separators
              $workDir.'\\'.$subDir.'\\',
              $cwd.'\\'.$workDir.'\\'.$subDir.'\\',
-             
+
              // multiple separators
              $workDir.'\\\\'.$subDir,
              $cwd.'\\\\'.$workDir.'\\\\'.$subDir,
-             
+
              // Unixified Dir
              $unixifiedDir,
-             
+
              );
-             
+
 
 foreach($dirs as $dir) {
-   echo "-- creating $dir --\n";           
+   echo "-- creating $dir --\n";
    $res = mkdir($dir);
    if ($res === true) {
       echo "Directory created\n";
diff --git a/ext/standard/tests/file/mkdir_variation5.phpt b/ext/standard/tests/file/mkdir_variation5.phpt
index 8a02fe1d676..ea60edf42f1 100644
--- a/ext/standard/tests/file/mkdir_variation5.phpt
+++ b/ext/standard/tests/file/mkdir_variation5.phpt
@@ -1,18 +1,18 @@
 --TEST--
-Test mkdir() function : variation: various valid and invalid paths 
+Test mkdir() function : variation: various valid and invalid paths
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == "WIN")
   die("skip Not valid for Windows");
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : bool mkdir(string pathname [, int mode [, bool recursive [, resource context]]])
- * Description: Create a directory 
+ * Description: Create a directory
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mkdir() : variation ***\n";
@@ -27,32 +27,32 @@ $dirs = array(
              $workDir.'/'.$subDir,
              './'.$workDir.'/'.$subDir,
              $workDir.'/../'.$workDir.'/'.$subDir,
-             
+
              // relative bad path
              $workDir.'/../BADDIR/'.$subDir,
              'BADDIR/'.$subDir,
-             
+
              //absolute
              $cwd.'/'.$workDir.'/'.$subDir,
              $cwd.'/./'.$workDir.'/'.$subDir,
              $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDir,
 
-             //absolute bad path             
+             //absolute bad path
              $cwd.'/BADDIR/'.$subDir,
-             
+
              //trailing separators
              $workDir.'/'.$subDir.'/',
              $cwd.'/'.$workDir.'/'.$subDir.'/',
-             
+
              // multiple separators
              $workDir.'//'.$subDir,
              $cwd.'//'.$workDir.'//'.$subDir,
-             
+
              );
-             
+
 
 foreach($dirs as $dir) {
-   echo "-- creating $dir --\n";           
+   echo "-- creating $dir --\n";
    $res = mkdir($dir);
    if ($res === true) {
       echo "Directory created\n";
diff --git a/ext/standard/tests/file/parse_ini_file.phpt b/ext/standard/tests/file/parse_ini_file.phpt
index db14c7a9b43..a79951e0139 100644
--- a/ext/standard/tests/file/parse_ini_file.phpt
+++ b/ext/standard/tests/file/parse_ini_file.phpt
@@ -4,7 +4,7 @@ Test parse_ini_file() function
 <?php
 /* Prototype: array parse_ini_file(string $filename [,bool $process_sections]);
    Description: parse_ini_file() loads in the ini file specified in filename,
-     and returns the settings in it in an associative array. 
+     and returns the settings in it in an associative array.
 */
 
 $file_path = dirname(__FILE__);
diff --git a/ext/standard/tests/file/parse_ini_file_error.phpt b/ext/standard/tests/file/parse_ini_file_error.phpt
index 14990b26064..29e022fb13b 100644
--- a/ext/standard/tests/file/parse_ini_file_error.phpt
+++ b/ext/standard/tests/file/parse_ini_file_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test parse_ini_file() function : error conditions 
+Test parse_ini_file() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto array parse_ini_file(string filename [, bool process_sections])
- * Description: Parse configuration file 
+ * Description: Parse configuration file
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing parse_ini_file() : error conditions ***\n";
@@ -23,7 +23,7 @@ var_dump( parse_ini_file($filename, $process_sections, $extra_arg) );
 
 echo "\n-- Testing parse_ini_file() function with a non-existent file --\n";
 $filename = __FILE__ . 'invalidfilename';
-var_dump( parse_ini_file($filename, $process_sections) ); 
+var_dump( parse_ini_file($filename, $process_sections) );
 
 echo "Done";
 ?>
diff --git a/ext/standard/tests/file/parse_ini_file_variation1.phpt b/ext/standard/tests/file/parse_ini_file_variation1.phpt
index a24bc1c0511..666ea433b1c 100644
--- a/ext/standard/tests/file/parse_ini_file_variation1.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation1.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : array parse_ini_file(string filename [, bool process_sections])
- * Description: Parse configuration file 
+ * Description: Parse configuration file
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing parse_ini_file() : variation ***\n";
diff --git a/ext/standard/tests/file/parse_ini_file_variation2.phpt b/ext/standard/tests/file/parse_ini_file_variation2.phpt
index 20ad6bb067c..e7b90917376 100644
--- a/ext/standard/tests/file/parse_ini_file_variation2.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation2.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : array parse_ini_file(string filename [, bool process_sections])
- * Description: Parse configuration file 
+ * Description: Parse configuration file
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing parse_ini_file() : variation ***\n";
diff --git a/ext/standard/tests/file/parse_ini_file_variation3.phpt b/ext/standard/tests/file/parse_ini_file_variation3.phpt
index 43b0274ea9e..96d44433f70 100644
--- a/ext/standard/tests/file/parse_ini_file_variation3.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation3.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : array parse_ini_file(string filename [, bool process_sections])
- * Description: Parse configuration file 
+ * Description: Parse configuration file
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing parse_ini_file() : variation ***\n";
@@ -32,7 +32,7 @@ foreach($newdirs as $newdir) {
 set_include_path($newIncludePath);
 $path = get_include_path();
 echo "New include path is : " . $path . "\n";
- 
+
 $output_file = $dir2."/".$iniFile;
 $iniContent = <<<FILE
 error_reporting  =  E_ALL
diff --git a/ext/standard/tests/file/parse_ini_file_variation4.phpt b/ext/standard/tests/file/parse_ini_file_variation4.phpt
index 66cab3bedcb..e80c25822d2 100644
--- a/ext/standard/tests/file/parse_ini_file_variation4.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation4.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test parse_ini_file() function : usage variation 
+Test parse_ini_file() function : usage variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : array parse_ini_file(string filename [, bool process_sections])
- * Description: Parse configuration file 
+ * Description: Parse configuration file
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing parse_ini_file() : usage variation ***\n";
diff --git a/ext/standard/tests/file/parse_ini_file_variation5.phpt b/ext/standard/tests/file/parse_ini_file_variation5.phpt
index eea7b7deccb..2cf20139888 100644
--- a/ext/standard/tests/file/parse_ini_file_variation5.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation5.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test parse_ini_file() function : usage variation 
+Test parse_ini_file() function : usage variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : array parse_ini_file(string filename [, bool process_sections])
- * Description: Parse configuration file 
+ * Description: Parse configuration file
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing parse_ini_file() : usage variation ***\n";
diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt
index 4e5d4347e44..432441ae6e4 100644
--- a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : array parse_ini_file(string filename [, bool process_sections])
- * Description: Parse configuration file 
+ * Description: Parse configuration file
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing parse_ini_file() : variation ***\n";
@@ -35,14 +35,14 @@ $allDirs = array(
   "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir,
   "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir,
   "$absSubDir\\BADDIR",
-  
+
   // relative paths
   $mainDir."\\".$subDir,
-  $mainDir."\\\\".$subDir, 
-   $mainDir."\\\\\\".$subDir, 
+  $mainDir."\\\\".$subDir,
+   $mainDir."\\\\\\".$subDir,
   ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir,
-  "BADDIR",  
-  
+  "BADDIR",
+
   // unixifed path
   $unixifiedDir,
 );
diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt
index 6dfbee990aa..7d5b650cc3a 100644
--- a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : array parse_ini_file(string filename [, bool process_sections])
- * Description: Parse configuration file 
+ * Description: Parse configuration file
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing parse_ini_file() : variation ***\n";
@@ -35,14 +35,14 @@ $allDirs = array(
   "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir,
   "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir,
   "$absSubDir\\BADDIR",
-  
+
   // relative paths
   $mainDir."\\".$subDir,
-  $mainDir."\\\\".$subDir, 
-   $mainDir."\\\\\\".$subDir, 
+  $mainDir."\\\\".$subDir,
+   $mainDir."\\\\\\".$subDir,
   ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir,
-  "BADDIR",  
-  
+  "BADDIR",
+
   // unixifed path
   $unixifiedDir,
 );
diff --git a/ext/standard/tests/file/parse_ini_file_variation6.phpt b/ext/standard/tests/file/parse_ini_file_variation6.phpt
index e9844e905a0..a4f24e4e13a 100644
--- a/ext/standard/tests/file/parse_ini_file_variation6.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation6.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : array parse_ini_file(string filename [, bool process_sections])
- * Description: Parse configuration file 
+ * Description: Parse configuration file
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing parse_ini_file() : variation ***\n";
@@ -29,14 +29,14 @@ $allDirs = array(
   "$absSubDir/../../".$mainDir."/./".$subDir,
   "$absSubDir/..///".$subDir."//..//../".$subDir,
   "$absSubDir/BADDIR",
-  
+
   // relative paths
   $mainDir."/".$subDir,
-  $mainDir."//".$subDir, 
-   $mainDir."///".$subDir, 
+  $mainDir."//".$subDir,
+   $mainDir."///".$subDir,
   "./".$mainDir."/../".$mainDir."/".$subDir,
-  "BADDIR",  
-  
+  "BADDIR",
+
 );
 
 $filename = 'ParseIniFileVar6.ini';
diff --git a/ext/standard/tests/file/pathinfo_basic.phpt b/ext/standard/tests/file/pathinfo_basic.phpt
index 0ab4776e02c..48d01dd66c9 100644
--- a/ext/standard/tests/file/pathinfo_basic.phpt
+++ b/ext/standard/tests/file/pathinfo_basic.phpt
@@ -45,7 +45,7 @@ $paths = array (
 
   /* Testing with homedir notation */
   "~/PHP/php5.2.0/",
-  
+
   /* Testing normal directory notation */
   "/home/example/test/",
   "http://httpd.apache.org/core.html#acceptpathinfo"
diff --git a/ext/standard/tests/file/pathinfo_basic1-win32.phpt b/ext/standard/tests/file/pathinfo_basic1-win32.phpt
index f783a6b179f..ea95ed1e2bb 100644
--- a/ext/standard/tests/file/pathinfo_basic1-win32.phpt
+++ b/ext/standard/tests/file/pathinfo_basic1-win32.phpt
@@ -27,14 +27,14 @@ $paths = array (
 			'/usr/include/arpa',
 			'/usr/include/arpa/',
 			'usr/include/arpa',
-			'usr/include/arpa/',			
+			'usr/include/arpa/',
 			'c:\test\afile',
 			'c:\\test\\afile',
 			'c://test//afile',
 			'c:\test\afile\\',
 			'c:\test\prog.exe',
 			'c:\\test\\prog.exe',
-			'c:/test/prog.exe',			
+			'c:/test/prog.exe',
 			'/usr/include/arpa/inet.h',
 			'//usr/include//arpa/inet.h',
 			'\\',
diff --git a/ext/standard/tests/file/pathinfo_basic1.phpt b/ext/standard/tests/file/pathinfo_basic1.phpt
index c57774a141d..89b733b6900 100644
--- a/ext/standard/tests/file/pathinfo_basic1.phpt
+++ b/ext/standard/tests/file/pathinfo_basic1.phpt
@@ -27,14 +27,14 @@ $paths = array (
 			'/usr/include/arpa',
 			'/usr/include/arpa/',
 			'usr/include/arpa',
-			'usr/include/arpa/',			
+			'usr/include/arpa/',
 			'c:\test\afile',
 			'c:\\test\\afile',
 			'c://test//afile',
 			'c:\test\afile\\',
 			'c:\test\prog.exe',
 			'c:\\test\\prog.exe',
-			'c:/test/prog.exe',			
+			'c:/test/prog.exe',
 			'/usr/include/arpa/inet.h',
 			'//usr/include//arpa/inet.h',
 			'\\',
diff --git a/ext/standard/tests/file/pathinfo_basic2-win32.phpt b/ext/standard/tests/file/pathinfo_basic2-win32.phpt
index 4c2fd2cacf8..5a88b648d35 100644
--- a/ext/standard/tests/file/pathinfo_basic2-win32.phpt
+++ b/ext/standard/tests/file/pathinfo_basic2-win32.phpt
@@ -31,7 +31,7 @@ $paths = array (
 			'..',
 			'...',
 			'/usr/lib/.../afile'
-						
+
 );
 
 $counter = 1;
diff --git a/ext/standard/tests/file/pathinfo_basic2.phpt b/ext/standard/tests/file/pathinfo_basic2.phpt
index 3ec7eec3585..c146876649b 100644
--- a/ext/standard/tests/file/pathinfo_basic2.phpt
+++ b/ext/standard/tests/file/pathinfo_basic2.phpt
@@ -31,7 +31,7 @@ $paths = array (
 			'..',
 			'...',
 			'/usr/lib/.../afile'
-						
+
 );
 
 $counter = 1;
diff --git a/ext/standard/tests/file/pathinfo_variation1.phpt b/ext/standard/tests/file/pathinfo_variation1.phpt
index ff4c1eb818e..36d9bab5ae3 100644
--- a/ext/standard/tests/file/pathinfo_variation1.phpt
+++ b/ext/standard/tests/file/pathinfo_variation1.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test pathinfo() function : usage variation 
+Test pathinfo() function : usage variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : array pathinfo(string path[, int options])
- * Description: Returns information about a certain string 
+ * Description: Returns information about a certain string
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing pathinfo() : usage variation ***\n";
diff --git a/ext/standard/tests/file/pathinfo_variation2.phpt b/ext/standard/tests/file/pathinfo_variation2.phpt
index ea7c2d77a8b..d0c1b37a526 100644
--- a/ext/standard/tests/file/pathinfo_variation2.phpt
+++ b/ext/standard/tests/file/pathinfo_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test pathinfo() function : usage variation 
+Test pathinfo() function : usage variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -7,9 +7,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : array pathinfo(string path[, int options])
- * Description: Returns information about a certain string 
+ * Description: Returns information about a certain string
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing pathinfo() : usage variation ***\n";
diff --git a/ext/standard/tests/file/pathinfo_variation3.phpt b/ext/standard/tests/file/pathinfo_variation3.phpt
index 333aa56838f..b8509dc8ecc 100644
--- a/ext/standard/tests/file/pathinfo_variation3.phpt
+++ b/ext/standard/tests/file/pathinfo_variation3.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test pathinfo() function : usage variation 
+Test pathinfo() function : usage variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : array pathinfo(string path[, int options])
- * Description: Returns information about a certain string 
+ * Description: Returns information about a certain string
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing pathinfo() : usage variation ***\n";
diff --git a/ext/standard/tests/file/pathinfo_variaton.phpt b/ext/standard/tests/file/pathinfo_variaton.phpt
index d6c6c774b40..421f378e013 100644
--- a/ext/standard/tests/file/pathinfo_variaton.phpt
+++ b/ext/standard/tests/file/pathinfo_variaton.phpt
@@ -57,7 +57,7 @@ $paths = array (
   /* pathname as NULL */
   NULL,
   null,
-  
+
   /* filename as resource */
   $fp,
 
diff --git a/ext/standard/tests/file/pclose_variation1.phpt b/ext/standard/tests/file/pclose_variation1.phpt
index a6ffd0630f1..c1fbf4a2e1e 100644
--- a/ext/standard/tests/file/pclose_variation1.phpt
+++ b/ext/standard/tests/file/pclose_variation1.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test pclose() function : usage variation 
+Test pclose() function : usage variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : int pclose(resource fp)
- * Description: Close a file pointer opened by popen() 
+ * Description: Close a file pointer opened by popen()
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing pclose() : usage variation ***\n";
diff --git a/ext/standard/tests/file/php_fd_wrapper_04.phpt b/ext/standard/tests/file/php_fd_wrapper_04.phpt
index 51f4d9f171f..1c5defdaefd 100644
--- a/ext/standard/tests/file/php_fd_wrapper_04.phpt
+++ b/ext/standard/tests/file/php_fd_wrapper_04.phpt
@@ -1,7 +1,7 @@
 --TEST--
 php://fd wrapper: invalid file descriptor
 --SKIPIF--
-<?php include('skipif.inc'); 
+<?php include('skipif.inc');
 if(substr(PHP_OS, 0, 3) == "WIN")
 	die("skip Not for Windows");
 
diff --git a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt
index 7e0a0e0c548..6dd995b43cc 100644
--- a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt
+++ b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt
@@ -36,8 +36,8 @@ $arr = array("ggg", "ddd", "aaa", "sss");
 // the only solution is to either put the absolute path here, or
 // remove variables_order= from PHP.ini (setting it in run-test's
 // default INI will fail too)
-// 
-// since we can't depend on PHP.ini being set a certain way, 
+//
+// since we can't depend on PHP.ini being set a certain way,
 // have to put the absolute path here.
 
 $sysroot = exec('echo %SYSTEMROOT%');
diff --git a/ext/standard/tests/file/popen_pclose_basic-win32.phpt b/ext/standard/tests/file/popen_pclose_basic-win32.phpt
index 6351d866f37..2b05b25a137 100644
--- a/ext/standard/tests/file/popen_pclose_basic-win32.phpt
+++ b/ext/standard/tests/file/popen_pclose_basic-win32.phpt
@@ -36,8 +36,8 @@ $arr = array("ggg", "ddd", "aaa", "sss");
 // the only solution is to either put the absolute path here, or
 // remove variables_order= from PHP.ini (setting it in run-test's
 // default INI will fail too)
-// 
-// since we can't depend on PHP.ini being set a certain way, 
+//
+// since we can't depend on PHP.ini being set a certain way,
 // have to put the absolute path here.
 
 $sysroot = exec('echo %SYSTEMROOT%');
diff --git a/ext/standard/tests/file/popen_pclose_basic.phpt b/ext/standard/tests/file/popen_pclose_basic.phpt
index 55a87bb02a6..bbdddf51b2b 100644
--- a/ext/standard/tests/file/popen_pclose_basic.phpt
+++ b/ext/standard/tests/file/popen_pclose_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test popen() and pclose function: basic functionality 
+Test popen() and pclose function: basic functionality
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == 'WIN' )
diff --git a/ext/standard/tests/file/proc_open01.phpt b/ext/standard/tests/file/proc_open01.phpt
index 4e619a3286d..b03e2786dfc 100644
--- a/ext/standard/tests/file/proc_open01.phpt
+++ b/ext/standard/tests/file/proc_open01.phpt
@@ -4,10 +4,10 @@ proc_open() regression test 1 (proc_open() leak)
 <?php
 $pipes = array(1, 2, 3);
 $orig_pipes = $pipes;
-$php = getenv('TEST_PHP_EXECUTABLE'); 
+$php = getenv('TEST_PHP_EXECUTABLE');
 if ($php === false) {
 	die("no php executable defined");
-} 
+}
 $proc = proc_open(
 	"$php -n",
 	array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')),
@@ -24,7 +24,7 @@ fflush($pipes[0]);
 fclose($pipes[0]);
 $cnt = '';
 $n=0;
-for ($left = strlen($test_string); $left > 0;) { 
+for ($left = strlen($test_string); $left > 0;) {
 	if (++$n >1000) {
 	  print "terminated after 1000 iterations\n";
 	  break;
diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt
index 61f6aba7a5e..a240a826b96 100644
--- a/ext/standard/tests/file/readfile_variation10-win32.phpt
+++ b/ext/standard/tests/file/readfile_variation10-win32.phpt
@@ -10,16 +10,16 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : int readfile(string filename [, bool use_include_path[, resource context]])
- * Description: Output a file or a URL 
+ * Description: Output a file or a URL
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing readfile() : variation ***\n";
 
-/* An array of files */ 
+/* An array of files */
 $names_arr = array(
-  /* Invalid args */ 
+  /* Invalid args */
   "-1" => -1,
   "TRUE" => TRUE,
   "FALSE" => FALSE,
@@ -30,7 +30,7 @@ $names_arr = array(
   "array()" => array(),
 
   /* prefix with path separator of a non existing directory*/
-  "/no/such/file/dir" => "/no/such/file/dir", 
+  "/no/such/file/dir" => "/no/such/file/dir",
   "php/php"=> "php/php"
 
 );
diff --git a/ext/standard/tests/file/readfile_variation10.phpt b/ext/standard/tests/file/readfile_variation10.phpt
index 3bbc329f317..59b92ad3658 100644
Binary files a/ext/standard/tests/file/readfile_variation10.phpt and b/ext/standard/tests/file/readfile_variation10.phpt differ
diff --git a/ext/standard/tests/file/readfile_variation3.phpt b/ext/standard/tests/file/readfile_variation3.phpt
index 854642a36d1..a22b2b40442 100644
--- a/ext/standard/tests/file/readfile_variation3.phpt
+++ b/ext/standard/tests/file/readfile_variation3.phpt
@@ -7,7 +7,7 @@ Test readfile() function: usage variation - include path
 */
 /* test readfile() by providing an include path, second argument */
 
-// include file.inc 
+// include file.inc
 require("file.inc");
 
 $file_path = dirname(__FILE__);
diff --git a/ext/standard/tests/file/readfile_variation4.phpt b/ext/standard/tests/file/readfile_variation4.phpt
index 9ee5a2f3c79..1df36908493 100644
--- a/ext/standard/tests/file/readfile_variation4.phpt
+++ b/ext/standard/tests/file/readfile_variation4.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test readfile() function : usage variation 
+Test readfile() function : usage variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : int readfile(string filename [, bool use_include_path[, resource context]])
- * Description: Output a file or a URL 
+ * Description: Output a file or a URL
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing readfile() : usage variation ***\n";
@@ -107,7 +107,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // file resource
       'file resource' => $fileRes,
 );
diff --git a/ext/standard/tests/file/readfile_variation5.phpt b/ext/standard/tests/file/readfile_variation5.phpt
index 21856f81353..04b0477154d 100644
--- a/ext/standard/tests/file/readfile_variation5.phpt
+++ b/ext/standard/tests/file/readfile_variation5.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test readfile() function : usage variation 
+Test readfile() function : usage variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : int readfile(string filename [, bool use_include_path[, resource context]])
- * Description: Output a file or a URL 
+ * Description: Output a file or a URL
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing readfile() : usage variation ***\n";
diff --git a/ext/standard/tests/file/readfile_variation6.phpt b/ext/standard/tests/file/readfile_variation6.phpt
index 02e708220cd..dca6f4df673 100644
--- a/ext/standard/tests/file/readfile_variation6.phpt
+++ b/ext/standard/tests/file/readfile_variation6.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : int readfile(string filename [, bool use_include_path[, resource context]])
- * Description: Output a file or a URL 
+ * Description: Output a file or a URL
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 require_once('fopen_include_path.inc');
@@ -39,7 +39,7 @@ function runtest() {
    fclose($h);
    readfile($filename, true);
    echo "\n";
-   unlink($secondFile);  
+   unlink($secondFile);
 }
 
 ?>
diff --git a/ext/standard/tests/file/readfile_variation7.phpt b/ext/standard/tests/file/readfile_variation7.phpt
index d26f52f4927..b41721ae4f5 100644
--- a/ext/standard/tests/file/readfile_variation7.phpt
+++ b/ext/standard/tests/file/readfile_variation7.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test readfile() function : variation 
+Test readfile() function : variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : int readfile(string filename [, bool use_include_path[, resource context]])
- * Description: Output a file or a URL 
+ * Description: Output a file or a URL
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 require_once('fopen_include_path.inc');
@@ -39,7 +39,7 @@ function runtest() {
    fclose($h);
    readfile($filename, true);
    echo "\n";
-   unlink($scriptLocFile);  
+   unlink($scriptLocFile);
 }
 
 ?>
diff --git a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt
index e53f3623677..b4fb0bf3226 100644
--- a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt
+++ b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test readfile() function : variation 
+Test readfile() function : variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : int readfile(string filename [, bool use_include_path[, resource context]])
- * Description: Output a file or a URL 
+ * Description: Output a file or a URL
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing readfile() : variation ***\n";
@@ -44,14 +44,14 @@ $allDirs = array(
   "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir,
   "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir,
   "$absSubDir\\BADDIR",
-  
+
   // relative paths
   $mainDir."\\".$subDir,
-  $mainDir."\\\\".$subDir, 
-   $mainDir."\\\\\\".$subDir, 
+  $mainDir."\\\\".$subDir,
+   $mainDir."\\\\\\".$subDir,
   ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir,
-  "BADDIR",  
-  
+  "BADDIR",
+
   // unixifed path
   $unixifiedDir,
 );
diff --git a/ext/standard/tests/file/readfile_variation8-win32.phpt b/ext/standard/tests/file/readfile_variation8-win32.phpt
index a66af5d25b4..dde7a1ec7ad 100644
--- a/ext/standard/tests/file/readfile_variation8-win32.phpt
+++ b/ext/standard/tests/file/readfile_variation8-win32.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test readfile() function : variation 
+Test readfile() function : variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : int readfile(string filename [, bool use_include_path[, resource context]])
- * Description: Output a file or a URL 
+ * Description: Output a file or a URL
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing readfile() : variation ***\n";
@@ -44,14 +44,14 @@ $allDirs = array(
   "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir,
   "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir,
   "$absSubDir\\BADDIR",
-  
+
   // relative paths
   $mainDir."\\".$subDir,
-  $mainDir."\\\\".$subDir, 
-   $mainDir."\\\\\\".$subDir, 
+  $mainDir."\\\\".$subDir,
+   $mainDir."\\\\\\".$subDir,
   ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir,
-  "BADDIR",  
-  
+  "BADDIR",
+
   // unixifed path
   $unixifiedDir,
 );
diff --git a/ext/standard/tests/file/readfile_variation9.phpt b/ext/standard/tests/file/readfile_variation9.phpt
index c802f4018ad..cf80caae996 100644
--- a/ext/standard/tests/file/readfile_variation9.phpt
+++ b/ext/standard/tests/file/readfile_variation9.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : int readfile(string filename [, bool use_include_path[, resource context]])
- * Description: Output a file or a URL 
+ * Description: Output a file or a URL
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing readfile() : variation ***\n";
@@ -38,14 +38,14 @@ $allDirs = array(
   "$absSubDir/../../".$mainDir."/./".$subDir,
   "$absSubDir/..///".$subDir."//..//../".$subDir,
   "$absSubDir/BADDIR",
-  
-  
+
+
   // relative paths
   $mainDir."/".$subDir,
-  $mainDir."//".$subDir, 
-   $mainDir."///".$subDir, 
+  $mainDir."//".$subDir,
+   $mainDir."///".$subDir,
   "./".$mainDir."/../".$mainDir."/".$subDir,
-  "BADDIR",  
+  "BADDIR",
 );
 
 for($i = 0; $i<count($allDirs); $i++) {
diff --git a/ext/standard/tests/file/readlink_realpath_basic1.phpt b/ext/standard/tests/file/readlink_realpath_basic1.phpt
index 99195e2b243..6efe7f2d493 100644
--- a/ext/standard/tests/file/readlink_realpath_basic1.phpt
+++ b/ext/standard/tests/file/readlink_realpath_basic1.phpt
@@ -26,7 +26,7 @@ fclose($file_handle1);
 fclose($file_handle2);
 fclose($file_handle3);
 
-symlink("$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1.tmp", 
+symlink("$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1.tmp",
         "$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1_link.tmp");
 symlink("$file_path/readlink_realpath_basic1/home/readlink_realpath_basic1.tmp",
         "$file_path/readlink_realpath_basic1/home/readlink_realpath_basic1_link.tmp");
@@ -38,7 +38,7 @@ $linknames = array (
   "$file_path/readlink_realpath_basic1/home/readlink_realpath_basic1_link.tmp",
   "$file_path/readlink_realpath_basic1/home/test/readlink_realpath_basic1_link.tmp",
   "$file_path/readlink_realpath_basic1//home/test//../test/./readlink_realpath_basic1_link.tmp",
-  
+
   /* linknames with invalid linkpath */
   "$file_path///readlink_realpath_basic1/home//..//././test//readlink_realpath_basic1_link.tmp",
   "$file_path/readlink_realpath_basic1/home/../home/../test/../readlink_realpath_basic1_link.tmp",
diff --git a/ext/standard/tests/file/readlink_realpath_variation1.phpt b/ext/standard/tests/file/readlink_realpath_variation1.phpt
index 341e39a9dea..ab1d9557781 100644
--- a/ext/standard/tests/file/readlink_realpath_variation1.phpt
+++ b/ext/standard/tests/file/readlink_realpath_variation1.phpt
@@ -36,30 +36,30 @@ $obj1 = new object_temp("$name_prefix/readlink_realpath_variation1/../././readli
 $obj2 = new object_temp("$name_prefix/readlink_realpath_variation1/home/../..///readlink_realpath_variation1_link.tmp");
 
 echo "\n-- Testing readlink() and realpath() with softlink, linkname stored inside an object --\n";
-// creating the links 
-var_dump( symlink($filename, $obj1->linkname) );  
-var_dump( readlink($obj1->linkname) ); 
+// creating the links
+var_dump( symlink($filename, $obj1->linkname) );
+var_dump( readlink($obj1->linkname) );
 var_dump( realpath($obj1->linkname) );
-var_dump( symlink($filename, $obj2->linkname) ); 
+var_dump( symlink($filename, $obj2->linkname) );
 var_dump( readlink($obj2->linkname) );
 var_dump( realpath($obj2->linkname) );
 
 // deleting the link
 unlink($obj1->linkname);
-unlink($obj2->linkname);  
+unlink($obj2->linkname);
 
 echo "\n-- Testing readlink() and realpath() with hardlink, linkname stored inside an object --\n";
 // creating hard links
-var_dump( link($filename, $obj1->linkname) );  
+var_dump( link($filename, $obj1->linkname) );
 var_dump( readlink($obj1->linkname) );   // invalid because readlink doesn't work with hardlink
 var_dump( realpath($obj1->linkname) );
-var_dump( link($filename, $obj2->linkname) );  
+var_dump( link($filename, $obj2->linkname) );
 var_dump( readlink($obj2->linkname) );   // invalid because readlink doesn't work with hardlink
 var_dump( realpath($obj2->linkname) );
 
-// delete the links 
+// delete the links
 unlink($obj1->linkname);
-unlink($obj2->linkname);  
+unlink($obj2->linkname);
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/file/readlink_realpath_variation2.phpt b/ext/standard/tests/file/readlink_realpath_variation2.phpt
index 0e748576aeb..c7add6b0379 100644
--- a/ext/standard/tests/file/readlink_realpath_variation2.phpt
+++ b/ext/standard/tests/file/readlink_realpath_variation2.phpt
@@ -31,31 +31,31 @@ $link_arr = array (
 );
 
 echo "\n-- Testing readlink() and realpath() with softlink, linkname stored inside an array --\n";
-// creating the links 
-var_dump( symlink($filename, $link_arr[0]) );  
-var_dump( readlink($link_arr[0]) ); 
-var_dump( realpath($link_arr[0]) ); 
-var_dump( symlink($filename, $link_arr[1]) ); 
+// creating the links
+var_dump( symlink($filename, $link_arr[0]) );
+var_dump( readlink($link_arr[0]) );
+var_dump( realpath($link_arr[0]) );
+var_dump( symlink($filename, $link_arr[1]) );
 var_dump( readlink($link_arr[1]) );
 var_dump( realpath($link_arr[1]) );
 
 // deleting the link
 unlink($link_arr[0]);
-unlink($link_arr[1]);  
+unlink($link_arr[1]);
 
 echo "\n-- Testing readlink() and realpath() with hardlink, linkname stored inside an array --\n";
 // creating hard links
-var_dump( link($filename, $link_arr[0]) );  
+var_dump( link($filename, $link_arr[0]) );
 var_dump( readlink($link_arr[0]) );   // invalid because readlink doesn't work with hardlink
 var_dump( realpath($link_arr[0]) );
-var_dump( link($filename, $link_arr[1]) );  
+var_dump( link($filename, $link_arr[1]) );
 var_dump( readlink($link_arr[1]) );   // invalid because readlink doesn't work with hardlink
 var_dump( realpath($link_arr[1]) );
 
-// delete the links 
+// delete the links
 unlink($link_arr[0]);
-unlink($link_arr[1]);  
-  
+unlink($link_arr[1]);
+
 echo "Done\n";
 ?>
 --CLEAN--
diff --git a/ext/standard/tests/file/readlink_realpath_variation3.phpt b/ext/standard/tests/file/readlink_realpath_variation3.phpt
index 3766a5b43ad..58e58237ef3 100644
--- a/ext/standard/tests/file/readlink_realpath_variation3.phpt
+++ b/ext/standard/tests/file/readlink_realpath_variation3.phpt
@@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 */
 
 echo "*** Testing readlink() and realpath() : usage variations ***\n";
-  
+
 echo "\n*** Testing readlink() and realpath() with linkname as empty string, NULL and single space ***\n";
 $link_string = array (
   /* linkname as spaces */
@@ -34,8 +34,8 @@ for($loop_counter = 0; $loop_counter < count($link_string); $loop_counter++) {
   echo $loop_counter + 1;
   echo " --\n";
 
-  var_dump( readlink($link_string[$loop_counter]) ); 
-  var_dump( realpath($link_string[$loop_counter]) ); 
+  var_dump( readlink($link_string[$loop_counter]) );
+  var_dump( realpath($link_string[$loop_counter]) );
 }
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/readlink_variation1.phpt b/ext/standard/tests/file/readlink_variation1.phpt
index d4f1a5ff029..c66e2a4265e 100644
--- a/ext/standard/tests/file/readlink_variation1.phpt
+++ b/ext/standard/tests/file/readlink_variation1.phpt
@@ -27,12 +27,12 @@ $filenames = array(
   FALSE,
   NULL,
   $file_handle,
-  
+
   /* scalars */
   1234,
   0
 );
-   
+
 /* loop through to test each element the above array */
 foreach( $filenames as $filename ) {
   var_dump( readlink($filename) );
diff --git a/ext/standard/tests/file/realpath_cache.phpt b/ext/standard/tests/file/realpath_cache.phpt
index 0eb9dc519a9..f16995eaa2c 100644
--- a/ext/standard/tests/file/realpath_cache.phpt
+++ b/ext/standard/tests/file/realpath_cache.phpt
@@ -15,7 +15,7 @@ var_dump($data[__DIR__]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(%d)
 array(4) {
   ["key"]=>
diff --git a/ext/standard/tests/file/realpath_cache_win32.phpt b/ext/standard/tests/file/realpath_cache_win32.phpt
index e74a6565a7a..bb8016875a7 100644
--- a/ext/standard/tests/file/realpath_cache_win32.phpt
+++ b/ext/standard/tests/file/realpath_cache_win32.phpt
@@ -15,7 +15,7 @@ var_dump($data[__DIR__]);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(%d)
 array(8) {
   ["key"]=>
diff --git a/ext/standard/tests/file/realpath_variation-win32-mb.phpt b/ext/standard/tests/file/realpath_variation-win32-mb.phpt
index 66d7c8b0c7b..25ea5308949 100644
--- a/ext/standard/tests/file/realpath_variation-win32-mb.phpt
+++ b/ext/standard/tests/file/realpath_variation-win32-mb.phpt
@@ -43,7 +43,7 @@ $file_arr = array (
   "$name_prefix/./realpath_variation_��ガラスを食�られ��/home/../home//tests//..//..//..//home//realpath_variation_��ガラスを食�られ��.tmp/"
 );
 
-var_dump( realpath($file_arr[0]) ); 
+var_dump( realpath($file_arr[0]) );
 var_dump( realpath($file_arr[1]) );
 
 echo "\n*** Testing realpath() with filename as empty string, NULL and single space ***\n";
@@ -62,7 +62,7 @@ for($loop_counter = 0; $loop_counter < count($file_string); $loop_counter++) {
   echo "-- Iteration";
   echo $loop_counter + 1;
   echo " --\n";
-  var_dump( realpath($file_string[$loop_counter]) ); 
+  var_dump( realpath($file_string[$loop_counter]) );
 }
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/realpath_variation-win32.phpt b/ext/standard/tests/file/realpath_variation-win32.phpt
index f58f6189939..8049d4c69ad 100644
--- a/ext/standard/tests/file/realpath_variation-win32.phpt
+++ b/ext/standard/tests/file/realpath_variation-win32.phpt
@@ -43,7 +43,7 @@ $file_arr = array (
   "$name_prefix/./realpath_variation/home/../home//tests//..//..//..//home//realpath_variation.tmp/"
 );
 
-var_dump( realpath($file_arr[0]) ); 
+var_dump( realpath($file_arr[0]) );
 var_dump( realpath($file_arr[1]) );
 
 echo "\n*** Testing realpath() with filename as empty string, NULL and single space ***\n";
@@ -62,7 +62,7 @@ for($loop_counter = 0; $loop_counter < count($file_string); $loop_counter++) {
   echo "-- Iteration";
   echo $loop_counter + 1;
   echo " --\n";
-  var_dump( realpath($file_string[$loop_counter]) ); 
+  var_dump( realpath($file_string[$loop_counter]) );
 }
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/realpath_variation2.phpt b/ext/standard/tests/file/realpath_variation2.phpt
index a5031aa7b5d..0c8bdb87e5a 100644
--- a/ext/standard/tests/file/realpath_variation2.phpt
+++ b/ext/standard/tests/file/realpath_variation2.phpt
@@ -10,23 +10,23 @@ if(substr(PHP_OS, 0, 3) == 'WIN' )
 --FILE--
 <?php
 /* Prototype  : string realpath(string path)
- * Description: Return the resolved path 
+ * Description: Return the resolved path
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing realpath() : variation ***\n";
 
-$paths = array('c:\\', 
-               'c:', 
-               'c' , 
-               '\\' , 
-               '/', 
-               'c:temp', 
-               'c:\\/', 
+$paths = array('c:\\',
+               'c:',
+               'c' ,
+               '\\' ,
+               '/',
+               'c:temp',
+               'c:\\/',
                '/tmp/',
-               '/tmp/\\', 
-               '\\tmp',                 
+               '/tmp/\\',
+               '\\tmp',
                '\\tmp\\');
 
 foreach($paths as $path) {
diff --git a/ext/standard/tests/file/rename_basic.phpt b/ext/standard/tests/file/rename_basic.phpt
index c589c514e41..238333e776c 100644
--- a/ext/standard/tests/file/rename_basic.phpt
+++ b/ext/standard/tests/file/rename_basic.phpt
@@ -25,7 +25,7 @@ var_dump( file_exists($dest_name) ); // expecting true
 $new_stat = stat("$file_path/rename_basic_new.tmp");
 
 // checking statistics of old and renamed file - both should be same except ctime
-$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 
+$keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12,
                        "dev", "ino", "mode", "nlink", "uid", "gid",
                        "rdev", "size", "atime", "mtime", "blksize", "blocks");
 var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) );
diff --git a/ext/standard/tests/file/rename_error.phpt b/ext/standard/tests/file/rename_error.phpt
index fae2b4f3738..e0ea2043c9f 100644
--- a/ext/standard/tests/file/rename_error.phpt
+++ b/ext/standard/tests/file/rename_error.phpt
@@ -8,7 +8,7 @@ Test rename() function: error conditions
 
 echo "*** Testing rename() for error conditions ***\n";
 //Zero argument
-var_dump( rename() );  
+var_dump( rename() );
 
 // less than expected,1 argument
 var_dump( rename(__FILE__) );
@@ -17,7 +17,7 @@ var_dump( rename(__FILE__) );
 $context = stream_context_create();
 $filename = __FILE__;
 $new_filename = __FILE__.".tmp";
-var_dump( rename($filename, $new_filename, $context, "extra_args") ); 
+var_dump( rename($filename, $new_filename, $context, "extra_args") );
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/file/rename_variation-win32.phpt b/ext/standard/tests/file/rename_variation-win32.phpt
index a10c6dfbe70..828837a84d3 100644
--- a/ext/standard/tests/file/rename_variation-win32.phpt
+++ b/ext/standard/tests/file/rename_variation-win32.phpt
@@ -41,16 +41,16 @@ foreach($src_filenames as $src_filename) {
   $dest_filename = "$file_path/rename_variation2.tmp";
   var_dump( rename($src_filename, $dest_filename) );
 
-  // ensure that file got renamed to new name 
+  // ensure that file got renamed to new name
   var_dump( file_exists($src_filename) );  // expecting false
   var_dump( file_exists($dest_filename) );  // expecting true
   $counter++;
- 
-  // unlink the file  
+
+  // unlink the file
   unlink($dest_filename);
 }
 
-rmdir("$file_path/rename_variation"); 
+rmdir("$file_path/rename_variation");
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/file/rename_variation.phpt b/ext/standard/tests/file/rename_variation.phpt
index 00dc309982b..2f25d193f5e 100644
--- a/ext/standard/tests/file/rename_variation.phpt
+++ b/ext/standard/tests/file/rename_variation.phpt
@@ -33,17 +33,17 @@ foreach($src_filenames as $src_filename) {
   fclose($fp);
   $dest_filename = "$file_path/rename_variation2.tmp";
   var_dump( rename($src_filename, $dest_filename) );
-  // ensure that file got renamed to new name 
+  // ensure that file got renamed to new name
   var_dump( file_exists($src_filename) );  // expecting false
   var_dump( file_exists($dest_filename) );  // expecting true
   $counter++;
- 
-  // unlink the file  
+
+  // unlink the file
   unlink($dest_filename);
 }
 
 // clean the temp dir and file
-rmdir("$file_path/rename_variation"); 
+rmdir("$file_path/rename_variation");
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/file/rename_variation1-win32.phpt b/ext/standard/tests/file/rename_variation1-win32.phpt
index 0955096d763..2196e107219 100644
--- a/ext/standard/tests/file/rename_variation1-win32.phpt
+++ b/ext/standard/tests/file/rename_variation1-win32.phpt
@@ -45,7 +45,7 @@ foreach($src_dirs as $src_dir) {
   mkdir("$file_path/rename_variation/");
   // rename the src dir to a new dir in dest dir
   var_dump( rename($src_dir, $dest_dir."/new_dir") );
-  // ensure that dir was renamed 
+  // ensure that dir was renamed
   var_dump( file_exists($src_dir) );  // expecting false
   var_dump( file_exists($dest_dir."/new_dir") ); // expecting true
 
diff --git a/ext/standard/tests/file/rename_variation1.phpt b/ext/standard/tests/file/rename_variation1.phpt
index 54338d74601..f37bba0108a 100644
--- a/ext/standard/tests/file/rename_variation1.phpt
+++ b/ext/standard/tests/file/rename_variation1.phpt
@@ -38,7 +38,7 @@ foreach($src_dirs as $src_dir) {
   mkdir("$file_path/rename_variation1/");
   // rename the src dir to a new dir in dest dir
   var_dump( rename($src_dir, $dest_dir."/new_dir") );
-  // ensure that dir was renamed 
+  // ensure that dir was renamed
   var_dump( file_exists($src_dir) );  // expecting false
   var_dump( file_exists($dest_dir."/new_dir") ); // expecting true
 
diff --git a/ext/standard/tests/file/rename_variation10.phpt b/ext/standard/tests/file/rename_variation10.phpt
index 42909ee484d..52efd783483 100644
--- a/ext/standard/tests/file/rename_variation10.phpt
+++ b/ext/standard/tests/file/rename_variation10.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : bool rename(string old_name, string new_name[, resource context])
- * Description: Rename a file 
+ * Description: Rename a file
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing rename() : usage variation ***\n";
@@ -104,7 +104,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // file resource
       'file resource' => $fileRes,
 );
diff --git a/ext/standard/tests/file/rename_variation11-win32.phpt b/ext/standard/tests/file/rename_variation11-win32.phpt
index c13a09a9513..e940f780703 100644
--- a/ext/standard/tests/file/rename_variation11-win32.phpt
+++ b/ext/standard/tests/file/rename_variation11-win32.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : bool rename(string old_name, string new_name[, resource context])
- * Description: Rename a file 
+ * Description: Rename a file
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing rename() with absolute and relative paths ***\n";
@@ -39,14 +39,14 @@ $allDirs = array(
   "$absSubDir\\..\\..\\".$mainDir."\\.\\".$subDir,
   "$absSubDir\\..\\\\\\".$subDir."\\\\..\\\\..\\".$subDir,
   "$absSubDir\\BADDIR",
-  
+
   // relative paths
   $mainDir."\\".$subDir,
-  $mainDir."\\\\".$subDir, 
-   $mainDir."\\\\\\".$subDir, 
+  $mainDir."\\\\".$subDir,
+   $mainDir."\\\\\\".$subDir,
   ".\\".$mainDir."\\..\\".$mainDir."\\".$subDir,
-  "BADDIR",  
-  
+  "BADDIR",
+
   // unixifed path
   $unixifiedDir,
 );
diff --git a/ext/standard/tests/file/rename_variation12-win32.phpt b/ext/standard/tests/file/rename_variation12-win32.phpt
index de5fc140043..064daa4dfe4 100644
--- a/ext/standard/tests/file/rename_variation12-win32.phpt
+++ b/ext/standard/tests/file/rename_variation12-win32.phpt
@@ -9,9 +9,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') die('skip..  for Windows');
 --FILE--
 <?php
 /* Prototype  : bool rename(string old_name, string new_name[, resource context])
- * Description: Rename a file 
+ * Description: Rename a file
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /* Creating unique files in various dirs by passing relative paths to $dir arg */
@@ -38,14 +38,14 @@ $allDirs = array(
   "$absSubDir/../../".$mainDir."/./".$subDir,
   "$absSubDir/..///".$subDir."//..//../".$subDir,
   "$absSubDir/BADDIR",
-  
-  
+
+
   // relative paths
   $mainDir."/".$subDir,
-  $mainDir."//".$subDir, 
-   $mainDir."///".$subDir, 
+  $mainDir."//".$subDir,
+   $mainDir."///".$subDir,
   "./".$mainDir."/../".$mainDir."/".$subDir,
-  "BADDIR",  
+  "BADDIR",
 );
 
 for($i = 0; $i<count($allDirs); $i++) {
diff --git a/ext/standard/tests/file/rename_variation12.phpt b/ext/standard/tests/file/rename_variation12.phpt
index 168beeffc97..a423496fbc9 100644
--- a/ext/standard/tests/file/rename_variation12.phpt
+++ b/ext/standard/tests/file/rename_variation12.phpt
@@ -9,9 +9,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die('skip..  not for Windows');
 --FILE--
 <?php
 /* Prototype  : bool rename(string old_name, string new_name[, resource context])
- * Description: Rename a file 
+ * Description: Rename a file
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /* Creating unique files in various dirs by passing relative paths to $dir arg */
@@ -38,14 +38,14 @@ $allDirs = array(
   "$absSubDir/../../".$mainDir."/./".$subDir,
   "$absSubDir/..///".$subDir."//..//../".$subDir,
   "$absSubDir/BADDIR",
-  
-  
+
+
   // relative paths
   $mainDir."/".$subDir,
-  $mainDir."//".$subDir, 
-   $mainDir."///".$subDir, 
+  $mainDir."//".$subDir,
+   $mainDir."///".$subDir,
   "./".$mainDir."/../".$mainDir."/".$subDir,
-  "BADDIR",  
+  "BADDIR",
 );
 
 for($i = 0; $i<count($allDirs); $i++) {
diff --git a/ext/standard/tests/file/rename_variation13-win32.phpt b/ext/standard/tests/file/rename_variation13-win32.phpt
index a5030761a50..894cfb26149 100644
Binary files a/ext/standard/tests/file/rename_variation13-win32.phpt and b/ext/standard/tests/file/rename_variation13-win32.phpt differ
diff --git a/ext/standard/tests/file/rename_variation13.phpt b/ext/standard/tests/file/rename_variation13.phpt
index ec1ee7c78d7..2686150f23c 100644
--- a/ext/standard/tests/file/rename_variation13.phpt
+++ b/ext/standard/tests/file/rename_variation13.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : bool rename(string old_name, string new_name[, resource context])
- * Description: Rename a file 
+ * Description: Rename a file
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing rename() with obscure files ***\n";
@@ -21,9 +21,9 @@ $aFile = $file_path.'/afile.tmp';
 
 mkdir($file_path);
 
-/* An array of files */ 
+/* An array of files */
 $names_arr = array(
-  /* Invalid args */ 
+  /* Invalid args */
   -1,
   TRUE,
   FALSE,
@@ -34,7 +34,7 @@ $names_arr = array(
   array(),
 
   /* prefix with path separator of a non existing directory*/
-  "/no/such/file/dir", 
+  "/no/such/file/dir",
   "php/php"
 
 );
diff --git a/ext/standard/tests/file/rename_variation2.phpt b/ext/standard/tests/file/rename_variation2.phpt
index 1e0a5d9edd3..5b0591b0ce2 100644
--- a/ext/standard/tests/file/rename_variation2.phpt
+++ b/ext/standard/tests/file/rename_variation2.phpt
@@ -29,7 +29,7 @@ var_dump(symlink($filename, $linkname));
 //rename the link to a new name in the same dir
 $dest_linkname = $file_path."/rename_variation2_soft_link2.tmp";
 var_dump( rename( $linkname, $dest_linkname) );
-//ensure that link was renamed 
+//ensure that link was renamed
 clearstatcache();
 var_dump( file_exists($linkname) );  // expecting false
 var_dump( file_exists($dest_linkname) );  // expecting true
@@ -41,7 +41,7 @@ clearstatcache();
 var_dump( file_exists($dest_linkname) );  // expecting false
 var_dump( file_exists($dest_dir."/rename_variation2_soft_link2.tmp") ); // expecting true
 
-// delete the link file now 
+// delete the link file now
 unlink($dest_dir."/rename_variation2_soft_link2.tmp");
 
 echo "Done\n";
diff --git a/ext/standard/tests/file/rename_variation3-win32.phpt b/ext/standard/tests/file/rename_variation3-win32.phpt
index b5da5878111..5f071fb5b92 100644
--- a/ext/standard/tests/file/rename_variation3-win32.phpt
+++ b/ext/standard/tests/file/rename_variation3-win32.phpt
@@ -16,13 +16,13 @@ require dirname(__FILE__).'/file.inc';
 
 /* creating directory */
 $file_path = dirname(__FILE__);
-$dirname = "$file_path/rename_variation3_dir"; 
+$dirname = "$file_path/rename_variation3_dir";
 mkdir($dirname);
 
 /* test rename() by trying to rename an existing file/dir to the same name
   and one another */
 
-$filename = "$file_path/rename_variation3.tmp"; 
+$filename = "$file_path/rename_variation3.tmp";
 $fp = fopen($filename, "w");
 if (!$fp) {
 	die("Cannot create $filename\n");
diff --git a/ext/standard/tests/file/rename_variation5.phpt b/ext/standard/tests/file/rename_variation5.phpt
index 2518cf48ea8..8ea2499eed0 100644
--- a/ext/standard/tests/file/rename_variation5.phpt
+++ b/ext/standard/tests/file/rename_variation5.phpt
@@ -11,12 +11,12 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 
 /* test rename() by trying to rename an existing file/dir/link to the same name
   and one another */
-// create a dir 
+// create a dir
 $file_path = dirname(__FILE__);
-$dirname = "$file_path/rename_variation5_dir"; 
+$dirname = "$file_path/rename_variation5_dir";
 mkdir($dirname);
 //create a file
-$filename = "$file_path/rename_variation5.tmp"; 
+$filename = "$file_path/rename_variation5.tmp";
 $fp = fopen($filename, "w");
 fclose($fp);
 // create a link
diff --git a/ext/standard/tests/file/rename_variation6-win32.phpt b/ext/standard/tests/file/rename_variation6-win32.phpt
index dfb57f2e198..9129bd871e6 100644
--- a/ext/standard/tests/file/rename_variation6-win32.phpt
+++ b/ext/standard/tests/file/rename_variation6-win32.phpt
@@ -34,7 +34,7 @@ var_dump(file_exists($tmp_file));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: readlink(): %s in %s on line %d
 bool(false)
 string(%d) "%srename_variation6-win32.php.tmp"
diff --git a/ext/standard/tests/file/rename_variation6.phpt b/ext/standard/tests/file/rename_variation6.phpt
index 413dc6e045e..3385d141340 100644
--- a/ext/standard/tests/file/rename_variation6.phpt
+++ b/ext/standard/tests/file/rename_variation6.phpt
@@ -28,7 +28,7 @@ var_dump(file_exists($tmp_file));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: readlink(): No such file or directory in %s on line %d
 bool(false)
 string(%d) "%srename_variation6.php.tmp"
diff --git a/ext/standard/tests/file/rename_variation7-win32.phpt b/ext/standard/tests/file/rename_variation7-win32.phpt
index 369e8c2d43b..a9643b44915 100644
--- a/ext/standard/tests/file/rename_variation7-win32.phpt
+++ b/ext/standard/tests/file/rename_variation7-win32.phpt
@@ -25,7 +25,7 @@ var_dump(readlink($tmp_link2));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: symlink(): Could not fetch file information(error 2) in %srename_variation7-win32.php on line %d
 
 Warning: readlink(): readlink failed to read the symbolic link (%srename_variation7-win32.php.tmp.link), error 2) in %srename_variation7-win32.php on line %d
diff --git a/ext/standard/tests/file/rename_variation7.phpt b/ext/standard/tests/file/rename_variation7.phpt
index 5b937728f8c..dc5ce429b6d 100644
--- a/ext/standard/tests/file/rename_variation7.phpt
+++ b/ext/standard/tests/file/rename_variation7.phpt
@@ -24,7 +24,7 @@ var_dump(readlink($tmp_link2));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: readlink(): No such file or directory in %s on line %d
 bool(false)
 string(%d) "%sthere_is_no_such_file"
diff --git a/ext/standard/tests/file/rename_variation8-win32.phpt b/ext/standard/tests/file/rename_variation8-win32.phpt
index 7be25949f60..b3a1797c7a7 100644
--- a/ext/standard/tests/file/rename_variation8-win32.phpt
+++ b/ext/standard/tests/file/rename_variation8-win32.phpt
@@ -32,7 +32,7 @@ var_dump( rename($dir_name, $new_dir_name) );
 var_dump( file_exists($dir_name) );  // expecting false
 var_dump( file_exists($new_dir_name) );  // expecting true
 
-// try to rename an non_existing dir 
+// try to rename an non_existing dir
 echo "\n*** Testing rename() on non-existing directory ***\n";
 $non_existent_dir_name = $file_path."/non_existent_dir";
 $new_dir_name = "$file_path/rename_basic_dir2";
diff --git a/ext/standard/tests/file/rename_variation8.phpt b/ext/standard/tests/file/rename_variation8.phpt
index 6e236c376cf..2026a249bcf 100644
--- a/ext/standard/tests/file/rename_variation8.phpt
+++ b/ext/standard/tests/file/rename_variation8.phpt
@@ -32,7 +32,7 @@ var_dump( rename($dir_name, $new_dir_name) );
 var_dump( file_exists($dir_name) );  // expecting false
 var_dump( file_exists($new_dir_name) );  // expecting true
 
-// try to rename an non_existing dir 
+// try to rename an non_existing dir
 echo "\n*** Testing rename() on non-existing directory ***\n";
 $non_existent_dir_name = $file_path."/non_existent_dir";
 $new_dir_name = "$file_path/rename_basic_dir2";
diff --git a/ext/standard/tests/file/rmdir_variation1-win32.phpt b/ext/standard/tests/file/rmdir_variation1-win32.phpt
index 2516e6162e4..5a958631d98 100644
--- a/ext/standard/tests/file/rmdir_variation1-win32.phpt
+++ b/ext/standard/tests/file/rmdir_variation1-win32.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : bool rmdir(string dirname[, resource context])
- * Description: Remove a directory 
+ * Description: Remove a directory
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing rmdir() : usage variation ***\n";
@@ -71,7 +71,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // other
       // php outputs Permission Denied, p8 outputs no suck file or dir
       'single space' => ' ',
diff --git a/ext/standard/tests/file/rmdir_variation1.phpt b/ext/standard/tests/file/rmdir_variation1.phpt
index 04fee0ee2a0..0556266efab 100644
--- a/ext/standard/tests/file/rmdir_variation1.phpt
+++ b/ext/standard/tests/file/rmdir_variation1.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : bool rmdir(string dirname[, resource context])
- * Description: Remove a directory 
+ * Description: Remove a directory
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing rmdir() : usage variation ***\n";
@@ -72,7 +72,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // other
       'single space' => ' ',
 );
diff --git a/ext/standard/tests/file/rmdir_variation2.phpt b/ext/standard/tests/file/rmdir_variation2.phpt
index 7b4311c2455..2b4f607aded 100644
--- a/ext/standard/tests/file/rmdir_variation2.phpt
+++ b/ext/standard/tests/file/rmdir_variation2.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : bool rmdir(string dirname[, resource context])
- * Description: Remove a directory 
+ * Description: Remove a directory
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing rmdir() : usage variation ***\n";
@@ -102,7 +102,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // non stream context resource
       $fileres,
 );
diff --git a/ext/standard/tests/file/rmdir_variation3-win32.phpt b/ext/standard/tests/file/rmdir_variation3-win32.phpt
index e6b3eaabb6f..2418ccfd5f9 100644
--- a/ext/standard/tests/file/rmdir_variation3-win32.phpt
+++ b/ext/standard/tests/file/rmdir_variation3-win32.phpt
@@ -6,13 +6,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 <?php
 if(substr(PHP_OS, 0, 3) != "WIN")
   die("skip Only valid for Windows");
-?>  
+?>
 --FILE--
 <?php
 /* Prototype  : bool rmdir(string dirname[, resource context])
- * Description: Remove a directory 
+ * Description: Remove a directory
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing rmdir() : variation ***\n";
@@ -29,36 +29,36 @@ $dirs = array(
              $workDir.'\\'.$subDir,
              '.\\'.$workDir.'\\'.$subDir,
              $workDir.'\\..\\'.$workDir.'\\'.$subDir,
-             
+
              // relative bad path
              $workDir.'\\..\\BADDIR\\'.$subDir,
              'BADDIR\\'.$subDir,
-             
+
              //absolute
              $cwd.'\\'.$workDir.'\\'.$subDir,
              $cwd.'\\.\\'.$workDir.'\\'.$subDir,
              $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$subDir,
 
-             //absolute bad path             
+             //absolute bad path
              $cwd.'\\BADDIR\\'.$subDir,
-             
+
              //trailing separators
              $workDir.'\\'.$subDir.'\\',
              $cwd.'\\'.$workDir.'\\'.$subDir.'\\',
-             
+
              // multiple separators
              $workDir.'\\\\'.$subDir,
              $cwd.'\\\\'.$workDir.'\\\\'.$subDir,
-             
+
              // Unixified Dir
-             $unixifiedDir,             
-             
+             $unixifiedDir,
+
              );
-             
+
 
 foreach($dirs as $dir) {
    mkdir($workDir.'/'.$subDir);
-   echo "-- removing $dir --\n";           
+   echo "-- removing $dir --\n";
    $res = rmdir($dir);
    if ($res === true) {
       echo "Directory removed\n";
diff --git a/ext/standard/tests/file/rmdir_variation3.phpt b/ext/standard/tests/file/rmdir_variation3.phpt
index 58480073955..fd700a00620 100644
--- a/ext/standard/tests/file/rmdir_variation3.phpt
+++ b/ext/standard/tests/file/rmdir_variation3.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test rmdir() function : variation: various valid and invalid paths 
+Test rmdir() function : variation: various valid and invalid paths
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : bool rmdir(string dirname[, resource context])
- * Description: Remove a directory 
+ * Description: Remove a directory
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing rmdir() : variation ***\n";
@@ -22,33 +22,33 @@ $dirs = array(
              $workDir.'/'.$subDir,
              './'.$workDir.'/'.$subDir,
              $workDir.'/../'.$workDir.'/'.$subDir,
-             
+
              // relative bad path
              $workDir.'/../BADDIR/'.$subDir,
              'BADDIR/'.$subDir,
-             
+
              //absolute
              $cwd.'/'.$workDir.'/'.$subDir,
              $cwd.'/./'.$workDir.'/'.$subDir,
              $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDir,
 
-             //absolute bad path             
+             //absolute bad path
              $cwd.'/BADDIR/'.$subDir,
-             
+
              //trailing separators
              $workDir.'/'.$subDir.'/',
              $cwd.'/'.$workDir.'/'.$subDir.'/',
-             
+
              // multiple separators
              $workDir.'//'.$subDir,
              $cwd.'//'.$workDir.'//'.$subDir,
-             
+
              );
-             
+
 
 foreach($dirs as $dir) {
    mkdir($workDir.'/'.$subDir);
-   echo "-- removing $dir --\n";           
+   echo "-- removing $dir --\n";
    $res = rmdir($dir);
    if ($res === true) {
       echo "Directory removed\n";
diff --git a/ext/standard/tests/file/stat_basic-win32-mb.phpt b/ext/standard/tests/file/stat_basic-win32-mb.phpt
index 334eb9ea657..c5f4e6c7ab8 100644
--- a/ext/standard/tests/file/stat_basic-win32-mb.phpt
+++ b/ext/standard/tests/file/stat_basic-win32-mb.phpt
@@ -40,17 +40,17 @@ sleep(2);
 $new_dir_stat = stat($dirname);
 clearstatcache();
 
-// stat contains 13 different values stored twice, can be accessed using 
-// numeric and named keys, compare them to see they are same  
+// stat contains 13 different values stored twice, can be accessed using
+// numeric and named keys, compare them to see they are same
 echo "*** Testing stat(): validating the values stored in stat ***\n";
 // Initial stat values
 var_dump( compare_self_stat($file_stat) ); //expect true
 var_dump( compare_self_stat($dir_stat) );  //expect true
 
-// New stat values taken after creation of file 
+// New stat values taken after creation of file
 var_dump( compare_self_stat($new_dir_stat) );  // expect true
 
-// compare the two stat values, initial stat and stat recorded after 
+// compare the two stat values, initial stat and stat recorded after
 // creating file, also dump the value of stats
 echo "*** Testing stat(): comparing stats (recorded before and after file creation) ***\n";
 echo "-- comparing difference in dir stats before and after creating file in it --\n";
diff --git a/ext/standard/tests/file/stat_basic-win32.phpt b/ext/standard/tests/file/stat_basic-win32.phpt
index e3e7ea7eb52..cde62730bd5 100644
--- a/ext/standard/tests/file/stat_basic-win32.phpt
+++ b/ext/standard/tests/file/stat_basic-win32.phpt
@@ -40,17 +40,17 @@ sleep(2);
 $new_dir_stat = stat($dirname);
 clearstatcache();
 
-// stat contains 13 different values stored twice, can be accessed using 
-// numeric and named keys, compare them to see they are same  
+// stat contains 13 different values stored twice, can be accessed using
+// numeric and named keys, compare them to see they are same
 echo "*** Testing stat(): validating the values stored in stat ***\n";
 // Initial stat values
 var_dump( compare_self_stat($file_stat) ); //expect true
 var_dump( compare_self_stat($dir_stat) );  //expect true
 
-// New stat values taken after creation of file 
+// New stat values taken after creation of file
 var_dump( compare_self_stat($new_dir_stat) );  // expect true
 
-// compare the two stat values, initial stat and stat recorded after 
+// compare the two stat values, initial stat and stat recorded after
 // creating file, also dump the value of stats
 echo "*** Testing stat(): comparing stats (recorded before and after file creation) ***\n";
 echo "-- comparing difference in dir stats before and after creating file in it --\n";
diff --git a/ext/standard/tests/file/stat_error-win32.phpt b/ext/standard/tests/file/stat_error-win32.phpt
index 1b69da8bf5b..3614ba5f7e3 100644
--- a/ext/standard/tests/file/stat_error-win32.phpt
+++ b/ext/standard/tests/file/stat_error-win32.phpt
@@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
    Description: Gives information about a file
 */
 
-$file_path = dirname(__FILE__); 
+$file_path = dirname(__FILE__);
 $arr = array(__FILE__);
 
 echo "\n*** Testing stat() for error conditions ***\n";
diff --git a/ext/standard/tests/file/stat_variation1-win32-mb.phpt b/ext/standard/tests/file/stat_variation1-win32-mb.phpt
index dcba28698fd..0c91b2afbc3 100644
--- a/ext/standard/tests/file/stat_variation1-win32-mb.phpt
+++ b/ext/standard/tests/file/stat_variation1-win32-mb.phpt
@@ -39,11 +39,11 @@ sleep(2);
 var_dump( rename($old_filename, $new_filename) );
 $new_stat = stat($new_filename);
 
-// compare the self stat 
+// compare the self stat
 var_dump( compare_self_stat($old_stat) );
 var_dump( compare_self_stat($new_stat) );
 
-// compare the two stats 
+// compare the two stats
 var_dump( compare_stats($old_stat, $old_stat, $all_stat_keys) );
 // clear the cache
 clearstatcache();
diff --git a/ext/standard/tests/file/stat_variation1-win32.phpt b/ext/standard/tests/file/stat_variation1-win32.phpt
index abbc88f945a..e3be517cfa9 100644
--- a/ext/standard/tests/file/stat_variation1-win32.phpt
+++ b/ext/standard/tests/file/stat_variation1-win32.phpt
@@ -39,11 +39,11 @@ sleep(2);
 var_dump( rename($old_filename, $new_filename) );
 $new_stat = stat($new_filename);
 
-// compare the self stat 
+// compare the self stat
 var_dump( compare_self_stat($old_stat) );
 var_dump( compare_self_stat($new_stat) );
 
-// compare the two stats 
+// compare the two stats
 var_dump( compare_stats($old_stat, $old_stat, $all_stat_keys) );
 // clear the cache
 clearstatcache();
diff --git a/ext/standard/tests/file/statpage.phpt b/ext/standard/tests/file/statpage.phpt
index f11be9734c8..5bd4183c212 100644
--- a/ext/standard/tests/file/statpage.phpt
+++ b/ext/standard/tests/file/statpage.phpt
@@ -11,7 +11,7 @@ var_dump(getmygid());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(%d)
 int(%d)
 int(%d)
diff --git a/ext/standard/tests/file/stream_001.phpt b/ext/standard/tests/file/stream_001.phpt
index eece30a2f51..6e692c554a9 100644
--- a/ext/standard/tests/file/stream_001.phpt
+++ b/ext/standard/tests/file/stream_001.phpt
@@ -10,7 +10,7 @@ var_dump(fopen("file://".__FILE__, "r"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 
 Warning: fopen(): Unable to find the wrapper "file" - did you forget to enable it when you configured PHP? in %s on line %d
diff --git a/ext/standard/tests/file/stream_002.phpt b/ext/standard/tests/file/stream_002.phpt
index e982f704c4f..b18dd85b311 100644
--- a/ext/standard/tests/file/stream_002.phpt
+++ b/ext/standard/tests/file/stream_002.phpt
@@ -20,7 +20,7 @@ var_dump($a, $b);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: stream_socket_client(): unable to connect to  (Failed to parse address "") in %s on line %d
 bool(false)
 int(0)
diff --git a/ext/standard/tests/file/stream_copy_to_stream.phpt b/ext/standard/tests/file/stream_copy_to_stream.phpt
index 716ae1f4624..1cc57b7f6d7 100644
--- a/ext/standard/tests/file/stream_copy_to_stream.phpt
+++ b/ext/standard/tests/file/stream_copy_to_stream.phpt
@@ -111,7 +111,7 @@ unlink($new_file);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(0)
 string(0) ""
 int(%d)
diff --git a/ext/standard/tests/file/stream_rfc2397_007.phpt b/ext/standard/tests/file/stream_rfc2397_007.phpt
index b62f19cd374..87e519de880 100644
--- a/ext/standard/tests/file/stream_rfc2397_007.phpt
+++ b/ext/standard/tests/file/stream_rfc2397_007.phpt
@@ -14,7 +14,7 @@ foreach($streams as $stream)
 	echo "===$stream===\n";
 
 	$fp = fopen($stream, 'rb');
-	
+
 	var_dump(ftell($fp));
 	var_dump(feof($fp));
 	echo "===S:4,S===\n";
diff --git a/ext/standard/tests/file/stream_supports_lock.phpt b/ext/standard/tests/file/stream_supports_lock.phpt
index bbf3993b6ba..38a84dd7c2a 100644
--- a/ext/standard/tests/file/stream_supports_lock.phpt
+++ b/ext/standard/tests/file/stream_supports_lock.phpt
@@ -30,7 +30,7 @@ var_dump(stream_supports_lock($sock));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 bool(true)
 resource(%d) of type (stream)
diff --git a/ext/standard/tests/file/symlink.phpt b/ext/standard/tests/file/symlink.phpt
index 489c26644f6..228e459297a 100644
--- a/ext/standard/tests/file/symlink.phpt
+++ b/ext/standard/tests/file/symlink.phpt
@@ -44,7 +44,7 @@ var_dump(linkinfo("."));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 string(%d) "%ssymlink.dat"
 int(%d)
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt
index 416e6ae323c..09fb35c973a 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic1.phpt
@@ -50,7 +50,7 @@ $files = array (
 );
 
 $counter = 1;
-/* create soft/hard link to  the file 
+/* create soft/hard link to  the file
    and check linkinfo() and is_link() on the link created */
 foreach($files as $file) {
   echo "\n-- Iteration $counter --\n";
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt
index b1b1afc7401..12e5da17e86 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation1.phpt
@@ -23,7 +23,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 
 /* Variation 1 : Creating links across directories where linkname is stored as an object and array member */
 
-// creating temp directory which will contain temp file and links created 
+// creating temp directory which will contain temp file and links created
 $file_path = dirname(__FILE__);
 $dirname = "$file_path/symlink_link_linkinfo_is_link_variation1/test/home";
 mkdir($dirname, 0777, true);
@@ -58,11 +58,11 @@ clearstatcache();
 /* Testing on hard links */
 echo "\n-- Working with hard links --\n";
 // creating hard link
-var_dump( link($filename, $obj->linkname) ); 
+var_dump( link($filename, $obj->linkname) );
 // check if the link exists
 var_dump( linkinfo($obj->linkname) );
 // check if link is soft link; expected: false as the link is a hardlink
-var_dump( is_link($obj->linkname) ); 
+var_dump( is_link($obj->linkname) );
 // delete the link created
 unlink($obj->linkname);
 // clear the cache
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt
index 21c9b576540..cbe4785ed08 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt
@@ -22,7 +22,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 */
 
 /* Variation 3 : Create file and a soft link to the file
-                 Access data of the file through the soft link 
+                 Access data of the file through the soft link
                  Update the file through soft link
                  Check size of file and soft link link
 */
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt
index f58937cd128..9d57c41f7e3 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt
@@ -22,7 +22,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 */
 
 /* Variation 4 : Create file and a hard link to the file
-                 Access data of the file through the hard link 
+                 Access data of the file through the hard link
                  Update the file through hard link
                  Check size of file and hard link
 */
@@ -45,7 +45,7 @@ $data_from_link = file_get_contents($linkname);  // data read from $filename
 var_dump( $data_from_link );
 
 echo "\n-- Check size of hard link and file --\n";
-if( filesize($filename) == filesize($linkname) ) 
+if( filesize($filename) == filesize($linkname) )
   echo "\nSize of file and hard link are same\n";
 else
   echo "\nWarning: Size of file and hard link differ\n";
@@ -61,7 +61,7 @@ $data_from_file = file_get_contents($filename);
 var_dump( $data_from_file );
 
 echo "\n-- Check size of hard link and file --\n";
-if( filesize($filename) == filesize($linkname) ) 
+if( filesize($filename) == filesize($linkname) )
   echo "\nSize of file and hard link are same\n";
 else
   echo "\nWarning: Size of file and hard link differ\n";
@@ -79,7 +79,7 @@ var_dump( $data_from_link );
 echo "\n-- Check size of hard link and file --\n";
 var_dump( filesize($filename) );
 var_dump( filesize($linkname) );
-if( filesize($filename) == filesize($linkname) ) 
+if( filesize($filename) == filesize($linkname) )
   echo "\nSize of file and hard link are same\n";
 else
   echo "\nWarning: Size of file and hard link differ\n";
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
index 9b9afba10dc..fe4f40a2b2a 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
@@ -54,7 +54,7 @@ echo "\n-- Working with soft links --\n";
 $linkname = "$dirname/non_existent_link_variation5.tmp";
 
 // expected: false
-var_dump( symlink($filename, $linkname) ); // this link won't get created 
+var_dump( symlink($filename, $linkname) ); // this link won't get created
 var_dump( linkinfo($linkname) );
 var_dump( is_link($linkname) );
 // clear the cache
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt
index 82ca75b64d0..df63dcfc5d1 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation7.phpt
@@ -33,7 +33,7 @@ $linkname = "$dir/symlink_link_linkinfo_is_link_link_variation7.tmp";
 $dirname = "$dir/home/test";
 mkdir($dirname, 0755, true);
 
-// create file 
+// create file
 $fp = fopen($filename, "w");
 fclose($fp);
 
diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt
index aacbcd4b3fb..8a771b27b9a 100644
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation9.phpt
@@ -21,7 +21,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
    Description: Gets information about a link
 */
 
-/* Variation 9 : Check lstat of soft/hard link created 
+/* Variation 9 : Check lstat of soft/hard link created
                  Check linkinfo() value with lstat['dev']
 */
 // temp file used
@@ -34,7 +34,7 @@ $soft_link = "$dirname/symlink_link_linkinfo_is_link_softlink_variation9.tmp";
 // hard link name used
 $hard_link = "$dirname/symlink_link_linkinfo_is_link_hardlink_variation9.tmp";
 
-// create the file 
+// create the file
 $fp = fopen($filename, "w");
 fclose($fp);
 
diff --git a/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt b/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt
index 4d985410dac..3e659c092c7 100644
--- a/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt
+++ b/ext/standard/tests/file/tempnam_variation1-win32-mb.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test tempnam() function: usage variations - creating files 
+Test tempnam() function: usage variations - creating files
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != "WIN")
@@ -21,24 +21,24 @@ for($i=1; $i<=10; $i++) {
   echo "-- Iteration $i --\n";
   $files[$i] = tempnam("$file_path", "tempnam_variation1.tmp");
 
-  if( file_exists($files[$i]) ) { 
+  if( file_exists($files[$i]) ) {
 
-    echo "File name is => "; 
+    echo "File name is => ";
     print($files[$i]);
     echo "\n";
-  
+
     echo "File permissions are => ";
     printf("%o", fileperms($files[$i]) );
     echo "\n";
     clearstatcache();
 
     echo "File created in => ";
-    $file_dir = dirname($files[$i]);    
-        
+    $file_dir = dirname($files[$i]);
+
     if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) {
        echo "temp dir\n";
     }
-    else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) {    
+    else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) {
        echo "directory specified\n";
     }
     else {
diff --git a/ext/standard/tests/file/tempnam_variation1-win32.phpt b/ext/standard/tests/file/tempnam_variation1-win32.phpt
index a3dd7e9d625..a571a7cd5be 100644
--- a/ext/standard/tests/file/tempnam_variation1-win32.phpt
+++ b/ext/standard/tests/file/tempnam_variation1-win32.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test tempnam() function: usage variations - creating files 
+Test tempnam() function: usage variations - creating files
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != "WIN")
@@ -21,24 +21,24 @@ for($i=1; $i<=10; $i++) {
   echo "-- Iteration $i --\n";
   $files[$i] = tempnam("$file_path", "tempnam_variation1.tmp");
 
-  if( file_exists($files[$i]) ) { 
+  if( file_exists($files[$i]) ) {
 
-    echo "File name is => "; 
+    echo "File name is => ";
     print($files[$i]);
     echo "\n";
-  
+
     echo "File permissions are => ";
     printf("%o", fileperms($files[$i]) );
     echo "\n";
     clearstatcache();
 
     echo "File created in => ";
-    $file_dir = dirname($files[$i]);    
-        
+    $file_dir = dirname($files[$i]);
+
     if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) {
        echo "temp dir\n";
     }
-    else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) {    
+    else if (realpath($file_dir) == realpath($file_path) || realpath($file_dir."\\") == realpath($file_path)) {
        echo "directory specified\n";
     }
     else {
diff --git a/ext/standard/tests/file/tempnam_variation1.phpt b/ext/standard/tests/file/tempnam_variation1.phpt
index 0745f5397c9..dbdc396656a 100644
--- a/ext/standard/tests/file/tempnam_variation1.phpt
+++ b/ext/standard/tests/file/tempnam_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test tempnam() function: usage variations - creating files 
+Test tempnam() function: usage variations - creating files
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == "WIN")
@@ -21,12 +21,12 @@ for($i=1; $i<=10; $i++) {
   echo "-- Iteration $i --\n";
   $files[$i] = tempnam("$file_path", "tempnam_variation1.tmp");
 
-  if( file_exists($files[$i]) ) { 
+  if( file_exists($files[$i]) ) {
 
-    echo "File name is => "; 
+    echo "File name is => ";
     print($files[$i]);
     echo "\n";
-  
+
     echo "File permissions are => ";
     printf("%o", fileperms($files[$i]) );
     echo "\n";
@@ -35,10 +35,10 @@ for($i=1; $i<=10; $i++) {
     echo "File inode is => ";
     print_r( fileinode($files[$i]) ); //checking inodes
     echo "\n";
-    
+
     echo "File created in => ";
-    $file_dir = dirname($files[$i]);    
-        
+    $file_dir = dirname($files[$i]);
+
     if ($file_dir == sys_get_temp_dir()) {
        echo "temp dir\n";
     }
diff --git a/ext/standard/tests/file/tempnam_variation2-win32.phpt b/ext/standard/tests/file/tempnam_variation2-win32.phpt
index 15d59614ff8..60fe951353c 100644
--- a/ext/standard/tests/file/tempnam_variation2-win32.phpt
+++ b/ext/standard/tests/file/tempnam_variation2-win32.phpt
@@ -31,23 +31,23 @@ $dir_paths = array(
   "$dir_path/../.././tempnam_variation2",
   "$dir_path/..///tempnam_variation2_sub//..//../tempnam_variation2",
   "$dir_path/BADDIR",
-  
-  
+
+
   // relative paths
   ".",
   "tempname_variation2",
   "tempname_variation2/",
   "tempnam_variation2/tempnam_variation2_sub",
-  "tempnam_variation2//tempnam_variation2_sub",  
+  "tempnam_variation2//tempnam_variation2_sub",
   "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub",
-  "BADDIR",  
+  "BADDIR",
 );
 
 for($i = 0; $i<count($dir_paths); $i++) {
   $j = $i+1;
   echo "\n-- Iteration $j --\n";
   $file_name = tempnam($dir_paths[$i], "tempnam_variation2.tmp");
-  
+
   if( file_exists($file_name) ){
 
     echo "File name is => ";
@@ -57,27 +57,27 @@ for($i = 0; $i<count($dir_paths); $i++) {
     echo "File permissions are => ";
     printf("%o", fileperms($file_name) );
     echo "\n";
-    
+
     echo "File created in => ";
     $file_dir = dirname($file_name);
     $dir_req = $dir_paths[$i];
-        
+
     if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) {
        echo "temp dir\n";
     }
-    else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) {    
+    else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) {
        echo "directory specified\n";
     }
     else {
        echo "unknown location\n";
-    }    
-    
+    }
+
 
   }
   else {
     echo "-- File is not created --";
   }
-  
+
   unlink($file_name);
 }
 
diff --git a/ext/standard/tests/file/tempnam_variation2.phpt b/ext/standard/tests/file/tempnam_variation2.phpt
index 1a2de1885b3..dd98b40e8b1 100644
--- a/ext/standard/tests/file/tempnam_variation2.phpt
+++ b/ext/standard/tests/file/tempnam_variation2.phpt
@@ -31,23 +31,23 @@ $dir_paths = array(
   "$dir_path/../.././tempnam_variation2",
   "$dir_path/..///tempnam_variation2_sub//..//../tempnam_variation2",
   "$dir_path/BADDIR",
-  
-  
+
+
   // relative paths
   ".",
   "tempname_variation2",
   "tempname_variation2/",
   "tempnam_variation2/tempnam_variation2_sub",
-  "tempnam_variation2//tempnam_variation2_sub",  
+  "tempnam_variation2//tempnam_variation2_sub",
   "./tempnam_variation2/../tempnam_variation2/tempnam_variation2_sub",
-  "BADDIR",  
+  "BADDIR",
 );
 
 for($i = 0; $i<count($dir_paths); $i++) {
   $j = $i+1;
   echo "\n-- Iteration $j --\n";
   $file_name = tempnam($dir_paths[$i], "tempnam_variation2.tmp");
-  
+
   if( file_exists($file_name) ){
 
     echo "File name is => ";
@@ -57,11 +57,11 @@ for($i = 0; $i<count($dir_paths); $i++) {
     echo "File permissions are => ";
     printf("%o", fileperms($file_name) );
     echo "\n";
-    
+
     echo "File created in => ";
     $file_dir = dirname($file_name);
     $dir_req = $dir_paths[$i];
-        
+
     if (realpath($file_dir) == realpath(sys_get_temp_dir())) {
        echo "temp dir\n";
     }
@@ -70,14 +70,14 @@ for($i = 0; $i<count($dir_paths); $i++) {
     }
     else {
        echo "unknown location\n";
-    }    
-    
+    }
+
 
   }
   else {
     echo "-- File is not created --";
   }
-  
+
   unlink($file_name);
 }
 
diff --git a/ext/standard/tests/file/tempnam_variation4-0.phpt b/ext/standard/tests/file/tempnam_variation4-0.phpt
index e96846ff2ca..47da53df013 100644
--- a/ext/standard/tests/file/tempnam_variation4-0.phpt
+++ b/ext/standard/tests/file/tempnam_variation4-0.phpt
@@ -22,7 +22,7 @@ unlink($filename);
 */
 
 /* Trying to create the file in a dir with permissions from 0000 to 0350,
-     Allowable permissions: files are expected to be created in the input dir 
+     Allowable permissions: files are expected to be created in the input dir
      Non-allowable permissions: files are expected to be created in '/tmp' dir
 */
 
@@ -44,9 +44,9 @@ for($mode = 0000; $mode <= 0350; $mode++) {
 
       if (realpath(dirname($file_name)) != realpath(sys_get_temp_dir())) {
          echo " created in unexpected dir\n";
-      }   
+      }
     }
-    unlink($file_name);    
+    unlink($file_name);
   }
   else {
     print("FAILED: File is not created\n");
diff --git a/ext/standard/tests/file/tempnam_variation4-1.phpt b/ext/standard/tests/file/tempnam_variation4-1.phpt
index 667d3ecda62..39f1fb0053d 100644
--- a/ext/standard/tests/file/tempnam_variation4-1.phpt
+++ b/ext/standard/tests/file/tempnam_variation4-1.phpt
@@ -22,7 +22,7 @@ unlink($filename);
 */
 
 /* Trying to create the file in a dir with permissions from 0351 to 0777,
-     Allowable permissions: files are expected to be created in the input dir 
+     Allowable permissions: files are expected to be created in the input dir
      Non-allowable permissions: files are expected to be created in '/tmp' dir
 */
 
@@ -44,9 +44,9 @@ for($mode = 0351; $mode <= 0777; $mode++) {
 
       if (realpath(dirname($file_name)) != realpath(sys_get_temp_dir())) {
          echo " created in unexpected dir\n";
-      }   
+      }
     }
-    unlink($file_name);    
+    unlink($file_name);
   }
   else {
     print("FAILED: File is not created\n");
diff --git a/ext/standard/tests/file/tempnam_variation5-win32.phpt b/ext/standard/tests/file/tempnam_variation5-win32.phpt
index 3e39352fe1f..d2e708bc309 100644
--- a/ext/standard/tests/file/tempnam_variation5-win32.phpt
+++ b/ext/standard/tests/file/tempnam_variation5-win32.phpt
@@ -25,7 +25,7 @@ $h = fopen($dir_name."/tempnam_variation6.tmp", "w");
 for($i=1; $i<=3; $i++) {
   echo "-- Iteration $i --\n";
   $created_file = tempnam("$dir_name", "tempnam_variation6.tmp");
-  
+
   if( file_exists($created_file) ) {
     echo "File name is => ";
     print($created_file);
diff --git a/ext/standard/tests/file/tempnam_variation5.phpt b/ext/standard/tests/file/tempnam_variation5.phpt
index cf2eff8bec3..fdfcee9bedd 100644
--- a/ext/standard/tests/file/tempnam_variation5.phpt
+++ b/ext/standard/tests/file/tempnam_variation5.phpt
@@ -23,7 +23,7 @@ $h = fopen($dir_name."/tempnam_variation5.tmp", "w");
 for($i=1; $i<=3; $i++) {
   echo "-- Iteration $i --\n";
   $created_file = tempnam("$dir_name", "tempnam_variation5.tmp");
-  
+
   if( file_exists($created_file) ) {
     echo "File name is => ";
     print($created_file);
diff --git a/ext/standard/tests/file/tempnam_variation6-win32.phpt b/ext/standard/tests/file/tempnam_variation6-win32.phpt
index efe7e86e85f..acaa1abf505 100644
--- a/ext/standard/tests/file/tempnam_variation6-win32.phpt
+++ b/ext/standard/tests/file/tempnam_variation6-win32.phpt
@@ -6,7 +6,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 <?php
 if(substr(PHP_OS, 0, 3) != "WIN")
   die("skip Windows Only");
-?> 
+?>
 --FILE--
 <?php
 /* Prototype:  string tempnam ( string $dir, string $prefix );
@@ -27,10 +27,10 @@ for($i=1; $i<=3; $i++) {
     echo "File name is => ";
     print($file_name);
     echo "\n";
-    
+
     echo "File created in => ";
     $file_dir = dirname($file_name);
-        
+
     if ($file_dir == sys_get_temp_dir()) {
        echo "temp dir\n";
     }
@@ -39,7 +39,7 @@ for($i=1; $i<=3; $i++) {
     }
     else {
        echo "unknown location\n";
-    }    
+    }
  }
 
   unlink($file_name);
diff --git a/ext/standard/tests/file/tempnam_variation6.phpt b/ext/standard/tests/file/tempnam_variation6.phpt
index 5eb6e6fc868..08a9fce4def 100644
--- a/ext/standard/tests/file/tempnam_variation6.phpt
+++ b/ext/standard/tests/file/tempnam_variation6.phpt
@@ -4,7 +4,7 @@ Test tempnam() function: usage variations - Using previous unique filename
 <?php
 if(substr(PHP_OS, 0, 3) == "WIN")
   die("skip Do not run on Windows");
-?> 
+?>
 --FILE--
 <?php
 /* Prototype:  string tempnam ( string $dir, string $prefix );
@@ -25,10 +25,10 @@ for($i=1; $i<=3; $i++) {
     echo "File name is => ";
     print($file_name);
     echo "\n";
-    
+
     echo "File created in => ";
     $file_dir = dirname($file_name);
-        
+
     if ($file_dir == sys_get_temp_dir()) {
        echo "temp dir\n";
     }
@@ -37,7 +37,7 @@ for($i=1; $i<=3; $i++) {
     }
     else {
        echo "unknown location\n";
-    }    
+    }
  }
 
   unlink($file_name);
diff --git a/ext/standard/tests/file/tempnam_variation7-win32.phpt b/ext/standard/tests/file/tempnam_variation7-win32.phpt
index 918ef365880..40999fef47a 100644
--- a/ext/standard/tests/file/tempnam_variation7-win32.phpt
+++ b/ext/standard/tests/file/tempnam_variation7-win32.phpt
@@ -11,13 +11,13 @@ if(substr(PHP_OS, 0, 3) != "WIN")
    Description: Create file with unique file name.
 */
 
-/* Passing invalid/non-existing args for $dir, 
+/* Passing invalid/non-existing args for $dir,
      hence the unique files will be created in temporary dir */
- 
+
 echo "*** Testing tempnam() with invalid/non-existing directory names ***\n";
-/* An array of names, which will be passed as a dir name */ 
+/* An array of names, which will be passed as a dir name */
 $names_arr = array(
-	/* Invalid args */ 
+	/* Invalid args */
 	-1,
 	TRUE,
 	FALSE,
@@ -28,7 +28,7 @@ $names_arr = array(
 	array(),
 
 	/* Non-existing dirs */
-	"/no/such/file/dir", 
+	"/no/such/file/dir",
 	"php"
 );
 
diff --git a/ext/standard/tests/file/tempnam_variation7.phpt b/ext/standard/tests/file/tempnam_variation7.phpt
index d24c1d89740..4a5ffcd3326 100644
--- a/ext/standard/tests/file/tempnam_variation7.phpt
+++ b/ext/standard/tests/file/tempnam_variation7.phpt
@@ -11,13 +11,13 @@ if(substr(PHP_OS, 0, 3) == "WIN")
    Description: Create file with unique file name.
 */
 
-/* Passing invalid/non-existing args for $dir, 
+/* Passing invalid/non-existing args for $dir,
      hence the unique files will be created in temporary dir */
 
 echo "*** Testing tempnam() with invalid/non-existing directory names ***\n";
-/* An array of names, which will be passed as a dir name */ 
+/* An array of names, which will be passed as a dir name */
 $names_arr = array(
-  /* Invalid args */ 
+  /* Invalid args */
   -1,
   TRUE,
   FALSE,
@@ -28,7 +28,7 @@ $names_arr = array(
   array(),
 
   /* Non-existing dirs */
-  "/no/such/file/dir", 
+  "/no/such/file/dir",
   "php"
 
 );
@@ -46,22 +46,22 @@ for( $i=0; $i<count($names_arr); $i++ ) {
     echo "File permissions are => ";
     printf("%o", fileperms($file_name) );
     echo "\n";
-    
+
     echo "File created in => ";
     $file_dir = dirname($file_name);
-        
+
     if (realpath($file_dir) == realpath(sys_get_temp_dir())) {
        echo "temp dir\n";
     }
     else {
        echo "unknown location\n";
-    }    
-    
+    }
+
   }
-  else { 
+  else {
     echo "-- File is not created --\n";
   }
- 
+
   unlink($file_name);
 }
 
diff --git a/ext/standard/tests/file/tempnam_variation8-win32.phpt b/ext/standard/tests/file/tempnam_variation8-win32.phpt
index 52ff7b9daa5..cceda6438fe 100644
--- a/ext/standard/tests/file/tempnam_variation8-win32.phpt
+++ b/ext/standard/tests/file/tempnam_variation8-win32.phpt
@@ -32,21 +32,21 @@ $dir_paths = array(
   "$dir_path\\..\\..\\.\\tempnam_variation2",
   "$dir_path\\..\\\\\\tempnam_variation2_sub\\\\..\\\\..\\tempnam_variation2",
   "$dir_path\\BADDIR",
-  
-  
+
+
   // relative paths
   "tempname_variation2\\",
   "tempnam_variation2\\tempnam_variation2_sub",
-  "tempnam_variation2\\\\tempnam_variation2_sub",  
+  "tempnam_variation2\\\\tempnam_variation2_sub",
   ".\\tempnam_variation2\\..\\tempnam_variation2\\tempnam_variation2_sub",
-  "BADDIR",  
+  "BADDIR",
 );
 
 for($i = 0; $i<count($dir_paths); $i++) {
   $j = $i+1;
   echo "\n-- Iteration $j --\n";
   $file_name = tempnam($dir_paths[$i], "tempnam_variation2.tmp");
-  
+
   if( file_exists($file_name) ){
 
     echo "File name is => ";
@@ -56,27 +56,27 @@ for($i = 0; $i<count($dir_paths); $i++) {
     echo "File permissions are => ";
     printf("%o", fileperms($file_name) );
     echo "\n";
-    
+
     echo "File created in => ";
     $file_dir = dirname($file_name);
     $dir_req = $dir_paths[$i];
-        
+
     if (realpath($file_dir) == realpath(sys_get_temp_dir()) || realpath($file_dir."\\") == realpath(sys_get_temp_dir())) {
        echo "temp dir\n";
     }
-    else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) {    
+    else if (realpath($file_dir) == realpath($dir_req) || realpath($file_dir."\\") == realpath($dir_req)) {
        echo "directory specified\n";
     }
     else {
        echo "unknown location\n";
-    }    
-    
+    }
+
 
   }
   else {
     echo "-- File is not created --";
   }
-  
+
   unlink($file_name);
 }
 
diff --git a/ext/standard/tests/file/touch.phpt b/ext/standard/tests/file/touch.phpt
index c6c270d065a..fa000db0086 100644
--- a/ext/standard/tests/file/touch.phpt
+++ b/ext/standard/tests/file/touch.phpt
@@ -38,7 +38,7 @@ var_dump(touch("/no/such/file/or/directory"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: touch() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 bool(true)
diff --git a/ext/standard/tests/file/touch_basic-win32-mb.phpt b/ext/standard/tests/file/touch_basic-win32-mb.phpt
index d721edc84c9..9a87ac60a6d 100644
--- a/ext/standard/tests/file/touch_basic-win32-mb.phpt
+++ b/ext/standard/tests/file/touch_basic-win32-mb.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test touch() function : basic functionality 
+Test touch() function : basic functionality
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : proto bool touch(string filename [, int time [, int atime]])
- * Description: Set modification time of file 
+ * Description: Set modification time of file
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing touch() : basic functionality ***\n";
diff --git a/ext/standard/tests/file/touch_basic-win32.phpt b/ext/standard/tests/file/touch_basic-win32.phpt
index b4ad29f0377..ff0b9d944b2 100644
--- a/ext/standard/tests/file/touch_basic-win32.phpt
+++ b/ext/standard/tests/file/touch_basic-win32.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test touch() function : basic functionality 
+Test touch() function : basic functionality
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : proto bool touch(string filename [, int time [, int atime]])
- * Description: Set modification time of file 
+ * Description: Set modification time of file
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing touch() : basic functionality ***\n";
diff --git a/ext/standard/tests/file/touch_basic.phpt b/ext/standard/tests/file/touch_basic.phpt
index b39c84b7e0f..a4c319aefac 100644
--- a/ext/standard/tests/file/touch_basic.phpt
+++ b/ext/standard/tests/file/touch_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test touch() function : basic functionality 
+Test touch() function : basic functionality
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : proto bool touch(string filename [, int time [, int atime]])
- * Description: Set modification time of file 
+ * Description: Set modification time of file
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing touch() : basic functionality ***\n";
diff --git a/ext/standard/tests/file/touch_error.phpt b/ext/standard/tests/file/touch_error.phpt
index ec58fee511f..9fa8a81739a 100644
--- a/ext/standard/tests/file/touch_error.phpt
+++ b/ext/standard/tests/file/touch_error.phpt
@@ -10,7 +10,7 @@ var_dump(touch(1, 2, 3, 4));
 var_dump(touch("/no/such/file/or/directory"));
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: touch() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 
diff --git a/ext/standard/tests/file/touch_variation1.phpt b/ext/standard/tests/file/touch_variation1.phpt
index dba41a60772..688da7ef89b 100644
--- a/ext/standard/tests/file/touch_variation1.phpt
+++ b/ext/standard/tests/file/touch_variation1.phpt
@@ -29,7 +29,7 @@ var_dump(fileatime($filename));
 echo "Done\n";
 
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(true)
 int(101)
 int(101)
diff --git a/ext/standard/tests/file/touch_variation2.phpt b/ext/standard/tests/file/touch_variation2.phpt
index 9477a3494e2..a3596adc6bf 100644
--- a/ext/standard/tests/file/touch_variation2.phpt
+++ b/ext/standard/tests/file/touch_variation2.phpt
@@ -18,7 +18,7 @@ var_dump(file_get_contents($filename));
 echo "Done\n";
 
 ?>
---EXPECT--	
+--EXPECT--
 bool(true)
 string(6) "mydata"
 Done
diff --git a/ext/standard/tests/file/touch_variation3-win32-mb.phpt b/ext/standard/tests/file/touch_variation3-win32-mb.phpt
index 445ef3fb1ca..37beb131605 100644
--- a/ext/standard/tests/file/touch_variation3-win32-mb.phpt
+++ b/ext/standard/tests/file/touch_variation3-win32-mb.phpt
@@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool touch(string filename [, int time [, int atime]])
- * Description: Set modification time of file 
+ * Description: Set modification time of file
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing touch() : usage variation ***\n";
diff --git a/ext/standard/tests/file/touch_variation3-win32.phpt b/ext/standard/tests/file/touch_variation3-win32.phpt
index d6760f92b72..8aae6a0964f 100644
--- a/ext/standard/tests/file/touch_variation3-win32.phpt
+++ b/ext/standard/tests/file/touch_variation3-win32.phpt
@@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool touch(string filename [, int time [, int atime]])
- * Description: Set modification time of file 
+ * Description: Set modification time of file
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing touch() : usage variation ***\n";
diff --git a/ext/standard/tests/file/touch_variation3.phpt b/ext/standard/tests/file/touch_variation3.phpt
index 1ba1fc44cba..261d95ac945 100644
--- a/ext/standard/tests/file/touch_variation3.phpt
+++ b/ext/standard/tests/file/touch_variation3.phpt
@@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool touch(string filename [, int time [, int atime]])
- * Description: Set modification time of file 
+ * Description: Set modification time of file
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing touch() : usage variation ***\n";
diff --git a/ext/standard/tests/file/touch_variation4-win32.phpt b/ext/standard/tests/file/touch_variation4-win32.phpt
index 0b12173cc18..2e96b73de22 100644
--- a/ext/standard/tests/file/touch_variation4-win32.phpt
+++ b/ext/standard/tests/file/touch_variation4-win32.phpt
@@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool touch(string filename [, int time [, int atime]])
- * Description: Set modification time of file 
+ * Description: Set modification time of file
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing touch() : usage variation ***\n";
diff --git a/ext/standard/tests/file/touch_variation4.phpt b/ext/standard/tests/file/touch_variation4.phpt
index 0bbb4a7a3be..a55714565b8 100644
--- a/ext/standard/tests/file/touch_variation4.phpt
+++ b/ext/standard/tests/file/touch_variation4.phpt
@@ -12,9 +12,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool touch(string filename [, int time [, int atime]])
- * Description: Set modification time of file 
+ * Description: Set modification time of file
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing touch() : usage variation ***\n";
diff --git a/ext/standard/tests/file/touch_variation5-win32.phpt b/ext/standard/tests/file/touch_variation5-win32.phpt
index 92bd8b7b5b2..2d428405e9c 100644
--- a/ext/standard/tests/file/touch_variation5-win32.phpt
+++ b/ext/standard/tests/file/touch_variation5-win32.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test touch() function : variation: various valid and invalid paths 
+Test touch() function : variation: various valid and invalid paths
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -10,9 +10,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool touch(string filename [, int time [, int atime]])
- * Description: Set modification time of file 
+ * Description: Set modification time of file
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $workDir = "touchVar5.tmp";
@@ -26,38 +26,38 @@ $paths = array(
              $workDir.'/'.$subDirOrFile,
              './'.$workDir.'/'.$subDirOrFile,
              $workDir.'/../'.$workDir.'/'.$subDirOrFile,
-             
+
              // relative bad path (note p8 msgs differ)
              $workDir.'/../BADDIR/'.$subDirOrFile,
              'BADDIR/'.$subDirOrFile,
-             
+
              //absolute
              $cwd.'/'.$workDir.'/'.$subDirOrFile,
              $cwd.'/./'.$workDir.'/'.$subDirOrFile,
              $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDirOrFile,
 
-             //absolute bad path (note p8 msgs differ)             
+             //absolute bad path (note p8 msgs differ)
              $cwd.'/BADDIR/'.$subDirOrFile,
-             
+
              //trailing separators
              $workDir.'/'.$subDirOrFile.'/',
              $cwd.'/'.$workDir.'/'.$subDirOrFile.'/',
-             
+
              // multiple separators
              $workDir.'//'.$subDirOrFile,
              $cwd.'//'.$workDir.'//'.$subDirOrFile,
-             
+
              );
-             
+
 echo "*** Testing touch() : variation ***\n";
 
-echo "\n*** testing nonexisting paths ***\n";      
+echo "\n*** testing nonexisting paths ***\n";
 test_nonexisting($paths);
 
-echo "\n*** testing existing files ***\n";      
+echo "\n*** testing existing files ***\n";
 test_existing($paths, false);
 
-echo "\n*** testing existing directories ***\n";      
+echo "\n*** testing existing directories ***\n";
 test_existing($paths, true);
 
 
@@ -68,7 +68,7 @@ rmdir($workDir);
 function test_nonexisting($paths) {
 	foreach($paths as $path) {
 	   echo "--- testing $path ---\n";
-	   
+
 	   if (is_dir($path) || is_file($path)) {
 	      echo "FAILED: $path - exists\n";
 	   }
@@ -115,7 +115,7 @@ function test_existing($paths, $are_dirs) {
 	      if ($res == true) {
              test_path($path);
              rmdir($path);
-          }	   
+          }
 	   }
 	   else {
 	      $h = @fopen($path,"w");
@@ -123,12 +123,12 @@ function test_existing($paths, $are_dirs) {
 	         fclose($h);
              test_path($path);
              unlink($path);
-          }	   
+          }
 	   }
 	}
 }
-	   
-	
+
+
 function test_path($path) {
    echo "--- testing $path ---\n";
    $org_atime = get_atime($path);
diff --git a/ext/standard/tests/file/touch_variation5.phpt b/ext/standard/tests/file/touch_variation5.phpt
index a448db3ea42..4c704ccacaf 100644
--- a/ext/standard/tests/file/touch_variation5.phpt
+++ b/ext/standard/tests/file/touch_variation5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test touch() function : variation: various valid and invalid paths 
+Test touch() function : variation: various valid and invalid paths
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool touch(string filename [, int time [, int atime]])
- * Description: Set modification time of file 
+ * Description: Set modification time of file
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $workDir = "touchVar5.tmp";
@@ -26,38 +26,38 @@ $paths = array(
              $workDir.'/'.$subDirOrFile,
              './'.$workDir.'/'.$subDirOrFile,
              $workDir.'/../'.$workDir.'/'.$subDirOrFile,
-             
+
              // relative bad path
              $workDir.'/../BADDIR/'.$subDirOrFile,
              'BADDIR/'.$subDirOrFile,
-             
+
              //absolute
              $cwd.'/'.$workDir.'/'.$subDirOrFile,
              $cwd.'/./'.$workDir.'/'.$subDirOrFile,
              $cwd.'/'.$workDir.'/../'.$workDir.'/'.$subDirOrFile,
 
-             //absolute bad path             
+             //absolute bad path
              $cwd.'/BADDIR/'.$subDirOrFile,
-             
+
              //trailing separators
              $workDir.'/'.$subDirOrFile.'/',
              $cwd.'/'.$workDir.'/'.$subDirOrFile.'/',
-             
+
              // multiple separators
              $workDir.'//'.$subDirOrFile,
              $cwd.'//'.$workDir.'//'.$subDirOrFile,
-             
+
              );
-             
+
 echo "*** Testing touch() : variation ***\n";
 
-echo "\n*** testing nonexisting paths ***\n";      
+echo "\n*** testing nonexisting paths ***\n";
 test_nonexisting($paths);
 
-echo "\n*** testing existing files ***\n";      
+echo "\n*** testing existing files ***\n";
 test_existing($paths, false);
 
-echo "\n*** testing existing directories ***\n";      
+echo "\n*** testing existing directories ***\n";
 test_existing($paths, true);
 
 
@@ -68,7 +68,7 @@ rmdir($workDir);
 function test_nonexisting($paths) {
 	foreach($paths as $path) {
 	   echo "--- testing $path ---\n";
-	   
+
 	   if (is_dir($path) || is_file($path)) {
 	      echo "FAILED: $path - exists\n";
 	   }
@@ -115,7 +115,7 @@ function test_existing($paths, $are_dirs) {
 	      if ($res == true) {
              test_path($path);
              rmdir($path);
-          }	   
+          }
 	   }
 	   else {
 	      $h = @fopen($path,"w");
@@ -123,12 +123,12 @@ function test_existing($paths, $are_dirs) {
 	         fclose($h);
              test_path($path);
              unlink($path);
-          }	   
+          }
 	   }
 	}
 }
-	   
-	
+
+
 function test_path($path) {
    echo "--- testing $path ---\n";
    $org_atime = get_atime($path);
diff --git a/ext/standard/tests/file/touch_variation6-win32.phpt b/ext/standard/tests/file/touch_variation6-win32.phpt
index 625e5719505..a53dbe4e0d6 100644
--- a/ext/standard/tests/file/touch_variation6-win32.phpt
+++ b/ext/standard/tests/file/touch_variation6-win32.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test touch() function : variation: various valid and invalid paths 
+Test touch() function : variation: various valid and invalid paths
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
@@ -11,9 +11,9 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 --FILE--
 <?php
 /* Prototype  : bool touch(string filename [, int time [, int atime]])
- * Description: Set modification time of file 
+ * Description: Set modification time of file
  * Source code: ext/standard/filestat.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $workDir = "touchVar5.tmp";
@@ -29,41 +29,41 @@ $paths = array(
              $workDir.'\\'.$subDirOrFile,
              '.\\'.$workDir.'\\'.$subDirOrFile,
              $workDir.'\\..\\'.$workDir.'\\'.$subDirOrFile,
-             
+
              // relative bad path (note p8 msgs differ)
              $workDir.'\\..\\BADDIR\\'.$subDirOrFile,
              'BADDIR\\'.$subDirOrFile,
-             
+
              //absolute
              $cwd.'\\'.$workDir.'\\'.$subDirOrFile,
              $cwd.'\\.\\'.$workDir.'\\'.$subDirOrFile,
              $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$subDirOrFile,
 
-             //absolute bad path (note p8 msgs differ)             
+             //absolute bad path (note p8 msgs differ)
              $cwd.'\\BADDIR\\'.$subDirOrFile,
-             
+
              //trailing separators
              $workDir.'\\'.$subDirOrFile.'\\',
              $cwd.'\\'.$workDir.'\\'.$subDirOrFile.'\\',
-             
+
              // multiple separators
              $workDir.'\\\\'.$subDirOrFile,
              $cwd.'\\\\'.$workDir.'\\\\'.$subDirOrFile,
-             
+
              // Unixified Dir Or File
-             $unixifiedDirOrFile,                         
-             
+             $unixifiedDirOrFile,
+
              );
-             
+
 echo "*** Testing touch() : variation ***\n";
 
-echo "\n*** testing nonexisting paths ***\n";      
+echo "\n*** testing nonexisting paths ***\n";
 test_nonexisting($paths);
 
-echo "\n*** testing existing files ***\n";      
+echo "\n*** testing existing files ***\n";
 test_existing($paths, false);
 
-echo "\n*** testing existing directories ***\n";      
+echo "\n*** testing existing directories ***\n";
 test_existing($paths, true);
 
 
@@ -74,7 +74,7 @@ rmdir($workDir);
 function test_nonexisting($paths) {
 	foreach($paths as $path) {
 	   echo "--- testing $path ---\n";
-	   
+
 	   if (is_dir($path) || is_file($path)) {
 	      echo "FAILED: $path - exists\n";
 	   }
@@ -121,7 +121,7 @@ function test_existing($paths, $are_dirs) {
 	      if ($res == true) {
              test_path($path);
              rmdir($path);
-          }	   
+          }
 	   }
 	   else {
 	      $h = @fopen($path,"w");
@@ -129,12 +129,12 @@ function test_existing($paths, $are_dirs) {
 	         fclose($h);
              test_path($path);
              unlink($path);
-          }	   
+          }
 	   }
 	}
 }
-	   
-	
+
+
 function test_path($path) {
    echo "--- testing $path ---\n";
    $org_atime = get_atime($path);
diff --git a/ext/standard/tests/file/umask_variation1.phpt b/ext/standard/tests/file/umask_variation1.phpt
index 29fe92e5568..fdcc27ceb9e 100644
--- a/ext/standard/tests/file/umask_variation1.phpt
+++ b/ext/standard/tests/file/umask_variation1.phpt
@@ -28,7 +28,7 @@ for($mask = 0000; $mask <= 0350; $mask++) {
   echo " --\n";
   // setting umask
   umask($mask);
- 
+
   /* umasking file */
   // creating temp file
   $fp = fopen($filename, "w");
diff --git a/ext/standard/tests/file/umask_variation2.phpt b/ext/standard/tests/file/umask_variation2.phpt
index 85b1a67f534..4feb42137fb 100644
--- a/ext/standard/tests/file/umask_variation2.phpt
+++ b/ext/standard/tests/file/umask_variation2.phpt
@@ -28,7 +28,7 @@ for($mask = 0351; $mask <= 0777; $mask++) {
   echo " --\n";
   // setting umask
   umask($mask);
- 
+
   /* umasking file */
   // creating temp file
   $fp = fopen($filename, "w");
diff --git a/ext/standard/tests/file/unlink_variation10.phpt b/ext/standard/tests/file/unlink_variation10.phpt
index e0c92caeba3..cfe0eb85628 100644
--- a/ext/standard/tests/file/unlink_variation10.phpt
+++ b/ext/standard/tests/file/unlink_variation10.phpt
@@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not for Windows');
 }
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : bool unlink(string filename[, context context])
- * Description: Delete a file 
+ * Description: Delete a file
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing unlink() : variation ***\n";
@@ -31,18 +31,18 @@ $dirs = array(
              $workDir.'/'.$tmpDir,
              './'.$workDir.'/'.$tmpDir,
              $workDir.'/../'.$workDir.'/'.$tmpDir,
-                         
+
              //absolute
              $cwd.'/'.$workDir.'/'.$tmpDir,
              $cwd.'/./'.$workDir.'/'.$tmpDir,
              $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpDir,
-           
+
              // multiple separators
              $workDir.'//'.$tmpDir,
              $cwd.'//'.$workDir.'//'.$tmpDir,
-             
+
              );
-             
+
 
 foreach($dirs as $dirToUnlink) {
    test_link($workDir.'/'.$tmpDir, $dirToLinkTo, $dirToUnlink, true);  //soft link
@@ -61,9 +61,9 @@ function test_link($linkedDir, $toLinkTo, $tounlink, $softlink) {
    }
    else {
    	  link($toLinkTo, $linkedDir);
-   	  $msg = "hard link";   	  
-   }   
-   echo "-- unlinking $msg $tounlink --\n";           
+   	  $msg = "hard link";
+   }
+   echo "-- unlinking $msg $tounlink --\n";
    $res = unlink($tounlink);
    if ($res === true) {
       if (is_link($tounlink) === false) {
diff --git a/ext/standard/tests/file/unlink_variation6.phpt b/ext/standard/tests/file/unlink_variation6.phpt
index ede9ada092d..3eab9683488 100644
--- a/ext/standard/tests/file/unlink_variation6.phpt
+++ b/ext/standard/tests/file/unlink_variation6.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test unlink() function : variation 
+Test unlink() function : variation
 --CREDITS--
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : bool unlink(string filename[, context context])
- * Description: Delete a file 
+ * Description: Delete a file
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing unlink() : variation: contexts and relative files ***\n";
@@ -30,7 +30,7 @@ function f_exists($file) {
    else {
       echo "$file doesn't exist\n";
    }
-} 
+}
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/standard/tests/file/unlink_variation7.phpt b/ext/standard/tests/file/unlink_variation7.phpt
index 64a2607d5f5..ce0b5f77f34 100644
--- a/ext/standard/tests/file/unlink_variation7.phpt
+++ b/ext/standard/tests/file/unlink_variation7.phpt
@@ -5,9 +5,9 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 /* Prototype  : bool unlink(string filename[, context context])
- * Description: Delete a file 
+ * Description: Delete a file
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing unlink() : usage variation different types for context ***\n";
@@ -101,7 +101,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // file resource
       'file resource' => $fileRes
 );
diff --git a/ext/standard/tests/file/unlink_variation8-win32.phpt b/ext/standard/tests/file/unlink_variation8-win32.phpt
index 8c9fbd895c7..9ee6b49d2a1 100644
--- a/ext/standard/tests/file/unlink_variation8-win32.phpt
+++ b/ext/standard/tests/file/unlink_variation8-win32.phpt
@@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 if (substr(PHP_OS, 0, 3) != 'WIN') {
     die('skip.. only for Windows');
 }
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : bool unlink(string filename[, context context])
- * Description: Delete a file 
+ * Description: Delete a file
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing unlink() : variation ***\n";
@@ -29,29 +29,29 @@ $files = array(
              $workDir.'/'.$tmpFile,
              './'.$workDir.'/'.$tmpFile,
              $workDir.'/../'.$workDir.'/'.$tmpFile,
-             
+
              // relative bad path
              $workDir.'/../BADDIR/'.$tmpFile,
              'BADDIR/'.$tmpFile,
-             
+
              //absolute
              $cwd.'/'.$workDir.'/'.$tmpFile,
              $cwd.'/./'.$workDir.'/'.$tmpFile,
              $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpFile,
 
-             //absolute bad path             
+             //absolute bad path
              $cwd.'/BADDIR/'.$tmpFile,
-             
+
              //trailing separators
              $workDir.'/'.$tmpFile.'/',
              $cwd.'/'.$workDir.'/'.$tmpFile.'/',
-             
+
              // multiple separators
              $workDir.'//'.$tmpFile,
              $cwd.'//'.$workDir.'//'.$tmpFile,
-             
+
              );
-             
+
 
 foreach($files as $fileToUnlink) {
    test_realfile($workDir.'/'.$tmpFile, $fileToUnlink);
@@ -61,7 +61,7 @@ rmdir($workDir);
 
 function test_realfile($file, $tounlink) {
    touch($file);
-   echo "-- removing $tounlink --\n";           
+   echo "-- removing $tounlink --\n";
    $res = unlink($tounlink);
    if ($res === true) {
       if (file_exists($tounlink) === false) {
diff --git a/ext/standard/tests/file/unlink_variation8.phpt b/ext/standard/tests/file/unlink_variation8.phpt
index e142763cefa..ab074c7849e 100644
--- a/ext/standard/tests/file/unlink_variation8.phpt
+++ b/ext/standard/tests/file/unlink_variation8.phpt
@@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not for Windows');
 }
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : bool unlink(string filename[, context context])
- * Description: Delete a file 
+ * Description: Delete a file
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing unlink() : variation ***\n";
@@ -31,34 +31,34 @@ $files = array(
              $workDir.'/'.$tmpFile,
              './'.$workDir.'/'.$tmpFile,
              $workDir.'/../'.$workDir.'/'.$tmpFile,
-             
+
              // relative bad path
              $workDir.'/../BADDIR/'.$tmpFile,
              'BADDIR/'.$tmpFile,
-             
+
              //absolute
              $cwd.'/'.$workDir.'/'.$tmpFile,
              $cwd.'/./'.$workDir.'/'.$tmpFile,
              $cwd.'/'.$workDir.'/../'.$workDir.'/'.$tmpFile,
 
-             //absolute bad path             
+             //absolute bad path
              $cwd.'/BADDIR/'.$tmpFile,
-             
+
              //trailing separators
              $workDir.'/'.$tmpFile.'/',
              $cwd.'/'.$workDir.'/'.$tmpFile.'/',
-             
+
              // multiple separators
              $workDir.'//'.$tmpFile,
              $cwd.'//'.$workDir.'//'.$tmpFile,
-             
+
              );
-             
+
 
 foreach($files as $fileToUnlink) {
    test_realfile($workDir.'/'.$tmpFile, $fileToUnlink);
    test_link($workDir.'/'.$tmpFile, $fileToLinkTo, $fileToUnlink, true);  //soft link
-   test_link($workDir.'/'.$tmpFile, $fileToLinkTo, $fileToUnlink, false); //hard link   
+   test_link($workDir.'/'.$tmpFile, $fileToLinkTo, $fileToUnlink, false); //hard link
 }
 
 unlink($fileToLinkTo);
@@ -66,7 +66,7 @@ rmdir($workDir);
 
 function test_realfile($file, $tounlink) {
    touch($file);
-   echo "-- removing $tounlink --\n";           
+   echo "-- removing $tounlink --\n";
    $res = unlink($tounlink);
    if ($res === true) {
       if (file_exists($tounlink) === false) {
@@ -88,9 +88,9 @@ function test_link($linkedfile, $toLinkTo, $tounlink, $softlink) {
    }
    else {
    	  link($toLinkTo, $linkedfile);
-   	  $msg = "hard link";   	  
-   }   
-   echo "-- unlinking $msg $tounlink --\n";           
+   	  $msg = "hard link";
+   }
+   echo "-- unlinking $msg $tounlink --\n";
    $res = unlink($tounlink);
    if ($res === true) {
       if (file_exists($tounlink) === false) {
diff --git a/ext/standard/tests/file/unlink_variation9-win32.phpt b/ext/standard/tests/file/unlink_variation9-win32.phpt
index 0eaed2e4caa..2331c9edc8b 100644
--- a/ext/standard/tests/file/unlink_variation9-win32.phpt
+++ b/ext/standard/tests/file/unlink_variation9-win32.phpt
@@ -7,13 +7,13 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 if (substr(PHP_OS, 0, 3) != 'WIN') {
     die('skip.. only for Windows');
 }
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : bool unlink(string filename[, context context])
- * Description: Delete a file 
+ * Description: Delete a file
  * Source code: ext/standard/file.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing unlink() : variation ***\n";
@@ -30,38 +30,38 @@ $files = array(
              $workDir.'\\'.$tmpFile,
              '.\\'.$workDir.'\\'.$tmpFile,
              $workDir.'\\..\\'.$workDir.'\\'.$tmpFile,
-             
+
              // relative bad path
              $workDir.'\\..\\BADDIR\\'.$tmpFile,
              'BADDIR\\'.$tmpFile,
-             
+
              //absolute
              $cwd.'\\'.$workDir.'\\'.$tmpFile,
              $cwd.'\\.\\'.$workDir.'\\'.$tmpFile,
              $cwd.'\\'.$workDir.'\\..\\'.$workDir.'\\'.$tmpFile,
 
-             //absolute bad path             
+             //absolute bad path
              $cwd.'\\BADDIR\\'.$tmpFile,
-             
+
              //trailing separators
              $workDir.'\\'.$tmpFile.'\\',
              $cwd.'\\'.$workDir.'\\'.$tmpFile.'\\',
-             
+
              // multiple separators
              $workDir.'\\\\'.$tmpFile,
              $cwd.'\\\\'.$workDir.'\\\\'.$tmpFile,
-             
+
              // Unixified File
-             $unixifiedFile,                                      
-             
+             $unixifiedFile,
+
              );
-             
+
 
 foreach($files as $fileToUnlink) {
 	$file = $workDir.'/'.$tmpFile;
 	$tounlink = $fileToUnlink;
    touch($file);
-   echo "-- removing $tounlink --\n";           
+   echo "-- removing $tounlink --\n";
    $res = unlink($tounlink);
    if ($res === true) {
       if (file_exists($tounlink) === false) {
diff --git a/ext/standard/tests/file/userfilters.phpt b/ext/standard/tests/file/userfilters.phpt
index dfa8376fffc..73f87de6137 100644
--- a/ext/standard/tests/file/userfilters.phpt
+++ b/ext/standard/tests/file/userfilters.phpt
@@ -10,7 +10,7 @@ class testfilter extends php_user_filter {
       $consumed += strlen($bucket->data);
       stream_bucket_append($out, $bucket);
     }
-    return PSFS_PASS_ON;    
+    return PSFS_PASS_ON;
   }
 
   function oncreate() {
diff --git a/ext/standard/tests/file/userstreams.phpt b/ext/standard/tests/file/userstreams.phpt
index 0e649e9a923..419ecc5122a 100644
--- a/ext/standard/tests/file/userstreams.phpt
+++ b/ext/standard/tests/file/userstreams.phpt
@@ -76,11 +76,11 @@ $DATALEN = strlen($DATA);
 if ($n != $DATALEN)
 	die("tmpfile stored $n bytes; should be $DATALEN!");
 
-class uselessstream 
+class uselessstream
 {
 }
 
-class mystream 
+class mystream
 {
 	public $path;
 	public $mode;
@@ -102,7 +102,7 @@ class mystream
 			$this->position = strlen($GLOBALS[$this->varname]);
 		else
 			$this->position = 0;
-		
+
 		return true;
 	}
 
@@ -228,7 +228,7 @@ for ($i = 0; $i < 256; $i++) {
 	$seeks[] = array($whence, $offset, $position);
 }
 
-/* we compare the results of fgets using differing line lengths to 
+/* we compare the results of fgets using differing line lengths to
  * test the fgets layer also */
 $line_lengths = array(1024, 256, 64, 16);
 $fail_count = 0;
@@ -266,7 +266,7 @@ foreach($line_lengths as $line_length) {
 			var_dump($dat);
 			break;
 		}
-		
+
 		$j++;
 	}
 	if ($fail_count)
diff --git a/ext/standard/tests/file/windows_acls/bug44859.phpt b/ext/standard/tests/file/windows_acls/bug44859.phpt
index 4454ee11732..20e10f5c5b6 100644
--- a/ext/standard/tests/file/windows_acls/bug44859.phpt
+++ b/ext/standard/tests/file/windows_acls/bug44859.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bug #44859 (incorrect result with NTFS ACL permissions, is_writable)
 --SKIPIF--
-<?php 
+<?php
 include_once __DIR__ . '/common.inc';
 skipif();
 ?>
diff --git a/ext/standard/tests/file/windows_acls/bug44859_2.phpt b/ext/standard/tests/file/windows_acls/bug44859_2.phpt
index 514953f42ef..583e63a2a6a 100644
--- a/ext/standard/tests/file/windows_acls/bug44859_2.phpt
+++ b/ext/standard/tests/file/windows_acls/bug44859_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bug #44859 (incorrect result with NTFS ACL permissions, is_readable)
 --SKIPIF--
-<?php 
+<?php
 include_once __DIR__ . '/common.inc';
 skipif();
 ?>
diff --git a/ext/standard/tests/file/windows_acls/bug44859_3.phpt b/ext/standard/tests/file/windows_acls/bug44859_3.phpt
index ed57abba077..35db1f29be6 100644
--- a/ext/standard/tests/file/windows_acls/bug44859_3.phpt
+++ b/ext/standard/tests/file/windows_acls/bug44859_3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 bug #44859 (incorrect result with NTFS ACL permissions, is_executable)
 --SKIPIF--
-<?php 
+<?php
 include_once __DIR__ . '/common.inc';
 skipif();
 ?>
diff --git a/ext/standard/tests/file/windows_acls/bug44859_4.phpt b/ext/standard/tests/file/windows_acls/bug44859_4.phpt
index bf640fa660e..452581fa054 100644
--- a/ext/standard/tests/file/windows_acls/bug44859_4.phpt
+++ b/ext/standard/tests/file/windows_acls/bug44859_4.phpt
@@ -3,7 +3,7 @@ bug #44859 (incorrect result with NTFS ACL permissions, is_readable)
 --CREDITS--
 Venkat Raman Don
 --SKIPIF--
-<?php 
+<?php
 include_once __DIR__ . '/common.inc';
 skipif();
 ?>
diff --git a/ext/standard/tests/file/windows_mb_path/bug54977.phpt b/ext/standard/tests/file/windows_mb_path/bug54977.phpt
index d5b184158ea..b1bc415f05f 100644
--- a/ext/standard/tests/file/windows_mb_path/bug54977.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug54977.phpt
@@ -27,7 +27,7 @@ foreach ($paths as $d) {
 }
 
 $myDirectory = opendir($prefix);
-while($entryName = readdir($myDirectory)) {	
+while($entryName = readdir($myDirectory)) {
 	echo get_basename_with_cp($prefix . $entryName, 65001, false) . "\n";
 }
 closedir($myDirectory);
diff --git a/ext/standard/tests/file/windows_mb_path/bug64506.phpt b/ext/standard/tests/file/windows_mb_path/bug64506.phpt
index 784cffadb71..6d9367f8577 100644
--- a/ext/standard/tests/file/windows_mb_path/bug64506.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug64506.phpt
@@ -36,7 +36,7 @@ var_dump(unlink($fnw));
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/bug71509.phpt b/ext/standard/tests/file/windows_mb_path/bug71509.phpt
index 2d74bfc8b38..418c35cd255 100644
--- a/ext/standard/tests/file/windows_mb_path/bug71509.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug71509.phpt
@@ -29,7 +29,7 @@ if ($return_code != true) die("Failed to open file: " . $return_code);
 
 $return_code = $zipfile->addfile($testfile_zip, basename($testfile_zip));
 if ($return_code != true) print("Failed to add file: " . $zipfile->getStatusString());
-		
+
 $return_code = $zipfile->close();
 if ($return_code != true) die("Failed to close archive: " . $zipfile->getStatusString());
 
diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt
index e291dd08554..6517cf88c13 100644
--- a/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_big5_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading big5 path 
+Test fopen() for reading big5 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -31,13 +31,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_big5");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(%d) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt
index 74202fa9661..98d4e0c89b4 100644
--- a/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_big5_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir big5 path 
+Test mkdir/rmdir big5 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -40,7 +40,7 @@ remove_data("dir_big5");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt
index 3be40bf61e1..406b9255553 100644
--- a/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_big5_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write big5 to UTF-8 path 
+Test fopen() for write big5 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -43,7 +43,7 @@ remove_data("file_big5");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt
index 3002b50c223..54710fc3c8f 100644
--- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading big5 to UTF-8 path 
+Test fopen() for reading big5 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -28,13 +28,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_big5");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(%d) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt
index abf3a76cc2f..4e1ef94c008 100644
--- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir big5 to UTF-8 path 
+Test mkdir/rmdir big5 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -37,7 +37,7 @@ remove_data("dir_big5");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt
index f204790e8e4..3b3b8a558ae 100644
--- a/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_big5_to_utf8_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write big5 to UTF-8 path 
+Test fopen() for write big5 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -40,7 +40,7 @@ remove_data("file_big5");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt
index 7a6496a6198..a5dea1c9b85 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_0.phpt
@@ -28,13 +28,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp1250");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(37) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt
index bd4421e7a2a..ae7eff4a13a 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_1.phpt
@@ -37,7 +37,7 @@ remove_data("dir_cp1250");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt
index 488343d8d11..45531b6d6bb 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_2.phpt
@@ -38,7 +38,7 @@ remove_data("dir_cp1250");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt
index 84b05b71d9e..c70570b2b09 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_3.phpt
@@ -28,13 +28,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp1250");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(37) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt
index 3759daa71de..a7df51695f8 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_4.phpt
@@ -37,7 +37,7 @@ remove_data("dir_cp1250");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt
index 7e1998ba2a6..75e5c55ca94 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1250_to_utf8_5.phpt
@@ -38,7 +38,7 @@ remove_data("dir_cp1250");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt
index 7dfd7eadbf9..485ff119efc 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading CP1251 path 
+Test fopen() for reading CP1251 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -31,13 +31,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp1251");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(35) "opened an utf8 filename for reading"
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt
index 3abce0d0d59..db0c9a690cc 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir CP1251 path 
+Test mkdir/rmdir CP1251 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -40,7 +40,7 @@ remove_data("dir_cp1251");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt
index 2a3b7390b10..7dd32c5a900 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write CP1251 path 
+Test fopen() for write CP1251 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -42,7 +42,7 @@ remove_data("file_cp1251");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt
index 13395d10177..14b5176415b 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading CP1251 to UTF-8 path 
+Test fopen() for reading CP1251 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -28,13 +28,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp1251");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(35) "opened an utf8 filename for reading"
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt
index 193e2fdc74f..7b5f71b84e5 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir CP1251 to UTF-8 path 
+Test mkdir/rmdir CP1251 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -37,7 +37,7 @@ remove_data("dir_cp1251");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt
index e552464214c..84ecdbff9e8 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_to_utf8_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write CP1251 to UTF-8 path 
+Test fopen() for write CP1251 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -39,7 +39,7 @@ remove_data("file_cp1251");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt
index b638eb4822c..2510a2d2dee 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_0.phpt
@@ -31,13 +31,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open failed\n";
-} 
+}
 
 remove_data("file_cp1251");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(35) "opened an utf8 filename for reading"
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt
index e44849b061e..3b55e18c67a 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_1.phpt
@@ -40,7 +40,7 @@ remove_data("dir_cp1251");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt
index c0b685c55b1..98e5852b67e 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1251_zend_multibyte_2.phpt
@@ -42,7 +42,7 @@ remove_data("file_cp1251");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt
index 85a1c41f07f..6fe0d968f72 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_0.phpt
@@ -19,9 +19,9 @@ internal_encoding=cp1252
 #vim: set encoding=cp1252
 */
 
-include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; 
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
 
-$item = "gefäß"; 
+$item = "gefäß";
 $prefix = create_data("file", $item, 1252);
 $fn = $prefix . DIRECTORY_SEPARATOR . $item;
 
@@ -34,7 +34,7 @@ remove_data("file");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 string(%d) "%s\gefäß"
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt
index bdb1a7a8786..ef5dc9397da 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading cp1252 to UTF-8 path 
+Test fopen() for reading cp1252 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -28,13 +28,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp1252");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(%d) "hallo
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt
index 059ab8dd8f0..2a347461834 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir cp1252 to UTF-8 path 
+Test mkdir/rmdir cp1252 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -37,7 +37,7 @@ remove_data("dir_cp1252");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt
index 9ea2485eebc..293824d5504 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write cp1252 to UTF-8 path 
+Test fopen() for write cp1252 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -39,7 +39,7 @@ remove_data("dir_cp1252");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt
index cae3426e755..c5e075a944d 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading cp1252 to UTF-8 path 
+Test fopen() for reading cp1252 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -28,13 +28,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file2_cp1252");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(4) "hola"
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt
index cacaf5d36d3..969a115392e 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir cp1252 to UTF-8 path 
+Test mkdir/rmdir cp1252 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -37,7 +37,7 @@ remove_data("dir2_cp1252");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt
index 3ac634134a2..6119213289a 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1252_to_utf8_5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write cp1252 to UTF-8 path 
+Test fopen() for write cp1252 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -39,7 +39,7 @@ remove_data("dir2_cp1252");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt
index 12ae1ac7cd9..24beb0d31a2 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading cp1253 path 
+Test fopen() for reading cp1253 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -31,13 +31,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp1253");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(37) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt
index 9049a65ee1b..854910bc311 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir cp1253 path 
+Test mkdir/rmdir cp1253 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -40,7 +40,7 @@ remove_data("dir_cp1253");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt
index 4c39fb5bda6..79892e8ae42 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_2.phpt
@@ -41,7 +41,7 @@ remove_data("dir_cp1253");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt
index 0fbc78fc121..950c4784d82 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading cp1253 to UTF-8 path 
+Test fopen() for reading cp1253 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -28,13 +28,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp1253");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(37) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt
index ddc79b12049..25aeb513bab 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir cp1253 to UTF-8 path 
+Test mkdir/rmdir cp1253 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -37,7 +37,7 @@ remove_data("dir_cp1253");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt
index 6e28c89e0c6..bd8fc22ba3d 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1253_to_utf8_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write cp1253 to UTF-8 path 
+Test fopen() for write cp1253 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -38,7 +38,7 @@ remove_data("dir_cp1253");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt
index 5fbcb746026..4f160c13707 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading cp1254 path 
+Test fopen() for reading cp1254 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -31,13 +31,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp1254");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(37) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt
index 314f78ecb81..5a72058097f 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir cp1254 to UTF-8 path 
+Test mkdir/rmdir cp1254 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -40,7 +40,7 @@ remove_data("dir_cp1254");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt
index d2a04d905a3..21f87c501ac 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write cp1254 path 
+Test fopen() for write cp1254 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -41,7 +41,7 @@ remove_data("dir_cp1254");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt
index 13357217c8d..7fcb0ff66dc 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_3.phpt
@@ -19,7 +19,7 @@ default_charset=cp1254
 #vim: set encoding=cp1254
 */
 
-include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; 
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
 
 
 $item = "çokbaytlý iþleri";
@@ -35,7 +35,7 @@ remove_data("file_cp1254");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 string(%d) "%s\çokbaytlý iþleri"
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt
index 9a92099cd06..7a3d496f9fd 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading cp1254 to UTF-8 path 
+Test fopen() for reading cp1254 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -28,13 +28,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp1254");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(37) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt
index 551a0f22353..0cb73207e80 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir cp1254 to UTF-8 path 
+Test mkdir/rmdir cp1254 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -37,7 +37,7 @@ remove_data("dir_cp1254");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt
index 12df56b11e5..ea4950974ca 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write cp1254 to UTF-8 path 
+Test fopen() for write cp1254 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -38,7 +38,7 @@ remove_data("dir_cp1254");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt
index cbaba44e4e2..0c330ea445b 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1254_to_utf8_3.phpt
@@ -16,7 +16,7 @@ skip_if_no_required_exts();
 #vim: set encoding=cp1254
 */
 
-include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; 
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
 
 
 $item = "çokbaytlı işleri";
@@ -32,7 +32,7 @@ remove_data("file_cp1254");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 string(%d) "%s\çokbaytlı işleri"
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt
index 8a685b68c45..01b4f7732d9 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading cp1255 path 
+Test fopen() for reading cp1255 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -31,13 +31,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp1255");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(37) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt
index 391a282a69e..991d2ab615d 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir cp1255 path 
+Test mkdir/rmdir cp1255 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -40,7 +40,7 @@ remove_data("dir_cp1255");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt
index 2f38398bb57..276af84a91e 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write cp1255 path 
+Test fopen() for write cp1255 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -41,7 +41,7 @@ remove_data("dir_cp1255");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt
index 31a48dbc0c1..e33616ddd3d 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading cp1255 to UTF-8 path 
+Test fopen() for reading cp1255 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -28,13 +28,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp1255");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(37) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt
index b6a59e4be34..b241210faa5 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir cp1255 to UTF-8 path 
+Test mkdir/rmdir cp1255 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -37,7 +37,7 @@ remove_data("dir_cp1255");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt
index 53f83b3a0e3..10fef624040 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1255_to_utf8_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write cp1255 to UTF-8 path 
+Test fopen() for write cp1255 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -38,7 +38,7 @@ remove_data("dir_cp1255");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt
index 6b473abb549..617ebedddd2 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading cp1256 to UTF-8 path 
+Test fopen() for reading cp1256 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -31,13 +31,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp1256");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(37) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt
index 1a4233f2c23..341c0c01a29 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir cp1256 to UTF-8 path 
+Test mkdir/rmdir cp1256 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -40,7 +40,7 @@ remove_data("dir_cp1256");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt
index 5c25d60fc8c..e8cf5709a73 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write cp1256 to UTF-8 path 
+Test fopen() for write cp1256 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -41,7 +41,7 @@ remove_data("dir_cp1256");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt
index b021df7fa49..32596c2bd50 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading cp1256 to UTF-8 path 
+Test fopen() for reading cp1256 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -28,13 +28,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp1256");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(37) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt
index 2fb10a97a56..fd0204aacee 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir cp1256 to UTF-8 path 
+Test mkdir/rmdir cp1256 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -37,7 +37,7 @@ remove_data("dir_cp1256");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt
index ba70e1a77ef..ef0229a2e94 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp1256_to_utf8_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write cp1256 to UTF-8 path 
+Test fopen() for write cp1256 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -38,7 +38,7 @@ remove_data("dir_cp1256");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt
index 52f080e2c22..efc43f35139 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp874_0.phpt
@@ -47,7 +47,7 @@ foreach ($names as $name) {
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 Active code page: %d
 getting basename of %sà»ç¹á¿éÁ·Õè·´Êͺ1.txt
 string(%d) "à»ç¹á¿éÁ·Õè·´Êͺ1.txt"
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt
index 6cb2fb7eeec..aa877d7406e 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp874_1.phpt
@@ -19,10 +19,10 @@ internal_encoding=cp874
 #vim: set encoding=cp874
 */
 
-include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; 
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
 
 
-$item = "à»ç¹á¿éÁ·Õè·´Êͺ11"; 
+$item = "à»ç¹á¿éÁ·Õè·´Êͺ11";
 $prefix = create_data("file_cp874", $item, 874);
 $fn = dirname(__FILE__) . DIRECTORY_SEPARATOR . $item;
 
@@ -35,7 +35,7 @@ remove_data("file_cp874");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 string(%d) "%s\à»ç¹á¿éÁ·Õè·´Êͺ11"
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt
index 8d32f88a8cd..2c244997b67 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_0.phpt
@@ -44,7 +44,7 @@ foreach ($names as $name) {
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 Active code page: %d
 getting basename of %sเป็น�ฟ้มที่ทดสอบ1.txt
 string(%d) "เป็น�ฟ้มที่ทดสอบ1.txt"
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt
index 843c66f4a2e..13ec027748f 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp874_to_utf8_1.phpt
@@ -16,10 +16,10 @@ skip_if_no_required_exts();
 #vim: set encoding=cp874
 */
 
-include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; 
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
 
 
-$item = "เป็น�ฟ้มที่ทดสอบ11"; 
+$item = "เป็น�ฟ้มที่ทดสอบ11";
 $prefix = create_data("file_cp874", $item);
 $fn = $prefix . DIRECTORY_SEPARATOR . $item;
 
@@ -32,7 +32,7 @@ remove_data("file_cp874");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 string(%d) "%s\เป็น�ฟ้มที่ทดสอบ11"
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt
index 1835f0d360a..48e55981cad 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp932_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading cp932 path 
+Test fopen() for reading cp932 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -31,13 +31,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp932");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(37) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt
index f7f24c045df..b177e2d1e23 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp932_1.phpt
@@ -40,7 +40,7 @@ remove_data("dir_cp932");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt
index d529f6a484a..595f86213a0 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp932_2.phpt
@@ -41,7 +41,7 @@ remove_data("dir_cp932");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt
index db31c1ad7a4..95992ae79f5 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp932_3.phpt
@@ -19,7 +19,7 @@ internal_encoding=cp932
 #vim: set encoding=cp932
 */
 
-include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; 
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
 
 
 $item = "ƒeƒXƒgƒ}ƒ‹ƒ`ƒoƒCƒg�EƒpƒX77"; // cp932 string
@@ -35,7 +35,7 @@ remove_data("file_cp932");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 string(%d) "%s\ƒeƒXƒgƒ}ƒ‹ƒ`ƒoƒCƒg�EƒpƒX77"
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt
index a04c14d2768..5e0e67b6626 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading cp932 to UTF-8 path 
+Test fopen() for reading cp932 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -28,13 +28,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp932");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(37) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt
index 9b13922a7a2..2092e40da00 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir cp932 to UTF-8 path 
+Test mkdir/rmdir cp932 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -37,7 +37,7 @@ remove_data("dir_cp932");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt
index fbe290468c0..bd9b1791ea2 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp932_to_utf8_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write cp932 to UTF-8 path 
+Test fopen() for write cp932 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -38,7 +38,7 @@ remove_data("dir_cp932");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt
index bcaa31353f6..46db0ebc4b3 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp936_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading cp936 path 
+Test fopen() for reading cp936 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -31,13 +31,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp936");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(%d) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt
index 9edb6d13013..9eb1f082171 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp936_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir cp936 path 
+Test mkdir/rmdir cp936 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -40,7 +40,7 @@ remove_data("dir_cp936");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt
index 2c05c313e92..eedee97bd05 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp936_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write cp936 path 
+Test fopen() for write cp936 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -43,7 +43,7 @@ remove_data("file_cp936");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt
index 554a05d94c5..b0b709c0cc7 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading cp936 to UTF-8 path 
+Test fopen() for reading cp936 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -28,13 +28,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_cp936");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(%d) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt
index 79bdfa4283b..2c4b2876c57 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir cp936 to UTF-8 path 
+Test mkdir/rmdir cp936 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -37,7 +37,7 @@ remove_data("dir_cp936");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt
index 22b64c31f94..b260b7b37f4 100644
--- a/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_cp936_to_utf8_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write cp936 to UTF-8 path 
+Test fopen() for write cp936 to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -40,7 +40,7 @@ remove_data("file_cp936");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt
index 0ff640aa35e..4b2bae974fa 100644
--- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading eucjp to UTF-8 path 
+Test fopen() for reading eucjp to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -28,13 +28,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_eucjp");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(37) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt
index 5a481e8d12c..db3f1d861b6 100644
--- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir eucjp to UTF-8 path 
+Test mkdir/rmdir eucjp to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -37,7 +37,7 @@ remove_data("dir_eucjp");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt
index 50727a9d713..0d06fb24894 100644
--- a/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_eucjp_to_utf8_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write eucjp to UTF-8 path 
+Test fopen() for write eucjp to UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -38,7 +38,7 @@ remove_data("dir_eucjp");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt
index 32b6f9b0661..51f1bb945b1 100644
--- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for reading Kartuli UTF-8 path 
+Test fopen() for reading Kartuli UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -28,13 +28,13 @@ if ($f) {
 	var_dump(fclose($f));
 } else {
 	echo "open utf8 failed\n";
-} 
+}
 
 remove_data("file_kartuli");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 string(37) "reading file wihh multibyte filename
 "
diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt
index a92e7c34ed5..ff32d75869e 100644
--- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mkdir/rmdir Kartuli UTF-8 path 
+Test mkdir/rmdir Kartuli UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -37,7 +37,7 @@ remove_data("dir_kartuli");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt
index edfb279cd23..192072760c1 100644
--- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test fopen() for write Kartuli UTF-8 path 
+Test fopen() for write Kartuli UTF-8 path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -38,7 +38,7 @@ remove_data("dir_kartuli");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (stream)
 int(25)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt
index 46077258d17..8f08357792f 100644
--- a/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_kartuli_utf8_3.phpt
@@ -16,10 +16,10 @@ skip_if_no_required_exts();
 #vim: set encoding=cp874
 */
 
-include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc"; 
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
 
 
-$item = "ქ�რთველები55"; 
+$item = "ქ�რთველები55";
 $prefix = create_data("file_kartuli", $item);
 $fn = $prefix . DIRECTORY_SEPARATOR . $item;
 
@@ -32,7 +32,7 @@ remove_data("file_kartuli");
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 string(%d) "%s\ქ�რთველები55"
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt
index 6bc28110e03..688fc6caca7 100644
--- a/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_long_path_0.phpt
@@ -12,14 +12,14 @@ skip_if_no_required_exts("mbstring");
 --FILE--
 <?php
 
-$p = ""; 
+$p = "";
 $s = str_repeat('a', 50);
 $how_many = 32;
 
 for ($i = 0; $i < $how_many; $i++) {
 	$p .= "$s";
 	$p .= DIRECTORY_SEPARATOR;
-} 
+}
 
 $p = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $p;
 
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt
index 94518e7a656..b2af71aa762 100644
--- a/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_long_path_1.phpt
@@ -11,7 +11,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 --FILE--
 <?php
 
-$p = ""; 
+$p = "";
 $s = str_repeat('a', 50);
 $how_many = 32;
 
@@ -19,7 +19,7 @@ $how_many = 32;
 for ($i = 0; $i < $how_many; $i++) {
 	$p .= "$s";
 	$p .= DIRECTORY_SEPARATOR;
-} 
+}
 
 $p = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $p;
 
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt
index 3be1850c5a1..bcae2c53bc3 100644
--- a/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_long_path_2.phpt
@@ -11,7 +11,7 @@ skip_if_no_required_exts("mbstring");
 ?>
 --FILE--
 <?php
-$p = ""; 
+$p = "";
 $s = str_repeat('x', 50) . "ü";
 $how_many = 32;
 
@@ -19,7 +19,7 @@ $how_many = 32;
 for ($i = 0; $i < $how_many; $i++) {
 	$p .= "$s";
 	$p .= DIRECTORY_SEPARATOR;
-} 
+}
 
 /* path doesn't exist at this point! */
 $p = realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $p;
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt
index 24535381902..5cc697c0fca 100644
--- a/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Mkdir with path length < 260 and > 248 has be a long path 
+Mkdir with path length < 260 and > 248 has be a long path
 --SKIPIF--
 <?php
 include dirname(__FILE__) . DIRECTORY_SEPARATOR . "util.inc";
@@ -15,13 +15,13 @@ if (strlen($start) > 260 || strlen($start) > 248) {
 --FILE--
 <?php
 
-$p = ""; 
+$p = "";
 $s = str_repeat('a', 50);
 $how_many = 32;
 
 for ($i = 0; $i < $how_many; $i++) {
 	$p .= "$s\\";
-} 
+}
 
 $start = realpath(dirname(__FILE__));
 if (strlen($start) <= 248) {
diff --git a/ext/standard/tests/filters/001.phpt b/ext/standard/tests/filters/001.phpt
index afbcdcfdd53..fbfdda23851 100644
--- a/ext/standard/tests/filters/001.phpt
+++ b/ext/standard/tests/filters/001.phpt
@@ -12,7 +12,7 @@ var_dump(stream_filter_register("", array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: stream_filter_register(): Filter name cannot be empty in %s on line %d
 bool(false)
 
diff --git a/ext/standard/tests/filters/stream_filter_remove_basic.phpt b/ext/standard/tests/filters/stream_filter_remove_basic.phpt
index 6ca84fef414..75b68295822 100644
--- a/ext/standard/tests/filters/stream_filter_remove_basic.phpt
+++ b/ext/standard/tests/filters/stream_filter_remove_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test stream_filter_remove() function : basic functionality 
+Test stream_filter_remove() function : basic functionality
 --SKIPIF--
 <?php
 $filters = stream_get_filters();
@@ -8,9 +8,9 @@ if(! in_array( "string.rot13", $filters )) die( "skip rot13 filter not available
 --FILE--
 <?php
 /* Prototype  : bool stream_filter_remove(resource stream_filter)
- * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource 
+ * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource
  * Source code: ext/standard/streamsfuncs.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing stream_filter_remove() : basic functionality ***\n";
diff --git a/ext/standard/tests/filters/stream_filter_remove_error.phpt b/ext/standard/tests/filters/stream_filter_remove_error.phpt
index 9cbb9258559..37820a99c49 100644
--- a/ext/standard/tests/filters/stream_filter_remove_error.phpt
+++ b/ext/standard/tests/filters/stream_filter_remove_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test stream_filter_remove() function : error conditions 
+Test stream_filter_remove() function : error conditions
 --SKIPIF--
 <?php
 $filters = stream_get_filters();
@@ -8,9 +8,9 @@ if(! in_array( "string.rot13", $filters )) die( "skip rot13 filter not available
 --FILE--
 <?php
 /* Prototype  : bool stream_filter_remove(resource stream_filter)
- * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource 
+ * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource
  * Source code: ext/standard/streamsfuncs.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $file = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'streamfilterTest.txt';
diff --git a/ext/standard/tests/general_functions/001.phpt b/ext/standard/tests/general_functions/001.phpt
index bfd82e55b0b..307122e1cb9 100644
--- a/ext/standard/tests/general_functions/001.phpt
+++ b/ext/standard/tests/general_functions/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 sprintf() function
 --FILE--
-<?php 
+<?php
 
 $agent = sprintf("%.5s", "James Bond, 007");
 
diff --git a/ext/standard/tests/general_functions/003.phpt b/ext/standard/tests/general_functions/003.phpt
index 7ad90c8b5ad..0388cf95b07 100644
--- a/ext/standard/tests/general_functions/003.phpt
+++ b/ext/standard/tests/general_functions/003.phpt
@@ -1,11 +1,11 @@
 --TEST--
 levenshtein() function test
 --FILE--
-<?php 
+<?php
 
 function test_me($title,$expect,$text1,$text2,$cost1=0,$cost2=0,$cost3=0) {
 
-  if($cost1==0) 
+  if($cost1==0)
 	  $result=levenshtein($text1,$text2);
 	else
     $result=levenshtein($text1,$text2,$cost1,$cost2,$cost3);
@@ -16,8 +16,8 @@ function test_me($title,$expect,$text1,$text2,$cost1=0,$cost2=0,$cost3=0) {
 	echo "for '$text1'/'$text2' ";
 	if($cost1) echo "($cost1:$cost2:$cost3)";
 	echo "\n";
-	
-	return 1;		
+
+	return 1;
 }
 
 $n=0;
diff --git a/ext/standard/tests/general_functions/004.phpt b/ext/standard/tests/general_functions/004.phpt
index 40b47cc1caf..5468ca99f0f 100644
--- a/ext/standard/tests/general_functions/004.phpt
+++ b/ext/standard/tests/general_functions/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 fgetcsv() with tab delimited fields (BUG #8258)
 --FILE--
-<?php 
+<?php
 chdir(dirname(__FILE__));
 $fp=fopen("004.data","r");
 while($a=fgetcsv($fp,100,"\t")) {
diff --git a/ext/standard/tests/general_functions/007.phpt b/ext/standard/tests/general_functions/007.phpt
index f755ab4f808..02fc6c64809 100644
--- a/ext/standard/tests/general_functions/007.phpt
+++ b/ext/standard/tests/general_functions/007.phpt
@@ -5,7 +5,7 @@ MD5 / Base64
 function test($str) {
 	$res = md5(base64_decode(base64_encode($str)))."\n";
 	return $res;
-} 
+}
 echo test("");
 echo test("a");
 echo test("abc");
diff --git a/ext/standard/tests/general_functions/009.phpt b/ext/standard/tests/general_functions/009.phpt
index e80d36140dc..39dc2189b31 100644
--- a/ext/standard/tests/general_functions/009.phpt
+++ b/ext/standard/tests/general_functions/009.phpt
@@ -5,7 +5,7 @@ SHA1
 function test($str) {
 	$res = sha1($str)."\n";
 	return $res;
-} 
+}
 echo test("");
 echo test("a");
 echo test("abc");
diff --git a/ext/standard/tests/general_functions/bug27678.phpt b/ext/standard/tests/general_functions/bug27678.phpt
index 6f95509e14e..7f6597d288c 100644
--- a/ext/standard/tests/general_functions/bug27678.phpt
+++ b/ext/standard/tests/general_functions/bug27678.phpt
@@ -11,6 +11,6 @@ var_dump(strlen($num) == 3); // $num == 'inf'
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 bool(true)
 Done
diff --git a/ext/standard/tests/general_functions/bug31190.phpt b/ext/standard/tests/general_functions/bug31190.phpt
index 7d154708fa4..12776448b30 100644
--- a/ext/standard/tests/general_functions/bug31190.phpt
+++ b/ext/standard/tests/general_functions/bug31190.phpt
@@ -4,7 +4,7 @@ Bug #31190 (exception in call_user_func_array())
 <?php
 
 class test {
-     function throwException() { throw new Exception("Hello World!\n"); 
+     function throwException() { throw new Exception("Hello World!\n");
 } }
 
 $array = array(new test(), 'throwException');
diff --git a/ext/standard/tests/general_functions/bug36011.phpt b/ext/standard/tests/general_functions/bug36011.phpt
index 08a45014f2e..b0dd2b8b1f1 100644
--- a/ext/standard/tests/general_functions/bug36011.phpt
+++ b/ext/standard/tests/general_functions/bug36011.phpt
@@ -9,17 +9,17 @@ class TestClass
 	{
 		echo __METHOD__ . "()\n";
 	}
-	
+
 	function whee()
 	{
 		array_map(array('TestClass', 'test'), array('array_value'));
 	}
-	
+
 	function whee4()
 	{
 		call_user_func(array('TestClass', 'test'));
 	}
-	
+
 	static function whee5()
 	{
 		call_user_func(array('TestClass', 'test'));
diff --git a/ext/standard/tests/general_functions/bug40752.phpt b/ext/standard/tests/general_functions/bug40752.phpt
index 30ed8a4aa77..c0526f31cf7 100644
--- a/ext/standard/tests/general_functions/bug40752.phpt
+++ b/ext/standard/tests/general_functions/bug40752.phpt
@@ -22,7 +22,7 @@ unlink($file);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(1) {
   ["foo"]=>
   array(1) {
diff --git a/ext/standard/tests/general_functions/bug41037.phpt b/ext/standard/tests/general_functions/bug41037.phpt
index 0ffc8d58f6d..b9bb5856d81 100644
--- a/ext/standard/tests/general_functions/bug41037.phpt
+++ b/ext/standard/tests/general_functions/bug41037.phpt
@@ -14,7 +14,7 @@ declare (ticks=1) {
     echo "Done\n";
 }
 ?>
---EXPECTF--	
+--EXPECTF--
 hello
 Warning: unregister_tick_function(): Unable to delete tick function executed at the moment in %s on line %d
 Done
diff --git a/ext/standard/tests/general_functions/bug41445.phpt b/ext/standard/tests/general_functions/bug41445.phpt
index 23888df7d70..a9ead940c14 100644
--- a/ext/standard/tests/general_functions/bug41445.phpt
+++ b/ext/standard/tests/general_functions/bug41445.phpt
@@ -35,7 +35,7 @@ var_dump(parse_ini_file($file));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(2) {
   ["001099030277"]=>
   array(1) {
diff --git a/ext/standard/tests/general_functions/bug41445_1.phpt b/ext/standard/tests/general_functions/bug41445_1.phpt
index 4698de436a0..99aa76a69ca 100644
--- a/ext/standard/tests/general_functions/bug41445_1.phpt
+++ b/ext/standard/tests/general_functions/bug41445_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #41445 (parse_ini_file() function parses octal numbers in section names) - 2 
+Bug #41445 (parse_ini_file() function parses octal numbers in section names) - 2
 --FILE--
 <?php
 
@@ -25,7 +25,7 @@ var_dump(parse_ini_file($file));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {
   ["2454.33"]=>
   array(1) {
diff --git a/ext/standard/tests/general_functions/bug43293_1.phpt b/ext/standard/tests/general_functions/bug43293_1.phpt
index d2c7f10ca46..34eb2f855ca 100644
--- a/ext/standard/tests/general_functions/bug43293_1.phpt
+++ b/ext/standard/tests/general_functions/bug43293_1.phpt
@@ -4,7 +4,7 @@ Bug #43293 (Multiple segfaults in getopt())
 register_argc_argv=Off
 --FILE--
 <?php
-$argv = array(1, 2, 3); 
+$argv = array(1, 2, 3);
 var_dump(getopt("abcd"));
 var_dump($argv);
 $argv = null;
diff --git a/ext/standard/tests/general_functions/bug44667.phpt b/ext/standard/tests/general_functions/bug44667.phpt
index 49183cc5807..290de2b1b14 100644
--- a/ext/standard/tests/general_functions/bug44667.phpt
+++ b/ext/standard/tests/general_functions/bug44667.phpt
@@ -11,19 +11,19 @@ $descriptor_spec = array(
 	0 => array('pipe', 'rb'),
 	1 => array('pipe', 'wb'),
 );
-        
+
 $proc = proc_open('cat', $descriptor_spec, $pipes);
-        
+
 fwrite($pipes[0], 'Hello', 5);
 fflush($pipes[0]);
 fclose($pipes[0]);
-        
+
 $result = fread($pipes[1], 5);
 fclose($pipes[1]);
-        
+
 proc_close($proc);
-        
-echo "Result is: ", $result, "\n";        
+
+echo "Result is: ", $result, "\n";
 
 echo "Done\n";
 
diff --git a/ext/standard/tests/general_functions/bug66094.phpt b/ext/standard/tests/general_functions/bug66094.phpt
index 8b33a4f4c3d..89dae71f4a0 100644
--- a/ext/standard/tests/general_functions/bug66094.phpt
+++ b/ext/standard/tests/general_functions/bug66094.phpt
@@ -7,6 +7,6 @@ register_tick_function($closure = function () { echo "Tick!\n"; });
 unregister_tick_function($closure);
 echo "done";
 ?>
---EXPECTF--	
+--EXPECTF--
 Tick!
 done
diff --git a/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt b/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt
index 4a4845aa1d0..51a079ad53a 100644
--- a/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt
+++ b/ext/standard/tests/general_functions/call_user_func_array_variation_002.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test call_user_func_array() function : first parameter variation 
+Test call_user_func_array() function : first parameter variation
 --FILE--
 <?php
 /* Prototype  : mixed call_user_func_array(string function_name, array parameters)
- * Description: Call a user function which is the first parameter with the arguments contained in array 
+ * Description: Call a user function which is the first parameter with the arguments contained in array
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing call_user_func_array() : usage variation ***\n";
diff --git a/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt b/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt
index 5ab5e461bf8..677ec53581a 100644
--- a/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt
+++ b/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test call_user_func_array() function : second parameter variation 
+Test call_user_func_array() function : second parameter variation
 --FILE--
 <?php
 /* Prototype  : mixed call_user_func_array(string function_name, array parameters)
- * Description: Call a user function which is the first parameter with the arguments contained in array 
+ * Description: Call a user function which is the first parameter with the arguments contained in array
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing call_user_func_array() : usage variation ***\n";
diff --git a/ext/standard/tests/general_functions/closures_001.phpt b/ext/standard/tests/general_functions/closures_001.phpt
index b4fc898fd29..7f9be50a774 100644
--- a/ext/standard/tests/general_functions/closures_001.phpt
+++ b/ext/standard/tests/general_functions/closures_001.phpt
@@ -6,6 +6,6 @@ register_shutdown_function(function () { echo "Hello World!\n"; });
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Done
 Hello World!
diff --git a/ext/standard/tests/general_functions/closures_002.phpt b/ext/standard/tests/general_functions/closures_002.phpt
index 6df389bbb11..e0ef5121c03 100644
--- a/ext/standard/tests/general_functions/closures_002.phpt
+++ b/ext/standard/tests/general_functions/closures_002.phpt
@@ -16,7 +16,7 @@ echo "$i\n";
 echo "Done\n";
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Test
 %d
 %d
diff --git a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt
index ec8e0a66ed7..968c4a3eb67 100644
Binary files a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt and b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt differ
diff --git a/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt
index 4fe2f4c95b8..cc3540c406f 100644
Binary files a/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt and b/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt differ
diff --git a/ext/standard/tests/general_functions/debug_zval_dump_e.phpt b/ext/standard/tests/general_functions/debug_zval_dump_e.phpt
index 49293626130..4f82039e2de 100644
--- a/ext/standard/tests/general_functions/debug_zval_dump_e.phpt
+++ b/ext/standard/tests/general_functions/debug_zval_dump_e.phpt
@@ -3,7 +3,7 @@ Test debug_zval_dump() function : error conditions
 --FILE--
 <?php
 /* Prototype: void debug_zval_dump ( mixed $variable );
-   Description: Dumps a string representation of an internal zend value 
+   Description: Dumps a string representation of an internal zend value
                 to output.
 */
 
diff --git a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt
index c06dff556db..d2a604ef4b6 100644
--- a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt
+++ b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt
@@ -9,7 +9,7 @@ Test debug_zval_dump() function : working on objects
 */
 
 /* Prototype: void zval_dump( $value );
-   Description: use debug_zval_dump() to display the objects and its 
+   Description: use debug_zval_dump() to display the objects and its
                 reference count */
 function zval_dump( $values ) {
   $counter = 1;
@@ -76,7 +76,7 @@ class contains_object_class
 }
 
 /* creating new object $obj */
-$obj = new contains_object_class(); 
+$obj = new contains_object_class();
 $obj1 = & $obj;  //object $obj1 references object $obj
 $obj2 = & $obj;
 $obj3 = & $obj2;
diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
index 849d8b492ca..f637bfc2e95 100644
--- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
+++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
@@ -3,7 +3,7 @@ Test debug_zval_dump() function : usage variations
 --FILE--
 <?php
 /* Prototype: void debug_zval_dump ( mixed $variable );
-   Description: Dumps a string representation of an internal zend value 
+   Description: Dumps a string representation of an internal zend value
                 to output.
 */
 
@@ -49,7 +49,7 @@ debug_zval_dump($ref_first_var);
 echo "\n-- Value of \$first_var --\n";
 debug_zval_dump($first_var);
 
-unset($ref_first_var); 
+unset($ref_first_var);
 
 /* dump value and reference count of $first_var, $ref_first_var
    here $ref_first_var is unset */
@@ -71,7 +71,7 @@ debug_zval_dump($var_3);
 
 /* unsetting $var_3 */
 unset($var_3);
-echo "\n-- Value of \$var_3: (after unsetting var_3) --\n"; 
+echo "\n-- Value of \$var_3: (after unsetting var_3) --\n";
 debug_zval_dump($var_3);
 echo "\n-- Value of \$var_2: --\n";
 debug_zval_dump($var_2);
@@ -94,7 +94,7 @@ $misc_values = array (
   /* nulls */
   NULL,
   null,
-  
+
   /* unset variable */
   @$unset_var,
 
diff --git a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
index c53b5153f85..57115a2b721 100644
--- a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
+++ b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
@@ -13,7 +13,7 @@ enable_dl=1
 <?php
 var_dump(dl(str_repeat("a", 8376757)));
 ?>
---EXPECTF--	
+--EXPECTF--
 
 Warning: dl(): File name exceeds the maximum allowed length of %d characters in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/general_functions/error_clear_last.phpt b/ext/standard/tests/general_functions/error_clear_last.phpt
index 02936c84cba..675affb6259 100644
--- a/ext/standard/tests/general_functions/error_clear_last.phpt
+++ b/ext/standard/tests/general_functions/error_clear_last.phpt
@@ -15,7 +15,7 @@ var_dump(error_get_last());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 NULL
 NULL
 array(4) {
diff --git a/ext/standard/tests/general_functions/error_get_last.phpt b/ext/standard/tests/general_functions/error_get_last.phpt
index 95a6cf434ca..71f068f1047 100644
--- a/ext/standard/tests/general_functions/error_get_last.phpt
+++ b/ext/standard/tests/general_functions/error_get_last.phpt
@@ -13,7 +13,7 @@ var_dump(error_get_last());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 NULL
 
 Warning: error_get_last() expects exactly 0 parameters, 1 given in %s on line %d
diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt
index f85f4a4195e..d7b27cd8de0 100644
--- a/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt
+++ b/ext/standard/tests/general_functions/escapeshellarg_basic-win32-mb.phpt
@@ -10,7 +10,7 @@ if( substr(PHP_OS, 0, 3) != "WIN" )
 /* Prototype  : string escapeshellarg  ( string $arg  )
  * Description: Escape a string to be used as a shell argument.
  * Source code: ext/standard/exec.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "Simple testcase for escapeshellarg() function\n";
diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt
index d97c1a956bc..7ee46ea9a28 100644
--- a/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt
+++ b/ext/standard/tests/general_functions/escapeshellarg_basic-win32.phpt
@@ -10,7 +10,7 @@ if( substr(PHP_OS, 0, 3) != "WIN" )
 /* Prototype  : string escapeshellarg  ( string $arg  )
  * Description: Escape a string to be used as a shell argument.
  * Source code: ext/standard/exec.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "Simple testcase for escapeshellarg() function\n";
diff --git a/ext/standard/tests/general_functions/escapeshellarg_basic.phpt b/ext/standard/tests/general_functions/escapeshellarg_basic.phpt
index c26915c923b..1efa72d9922 100644
--- a/ext/standard/tests/general_functions/escapeshellarg_basic.phpt
+++ b/ext/standard/tests/general_functions/escapeshellarg_basic.phpt
@@ -10,7 +10,7 @@ if( substr(PHP_OS, 0, 3) == "WIN" )
 /* Prototype  : string escapeshellarg  ( string $arg  )
  * Description: Escape a string to be used as a shell argument.
  * Source code: ext/standard/exec.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "Simple testcase for escapeshellarg() function\n";
diff --git a/ext/standard/tests/general_functions/escapeshellarg_error.phpt b/ext/standard/tests/general_functions/escapeshellarg_error.phpt
index 139a4452029..8746b5884a6 100644
--- a/ext/standard/tests/general_functions/escapeshellarg_error.phpt
+++ b/ext/standard/tests/general_functions/escapeshellarg_error.phpt
@@ -38,7 +38,7 @@ var_dump( escapeshellarg($fp));
 fclose($fp);
 
 echo "\n-- Testing escapeshellarg() function with a array supplied for argument --\n";
-$arg = array(1,2,3); 
+$arg = array(1,2,3);
 var_dump( escapeshellarg($arg));
 
 ?>
diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt
index 8f8bc19d8f3..f4e9439b140 100644
--- a/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt
+++ b/ext/standard/tests/general_functions/escapeshellarg_variation1-win32.phpt
@@ -34,7 +34,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12,
-       -12,       
+       -12,
        2147483647,
 
        // float data
@@ -53,7 +53,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
diff --git a/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt b/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt
index 32431a581a8..6f3b6a9f326 100644
--- a/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt
+++ b/ext/standard/tests/general_functions/escapeshellarg_variation1.phpt
@@ -34,7 +34,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12,
-       -12,       
+       -12,
        2147483647,
 
        // float data
@@ -53,7 +53,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
diff --git a/ext/standard/tests/general_functions/floatval.phpt b/ext/standard/tests/general_functions/floatval.phpt
index d7bdffd6ae0..1bb4d1151ce 100644
--- a/ext/standard/tests/general_functions/floatval.phpt
+++ b/ext/standard/tests/general_functions/floatval.phpt
@@ -7,7 +7,7 @@ Testing floatval() and its alias doubleval() Functions
  */
 
 echo "*** Testing floatval() with valid float values ***\n";
-// different valid  float values 
+// different valid  float values
 $valid_floats = array(
                 0.0,
                 1.0,
@@ -32,7 +32,7 @@ $valid_floats = array(
 		-.5e+7
 );
 
-/* loop to check that floatval() recognizes different 
+/* loop to check that floatval() recognizes different
    float values, expected output:float value for valid floating point number */
 
 foreach ($valid_floats as $value ) {
@@ -41,7 +41,7 @@ foreach ($valid_floats as $value ) {
 
 
 echo "\n*** Testing doubleval() with valid float values ***\n";
-/* loop to check that doubleval() also recognizes different 
+/* loop to check that doubleval() also recognizes different
    float values, expected output:float value for valid floating point number */
 
 foreach ($valid_floats as $value ) {
@@ -57,7 +57,7 @@ fclose($fp);
 $dfp = opendir ( dirname(__FILE__) );
 closedir($dfp);
 
-// other types in an array 
+// other types in an array
 $not_float_types = array (
                    -2147483648, // max negative integer value
                    2147483648,  // max positive integer value
@@ -76,7 +76,7 @@ $not_float_types = array (
                    NULL,
                    null,
                  );
-/* loop through the $not_float_types to see working of 
+/* loop through the $not_float_types to see working of
    floatval() on non float types, expected output: float value valid floating point numbers */
 foreach ($not_float_types as $type ) {
    var_dump( floatval($type) );
@@ -85,7 +85,7 @@ foreach ($not_float_types as $type ) {
 
 echo "\n*** Testing doubleval() on non floating types ***\n";
 
-/* loop through the $not_float_types to see working of 
+/* loop through the $not_float_types to see working of
    doubleval() on non float types, expected output: float value valid floating point numbers */
 foreach ($not_float_types as $type ) {
    var_dump( doubleval($type) );
@@ -99,10 +99,10 @@ echo "\n*** Testing error conditions ***\n";
 var_dump( floatval() );
 var_dump( doubleval() );
 
-//arguments more than expected 
+//arguments more than expected
 var_dump( floatval(TRUE, FALSE) );
 var_dump( doubleval(TRUE, FALSE) );
- 
+
 echo "\nDone\n";
 
 
diff --git a/ext/standard/tests/general_functions/floatval_basic.phpt b/ext/standard/tests/general_functions/floatval_basic.phpt
index 129aa87b3cb..71f4e0d1397 100644
--- a/ext/standard/tests/general_functions/floatval_basic.phpt
+++ b/ext/standard/tests/general_functions/floatval_basic.phpt
@@ -8,7 +8,7 @@ precision = 14
  * Description: Returns the float value of var.
  */
 
-// different valid  float values 
+// different valid  float values
 $valid_floats = array(
        "0.0"  => 0.0,
        "1.0"  => 1.0,
@@ -33,7 +33,7 @@ $valid_floats = array(
 	   "-.5e+7" =>-.5e+7
 );
 
-/* loop to check that floatval() recognizes different 
+/* loop to check that floatval() recognizes different
    float values, expected output:float value for valid floating point number */
 echo "*** Testing floatval() with valid float values ***\n";
 foreach ($valid_floats as $key => $value ) {
@@ -41,7 +41,7 @@ foreach ($valid_floats as $key => $value ) {
    var_dump( floatval($value) );
 }
 
-/* loop to check that doubleval() also recognizes different 
+/* loop to check that doubleval() also recognizes different
    float values, expected output:float value for valid floating point number */
 echo "\n*** Testing doubleval() with valid float values ***\n";
 foreach ($valid_floats as $key => $value ) {
diff --git a/ext/standard/tests/general_functions/floatval_variation1.phpt b/ext/standard/tests/general_functions/floatval_variation1.phpt
index aa808cfba1d..2aafa0684c1 100644
--- a/ext/standard/tests/general_functions/floatval_variation1.phpt
+++ b/ext/standard/tests/general_functions/floatval_variation1.phpt
@@ -14,11 +14,11 @@ fclose($fp);
 $dfp = opendir ( dirname(__FILE__) );
 closedir($dfp);
 
-// other types in an array 
+// other types in an array
 $not_float_types = array (
            "-2147483648" => -2147483648, // max negative integer value
            "2147483647" => 2147483648,  // max positive integer value
-           "file resoruce" => $fp, 
+           "file resoruce" => $fp,
            "directory resource" => $dfp,
            "\"0.0\"" => "0.0", // string
            "\"1.0\"" => "1.0",
@@ -33,7 +33,7 @@ $not_float_types = array (
            "NULL" => NULL,
            "null" => null,
                  );
-/* loop through the $not_float_types to see working of 
+/* loop through the $not_float_types to see working of
    floatval() on non float types, expected output: float value valid floating point numbers */
 echo "\n*** Testing floatval() on non floating types ***\n";
 foreach ($not_float_types as $key => $type ) {
@@ -43,7 +43,7 @@ foreach ($not_float_types as $key => $type ) {
 
 echo "\n*** Testing doubleval() on non floating types ***\n";
 
-/* loop through the $not_float_types to see working of 
+/* loop through the $not_float_types to see working of
    doubleval() on non float types, expected output: float value valid floating point numbers */
 foreach ($not_float_types as $key => $type ) {
    echo "\n-- Iteration : $key --\n";
diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt
index 6e0ffc51f03..3bb08fc24f3 100644
--- a/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt
+++ b/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt
@@ -21,7 +21,7 @@ EOT;
 
 $variation_array = array(
   'session.use_cookies',
-  'session.serialize_handler', 
+  'session.serialize_handler',
   'session.save_handler'
   );
 
diff --git a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt
index 544887129f4..54f0868c7f2 100644
--- a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt
+++ b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_defined_constants() function : basic functionality 
+Test get_defined_constants() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array get_defined_constants  ([ bool $categorize  ] )
  * Description:  Returns an associative array with the names of all the constants and their values
  * Source code: Zend/zend_builtin_functions.c
- */		
+ */
 
 echo "*** Testing get_defined_constants() : basic functionality ***\n";
 
@@ -29,7 +29,7 @@ if ($n2 == $n1 + 1 && array_key_exists("USER_CONSTANT", $arr2)) {
 
 ?>
 ===DONE===
---EXPECTF-- 
+--EXPECTF--
 *** Testing get_defined_constants() : basic functionality ***
 string(5) "array"
 string(5) "array"
diff --git a/ext/standard/tests/general_functions/get_defined_constants_error.phpt b/ext/standard/tests/general_functions/get_defined_constants_error.phpt
index 1092712ee99..b093ed1e0ca 100644
--- a/ext/standard/tests/general_functions/get_defined_constants_error.phpt
+++ b/ext/standard/tests/general_functions/get_defined_constants_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_defined_constants() function : error conditions 
+Test get_defined_constants() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array get_defined_constants  ([ bool $categorize  ] )
  * Description:  Returns an associative array with the names of all the constants and their values
  * Source code: Zend/zend_builtin_functions.c
- */	
+ */
 
 echo "*** Testing get_defined_constants() : error conditions ***\n";
 
diff --git a/ext/standard/tests/general_functions/get_defined_vars_basic.phpt b/ext/standard/tests/general_functions/get_defined_vars_basic.phpt
index 3aa6e72a92f..b809dc9d552 100644
--- a/ext/standard/tests/general_functions/get_defined_vars_basic.phpt
+++ b/ext/standard/tests/general_functions/get_defined_vars_basic.phpt
@@ -3,47 +3,47 @@ Test get_defined_vars() function
 --FILE--
 <?php
 /* Prototype: array get_defined_vars  ( void  )
-   Description: This function returns a multidimensional array containing a list of all defined 
-   variables, be them environment, server or user-defined variables, within the scope that 
+   Description: This function returns a multidimensional array containing a list of all defined
+   variables, be them environment, server or user-defined variables, within the scope that
    get_defined_vars() is called.
 */
 
 echo "Simple testcase for get_defined_vars() function\n\n";
 
 function f1() {
-  echo "\n-- Function f1() called --\n"; 
+  echo "\n-- Function f1() called --\n";
   $vars = get_defined_vars();
-  
+
   if (count($vars) != 0) {
-	 echo "TEST FAILED\n"; 
-  } 
-  
-  echo "\n-- ..define some local variables --\n"; 
+	 echo "TEST FAILED\n";
+  }
+
+  echo "\n-- ..define some local variables --\n";
   $i = 123;
   $f = 123.456;
   $b = false;
-  $s = "Hello World"; 
+  $s = "Hello World";
   $arr = array(1,2,3,4);
-  var_dump( get_defined_vars() ); 
+  var_dump( get_defined_vars() );
   f2();
 }
 
 function f2() {
-  echo "\n -- Function f2() called --\n"; 
+  echo "\n -- Function f2() called --\n";
   $vars= get_defined_vars();
-  
+
   if (count($vars) != 0) {
-	 echo "TEST FAILED\n"; 
+	 echo "TEST FAILED\n";
   }
-   
-  echo "\n-- ...define some variables --\n"; 
+
+  echo "\n-- ...define some variables --\n";
   $i = 456;
   $f = 456.678;
   $b = true;
-  $s = "Goodnight"; 
-  $arr = array("foo", "bar");  
+  $s = "Goodnight";
+  $arr = array("foo", "bar");
   var_dump( get_defined_vars() );
-   
+
   echo "\n-- ...define some more variables --\n";
   $i1 = 456;
   $f1 = 456.678;
@@ -56,8 +56,8 @@ echo "\n-- Get variables at global scope --\n";
 $vars = get_defined_vars();
 
 if (count($vars) == 0) {
-   echo "TEST FAILED - Global variables missing at global scope\n"; 
-}   
+   echo "TEST FAILED - Global variables missing at global scope\n";
+}
 
 // call a function
 f1();
diff --git a/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt b/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt
index d87eb4c0c86..1b7ead428ca 100644
--- a/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt
+++ b/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt
@@ -5,7 +5,7 @@ Test get_extension_funcs() function: basic test
 /* Prototype  : array get_extension_funcs  ( string $module_name  )
  * Description: Returns an array with the names of the functions of a module.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "Simple testcase for get_extension_funcs() function\n";
diff --git a/ext/standard/tests/general_functions/get_extension_funcs_error.phpt b/ext/standard/tests/general_functions/get_extension_funcs_error.phpt
index 33e32a66a56..44bd822d12e 100644
--- a/ext/standard/tests/general_functions/get_extension_funcs_error.phpt
+++ b/ext/standard/tests/general_functions/get_extension_funcs_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_extension_funcs() function : error conditions 
+Test get_extension_funcs() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array get_extension_funcs  ( string $module_name  )
  * Description: Returns an array with the names of the functions of a module.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing get_extension_funcs() : error conditions ***\n";
diff --git a/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt b/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt
index c5757372645..ac4568c6218 100644
--- a/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt
+++ b/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_extension_funcs() function : error conditions 
+Test get_extension_funcs() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array get_extension_funcs  ( string $module_name  )
  * Description: Returns an array with the names of the functions of a module.
  * Source code: Zend/zend_builtin_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing get_extension_funcs() function: with unexpected inputs for 'module_name' argument ***\n";
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
diff --git a/ext/standard/tests/general_functions/get_include_path_basic.phpt b/ext/standard/tests/general_functions/get_include_path_basic.phpt
index 999862bc64d..b777a2a44dd 100644
--- a/ext/standard/tests/general_functions/get_include_path_basic.phpt
+++ b/ext/standard/tests/general_functions/get_include_path_basic.phpt
@@ -17,7 +17,7 @@ if (ini_get("include_path") == get_include_path()) {
 	echo "PASSED\n";
 } else {
 	echo "FAILED\n";
-}		
+}
 
 echo "\nError cases:\n";
 var_dump(get_include_path(TRUE));
diff --git a/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt b/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt
index 52b2136f5b4..8ce2323a394 100644
--- a/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt
+++ b/ext/standard/tests/general_functions/get_loaded_extensions_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_loaded_extensions() function : basic functionality 
+Test get_loaded_extensions() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array get_loaded_extensions  ([ bool $zend_extensions= false  ] )
  * Description:  Returns an array with the names of all modules compiled and loaded
  * Source code: Zend/zend_builtin_functions.c
- */		
+ */
 
 echo "*** Testing get_loaded_extensions() : basic functionality ***\n";
 
diff --git a/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt b/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt
index d731046dc68..1728dea23f9 100644
--- a/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt
+++ b/ext/standard/tests/general_functions/get_loaded_extensions_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_loaded_extensions() function : error conditions 
+Test get_loaded_extensions() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array get_loaded_extensions  ([ bool $zend_extensions= false  ] )
  * Description:  Returns an array with the names of all modules compiled and loaded
  * Source code: Zend/zend_builtin_functions.c
- */		
+ */
 
 echo "*** Testing get_loaded_extensions() : error conditions ***\n";
 
diff --git a/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt b/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt
index 75cde18b087..add1ea141ce 100644
--- a/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt
+++ b/ext/standard/tests/general_functions/get_magic_quotes_gpc.phpt
@@ -9,9 +9,9 @@ Test get_magic_quotes_gpc() function
 echo "Simple testcase for get_magic_quotes_gpc() function\n";
 var_dump(get_magic_quotes_gpc());
 
-echo "\n-- Error cases --\n"; 
+echo "\n-- Error cases --\n";
 // no checks on number of args
-var_dump(get_magic_quotes_gpc(true)); 
+var_dump(get_magic_quotes_gpc(true));
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt b/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt
index 4106ee9eea0..620e97cf830 100644
--- a/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt
+++ b/ext/standard/tests/general_functions/get_magic_quotes_runtime.phpt
@@ -10,9 +10,9 @@ echo "Simple testcase for get_magic_quotes_runtime() function\n";
 
 var_dump(get_magic_quotes_runtime());
 
-echo "\n-- Error cases --\n"; 
+echo "\n-- Error cases --\n";
 // no checks on number of args
-var_dump(get_magic_quotes_runtime(true)); 
+var_dump(get_magic_quotes_runtime(true));
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/general_functions/get_resource_type_basic.phpt b/ext/standard/tests/general_functions/get_resource_type_basic.phpt
index 7ff4aec2c3a..58a49e713f4 100644
--- a/ext/standard/tests/general_functions/get_resource_type_basic.phpt
+++ b/ext/standard/tests/general_functions/get_resource_type_basic.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test get_resource_type() function : basic functionality 
+Test get_resource_type() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string get_resource_type  ( resource $handle  )
- * Description:  Returns the resource type 
+ * Description:  Returns the resource type
  * Source code: Zend/zend_builtin_functions.c
- */		
+ */
 
 echo "*** Testing get_resource_type() : basic functionality ***\n";
 
 $res = fopen(__FILE__, "r");
-var_dump(get_resource_type($res)); 
+var_dump(get_resource_type($res));
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/general_functions/get_resource_type_error.phpt b/ext/standard/tests/general_functions/get_resource_type_error.phpt
index 40dcf07799f..a010f7eba4f 100644
--- a/ext/standard/tests/general_functions/get_resource_type_error.phpt
+++ b/ext/standard/tests/general_functions/get_resource_type_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test get_resource_type() function : error conditions 
+Test get_resource_type() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string get_resource_type  ( resource $handle  )
- * Description:  Returns the resource type 
+ * Description:  Returns the resource type
  * Source code: Zend/zend_builtin_functions.c
- */		
+ */
 
 echo "*** Testing get_resource_type() : error conditions ***\n";
 
diff --git a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt
index 635bd898164..c620ba9bb0d 100644
--- a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt
+++ b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt
@@ -3,16 +3,16 @@ Test get_resource_type() function : usage variations - different data types as h
 --FILE--
 <?php
 /* Prototype  : string get_resource_type  ( resource $handle  )
- * Description:  Returns the resource type 
+ * Description:  Returns the resource type
  * Source code: Zend/zend_builtin_functions.c
- */		
+ */
 
 echo "*** Testing get_resource_type() : variation test ***\n";
 
 class Hello {
   public function SayHello($arg) {
   	echo "Hello\n";
-  } 
+  }
 }
 
 $res = fopen(__FILE__, "r");
diff --git a/ext/standard/tests/general_functions/getmypid_basic.phpt b/ext/standard/tests/general_functions/getmypid_basic.phpt
index 869eb594428..3f4d9cd5cf9 100644
--- a/ext/standard/tests/general_functions/getmypid_basic.phpt
+++ b/ext/standard/tests/general_functions/getmypid_basic.phpt
@@ -5,7 +5,7 @@ Test getmypid() function: basic test
 /* Prototype  : int getmypid  ( void  )
  * Description: Gets the current PHP process ID.
  * Source code: ext/standard/pageinfo.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "Simple testcase for getmypid() function\n";
diff --git a/ext/standard/tests/general_functions/getrusage.phpt b/ext/standard/tests/general_functions/getrusage.phpt
index e89f9e68a7a..e716414eb37 100644
--- a/ext/standard/tests/general_functions/getrusage.phpt
+++ b/ext/standard/tests/general_functions/getrusage.phpt
@@ -13,7 +13,7 @@ var_dump(getrusage(array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(5) "array"
 string(5) "array"
 string(5) "array"
diff --git a/ext/standard/tests/general_functions/getrusage_basic.phpt b/ext/standard/tests/general_functions/getrusage_basic.phpt
index b2379a76630..a2b03ee07ae 100644
--- a/ext/standard/tests/general_functions/getrusage_basic.phpt
+++ b/ext/standard/tests/general_functions/getrusage_basic.phpt
@@ -7,7 +7,7 @@ Test getrusage() function: basic test
 /* Prototype  :  array getrusage  ([ int $who  ] )
  * Description: Gets the current resource usages
  * Source code: ext/standard/microtime.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "Simple testcase for getrusage() function\n";
@@ -16,11 +16,11 @@ $dat = getrusage();
 
 if (!is_array($dat)) {
 	echo "TEST FAILED : getrusage should return an array\n";
-} 	
+}
 
-// echo the fields which are common to all platforms 
+// echo the fields which are common to all platforms
 echo "User time used (seconds) " . $dat["ru_utime.tv_sec"] . "\n";
-echo "User time used (microseconds) " . $dat["ru_utime.tv_usec"] . "\n"; 
+echo "User time used (microseconds) " . $dat["ru_utime.tv_usec"] . "\n";
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/standard/tests/general_functions/getrusage_error.phpt b/ext/standard/tests/general_functions/getrusage_error.phpt
index 7ac99655b8e..ce2bbc815e0 100644
--- a/ext/standard/tests/general_functions/getrusage_error.phpt
+++ b/ext/standard/tests/general_functions/getrusage_error.phpt
@@ -7,7 +7,7 @@ Test getrusage() function : error conditions - incorrect number of args
 /* Prototype  :  array getrusage  ([ int $who  ] )
  * Description: Gets the current resource usages
  * Source code: ext/standard/microtime.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -29,7 +29,7 @@ $array_arg = array(1,2,3);
 $dat = getrusage($array_arg);
 
 echo "\n-- Testing getrusage() function with invalid argument - OBJECT --\n";
-class classA 
+class classA
 {
   function __toString() {
     return "ClassAObject";
diff --git a/ext/standard/tests/general_functions/getrusage_variation1.phpt b/ext/standard/tests/general_functions/getrusage_variation1.phpt
index 568c9c73835..0c072ed6e06 100644
--- a/ext/standard/tests/general_functions/getrusage_variation1.phpt
+++ b/ext/standard/tests/general_functions/getrusage_variation1.phpt
@@ -3,14 +3,14 @@ Test getrusage() function : usage variation - diff data types as $who arg
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only");
-if (!function_exists("getrusage")) die("skip"); 
+if (!function_exists("getrusage")) die("skip");
 ?>
 --FILE--
 <?php
 /* Prototype  :  array getrusage  ([ int $who  ] )
  * Description: Gets the current resource usages
  * Source code: ext/standard/microtime.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
@@ -50,13 +50,13 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // string data
 /*16*/ "0",
        '1',
        "1232456",
        "1.23E4",
-       
+
        // undefined data
 /*20*/ @$undefined_var,
 
diff --git a/ext/standard/tests/general_functions/getservbyname_error.phpt b/ext/standard/tests/general_functions/getservbyname_error.phpt
index eaeec648889..ec9b7795a59 100644
--- a/ext/standard/tests/general_functions/getservbyname_error.phpt
+++ b/ext/standard/tests/general_functions/getservbyname_error.phpt
@@ -8,7 +8,7 @@ Danilo Sanchi (sanchi@grupporetina.com)
 --FILE--
 <?php
 $service = "www";
-$protocol = "tcp"; 
+$protocol = "tcp";
 $extra_arg = 12;
 var_dump(getservbyname($service, $protocol, $extra_arg ) );
 var_dump(getservbyname($service));
diff --git a/ext/standard/tests/general_functions/getservbyname_variation14.phpt b/ext/standard/tests/general_functions/getservbyname_variation14.phpt
index d93b53ece48..1e52b075f2d 100644
--- a/ext/standard/tests/general_functions/getservbyname_variation14.phpt
+++ b/ext/standard/tests/general_functions/getservbyname_variation14.phpt
@@ -6,7 +6,7 @@ Test function getservbyname() by substituting argument 2 with string values.
 
 echo "*** Test substituting argument 2 with string values ***\n";
 
-$service = "www"; 
+$service = "www";
 
 
 $heredoc = <<<EOT
diff --git a/ext/standard/tests/general_functions/getservbyname_variation2.phpt b/ext/standard/tests/general_functions/getservbyname_variation2.phpt
index 877c1d12af1..66aebcdc002 100644
--- a/ext/standard/tests/general_functions/getservbyname_variation2.phpt
+++ b/ext/standard/tests/general_functions/getservbyname_variation2.phpt
@@ -6,7 +6,7 @@ Test function getservbyname() by substituting argument 1 with boolean values.
 
 echo "*** Test substituting argument 1 with boolean values ***\n";
 
-$protocol = "tcp"; 
+$protocol = "tcp";
 
 
 $variation_array = array(
diff --git a/ext/standard/tests/general_functions/getservbyname_variation5.phpt b/ext/standard/tests/general_functions/getservbyname_variation5.phpt
index 1d3b8f6d743..f35abdf2708 100644
--- a/ext/standard/tests/general_functions/getservbyname_variation5.phpt
+++ b/ext/standard/tests/general_functions/getservbyname_variation5.phpt
@@ -6,7 +6,7 @@ Test function getservbyname() by substituting argument 1 with int values.
 
 echo "*** Test substituting argument 1 with int values ***\n";
 
-$protocol = "tcp"; 
+$protocol = "tcp";
 
 
 $variation_array = array (
diff --git a/ext/standard/tests/general_functions/getservbyport_error.phpt b/ext/standard/tests/general_functions/getservbyport_error.phpt
index e2c245b7eab..7d4107cedf9 100644
--- a/ext/standard/tests/general_functions/getservbyport_error.phpt
+++ b/ext/standard/tests/general_functions/getservbyport_error.phpt
@@ -8,7 +8,7 @@ Simone Gentili (sensorario@gmail.com)
 --FILE--
 <?php
 $port = 80;
-$protocol = "tcp"; 
+$protocol = "tcp";
 $extra_arg = 12;
 var_dump(getservbyport( $port, $protocol, $extra_arg ) );
 var_dump(getservbyport($port));
diff --git a/ext/standard/tests/general_functions/getservbyport_variation1.phpt b/ext/standard/tests/general_functions/getservbyport_variation1.phpt
index add7b52debc..cc4a9afb268 100644
--- a/ext/standard/tests/general_functions/getservbyport_variation1.phpt
+++ b/ext/standard/tests/general_functions/getservbyport_variation1.phpt
@@ -18,7 +18,7 @@ Simone Gentili (sensorario@gmail.com)
 	var_dump(getservbyport( 2, 2));
 	var_dump(getservbyport( "80", "tcp"));
 	var_dump(getservbyport( new stdClass(), new stdClass()));
-	
+
 ?>
 --EXPECTF--
 bool(false)
diff --git a/ext/standard/tests/general_functions/gettype_settype_basic.phpt b/ext/standard/tests/general_functions/gettype_settype_basic.phpt
index b082fbf5f5b..59252b5e2c9 100644
--- a/ext/standard/tests/general_functions/gettype_settype_basic.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_basic.phpt
@@ -8,11 +8,11 @@ precision=14
    Description: Returns the type of the PHP variable var
 
    Prototype: bool settype ( mixed &$var, string $type );
-   Description: Set the type of variable var to type 
+   Description: Set the type of variable var to type
 */
 
 /* Test the basic functionalities of settype() & gettype() functions.
-   Use the gettype() to get the type of regular data and use settype() 
+   Use the gettype() to get the type of regular data and use settype()
    to change its type to other types */
 
 /* function to handle catchable errors */
@@ -22,8 +22,8 @@ function foo($errno, $errstr, $errfile, $errline) {
    echo "$errno: $errstr\n";
 }
 //set the error handler, this is required as
-// settype() would fail with catachable fatal error 
-set_error_handler("foo"); 
+// settype() would fail with catachable fatal error
+set_error_handler("foo");
 
 echo "**** Testing gettype() and settype() functions ****\n";
 
@@ -89,24 +89,24 @@ foreach ($values as $value) {
 
 echo "\n*** Testing settype(): basic operations ***\n";
 foreach ($types as $type) {
-  echo "\n-- Setting type of data to $type --\n"; 
+  echo "\n-- Setting type of data to $type --\n";
   $loop_count = 1;
   foreach ($values as $var) {
      echo "-- Iteration $loop_count --\n"; $loop_count ++;
      // set to new type
      var_dump( settype($var, $type) );
-    
-     // dump the var 
+
+     // dump the var
      var_dump( $var );
-  
-     // check the new type 
-     var_dump( gettype($var) );  
+
+     // check the new type
+     var_dump( gettype($var) );
   }
 }
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 **** Testing gettype() and settype() functions ****
 
 *** Testing gettype(): basic operations ***
diff --git a/ext/standard/tests/general_functions/gettype_settype_error.phpt b/ext/standard/tests/general_functions/gettype_settype_error.phpt
index 2c6aac68752..325e91e47f6 100644
--- a/ext/standard/tests/general_functions/gettype_settype_error.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_error.phpt
@@ -1,12 +1,12 @@
 --TEST--
-Test gettype() & settype() functions : error conditions 
+Test gettype() & settype() functions : error conditions
 --FILE--
 <?php
 /* Prototype: string gettype ( mixed $var );
    Description: Returns the type of the PHP variable var
 
    Prototype: bool settype ( mixed &$var, string $type );
-   Description: Set the type of variable var to type 
+   Description: Set the type of variable var to type
 */
 
 /* Test different error conditions of settype() and gettype() functions */
@@ -16,14 +16,14 @@ echo "**** Testing gettype() and settype() functions ****\n";
 echo "\n*** Testing gettype(): error conditions ***\n";
 //Zero arguments
 var_dump( gettype() );
-// args more than expected 
+// args more than expected
 var_dump( gettype( "1", "2" ) );
 
 echo "\n*** Testing settype(): error conditions ***\n";
 //Zero arguments
 var_dump( settype() );
 
-// args more than expected 
+// args more than expected
 $var = 10.5;
 var_dump( settype( $var, $var, "int" ) );
 
@@ -32,7 +32,7 @@ var_dump( settype( $var, "unknown" ) );
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 **** Testing gettype() and settype() functions ****
 
 *** Testing gettype(): error conditions ***
diff --git a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt
index 440443bca29..ada73f01592 100644
--- a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt
@@ -12,19 +12,19 @@ precision=14
    Description: Returns the type of the PHP variable var
 
    Prototype: bool settype ( mixed &$var, string $type );
-   Description: Set the type of variable var to type 
+   Description: Set the type of variable var to type
 */
 
-/* Test usage variation of gettype() and settype() functions: 
-         settype() to null type. 
+/* Test usage variation of gettype() and settype() functions:
+         settype() to null type.
    Set type of the data to "null" and verify using gettype
    Following are performed in the listed sequence:
-     get the current type of the variable 
+     get the current type of the variable
      set the type of the variable to "null type"
      dump the variable to see its new data
      get the new type of the variable
 */
-     
+
 /* function to handle catchable errors */
 function foo($errno, $errstr, $errfile, $errline) {
 //	var_dump($errstr);
@@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) {
    echo "$errno: $errstr\n";
 }
 //set the error handler, this is required as
-// settype() would fail with catachable fatal error 
-set_error_handler("foo"); 
+// settype() would fail with catachable fatal error
+set_error_handler("foo");
 
 $var1 = "another string";
 $var2 = array(2,3,4);
@@ -57,15 +57,15 @@ class point
   }
 }
 
-$var_values = array ( 
+$var_values = array (
   /* nulls */
-  null,  
+  null,
 
   /* boolean */
-  FALSE, 
+  FALSE,
   TRUE,
   true,
- 
+
   /* strings */
   "\xFF",
   "\x66",
@@ -79,7 +79,7 @@ $var_values = array (
   "10",
   "10string",
   '10string',
-  "1",  
+  "1",
   "-1",
   "1e2",
   " 1",
@@ -125,11 +125,11 @@ $var_values = array (
   0555,
   -0555,
   02224242434343152, // an octal value > than max int
-  
+
   /* floats */
   1e5,
   -1e5,
-  1E5, 
+  1E5,
   -1E5,
   -1.5,
   .5,
@@ -155,7 +155,7 @@ $var_values = array (
   $undef_var
 );
 
-/* test conversion to null type */                
+/* test conversion to null type */
 $type = "null";
 
 echo "\n*** Testing gettype() & settype() functions : usage variations ***\n";
@@ -164,22 +164,22 @@ $loop_count = 1;
 foreach ($var_values as $var) {
   echo "-- Iteration $loop_count --\n"; $loop_count++;
 
-  // get the current data type 
+  // get the current data type
   var_dump( gettype($var) );
-  
-  // convert it to null 
+
+  // convert it to null
   var_dump( settype($var, $type) );
 
-  // dump the converted data 
+  // dump the converted data
   var_dump( $var );
-  
+
   // check the new type after conversion
   var_dump( gettype($var) );
 }
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 8: Undefined variable: unset_var
 8: Undefined variable: undef_var
 
diff --git a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt
index 18b05b6a972..ff30821380b 100644
--- a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt
@@ -15,7 +15,7 @@ precision=14
    Description: Returns the type of the PHP variable var
 
    Prototype: bool settype ( mixed &$var, string $type );
-   Description: Set the type of variable var to type 
+   Description: Set the type of variable var to type
 */
 
 /* Test usage variation of gettype() and settype() functions:
@@ -35,8 +35,8 @@ function foo($errno, $errstr, $errfile, $errline) {
    echo "$errno: $errstr\n";
 }
 //set the error handler, this is required as
-// settype() would fail with catachable fatal error 
-set_error_handler("foo"); 
+// settype() would fail with catachable fatal error
+set_error_handler("foo");
 
 $var1 = "another string";
 $var2 = array(2,3,4);
@@ -60,15 +60,15 @@ class point
   }
 }
 
-$var_values = array ( 
+$var_values = array (
   /* nulls */
-  null,  
+  null,
 
   /* boolean */
-  FALSE, 
+  FALSE,
   TRUE,
   true,
- 
+
   /* strings */
   "\xFF",
   "\x66",
@@ -82,7 +82,7 @@ $var_values = array (
   "10",
   "10string",
   '10string',
-  "1",  
+  "1",
   "-1",
   "1e2",
   " 1",
@@ -128,11 +128,11 @@ $var_values = array (
   0555,
   -0555,
   02224242434343152, // an octal value > than max int
-  
+
   /* floats */
   1e5,
   -1e5,
-  1E5, 
+  1E5,
   -1E5,
   -1.5,
   .5,
@@ -158,7 +158,7 @@ $var_values = array (
   $undef_var
 );
 
-// test conversion to these types                 
+// test conversion to these types
 $types = array(
   "integer",
   "int"
@@ -173,13 +173,13 @@ foreach ($types as $type) {
 
     // get the current data type
     var_dump( gettype($var) );
-   
+
     // convert it to new type
     var_dump( settype($var, $type) );
-    
+
     // dump the converted $var
     var_dump( $var );
- 
+
     // get the new type of the $var
     var_dump( gettype($var) );
   }
diff --git a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt
index f00d04ef888..f0fdd34d147 100644
--- a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt
@@ -12,7 +12,7 @@ precision=14
    Description: Returns the type of the PHP variable var
 
    Prototype: bool settype ( mixed &$var, string $type );
-   Description: Set the type of variable var to type 
+   Description: Set the type of variable var to type
 */
 
 /* Test usage variation of gettype() and settype() functions:
@@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) {
    echo "$errno: $errstr\n";
 }
 //set the error handler, this is required as
-// settype() would fail with catachable fatal error 
-set_error_handler("foo"); 
+// settype() would fail with catachable fatal error
+set_error_handler("foo");
 
 $var1 = "another string";
 $var2 = array(2,3,4);
@@ -57,15 +57,15 @@ class point
   }
 }
 
-$var_values = array ( 
+$var_values = array (
   /* nulls */
-  null,  
+  null,
 
   /* boolean */
-  FALSE, 
+  FALSE,
   TRUE,
   true,
- 
+
   /* strings */
   "\xFF",
   "\x66",
@@ -79,7 +79,7 @@ $var_values = array (
   "10",
   "10string",
   '10string',
-  "1",  
+  "1",
   "-1",
   "1e2",
   " 1",
@@ -125,11 +125,11 @@ $var_values = array (
   0555,
   -0555,
   02224242434343152, // an octal value > than max int
-  
+
   /* floats */
   1e5,
   -1e5,
-  1E5, 
+  1E5,
   -1E5,
   -1.5,
   .5,
@@ -155,7 +155,7 @@ $var_values = array (
   $undef_var
 );
 
-// test conversion to these types                 
+// test conversion to these types
 $types = array(
   "float",
   "double"
@@ -184,7 +184,7 @@ foreach ($types as $type) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 8: Undefined variable: unset_var
 8: Undefined variable: undef_var
 
diff --git a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt
index 6ff891391f0..a0a70646988 100644
--- a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt
@@ -12,7 +12,7 @@ precision=14
    Description: Returns the type of the PHP variable var
 
    Prototype: bool settype ( mixed &$var, string $type );
-   Description: Set the type of variable var to type 
+   Description: Set the type of variable var to type
 */
 
 /* Test usage variation of gettype() and settype() functions:
@@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) {
    echo "$errno: $errstr\n";
 }
 //set the error handler, this is required as
-// settype() would fail with catachable fatal error 
-set_error_handler("foo"); 
+// settype() would fail with catachable fatal error
+set_error_handler("foo");
 
 $var1 = "another string";
 $var2 = array(2,3,4);
@@ -61,15 +61,15 @@ class class_with_no_member {
  // no member(s)
 }
 
-$var_values = array ( 
+$var_values = array (
   /* nulls */
-  null,  
+  null,
 
   /* boolean */
-  FALSE, 
+  FALSE,
   TRUE,
   true,
- 
+
   /* strings */
   "\xFF",
   "\x66",
@@ -86,7 +86,7 @@ $var_values = array (
   "10",
   "10string",
   '10string',
-  "1",  
+  "1",
   "-1",
   "1e2",
   " 1",
@@ -133,12 +133,12 @@ $var_values = array (
   0555,
   -0555,
   02224242434343152, // an octal value > than max int
-  
+
   /* floats */
   0.0,
   1e5,
   -1e5,
-  1E5, 
+  1E5,
   -1E5,
   -1.5,
   .5,
@@ -163,7 +163,7 @@ $var_values = array (
   /* undefined/unset vars */
   $unset_var,
   $undef_var,
-  
+
   /* binary strings */
   b"0",
   b'0',
@@ -180,7 +180,7 @@ $var_values = array (
   b"10string"
 );
 
-// test conversion to these types                 
+// test conversion to these types
 $types = array(
   "boolean",
   "bool"
@@ -209,7 +209,7 @@ foreach ($types as $type) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 8: Undefined variable: unset_var
 8: Undefined variable: undef_var
 
diff --git a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt
index 7c43b8e3182..0885af1a3dd 100644
--- a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt
@@ -12,7 +12,7 @@ precision=14
    Description: Returns the type of the PHP variable var
 
    Prototype: bool settype ( mixed &$var, string $type );
-   Description: Set the type of variable var to type 
+   Description: Set the type of variable var to type
 */
 
 /* Test usage variation of gettype() and settype() functions:
@@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) {
    echo "$errno: $errstr\n";
 }
 //set the error handler, this is required as
-// settype() would fail with catachable fatal error 
-set_error_handler("foo"); 
+// settype() would fail with catachable fatal error
+set_error_handler("foo");
 
 $var1 = "another string";
 $var2 = array(2,3,4);
@@ -57,15 +57,15 @@ class point
   }
 }
 
-$var_values = array ( 
+$var_values = array (
   /* nulls */
-  null,  
+  null,
 
   /* boolean */
-  FALSE, 
+  FALSE,
   TRUE,
   true,
- 
+
   /* strings */
   "\xFF",
   "\x66",
@@ -79,7 +79,7 @@ $var_values = array (
   "10",
   "10string",
   '10string',
-  "1",  
+  "1",
   "-1",
   "1e2",
   " 1",
@@ -125,11 +125,11 @@ $var_values = array (
   0555,
   -0555,
   02224242434343152, // an octal value > than max int
-  
+
   /* floats */
   1e5,
   -1e5,
-  1E5, 
+  1E5,
   -1E5,
   -1.5,
   .5,
@@ -179,7 +179,7 @@ foreach ($var_values as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 8: Undefined variable: unset_var
 8: Undefined variable: undef_var
 
diff --git a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt
index 9e5ce2e600c..3854deac0f1 100644
--- a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt
@@ -12,7 +12,7 @@ precision=14
    Description: Returns the type of the PHP variable var
 
    Prototype: bool settype ( mixed &$var, string $type );
-   Description: Set the type of variable var to type 
+   Description: Set the type of variable var to type
 */
 
 /* Test usage variation of gettype() and settype() functions:
@@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) {
    echo "$errno: $errstr\n";
 }
 //set the error handler, this is required as
-// settype() would fail with catachable fatal error 
-set_error_handler("foo"); 
+// settype() would fail with catachable fatal error
+set_error_handler("foo");
 
 $var1 = "another string";
 $var2 = array(2,3,4);
@@ -57,15 +57,15 @@ class point
   }
 }
 
-$var_values = array ( 
+$var_values = array (
   /* nulls */
-  null,  
+  null,
 
   /* boolean */
-  FALSE, 
+  FALSE,
   TRUE,
   true,
- 
+
   /* strings */
   "\xFF",
   "\x66",
@@ -79,7 +79,7 @@ $var_values = array (
   "10",
   "10string",
   '10string',
-  "1",  
+  "1",
   "-1",
   "1e2",
   " 1",
@@ -125,11 +125,11 @@ $var_values = array (
   0555,
   -0555,
   02224242434343152, // an octal value > than max int
-  
+
   /* floats */
   1e5,
   -1e5,
-  1E5, 
+  1E5,
   -1E5,
   -1.5,
   .5,
@@ -181,7 +181,7 @@ foreach ($var_values as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 8: Undefined variable: unset_var
 8: Undefined variable: undef_var
 
diff --git a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt
index c4246b4204b..8d7333edfc8 100644
--- a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt
@@ -12,7 +12,7 @@ precision=14
    Description: Returns the type of the PHP variable var
 
    Prototype: bool settype ( mixed &$var, string $type );
-   Description: Set the type of variable var to type 
+   Description: Set the type of variable var to type
 */
 
 /* Test usage variation of gettype() and settype() functions:
@@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) {
    echo "$errno: $errstr\n";
 }
 //set the error handler, this is required as
-// settype() would fail with catachable fatal error 
-set_error_handler("foo"); 
+// settype() would fail with catachable fatal error
+set_error_handler("foo");
 
 $var1 = "another string";
 $var2 = array(2,3,4);
@@ -57,15 +57,15 @@ class point
   }
 }
 
-$var_values = array ( 
+$var_values = array (
   /* nulls */
-  null,  
+  null,
 
   /* boolean */
-  FALSE, 
+  FALSE,
   TRUE,
   true,
- 
+
   /* strings */
   "\xFF",
   "\x66",
@@ -79,7 +79,7 @@ $var_values = array (
   "10",
   "10string",
   '10string',
-  "1",  
+  "1",
   "-1",
   "1e2",
   " 1",
@@ -125,11 +125,11 @@ $var_values = array (
   0555,
   -0555,
   02224242434343152, // an octal value > than max int
-  
+
   /* floats */
   1e5,
   -1e5,
-  1E5, 
+  1E5,
   -1E5,
   -1.5,
   .5,
@@ -154,7 +154,7 @@ $var_values = array (
   $unset_var,
   $undef_var
 );
-                
+
 /* test conversion to object type */
 $type = "object";
 
@@ -179,7 +179,7 @@ foreach ($var_values as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 8: Undefined variable: unset_var
 8: Undefined variable: undef_var
 
diff --git a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt
index 5e568fe7aa6..25371faa197 100644
--- a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt
@@ -12,7 +12,7 @@ precision=14
    Description: Returns the type of the PHP variable var
 
    Prototype: bool settype ( mixed &$var, string $type );
-   Description: Set the type of variable var to type 
+   Description: Set the type of variable var to type
 */
 
 /* Test usage variation of gettype() and settype() functions:
@@ -32,8 +32,8 @@ function foo($errno, $errstr, $errfile, $errline) {
    echo "$errno: $errstr\n";
 }
 //set the error handler, this is required as
-// settype() would fail with catachable fatal error 
-set_error_handler("foo"); 
+// settype() would fail with catachable fatal error
+set_error_handler("foo");
 
 $var1 = "another string";
 $var2 = array(2,3,4);
@@ -57,15 +57,15 @@ class point
   }
 }
 
-$var_values = array ( 
+$var_values = array (
   /* nulls */
-  null,  
+  null,
 
   /* boolean */
-  FALSE, 
+  FALSE,
   TRUE,
   true,
- 
+
   /* strings */
   "\xFF",
   "\x66",
@@ -79,7 +79,7 @@ $var_values = array (
   "10",
   "10string",
   '10string',
-  "1",  
+  "1",
   "-1",
   "1e2",
   " 1",
@@ -125,11 +125,11 @@ $var_values = array (
   0555,
   -0555,
   02224242434343152, // an octal value > than max int
-  
+
   /* floats */
   1e5,
   -1e5,
-  1E5, 
+  1E5,
   -1E5,
   -1.5,
   .5,
@@ -179,7 +179,7 @@ foreach ($var_values as $var) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 8: Undefined variable: unset_var
 8: Undefined variable: undef_var
 
diff --git a/ext/standard/tests/general_functions/head.phpt b/ext/standard/tests/general_functions/head.phpt
index e83bbf6aca1..059c56b2588 100644
--- a/ext/standard/tests/general_functions/head.phpt
+++ b/ext/standard/tests/general_functions/head.phpt
@@ -27,7 +27,7 @@ var_dump(headers_list());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 NULL
 bool(false)
 array(0) {
diff --git a/ext/standard/tests/general_functions/ini_get_all.phpt b/ext/standard/tests/general_functions/ini_get_all.phpt
index 806831edfc7..b97a945ee58 100644
--- a/ext/standard/tests/general_functions/ini_get_all.phpt
+++ b/ext/standard/tests/general_functions/ini_get_all.phpt
@@ -20,7 +20,7 @@ var_dump(ini_get_all("", ""));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(5) "array"
 
 Warning: ini_get_all(): Unable to find extension '' in %s on line %d
diff --git a/ext/standard/tests/general_functions/intval.phpt b/ext/standard/tests/general_functions/intval.phpt
index a22b747e55c..322b407aa44 100644
--- a/ext/standard/tests/general_functions/intval.phpt
+++ b/ext/standard/tests/general_functions/intval.phpt
@@ -11,13 +11,13 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
  */
 
 echo "*** Testing intval() with valid integer values ***\n";
-// different valid  integer vlaues 
+// different valid  integer vlaues
 $valid_ints = array(
                 '0',
                 '1',
                 '-1',
                 '-2147483648', // max negative integer value
-                '-2147483647', 
+                '-2147483647',
                 2147483647,  // max positive integer value
                 2147483640,
                 0x123B,      // integer as hexadecimal
@@ -33,7 +33,7 @@ $valid_ints = array(
                 017777777777,  // max positive integer as octal
                );
 
-/* loop to check that intval() recognizes different 
+/* loop to check that intval() recognizes different
    integer values, expected output:integer value in decimal notation for valid integer */
 
 echo "\n***Output with default base value ie 10 ***\n";
@@ -47,7 +47,7 @@ foreach ($valid_ints as $value ) {
    var_dump( intval($value, 10) );
 }
 
- 
+
 echo "\n***Output with base value  of 16 ***\n";
 foreach ($valid_ints as $value ) {
    var_dump( intval($value, 16) );
@@ -140,7 +140,7 @@ $not_int_types = array (
 );
 
 
-/* loop through the $not_int_types to see working of 
+/* loop through the $not_int_types to see working of
    intval() on non integer types, expected output: integer value in decimal notation for valid integers */
 foreach ($not_int_types as $type ) {
    var_dump( intval($type) );
@@ -150,9 +150,9 @@ echo "\n*** Testing error conditions ***\n";
 //Zero argument
 var_dump( intval() );
 
-//arguments more than expected 
+//arguments more than expected
 var_dump( intval(TRUE, FALSE, TRUE) );
- 
+
 echo "\n--- Done ---\n";
 
 
diff --git a/ext/standard/tests/general_functions/intval_variation1.phpt b/ext/standard/tests/general_functions/intval_variation1.phpt
index bf88c7c920d..e76d7083d4d 100644
--- a/ext/standard/tests/general_functions/intval_variation1.phpt
+++ b/ext/standard/tests/general_functions/intval_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test intval() function : usage variation 
+Test intval() function : usage variation
 --FILE--
 <?php
 /* Prototype  : int intval(mixed var [, int base])
- * Description: Get the integer value of a variable using the optional base for the conversion 
+ * Description: Get the integer value of a variable using the optional base for the conversion
  * Source code: ext/standard/type.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing intval() : usage variation ***\n";
diff --git a/ext/standard/tests/general_functions/intval_variation2.phpt b/ext/standard/tests/general_functions/intval_variation2.phpt
index f601c4b8954..0b382363736 100644
--- a/ext/standard/tests/general_functions/intval_variation2.phpt
+++ b/ext/standard/tests/general_functions/intval_variation2.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test intval() function : usage variation 
+Test intval() function : usage variation
 --SKIPIF--
 <?php if (PHP_INT_SIZE !== 4) die("skip this test is for 32-bit only");
 --FILE--
 <?php
 /* Prototype  : int intval(mixed var [, int base])
- * Description: Get the integer value of a variable using the optional base for the conversion 
+ * Description: Get the integer value of a variable using the optional base for the conversion
  * Source code: ext/standard/type.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing intval() : usage variation ***\n";
diff --git a/ext/standard/tests/general_functions/is_array.phpt b/ext/standard/tests/general_functions/is_array.phpt
index 469a8ec6cb8..223b732904c 100644
--- a/ext/standard/tests/general_functions/is_array.phpt
+++ b/ext/standard/tests/general_functions/is_array.phpt
@@ -25,7 +25,7 @@ $arrays = array(
   array("string", "test"),
   array('string', 'test')
 );
-/* loop to check that is_array() recognizes different 
+/* loop to check that is_array() recognizes different
    type of arrays, expected output bool(true) */
 $loop_counter = 1;
 foreach ($arrays as $var_array ) {
@@ -39,14 +39,14 @@ echo "\n*** Testing is_array() on non array types ***\n";
 $fp = fopen (__FILE__, "r");
 $dfp = opendir ( dirname(__FILE__) );
 
-// unset variables 
+// unset variables
 $unset_array = array(10);
 unset($unset_array);
 
-// other types in a array 
+// other types in a array
 $varient_arrays = array (
   /* integers */
-  543915, 
+  543915,
   -5322,
   0x55F,
   -0xCCF,
@@ -54,7 +54,7 @@ $varient_arrays = array (
   -0654,
 
   /* strings */
-  "",  
+  "",
   '',
   "0",
   '0',
@@ -68,20 +68,20 @@ $varient_arrays = array (
   .5E+8,
   -.5e+90,
   1e5,
-  
+
   /* objects */
-  new stdclass, 
-  
+  new stdclass,
+
   /* resources */
-  $fp, 
-  $dfp, 
+  $fp,
+  $dfp,
 
   /* nulls */
-  null,  
+  null,
   NULL,
 
   /* boolean */
-  true, 
+  true,
   TRUE,
   FALSE,
   false,
@@ -90,7 +90,7 @@ $varient_arrays = array (
   @$unset_array,
   @$undefined_array
 );
-/* loop through the $varient_array to see working of 
+/* loop through the $varient_array to see working of
    is_array() on non array types, expected output bool(false) */
 $loop_counter = 1;
 foreach ($varient_arrays as $type ) {
@@ -102,9 +102,9 @@ echo "\n*** Testing error conditions ***\n";
 //Zero argument
 var_dump( is_array() );
 
-//arguments more than expected 
+//arguments more than expected
 var_dump( is_array ($fp, $fp) );
- 
+
 echo "Done\n";
 /* close resources */
 fclose($fp);
diff --git a/ext/standard/tests/general_functions/is_bool.phpt b/ext/standard/tests/general_functions/is_bool.phpt
index 250385a9efb..de1c0430ee2 100644
--- a/ext/standard/tests/general_functions/is_bool.phpt
+++ b/ext/standard/tests/general_functions/is_bool.phpt
@@ -3,22 +3,22 @@ Test is_bool() function
 --FILE--
 <?php
 /* Prototype: bool is_bool ( mixed $var );
- * Description: Finds whether the given variable is a boolean  
+ * Description: Finds whether the given variable is a boolean
  */
 
 echo "*** Testing is_bool() with valid boolean values ***\n";
-// different valid  boolean vlaues 
+// different valid  boolean vlaues
 $valid_bools = array(
   TRUE,
   FALSE,
   true,
   false,
 );
-/* loop to check that is_bool() recognizes different 
+/* loop to check that is_bool() recognizes different
    bool values, expected output: bool(true) */
 $loop_counter = 1;
 foreach ($valid_bools as $bool_val ) {
-  echo "-- Iteration $loop_counter --\n"; $loop_counter++; 
+  echo "-- Iteration $loop_counter --\n"; $loop_counter++;
   var_dump( is_bool($bool_val) );
 }
 
@@ -36,7 +36,7 @@ unset ($unset_bool1);
 unset ($unset_bool2);
 unset ($unset_var);
 
-// other types in a array 
+// other types in a array
 $not_bool_types = array (
   /* integers */
   0,
@@ -98,7 +98,7 @@ $not_bool_types = array (
   /* nulls */
   null,
   NULL,
-  
+
   /* arrays */
   array(),
   array(0),
@@ -114,16 +114,16 @@ $not_bool_types = array (
   array(1 => "One", "two" => 2),
 
   /* unset bool vars and undefined var */
-  @$unset_bool1, 
-  @$unset_bool2, 
-  @$unset_var, 
+  @$unset_bool1,
+  @$unset_bool2,
+  @$unset_var,
   @$undefined_var
 );
-/* loop through the $not_bool_types to see working of 
+/* loop through the $not_bool_types to see working of
    is_bool() on non bull types, expected output: bool(false) */
 $loop_counter = 1;
 foreach ($not_bool_types as $type ) {
-  echo "-- Iteration $loop_counter --\n"; $loop_counter++; 
+  echo "-- Iteration $loop_counter --\n"; $loop_counter++;
   var_dump( is_bool($type) );
 }
 
@@ -131,9 +131,9 @@ echo "\n*** Testing error conditions ***\n";
 //Zero argument
 var_dump( is_bool() );
 
-//arguments more than expected 
+//arguments more than expected
 var_dump( is_bool(TRUE, FALSE) );
- 
+
 echo "Done\n";
 
 // close resources
diff --git a/ext/standard/tests/general_functions/is_callable_basic2.phpt b/ext/standard/tests/general_functions/is_callable_basic2.phpt
index d842534124b..379defc3a8e 100644
--- a/ext/standard/tests/general_functions/is_callable_basic2.phpt
+++ b/ext/standard/tests/general_functions/is_callable_basic2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test is_callable() function : usage variations - on objects 
+Test is_callable() function : usage variations - on objects
 --INI--
 precision=14
 error_reporting = E_ALL & ~E_NOTICE | E_STRICT
@@ -11,7 +11,7 @@ error_reporting = E_ALL & ~E_NOTICE | E_STRICT
 */
 
 /* Prototype: void check_iscallable_objects( $methods );
-   Description: use is_callable() on given $method to check if the array 
+   Description: use is_callable() on given $method to check if the array
                 contains a valid method name;
                 returns true if valid function name, false otherwise
 */
@@ -35,11 +35,11 @@ echo "\n*** Testing is_callable() on objects ***\n";
 class object_class
 {
   public $value = 100;
-  
+
   /* static method */
   static public function foo() {
   }
-  
+
   public function foo1() {
   }
   /* function name with mixed string and integer */
@@ -50,7 +50,7 @@ class object_class
   }
   /* function name having boolean value */
   public function TRUE() {
-  }  
+  }
 
   protected function foo2() {
   }
diff --git a/ext/standard/tests/general_functions/is_callable_variation2.phpt b/ext/standard/tests/general_functions/is_callable_variation2.phpt
index b94a446dcf4..1019bca6fab 100644
--- a/ext/standard/tests/general_functions/is_callable_variation2.phpt
+++ b/ext/standard/tests/general_functions/is_callable_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test is_callable() function : usage variations - on invalid function names  
+Test is_callable() function : usage variations - on invalid function names
 --INI--
 precision=14
 error_reporting = E_ALL & ~E_NOTICE | E_STRICT
diff --git a/ext/standard/tests/general_functions/is_float.phpt b/ext/standard/tests/general_functions/is_float.phpt
index f6bbdaace00..07bcc9da9eb 100644
--- a/ext/standard/tests/general_functions/is_float.phpt
+++ b/ext/standard/tests/general_functions/is_float.phpt
@@ -7,11 +7,11 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype: bool is_float ( mixed $var );
- * Description: Finds whether the given variable is a float 
- */ 
+ * Description: Finds whether the given variable is a float
+ */
 
 echo "*** Testing is_float(), is_double() and is_real() with float values***\n";
-// different valid  float vlaues 
+// different valid  float vlaues
 $floats = array(
   -2147483649, // float value
   2147483648,  // float value
@@ -63,7 +63,7 @@ $dfp = opendir ( dirname(__FILE__) );
 $unset_var = 10;
 unset ($unset_var);
 
-// non_scalar values, objects, arrays, resources and boolean 
+// non_scalar values, objects, arrays, resources and boolean
 class foo
 {
   var $array = array(10.5);
@@ -72,7 +72,7 @@ $object = new foo();
 
 $not_floats = array (
   new foo, //object
-  $object,  
+  $object,
 
   $fp,  // resource
   $dfp,
@@ -90,7 +90,7 @@ $not_floats = array (
   TRUE,
   false,
   FALSE,
-  
+
   "",  // strings
   '',
   "0",
@@ -103,7 +103,7 @@ $not_floats = array (
   '1e5',
   '1.5e6_string',
   "1.5e6_string",
- 
+
   1,  // integers, hex and octal
   -1,
   0,
@@ -112,11 +112,11 @@ $not_floats = array (
   -0x673,
   0123,
   -0123,
-   
+
   @$unset_var,  // unset variable
   @$undefined_var
 );
-/* loop through the $not_floats to see working of 
+/* loop through the $not_floats to see working of
    is_float(), is_double() & is_real() on objects,
     arrays, boolean and others */
 $loop_counter = 1;
@@ -133,14 +133,14 @@ var_dump( is_float() );
 var_dump( is_double() );
 var_dump( is_real() );
 
-//arguments more than expected 
+//arguments more than expected
 var_dump( is_float( $floats[0], $floats[1]) );
 var_dump( is_double( $floats[0], $floats[1]) );
 var_dump( is_real( $floats[0], $floats[1]) );
- 
+
 echo "Done\n";
 
-// close the resources used 
+// close the resources used
 fclose($fp);
 closedir($dfp);
 
diff --git a/ext/standard/tests/general_functions/is_float_64bit.phpt b/ext/standard/tests/general_functions/is_float_64bit.phpt
index 05dd1c3a4a4..13ebb67a790 100644
--- a/ext/standard/tests/general_functions/is_float_64bit.phpt
+++ b/ext/standard/tests/general_functions/is_float_64bit.phpt
@@ -9,11 +9,11 @@ precision=14
 --FILE--
 <?php
 /* Prototype: bool is_float ( mixed $var );
- * Description: Finds whether the given variable is a float 
- */ 
+ * Description: Finds whether the given variable is a float
+ */
 
 echo "*** Testing is_float(), is_double() and is_real() with float values***\n";
-// different valid  float vlaues 
+// different valid  float vlaues
 $floats = array(
   -2147483649, // float value
   2147483648,  // float value
@@ -65,7 +65,7 @@ $dfp = opendir ( dirname(__FILE__) );
 $unset_var = 10;
 unset ($unset_var);
 
-// non_scalar values, objects, arrays, resources and boolean 
+// non_scalar values, objects, arrays, resources and boolean
 class foo
 {
   var $array = array(10.5);
@@ -74,7 +74,7 @@ $object = new foo();
 
 $not_floats = array (
   new foo, //object
-  $object,  
+  $object,
 
   $fp,  // resource
   $dfp,
@@ -92,7 +92,7 @@ $not_floats = array (
   TRUE,
   false,
   FALSE,
-  
+
   "",  // strings
   '',
   "0",
@@ -105,7 +105,7 @@ $not_floats = array (
   '1e5',
   '1.5e6_string',
   "1.5e6_string",
- 
+
   1,  // integers, hex and octal
   -1,
   0,
@@ -114,11 +114,11 @@ $not_floats = array (
   -0x673,
   0123,
   -0123,
-   
+
   @$unset_var,  // unset variable
   @$undefined_var
 );
-/* loop through the $not_floats to see working of 
+/* loop through the $not_floats to see working of
    is_float(), is_double() & is_real() on objects,
     arrays, boolean and others */
 $loop_counter = 1;
@@ -135,11 +135,11 @@ var_dump( is_float() );
 var_dump( is_double() );
 var_dump( is_real() );
 
-//arguments more than expected 
+//arguments more than expected
 var_dump( is_float( $floats[0], $floats[1]) );
 var_dump( is_double( $floats[0], $floats[1]) );
 var_dump( is_real( $floats[0], $floats[1]) );
- 
+
 echo "Done\n";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/general_functions/is_int.phpt b/ext/standard/tests/general_functions/is_int.phpt
index eccaa1995ce..9867410e40d 100644
--- a/ext/standard/tests/general_functions/is_int.phpt
+++ b/ext/standard/tests/general_functions/is_int.phpt
@@ -7,17 +7,17 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype: bool is_int ( mixed $var );
- * Description: Finds whether the given variable is an integer  
+ * Description: Finds whether the given variable is an integer
  */
 
 echo "*** Testing is_int(), is_integer() & is_long()  with valid integer values ***\n";
-// different valid  integer vlaues 
+// different valid  integer vlaues
 $valid_ints = array(
   0,
   1,
   -1,
   -2147483648, // max negative integer value
-  -2147483647, 
+  -2147483647,
   2147483647,  // max positive integer value
   2147483640,
   0x123B,      // integer as hexadecimal
@@ -32,11 +32,11 @@ $valid_ints = array(
   -020000000000, // max negative integer as octal
   017777777777,  // max positive integer as octal
 );
-/* loop to check that is_int() recognizes different 
+/* loop to check that is_int() recognizes different
    integer values, expected output: bool(true) */
 $loop_counter = 1;
 foreach ($valid_ints as $int_val ) {
-   echo "--Iteration $loop_counter--\n"; $loop_counter++;   
+   echo "--Iteration $loop_counter--\n"; $loop_counter++;
    var_dump( is_int($int_val) );
    var_dump( is_integer($int_val) );
    var_dump( is_long($int_val) );
@@ -52,16 +52,16 @@ $dfp = opendir ( dirname(__FILE__) );
 $unset_var = 10;
 unset ($unset_var);
 
-// other types in a array 
+// other types in a array
 $not_int_types = array (
   /* float values */
   -2147483649, // float value
   2147483648,  // float value
   -0x80000001, // float value, beyond max negative int
   0x800000001, // float value, beyond max positive int
-  020000000001, // float value, beyond max positive int 
-  -020000000001, // float value, beyond max negative int 
-  0.0,  
+  020000000001, // float value, beyond max positive int
+  -020000000001, // float value, beyond max negative int
+  0.0,
   -0.1,
   1.0,
   1e5,
@@ -70,14 +70,14 @@ $not_int_types = array (
   -1E9,
   10.0000000000000000005,
   10.5e+5,
- 
+
   /* objects */
   new stdclass,
 
   /* resources */
   $fp,
   $dfp,
-  
+
   /* arrays */
   array(),
   array(0),
@@ -91,7 +91,7 @@ $not_int_types = array (
   array(FALSE),
   array(1,2,3,4),
   array(1 => "One", "two" => 2),
-  
+
   /* strings */
   "",
   '',
@@ -119,14 +119,14 @@ $not_int_types = array (
   FALSE,
 
   /* undefined and unset vars */
-  @$unset_var, 
+  @$unset_var,
   @$undefined_var
 );
-/* loop through the $not_int_types to see working of 
+/* loop through the $not_int_types to see working of
    is_int() on non integer types, expected output: bool(false) */
 $loop_counter = 1;
 foreach ($not_int_types as $type ) {
-   echo "--Iteration $loop_counter--\n"; $loop_counter++;   
+   echo "--Iteration $loop_counter--\n"; $loop_counter++;
    var_dump( is_int($type) );
    var_dump( is_integer($type) );
    var_dump( is_long($type) );
@@ -138,11 +138,11 @@ var_dump( is_int() );
 var_dump( is_integer() );
 var_dump( is_long() );
 
-//arguments more than expected 
+//arguments more than expected
 var_dump( is_int(TRUE, FALSE) );
 var_dump( is_integer(TRUE, FALSE) );
 var_dump( is_long(TRUE, FALSE) );
- 
+
 echo "Done\n";
 
 // close the resources
diff --git a/ext/standard/tests/general_functions/is_int_64bit.phpt b/ext/standard/tests/general_functions/is_int_64bit.phpt
index cecfa700e39..228a11690de 100644
--- a/ext/standard/tests/general_functions/is_int_64bit.phpt
+++ b/ext/standard/tests/general_functions/is_int_64bit.phpt
@@ -9,17 +9,17 @@ precision=14
 --FILE--
 <?php
 /* Prototype: bool is_int ( mixed $var );
- * Description: Finds whether the given variable is an integer  
+ * Description: Finds whether the given variable is an integer
  */
 
 echo "*** Testing is_int(), is_integer() & is_long()  with valid integer values ***\n";
-// different valid  integer vlaues 
+// different valid  integer vlaues
 $valid_ints = array(
   0,
   1,
   -1,
   -2147483648, // max negative integer value
-  -2147483647, 
+  -2147483647,
   2147483647,  // max positive integer value
   2147483640,
   0x123B,      // integer as hexadecimal
@@ -34,11 +34,11 @@ $valid_ints = array(
   -020000000000, // max negative integer as octal
   017777777777,  // max positive integer as octal
 );
-/* loop to check that is_int() recognizes different 
+/* loop to check that is_int() recognizes different
    integer values, expected output: bool(true) */
 $loop_counter = 1;
 foreach ($valid_ints as $int_val ) {
-   echo "--Iteration $loop_counter--\n"; $loop_counter++;   
+   echo "--Iteration $loop_counter--\n"; $loop_counter++;
    var_dump( is_int($int_val) );
    var_dump( is_integer($int_val) );
    var_dump( is_long($int_val) );
@@ -54,16 +54,16 @@ $dfp = opendir ( dirname(__FILE__) );
 $unset_var = 10;
 unset ($unset_var);
 
-// other types in a array 
+// other types in a array
 $not_int_types = array (
   /* float values */
   -2147483649, // float value
   2147483648,  // float value
   -0x80000001, // float value, beyond max negative int
   0x800000001, // float value, beyond max positive int
-  020000000001, // float value, beyond max positive int 
-  -020000000001, // float value, beyond max negative int 
-  0.0,  
+  020000000001, // float value, beyond max positive int
+  -020000000001, // float value, beyond max negative int
+  0.0,
   -0.1,
   1.0,
   1e5,
@@ -72,14 +72,14 @@ $not_int_types = array (
   -1E9,
   10.0000000000000000005,
   10.5e+5,
- 
+
   /* objects */
   new stdclass,
 
   /* resources */
   $fp,
   $dfp,
-  
+
   /* arrays */
   array(),
   array(0),
@@ -93,7 +93,7 @@ $not_int_types = array (
   array(FALSE),
   array(1,2,3,4),
   array(1 => "One", "two" => 2),
-  
+
   /* strings */
   "",
   '',
@@ -121,14 +121,14 @@ $not_int_types = array (
   FALSE,
 
   /* undefined and unset vars */
-  @$unset_var, 
+  @$unset_var,
   @$undefined_var
 );
-/* loop through the $not_int_types to see working of 
+/* loop through the $not_int_types to see working of
    is_int() on non integer types, expected output: bool(false) */
 $loop_counter = 1;
 foreach ($not_int_types as $type ) {
-   echo "--Iteration $loop_counter--\n"; $loop_counter++;   
+   echo "--Iteration $loop_counter--\n"; $loop_counter++;
    var_dump( is_int($type) );
    var_dump( is_integer($type) );
    var_dump( is_long($type) );
@@ -140,11 +140,11 @@ var_dump( is_int() );
 var_dump( is_integer() );
 var_dump( is_long() );
 
-//arguments more than expected 
+//arguments more than expected
 var_dump( is_int(TRUE, FALSE) );
 var_dump( is_integer(TRUE, FALSE) );
 var_dump( is_long(TRUE, FALSE) );
- 
+
 echo "Done\n";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/general_functions/is_null.phpt b/ext/standard/tests/general_functions/is_null.phpt
index b01b1956971..ad0435b7c83 100644
--- a/ext/standard/tests/general_functions/is_null.phpt
+++ b/ext/standard/tests/general_functions/is_null.phpt
@@ -3,11 +3,11 @@ Test is_null() function
 --FILE--
 <?php
 /* Prototype: bool is_null ( mixed $var );
- * Description: Finds whether the given variable is NULL 
+ * Description: Finds whether the given variable is NULL
  */
 
 echo "*** Testing is_null() with valid null values ***\n";
-// different valid  null vlaues 
+// different valid  null vlaues
 $unset_array = array();
 $unset_int = 10;
 $unset_float = 10.5;
@@ -15,7 +15,7 @@ $unset_bool = true;
 $unset_object = new stdclass;
 $unset_resource = fopen(__FILE__, "r");
 // unset them to make it null.
-unset ($unset_array, $unset_int, $unset_float, $unset_bool, $unset_object, $unset_resource); 
+unset ($unset_array, $unset_int, $unset_float, $unset_bool, $unset_object, $unset_resource);
 $null_var1 = NULL;
 $null_var2 = null;
 
@@ -32,7 +32,7 @@ $valid_nulls = array(
   @$unset_resource,
   @$undefined_var,
 );
-/* loop to check that is_null() recognizes different 
+/* loop to check that is_null() recognizes different
    null values, expected output: bool(true) */
 $loop_counter = 1;
 foreach ($valid_nulls as $null_val ) {
@@ -46,7 +46,7 @@ echo "\n*** Testing is_bool() on non null values ***\n";
 $fp = fopen (__FILE__, "r");
 $dfp = opendir ( dirname(__FILE__) );
 
-// other types in a array 
+// other types in a array
 $not_null_types = array (
 /* integers */
   0,
@@ -119,7 +119,7 @@ $not_null_types = array (
   array(1,2,3,4),
   array(1 => "One", "two" => 2),
 );
-/* loop through the $not_null_types to see working of 
+/* loop through the $not_null_types to see working of
    is_null() on non null types, expected output: bool(false) */
 $loop_counter = 1;
 foreach ($not_null_types as $type ) {
@@ -131,9 +131,9 @@ echo "\n*** Testing error conditions ***\n";
 //Zero argument
 var_dump( is_null() );
 
-//arguments more than expected 
+//arguments more than expected
 var_dump( is_null(NULL, null) );
- 
+
 echo "Done\n";
 
 // close the resources used
diff --git a/ext/standard/tests/general_functions/is_numeric.phpt b/ext/standard/tests/general_functions/is_numeric.phpt
index 415ce069e96..32fb8f3094b 100644
--- a/ext/standard/tests/general_functions/is_numeric.phpt
+++ b/ext/standard/tests/general_functions/is_numeric.phpt
@@ -3,11 +3,11 @@ Test is_numeric() function
 --FILE--
 <?php
 /* Prototype: bool is_numeric ( mixed $var );
- * Description: Finds whether a variable is a number or a numeric string  
+ * Description: Finds whether a variable is a number or a numeric string
  */
 
 echo "*** Testing is_numeric() with valid numeric values ***\n";
-// different valid numeric  vlaues 
+// different valid numeric  vlaues
 $numerics = array(
   0,
   1,
@@ -58,15 +58,15 @@ $numerics = array(
   //0x1111111111111111111111,
   -0x1111111,
   +0x6698319,
-  01000000000000000000000, 
+  01000000000000000000000,
   0123,
   0345,
-  -0200001,  
-  -0200001.7,  
-  0200001.7,  
-  +0200001,  
-  +0200001.7,  
-  +0200001.7,  
+  -0200001,
+  -0200001.7,
+  0200001.7,
+  +0200001,
+  +0200001.7,
+  +0200001.7,
   2.00000000000000000000001, // a float value with more precision points
   "1",	// numeric in the form of string
   "-1",
@@ -87,7 +87,7 @@ $numerics = array(
   '-0123',
   '+0123'
 );
-/* loop to check that is_numeric() recognizes different 
+/* loop to check that is_numeric() recognizes different
    numeric values, expected output: bool(true) */
 $loop_counter = 1;
 foreach ($numerics as $num ) {
@@ -105,13 +105,13 @@ $dfp = opendir ( dirname(__FILE__) );
 $unset_var = 10.5;
 unset ($unset_var);
 
-// other types in a array 
+// other types in a array
 $not_numerics = array(
   "0x80001",
-  "-0x80001", 
-  "+0x80001", 
+  "-0x80001",
+  "+0x80001",
   "-0x80001.5",
-  "0x80001.5", 
+  "0x80001.5",
   new stdclass, // object
   $fp,  // resource
   $dfp,
@@ -126,7 +126,7 @@ $not_numerics = array(
   "20 test",
   "3.6test",
   "1,000",
-  "NULL", 
+  "NULL",
   "true",
   true,
   NULL,
@@ -137,7 +137,7 @@ $not_numerics = array(
   @$unset_var, // unset variable
   @$undefined_var
 );
-/* loop through the $not_numerics to see working of 
+/* loop through the $not_numerics to see working of
    is_numeric() on non numeric values, expected output: bool(false) */
 $loop_counter = 1;
 foreach ($not_numerics as $type ) {
@@ -149,9 +149,9 @@ echo "\n*** Testing error conditions ***\n";
 //Zero argument
 var_dump( is_numeric() );
 
-//arguments more than expected 
+//arguments more than expected
 var_dump( is_numeric("10", "20") );
- 
+
 echo "Done\n";
 
 // close the resources used
diff --git a/ext/standard/tests/general_functions/is_object.phpt b/ext/standard/tests/general_functions/is_object.phpt
index 89b5081fae4..8abc766376e 100644
--- a/ext/standard/tests/general_functions/is_object.phpt
+++ b/ext/standard/tests/general_functions/is_object.phpt
@@ -3,7 +3,7 @@ Test is_object() function
 --FILE--
 <?php
 /* Prototype: bool is_object ( mixed $var );
- * Description: Finds whether the given variable is an object  
+ * Description: Finds whether the given variable is an object
  */
 
 echo "*** Testing is_object() with valid objects ***\n";
@@ -11,7 +11,7 @@ echo "*** Testing is_object() with valid objects ***\n";
 // class with no members
 class foo
 {
-// no members 
+// no members
 }
 
 // abstract class
@@ -31,10 +31,10 @@ class concreteClass extends abstractClass
   }
 }
 
-// interface class 
+// interface class
 interface IValue
 {
-   public function setVal ($name, $val); 
+   public function setVal ($name, $val);
    public function dumpVal ();
 }
 
@@ -42,18 +42,18 @@ interface IValue
 class Value implements IValue
 {
   private $vars = array ();
-  
+
   public function setVal ( $name, $val ) {
     $this->vars[$name] = $val;
   }
-  
+
   public function dumpVal () {
     var_dump ( $vars );
   }
 }
 
-// a gereral class 
-class myClass 
+// a gereral class
+class myClass
 {
   var       $foo_object;
   public    $public_var;
@@ -67,7 +67,7 @@ class myClass
     $this->public_var1 = new foo();
     $this->private_var = new foo();
     $this->proected_var = new foo();
-  }  
+  }
 }
 
 // create a object of each class defined above
@@ -88,9 +88,9 @@ $valid_objects = array(
   $foo_object,
   $Value_object,
   $concreteClass_object
-); 
-                  
-/* loop to check that is_object() recognizes different 
+);
+
+/* loop to check that is_object() recognizes different
    objects, expected output: bool(true) */
 $loop_counter = 1;
 foreach ($valid_objects as $object ) {
@@ -104,11 +104,11 @@ echo "\n*** Testing is_object() on non object types ***\n";
 $fp = fopen (__FILE__, "r");
 $dfp = opendir ( dirname(__FILE__) );
 
-// unset object 
+// unset object
 $unset_object = new foo();
 unset ($unset_object);
 
-// other types in a array 
+// other types in a array
 $not_objects = array (
   0,
   -1,
@@ -130,7 +130,7 @@ $not_objects = array (
   @$unset_object, // unset object
   @$undefined_var, // undefined variable
 );
-/* loop through the $not_objects to see working of 
+/* loop through the $not_objects to see working of
    is_object() on non object types, expected output: bool(false) */
 $loop_counter = 1;
 foreach ($not_objects as $type ) {
@@ -142,9 +142,9 @@ echo "\n*** Testing error conditions ***\n";
 //Zero argument
 var_dump( is_object() );
 
-//arguments more than expected 
+//arguments more than expected
 var_dump( is_object($myClass_object, $myClass_object) );
- 
+
 echo "Done\n";
 
 // close the resources used
diff --git a/ext/standard/tests/general_functions/is_resource_basic.phpt b/ext/standard/tests/general_functions/is_resource_basic.phpt
index 27583d3d879..75f4e4a8d8b 100644
--- a/ext/standard/tests/general_functions/is_resource_basic.phpt
+++ b/ext/standard/tests/general_functions/is_resource_basic.phpt
@@ -1,18 +1,18 @@
 --TEST--
-Test is_resource() function : basic functionality 
+Test is_resource() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool is_resource  ( mixed $var  )
  * Description:  Finds whether a variable is a resource
  * Source code: ext/standard/type.c
- */		
+ */
 
 echo "*** Testing is_resource() : basic functionality ***\n";
 
 class Hello {
   public function SayHello($arg) {
   	echo "Hello\n";
-  } 
+  }
 }
 
 
@@ -25,7 +25,7 @@ $vars = array(
 	array(1,2,3,4,5),
 	NULL,
 	new Hello());
-	
+
 $types = array(
 	"bool=false",
 	"bool=true",
@@ -34,7 +34,7 @@ $types = array(
 	"string",
 	"array",
 	"NULL",
-	"object");	
+	"object");
 
 echo "\nNon-resource type cases\n";
 
@@ -44,7 +44,7 @@ for ($i=0; $i < count($vars); $i++) {
 	} else {
 		echo $types[$i]. " test returns FALSE\n";
 	}
-}	
+}
 
 $res = fopen(__FILE__, "r");
 echo "\nResource type..var_dump after file open returns\n";
@@ -64,7 +64,7 @@ if (is_resource($res)) {
 	echo " TRUE\n";
 } else {
 	echo " FALSE\n";
-}	
+}
 
 
 ?>
diff --git a/ext/standard/tests/general_functions/is_resource_error.phpt b/ext/standard/tests/general_functions/is_resource_error.phpt
index acb3cb660ba..f7168737cd0 100644
--- a/ext/standard/tests/general_functions/is_resource_error.phpt
+++ b/ext/standard/tests/general_functions/is_resource_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test is_resource() function : error conditions 
+Test is_resource() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool is_resource  ( mixed $var  )
diff --git a/ext/standard/tests/general_functions/is_scalar.phpt b/ext/standard/tests/general_functions/is_scalar.phpt
index d3e2fa572b1..53620178c4a 100644
--- a/ext/standard/tests/general_functions/is_scalar.phpt
+++ b/ext/standard/tests/general_functions/is_scalar.phpt
@@ -13,7 +13,7 @@ $scalar_variables = array(
   -45678,
   0x5FF,  // hexadecimal as integer
   0X566,
-  -0xAAF, 
+  -0xAAF,
   -0XCCF,
   01234,  // octal as integer
   -0126,
@@ -33,8 +33,8 @@ $scalar_variables = array(
   " ",
   ' ',
   "string",
-  'string', 
-  "0",  // numeric as string  
+  'string',
+  "0",  // numeric as string
   "40",
   "50.696",
   "0x534",
@@ -45,7 +45,7 @@ $scalar_variables = array(
   true,
   false
 );
-/* loop through each valid scalar variables in $scalar_variables 
+/* loop through each valid scalar variables in $scalar_variables
    and see the working of is_scalar(), expected output: bool(true)
 */
 $loop_counter = 1;
@@ -65,7 +65,7 @@ $array = array(10);
 $resource = opendir('.');
 unset($int_var, $float_var, $string_var, $boolean_var, $object, $array, $resource);
 
-// resources 
+// resources
 $fp = fopen(__FILE__, "r");
 $dfp = opendir(".");
 
@@ -73,7 +73,7 @@ $variation_array = array(
   NULL,
   null,
 
-  array(),  // arrays 
+  array(),  // arrays
   array(NULL),
   array(true),
   array(0),
@@ -94,9 +94,9 @@ $variation_array = array(
   @$resource,
 
   @$undefined_var  // undefined variable
-);  
+);
 
-/* loop through each element of $variation_array to see the 
+/* loop through each element of $variation_array to see the
    working of is_scalar on non-scalar values, expected output: bool(false)
 */
 $loop_counter = 1;
@@ -113,7 +113,7 @@ var_dump( is_scalar() );
 var_dump( is_scalar( $scalar_variables[2], $scalar_variables[2]) );
 var_dump( is_scalar( new stdclass, new stdclass) );
 
-echo "Done\n";  
+echo "Done\n";
 
 // close the resources used
 fclose($fp);
diff --git a/ext/standard/tests/general_functions/is_string.phpt b/ext/standard/tests/general_functions/is_string.phpt
index b8c82b187bd..72a885a57a2 100644
--- a/ext/standard/tests/general_functions/is_string.phpt
+++ b/ext/standard/tests/general_functions/is_string.phpt
@@ -7,7 +7,7 @@ Test is_string() function
  */
 
 echo "*** Testing is_string() with valid string values ***\n";
-// different valid strings 
+// different valid strings
 
 /* string created using Heredoc (<<<) */
 $heredoc_string = <<<EOT
@@ -50,7 +50,7 @@ $strings = array(
   $heredoc_empty_string,
   $heredoc_null_string
 );
-/* loop to check that is_string() recognizes different 
+/* loop to check that is_string() recognizes different
    strings, expected output bool(true) */
 $loop_counter = 1;
 foreach ($strings as $string ) {
@@ -70,10 +70,10 @@ $unset_string2 = 'string';
 $unset_heredoc = <<<EOT
 this is heredoc string
 EOT;
-// unset the vars 
+// unset the vars
 unset($unset_string1, $unset_string2, $unset_heredoc);
 
-// other types in a array 
+// other types in a array
 $not_strings = array (
   /* integers */
   0,
@@ -130,9 +130,9 @@ $not_strings = array (
   @$unset_string1,
   @$unset_string2,
   @$unset_heredoc,
-  @$undefined_var 
+  @$undefined_var
 );
-/* loop through the $not_strings to see working of 
+/* loop through the $not_strings to see working of
    is_string() on non string types, expected output bool(false) */
 $loop_counter = 1;
 foreach ($not_strings as $type ) {
@@ -144,9 +144,9 @@ echo "\n*** Testing error conditions ***\n";
 //Zero argument
 var_dump( is_string() );
 
-//arguments more than expected 
+//arguments more than expected
 var_dump( is_string("string", "test") );
- 
+
 echo "Done\n";
 
 // close the resources used
diff --git a/ext/standard/tests/general_functions/isset_basic1.phpt b/ext/standard/tests/general_functions/isset_basic1.phpt
index 4c03210342d..fd3f5be6a0d 100644
--- a/ext/standard/tests/general_functions/isset_basic1.phpt
+++ b/ext/standard/tests/general_functions/isset_basic1.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test isset() function : basic functionality 
+Test isset() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool isset  ( mixed $var  [, mixed $var  [,  $...  ]] )
  * Description:  Determine if a variable is set and is not NULL
- */		
+ */
 
 class foo {}
 
diff --git a/ext/standard/tests/general_functions/isset_basic2.phpt b/ext/standard/tests/general_functions/isset_basic2.phpt
index 9137aeb9223..5f0432b5946 100644
--- a/ext/standard/tests/general_functions/isset_basic2.phpt
+++ b/ext/standard/tests/general_functions/isset_basic2.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test isset() function : basic functionality 
+Test isset() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool isset  ( mixed $var  [, mixed $var  [,  $...  ]] )
  * Description:  Determine if a variable is set and is not NULL
- */		
+ */
 
 class foo {}
 
@@ -28,14 +28,14 @@ var_dump(isset($i, $f, $s, $b));
 
 echo "\n\nArray test:\n";
 $arr = array();
-var_dump(isset($var)); 
+var_dump(isset($var));
 var_dump(isset($var[1]));
-var_dump(isset($var, $var[1])); 
+var_dump(isset($var, $var[1]));
 echo "..now set\n";
 $var[1] = 10;
-var_dump(isset($var)); 
-var_dump(isset($var[1])); 
-var_dump(isset($var, $var[1])); 
+var_dump(isset($var));
+var_dump(isset($var[1]));
+var_dump(isset($var, $var[1]));
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/general_functions/ob_get_flush_basic.phpt b/ext/standard/tests/general_functions/ob_get_flush_basic.phpt
index dbda1d9e669..1c623409706 100644
--- a/ext/standard/tests/general_functions/ob_get_flush_basic.phpt
+++ b/ext/standard/tests/general_functions/ob_get_flush_basic.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test ob_get_flush() function : basic functionality 
+Test ob_get_flush() function : basic functionality
 --INI--
 output_buffering=0
 --FILE--
 <?php
 /* Prototype  : bool ob_get_flush(void)
- * Description: Get current buffer contents, flush (send) the output buffer, and delete current output buffer 
+ * Description: Get current buffer contents, flush (send) the output buffer, and delete current output buffer
  * Source code: main/output.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing ob_get_flush() : basic functionality ***\n";
diff --git a/ext/standard/tests/general_functions/ob_get_flush_error.phpt b/ext/standard/tests/general_functions/ob_get_flush_error.phpt
index 1d3538120dd..0664043eba6 100644
--- a/ext/standard/tests/general_functions/ob_get_flush_error.phpt
+++ b/ext/standard/tests/general_functions/ob_get_flush_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test ob_get_flush() function : error conditions 
+Test ob_get_flush() function : error conditions
 --INI--
 output_buffering=0
 --FILE--
 <?php
 /* Prototype  : bool ob_get_flush(void)
- * Description: Get current buffer contents, flush (send) the output buffer, and delete current output buffer 
+ * Description: Get current buffer contents, flush (send) the output buffer, and delete current output buffer
  * Source code: main/output.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing ob_get_flush() : error conditions ***\n";
diff --git a/ext/standard/tests/general_functions/ob_get_length_basic.phpt b/ext/standard/tests/general_functions/ob_get_length_basic.phpt
index 9b3e8fb4654..b3470bec559 100644
--- a/ext/standard/tests/general_functions/ob_get_length_basic.phpt
+++ b/ext/standard/tests/general_functions/ob_get_length_basic.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test ob_get_length() function : basic functionality 
+Test ob_get_length() function : basic functionality
 --INI--
 output_buffering=0
 --FILE--
 <?php
 /* Prototype  : int ob_get_length(void)
- * Description: Return the length of the output buffer 
+ * Description: Return the length of the output buffer
  * Source code: main/output.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function dump_string_length( $string )
diff --git a/ext/standard/tests/general_functions/parse_ini_basic.phpt b/ext/standard/tests/general_functions/parse_ini_basic.phpt
index 0c0591e7eb6..023b311fe33 100644
--- a/ext/standard/tests/general_functions/parse_ini_basic.phpt
+++ b/ext/standard/tests/general_functions/parse_ini_basic.phpt
@@ -14,7 +14,7 @@ var_dump(parse_ini_file($ini_file, 1));
 
 echo "Done.\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(26) {
   ["basic"]=>
   array(15) {
diff --git a/ext/standard/tests/general_functions/parse_ini_booleans.phpt b/ext/standard/tests/general_functions/parse_ini_booleans.phpt
index 7b012c50f6e..d18eb24cafe 100644
--- a/ext/standard/tests/general_functions/parse_ini_booleans.phpt
+++ b/ext/standard/tests/general_functions/parse_ini_booleans.phpt
@@ -10,7 +10,7 @@ var_dump(parse_ini_file($ini_file, 1));
 echo "Done.\n";
 
 ?>
---EXPECTF--	
+--EXPECTF--
 array(3) {
   ["error_reporting values"]=>
   array(6) {
diff --git a/ext/standard/tests/general_functions/parse_ini_file.phpt b/ext/standard/tests/general_functions/parse_ini_file.phpt
index fb12c3f1392..ebc714455dc 100644
--- a/ext/standard/tests/general_functions/parse_ini_file.phpt
+++ b/ext/standard/tests/general_functions/parse_ini_file.phpt
@@ -120,7 +120,7 @@ var_dump(parse_ini_file($filename, true));
 @unlink($filename);
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: parse_ini_file() expects at least 1 parameter, 0 given in %sparse_ini_file.php on line 6
 bool(false)
 
diff --git a/ext/standard/tests/general_functions/parse_ini_string_001.phpt b/ext/standard/tests/general_functions/parse_ini_string_001.phpt
index c5e70cb9004..d774eeaf80a 100644
--- a/ext/standard/tests/general_functions/parse_ini_string_001.phpt
+++ b/ext/standard/tests/general_functions/parse_ini_string_001.phpt
@@ -4,7 +4,7 @@ Test parse_ini_string() function
 <?php
 /* Prototype: array parse_ini_string(string $string [,bool $process_sections]);
    Description: parse_ini_string() loads in the ini file specified in filename,
-     and returns the settings in it in an associative array. 
+     and returns the settings in it in an associative array.
 */
 
 $parse_string = <<<EOD
diff --git a/ext/standard/tests/general_functions/parse_ini_string_002.phpt b/ext/standard/tests/general_functions/parse_ini_string_002.phpt
index 98c9c0b3594..106cd0c8424 100644
--- a/ext/standard/tests/general_functions/parse_ini_string_002.phpt
+++ b/ext/standard/tests/general_functions/parse_ini_string_002.phpt
@@ -86,7 +86,7 @@ var_dump(parse_ini_string($ini, true));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: parse_ini_string() expects at least 1 parameter, 0 given in %s
 bool(false)
 
diff --git a/ext/standard/tests/general_functions/php_uname_error.phpt b/ext/standard/tests/general_functions/php_uname_error.phpt
index ca4c3d40228..2f671cd016c 100644
--- a/ext/standard/tests/general_functions/php_uname_error.phpt
+++ b/ext/standard/tests/general_functions/php_uname_error.phpt
@@ -13,7 +13,7 @@ var_dump( php_uname('a', true) );
 
 echo "\n-- Testing php_uname() function with invalid mode --\n";
 // am invalid mode should result in same o/p as mode 'a'
-var_dump( php_uname('z') == php_uname('z') ); 
+var_dump( php_uname('z') == php_uname('z') );
 
 class barClass {
 }
diff --git a/ext/standard/tests/general_functions/php_uname_variation1.phpt b/ext/standard/tests/general_functions/php_uname_variation1.phpt
index d94fd800499..4a478276570 100644
--- a/ext/standard/tests/general_functions/php_uname_variation1.phpt
+++ b/ext/standard/tests/general_functions/php_uname_variation1.phpt
@@ -26,34 +26,34 @@ $values = array(
 		  "1" => 1,
 		  "12345" =>  12345,
 		  "-2345" =>  -2345,
-		
+
 		  // float data
 		  "10.5" => 10.5,
 		  "-10.5" => -10.5,
 		  "10.1234567e10" => 10.1234567e10,
 		  "10.7654321E-10" => 10.7654321E-10,
 		  ".5" => .5,
-		
+
 		  // null data
 		  "NULL" => NULL,
 		  "null" =>  null,
-		
+
 		  // boolean data
 		  "true" => true,
 		  "false" => false,
 		  "TRUE" => TRUE,
 		  "FALSE" => FALSE,
-		
+
 		  // empty data
 		  "\"\"" => "",
 		  "''" => '',
-		
+
 		  // object data
 		  "new fooClass()" => new fooClass(),
-		  
+
 		  // undefined data
 		  "undefined var" => $undefined_var,
-		
+
 		 // unset data
 		 "unset var" => $unset_var,
 );
diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt
index e502f612911..cfeaca7badd 100644
--- a/ext/standard/tests/general_functions/print_r.phpt
+++ b/ext/standard/tests/general_functions/print_r.phpt
@@ -28,9 +28,9 @@ function check_printr( $variables ) {
     $counter++;
   }
 }
-  
+
 echo "\n*** Testing print_r() on integer variables ***\n";
-$integers = array ( 
+$integers = array (
   0,  // zero as argument
   000000123,  //octal value of 83
   123000000,
@@ -46,7 +46,7 @@ $integers = array (
   -0x80000000,  // min range of hexadecimal integer
   017777777777,  // max posotive octal integer
   -020000000000  // min range of octal integer
-);		    
+);
 /* calling check_printr() to display contents of integer variables
    using print_r() */
 check_printr($integers);
@@ -84,7 +84,7 @@ $floats = array (
   -0x80000001,  // float value, beyond max negative int
   0x80000001,  // float value, beyond max positive int
   020000000001,  // float value, beyond max positive int
-  -020000000001  // float value, beyond max negative int 
+  -020000000001  // float value, beyond max negative int
 );
 /* calling check_printr() to display contents of float variables
    using print_r() */
@@ -116,7 +116,7 @@ $booleans = array (
   FALSE,
   true,
   false
-);	  
+);
 /* calling check_printr() to display boolean variables using print_r() */
 check_printr($booleans);
 var_dump( reset($booleans) );
@@ -231,7 +231,7 @@ print_r($recursion_obj2);
 
 echo "\n*** Testing print_r() on resources ***\n";
 /* file type resource */
-$file_handle = fopen(__FILE__, "r"); 
+$file_handle = fopen(__FILE__, "r");
 
 /* directory type resource */
 $dir_handle = opendir( dirname(__FILE__) );
@@ -259,9 +259,9 @@ $variations = array (
   array( new no_member_class, array(), false, 0 ),
   array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ),
   array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ),  //unusual data
-  array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') 
+  array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7')
 );
-/* calling check_printr() to display combinations of scalar and 
+/* calling check_printr() to display combinations of scalar and
    non-scalar variables using print_r() */
 check_printr($variations);
 
diff --git a/ext/standard/tests/general_functions/print_r_64bit.phpt b/ext/standard/tests/general_functions/print_r_64bit.phpt
index 3054e0a431c..25776dd3baa 100644
--- a/ext/standard/tests/general_functions/print_r_64bit.phpt
+++ b/ext/standard/tests/general_functions/print_r_64bit.phpt
@@ -29,9 +29,9 @@ function check_printr( $variables ) {
     $counter++;
   }
 }
-  
+
 echo "\n*** Testing print_r() on integer variables ***\n";
-$integers = array ( 
+$integers = array (
   0,  // zero as argument
   000000123,  //octal value of 83
   123000000,
@@ -47,7 +47,7 @@ $integers = array (
   -0x80000000,  // min range of hexadecimal integer
   017777777777,  // max posotive octal integer
   -020000000000  // min range of octal integer
-);		    
+);
 /* calling check_printr() to display contents of integer variables
    using print_r() */
 check_printr($integers);
@@ -85,7 +85,7 @@ $floats = array (
   -0x80000001,  // float value, beyond max negative int
   0x80000001,  // float value, beyond max positive int
   020000000001,  // float value, beyond max positive int
-  -020000000001  // float value, beyond max negative int 
+  -020000000001  // float value, beyond max negative int
 );
 /* calling check_printr() to display contents of float variables
    using print_r() */
@@ -117,7 +117,7 @@ $booleans = array (
   FALSE,
   true,
   false
-);	  
+);
 /* calling check_printr() to display boolean variables using print_r() */
 check_printr($booleans);
 var_dump( reset($booleans) );
@@ -232,7 +232,7 @@ print_r($recursion_obj2);
 
 echo "\n*** Testing print_r() on resources ***\n";
 /* file type resource */
-$file_handle = fopen(__FILE__, "r"); 
+$file_handle = fopen(__FILE__, "r");
 
 /* directory type resource */
 $dir_handle = opendir( dirname(__FILE__) );
@@ -260,9 +260,9 @@ $variations = array (
   array( new no_member_class, array(), false, 0 ),
   array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ),
   array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ),  //unusual data
-  array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') 
+  array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7')
 );
-/* calling check_printr() to display combinations of scalar and 
+/* calling check_printr() to display combinations of scalar and
    non-scalar variables using print_r() */
 check_printr($variations);
 
diff --git a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt
index 157ad747833..5ff409e10df 100644
--- a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt
+++ b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt
@@ -45,7 +45,7 @@ function get_priority_from_wmic() {
 
 	$f = false;
 	$m = [
-		strpos($t[0], ' ProcessId' ), 
+		strpos($t[0], ' ProcessId' ),
 		strpos($t[0], ' Priority ')
 		];
 
@@ -71,10 +71,10 @@ function get_priority_from_wmic() {
 $p = [
 	/* '<verbose name>' => ['<wmic value>', '<proc_nice value>'] */
 
-	'Idle' 		=> [4, 10], 
-	'Below normal'	=> [6, 5], 
-	'Normal'	=> [8, 0], 
-	'Above normal'	=> [10, -5], 
+	'Idle' 		=> [4, 10],
+	'Below normal'	=> [6, 5],
+	'Normal'	=> [8, 0],
+	'Above normal'	=> [10, -5],
 	'High priority'	=> [13, -10]
 	];
 
diff --git a/ext/standard/tests/general_functions/proc_open_pipes1.phpt b/ext/standard/tests/general_functions/proc_open_pipes1.phpt
index dc104283eb1..f3335bc8ce6 100644
--- a/ext/standard/tests/general_functions/proc_open_pipes1.phpt
+++ b/ext/standard/tests/general_functions/proc_open_pipes1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-proc_open() with > 16 pipes 
+proc_open() with > 16 pipes
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/general_functions/proc_open_pipes2.phpt b/ext/standard/tests/general_functions/proc_open_pipes2.phpt
index a232d53dd7b..29eca464e16 100644
--- a/ext/standard/tests/general_functions/proc_open_pipes2.phpt
+++ b/ext/standard/tests/general_functions/proc_open_pipes2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-proc_open() with no pipes 
+proc_open() with no pipes
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/general_functions/proc_open_pipes3.phpt b/ext/standard/tests/general_functions/proc_open_pipes3.phpt
index 6e90471bdc1..d64987018bd 100644
--- a/ext/standard/tests/general_functions/proc_open_pipes3.phpt
+++ b/ext/standard/tests/general_functions/proc_open_pipes3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-proc_open() with invalid pipes 
+proc_open() with invalid pipes
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/general_functions/putenv.phpt b/ext/standard/tests/general_functions/putenv.phpt
index 254207320be..ab2c1b41f75 100644
--- a/ext/standard/tests/general_functions/putenv.phpt
+++ b/ext/standard/tests/general_functions/putenv.phpt
@@ -20,7 +20,7 @@ var_dump(putenv(""));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(false)
 bool(true)
 string(5) "value"
diff --git a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt
index eb5187b205d..ccb1eea884f 100644
--- a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt
+++ b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt
@@ -35,7 +35,7 @@ var_dump(putenv('FOO=
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 string(2) "°¡"
 bool(true)
diff --git a/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt b/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt
index 70f5d08cead..8760927835b 100644
--- a/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt
+++ b/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt
@@ -24,7 +24,7 @@ var_dump(putenv('FOO=å•Šaå•Šå•Šå•Šå•Š'), getenv("FOO"));
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 string(3) "å•Š"
 bool(true)
diff --git a/ext/standard/tests/general_functions/rand.phpt b/ext/standard/tests/general_functions/rand.phpt
index f314200e654..e722ff5813e 100644
--- a/ext/standard/tests/general_functions/rand.phpt
+++ b/ext/standard/tests/general_functions/rand.phpt
@@ -29,7 +29,7 @@ var_dump(mt_getrandmax(1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(%d)
 
 Warning: mt_rand() expects exactly 2 parameters, 1 given in %s on line %d
diff --git a/ext/standard/tests/general_functions/sleep_basic.phpt b/ext/standard/tests/general_functions/sleep_basic.phpt
index 5d7fe536f1d..98ab348ecb8 100644
--- a/ext/standard/tests/general_functions/sleep_basic.phpt
+++ b/ext/standard/tests/general_functions/sleep_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test sleep() function : basic functionality 
+Test sleep() function : basic functionality
 --SKIPIF--
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
@@ -7,22 +7,22 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 --FILE--
 <?php
 /* Prototype  : int sleep  ( int $seconds  )
- * Description: Delays the program execution for the given number of seconds . 
+ * Description: Delays the program execution for the given number of seconds .
  * Source code: ext/standard/basic_functions.c
  */
 
 echo "*** Testing sleep() : basic functionality ***\n";
 
-$sleeptime = 5; // sleep for 5 seconds 
+$sleeptime = 5; // sleep for 5 seconds
 
-set_time_limit(20); 
+set_time_limit(20);
 
 $time_start = microtime(true);
 
 // Sleep for a while
 sleep($sleeptime);
 
-// Test passes if sleeps for at least 98% of specified time 
+// Test passes if sleeps for at least 98% of specified time
 $sleeplow = $sleeptime - ($sleeptime * 2 /100);
 
 $time_end = microtime(true);
diff --git a/ext/standard/tests/general_functions/sleep_error.phpt b/ext/standard/tests/general_functions/sleep_error.phpt
index 199bd8e9bcf..c4f069a3d2a 100644
--- a/ext/standard/tests/general_functions/sleep_error.phpt
+++ b/ext/standard/tests/general_functions/sleep_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test sleep() function : error conditions 
+Test sleep() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int sleep  ( int $seconds  )
- * Description: Delays the program execution for the given number of seconds . 
+ * Description: Delays the program execution for the given number of seconds .
  * Source code: ext/standard/basic_functions.c
  */
  set_time_limit(20);
- 
+
 echo "*** Testing sleep() : error conditions ***\n";
 
 echo "\n-- Testing sleep() function with zero arguments --\n";
diff --git a/ext/standard/tests/general_functions/strval.phpt b/ext/standard/tests/general_functions/strval.phpt
index 2e1e81c2ee5..b2c5cd8b765 100644
--- a/ext/standard/tests/general_functions/strval.phpt
+++ b/ext/standard/tests/general_functions/strval.phpt
@@ -21,27 +21,27 @@ EOD;
 /* null heredoc string */
 $heredoc_empty_string = <<<EOD
 EOD;
-/* heredoc string with NULL */ 
+/* heredoc string with NULL */
 $heredoc_NULL_string = <<<EOD
 NULL
 EOD;
 
-// different valid  scalar vlaues 
+// different valid  scalar vlaues
 $scalars = array(
   /* integers */
   0,
   1,
   -1,
   -2147483648, // max negative integer value
-  -2147483647, 
+  -2147483647,
   2147483647,  // max positive integer value
   2147483640,
   0x123B,      // integer as hexadecimal
   0x12ab,
   0Xfff,
   0XFA,
- 
-  /* floats */ 
+
+  /* floats */
   -0x80000000, // max negative integer as hexadecimal
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
@@ -66,12 +66,12 @@ $scalars = array(
   .0034E-30,
 
   /* booleans */
-  true,  
+  true,
   TRUE,
   FALSE,
-  false,  
+  false,
 
-  /* strings */  
+  /* strings */
   "",
   '',
   " ",
@@ -91,11 +91,11 @@ $scalars = array(
   "true",
   /*"\0123",
   "\0x12FF",*/
-  $heredoc_string, 
+  $heredoc_string,
   $heredoc_numeric_string,
   $heredoc_empty_string
 );
-/* loop to check that strval() recognizes different 
+/* loop to check that strval() recognizes different
    scalar values and retuns the string conversion of same */
 $loop_counter = 1;
 foreach ($scalars as $scalar ) {
@@ -112,7 +112,7 @@ $dfp = opendir( dirname(__FILE__) );
 $unset_var = 10;
 unset ($unset_var);
 
-// non_scalar values, objects, arrays, resources and boolean 
+// non_scalar values, objects, arrays, resources and boolean
 class foo
 {
   function __toString() {
@@ -133,7 +133,7 @@ $not_scalars = array (
   @$unset_var,  // unset variable
   @$undefined_var
 );
-/* loop through the $not_scalars to see working of 
+/* loop through the $not_scalars to see working of
    strval() on objects, arrays, boolean and others */
 $loop_counter = 1;
 foreach ($not_scalars as $value ) {
@@ -145,9 +145,9 @@ echo "\n*** Testing error conditions ***\n";
 //Zero argument
 var_dump( strval() );
 
-//arguments more than expected 
+//arguments more than expected
 var_dump( strval( $scalars[0], $scalars[1]) );
- 
+
 echo "Done\n";
 
 // close the resources used
diff --git a/ext/standard/tests/general_functions/type.phpt b/ext/standard/tests/general_functions/type.phpt
index ac29a1bf38f..90bfb45f282 100644
--- a/ext/standard/tests/general_functions/type.phpt
+++ b/ext/standard/tests/general_functions/type.phpt
@@ -54,7 +54,7 @@ foreach ($types as $type) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(5) "array"
 string(6) "string"
 string(5) "array"
diff --git a/ext/standard/tests/general_functions/uniqid_basic.phpt b/ext/standard/tests/general_functions/uniqid_basic.phpt
index 2da832b8ed2..285365ab608 100644
--- a/ext/standard/tests/general_functions/uniqid_basic.phpt
+++ b/ext/standard/tests/general_functions/uniqid_basic.phpt
@@ -3,7 +3,7 @@ Test uniqid() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string uniqid  ([ string $prefix= ""  [, bool $more_entropy= false  ]] )
- * Description: Gets a prefixed unique identifier based on the current time in microseconds. 
+ * Description: Gets a prefixed unique identifier based on the current time in microseconds.
  * Source code: ext/standard/uniqid.c
 */
 echo "*** Testing uniqid() : basic functionality ***\n";
@@ -16,26 +16,26 @@ echo "\n\n";
 
 echo "uniqid() with a prefix\n";
 
-// Use a fixed prefix so we can ensure length of o/p id is fixed 
+// Use a fixed prefix so we can ensure length of o/p id is fixed
 $prefix = array (
 				99999,
 				"99999",
 				10.5e2,
 				null,
 				true,
-				false				
+				false
 				);
 
-for ($i = 0; $i < count($prefix); $i++) {				
+for ($i = 0; $i < count($prefix); $i++) {
 	var_dump(uniqid($prefix[$i]));
 	var_dump(uniqid($prefix[$i], true));
 	var_dump(uniqid($prefix[$i], false));
 	echo "\n";
-}	
+}
 
 ?>
 ===DONE===
---EXPECTF-- 
+--EXPECTF--
 *** Testing uniqid() : basic functionality ***
 
 uniqid() without a prefix
diff --git a/ext/standard/tests/general_functions/uniqid_error.phpt b/ext/standard/tests/general_functions/uniqid_error.phpt
index 8f7f22d7d3d..388bc42599e 100644
--- a/ext/standard/tests/general_functions/uniqid_error.phpt
+++ b/ext/standard/tests/general_functions/uniqid_error.phpt
@@ -3,7 +3,7 @@ Test uniqid() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string uniqid  ([ string $prefix= ""  [, bool $more_entropy= false  ]] )
- * Description: Gets a prefixed unique identifier based on the current time in microseconds. 
+ * Description: Gets a prefixed unique identifier based on the current time in microseconds.
  * Source code: ext/standard/uniqid.c
 */
 echo "*** Testing uniqid() : error conditions ***\n";
@@ -17,7 +17,7 @@ var_dump(uniqid($prefix, $more_entropy, $extra_arg));
 echo "\n-- Testing uniqid() function with invalid values for \$prefix --\n";
 class class1{}
 $obj = new class1();
-$res = fopen(__FILE__, "r"); 
+$res = fopen(__FILE__, "r");
 $array = array(1,2,3);
 
 uniqid($array, false);
@@ -28,7 +28,7 @@ fclose($res);
 
 ?>
 ===DONE===
---EXPECTF-- 
+--EXPECTF--
 *** Testing uniqid() : error conditions ***
 
 -- Testing uniqid() function with more than expected no. of arguments --
diff --git a/ext/standard/tests/general_functions/usleep_basic.phpt b/ext/standard/tests/general_functions/usleep_basic.phpt
index d6f312e15b5..8c724d79ee8 100644
--- a/ext/standard/tests/general_functions/usleep_basic.phpt
+++ b/ext/standard/tests/general_functions/usleep_basic.phpt
@@ -7,16 +7,16 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 --FILE--
 <?php
 /* Prototype  : void usleep  ( int $micro_seconds  )
- * Description: Delays program execution for the given number of micro seconds. 
+ * Description: Delays program execution for the given number of micro seconds.
  * Source code: ext/standard/basic_functions.c
  */
- 
+
 set_time_limit(20);
- 
+
 echo "*** Testing usleep() : basic functionality ***\n";
 
 $sleeptime = 5000000; // == 5 seconds
-// Test passes if sleeps for at least 98% of specified time 
+// Test passes if sleeps for at least 98% of specified time
 $sleeplow = $sleeptime - ($sleeptime * 2 /100);
 
 $time_start = microtime(true);
diff --git a/ext/standard/tests/general_functions/usleep_error.phpt b/ext/standard/tests/general_functions/usleep_error.phpt
index bdd120cde98..474aab7d5dd 100644
--- a/ext/standard/tests/general_functions/usleep_error.phpt
+++ b/ext/standard/tests/general_functions/usleep_error.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test usleep() function : error conditions 
+Test usleep() function : error conditions
 --FILE--
 <?php
 /* Prototype  : void usleep  ( int $micro_seconds  )
- * Description: Delays program execution for the given number of micro seconds. 
+ * Description: Delays program execution for the given number of micro seconds.
  * Source code: ext/standard/basic_functions.c
  */
- 
-set_time_limit(20); 
+
+set_time_limit(20);
 
 echo "*** Testing usleep() : error conditions ***\n";
 
diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt
index 78c862b77d4..b12f5f579f0 100644
--- a/ext/standard/tests/general_functions/var_dump.phpt
+++ b/ext/standard/tests/general_functions/var_dump.phpt
@@ -22,9 +22,9 @@ function check_vardump( $variables ) {
     $counter++;
   }
 }
-  
+
 echo "\n*** Testing var_dump() on integer variables ***\n";
-$integers = array ( 
+$integers = array (
   0,  // zero as argument
   000000123,  //octal value of 83
   123000000,
@@ -40,8 +40,8 @@ $integers = array (
   -0x80000000,  // min range of hexadecimal integer
   017777777777,  // max posotive octal integer
   -020000000000  // min range of octal integer
-);		    
-/* calling check_vardump() to display contents of integer variables 
+);
+/* calling check_vardump() to display contents of integer variables
    using var_dump() */
 check_vardump($integers);
 
@@ -78,9 +78,9 @@ $floats = array (
   -0x80000001,  // float value, beyond max negative int
   0x80000001,  // float value, beyond max positive int
   020000000001,  // float value, beyond max positive int
-  -020000000001  // float value, beyond max negative int 
+  -020000000001  // float value, beyond max negative int
 );
-/* calling check_vardump() to display contents of float variables 
+/* calling check_vardump() to display contents of float variables
    using var_dump() */
 check_vardump($floats);
 
@@ -101,7 +101,7 @@ $strings = array (
   "abcd\0efgh\0ijkl\x00mnop\x000qrst\00uvwx\0000yz",  // strings with octal NULL
   "1234\t\n5678\n\t9100\rabcda"  // strings with escape characters
 );
-/* calling check_vardump() to display contents of strings 
+/* calling check_vardump() to display contents of strings
    using var_dump() */
 check_vardump($strings);
 
@@ -111,7 +111,7 @@ $booleans = array (
   FALSE,
   true,
   false
-);	  
+);
 /* calling check_vardump() to display boolean variables
    using var_dump() */
 check_vardump($booleans);
@@ -226,7 +226,7 @@ var_dump($recursion_obj2);
 
 echo "\n*** Testing var_dump() on resources ***\n";
 /* file type resource */
-$file_handle = fopen(__FILE__, "r"); 
+$file_handle = fopen(__FILE__, "r");
 
 /* directory type resource */
 $dir_handle = opendir( dirname(__FILE__) );
@@ -254,7 +254,7 @@ $variations = array (
   array( new no_member_class, array(), false, 0 ),
   array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ),
   array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ),  //unusual data
-  array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') 
+  array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7')
 );
 /* calling check_vardump() to display combinations of scalar and
    non-scalar variables using var_dump() */
@@ -271,7 +271,7 @@ $misc_values = array (
 check_vardump($misc_values);
 
 echo "\n*** Testing var_dump() on multiple arguments ***\n";
-var_dump( $integers, $floats, $strings, $arrays, $booleans, $resources, 
+var_dump( $integers, $floats, $strings, $arrays, $booleans, $resources,
           $objects, $misc_values, $variations );
 
 /* checking var_dump() on functions */
@@ -287,7 +287,7 @@ echo "\n*** Testing error conditions ***\n";
 var_dump();
 
 /* closing resource handle used */
-closedir($dir_handle); 
+closedir($dir_handle);
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt
index 3b8212204a1..a7f61ec0636 100644
--- a/ext/standard/tests/general_functions/var_dump_64bit.phpt
+++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt
@@ -22,9 +22,9 @@ function check_vardump( $variables ) {
     $counter++;
   }
 }
-  
+
 echo "\n*** Testing var_dump() on integer variables ***\n";
-$integers = array ( 
+$integers = array (
   0,  // zero as argument
   000000123,  //octal value of 83
   123000000,
@@ -40,8 +40,8 @@ $integers = array (
   -0x80000000,  // min range of hexadecimal integer
   017777777777,  // max posotive octal integer
   -020000000000  // min range of octal integer
-);		    
-/* calling check_vardump() to display contents of integer variables 
+);
+/* calling check_vardump() to display contents of integer variables
    using var_dump() */
 check_vardump($integers);
 
@@ -78,9 +78,9 @@ $floats = array (
   -0x80000001,  // float value, beyond max negative int
   0x80000001,  // float value, beyond max positive int
   020000000001,  // float value, beyond max positive int
-  -020000000001  // float value, beyond max negative int 
+  -020000000001  // float value, beyond max negative int
 );
-/* calling check_vardump() to display contents of float variables 
+/* calling check_vardump() to display contents of float variables
    using var_dump() */
 check_vardump($floats);
 
@@ -101,7 +101,7 @@ $strings = array (
   "abcd\0efgh\0ijkl\x00mnop\x000qrst\00uvwx\0000yz",  // strings with octal NULL
   "1234\t\n5678\n\t9100\rabcda"  // strings with escape characters
 );
-/* calling check_vardump() to display contents of strings 
+/* calling check_vardump() to display contents of strings
    using var_dump() */
 check_vardump($strings);
 
@@ -111,7 +111,7 @@ $booleans = array (
   FALSE,
   true,
   false
-);	  
+);
 /* calling check_vardump() to display boolean variables
    using var_dump() */
 check_vardump($booleans);
@@ -226,7 +226,7 @@ var_dump($recursion_obj2);
 
 echo "\n*** Testing var_dump() on resources ***\n";
 /* file type resource */
-$file_handle = fopen(__FILE__, "r"); 
+$file_handle = fopen(__FILE__, "r");
 
 /* directory type resource */
 $dir_handle = opendir( dirname(__FILE__) );
@@ -254,7 +254,7 @@ $variations = array (
   array( new no_member_class, array(), false, 0 ),
   array( -0.00, "Where am I?", array(7,8,9), TRUE, 'A', 987654321 ),
   array( @$unset_var, 2.E+10, 100-20.9, 000004.599998 ),  //unusual data
-  array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7') 
+  array( "array(1,2,3,4)1.0000002TRUE", @$file_handle, 111333.00+45e5, '/00\7')
 );
 /* calling check_vardump() to display combinations of scalar and
    non-scalar variables using var_dump() */
@@ -271,7 +271,7 @@ $misc_values = array (
 check_vardump($misc_values);
 
 echo "\n*** Testing var_dump() on multiple arguments ***\n";
-var_dump( $integers, $floats, $strings, $arrays, $booleans, $resources, 
+var_dump( $integers, $floats, $strings, $arrays, $booleans, $resources,
           $objects, $misc_values, $variations );
 
 /* checking var_dump() on functions */
@@ -287,7 +287,7 @@ echo "\n*** Testing error conditions ***\n";
 var_dump();
 
 /* closing resource handle used */
-closedir($dir_handle); 
+closedir($dir_handle);
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt
index 47dfcbb3ee3..7503e789b09 100644
--- a/ext/standard/tests/general_functions/var_export-locale.phpt
+++ b/ext/standard/tests/general_functions/var_export-locale.phpt
@@ -17,13 +17,13 @@ setlocale(LC_ALL, "german", "de","de_DE","de_DE.ISO8859-1","de_DE.ISO_8859-1","d
 */
 
 echo "*** Testing var_export() with integer values ***\n";
-// different integer vlaues 
+// different integer vlaues
 $valid_ints = array(
                 '0',
                 '1',
                 '-1',
                 '-2147483648', // max negative integer value
-                '-2147483647', 
+                '-2147483647',
                 2147483647,  // max positive integer value
                 2147483640,
                 0x123B,      // integer as hexadecimal
@@ -53,11 +53,11 @@ $counter++;
 }
 
 echo "*** Testing var_export() with valid boolean values ***\n";
-// different valid  boolean vlaues 
+// different valid  boolean vlaues
 $valid_bool = array(
 		    1,
 		    TRUE,
-                true, 
+                true,
                 0,
 		    FALSE,
 		    false
@@ -77,7 +77,7 @@ $counter++;
 }
 
 echo "*** Testing var_export() with valid float values ***\n";
-// different valid  float vlaues 
+// different valid  float vlaues
 $valid_floats = array(
   (float)-2147483649, // float value
   (float)2147483648,  // float value
@@ -115,7 +115,7 @@ $counter++;
 }
 
 echo "*** Testing var_export() with valid strings ***\n";
-// different valid  string 
+// different valid  string
 $valid_strings = array(
             "",
             " ",
@@ -148,7 +148,7 @@ $counter++;
 }
 
 echo "*** Testing var_export() with valid arrays ***\n";
-// different valid  arrays 
+// different valid  arrays
 $valid_arrays = array(
            array(),
            array(NULL),
@@ -185,7 +185,7 @@ echo "*** Testing var_export() with valid objects ***\n";
 // class with no members
 class foo
 {
-// no members 
+// no members
 }
 
 // abstract class
@@ -204,28 +204,28 @@ class concreteClass extends abstractClass
   }
 }
 
-// interface class 
+// interface class
 interface iValue
 {
-   public function setVal ($name, $val); 
+   public function setVal ($name, $val);
    public function dumpVal ();
 }
 // implement the interface
 class Value implements iValue
 {
   private $vars = array ();
-  
+
   public function setVal ( $name, $val ) {
     $this->vars[$name] = $val;
   }
-  
+
   public function dumpVal () {
     var_export ( $vars );
   }
 }
 
-// a gereral class 
-class myClass 
+// a gereral class
+class myClass
 {
   var $foo_object;
   public $public_var;
@@ -239,7 +239,7 @@ class myClass
     $this->public_var1 = new foo();
     $this->private_var = new foo();
     $this->proected_var = new foo();
-  }  
+  }
 }
 
 // create a object of each class defined above
@@ -260,7 +260,7 @@ $valid_objects = array(
                   $foo_object,
                   $Value_object,
                   $concreteClass_object
-                 ); 
+                 );
  $counter = 1;
 /* Loop to check for above objects with var_export() */
 echo "\n*** Output for objects ***\n";
@@ -274,9 +274,9 @@ var_dump( var_export( $obj, TRUE) );
 echo "\n";
 $counter++;
 }
-                 
+
 echo "*** Testing var_export() with valid null values ***\n";
-// different valid  null vlaues 
+// different valid  null vlaues
 $unset_var = array();
 unset ($unset_var); // now a null
 $null_var = NULL;
@@ -304,9 +304,9 @@ echo "\n*** Testing error conditions ***\n";
 //Zero argument
 var_export( var_export() );
 
-//arguments more than expected 
+//arguments more than expected
 var_export( var_export(TRUE, FALSE, TRUE) );
- 
+
 echo "\n\nDone";
 
 
diff --git a/ext/standard/tests/general_functions/var_export_basic1.phpt b/ext/standard/tests/general_functions/var_export_basic1.phpt
index 5f7b89124c1..2dfd28785bc 100644
--- a/ext/standard/tests/general_functions/var_export_basic1.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic1.phpt
@@ -3,19 +3,19 @@ Test var_export() function with integer values
 --FILE--
 <?php
 /* Prototype  : mixed var_export(mixed var [, bool return])
- * Description: Outputs or returns a string representation of a variable 
+ * Description: Outputs or returns a string representation of a variable
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing var_export() with integer values ***\n";
-// different integer vlaues 
+// different integer vlaues
 $valid_ints = array(
                 '0' => '0',
                 '1' => '1',
                 '-1' => '-1',
                 '-2147483648' => '-2147483648', // max negative integer value
-                '-2147483647' => '-2147483647', 
+                '-2147483647' => '-2147483647',
                 '2147483647' => 2147483647,  // max positive integer value
                 '2147483640' => 2147483640,
                 '0x123B' => 0x123B,      // integer as hexadecimal
diff --git a/ext/standard/tests/general_functions/var_export_basic2.phpt b/ext/standard/tests/general_functions/var_export_basic2.phpt
index 33ca400cc6a..01734b54de6 100644
--- a/ext/standard/tests/general_functions/var_export_basic2.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic2.phpt
@@ -4,22 +4,22 @@ Test var_export() function with valid boolean values
 <?php
 
 /* Prototype  : mixed var_export(mixed var [, bool return])
- * Description: Outputs or returns a string representation of a variable 
+ * Description: Outputs or returns a string representation of a variable
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing var_export() with valid boolean values ***\n";
-// different valid  boolean vlaues 
+// different valid  boolean vlaues
 $valid_bool = array(
 		    "1" => 1,
 		    "TRUE" => TRUE,
-            "true" => true, 
+            "true" => true,
             "0" => 0,
 		    "FALSE" => FALSE,
 		    "false" => false
 );
-               
+
 /* Loop to check for above boolean values with var_export() */
 echo "\n*** Output for boolean values ***\n";
 foreach($valid_bool as $key => $bool_value) {
diff --git a/ext/standard/tests/general_functions/var_export_basic3.phpt b/ext/standard/tests/general_functions/var_export_basic3.phpt
index 35692ad6274..c85a4782ae4 100644
--- a/ext/standard/tests/general_functions/var_export_basic3.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic3.phpt
@@ -5,13 +5,13 @@ serialize_precision=17
 --FILE--
 <?php
 /* Prototype  : mixed var_export(mixed var [, bool return])
- * Description: Outputs or returns a string representation of a variable 
+ * Description: Outputs or returns a string representation of a variable
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing var_export() with valid float values ***\n";
-// different valid  float vlaues 
+// different valid  float vlaues
 $valid_floats = array(
 	  "-2147483649" => (float)-2147483649, // float value
 	  "2147483648" => (float)2147483648,  // float value
diff --git a/ext/standard/tests/general_functions/var_export_basic4.phpt b/ext/standard/tests/general_functions/var_export_basic4.phpt
index 4668ace1c55..cfdac8b2681 100644
--- a/ext/standard/tests/general_functions/var_export_basic4.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic4.phpt
@@ -3,14 +3,14 @@ Test var_export() function with valid strings
 --FILE--
 <?php
 /* Prototype  : mixed var_export(mixed var [, bool return])
- * Description: Outputs or returns a string representation of a variable 
+ * Description: Outputs or returns a string representation of a variable
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
 echo "*** Testing var_export() with valid strings ***\n";
-// different valid  string 
+// different valid  string
 $valid_strings = array(
             "\"\"" => "",
             "\" \"" => " ",
diff --git a/ext/standard/tests/general_functions/var_export_basic5.phpt b/ext/standard/tests/general_functions/var_export_basic5.phpt
index dacb3553230..ab81fa802e6 100644
--- a/ext/standard/tests/general_functions/var_export_basic5.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic5.phpt
@@ -5,14 +5,14 @@ serialize_precision=17
 --FILE--
 <?php
 /* Prototype  : mixed var_export(mixed var [, bool return])
- * Description: Outputs or returns a string representation of a variable 
+ * Description: Outputs or returns a string representation of a variable
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
 echo "*** Testing var_export() with valid arrays ***\n";
-// different valid  arrays 
+// different valid  arrays
 $valid_arrays = array(
            "array()" => array(),
            "array(NULL)" => array(NULL),
diff --git a/ext/standard/tests/general_functions/var_export_basic6.phpt b/ext/standard/tests/general_functions/var_export_basic6.phpt
index 38fdb373dfc..ea3707d0bcb 100644
--- a/ext/standard/tests/general_functions/var_export_basic6.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic6.phpt
@@ -3,9 +3,9 @@ Test var_export() function with valid objects
 --FILE--
 <?php
 /* Prototype  : mixed var_export(mixed var [, bool return])
- * Description: Outputs or returns a string representation of a variable 
+ * Description: Outputs or returns a string representation of a variable
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing var_export() with valid objects ***\n";
@@ -13,7 +13,7 @@ echo "*** Testing var_export() with valid objects ***\n";
 // class with no members
 class foo
 {
-// no members 
+// no members
 }
 
 // abstract class
@@ -32,28 +32,28 @@ class concreteClass extends abstractClass
   }
 }
 
-// interface class 
+// interface class
 interface iValue
 {
-   public function setVal ($name, $val); 
+   public function setVal ($name, $val);
    public function dumpVal ();
 }
 // implement the interface
 class Value implements iValue
 {
   private $vars = array ();
-  
+
   public function setVal ( $name, $val ) {
     $this->vars[$name] = $val;
   }
-  
+
   public function dumpVal () {
     var_export ( $vars );
   }
 }
 
-// a gereral class 
-class myClass 
+// a gereral class
+class myClass
 {
   var $foo_object;
   public $public_var;
@@ -67,7 +67,7 @@ class myClass
     $this->public_var1 = new foo();
     $this->private_var = new foo();
     $this->proected_var = new foo();
-  }  
+  }
 }
 
 // create a object of each class defined above
@@ -88,7 +88,7 @@ $valid_objects = array(
                   "foo_object" => $foo_object,
                   "Value_object" => $Value_object,
                   "concreteClass_object" => $concreteClass_object
-                 ); 
+                 );
 /* Loop to check for above objects with var_export() */
 echo "\n*** Output for objects ***\n";
 foreach($valid_objects as $key => $obj) {
diff --git a/ext/standard/tests/general_functions/var_export_basic7.phpt b/ext/standard/tests/general_functions/var_export_basic7.phpt
index 10dc0329001..b652b456e0e 100644
--- a/ext/standard/tests/general_functions/var_export_basic7.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic7.phpt
@@ -3,14 +3,14 @@ Test var_export() function with valid null values
 --FILE--
 <?php
 /* Prototype  : mixed var_export(mixed var [, bool return])
- * Description: Outputs or returns a string representation of a variable 
+ * Description: Outputs or returns a string representation of a variable
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing var_export() with valid null values ***\n";
 
-// different valid  null vlaues 
+// different valid  null vlaues
 $unset_var = array();
 unset ($unset_var); // now a null
 $null_var = NULL;
diff --git a/ext/standard/tests/general_functions/var_export_basic8.phpt b/ext/standard/tests/general_functions/var_export_basic8.phpt
index 6e6263d2ade..11cf06e6ee9 100644
--- a/ext/standard/tests/general_functions/var_export_basic8.phpt
+++ b/ext/standard/tests/general_functions/var_export_basic8.phpt
@@ -3,18 +3,18 @@ var_export(): simple test with arrays and objects
 --FILE--
 <?php
 /* Prototype  : mixed var_export(mixed var [, bool return])
- * Description: Outputs or returns a string representation of a variable 
+ * Description: Outputs or returns a string representation of a variable
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
- 
+
 echo "\n\n-- Var export on a simple  object --\n";
 $o1 = new stdclass;
 $o1->p = '22';
 $o2 = new stdclass;
 $o2->a = 1;
-$o2->b = array('k'=>2); 
-$o2->x = $o1; 
+$o2->b = array('k'=>2);
+$o2->x = $o1;
 var_export($o2);
 
 echo "\n\n-- Var export on an simple array --\n";
diff --git a/ext/standard/tests/general_functions/var_export_error1.phpt b/ext/standard/tests/general_functions/var_export_error1.phpt
index d9c5eee9dc8..ffa542c0536 100644
--- a/ext/standard/tests/general_functions/var_export_error1.phpt
+++ b/ext/standard/tests/general_functions/var_export_error1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test var_export() function : error conditions 
+Test var_export() function : error conditions
 --FILE--
 <?php
 /* Prototype  : mixed var_export(mixed var [, bool return])
- * Description: Outputs or returns a string representation of a variable 
+ * Description: Outputs or returns a string representation of a variable
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing var_export() : error conditions ***\n";
diff --git a/ext/standard/tests/general_functions/var_export_error2.phpt b/ext/standard/tests/general_functions/var_export_error2.phpt
index a6403e610de..57764e54d14 100644
--- a/ext/standard/tests/general_functions/var_export_error2.phpt
+++ b/ext/standard/tests/general_functions/var_export_error2.phpt
@@ -3,9 +3,9 @@ Test var_export() function : error conditions - recursive object
 --FILE--
 <?php
 /* Prototype  : mixed var_export(mixed var [, bool return])
- * Description: Outputs or returns a string representation of a variable 
+ * Description: Outputs or returns a string representation of a variable
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 @$obj->p =& $obj;
diff --git a/ext/standard/tests/general_functions/var_export_error3.phpt b/ext/standard/tests/general_functions/var_export_error3.phpt
index c862691e911..a5acb37027f 100644
--- a/ext/standard/tests/general_functions/var_export_error3.phpt
+++ b/ext/standard/tests/general_functions/var_export_error3.phpt
@@ -3,9 +3,9 @@ Test var_export() function : error conditions - recursive array
 --FILE--
 <?php
 /* Prototype  : mixed var_export(mixed var [, bool return])
- * Description: Outputs or returns a string representation of a variable 
+ * Description: Outputs or returns a string representation of a variable
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $a[] =& $a;
diff --git a/ext/standard/tests/http/bug60570.phpt b/ext/standard/tests/http/bug60570.phpt
index 29c6a46f179..7cdb6e3d415 100644
--- a/ext/standard/tests/http/bug60570.phpt
+++ b/ext/standard/tests/http/bug60570.phpt
@@ -26,7 +26,7 @@ function do_test() {
 		$context = stream_context_create(array('http'=>array('timeout'=>1)));
 		file_get_contents('http://127.0.0.1:12342/', 0, $context);
 		unset($context);
-		
+
 		$b = $a;
 		$a = count(get_resources());
 	}
diff --git a/ext/standard/tests/image/getimagesize_basic.phpt b/ext/standard/tests/image/getimagesize_basic.phpt
index 4d472258180..66cbc50ae1c 100644
--- a/ext/standard/tests/image/getimagesize_basic.phpt
+++ b/ext/standard/tests/image/getimagesize_basic.phpt
@@ -3,7 +3,7 @@ Test getimagesize() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array getimagesize(string imagefile [, array info])
- * Description: Get the size of an image as 4-element array 
+ * Description: Get the size of an image as 4-element array
  * Source code: ext/standard/image.c
  */
 
@@ -16,13 +16,13 @@ $imagetype_filenames = array(
 
       //PNG file
       "PNG image file" => "200x100.png",
-    
+
       //SWF file
       "SWF image file" => "200x100.swf",
-      
+
       //BMP file
       "BMP image file" => "200x100.bmp",
-      
+
       //TIFF intel byte order
       "TIFF intel byte order image file" => "200x100.tif",
 
diff --git a/ext/standard/tests/image/getimagesize_error1.phpt b/ext/standard/tests/image/getimagesize_error1.phpt
index 947379d145d..d72535c91c5 100644
--- a/ext/standard/tests/image/getimagesize_error1.phpt
+++ b/ext/standard/tests/image/getimagesize_error1.phpt
@@ -3,9 +3,9 @@ Test getimagesize() function : error conditions - wrong number of args
 --FILE--
 <?php
 /* Prototype  : proto array getimagesize(string imagefile [, array info])
- * Description: Get the size of an image as 4-element array 
+ * Description: Get the size of an image as 4-element array
  * Source code: ext/standard/image.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing getimagesize() : error conditions ***\n";
diff --git a/ext/standard/tests/image/getimagesize_jpgapp.phpt b/ext/standard/tests/image/getimagesize_jpgapp.phpt
index 8e179d2551d..f75f3826c51 100644
--- a/ext/standard/tests/image/getimagesize_jpgapp.phpt
+++ b/ext/standard/tests/image/getimagesize_jpgapp.phpt
@@ -9,9 +9,9 @@ Test getimagesize() function : basic functionality - load APP info from jpeg.
 --FILE--
 <?php
 /* Prototype  : proto array getimagesize(string imagefile [, array info])
- * Description: Get the size of an image as 4-element array 
+ * Description: Get the size of an image as 4-element array
  * Source code: ext/standard/image.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/image/getimagesize_tif_mm.phpt b/ext/standard/tests/image/getimagesize_tif_mm.phpt
index 8bc88fd0488..6f9eddcf57a 100644
--- a/ext/standard/tests/image/getimagesize_tif_mm.phpt
+++ b/ext/standard/tests/image/getimagesize_tif_mm.phpt
@@ -9,9 +9,9 @@ GetImageSize() for tiff format with big-endian (aka Motorola, aka MM) ordering
 --FILE--
 <?php
 /* Prototype  : proto array getimagesize(string imagefile [, array info])
- * Description: Get the size of an image as 4-element array 
+ * Description: Get the size of an image as 4-element array
  * Source code: ext/standard/image.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing getimagesize() : tiff_mm format ***\n";
diff --git a/ext/standard/tests/image/getimagesize_variation1.phpt b/ext/standard/tests/image/getimagesize_variation1.phpt
index 78795f7636a..09679f53c76 100644
--- a/ext/standard/tests/image/getimagesize_variation1.phpt
+++ b/ext/standard/tests/image/getimagesize_variation1.phpt
@@ -3,9 +3,9 @@ Test getimagesize() function : usage variations  - unexpected type for arg 1
 --FILE--
 <?php
 /* Prototype  : proto array getimagesize(string imagefile [, array info])
- * Description: Get the size of an image as 4-element array 
+ * Description: Get the size of an image as 4-element array
  * Source code: ext/standard/image.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
diff --git a/ext/standard/tests/image/getimagesize_variation2.phpt b/ext/standard/tests/image/getimagesize_variation2.phpt
index 9e8c16b9ee0..5bfbcfd406f 100644
--- a/ext/standard/tests/image/getimagesize_variation2.phpt
+++ b/ext/standard/tests/image/getimagesize_variation2.phpt
@@ -9,9 +9,9 @@ Test getimagesize() function : usage variations  - unexpected type for arg 2
 --FILE--
 <?php
 /* Prototype  : proto array getimagesize(string imagefile [, array info])
- * Description: Get the size of an image as 4-element array 
+ * Description: Get the size of an image as 4-element array
  * Source code: ext/standard/image.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
diff --git a/ext/standard/tests/image/getimagesize_variation3.phpt b/ext/standard/tests/image/getimagesize_variation3.phpt
index 9db2b5eadb5..26d871150b1 100644
--- a/ext/standard/tests/image/getimagesize_variation3.phpt
+++ b/ext/standard/tests/image/getimagesize_variation3.phpt
@@ -3,7 +3,7 @@ Test getimagesize() function : variation - Passing non image files
 --FILE--
 <?php
 /* Prototype  : array getimagesize(string imagefile [, array info])
- * Description: Get the size of an image as 4-element array 
+ * Description: Get the size of an image as 4-element array
  * Source code: ext/standard/image.c
  */
 
diff --git a/ext/standard/tests/image/getimagesize_variation4.phpt b/ext/standard/tests/image/getimagesize_variation4.phpt
index 8fa690c27f9..111e5c8730f 100644
--- a/ext/standard/tests/image/getimagesize_variation4.phpt
+++ b/ext/standard/tests/image/getimagesize_variation4.phpt
@@ -9,7 +9,7 @@ Test getimagesize() function : variation - For shockwave-flash format
 --FILE--
 <?php
 /* Prototype  : array getimagesize(string imagefile [, array info])
- * Description: Get the size of an image as 4-element array 
+ * Description: Get the size of an image as 4-element array
  * Source code: ext/standard/image.c
  */
 
diff --git a/ext/standard/tests/image/getimagesize_variation_003.phpt b/ext/standard/tests/image/getimagesize_variation_003.phpt
index 1de9850651e..e46b9e97b47 100644
--- a/ext/standard/tests/image/getimagesize_variation_003.phpt
+++ b/ext/standard/tests/image/getimagesize_variation_003.phpt
@@ -3,7 +3,7 @@ Test getimagesize() function : variation - Passing non image files
 --FILE--
 <?php
 /* Prototype  : array getimagesize(string imagefile [, array info])
- * Description: Get the size of an image as 4-element array 
+ * Description: Get the size of an image as 4-element array
  * Source code: ext/standard/image.c
  */
 
diff --git a/ext/standard/tests/image/getimagesize_variation_005.phpt b/ext/standard/tests/image/getimagesize_variation_005.phpt
index 6f0ad8f1900..47189ccae0f 100644
--- a/ext/standard/tests/image/getimagesize_variation_005.phpt
+++ b/ext/standard/tests/image/getimagesize_variation_005.phpt
@@ -9,7 +9,7 @@ Test getimagesize() function : basic functionality for shockwave-flash
 --FILE--
 <?php
 /* Prototype  : array getimagesize(string imagefile [, array info])
- * Description: Get the size of an image as 4-element array 
+ * Description: Get the size of an image as 4-element array
  * Source code: ext/standard/image.c
  */
 
diff --git a/ext/standard/tests/image/getimagesize_wbmp.phpt b/ext/standard/tests/image/getimagesize_wbmp.phpt
index 503b5f14252..f1b68d18933 100644
--- a/ext/standard/tests/image/getimagesize_wbmp.phpt
+++ b/ext/standard/tests/image/getimagesize_wbmp.phpt
@@ -9,9 +9,9 @@ GetImageSize() for wbmp format
 --FILE--
 <?php
 /* Prototype  : proto array getimagesize(string imagefile [, array info])
- * Description: Get the size of an image as 4-element array 
+ * Description: Get the size of an image as 4-element array
  * Source code: ext/standard/image.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing getimagesize() : wbmp format ***\n";
diff --git a/ext/standard/tests/image/getimagesize_xbm.phpt b/ext/standard/tests/image/getimagesize_xbm.phpt
index 53406a8fe82..2a1aeb637f1 100644
--- a/ext/standard/tests/image/getimagesize_xbm.phpt
+++ b/ext/standard/tests/image/getimagesize_xbm.phpt
@@ -9,9 +9,9 @@ GetImageSize() for xbm format
 --FILE--
 <?php
 /* Prototype  : proto array getimagesize(string imagefile [, array info])
- * Description: Get the size of an image as 4-element array 
+ * Description: Get the size of an image as 4-element array
  * Source code: ext/standard/image.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing getimagesize() : xbm format ***\n";
diff --git a/ext/standard/tests/image/getimagesizefromstring1.phpt b/ext/standard/tests/image/getimagesizefromstring1.phpt
index df75be518b6..1e9dc59d450 100644
--- a/ext/standard/tests/image/getimagesizefromstring1.phpt
+++ b/ext/standard/tests/image/getimagesizefromstring1.phpt
@@ -5,9 +5,9 @@ Compare getimagesize and getimagesizefromstring
 $img = __DIR__ . '/test.gif';
 
 $i1 = getimagesize($img);
-    
+
 $data = file_get_contents($img);
-    
+
 $i2 = getimagesizefromstring($data);
 
 var_dump($i1);
diff --git a/ext/standard/tests/image/image_type_to_extension.phpt b/ext/standard/tests/image/image_type_to_extension.phpt
index 91666af42dd..98a92a6c404 100644
--- a/ext/standard/tests/image/image_type_to_extension.phpt
+++ b/ext/standard/tests/image/image_type_to_extension.phpt
@@ -1,8 +1,8 @@
 --TEST--
 image_type_to_extension()
 --SKIPIF--
-<?php 
-    if (!function_exists('image_type_to_extension')) die('skip image_type_to_extension() not available'); 
+<?php
+    if (!function_exists('image_type_to_extension')) die('skip image_type_to_extension() not available');
     require_once('skipif_imagetype.inc');
 ?>
 --FILE--
diff --git a/ext/standard/tests/image/image_type_to_mime_type_basic.phpt b/ext/standard/tests/image/image_type_to_mime_type_basic.phpt
index 5506570494f..34b167b6e09 100644
--- a/ext/standard/tests/image/image_type_to_mime_type_basic.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 image_type_to_mime_type()
 --SKIPIF--
-<?php 
+<?php
 	if (!function_exists('image_type_to_mime_type')) die('skip image_type_to_mime_type() not available');
 ?>
 --FILE--
@@ -10,27 +10,27 @@ image_type_to_mime_type()
 /* Prototype  : string image_type_to_mime_type  ( int $imagetype  )
  * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype.
  * Source code: ext/standard/image.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "Starting image_type_to_mime_type() test\n\n";
 
 $image_types = array (
-	IMAGETYPE_GIF,     
-	IMAGETYPE_JPEG,     
-	IMAGETYPE_PNG,      
-	IMAGETYPE_SWF,      
-	IMAGETYPE_PSD,      
-	IMAGETYPE_BMP,  
-	IMAGETYPE_TIFF_II,  
-	IMAGETYPE_TIFF_MM,  
-	IMAGETYPE_JPC,      
-	IMAGETYPE_JP2,      
-	IMAGETYPE_JPX,      
-	IMAGETYPE_JB2,      
-	IMAGETYPE_IFF,     
-	IMAGETYPE_WBMP, 
-	IMAGETYPE_JPEG2000, 
+	IMAGETYPE_GIF,
+	IMAGETYPE_JPEG,
+	IMAGETYPE_PNG,
+	IMAGETYPE_SWF,
+	IMAGETYPE_PSD,
+	IMAGETYPE_BMP,
+	IMAGETYPE_TIFF_II,
+	IMAGETYPE_TIFF_MM,
+	IMAGETYPE_JPC,
+	IMAGETYPE_JP2,
+	IMAGETYPE_JPX,
+	IMAGETYPE_JB2,
+	IMAGETYPE_IFF,
+	IMAGETYPE_WBMP,
+	IMAGETYPE_JPEG2000,
 	IMAGETYPE_XBM,
 	IMAGETYPE_WEBP
 );
diff --git a/ext/standard/tests/image/image_type_to_mime_type_error.phpt b/ext/standard/tests/image/image_type_to_mime_type_error.phpt
index 88aacbf1763..9a3e2d17c5b 100644
--- a/ext/standard/tests/image/image_type_to_mime_type_error.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type_error.phpt
@@ -3,7 +3,7 @@ Test image_type_to_mime_type() function : error conditions  - Pass incorrect num
 --FILE--
 <?php
 /* Prototype  : proto string image_type_to_mime_type(int imagetype)
- * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype 
+ * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype
  * Source code: ext/standard/image.c
  */
 
diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt
index ccff8645e60..236b698725e 100644
--- a/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt
@@ -5,7 +5,7 @@ Test image_type_to_mime_type() function : usage variations  - Pass different dat
 --FILE--
 <?php
 /* Prototype  : string image_type_to_mime_type(int imagetype)
- * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype 
+ * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype
  * Source code: ext/standard/image.c
  */
 
diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt
index 141bc576ff7..6043c811803 100644
--- a/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type_variation2.phpt
@@ -3,7 +3,7 @@ Test image_type_to_mime_type() function : usage variations  - Pass decimal, octa
 --FILE--
 <?php
 /* Prototype  : string image_type_to_mime_type(int imagetype)
- * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype 
+ * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype
  * Source code: ext/standard/image.c
  */
 
@@ -16,13 +16,13 @@ $values =  array (
   1,
   12345,
   -12345,
-  
+
   //Octal values
   02,
   010,
   030071,
   -030071,
-  
+
   //Hexadecimal values
   0x0,
   0x1,
diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
index 7b06c0a145b..0b2c90263f5 100644
--- a/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt
@@ -5,7 +5,7 @@ Sanjay Mantoor <sanjay.mantoor@gmail.com>
 --FILE--
 <?php
 /* Prototype  : string image_type_to_mime_type(int imagetype)
- * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype 
+ * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype
  * Source code: ext/standard/image.c
  */
 
diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt
index a67bb86a69b..3ab3842eebf 100644
--- a/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt
@@ -9,7 +9,7 @@ Test image_type_to_mime_type() function : usage variations - Passing IMAGETYPE_I
 --FILE--
 <?php
 /* Prototype  : string image_type_to_mime_type(int imagetype)
- * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype 
+ * Description: Get Mime-Type for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype
  * Source code: ext/standard/image.c
  */
 
diff --git a/ext/standard/tests/mail/bug66535.phpt b/ext/standard/tests/mail/bug66535.phpt
index db1f449cb61..f0a5d5ea852 100644
--- a/ext/standard/tests/mail/bug66535.phpt
+++ b/ext/standard/tests/mail/bug66535.phpt
@@ -11,9 +11,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mail() : send email without additional headers ***\n";
diff --git a/ext/standard/tests/mail/bug69115.phpt b/ext/standard/tests/mail/bug69115.phpt
index bc485de678c..f81d32403eb 100644
--- a/ext/standard/tests/mail/bug69115.phpt
+++ b/ext/standard/tests/mail/bug69115.phpt
@@ -7,7 +7,7 @@ if( substr(PHP_OS, 0, 3) != 'WIN' ) {
 }
 ?>
 --INI--
-SMTP = 
+SMTP =
 smtp_port =
 --FILE--
 <?php
diff --git a/ext/standard/tests/mail/bug73203.phpt b/ext/standard/tests/mail/bug73203.phpt
index 79615f31b55..c3f22d36d50 100644
--- a/ext/standard/tests/mail/bug73203.phpt
+++ b/ext/standard/tests/mail/bug73203.phpt
@@ -9,7 +9,7 @@ verify that the call succeeds.
 sendmail_path=cat >/dev/null
 mail.add_x_header = Off
 --SKIPIF--
-<?php 
+<?php
 if (substr(PHP_OS, 0, 3) === 'WIN') die('skip won\'t run on Windows');
 ?>
 --FILE--
diff --git a/ext/standard/tests/mail/ezmlm_hash_basic.phpt b/ext/standard/tests/mail/ezmlm_hash_basic.phpt
index 2f810e2562a..b6ed463edcb 100644
--- a/ext/standard/tests/mail/ezmlm_hash_basic.phpt
+++ b/ext/standard/tests/mail/ezmlm_hash_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test ezmlm_hash() function : basic functionality 
+Test ezmlm_hash() function : basic functionality
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
diff --git a/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt b/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt
index 46abdba7c80..44a06651ad1 100644
--- a/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt
+++ b/ext/standard/tests/mail/ezmlm_hash_basic_64bit.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test ezmlm_hash() function : basic functionality 
+Test ezmlm_hash() function : basic functionality
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
diff --git a/ext/standard/tests/mail/ezmlm_hash_error.phpt b/ext/standard/tests/mail/ezmlm_hash_error.phpt
index c5f49dd73ae..f5bc578558e 100644
--- a/ext/standard/tests/mail/ezmlm_hash_error.phpt
+++ b/ext/standard/tests/mail/ezmlm_hash_error.phpt
@@ -32,7 +32,7 @@ echo "\n-- Testing ezmlm_hash() function with invalid input - RESOURCE --\n";
 $file_handle = fopen(__FILE__, "r");
 $extra_arg = 10;
 var_dump( ezmlm_hash($file_handle) );
-fclose($file_handle); 
+fclose($file_handle);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/mail/ezmlm_hash_variation1.phpt b/ext/standard/tests/mail/ezmlm_hash_variation1.phpt
index 58957c84a98..123195e5ec7 100644
--- a/ext/standard/tests/mail/ezmlm_hash_variation1.phpt
+++ b/ext/standard/tests/mail/ezmlm_hash_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
diff --git a/ext/standard/tests/mail/mail_basic.phpt b/ext/standard/tests/mail/mail_basic.phpt
index 70f32df40f1..ddc5571c7ec 100644
--- a/ext/standard/tests/mail/mail_basic.phpt
+++ b/ext/standard/tests/mail/mail_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mail() function : basic functionality 
+Test mail() function : basic functionality
 --INI--
 sendmail_path=tee mailBasic.out >/dev/null
 mail.add_x_header = Off
@@ -11,9 +11,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mail() : basic functionality ***\n";
diff --git a/ext/standard/tests/mail/mail_basic2.phpt b/ext/standard/tests/mail/mail_basic2.phpt
index 60ad0091906..aa1e0b1ecd1 100644
--- a/ext/standard/tests/mail/mail_basic2.phpt
+++ b/ext/standard/tests/mail/mail_basic2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mail() function : basic functionality 
+Test mail() function : basic functionality
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == "WIN")
@@ -11,9 +11,9 @@ mail.add_x_header = Off
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mail() : basic functionality ***\n";
diff --git a/ext/standard/tests/mail/mail_basic3.phpt b/ext/standard/tests/mail/mail_basic3.phpt
index 3e648e5cac8..3bab8056494 100644
--- a/ext/standard/tests/mail/mail_basic3.phpt
+++ b/ext/standard/tests/mail/mail_basic3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mail() function : basic functionality 
+Test mail() function : basic functionality
 --INI--
 sendmail_path="exit 1"
 --SKIPIF--
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mail() : basic functionality ***\n";
diff --git a/ext/standard/tests/mail/mail_basic4.phpt b/ext/standard/tests/mail/mail_basic4.phpt
index de2407a740d..c7f8ff9824e 100644
--- a/ext/standard/tests/mail/mail_basic4.phpt
+++ b/ext/standard/tests/mail/mail_basic4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mail() function : basic functionality 
+Test mail() function : basic functionality
 --INI--
 sendmail_path="exit 1"
 --SKIPIF--
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mail() : basic functionality ***\n";
diff --git a/ext/standard/tests/mail/mail_basic5.phpt b/ext/standard/tests/mail/mail_basic5.phpt
index 8d755ebb865..c6cc005dd55 100644
--- a/ext/standard/tests/mail/mail_basic5.phpt
+++ b/ext/standard/tests/mail/mail_basic5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test mail() function : basic functionality 
+Test mail() function : basic functionality
 --INI--
 sendmail_path="exit 1"
 --SKIPIF--
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mail() : basic functionality ***\n";
diff --git a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt
index fc504983477..eb4c47271f1 100644
--- a/ext/standard/tests/mail/mail_basic_alt1-win32.phpt
+++ b/ext/standard/tests/mail/mail_basic_alt1-win32.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test mail() function : basic functionality 
+Test mail() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 
 if( substr(PHP_OS, 0, 3) != 'WIN' ) {
    die('skip...Windows only test');
@@ -14,9 +14,9 @@ max_execution_time = 120
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 error_reporting(E_ALL & ~E_STRICT);
@@ -39,7 +39,7 @@ HERE;
 $res = mail($to, $subject, $message);
 
 if ($res !== true) {
-	exit("TEST FAILED : Unable to send test email\n"); 
+	exit("TEST FAILED : Unable to send test email\n");
 } else {
 	echo "Msg sent OK\n";
 }
@@ -49,10 +49,10 @@ $imap_stream = imap_open($default_mailbox, $username, $password);
 if ($imap_stream === false) {
 	echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n";
 	return false;
-}	
+}
 
 $found = false;
-$repeat_count = 20; // we will repeat a max of 20 times 
+$repeat_count = 20; // we will repeat a max of 20 times
 while (!$found && $repeat_count > 0) {
 
 	// sleep for a while to allow msg to be delivered
@@ -63,22 +63,22 @@ while (!$found && $repeat_count > 0) {
 	// Iterate over recent msgs to find the one we sent above
 	for ($i = 1; $i <= $current_msg_count; $i++) {
 		// get hdr details
-		$hdr = imap_headerinfo($imap_stream, $i);  
+		$hdr = imap_headerinfo($imap_stream, $i);
 
 		if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) {
-			echo "Id of msg just sent is $i\n"; 
-			echo ".. delete it\n"; 
+			echo "Id of msg just sent is $i\n";
+			echo ".. delete it\n";
 			imap_delete($imap_stream, $i);
 			$found = true;
-			break; 
+			break;
 		}
 	}
-	
+
 	$repeat_count -= 1;
 }
 
-if (!$found) { 
-	echo "TEST FAILED: email not delivered\n"; 
+if (!$found) {
+	echo "TEST FAILED: email not delivered\n";
 } else {
 	echo "TEST PASSED: Msgs sent and deleted OK\n";
 }
diff --git a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt
index 892d92391e0..dedb1e3ff82 100644
--- a/ext/standard/tests/mail/mail_basic_alt2-win32.phpt
+++ b/ext/standard/tests/mail/mail_basic_alt2-win32.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test mail() function : basic functionality 
+Test mail() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 if( substr(PHP_OS, 0, 3) != 'WIN' ) {
    die('skip...Windows only test');
 }
@@ -13,9 +13,9 @@ max_execution_time = 120
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 error_reporting(E_ALL & ~E_STRICT);
@@ -37,7 +37,7 @@ $extra_headers = "from: user@example.com";
 $res = mail($to, $subject, $message, $extra_headers);
 
 if ($res !== true) {
-	exit("TEST FAILED : Unable to send test email\n"); 
+	exit("TEST FAILED : Unable to send test email\n");
 } else {
 	echo "Msg sent OK\n";
 }
@@ -47,10 +47,10 @@ $imap_stream = imap_open($default_mailbox, $username, $password);
 if ($imap_stream === false) {
 	echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n";
 	return false;
-}	
+}
 
 $found = false;
-$repeat_count = 20; // we will repeat a max of 20 times 
+$repeat_count = 20; // we will repeat a max of 20 times
 while (!$found && $repeat_count > 0) {
 
 	// sleep for a while to allow msg to be delivered
@@ -61,22 +61,22 @@ while (!$found && $repeat_count > 0) {
 	// Iterate over recent msgs to find the one we sent above
 	for ($i = 1; $i <= $current_msg_count; $i++) {
 		// get hdr details
-		$hdr = imap_headerinfo($imap_stream, $i);  
+		$hdr = imap_headerinfo($imap_stream, $i);
 
 		if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) {
-			echo "Id of msg just sent is $i\n"; 
-			echo ".. delete it\n"; 
+			echo "Id of msg just sent is $i\n";
+			echo ".. delete it\n";
 			imap_delete($imap_stream, $i);
 			$found = true;
-			break; 
+			break;
 		}
 	}
-	
+
 	$repeat_count -= 1;
 }
 
-if (!$found) { 
-	echo "TEST FAILED: email not delivered\n"; 
+if (!$found) {
+	echo "TEST FAILED: email not delivered\n";
 } else {
 	echo "TEST PASSED: Msgs sent and deleted OK\n";
 }
diff --git a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt
index 1caa68c0684..5d1ec6b7a3c 100644
--- a/ext/standard/tests/mail/mail_basic_alt3-win32.phpt
+++ b/ext/standard/tests/mail/mail_basic_alt3-win32.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test mail() function : basic functionality 
+Test mail() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 if( substr(PHP_OS, 0, 3) != 'WIN' ) {
    die('skip...Windows only test');
 }
@@ -13,9 +13,9 @@ max_execution_time = 120
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 error_reporting(E_ALL & ~E_STRICT);
@@ -37,7 +37,7 @@ $extra_headers = "FRom: user@example.com";
 $res = mail($to, $subject, $message, $extra_headers);
 
 if ($res !== true) {
-	exit("TEST FAILED : Unable to send test email\n"); 
+	exit("TEST FAILED : Unable to send test email\n");
 } else {
 	echo "Msg sent OK\n";
 }
@@ -47,10 +47,10 @@ $imap_stream = imap_open($default_mailbox, $username, $password);
 if ($imap_stream === false) {
 	echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n";
 	return false;
-}	
+}
 
 $found = false;
-$repeat_count = 20; // we will repeat a max of 20 times 
+$repeat_count = 20; // we will repeat a max of 20 times
 while (!$found && $repeat_count > 0) {
 
 	// sleep for a while to allow msg to be delivered
@@ -61,22 +61,22 @@ while (!$found && $repeat_count > 0) {
 	// Iterate over recent msgs to find the one we sent above
 	for ($i = 1; $i <= $current_msg_count; $i++) {
 		// get hdr details
-		$hdr = imap_headerinfo($imap_stream, $i);  
+		$hdr = imap_headerinfo($imap_stream, $i);
 
 		if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) {
-			echo "Id of msg just sent is $i\n"; 
-			echo ".. delete it\n"; 
+			echo "Id of msg just sent is $i\n";
+			echo ".. delete it\n";
 			imap_delete($imap_stream, $i);
 			$found = true;
-			break; 
+			break;
 		}
 	}
-	
+
 	$repeat_count -= 1;
 }
 
-if (!$found) { 
-	echo "TEST FAILED: email not delivered\n"; 
+if (!$found) {
+	echo "TEST FAILED: email not delivered\n";
 } else {
 	echo "TEST PASSED: Msgs sent and deleted OK\n";
 }
diff --git a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt
index c8e45242e20..c90e909c6f2 100644
--- a/ext/standard/tests/mail/mail_basic_alt4-win32.phpt
+++ b/ext/standard/tests/mail/mail_basic_alt4-win32.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test mail() function : basic functionality 
+Test mail() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 if( substr(PHP_OS, 0, 3) != 'WIN' ) {
    die('skip...Windows only test');
 }
@@ -13,9 +13,9 @@ max_execution_time = 120
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 error_reporting(E_ALL & ~E_STRICT);
@@ -38,7 +38,7 @@ $extra_parameters = "addons"; // should be ignored
 $res = mail($to, $subject, $message, $extra_headers, $extra_parameters);
 
 if ($res !== true) {
-	exit("TEST FAILED : Unable to send test email\n"); 
+	exit("TEST FAILED : Unable to send test email\n");
 } else {
 	echo "Msg sent OK\n";
 }
@@ -48,10 +48,10 @@ $imap_stream = imap_open($default_mailbox, $username, $password);
 if ($imap_stream === false) {
 	echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n";
 	return false;
-}	
+}
 
 $found = false;
-$repeat_count = 20; // we will repeat a max of 20 times 
+$repeat_count = 20; // we will repeat a max of 20 times
 while (!$found && $repeat_count > 0) {
 
 	// sleep for a while to allow msg to be delivered
@@ -62,22 +62,22 @@ while (!$found && $repeat_count > 0) {
 	// Iterate over recent msgs to find the one we sent above
 	for ($i = 1; $i <= $current_msg_count; $i++) {
 		// get hdr details
-		$hdr = imap_headerinfo($imap_stream, $i);  
+		$hdr = imap_headerinfo($imap_stream, $i);
 
 		if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) {
-			echo "Id of msg just sent is $i\n"; 
-			echo ".. delete it\n"; 
+			echo "Id of msg just sent is $i\n";
+			echo ".. delete it\n";
 			imap_delete($imap_stream, $i);
 			$found = true;
-			break; 
+			break;
 		}
 	}
-	
+
 	$repeat_count -= 1;
 }
 
-if (!$found) { 
-	echo "TEST FAILED: email not delivered\n"; 
+if (!$found) {
+	echo "TEST FAILED: email not delivered\n";
 } else {
 	echo "TEST PASSED: Msgs sent and deleted OK\n";
 }
diff --git a/ext/standard/tests/mail/mail_error.phpt b/ext/standard/tests/mail/mail_error.phpt
index 871b6da0be4..efecd162e9d 100644
--- a/ext/standard/tests/mail/mail_error.phpt
+++ b/ext/standard/tests/mail/mail_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test mail() function : error conditions 
+Test mail() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mail() : error conditions ***\n";
diff --git a/ext/standard/tests/mail/mail_variation1.phpt b/ext/standard/tests/mail/mail_variation1.phpt
index a8eb6bec790..fd40f97b681 100644
--- a/ext/standard/tests/mail/mail_variation1.phpt
+++ b/ext/standard/tests/mail/mail_variation1.phpt
@@ -10,9 +10,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mail() : variation ***\n";
diff --git a/ext/standard/tests/mail/mail_variation2.phpt b/ext/standard/tests/mail/mail_variation2.phpt
index f0e44241b19..7e78bcfade3 100644
--- a/ext/standard/tests/mail/mail_variation2.phpt
+++ b/ext/standard/tests/mail/mail_variation2.phpt
@@ -12,9 +12,9 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing mail() : basic functionality ***\n";
diff --git a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt
index dd7fd937e2f..258bf31377e 100644
--- a/ext/standard/tests/mail/mail_variation_alt1-win32.phpt
+++ b/ext/standard/tests/mail/mail_variation_alt1-win32.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test mail() function : basic functionality 
+Test mail() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 if( substr(PHP_OS, 0, 3) != 'WIN' ) {
    die('skip...Windows only test');
 }
@@ -13,9 +13,9 @@ max_execution_time = 120
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 error_reporting(E_ALL & ~E_STRICT);
@@ -38,7 +38,7 @@ HERE;
 $res = mail($to, $subject, $message);
 
 if ($res !== true) {
-	exit("TEST COMPLETED : Unable to send test email\n"); 
+	exit("TEST COMPLETED : Unable to send test email\n");
 } else {
 	echo "Msg sent OK\n";
 }
@@ -48,10 +48,10 @@ $imap_stream = imap_open($default_mailbox, $username, $password);
 if ($imap_stream === false) {
 	echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n";
 	return false;
-}	
+}
 
 $found = false;
-$repeat_count = 20; // we will repeat a max of 20 times 
+$repeat_count = 20; // we will repeat a max of 20 times
 while (!$found && $repeat_count > 0) {
 
 	// sleep for a while to allow msg to be delivered
@@ -62,22 +62,22 @@ while (!$found && $repeat_count > 0) {
 	// Iterate over recent msgs to find the one we sent above
 	for ($i = 1; $i <= $current_msg_count; $i++) {
 		// get hdr details
-		$hdr = imap_headerinfo($imap_stream, $i);  
+		$hdr = imap_headerinfo($imap_stream, $i);
 
 		if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) {
-			echo "Id of msg just sent is $i\n"; 
-			echo ".. delete it\n"; 
+			echo "Id of msg just sent is $i\n";
+			echo ".. delete it\n";
 			imap_delete($imap_stream, $i);
 			$found = true;
-			break; 
+			break;
 		}
 	}
-	
+
 	$repeat_count -= 1;
 }
 
-if (!$found) { 
-	echo "TEST FAILED: email not delivered\n"; 
+if (!$found) {
+	echo "TEST FAILED: email not delivered\n";
 } else {
 	echo "TEST PASSED: Msgs sent and deleted OK\n";
 }
diff --git a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt
index 817cc36af4e..4c8ee2ff6cd 100644
--- a/ext/standard/tests/mail/mail_variation_alt2-win32.phpt
+++ b/ext/standard/tests/mail/mail_variation_alt2-win32.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test mail() function : basic functionality 
+Test mail() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 if( substr(PHP_OS, 0, 3) != 'WIN' ) {
    die('skip...Windows only test');
 }
@@ -13,9 +13,9 @@ max_execution_time = 120
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 error_reporting(E_ALL & ~E_STRICT);
@@ -38,7 +38,7 @@ HERE;
 $res = mail($to, $subject, $message);
 
 if ($res !== true) {
-	exit("TEST COMPLETED : Unable to send test email\n"); 
+	exit("TEST COMPLETED : Unable to send test email\n");
 } else {
 	echo "Msg sent OK\n";
 }
@@ -48,10 +48,10 @@ $imap_stream = imap_open($default_mailbox, $username, $password);
 if ($imap_stream === false) {
 	echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n";
 	return false;
-}	
+}
 
 $found = false;
-$repeat_count = 20; // we will repeat a max of 20 times 
+$repeat_count = 20; // we will repeat a max of 20 times
 while (!$found && $repeat_count > 0) {
 
 	// sleep for a while to allow msg to be delivered
@@ -62,22 +62,22 @@ while (!$found && $repeat_count > 0) {
 	// Iterate over recent msgs to find the one we sent above
 	for ($i = 1; $i <= $current_msg_count; $i++) {
 		// get hdr details
-		$hdr = imap_headerinfo($imap_stream, $i);  
+		$hdr = imap_headerinfo($imap_stream, $i);
 
 		if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) {
-			echo "Id of msg just sent is $i\n"; 
-			echo ".. delete it\n"; 
+			echo "Id of msg just sent is $i\n";
+			echo ".. delete it\n";
 			imap_delete($imap_stream, $i);
 			$found = true;
-			break; 
+			break;
 		}
 	}
-	
+
 	$repeat_count -= 1;
 }
 
-if (!$found) { 
-	echo "TEST FAILED: email not delivered\n"; 
+if (!$found) {
+	echo "TEST FAILED: email not delivered\n";
 } else {
 	echo "TEST PASSED: Msgs sent and deleted OK\n";
 }
diff --git a/ext/standard/tests/mail/mail_variation_alt3-win32.phpt b/ext/standard/tests/mail/mail_variation_alt3-win32.phpt
index 4062fae9818..ae6e308715a 100644
--- a/ext/standard/tests/mail/mail_variation_alt3-win32.phpt
+++ b/ext/standard/tests/mail/mail_variation_alt3-win32.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test mail() function : basic functionality 
+Test mail() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 if( substr(PHP_OS, 0, 3) != 'WIN' ) {
    die('skip...Windows only test');
 }
@@ -13,9 +13,9 @@ max_execution_time = 120
 --FILE--
 <?php
 /* Prototype  : int mail(string to, string subject, string message [, string additional_headers [, string additional_parameters]])
- * Description: Send an email message 
+ * Description: Send an email message
  * Source code: ext/standard/mail.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 error_reporting(E_ALL & ~E_STRICT);
@@ -37,7 +37,7 @@ HERE;
 $res = mail($to, $subject, $message);
 
 if ($res !== true) {
-	exit("TEST COMPLETED : Unable to send test email\n"); 
+	exit("TEST COMPLETED : Unable to send test email\n");
 } else {
 	echo "Msg sent OK\n";
 }
@@ -47,10 +47,10 @@ $imap_stream = imap_open($default_mailbox, $username, $password);
 if ($imap_stream === false) {
 	echo "Cannot connect to IMAP server $server: " . imap_last_error() . "\n";
 	return false;
-}	
+}
 
 $found = false;
-$repeat_count = 20; // we will repeat a max of 20 times 
+$repeat_count = 20; // we will repeat a max of 20 times
 while (!$found && $repeat_count > 0) {
 
 	// sleep for a while to allow msg to be delivered
@@ -61,22 +61,22 @@ while (!$found && $repeat_count > 0) {
 	// Iterate over recent msgs to find the one we sent above
 	for ($i = 1; $i <= $current_msg_count; $i++) {
 		// get hdr details
-		$hdr = imap_headerinfo($imap_stream, $i);  
+		$hdr = imap_headerinfo($imap_stream, $i);
 
 		if (substr($hdr->Subject, 0 , strlen($subject_prefix)) == $subject_prefix) {
-			echo "Id of msg just sent is $i\n"; 
-			echo ".. delete it\n"; 
+			echo "Id of msg just sent is $i\n";
+			echo ".. delete it\n";
 			imap_delete($imap_stream, $i);
 			$found = true;
-			break; 
+			break;
 		}
 	}
-	
+
 	$repeat_count -= 1;
 }
 
-if (!$found) { 
-	echo "TEST FAILED: email not delivered\n"; 
+if (!$found) {
+	echo "TEST FAILED: email not delivered\n";
 } else {
 	echo "TEST PASSED: Msgs sent and deleted OK\n";
 }
diff --git a/ext/standard/tests/math/abs_basic.phpt b/ext/standard/tests/math/abs_basic.phpt
index 0f6ecbc09bc..0665e5bfa33 100644
--- a/ext/standard/tests/math/abs_basic.phpt
+++ b/ext/standard/tests/math/abs_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test abs() function : basic functionality 
+Test abs() function : basic functionality
 --INI--
 precision = 14
 --FILE--
@@ -20,11 +20,11 @@ $values = array(23,
 				"23",
 				"-23",
 				"23.45",
-				"2.345e1",		
-				"-2.345e1",			
+				"2.345e1",
+				"-2.345e1",
 				null,
 				true,
-				false);	
+				false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = abs($values[$i]);
diff --git a/ext/standard/tests/math/abs_basiclong_64bit.phpt b/ext/standard/tests/math/abs_basiclong_64bit.phpt
index ccb25564277..0f0cb5d55c3 100644
--- a/ext/standard/tests/math/abs_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/abs_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(abs($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/abs_error.phpt b/ext/standard/tests/math/abs_error.phpt
index 4d62259afba..8c2a9f73ced 100644
--- a/ext/standard/tests/math/abs_error.phpt
+++ b/ext/standard/tests/math/abs_error.phpt
@@ -10,7 +10,7 @@ Test abs() function :  error conditions - incorrect number of args
 /*
  * Pass incorrect number of arguments to abs() to test behaviour
  */
- 
+
 echo "*** Testing abs() : error conditions ***\n";
 
 $arg_0 = 1.0;
diff --git a/ext/standard/tests/math/abs_variation.phpt b/ext/standard/tests/math/abs_variation.phpt
index 6df1e6b55ce..988eba93de9 100644
--- a/ext/standard/tests/math/abs_variation.phpt
+++ b/ext/standard/tests/math/abs_variation.phpt
@@ -45,7 +45,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -55,7 +55,7 @@ $inputs = array(
 /*19*/ "abs",
        'abs',
        $heredoc,
-       
+
        // object data
 /*22*/ new classA(),
 
diff --git a/ext/standard/tests/math/acos_basic.phpt b/ext/standard/tests/math/acos_basic.phpt
index 150eb975ad2..a5af21e958c 100644
--- a/ext/standard/tests/math/acos_basic.phpt
+++ b/ext/standard/tests/math/acos_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input acos()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float acos(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
diff --git a/ext/standard/tests/math/acos_basiclong_64bit.phpt b/ext/standard/tests/math/acos_basiclong_64bit.phpt
index 3d811f59284..a32180cd1b5 100644
--- a/ext/standard/tests/math/acos_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/acos_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(acos($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/acos_error.phpt b/ext/standard/tests/math/acos_error.phpt
index 6cfdb8f857e..6a9dd909a52 100644
--- a/ext/standard/tests/math/acos_error.phpt
+++ b/ext/standard/tests/math/acos_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for acos()
 --FILE--
 <?php
-/* 
+/*
  * proto float acos(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/acos_variation.phpt b/ext/standard/tests/math/acos_variation.phpt
index fa9f5e48acf..5575ec57960 100644
--- a/ext/standard/tests/math/acos_variation.phpt
+++ b/ext/standard/tests/math/acos_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of acos()
 precision=10
 --FILE--
 <?php
-/* 
+/*
  * proto float acos(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test acos with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = acos($values[$i]);
diff --git a/ext/standard/tests/math/acosh_basic.phpt b/ext/standard/tests/math/acosh_basic.phpt
index d94109d9c19..ba1a706574f 100644
--- a/ext/standard/tests/math/acosh_basic.phpt
+++ b/ext/standard/tests/math/acosh_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input acosh()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float acosh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
diff --git a/ext/standard/tests/math/acosh_basiclong_64bit.phpt b/ext/standard/tests/math/acosh_basiclong_64bit.phpt
index 80c33b224b2..902c235c32f 100644
--- a/ext/standard/tests/math/acosh_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/acosh_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(acosh($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/acosh_error.phpt b/ext/standard/tests/math/acosh_error.phpt
index cb85becdb1f..270796c373e 100644
--- a/ext/standard/tests/math/acosh_error.phpt
+++ b/ext/standard/tests/math/acosh_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for acosh()
 --FILE--
 <?php
-/* 
+/*
  * proto float acosh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/acosh_variation.phpt b/ext/standard/tests/math/acosh_variation.phpt
index 6f8abb19ae3..cc89ce3e768 100644
--- a/ext/standard/tests/math/acosh_variation.phpt
+++ b/ext/standard/tests/math/acosh_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of acosh()
 precision = 10
 --FILE--
 <?php
-/* 
+/*
  * proto float acosh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test acosh with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = acosh($values[$i]);
diff --git a/ext/standard/tests/math/asin_basic.phpt b/ext/standard/tests/math/asin_basic.phpt
index 183f7449bbd..7c7542e0f63 100644
--- a/ext/standard/tests/math/asin_basic.phpt
+++ b/ext/standard/tests/math/asin_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input asin()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float asin(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
diff --git a/ext/standard/tests/math/asin_basiclong_64bit.phpt b/ext/standard/tests/math/asin_basiclong_64bit.phpt
index 7e17f2daff7..071ad1c39c6 100644
--- a/ext/standard/tests/math/asin_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/asin_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(asin($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/asin_error.phpt b/ext/standard/tests/math/asin_error.phpt
index a51a077b90f..2428e8a5b4a 100644
--- a/ext/standard/tests/math/asin_error.phpt
+++ b/ext/standard/tests/math/asin_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for asin()
 --FILE--
 <?php
-/* 
+/*
  * proto float asin(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/asin_variation.phpt b/ext/standard/tests/math/asin_variation.phpt
index 8259bc811de..c8063849fd4 100644
--- a/ext/standard/tests/math/asin_variation.phpt
+++ b/ext/standard/tests/math/asin_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of asin()
 precision = 10
 --FILE--
 <?php
-/* 
+/*
  * proto float asin(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test asin with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = asin($values[$i]);
diff --git a/ext/standard/tests/math/asinh_basic.phpt b/ext/standard/tests/math/asinh_basic.phpt
index ff8a2d10ac5..31643fa3c43 100644
--- a/ext/standard/tests/math/asinh_basic.phpt
+++ b/ext/standard/tests/math/asinh_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input asinh()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float asinh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
diff --git a/ext/standard/tests/math/asinh_basiclong_64bit.phpt b/ext/standard/tests/math/asinh_basiclong_64bit.phpt
index a501d75d3c8..f4ccb0d23b2 100644
--- a/ext/standard/tests/math/asinh_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/asinh_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(asinh($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/asinh_error.phpt b/ext/standard/tests/math/asinh_error.phpt
index 8a0d5587831..ad6bf360140 100644
--- a/ext/standard/tests/math/asinh_error.phpt
+++ b/ext/standard/tests/math/asinh_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for asinh()
 --FILE--
 <?php
-/* 
+/*
  * proto float asinh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/asinh_variation.phpt b/ext/standard/tests/math/asinh_variation.phpt
index 77bf4d8998e..5e41a459005 100644
--- a/ext/standard/tests/math/asinh_variation.phpt
+++ b/ext/standard/tests/math/asinh_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of asinh()
 precision = 10
 --FILE--
 <?php
-/* 
+/*
  * proto float asinh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test asinh with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = asinh($values[$i]);
diff --git a/ext/standard/tests/math/atan2_basic.phpt b/ext/standard/tests/math/atan2_basic.phpt
index 65a0622c6a2..c387cad4397 100644
--- a/ext/standard/tests/math/atan2_basic.phpt
+++ b/ext/standard/tests/math/atan2_basic.phpt
@@ -12,11 +12,11 @@ $valuesy = array(23,
 				027,
 				"23",
 				"23.45",
-				"2.345e1",				
+				"2.345e1",
 				null,
 				true,
 				false);
-					
+
 $valuesx = array(23,
 				-23,
 				2.345e1,
@@ -25,17 +25,17 @@ $valuesx = array(23,
 				027,
 				"23",
 				"23.45",
-				"2.345e1",				
+				"2.345e1",
 				null,
 				true,
-				false);					
+				false);
 
 for ($i = 0; $i < count($valuesy); $i++) {
-	for ($j = 0; $j < count($valuesx); $j++) {	
+	for ($j = 0; $j < count($valuesx); $j++) {
 		$res = atan2($valuesy[$i], $valuesx[$j]);
 		echo "Y:$valuesy[$i] X:$valuesx[$j] ";
 		var_dump($res);
-	}	
+	}
 }
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/math/atan2_basiclong_64bit.phpt b/ext/standard/tests/math/atan2_basiclong_64bit.phpt
index e0548a08eed..f646585f30b 100644
--- a/ext/standard/tests/math/atan2_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/atan2_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,11 +23,11 @@ $otherVals = array(0, 1, -1, 7, 9, 65, -44, MAX_32Bit, MIN_32Bit, MAX_64Bit, MIN
 
 foreach ($longVals as $longVal) {
    foreach($otherVals as $otherVal) {
-	   echo "--- testing: $longVal, $otherVal ---\n";   
+	   echo "--- testing: $longVal, $otherVal ---\n";
       var_dump(atan2($longVal, $otherVal));
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/atan2_variation1.phpt b/ext/standard/tests/math/atan2_variation1.phpt
index 15aef71359a..7f9be489e77 100644
--- a/ext/standard/tests/math/atan2_variation1.phpt
+++ b/ext/standard/tests/math/atan2_variation1.phpt
@@ -34,7 +34,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12,
-       -12,       
+       -12,
        2147483647,
 
        // float data
@@ -53,7 +53,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -63,10 +63,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/atan2_variation2.phpt b/ext/standard/tests/math/atan2_variation2.phpt
index 2de0bb2eec0..120ac45eb55 100644
--- a/ext/standard/tests/math/atan2_variation2.phpt
+++ b/ext/standard/tests/math/atan2_variation2.phpt
@@ -34,7 +34,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12,
-       -12,       
+       -12,
        2147483647,
 
        // float data
@@ -53,7 +53,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -63,10 +63,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/atan_basic.phpt b/ext/standard/tests/math/atan_basic.phpt
index f4a2bedf76f..180263fe59b 100644
--- a/ext/standard/tests/math/atan_basic.phpt
+++ b/ext/standard/tests/math/atan_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input atan()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float atan(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
diff --git a/ext/standard/tests/math/atan_basiclong_64bit.phpt b/ext/standard/tests/math/atan_basiclong_64bit.phpt
index ffdfe243722..15d9a000aea 100644
--- a/ext/standard/tests/math/atan_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/atan_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(atan($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/atan_error.phpt b/ext/standard/tests/math/atan_error.phpt
index 61b35b05d6e..0a578180881 100644
--- a/ext/standard/tests/math/atan_error.phpt
+++ b/ext/standard/tests/math/atan_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for atan()
 --FILE--
 <?php
-/* 
+/*
  * proto float atan(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/atan_variation.phpt b/ext/standard/tests/math/atan_variation.phpt
index 797d88d2d21..b6a9a9ec32f 100644
--- a/ext/standard/tests/math/atan_variation.phpt
+++ b/ext/standard/tests/math/atan_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of atan()
 precision = 10
 --FILE--
 <?php
-/* 
+/*
  * proto float atan(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test atan with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = atan($values[$i]);
diff --git a/ext/standard/tests/math/atanh_basic.phpt b/ext/standard/tests/math/atanh_basic.phpt
index 7e7144e2393..87580ef1817 100644
--- a/ext/standard/tests/math/atanh_basic.phpt
+++ b/ext/standard/tests/math/atanh_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input atanh()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float atanh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
diff --git a/ext/standard/tests/math/atanh_basiclong_64bit.phpt b/ext/standard/tests/math/atanh_basiclong_64bit.phpt
index d7608cad1d8..426ca51f2a8 100644
--- a/ext/standard/tests/math/atanh_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/atanh_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(atanh($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/atanh_error.phpt b/ext/standard/tests/math/atanh_error.phpt
index e442825b0ec..c62dadf0276 100644
--- a/ext/standard/tests/math/atanh_error.phpt
+++ b/ext/standard/tests/math/atanh_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for atanh()
 --FILE--
 <?php
-/* 
+/*
  * proto float atanh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/atanh_variation.phpt b/ext/standard/tests/math/atanh_variation.phpt
index 984d399a856..2b0a4b10854 100644
--- a/ext/standard/tests/math/atanh_variation.phpt
+++ b/ext/standard/tests/math/atanh_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of atanh()
 precision = 10
 --FILE--
 <?php
-/* 
+/*
  * proto float atanh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test atanh with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = atanh($values[$i]);
diff --git a/ext/standard/tests/math/base_convert_basic.phpt b/ext/standard/tests/math/base_convert_basic.phpt
index 69a2667a24a..2c18d45e1ab 100644
--- a/ext/standard/tests/math/base_convert_basic.phpt
+++ b/ext/standard/tests/math/base_convert_basic.phpt
@@ -9,23 +9,23 @@ $values = array(10,
 				27,
 				39,
 				03,
-				0x5F,	
+				0x5F,
 				"10",
 				"27",
 				"39",
-				"5F", 
+				"5F",
 				"3XYZ"
-				);	
+				);
 
 for ($f= 0; $f < count($frombase); $f++) {
 	echo "\n...from base is ", $frombase[$f], "\n";
 	for ($t= 0; $t < count($tobase); $t++) {
-		echo "......to base is ", $tobase[$t], "\n";	
-		for ($i =0; $i < count($values); $i++){ 	
+		echo "......to base is ", $tobase[$t], "\n";
+		for ($i =0; $i < count($values); $i++){
 			$res = base_convert($values[$i],$frombase[$f],$tobase[$t]);
 			echo ".........value= ", $values[$i], " res = ", $res, "\n";
-		}		
-	}	
+		}
+	}
 }
 ?>
 
diff --git a/ext/standard/tests/math/base_convert_variation1.phpt b/ext/standard/tests/math/base_convert_variation1.phpt
index afa0c5bb8a3..a285ece2a28 100644
--- a/ext/standard/tests/math/base_convert_variation1.phpt
+++ b/ext/standard/tests/math/base_convert_variation1.phpt
@@ -27,7 +27,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12,
-       -12,       
+       -12,
        2147483647,
 
        // float data
@@ -46,7 +46,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -56,7 +56,7 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // undefined data
 /*23*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/base_convert_variation2.phpt b/ext/standard/tests/math/base_convert_variation2.phpt
index 96bc5967471..c384d08d745 100644
--- a/ext/standard/tests/math/base_convert_variation2.phpt
+++ b/ext/standard/tests/math/base_convert_variation2.phpt
@@ -24,7 +24,7 @@ $inputs = array(
 /*1*/  0,
        1,
        -1,
-       -12,       
+       -12,
        2147483647,
 
        // float data
@@ -43,7 +43,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -53,7 +53,7 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // undefined data
 /*23*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/base_convert_variation3.phpt b/ext/standard/tests/math/base_convert_variation3.phpt
index c5cf390f19b..8c3316b84f5 100644
--- a/ext/standard/tests/math/base_convert_variation3.phpt
+++ b/ext/standard/tests/math/base_convert_variation3.phpt
@@ -24,7 +24,7 @@ $inputs = array(
 /*1*/  0,
        1,
        -1,
-       -12,       
+       -12,
        2147483647,
 
        // float data
@@ -43,7 +43,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -53,7 +53,7 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // undefined data
 /*23*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/bindec_basic.phpt b/ext/standard/tests/math/bindec_basic.phpt
index 9fcca4a7ee2..d0db2a37eae 100644
--- a/ext/standard/tests/math/bindec_basic.phpt
+++ b/ext/standard/tests/math/bindec_basic.phpt
@@ -23,10 +23,10 @@ $values = array(111000111,
 				31101.3,
 				31.1013e5,
 				0x111ABC,
-				011237,				
+				011237,
 				true,
 				false,
-				null);	
+				null);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = bindec($values[$i]);
diff --git a/ext/standard/tests/math/bindec_basic_64bit.phpt b/ext/standard/tests/math/bindec_basic_64bit.phpt
index 949c19eea38..f6483e08072 100644
--- a/ext/standard/tests/math/bindec_basic_64bit.phpt
+++ b/ext/standard/tests/math/bindec_basic_64bit.phpt
@@ -23,10 +23,10 @@ $values = array(111000111,
 				31101.3,
 				31.1013e5,
 				0x111ABC,
-				011237,				
+				011237,
 				true,
 				false,
-				null);	
+				null);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = bindec($values[$i]);
diff --git a/ext/standard/tests/math/bindec_basiclong_64bit.phpt b/ext/standard/tests/math/bindec_basiclong_64bit.phpt
index 3cc57d5dc42..488ab538ede 100644
--- a/ext/standard/tests/math/bindec_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/bindec_basiclong_64bit.phpt
@@ -6,20 +6,20 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
 define("MIN_32Bit", -2147483647 - 1);
 
 $binLongStrs = array(
-   '0'.str_repeat('1',63), 
-   str_repeat('1',64), 
-   '0'.str_repeat('1',31), 
-   str_repeat('1',32), 
+   '0'.str_repeat('1',63),
+   str_repeat('1',64),
+   '0'.str_repeat('1',31),
+   str_repeat('1',32),
    '0'.str_repeat('1',64),
-   str_repeat('1',65), 
-   '0'.str_repeat('1',32), 
+   str_repeat('1',65),
+   '0'.str_repeat('1',32),
    str_repeat('1',33)
 );
 
@@ -28,7 +28,7 @@ foreach ($binLongStrs as $strVal) {
    echo "--- testing: $strVal ---\n";
    var_dump(bindec($strVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/bindec_error.phpt b/ext/standard/tests/math/bindec_error.phpt
index aa6ac9cdd1f..8bd52332c4a 100644
--- a/ext/standard/tests/math/bindec_error.phpt
+++ b/ext/standard/tests/math/bindec_error.phpt
@@ -10,7 +10,7 @@ Test bindec() function :  error conditions - incorrect input
 /*
  * Pass incorrect input to bindec() to test behaviour
  */
- 
+
 echo "*** Testing bindec() : error conditions ***\n";
 
 // get a class
diff --git a/ext/standard/tests/math/bindec_variation1.phpt b/ext/standard/tests/math/bindec_variation1.phpt
index 1e188bab348..9efadf6e5c1 100644
--- a/ext/standard/tests/math/bindec_variation1.phpt
+++ b/ext/standard/tests/math/bindec_variation1.phpt
@@ -48,7 +48,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -58,7 +58,7 @@ $inputs = array(
 /*19*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // undefined data
 /*22*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/bindec_variation1_64bit.phpt b/ext/standard/tests/math/bindec_variation1_64bit.phpt
index 0a37c4c2f97..ab667126dae 100644
--- a/ext/standard/tests/math/bindec_variation1_64bit.phpt
+++ b/ext/standard/tests/math/bindec_variation1_64bit.phpt
@@ -48,7 +48,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -58,7 +58,7 @@ $inputs = array(
 /*19*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // undefined data
 /*22*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/bug25665.phpt b/ext/standard/tests/math/bug25665.phpt
index 469236c943d..120604aff25 100644
--- a/ext/standard/tests/math/bug25665.phpt
+++ b/ext/standard/tests/math/bug25665.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #25665 (var_dump () hangs on Nan and INF)
 --SKIPIF--
-<?php 
+<?php
 	$OS = strtoupper(PHP_OS);
 	if ($OS == 'SUNOS' || $OS == 'SOLARIS') die("SKIP Solaris acos() returns wrong value");
 ?>
diff --git a/ext/standard/tests/math/bug45712.phpt b/ext/standard/tests/math/bug45712.phpt
index 2aa43865875..23c3b6ddd36 100644
--- a/ext/standard/tests/math/bug45712.phpt
+++ b/ext/standard/tests/math/bug45712.phpt
@@ -14,7 +14,7 @@ var_dump($nan==50);
 var_dump($nan=='500');
 var_dump($nan=='abc');
 var_dump($nan==$nan);
-// 
+//
 var_dump($nan==='');
 var_dump($nan===0.5);
 var_dump($nan===50);
@@ -33,7 +33,7 @@ var_dump($inf==50);
 var_dump($inf=='500');
 var_dump($inf=='abc');
 var_dump($inf==$inf);
-// 
+//
 var_dump($inf==='');
 var_dump($inf===0.5);
 var_dump($inf===50);
diff --git a/ext/standard/tests/math/ceil_basic.phpt b/ext/standard/tests/math/ceil_basic.phpt
index e90afd33886..3a4bb0c293f 100644
--- a/ext/standard/tests/math/ceil_basic.phpt
+++ b/ext/standard/tests/math/ceil_basic.phpt
@@ -25,7 +25,7 @@ $values = array(0,
 				2.6,
 				-2.6,
 				037,
-				0x5F,	
+				0x5F,
 				"10.5",
 				"-10.5",
 				"3.95E3",
@@ -33,8 +33,8 @@ $values = array(0,
 				"039",
 				true,
 				false,
-				null, 
-				);	
+				null,
+				);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = ceil($values[$i]);
diff --git a/ext/standard/tests/math/ceil_basiclong_64bit.phpt b/ext/standard/tests/math/ceil_basiclong_64bit.phpt
index b4c23d85cd8..42d9f6b4131 100644
--- a/ext/standard/tests/math/ceil_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/ceil_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(ceil($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/ceil_variation1.phpt b/ext/standard/tests/math/ceil_variation1.phpt
index 7c1f8592772..e68dd8b8781 100644
--- a/ext/standard/tests/math/ceil_variation1.phpt
+++ b/ext/standard/tests/math/ceil_variation1.phpt
@@ -39,7 +39,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /* 7*/ "",
        '',
@@ -49,7 +49,7 @@ $inputs = array(
 /*10*/ "abcxyz",
        'abcxyz}',
        $heredoc,
-       
+
        // object data
 /*13*/ new classA(),
 
diff --git a/ext/standard/tests/math/constants_basic.phpt b/ext/standard/tests/math/constants_basic.phpt
index 0220d933550..f44c6de4ff3 100644
--- a/ext/standard/tests/math/constants_basic.phpt
+++ b/ext/standard/tests/math/constants_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test for pre-defined math constants  
+Test for pre-defined math constants
 --INI--
 precision=14
 --FILE--
diff --git a/ext/standard/tests/math/cos_basic.phpt b/ext/standard/tests/math/cos_basic.phpt
index f0cfa66ee57..8ad7010ce10 100644
--- a/ext/standard/tests/math/cos_basic.phpt
+++ b/ext/standard/tests/math/cos_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input cos()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float cos(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
diff --git a/ext/standard/tests/math/cos_basiclong_64bit.phpt b/ext/standard/tests/math/cos_basiclong_64bit.phpt
index c9f041783b7..12355a7d868 100644
--- a/ext/standard/tests/math/cos_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/cos_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(cos($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/cos_error.phpt b/ext/standard/tests/math/cos_error.phpt
index 40901991e03..21d4692a7ad 100644
--- a/ext/standard/tests/math/cos_error.phpt
+++ b/ext/standard/tests/math/cos_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for cos()
 --FILE--
 <?php
-/* 
+/*
  * proto float cos(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/cos_variation.phpt b/ext/standard/tests/math/cos_variation.phpt
index 418bbf658f1..6323042dc7d 100644
--- a/ext/standard/tests/math/cos_variation.phpt
+++ b/ext/standard/tests/math/cos_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of cos()
 precision = 10
 --FILE--
 <?php
-/* 
+/*
  * proto float cos(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test cos with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = cos($values[$i]);
diff --git a/ext/standard/tests/math/cosh_basic.phpt b/ext/standard/tests/math/cosh_basic.phpt
index 0a637ca8e59..e6cfd868a07 100644
--- a/ext/standard/tests/math/cosh_basic.phpt
+++ b/ext/standard/tests/math/cosh_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input cosh()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float cosh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
diff --git a/ext/standard/tests/math/cosh_basiclong_64bit.phpt b/ext/standard/tests/math/cosh_basiclong_64bit.phpt
index 0916839381d..f065b47213e 100644
--- a/ext/standard/tests/math/cosh_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/cosh_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(cosh($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/cosh_error.phpt b/ext/standard/tests/math/cosh_error.phpt
index afed24fe3b0..c540f72a207 100644
--- a/ext/standard/tests/math/cosh_error.phpt
+++ b/ext/standard/tests/math/cosh_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for cosh()
 --FILE--
 <?php
-/* 
+/*
  * proto float cosh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/cosh_variation.phpt b/ext/standard/tests/math/cosh_variation.phpt
index 7a6cff2fd99..cd64670668c 100644
--- a/ext/standard/tests/math/cosh_variation.phpt
+++ b/ext/standard/tests/math/cosh_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of cosh()
 precision = 10
 --FILE--
 <?php
-/* 
+/*
  * proto float cosh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test cosh with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = cosh($values[$i]);
diff --git a/ext/standard/tests/math/decbin_basic.phpt b/ext/standard/tests/math/decbin_basic.phpt
index 572a04245e9..0cae2d90764 100644
--- a/ext/standard/tests/math/decbin_basic.phpt
+++ b/ext/standard/tests/math/decbin_basic.phpt
@@ -6,7 +6,7 @@ $values = array(10,
 				3950.5,
 				3.9505e3,
 				03,
-				0x5F,	
+				0x5F,
 				"10",
 				"3950.5",
 				"3.9505e3",
@@ -14,8 +14,8 @@ $values = array(10,
 				"0x5F",
 				true,
 				false,
-				null, 
-				);	
+				null,
+				);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = decbin($values[$i]);
diff --git a/ext/standard/tests/math/decbin_basiclong_64bit.phpt b/ext/standard/tests/math/decbin_basiclong_64bit.phpt
index 3dc61c4e28c..a2e9185ab53 100644
--- a/ext/standard/tests/math/decbin_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/decbin_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(decbin($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/decbin_error.phpt b/ext/standard/tests/math/decbin_error.phpt
index fcfd1874a51..e0a2db85ea2 100644
--- a/ext/standard/tests/math/decbin_error.phpt
+++ b/ext/standard/tests/math/decbin_error.phpt
@@ -9,7 +9,7 @@ precision=14
 --FILE--
 <?php
 /* Prototype  : float expm1  ( float $arg  )
- * Description: Returns exp(number) - 1, computed in a way that is accurate even 
+ * Description: Returns exp(number) - 1, computed in a way that is accurate even
  *              when the value of number is close to zero.
  * Source code: ext/standard/math.c
  */
diff --git a/ext/standard/tests/math/decbin_variation1.phpt b/ext/standard/tests/math/decbin_variation1.phpt
index b357c279b3f..b6341cca76a 100644
--- a/ext/standard/tests/math/decbin_variation1.phpt
+++ b/ext/standard/tests/math/decbin_variation1.phpt
@@ -38,8 +38,8 @@ $inputs = array(
        1,
        12345,
        -2345,
-       4294967295,  // largest decimal  
-       4294967296, 
+       4294967295,  // largest decimal
+       4294967296,
 
        // float data
 /*7*/  10.5,
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*18*/ "",
        '',
@@ -69,8 +69,8 @@ $inputs = array(
        $heredoc,
 
        // object data
-/*24*/ new classA(),          
-       
+/*24*/ new classA(),
+
        // undefined data
 /*25*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/decbin_variation1_64bit.phpt b/ext/standard/tests/math/decbin_variation1_64bit.phpt
index e82ee3e88c8..b2209ba3016 100644
--- a/ext/standard/tests/math/decbin_variation1_64bit.phpt
+++ b/ext/standard/tests/math/decbin_variation1_64bit.phpt
@@ -38,8 +38,8 @@ $inputs = array(
        1,
        12345,
        -2345,
-       18446744073709551615,  // largest decimal  
-       18446744073709551616, 
+       18446744073709551615,  // largest decimal
+       18446744073709551616,
 
        // float data
 /*7*/  10.5,
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*18*/ "",
        '',
@@ -69,8 +69,8 @@ $inputs = array(
        $heredoc,
 
        // object data
-/*24*/ new classA(),          
-       
+/*24*/ new classA(),
+
        // undefined data
 /*25*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/dechex_basic.phpt b/ext/standard/tests/math/dechex_basic.phpt
index ac53a97b34f..439beea3ef7 100644
--- a/ext/standard/tests/math/dechex_basic.phpt
+++ b/ext/standard/tests/math/dechex_basic.phpt
@@ -6,7 +6,7 @@ $values = array(10,
 				3950.5,
 				3.9505e3,
 				03,
-				0x5F,	
+				0x5F,
 				"10",
 				"3950.5",
 				"3.9505e3",
@@ -14,8 +14,8 @@ $values = array(10,
 				"0x5F",
 				true,
 				false,
-				null, 
-				);	
+				null,
+				);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = dechex($values[$i]);
diff --git a/ext/standard/tests/math/dechex_basiclong_64bit.phpt b/ext/standard/tests/math/dechex_basiclong_64bit.phpt
index 40b08792462..135a422f662 100644
--- a/ext/standard/tests/math/dechex_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/dechex_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(dechex($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/dechex_error.phpt b/ext/standard/tests/math/dechex_error.phpt
index 7ed0c4598cf..4c3fd6f8581 100644
--- a/ext/standard/tests/math/dechex_error.phpt
+++ b/ext/standard/tests/math/dechex_error.phpt
@@ -9,7 +9,7 @@ Test dechex() - wrong params dechex()
 
 echo "*** Testing dechex() : error conditions ***\n";
 
-echo "\nIncorrect number of arguments\n"; 
+echo "\nIncorrect number of arguments\n";
 dechex();
 dechex(23,2,true);
 
diff --git a/ext/standard/tests/math/dechex_variation1.phpt b/ext/standard/tests/math/dechex_variation1.phpt
index 5bcd2b5c5df..ee51c134d5b 100644
--- a/ext/standard/tests/math/dechex_variation1.phpt
+++ b/ext/standard/tests/math/dechex_variation1.phpt
@@ -37,9 +37,9 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
-       4294967295,  // largest decimal  
-       4294967296, 
+       -2345,
+       4294967295,  // largest decimal
+       4294967296,
 
        // float data
 /*7*/  10.5,
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*18*/ "",
        '',
@@ -69,8 +69,8 @@ $inputs = array(
        $heredoc,
 
        // object data
-/*24*/ new classA(),   
-       
+/*24*/ new classA(),
+
        // undefined data
 /*25*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/dechex_variation1_64bit.phpt b/ext/standard/tests/math/dechex_variation1_64bit.phpt
index a513264df2b..404e9dfd825 100644
--- a/ext/standard/tests/math/dechex_variation1_64bit.phpt
+++ b/ext/standard/tests/math/dechex_variation1_64bit.phpt
@@ -37,10 +37,10 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
-       18446744073709551615,  // largest decimal  
-       18446744073709551616, 
-       
+       -2345,
+       18446744073709551615,  // largest decimal
+       18446744073709551616,
+
        // float data
 /*7*/  10.5,
        -10.5,
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*18*/ "",
        '',
@@ -69,8 +69,8 @@ $inputs = array(
        $heredoc,
 
        // object data
-/*24*/ new classA(),   
-       
+/*24*/ new classA(),
+
        // undefined data
 /*25*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/decoct_basic.phpt b/ext/standard/tests/math/decoct_basic.phpt
index 3a5011b973e..b9d9ebc060a 100644
--- a/ext/standard/tests/math/decoct_basic.phpt
+++ b/ext/standard/tests/math/decoct_basic.phpt
@@ -6,7 +6,7 @@ $values = array(10,
 				3950.5,
 				3.9505e3,
 				03,
-				0x5F,	
+				0x5F,
 				"10",
 				"3950.5",
 				"3.9505e3",
@@ -14,8 +14,8 @@ $values = array(10,
 				"0x5F",
 				true,
 				false,
-				null, 
-				);	
+				null,
+				);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = decoct($values[$i]);
diff --git a/ext/standard/tests/math/decoct_basiclong_64bit.phpt b/ext/standard/tests/math/decoct_basiclong_64bit.phpt
index d7434176db7..f1812b90620 100644
--- a/ext/standard/tests/math/decoct_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/decoct_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(decoct($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/decoct_variation1.phpt b/ext/standard/tests/math/decoct_variation1.phpt
index 49ba57f54b4..85230df2b3c 100644
--- a/ext/standard/tests/math/decoct_variation1.phpt
+++ b/ext/standard/tests/math/decoct_variation1.phpt
@@ -38,9 +38,9 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
-       4294967295,  // largest decimal  
-       4294967296, 
+       -2345,
+       4294967295,  // largest decimal
+       4294967296,
 
        // float data
 /*7*/  10.5,
@@ -58,7 +58,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*18*/ "",
        '',
@@ -68,10 +68,10 @@ $inputs = array(
 /*21*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*24*/ new classA(),         
-       
+/*24*/ new classA(),
+
        // undefined data
 /*25*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/decoct_variation1_64bit.phpt b/ext/standard/tests/math/decoct_variation1_64bit.phpt
index 40afafa10a1..14a978b2b3f 100644
--- a/ext/standard/tests/math/decoct_variation1_64bit.phpt
+++ b/ext/standard/tests/math/decoct_variation1_64bit.phpt
@@ -38,9 +38,9 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
-       18446744073709551615,  // largest decimal  
-       18446744073709551616, 
+       -2345,
+       18446744073709551615,  // largest decimal
+       18446744073709551616,
 
        // float data
 /*7*/  10.5,
@@ -58,7 +58,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*18*/ "",
        '',
@@ -68,10 +68,10 @@ $inputs = array(
 /*21*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*24*/ new classA(),         
-       
+/*24*/ new classA(),
+
        // undefined data
 /*25*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/deg2rad_basic.phpt b/ext/standard/tests/math/deg2rad_basic.phpt
index 64771b9980c..3b756281fa9 100644
--- a/ext/standard/tests/math/deg2rad_basic.phpt
+++ b/ext/standard/tests/math/deg2rad_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input deg2rad()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float deg2rad(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
diff --git a/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt b/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt
index c64627661dc..3a14b118252 100644
--- a/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/deg2rad_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(deg2rad($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/deg2rad_error.phpt b/ext/standard/tests/math/deg2rad_error.phpt
index 517680a7c37..4bdad8cdb88 100644
--- a/ext/standard/tests/math/deg2rad_error.phpt
+++ b/ext/standard/tests/math/deg2rad_error.phpt
@@ -4,10 +4,10 @@ Test wrong number of arguments for deg2rad()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float deg2rad(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/deg2rad_variation.phpt b/ext/standard/tests/math/deg2rad_variation.phpt
index 737be67772e..d5f6920ea7a 100644
--- a/ext/standard/tests/math/deg2rad_variation.phpt
+++ b/ext/standard/tests/math/deg2rad_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of deg2rad()
 precision = 10
 --FILE--
 <?php
-/* 
+/*
  * proto float deg2rad(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test deg2rad with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = deg2rad($values[$i]);
diff --git a/ext/standard/tests/math/exp_basic.phpt b/ext/standard/tests/math/exp_basic.phpt
index 135705507cf..69d29fa5a4c 100644
--- a/ext/standard/tests/math/exp_basic.phpt
+++ b/ext/standard/tests/math/exp_basic.phpt
@@ -8,15 +8,15 @@ $values = array(10,
 				10.3,
 				3.9505e3,
 				037,
-				0x5F,	
+				0x5F,
 				"10",
 				"3950.5",
 				"3.9505e3",
 				"039",
 				true,
 				false,
-				null, 
-				);	
+				null,
+				);
 
 $iterator = 1;
 foreach($values as $value) {
diff --git a/ext/standard/tests/math/exp_basiclong_64bit.phpt b/ext/standard/tests/math/exp_basiclong_64bit.phpt
index 5156d055a47..75518548e34 100644
--- a/ext/standard/tests/math/exp_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/exp_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(exp($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/exp_variation1.phpt b/ext/standard/tests/math/exp_variation1.phpt
index 150e0cee8a7..5305b636602 100644
--- a/ext/standard/tests/math/exp_variation1.phpt
+++ b/ext/standard/tests/math/exp_variation1.phpt
@@ -35,7 +35,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -54,7 +54,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -64,10 +64,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/expm1_basic.phpt b/ext/standard/tests/math/expm1_basic.phpt
index 320b01a27dd..00f8762ad59 100644
--- a/ext/standard/tests/math/expm1_basic.phpt
+++ b/ext/standard/tests/math/expm1_basic.phpt
@@ -5,7 +5,7 @@ precision=14
 --FILE--
 <?php
 /* Prototype  : float expm1 ( float $arg  )
- * Description: Returns exp(number) - 1, computed in a way that is accurate even 
+ * Description: Returns exp(number) - 1, computed in a way that is accurate even
  *              when the value of number is close to zero.
  * Source code: ext/standard/math.c
  */
@@ -15,15 +15,15 @@ $values = array(10,
 				10.3,
 				3.9505e3,
 				037,
-				0x5F,	
+				0x5F,
 				"10",
 				"3950.5",
 				"3.9505e3",
 				"039",
 				true,
 				false,
-				null, 
-				);	
+				null,
+				);
 
 // loop through each element of $values to check the behaviour of expm1()
 $iterator = 1;
diff --git a/ext/standard/tests/math/expm1_basiclong_64bit.phpt b/ext/standard/tests/math/expm1_basiclong_64bit.phpt
index 69639767771..9046764d021 100644
--- a/ext/standard/tests/math/expm1_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/expm1_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(expm1($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/expm1_error.phpt b/ext/standard/tests/math/expm1_error.phpt
index 380633b67bd..f743e48d185 100644
--- a/ext/standard/tests/math/expm1_error.phpt
+++ b/ext/standard/tests/math/expm1_error.phpt
@@ -3,7 +3,7 @@ Test expm1() - Error conditions
 --FILE--
 <?php
 /* Prototype  : float expm1  ( float $arg  )
- * Description: Returns exp(number) - 1, computed in a way that is accurate even 
+ * Description: Returns exp(number) - 1, computed in a way that is accurate even
  *              when the value of number is close to zero.
  * Source code: ext/standard/math.c
  */
diff --git a/ext/standard/tests/math/expm1_variation1.phpt b/ext/standard/tests/math/expm1_variation1.phpt
index a342d25a7c7..de51bc7e755 100644
--- a/ext/standard/tests/math/expm1_variation1.phpt
+++ b/ext/standard/tests/math/expm1_variation1.phpt
@@ -6,7 +6,7 @@ precision=14
 <?php
 
 /* Prototype  : float expm1  ( float $arg  )
- * Description: Returns exp(number) - 1, computed in a way that is accurate even 
+ * Description: Returns exp(number) - 1, computed in a way that is accurate even
  *              when the value of number is close to zero.
  * Source code: ext/standard/math.c
  */
@@ -37,7 +37,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
 
        // float data
 /*5*/  10.5,
@@ -55,7 +55,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*16*/ "",
        '',
@@ -65,14 +65,14 @@ $inputs = array(
 /*19*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // array data
        array(),
        array(1,2,4),
-       
+
        // object data
-/*24*/ new classA(),       
-       
+/*24*/ new classA(),
+
        // undefined data
 /*25*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/floor_basic.phpt b/ext/standard/tests/math/floor_basic.phpt
index 2b6d2f75c86..e21e893ab35 100644
--- a/ext/standard/tests/math/floor_basic.phpt
+++ b/ext/standard/tests/math/floor_basic.phpt
@@ -21,7 +21,7 @@ $values = array(0,
 				2.6,
 				-2.6,
 				037,
-				0x5F,	
+				0x5F,
 				"10.5",
 				"-10.5",
 				"3.95E3",
@@ -29,13 +29,13 @@ $values = array(0,
 				"039",
 				true,
 				false,
-				null, 
-				);	
-				
+				null,
+				);
+
 foreach($values as $value) {
 	echo "\n-- floor $value --\n";
 	var_dump(floor($value));
-};				
+};
 
 ?>
 ===Done===
diff --git a/ext/standard/tests/math/floor_basiclong_64bit.phpt b/ext/standard/tests/math/floor_basiclong_64bit.phpt
index 65a50fc083d..6b768ef90c5 100644
--- a/ext/standard/tests/math/floor_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/floor_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(floor($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/floor_variation1.phpt b/ext/standard/tests/math/floor_variation1.phpt
index baba53aab4c..adf12551f40 100644
--- a/ext/standard/tests/math/floor_variation1.phpt
+++ b/ext/standard/tests/math/floor_variation1.phpt
@@ -39,7 +39,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /* 7*/ "",
        '',
@@ -49,7 +49,7 @@ $inputs = array(
 /*10*/ "abcxyz",
        'abcxyz}',
        $heredoc,
-       
+
        // object data
 /*13*/ new classA(),
 
diff --git a/ext/standard/tests/math/floorceil.phpt b/ext/standard/tests/math/floorceil.phpt
index 2f7d82c6e62..55395dba3d4 100644
--- a/ext/standard/tests/math/floorceil.phpt
+++ b/ext/standard/tests/math/floorceil.phpt
@@ -2,22 +2,22 @@
 Tests for floor en ceil
 --FILE--
 <?php
-    $a = ceil (-0);   $b = ceil (-1);	$c = ceil (-1.5); 
+    $a = ceil (-0);   $b = ceil (-1);	$c = ceil (-1.5);
     $d = ceil (-1.8); $e = ceil (-2.7);
     var_dump ($a, $b, $c, $d, $e);
-    
+
     $a = ceil (0);   $b = ceil (0.5); $c = ceil (1);
     $d = ceil (1.5); $e = ceil (1.8); $f = ceil (2.7);
     var_dump ($a, $b, $c, $d, $e, $f);
-    
+
     $a = floor (-0);   $b = floor (-0.5); $c = floor (-1);
     $d = floor (-1.5); $e = floor (-1.8); $f = floor (-2.7);
     var_dump ($a, $b, $c, $d, $e, $f);
-    
+
     $a = floor (0);   $b = floor (0.5); $c = floor (1);
     $d = floor (1.5); $e = floor (1.8); $f = floor (2.7);
     var_dump ($a, $b, $c, $d, $e, $f);
-?>  
+?>
 --EXPECT--
 float(0)
 float(-1)
diff --git a/ext/standard/tests/math/fmod_basic.phpt b/ext/standard/tests/math/fmod_basic.phpt
index c29abca9d2c..d10f08af0d3 100644
--- a/ext/standard/tests/math/fmod_basic.phpt
+++ b/ext/standard/tests/math/fmod_basic.phpt
@@ -12,11 +12,11 @@ $values1 = array(234,
 				0352,
 				"234",
 				"234.5",
-				"23.45e1",				
+				"23.45e1",
 				null,
 				true,
-				false);	
-				
+				false);
+
 $values2 = array(2,
 				-2,
 				2.3e1,
@@ -25,17 +25,17 @@ $values2 = array(2,
 				02,
 				"2",
 				"2.3",
-				"2.3e1",				
+				"2.3e1",
 				null,
 				true,
-				false);	
+				false);
 for ($i = 0; $i < count($values1); $i++) {
-	echo "\niteration ", $i, "\n";	
-	
+	echo "\niteration ", $i, "\n";
+
 	for ($j = 0; $j < count($values2); $j++) {
 		$res = fmod($values1[$i], $values2[$j]);
 		var_dump($res);
-	}	
+	}
 }
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/math/fmod_basiclong_64bit.phpt b/ext/standard/tests/math/fmod_basiclong_64bit.phpt
index 1502b651e2a..6513e311596 100644
--- a/ext/standard/tests/math/fmod_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/fmod_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,11 +23,11 @@ $otherVals = array(0, 1, -1, 7, 9, 65, -44, MAX_32Bit, MIN_32Bit, MAX_64Bit, MIN
 
 foreach ($longVals as $longVal) {
    foreach($otherVals as $otherVal) {
-	   echo "--- testing: $longVal, $otherVal ---\n";   
+	   echo "--- testing: $longVal, $otherVal ---\n";
       var_dump(fmod($longVal, $otherVal));
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/fmod_variation1.phpt b/ext/standard/tests/math/fmod_variation1.phpt
index 0f0d826ac97..345d74c4315 100644
--- a/ext/standard/tests/math/fmod_variation1.phpt
+++ b/ext/standard/tests/math/fmod_variation1.phpt
@@ -32,7 +32,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -51,7 +51,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -61,10 +61,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/fmod_variation2.phpt b/ext/standard/tests/math/fmod_variation2.phpt
index 12fae1a758f..6c5fc825416 100644
--- a/ext/standard/tests/math/fmod_variation2.phpt
+++ b/ext/standard/tests/math/fmod_variation2.phpt
@@ -32,7 +32,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -51,7 +51,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -61,10 +61,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/hexdec_basic.phpt b/ext/standard/tests/math/hexdec_basic.phpt
index 1c42ae7e406..08303ad20cb 100644
--- a/ext/standard/tests/math/hexdec_basic.phpt
+++ b/ext/standard/tests/math/hexdec_basic.phpt
@@ -19,11 +19,11 @@ $values = array(0x123abc,
 				'311015',
 				31101.3,
 				31.1013e5,
-				011237,	
-				'011237', 			
+				011237,
+				'011237',
 				true,
 				false,
-				null);	
+				null);
 for ($i = 0; $i < count($values); $i++) {
 	$res = hexdec($values[$i]);
 	var_dump($res);
diff --git a/ext/standard/tests/math/hexdec_basic_64bit.phpt b/ext/standard/tests/math/hexdec_basic_64bit.phpt
index f1a2028b5c6..fff7185ef1c 100644
--- a/ext/standard/tests/math/hexdec_basic_64bit.phpt
+++ b/ext/standard/tests/math/hexdec_basic_64bit.phpt
@@ -21,17 +21,17 @@ $values = array(0x123abc,
 				'311015',
 				31101.3,
 				31.1013e5,
-				011237,	
-				'011237', 			
+				011237,
+				'011237',
 				true,
 				false,
-				null);	
+				null);
 
 foreach($values as $value) {
 	echo "\n-- hexdec $value --\n";
 	var_dump(hexdec($value));
-};						
-				
+};
+
 ?>
 ===Done===
 --EXPECTF--
diff --git a/ext/standard/tests/math/hexdec_basiclong_64bit.phpt b/ext/standard/tests/math/hexdec_basiclong_64bit.phpt
index 29c684a1552..225e42018bb 100644
--- a/ext/standard/tests/math/hexdec_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/hexdec_basiclong_64bit.phpt
@@ -6,20 +6,20 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
 define("MIN_32Bit", -2147483647 - 1);
 
 $hexLongStrs = array(
-   '7'.str_repeat('f',15), 
-   str_repeat('f',16), 
-   '7'.str_repeat('f',7), 
-   str_repeat('f',8), 
+   '7'.str_repeat('f',15),
+   str_repeat('f',16),
+   '7'.str_repeat('f',7),
+   str_repeat('f',8),
    '7'.str_repeat('f',16),
    str_repeat('f',18),
-   '7'.str_repeat('f',8), 
+   '7'.str_repeat('f',8),
    str_repeat('f',9)
 );
 
@@ -28,7 +28,7 @@ foreach ($hexLongStrs as $strVal) {
    echo "--- testing: $strVal ---\n";
    var_dump(hexdec($strVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/hexdec_error.phpt b/ext/standard/tests/math/hexdec_error.phpt
index c45c2aa92b1..7b65e5623a5 100644
--- a/ext/standard/tests/math/hexdec_error.phpt
+++ b/ext/standard/tests/math/hexdec_error.phpt
@@ -3,7 +3,7 @@ Test hexdec() - wrong params test hexdec()
 --FILE--
 <?php
 /* Prototype  : number hexdec  ( string $hex_string  )
- * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string  argument. 
+ * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string  argument.
  * Source code: ext/standard/math.c
  */
 
diff --git a/ext/standard/tests/math/hexdec_variation1.phpt b/ext/standard/tests/math/hexdec_variation1.phpt
index 2b3f1b6ab3b..34b2e474d08 100644
--- a/ext/standard/tests/math/hexdec_variation1.phpt
+++ b/ext/standard/tests/math/hexdec_variation1.phpt
@@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : number hexdec  ( string $hex_string  )
- * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string  argument. 
+ * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string  argument.
  * Source code: ext/standard/math.c
  */
 
@@ -32,9 +32,9 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
-       4294967295,  // largest decimal  
-       4294967296, 
+       -2345,
+       4294967295,  // largest decimal
+       4294967296,
 
        // float data
 /*7*/  10.5,
@@ -52,7 +52,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*18*/ "",
        '',
diff --git a/ext/standard/tests/math/hexdec_variation1_64bit.phpt b/ext/standard/tests/math/hexdec_variation1_64bit.phpt
index 65beb2d91b8..f70a48eeb2c 100644
--- a/ext/standard/tests/math/hexdec_variation1_64bit.phpt
+++ b/ext/standard/tests/math/hexdec_variation1_64bit.phpt
@@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : number hexdec  ( string $hex_string  )
- * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string  argument. 
+ * Description: Returns the decimal equivalent of the hexadecimal number represented by the hex_string  argument.
  * Source code: ext/standard/math.c
  */
 
@@ -32,9 +32,9 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
-       4294967295,  // largest decimal  
-       4294967296, 
+       -2345,
+       4294967295,  // largest decimal
+       4294967296,
 
        // float data
 /*7*/  10.5,
@@ -52,7 +52,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*18*/ "",
        '',
diff --git a/ext/standard/tests/math/hypot_basic.phpt b/ext/standard/tests/math/hypot_basic.phpt
index c280a23bb22..107d3e40de3 100644
--- a/ext/standard/tests/math/hypot_basic.phpt
+++ b/ext/standard/tests/math/hypot_basic.phpt
@@ -20,12 +20,12 @@ $valuesy = array(23,
 				027,
 				"23",
 				"23.45",
-				"2.345e1",	
-				"23abc",			
+				"2.345e1",
+				"23abc",
 				null,
 				true,
 				false);
-					
+
 $valuesx = array(33,
 				-33,
 				3.345e1,
@@ -35,17 +35,17 @@ $valuesx = array(33,
 				"33",
 				"43.45",
 				"1.345e1",
-				"33abc",				
+				"33abc",
 				null,
 				true,
-				false);					
+				false);
 
 for ($i = 0; $i < count($valuesy); $i++) {
-	for ($j = 0; $j < count($valuesx); $j++) {	
+	for ($j = 0; $j < count($valuesx); $j++) {
 		echo "\nY:$valuesy[$i] X:$valuesx[$j] ";
 		$res = hypot($valuesy[$i], $valuesx[$j]);
 		var_dump($res);
-	}	
+	}
 }
 ?>
 ===Done===
diff --git a/ext/standard/tests/math/hypot_basiclong_64bit.phpt b/ext/standard/tests/math/hypot_basiclong_64bit.phpt
index 241fa9c4e9c..3bbfcb4afc5 100644
--- a/ext/standard/tests/math/hypot_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/hypot_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,11 +23,11 @@ $otherVals = array(0, 1, -1, 7, 9, 65, -44, MAX_32Bit, MIN_32Bit, MAX_64Bit, MIN
 
 foreach ($longVals as $longVal) {
    foreach($otherVals as $otherVal) {
-	   echo "--- testing: $longVal, $otherVal ---\n";   
+	   echo "--- testing: $longVal, $otherVal ---\n";
       var_dump(hypot($longVal, $otherVal));
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/hypot_error.phpt b/ext/standard/tests/math/hypot_error.phpt
index b357a3a8097..b816cd58a08 100644
--- a/ext/standard/tests/math/hypot_error.phpt
+++ b/ext/standard/tests/math/hypot_error.phpt
@@ -6,7 +6,7 @@ Test hypot() - wrong params test hypot()
  * Description: Calculate the length of the hypotenuse of a right-angle triangle.
  * Source code: ext/standard/math.c
  */
- 
+
 echo "*** Testing hypot() : error conditions ***\n";
 
 echo "\n-- Testing hypot() function with less than expected no. of arguments --\n";
diff --git a/ext/standard/tests/math/hypot_variation1.phpt b/ext/standard/tests/math/hypot_variation1.phpt
index b083822c101..762bc587275 100644
--- a/ext/standard/tests/math/hypot_variation1.phpt
+++ b/ext/standard/tests/math/hypot_variation1.phpt
@@ -33,7 +33,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -52,7 +52,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -62,10 +62,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/hypot_variation2.phpt b/ext/standard/tests/math/hypot_variation2.phpt
index 393e5eb9d19..989e7d00aea 100644
--- a/ext/standard/tests/math/hypot_variation2.phpt
+++ b/ext/standard/tests/math/hypot_variation2.phpt
@@ -33,7 +33,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -52,7 +52,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -62,10 +62,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/is_finite_basic.phpt b/ext/standard/tests/math/is_finite_basic.phpt
index 85d26852734..5906517658d 100644
--- a/ext/standard/tests/math/is_finite_basic.phpt
+++ b/ext/standard/tests/math/is_finite_basic.phpt
@@ -10,16 +10,16 @@ $values = array(234,
 				0352,
 				"234",
 				"234.5",
-				"23.45e1",				
+				"23.45e1",
 				null,
 				true,
 				false,
 				pow(0, -2),
-				acos(1.01));	
+				acos(1.01));
 ;
 for ($i = 0; $i < count($values); $i++) {
 	$res = is_finite($values[$i]);
-	var_dump($res);		
+	var_dump($res);
 }
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/math/is_finite_basiclong_64bit.phpt b/ext/standard/tests/math/is_finite_basiclong_64bit.phpt
index bbc43f73497..201d8473fab 100644
--- a/ext/standard/tests/math/is_finite_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/is_finite_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(is_finite($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/is_finite_variation1.phpt b/ext/standard/tests/math/is_finite_variation1.phpt
index 4f6288f5dfd..498d0b2717f 100644
--- a/ext/standard/tests/math/is_finite_variation1.phpt
+++ b/ext/standard/tests/math/is_finite_variation1.phpt
@@ -32,7 +32,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -51,7 +51,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -61,10 +61,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/is_infinite_basic.phpt b/ext/standard/tests/math/is_infinite_basic.phpt
index ca79922287b..508c5839bb2 100644
--- a/ext/standard/tests/math/is_infinite_basic.phpt
+++ b/ext/standard/tests/math/is_infinite_basic.phpt
@@ -10,16 +10,16 @@ $values = array(234,
 				0352,
 				"234",
 				"234.5",
-				"23.45e1",				
+				"23.45e1",
 				null,
 				true,
 				false,
 				pow(0, -2),
-				acos(1.01));	
+				acos(1.01));
 ;
 for ($i = 0; $i < count($values); $i++) {
 	$res = is_infinite($values[$i]);
-	var_dump($res);		
+	var_dump($res);
 }
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt b/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt
index ab15ec71f0b..ca53b77f0cd 100644
--- a/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/is_infinite_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(is_infinite($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/is_infinite_variation1.phpt b/ext/standard/tests/math/is_infinite_variation1.phpt
index e7228dd7c55..0f57209b985 100644
--- a/ext/standard/tests/math/is_infinite_variation1.phpt
+++ b/ext/standard/tests/math/is_infinite_variation1.phpt
@@ -32,7 +32,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -51,7 +51,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -61,10 +61,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/is_nan_basic.phpt b/ext/standard/tests/math/is_nan_basic.phpt
index fb10737ceaa..05db70db765 100644
--- a/ext/standard/tests/math/is_nan_basic.phpt
+++ b/ext/standard/tests/math/is_nan_basic.phpt
@@ -10,19 +10,19 @@ $values = array(234,
 				0352,
 				"234",
 				"234.5",
-				"23.45e1",				
+				"23.45e1",
 				null,
 				true,
 				false,
 				pow(0, -2),
-				acos(1.01));	
-			
+				acos(1.01));
+
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = is_nan($values[$i]);
-	var_dump($res);		
+	var_dump($res);
 }
- 
+
 ?>
 
 --EXPECTF--
diff --git a/ext/standard/tests/math/is_nan_basiclong_64bit.phpt b/ext/standard/tests/math/is_nan_basiclong_64bit.phpt
index 6f66d6b71eb..ca85db16603 100644
--- a/ext/standard/tests/math/is_nan_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/is_nan_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(is_nan($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/is_nan_variation1.phpt b/ext/standard/tests/math/is_nan_variation1.phpt
index 3106d30d740..9cd24cfd911 100644
--- a/ext/standard/tests/math/is_nan_variation1.phpt
+++ b/ext/standard/tests/math/is_nan_variation1.phpt
@@ -32,7 +32,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -51,7 +51,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -61,10 +61,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/lcg_value_basic.phpt b/ext/standard/tests/math/lcg_value_basic.phpt
index 6d624d84ab0..b2e50f86f86 100644
--- a/ext/standard/tests/math/lcg_value_basic.phpt
+++ b/ext/standard/tests/math/lcg_value_basic.phpt
@@ -9,7 +9,7 @@ echo "MATHS test script started\n";
 echo "\n lcg_value tests...\n";
 for ($i = 0; $i < 100; $i++) {
 	$res = lcg_value();
-	
+
 	if (!is_float($res) || $res < 0 || $res > 1) {
 		break;
 	}
@@ -17,28 +17,28 @@ for ($i = 0; $i < 100; $i++) {
 
 if ($i != 100) {
 	echo "FAILED\n";
-} else { 
+} else {
 	echo "PASSED\n";
-}	
+}
 
 echo "\n lcg_value error cases..spurious args get ignored\n";
 $res = lcg_value(23);
 
 if (!is_float($res) || $res < 0 || $res > 1) {
 	echo "FAILED\n";
-} else { 
+} else {
 	echo "PASSED\n";
-}	
+}
 
 $res = lcg_value(10,false);
 if (!is_float($res) || $res < 0 || $res > 1) {
 	echo "FAILED\n";
-} else { 
+} else {
 	echo "PASSED\n";
-}	
+}
 
 echo "MATHS test script completed\n";
- 
+
 ?>
 
 --EXPECT--
diff --git a/ext/standard/tests/math/log.phpt b/ext/standard/tests/math/log.phpt
index 4f8b47a76b6..53034b3688e 100644
--- a/ext/standard/tests/math/log.phpt
+++ b/ext/standard/tests/math/log.phpt
@@ -6,8 +6,8 @@ echo "On failure, please mail result to php-dev@lists.php.net\n";
 for ($x = 0, $count= 0; $x < 200; $x++) {
     $x2 = (int) exp(log($x));
     // e ^ log(x) should be close in range to x
-    if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) { 
-        $count++; 
+    if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) {
+        $count++;
     } else {
         print "$x : $x2\n";
     }
@@ -19,8 +19,8 @@ for ($base = 2; $base < 11; $base++) {
     for ($x = 0, $count= 0; $x < 50; $x++) {
         $x2 = (int) pow($base, log($x, $base));
         // base ^ log(x) should be close in range to x
-        if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) { 
-            $count++; 
+        if (($x2 < ($x + 2)) && ($x2 > ($x - 2))) {
+            $count++;
         } else {
              print "base $base: $x : $x2\n";
         }
diff --git a/ext/standard/tests/math/log10_basic.phpt b/ext/standard/tests/math/log10_basic.phpt
index 0877df23d7f..3ea14b59aca 100644
--- a/ext/standard/tests/math/log10_basic.phpt
+++ b/ext/standard/tests/math/log10_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input log10()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float log10(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
diff --git a/ext/standard/tests/math/log10_basiclong_64bit.phpt b/ext/standard/tests/math/log10_basiclong_64bit.phpt
index be1b7eff7db..2eb2d544b63 100644
--- a/ext/standard/tests/math/log10_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/log10_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(log10($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/log10_error.phpt b/ext/standard/tests/math/log10_error.phpt
index e3bc604fd24..f4e5da8f48d 100644
--- a/ext/standard/tests/math/log10_error.phpt
+++ b/ext/standard/tests/math/log10_error.phpt
@@ -4,10 +4,10 @@ Test wrong number of arguments for log10()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float log10(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/log10_variation.phpt b/ext/standard/tests/math/log10_variation.phpt
index ca41a0dbd58..53043259528 100644
--- a/ext/standard/tests/math/log10_variation.phpt
+++ b/ext/standard/tests/math/log10_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of log10()
 precision = 10
 --FILE--
 <?php
-/* 
+/*
  * proto float log10(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test log10 with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = log10($values[$i]);
diff --git a/ext/standard/tests/math/log1p_basic.phpt b/ext/standard/tests/math/log1p_basic.phpt
index b28941860fc..76d51b0d9bc 100644
--- a/ext/standard/tests/math/log1p_basic.phpt
+++ b/ext/standard/tests/math/log1p_basic.phpt
@@ -5,7 +5,7 @@ precision=14
 --FILE--
 <?php
 /* Prototype  : float log1p  ( float $arg  )
- * Description: Returns log(1 + number), computed in a way that is accurate even 
+ * Description: Returns log(1 + number), computed in a way that is accurate even
  *				when the value of number is close to zero
  * Source code: ext/standard/math.c
  */
@@ -20,17 +20,17 @@ $values = array(23,
 				027,
 				"23",
 				"23.45",
-				"2.345e1",				
+				"2.345e1",
 				null,
 				true,
-				false);	
+				false);
 
 echo "\n LOG1p tests\n";
 
 foreach($values as $value) {
 	echo "\n-- log1p $value --\n";
 	var_dump(log1p($value));
-};	
+};
 
 
 ?>
diff --git a/ext/standard/tests/math/log1p_basiclong_64bit.phpt b/ext/standard/tests/math/log1p_basiclong_64bit.phpt
index a0b32bdce9d..05580ff7319 100644
--- a/ext/standard/tests/math/log1p_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/log1p_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(log1p($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/log1p_error.phpt b/ext/standard/tests/math/log1p_error.phpt
index e0b01a19ac3..09d63be1289 100644
--- a/ext/standard/tests/math/log1p_error.phpt
+++ b/ext/standard/tests/math/log1p_error.phpt
@@ -3,11 +3,11 @@ Test log1p() - Error conditions
 --FILE--
 <?php
 /* Prototype  : float log1p  ( float $arg  )
- * Description: Returns log(1 + number), computed in a way that is accurate even 
+ * Description: Returns log(1 + number), computed in a way that is accurate even
  *				when the value of number is close to zero
  * Source code: ext/standard/math.c
  */
- 
+
 echo "*** Testing log1p() : error conditions ***\n";
 
 echo "\n-- Testing log1p() function with less than expected no. of arguments --\n";
diff --git a/ext/standard/tests/math/log1p_variation1.phpt b/ext/standard/tests/math/log1p_variation1.phpt
index 8cd41526f5c..b166c302ebe 100644
--- a/ext/standard/tests/math/log1p_variation1.phpt
+++ b/ext/standard/tests/math/log1p_variation1.phpt
@@ -5,7 +5,7 @@ precision=14
 --FILE--
 <?php
 /* Prototype  : float log1p  ( float $arg  )
- * Description: Returns log(1 + number), computed in a way that is accurate even 
+ * Description: Returns log(1 + number), computed in a way that is accurate even
  *				when the value of number is close to zero
  * Source code: ext/standard/math.c
  */
@@ -35,7 +35,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
        -2147483648,
 
@@ -55,7 +55,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*18*/ "",
        '',
@@ -65,10 +65,10 @@ $inputs = array(
 /*21*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*24*/ new classA(),       
-       
+/*24*/ new classA(),
+
        // undefined data
 /*25*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/log_basic.phpt b/ext/standard/tests/math/log_basic.phpt
index e2f9c9fe7d3..a704b9fda82 100644
--- a/ext/standard/tests/math/log_basic.phpt
+++ b/ext/standard/tests/math/log_basic.phpt
@@ -12,10 +12,10 @@ $values = array(23,
 				027,
 				"23",
 				"23.45",
-				"2.345e1",				
+				"2.345e1",
 				null,
 				true,
-				false);	
+				false);
 
 echo "\n LOG tests...no base\n";
 for ($i = 0; $i < count($values); $i++) {
diff --git a/ext/standard/tests/math/log_basiclong_64bit.phpt b/ext/standard/tests/math/log_basiclong_64bit.phpt
index 9a8f8a6f1d3..5259899323d 100644
--- a/ext/standard/tests/math/log_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/log_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(log($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/log_variation1.phpt b/ext/standard/tests/math/log_variation1.phpt
index c1cde4bcc9f..5874f63211c 100644
--- a/ext/standard/tests/math/log_variation1.phpt
+++ b/ext/standard/tests/math/log_variation1.phpt
@@ -32,7 +32,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -51,7 +51,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -61,10 +61,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/log_variation2.phpt b/ext/standard/tests/math/log_variation2.phpt
index 9f5c7313fab..4ea191e75c3 100644
--- a/ext/standard/tests/math/log_variation2.phpt
+++ b/ext/standard/tests/math/log_variation2.phpt
@@ -32,7 +32,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -51,7 +51,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -61,10 +61,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/mt_rand_basic.phpt b/ext/standard/tests/math/mt_rand_basic.phpt
index 0f7b8a8b6e9..2661c767d57 100644
--- a/ext/standard/tests/math/mt_rand_basic.phpt
+++ b/ext/standard/tests/math/mt_rand_basic.phpt
@@ -7,8 +7,8 @@ $default_max = mt_getrandmax();
 echo "\nmt_rand() tests with default min and max value (i.e 0 thru ", $default_max, ")\n";
 for ($i = 0; $i < 100; $i++) {
 	$res = mt_rand();
-	
-// By default RAND_MAX is 32768 although no constant is defined for it for user space apps 	
+
+// By default RAND_MAX is 32768 although no constant is defined for it for user space apps
 	if (!is_int($res) || $res < 0 || $res > $default_max) {
 		break;
 	}
@@ -16,9 +16,9 @@ for ($i = 0; $i < 100; $i++) {
 
 if ($i != 100) {
 	echo "FAILED: res = ",  $res, " min = 0 max = ", $default_max, "\n";
-} else { 
-	echo "PASSED: range min = 0  max = ", $default_max, "\n"; 
-}	
+} else {
+	echo "PASSED: range min = 0  max = ", $default_max, "\n";
+}
 
 echo "\nmt_rand() tests with defined min and max value\n";
 
@@ -28,28 +28,28 @@ $min = array(10,
 			 10.5e3,
 			 0x10,
 			 0400);
-			 
+
 $max = array(100,
 			 1000,
 			 19.5,
 			 10.5e5,
 			 0x10000,
-			 0700);		 	
+			 0700);
 
 for ($x = 0; $x < count($min); $x++) {
 	for ($i = 0; $i < 100; $i++) {
 		$res = mt_rand($min[$x], $max[$x]);
-		
+
 		if (!is_int($res) || $res < intval($min[$x]) || $res > intval($max[$x])) {
-			echo "FAILED: res = ",  $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n";		
+			echo "FAILED: res = ",  $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n";
 			break;
 		}
 	}
 
 	if ($i == 100) {
-		echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; 
+		echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n";
 	}
-}	
+}
 
 echo "\nNon-numeric cases\n";
 $min = array(true,
@@ -57,8 +57,8 @@ $min = array(true,
 			 null,
 			 "10",
 			 "10.5");
-		
-// Expected numerical equivalent of above non-numerics		
+
+// Expected numerical equivalent of above non-numerics
 $minval = array(1,
 				0,
 				0,
@@ -67,16 +67,16 @@ $minval = array(1,
 for ($x = 0; $x < count($min); $x++) {
 	for ($i = 0; $i < 100; $i++) {
 		$res = mt_rand($min[$x], 100);
-		
+
 		if (!is_int($res) || $res < intval($minval[$x]) || $res > 100) {
-			echo "FAILED: res = ",  $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n";	
+			echo "FAILED: res = ",  $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n";
 			break;
 		}
 	}
-	
+
 	if ($i == 100) {
-		echo "PASSED range min = ", intval($min[$x]), " max = 100\n"; 
-	}	
+		echo "PASSED range min = ", intval($min[$x]), " max = 100\n";
+	}
 }
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/math/mt_rand_variation1.phpt b/ext/standard/tests/math/mt_rand_variation1.phpt
index f2adb6d39de..da4fac3e2f4 100644
--- a/ext/standard/tests/math/mt_rand_variation1.phpt
+++ b/ext/standard/tests/math/mt_rand_variation1.phpt
@@ -32,7 +32,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -51,7 +51,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -61,10 +61,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/mt_rand_variation2.phpt b/ext/standard/tests/math/mt_rand_variation2.phpt
index 3c4be806d69..f04baa514ad 100644
--- a/ext/standard/tests/math/mt_rand_variation2.phpt
+++ b/ext/standard/tests/math/mt_rand_variation2.phpt
@@ -34,7 +34,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -53,7 +53,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -63,10 +63,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/mt_srand_variation1.phpt b/ext/standard/tests/math/mt_srand_variation1.phpt
index 7409767f910..5648a8fd2a6 100644
--- a/ext/standard/tests/math/mt_srand_variation1.phpt
+++ b/ext/standard/tests/math/mt_srand_variation1.phpt
@@ -34,7 +34,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -53,7 +53,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -63,10 +63,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/number_format_basic.phpt b/ext/standard/tests/math/number_format_basic.phpt
index 7f5f4beb256..303b5a26624 100644
--- a/ext/standard/tests/math/number_format_basic.phpt
+++ b/ext/standard/tests/math/number_format_basic.phpt
@@ -10,10 +10,10 @@ $values = array(1234.5678,
 				02777777777,
 				"123456789",
 				"123.456789",
-				"12.3456789e1",				
+				"12.3456789e1",
 				null,
 				true,
-				false);	
+				false);
 
 echo "\n number_format tests.....default\n";
 for ($i = 0; $i < count($values); $i++) {
diff --git a/ext/standard/tests/math/number_format_multichar.phpt b/ext/standard/tests/math/number_format_multichar.phpt
index ae36d12c731..3d4eb10e741 100644
--- a/ext/standard/tests/math/number_format_multichar.phpt
+++ b/ext/standard/tests/math/number_format_multichar.phpt
@@ -10,10 +10,10 @@ $values = array(1234.5678,
 				02777777777,
 				"123456789",
 				"123.456789",
-				"12.3456789e1",				
+				"12.3456789e1",
 				null,
 				true,
-				false);	
+				false);
 
 echo " number_format tests.....multiple character decimal point\n";
 for ($i = 0; $i < count($values); $i++) {
diff --git a/ext/standard/tests/math/octdec_basic.phpt b/ext/standard/tests/math/octdec_basic.phpt
index 8fd57ecfef7..d10c35cb056 100644
--- a/ext/standard/tests/math/octdec_basic.phpt
+++ b/ext/standard/tests/math/octdec_basic.phpt
@@ -19,10 +19,10 @@ $values = array(01234567,
 				'0x1234ABC',
 				'12345',
 				31101.3,
-				31.1013e5,				
+				31.1013e5,
 				true,
 				false,
-				null);	
+				null);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = octdec($values[$i]);
diff --git a/ext/standard/tests/math/octdec_basic_64bit.phpt b/ext/standard/tests/math/octdec_basic_64bit.phpt
index 98996dc1826..2fb9a11397d 100644
--- a/ext/standard/tests/math/octdec_basic_64bit.phpt
+++ b/ext/standard/tests/math/octdec_basic_64bit.phpt
@@ -22,10 +22,10 @@ $values = array(01234567,
 				'0x1234ABC',
 				'12345',
 				31101.3,
-				31.1013e5,				
+				31.1013e5,
 				true,
 				false,
-				null);	
+				null);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = octdec($values[$i]);
diff --git a/ext/standard/tests/math/octdec_basiclong_64bit.phpt b/ext/standard/tests/math/octdec_basiclong_64bit.phpt
index 651b09db399..4a97a6f4143 100644
--- a/ext/standard/tests/math/octdec_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/octdec_basiclong_64bit.phpt
@@ -6,15 +6,15 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
 define("MIN_32Bit", -2147483647 - 1);
 
 $octLongStrs = array(
-   '777777777777777777777', 
-   '1777777777777777777777', 
+   '777777777777777777777',
+   '1777777777777777777777',
    '17777777777',
    '37777777777',
    '377777777777777777777777',
@@ -28,7 +28,7 @@ foreach ($octLongStrs as $strVal) {
    echo "--- testing: $strVal ---\n";
    var_dump(octdec($strVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/octdec_error.phpt b/ext/standard/tests/math/octdec_error.phpt
index ba5f2116bbc..5d94acc435a 100644
--- a/ext/standard/tests/math/octdec_error.phpt
+++ b/ext/standard/tests/math/octdec_error.phpt
@@ -3,7 +3,7 @@ Test octdec() - wrong params  test octdec()
 --FILE--
 <?php
 /* Prototype  : number octdec  ( string $octal_string  )
- * Description: Returns the decimal equivalent of the octal number represented by the octal_string  argument. 
+ * Description: Returns the decimal equivalent of the octal number represented by the octal_string  argument.
  * Source code: ext/standard/math.c
  */
 
@@ -14,7 +14,7 @@ class classA
 {
 }
 
-echo "\n-- Incorrect number of arguments --\n"; 
+echo "\n-- Incorrect number of arguments --\n";
 octdec();
 octdec('0123567',true);
 
diff --git a/ext/standard/tests/math/octdec_variation1.phpt b/ext/standard/tests/math/octdec_variation1.phpt
index 117119600bf..42d6a730684 100644
--- a/ext/standard/tests/math/octdec_variation1.phpt
+++ b/ext/standard/tests/math/octdec_variation1.phpt
@@ -5,7 +5,7 @@ precision=14
 --FILE--
 <?php
 /* Prototype  : number octdec  ( string $octal_string  )
- * Description: Returns the decimal equivalent of the octal number represented by the octal_string  argument. 
+ * Description: Returns the decimal equivalent of the octal number represented by the octal_string  argument.
  * Source code: ext/standard/math.c
  */
 
@@ -28,9 +28,9 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
-       4294967295,  // largest decimal  
-       4294967296, 
+       -2345,
+       4294967295,  // largest decimal
+       4294967296,
 
        // float data
 /*7*/  10.5,
@@ -48,7 +48,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*18*/ "",
        '',
@@ -58,7 +58,7 @@ $inputs = array(
 /*21*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/pi_basic.phpt b/ext/standard/tests/math/pi_basic.phpt
index fec5691371d..c00684edcb3 100644
--- a/ext/standard/tests/math/pi_basic.phpt
+++ b/ext/standard/tests/math/pi_basic.phpt
@@ -6,8 +6,8 @@ precision=14
 <?php
 echo pi(), "\n";
 echo M_PI, "\n";
-// N.B pi() ignores all specified arguments no error 
-// messages are produced if arguments are spcified. 
+// N.B pi() ignores all specified arguments no error
+// messages are produced if arguments are spcified.
 ?>
 --EXPECTF--
 3.1415926535898
diff --git a/ext/standard/tests/math/pow_basic.phpt b/ext/standard/tests/math/pow_basic.phpt
index b7d96ca23b6..abd4f26d8e2 100644
--- a/ext/standard/tests/math/pow_basic.phpt
+++ b/ext/standard/tests/math/pow_basic.phpt
@@ -18,9 +18,9 @@ $bases = array(23,
 				027,
 				"23",
 				"23.45",
-				"2.345e1",	
+				"2.345e1",
 				PHP_INT_MAX,
-				-PHP_INT_MAX - 1);			
+				-PHP_INT_MAX - 1);
 
 $exponents = array(0,
                1,
@@ -34,8 +34,8 @@ $exponents = array(0,
                500,
                -500,
                2147483647,
-			   -2147483648); 				
-					
+			   -2147483648);
+
 foreach($bases as $base) {
 	echo "\n\nBase = $base";
 	foreach($exponents as $exponent) {
diff --git a/ext/standard/tests/math/pow_basic2.phpt b/ext/standard/tests/math/pow_basic2.phpt
index fc55caccad4..a1cb124767c 100644
--- a/ext/standard/tests/math/pow_basic2.phpt
+++ b/ext/standard/tests/math/pow_basic2.phpt
@@ -8,7 +8,7 @@ precision=14
 $large_exp = 20000;
 
 echo "\n-- The following all result in INF --\n";
-var_dump(pow(24, $large_exp)); 
+var_dump(pow(24, $large_exp));
 var_dump(pow(0.24, -$large_exp));
 var_dump(pow(-0.24, -$large_exp));
 
@@ -16,7 +16,7 @@ echo "\n\n-- The following all result in 0 --\n";
 var_dump(pow(0.24, $large_exp));
 var_dump(pow(-0.24, $large_exp));
 var_dump(pow(24, -$large_exp));
-var_dump(pow(-24, -$large_exp));  
+var_dump(pow(-24, -$large_exp));
 
 echo "\n\n-- The following all result in -0 --\n";
 var_dump(pow(-0.24, $large_exp+1));
diff --git a/ext/standard/tests/math/pow_basic_64bit.phpt b/ext/standard/tests/math/pow_basic_64bit.phpt
index 898f6efa339..eb1441f4fd7 100644
--- a/ext/standard/tests/math/pow_basic_64bit.phpt
+++ b/ext/standard/tests/math/pow_basic_64bit.phpt
@@ -18,9 +18,9 @@ $bases = array(23,
 				027,
 				"23",
 				"23.45",
-				"2.345e1",	
+				"2.345e1",
 				PHP_INT_MAX,
-				-PHP_INT_MAX - 1);				
+				-PHP_INT_MAX - 1);
 
 $exponents = array(0,
                1,
@@ -34,8 +34,8 @@ $exponents = array(0,
                500,
                -500,
                2147483647,
-			   -2147483648); 				
-					
+			   -2147483648);
+
 foreach($bases as $base) {
 	echo "\n\nBase = $base";
 	foreach($exponents as $exponent) {
diff --git a/ext/standard/tests/math/pow_basiclong_64bit.phpt b/ext/standard/tests/math/pow_basiclong_64bit.phpt
index dfff0f67858..722b01c0c74 100644
--- a/ext/standard/tests/math/pow_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/pow_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,11 +23,11 @@ $otherVals = array(0, 1, -1, 7, 9, 65, -44, MAX_32Bit, MIN_32Bit, MAX_64Bit, MIN
 
 foreach ($longVals as $longVal) {
    foreach($otherVals as $otherVal) {
-	   echo "--- testing: $longVal, $otherVal ---\n";   
+	   echo "--- testing: $longVal, $otherVal ---\n";
       var_dump(pow($longVal, $otherVal));
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/pow_variation1.phpt b/ext/standard/tests/math/pow_variation1.phpt
index c744c4eb9d4..79b5b4d9889 100644
--- a/ext/standard/tests/math/pow_variation1.phpt
+++ b/ext/standard/tests/math/pow_variation1.phpt
@@ -38,7 +38,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        PHP_INT_MAX,
 
        // float data
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -67,10 +67,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/pow_variation1_64bit.phpt b/ext/standard/tests/math/pow_variation1_64bit.phpt
index ea2ae45d18a..f2979ad4ba1 100644
--- a/ext/standard/tests/math/pow_variation1_64bit.phpt
+++ b/ext/standard/tests/math/pow_variation1_64bit.phpt
@@ -38,7 +38,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        PHP_INT_MAX,
 
        // float data
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -67,10 +67,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/pow_variation2.phpt b/ext/standard/tests/math/pow_variation2.phpt
index 36b085b6474..f5b6717b0bd 100644
--- a/ext/standard/tests/math/pow_variation2.phpt
+++ b/ext/standard/tests/math/pow_variation2.phpt
@@ -34,7 +34,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -53,7 +53,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -63,10 +63,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/rad2deg_basic.phpt b/ext/standard/tests/math/rad2deg_basic.phpt
index 0256ffbd90f..e79e591cf74 100644
--- a/ext/standard/tests/math/rad2deg_basic.phpt
+++ b/ext/standard/tests/math/rad2deg_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input rad2deg()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float rad2deg(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
diff --git a/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt b/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt
index 4f43ef13686..b3d973387ef 100644
--- a/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/rad2deg_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(rad2deg($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/rad2deg_error.phpt b/ext/standard/tests/math/rad2deg_error.phpt
index 32b2f4dcb67..e49eea2703e 100644
--- a/ext/standard/tests/math/rad2deg_error.phpt
+++ b/ext/standard/tests/math/rad2deg_error.phpt
@@ -4,10 +4,10 @@ Test wrong number of arguments for rad2deg()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float rad2deg(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/rad2deg_variation.phpt b/ext/standard/tests/math/rad2deg_variation.phpt
index 935636cd59e..596a1940a41 100644
--- a/ext/standard/tests/math/rad2deg_variation.phpt
+++ b/ext/standard/tests/math/rad2deg_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of rad2deg()
 precision = 10
 --FILE--
 <?php
-/* 
+/*
  * proto float rad2deg(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test rad2deg with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = rad2deg($values[$i]);
diff --git a/ext/standard/tests/math/rand_basic.phpt b/ext/standard/tests/math/rand_basic.phpt
index 8dc9fb862c6..f59a7823b4d 100644
--- a/ext/standard/tests/math/rand_basic.phpt
+++ b/ext/standard/tests/math/rand_basic.phpt
@@ -7,8 +7,8 @@ $default_max = getrandmax();
 echo "\nrand() tests with default min and max value (i.e 0 thru ", $default_max, ")\n";
 for ($i = 0; $i < 100; $i++) {
 	$res = rand();
-	
-// By default RAND_MAX is 32768 although no constant is defined for it for user space apps 	
+
+// By default RAND_MAX is 32768 although no constant is defined for it for user space apps
 	if (!is_int($res) || $res < 0 || $res > $default_max) {
 		break;
 	}
@@ -16,9 +16,9 @@ for ($i = 0; $i < 100; $i++) {
 
 if ($i != 100) {
 	echo "FAILED: res = ", $res, " min = 0 max = ", $default_max, "\n";
-} else { 
+} else {
 	echo "PASSED: range min = 0 max = ", $default_max, "\n";
-}	
+}
 
 echo "\nrand() tests with defined min and max value\n";
 
@@ -28,28 +28,28 @@ $min = array(10,
 			 10.5e3,
 			 0x10,
 			 0400);
-			 
+
 $max = array(100,
 			 1000,
 			 19.5,
 			 10.5e5,
 			 0x10000,
-			 0700);		 	
+			 0700);
 
 for ($x = 0; $x < count($min); $x++) {
 	for ($i = 0; $i < 100; $i++) {
 		$res = rand($min[$x], $max[$x]);
-		
+
 		if (!is_int($res) || $res < intval($min[$x]) || $res > intval($max[$x])) {
-			echo "FAILED: res = ",  $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n";		
+			echo "FAILED: res = ",  $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n";
 			break;
 		}
 	}
 
 	if ($i == 100) {
-		echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n"; 
+		echo "PASSED: range min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n";
 	}
-}	
+}
 
 echo "\nNon-numeric cases\n";
 $min = array(true,
@@ -57,8 +57,8 @@ $min = array(true,
 			 null,
 			 "10",
 			 "10.5");
-		
-// Eexepcted numerical equivalent of above non-numerics		
+
+// Eexepcted numerical equivalent of above non-numerics
 $minval = array(1,
 				0,
 				0,
@@ -67,16 +67,16 @@ $minval = array(1,
 for ($x = 0; $x < count($min); $x++) {
 	for ($i = 0; $i < 100; $i++) {
 		$res = rand($min[$x], 100);
-		
+
 		if (!is_int($res) || $res < intval($minval[$x]) || $res > 100) {
-			echo "FAILED: res = ",  $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n";	
+			echo "FAILED: res = ",  $res, " min = ", intval($min[$x]), " max = ", intval($max[$x]), "\n";
 			break;
 		}
 	}
-	
+
 	if ($i == 100) {
-		echo "PASSED range min = ", intval($min[$x]), " max = 100\n"; 
-	}	
+		echo "PASSED range min = ", intval($min[$x]), " max = 100\n";
+	}
 }
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/math/rand_variation1.phpt b/ext/standard/tests/math/rand_variation1.phpt
index f14ada87f58..3d3d4f502cc 100644
--- a/ext/standard/tests/math/rand_variation1.phpt
+++ b/ext/standard/tests/math/rand_variation1.phpt
@@ -34,7 +34,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -53,7 +53,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -63,10 +63,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/rand_variation2.phpt b/ext/standard/tests/math/rand_variation2.phpt
index 824b47b0cb5..f14d6f202b7 100644
--- a/ext/standard/tests/math/rand_variation2.phpt
+++ b/ext/standard/tests/math/rand_variation2.phpt
@@ -34,7 +34,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -53,7 +53,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -63,10 +63,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/round_basic.phpt b/ext/standard/tests/math/round_basic.phpt
index d4b94ec0568..94531ba0172 100644
--- a/ext/standard/tests/math/round_basic.phpt
+++ b/ext/standard/tests/math/round_basic.phpt
@@ -19,9 +19,9 @@ $values = array(123456789,
 				-4.567E3,
 				0x234567,
 				067777777,
-				"1.234567", 
+				"1.234567",
 				"2.3456789e8");
-					
+
 $precision = array(2,
 				8,
 				0x3,
@@ -30,10 +30,10 @@ $precision = array(2,
 				"2",
 				"04",
 				"3.6",
-				"2.1e1",				
+				"2.1e1",
 				null,
 				true,
-				false);					
+				false);
 
 for ($i = 0; $i < count($values); $i++) {
 	echo "round: $values[$i]\n";
@@ -41,7 +41,7 @@ for ($i = 0; $i < count($values); $i++) {
 		$res = round($values[$i], $precision[$j]);
 		echo "...with precision $precision[$j]-> ";
 		var_dump($res);
-	}	
+	}
 }
 ?>
 ===Done===
diff --git a/ext/standard/tests/math/round_basiclong_64bit.phpt b/ext/standard/tests/math/round_basiclong_64bit.phpt
index 19db12ed81b..fbae95437fe 100644
--- a/ext/standard/tests/math/round_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/round_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(round($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/round_error.phpt b/ext/standard/tests/math/round_error.phpt
index 28a6d5cf79a..eb80722d92e 100644
--- a/ext/standard/tests/math/round_error.phpt
+++ b/ext/standard/tests/math/round_error.phpt
@@ -7,11 +7,11 @@ Test round() function :  error conditions - incorrect number of args
  * after the decimal point)
  * Source code: ext/standard/math.c
  */
- 
+
 /*
  * Pass incorrect number of arguments to round() to test behaviour
  */
- 
+
 echo "*** Testing round() : error conditions ***\n";
 
 echo "\n-- Wrong nmumber of arguments --\n";
diff --git a/ext/standard/tests/math/round_variation1.phpt b/ext/standard/tests/math/round_variation1.phpt
index c89dd6818a3..f0d893aeeb5 100644
--- a/ext/standard/tests/math/round_variation1.phpt
+++ b/ext/standard/tests/math/round_variation1.phpt
@@ -35,7 +35,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -54,7 +54,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -64,10 +64,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/round_variation2.phpt b/ext/standard/tests/math/round_variation2.phpt
index f199ff7eb61..a90c8832a0f 100644
--- a/ext/standard/tests/math/round_variation2.phpt
+++ b/ext/standard/tests/math/round_variation2.phpt
@@ -35,7 +35,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -54,7 +54,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -64,10 +64,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/sin_basic.phpt b/ext/standard/tests/math/sin_basic.phpt
index 2b55ad7355a..27579cd2890 100644
--- a/ext/standard/tests/math/sin_basic.phpt
+++ b/ext/standard/tests/math/sin_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input sin()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float sin(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
@@ -64,7 +64,7 @@ var_dump(sin($twoseventy));
 if (allowed_rounding_error(sin($twoseventy),-1.0)) {
 	echo "Pass\n";
 }
-else {	
+else {
 	echo "Fail\n";
 }
 
diff --git a/ext/standard/tests/math/sin_basiclong_64bit.phpt b/ext/standard/tests/math/sin_basiclong_64bit.phpt
index 55b859a6fdd..f335b3bd621 100644
--- a/ext/standard/tests/math/sin_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/sin_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(sin($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/sin_error.phpt b/ext/standard/tests/math/sin_error.phpt
index 41a4b2e7aff..c6b9f086cdc 100644
--- a/ext/standard/tests/math/sin_error.phpt
+++ b/ext/standard/tests/math/sin_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for sin()
 --FILE--
 <?php
-/* 
+/*
  * proto float sin(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/sin_variation.phpt b/ext/standard/tests/math/sin_variation.phpt
index 5d4b5583ccc..5b635dfbdcc 100644
--- a/ext/standard/tests/math/sin_variation.phpt
+++ b/ext/standard/tests/math/sin_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of sin()
 precision = 10
 --FILE--
 <?php
-/* 
+/*
  * proto float sin(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test sin with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = sin($values[$i]);
diff --git a/ext/standard/tests/math/sinh_basic.phpt b/ext/standard/tests/math/sinh_basic.phpt
index 79bef6314c1..2bcf42f9fdf 100644
--- a/ext/standard/tests/math/sinh_basic.phpt
+++ b/ext/standard/tests/math/sinh_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input sinh()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float sinh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
diff --git a/ext/standard/tests/math/sinh_basiclong_64bit.phpt b/ext/standard/tests/math/sinh_basiclong_64bit.phpt
index 52068146eab..a52a48a8db9 100644
--- a/ext/standard/tests/math/sinh_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/sinh_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(sinh($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/sinh_error.phpt b/ext/standard/tests/math/sinh_error.phpt
index 70decf252fe..3f7ba923c3d 100644
--- a/ext/standard/tests/math/sinh_error.phpt
+++ b/ext/standard/tests/math/sinh_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for sinh()
 --FILE--
 <?php
-/* 
+/*
  * proto float sinh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/sinh_variation.phpt b/ext/standard/tests/math/sinh_variation.phpt
index 860f809b880..e47e94d629f 100644
--- a/ext/standard/tests/math/sinh_variation.phpt
+++ b/ext/standard/tests/math/sinh_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of sinh()
 precision = 10
 --FILE--
 <?php
-/* 
+/*
  * proto float sinh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test sinh with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = sinh($values[$i]);
diff --git a/ext/standard/tests/math/sqrt_basic.phpt b/ext/standard/tests/math/sqrt_basic.phpt
index 076a1130168..ef665a02163 100644
--- a/ext/standard/tests/math/sqrt_basic.phpt
+++ b/ext/standard/tests/math/sqrt_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input sqrt()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float sqrt(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 9.0;
 
diff --git a/ext/standard/tests/math/sqrt_basiclong_64bit.phpt b/ext/standard/tests/math/sqrt_basiclong_64bit.phpt
index 99091e2c4b0..44fe578548b 100644
--- a/ext/standard/tests/math/sqrt_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/sqrt_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(sqrt($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/sqrt_error.phpt b/ext/standard/tests/math/sqrt_error.phpt
index 66d6d273551..ac66091838a 100644
--- a/ext/standard/tests/math/sqrt_error.phpt
+++ b/ext/standard/tests/math/sqrt_error.phpt
@@ -4,10 +4,10 @@ Test wrong number of arguments for sqrt()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float sqrt(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/sqrt_variation.phpt b/ext/standard/tests/math/sqrt_variation.phpt
index e5629ee55c1..7369b98dfda 100644
--- a/ext/standard/tests/math/sqrt_variation.phpt
+++ b/ext/standard/tests/math/sqrt_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of sqrt()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float sqrt(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test sqrt with a different input values
@@ -22,12 +22,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = sqrt($values[$i]);
diff --git a/ext/standard/tests/math/srand_error.phpt b/ext/standard/tests/math/srand_error.phpt
index ca9e4b939cd..089044d805a 100644
--- a/ext/standard/tests/math/srand_error.phpt
+++ b/ext/standard/tests/math/srand_error.phpt
@@ -6,11 +6,11 @@ Test srand() function :  error conditions - incorrect number of args
  * Description: Seed the random number generator.
  * Source code: ext/standard/rand.c
  */
- 
+
 /*
  * Pass incorrect number of arguments to srand() to test behaviour
  */
- 
+
 echo "*** Testing srand() : error conditions ***\n";
 
 var_dump(srand(500, 0, true));
diff --git a/ext/standard/tests/math/srand_variation1.phpt b/ext/standard/tests/math/srand_variation1.phpt
index 522a8f5536e..9d1439d9107 100644
--- a/ext/standard/tests/math/srand_variation1.phpt
+++ b/ext/standard/tests/math/srand_variation1.phpt
@@ -34,7 +34,7 @@ $inputs = array(
 /*1*/  0,
        1,
        12345,
-       -2345,       
+       -2345,
        2147483647,
 
        // float data
@@ -53,7 +53,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-       
+
        // empty data
 /*17*/ "",
        '',
@@ -63,10 +63,10 @@ $inputs = array(
 /*20*/ "abcxyz",
        'abcxyz',
        $heredoc,
-       
+
        // object data
-/*23*/ new classA(),       
-       
+/*23*/ new classA(),
+
        // undefined data
 /*24*/ @$undefined_var,
 
diff --git a/ext/standard/tests/math/tan_basic.phpt b/ext/standard/tests/math/tan_basic.phpt
index e2934fb3889..b804a662de9 100644
--- a/ext/standard/tests/math/tan_basic.phpt
+++ b/ext/standard/tests/math/tan_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input tan()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float tan(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
@@ -23,7 +23,7 @@ if (allowed_rounding_error(tan($sixty),1.7320508075689)) {
 else {
 	echo "Fail\n";
 }
- 
+
 echo "tan 30 = ";
 var_dump(tan($thirty));
 if (allowed_rounding_error(tan($thirty),0.57735026918963)) {
diff --git a/ext/standard/tests/math/tan_basiclong_64bit.phpt b/ext/standard/tests/math/tan_basiclong_64bit.phpt
index 3c8abe9d275..bdc97b07323 100644
--- a/ext/standard/tests/math/tan_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/tan_basiclong_64bit.phpt
@@ -8,7 +8,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -25,7 +25,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(tan($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/tan_error.phpt b/ext/standard/tests/math/tan_error.phpt
index b3d4cf83c18..f36e633b166 100644
--- a/ext/standard/tests/math/tan_error.phpt
+++ b/ext/standard/tests/math/tan_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for tan()
 --FILE--
 <?php
-/* 
+/*
  * proto float tan(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/tan_variation.phpt b/ext/standard/tests/math/tan_variation.phpt
index b88d66acdf5..81546bbf6fa 100644
--- a/ext/standard/tests/math/tan_variation.phpt
+++ b/ext/standard/tests/math/tan_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of tan()
 precision = 10
 --FILE--
 <?php
-/* 
+/*
  * proto float tan(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test tan with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = tan($values[$i]);
diff --git a/ext/standard/tests/math/tanh_basic.phpt b/ext/standard/tests/math/tanh_basic.phpt
index 6b6a9dff7d4..30eacca4ccf 100644
--- a/ext/standard/tests/math/tanh_basic.phpt
+++ b/ext/standard/tests/math/tanh_basic.phpt
@@ -4,10 +4,10 @@ Test return type and value for expected input tanh()
 precision = 14
 --FILE--
 <?php
-/* 
+/*
  * proto float tanh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 $file_path = dirname(__FILE__);
 require($file_path."/allowed_rounding_error.inc");
 
diff --git a/ext/standard/tests/math/tanh_basiclong_64bit.phpt b/ext/standard/tests/math/tanh_basiclong_64bit.phpt
index 02e6c102feb..f3563f81fca 100644
--- a/ext/standard/tests/math/tanh_basiclong_64bit.phpt
+++ b/ext/standard/tests/math/tanh_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(tanh($longVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/math/tanh_error.phpt b/ext/standard/tests/math/tanh_error.phpt
index cc92cb4acab..1e38a6cdcf8 100644
--- a/ext/standard/tests/math/tanh_error.phpt
+++ b/ext/standard/tests/math/tanh_error.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for tanh()
 --FILE--
 <?php
-/* 
+/*
  * proto float tanh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 $arg_0 = 1.0;
 $extra_arg = 1;
diff --git a/ext/standard/tests/math/tanh_variation.phpt b/ext/standard/tests/math/tanh_variation.phpt
index 0c9371e938a..b1b477c150b 100644
--- a/ext/standard/tests/math/tanh_variation.phpt
+++ b/ext/standard/tests/math/tanh_variation.phpt
@@ -4,10 +4,10 @@ Test variations in usage of tanh()
 precision = 10
 --FILE--
 <?php
-/* 
+/*
  * proto float tanh(float number)
  * Function is implemented in ext/standard/math.c
-*/ 
+*/
 
 
 //Test tanh with a different input values
@@ -21,12 +21,12 @@ $values = array(23,
 		"23",
 		"23.45",
 		"2.345e1",
-		"nonsense",				
+		"nonsense",
 		"1000",
 		"1000ABC",
 		null,
 		true,
-		false);	
+		false);
 
 for ($i = 0; $i < count($values); $i++) {
 	$res = tanh($values[$i]);
diff --git a/ext/standard/tests/misc/get_browser_basic.phpt b/ext/standard/tests/misc/get_browser_basic.phpt
index 60638e005ed..c0468bcc405 100644
--- a/ext/standard/tests/misc/get_browser_basic.phpt
+++ b/ext/standard/tests/misc/get_browser_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test get_browser() function : basic functionality 
+Test get_browser() function : basic functionality
 --INI--
 browscap={PWD}/browscap.ini
 --SKIPIF--
@@ -15,12 +15,12 @@ browscap={PWD}/browscap.ini
 --FILE--
 <?php
 /* Prototype  : mixed get_browser([string browser_name [, bool return_array]])
- * Description: Get information about the capabilities of a browser. 
- * If browser_name is omitted or null, HTTP_USER_AGENT is used. 
- * Returns an object by default; if return_array is true, returns an array. 
+ * Description: Get information about the capabilities of a browser.
+ * If browser_name is omitted or null, HTTP_USER_AGENT is used.
+ * Returns an object by default; if return_array is true, returns an array.
  *
  * Source code: ext/standard/browscap.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'browsernames.inc';
diff --git a/ext/standard/tests/misc/get_browser_error.phpt b/ext/standard/tests/misc/get_browser_error.phpt
index d5e7abdd34e..049c8b9431c 100644
--- a/ext/standard/tests/misc/get_browser_error.phpt
+++ b/ext/standard/tests/misc/get_browser_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test get_browser() function : error functionality 
+Test get_browser() function : error functionality
 --INI--
 browscap={PWD}/browscap.ini
 --SKIPIF--
@@ -15,12 +15,12 @@ browscap={PWD}/browscap.ini
 --FILE--
 <?php
 /* Prototype  : mixed get_browser([string browser_name [, bool return_array]])
- * Description: Get information about the capabilities of a browser. 
- * If browser_name is omitted or null, HTTP_USER_AGENT is used. 
- * Returns an object by default; if return_array is true, returns an array. 
+ * Description: Get information about the capabilities of a browser.
+ * If browser_name is omitted or null, HTTP_USER_AGENT is used.
+ * Returns an object by default; if return_array is true, returns an array.
  *
  * Source code: ext/standard/browscap.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'browsernames.inc';
diff --git a/ext/standard/tests/misc/get_browser_variation1.phpt b/ext/standard/tests/misc/get_browser_variation1.phpt
index ac485155a9c..81164ac22d6 100644
--- a/ext/standard/tests/misc/get_browser_variation1.phpt
+++ b/ext/standard/tests/misc/get_browser_variation1.phpt
@@ -15,12 +15,12 @@ browscap={PWD}/browscap.ini
 --FILE--
 <?php
 /* Prototype  : mixed get_browser([string browser_name [, bool return_array]])
- * Description: Get information about the capabilities of a browser. 
- * If browser_name is omitted or null, HTTP_USER_AGENT is used. 
- * Returns an object by default; if return_array is true, returns an array. 
+ * Description: Get information about the capabilities of a browser.
+ * If browser_name is omitted or null, HTTP_USER_AGENT is used.
+ * Returns an object by default; if return_array is true, returns an array.
  *
  * Source code: ext/standard/browscap.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'browsernames.inc';
diff --git a/ext/standard/tests/misc/time_nanosleep_error3.phpt b/ext/standard/tests/misc/time_nanosleep_error3.phpt
index b6365f364f1..d10ef922d0d 100644
--- a/ext/standard/tests/misc/time_nanosleep_error3.phpt
+++ b/ext/standard/tests/misc/time_nanosleep_error3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 time_nanosleep — Delay for a number of seconds and nanoseconds
 --SKIPIF--
-<?php 
+<?php
 if (strpos(strtoupper(PHP_OS), 'WIN') !== false) die("skip Test is not valid for Windows");
 if (!function_exists('time_nanosleep')) die("skip");
 ?>
diff --git a/ext/standard/tests/misc/time_sleep_until_basic.phpt b/ext/standard/tests/misc/time_sleep_until_basic.phpt
index 2be972a1342..cac7133e955 100644
--- a/ext/standard/tests/misc/time_sleep_until_basic.phpt
+++ b/ext/standard/tests/misc/time_sleep_until_basic.phpt
@@ -19,7 +19,7 @@ Michele Orselli mo@ideato.it
     // to 10th of a second. this means there can be up to a .9 millisecond difference
     // which will fail this test. this test randomly fails on Windows and this is the cause.
     //
-    // fix: round to nearest millisecond 
+    // fix: round to nearest millisecond
     // passes for up to .5 milliseconds less, fails for more than .5 milliseconds
     // should be fine since time_sleep_until() on Windows is accurate to the
     // millisecond(.5 rounded up is 1 millisecond)
diff --git a/ext/standard/tests/network/closelog_basic.phpt b/ext/standard/tests/network/closelog_basic.phpt
index 06798a5c1db..77c7155ea88 100644
--- a/ext/standard/tests/network/closelog_basic.phpt
+++ b/ext/standard/tests/network/closelog_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test closelog() function : basic functionality 
+Test closelog() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : bool closelog(void)
- * Description: Close connection to system logger 
+ * Description: Close connection to system logger
  * Source code: ext/standard/syslog.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing closelog() : basic functionality ***\n";
diff --git a/ext/standard/tests/network/closelog_error.phpt b/ext/standard/tests/network/closelog_error.phpt
index 442f9a62491..b72048bd76f 100644
--- a/ext/standard/tests/network/closelog_error.phpt
+++ b/ext/standard/tests/network/closelog_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test closelog() function : error conditions 
+Test closelog() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool closelog(void)
- * Description: Close connection to system logger 
+ * Description: Close connection to system logger
  * Source code: ext/standard/syslog.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing closelog() : error conditions ***\n";
diff --git a/ext/standard/tests/network/fsockopen_basic.phpt b/ext/standard/tests/network/fsockopen_basic.phpt
index 227762f899d..4795008b5ba 100644
--- a/ext/standard/tests/network/fsockopen_basic.phpt
+++ b/ext/standard/tests/network/fsockopen_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test fsockopen() function : basic functionality 
+Test fsockopen() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto resource fsockopen(string hostname, int port [, int errno [, string errstr [, float timeout]]])
- * Description: Open Internet or Unix domain socket connection 
+ * Description: Open Internet or Unix domain socket connection
  * Source code: ext/standard/fsock.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing fsockopen() : basic functionality ***\n";
diff --git a/ext/standard/tests/network/fsockopen_error.phpt b/ext/standard/tests/network/fsockopen_error.phpt
index 3b13b8cf397..638412b47f4 100644
--- a/ext/standard/tests/network/fsockopen_error.phpt
+++ b/ext/standard/tests/network/fsockopen_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test fsockopen() function : error conditions 
+Test fsockopen() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto resource fsockopen(string hostname, int port [, int errno [, string errstr [, float timeout]]])
- * Description: Open Internet or Unix domain socket connection 
+ * Description: Open Internet or Unix domain socket connection
  * Source code: ext/standard/fsock.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
diff --git a/ext/standard/tests/network/gethostbyaddr_basic1.phpt b/ext/standard/tests/network/gethostbyaddr_basic1.phpt
index a20b4756c15..0e659378717 100644
--- a/ext/standard/tests/network/gethostbyaddr_basic1.phpt
+++ b/ext/standard/tests/network/gethostbyaddr_basic1.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test gethostbyaddr() function : basic functionality 
+Test gethostbyaddr() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string gethostbyaddr  ( string $ip_address  )
- * Description: Get the Internet host name corresponding to a given IP address 
+ * Description: Get the Internet host name corresponding to a given IP address
  * Source code: ext/standard/dns.c
 */
 
diff --git a/ext/standard/tests/network/gethostbyaddr_error.phpt b/ext/standard/tests/network/gethostbyaddr_error.phpt
index 8909a30328d..f7982d5ca47 100644
--- a/ext/standard/tests/network/gethostbyaddr_error.phpt
+++ b/ext/standard/tests/network/gethostbyaddr_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test gethostbyaddr() function : error conditions 
+Test gethostbyaddr() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto string gethostbyaddr(string ip_address)
- * Description: Get the Internet host name corresponding to a given IP address 
+ * Description: Get the Internet host name corresponding to a given IP address
  * Source code: ext/standard/dns.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
diff --git a/ext/standard/tests/network/gethostbyname_basic003.phpt b/ext/standard/tests/network/gethostbyname_basic003.phpt
index 2cb3d8d2293..2c6a6d3b219 100644
--- a/ext/standard/tests/network/gethostbyname_basic003.phpt
+++ b/ext/standard/tests/network/gethostbyname_basic003.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test gethostbyname() function : basic functionality 
+Test gethostbyname() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string gethostbyname  ( string $hostname  )
- * Description: Get the IPv4 address corresponding to a given Internet host name 
+ * Description: Get the IPv4 address corresponding to a given Internet host name
  * Source code: ext/standard/dns.c
 */
 
diff --git a/ext/standard/tests/network/gethostbynamel_basic1.phpt b/ext/standard/tests/network/gethostbynamel_basic1.phpt
index 9d1580c8261..ceb2a843fdd 100644
--- a/ext/standard/tests/network/gethostbynamel_basic1.phpt
+++ b/ext/standard/tests/network/gethostbynamel_basic1.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test gethostbynamel() function : basic functionality 
+Test gethostbynamel() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array gethostbynamel  ( string $hostname  )
- * Description: Get a list of IPv4 addresses corresponding to a given Internet host name 
+ * Description: Get a list of IPv4 addresses corresponding to a given Internet host name
  * Source code: ext/standard/dns.c
 */
 
diff --git a/ext/standard/tests/network/gethostbynamel_error.phpt b/ext/standard/tests/network/gethostbynamel_error.phpt
index 7aa00e537e7..9d4c29619b1 100644
--- a/ext/standard/tests/network/gethostbynamel_error.phpt
+++ b/ext/standard/tests/network/gethostbynamel_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test gethostbynamel() function : error conditions 
+Test gethostbynamel() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto array gethostbynamel(string hostname)
- * Description: Return a list of IP addresses that a given hostname resolves to. 
+ * Description: Return a list of IP addresses that a given hostname resolves to.
  * Source code: ext/standard/dns.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gethostbynamel() : error conditions ***\n";
diff --git a/ext/standard/tests/network/inet.phpt b/ext/standard/tests/network/inet.phpt
index 10b4dad0a6e..5cc1d0e8b58 100644
--- a/ext/standard/tests/network/inet.phpt
+++ b/ext/standard/tests/network/inet.phpt
@@ -1,9 +1,9 @@
 --TEST--
 inet_ntop() & inet_pton() tests
 --SKIPIF--
-<?php 
-if (!function_exists("inet_ntop")) die("skip no inet_ntop()"); 
-if (!function_exists("inet_pton")) die("skip no inet_pton()"); 
+<?php
+if (!function_exists("inet_ntop")) die("skip no inet_ntop()");
+if (!function_exists("inet_pton")) die("skip no inet_pton()");
 ?>
 --FILE--
 <?php
@@ -37,7 +37,7 @@ foreach ($array as $val) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(9) "127.0.0.1"
 string(13) "255.255.255.0"
 
diff --git a/ext/standard/tests/network/inet_ipv6.phpt b/ext/standard/tests/network/inet_ipv6.phpt
index 3b280dfec7d..623f04c0ee5 100644
--- a/ext/standard/tests/network/inet_ipv6.phpt
+++ b/ext/standard/tests/network/inet_ipv6.phpt
@@ -1,9 +1,9 @@
 --TEST--
 inet_ntop() & inet_pton() IPv6 tests
 --SKIPIF--
-<?php 
-if (!function_exists("inet_ntop")) die("skip no inet_ntop()"); 
-if (!function_exists("inet_pton")) die("skip no inet_pton()"); 
+<?php
+if (!function_exists("inet_ntop")) die("skip no inet_ntop()");
+if (!function_exists("inet_pton")) die("skip no inet_pton()");
 
 $packed = str_repeat(chr(0), 15) . chr(1);
 if (@inet_ntop($packed) === false) {
@@ -33,7 +33,7 @@ foreach ($a as $address) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(3) "::1"
 string(3) "::2"
 string(4) "::35"
diff --git a/ext/standard/tests/network/ip.phpt b/ext/standard/tests/network/ip.phpt
index abe50e71928..03329802c1c 100644
--- a/ext/standard/tests/network/ip.phpt
+++ b/ext/standard/tests/network/ip.phpt
@@ -34,7 +34,7 @@ var_dump(long2ip(array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(2130706433)
 string(9) "127.0.0.1"
 int(167772161)
diff --git a/ext/standard/tests/network/ip2long_error.phpt b/ext/standard/tests/network/ip2long_error.phpt
index 65e73155956..4816d63943e 100644
--- a/ext/standard/tests/network/ip2long_error.phpt
+++ b/ext/standard/tests/network/ip2long_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test ip2long() function : error conditions 
+Test ip2long() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int ip2long(string ip_address)
- * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address 
+ * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing ip2long() : error conditions ***\n";
diff --git a/ext/standard/tests/network/ip2long_variation1.phpt b/ext/standard/tests/network/ip2long_variation1.phpt
index b228c9bd14a..fa7410930f3 100644
--- a/ext/standard/tests/network/ip2long_variation1.phpt
+++ b/ext/standard/tests/network/ip2long_variation1.phpt
@@ -3,9 +3,9 @@ Test ip2long() function : usage variation 1
 --FILE--
 <?php
 /* Prototype  : int ip2long(string ip_address)
- * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address 
+ * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing ip2long() : usage variation ***\n";
@@ -94,7 +94,7 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource
       'resource' => $res,
 );
diff --git a/ext/standard/tests/network/ip2long_variation2.phpt b/ext/standard/tests/network/ip2long_variation2.phpt
index 0ca156a67b4..d85b6ba3c93 100644
--- a/ext/standard/tests/network/ip2long_variation2.phpt
+++ b/ext/standard/tests/network/ip2long_variation2.phpt
@@ -6,9 +6,9 @@ Test ip2long() function : usage variation 2, 32 bit
 --FILE--
 <?php
 /* Prototype  : int ip2long(string ip_address)
- * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address 
+ * Description: Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $ips = array(
diff --git a/ext/standard/tests/network/ip_x86_64.phpt b/ext/standard/tests/network/ip_x86_64.phpt
index 45a48ca9dfc..7b93815f926 100644
--- a/ext/standard/tests/network/ip_x86_64.phpt
+++ b/ext/standard/tests/network/ip_x86_64.phpt
@@ -34,7 +34,7 @@ var_dump(long2ip(array()));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(2130706433)
 string(9) "127.0.0.1"
 int(167772161)
diff --git a/ext/standard/tests/network/long2ip_error.phpt b/ext/standard/tests/network/long2ip_error.phpt
index d56397cdd5e..7003c368060 100644
--- a/ext/standard/tests/network/long2ip_error.phpt
+++ b/ext/standard/tests/network/long2ip_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test long2ip() function : error conditions 
+Test long2ip() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string long2ip(int proper_address)
- * Description: Converts an (IPv4) Internet network address into a string in Internet standard dotted format 
+ * Description: Converts an (IPv4) Internet network address into a string in Internet standard dotted format
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing long2ip() : error conditions ***\n";
diff --git a/ext/standard/tests/network/long2ip_variation1.phpt b/ext/standard/tests/network/long2ip_variation1.phpt
index e7336712beb..488bea1222b 100644
--- a/ext/standard/tests/network/long2ip_variation1.phpt
+++ b/ext/standard/tests/network/long2ip_variation1.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test long2ip() function : usage variation 
+Test long2ip() function : usage variation
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == "WIN")
   die("skip don't run on Windows");
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : string long2ip(int proper_address)
- * Description: Converts an (IPv4) Internet network address into a string in Internet standard dotted format 
+ * Description: Converts an (IPv4) Internet network address into a string in Internet standard dotted format
  * Source code: ext/standard/basic_functions.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing long2ip() : usage variation ***\n";
@@ -97,9 +97,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource
-      'resource' => $res,      
+      'resource' => $res,
 );
 
 // loop through each element of the array for proper_address
diff --git a/ext/standard/tests/network/shutdown.phpt b/ext/standard/tests/network/shutdown.phpt
index 1ce77fb80e2..1e79b059b14 100644
--- a/ext/standard/tests/network/shutdown.phpt
+++ b/ext/standard/tests/network/shutdown.phpt
@@ -6,7 +6,7 @@ stream_socket_shutdown() test on IPv4 TCP Loopback
 ?>
 --FILE--
 <?php
-  
+
   for ($i=0; $i<100; $i++) {
     $port = rand(10000, 65000);
     /* Setup socket server */
@@ -15,7 +15,7 @@ stream_socket_shutdown() test on IPv4 TCP Loopback
       break;
     }
   }
-	
+
 if (!$server) {
 		die('Unable to create AF_INET socket [server]');
 	}
diff --git a/ext/standard/tests/network/syslog_basic-win32.phpt b/ext/standard/tests/network/syslog_basic-win32.phpt
index 88d3c5a6d91..8ad480a6072 100644
--- a/ext/standard/tests/network/syslog_basic-win32.phpt
+++ b/ext/standard/tests/network/syslog_basic-win32.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test syslog() function : basic functionality 
+Test syslog() function : basic functionality
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != "WIN")
@@ -8,9 +8,9 @@ if(substr(PHP_OS, 0, 3) != "WIN")
 --FILE--
 <?php
 /* Prototype  : bool syslog(int priority, string message)
- * Description: Generate a system log message 
+ * Description: Generate a system log message
  * Source code: ext/standard/syslog.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing syslog() : basic functionality ***\n";
diff --git a/ext/standard/tests/network/syslog_error.phpt b/ext/standard/tests/network/syslog_error.phpt
index a99fd5314a7..c958af432b7 100644
--- a/ext/standard/tests/network/syslog_error.phpt
+++ b/ext/standard/tests/network/syslog_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test syslog() function : error conditions 
+Test syslog() function : error conditions
 --FILE--
 <?php
 /* Prototype  : bool syslog(int priority, string message)
- * Description: Generate a system log message 
+ * Description: Generate a system log message
  * Source code: ext/standard/syslog.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing syslog() : error conditions ***\n";
diff --git a/ext/standard/tests/network/tcp6loop.phpt b/ext/standard/tests/network/tcp6loop.phpt
index 30b1d7bcd21..c8223633ca1 100644
--- a/ext/standard/tests/network/tcp6loop.phpt
+++ b/ext/standard/tests/network/tcp6loop.phpt
@@ -3,7 +3,7 @@ Streams Based IPv6 TCP Loopback test
 --SKIPIF--
 <?php
 	/* If IPv6 is supported on the platform this will error out with code 111 - Connection refused.
-	   If IPv6 is NOT supported, $errno will be set to something else (indicating parse/getaddrinfo error) 
+	   If IPv6 is NOT supported, $errno will be set to something else (indicating parse/getaddrinfo error)
 	   Note: Might be a good idea to export an IPv6 support indicator (such as AF_INET6 exported by ext/sockets) */
 	@stream_socket_client('tcp://[::1]:0', $errno);
 	if ($errno != 111) die('skip IPv6 not supported.');
diff --git a/ext/standard/tests/network/udgloop.phpt b/ext/standard/tests/network/udgloop.phpt
index a61d082c189..61f8f251351 100644
--- a/ext/standard/tests/network/udgloop.phpt
+++ b/ext/standard/tests/network/udgloop.phpt
@@ -3,7 +3,7 @@ Streams Based Unix Domain Datagram Loopback test
 --SKIPIF--
 <?php # vim:ft=php:
 	if (array_search("udg",stream_get_transports()) === false)
-		die('SKIP No support for UNIX domain sockets.'); 
+		die('SKIP No support for UNIX domain sockets.');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/network/unixloop.phpt b/ext/standard/tests/network/unixloop.phpt
index abb103b0d14..83bfbb0667b 100644
--- a/ext/standard/tests/network/unixloop.phpt
+++ b/ext/standard/tests/network/unixloop.phpt
@@ -3,7 +3,7 @@ Streams Based Unix Domain Loopback test
 --SKIPIF--
 <?php # vim:ft=php:
 	if (array_search("unix",stream_get_transports()) === false)
-		die('SKIP No support for UNIX domain sockets.'); 
+		die('SKIP No support for UNIX domain sockets.');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/serialize/001.phpt b/ext/standard/tests/serialize/001.phpt
index e83b9af002e..5551956e92b 100644
--- a/ext/standard/tests/serialize/001.phpt
+++ b/ext/standard/tests/serialize/001.phpt
@@ -3,7 +3,7 @@ serialize()/unserialize()/var_dump()
 --INI--
 serialize_precision=100
 --FILE--
-<?php 
+<?php
 class t
 {
 	function __construct()
diff --git a/ext/standard/tests/serialize/002.phpt b/ext/standard/tests/serialize/002.phpt
index 3085d1cf4f7..635e7289681 100644
--- a/ext/standard/tests/serialize/002.phpt
+++ b/ext/standard/tests/serialize/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #25378 (unserialize() crashes with invalid data)
 --FILE--
-<?php 
+<?php
 var_dump(unserialize('b:0;'));
 var_dump(unserialize('b:1;'));
 var_dump(unserialize('i:823;'));
diff --git a/ext/standard/tests/serialize/003.phpt b/ext/standard/tests/serialize/003.phpt
index edbcb1f0f00..50114128098 100644
--- a/ext/standard/tests/serialize/003.phpt
+++ b/ext/standard/tests/serialize/003.phpt
@@ -4,7 +4,7 @@ unserialize() floats with E notation (#18654)
 precision=12
 serialize_precision=100
 --FILE--
-<?php 
+<?php
 foreach(array(1e2, 5.2e25, 85.29e-23, 9e-9) AS $value) {
 	echo ($ser = serialize($value))."\n";
 	var_dump(unserialize($ser));
diff --git a/ext/standard/tests/serialize/005.phpt b/ext/standard/tests/serialize/005.phpt
index 1702a44f516..fc7d717229f 100644
--- a/ext/standard/tests/serialize/005.phpt
+++ b/ext/standard/tests/serialize/005.phpt
@@ -48,17 +48,17 @@ class TestOld
 	{
 		echo __METHOD__ . "()\n";
 	}
-	
+
 	function unserialize($serialized)
 	{
 		echo __METHOD__ . "()\n";
 	}
-	
+
 	function __wakeup()
 	{
 		echo __METHOD__ . "()\n";
 	}
-	
+
 	function __sleep()
 	{
 		echo __METHOD__ . "()\n";
@@ -81,17 +81,17 @@ class TestNew implements Serializable
 			return "2";
 		}
 	}
-	
+
 	function unserialize($serialized)
 	{
 		echo __METHOD__ . "()\n";
 	}
-	
+
 	function __wakeup()
 	{
 		echo __METHOD__ . "()\n";
 	}
-	
+
 	function __sleep()
 	{
 		echo __METHOD__ . "()\n";
diff --git a/ext/standard/tests/serialize/006.phpt b/ext/standard/tests/serialize/006.phpt
index fb813bc0d90..6ba93f4d23b 100644
--- a/ext/standard/tests/serialize/006.phpt
+++ b/ext/standard/tests/serialize/006.phpt
@@ -4,13 +4,13 @@ serialize()/unserialize() with exotic letters
 <?php
 	$åäöÅÄÖ = array('åäöÅÄÖ' => 'åäöÅÄÖ');
 
-	class ÜberKööliäå 
+	class ÜberKööliäå
 	{
 		public $åäöÅÄÖüÜber = 'åäöÅÄÖ';
 	}
-  
+
     $foo = new Überkööliäå();
-  
+
 	var_dump(serialize($foo));
 	var_dump(unserialize(serialize($foo)));
 	var_dump(serialize($åäöÅÄÖ));
diff --git a/ext/standard/tests/serialize/bug14293.phpt b/ext/standard/tests/serialize/bug14293.phpt
index 8e7b8a9d7d3..73636ba56d5 100644
--- a/ext/standard/tests/serialize/bug14293.phpt
+++ b/ext/standard/tests/serialize/bug14293.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #14293 (serialize() and __sleep())
 --FILE--
-<?php 
+<?php
 class t
 {
 	function __construct()
@@ -13,7 +13,7 @@ class t
 	{
 		echo "__sleep called\n";
 		return array('a','b');
-	}	
+	}
 }
 
 $t = new t();
diff --git a/ext/standard/tests/serialize/bug21957.phpt b/ext/standard/tests/serialize/bug21957.phpt
index 2084503d243..070eda3f4ce 100644
--- a/ext/standard/tests/serialize/bug21957.phpt
+++ b/ext/standard/tests/serialize/bug21957.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #21957 (serialize() mangles objects with __sleep)
 --FILE--
-<?php 
+<?php
 class test
 {
 	public $a, $b;
diff --git a/ext/standard/tests/serialize/bug23298.phpt b/ext/standard/tests/serialize/bug23298.phpt
index a5305cf37c9..fe56fccc451 100644
--- a/ext/standard/tests/serialize/bug23298.phpt
+++ b/ext/standard/tests/serialize/bug23298.phpt
@@ -3,7 +3,7 @@ Bug #23298 (serialize() and floats/doubles)
 --INI--
 serialize_precision=100
 --FILE--
-<?php 
+<?php
 	ini_set('precision', 12);
 	$foo = 1.428571428571428647642857142;
 	$bar = unserialize(serialize($foo));
diff --git a/ext/standard/tests/serialize/bug24063.phpt b/ext/standard/tests/serialize/bug24063.phpt
index 3cca101cbbb..38c9d6ed247 100644
--- a/ext/standard/tests/serialize/bug24063.phpt
+++ b/ext/standard/tests/serialize/bug24063.phpt
@@ -4,7 +4,7 @@ Bug #24063 (serialize() missing 0 after the . on scientific notation)
 serialize_precision=100
 precision=12
 --FILE--
-<?php 
+<?php
 $v = 1;
 for ($i = 1; $i < 10; $i++) {
 	$v /= 10;
diff --git a/ext/standard/tests/serialize/bug25378.phpt b/ext/standard/tests/serialize/bug25378.phpt
index e95a4270062..70bfbb46a37 100644
--- a/ext/standard/tests/serialize/bug25378.phpt
+++ b/ext/standard/tests/serialize/bug25378.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #25378 (unserialize() crashes with invalid data)
 --FILE--
-<?php 
+<?php
 var_dump(unserialize("s:-1:\"\";"));
 var_dump(unserialize("i:823"));
 var_dump(unserialize("O:8:\"stdClass :0:{}"));
diff --git a/ext/standard/tests/serialize/bug26762.phpt b/ext/standard/tests/serialize/bug26762.phpt
index dd779780f49..b876874e40b 100644
--- a/ext/standard/tests/serialize/bug26762.phpt
+++ b/ext/standard/tests/serialize/bug26762.phpt
@@ -1,11 +1,11 @@
 --TEST--
 Bug #26762 (unserialize() produces lowercase classnames)
 --SKIPIF--
-<?php 
+<?php
 	if (class_exists('autoload_root')) die('skip Autoload test classes exist already');
 ?>
 --FILE--
-<?php 
+<?php
 
 ini_set('unserialize_callback_func','check');
 
diff --git a/ext/standard/tests/serialize/bug30234.phpt b/ext/standard/tests/serialize/bug30234.phpt
index ae3a0b2f556..21119622944 100644
--- a/ext/standard/tests/serialize/bug30234.phpt
+++ b/ext/standard/tests/serialize/bug30234.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #30234 (__autoload() not invoked for interfaces)
 --SKIPIF--
-<?php 
+<?php
 	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
diff --git a/ext/standard/tests/serialize/bug31402.phpt b/ext/standard/tests/serialize/bug31402.phpt
index 404d57eb3eb..566e959554a 100644
--- a/ext/standard/tests/serialize/bug31402.phpt
+++ b/ext/standard/tests/serialize/bug31402.phpt
@@ -3,7 +3,7 @@ Bug #31402 (unserialize() generates references when it should not)
 --INI--
 error_reporting=E_ALL
 --FILE--
-<?php 
+<?php
 
 class TestX {
   var $i;
diff --git a/ext/standard/tests/serialize/bug49649.phpt b/ext/standard/tests/serialize/bug49649.phpt
index 2e0a5059301..d6acb807647 100644
--- a/ext/standard/tests/serialize/bug49649.phpt
+++ b/ext/standard/tests/serialize/bug49649.phpt
@@ -7,11 +7,11 @@ Bug #49649 (unserialize() doesn't handle changes in property visibility) - to pu
  *class Foo
  *{
  *	private $private = 1;
- *	
+ *
  *	protected $protected = 2;
- *	
+ *
  *	public $public = 3;
- *	
+ *
  *	public $notThere = 'old';
  * }
  *
diff --git a/ext/standard/tests/serialize/bug49649_1.phpt b/ext/standard/tests/serialize/bug49649_1.phpt
index 1ca840a9b61..fb6d6dba529 100644
--- a/ext/standard/tests/serialize/bug49649_1.phpt
+++ b/ext/standard/tests/serialize/bug49649_1.phpt
@@ -7,11 +7,11 @@ Bug #49649 (unserialize() doesn't handle changes in property visibility) - to pr
  *class Foo
  *{
  *	private $private = 1;
- *	
+ *
  *	protected $protected = 2;
- *	
+ *
  *	public $public = 3;
- *	
+ *
  *	public $notThere = 'old';
  * }
  *
diff --git a/ext/standard/tests/serialize/bug49649_2.phpt b/ext/standard/tests/serialize/bug49649_2.phpt
index e9fe4290de8..fe5b43a6ad9 100644
--- a/ext/standard/tests/serialize/bug49649_2.phpt
+++ b/ext/standard/tests/serialize/bug49649_2.phpt
@@ -7,11 +7,11 @@ Bug #49649 (unserialize() doesn't handle changes in property visibility) - to pr
  *class Foo
  *{
  *	private $private = 1;
- *	
+ *
  *	protected $protected = 2;
- *	
+ *
  *	public $public = 3;
- *	
+ *
  *	public $notThere = 'old';
  * }
  *
diff --git a/ext/standard/tests/serialize/bug62373.phpt b/ext/standard/tests/serialize/bug62373.phpt
index 666c33ebdbc..996e4c024c7 100644
--- a/ext/standard/tests/serialize/bug62373.phpt
+++ b/ext/standard/tests/serialize/bug62373.phpt
@@ -14,7 +14,7 @@ for ($i = 0; $i < $period * 3; $i++) {
     $s = unserialize(serialize(array($b, $a)));
     if ($s[0] === $s[1]) {
         echo "OOPS\n";
-        break; 
+        break;
     }
     $dummy[] = $a;
 }
diff --git a/ext/standard/tests/serialize/bug64354_1.phpt b/ext/standard/tests/serialize/bug64354_1.phpt
index e85749bcbef..705b60dc051 100644
--- a/ext/standard/tests/serialize/bug64354_1.phpt
+++ b/ext/standard/tests/serialize/bug64354_1.phpt
@@ -10,13 +10,13 @@ spl_autoload_register(
 
 try {
     var_dump(unserialize('O:1:"A":0:{}'));
-} catch (Exception $e) { 
+} catch (Exception $e) {
     var_dump($e->getMessage());
 }
 
 try {
     var_dump(unserialize('a:2:{i:0;O:1:"A":0:{}i:1;O:1:"A":0:{}}'));
-} catch (Exception $e) { 
+} catch (Exception $e) {
     var_dump($e->getMessage());
 }
 ?>
diff --git a/ext/standard/tests/serialize/bug64354_2.phpt b/ext/standard/tests/serialize/bug64354_2.phpt
index 41a455b54a6..82552f426a3 100644
--- a/ext/standard/tests/serialize/bug64354_2.phpt
+++ b/ext/standard/tests/serialize/bug64354_2.phpt
@@ -16,7 +16,7 @@ spl_autoload_register(
 
 try {
     var_dump(unserialize('a:2:{i:0;O:1:"A":0:{}i:1;O:1:"B":0:{}}'));
-} catch (Exception $e) { 
+} catch (Exception $e) {
     var_dump($e->getMessage());
 }
 ?>
diff --git a/ext/standard/tests/serialize/bug64354_3.phpt b/ext/standard/tests/serialize/bug64354_3.phpt
index 3ce61152d64..520e543785c 100644
--- a/ext/standard/tests/serialize/bug64354_3.phpt
+++ b/ext/standard/tests/serialize/bug64354_3.phpt
@@ -21,7 +21,7 @@ $data = array(new A, new B);
 
 try {
     serialize($data);
-} catch (Exception $e) { 
+} catch (Exception $e) {
     var_dump($e->getMessage());
 }
 ?>
diff --git a/ext/standard/tests/serialize/bug68545.phpt b/ext/standard/tests/serialize/bug68545.phpt
index e7250b37bc9..c33155d269a 100644
--- a/ext/standard/tests/serialize/bug68545.phpt
+++ b/ext/standard/tests/serialize/bug68545.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #68545 NULL pointer dereference in unserialize.c:var_push_dtor
 --FILE--
-<?php 
-var_dump(unserialize('a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"b22";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";s:3:"bar";')); 
+<?php
+var_dump(unserialize('a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"b22";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";s:3:"bar";'));
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/standard/tests/serialize/bug68976.phpt b/ext/standard/tests/serialize/bug68976.phpt
index a79a953a4a2..be06ea66ac8 100644
--- a/ext/standard/tests/serialize/bug68976.phpt
+++ b/ext/standard/tests/serialize/bug68976.phpt
@@ -14,7 +14,7 @@ $fakezval = pack(
     0x00100000,
     0x00000400,
     0x00000000,
-    0x00000006 
+    0x00000006
 );
 
 $data = unserialize('a:2:{i:0;O:9:"evilClass":1:{s:4:"name";a:2:{i:0;i:1;i:1;i:2;}}i:1;R:4;}');
diff --git a/ext/standard/tests/serialize/bug69425.phpt b/ext/standard/tests/serialize/bug69425.phpt
index e39f855f23a..c7f42657898 100644
--- a/ext/standard/tests/serialize/bug69425.phpt
+++ b/ext/standard/tests/serialize/bug69425.phpt
@@ -7,7 +7,7 @@ Bug #69425: Use After Free in unserialize()
 class test
 {
 	var $ryat;
-	
+
 	function __wakeup()
 	{
 		$this->ryat = 1;
diff --git a/ext/standard/tests/serialize/bug70219.phpt b/ext/standard/tests/serialize/bug70219.phpt
index e134c78a9f7..7cd13d05fb1 100644
--- a/ext/standard/tests/serialize/bug70219.phpt
+++ b/ext/standard/tests/serialize/bug70219.phpt
@@ -24,7 +24,7 @@ for ($i = 0; $i < 5; $i++) {
     $v[$i] = 'hi'.$i;
 }
 
-var_dump($data);	
+var_dump($data);
 ?>
 --EXPECTF--
 Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s on line %d
diff --git a/ext/standard/tests/serialize/bug70436.phpt b/ext/standard/tests/serialize/bug70436.phpt
index 8b0df73d608..1bbf3b98ab5 100644
--- a/ext/standard/tests/serialize/bug70436.phpt
+++ b/ext/standard/tests/serialize/bug70436.phpt
@@ -6,12 +6,12 @@ Bug #70436: Use After Free Vulnerability in unserialize()
 class obj implements Serializable
 {
 	var $data;
-	
+
 	function serialize()
 	{
 		return serialize($this->data);
 	}
-	
+
 	function unserialize($data)
 	{
 		$this->data = unserialize($data);
@@ -35,12 +35,12 @@ var_dump($data);
 function ptr2str($ptr)
 {
 	$out = '';
-	
+
 	for ($i = 0; $i < 8; $i++) {
 		$out .= chr($ptr & 0xff);
 		$ptr >>= 8;
 	}
-	
+
 	return $out;
 }
 ?>
diff --git a/ext/standard/tests/serialize/bug70513.phpt b/ext/standard/tests/serialize/bug70513.phpt
index 2ac4ef6626d..cbdbdb82228 100644
--- a/ext/standard/tests/serialize/bug70513.phpt
+++ b/ext/standard/tests/serialize/bug70513.phpt
@@ -8,7 +8,7 @@ Bug #70513: GMP Deserialization Type Confusion Vulnerability
 class obj
 {
 	var $ryat;
-	
+
 	function __wakeup()
 	{
 		$this->ryat = 1;
diff --git a/ext/standard/tests/serialize/bug72229.phpt b/ext/standard/tests/serialize/bug72229.phpt
index 17c393c7d48..0ae1ceed03f 100644
--- a/ext/standard/tests/serialize/bug72229.phpt
+++ b/ext/standard/tests/serialize/bug72229.phpt
@@ -11,7 +11,7 @@ class C1
         $this->arr1[0] = $this;
         $this->arr2[0] = $this->arr1[0];
         $var1 = &$this->arr1[0];  // Set a reference...
-        unset($var1);             // ... and unset it. 
+        unset($var1);             // ... and unset it.
     }
 }
 $Obj1 = new C1();
diff --git a/ext/standard/tests/serialize/incomplete_class.phpt b/ext/standard/tests/serialize/incomplete_class.phpt
index 7e6aa7b39f7..948a31e1666 100644
--- a/ext/standard/tests/serialize/incomplete_class.phpt
+++ b/ext/standard/tests/serialize/incomplete_class.phpt
@@ -13,7 +13,7 @@ var_dump($o->test2);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 object(__PHP_Incomplete_Class)#%d (0) {
 }
 
diff --git a/ext/standard/tests/serialize/serialization_arrays_001.phpt b/ext/standard/tests/serialize/serialization_arrays_001.phpt
index 51acfc4b469..4b9c7e2c3ea 100644
--- a/ext/standard/tests/serialize/serialization_arrays_001.phpt
+++ b/ext/standard/tests/serialize/serialization_arrays_001.phpt
@@ -3,16 +3,16 @@ Test serialize() & unserialize() functions: arrays (circular references)
 --INI--
 serialize_precision=100
 --FILE--
-<?php 
+<?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "\n--- Testing Circular reference of an array ---\n";
diff --git a/ext/standard/tests/serialize/serialization_arrays_002.phpt b/ext/standard/tests/serialize/serialization_arrays_002.phpt
index c62ff6a91c1..c9eded4a9a6 100644
--- a/ext/standard/tests/serialize/serialization_arrays_002.phpt
+++ b/ext/standard/tests/serialize/serialization_arrays_002.phpt
@@ -3,21 +3,21 @@ serialization: arrays with references amonst elements
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function check(&$a) {
 	var_dump($a);
 	$ser = serialize($a);
 	var_dump($ser);
-	
+
 	$b = unserialize($ser);
 	var_dump($b);
 	$b[0] = "b0.changed";
@@ -25,7 +25,7 @@ function check(&$a) {
 	$b[1] = "b1.changed";
 	var_dump($b);
 	$b[2] = "b2.changed";
-	var_dump($b);	
+	var_dump($b);
 }
 
 echo "\n\n--- No references:\n";
diff --git a/ext/standard/tests/serialize/serialization_arrays_003.phpt b/ext/standard/tests/serialize/serialization_arrays_003.phpt
index 8d664fccf3f..3e44d4c7e8d 100644
--- a/ext/standard/tests/serialize/serialization_arrays_003.phpt
+++ b/ext/standard/tests/serialize/serialization_arrays_003.phpt
@@ -3,21 +3,21 @@ serialization: arrays with references to an external variable
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function check(&$a) {
 	var_dump($a);
 	$ser = serialize($a);
 	var_dump($ser);
-	
+
 	$b = unserialize($ser);
 	var_dump($b);
 	$b[0] = "b0.changed";
@@ -25,7 +25,7 @@ function check(&$a) {
 	$b[1] = "b1.changed";
 	var_dump($b);
 	$b[2] = "b2.changed";
-	var_dump($b);	
+	var_dump($b);
 }
 
 echo "\n\n--- 0 refs external:\n";
diff --git a/ext/standard/tests/serialize/serialization_arrays_004.phpt b/ext/standard/tests/serialize/serialization_arrays_004.phpt
index 55d849c972c..bde60a4651e 100644
--- a/ext/standard/tests/serialize/serialization_arrays_004.phpt
+++ b/ext/standard/tests/serialize/serialization_arrays_004.phpt
@@ -3,21 +3,21 @@ serialization: arrays with references to the containing array
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function check(&$a) {
 	var_dump($a);
 	$ser = serialize($a);
 	var_dump($ser);
-	
+
 	$b = unserialize($ser);
 	var_dump($b);
 	$b[0] = "b0.changed";
@@ -25,7 +25,7 @@ function check(&$a) {
 	$b[1] = "b1.changed";
 	var_dump($b);
 	$b[2] = "b2.changed";
-	var_dump($b);	
+	var_dump($b);
 }
 
 echo "\n\n--- 1 refs container:\n";
diff --git a/ext/standard/tests/serialize/serialization_arrays_005.phpt b/ext/standard/tests/serialize/serialization_arrays_005.phpt
index 10e33129f84..0270ec7c0e5 100644
--- a/ext/standard/tests/serialize/serialization_arrays_005.phpt
+++ b/ext/standard/tests/serialize/serialization_arrays_005.phpt
@@ -3,24 +3,24 @@ serialization: arrays with references, nested
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function check(&$a) {
 	var_dump($a);
 	$ser = serialize($a);
 	var_dump($ser);
-	
+
 	$b = unserialize($ser);
-	
-	// Change each element and dump result. 
+
+	// Change each element and dump result.
 	foreach($b as $k=>$v) {
 		if (is_array($v)){
 			foreach($b[$k] as $sk=>$sv) {
diff --git a/ext/standard/tests/serialize/serialization_error_001.phpt b/ext/standard/tests/serialize/serialization_error_001.phpt
index 014128b19f5..97c2af4ccbe 100644
--- a/ext/standard/tests/serialize/serialization_error_001.phpt
+++ b/ext/standard/tests/serialize/serialization_error_001.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test serialize() & unserialize() functions: error conditions - wrong number of args. 
+Test serialize() & unserialize() functions: error conditions - wrong number of args.
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing serialize()/unserialize() : error conditions ***\n";
diff --git a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt
index 548a67345f9..e88e98e1b20 100644
Binary files a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt and b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt differ
diff --git a/ext/standard/tests/serialize/serialization_objects_001.phpt b/ext/standard/tests/serialize/serialization_objects_001.phpt
index f85b89e1027..d887aba236c 100644
Binary files a/ext/standard/tests/serialize/serialization_objects_001.phpt and b/ext/standard/tests/serialize/serialization_objects_001.phpt differ
diff --git a/ext/standard/tests/serialize/serialization_objects_002.phpt b/ext/standard/tests/serialize/serialization_objects_002.phpt
index fbd9e261206..c7f9e1cbd30 100644
Binary files a/ext/standard/tests/serialize/serialization_objects_002.phpt and b/ext/standard/tests/serialize/serialization_objects_002.phpt differ
diff --git a/ext/standard/tests/serialize/serialization_objects_003.phpt b/ext/standard/tests/serialize/serialization_objects_003.phpt
index 5e6773a2ae4..d72c471fae3 100644
--- a/ext/standard/tests/serialize/serialization_objects_003.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_003.phpt
@@ -3,21 +3,21 @@ Test serialize() & unserialize() functions: objects (abstract classes)
 --INI--
 serialize_precision=100
 --FILE--
-<?php 
+<?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "\n--- Testing Abstract Class ---\n";
 // abstract class
-abstract class Name 
+abstract class Name
 {
   public function __construct() {
     $this->a = 10;
@@ -27,10 +27,10 @@ abstract class Name
   abstract protected function getClassName();
   public function printClassName () {
     return $this->getClassName();
-  } 
+  }
 }
 // implement abstract class
-class extendName extends Name 
+class extendName extends Name
 {
   var $a, $b, $c;
 
diff --git a/ext/standard/tests/serialize/serialization_objects_004.phpt b/ext/standard/tests/serialize/serialization_objects_004.phpt
index 6b826a398b2..f6a3ef64101 100644
--- a/ext/standard/tests/serialize/serialization_objects_004.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_004.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test serialize() & unserialize() functions: objects - ensure that COW references of objects are not serialized separately (unlike other types). 
+Test serialize() & unserialize() functions: objects - ensure that COW references of objects are not serialized separately (unlike other types).
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $x = new stdClass;
diff --git a/ext/standard/tests/serialize/serialization_objects_005.phpt b/ext/standard/tests/serialize/serialization_objects_005.phpt
index fd58b0323ab..4c631c6a596 100644
--- a/ext/standard/tests/serialize/serialization_objects_005.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_005.phpt
@@ -3,14 +3,14 @@ Check behaviour of incomplete class
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $serialized = 'O:1:"C":1:{s:1:"p";i:1;}';
diff --git a/ext/standard/tests/serialize/serialization_objects_006.phpt b/ext/standard/tests/serialize/serialization_objects_006.phpt
index 918e59d0aac..93fb726b4c8 100644
--- a/ext/standard/tests/serialize/serialization_objects_006.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_006.phpt
@@ -3,14 +3,14 @@ Behaviour of incomplete class is preserved even when it was not created by unser
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $a = new __PHP_Incomplete_Class;
diff --git a/ext/standard/tests/serialize/serialization_objects_007.phpt b/ext/standard/tests/serialize/serialization_objects_007.phpt
index 2837e1ec466..ff584a09198 100644
--- a/ext/standard/tests/serialize/serialization_objects_007.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_007.phpt
@@ -3,14 +3,14 @@ Ensure __autoload is called twice if unserialize_callback_func is defined.
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 spl_autoload_register(function ($name) {
@@ -20,7 +20,7 @@ spl_autoload_register(function ($name) {
 ini_set('unserialize_callback_func','check');
 
 function check($name) {
-	echo "in check($name)\n"; 
+	echo "in check($name)\n";
 }
 
 $o = unserialize('O:3:"FOO":0:{}');
diff --git a/ext/standard/tests/serialize/serialization_objects_008.phpt b/ext/standard/tests/serialize/serialization_objects_008.phpt
index b963872f28f..484d38216d5 100644
--- a/ext/standard/tests/serialize/serialization_objects_008.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_008.phpt
@@ -1,16 +1,16 @@
 --TEST--
 Bad unserialize_callback_func
 --FILE--
-<?php 
+<?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 ini_set('unserialize_callback_func','Nonexistent');
diff --git a/ext/standard/tests/serialize/serialization_objects_009.phpt b/ext/standard/tests/serialize/serialization_objects_009.phpt
index 595692d2f05..0c969df7cdd 100644
--- a/ext/standard/tests/serialize/serialization_objects_009.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_009.phpt
@@ -3,14 +3,14 @@ Custom unserialization of classes with no custom unserializer.
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $ser = 'C:1:"C":6:{dasdas}';
diff --git a/ext/standard/tests/serialize/serialization_objects_010.phpt b/ext/standard/tests/serialize/serialization_objects_010.phpt
index 0fbf0723df2..a663134ff7b 100644
--- a/ext/standard/tests/serialize/serialization_objects_010.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_010.phpt
@@ -5,21 +5,21 @@ Serialize() must return a string or NULL
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 Class C implements Serializable {
-	public function serialize() { 
+	public function serialize() {
 		return $this;
 	}
-	
+
 	public function unserialize($blah) {
 	}
 }
diff --git a/ext/standard/tests/serialize/serialization_objects_011.phpt b/ext/standard/tests/serialize/serialization_objects_011.phpt
index 1dc48390c24..09b3046d051 100644
--- a/ext/standard/tests/serialize/serialization_objects_011.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_011.phpt
@@ -3,50 +3,50 @@ Object serialization / unserialization with inherited and hidden properties.
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 Class A {
 	private $APriv = "A.APriv";
 	protected $AProt = "A.AProt";
 	public $APub = "A.APub";
-	
+
 	function audit() {
-		return isset($this->APriv, $this->AProt, $this->APub); 
-	}		
+		return isset($this->APriv, $this->AProt, $this->APub);
+	}
 }
 
 Class B extends A {
 	private $BPriv = "B.BPriv";
 	protected $BProt = "B.BProt";
 	public $BPub = "B.BPub";
-	
+
 	function audit() {
 		return  parent::audit() && isset($this->AProt, $this->APub,
-					 $this->BPriv, $this->BProt, $this->BPub); 
-	}	
+					 $this->BPriv, $this->BProt, $this->BPub);
+	}
 }
 
 Class C extends B {
 	private $APriv = "C.APriv";
 	protected $AProt = "C.AProt";
 	public $APub = "C.APub";
-	
+
 	private $CPriv = "C.CPriv";
 	protected $CProt = "C.BProt";
 	public $CPub = "C.CPub";
-	
+
 	function audit() {
-		return parent::audit() && isset($this->APriv, $this->AProt, $this->APub, 
-					 $this->BProt, $this->BPub, 
-					 $this->CPriv, $this->CProt, $this->CPub); 
+		return parent::audit() && isset($this->APriv, $this->AProt, $this->APub,
+					 $this->BProt, $this->BPub,
+					 $this->CPriv, $this->CProt, $this->CPub);
 	}
 }
 
@@ -58,11 +58,11 @@ function prettyPrint($obj) {
 	$ser = serialize($obj);
 	$serPrintable = str_replace("\0", '\0', $ser);
 	var_dump($serPrintable);
-	
+
 	echo "Unserialized:\n";
 	$uobj = unserialize($ser);
 	var_dump($uobj);
-	
+
 	echo "Sanity check: ";
 	var_dump($uobj->audit());
 }
diff --git a/ext/standard/tests/serialize/serialization_objects_012.phpt b/ext/standard/tests/serialize/serialization_objects_012.phpt
index f994d8e2608..b834de3221f 100644
--- a/ext/standard/tests/serialize/serialization_objects_012.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_012.phpt
@@ -3,14 +3,14 @@ Object serialization / unserialization: real references and COW references
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "\n\nArray containing same object twice:\n";
@@ -20,7 +20,7 @@ $a[1] = $a[0];
 var_dump($a);
 
 $ser = serialize($a);
-var_dump($ser); 
+var_dump($ser);
 
 $ua = unserialize($ser);
 var_dump($ua);
@@ -37,7 +37,7 @@ $a[1] = &$a[0];
 var_dump($a);
 
 $ser = serialize($a);
-var_dump($ser); 
+var_dump($ser);
 
 $ua = unserialize($ser);
 var_dump($ua);
@@ -50,11 +50,11 @@ echo "\n\nObject containing same object twice:";
 $obj = new stdclass;
 $contaner = new stdclass;
 $contaner->a = $obj;
-$contaner->b = $contaner->a; 
+$contaner->b = $contaner->a;
 var_dump($contaner);
 
 $ser = serialize($contaner);
-var_dump($ser); 
+var_dump($ser);
 
 $ucontainer = unserialize($ser);
 var_dump($ucontainer);
@@ -68,11 +68,11 @@ echo "\n\nObject containing object and reference to that object:\n";
 $obj = new stdclass;
 $contaner = new stdclass;
 $contaner->a = $obj;
-$contaner->b = &$contaner->a; 
+$contaner->b = &$contaner->a;
 var_dump($contaner);
 
 $ser = serialize($contaner);
-var_dump($ser); 
+var_dump($ser);
 
 $ucontainer = unserialize($ser);
 var_dump($ucontainer);
diff --git a/ext/standard/tests/serialize/serialization_objects_013.phpt b/ext/standard/tests/serialize/serialization_objects_013.phpt
index 403f9de08cd..56e05c3756f 100644
--- a/ext/standard/tests/serialize/serialization_objects_013.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_013.phpt
@@ -1,25 +1,25 @@
 --TEST--
-Object serialization / unserialization: references amongst properties 
+Object serialization / unserialization: references amongst properties
 --INI--
 error_reporting = E_ALL & ~E_STRICT
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function check(&$obj) {
 	var_dump($obj);
 	$ser = serialize($obj);
 	var_dump($ser);
-	
+
 	$uobj = unserialize($ser);
 	var_dump($uobj);
 	$uobj->a = "obj->a.changed";
@@ -27,7 +27,7 @@ function check(&$obj) {
 	$uobj->b = "obj->b.changed";
 	var_dump($uobj);
 	$uobj->c = "obj->c.changed";
-	var_dump($uobj);	
+	var_dump($uobj);
 }
 
 echo "\n\n--- a refs b:\n";
diff --git a/ext/standard/tests/serialize/serialization_objects_014.phpt b/ext/standard/tests/serialize/serialization_objects_014.phpt
index 234f5e084c2..b1e63b89fb2 100644
--- a/ext/standard/tests/serialize/serialization_objects_014.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_014.phpt
@@ -1,25 +1,25 @@
 --TEST--
-Object serialization / unserialization: references to external values 
+Object serialization / unserialization: references to external values
 --INI--
 error_reporting = E_ALL & ~E_STRICT
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function check(&$obj) {
 	var_dump($obj);
 	$ser = serialize($obj);
 	var_dump($ser);
-	
+
 	$uobj = unserialize($ser);
 	var_dump($uobj);
 	$uobj->a = "obj->a.changed";
@@ -27,7 +27,7 @@ function check(&$obj) {
 	$uobj->b = "obj->b.changed";
 	var_dump($uobj);
 	$uobj->c = "obj->c.changed";
-	var_dump($uobj);	
+	var_dump($uobj);
 }
 
 echo "\n\n--- a refs external:\n";
diff --git a/ext/standard/tests/serialize/serialization_objects_015.phpt b/ext/standard/tests/serialize/serialization_objects_015.phpt
index 2265caba93f..69ac7f07ec2 100644
--- a/ext/standard/tests/serialize/serialization_objects_015.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_015.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Object serialization / unserialization: properties reference containing object 
+Object serialization / unserialization: properties reference containing object
 --INI--
 error_reporting = E_ALL & ~E_STRICT
 --FILE--
@@ -9,7 +9,7 @@ function check(&$obj) {
 	var_dump($obj);
 	$ser = serialize($obj);
 	var_dump($ser);
-	
+
 	$uobj = unserialize($ser);
 	var_dump($uobj);
 	$uobj->a = "obj->a.changed";
@@ -17,7 +17,7 @@ function check(&$obj) {
 	$uobj->b = "obj->b.changed";
 	var_dump($uobj);
 	$uobj->c = "obj->c.changed";
-	var_dump($uobj);	
+	var_dump($uobj);
 }
 
 echo "\n\n--- a refs container:\n";
diff --git a/ext/standard/tests/serialize/serialization_precision_001.phpt b/ext/standard/tests/serialize/serialization_precision_001.phpt
index eb633beb74f..040ed5ec5b2 100644
--- a/ext/standard/tests/serialize/serialization_precision_001.phpt
+++ b/ext/standard/tests/serialize/serialization_precision_001.phpt
@@ -5,14 +5,14 @@ serialize_precision=10
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 var_dump(serialize(0.1));
diff --git a/ext/standard/tests/serialize/serialization_precision_002.phpt b/ext/standard/tests/serialize/serialization_precision_002.phpt
index 653fabea36a..c94bc57318b 100644
--- a/ext/standard/tests/serialize/serialization_precision_002.phpt
+++ b/ext/standard/tests/serialize/serialization_precision_002.phpt
@@ -5,14 +5,14 @@ serialize_precision=75
 --FILE--
 <?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 var_dump(serialize(0.1));
diff --git a/ext/standard/tests/serialize/serialization_resources_001.phpt b/ext/standard/tests/serialize/serialization_resources_001.phpt
index dbb7d3d3e93..233b31ba64f 100644
--- a/ext/standard/tests/serialize/serialization_resources_001.phpt
+++ b/ext/standard/tests/serialize/serialization_resources_001.phpt
@@ -1,16 +1,16 @@
 --TEST--
 Test serialize() & unserialize() functions: resources
 --FILE--
-<?php 
+<?php
 /* Prototype  : proto string serialize(mixed variable)
- * Description: Returns a string representation of variable (which can later be unserialized) 
+ * Description: Returns a string representation of variable (which can later be unserialized)
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 /* Prototype  : proto mixed unserialize(string variable_representation)
- * Description: Takes a string representation of variable and recreates it 
+ * Description: Takes a string representation of variable and recreates it
  * Source code: ext/standard/var.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "\n--- Testing Resource ---\n";
diff --git a/ext/standard/tests/streams/bug40459.phpt b/ext/standard/tests/streams/bug40459.phpt
index 902a1f91111..ce06a3f804a 100644
--- a/ext/standard/tests/streams/bug40459.phpt
+++ b/ext/standard/tests/streams/bug40459.phpt
@@ -48,7 +48,7 @@ class testwrapper {
 		echo $this->constructorCalled ? 'yes' : 'no';
 		return TRUE;
 	}
-	function stream_metadata() 
+	function stream_metadata()
 	{
 		echo $this->constructorCalled ? 'yes' : 'no';
 		return TRUE;
diff --git a/ext/standard/tests/streams/bug46024.phpt b/ext/standard/tests/streams/bug46024.phpt
index fdfd03ee2ef..49e6beeefb2 100644
--- a/ext/standard/tests/streams/bug46024.phpt
+++ b/ext/standard/tests/streams/bug46024.phpt
@@ -4,7 +4,7 @@ Bug #46024 stream_select() doesn't return the correct number
 <?php if (!getenv('TEST_PHP_EXECUTABLE')) die("skip TEST_PHP_EXECUTABLE not defined"); ?>
 --FILE--
 <?php
-$php = realpath(getenv('TEST_PHP_EXECUTABLE')); 
+$php = realpath(getenv('TEST_PHP_EXECUTABLE'));
 $pipes = array();
 $proc = proc_open(
 	"$php -n -i"
diff --git a/ext/standard/tests/streams/bug60455_02.phpt b/ext/standard/tests/streams/bug60455_02.phpt
index 0ddf346eba2..c68a1a07ab3 100644
--- a/ext/standard/tests/streams/bug60455_02.phpt
+++ b/ext/standard/tests/streams/bug60455_02.phpt
@@ -10,13 +10,13 @@ class TestStream {
 	function stream_read($count) {
 		if ($this->s++ == 0)
 			return "a\n";
-		
+
 		return "";
 	}
 	function stream_eof() {
 		return $this->s >= 2;
 	}
-	
+
 }
 
 stream_wrapper_register("test", "TestStream");
diff --git a/ext/standard/tests/streams/bug60455_03.phpt b/ext/standard/tests/streams/bug60455_03.phpt
index 2429d31008c..131da852b73 100644
--- a/ext/standard/tests/streams/bug60455_03.phpt
+++ b/ext/standard/tests/streams/bug60455_03.phpt
@@ -22,7 +22,7 @@ class TestStream {
 	function stream_eof() {
 		return $this->s >= $this->eofth;
 	}
-	
+
 }
 
 stream_wrapper_register("test", "TestStream");
diff --git a/ext/standard/tests/streams/bug60455_04.phpt b/ext/standard/tests/streams/bug60455_04.phpt
index 3a82298dbcd..123a8653d31 100644
--- a/ext/standard/tests/streams/bug60455_04.phpt
+++ b/ext/standard/tests/streams/bug60455_04.phpt
@@ -11,13 +11,13 @@ class TestStream {
 	function stream_read($count) {
 		if ($this->s++ == 0)
 			return "a\n";
-		
+
 		return "";
 	}
 	function stream_eof() {
 		return $this->s >= 2;
 	}
-	
+
 }
 
 stream_wrapper_register("test", "TestStream");
diff --git a/ext/standard/tests/streams/bug60602.phpt b/ext/standard/tests/streams/bug60602.phpt
index f0a3cf83e87..82917ecbd67 100644
--- a/ext/standard/tests/streams/bug60602.phpt
+++ b/ext/standard/tests/streams/bug60602.phpt
@@ -17,7 +17,7 @@ $p = proc_open($cmd, $descs, $pipes, '.', $environment);
 if (is_resource($p)) {
 	$data = '';
 
-	while (1) {	
+	while (1) {
 		$w = $e = NULL;
 		$n = stream_select($pipes, $w, $e, 300);
 
diff --git a/ext/standard/tests/streams/bug61019.phpt b/ext/standard/tests/streams/bug61019.phpt
index 45b207ea9e2..7fead5362f4 100644
--- a/ext/standard/tests/streams/bug61019.phpt
+++ b/ext/standard/tests/streams/bug61019.phpt
@@ -23,17 +23,17 @@ if(is_resource($process))
 	$stdin_stream="";
 	$stderr_stream="";
 
-	echo "External command executed\n";   	
-	do                                     	
+	echo "External command executed\n";
+	do
 	{
 		$process_state=proc_get_status($process);
-		$tmp_stdin=stream_get_contents($pipes[1]);   	
-		if($tmp_stdin) 
+		$tmp_stdin=stream_get_contents($pipes[1]);
+		if($tmp_stdin)
 		{
 			$stdin_stream=$stdin_stream.$tmp_stdin;
 		}
 		$tmp_stderr=stream_get_contents($pipes[2]);
-		if($tmp_stderr) 
+		if($tmp_stderr)
 		{
 			$stderr_stream=$stderr_stream.$tmp_stderr;
 		}
@@ -42,13 +42,13 @@ if(is_resource($process))
 	echo "External command exit: ".$process_state['exitcode']."\n";
 
 	//read outstanding data
-	$tmp_stdin=stream_get_contents($pipes[1]);   	
-	if($tmp_stdin) 
+	$tmp_stdin=stream_get_contents($pipes[1]);
+	if($tmp_stdin)
 	{
 		$stdin_stream=$stdin_stream.$tmp_stdin;
 	}
 	$tmp_stderr=stream_get_contents($pipes[2]);
-	if($tmp_stderr) 
+	if($tmp_stderr)
 	{
 		$stderr_stream=$stderr_stream.$tmp_stderr;
 	}
@@ -57,7 +57,7 @@ if(is_resource($process))
 	fclose ($pipes[1]);
 	fclose ($pipes[2]);
 
-	proc_close($process);    
+	proc_close($process);
 
 	echo "STDOUT: ".$stdin_stream."\n";
 	echo "STDERR: ".$stderr_stream."\n";
diff --git a/ext/standard/tests/streams/bug61115-1.phpt b/ext/standard/tests/streams/bug61115-1.phpt
index 99e2f7929ca..892b0f80e57 100644
--- a/ext/standard/tests/streams/bug61115-1.phpt
+++ b/ext/standard/tests/streams/bug61115-1.phpt
@@ -5,7 +5,7 @@ Bug #61115: Stream related segfault on fatal error in php_stream_context_del_lin
 if (getenv("USE_ZEND_ALLOC") === "0") {
     die("skip Zend MM disabled");
 }
-?> 
+?>
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/streams/bug64166_2.phpt b/ext/standard/tests/streams/bug64166_2.phpt
index 9d6655d5c1e..b4224662eeb 100644
--- a/ext/standard/tests/streams/bug64166_2.phpt
+++ b/ext/standard/tests/streams/bug64166_2.phpt
@@ -13,7 +13,7 @@ function test_64166($data) {
 		'line-length' => 74
     ));
     $str = "";
-    while(($c = fread($fd, 1))!= "") $str .= $c; 
+    while(($c = fread($fd, 1))!= "") $str .= $c;
     var_dump($str);
 
     stream_filter_remove($res);
diff --git a/ext/standard/tests/streams/bug64433.phpt b/ext/standard/tests/streams/bug64433.phpt
index f973768f81f..67c66d61bc9 100644
--- a/ext/standard/tests/streams/bug64433.phpt
+++ b/ext/standard/tests/streams/bug64433.phpt
@@ -2,7 +2,7 @@
 Bug #60180 ($_SERVER["PHP_SELF"] incorrect)
 --SKIPIF--
 <?php
-if(!file_exists(dirname(__FILE__)."/../../../../sapi/cli/tests/php_cli_server.inc")) 
+if(!file_exists(dirname(__FILE__)."/../../../../sapi/cli/tests/php_cli_server.inc"))
 	die("skip could not found cli server script");
 $res = @include dirname(__FILE__)."/../../../../sapi/cli/tests/php_cli_server.inc";
 if(!$res) {
@@ -27,7 +27,7 @@ foreach($codes as $code) {
 echo "follow=0\n";
 $arr = array('http'=>
                         array(
-                                'follow_location'=>0,	
+                                'follow_location'=>0,
                         )
                 );
 $context = stream_context_create($arr);
@@ -37,7 +37,7 @@ foreach($codes as $code) {
 echo "follow=1\n";
 $arr = array('http'=>
                         array(
-                                'follow_location'=>1,	
+                                'follow_location'=>1,
                         )
                 );
 $context = stream_context_create($arr);
diff --git a/ext/standard/tests/streams/bug64770.phpt b/ext/standard/tests/streams/bug64770.phpt
index 785c4237a13..86addfd8098 100644
--- a/ext/standard/tests/streams/bug64770.phpt
+++ b/ext/standard/tests/streams/bug64770.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #64770 stream_select() fails with pipes from proc_open() 
+Bug #64770 stream_select() fails with pipes from proc_open()
 --FILE--
 <?php
 
@@ -17,7 +17,7 @@ $p = proc_open($cmd, $descs, $pipes, '.', NULL, $other_opts);
 if (is_resource($p)) {
 	$data = '';
 
-	while (1) {	
+	while (1) {
 		$w = $e = NULL;
 		$n = stream_select($pipes, $w, $e, 300);
 
diff --git a/ext/standard/tests/streams/bug67626.phpt b/ext/standard/tests/streams/bug67626.phpt
index 67c2c3f8e08..ffdfb3553b3 100644
--- a/ext/standard/tests/streams/bug67626.phpt
+++ b/ext/standard/tests/streams/bug67626.phpt
@@ -5,18 +5,18 @@ Bug #67626: Exceptions not properly handled in user stream handlers
 class MyStream
 {
 	public function stream_open() { return true; }
-	
+
 	public function stream_read()
 	{
 		throw new Exception('stream_read_exception');
 		return 'read';
 	}
-	
+
 	public function stream_eof()
 	{
 		return true;
 	}
-	
+
 	public function stream_write()
 	{
 		throw new Exception('stream_write_exception');
diff --git a/ext/standard/tests/streams/bug70198.phpt b/ext/standard/tests/streams/bug70198.phpt
index bfba808769d..cc3f328d3f2 100644
--- a/ext/standard/tests/streams/bug70198.phpt
+++ b/ext/standard/tests/streams/bug70198.phpt
@@ -7,7 +7,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 --FILE--
 <?php
 
-/* What is checked here is 
+/* What is checked here is
 	- start a server and listen
 	- as soon as client connects, close connection and exit
 	- on the client side - sleep(1) and check feof()
diff --git a/ext/standard/tests/streams/bug72771.phpt b/ext/standard/tests/streams/bug72771.phpt
index b38ccbdda82..ebb358707ed 100644
--- a/ext/standard/tests/streams/bug72771.phpt
+++ b/ext/standard/tests/streams/bug72771.phpt
@@ -16,7 +16,7 @@ $path="ftps://127.0.0.1:" . $port."/";
 $ds=opendir($path, $context);
 var_dump($ds);
 ?>
-==DONE== 
+==DONE==
 --EXPECTF--
 Warning: opendir(ftps://127.0.0.1:%d/): failed to open dir: Server doesn't support FTPS. in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/streams/bug72857.phpt b/ext/standard/tests/streams/bug72857.phpt
index 97d145b5951..e91e6fa4ea3 100644
--- a/ext/standard/tests/streams/bug72857.phpt
+++ b/ext/standard/tests/streams/bug72857.phpt
@@ -8,7 +8,7 @@ Bug #72857 stream_socket_recvfrom read access violation
 	$v3=STREAM_PEEK;
 	$v4="A";
 
-	var_dump(stream_socket_recvfrom($fp0,$v2,$v3,$v4), $v4); 
+	var_dump(stream_socket_recvfrom($fp0,$v2,$v3,$v4), $v4);
 
 	fclose($fp0);
 	unlink($fname);
diff --git a/ext/standard/tests/streams/bug73457.phpt b/ext/standard/tests/streams/bug73457.phpt
index f44c26d8a6a..a49a2026b7f 100644
--- a/ext/standard/tests/streams/bug73457.phpt
+++ b/ext/standard/tests/streams/bug73457.phpt
@@ -16,7 +16,7 @@ $path="ftp://127.0.0.1:" . $port."/bug73457";
 $ds=file_get_contents($path);
 var_dump($ds);
 ?>
-==DONE== 
+==DONE==
 --EXPECTF--
 Warning: file_get_contents(ftp://127.0.0.1:%d/bug73457): failed to open stream: Failed to set up data channel: Connection refused in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/streams/opendir-001.phpt b/ext/standard/tests/streams/opendir-001.phpt
index 28fa43cf268..d2d2ce8b9ce 100644
--- a/ext/standard/tests/streams/opendir-001.phpt
+++ b/ext/standard/tests/streams/opendir-001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-opendir() with 'ftp://' stream. 
+opendir() with 'ftp://' stream.
 --SKIPIF--
 <?php
 if (array_search('ftp',stream_get_wrappers()) === FALSE) die("skip ftp wrapper not available.");
@@ -14,7 +14,7 @@ $path="ftp://localhost:" . $port."/bogusdir";
 
 var_dump(opendir($path));
 ?>
-==DONE== 
+==DONE==
 --EXPECTF--
 Warning: opendir(ftp://localhost:%d/bogusdir): failed to open dir: FTP server reports 250 /bogusdir: No such file or directory
  in %s on line %d
diff --git a/ext/standard/tests/streams/opendir-002.phpt b/ext/standard/tests/streams/opendir-002.phpt
index 83d40e8bb1f..a9959799925 100644
--- a/ext/standard/tests/streams/opendir-002.phpt
+++ b/ext/standard/tests/streams/opendir-002.phpt
@@ -1,5 +1,5 @@
 --TEST--
-opendir() with 'ftp://' stream. 
+opendir() with 'ftp://' stream.
 --SKIPIF--
 <?php
 if (array_search('ftp',stream_get_wrappers()) === FALSE) die("skip ftp wrapper not available.");
@@ -21,7 +21,7 @@ while ($fn=readdir($ds)) {
 
 closedir($ds);
 ?>
-==DONE== 
+==DONE==
 --EXPECTF--
 resource(%d) of type (stream)
 string(5) "file1"
diff --git a/ext/standard/tests/streams/opendir-003.phpt b/ext/standard/tests/streams/opendir-003.phpt
index 1d6a9057fa8..2b3aedbf30a 100644
--- a/ext/standard/tests/streams/opendir-003.phpt
+++ b/ext/standard/tests/streams/opendir-003.phpt
@@ -1,5 +1,5 @@
 --TEST--
-opendir() with 'ftps://' stream. 
+opendir() with 'ftps://' stream.
 --SKIPIF--
 <?php
 if (array_search('ftp',stream_get_wrappers()) === FALSE) die("skip ftp wrapper not available.");
@@ -18,7 +18,7 @@ $context = stream_context_create(array('ssl' => array('cafile' =>  __DIR__ . '/.
 
 var_dump(opendir($path, $context));
 ?>
-==DONE== 
+==DONE==
 --EXPECTF--
 Warning: opendir(ftps://127.0.0.1:%d/bogusdir): failed to open dir: FTP server reports 250 /bogusdir: No such file or directory
  in %s on line %d
diff --git a/ext/standard/tests/streams/opendir-004.phpt b/ext/standard/tests/streams/opendir-004.phpt
index b50c6580c2d..06a3f944bed 100644
--- a/ext/standard/tests/streams/opendir-004.phpt
+++ b/ext/standard/tests/streams/opendir-004.phpt
@@ -1,5 +1,5 @@
 --TEST--
-opendir() with 'ftps://' stream. 
+opendir() with 'ftps://' stream.
 --SKIPIF--
 <?php
 if (array_search('ftp',stream_get_wrappers()) === FALSE) die("skip ftp wrapper not available.");
@@ -22,7 +22,7 @@ while ($fn=readdir($ds)) {
       var_dump($fn);
 }
 ?>
-==DONE== 
+==DONE==
 --EXPECTF--
 resource(%d) of type (stream)
 string(5) "file1"
diff --git a/ext/standard/tests/streams/proc_open_bug69900.phpt b/ext/standard/tests/streams/proc_open_bug69900.phpt
index a3fdfa6c555..8049fb68ff0 100644
--- a/ext/standard/tests/streams/proc_open_bug69900.phpt
+++ b/ext/standard/tests/streams/proc_open_bug69900.phpt
@@ -33,7 +33,7 @@ for($i = 0; $i < 10; $i++){
 	$s = fgets($pipes[1]);
 	$t1 = microtime(1);
 
-	echo $s;		
+	echo $s;
 	echo "fgets() took ", (($t1 - $t0)*1000 > $max_ms ? 'more' : 'less'), " than $max_ms ms\n";
 }
 
diff --git a/ext/standard/tests/streams/set_file_buffer.phpt b/ext/standard/tests/streams/set_file_buffer.phpt
index 04d0fb121d3..79df5a441a8 100644
--- a/ext/standard/tests/streams/set_file_buffer.phpt
+++ b/ext/standard/tests/streams/set_file_buffer.phpt
@@ -10,16 +10,16 @@ class test_wrapper {
   function stream_open($path, $mode, $openedpath) {
     return true;
   }
-  
+
   function stream_eof() {
     return false;
   }
-  
+
   function stream_write($data) {
     echo "size: ", strlen($data), "\n";
     return strlen($data);
   }
-  
+
   function stream_set_option($option, $arg1, $arg2) {
     echo "option: ", $option, ", ", $arg1, ", ", $arg2, "\n";
     return false;
diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt
index 401c65bce05..1e5b7e31d80 100644
--- a/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt
+++ b/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt
@@ -16,7 +16,7 @@ $ctxt = stream_context_create([
 $stream = stream_socket_client(
 	"tcp://www.php.net:80", $errno, $errstr, 10, STREAM_CLIENT_CONNECT, $ctxt);
 
-$socket = 
+$socket =
 	socket_import_stream($stream);
 
 var_dump(socket_get_option($socket, SOL_TCP, TCP_NODELAY) > 0);
diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt
index bf35925e4df..3f4fc486678 100644
--- a/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt
+++ b/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt
@@ -15,7 +15,7 @@ $ctxt = stream_context_create([
 
 $stream = fopen("http://www.php.net", "r", false,  $ctxt);
 
-$socket = 
+$socket =
 	@socket_import_stream($stream);
 
 var_dump(socket_get_option($socket, STREAM_IPPROTO_TCP, TCP_NODELAY) > 0);
diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt
index 6606a150528..ed7f7fb0ac8 100644
--- a/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt
+++ b/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt
@@ -38,7 +38,7 @@ $clientCode = <<<'CODE'
 CODE;
 
 include sprintf(
-	"%s/../../../openssl/tests/ServerClientTestCase.inc", 
+	"%s/../../../openssl/tests/ServerClientTestCase.inc",
 	dirname(__FILE__));
 ServerClientTestCase::getInstance()->run($serverCode, $clientCode);
 ?>
diff --git a/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt b/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt
index 32756d7618b..8cdd5c17795 100644
--- a/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt
+++ b/ext/standard/tests/streams/stream_get_line_NUL_delimiter.phpt
@@ -10,13 +10,13 @@ class TestStream {
 	function stream_read($count) {
 		if ($this->s++ == 0)
 			return "a\0";
-		
+
 		return "";
 	}
 	function stream_eof() {
 		return $this->s >= 2;
 	}
-	
+
 }
 
 stream_wrapper_register("test", "TestStream");
diff --git a/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt b/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt
index c2532c714ab..164c24d5522 100644
--- a/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt
+++ b/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test stream_get_meta_data() function : error conditions 
+Test stream_get_meta_data() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto array stream_get_meta_data(resource fp)
- * Description: Retrieves header/meta data from streams/file pointers 
+ * Description: Retrieves header/meta data from streams/file pointers
  * Source code: ext/standard/streamsfuncs.c
  * Alias to functions: socket_get_status
  */
diff --git a/ext/standard/tests/streams/stream_get_meta_data_file_variation1.phpt b/ext/standard/tests/streams/stream_get_meta_data_file_variation1.phpt
index d54eb04410d..f7ccc7783bd 100644
--- a/ext/standard/tests/streams/stream_get_meta_data_file_variation1.phpt
+++ b/ext/standard/tests/streams/stream_get_meta_data_file_variation1.phpt
@@ -16,7 +16,7 @@ fclose($fp);
 // open file in each access mode and get meta data
 foreach ($filemodes as $mode) {
 	if (strncmp($mode, 'x', 1) == 0) {
-		// x modes require that file does not exist	
+		// x modes require that file does not exist
 		unlink($filename);
 	}
 	$fp = fopen($filename, $mode);
diff --git a/ext/standard/tests/streams/stream_get_meta_data_process_basic.phpt b/ext/standard/tests/streams/stream_get_meta_data_process_basic.phpt
index b7ab37c7c58..02a6ae8cc86 100644
--- a/ext/standard/tests/streams/stream_get_meta_data_process_basic.phpt
+++ b/ext/standard/tests/streams/stream_get_meta_data_process_basic.phpt
@@ -2,8 +2,8 @@
 Testing stream_get_meta_data() on a process stream.
 --FILE--
 <?php
- 
-$output_file = __FILE__.'.tmp'; 
+
+$output_file = __FILE__.'.tmp';
 $cmd = "echo here is some output";
 $mode = 'rb';
 $handle = popen($cmd, $mode);
diff --git a/ext/standard/tests/streams/stream_set_timeout_error.phpt b/ext/standard/tests/streams/stream_set_timeout_error.phpt
index b40b6616cf3..1e2f171b1fb 100644
--- a/ext/standard/tests/streams/stream_set_timeout_error.phpt
+++ b/ext/standard/tests/streams/stream_set_timeout_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test stream_set_timeout() function : error conditions 
+Test stream_set_timeout() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto bool stream_set_timeout(resource stream, int seconds, int microseconds)
- * Description: Set timeout on stream read to seconds + microseonds 
+ * Description: Set timeout on stream read to seconds + microseonds
  * Source code: ext/standard/streamsfuncs.c
  * Alias to functions: socket_set_timeout
  */
diff --git a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt
index 3e1aedcd828..4b0d9a1923f 100644
--- a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt
+++ b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt
@@ -19,7 +19,7 @@ if (is_resource($sock)) {
   var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv23_CLIENT));
   var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv3_CLIENT));
   var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv2_CLIENT));
-  var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_TLS_CLIENT));  
+  var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_TLS_CLIENT));
   var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER));
   var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv2_SERVER));
   var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv3_SERVER));
diff --git a/ext/standard/tests/strings/004.phpt b/ext/standard/tests/strings/004.phpt
index e1414db46cc..9a0ea18861b 100644
--- a/ext/standard/tests/strings/004.phpt
+++ b/ext/standard/tests/strings/004.phpt
@@ -15,7 +15,7 @@ for ($i = 0; $i < $times; $i++) {
     $p = range(1,4);
     shuffle($p);
     $s = join('', $p);
-    if (empty($a[$s])) $a[$s] = 0; 
+    if (empty($a[$s])) $a[$s] = 0;
     $a[$s]++;
 }
 
diff --git a/ext/standard/tests/strings/005.phpt b/ext/standard/tests/strings/005.phpt
index a69ff494255..41ec9dc92f6 100644
--- a/ext/standard/tests/strings/005.phpt
+++ b/ext/standard/tests/strings/005.phpt
@@ -16,7 +16,7 @@ var_dump(error_reporting());
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 hello
 int(8192)
 bool(false)
diff --git a/ext/standard/tests/strings/006.phpt b/ext/standard/tests/strings/006.phpt
index afb5d24dbf3..7665aa20f5f 100644
--- a/ext/standard/tests/strings/006.phpt
+++ b/ext/standard/tests/strings/006.phpt
@@ -12,7 +12,7 @@ var_dump(ob_get_contents());
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 Warning: highlight_file(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA): failed to open stream: %s006.php on line %d
 
 Warning: highlight_file(): Failed opening 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' for highlighting in %s006.php on line %d
diff --git a/ext/standard/tests/strings/007-win32.phpt b/ext/standard/tests/strings/007-win32.phpt
index b16c566eaa2..7d06f018a5f 100644
--- a/ext/standard/tests/strings/007-win32.phpt
+++ b/ext/standard/tests/strings/007-win32.phpt
@@ -13,7 +13,7 @@ var_dump(ob_get_contents());
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 Warning: php_strip_whitespace(%s): failed to open stream: No such file or directory in %s on line %d
 string(0) ""
 bool(false)
diff --git a/ext/standard/tests/strings/007.phpt b/ext/standard/tests/strings/007.phpt
index 804b455167b..a0fd8acdf4e 100644
--- a/ext/standard/tests/strings/007.phpt
+++ b/ext/standard/tests/strings/007.phpt
@@ -13,7 +13,7 @@ var_dump(ob_get_contents());
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 Warning: php_strip_whitespace(%s): failed to open stream: File name too long in %s007.php on line %d
 string(0) ""
 bool(false)
diff --git a/ext/standard/tests/strings/addcslashes_001.phpt b/ext/standard/tests/strings/addcslashes_001.phpt
index c9722c7fe7e..4080c7214d7 100644
Binary files a/ext/standard/tests/strings/addcslashes_001.phpt and b/ext/standard/tests/strings/addcslashes_001.phpt differ
diff --git a/ext/standard/tests/strings/addcslashes_002.phpt b/ext/standard/tests/strings/addcslashes_002.phpt
index eb46803bbe7..09327706b92 100644
--- a/ext/standard/tests/strings/addcslashes_002.phpt
+++ b/ext/standard/tests/strings/addcslashes_002.phpt
@@ -21,7 +21,7 @@ class string1
 $obj = new string1;
 var_dump( addcslashes($obj, "b") );
 
-echo "Done\n"; 
+echo "Done\n";
 
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/strings/addcslashes_003.phpt b/ext/standard/tests/strings/addcslashes_003.phpt
index f1d658135be..56379957961 100644
Binary files a/ext/standard/tests/strings/addcslashes_003.phpt and b/ext/standard/tests/strings/addcslashes_003.phpt differ
diff --git a/ext/standard/tests/strings/addcslashes_004.phpt b/ext/standard/tests/strings/addcslashes_004.phpt
index db2b6f88589..a7878455066 100644
--- a/ext/standard/tests/strings/addcslashes_004.phpt
+++ b/ext/standard/tests/strings/addcslashes_004.phpt
@@ -13,7 +13,7 @@ var_dump( addcslashes() );
 var_dump( addcslashes("foo[]") );
 var_dump( addcslashes('foo[]', "o", "foo") );
 
-echo "Done\n"; 
+echo "Done\n";
 
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/strings/addslashes_basic.phpt b/ext/standard/tests/strings/addslashes_basic.phpt
index 0912d34e483..7d5f6f0a481 100644
--- a/ext/standard/tests/strings/addslashes_basic.phpt
+++ b/ext/standard/tests/strings/addslashes_basic.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test addslashes() function : basic functionality 
+Test addslashes() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
- * Description: Returns a string with backslashes before characters (single quotes, double quote, 
+ * Description: Returns a string with backslashes before characters (single quotes, double quote,
  *              backslash and nul character) that need to be quoted in database queries etc.
  * Source code: ext/standard/string.c
 */
 
 /*
- * Testing addslashes() with strings containing characters that can be prefixed with backslash 
+ * Testing addslashes() with strings containing characters that can be prefixed with backslash
  * by the function
 */
 
diff --git a/ext/standard/tests/strings/addslashes_error.phpt b/ext/standard/tests/strings/addslashes_error.phpt
index e920dfd1c49..c5d67c09aeb 100644
--- a/ext/standard/tests/strings/addslashes_error.phpt
+++ b/ext/standard/tests/strings/addslashes_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test addslashes() function : error conditions 
+Test addslashes() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
diff --git a/ext/standard/tests/strings/addslashes_variation1.phpt b/ext/standard/tests/strings/addslashes_variation1.phpt
index 6dfeb7e69b0..e204498ba67 100644
--- a/ext/standard/tests/strings/addslashes_variation1.phpt
+++ b/ext/standard/tests/strings/addslashes_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test addslashes() function : usage variations  - non-string type argument 
+Test addslashes() function : usage variations  - non-string type argument
 --FILE--
 <?php
 /* Prototype  : string addslashes ( string $str )
@@ -8,7 +8,7 @@ Test addslashes() function : usage variations  - non-string type argument
 */
 
 /*
- * Test addslashes() with non-string type argument such as int, float, etc 
+ * Test addslashes() with non-string type argument such as int, float, etc
 */
 
 echo "*** Testing addslashes() : with non-string type argument ***\n";
@@ -22,7 +22,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
   return "obj'ct";
-  } 
+  }
 }
 
 // Defining resource
@@ -36,43 +36,43 @@ $values =  array (
 		  1,
 		  12345,
 		  -2345,
-		
+
 		  // float values
 /*5*/	  10.5,
 		  -10.5,
 		  10.1234567e10,
 		  10.7654321E-10,
 		  .5,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1),
 		  array(1, 2),
 		  array('color' => 'red', 'item' => 'pen'),
-		
+
 		  // boolean values
 /*15*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // empty string
 /*19*/	  "",
 		  '',
-		
+
 		  // undefined variable
 /*21*/	  $undefined_var,
-		
+
 		  // unset variable
 /*22*/	  $unset_var,
-		  
+
 		  // objects
 /*23*/	  new sample(),
-		
+
 		  // resource
 /*24*/	  $file_handle,
-		 
+
 /*25*/	  NULL,
 		  null
 );
diff --git a/ext/standard/tests/strings/addslashes_variation2.phpt b/ext/standard/tests/strings/addslashes_variation2.phpt
index 792c2c30b6f..628980df278 100644
--- a/ext/standard/tests/strings/addslashes_variation2.phpt
+++ b/ext/standard/tests/strings/addslashes_variation2.phpt
@@ -8,7 +8,7 @@ Test addslashes() function : usage variations - strings with characters to be ba
 */
 
 /*
- * Test addslashes() with various strings containing characters thats can be backslashed 
+ * Test addslashes() with various strings containing characters thats can be backslashed
 */
 
 echo "*** Testing addslashes() : with various strings containing characters to be backslashed ***\n";
@@ -21,21 +21,21 @@ EOT;
 
 $heredoc_null_string =<<<EOT
 EOT;
- 
+
 // initialising the string array
 
-$str_array = array( 
+$str_array = array(
                     // string without any characters that can be backslashed
                     'Hello world',
- 
+
                     // string with single quotes
-                    "how're you doing?", 
+                    "how're you doing?",
                     "don't disturb u'r neighbours",
                     "don't disturb u'r neighbours''",
                     '',
                     '\'',
                     "'",
-                    
+
                     // string with double quotes
                     'he said, "he will be on leave"',
                     'he said, ""he will be on leave"',
@@ -44,7 +44,7 @@ $str_array = array(
                     "\"",
                     '"',
  		    "hello\"",
-                         
+
                     // string with backslash characters
                     'Is your name Ram\Krishna?',
                     '\\0.0.0.0',
diff --git a/ext/standard/tests/strings/basename_basic.phpt b/ext/standard/tests/strings/basename_basic.phpt
index fa0d410e5fc..4793aca5ec0 100644
Binary files a/ext/standard/tests/strings/basename_basic.phpt and b/ext/standard/tests/strings/basename_basic.phpt differ
diff --git a/ext/standard/tests/strings/basename_error.phpt b/ext/standard/tests/strings/basename_error.phpt
index bd7741d0e95..8309c3578be 100644
--- a/ext/standard/tests/strings/basename_error.phpt
+++ b/ext/standard/tests/strings/basename_error.phpt
@@ -4,17 +4,17 @@ Test basename() function : error conditions
 <?php
 /* Prototype: string basename ( string $path [, string $suffix] );
    Description: Given a string containing a path to a file,
-                this function will return the base name of the file. 
+                this function will return the base name of the file.
                 If the filename ends in suffix this will also be cut off.
 */
 echo "*** Testing error conditions ***\n";
-// zero arguments 
+// zero arguments
 var_dump( basename() );
 
 // more than expected no. of arguments
 var_dump( basename("/var/tmp/bar.gz", ".gz", ".gz") );
 
-// passing invalid type arguments 
+// passing invalid type arguments
 $object = new stdclass;
 var_dump( basename( array("string/bar") ) );
 var_dump( basename( array("string/bar"), "bar" ) );
diff --git a/ext/standard/tests/strings/basename_invalid_path.phpt b/ext/standard/tests/strings/basename_invalid_path.phpt
index b632efa845c..db0130c2a2d 100644
--- a/ext/standard/tests/strings/basename_invalid_path.phpt
+++ b/ext/standard/tests/strings/basename_invalid_path.phpt
@@ -9,7 +9,7 @@ if((substr(PHP_OS, 0, 3) == "WIN"))
 <?php
 /* Prototype: string basename ( string $path [, string $suffix] );
    Description: Given a string containing a path to a file,
-                this function will return the base name of the file. 
+                this function will return the base name of the file.
                 If the filename ends in suffix this will also be cut off.
 */
 
diff --git a/ext/standard/tests/strings/basename_invalid_path_win.phpt b/ext/standard/tests/strings/basename_invalid_path_win.phpt
index 587f2b114c4..3cb74c21edd 100644
--- a/ext/standard/tests/strings/basename_invalid_path_win.phpt
+++ b/ext/standard/tests/strings/basename_invalid_path_win.phpt
@@ -9,7 +9,7 @@ if((substr(PHP_OS, 0, 3) != "WIN"))
 <?php
 /* Prototype: string basename ( string $path [, string $suffix] );
    Description: Given a string containing a path to a file,
-                this function will return the base name of the file. 
+                this function will return the base name of the file.
                 If the filename ends in suffix this will also be cut off.
 */
 
diff --git a/ext/standard/tests/strings/basename_variation.phpt b/ext/standard/tests/strings/basename_variation.phpt
index 1efd8c701a1..2be0aad5ee1 100644
--- a/ext/standard/tests/strings/basename_variation.phpt
+++ b/ext/standard/tests/strings/basename_variation.phpt
@@ -4,7 +4,7 @@ Test basename() function : usage variations
 <?php
 /* Prototype: string basename ( string $path [, string $suffix] );
    Description: Given a string containing a path to a file,
-                this function will return the base name of the file. 
+                this function will return the base name of the file.
                 If the filename ends in suffix this will also be cut off.
 */
 $file_path_variations = array (
@@ -62,7 +62,7 @@ $file_path_variations = array (
   /* path with spaces */
   array(" "),
   array(' '),
-  
+
   /* empty paths */
   array(""),
   array(''),
@@ -76,8 +76,8 @@ function check_basename( $path_arrays ) {
      if( 1 == count($path) ) { // no suffix provided
        var_dump( basename($path[0]) );
      } else { // path as well as suffix provided,
-       var_dump( basename($path[0], $path[1]) );    
-     } 
+       var_dump( basename($path[0], $path[1]) );
+     }
    }
 }
 
diff --git a/ext/standard/tests/strings/bin2hex_basic.phpt b/ext/standard/tests/strings/bin2hex_basic.phpt
index 5d667a7ff69..9eb07b573ef 100644
--- a/ext/standard/tests/strings/bin2hex_basic.phpt
+++ b/ext/standard/tests/strings/bin2hex_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test bin2hex() function : basic functionality 
+Test bin2hex() function : basic functionality
 --FILE--
 <?php
 
@@ -17,20 +17,20 @@ $strings =  array (
 /*1*/	  "Here is a simple string",
 		  "\t This String contains \t\t some control characters\r\n",
 		  "\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f",
-		  
+
 		   //single quoted strings
 /*4*/	  'Here is a simple string',
 		  '\t This String contains \t\t some control characters\r\n',
 		  '\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f',
-);  
+);
 
 // loop through with each element of the $strings array to test bin2hex() function
 $count = 1;
 foreach($strings as $string) {
-  echo "-- Iteration $count --\n";	
+  echo "-- Iteration $count --\n";
   var_dump(bin2hex($string));
   $count ++;
-}  
+}
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/strings/bin2hex_error.phpt b/ext/standard/tests/strings/bin2hex_error.phpt
index 9d2e1313a1e..efee90bdee7 100644
--- a/ext/standard/tests/strings/bin2hex_error.phpt
+++ b/ext/standard/tests/strings/bin2hex_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test bin2hex() function : error conditions 
+Test bin2hex() function : error conditions
 --FILE--
 <?php
 
@@ -17,7 +17,7 @@ echo "\n-- Testing bin2hex() function with more than expected no. of arguments -
 $extra_arg = 10;
 var_dump( bin2hex("Hello World", $extra_arg) );
 
-?> 
+?>
 ===DONE===
 --EXPECTF--
 *** Testing bin2hex() : error conditions ***
@@ -31,5 +31,4 @@ NULL
 
 Warning: bin2hex() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
- 
 ===DONE===
diff --git a/ext/standard/tests/strings/bin2hex_variation1.phpt b/ext/standard/tests/strings/bin2hex_variation1.phpt
index e73ff5de6ae..2b8513879cb 100644
--- a/ext/standard/tests/strings/bin2hex_variation1.phpt
+++ b/ext/standard/tests/strings/bin2hex_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -31,36 +31,36 @@ $inputs =  array (
 /*1*/ 0,
 	  1,
 	  123456,
-	
+
 	  // float values
 /*4*/ 10.5,
 	  -20.5,
 	  10.1234567e10,
-	
+
 	  // array values
 /*7*/ array(),
 	  array(0),
 	  array(1, 2),
-	
+
 	  // boolean values
 /*10*/true,
 	  false,
 	  TRUE,
 	  FALSE,
-	
+
 	  // null values
 /*14*/NULL,
 	  null,
-	
+
 	  // objects
 /*16*/new sample(),
-	
+
 	  // resource
 /*17*/$file_handle,
-	
+
 	  // undefined variable
 /*18*/@$undefined_var,
-	
+
 	  // unset variable
 /*19*/@$unset_var
 );
diff --git a/ext/standard/tests/strings/bug20934.phpt b/ext/standard/tests/strings/bug20934.phpt
index 0d95081d54d..e8cf3e90d07 100644
--- a/ext/standard/tests/strings/bug20934.phpt
+++ b/ext/standard/tests/strings/bug20934.phpt
@@ -5,7 +5,7 @@ Bug #20934 (htmlspecialchars returns latin1 from UTF-8)
 if (!function_exists("utf8_encode") || !function_exists("utf8_decode")) {
 	die("SKIP Neither utf8_encode() nor utf8_decode() are available");
 }
-?> 
+?>
 --FILE--
 <?php
 $str = utf8_encode("\xe0\xe1");
diff --git a/ext/standard/tests/strings/bug22207.phpt b/ext/standard/tests/strings/bug22207.phpt
index 32a15d73cd1..956acd2103b 100644
--- a/ext/standard/tests/strings/bug22207.phpt
+++ b/ext/standard/tests/strings/bug22207.phpt
@@ -2,7 +2,7 @@
 Bug #22207 (missing 0 when using the e notation in *printf functions)
 --FILE--
 <?php
-	printf("%10.5e\n", 1.1); 
+	printf("%10.5e\n", 1.1);
 	var_dump(sprintf("%10.5e\n", 1.1));
 ?>
 --EXPECT--
diff --git a/ext/standard/tests/strings/bug22224.phpt b/ext/standard/tests/strings/bug22224.phpt
index c30f222f326..0ab00a6c423 100644
--- a/ext/standard/tests/strings/bug22224.phpt
+++ b/ext/standard/tests/strings/bug22224.phpt
@@ -14,7 +14,7 @@ class foo
 
 
 $a = new foo();
-			    
+
 $arr = array(0=>&$a, 1=>&$a);
 var_dump(implode(",",$arr));
 var_dump($arr)
diff --git a/ext/standard/tests/strings/bug26817.phpt b/ext/standard/tests/strings/bug26817.phpt
index 228348708cb..2e31d30be93 100644
--- a/ext/standard/tests/strings/bug26817.phpt
+++ b/ext/standard/tests/strings/bug26817.phpt
@@ -2,7 +2,7 @@
 Bug #26817 (http_build_query() did not handle private & protected object properties)
 --FILE--
 <?php
-class test { 
+class test {
 	protected $foo;
 	private $bar;
 	public $test;
diff --git a/ext/standard/tests/strings/bug33076.phpt b/ext/standard/tests/strings/bug33076.phpt
index dafb8161b0f..95525ff2e80 100644
--- a/ext/standard/tests/strings/bug33076.phpt
+++ b/ext/standard/tests/strings/bug33076.phpt
@@ -9,6 +9,6 @@ var_dump($value);
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(6) "bzexbz"
 Done
diff --git a/ext/standard/tests/strings/bug36306.phpt b/ext/standard/tests/strings/bug36306.phpt
index 6317c974ab0..3c52250718e 100644
--- a/ext/standard/tests/strings/bug36306.phpt
+++ b/ext/standard/tests/strings/bug36306.phpt
@@ -6,7 +6,7 @@ Bug #36306 (crc32() 64bit)
 /* as an example how to write crc32 tests
    PHP does not have uint values, you cannot
    display crc32 like a signed integer.
-   Have to find some small strings to truly reproduce 
+   Have to find some small strings to truly reproduce
    the problem, this example being not a problem
 */
 echo dechex(crc32("platform independent")) . "\n";
diff --git a/ext/standard/tests/strings/bug36944.phpt b/ext/standard/tests/strings/bug36944.phpt
index 2a43d060e2f..a9f117fe3f3 100644
--- a/ext/standard/tests/strings/bug36944.phpt
+++ b/ext/standard/tests/strings/bug36944.phpt
@@ -13,7 +13,7 @@ var_dump(strncasecmp("test ", "E", 0));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: Length must be greater than or equal to 0 in %s on line %d
 bool(false)
 int(%d)
diff --git a/ext/standard/tests/strings/bug37262.phpt b/ext/standard/tests/strings/bug37262.phpt
index ffdc994f466..b964c4a6592 100644
--- a/ext/standard/tests/strings/bug37262.phpt
+++ b/ext/standard/tests/strings/bug37262.phpt
@@ -5,6 +5,6 @@ Bug #37262 (var_export() does not escape \0 character)
 $func = create_function('$a', 'return $a;');
 var_export($func);
 ?>
---EXPECTF--	
+--EXPECTF--
 Deprecated: Function create_function() is deprecated in %s on line %d
 '' . "\0" . 'lambda_%d'
diff --git a/ext/standard/tests/strings/bug38322.phpt b/ext/standard/tests/strings/bug38322.phpt
index 79f66f1fa0c..d0a44a0902e 100644
--- a/ext/standard/tests/strings/bug38322.phpt
+++ b/ext/standard/tests/strings/bug38322.phpt
@@ -8,6 +8,6 @@ var_dump(sscanf("a ",'%1$s',$str));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(1)
 Done
diff --git a/ext/standard/tests/strings/bug38770.phpt b/ext/standard/tests/strings/bug38770.phpt
index 1821639aca0..76ec33572b2 100644
--- a/ext/standard/tests/strings/bug38770.phpt
+++ b/ext/standard/tests/strings/bug38770.phpt
@@ -13,7 +13,7 @@ foreach (array('N','l') as $v) {
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 Array
 (
     [1] => 4294937296
diff --git a/ext/standard/tests/strings/bug39032.phpt b/ext/standard/tests/strings/bug39032.phpt
index dbd39ec9d81..ac8bdba4114 100644
--- a/ext/standard/tests/strings/bug39032.phpt
+++ b/ext/standard/tests/strings/bug39032.phpt
@@ -10,7 +10,7 @@ var_dump(strcspn(chr(1),"qweqwe"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(1)
 int(0)
 int(1)
diff --git a/ext/standard/tests/strings/bug39350.phpt b/ext/standard/tests/strings/bug39350.phpt
index 53d58b70998..8cc51e95923 100644
--- a/ext/standard/tests/strings/bug39350.phpt
+++ b/ext/standard/tests/strings/bug39350.phpt
@@ -9,5 +9,5 @@ implode('', array(""));
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 Done
diff --git a/ext/standard/tests/strings/bug39621.phpt b/ext/standard/tests/strings/bug39621.phpt
index 1a33147b68a..924544f2e16 100644
Binary files a/ext/standard/tests/strings/bug39621.phpt and b/ext/standard/tests/strings/bug39621.phpt differ
diff --git a/ext/standard/tests/strings/bug39873.phpt b/ext/standard/tests/strings/bug39873.phpt
index e73f3c8516e..527b7d3c922 100644
--- a/ext/standard/tests/strings/bug39873.phpt
+++ b/ext/standard/tests/strings/bug39873.phpt
@@ -9,7 +9,7 @@ if (!setlocale(LC_ALL, "ita","it","Italian","it_IT","it_IT.ISO8859-1","it_IT.ISO
 --FILE--
 <?php
 	setlocale(LC_ALL, "ita","it","Italian","it_IT","it_IT.ISO8859-1","it_IT.ISO_8859-1");
-	$num = 0+"1234.56";  
+	$num = 0+"1234.56";
 	echo number_format($num,2);
 	echo "\n";
 ?>
diff --git a/ext/standard/tests/strings/bug40637.phpt b/ext/standard/tests/strings/bug40637.phpt
index 5669083aa6f..d6b56918ff8 100644
--- a/ext/standard/tests/strings/bug40637.phpt
+++ b/ext/standard/tests/strings/bug40637.phpt
@@ -8,6 +8,6 @@ var_dump(strip_tags($html));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(4) "Text"
 Done
diff --git a/ext/standard/tests/strings/bug40704.phpt b/ext/standard/tests/strings/bug40704.phpt
index 82e91b5c872..b2f6cf89cc7 100644
--- a/ext/standard/tests/strings/bug40704.phpt
+++ b/ext/standard/tests/strings/bug40704.phpt
@@ -8,6 +8,6 @@ var_dump(strip_tags($html));
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(26) "Bug ' Trigger Missing Text"
 Done
diff --git a/ext/standard/tests/strings/bug40754.phpt b/ext/standard/tests/strings/bug40754.phpt
index b30042e9391..26ea5bc7704 100644
--- a/ext/standard/tests/strings/bug40754.phpt
+++ b/ext/standard/tests/strings/bug40754.phpt
@@ -26,7 +26,7 @@ var_dump(chunk_split("abcde", $v, "abc"));
 var_dump(substr("abcde", $v, $v));
 
 ?>
---EXPECTF--	
+--EXPECTF--
 string(4) "bcde"
 string(6) "abcdex"
 bool(false)
diff --git a/ext/standard/tests/strings/bug45166.phpt b/ext/standard/tests/strings/bug45166.phpt
index 60449e04f0f..eb32e739e04 100644
--- a/ext/standard/tests/strings/bug45166.phpt
+++ b/ext/standard/tests/strings/bug45166.phpt
@@ -2,7 +2,7 @@
 Bug #45166 (substr() )
 --FILE--
 <?php
-	echo substr('cd', -3) . "\n";  
+	echo substr('cd', -3) . "\n";
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/strings/bug48709.phpt b/ext/standard/tests/strings/bug48709.phpt
index 999a2c6513c..6a93b8dae4e 100644
--- a/ext/standard/tests/strings/bug48709.phpt
+++ b/ext/standard/tests/strings/bug48709.phpt
@@ -13,8 +13,8 @@ $exceptions = array(
 	'x',  // s
 	'wh', // w
 	'wa'  // w
-);	
-	
+);
+
 foreach ($exceptions as $letter) {
 	printf("%s => %s\n", $letter, metaphone($letter));
 }
diff --git a/ext/standard/tests/strings/bug54721.phpt b/ext/standard/tests/strings/bug54721.phpt
index 3851df15423..f21d65fddfe 100644
--- a/ext/standard/tests/strings/bug54721.phpt
+++ b/ext/standard/tests/strings/bug54721.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #54721 (Different Hashes on Windows, BSD and Linux on wrong Salt size)
 --FILE--
-<?php 
+<?php
 echo crypt("", '$1$dW0.is5.$10CH101gGOr1677ZYd517.') . "\n";
 echo crypt("b", '$1$dW0.is5.$10CH101gGOr1677ZYd517.') . "\n";
 echo crypt("bu", '$1$dW0.is5.$10CH101gGOr1677ZYd517.') . "\n";
diff --git a/ext/standard/tests/strings/bug55871.phpt b/ext/standard/tests/strings/bug55871.phpt
index 0044f50ce70..0c8fd4c6e69 100644
--- a/ext/standard/tests/strings/bug55871.phpt
+++ b/ext/standard/tests/strings/bug55871.phpt
@@ -17,7 +17,7 @@ class test2 {
 }
 
 class test3 {
-        public function __toString() {                
+        public function __toString() {
                 $GLOBALS['my_var'] .= "AAAAAAAA";
                 return '';
         }
diff --git a/ext/standard/tests/strings/bug64879.phpt b/ext/standard/tests/strings/bug64879.phpt
index 1df90c6d85c..7131fc2449e 100644
--- a/ext/standard/tests/strings/bug64879.phpt
+++ b/ext/standard/tests/strings/bug64879.phpt
@@ -3,10 +3,10 @@ Bug #64879: quoted_printable_encode() wrong size calculation (CVE-2013-2110)
 --FILE--
 <?php
 
-quoted_printable_encode(str_repeat("\xf4", 1000)); 
-quoted_printable_encode(str_repeat("\xf4", 100000)); 
+quoted_printable_encode(str_repeat("\xf4", 1000));
+quoted_printable_encode(str_repeat("\xf4", 100000));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Done
diff --git a/ext/standard/tests/strings/bug65230.phpt b/ext/standard/tests/strings/bug65230.phpt
index c707dd36913..9ae18c0890d 100644
--- a/ext/standard/tests/strings/bug65230.phpt
+++ b/ext/standard/tests/strings/bug65230.phpt
@@ -11,7 +11,7 @@ date.timezone=Europe/Berlin
 --FILE--
 <?php
 
-function test($locale, $value) 
+function test($locale, $value)
 {
 	$newlocale = setlocale(LC_ALL, $locale);
 	$conv      = localeconv();
diff --git a/ext/standard/tests/strings/bug65947.phpt b/ext/standard/tests/strings/bug65947.phpt
index 956aa6049a2..18bcb86b767 100644
--- a/ext/standard/tests/strings/bug65947.phpt
+++ b/ext/standard/tests/strings/bug65947.phpt
@@ -9,9 +9,9 @@ $filename = 'test.toto';
 $csv = base64_decode('6Q==');
 $adata = str_getcsv($csv,";");
 $b2 = basename($filename);
-if ($filename != $b2) 
+if ($filename != $b2)
 	print "BUG";
-else 
+else
 	print "OKEY";
---EXPECTF--	
+--EXPECTF--
 OKEY
diff --git a/ext/standard/tests/strings/bug67252.phpt b/ext/standard/tests/strings/bug67252.phpt
index 80a6ebcf1c4..576524f1d28 100644
--- a/ext/standard/tests/strings/bug67252.phpt
+++ b/ext/standard/tests/strings/bug67252.phpt
@@ -7,7 +7,7 @@ $a = "M86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A86%A"."\n"."a.";
 var_dump(convert_uudecode($a));
 
 ?>
---EXPECTF--	
+--EXPECTF--
 
 Warning: convert_uudecode(): The given parameter is not a valid uuencoded string in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/strings/bug73058.phpt b/ext/standard/tests/strings/bug73058.phpt
index f0998502134..1d1e5a15f59 100644
--- a/ext/standard/tests/strings/bug73058.phpt
+++ b/ext/standard/tests/strings/bug73058.phpt
@@ -5,7 +5,7 @@ Bug #73058 crypt broken when salt is 'too' long
 if (!function_exists('crypt'))) {
 	die("SKIP crypt() is not available");
 }
-?> 
+?>
 --FILE--
 <?php
 $pass = 'secret';
diff --git a/ext/standard/tests/strings/chop_basic.phpt b/ext/standard/tests/strings/chop_basic.phpt
index 99a03cb0f1b..ea6944e6da9 100644
Binary files a/ext/standard/tests/strings/chop_basic.phpt and b/ext/standard/tests/strings/chop_basic.phpt differ
diff --git a/ext/standard/tests/strings/chop_error.phpt b/ext/standard/tests/strings/chop_error.phpt
index 71a1004ecd5..2f2656f3aa6 100644
--- a/ext/standard/tests/strings/chop_error.phpt
+++ b/ext/standard/tests/strings/chop_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test chop() function : error conditions 
+Test chop() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string chop ( string $str [, string $charlist] )
diff --git a/ext/standard/tests/strings/chop_variation1.phpt b/ext/standard/tests/strings/chop_variation1.phpt
index bb5bca4ecfe..3a680c216fb 100644
--- a/ext/standard/tests/strings/chop_variation1.phpt
+++ b/ext/standard/tests/strings/chop_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test chop() function : usage variations  - unexpected values for str argument 
+Test chop() function : usage variations  - unexpected values for str argument
 --FILE--
 <?php
 /* Prototype  : string chop ( string $str [, string $charlist] )
@@ -72,10 +72,10 @@ $values =  array (
 
   // unset variable
   $unset_var,
- 
+
   // object
   $sample_obj,
-  
+
   // resource
   $file_handle
 );
diff --git a/ext/standard/tests/strings/chop_variation2.phpt b/ext/standard/tests/strings/chop_variation2.phpt
index 02d32306ecd..cad8ec75f5e 100644
--- a/ext/standard/tests/strings/chop_variation2.phpt
+++ b/ext/standard/tests/strings/chop_variation2.phpt
@@ -71,13 +71,13 @@ $values =  array (
 
   // resource
   $file_handle,
-  
+
   // undefined variable
   $undefined_var,
 
   // unset variable
   $unset_var
-  
+
 );
 
 
diff --git a/ext/standard/tests/strings/chr_basic.phpt b/ext/standard/tests/strings/chr_basic.phpt
index 378b4027a1d..5e102b5d83d 100644
--- a/ext/standard/tests/strings/chr_basic.phpt
+++ b/ext/standard/tests/strings/chr_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test chr() function : basic functionality 
+Test chr() function : basic functionality
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/chr_ord.phpt b/ext/standard/tests/strings/chr_ord.phpt
index b5015a01082..be0b1a32da5 100644
Binary files a/ext/standard/tests/strings/chr_ord.phpt and b/ext/standard/tests/strings/chr_ord.phpt differ
diff --git a/ext/standard/tests/strings/chr_variation1.phpt b/ext/standard/tests/strings/chr_variation1.phpt
index 03adc49d476..e61ed546999 100644
--- a/ext/standard/tests/strings/chr_variation1.phpt
+++ b/ext/standard/tests/strings/chr_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -32,36 +32,36 @@ $inputs =  array (
 		  1,
 		  255,
 		  256,
-		
+
 		  // float values
 /*5*/	  10.5,
 		  -20.5,
 		  1.1234e6,
-		
+
 		  // array values
 /*8*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*11*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*15*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*17*/	  new sample(),
-		
+
 		  // resource
 /*18*/	  $file_handle,
-		
+
 		  // undefined variable
 /*19*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*20*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/chunk_split_basic.phpt b/ext/standard/tests/strings/chunk_split_basic.phpt
index 14ad782ac01..6a201ec9cac 100644
--- a/ext/standard/tests/strings/chunk_split_basic.phpt
+++ b/ext/standard/tests/strings/chunk_split_basic.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test chunk_split() function : basic functionality 
+Test chunk_split() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string chunk_split(string $str [, int $chunklen [, string $ending]])
- * Description: Returns split line 
+ * Description: Returns split line
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
 */
 
 /*
-* Testing chunk_split() for basic functionality by passing all possible 
-* arguments as well as with default arguments chunklen and ending  
+* Testing chunk_split() for basic functionality by passing all possible
+* arguments as well as with default arguments chunklen and ending
 */
 
 echo "*** Testing chunk_split() : basic functionality ***\n";
@@ -22,7 +22,7 @@ $chunklen = 2;
 $ending = '##';
 
 // Calling chunk_split() with all possible arguments
-echo "-- Testing chunk_split() with all possible arguments --\n"; 
+echo "-- Testing chunk_split() with all possible arguments --\n";
 var_dump( chunk_split($str, $chunklen, $ending) );
 
 
@@ -34,8 +34,8 @@ var_dump( chunk_split($str, $chunklen) );
 //Calling chunk_split() with default chunklen and ending string
 echo "-- Testing chunk_split() with default chunklen and ending string --\n";
 var_dump( chunk_split($str) );
-	
-echo "Done"   
+
+echo "Done"
 ?>
 --EXPECTF--
 *** Testing chunk_split() : basic functionality ***
diff --git a/ext/standard/tests/strings/chunk_split_error.phpt b/ext/standard/tests/strings/chunk_split_error.phpt
index 341f04ffd35..d8a72586af0 100644
--- a/ext/standard/tests/strings/chunk_split_error.phpt
+++ b/ext/standard/tests/strings/chunk_split_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test chunk_split() function : error conditions 
+Test chunk_split() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string chunk_split(string $str [, int $chunklen [, string $ending]])
@@ -9,8 +9,8 @@ Test chunk_split() function : error conditions
 */
 
 /*
-* Testing error conditions of chunk_split() with zero arguments 
-* and for more than expected number of arguments 
+* Testing error conditions of chunk_split() with zero arguments
+* and for more than expected number of arguments
 */
 
 echo "*** Testing chunk_split() : error conditions ***\n";
diff --git a/ext/standard/tests/strings/chunk_split_variation1.phpt b/ext/standard/tests/strings/chunk_split_variation1.phpt
index 5f41c86dc3a..0b24f9b6d92 100644
--- a/ext/standard/tests/strings/chunk_split_variation1.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation1.phpt
@@ -81,7 +81,7 @@ $values = array(
   @$unset_var,
 
   // resource data
-  $fp	
+  $fp
 );
 
 // loop through each element of the array for 'str'
diff --git a/ext/standard/tests/strings/chunk_split_variation10.phpt b/ext/standard/tests/strings/chunk_split_variation10.phpt
index 36b9fe8a05f..5bf678b4ac9 100644
--- a/ext/standard/tests/strings/chunk_split_variation10.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation10.phpt
@@ -28,12 +28,12 @@ $values = array (
   'ENDING',  //String
   '@#$%^',  //Special chars
 
-  
-  '\t',  
+
+  '\t',
   '\n',
   '\r',
   '\r\n',
-  
+
   '\0',  //Null char
   '123',  //Numeric
   '(MSG)',  //With ( and )
diff --git a/ext/standard/tests/strings/chunk_split_variation11.phpt b/ext/standard/tests/strings/chunk_split_variation11.phpt
index 418e607f4ce..f20a4af22b4 100644
--- a/ext/standard/tests/strings/chunk_split_variation11.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation11.phpt
@@ -5,7 +5,7 @@ Test chunk_split() function : usage variations - different strings for 'ending'
 /* Prototype  : string chunk_split(string $str [, int $chunklen [, string $ending]])
  * Description: Returns split line
  * Source code: ext/standard/string.c
- * Alias to functions: none 
+ * Alias to functions: none
 */
 
 /*
@@ -26,7 +26,7 @@ $chunklen = 6E+0;
 
 //different values for 'ending'
 $values = array (
-  "",  //empty 
+  "",  //empty
   " ",  //space
   "a",  //single char
   "ENDING",  //regular string
diff --git a/ext/standard/tests/strings/chunk_split_variation12.phpt b/ext/standard/tests/strings/chunk_split_variation12.phpt
index e90287546a6..db5d76a48ee 100644
--- a/ext/standard/tests/strings/chunk_split_variation12.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation12.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test chunk_split() function : usage variations - different heredoc strings for 'ending' argument 
+Test chunk_split() function : usage variations - different heredoc strings for 'ending' argument
 --FILE--
 <?php
 /* Prototype  : string chunk_split(string $str [, int $chunklen [, string $ending]])
@@ -9,7 +9,7 @@ Test chunk_split() function : usage variations - different heredoc strings for '
 */
 
 /*
-* passing different heredoc strings as 'ending' argument to chunk_split() 
+* passing different heredoc strings as 'ending' argument to chunk_split()
 * 'chunklen' argument is set to 10
 */
 
@@ -80,7 +80,7 @@ foreach($heredoc_arr as $value) {
   var_dump( chunk_split( $str, $chunklen, $value) );
   $count++;
 };
- 
+
 echo "Done"
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/strings/chunk_split_variation13.phpt b/ext/standard/tests/strings/chunk_split_variation13.phpt
index 3cbcbe466d8..c042d888960 100644
--- a/ext/standard/tests/strings/chunk_split_variation13.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation13.phpt
@@ -5,7 +5,7 @@ Test chunk_split() function : usage variations - default 'chunklen' with long st
 /* Prototype  : string chunk_split(string $str [, int $chunklen [, string $ending]])
  * Description: Returns split line
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
 */
 
 /*
diff --git a/ext/standard/tests/strings/chunk_split_variation2.phpt b/ext/standard/tests/strings/chunk_split_variation2.phpt
index 9240ed3ea06..3a023208873 100644
--- a/ext/standard/tests/strings/chunk_split_variation2.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation2.phpt
@@ -40,7 +40,7 @@ $values = array(
   (float) PHP_INT_MAX + 1,
   (float) -PHP_INT_MAX - 1,
   .5,
- 
+
   // array data
   array(),
   array(0),
diff --git a/ext/standard/tests/strings/chunk_split_variation3.phpt b/ext/standard/tests/strings/chunk_split_variation3.phpt
index 758bec088b8..408d8c8afb0 100644
--- a/ext/standard/tests/strings/chunk_split_variation3.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation3.phpt
@@ -75,7 +75,7 @@ $values = array(
 
   // unset data
   @$unset_var,
-	
+
   // resource data
   $fp
 );
diff --git a/ext/standard/tests/strings/chunk_split_variation4.phpt b/ext/standard/tests/strings/chunk_split_variation4.phpt
index cfa62698b90..f5c926c7a0d 100644
--- a/ext/standard/tests/strings/chunk_split_variation4.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test chunk_split() function : usage variations - different heredoc strings as 'str' argument 
+Test chunk_split() function : usage variations - different heredoc strings as 'str' argument
 --FILE--
 <?php
 /* Prototype  : string chunk_split(string $str [, int $chunklen [, string $ending]])
@@ -9,7 +9,7 @@ Test chunk_split() function : usage variations - different heredoc strings as 's
 */
 
 /*
-* Passing different heredoc strings as 'str' argument to the chunk_split() 
+* Passing different heredoc strings as 'str' argument to the chunk_split()
 * with 'chunklen' 4 and default value of 'ending' that is "\r\n"
 */
 
@@ -81,7 +81,7 @@ foreach($heredoc_arr as $str) {
   var_dump( chunk_split( $str, $chunklen) );
   $count++;
 };
- 
+
 echo "Done"
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/strings/chunk_split_variation5.phpt b/ext/standard/tests/strings/chunk_split_variation5.phpt
index e53b1e32409..19f1c7c66d8 100644
Binary files a/ext/standard/tests/strings/chunk_split_variation5.phpt and b/ext/standard/tests/strings/chunk_split_variation5.phpt differ
diff --git a/ext/standard/tests/strings/chunk_split_variation6.phpt b/ext/standard/tests/strings/chunk_split_variation6.phpt
index 705bb31fcab..4242a81a9b4 100644
--- a/ext/standard/tests/strings/chunk_split_variation6.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation6.phpt
@@ -23,19 +23,19 @@ $ending = "):(";
 $values = array(
   '',  //empty
   ' ',  //space
-  'This is simple string',  //regular string                                   
-  'It\'s string with quotes',                                  
-  'This contains @ # $ % ^ & chars',   //special characters                   
-  'This string\tcontains\rwhite space\nchars',  //with white space chars      
-  'This is string with 1234 numbers',                    
-  'This is string with \0 and ".chr(0)."null chars',  //for binary safe 
-  'This is string with    multiple         space char',  
-  'This is to check string with ()',                           
-  '     Testing with    multiple spaces     ',                           
-  'Testing invalid \k and \m escape char',            
-  'This is to check with \\n and \\t'                     
-);                                                                         
-                                                          
+  'This is simple string',  //regular string
+  'It\'s string with quotes',
+  'This contains @ # $ % ^ & chars',   //special characters
+  'This string\tcontains\rwhite space\nchars',  //with white space chars
+  'This is string with 1234 numbers',
+  'This is string with \0 and ".chr(0)."null chars',  //for binary safe
+  'This is string with    multiple         space char',
+  'This is to check string with ()',
+  '     Testing with    multiple spaces     ',
+  'Testing invalid \k and \m escape char',
+  'This is to check with \\n and \\t'
+);
+
 
 //Loop through each element of values for 'str'
 for($count = 0;$count < count($values);$count++) {
diff --git a/ext/standard/tests/strings/chunk_split_variation7.phpt b/ext/standard/tests/strings/chunk_split_variation7.phpt
index a27ff3cacd0..fff05ad73ac 100644
Binary files a/ext/standard/tests/strings/chunk_split_variation7.phpt and b/ext/standard/tests/strings/chunk_split_variation7.phpt differ
diff --git a/ext/standard/tests/strings/chunk_split_variation8.phpt b/ext/standard/tests/strings/chunk_split_variation8.phpt
index 3dfa33a2eb7..9299dc13ccb 100644
--- a/ext/standard/tests/strings/chunk_split_variation8.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation8.phpt
@@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 /* Prototype  : string chunk_split(string $str [, int $chunklen [, string $ending]])
  * Description: Returns split line
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
 */
 
 /*
@@ -31,8 +31,8 @@ $ending = ':::';
 
 // different values for 'chunklen'
 $values = array (
-  0,  
-  1,  
+  0,
+  1,
   -123,  //negative integer
   0234,  //octal number
   0x1A,  //hexadecimal number
diff --git a/ext/standard/tests/strings/chunk_split_variation9.phpt b/ext/standard/tests/strings/chunk_split_variation9.phpt
index 5601bbc1e28..2196bc64b40 100644
Binary files a/ext/standard/tests/strings/chunk_split_variation9.phpt and b/ext/standard/tests/strings/chunk_split_variation9.phpt differ
diff --git a/ext/standard/tests/strings/convert_cyr_string.phpt b/ext/standard/tests/strings/convert_cyr_string.phpt
index b62768eff4f..af239543c5e 100644
--- a/ext/standard/tests/strings/convert_cyr_string.phpt
+++ b/ext/standard/tests/strings/convert_cyr_string.phpt
@@ -19,7 +19,7 @@ var_dump(convert_cyr_string("", "d", "i"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: convert_cyr_string() expects exactly 3 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/standard/tests/strings/convert_cyr_string_basic.phpt b/ext/standard/tests/strings/convert_cyr_string_basic.phpt
index e29ad330ceb..e5ccf4cbb9c 100644
--- a/ext/standard/tests/strings/convert_cyr_string_basic.phpt
+++ b/ext/standard/tests/strings/convert_cyr_string_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test convert_cyr_string() function : basic functionality 
+Test convert_cyr_string() function : basic functionality
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/convert_cyr_string_error.phpt b/ext/standard/tests/strings/convert_cyr_string_error.phpt
index 844f2d74d8d..66effea4302 100644
--- a/ext/standard/tests/strings/convert_cyr_string_error.phpt
+++ b/ext/standard/tests/strings/convert_cyr_string_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test convert_cyr_string() function : error conditions 
+Test convert_cyr_string() function : error conditions
 --FILE--
 <?php
 
@@ -33,7 +33,7 @@ var_dump(bin2hex( convert_cyr_string($str, $from, "?")) );
 echo "\n-- Testing convert_cyr_string() function with invalid 'from' and 'to' character set --\n";
 var_dump(bin2hex( convert_cyr_string($str, ">", "?")) );
 
-?> 
+?>
 ===DONE===
 --EXPECTF--
 *** Testing convert_cyr_string() : error conditions ***
@@ -69,5 +69,4 @@ Warning: convert_cyr_string(): Unknown source charset: > in %s on line %d
 
 Warning: convert_cyr_string(): Unknown destination charset: ? in %s on line %d
 string(10) "68656c6c6f"
- 
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/strings/convert_cyr_string_variation1.phpt b/ext/standard/tests/strings/convert_cyr_string_variation1.phpt
index 9986ac214d3..47174defefe 100644
--- a/ext/standard/tests/strings/convert_cyr_string_variation1.phpt
+++ b/ext/standard/tests/strings/convert_cyr_string_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $inputs =  array (
 		  256,
 		  2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/convert_uudecode_basic.phpt b/ext/standard/tests/strings/convert_uudecode_basic.phpt
index 6e334a98156..34e53cbdda3 100644
--- a/ext/standard/tests/strings/convert_uudecode_basic.phpt
+++ b/ext/standard/tests/strings/convert_uudecode_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test convert_uudecode() function : basic functionality 
+Test convert_uudecode() function : basic functionality
 --FILE--
 <?php
 
@@ -20,34 +20,34 @@ $strings =  array (
   "Here is a simple string to test convert_uuencode/decode",
   "\t This String contains \t\t some control characters\r\n",
   "\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f",
-  
+
    //single quoted strings
   '123',
   'abc',
   '1a2b3c',
   '\t This String contains \t\t some control characters\r\n',
-  
-);  
+
+);
 
 // loop through with each element of the $strings array to test convert_uudecode() function
 $count = 1;
 foreach($strings as $string) {
-  	
+
   $encode = convert_uuencode($string);
   $decode = convert_uudecode($encode);
-  
-  if ($decode != $string) { 
-  	var_dump($encode, $decode, $string);  
+
+  if ($decode != $string) {
+  	var_dump($encode, $decode, $string);
   	exit("TEST FAILED on iteration $count\n");
-  } 	
-  
+  }
+
   $count ++;
 }
 
 echo "TEST PASSED\n";
 
 ?>
-===DONE=== 
+===DONE===
 --EXPECTF--
 *** Testing convert_uudecode() : basic functionality ***
 TEST PASSED
diff --git a/ext/standard/tests/strings/convert_uudecode_error.phpt b/ext/standard/tests/strings/convert_uudecode_error.phpt
index 77d3a88833d..77ac18b50bf 100644
--- a/ext/standard/tests/strings/convert_uudecode_error.phpt
+++ b/ext/standard/tests/strings/convert_uudecode_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test convert_uudecode() function : error conditions 
+Test convert_uudecode() function : error conditions
 --FILE--
 <?php
 
@@ -17,7 +17,7 @@ echo "\n-- Testing convert_uudecode() function with more than expected no. of ar
 $extra_arg = 10;
 var_dump( convert_uudecode(72, $extra_arg) );
 
-?> 
+?>
 ===DONE===
 --EXPECTF--
 *** Testing convert_uudecode() : error conditions ***
@@ -31,5 +31,4 @@ bool(false)
 
 Warning: convert_uudecode() expects exactly 1 parameter, 2 given in %s on line %d
 bool(false)
- 
 ===DONE===
diff --git a/ext/standard/tests/strings/convert_uudecode_variation1.phpt b/ext/standard/tests/strings/convert_uudecode_variation1.phpt
index 049fd7f65ba..4c66f076a50 100644
--- a/ext/standard/tests/strings/convert_uudecode_variation1.phpt
+++ b/ext/standard/tests/strings/convert_uudecode_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $inputs =  array (
 		  256,
 	      2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/convert_uuencode_basic.phpt b/ext/standard/tests/strings/convert_uuencode_basic.phpt
index 9849997d41d..b8c338a1c69 100644
--- a/ext/standard/tests/strings/convert_uuencode_basic.phpt
+++ b/ext/standard/tests/strings/convert_uuencode_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test convert_uuencode() function : basic functionality 
+Test convert_uuencode() function : basic functionality
 --FILE--
 <?php
 
@@ -20,14 +20,14 @@ $strings =  array (
   "Here is a simple string to test convert_uuencode/decode",
   "\t This String contains \t\t some control characters\r\n",
   "\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f",
-  
+
    //single quoted strings
   '123',
   'abc',
   '1a2b3c',
   '\t This String contains \t\t some control characters\r\n',
-  
-);  
+
+);
 
 // loop through with each element of the $strings array to test convert_uuencode() function
 $count = 1;
@@ -39,7 +39,7 @@ foreach($strings as $string) {
 
 
 ?>
-===DONE=== 
+===DONE===
 --EXPECTF--
 *** Testing convert_uuencode() : basic functionality ***
 -- Iteration 1 --
diff --git a/ext/standard/tests/strings/convert_uuencode_error.phpt b/ext/standard/tests/strings/convert_uuencode_error.phpt
index a995e18fe29..ec4d3f64777 100644
--- a/ext/standard/tests/strings/convert_uuencode_error.phpt
+++ b/ext/standard/tests/strings/convert_uuencode_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test convert_uuencode() function : error conditions 
+Test convert_uuencode() function : error conditions
 --FILE--
 <?php
 
@@ -17,7 +17,7 @@ echo "\n-- Testing convert_uuencode() function with more than expected no. of ar
 $extra_arg = 10;
 var_dump( convert_uuencode(72, $extra_arg) );
 
-?> 
+?>
 ===DONE===
 --EXPECTF--
 *** Testing convert_uuencode() : error conditions ***
@@ -31,5 +31,4 @@ bool(false)
 
 Warning: convert_uuencode() expects exactly 1 parameter, 2 given in %s on line %d
 bool(false)
- 
 ===DONE===
diff --git a/ext/standard/tests/strings/convert_uuencode_variation1.phpt b/ext/standard/tests/strings/convert_uuencode_variation1.phpt
index 12ca2819601..c9ef4335be1 100644
--- a/ext/standard/tests/strings/convert_uuencode_variation1.phpt
+++ b/ext/standard/tests/strings/convert_uuencode_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $inputs =  array (
 		  256,
 	      2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/count_chars_basic.phpt b/ext/standard/tests/strings/count_chars_basic.phpt
index f28fa63b200..587beea95b4 100644
--- a/ext/standard/tests/strings/count_chars_basic.phpt
+++ b/ext/standard/tests/strings/count_chars_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test count_chars() function : basic functionality 
+Test count_chars() function : basic functionality
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/count_chars_error.phpt b/ext/standard/tests/strings/count_chars_error.phpt
index 45c11633983..f87b6e532ed 100644
--- a/ext/standard/tests/strings/count_chars_error.phpt
+++ b/ext/standard/tests/strings/count_chars_error.phpt
@@ -14,7 +14,7 @@ echo "\n-- Testing count_chars() function with no arguments --\n";
 var_dump( count_chars() );
 
 echo "\n-- Testing count_chars() function with more than expected no. of arguments --\n";
-$string = "Hello World\n"; 
+$string = "Hello World\n";
 $mode = 1;
 $extra_arg = 10;
 var_dump( count_chars($string, $mode, $extra_arg) );
diff --git a/ext/standard/tests/strings/count_chars_variation1.phpt b/ext/standard/tests/strings/count_chars_variation1.phpt
index 18e23f95b67..9e78219dbec 100644
--- a/ext/standard/tests/strings/count_chars_variation1.phpt
+++ b/ext/standard/tests/strings/count_chars_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $inputs =  array (
 			  256,
 	    	  2147483647,
 		 	 -2147483648,
-			
+
 			  // float values
 /* 7 */		  10.5,
 			  -20.5,
 			  10.1234567e10,
-			
+
 			  // array values
 /* 10 */	  array(),
 			  array(0),
 			  array(1, 2),
-			
+
 			  // boolean values
 /* 13 */	  true,
 			  false,
 			  TRUE,
 			  FALSE,
-			
+
 			  // null values
 /* 17 */	  NULL,
 			  null,
-			
+
 			  // objects
 /* 19 */	  new sample(),
-			
+
 			  // resource
 /* 20 */	  $file_handle,
-			
+
 			  // undefined variable
 /* 21 */	  @$undefined_var,
-			
+
 			  // unset variable
 /* 22 */	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/count_chars_variation2.phpt b/ext/standard/tests/strings/count_chars_variation2.phpt
index 7896ff1d73b..d1ce781933c 100644
--- a/ext/standard/tests/strings/count_chars_variation2.phpt
+++ b/ext/standard/tests/strings/count_chars_variation2.phpt
@@ -29,40 +29,40 @@ $inputs =  array (
 			  255,
 			  2147483647,
 		      -2147483648,
-			
+
 			  // float values
 /* 6 */		  0.0,
 			  1.3,
 			  10.5,
 			  -20.5,
 			  10.1234567e10,
-			
+
 			  // array values
 /* 11 */	  array(),
 			  array(1, 2, 3, 4, 5, 6, 7, 8, 9),
-			
+
 			  // boolean values
 /* 14 */	  true,
 			  false,
 			  TRUE,
 			  FALSE,
-			
+
 			  // null values
 /* 18 */	  NULL,
 			  null,
-			  
+
 			  // string values
 /* 20 */	  "ABCD",
 			  'abcd',
 			  "1ABC",
 			  "5ABC",
-			  
+
 			  // objects
 /* 24 */ 	  new sample(),
-			
+
 			   // undefined variable
 /* 25 */	  @$undefined_var,
-			
+
 			  // unset variable
 /* 26 */	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/crc32_basic.phpt b/ext/standard/tests/strings/crc32_basic.phpt
index 52a3f89f4a8..9c3ea445942 100644
--- a/ext/standard/tests/strings/crc32_basic.phpt
+++ b/ext/standard/tests/strings/crc32_basic.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test crc32() function : basic functionality 
+Test crc32() function : basic functionality
 --SKIPIF--
 <?php
-if (PHP_INT_SIZE != 4) 
+if (PHP_INT_SIZE != 4)
   die("skip this test is for 32bit platform only");
 ?>
 
 --FILE--
 <?php
 /* Prototype  : string crc32(string $str)
- * Description: Calculate the crc32 polynomial of a string 
+ * Description: Calculate the crc32 polynomial of a string
  * Source code: ext/standard/crc32.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/crc32_error.phpt b/ext/standard/tests/strings/crc32_error.phpt
index 45378204cd4..e8b708d97f4 100644
--- a/ext/standard/tests/strings/crc32_error.phpt
+++ b/ext/standard/tests/strings/crc32_error.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test crc32() function : error conditions 
+Test crc32() function : error conditions
 --SKIPIF--
 <?php
-if (PHP_INT_SIZE != 4) 
+if (PHP_INT_SIZE != 4)
   die("skip this test is for 32bit platform only");
 ?>
 
 --FILE--
 <?php
 /* Prototype  : string crc32(string $str)
- * Description: Calculate the crc32 polynomial of a string 
+ * Description: Calculate the crc32 polynomial of a string
  * Source code: ext/standard/crc32.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/crc32_variation1.phpt b/ext/standard/tests/strings/crc32_variation1.phpt
index cfd47790912..1d6f33ec2e9 100644
--- a/ext/standard/tests/strings/crc32_variation1.phpt
+++ b/ext/standard/tests/strings/crc32_variation1.phpt
@@ -2,14 +2,14 @@
 Test crc32() function : usage variations - unexpected values
 --SKIPIF--
 <?php
-if (PHP_INT_SIZE != 4) 
+if (PHP_INT_SIZE != 4)
   die("skip this test is for 32bit platform only");
 ?>
 
 --FILE--
 <?php
 /* Prototype  : string crc32(string $str)
- * Description: Calculate the crc32 polynomial of a string 
+ * Description: Calculate the crc32 polynomial of a string
  * Source code: ext/standard/crc32.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/crc32_variation2.phpt b/ext/standard/tests/strings/crc32_variation2.phpt
index 6d57a944538..ed2eb6b7194 100644
--- a/ext/standard/tests/strings/crc32_variation2.phpt
+++ b/ext/standard/tests/strings/crc32_variation2.phpt
@@ -8,7 +8,7 @@ if (PHP_INT_SIZE != 4)
 --FILE--
 <?php
 /* Prototype  : string crc32(string $str)
- * Description: Calculate the crc32 polynomial of a string 
+ * Description: Calculate the crc32 polynomial of a string
  * Source code: ext/standard/crc32.c
  * Alias to functions: none
 */
@@ -63,7 +63,7 @@ $string_array = array(
 
 // looping to check the behaviour of the function for each string in the array
 
-$count = 1; 
+$count = 1;
 foreach($string_array as $str) {
   echo "\n-- Iteration $count --\n";
   var_dump( crc32($str) );
diff --git a/ext/standard/tests/strings/crc32_variation3.phpt b/ext/standard/tests/strings/crc32_variation3.phpt
index 639254a5f49..691703103e2 100644
--- a/ext/standard/tests/strings/crc32_variation3.phpt
+++ b/ext/standard/tests/strings/crc32_variation3.phpt
@@ -8,7 +8,7 @@ if (PHP_INT_SIZE != 4)
 --FILE--
 <?php
 /* Prototype  : string crc32(string $str)
- * Description: Calculate the crc32 polynomial of a string 
+ * Description: Calculate the crc32 polynomial of a string
  * Source code: ext/standard/crc32.c
  * Alias to functions: none
 */
@@ -65,7 +65,7 @@ $string_array = array(
 
 // looping to check the behaviour of the function for each string in the array
 
-$count = 1; 
+$count = 1;
 foreach($string_array as $str) {
   echo "\n-- Iteration $count --\n";
   var_dump( crc32($str) );
diff --git a/ext/standard/tests/strings/crc32_variation4.phpt b/ext/standard/tests/strings/crc32_variation4.phpt
index 35c3b0a719e..d3349d2092c 100644
--- a/ext/standard/tests/strings/crc32_variation4.phpt
+++ b/ext/standard/tests/strings/crc32_variation4.phpt
@@ -8,7 +8,7 @@ if (PHP_INT_SIZE != 4)
 --FILE--
 <?php
 /* Prototype  : string crc32(string $str)
- * Description: Calculate the crc32 polynomial of a string 
+ * Description: Calculate the crc32 polynomial of a string
  * Source code: ext/standard/crc32.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/crypt.phpt b/ext/standard/tests/strings/crypt.phpt
index 3dcff2eaf26..d04955412cb 100644
--- a/ext/standard/tests/strings/crypt.phpt
+++ b/ext/standard/tests/strings/crypt.phpt
@@ -5,7 +5,7 @@ crypt() function
 if (!function_exists('crypt')) {
 	die("SKIP crypt() is not available");
 }
-?> 
+?>
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/crypt_sha256.phpt b/ext/standard/tests/strings/crypt_sha256.phpt
index a29bbf3c882..cbddd236dea 100644
--- a/ext/standard/tests/strings/crypt_sha256.phpt
+++ b/ext/standard/tests/strings/crypt_sha256.phpt
@@ -1,11 +1,11 @@
 --TEST--
-crypt() SHA-256 
+crypt() SHA-256
 --SKIPIF--
 <?php
 if (!function_exists('crypt') || !defined("CRYPT_SHA256")) {
 	die("SKIP crypt()-sha256 is not available");
 }
-?> 
+?>
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/crypt_sha512.phpt b/ext/standard/tests/strings/crypt_sha512.phpt
index 3d51f4aafa4..4015cf34fb9 100644
--- a/ext/standard/tests/strings/crypt_sha512.phpt
+++ b/ext/standard/tests/strings/crypt_sha512.phpt
@@ -5,7 +5,7 @@ crypt() SHA-512
 if (!function_exists('crypt') || !defined("CRYPT_SHA512")) {
 	die("SKIP crypt()-sha512 is not available");
 }
-?> 
+?>
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/crypt_variation1.phpt b/ext/standard/tests/strings/crypt_variation1.phpt
index 6e0d3fe1215..a0d4665f994 100644
--- a/ext/standard/tests/strings/crypt_variation1.phpt
+++ b/ext/standard/tests/strings/crypt_variation1.phpt
@@ -5,7 +5,7 @@ crypt() function - long salt
 if (!function_exists('crypt')) {
 	die("SKIP crypt() is not available");
 }
-?> 
+?>
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/dirname_basic.phpt b/ext/standard/tests/strings/dirname_basic.phpt
index 33fee611e0b..9006b27619d 100644
--- a/ext/standard/tests/strings/dirname_basic.phpt
+++ b/ext/standard/tests/strings/dirname_basic.phpt
@@ -16,18 +16,18 @@ $file_paths = array (
   "/foo/bar/",
   "foo/bar/",
   "/bar/",
-  
+
   /* path with only files and trailing slashes*/
   "/foo/bar.gz",
   "foo/bar.gz",
   "bar.gz",
   "bar.gz/",
-  "/bar.gz",  
+  "/bar.gz",
   "/bar.gz/",
   "/foo/bar.gz/",
   "foo/bar.gz/",
-  "/bar.gz/",  
- 
+  "/bar.gz/",
+
   /* path with file extension and trailing slashes */
   "/.gz",
   ".gz",
@@ -49,7 +49,7 @@ function check_dirname( $paths ) {
    $noOfPaths = count($paths);
    for( ; $loop_counter < $noOfPaths; $loop_counter++ ) {
      echo "\n--Iteration ";
-     echo $loop_counter + 1; 
+     echo $loop_counter + 1;
      echo " --\n";
      var_dump( dirname($paths[$loop_counter]) );
    }
diff --git a/ext/standard/tests/strings/dirname_error.phpt b/ext/standard/tests/strings/dirname_error.phpt
index 303a59b2d57..98a9ea5b456 100644
--- a/ext/standard/tests/strings/dirname_error.phpt
+++ b/ext/standard/tests/strings/dirname_error.phpt
@@ -6,7 +6,7 @@ Test dirname() function : error conditions
    Description: Returns directory name component of path.
 */
 echo "*** Testing error conditions ***\n";
-// zero arguments 
+// zero arguments
 var_dump( dirname() );
 
 // Bad arg
diff --git a/ext/standard/tests/strings/dirname_variation.phpt b/ext/standard/tests/strings/dirname_variation.phpt
index da66f0fc55c..71a2e4db2e5 100644
--- a/ext/standard/tests/strings/dirname_variation.phpt
+++ b/ext/standard/tests/strings/dirname_variation.phpt
@@ -6,7 +6,7 @@ Test dirname() function : usage variations
    Description: Returns directory name component of path.
 */
 class temp
-{ 
+{
    function __toString() {
      return "Object";
    }
@@ -26,7 +26,7 @@ $file_path_variations = array (
   "hostname:/home/user/My Pics.gz/",
   "hostname:/home/user/My Pics/",
   "hostname:/home/user/My Pics",
-  
+
   /* path containing numeric string */
   "10.5",
   "/10.5",
@@ -35,7 +35,7 @@ $file_path_variations = array (
   "10/10.gz",
   '0',
   "0",
-  
+
   /* object */
   new temp,
 
@@ -56,7 +56,7 @@ function check_dirname( $paths ) {
    for( ; $loop_counter < $noOfPaths; $loop_counter++ ) {
      echo "\n--Iteration ";
      echo $loop_counter +1;
-     echo " --\n"; 
+     echo " --\n";
      var_dump( dirname($paths[$loop_counter]) );
    }
 }
diff --git a/ext/standard/tests/strings/explode1.phpt b/ext/standard/tests/strings/explode1.phpt
index 669b66272da..68429476057 100644
--- a/ext/standard/tests/strings/explode1.phpt
+++ b/ext/standard/tests/strings/explode1.phpt
@@ -6,9 +6,9 @@ precision=14
 --FILE--
 <?php
 /* Prototype: array explode ( string $delimiter, string $string [, int $limit] );
-   Description: Returns an array of strings, each of which is a substring of string 
+   Description: Returns an array of strings, each of which is a substring of string
                 formed by splitting it on boundaries formed by the string delimiter.
-                If limit is set, the returned array will contain a maximum of limit 
+                If limit is set, the returned array will contain a maximum of limit
                 elements with the last element containing the rest of string.
 */
 
@@ -28,7 +28,7 @@ $delimiters = array (
 );
 $string = "1234NULL23abcd00000TRUEFALSE-11.234444true-11.24%PHP%ZEND";
 /* loop prints an array of strings, each of which is a substring of $string
-   formed by splitting it on boundaries formed by the string $delimiter. 
+   formed by splitting it on boundaries formed by the string $delimiter.
  */
 $counter = 1;
 foreach($delimiters as $delimiter) {
@@ -51,7 +51,7 @@ echo "\n-- Passing limit values 0 and 1 to explode() --\n";
 var_dump( explode(":", "Name:Phone:Address:City:State", 0) );
 var_dump( explode(":", "Name:Phone:Address:City:State", 1) );
 
-/* to check the maximum limit of string that can be given with limit<=0, 
+/* to check the maximum limit of string that can be given with limit<=0,
    default size is 50 but increases dynamically */
 echo "\n*** Testing explode() for maximum limit of string with Limit = -1 ***\n";
 var_dump( explode(":", "1:2:3:4:5:6:7:7:5:6:7:3:4:5:2:8:9:0:5:5:5:5:5:5:5:5:5:5:5:5:55:5:5:5%:%:%:%:5:5:5:%:%:5:5:5:5:5%:%:%:55:1:1", -1) );
diff --git a/ext/standard/tests/strings/explode_variation1.phpt b/ext/standard/tests/strings/explode_variation1.phpt
index f16f69bece1..7ced1dc822d 100644
--- a/ext/standard/tests/strings/explode_variation1.phpt
+++ b/ext/standard/tests/strings/explode_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $delimiters =  array (
 		  256,
 	      2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/explode_variation2.phpt b/ext/standard/tests/strings/explode_variation2.phpt
index 4de4637ac14..9377f308422 100644
--- a/ext/standard/tests/strings/explode_variation2.phpt
+++ b/ext/standard/tests/strings/explode_variation2.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $strings =  array (
 		  256,
 	      2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/explode_variation3.phpt b/ext/standard/tests/strings/explode_variation3.phpt
index 37574e11a4b..d60d26bec6b 100644
--- a/ext/standard/tests/strings/explode_variation3.phpt
+++ b/ext/standard/tests/strings/explode_variation3.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $limits =  array (
 		  256,
 	      2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e5,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/explode_variation6.phpt b/ext/standard/tests/strings/explode_variation6.phpt
index d1b34e3ef8f..14b6d401a25 100644
--- a/ext/standard/tests/strings/explode_variation6.phpt
+++ b/ext/standard/tests/strings/explode_variation6.phpt
@@ -33,10 +33,10 @@ $e = test_explode("\x00", $str, 100);
 function test_explode($delim, $string, $limit)
 {
 	$e = explode($delim, $string, $limit);
-	foreach ( $e as $v) 
+	foreach ( $e as $v)
 	{
 		var_dump(bin2hex($v));
-	}	
+	}
 }
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt
index 1a908efdb41..95a54689121 100644
--- a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt
@@ -17,7 +17,7 @@ asort( $tt );
 var_dump( $tt );
 
 echo "-- with table = HTML_SPECIALCHARS --\n";
-$table = HTML_SPECIALCHARS; 
+$table = HTML_SPECIALCHARS;
 $tt = get_html_translation_table($table, ENT_COMPAT, "WINDOWS-1252");
 asort( $tt );
 var_dump( $tt );
diff --git a/ext/standard/tests/strings/get_html_translation_table_basic5.phpt b/ext/standard/tests/strings/get_html_translation_table_basic5.phpt
index e60443050d1..86f19f3a660 100644
--- a/ext/standard/tests/strings/get_html_translation_table_basic5.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_basic5.phpt
@@ -22,7 +22,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_HTML5, "UTF-8");
 var_dump( count($tt) );
 
 echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n";
-$table = HTML_SPECIALCHARS; 
+$table = HTML_SPECIALCHARS;
 $tt = get_html_translation_table($table, ENT_COMPAT, "UTF-8");
 asort( $tt );
 var_dump( count($tt) );
diff --git a/ext/standard/tests/strings/get_html_translation_table_basic6.phpt b/ext/standard/tests/strings/get_html_translation_table_basic6.phpt
index 52ba2f44f32..1715b0852bf 100644
--- a/ext/standard/tests/strings/get_html_translation_table_basic6.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_basic6.phpt
@@ -25,7 +25,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_HTML5, "Windows-1251
 var_dump( count($tt) );
 
 echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n";
-$table = HTML_SPECIALCHARS; 
+$table = HTML_SPECIALCHARS;
 $tt = get_html_translation_table($table, ENT_COMPAT, "Windows-1251");
 uksort( $tt, 'so' );
 var_dump( count($tt) );
diff --git a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt
index 98ebbb9ac49..4e5c5afc14f 100644
--- a/ext/standard/tests/strings/get_html_translation_table_basic7.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_basic7.phpt
@@ -23,7 +23,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_XHTML, "UTF-8");
 var_dump( count($tt) );
 
 echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n";
-$table = HTML_SPECIALCHARS; 
+$table = HTML_SPECIALCHARS;
 $tt = get_html_translation_table($table, ENT_COMPAT, "UTF-8");
 asort( $tt );
 var_dump( count($tt) );
diff --git a/ext/standard/tests/strings/get_html_translation_table_basic8.phpt b/ext/standard/tests/strings/get_html_translation_table_basic8.phpt
index 8f8ca580ea8..a3813262f79 100644
--- a/ext/standard/tests/strings/get_html_translation_table_basic8.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_basic8.phpt
@@ -22,7 +22,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_XML1, "UTF-8");
 var_dump( count($tt) );
 
 echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n";
-$table = HTML_SPECIALCHARS; 
+$table = HTML_SPECIALCHARS;
 $tt = get_html_translation_table($table, ENT_COMPAT, "UTF-8");
 asort( $tt );
 var_dump( count($tt) );
diff --git a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt
index cd32cccd5f4..6e144c0c510 100644
--- a/ext/standard/tests/strings/get_html_translation_table_basic9.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_basic9.phpt
@@ -23,7 +23,7 @@ $tt = get_html_translation_table($table, ENT_NOQUOTES | ENT_HTML5, "SJIS");
 var_dump( count($tt) );
 
 echo "-- with table = HTML_SPECIALCHARS, ENT_COMPAT --\n";
-$table = HTML_SPECIALCHARS; 
+$table = HTML_SPECIALCHARS;
 $tt = get_html_translation_table($table, ENT_COMPAT, "SJIS");
 asort( $tt );
 var_dump( count($tt) );
diff --git a/ext/standard/tests/strings/get_html_translation_table_error.phpt b/ext/standard/tests/strings/get_html_translation_table_error.phpt
index 149adbc197b..5adfe984780 100644
--- a/ext/standard/tests/strings/get_html_translation_table_error.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test get_html_translation_table() function : error conditions 
+Test get_html_translation_table() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array get_html_translation_table ( [int $table [, int $quote_style [, string charset_hint]]] )
diff --git a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
index ec4075b5ec9..72aec086485 100644
--- a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
@@ -8,7 +8,7 @@ Test get_html_translation_table() function : usage variations - unexpected table
 */
 
 /*
- * test get_html_translation_table() with unexpected value for argument $table 
+ * test get_html_translation_table() with unexpected value for argument $table
 */
 
 echo "*** Testing get_html_translation_table() : usage variations ***\n";
@@ -19,7 +19,7 @@ $quote_style = ENT_COMPAT;
 $unset_var = 10;
 unset($unset_var);
 
-// a resource variable 
+// a resource variable
 $fp = fopen(__FILE__, "r");
 
 // array with different values
@@ -81,7 +81,7 @@ for($index = 0; $index < count($values); $index ++) {
    } else {
     var_dump($v);
    }
-   
+
   $v = get_html_translation_table($table, $quote_style, "UTF-8");
   if (is_array($v) && count($v) > 100)
     var_dump(count($v));
diff --git a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
index 67acf42ff72..459cd4fcd5f 100644
--- a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
@@ -57,7 +57,7 @@ $values =  array (
   null,
 
   // resource var
-  $fp, 
+  $fp,
 
   // undefined variable
   @$undefined_var,
diff --git a/ext/standard/tests/strings/get_meta_tags.phpt b/ext/standard/tests/strings/get_meta_tags.phpt
index f086b99b76b..ba944d7a95a 100644
--- a/ext/standard/tests/strings/get_meta_tags.phpt
+++ b/ext/standard/tests/strings/get_meta_tags.phpt
@@ -55,7 +55,7 @@ foreach ($array as $html) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(4) {
   ["author"]=>
   string(4) "name"
diff --git a/ext/standard/tests/strings/hebrev_basic.phpt b/ext/standard/tests/strings/hebrev_basic.phpt
index 2f53c6fc294..f583152047d 100644
--- a/ext/standard/tests/strings/hebrev_basic.phpt
+++ b/ext/standard/tests/strings/hebrev_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test hebrev() function : basic functionality 
+Test hebrev() function : basic functionality
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/hebrev_error.phpt b/ext/standard/tests/strings/hebrev_error.phpt
index 8abf68cd70b..a04e519db53 100644
--- a/ext/standard/tests/strings/hebrev_error.phpt
+++ b/ext/standard/tests/strings/hebrev_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test hebrev() function : error conditions 
+Test hebrev() function : error conditions
 --FILE--
 <?php
 
@@ -17,7 +17,7 @@ echo "\n-- Testing hebrev() function with more than expected no. of arguments --
 $extra_arg = 10;
 var_dump( hebrev("Hello World", 5, $extra_arg) );
 
-?> 
+?>
 ===DONE===
 --EXPECTF--
 *** Testing hebrev() : error conditions ***
@@ -31,5 +31,4 @@ NULL
 
 Warning: hebrev() expects at most 2 parameters, 3 given in %s on line %d
 NULL
- 
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/strings/hebrev_variation1.phpt b/ext/standard/tests/strings/hebrev_variation1.phpt
index 23a4c231452..33fd974eb7c 100644
--- a/ext/standard/tests/strings/hebrev_variation1.phpt
+++ b/ext/standard/tests/strings/hebrev_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $texts =  array (
 		  256,
 	      2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e5,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var,
 
diff --git a/ext/standard/tests/strings/hebrev_variation2.phpt b/ext/standard/tests/strings/hebrev_variation2.phpt
index 5698cde793c..2c72588b42b 100644
--- a/ext/standard/tests/strings/hebrev_variation2.phpt
+++ b/ext/standard/tests/strings/hebrev_variation2.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,43 +34,43 @@ $inputs =  array (
 		  256,
 	      2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e5,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		  
+
 		  // string values
 /*19*/	  "abc",
 		  'abc',
 		  "3abc",
 		  "0abc",
 		  "0x3",
-		
+
 		  // objects
 /*24*/	  new sample(),
-		
+
 		  // resource
 /*25*/	  $file_handle,
-		
+
 		  // undefined variable
 /*26*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*27*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/hebrevc_basic.phpt b/ext/standard/tests/strings/hebrevc_basic.phpt
index 9d9a7137c2a..1066a4fcb03 100644
--- a/ext/standard/tests/strings/hebrevc_basic.phpt
+++ b/ext/standard/tests/strings/hebrevc_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test hebrevc() function : basic functionality 
+Test hebrevc() function : basic functionality
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/hebrevc_error.phpt b/ext/standard/tests/strings/hebrevc_error.phpt
index f75abb3a4d8..630c995b18f 100644
--- a/ext/standard/tests/strings/hebrevc_error.phpt
+++ b/ext/standard/tests/strings/hebrevc_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test hebrevc() function : error conditions 
+Test hebrevc() function : error conditions
 --FILE--
 <?php
 
@@ -17,7 +17,7 @@ echo "\n-- Testing hebrevc() function with more than expected no. of arguments -
 $extra_arg = 10;
 var_dump( hebrevc("Hello World", 5, $extra_arg) );
 
-?> 
+?>
 ===DONE===
 --EXPECTF--
 *** Testing hebrevc() : error conditions ***
@@ -31,5 +31,4 @@ NULL
 
 Warning: hebrevc() expects at most 2 parameters, 3 given in %s on line %d
 NULL
- 
 ===DONE===
diff --git a/ext/standard/tests/strings/hebrevc_variation1.phpt b/ext/standard/tests/strings/hebrevc_variation1.phpt
index 92c6ffabb99..c16780e769c 100644
--- a/ext/standard/tests/strings/hebrevc_variation1.phpt
+++ b/ext/standard/tests/strings/hebrevc_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $texts =  array (
 		  256,
 	      2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e5,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/hebrevc_variation2.phpt b/ext/standard/tests/strings/hebrevc_variation2.phpt
index e6a6013931f..33c331b94c3 100644
--- a/ext/standard/tests/strings/hebrevc_variation2.phpt
+++ b/ext/standard/tests/strings/hebrevc_variation2.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,43 +34,43 @@ $inputs =  array (
 		  256,
 	      2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e5,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		  
+
 		  // string values
 /*19*/	  "abc",
 		  'abc',
 		  "3abc",
 		  "0abc",
 		  "0x3",
-		
+
 		  // objects
 /*24*/	  new sample(),
-		
+
 		  // resource
 /*25*/	  $file_handle,
-		
+
 		  // undefined variable
 /*26*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*27*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/highlight_file.phpt b/ext/standard/tests/strings/highlight_file.phpt
index d1a0323c58e..65636908e61 100644
--- a/ext/standard/tests/strings/highlight_file.phpt
+++ b/ext/standard/tests/strings/highlight_file.phpt
@@ -36,7 +36,7 @@ var_dump(highlight_file($filename));
 @unlink($filename);
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: highlight_file() expects at least 1 parameter, 0 given in %s on line %d
 bool(false)
 
diff --git a/ext/standard/tests/strings/html_entity_decode_cp866.phpt b/ext/standard/tests/strings/html_entity_decode_cp866.phpt
index 76323be30b2..18f6f3c90b8 100644
--- a/ext/standard/tests/strings/html_entity_decode_cp866.phpt
+++ b/ext/standard/tests/strings/html_entity_decode_cp866.phpt
@@ -138,7 +138,7 @@ foreach ($arr as $u => $v) {
     $res = html_entity_decode($ent, ENT_QUOTES, 'CP866');
     $d = unpack("H*", $res);
     echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]);
-    
+
     $ent = sprintf("&#x%X;", $v[0]);
     $res = html_entity_decode($ent, ENT_QUOTES, 'CP866');
     if ($res[0] != "&" || $res[1] != "#")
diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt
index a3be8f36682..09fd5df02b3 100644
--- a/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt
+++ b/ext/standard/tests/strings/html_entity_decode_iso8859-15.phpt
@@ -106,7 +106,7 @@ foreach ($arr as $u => $v) {
     $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-15');
     $d = unpack("H*", $res);
     echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]);
-    
+
     $ent = sprintf("&#x%X;", $v[0]);
     $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-15');
     if ($res[0] != "&" || $res[1] != "#")
diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt
index 6a65413c9c6..070ed536f4e 100644
--- a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt
+++ b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt
@@ -106,7 +106,7 @@ foreach ($arr as $u => $v) {
     $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-5');
     $d = unpack("H*", $res);
     echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]);
-    
+
     $ent = sprintf("&#x%X;", $v[0]);
     $res = html_entity_decode($ent, ENT_QUOTES, 'ISO-8859-5');
     if ($res[0] != "&" || $res[1] != "#")
diff --git a/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt b/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt
index cb7fc7d1d85..e8523f6a096 100644
--- a/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt
+++ b/ext/standard/tests/strings/html_entity_decode_koi8-r.phpt
@@ -138,7 +138,7 @@ foreach ($arr as $u => $v) {
     $res = html_entity_decode($ent, ENT_QUOTES, 'KOI8-R');
     $d = unpack("H*", $res);
     echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]);
-    
+
     $ent = sprintf("&#x%X;", $v[0]);
     $res = html_entity_decode($ent, ENT_QUOTES, 'KOI8-R');
     if ($res[0] != "&" || $res[1] != "#")
diff --git a/ext/standard/tests/strings/html_entity_decode_macroman.phpt b/ext/standard/tests/strings/html_entity_decode_macroman.phpt
index 4691bcf1a7e..4f500dc4e7f 100644
--- a/ext/standard/tests/strings/html_entity_decode_macroman.phpt
+++ b/ext/standard/tests/strings/html_entity_decode_macroman.phpt
@@ -142,7 +142,7 @@ foreach ($arr as $u => $v) {
     $res = html_entity_decode($ent, ENT_QUOTES, 'MacRoman');
     $d = unpack("H*", $res);
     echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]);
-    
+
     $ent = sprintf("&#x%X;", $v[0]);
     $res = html_entity_decode($ent, ENT_QUOTES, 'MacRoman');
     if ($res[0] != "&" || $res[1] != "#")
diff --git a/ext/standard/tests/strings/html_entity_decode_win1251.phpt b/ext/standard/tests/strings/html_entity_decode_win1251.phpt
index e47392623c9..e60d7074bf8 100644
--- a/ext/standard/tests/strings/html_entity_decode_win1251.phpt
+++ b/ext/standard/tests/strings/html_entity_decode_win1251.phpt
@@ -142,7 +142,7 @@ foreach ($arr as $u => $v) {
     $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1251');
     $d = unpack("H*", $res);
     echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]);
-    
+
     $ent = sprintf("&#x%X;", $v[0]);
     $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1251');
     if ($res[0] != "&" || $res[1] != "#")
diff --git a/ext/standard/tests/strings/html_entity_decode_win1252.phpt b/ext/standard/tests/strings/html_entity_decode_win1252.phpt
index 2a7a6981dc3..6163ef24aea 100644
--- a/ext/standard/tests/strings/html_entity_decode_win1252.phpt
+++ b/ext/standard/tests/strings/html_entity_decode_win1252.phpt
@@ -62,7 +62,7 @@ foreach ($arr as $u => $v) {
     $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1252');
     $d = unpack("H*", $res);
     echo sprintf("%s: %s => %s\n", $v[1], $ent, $d[1]);
-    
+
     $ent = sprintf("&#x%X;", $v[0]);
     $res = html_entity_decode($ent, ENT_QUOTES, 'WINDOWS-1252');
     if ($res[0] != "&" || $res[1] != "#")
diff --git a/ext/standard/tests/strings/htmlentities-utf-2.phpt b/ext/standard/tests/strings/htmlentities-utf-2.phpt
index 81c974cbf87..25391d57526 100644
--- a/ext/standard/tests/strings/htmlentities-utf-2.phpt
+++ b/ext/standard/tests/strings/htmlentities-utf-2.phpt
@@ -3,9 +3,9 @@ HTML entities with invalid chars and ENT_IGNORE
 --INI--
 output_handler=
 --FILE--
-<?php 
+<?php
 @setlocale (LC_CTYPE, "C");
-$strings = array("<", "\xD0", "\xD0\x90", "\xD0\x90\xD0", "\xD0\x90\xD0\xB0", "\xE0", "A\xE0", "\xE0\x80", "\xE0\x79", "\xE0\x80\xBE", 
+$strings = array("<", "\xD0", "\xD0\x90", "\xD0\x90\xD0", "\xD0\x90\xD0\xB0", "\xE0", "A\xE0", "\xE0\x80", "\xE0\x79", "\xE0\x80\xBE",
 	"Voil\xE0", "Clich\xE9s",
 	"\xFE", "\xFE\x41", "\xC3\xA9", "\xC3\x79", "\xF7\xBF\xBF\xBF", "\xFB\xBF\xBF\xBF\xBF", "\xFD\xBF\xBF\xBF\xBF\xBF",
 	"\x41\xF7\xF7\x42", "\x42\xFB\xFB\x42", "\x43\xFD\xFD\x42", "\x44\xF7\xF7", "\x45\xFB\xFB", "\x46\xFD\xFD"
diff --git a/ext/standard/tests/strings/htmlentities-utf.phpt b/ext/standard/tests/strings/htmlentities-utf.phpt
index 0dc5b8030cb..6ad1920343a 100644
--- a/ext/standard/tests/strings/htmlentities-utf.phpt
+++ b/ext/standard/tests/strings/htmlentities-utf.phpt
@@ -3,7 +3,7 @@ HTML entities with invalid chars
 --INI--
 output_handler=
 --FILE--
-<?php 
+<?php
 @setlocale (LC_CTYPE, "C");
 $strings = array("<", "\xD0", "\xD0\x90", "\xD0\x90\xD0", "\xD0\x90\xD0\xB0", "\xE0", "A\xE0", "\xE0\x80", "\xE0\x79", "\xE0\x80\xBE",
 	"Voil\xE0", "Clich\xE9s",
diff --git a/ext/standard/tests/strings/htmlentities.phpt b/ext/standard/tests/strings/htmlentities.phpt
index f2e107a7355..5f54ee6753a 100644
--- a/ext/standard/tests/strings/htmlentities.phpt
+++ b/ext/standard/tests/strings/htmlentities.phpt
@@ -3,7 +3,7 @@ HTML entities of ISO-8859 chars
 --INI--
 output_handler=
 --FILE--
-<?php 
+<?php
 setlocale (LC_CTYPE, "C");
 $sc_encoded = htmlspecialchars ("<>\"&åÄ\n",ENT_COMPAT,"ISO-8859-1");
 echo $sc_encoded;
diff --git a/ext/standard/tests/strings/htmlentities02.phpt b/ext/standard/tests/strings/htmlentities02.phpt
index 5d708c21c8f..161f02e24a5 100644
--- a/ext/standard/tests/strings/htmlentities02.phpt
+++ b/ext/standard/tests/strings/htmlentities02.phpt
@@ -1,5 +1,5 @@
 --TEST--
-htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15) 
+htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15)
 --SKIPIF--
 <?php
 $result = (bool)setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15", 'fr_FR@euro');
diff --git a/ext/standard/tests/strings/htmlentities20.phpt b/ext/standard/tests/strings/htmlentities20.phpt
index 92c996bcb4e..ff52aca07ac 100644
--- a/ext/standard/tests/strings/htmlentities20.phpt
+++ b/ext/standard/tests/strings/htmlentities20.phpt
@@ -6,7 +6,7 @@ function codepoint_to_utf8($k) {
 	if ($k < 0x80) {
 		$retval = pack('C', $k);
 	} else if ($k < 0x800) {
-		$retval = pack('C2', 
+		$retval = pack('C2',
             0xc0 | ($k >> 6),
             0x80 | ($k & 0x3f));
 	} else if ($k < 0x10000) {
diff --git a/ext/standard/tests/strings/htmlentities22.phpt b/ext/standard/tests/strings/htmlentities22.phpt
index f11982044d3..82dae2ba083 100644
--- a/ext/standard/tests/strings/htmlentities22.phpt
+++ b/ext/standard/tests/strings/htmlentities22.phpt
@@ -40,7 +40,7 @@ function test($flag, $flag2=ENT_DISALLOWED, $charset="UTF-8") {
         $i++;
         $a = htmlentities($test, $flag | $flag2, $charset, FALSE);
         $b = htmlspecialchars($test, $flag | $flag2, $charset, FALSE);
-        
+
         if ($a == $b)
             echo sprintf("%s\t%s", $test, $a==$test?"NOT CHANGED":"CHANGED"), "\n";
         else
diff --git a/ext/standard/tests/strings/htmlentities_html4.phpt b/ext/standard/tests/strings/htmlentities_html4.phpt
index 22b0305ced1..5d784c2af54 100644
--- a/ext/standard/tests/strings/htmlentities_html4.phpt
+++ b/ext/standard/tests/strings/htmlentities_html4.phpt
@@ -6,7 +6,7 @@ function utf32_utf8($k) {
 	if ($k < 0x80) {
 		$retval = pack('C', $k);
 	} else if ($k < 0x800) {
-		$retval = pack('C2', 
+		$retval = pack('C2',
             0xc0 | ($k >> 6),
             0x80 | ($k & 0x3f));
 	} else if ($k < 0x10000) {
diff --git a/ext/standard/tests/strings/htmlentities_html5.phpt b/ext/standard/tests/strings/htmlentities_html5.phpt
index e7c216a292d..427ba0bc354 100644
--- a/ext/standard/tests/strings/htmlentities_html5.phpt
+++ b/ext/standard/tests/strings/htmlentities_html5.phpt
@@ -6,7 +6,7 @@ function utf32_utf8($k) {
 	if ($k < 0x80) {
 		$retval = pack('C', $k);
 	} else if ($k < 0x800) {
-		$retval = pack('C2', 
+		$retval = pack('C2',
             0xc0 | ($k >> 6),
             0x80 | ($k & 0x3f));
 	} else if ($k < 0x10000) {
diff --git a/ext/standard/tests/strings/htmlspecialchars_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_basic.phpt
index 3ef932a70b5..44396b0e2bb 100644
--- a/ext/standard/tests/strings/htmlspecialchars_basic.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test htmlspecialchars() function : basic functionality 
+Test htmlspecialchars() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string htmlspecialchars  ( string $string  [, int $quote_style  [, string $charset  [, bool $double_encode  ]]] )
diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt
index dc027398d50..cd78c32206c 100644
--- a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt
@@ -1,16 +1,16 @@
 --TEST--
-Test htmlspecialchars_decode() function : basic functionality 
+Test htmlspecialchars_decode() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string htmlspecialchars_decode(string $string [, int $quote_style])
- * Description: Convert special HTML entities back to characters 
+ * Description: Convert special HTML entities back to characters
  * Source code: ext/standard/html.c
 */
 
 echo "*** Testing htmlspecialchars_decode() : basic functionality ***\n";
 
 
-// Initialise arguments 
+// Initialise arguments
 //value initialized = Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. "double quoted string"
 $single_quote_string = "Roy&#039;s height &gt; Sam&#039;s height. 13 &lt; 25. 1111 &amp; 0000 = 0000. &quot; double quoted string &quot;";
 $double_quote_string = "Roy&#039;s height &gt; Sam&#039;s height. 13 &lt; 25. 1111 &amp; 0000 = 0000. &quot; double quoted string &quot;";
@@ -21,7 +21,7 @@ var_dump( htmlspecialchars_decode($double_quote_string) );
 
 // Calling htmlspecialchars_decode() with optional 'quote_style' argument
 var_dump( htmlspecialchars_decode($single_quote_string, ENT_COMPAT) );
-var_dump( htmlspecialchars_decode($double_quote_string, ENT_COMPAT) );   
+var_dump( htmlspecialchars_decode($double_quote_string, ENT_COMPAT) );
 var_dump( htmlspecialchars_decode($single_quote_string, ENT_NOQUOTES) );
 var_dump( htmlspecialchars_decode($double_quote_string, ENT_NOQUOTES) );
 var_dump( htmlspecialchars_decode($single_quote_string, ENT_QUOTES) );
diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt
index f4201d2842d..36b8e6bbec8 100644
--- a/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars_decode_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test htmlspecialchars_decode() function : error conditions 
+Test htmlspecialchars_decode() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string htmlspecialchars_decode(string $string [, int $quote_style])
- * Description: Convert special HTML entities back to characters 
+ * Description: Convert special HTML entities back to characters
  * Source code: ext/standard/html.c
 */
 
diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt
index 2bbe274d714..4b4af9c63f4 100644
--- a/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt
@@ -3,7 +3,7 @@ Test htmlspecialchars_decode() function : usage variations - unexpected values f
 --FILE--
 <?php
 /* Prototype  : string htmlspecialchars_decode(string $string [, int $quote_style])
- * Description: Convert special HTML entities back to characters 
+ * Description: Convert special HTML entities back to characters
  * Source code: ext/standard/html.c
 */
 
@@ -14,7 +14,7 @@ Test htmlspecialchars_decode() function : usage variations - unexpected values f
 echo "*** Testing htmlspecialchars_decode() : usage variations ***\n";
 
 //get a class
-class classA 
+class classA
 {
   function __toString() {
     return "ClassAObject";
diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt
index 837583c224a..da53b0dcc1c 100644
--- a/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt
@@ -3,7 +3,7 @@ Test htmlspecialchars_decode() function : usage variations - unexpected values f
 --FILE--
 <?php
 /* Prototype  : string htmlspecialchars_decode(string $string [, int $quote_style])
- * Description: Convert special HTML entities back to characters 
+ * Description: Convert special HTML entities back to characters
  * Source code: ext/standard/html.c
 */
 
@@ -14,7 +14,7 @@ Test htmlspecialchars_decode() function : usage variations - unexpected values f
 echo "*** Testing htmlspecialchars_decode() : usage variations ***\n";
 
 // Initialise function arguments
-// value initialized = Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string " 
+// value initialized = Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string "
 $string = "<html>Roy&#039;s height &gt; Sam&#039;s height. 13 &lt; 15. 1111 &amp; 0000 = 0000. &quot; double quote string &quot;</html>";
 
 //get a class
diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt
index b36556f1a27..451a3260010 100644
--- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt
@@ -7,7 +7,7 @@ Test htmlspecialchars_decode() function : usage variations - heredoc strings for
  * Source code: ext/standard/html.c
 */
 
-/* 
+/*
  * testing htmlspecialchars_decode() with various heredoc strings as argument for $string
 */
 
diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt
index e51e904feab..65b5c58b964 100644
--- a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt
@@ -21,7 +21,7 @@ $values = array (
   '\r\tRoy&#039;s height &gt\r; Sam\t&#039;s height',
   '\n 1\t3 &\tgt; 11 but 11 &\tlt; 12',
 );
-  
+
 // loop through each element of the values array to check htmlspecialchars_decode() function with all possible arguments
 $iterator = 1;
 foreach($values as $value) {
diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt
index 307cfe6d90d..a57abd21c4b 100644
--- a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt
@@ -8,7 +8,7 @@ Test htmlspecialchars_decode() function : usage variations - double quoted strin
 */
 
 /*
- * testing htmlspecialchars_decode() for various double quoted strings as argument for $string 
+ * testing htmlspecialchars_decode() for various double quoted strings as argument for $string
 */
 echo "*** Testing htmlspecialchars_decode() : usage variations ***\n";
 
@@ -20,7 +20,7 @@ $strings = array (
   "\r\tRoy&#039;s height &gt\r; Sam\t&#039;s height",
   "\n 1\t3 &\tgt; 11 but 11 &\tlt; 12",
 );
-  
+
 // loop through each element of the array to check htmlspecialchars_decode() function with all possible arguments
 $iterator = 1;
 foreach($strings as $value) {
diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt
index 7b1295c54e0..7991547d3b3 100644
Binary files a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt and b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt differ
diff --git a/ext/standard/tests/strings/http_build_query_variation1.phpt b/ext/standard/tests/strings/http_build_query_variation1.phpt
index 56d81c9fddd..4532fe18af5 100644
--- a/ext/standard/tests/strings/http_build_query_variation1.phpt
+++ b/ext/standard/tests/strings/http_build_query_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test http_build_query() function: usage variations - first arguments as object 
+Test http_build_query() function: usage variations - first arguments as object
 --CREDITS--
 Adam Gegotek <adam [dot] gegotek [at] gmail [dot] com>
 --FILE--
 <?php
 /* Prototype  : string http_build_query ( mixed $query_data [, string $numeric_prefix [, string $arg_separator [, int $enc_type = PHP_QUERY_RFC1738 ]]] )
- * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. 
+ * Description: Generates a URL-encoded query string from the associative (or indexed) array provided.
  * Source code: ext/standard/http.c
 */
 
diff --git a/ext/standard/tests/strings/http_build_query_variation2.phpt b/ext/standard/tests/strings/http_build_query_variation2.phpt
index ca1d8f459a1..07b362352d1 100644
--- a/ext/standard/tests/strings/http_build_query_variation2.phpt
+++ b/ext/standard/tests/strings/http_build_query_variation2.phpt
@@ -5,26 +5,26 @@ Adam Gegotek <adam [dot] gegotek [at] gmail [dot] com>
 --FILE--
 <?php
 /* Prototype  : string http_build_query ( mixed $query_data [, string $numeric_prefix [, string $arg_separator [, int $enc_type = PHP_QUERY_RFC1738 ]]] )
- * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. 
+ * Description: Generates a URL-encoded query string from the associative (or indexed) array provided.
  * Source code: ext/standard/http.c
 */
 
 $mDimensional = array(
-  20, 
-  5 => 13, 
+  20,
+  5 => 13,
   "9" => array(
-    1 => "val1", 
-    3 => "val2", 
+    1 => "val1",
+    3 => "val2",
     "string" => "string"
   ),
-  "name" => "homepage", 
+  "name" => "homepage",
   "page" => 10,
   "sort" => array(
-    "desc", 
+    "desc",
     "admin" => array(
-      "admin1", 
+      "admin1",
       "admin2" => array(
-        "who" => "admin2", 
+        "who" => "admin2",
         2 => "test"
       )
     )
diff --git a/ext/standard/tests/strings/http_build_query_variation3.phpt b/ext/standard/tests/strings/http_build_query_variation3.phpt
index 350f3c8661c..5b9ea371d20 100644
--- a/ext/standard/tests/strings/http_build_query_variation3.phpt
+++ b/ext/standard/tests/strings/http_build_query_variation3.phpt
@@ -5,7 +5,7 @@ Adam Gegotek <adam [dot] gegotek [at] gmail [dot] com>
 --FILE--
 <?php
 /* Prototype  : string http_build_query ( mixed $query_data [, string $numeric_prefix [, string $arg_separator [, int $enc_type = PHP_QUERY_RFC1738 ]]] )
- * Description: Generates a URL-encoded query string from the associative (or indexed) array provided. 
+ * Description: Generates a URL-encoded query string from the associative (or indexed) array provided.
  * Source code: ext/standard/http.c
 */
 
diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt
index 3720c069276..d5de391e967 100644
Binary files a/ext/standard/tests/strings/implode1.phpt and b/ext/standard/tests/strings/implode1.phpt differ
diff --git a/ext/standard/tests/strings/join_basic.phpt b/ext/standard/tests/strings/join_basic.phpt
index 164c4613a0b..44e7f093c81 100644
--- a/ext/standard/tests/strings/join_basic.phpt
+++ b/ext/standard/tests/strings/join_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test join() function : basic functionality 
+Test join() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string join( string $glue, array $pieces )
diff --git a/ext/standard/tests/strings/join_error.phpt b/ext/standard/tests/strings/join_error.phpt
index b283bf4cdbd..36ee9d7ba6c 100644
--- a/ext/standard/tests/strings/join_error.phpt
+++ b/ext/standard/tests/strings/join_error.phpt
@@ -22,10 +22,10 @@ $extra_arg = 10;
 
 var_dump( join($glue, $pieces, $extra_arg) );
 
-// Less than expected number of arguments 
+// Less than expected number of arguments
 echo "\n-- Testing join() with less than expected no. of arguments --\n";
 $glue = 'string_val';
- 
+
 var_dump( join($glue));
 
 echo "Done\n";
diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt
index e2635f05f8d..8c830c8d07b 100644
--- a/ext/standard/tests/strings/join_variation1.phpt
+++ b/ext/standard/tests/strings/join_variation1.phpt
@@ -71,7 +71,7 @@ $values =  array (
   // null vlaues
   NULL,
   null,
-  
+
   // resource variable
   $fp,
 
diff --git a/ext/standard/tests/strings/join_variation2.phpt b/ext/standard/tests/strings/join_variation2.phpt
index 46e91afd3bb..1cc4b5fe5c4 100644
--- a/ext/standard/tests/strings/join_variation2.phpt
+++ b/ext/standard/tests/strings/join_variation2.phpt
@@ -72,7 +72,7 @@ $values =  array (
 
   // resource variable
   $fp,
- 
+
   // undefined variable
   @$undefined_var,
 
diff --git a/ext/standard/tests/strings/join_variation3.phpt b/ext/standard/tests/strings/join_variation3.phpt
index 5b0ad5a5280..c3799cc01a5 100644
--- a/ext/standard/tests/strings/join_variation3.phpt
+++ b/ext/standard/tests/strings/join_variation3.phpt
@@ -9,7 +9,7 @@ Test join() function : usage variations - different values for 'pieces' argument
 */
 
 /*
- * test join() by giving different pieces values 
+ * test join() by giving different pieces values
 */
 
 echo "*** Testing join() : usage variations ***\n";
@@ -22,21 +22,21 @@ $pieces_arrays = array (
   array(), // empty array
   array(NULL), // array with NULL
   array("a","aaaa","b","bbbb","c","ccccc"),
-  
+
   // associative arrays
   array(1 => "one", 2 => "two", 3 => "three"),  // explicit numeric keys, string values
   array("one" => 1, "two" => 2, "three" => 3 ),  // string keys & numeric values
   array( 1 => 10, 2 => 20, 4 => 40, 3 => 30),  // explicit numeric keys and numeric values
   array( "one" => "ten", "two" => "twenty", "three" => "thirty"),  // string key/value
   array("one" => 1, 2 => "two", 4 => "four"),  //mixed
-  
+
   // associative array, containing null/empty/boolean values as key/value
   array(NULL => "NULL", null => "null", "NULL" => NULL, "null" => null),
   array(true => "true", false => "false", "false" => false, "true" => true),
   array("" => "emptyd", '' => 'emptys', "emptyd" => "", 'emptys' => ''),
   array(1 => '', 2 => "", 3 => NULL, 4 => null, 5 => false, 6 => true),
   array('' => 1, "" => 2, NULL => 3, null => 4, false => 5, true => 6),
-  
+
   // array with repetative keys
   array("One" => 1, "two" => 2, "One" => 10, "two" => 20, "three" => 3)
 );
@@ -44,14 +44,14 @@ $pieces_arrays = array (
 // a multichar glue value
 $glue = "], [";
 
-// loop through each $pieces_arrays element and call join() 
+// loop through each $pieces_arrays element and call join()
 $iteration = 1;
 for($index = 0; $index < count($pieces_arrays); $index ++) {
   echo "-- Iteration $iteration --\n";
   var_dump( join($glue, $pieces_arrays[$index]) );
   $iteration ++;
 }
- 
+
 echo "Done\n";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/strings/join_variation5.phpt b/ext/standard/tests/strings/join_variation5.phpt
index a02efd7767a..361f65bbc55 100644
--- a/ext/standard/tests/strings/join_variation5.phpt
+++ b/ext/standard/tests/strings/join_variation5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test join() function : usage variations - sub array as argument 
+Test join() function : usage variations - sub array as argument
 --FILE--
 <?php
 /* Prototype  : string join( string $glue, array $pieces )
diff --git a/ext/standard/tests/strings/join_variation6.phpt b/ext/standard/tests/strings/join_variation6.phpt
index 621b69521cc..71e7f9f42a3 100644
Binary files a/ext/standard/tests/strings/join_variation6.phpt and b/ext/standard/tests/strings/join_variation6.phpt differ
diff --git a/ext/standard/tests/strings/lcfirst.phpt b/ext/standard/tests/strings/lcfirst.phpt
index 9451ea80a3c..d09e51eef52 100644
Binary files a/ext/standard/tests/strings/lcfirst.phpt and b/ext/standard/tests/strings/lcfirst.phpt differ
diff --git a/ext/standard/tests/strings/levenshtein.phpt b/ext/standard/tests/strings/levenshtein.phpt
index 249b532da76..1ac05cf2ae7 100644
--- a/ext/standard/tests/strings/levenshtein.phpt
+++ b/ext/standard/tests/strings/levenshtein.phpt
@@ -1,11 +1,11 @@
 --TEST--
 levenshtein() function test
 --FILE--
-<?php 
- 
+<?php
+
 function test_me($title,$expect,$text1,$text2,$cost1="",$cost2="",$cost3="") {
- 
-  if ($cost1=="") { 
+
+  if ($cost1=="") {
           $result=levenshtein($text1,$text2);
   }
   elseif ($cost2=="") {
@@ -15,52 +15,52 @@ function test_me($title,$expect,$text1,$text2,$cost1="",$cost2="",$cost3="") {
     $result=levenshtein($text1,$text2,$cost1,$cost2,$cost3);
   }
         if($result==$expect) return 0;
-       
+
         echo "$title: result is $result instead of $expect ";
         echo "for '$text1'/'$text2' ";
         if($cost1) echo "($cost1:$cost2:$cost3)";
         echo "\n";
-        
+
         return 1;
 }
- 
+
 $n=0;
- 
+
 $n += test_me("equal"      , 0, "12345", "12345");
 $n += test_me("1st empty"  , 3,      "",   "xzy");
 $n += test_me("2nd empty"  , 3,   "xzy",      "");
 $n += test_me("both empty" , 0,      "",      "");
 $n += test_me("1 char"     , 1,     "1",     "2");
 $n += test_me("2 char swap", 2,    "12",    "21");
- 
+
 $n += test_me("inexpensive delete",  2, "2121",   "11", 2, 1, 1);
 $n += test_me("expensive delete"  , 10, "2121",   "11", 2, 1, 5);
 $n += test_me("inexpensive insert",  2,   "11", "2121", 1, 1, 1);
 $n += test_me("expensive insert"  , 10,   "11", "2121", 5, 1, 1);
- 
+
 $n += test_me("expensive replace"     , 3, "111", "121", 2, 3, 2);
 $n += test_me("very expensive replace", 4, "111", "121", 2, 9, 2);
- 
+
 $n += test_me("bug #7368", 2,     "13458",    "12345");
 $n += test_me("bug #7368", 2,      "1345",     "1234");
- 
+
 $n += test_me("bug #6562", 1,    "debugg",    "debug");
 $n += test_me("bug #6562", 1,    "ddebug",    "debug");
 $n += test_me("bug #6562", 2,   "debbbug",    "debug");
 $n += test_me("bug #6562", 1, "debugging", "debuging");
- 
+
 $n += test_me("bug #16473", 2, "a", "bc");
 $n += test_me("bug #16473", 2, "xa", "xbc");
 $n += test_me("bug #16473", 2, "xax", "xbcx");
 $n += test_me("bug #16473", 2, "ax", "bcx");
- 
+
 $n += test_me("custom", -1, "111", "121", "my_levcode");
 $n += test_me("lt maxlength1", 254, "AbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsu", "A");
 $n += test_me("gt maxlength1", -1, "AbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuv", "A");
- 
+
 $n += test_me("lt maxlength2", 254, "A", "AbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsu");
 $n += test_me("gt maxlength2", -1, "A",  "AbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrstuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuvwxyzAbcdefghijklmnopqrtsuv");
- 
+
 echo ($n==0)?"all passed\n":"$n failed\n";
 
 var_dump(levenshtein(array(), array()));
diff --git a/ext/standard/tests/strings/ltrim.phpt b/ext/standard/tests/strings/ltrim.phpt
index cddce246881..638c93557f1 100644
--- a/ext/standard/tests/strings/ltrim.phpt
+++ b/ext/standard/tests/strings/ltrim.phpt
@@ -36,7 +36,7 @@ var_dump( ltrim($str, "\nusi") );
  var_dump ( ltrim("ABCXYZltrim test", "A..Z") );                 /* with characters range as second Argument */
  var_dump ( ltrim("0123456789ltrim test", "0..9") );             /* with numbers range as second Argument */
  var_dump ( ltrim("@$#ltrim test", "#@$") );                     /* with some special characters as second Argument */
- 
+
 
  echo "\n *** Output for  scalar argument) ***\n";
  var_dump( ltrim(  12345  ) );                                   /* Scalar argument */
diff --git a/ext/standard/tests/strings/ltrim_basic.phpt b/ext/standard/tests/strings/ltrim_basic.phpt
index 74769cac9fc..45967fa24b2 100644
--- a/ext/standard/tests/strings/ltrim_basic.phpt
+++ b/ext/standard/tests/strings/ltrim_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test ltrim() function : basic functionality 
+Test ltrim() function : basic functionality
 --FILE--
 <?php
 
@@ -18,13 +18,13 @@ $alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 echo "\n-- Trim string with all white space characters --\n";
 var_dump(ltrim($text));
 
-echo "\n-- Trim non-whitespace from a string --\n"; 
+echo "\n-- Trim non-whitespace from a string --\n";
 var_dump(ltrim($hello, "=!"));
 
-echo "\n-- Trim some non-white space characters from a string --\n"; 
+echo "\n-- Trim some non-white space characters from a string --\n";
 var_dump(ltrim($hello, "!oleH="));
 
-echo "\n-- Trim some non-white space characters from a string suing a character range --\n"; 
+echo "\n-- Trim some non-white space characters from a string suing a character range --\n";
 var_dump(ltrim($alpha, "A..Z"));
 
 
diff --git a/ext/standard/tests/strings/ltrim_error.phpt b/ext/standard/tests/strings/ltrim_error.phpt
index eb4f9381527..4d6e413672c 100644
--- a/ext/standard/tests/strings/ltrim_error.phpt
+++ b/ext/standard/tests/strings/ltrim_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test ltrim() function : error conditions 
+Test ltrim() function : error conditions
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/ltrim_variation1.phpt b/ext/standard/tests/strings/ltrim_variation1.phpt
index 5e885266090..48b76e9be7f 100644
--- a/ext/standard/tests/strings/ltrim_variation1.phpt
+++ b/ext/standard/tests/strings/ltrim_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "  sample object  ";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $inputs =  array (
 		  256,
 	      2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/ltrim_variation2.phpt b/ext/standard/tests/strings/ltrim_variation2.phpt
index 194acd187f0..40254843a12 100644
--- a/ext/standard/tests/strings/ltrim_variation2.phpt
+++ b/ext/standard/tests/strings/ltrim_variation2.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "  sample object  ";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $inputs =  array (
 		  256,
 	      2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/md5_basic1.phpt b/ext/standard/tests/strings/md5_basic1.phpt
index af91ade73fd..6c12d59dc79 100644
--- a/ext/standard/tests/strings/md5_basic1.phpt
+++ b/ext/standard/tests/strings/md5_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test md5() function : basic functionality 
+Test md5() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string md5  ( string $str  [, bool $raw_output= false  ] )
diff --git a/ext/standard/tests/strings/md5_basic2.phpt b/ext/standard/tests/strings/md5_basic2.phpt
index 7098dc41b57..73bcc33becd 100644
--- a/ext/standard/tests/strings/md5_basic2.phpt
+++ b/ext/standard/tests/strings/md5_basic2.phpt
@@ -13,7 +13,7 @@ $md5_raw = md5($str, true);
 var_dump(bin2hex($md5_raw));
 
 $md5 = md5($str, false);
-	
+
 if (strcmp(bin2hex($md5_raw), $md5) == 0 ) {
 	echo "TEST PASSED\n";
 } else {
diff --git a/ext/standard/tests/strings/md5_file.phpt b/ext/standard/tests/strings/md5_file.phpt
index 777140957c7..8e917767813 100644
Binary files a/ext/standard/tests/strings/md5_file.phpt and b/ext/standard/tests/strings/md5_file.phpt differ
diff --git a/ext/standard/tests/strings/metaphone.phpt b/ext/standard/tests/strings/metaphone.phpt
index d1aa9af5432..ef1d23d89a4 100644
--- a/ext/standard/tests/strings/metaphone.phpt
+++ b/ext/standard/tests/strings/metaphone.phpt
@@ -13,7 +13,7 @@ var_dump(metaphone("valid phrase", 0));
 var_dump(metaphone("valid phrase", 10000));
 
 $array = array(
-"They fell forward, grovelling heedlessly on the cold earth.", 
+"They fell forward, grovelling heedlessly on the cold earth.",
 "But the shadow of horror wheeled and returned, passing lower now, right above them, sweeping the fen-reek with its ghastly wings.",
 "And then it was gone, flying back to Mordor with the speed of the wrath of Sauron; and behind it the wind roared away, leaving the Dead Marshes bare and bleak.",
 "The naked waste, as far as the eye could pierce, even to the distant menace of the mountains, was dappled with the fitful moonlight."
@@ -25,7 +25,7 @@ foreach($array as $str) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: metaphone() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 string(0) ""
diff --git a/ext/standard/tests/strings/money_format_basic1.phpt b/ext/standard/tests/strings/money_format_basic1.phpt
index 70b5ca574eb..61fd816dae4 100644
--- a/ext/standard/tests/strings/money_format_basic1.phpt
+++ b/ext/standard/tests/strings/money_format_basic1.phpt
@@ -23,13 +23,13 @@ $value = 1234.5678;
 $negative_value = -1234.5678;
 
 // Format with 14 positions of width, 8 digits of
-// left precision, 2 of right precision using national 
+// left precision, 2 of right precision using national
 // format for en_US
 echo "Format values with 14 positions, 8 digits to left, 2 to right using national format\n";
 echo gettype(money_format('%14#8.2n', $value))."\n";
 echo gettype(money_format('%14#8.2n', $negative_value))."\n";
 
-// Same again but use '(' for negative values 
+// Same again but use '(' for negative values
 echo "Format again but with ( for negative values\n";
 echo gettype(money_format('%(14#8.2n', $value))."\n";
 echo gettype(money_format('%(14#8.2n', $negative_value))."\n";
@@ -45,12 +45,12 @@ echo gettype(money_format('%=*14#8.2n', $value))."\n";
 echo gettype(money_format('%=*14#8.2n', $negative_value))."\n";
 
 // Same again but disable grouping character
-echo "Format again but disable grouping character\n"; 
+echo "Format again but disable grouping character\n";
 echo gettype(money_format('%=*^14#8.2n', $value))."\n";
 echo gettype(money_format('%=*^14#8.2n', $negative_value))."\n";
 
 // Same again but suppress currency symbol
-echo "Format again suppress currency symbol\n"; 
+echo "Format again suppress currency symbol\n";
 echo gettype(money_format('%=*!14#8.2n', $value))."\n";
 echo gettype(money_format('%=*!14#8.2n', $negative_value))."\n";
 
diff --git a/ext/standard/tests/strings/money_format_variation1.phpt b/ext/standard/tests/strings/money_format_variation1.phpt
index d4fa687db33..4a381c183a7 100644
--- a/ext/standard/tests/strings/money_format_variation1.phpt
+++ b/ext/standard/tests/strings/money_format_variation1.phpt
@@ -26,11 +26,11 @@ unset($unset_var);
 //defining a couple of sample classes
 class class_no_tostring  {
 }
- 
+
 class class_with_tostring  {
   public function __toString() {
     return "  sample object  ";
-  } 
+  }
 }
 
 
@@ -47,43 +47,43 @@ $formats =  array (
 		  256,
 	      2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		  
+
 		  // string values
 /*19*/	  "abcd",
 		  'abcd',
 		  "0x12f",
 		  "%=*!14#8.2nabcd",
-		
+
 		  // objects
 /*23*/	  new class_no_tostring(),
 		  new class_with_tostring(),
-		
+
 		  // resource
 /*25*/	  $file_handle,
-		
+
 		  // undefined variable
 /*26*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*27*/	  @$unset_var
 );
@@ -99,7 +99,7 @@ foreach($formats as $format) {
 }
 
 // close the file handle
-fclose($file_handle);  
+fclose($file_handle);
 
 ?>
 ===Done===
diff --git a/ext/standard/tests/strings/money_format_variation2.phpt b/ext/standard/tests/strings/money_format_variation2.phpt
index 6e01bf03ddd..c8de58bded0 100644
--- a/ext/standard/tests/strings/money_format_variation2.phpt
+++ b/ext/standard/tests/strings/money_format_variation2.phpt
@@ -26,11 +26,11 @@ unset($unset_var);
 //defining a couple of sample classes
 class class_no_tostring  {
 }
- 
+
 class class_with_tostring  {
   public function __toString() {
     return "  sample object  ";
-  } 
+  }
 }
 
 
@@ -47,43 +47,43 @@ $numbers =  array (
 		  256,
 		  2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		  
+
 		  // string values
 /*19*/	  "abcd",
 		  'abcd',
 		  "0x12f",
 		  "%=*!14#8.2nabcd",
-		
+
 		  // objects
 /*23*/	  new class_no_tostring(),
 		  new class_with_tostring(),
-		
+
 		  // resource
 /*25*/	  $file_handle,
-		
+
 		  // undefined variable
 /*26*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*27*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/nl2br.phpt b/ext/standard/tests/strings/nl2br.phpt
index 6a3b94023c2..728f3339a00 100644
--- a/ext/standard/tests/strings/nl2br.phpt
+++ b/ext/standard/tests/strings/nl2br.phpt
@@ -9,11 +9,11 @@ nl2br() function
 	var_dump(nl2br("\n"));
 	var_dump(nl2br("\r"));
 	var_dump(nl2br("\n\r"));
-	
+
 	var_dump(nl2br("\n\r\r\n\r\r\r\r"));
 	var_dump(nl2br("\n\r\n\n\r\n\r\r\n\r\n"));
 	var_dump(nl2br("\n\r\n\n\n\n\r\r\r\r\n\r"));
-	
+
 ?>
 --EXPECT--
 string(4) "test"
diff --git a/ext/standard/tests/strings/nl2br_error.phpt b/ext/standard/tests/strings/nl2br_error.phpt
index dbf4227378d..b40e7b16a55 100644
--- a/ext/standard/tests/strings/nl2br_error.phpt
+++ b/ext/standard/tests/strings/nl2br_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test nl2br() function : error conditions 
+Test nl2br() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string nl2br(string $str)
diff --git a/ext/standard/tests/strings/nl2br_variation1.phpt b/ext/standard/tests/strings/nl2br_variation1.phpt
index ab15ca1fe4b..a3b863391a6 100644
--- a/ext/standard/tests/strings/nl2br_variation1.phpt
+++ b/ext/standard/tests/strings/nl2br_variation1.phpt
@@ -7,7 +7,7 @@ Test nl2br() function : usage variations - double quoted strings for 'str' argum
  * Source code: ext/standard/string.c
 */
 
-/* Test nl2br() function by passing double quoted strings containing various 
+/* Test nl2br() function by passing double quoted strings containing various
  *   combinations of new line chars to 'str' argument
 */
 
@@ -22,7 +22,7 @@ $strings = array(
   "Hello\r\nWorld",
   "\r\nHello\r\nWorld\r\n",
 
-  //one blank line 
+  //one blank line
   "
 ",
 
diff --git a/ext/standard/tests/strings/nl2br_variation5.phpt b/ext/standard/tests/strings/nl2br_variation5.phpt
index beebe03fe21..06a70cbc410 100644
--- a/ext/standard/tests/strings/nl2br_variation5.phpt
+++ b/ext/standard/tests/strings/nl2br_variation5.phpt
@@ -8,7 +8,7 @@ Test nl2br() function : usage variations - unexpected values for 'str' argument
 */
 
 /*
-* Test nl2br() function by passing different types of values other than 
+* Test nl2br() function by passing different types of values other than
 *   expected type for 'str' argument
 */
 
@@ -74,7 +74,7 @@ $values = array(
   @$unset_var,
 );
 
-// loop through $values array to test nl2br() function with each element 
+// loop through $values array to test nl2br() function with each element
 $count = 1;
 foreach($values as $value) {
   echo "-- Iteration $count --\n";
diff --git a/ext/standard/tests/strings/nl_langinfo_basic.phpt b/ext/standard/tests/strings/nl_langinfo_basic.phpt
index 370177ba8a1..25c52cb7ab5 100644
--- a/ext/standard/tests/strings/nl_langinfo_basic.phpt
+++ b/ext/standard/tests/strings/nl_langinfo_basic.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Test nl_langinfo() function : basic functionality 
+Test nl_langinfo() function : basic functionality
 --SKIPIF--
 <?php
-if( substr(PHP_OS, 0, 3) == 'WIN'){  
+if( substr(PHP_OS, 0, 3) == 'WIN'){
   die('skip Not for Windows');
 }
 ?>
@@ -24,7 +24,7 @@ var_dump(nl_langinfo(ABMON_7));
 var_dump(nl_langinfo(MON_4));
 var_dump(nl_langinfo(RADIXCHAR));
 
-setlocale(LC_ALL, $original); 
+setlocale(LC_ALL, $original);
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/standard/tests/strings/nl_langinfo_error1.phpt b/ext/standard/tests/strings/nl_langinfo_error1.phpt
index 7702b012e92..c8f3a284bf1 100644
--- a/ext/standard/tests/strings/nl_langinfo_error1.phpt
+++ b/ext/standard/tests/strings/nl_langinfo_error1.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Test nl_langinfo() function : error conditions  
+Test nl_langinfo() function : error conditions
 --SKIPIF--
 <?php
-if( substr(PHP_OS, 0, 3) == 'WIN'){  
+if( substr(PHP_OS, 0, 3) == 'WIN'){
   die('skip Not for Windows');
 }
 ?>
diff --git a/ext/standard/tests/strings/nl_langinfo_variation1.phpt b/ext/standard/tests/strings/nl_langinfo_variation1.phpt
index 2d65d0ef07d..774dc6da6f2 100644
--- a/ext/standard/tests/strings/nl_langinfo_variation1.phpt
+++ b/ext/standard/tests/strings/nl_langinfo_variation1.phpt
@@ -2,7 +2,7 @@
 Test nl_langinfo() function :  unexpected inputs for '$tem' argument
 --SKIPIF--
 <?php
-if( substr(PHP_OS, 0, 3) == 'WIN'){  
+if( substr(PHP_OS, 0, 3) == 'WIN'){
   die('skip Not for Windows');
 }
 ?>
@@ -26,7 +26,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -38,15 +38,15 @@ $items =  array (
 /*1*/	  2147483647,
 		  -2147483648,
 		  -20,
-		
+
 	      // array values
 /*4*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // objects
 /*7*/	  new sample(),
-		
+
 		  // resource
 /*8*/	  $file_handle,
 		);
@@ -63,7 +63,7 @@ foreach($items as $item) {
 }
 
 fclose($file_handle);  //closing the file handle
-setlocale(LC_ALL, $original); 
+setlocale(LC_ALL, $original);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/number_format_basic.phpt b/ext/standard/tests/strings/number_format_basic.phpt
index 94b8482eef1..b52e65953b3 100644
--- a/ext/standard/tests/strings/number_format_basic.phpt
+++ b/ext/standard/tests/strings/number_format_basic.phpt
@@ -7,7 +7,7 @@ Test number_format() - basic function test number_format()
  * Description: Format a number with grouped thousands
  * Source code: ext/standard/string.c
  */
- 
+
 echo "*** Testing number_format() : basic functionality ***\n";
 
 $values = array(1234.5678,
@@ -18,10 +18,10 @@ $values = array(1234.5678,
 				02777777777,
 				"123456789",
 				"123.456789",
-				"12.3456789e1",				
+				"12.3456789e1",
 				null,
 				true,
-				false);	
+				false);
 
 echo "\n-- number_format tests.....default --\n";
 for ($i = 0; $i < count($values); $i++) {
diff --git a/ext/standard/tests/strings/number_format_error.phpt b/ext/standard/tests/strings/number_format_error.phpt
index 334b63eacc2..933466d12be 100644
--- a/ext/standard/tests/strings/number_format_error.phpt
+++ b/ext/standard/tests/strings/number_format_error.phpt
@@ -7,7 +7,7 @@ Test number_format() - wrong params test number_format()
  * Description: Format a number with grouped thousands
  * Source code: ext/standard/string.c
  */
- 
+
 echo "*** Testing number_format() : error conditions ***\n";
 
 echo "\n-- Testing number_format() function with less than expected no. of arguments --\n";
diff --git a/ext/standard/tests/strings/ord_basic.phpt b/ext/standard/tests/strings/ord_basic.phpt
index 19f3ea28d66..f49948206aa 100644
--- a/ext/standard/tests/strings/ord_basic.phpt
+++ b/ext/standard/tests/strings/ord_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test ord() function : basic functionality 
+Test ord() function : basic functionality
 --FILE--
 <?php
 
@@ -26,7 +26,7 @@ var_dump(ord("Hello"));
 for ($i = 0; $i < 255; $i++) {
 	if (ord(chr($i)) != $i) {
 		exit("TEST FAILED: $i does not round trip\n");
-	} 	
+	}
 }
 
 ?>
diff --git a/ext/standard/tests/strings/ord_variation1.phpt b/ext/standard/tests/strings/ord_variation1.phpt
index 06d9364a083..ffca230dbaa 100644
--- a/ext/standard/tests/strings/ord_variation1.phpt
+++ b/ext/standard/tests/strings/ord_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -33,36 +33,36 @@ $inputs =  array (
 		  256,
 		  2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/pack_float.phpt b/ext/standard/tests/strings/pack_float.phpt
index 088b508bc0b..a164d31921b 100644
--- a/ext/standard/tests/strings/pack_float.phpt
+++ b/ext/standard/tests/strings/pack_float.phpt
@@ -19,7 +19,7 @@ var_dump(
     bin2hex(pack("e", -10000000000000000)),
     bin2hex(pack("e", -0.591234709823149)),
     bin2hex(pack("e", -12345678901234567890.1234567898765432123456789)),
-    
+
     'pack E',
     bin2hex(pack("E", "")),
     bin2hex(pack("E", "a")),
@@ -36,7 +36,7 @@ var_dump(
     bin2hex(pack("E", -10000000000000000)),
     bin2hex(pack("E", -0.591234709823149)),
     bin2hex(pack("E", -12345678901234567890.1234567898765432123456789)),
-    
+
     'pack g',
     bin2hex(pack("g", "")),
     bin2hex(pack("g", "a")),
@@ -53,7 +53,7 @@ var_dump(
     bin2hex(pack("g", -10000000000000000)),
     bin2hex(pack("g", -0.591234709823149)),
     bin2hex(pack("g", -12345678901234567890.1234567898765432123456789)),
-    
+
     'pack G',
     bin2hex(pack("G", "")),
     bin2hex(pack("G", "a")),
@@ -70,7 +70,7 @@ var_dump(
     bin2hex(pack("G", -10000000000000000)),
     bin2hex(pack("G", -0.591234709823149)),
     bin2hex(pack("G", -12345678901234567890.1234567898765432123456789)),
-    
+
     'unpack e',
     unpack('e', hex2bin('0000000000000000')),
     unpack('e', hex2bin('000000000000f03f')),
@@ -80,7 +80,7 @@ var_dump(
     unpack('e', hex2bin('0080e03779c341c3')),
     unpack('e', hex2bin('4a6ade0d65ebe2bf')),
     unpack('e', hex2bin('e1639d31956ae5c3')),
-    
+
     'unpack E',
     unpack('E', hex2bin('3ff0000000000000')),
     unpack('E', hex2bin('4341c37937e08000')),
@@ -90,7 +90,7 @@ var_dump(
     unpack('E', hex2bin('c341c37937e08000')),
     unpack('E', hex2bin('bfe2eb650dde6a4a')),
     unpack('E', hex2bin('c3e56a95319d63e1')),
-    
+
     'unpack g',
     unpack('g', hex2bin('0000803f')),
     unpack('g', hex2bin('ca1b0e5a')),
@@ -100,7 +100,7 @@ var_dump(
     unpack('g', hex2bin('ca1b0eda')),
     unpack('g', hex2bin('285b17bf')),
     unpack('g', hex2bin('aa542bdf')),
-    
+
     'unpack G',
     unpack('G', hex2bin('3f800000')),
     unpack('G', hex2bin('5a0e1bca')),
@@ -110,7 +110,7 @@ var_dump(
     unpack('G', hex2bin('da0e1bca')),
     unpack('G', hex2bin('bf175b28')),
     unpack('G', hex2bin('df2b54aa'))
-    
+
 );
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/strings/parse_str_basic1.phpt b/ext/standard/tests/strings/parse_str_basic1.phpt
index a1222814f71..b3f2fe5cfc7 100644
--- a/ext/standard/tests/strings/parse_str_basic1.phpt
+++ b/ext/standard/tests/strings/parse_str_basic1.phpt
@@ -1,8 +1,8 @@
 --TEST--
-Test parse_str() function : basic functionality 
+Test parse_str() function : basic functionality
 --FILE--
 <?php
-		
+
 /* Prototype  : void parse_str  ( string $str  [, array &$arr  ] )
  * Description: Parses the string into variables
  * Source code: ext/standard/string.c
@@ -29,7 +29,7 @@ var_dump($res2);
 echo "\nBasic test with an existing array as results array\n";
 $res3_array = array(1,2,3,4);
 var_dump(parse_str($s1, $res3_array));
-var_dump($res3_array); 
+var_dump($res3_array);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/parse_str_basic2.phpt b/ext/standard/tests/strings/parse_str_basic2.phpt
index 88a13ca387a..32a8fcd3fc7 100644
--- a/ext/standard/tests/strings/parse_str_basic2.phpt
+++ b/ext/standard/tests/strings/parse_str_basic2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test parse_str() function : non-default arg_separator.input specified
 --INI--
-arg_separator.input = "/" 
+arg_separator.input = "/"
 --FILE--
 <?php
 /* Prototype  : void parse_str  ( string $str  [, array &$arr  ] )
diff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt
index a38395b8841..0368dea5f9f 100644
Binary files a/ext/standard/tests/strings/parse_str_basic3.phpt and b/ext/standard/tests/strings/parse_str_basic3.phpt differ
diff --git a/ext/standard/tests/strings/parse_str_error1.phpt b/ext/standard/tests/strings/parse_str_error1.phpt
index a9c902e807a..dcc3888e7ec 100644
--- a/ext/standard/tests/strings/parse_str_error1.phpt
+++ b/ext/standard/tests/strings/parse_str_error1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test parse_str() function : non-default arg_separator.input specified
 --INI--
-arg_separator.input = "/" 
+arg_separator.input = "/"
 --FILE--
 <?php
 /* Prototype  : void parse_str  ( string $str  [, array &$arr  ] )
@@ -15,7 +15,7 @@ echo "\n-- Testing htmlentities() function with less than expected no. of argume
 parse_str();
 echo "\n-- Testing htmlentities() function with more than expected no. of arguments --\n";
 $s1 = "first=val1&second=val2&third=val3";
-parse_str($s1, $res_array, true); 
+parse_str($s1, $res_array, true);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/pathinfo.phpt b/ext/standard/tests/strings/pathinfo.phpt
index d9c3a2ed6c8..a3d735069d5 100644
--- a/ext/standard/tests/strings/pathinfo.phpt
+++ b/ext/standard/tests/strings/pathinfo.phpt
@@ -26,7 +26,7 @@ var_dump(pathinfo(__FILE__, PATHINFO_DIRNAME|PATHINFO_BASENAME));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: pathinfo() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 array(2) {
diff --git a/ext/standard/tests/strings/php_strip_whitespace.phpt b/ext/standard/tests/strings/php_strip_whitespace.phpt
index 4f7ef909e9f..d9376b101ad 100644
--- a/ext/standard/tests/strings/php_strip_whitespace.phpt
+++ b/ext/standard/tests/strings/php_strip_whitespace.phpt
@@ -39,7 +39,7 @@ var_dump(php_strip_whitespace($filename));
 @unlink($filename);
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: php_strip_whitespace() expects exactly 1 parameter, 0 given in %s on line %d
 bool(false)
 
diff --git a/ext/standard/tests/strings/print_basic.phpt b/ext/standard/tests/strings/print_basic.phpt
index a4bc8c239ae..0b756419910 100644
--- a/ext/standard/tests/strings/print_basic.phpt
+++ b/ext/standard/tests/strings/print_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test print() function : basic functionality 
+Test print() function : basic functionality
 --FILE--
 <?php
 
@@ -50,7 +50,7 @@ echo "\n-- Iteration 9 --\n";
 print $foo;          // foobar
 
 echo "\n-- Iteration 10 --\n";
-$variable = "VARIABLE"; 
+$variable = "VARIABLE";
 print <<<END
 This uses the "here document" syntax to output
 multiple lines with $variable interpolation. Note
diff --git a/ext/standard/tests/strings/print_variation1.phpt b/ext/standard/tests/strings/print_variation1.phpt
index 7c499f1084c..8e552e18556 100644
--- a/ext/standard/tests/strings/print_variation1.phpt
+++ b/ext/standard/tests/strings/print_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test print() function : usage variations 
+Test print() function : usage variations
 --FILE--
 <?php
 
@@ -19,7 +19,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $inputs =  array (
 		  -2,
 		  2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*6*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*9*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*12*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null vlaues
 /*16*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*18*/	  new sample(),
-		
+
 		  // resource
 /*19*/	  $file_handle,
-		
+
 		  // undefined variable
 /*20*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*21*/	  @$unset_var
 );
@@ -74,7 +74,7 @@ foreach($inputs as $input) {
   echo "-- Iteration $count --\n";
   $res = print($input);
   echo "\n";
-  var_dump($res); 
+  var_dump($res);
   $count ++;
 }
 
diff --git a/ext/standard/tests/strings/printf.phpt b/ext/standard/tests/strings/printf.phpt
index d989d6a42a6..eab44a4a657 100644
--- a/ext/standard/tests/strings/printf.phpt
+++ b/ext/standard/tests/strings/printf.phpt
@@ -196,10 +196,10 @@ echo"\n\n*** Output for '%%' as the format parameter ***\n";
 printf("%%",1.23456789e10);
 
 echo"\n\n*** Output for precision value more than maximum ***\n";
-printf("%.988f",1.23456789e10);   
+printf("%.988f",1.23456789e10);
 
 echo"\n\n*** Output for invalid width(-15) specifier ***\n";
-printf("%030.-15s", $tempstring);  
+printf("%030.-15s", $tempstring);
 
 echo"\n\n*** Output for '%F' as the format parameter ***\n";
 printf("%F",1.23456789e10);
@@ -211,16 +211,16 @@ echo"\n\n*** Output  with no format parameter ***\n";
 printf($tempnum);
 
 echo"\n\n*** Output for multiple format parameters ***\n";
-printf("%d  %s  %d\n", $tempnum, $tempstring, $tempnum); 
+printf("%d  %s  %d\n", $tempnum, $tempstring, $tempnum);
 
 echo"\n\n*** Output for excess of mixed type arguments  ***\n";
-printf("%s", $tempstring, $tempstring, $tempstring);      
+printf("%s", $tempstring, $tempstring, $tempstring);
 
 echo"\n\n*** Output for string format parameter and integer type argument ***\n";
-printf("%s", $tempnum);          
+printf("%s", $tempnum);
 
 echo"\n\n*** Output for integer format parameter and string type argument ***\n";
-printf("%d", $tempstring);    
+printf("%d", $tempstring);
 
 
 ?>
diff --git a/ext/standard/tests/strings/printf_64bit.phpt b/ext/standard/tests/strings/printf_64bit.phpt
index d0b7aaff446..1a909703713 100644
--- a/ext/standard/tests/strings/printf_64bit.phpt
+++ b/ext/standard/tests/strings/printf_64bit.phpt
@@ -196,10 +196,10 @@ echo"\n\n*** Output for '%%' as the format parameter ***\n";
 printf("%%",1.23456789e10);
 
 echo"\n\n*** Output for precision value more than maximum ***\n";
-printf("%.988f",1.23456789e10);   
+printf("%.988f",1.23456789e10);
 
 echo"\n\n*** Output for invalid width(-15) specifier ***\n";
-printf("%030.-15s", $tempstring);  
+printf("%030.-15s", $tempstring);
 
 echo"\n\n*** Output for '%F' as the format parameter ***\n";
 printf("%F",1.23456789e10);
@@ -211,16 +211,16 @@ echo"\n\n*** Output  with no format parameter ***\n";
 printf($tempnum);
 
 echo"\n\n*** Output for multiple format parameters ***\n";
-printf("%d  %s  %d\n", $tempnum, $tempstring, $tempnum); 
+printf("%d  %s  %d\n", $tempnum, $tempstring, $tempnum);
 
 echo"\n\n*** Output for excess of mixed type arguments  ***\n";
-printf("%s", $tempstring, $tempstring, $tempstring);      
+printf("%s", $tempstring, $tempstring, $tempstring);
 
 echo"\n\n*** Output for string format parameter and integer type argument ***\n";
-printf("%s", $tempnum);          
+printf("%s", $tempnum);
 
 echo"\n\n*** Output for integer format parameter and string type argument ***\n";
-printf("%d", $tempstring);    
+printf("%d", $tempstring);
 
 
 ?>
diff --git a/ext/standard/tests/strings/printf_basic2.phpt b/ext/standard/tests/strings/printf_basic2.phpt
index 195f7cb58fd..4b245ebb549 100644
--- a/ext/standard/tests/strings/printf_basic2.phpt
+++ b/ext/standard/tests/strings/printf_basic2.phpt
@@ -19,7 +19,7 @@ $arg1 = 111;
 $arg2 = 222;
 $arg3 = 333;
 
-echo "\n-- Calling printf() with no arguments --\n"; 
+echo "\n-- Calling printf() with no arguments --\n";
 $result = printf($format);
 echo "\n";
 var_dump($result);
diff --git a/ext/standard/tests/strings/printf_basic4.phpt b/ext/standard/tests/strings/printf_basic4.phpt
index 9de04976741..3cebda439a0 100644
--- a/ext/standard/tests/strings/printf_basic4.phpt
+++ b/ext/standard/tests/strings/printf_basic4.phpt
@@ -19,7 +19,7 @@ $arg1 = TRUE;
 $arg2 = FALSE;
 $arg3 = true;
 
-echo "\n-- Calling printf() with no arguments --\n"; 
+echo "\n-- Calling printf() with no arguments --\n";
 $result = printf($format);
 echo "\n";
 var_dump($result);
diff --git a/ext/standard/tests/strings/printf_basic7.phpt b/ext/standard/tests/strings/printf_basic7.phpt
index a43fcf2da1b..a83f3f70a4f 100644
--- a/ext/standard/tests/strings/printf_basic7.phpt
+++ b/ext/standard/tests/strings/printf_basic7.phpt
@@ -25,7 +25,7 @@ $arg1 = -1111;
 $arg2 = -1234567;
 $arg3 = +2345432;
 
-echo "\n-- Calling printf() with no arguments --\n"; 
+echo "\n-- Calling printf() with no arguments --\n";
 $result = printf($format);
 echo "\n";
 var_dump($result);
diff --git a/ext/standard/tests/strings/printf_basic8.phpt b/ext/standard/tests/strings/printf_basic8.phpt
index 4127bc637fe..00953b9720e 100644
--- a/ext/standard/tests/strings/printf_basic8.phpt
+++ b/ext/standard/tests/strings/printf_basic8.phpt
@@ -29,7 +29,7 @@ $result = printf($format);
 echo "\n";
 var_dump($result);
 
-echo "\n-- Calling printf() with one arguments --\n"; 
+echo "\n-- Calling printf() with one arguments --\n";
 $result = printf($format1, $arg1);
 echo "\n";
 var_dump($result);
diff --git a/ext/standard/tests/strings/printf_basic9.phpt b/ext/standard/tests/strings/printf_basic9.phpt
index 9b441b2ccf2..e5b8abd726a 100644
--- a/ext/standard/tests/strings/printf_basic9.phpt
+++ b/ext/standard/tests/strings/printf_basic9.phpt
@@ -25,12 +25,12 @@ $arg1 = 11;
 $arg2 = 132;
 $arg3 = 177;
 
-echo "\n-- Calling printf() with no arguments --\n"; 
+echo "\n-- Calling printf() with no arguments --\n";
 $result = printf($format);
 echo "\n";
 var_dump($result);
 
-echo "\n-- Calling printf() with one arguments --\n"; 
+echo "\n-- Calling printf() with one arguments --\n";
 $result = printf($format1, $arg1);
 echo "\n";
 var_dump($result);
@@ -38,7 +38,7 @@ $result = printf($format11, $arg1);
 echo "\n";
 var_dump($result);
 
-echo "\n-- Calling printf() with two arguments --\n"; 
+echo "\n-- Calling printf() with two arguments --\n";
 $result = printf($format2, $arg1, $arg2);
 echo "\n";
 var_dump($result);
@@ -46,7 +46,7 @@ $result = printf($format22, $arg1, $arg2);
 echo "\n";
 var_dump($result);
 
-echo "\n-- Calling printf() with three arguments --\n"; 
+echo "\n-- Calling printf() with three arguments --\n";
 $result = printf($format3, $arg1, $arg2, $arg3);
 echo "\n";
 var_dump($result);
diff --git a/ext/standard/tests/strings/printf_error.phpt b/ext/standard/tests/strings/printf_error.phpt
index 6645613c831..bce0c4d0d7d 100644
--- a/ext/standard/tests/strings/printf_error.phpt
+++ b/ext/standard/tests/strings/printf_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test printf() function : error conditions 
+Test printf() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int printf  ( string $format  [, mixed $args  [, mixed $...  ]] )
@@ -21,7 +21,7 @@ $arg1 = 'one';
 $arg2 = 'two';
 
 echo "\n-- Call printf with one argument less than expected --\n";
-var_dump( printf($format1) );  
+var_dump( printf($format1) );
 var_dump( printf($format2,$arg1) );
 var_dump( printf($format3,$arg1,$arg2) );
 
diff --git a/ext/standard/tests/strings/printf_variation1.phpt b/ext/standard/tests/strings/printf_variation1.phpt
index e71e564da2e..fcf69ebaa7b 100644
--- a/ext/standard/tests/strings/printf_variation1.phpt
+++ b/ext/standard/tests/strings/printf_variation1.phpt
@@ -40,44 +40,44 @@ $values = array(
 	      1,
 	      12345,
 	      -2345,
-	
+
 	      // float data
 /*5*/      10.5,
 	      -10.5,
 	      10.1234567e10,
 	      10.7654321E-10,
 	      .5,
-	
+
 	      // array data
 /*10*/    array(),
 	      array(0),
 	      array(1),
 	      array(1, 2),
 	      array('color' => 'red', 'item' => 'pen'),
-	
+
 	      // null data
 /*15*/    NULL,
 	      null,
-	
+
 	      // boolean data
 /*17*/    true,
 	      false,
 	      TRUE,
 	      FALSE,
-	
+
 	      // empty data
 /*21*/    "",
 	      '',
-	
+
 	      // object data
 /*23*/    new sample(),
-	
+
 	      // undefined data
 /*24*/    @$undefined_var,
-	
+
 	      // unset data
 /*25*/    @$unset_var,
-	
+
 	      // resource data
 /*26*/    $file_handle
 );
@@ -87,12 +87,12 @@ $values = array(
 $count = 1;
 foreach($values as $value) {
   echo "\n-- Iteration $count --\n";
-  
+
   // with default argument
   $result = printf($value);
   echo "\n";
   var_dump($result);
-  
+
   // with two arguments
   $result = printf($value, $arg1);
   echo "\n";
diff --git a/ext/standard/tests/strings/printf_variation2.phpt b/ext/standard/tests/strings/printf_variation2.phpt
index be66ad8fca6..8e7d5ec9109 100644
--- a/ext/standard/tests/strings/printf_variation2.phpt
+++ b/ext/standard/tests/strings/printf_variation2.phpt
@@ -24,7 +24,7 @@ class sample
 {
   public function __toString() {
     return "Object";
-  } 
+  }
 }
 
 // creating a file resource
@@ -38,48 +38,48 @@ $values = array(
 	      1,
 	      12345,
 	      -2345,
-	
+
 	      // float data
 /*5*/     10.5,
 	      -10.5,
 	      10.1234567e10,
 	      10.7654321E-10,
 	      .5,
-	
+
 	      // array data
 /*10*/    array(),
 	      array(0),
 	      array(1),
 	      array(1, 2),
 	      array('color' => 'red', 'item' => 'pen'),
-	
+
 	      // null data
 /*15*/    NULL,
 	      null,
-	
+
 	      // boolean data
 /*17*/    true,
 	      false,
 	      TRUE,
 	      FALSE,
-	
+
 	      // empty data
 /*21*/    "",
 	      '',
-	
+
 	      // string data
 /*23*/    "string",
 	      'string',
-	
+
 	      // object data
 /*25*/    new sample(),
-	
+
 	      // undefined data
 /*26*/    @$undefined_var,
-	
+
 	      // unset data
 /*27*/    @$unset_var,
-	
+
 	      // resource data
 /*28*/    $file_handle
 );
@@ -89,7 +89,7 @@ $values = array(
 $count = 1;
 foreach($values as $value) {
   echo "\n-- Iteration $count --\n";
-  
+
   // with two arguments
   $result = printf($format, $value);
   echo "\n";
@@ -99,8 +99,8 @@ foreach($values as $value) {
   $result = printf($format, $value, $arg2);
   echo "\n";
   var_dump($result);
- 
-  $count++;   
+
+  $count++;
 };
 
 // closing the resource
diff --git a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt
index 5b15388d08f..9556dad30fc 100644
--- a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt
+++ b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test quoted_printable_decode() function : basic functionality 
+Test quoted_printable_decode() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string quoted_printable_decode  ( string $str  )
@@ -13,7 +13,7 @@ $str = "=FAwow-factor=C1=d0=D5=DD=C5=CE=CE=D9=C5=0A=
 =20=D4=cf=D2=C7=CF=D7=D9=C5=  	    
 =20=	 	
 =D0=
-=D2=CF=C5=CB=D4=D9"; 
+=D2=CF=C5=CB=D4=D9";
 
 var_dump(bin2hex(quoted_printable_decode($str)));
 
diff --git a/ext/standard/tests/strings/quoted_printable_decode_error.phpt b/ext/standard/tests/strings/quoted_printable_decode_error.phpt
index 0515fea2a71..9008f5c861f 100644
--- a/ext/standard/tests/strings/quoted_printable_decode_error.phpt
+++ b/ext/standard/tests/strings/quoted_printable_decode_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test quoted_printable_decode() function : error conditions  
+Test quoted_printable_decode() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string quoted_printable_decode  ( string $str  )
@@ -17,7 +17,7 @@ $str = "=FAwow-factor=C1=d0=D5=DD=C5=CE=CE=D9=C5=0A=
 =20=D4=cf=D2=C7=CF=D7=D9=C5=  	    
 =20=	 	
 =D0=
-=D2=CF=C5=CB=D4=D9"; 
+=D2=CF=C5=CB=D4=D9";
 $extra_arg = 10;
 var_dump( quoted_printable_decode($str, $extra_arg) );
 
diff --git a/ext/standard/tests/strings/quoted_printable_decode_variation1.phpt b/ext/standard/tests/strings/quoted_printable_decode_variation1.phpt
index ce35cea6b8e..8d147c0e673 100644
--- a/ext/standard/tests/strings/quoted_printable_decode_variation1.phpt
+++ b/ext/standard/tests/strings/quoted_printable_decode_variation1.phpt
@@ -40,44 +40,44 @@ $values = array(
 		      1,
 		      12345,
 		      -2345,
-		
+
 		      // float data
 /*5*/	      10.5,
 		      -10.5,
 		      10.1234567e10,
 		      10.7654321E-10,
 		      .5,
-		
+
 		      // array data
 /*10*/	      array(),
 		      array(0),
 		      array(1),
 		      array(1, 2),
 		      array('color' => 'red', 'item' => 'pen'),
-		
+
 		      // null data
 /*15*/	      NULL,
 		      null,
-		
+
 		      // boolean data
 /*17*/	      true,
 		      false,
 		      TRUE,
 		      FALSE,
-		
+
 		      // empty data
 /*21*/	      "",
 		      '',
-		
+
 		      // object data
 /*23*/	      new sample(),
-		
+
 		      // undefined data
 /*24*/	      @$undefined_var,
-		
+
 		      // unset data
 /*25*/	      @$unset_var,
-		
+
 		      // resource data
 /*26*/	      $file_handle
 );
diff --git a/ext/standard/tests/strings/quoted_printable_encode_001.phpt b/ext/standard/tests/strings/quoted_printable_encode_001.phpt
index 6a22da8afcd..1ce7d791dca 100644
--- a/ext/standard/tests/strings/quoted_printable_encode_001.phpt
+++ b/ext/standard/tests/strings/quoted_printable_encode_001.phpt
@@ -16,7 +16,7 @@ var_dump(quoted_printable_encode(false));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: quoted_printable_encode() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 string(0) ""
diff --git a/ext/standard/tests/strings/quotemeta_basic.phpt b/ext/standard/tests/strings/quotemeta_basic.phpt
index 9a2f23c464e..00572add56d 100644
--- a/ext/standard/tests/strings/quotemeta_basic.phpt
+++ b/ext/standard/tests/strings/quotemeta_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test quotemeta() function : basic functionality 
+Test quotemeta() function : basic functionality
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/rtrim_basic.phpt b/ext/standard/tests/strings/rtrim_basic.phpt
index 7193b598668..dbbd6c61548 100644
--- a/ext/standard/tests/strings/rtrim_basic.phpt
+++ b/ext/standard/tests/strings/rtrim_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test rtrim() function : basic functionality 
+Test rtrim() function : basic functionality
 --FILE--
 <?php
 
@@ -20,13 +20,13 @@ $binary = "Example string\x0A\x0D";
 echo "\n-- Trim string with all white space characters --\n";
 var_dump(rtrim($text));
 
-echo "\n-- Trim non-whitespace from a string --\n"; 
+echo "\n-- Trim non-whitespace from a string --\n";
 var_dump(rtrim($hello, "=!"));
 
-echo "\n-- Trim some non-white space characters from a string --\n"; 
+echo "\n-- Trim some non-white space characters from a string --\n";
 var_dump(rtrim($hello, "!dlWro="));
 
-echo "\n-- Trim some non-white space characters from a string using a character range --\n"; 
+echo "\n-- Trim some non-white space characters from a string using a character range --\n";
 var_dump(rtrim($alpha, "A..Z"));
 
 echo "\n-- Trim the ASCII control characters at the beginning of a string --\n";
diff --git a/ext/standard/tests/strings/rtrim_error.phpt b/ext/standard/tests/strings/rtrim_error.phpt
index 3cdfb9116d8..108f96a1f05 100644
--- a/ext/standard/tests/strings/rtrim_error.phpt
+++ b/ext/standard/tests/strings/rtrim_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test rtrim() function : error conditions 
+Test rtrim() function : error conditions
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/rtrim_variation1.phpt b/ext/standard/tests/strings/rtrim_variation1.phpt
index 68c7bb90798..f07b7db3df1 100644
--- a/ext/standard/tests/strings/rtrim_variation1.phpt
+++ b/ext/standard/tests/strings/rtrim_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "  !---sample object---!  ";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $inputs =  array (
 		  256,
 		  2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/rtrim_variation2.phpt b/ext/standard/tests/strings/rtrim_variation2.phpt
index 9e3943dfe46..70efd09f2bb 100644
--- a/ext/standard/tests/strings/rtrim_variation2.phpt
+++ b/ext/standard/tests/strings/rtrim_variation2.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "  sample object  ";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $inputs =  array (
 		  256,
 		  2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/setlocale_basic1.phpt b/ext/standard/tests/strings/setlocale_basic1.phpt
index c806e6fabf8..08c4cf44242 100644
--- a/ext/standard/tests/strings/setlocale_basic1.phpt
+++ b/ext/standard/tests/strings/setlocale_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test setlocale() function : basic functionality - setting system locale to a specific   
+Test setlocale() function : basic functionality - setting system locale to a specific
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
@@ -12,16 +12,16 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d
 --FILE--
 <?php
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
-              : string setlocale(int $category , array $locale);  
- * Description: Sets locale information.Returns the new current locale , 
- *              or FALSE if locale functionality is not implemented in this platform. 
+              : string setlocale(int $category , array $locale);
+ * Description: Sets locale information.Returns the new current locale ,
+ *              or FALSE if locale functionality is not implemented in this platform.
  * Source code: ext/standard/string.c
 */
 
 /* test setlocale by specifying a specific locale as input */
 
 /* Prototype  : array list_system_locales( void )
-   Description: To get the currently installed locle in this platform 
+   Description: To get the currently installed locle in this platform
    Arguments  : Nil
    Returns    : set of locale as array
 */
@@ -50,9 +50,9 @@ echo "*** Testing setlocale() : basic functionality - set to a specific locale *
 
 //set of locales to be used
 $common_locales = array(
-  "english_US"=> "en_US.utf8", 
-  "english_AU" => "en_AU.utf8", 
-  "korean_KR" => "ko_KR.utf8", 
+  "english_US"=> "en_US.utf8",
+  "english_AU" => "en_AU.utf8",
+  "korean_KR" => "ko_KR.utf8",
   "Chinese_zh" => "zh_CN.utf8",
   "germen_DE" => "de_DE.utf8",
   "spanish_es" => "es_EC.utf8",
@@ -79,18 +79,18 @@ $currency_symbol = array(
 // gather all the locales installed in the system
 $all_system_locales = list_system_locales();
 
-// set the system locale to a locale, choose the right locale by 
-// finding a common locale in commonly used locale stored in 
-// $common_locales & locales that are available in the system, stored 
-// in $all_system_locales. 
+// set the system locale to a locale, choose the right locale by
+// finding a common locale in commonly used locale stored in
+// $common_locales & locales that are available in the system, stored
+// in $all_system_locales.
 echo "Setting system locale(LC_ALL) to ";
 foreach($common_locales as $value) {
-  // check if a commonly used locale is installed in the system 
+  // check if a commonly used locale is installed in the system
   if(in_array($value, $all_system_locales)){
     echo "$value\n"; // print, this is found
     // set the found locale as current locale
     var_dump(setlocale(LC_ALL, $value ));
-    // stop here 
+    // stop here
     break;
   }
   else{
diff --git a/ext/standard/tests/strings/setlocale_basic2.phpt b/ext/standard/tests/strings/setlocale_basic2.phpt
index 7204c459114..75ae1545d99 100644
--- a/ext/standard/tests/strings/setlocale_basic2.phpt
+++ b/ext/standard/tests/strings/setlocale_basic2.phpt
@@ -12,16 +12,16 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d
 --FILE--
 <?php
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
-              : string setlocale(int $category , array $locale);  
+              : string setlocale(int $category , array $locale);
  * Description: Sets locale information.Returns the new current locale , or FALSE
-                if locale  functionality is not implemented in this platform. 
+                if locale  functionality is not implemented in this platform.
  * Source code: ext/standard/string.c
 */
 
 /* Test the setlocale() when an array is provided as input containing list of locales */
 
 /* Prototype  : array list_system_locales( void )
- * Description: To get the currently installed locle in this platform 
+ * Description: To get the currently installed locle in this platform
  * Arguments  : Nil
  * Returns    : set of locale as array
 */
@@ -44,16 +44,16 @@ function list_system_locales() {
   return $system_locales;
 }
 
-/* Collect existing system locales and prepare a list of locales that can be used as 
+/* Collect existing system locales and prepare a list of locales that can be used as
    input to setlocale() */
 
 echo "*** Testing setlocale() with an array containing list of locales ***\n";
 
 //set of locales to be used
 $common_locales = array(
-  "english_US"=> "en_US.utf8", 
-  "english_AU" => "en_AU.utf8", 
-  "korean_KR" => "ko_KR.utf8", 
+  "english_US"=> "en_US.utf8",
+  "english_AU" => "en_AU.utf8",
+  "korean_KR" => "ko_KR.utf8",
   "Chinese_zh" => "zh_CN.utf8",
   "germen_DE" => "de_DE.utf8",
   "spanish_es" => "es_EC.utf8",
@@ -91,7 +91,7 @@ foreach($common_locales as $value) {
   }
 }
 
-// Now $list_of_locales array contains the locales that can be passed to 
+// Now $list_of_locales array contains the locales that can be passed to
 // setlocale() function.
 echo "-- Testing setlocale() : 'category' argument as LC_ALL & 'locale' argument as an array --\n";
 if ( count($list_of_locales) > 0 ) {
@@ -111,7 +111,7 @@ if ( count($list_of_locales) > 0 ) {
 
   if(trim($currency_symbol[$new_locale]) == $new_currency){
     echo "PASSED.\n";
-  } else { 
+  } else {
     echo "FAILED.\n";
   }
 } else {
diff --git a/ext/standard/tests/strings/setlocale_basic3.phpt b/ext/standard/tests/strings/setlocale_basic3.phpt
index 997dad98e7c..46beeda10e1 100644
--- a/ext/standard/tests/strings/setlocale_basic3.phpt
+++ b/ext/standard/tests/strings/setlocale_basic3.phpt
@@ -21,7 +21,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) {
 /* Test the setlocale() when multiple locales are provided as argument */
 
 /* Prototype  : array list_system_locales( void )
-   Description: To get the currently installed locle in this platform 
+   Description: To get the currently installed locle in this platform
    Arguments  : Nil
    Returns    : set of locale as array
 */
@@ -44,7 +44,7 @@ function list_system_locales() {
   return $system_locales;
 }
 
-/* Collect existing system locales and get three locales that can be use to 
+/* Collect existing system locales and get three locales that can be use to
    pass as argument to setlocale() */
 echo "*** Testing setlocale() by passing multiple locales as argument ***\n";
 
diff --git a/ext/standard/tests/strings/setlocale_error.phpt b/ext/standard/tests/strings/setlocale_error.phpt
index a6a8e382052..14bb7d7ed55 100644
--- a/ext/standard/tests/strings/setlocale_error.phpt
+++ b/ext/standard/tests/strings/setlocale_error.phpt
@@ -11,8 +11,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
-              : string setlocale(int $category , array $locale);  
- * Description: Sets locale information.Returns the new current locale , or FALSE if locale functionality is not implemented in this platform. 
+              : string setlocale(int $category , array $locale);
+ * Description: Sets locale information.Returns the new current locale , or FALSE if locale functionality is not implemented in this platform.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_variation1.phpt b/ext/standard/tests/strings/setlocale_variation1.phpt
index 04665b54553..6dc4179baf0 100644
--- a/ext/standard/tests/strings/setlocale_variation1.phpt
+++ b/ext/standard/tests/strings/setlocale_variation1.phpt
@@ -21,7 +21,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) {
 /* Test the setlocale() when multiple valid/invalid locales are provided as argument */
 
 /* Prototype  : array list_system_locales( void )
-   Description: To get the currently installed locle in this platform 
+   Description: To get the currently installed locle in this platform
    Arguments  : Nil
    Returns    : set of locale as array
 */
@@ -44,7 +44,7 @@ function list_system_locales() {
   return $system_locales;
 }
 
-/* Collect existing system locales and get 2 valid locales that can be use to 
+/* Collect existing system locales and get 2 valid locales that can be use to
    pass as argument to setlocale(), pass 2 invalid arguments along with two valid arguments*/
 echo "*** Testing setlocale() by passing multiple valid/invalid locales as argument ***\n";
 
diff --git a/ext/standard/tests/strings/setlocale_variation2.phpt b/ext/standard/tests/strings/setlocale_variation2.phpt
index 5ebdfe8d507..fad3298cc7a 100644
--- a/ext/standard/tests/strings/setlocale_variation2.phpt
+++ b/ext/standard/tests/strings/setlocale_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test setlocale() function : usage variations - Setting all available locales in the platform 
+Test setlocale() function : usage variations - Setting all available locales in the platform
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
@@ -9,16 +9,16 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
-              : string setlocale(int $category , array $locale);  
- * Description: Sets locale information.Returns the new current locale , or FALSE 
-                if locale functionality is not implemented in this platform. 
+              : string setlocale(int $category , array $locale);
+ * Description: Sets locale information.Returns the new current locale , or FALSE
+                if locale functionality is not implemented in this platform.
  * Source code: ext/standard/string.c
 */
 
 /* setlocale() to set all available locales in the system and check the success count */
 echo "*** Testing setlocale() : usage variations ***\n";
 
-function good_locale($locale) { 
+function good_locale($locale) {
     /**
     * Note: no_NO is a bogus locale and should not be used, see https://bugzilla.redhat.com/971416
     **/
@@ -26,7 +26,7 @@ function good_locale($locale) {
 }
 
 /* Prototype  : array list_system_locales( void )
- * Description: To get the currently installed locle in this platform 
+ * Description: To get the currently installed locle in this platform
  * Arguments  : Nil
  * Returns    : set of locale as array
 */
@@ -52,7 +52,7 @@ function list_system_locales() {
 // gather all the locales installed in the system
 $all_system_locales = list_system_locales();
 
-//try different locale names	
+//try different locale names
 $failure_locale = array();
 $success_count = 0;
 
@@ -74,7 +74,7 @@ echo "No of locales found on the machine = ".count($all_system_locales)."\n";
 echo "No of setlocale() success = ".$success_count."\n";
 echo "Expected no of failures = 0\n";
 echo "Test ";
-// check if there were any failure of setlocale() function earlier, if any 
+// check if there were any failure of setlocale() function earlier, if any
 // failure then dump the list of failing locales
 if($success_count != count($all_system_locales)){
   echo "FAILED\n";
diff --git a/ext/standard/tests/strings/setlocale_variation3.phpt b/ext/standard/tests/strings/setlocale_variation3.phpt
index 44cbe1bda77..d1e06a05403 100644
--- a/ext/standard/tests/strings/setlocale_variation3.phpt
+++ b/ext/standard/tests/strings/setlocale_variation3.phpt
@@ -12,9 +12,9 @@ if (setlocale(LC_ALL,'en_US.utf8') === false) {
 --FILE--
 <?php
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
- *            : string setlocale(int $category , array $locale);  
+ *            : string setlocale(int $category , array $locale);
  * Description: Sets locale information.Returns the new current locale , or FALSE
- *              if locale functionality is not implemented in this platform. 
+ *              if locale functionality is not implemented in this platform.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_variation4.phpt b/ext/standard/tests/strings/setlocale_variation4.phpt
index 7b27c106d90..8ee8db674e7 100644
--- a/ext/standard/tests/strings/setlocale_variation4.phpt
+++ b/ext/standard/tests/strings/setlocale_variation4.phpt
@@ -14,9 +14,9 @@ LC_ALL=en_US.utf8;
 --FILE--
 <?php
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
- *            : string setlocale(int $category , array $locale);  
+ *            : string setlocale(int $category , array $locale);
  * Description: Sets locale information.Returns the new current locale , or FALSE
- *              if locale functionality is not implemented in this platform. 
+ *              if locale functionality is not implemented in this platform.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_variation5.phpt b/ext/standard/tests/strings/setlocale_variation5.phpt
index 40eda3780b6..123e86e77f0 100644
--- a/ext/standard/tests/strings/setlocale_variation5.phpt
+++ b/ext/standard/tests/strings/setlocale_variation5.phpt
@@ -14,9 +14,9 @@ LC_ALL=en_US.utf8;
 --FILE--
 <?php
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
- *            : string setlocale(int $category , array $locale);  
- * Description: Sets locale information.Returns the new current locale , or FALSE 
- *              if locale functionality is not implemented in this platform. 
+ *            : string setlocale(int $category , array $locale);
+ * Description: Sets locale information.Returns the new current locale , or FALSE
+ *              if locale functionality is not implemented in this platform.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/sha1_error.phpt b/ext/standard/tests/strings/sha1_error.phpt
index bfc3e44fd5d..193c64e941a 100644
--- a/ext/standard/tests/strings/sha1_error.phpt
+++ b/ext/standard/tests/strings/sha1_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test sha1() function : error conditions 
+Test sha1() function : error conditions
 --FILE--
 <?php
 
@@ -7,7 +7,7 @@ Test sha1() function : error conditions
 /* Prototype: string sha1  ( string $str  [, bool $raw_output  ] )
  * Description: Calculate the sha1 hash of a string
  */
- 
+
 echo "*** Testing sha1() : error conditions ***\n";
 
 echo "\n-- Testing sha1() function with no arguments --\n";
diff --git a/ext/standard/tests/strings/sha1_file.phpt b/ext/standard/tests/strings/sha1_file.phpt
index 20d62e69990..83a191b172b 100644
--- a/ext/standard/tests/strings/sha1_file.phpt
+++ b/ext/standard/tests/strings/sha1_file.phpt
@@ -17,7 +17,7 @@ return false;
 if (($handle2 = fopen( "DataFile.txt", "w+")) == FALSE)
 return false;
 
-/* Writing into file */ 
+/* Writing into file */
 $filename = "DataFile.txt";
 $content = "Add this to the file\n";
 if (is_writable($filename)) {
@@ -27,7 +27,7 @@ if (is_writable($filename)) {
   }
 }
 
-// close the files 
+// close the files
 fclose($handle);
 fclose($handle2);
 
diff --git a/ext/standard/tests/strings/sha1_variation1.phpt b/ext/standard/tests/strings/sha1_variation1.phpt
index 044be46d98f..35fb16a87ba 100644
--- a/ext/standard/tests/strings/sha1_variation1.phpt
+++ b/ext/standard/tests/strings/sha1_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test sha1() function : usage variations - unexpected values for 'str' argument 
+Test sha1() function : usage variations - unexpected values for 'str' argument
 --FILE--
 <?php
 
@@ -35,44 +35,44 @@ $values = array(
 		  1,
 		  12345,
 		  -2345,
-		
+
 		  // float data
 /*5*/	  10.5,
 		  -10.5,
 		  10.1234567e10,
 		  10.1234567E-10,
 		  .5,
-		
+
 		  // array data
 /*10*/	  array(),
 		  array(0),
 		  array(1),
 		  array(1, 2),
 		  array('color' => 'red', 'item' => 'pen'),
-		
+
 		  // null data
 /*15*/	  NULL,
 		  null,
-		
+
 		  // boolean data
 /*17*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // empty data
 /*21*/	  "",
 		  '',
-		
+
 		  // object data
 /*23*/	  new MyClass(),
-		
+
 		  // undefined data
 /*24*/	  @$undefined_var,
-		
+
 		  // unset data
 /*25*/	  @$unset_var,
-		
+
 		  //resource data
 /*26*/	  $fp
 );
diff --git a/ext/standard/tests/strings/sha1_variation2.phpt b/ext/standard/tests/strings/sha1_variation2.phpt
index a5bf5f868c2..f784a8900fa 100644
--- a/ext/standard/tests/strings/sha1_variation2.phpt
+++ b/ext/standard/tests/strings/sha1_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test sha1() function : usage variations - unexpected values for 'raw' argument 
+Test sha1() function : usage variations - unexpected values for 'raw' argument
 --FILE--
 <?php
 
@@ -35,44 +35,44 @@ $values = array(
 		  1,
 		  12345,
 		  -2345,
-		
+
 		  // float data
 /*5*/	  10.5,
 		  -10.5,
 		  10.1234567e10,
 		  10.1234567E-10,
 		  .5,
-		
+
 		  // array data
 /*10*/	  array(),
 		  array(0),
 		  array(1),
 		  array(1, 2),
 		  array('color' => 'red', 'item' => 'pen'),
-		
+
 		  // null data
 /*15*/	  NULL,
 		  null,
-		
+
   		  // string data
 /*17*/	  "ABC",
   		  'abc',
   		  "0abc",
   		  "123abc",
-		
+
 		  // empty data
 /*21*/	  "",
 		  '',
-		
+
 		  // object data
 /*23*/	  new MyClass(),
-		
+
 		  // undefined data
 /*24*/	  @$undefined_var,
-		
+
 		  // unset data
 /*25*/	  @$unset_var,
-		
+
 		  //resource data
 /*26*/	  $fp
 );
diff --git a/ext/standard/tests/strings/show_source_basic.phpt b/ext/standard/tests/strings/show_source_basic.phpt
index cfd998fe96e..09a3af407d6 100644
--- a/ext/standard/tests/strings/show_source_basic.phpt
+++ b/ext/standard/tests/strings/show_source_basic.phpt
@@ -9,19 +9,19 @@ echo "*** Test by calling method or function with its expected arguments ***\n";
 $foo = 'bar';
 $baz = "something ".$foo."\n";
 
-if ( $foo == 'bar' ) 
+if ( $foo == 'bar' )
 {
   $baz = 'baz';
 }
 
  /* some code here */
-   
+
 show_source(__FILE__);
 
 ?>
 --EXPECTF--
 *** Test by calling method or function with its expected arguments ***
 <code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php<br /></span><span style="color: #007700">echo&nbsp;</span><span style="color: #DD0000">"***&nbsp;Test&nbsp;by&nbsp;calling&nbsp;method&nbsp;or&nbsp;function&nbsp;with&nbsp;its&nbsp;expected&nbsp;arguments&nbsp;***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">"something&nbsp;"</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if&nbsp;(&nbsp;</span><span style="color: #0000BB">$foo&nbsp;</span><span style="color: #007700">==&nbsp;</span><span style="color: #DD0000">'bar'&nbsp;</span><span style="color: #007700">)&nbsp;<br />{<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$baz&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">'baz'</span><span style="color: #007700">;<br />}<br /><br />&nbsp;</span><span style="color: #FF8000">/*&nbsp;some&nbsp;code&nbsp;here&nbsp;*/<br />&nbsp;&nbsp;&nbsp;<br /></span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">?&gt;<br /></span>
+<span style="color: #0000BB">&lt;?php<br /></span><span style="color: #007700">echo&nbsp;</span><span style="color: #DD0000">"***&nbsp;Test&nbsp;by&nbsp;calling&nbsp;method&nbsp;or&nbsp;function&nbsp;with&nbsp;its&nbsp;expected&nbsp;arguments&nbsp;***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">"something&nbsp;"</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if&nbsp;(&nbsp;</span><span style="color: #0000BB">$foo&nbsp;</span><span style="color: #007700">==&nbsp;</span><span style="color: #DD0000">'bar'&nbsp;</span><span style="color: #007700">)<br />{<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$baz&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">'baz'</span><span style="color: #007700">;<br />}<br /><br />&nbsp;</span><span style="color: #FF8000">/*&nbsp;some&nbsp;code&nbsp;here&nbsp;*/<br /><br /></span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">?&gt;<br /></span>
 </span>
 </code>
diff --git a/ext/standard/tests/strings/show_source_variation1.phpt b/ext/standard/tests/strings/show_source_variation1.phpt
index a9993ed4579..b59776a4d20 100644
--- a/ext/standard/tests/strings/show_source_variation1.phpt
+++ b/ext/standard/tests/strings/show_source_variation1.phpt
@@ -9,13 +9,13 @@ echo "*** Test by calling method or function with its expected arguments and php
 $foo = 'bar';
 $baz = "something ".$foo."\n";
 
-if ( $foo == 'bar' ) 
+if ( $foo == 'bar' )
 {
   $baz = "baz\n";
 }
 
  /* some code here */
-echo $baz;   
+echo $baz;
 show_source(__FILE__);
 echo $foo;
 ?>
@@ -23,6 +23,6 @@ echo $foo;
 *** Test by calling method or function with its expected arguments and php output ***
 baz
 <code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php<br /></span><span style="color: #007700">echo&nbsp;</span><span style="color: #DD0000">"***&nbsp;Test&nbsp;by&nbsp;calling&nbsp;method&nbsp;or&nbsp;function&nbsp;with&nbsp;its&nbsp;expected&nbsp;arguments&nbsp;and&nbsp;php&nbsp;output&nbsp;***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">"something&nbsp;"</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if&nbsp;(&nbsp;</span><span style="color: #0000BB">$foo&nbsp;</span><span style="color: #007700">==&nbsp;</span><span style="color: #DD0000">'bar'&nbsp;</span><span style="color: #007700">)&nbsp;<br />{<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$baz&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">"baz\n"</span><span style="color: #007700">;<br />}<br /><br />&nbsp;</span><span style="color: #FF8000">/*&nbsp;some&nbsp;code&nbsp;here&nbsp;*/<br /></span><span style="color: #007700">echo&nbsp;</span><span style="color: #0000BB">$baz</span><span style="color: #007700">;&nbsp;&nbsp;&nbsp;<br /></span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">);<br />echo&nbsp;</span><span style="color: #0000BB">$foo</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?&gt;<br /></span>
+<span style="color: #0000BB">&lt;?php<br /></span><span style="color: #007700">echo&nbsp;</span><span style="color: #DD0000">"***&nbsp;Test&nbsp;by&nbsp;calling&nbsp;method&nbsp;or&nbsp;function&nbsp;with&nbsp;its&nbsp;expected&nbsp;arguments&nbsp;and&nbsp;php&nbsp;output&nbsp;***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">"something&nbsp;"</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if&nbsp;(&nbsp;</span><span style="color: #0000BB">$foo&nbsp;</span><span style="color: #007700">==&nbsp;</span><span style="color: #DD0000">'bar'&nbsp;</span><span style="color: #007700">)<br />{<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$baz&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">"baz\n"</span><span style="color: #007700">;<br />}<br /><br />&nbsp;</span><span style="color: #FF8000">/*&nbsp;some&nbsp;code&nbsp;here&nbsp;*/<br /></span><span style="color: #007700">echo&nbsp;</span><span style="color: #0000BB">$baz</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">);<br />echo&nbsp;</span><span style="color: #0000BB">$foo</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?&gt;<br /></span>
 </span>
 </code>bar
diff --git a/ext/standard/tests/strings/show_source_variation2.phpt b/ext/standard/tests/strings/show_source_variation2.phpt
index 06ef66c2d29..d9af024fd95 100644
--- a/ext/standard/tests/strings/show_source_variation2.phpt
+++ b/ext/standard/tests/strings/show_source_variation2.phpt
@@ -9,19 +9,19 @@ echo "*** Test by calling method or function with its expected arguments and out
 $foo = 'bar';
 $baz = "something ".$foo."\n";
 
-if ( $foo == 'bar' ) 
+if ( $foo == 'bar' )
 {
   $baz = "baz\n";
 }
 
- /* some code here */ 
+ /* some code here */
 $source = show_source(__FILE__, true);
 
 var_dump($source);
 ?>
 --EXPECTF--
 *** Test by calling method or function with its expected arguments and output to variable ***
-string(1987) "<code><span style="color: #000000">
-<span style="color: #0000BB">&lt;?php<br /></span><span style="color: #007700">echo&nbsp;</span><span style="color: #DD0000">"***&nbsp;Test&nbsp;by&nbsp;calling&nbsp;method&nbsp;or&nbsp;function&nbsp;with&nbsp;its&nbsp;expected&nbsp;arguments&nbsp;and&nbsp;output&nbsp;to&nbsp;variable&nbsp;***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">"something&nbsp;"</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if&nbsp;(&nbsp;</span><span style="color: #0000BB">$foo&nbsp;</span><span style="color: #007700">==&nbsp;</span><span style="color: #DD0000">'bar'&nbsp;</span><span style="color: #007700">)&nbsp;<br />{<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$baz&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">"baz\n"</span><span style="color: #007700">;<br />}<br /><br />&nbsp;</span><span style="color: #FF8000">/*&nbsp;some&nbsp;code&nbsp;here&nbsp;*/&nbsp;<br /></span><span style="color: #0000BB">$source&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">,&nbsp;</span><span style="color: #0000BB">true</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$source</span><span style="color: #007700">);<br /></span><span style="color: #0000BB">?&gt;<br /></span>
+string(1975) "<code><span style="color: #000000">
+<span style="color: #0000BB">&lt;?php<br /></span><span style="color: #007700">echo&nbsp;</span><span style="color: #DD0000">"***&nbsp;Test&nbsp;by&nbsp;calling&nbsp;method&nbsp;or&nbsp;function&nbsp;with&nbsp;its&nbsp;expected&nbsp;arguments&nbsp;and&nbsp;output&nbsp;to&nbsp;variable&nbsp;***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">"something&nbsp;"</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if&nbsp;(&nbsp;</span><span style="color: #0000BB">$foo&nbsp;</span><span style="color: #007700">==&nbsp;</span><span style="color: #DD0000">'bar'&nbsp;</span><span style="color: #007700">)<br />{<br />&nbsp;&nbsp;</span><span style="color: #0000BB">$baz&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">"baz\n"</span><span style="color: #007700">;<br />}<br /><br />&nbsp;</span><span style="color: #FF8000">/*&nbsp;some&nbsp;code&nbsp;here&nbsp;*/<br /></span><span style="color: #0000BB">$source&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">,&nbsp;</span><span style="color: #0000BB">true</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$source</span><span style="color: #007700">);<br /></span><span style="color: #0000BB">?&gt;<br /></span>
 </span>
 </code>"
diff --git a/ext/standard/tests/strings/soundex.phpt b/ext/standard/tests/strings/soundex.phpt
index 55769ad57ea..650236c2e5c 100644
--- a/ext/standard/tests/strings/soundex.phpt
+++ b/ext/standard/tests/strings/soundex.phpt
@@ -11,10 +11,10 @@ $array = array(
 "From",
 "that",
 "time",
-"on", 
+"on",
 "Sam",
-"thought", 
-"that", 
+"thought",
+"that",
 "he",
 "sensed",
 "a",
@@ -31,7 +31,7 @@ foreach ($array as $str) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(false)
 string(4) "0000"
 
diff --git a/ext/standard/tests/strings/soundex_basic.phpt b/ext/standard/tests/strings/soundex_basic.phpt
index 9777473ee99..401eb674609 100644
--- a/ext/standard/tests/strings/soundex_basic.phpt
+++ b/ext/standard/tests/strings/soundex_basic.phpt
@@ -9,9 +9,9 @@ Test soundex() function : basic functionality
 echo "*** Testing soundex() : basic functionality ***\n";
 
 var_dump(soundex("Euler"));
-var_dump(soundex("Gauss"));  
-var_dump(soundex("Hilbert"));  
-var_dump(soundex("Knuth")); 
+var_dump(soundex("Gauss"));
+var_dump(soundex("Hilbert"));
+var_dump(soundex("Knuth"));
 var_dump(soundex("Lloyd"));
 var_dump(soundex("Lukasiewicz"));
 
@@ -23,8 +23,8 @@ var_dump(soundex("Lloyd")       == soundex("Ladd"));      // L300
 var_dump(soundex("Lukasiewicz") == soundex("Lissajous")); // L222
 
 var_dump(soundex("Lukasiewicz") == soundex("Ghosh"));
-var_dump(soundex("Hilbert") == soundex("Ladd"));  
-?> 
+var_dump(soundex("Hilbert") == soundex("Ladd"));
+?>
 ===DONE===
 --EXPECT--
 *** Testing soundex() : basic functionality ***
@@ -42,5 +42,4 @@ bool(true)
 bool(true)
 bool(false)
 bool(false)
- 
 ===DONE===
diff --git a/ext/standard/tests/strings/soundex_error.phpt b/ext/standard/tests/strings/soundex_error.phpt
index 20cf2c9d3e4..8ff93b6d706 100644
--- a/ext/standard/tests/strings/soundex_error.phpt
+++ b/ext/standard/tests/strings/soundex_error.phpt
@@ -6,7 +6,7 @@ Test soundex() function : error conditions
  * Description: Calculate the soundex key of a string
  * Source code: ext/standard/string.c
 */
-		
+
 echo "\n*** Testing soundex error conditions ***";
 
 echo "-- Testing soundex() function with Zero arguments --\n";
@@ -17,7 +17,7 @@ $str = "Euler";
 $extra_arg = 10;
 var_dump( soundex( $str, $extra_arg) );
 
-?> 
+?>
 ===DONE===
 --EXPECTF--
 *** Testing soundex error conditions ***-- Testing soundex() function with Zero arguments --
@@ -30,5 +30,4 @@ NULL
 
 Warning: soundex() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
- 
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/standard/tests/strings/sprintf_basic1.phpt b/ext/standard/tests/strings/sprintf_basic1.phpt
index b1c6194f065..4507cbd97da 100644
--- a/ext/standard/tests/strings/sprintf_basic1.phpt
+++ b/ext/standard/tests/strings/sprintf_basic1.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - string format
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/sprintf_basic2.phpt b/ext/standard/tests/strings/sprintf_basic2.phpt
index 94b177f5a37..a73a2da21b4 100644
--- a/ext/standard/tests/strings/sprintf_basic2.phpt
+++ b/ext/standard/tests/strings/sprintf_basic2.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - integer format
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/sprintf_basic3.phpt b/ext/standard/tests/strings/sprintf_basic3.phpt
index 52582abbe11..a8d720a70a0 100644
--- a/ext/standard/tests/strings/sprintf_basic3.phpt
+++ b/ext/standard/tests/strings/sprintf_basic3.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - float format
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/sprintf_basic4.phpt b/ext/standard/tests/strings/sprintf_basic4.phpt
index ee0a4b5654f..e9469460e7a 100644
--- a/ext/standard/tests/strings/sprintf_basic4.phpt
+++ b/ext/standard/tests/strings/sprintf_basic4.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - bool format
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
  */
 
diff --git a/ext/standard/tests/strings/sprintf_basic5.phpt b/ext/standard/tests/strings/sprintf_basic5.phpt
index 7f06cbe47e5..f0d8029e07a 100644
--- a/ext/standard/tests/strings/sprintf_basic5.phpt
+++ b/ext/standard/tests/strings/sprintf_basic5.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - char format
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
  */
 
diff --git a/ext/standard/tests/strings/sprintf_basic6.phpt b/ext/standard/tests/strings/sprintf_basic6.phpt
index c6d691cec53..07c92190eed 100644
--- a/ext/standard/tests/strings/sprintf_basic6.phpt
+++ b/ext/standard/tests/strings/sprintf_basic6.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - exponential format
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
  */
 
diff --git a/ext/standard/tests/strings/sprintf_basic7.phpt b/ext/standard/tests/strings/sprintf_basic7.phpt
index 56bae8bd8d8..0e560716fc1 100644
--- a/ext/standard/tests/strings/sprintf_basic7.phpt
+++ b/ext/standard/tests/strings/sprintf_basic7.phpt
@@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) {
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
  */
 
diff --git a/ext/standard/tests/strings/sprintf_basic7_64bit.phpt b/ext/standard/tests/strings/sprintf_basic7_64bit.phpt
index 035661db615..74d226660a3 100644
--- a/ext/standard/tests/strings/sprintf_basic7_64bit.phpt
+++ b/ext/standard/tests/strings/sprintf_basic7_64bit.phpt
@@ -5,7 +5,7 @@ Test sprintf() function : basic functionality - unsigned format
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
  */
 
diff --git a/ext/standard/tests/strings/sprintf_basic8.phpt b/ext/standard/tests/strings/sprintf_basic8.phpt
index 925689939c8..dad2cb4cb36 100644
--- a/ext/standard/tests/strings/sprintf_basic8.phpt
+++ b/ext/standard/tests/strings/sprintf_basic8.phpt
@@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) {
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
  */
 
diff --git a/ext/standard/tests/strings/sprintf_basic8_64bit.phpt b/ext/standard/tests/strings/sprintf_basic8_64bit.phpt
index 9c7e1e65359..5e5c608d688 100644
--- a/ext/standard/tests/strings/sprintf_basic8_64bit.phpt
+++ b/ext/standard/tests/strings/sprintf_basic8_64bit.phpt
@@ -5,7 +5,7 @@ Test sprintf() function : basic functionality - octal format
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
  */
 
diff --git a/ext/standard/tests/strings/sprintf_basic9.phpt b/ext/standard/tests/strings/sprintf_basic9.phpt
index 1e16bf810c3..106a4c42d73 100644
--- a/ext/standard/tests/strings/sprintf_basic9.phpt
+++ b/ext/standard/tests/strings/sprintf_basic9.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - hexadecimal format
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
  */
 
diff --git a/ext/standard/tests/strings/sprintf_error.phpt b/ext/standard/tests/strings/sprintf_error.phpt
index f7f9e37e770..1c12cd31686 100644
--- a/ext/standard/tests/strings/sprintf_error.phpt
+++ b/ext/standard/tests/strings/sprintf_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test sprintf() function : error conditions 
+Test sprintf() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
  */
 
@@ -21,7 +21,7 @@ $arg1 = 'one';
 $arg2 = 'two';
 
 // with one argument less than expected
-var_dump( sprintf($format1) );  
+var_dump( sprintf($format1) );
 var_dump( sprintf($format2,$arg1) );
 var_dump( sprintf($format3,$arg1,$arg2) );
 
diff --git a/ext/standard/tests/strings/sprintf_f_2.phpt b/ext/standard/tests/strings/sprintf_f_2.phpt
index 1c7cc7f924c..9ee0aae17fb 100644
--- a/ext/standard/tests/strings/sprintf_f_2.phpt
+++ b/ext/standard/tests/strings/sprintf_f_2.phpt
@@ -77,7 +77,7 @@ var_dump(sprintf("%01.2f", $money)); // output "123.10"
 
 /* example#9: scientific notation */
 $number = 362525200;
- 
+
 var_dump(sprintf("%.3e", $number)); // outputs 3.63e+8
 ?>
 --EXPECTREGEX--
diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt
index 2a5bdfdec99..f7bb9dec00e 100644
--- a/ext/standard/tests/strings/sprintf_variation1.phpt
+++ b/ext/standard/tests/strings/sprintf_variation1.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - unexpected values for format argume
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -87,7 +87,7 @@ $values = array(
 $count = 1;
 foreach($values as $value) {
   echo "\n-- Iteration $count --\n";
-  
+
   // with default argument
   var_dump( sprintf($value) );
 
diff --git a/ext/standard/tests/strings/sprintf_variation10.phpt b/ext/standard/tests/strings/sprintf_variation10.phpt
index 3880b212df3..a0e7d0b0ca3 100644
--- a/ext/standard/tests/strings/sprintf_variation10.phpt
+++ b/ext/standard/tests/strings/sprintf_variation10.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with integer values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -42,7 +42,7 @@ $float_formats = array(
 $count = 1;
 foreach($integer_values as $int_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($float_formats as $format) {
     // with two arguments
     var_dump( sprintf($format, $int_value) );
diff --git a/ext/standard/tests/strings/sprintf_variation11.phpt b/ext/standard/tests/strings/sprintf_variation11.phpt
index 21e01883a6a..cb2a3a9cacc 100644
--- a/ext/standard/tests/strings/sprintf_variation11.phpt
+++ b/ext/standard/tests/strings/sprintf_variation11.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with resource values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -21,8 +21,8 @@ $resource_values = array (
 
 // various float formats
 $float_formats = array(
-  "%f", "%hf", "%lf", 
-  "%Lf", " %f", "%f ", 
+  "%f", "%hf", "%lf",
+  "%Lf", " %f", "%f ",
   "\t%f", "\n%f", "%4f",
   "%30f", "%[0-9]", "%*f"
 );
@@ -30,7 +30,7 @@ $float_formats = array(
 $count = 1;
 foreach($resource_values as $resource_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($float_formats as $format) {
     // with two arguments
     var_dump( sprintf($format, $resource_value) );
diff --git a/ext/standard/tests/strings/sprintf_variation12.phpt b/ext/standard/tests/strings/sprintf_variation12.phpt
index b1b186c4490..8614ea4d0a0 100644
--- a/ext/standard/tests/strings/sprintf_variation12.phpt
+++ b/ext/standard/tests/strings/sprintf_variation12.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test sprintf() function : usage variations - float formats with arrays 
+Test sprintf() function : usage variations - float formats with arrays
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -29,8 +29,8 @@ $array_values = array (
 
 // various float formats
 $float_formats = array(
-  "%f", "%hf", "%lf", 
-  "%Lf", " %f", "%f ", 
+  "%f", "%hf", "%lf",
+  "%Lf", " %f", "%f ",
   "\t%f", "\n%f", "%4f",
   "%30f", "%[0-9]", "%*f"
 );
@@ -38,7 +38,7 @@ $float_formats = array(
 $count = 1;
 foreach($array_values as $array_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($float_formats as $format) {
     // with two arguments
     var_dump( sprintf($format, $array_value) );
diff --git a/ext/standard/tests/strings/sprintf_variation13.phpt b/ext/standard/tests/strings/sprintf_variation13.phpt
index 60ae89c6102..45d6c5fa250 100644
--- a/ext/standard/tests/strings/sprintf_variation13.phpt
+++ b/ext/standard/tests/strings/sprintf_variation13.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with strings
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -35,8 +35,8 @@ $string_values = array (
 
 // various float formats
 $float_formats = array(
-  "%f", "%hf", "%lf", 
-  "%Lf", " %f", "%f ", 
+  "%f", "%hf", "%lf",
+  "%Lf", " %f", "%f ",
   "\t%f", "\n%f", "%4f",
   "%30f", "%[0-9]", "%*f"
 );
@@ -44,7 +44,7 @@ $float_formats = array(
 $count = 1;
 foreach($string_values as $string_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($float_formats as $format) {
     var_dump( sprintf($format, $string_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation14.phpt b/ext/standard/tests/strings/sprintf_variation14.phpt
index 40704d2899d..92bb8dfd084 100644
--- a/ext/standard/tests/strings/sprintf_variation14.phpt
+++ b/ext/standard/tests/strings/sprintf_variation14.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with boolean values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,8 +19,8 @@ $boolean_values = array (
 
 // various float formats
 $float_formats = array(
-  "%f", "%hf", "%lf", 
-  "%Lf", " %f", "%f ", 
+  "%f", "%hf", "%lf",
+  "%Lf", " %f", "%f ",
   "\t%f", "\n%f", "%4f",
   "%30f", "%[0-9]", "%*f"
 );
@@ -28,7 +28,7 @@ $float_formats = array(
 $count = 1;
 foreach($boolean_values as $boolean_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($float_formats as $format) {
     var_dump( sprintf($format, $boolean_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation15.phpt b/ext/standard/tests/strings/sprintf_variation15.phpt
index 3769ae90d92..1559cea83b2 100644
Binary files a/ext/standard/tests/strings/sprintf_variation15.phpt and b/ext/standard/tests/strings/sprintf_variation15.phpt differ
diff --git a/ext/standard/tests/strings/sprintf_variation16.phpt b/ext/standard/tests/strings/sprintf_variation16.phpt
index 57965315ee1..d314539ba5f 100644
--- a/ext/standard/tests/strings/sprintf_variation16.phpt
+++ b/ext/standard/tests/strings/sprintf_variation16.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - string formats with float values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : string formats with float values ***\n";
 
-// array of float values 
+// array of float values
 $float_values = array(
   -2147483649,
   2147483648,
@@ -29,9 +29,9 @@ $float_values = array(
 );
 
 // array of string formats
-$string_formats = array( 
-  "%s", "%hs", "%ls", 
-  "%Ls"," %s", "%s ", 
+$string_formats = array(
+  "%s", "%hs", "%ls",
+  "%Ls"," %s", "%s ",
   "\t%s", "\n%s", "%4s",
   "%30s", "%[a-zA-Z0-9]", "%*s"
 );
@@ -39,7 +39,7 @@ $string_formats = array(
 $count = 1;
 foreach($float_values as $float_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($string_formats as $format) {
     var_dump( sprintf($format, $float_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation17.phpt b/ext/standard/tests/strings/sprintf_variation17.phpt
index 8ba55070e8d..dc9bc8bcada 100644
--- a/ext/standard/tests/strings/sprintf_variation17.phpt
+++ b/ext/standard/tests/strings/sprintf_variation17.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - string formats with resource values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -20,9 +20,9 @@ $resource_values = array (
 );
 
 // array of string formats
-$string_formats = array( 
-  "%s", "%hs", "%ls", 
-  "%Ls"," %s", "%s ", 
+$string_formats = array(
+  "%s", "%hs", "%ls",
+  "%Ls"," %s", "%s ",
   "\t%s", "\n%s", "%4s",
   "%30s", "%[a-zA-Z0-9]", "%*s"
 );
@@ -30,7 +30,7 @@ $string_formats = array(
 $count = 1;
 foreach($resource_values as $resource_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($string_formats as $format) {
     var_dump( sprintf($format, $resource_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt
index 960bcd0e78e..645d3e96ea5 100644
--- a/ext/standard/tests/strings/sprintf_variation18.phpt
+++ b/ext/standard/tests/strings/sprintf_variation18.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - string formats with array values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -28,9 +28,9 @@ $array_values = array(
 );
 
 // array of string formats
-$string_formats = array( 
-  "%s", "%hs", "%ls", 
-  "%Ls"," %s", "%s ", 
+$string_formats = array(
+  "%s", "%hs", "%ls",
+  "%Ls"," %s", "%s ",
   "\t%s", "\n%s", "%4s",
   "%30s", "%[a-zA-Z0-9]", "%*s"
 );
@@ -38,7 +38,7 @@ $string_formats = array(
 $count = 1;
 foreach($array_values as $array_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($string_formats as $format) {
     var_dump( sprintf($format, $array_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation19.phpt b/ext/standard/tests/strings/sprintf_variation19.phpt
index fb3f90585e9..d6e8a8f5163 100644
--- a/ext/standard/tests/strings/sprintf_variation19.phpt
+++ b/ext/standard/tests/strings/sprintf_variation19.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - string formats with integer values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : string formats with integer values ***\n";
 
-// array of integer values 
+// array of integer values
 $integer_values = array(
   0,
   1,
@@ -32,9 +32,9 @@ $integer_values = array(
 );
 
 // array of string formats
-$string_formats = array( 
-  "%s", "%hs", "%ls", 
-  "%Ls"," %s", "%s ", 
+$string_formats = array(
+  "%s", "%hs", "%ls",
+  "%Ls"," %s", "%s ",
   "\t%s", "\n%s", "%4s",
   "%30s", "%[a-zA-Z0-9]", "%*s"
 );
@@ -42,7 +42,7 @@ $string_formats = array(
 $count = 1;
 foreach($integer_values as $integer_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($string_formats as $format) {
     var_dump( sprintf($format, $integer_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation2.phpt b/ext/standard/tests/strings/sprintf_variation2.phpt
index a663df4444c..967949a09ca 100644
--- a/ext/standard/tests/strings/sprintf_variation2.phpt
+++ b/ext/standard/tests/strings/sprintf_variation2.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - with all types of values for arg1 a
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -24,7 +24,7 @@ class sample
 {
   public function __toString() {
     return "Object";
-  } 
+  }
 }
 
 // creating a file resource
@@ -89,14 +89,14 @@ $values = array(
 $count = 1;
 foreach($values as $value) {
   echo "\n-- Iteration $count --\n";
-  
+
   // with two arguments
   var_dump( sprintf($format, $value) );
 
   // with three arguments
   var_dump( sprintf($format, $value, $arg2) );
-  
-  $count++;   
+
+  $count++;
 };
 
 // closing the resource
diff --git a/ext/standard/tests/strings/sprintf_variation20.phpt b/ext/standard/tests/strings/sprintf_variation20.phpt
index fc82fefa2a0..9283e76b8b0 100644
--- a/ext/standard/tests/strings/sprintf_variation20.phpt
+++ b/ext/standard/tests/strings/sprintf_variation20.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - string formats with boolean values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : string formats with boolean values ***\n";
 
-// array of boolean values 
+// array of boolean values
 $boolean_values = array(
   true,
   false,
@@ -18,9 +18,9 @@ $boolean_values = array(
 );
 
 // array of string formats
-$string_formats = array( 
-  "%s", "%hs", "%ls", 
-  "%Ls"," %s", "%s ", 
+$string_formats = array(
+  "%s", "%hs", "%ls",
+  "%Ls"," %s", "%s ",
   "\t%s", "\n%s", "%4s",
   "%30s", "%[a-zA-Z0-9]", "%*s"
 );
@@ -28,7 +28,7 @@ $string_formats = array(
 $count = 1;
 foreach($boolean_values as $boolean_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($string_formats as $format) {
     var_dump( sprintf($format, $boolean_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation21.phpt b/ext/standard/tests/strings/sprintf_variation21.phpt
index 20aa1e9d586..7967dbf2626 100644
Binary files a/ext/standard/tests/strings/sprintf_variation21.phpt and b/ext/standard/tests/strings/sprintf_variation21.phpt differ
diff --git a/ext/standard/tests/strings/sprintf_variation22.phpt b/ext/standard/tests/strings/sprintf_variation22.phpt
index 86847652507..db6599c10c9 100644
Binary files a/ext/standard/tests/strings/sprintf_variation22.phpt and b/ext/standard/tests/strings/sprintf_variation22.phpt differ
diff --git a/ext/standard/tests/strings/sprintf_variation23.phpt b/ext/standard/tests/strings/sprintf_variation23.phpt
index 09e5b9fbb21..fc3148c0be1 100644
--- a/ext/standard/tests/strings/sprintf_variation23.phpt
+++ b/ext/standard/tests/strings/sprintf_variation23.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - char formats with resource values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -20,8 +20,8 @@ $resource_values = array (
 );
 
 // array of char formats
-$char_formats = array( 
-  "%c", "%hc", "%lc", 
+$char_formats = array(
+  "%c", "%hc", "%lc",
   "%Lc", " %c", "%c ",
   "\t%c", "\n%c", "%4c",
   "%30c", "%[a-bA-B@#$&]", "%*c"
@@ -30,7 +30,7 @@ $char_formats = array(
 $count = 1;
 foreach($resource_values as $resource_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($char_formats as $format) {
     var_dump( sprintf($format, $resource_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation24.phpt b/ext/standard/tests/strings/sprintf_variation24.phpt
index 6bb3e0e370d..772b94381b3 100644
Binary files a/ext/standard/tests/strings/sprintf_variation24.phpt and b/ext/standard/tests/strings/sprintf_variation24.phpt differ
diff --git a/ext/standard/tests/strings/sprintf_variation25.phpt b/ext/standard/tests/strings/sprintf_variation25.phpt
index 456344c3f0d..027dd7c9dbb 100644
Binary files a/ext/standard/tests/strings/sprintf_variation25.phpt and b/ext/standard/tests/strings/sprintf_variation25.phpt differ
diff --git a/ext/standard/tests/strings/sprintf_variation26.phpt b/ext/standard/tests/strings/sprintf_variation26.phpt
index b5881ea5ea3..88c8bd42a44 100644
Binary files a/ext/standard/tests/strings/sprintf_variation26.phpt and b/ext/standard/tests/strings/sprintf_variation26.phpt differ
diff --git a/ext/standard/tests/strings/sprintf_variation27.phpt b/ext/standard/tests/strings/sprintf_variation27.phpt
index 88602dbdb2c..43974cecc38 100644
Binary files a/ext/standard/tests/strings/sprintf_variation27.phpt and b/ext/standard/tests/strings/sprintf_variation27.phpt differ
diff --git a/ext/standard/tests/strings/sprintf_variation28.phpt b/ext/standard/tests/strings/sprintf_variation28.phpt
index e295fc81814..0b0bf469218 100644
--- a/ext/standard/tests/strings/sprintf_variation28.phpt
+++ b/ext/standard/tests/strings/sprintf_variation28.phpt
@@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) {
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : octal formats with integer values ***\n";
 
-// array of integer values 
+// array of integer values
 $integer_values = array(
   0,
   1,
@@ -48,7 +48,7 @@ $octal_formats = array(
 $count = 1;
 foreach($integer_values as $integer_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($octal_formats as $format) {
     var_dump( sprintf($format, $integer_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt
index f4d8125e981..589c01d3d39 100644
--- a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt
+++ b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt
@@ -5,13 +5,13 @@ Test sprintf() function : usage variations - octal formats with integer values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : octal formats with integer values ***\n";
 
-// array of integer values 
+// array of integer values
 $integer_values = array(
   0,
   1,
@@ -44,7 +44,7 @@ $octal_formats = array(
 $count = 1;
 foreach($integer_values as $integer_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($octal_formats as $format) {
     var_dump( sprintf($format, $integer_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation29.phpt b/ext/standard/tests/strings/sprintf_variation29.phpt
index 87ee835b76f..4ee9edeff8c 100644
--- a/ext/standard/tests/strings/sprintf_variation29.phpt
+++ b/ext/standard/tests/strings/sprintf_variation29.phpt
@@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) {
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : octal formats with float values ***\n";
 
-// array of float values 
+// array of float values
 $float_values = array(
   0.0,
   -0.1,
@@ -28,9 +28,9 @@ $float_values = array(
 );
 
 // array of octal formats
-$octal_formats = array( 
-  "%o", "%ho", "%lo", 
-  "%Lo", " %o", "%o ",                        
+$octal_formats = array(
+  "%o", "%ho", "%lo",
+  "%Lo", " %o", "%o ",
   "\t%o", "\n%o", "%4o",
   "%30o", "%[0-7]", "%*o"
 );
@@ -38,7 +38,7 @@ $octal_formats = array(
 $count = 1;
 foreach($float_values as $float_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($octal_formats as $format) {
     var_dump( sprintf($format, $float_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation29_64bit.phpt b/ext/standard/tests/strings/sprintf_variation29_64bit.phpt
index 53b45613751..fb5dfa590d2 100644
--- a/ext/standard/tests/strings/sprintf_variation29_64bit.phpt
+++ b/ext/standard/tests/strings/sprintf_variation29_64bit.phpt
@@ -5,13 +5,13 @@ Test sprintf() function : usage variations - octal formats with float values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : octal formats with float values ***\n";
 
-// array of float values 
+// array of float values
 $float_values = array(
   0.0,
   -0.1,
@@ -24,9 +24,9 @@ $float_values = array(
 );
 
 // array of octal formats
-$octal_formats = array( 
-  "%o", "%ho", "%lo", 
-  "%Lo", " %o", "%o ",                        
+$octal_formats = array(
+  "%o", "%ho", "%lo",
+  "%Lo", " %o", "%o ",
   "\t%o", "\n%o", "%4o",
   "%30o", "%[0-7]", "%*o"
 );
@@ -34,7 +34,7 @@ $octal_formats = array(
 $count = 1;
 foreach($float_values as $float_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($octal_formats as $format) {
     var_dump( sprintf($format, $float_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation3.phpt b/ext/standard/tests/strings/sprintf_variation3.phpt
index 6c0577e4d4d..2ebdc0548b9 100644
--- a/ext/standard/tests/strings/sprintf_variation3.phpt
+++ b/ext/standard/tests/strings/sprintf_variation3.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - int formats with int values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -37,11 +37,11 @@ $int_formats = array(
   "\t%d", "\n%d", "%4d",
   "%30d", "%[0-9]", "%*d"
 );
- 
+
 $count = 1;
 foreach($valid_ints as $int_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($int_formats as $format) {
     var_dump( sprintf($format, $int_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation30.phpt b/ext/standard/tests/strings/sprintf_variation30.phpt
index 78d8e133bf4..d0beeb95016 100644
--- a/ext/standard/tests/strings/sprintf_variation30.phpt
+++ b/ext/standard/tests/strings/sprintf_variation30.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - octal formats with resource values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -20,9 +20,9 @@ $resource_values = array (
 );
 
 // array of octal formats
-$octal_formats = array( 
-  "%o", "%ho", "%lo", 
-  "%Lo", " %o", "%o ",                        
+$octal_formats = array(
+  "%o", "%ho", "%lo",
+  "%Lo", " %o", "%o ",
   "\t%o", "\n%o", "%4o",
   "%30o", "%[0-7]", "%*o"
 );
@@ -30,7 +30,7 @@ $octal_formats = array(
 $count = 1;
 foreach($resource_values as $resource_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($octal_formats as $format) {
     var_dump( sprintf($format, $resource_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation31.phpt b/ext/standard/tests/strings/sprintf_variation31.phpt
index a081273a225..c5064127e17 100644
--- a/ext/standard/tests/strings/sprintf_variation31.phpt
+++ b/ext/standard/tests/strings/sprintf_variation31.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - octal formats with array values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : octal formats with array values ***\n";
 
-// different arrays used to test the function 
+// different arrays used to test the function
 $array_values = array(
   array(),
   array(0),
@@ -27,9 +27,9 @@ $array_values = array(
 );
 
 // array of octal formats
-$octal_formats = array( 
-  "%o", "%ho", "%lo", 
-  "%Lo", " %o", "%o ",                        
+$octal_formats = array(
+  "%o", "%ho", "%lo",
+  "%Lo", " %o", "%o ",
   "\t%o", "\n%o", "%4o",
   "%30o", "%[0-7]", "%*o"
 );
@@ -37,7 +37,7 @@ $octal_formats = array(
 $count = 1;
 foreach($array_values as $array_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($octal_formats as $format) {
     var_dump( sprintf($format, $array_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation32.phpt b/ext/standard/tests/strings/sprintf_variation32.phpt
index 6caf8ee6a39..d61c6b7c671 100644
--- a/ext/standard/tests/strings/sprintf_variation32.phpt
+++ b/ext/standard/tests/strings/sprintf_variation32.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - octal formats with string values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : octal formats with string values ***\n";
 
-// array of string values 
+// array of string values
 $string_values = array(
   "",
   '',
@@ -33,9 +33,9 @@ $string_values = array(
 );
 
 // array of octal formats
-$octal_formats = array( 
-  "%o", "%ho", "%lo", 
-  "%Lo", " %o", "%o ",                        
+$octal_formats = array(
+  "%o", "%ho", "%lo",
+  "%Lo", " %o", "%o ",
   "\t%o", "\n%o", "%4o",
   "%30o", "%[0-7]", "%*o"
 );
@@ -43,7 +43,7 @@ $octal_formats = array(
 $count = 1;
 foreach($string_values as $string_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($octal_formats as $format) {
     var_dump( sprintf($format, $string_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation33.phpt b/ext/standard/tests/strings/sprintf_variation33.phpt
index e903108f9e1..aa2c96f012c 100644
--- a/ext/standard/tests/strings/sprintf_variation33.phpt
+++ b/ext/standard/tests/strings/sprintf_variation33.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - octal formats with boolean values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : octal formats with boolean values ***\n";
 
-// array of boolean values 
+// array of boolean values
 $boolean_values = array(
   true,
   false,
@@ -18,9 +18,9 @@ $boolean_values = array(
 );
 
 // array of octal formats
-$octal_formats = array( 
-  "%o", "%ho", "%lo", 
-  "%Lo", " %o", "%o ",                        
+$octal_formats = array(
+  "%o", "%ho", "%lo",
+  "%Lo", " %o", "%o ",
   "\t%o", "\n%o", "%4o",
   "%30o", "%[0-7]", "%*o"
 );
@@ -28,7 +28,7 @@ $octal_formats = array(
 $count = 1;
 foreach($boolean_values as $boolean_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($octal_formats as $format) {
     var_dump( sprintf($format, $boolean_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation34.phpt b/ext/standard/tests/strings/sprintf_variation34.phpt
index db905ebd18d..4d8f060b9d4 100644
--- a/ext/standard/tests/strings/sprintf_variation34.phpt
+++ b/ext/standard/tests/strings/sprintf_variation34.phpt
@@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) {
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : hexa formats with integer values ***\n";
 
-// array of integer values 
+// array of integer values
 $integer_values = array(
   0,
   1,
@@ -31,9 +31,9 @@ $integer_values = array(
   -0x80000000, // max negative integer as hexadecimal
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
-  0123,        // integer as octal 
+  0123,        // integer as octal
   01,       // should be quivalent to octal 1
-  -020000000000, // max negative integer as octal 
+  -020000000000, // max negative integer as octal
   017777777777  // max positive integer as octal
 );
 
@@ -48,7 +48,7 @@ $hexa_formats = array(
 $count = 1;
 foreach($integer_values as $integer_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($hexa_formats as $format) {
     var_dump( sprintf($format, $integer_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt
index a4914664a27..098f0205c35 100644
--- a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt
+++ b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt
@@ -5,13 +5,13 @@ Test sprintf() function : usage variations - hexa formats with integer values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : hexa formats with integer values ***\n";
 
-// array of integer values 
+// array of integer values
 $integer_values = array(
   0,
   1,
@@ -27,9 +27,9 @@ $integer_values = array(
   -0x80000000, // max negative integer as hexadecimal
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
-  0123,        // integer as octal 
+  0123,        // integer as octal
   01,       // should be quivalent to octal 1
-  -020000000000, // max negative integer as octal 
+  -020000000000, // max negative integer as octal
   017777777777  // max positive integer as octal
 );
 
@@ -44,7 +44,7 @@ $hexa_formats = array(
 $count = 1;
 foreach($integer_values as $integer_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($hexa_formats as $format) {
     var_dump( sprintf($format, $integer_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation35.phpt b/ext/standard/tests/strings/sprintf_variation35.phpt
index ca6ba891dd1..84312114812 100644
--- a/ext/standard/tests/strings/sprintf_variation35.phpt
+++ b/ext/standard/tests/strings/sprintf_variation35.phpt
@@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) {
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : hexa formats with float values ***\n";
 
-// array of float values 
+// array of float values
 $float_values = array(
   2147483647,
   0x800000001, // float value, beyond max positive int
@@ -32,8 +32,8 @@ $float_values = array(
 );
 
 // array of hexa formats
-$hexa_formats = array(  
-  "%x", "%xx", "%lx", 
+$hexa_formats = array(
+  "%x", "%xx", "%lx",
   "%Lx", " %x", "%x ",
   "\t%x", "\n%x", "%4x",
   "%30x", "%[0-9A-Fa-f]", "%*x"
@@ -42,7 +42,7 @@ $hexa_formats = array(
 $count = 1;
 foreach($float_values as $float_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($hexa_formats as $format) {
     // with two arguments
     var_dump( sprintf($format, $float_value) );
diff --git a/ext/standard/tests/strings/sprintf_variation35_64bit.phpt b/ext/standard/tests/strings/sprintf_variation35_64bit.phpt
index 09ae50498e3..37868f4b5cf 100644
--- a/ext/standard/tests/strings/sprintf_variation35_64bit.phpt
+++ b/ext/standard/tests/strings/sprintf_variation35_64bit.phpt
@@ -5,13 +5,13 @@ Test sprintf() function : usage variations - hexa formats with float values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : hexa formats with float values ***\n";
 
-// array of float values 
+// array of float values
 $float_values = array(
   2147483647,
   0x800000001, // float value, beyond max positive int
@@ -28,8 +28,8 @@ $float_values = array(
 );
 
 // array of hexa formats
-$hexa_formats = array(  
-  "%x", "%xx", "%lx", 
+$hexa_formats = array(
+  "%x", "%xx", "%lx",
   "%Lx", " %x", "%x ",
   "\t%x", "\n%x", "%4x",
   "%30x", "%[0-9A-Fa-f]", "%*x"
@@ -38,7 +38,7 @@ $hexa_formats = array(
 $count = 1;
 foreach($float_values as $float_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($hexa_formats as $format) {
     // with two arguments
     var_dump( sprintf($format, $float_value) );
diff --git a/ext/standard/tests/strings/sprintf_variation36.phpt b/ext/standard/tests/strings/sprintf_variation36.phpt
index d7d6999de8c..bf05a99db43 100644
--- a/ext/standard/tests/strings/sprintf_variation36.phpt
+++ b/ext/standard/tests/strings/sprintf_variation36.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - hexa formats with resource values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -20,8 +20,8 @@ $resource_values = array (
 );
 
 // array of hexa formats
-$hexa_formats = array(  
-  "%x", "%xx", "%lx", 
+$hexa_formats = array(
+  "%x", "%xx", "%lx",
   "%Lx", " %x", "%x ",
   "\t%x", "\n%x", "%4x",
   "%30x", "%[0-9A-Fa-f]", "%*x"
@@ -30,7 +30,7 @@ $hexa_formats = array(
 $count = 1;
 foreach($resource_values as $resource_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($hexa_formats as $format) {
     var_dump( sprintf($format, $resource_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation37.phpt b/ext/standard/tests/strings/sprintf_variation37.phpt
index d1ecbfc0dc3..f8abfb75fe4 100644
--- a/ext/standard/tests/strings/sprintf_variation37.phpt
+++ b/ext/standard/tests/strings/sprintf_variation37.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - hexa formats with array values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : hexa formats with array values ***\n";
 
-// array of array values 
+// array of array values
 $array_values = array(
   array(),
   array(0),
@@ -26,8 +26,8 @@ $array_values = array(
 );
 
 // array of hexa formats
-$hexa_formats = array(  
-  "%x", "%xx", "%lx", 
+$hexa_formats = array(
+  "%x", "%xx", "%lx",
   "%Lx", " %x", "%x ",
   "\t%x", "\n%x", "%4x",
   "%30x", "%[0-9A-Fa-f]", "%*x"
@@ -36,7 +36,7 @@ $hexa_formats = array(
 $count = 1;
 foreach($array_values as $array_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($hexa_formats as $format) {
     var_dump( sprintf($format, $array_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation38.phpt b/ext/standard/tests/strings/sprintf_variation38.phpt
index f9b4a7f6ab9..160b56b2c9e 100644
--- a/ext/standard/tests/strings/sprintf_variation38.phpt
+++ b/ext/standard/tests/strings/sprintf_variation38.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - hexa formats with string values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : hexa formats with string values ***\n";
 
-// array of string values 
+// array of string values
 $string_values = array(
   "",
   '',
@@ -32,8 +32,8 @@ $string_values = array(
 );
 
 // array of hexa formats
-$hexa_formats = array(  
-  "%x", "%xx", "%lx", 
+$hexa_formats = array(
+  "%x", "%xx", "%lx",
   "%Lx", " %x", "%x ",
   "\t%x", "\n%x", "%4x",
   "%30x", "%[0-9A-Fa-f]", "%*x"
@@ -42,7 +42,7 @@ $hexa_formats = array(
 $count = 1;
 foreach($string_values as $string_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($hexa_formats as $format) {
     var_dump( sprintf($format, $string_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation39.phpt b/ext/standard/tests/strings/sprintf_variation39.phpt
index dac4346176b..0180dd55d82 100644
--- a/ext/standard/tests/strings/sprintf_variation39.phpt
+++ b/ext/standard/tests/strings/sprintf_variation39.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - hexa formats with boolean values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : hexa formats with boolean values ***\n";
 
-// array of boolean values 
+// array of boolean values
 $boolean_values = array(
   true,
   false,
@@ -18,8 +18,8 @@ $boolean_values = array(
 );
 
 // array of hexa formats
-$hexa_formats = array(  
-  "%x", "%xx", "%lx", 
+$hexa_formats = array(
+  "%x", "%xx", "%lx",
   "%Lx", " %x", "%x ",
   "\t%x", "\n%x", "%4x",
   "%30x", "%[0-9A-Fa-f]", "%*x"
@@ -28,7 +28,7 @@ $hexa_formats = array(
 $count = 1;
 foreach($boolean_values as $boolean_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($hexa_formats as $format) {
     var_dump( sprintf($format, $boolean_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation4.phpt b/ext/standard/tests/strings/sprintf_variation4.phpt
index 7fc66f910ed..3a4588cff91 100644
--- a/ext/standard/tests/strings/sprintf_variation4.phpt
+++ b/ext/standard/tests/strings/sprintf_variation4.phpt
@@ -9,7 +9,7 @@ if (PHP_INT_SIZE != 4) {
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -39,11 +39,11 @@ $int_formats = array(
   "\t%d", "\n%d", "%4d",
   "%30d", "%[0-9]", "%*d"
 );
- 
+
 $count = 1;
 foreach($float_values as $float_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($int_formats as $format) {
     var_dump( sprintf($format, $float_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation40.phpt b/ext/standard/tests/strings/sprintf_variation40.phpt
index 774650a32c4..3a7c17c6863 100644
--- a/ext/standard/tests/strings/sprintf_variation40.phpt
+++ b/ext/standard/tests/strings/sprintf_variation40.phpt
@@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) {
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : unsigned formats with integer values ***\n";
 
-// array of integer values 
+// array of integer values
 $integer_values = array(
   0,
   1,
@@ -31,9 +31,9 @@ $integer_values = array(
   -0x80000000, // max negative integer as hexadecimal
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
-  0123,        // integer as octal 
+  0123,        // integer as octal
   01,       // should be quivalent to octal 1
-  -020000000000, // max negative integer as octal 
+  -020000000000, // max negative integer as octal
   017777777777  // max positive integer as octal
 );
 
@@ -49,7 +49,7 @@ $unsigned_formats = array(
 $count = 1;
 foreach($integer_values as $integer_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($unsigned_formats as $format) {
     var_dump( sprintf($format, $integer_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt
index fffe6155fe4..30f9d931832 100644
--- a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt
+++ b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt
@@ -5,13 +5,13 @@ Test sprintf() function : usage variations - unsigned formats with integer value
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : unsigned formats with integer values ***\n";
 
-// array of integer values 
+// array of integer values
 $integer_values = array(
   0,
   1,
@@ -27,9 +27,9 @@ $integer_values = array(
   -0x80000000, // max negative integer as hexadecimal
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
-  0123,        // integer as octal 
+  0123,        // integer as octal
   01,       // should be quivalent to octal 1
-  -020000000000, // max negative integer as octal 
+  -020000000000, // max negative integer as octal
   017777777777  // max positive integer as octal
 );
 
@@ -45,7 +45,7 @@ $unsigned_formats = array(
 $count = 1;
 foreach($integer_values as $integer_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($unsigned_formats as $format) {
     var_dump( sprintf($format, $integer_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation41.phpt b/ext/standard/tests/strings/sprintf_variation41.phpt
index 219ea0f025a..ac794eb3ede 100644
--- a/ext/standard/tests/strings/sprintf_variation41.phpt
+++ b/ext/standard/tests/strings/sprintf_variation41.phpt
@@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) {
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : unsigned formats with float values ***\n";
 
-// array of float values 
+// array of float values
 $float_values = array(
   2147483647,
   0x800000001, // float value, beyond max positive int
@@ -39,7 +39,7 @@ $float_values = array(
 // array of unsigned formats
 $unsigned_formats = array(
   "%u", "%hu", "%lu",
-  "%Lu", " %u", "%u ", 
+  "%Lu", " %u", "%u ",
   "\t%u", "\n%u", "%4u",
   "%30u", "%[0-9]", "%*u"
 );
@@ -47,7 +47,7 @@ $unsigned_formats = array(
 $count = 1;
 foreach($float_values as $float_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($unsigned_formats as $format) {
     var_dump( sprintf($format, $float_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation41_64bit.phpt b/ext/standard/tests/strings/sprintf_variation41_64bit.phpt
index 1435d02cb24..4f30c8676bf 100644
--- a/ext/standard/tests/strings/sprintf_variation41_64bit.phpt
+++ b/ext/standard/tests/strings/sprintf_variation41_64bit.phpt
@@ -5,13 +5,13 @@ Test sprintf() function : usage variations - unsigned formats with float values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : unsigned formats with float values ***\n";
 
-// array of float values 
+// array of float values
 $float_values = array(
   2147483647,
   0x800000001, // float value, beyond max positive int
@@ -35,7 +35,7 @@ $float_values = array(
 // array of unsigned formats
 $unsigned_formats = array(
   "%u", "%hu", "%lu",
-  "%Lu", " %u", "%u ", 
+  "%Lu", " %u", "%u ",
   "\t%u", "\n%u", "%4u",
   "%30u", "%[0-9]", "%*u"
 );
@@ -43,7 +43,7 @@ $unsigned_formats = array(
 $count = 1;
 foreach($float_values as $float_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($unsigned_formats as $format) {
     var_dump( sprintf($format, $float_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation42.phpt b/ext/standard/tests/strings/sprintf_variation42.phpt
index f9f7dd631dd..760c173a005 100644
--- a/ext/standard/tests/strings/sprintf_variation42.phpt
+++ b/ext/standard/tests/strings/sprintf_variation42.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - unsigned formats with resource valu
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -22,7 +22,7 @@ $resource_values = array (
 // array of unsigned formats
 $unsigned_formats = array(
   "%u", "%hu", "%lu",
-  "%Lu", " %u", "%u ", 
+  "%Lu", " %u", "%u ",
   "\t%u", "\n%u", "%4u",
    "%30u", "%[0-9]", "%*u"
 );
@@ -31,7 +31,7 @@ $unsigned_formats = array(
 $count = 1;
 foreach($resource_values as $resource_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($unsigned_formats as $format) {
     var_dump( sprintf($format, $resource_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation43.phpt b/ext/standard/tests/strings/sprintf_variation43.phpt
index 86527a52d41..1166d5ed340 100644
--- a/ext/standard/tests/strings/sprintf_variation43.phpt
+++ b/ext/standard/tests/strings/sprintf_variation43.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - unsigned formats with array values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : unsigned formats with array values ***\n";
 
-// array of array values 
+// array of array values
 $array_values = array(
   array(),
   array(0),
@@ -28,17 +28,17 @@ $array_values = array(
 );
 
 // array of unsigned formats
-$unsigned_formats = array( 
+$unsigned_formats = array(
   "%u", "%hu", "%lu",
-  "%Lu", " %u", "%u ",   
-  "\t%u", "\n%u", "%4u", 
+  "%Lu", " %u", "%u ",
+  "\t%u", "\n%u", "%4u",
    "%30u", "%[0-9]", "%*u"
 );
 
 $count = 1;
 foreach($array_values as $array_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($unsigned_formats as $format) {
     var_dump( sprintf($format, $array_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation44.phpt b/ext/standard/tests/strings/sprintf_variation44.phpt
index fd4e0bc5a60..363694a196f 100644
--- a/ext/standard/tests/strings/sprintf_variation44.phpt
+++ b/ext/standard/tests/strings/sprintf_variation44.phpt
@@ -9,13 +9,13 @@ if (PHP_INT_SIZE != 4) {
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : unsigned formats with string values ***\n";
 
-// array of string values 
+// array of string values
 $string_values = array(
   "",
   '',
@@ -40,10 +40,10 @@ $string_values = array(
 );
 
 // array of unsigned formats
-$unsigned_formats = array( 
+$unsigned_formats = array(
   "%u", "%hu", "%lu",
-  "%Lu", " %u", "%u ",   
-  "\t%u", "\n%u", "%4u", 
+  "%Lu", " %u", "%u ",
+  "\t%u", "\n%u", "%4u",
    "%30u", "%[0-9]", "%*u"
 );
 
@@ -51,7 +51,7 @@ $unsigned_formats = array(
 $count = 1;
 foreach($string_values as $string_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($unsigned_formats as $format) {
     var_dump( sprintf($format, $string_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation44_64bit.phpt b/ext/standard/tests/strings/sprintf_variation44_64bit.phpt
index 096e7e6499a..7ab86b9362d 100644
--- a/ext/standard/tests/strings/sprintf_variation44_64bit.phpt
+++ b/ext/standard/tests/strings/sprintf_variation44_64bit.phpt
@@ -5,13 +5,13 @@ Test sprintf() function : usage variations - unsigned formats with string values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : unsigned formats with string values ***\n";
 
-// array of string values 
+// array of string values
 $string_values = array(
   "",
   '',
@@ -36,10 +36,10 @@ $string_values = array(
 );
 
 // array of unsigned formats
-$unsigned_formats = array( 
+$unsigned_formats = array(
   "%u", "%hu", "%lu",
-  "%Lu", " %u", "%u ",   
-  "\t%u", "\n%u", "%4u", 
+  "%Lu", " %u", "%u ",
+  "\t%u", "\n%u", "%4u",
    "%30u", "%[0-9]", "%*u"
 );
 
@@ -47,7 +47,7 @@ $unsigned_formats = array(
 $count = 1;
 foreach($string_values as $string_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($unsigned_formats as $format) {
     var_dump( sprintf($format, $string_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation45.phpt b/ext/standard/tests/strings/sprintf_variation45.phpt
index e8219fc95e4..46eb67dd9ca 100644
--- a/ext/standard/tests/strings/sprintf_variation45.phpt
+++ b/ext/standard/tests/strings/sprintf_variation45.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - unsigned formats with boolean value
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : unsigned formats with boolean values ***\n";
 
-// array of boolean values 
+// array of boolean values
 $boolean_values = array(
   true,
   false,
@@ -18,17 +18,17 @@ $boolean_values = array(
 );
 
 // array of unsigned formats
-$unsigned_formats = array( 
+$unsigned_formats = array(
   "%u", "%hu", "%lu",
-  "%Lu", " %u", "%u ",   
-  "\t%u", "\n%u", "%4u", 
+  "%Lu", " %u", "%u ",
+  "\t%u", "\n%u", "%4u",
    "%30u", "%[0-9]", "%*u"
 );
 
 $count = 1;
 foreach($boolean_values as $boolean_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($unsigned_formats as $format) {
     var_dump( sprintf($format, $boolean_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation46.phpt b/ext/standard/tests/strings/sprintf_variation46.phpt
index 9b8892d7d03..172148f1970 100644
--- a/ext/standard/tests/strings/sprintf_variation46.phpt
+++ b/ext/standard/tests/strings/sprintf_variation46.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with integer val
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : scientific formats with integer values ***\n";
 
-// array of integer values 
+// array of integer values
 $integer_values = array(
   0,
   1,
@@ -25,9 +25,9 @@ $integer_values = array(
   -0x80000000, // max negative integer as hexadecimal
   0x7fffffff,  // max positive integer as hexadecimal
   0x7FFFFFFF,  // max positive integer as hexadecimal
-  0123,        // integer as octal 
+  0123,        // integer as octal
   01,       // should be quivalent to octal 1
-  -020000000000, // max negative integer as octal 
+  -020000000000, // max negative integer as octal
   017777777777  // max positive integer as octal
 );
 
@@ -42,7 +42,7 @@ $scientific_formats = array(
 $count = 1;
 foreach($integer_values as $integer_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($scientific_formats as $format) {
     var_dump( sprintf($format, $integer_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation47.phpt b/ext/standard/tests/strings/sprintf_variation47.phpt
index 4a100ef7dc5..fe11efb4011 100644
--- a/ext/standard/tests/strings/sprintf_variation47.phpt
+++ b/ext/standard/tests/strings/sprintf_variation47.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with float value
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : scientific formats with float values ***\n";
 
-// array of float values 
+// array of float values
 $float_values = array(
   -2147483649,
   2147483648,
@@ -44,7 +44,7 @@ $scientific_formats = array(
 $count = 1;
 foreach($float_values as $float_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($scientific_formats as $format) {
     var_dump( sprintf($format, $float_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation48.phpt b/ext/standard/tests/strings/sprintf_variation48.phpt
index 758b705c0db..ac551a4453a 100644
--- a/ext/standard/tests/strings/sprintf_variation48.phpt
+++ b/ext/standard/tests/strings/sprintf_variation48.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - scientific formats with resource va
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -20,17 +20,17 @@ $resource_values = array (
 );
 
 // array of scientific formats
-$scientific_formats = array( 
+$scientific_formats = array(
   "%e", "%he", "%le",
   "%Le", " %e", "%e ",
-  "\t%e", "\n%e", "%4e", 
+  "\t%e", "\n%e", "%4e",
   "%30e", "%[0-1]", "%*e"
 );
 
 $count = 1;
 foreach($resource_values as $resource_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($scientific_formats as $format) {
     var_dump( sprintf($format, $resource_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation49.phpt b/ext/standard/tests/strings/sprintf_variation49.phpt
index 554b43ac1e4..36b2407b2c7 100644
--- a/ext/standard/tests/strings/sprintf_variation49.phpt
+++ b/ext/standard/tests/strings/sprintf_variation49.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with array value
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : scientific formats with array values ***\n";
 
-// array of array values 
+// array of array values
 $array_values = array(
   array(),
   array(0),
@@ -29,17 +29,17 @@ $array_values = array(
 );
 
 // array of scientific formats
-$scientific_formats = array( 
+$scientific_formats = array(
   "%e", "%he", "%le",
   "%Le", " %e", "%e ",
-  "\t%e", "\n%e", "%4e", 
+  "\t%e", "\n%e", "%4e",
   "%30e", "%[0-1]", "%*e"
 );
 
 $count = 1;
 foreach($array_values as $array_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($scientific_formats as $format) {
     var_dump( sprintf($format, $array_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation4_64bit.phpt b/ext/standard/tests/strings/sprintf_variation4_64bit.phpt
index 21bb391b2eb..7b792825ca8 100644
--- a/ext/standard/tests/strings/sprintf_variation4_64bit.phpt
+++ b/ext/standard/tests/strings/sprintf_variation4_64bit.phpt
@@ -5,7 +5,7 @@ Test sprintf() function : usage variations - int formats with float values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -35,11 +35,11 @@ $int_formats = array(
   "\t%d", "\n%d", "%4d",
   "%30d", "%[0-9]", "%*d"
 );
- 
+
 $count = 1;
 foreach($float_values as $float_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($int_formats as $format) {
     var_dump( sprintf($format, $float_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation5.phpt b/ext/standard/tests/strings/sprintf_variation5.phpt
index ee13d3d64b3..4fc37435ef8 100644
--- a/ext/standard/tests/strings/sprintf_variation5.phpt
+++ b/ext/standard/tests/strings/sprintf_variation5.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - int formats with resource values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -15,7 +15,7 @@ $dfp = opendir ( dirname(__FILE__) );
 
 $fp_copy = $fp;
 $dfp_copy = $dfp;
-  
+
 // array of resource types
 $resource_types = array (
   $fp_copy,
@@ -28,11 +28,11 @@ $int_formats = array(
   "\t%d", "\n%d", "%4d",
   "%[0-9]", "%*d"
 );
- 
+
 $count = 1;
 foreach($resource_types as $res) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($int_formats as $format) {
     var_dump( sprintf($format, $res) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation50.phpt b/ext/standard/tests/strings/sprintf_variation50.phpt
index 62bae0e22a1..cce7cdbadbb 100644
--- a/ext/standard/tests/strings/sprintf_variation50.phpt
+++ b/ext/standard/tests/strings/sprintf_variation50.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with string valu
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : scientific formats with string values ***\n";
 
-// array of string values 
+// array of string values
 $string_values = array(
   "",
   '',
@@ -44,7 +44,7 @@ $scientific_formats = array(
 $count = 1;
 foreach($string_values as $string_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($scientific_formats as $format) {
     var_dump( sprintf($format, $string_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation51.phpt b/ext/standard/tests/strings/sprintf_variation51.phpt
index d988aa70efd..70e70b0887a 100644
--- a/ext/standard/tests/strings/sprintf_variation51.phpt
+++ b/ext/standard/tests/strings/sprintf_variation51.phpt
@@ -3,13 +3,13 @@ Test sprintf() function : usage variations - scientific formats with boolean val
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
 echo "*** Testing sprintf() : scientific formats with boolean values ***\n";
 
-// array of boolean values 
+// array of boolean values
 $boolean_values = array(
   true,
   false,
@@ -18,17 +18,17 @@ $boolean_values = array(
 );
 
 // array of scientific formats
-$scientific_formats = array( 
+$scientific_formats = array(
   "%e", "%he", "%le",
   "%Le", " %e", "%e ",
-  "\t%e", "\n%e", "%4e", 
+  "\t%e", "\n%e", "%4e",
   "%30e", "%[0-1]", "%*e"
 );
 
 $count = 1;
 foreach($boolean_values as $boolean_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($scientific_formats as $format) {
     var_dump( sprintf($format, $boolean_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation52.phpt b/ext/standard/tests/strings/sprintf_variation52.phpt
index 996434fef4e..7817f77b2fb 100644
--- a/ext/standard/tests/strings/sprintf_variation52.phpt
+++ b/ext/standard/tests/strings/sprintf_variation52.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - typical format strings
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/sprintf_variation53.phpt b/ext/standard/tests/strings/sprintf_variation53.phpt
index 427d0d9364b..199a957979d 100644
--- a/ext/standard/tests/strings/sprintf_variation53.phpt
+++ b/ext/standard/tests/strings/sprintf_variation53.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - with whitespaces in format strings
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/sprintf_variation6.phpt b/ext/standard/tests/strings/sprintf_variation6.phpt
index 362c90d0a73..f21005dcdec 100644
--- a/ext/standard/tests/strings/sprintf_variation6.phpt
+++ b/ext/standard/tests/strings/sprintf_variation6.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - int formats with arrays
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -32,14 +32,14 @@ $array_types = array (
 $int_formats = array(
   "%d", "%hd", "%ld",
   "%Ld", " %d", "%d ",
-  "\t%d", "\n%d", "%4d", 
+  "\t%d", "\n%d", "%4d",
   "%30d", "%[0-9]", "%*d"
 );
- 
+
 $count = 1;
 foreach($array_types as $arr) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($int_formats as $format) {
     var_dump( sprintf($format, $arr) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation7.phpt b/ext/standard/tests/strings/sprintf_variation7.phpt
index 30e9aa54f13..3b858ca7e4c 100644
--- a/ext/standard/tests/strings/sprintf_variation7.phpt
+++ b/ext/standard/tests/strings/sprintf_variation7.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - int formats with boolean values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -21,14 +21,14 @@ $boolean_values = array (
 $int_formats = array(
   "%d", "%hd", "%ld",
   "%Ld", " %d", "%d ",
-  "\t%d", "\n%d", "%4d", 
+  "\t%d", "\n%d", "%4d",
   "%30d", "%[0-9]", "%*d"
 );
- 
+
 $count = 1;
 foreach($boolean_values as $boolean_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($int_formats as $format) {
     var_dump( sprintf($format, $boolean_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation8.phpt b/ext/standard/tests/strings/sprintf_variation8.phpt
index 9bec9388366..731933a8468 100644
--- a/ext/standard/tests/strings/sprintf_variation8.phpt
+++ b/ext/standard/tests/strings/sprintf_variation8.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - int formats with string values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -41,11 +41,11 @@ $int_formats = array(
   "\t%d", "\n%d", "%4d",
   "%30d", "%[0-9]", "%*d"
 );
- 
+
 $count = 1;
 foreach($string_values as $string_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($int_formats as $format) {
     var_dump( sprintf($format, $string_value) );
   }
diff --git a/ext/standard/tests/strings/sprintf_variation9.phpt b/ext/standard/tests/strings/sprintf_variation9.phpt
index 6511d1ad6ee..b1894225727 100644
--- a/ext/standard/tests/strings/sprintf_variation9.phpt
+++ b/ext/standard/tests/strings/sprintf_variation9.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - float formats with float values
 --FILE--
 <?php
 /* Prototype  : string sprintf(string $format [, mixed $arg1 [, mixed ...]])
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -55,7 +55,7 @@ $float_formats = array(
 $count = 1;
 foreach($float_values as $float_value) {
   echo "\n-- Iteration $count --\n";
-  
+
   foreach($float_formats as $format) {
     var_dump( sprintf($format, $float_value) );
   }
diff --git a/ext/standard/tests/strings/sscanf_basic1.phpt b/ext/standard/tests/strings/sscanf_basic1.phpt
index dadafbde2ce..8a38f9d19ed 100644
--- a/ext/standard/tests/strings/sscanf_basic1.phpt
+++ b/ext/standard/tests/strings/sscanf_basic1.phpt
@@ -16,15 +16,15 @@ echo "*** Testing sscanf() : basic functionality - using string format ***\n";
 $str = "Part: Widget Serial Number: 1234789 Stock: 25";
 $format = "Part: %s Serial Number: %s Stock: %s";
 
-echo "\n-- Try sccanf() WITHOUT optional args --\n"; 
+echo "\n-- Try sccanf() WITHOUT optional args --\n";
 // extract details using short format
 list($part, $number, $stock) = sscanf($str, $format);
 var_dump($part, $number, $stock);
 
-echo "\n-- Try sccanf() WITH optional args --\n"; 
+echo "\n-- Try sccanf() WITH optional args --\n";
 // extract details using long  format
 $res = sscanf($str, $format, $part, $number, $stock);
-var_dump($res, $part, $number, $stock); 
+var_dump($res, $part, $number, $stock);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/sscanf_basic2.phpt b/ext/standard/tests/strings/sscanf_basic2.phpt
index 693a307c05d..92f4d1051ee 100644
--- a/ext/standard/tests/strings/sscanf_basic2.phpt
+++ b/ext/standard/tests/strings/sscanf_basic2.phpt
@@ -16,15 +16,15 @@ echo "*** Testing sscanf() : basic functionality - using integer format ***\n";
 $str = "Part: Widget Serial Number: 1234789 Stock: 25";
 $format = "Part: %s Serial Number: %d Stock: %d";
 
-echo "\n-- Try sccanf() WITHOUT optional args --\n"; 
+echo "\n-- Try sccanf() WITHOUT optional args --\n";
 // extract details using short format
 list($part, $number, $stock) = sscanf($str, $format);
 var_dump($part, $number, $stock);
 
-echo "\n-- Try sccanf() WITH optional args --\n"; 
+echo "\n-- Try sccanf() WITH optional args --\n";
 // extract details using long  format
 $res = sscanf($str, $format, $part, $number, $stock);
-var_dump($res, $part, $number, $stock); 
+var_dump($res, $part, $number, $stock);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/sscanf_basic3.phpt b/ext/standard/tests/strings/sscanf_basic3.phpt
index de910ef4b8c..b728dea34d4 100644
--- a/ext/standard/tests/strings/sscanf_basic3.phpt
+++ b/ext/standard/tests/strings/sscanf_basic3.phpt
@@ -13,15 +13,15 @@ echo "*** Testing sscanf() : basic functionality -- using float format ***\n";
 $str = "Part: Widget Length: 111.53 Width: 22.345 Depth: 12.4";
 $format = "Part: %s Length: %f Width: %f Depth: %f";
 
-echo "\n-- Try sccanf() WITHOUT optional args --\n"; 
+echo "\n-- Try sccanf() WITHOUT optional args --\n";
 // extract details using short format
 list($part, $length, $width, $depth) = sscanf($str, $format);
 var_dump($part, $length, $width, $depth);
 
-echo "\n-- Try sccanf() WITH optional args --\n"; 
+echo "\n-- Try sccanf() WITH optional args --\n";
 // extract details using long  format
 $res = sscanf($str, $format, $part, $length, $width, $depth);
-var_dump($res, $part, $length, $width, $depth); 
+var_dump($res, $part, $length, $width, $depth);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/sscanf_basic4.phpt b/ext/standard/tests/strings/sscanf_basic4.phpt
index 8ce44ff4c81..8ed760afded 100644
--- a/ext/standard/tests/strings/sscanf_basic4.phpt
+++ b/ext/standard/tests/strings/sscanf_basic4.phpt
@@ -13,15 +13,15 @@ echo "*** Testing sscanf() : basic functionality - using char format ***\n";
 $str = "X = A + B - C";
 $format = "%c = %c + %c - %c";
 
-echo "\n-- Try sccanf() WITHOUT optional args --\n"; 
+echo "\n-- Try sccanf() WITHOUT optional args --\n";
 // extract details using short format
 list($arg1, $arg2, $arg3, $arg4) = sscanf($str, $format);
 var_dump($arg1, $arg2, $arg3, $arg4);
 
-echo "\n-- Try sccanf() WITH optional args --\n"; 
+echo "\n-- Try sccanf() WITH optional args --\n";
 // extract details using long  format
 $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4);
-var_dump($res, $arg1, $arg2, $arg3, $arg4); 
+var_dump($res, $arg1, $arg2, $arg3, $arg4);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/sscanf_basic5.phpt b/ext/standard/tests/strings/sscanf_basic5.phpt
index 5dbbf448131..36c2feba9d9 100644
--- a/ext/standard/tests/strings/sscanf_basic5.phpt
+++ b/ext/standard/tests/strings/sscanf_basic5.phpt
@@ -14,19 +14,19 @@ $str = "10.12345 10.12345E3 10.12345e3 -10.12345e4" ;
 $format1 = "%e %e %e %e";
 $format2 = "%E %E %E %E";
 
-echo "\n-- Try sccanf() WITHOUT optional args --\n"; 
+echo "\n-- Try sccanf() WITHOUT optional args --\n";
 // extract details using short format
 list($arg1, $arg2, $arg3, $arg4) = sscanf($str, $format1);
 var_dump($arg1, $arg2, $arg3, $arg4);
 list($arg1, $arg2, $arg3, $arg4) = sscanf($str, $format2);
 var_dump($arg1, $arg2, $arg3, $arg4);
 
-echo "\n-- Try sccanf() WITH optional args --\n"; 
+echo "\n-- Try sccanf() WITH optional args --\n";
 // extract details using long  format
 $res = sscanf($str, $format1, $arg1, $arg2, $arg3, $arg4);
-var_dump($res, $arg1, $arg2, $arg3, $arg4); 
+var_dump($res, $arg1, $arg2, $arg3, $arg4);
 $res = sscanf($str, $format2,$arg1, $arg2, $arg3, $arg4);
-var_dump($res, $arg1, $arg2, $arg3, $arg4); 
+var_dump($res, $arg1, $arg2, $arg3, $arg4);
 
 
 ?>
diff --git a/ext/standard/tests/strings/sscanf_basic6.phpt b/ext/standard/tests/strings/sscanf_basic6.phpt
index 6efdd0b687c..381ccc12c27 100644
--- a/ext/standard/tests/strings/sscanf_basic6.phpt
+++ b/ext/standard/tests/strings/sscanf_basic6.phpt
@@ -19,15 +19,15 @@ echo "*** Testing sscanf() : basic functionality - using unsigned format ***\n";
 $str = "-11 +11 11 -11.234 +11.234 11.234";
 $format = "%u %u %u %u %u %u";
 
-echo "\n-- Try sccanf() WITHOUT optional args --\n"; 
+echo "\n-- Try sccanf() WITHOUT optional args --\n";
 // extract details using short format
 list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format);
 var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
 
-echo "\n-- Try sccanf() WITH optional args --\n"; 
+echo "\n-- Try sccanf() WITH optional args --\n";
 // extract details using long  format
 $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
-var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); 
+var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/sscanf_basic7.phpt b/ext/standard/tests/strings/sscanf_basic7.phpt
index 1d54054d4b1..253dd1ba536 100644
--- a/ext/standard/tests/strings/sscanf_basic7.phpt
+++ b/ext/standard/tests/strings/sscanf_basic7.phpt
@@ -13,15 +13,15 @@ echo "*** Testing sscanf() : basic functionality - using octal format ***\n";
 $str = "0123 -0123 +0123 0129 -0129 +0129";
 $format = "%o %o %o %o %o %o";
 
-echo "\n-- Try sccanf() WITHOUT optional args --\n"; 
+echo "\n-- Try sccanf() WITHOUT optional args --\n";
 // extract details using short format
 list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format);
 var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
 
-echo "\n-- Try sccanf() WITH optional args --\n"; 
+echo "\n-- Try sccanf() WITH optional args --\n";
 // extract details using long  format
 $res = sscanf($str, $format, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
-var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); 
+var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/sscanf_basic8.phpt b/ext/standard/tests/strings/sscanf_basic8.phpt
index 4773f026afd..bcec81eab4d 100644
--- a/ext/standard/tests/strings/sscanf_basic8.phpt
+++ b/ext/standard/tests/strings/sscanf_basic8.phpt
@@ -14,19 +14,19 @@ $str = "129 12F 123B -123B 01ABC 1G";
 $format1 = "%x %x %x %x %x %x";
 $format2 = "%X %X %X %X %X %X";
 
-echo "\n-- Try sccanf() WITHOUT optional args --\n"; 
+echo "\n-- Try sccanf() WITHOUT optional args --\n";
 // extract details using short format
 list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format1);
 var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
 list($arg1, $arg2, $arg3, $arg4, $arg5, $arg6) = sscanf($str, $format2);
 var_dump($arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
 
-echo "\n-- Try sccanf() WITH optional args --\n"; 
+echo "\n-- Try sccanf() WITH optional args --\n";
 // extract details using long  format
 $res = sscanf($str, $format1, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
-var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); 
+var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
 $res = sscanf($str, $format2, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
-var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); 
+var_dump($res, $arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/sscanf_error.phpt b/ext/standard/tests/strings/sscanf_error.phpt
index 8d883a1f926..f2a3dcbfec4 100644
--- a/ext/standard/tests/strings/sscanf_error.phpt
+++ b/ext/standard/tests/strings/sscanf_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test sscanf() function : error conditions 
+Test sscanf() function : error conditions
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/sscanf_variation1.phpt b/ext/standard/tests/strings/sscanf_variation1.phpt
index 9bbf2c8b790..f5c4664526d 100644
--- a/ext/standard/tests/strings/sscanf_variation1.phpt
+++ b/ext/standard/tests/strings/sscanf_variation1.phpt
@@ -17,7 +17,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -32,36 +32,36 @@ $inputs =  array (
 		  -2,
  		  2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*6*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*9*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*12*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*16*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*18*/	  new sample(),
-		
+
 		  // resource
 /*19*/	  $file_handle,
-		
+
 		  // undefined variable
 /*20*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*21*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/sscanf_variation2.phpt b/ext/standard/tests/strings/sscanf_variation2.phpt
index ee3a41a7c30..9d2904ff725 100644
--- a/ext/standard/tests/strings/sscanf_variation2.phpt
+++ b/ext/standard/tests/strings/sscanf_variation2.phpt
@@ -17,7 +17,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -32,36 +32,36 @@ $inputs =  array (
 		  -2,
 		   2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*6*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*9*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*12*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*16*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*18*/	  new sample(),
-		
+
 		  // resource
 /*19*/	  $file_handle,
-		
+
 		  // undefined variable
 /*20*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*21*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/str_ireplace.phpt b/ext/standard/tests/strings/str_ireplace.phpt
index b127424dfea..526b8ac7235 100644
--- a/ext/standard/tests/strings/str_ireplace.phpt
+++ b/ext/standard/tests/strings/str_ireplace.phpt
@@ -47,7 +47,7 @@ var_dump($Data = str_ireplace("\n", "<br>", $Data));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: str_ireplace() expects at least 3 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/standard/tests/strings/str_pad.phpt b/ext/standard/tests/strings/str_pad.phpt
index 0c0c2026cda..b44a9517ab7 100644
Binary files a/ext/standard/tests/strings/str_pad.phpt and b/ext/standard/tests/strings/str_pad.phpt differ
diff --git a/ext/standard/tests/strings/str_pad_variation1.phpt b/ext/standard/tests/strings/str_pad_variation1.phpt
index aff89f598a6..26902cdd4aa 100644
--- a/ext/standard/tests/strings/str_pad_variation1.phpt
+++ b/ext/standard/tests/strings/str_pad_variation1.phpt
@@ -7,7 +7,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$input' argu
  * Source code: ext/standard/string.c
 */
 
-/* Test str_pad() function: with unexpected inputs for '$input' 
+/* Test str_pad() function: with unexpected inputs for '$input'
  *  and expected type for '$pad_length'
 */
 
@@ -21,7 +21,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -36,36 +36,36 @@ $inputs =  array (
 		  -2,
 		  2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*6*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*9*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*12*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null vlaues
 /*16*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*18*/	  new sample(),
-		
+
 		  // resource
 /*19*/	  $file_handle,
-		
+
 		  // undefined variable
 /*20*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*21*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/str_pad_variation2.phpt b/ext/standard/tests/strings/str_pad_variation2.phpt
index 6313dd0fe25..ed620d07bb5 100644
--- a/ext/standard/tests/strings/str_pad_variation2.phpt
+++ b/ext/standard/tests/strings/str_pad_variation2.phpt
@@ -7,7 +7,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$pad_length'
  * Source code: ext/standard/string.c
 */
 
-/* Test str_pad() function: with unexpected inputs for '$pad_length' 
+/* Test str_pad() function: with unexpected inputs for '$pad_length'
  *  and expected type for '$input'
 */
 
@@ -21,7 +21,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -35,36 +35,36 @@ $pad_lengths =  array (
 		  1,
 		  -2,
 		  255,
-		
+
 		  // float values
 /*5*/	  10.5,
 		  -20.5,
 		  10.12345e2,
-		
+
 		  // array values
 /*8*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*11*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null vlaues
 /*15*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*17*/	  new sample(),
-		
+
 		  // resource
 /*18*/	  $file_handle,
-		
+
 		  // undefined variable
 /*19*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*20*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/str_pad_variation3.phpt b/ext/standard/tests/strings/str_pad_variation3.phpt
index c277eb756bd..b9209e66570 100644
--- a/ext/standard/tests/strings/str_pad_variation3.phpt
+++ b/ext/standard/tests/strings/str_pad_variation3.phpt
@@ -7,7 +7,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$pad_string'
  * Source code: ext/standard/string.c
 */
 
-/* Test str_pad() function: with unexpected inputs for '$pad_string' 
+/* Test str_pad() function: with unexpected inputs for '$pad_string'
  *  and expected type for '$input' and '$pad_length'
 */
 
@@ -21,7 +21,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -36,36 +36,36 @@ $pad_strings =  array (
 		  -2,
 		  2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*6*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*9*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*12*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null vlaues
 /*16*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*18*/	  new sample(),
-		
+
 		  // resource
 /*19*/	  $file_handle,
-		
+
 		  // undefined variable
 /*20*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*21*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/str_pad_variation4.phpt b/ext/standard/tests/strings/str_pad_variation4.phpt
index 585d79edb3d..3574d299b59 100644
--- a/ext/standard/tests/strings/str_pad_variation4.phpt
+++ b/ext/standard/tests/strings/str_pad_variation4.phpt
@@ -9,7 +9,7 @@ Test str_pad() function : usage variations - unexpected inputs for '$pad_type' a
  * Source code: ext/standard/string.c
 */
 
-/* Test str_pad() function: with unexpected inputs for '$pad_type' 
+/* Test str_pad() function: with unexpected inputs for '$pad_type'
  *  and expected type for '$input', '$pad_length' and '$pad_string'
 */
 
@@ -23,7 +23,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 // array with different values for $input
@@ -33,43 +33,43 @@ $pad_types =  array (
 /*1*/	  0, // == STR_PAD_LEFT
 		  1, // == STR_PAD_RIGHT
 		  2, // == STR_PAD_BOTH
-		  -2, 
+		  -2,
 		  2147483647,
 		  -2147483648,
-		  	
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		  
+
 		  // string data
 /*10*/	  "abc",
 		  "STR_PAD_LEFT",
 		  "2",
 		  "0x2",
 		  "02",
-		  
+
 		  // array values
 /*15*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*18*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null vlaues
 /*22*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*24*/	  new sample(),
-		
+
 		  // undefined variable
 /*25*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*26*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/str_pad_variation5.phpt b/ext/standard/tests/strings/str_pad_variation5.phpt
index f1f47b932c9..8eade37df3d 100644
--- a/ext/standard/tests/strings/str_pad_variation5.phpt
+++ b/ext/standard/tests/strings/str_pad_variation5.phpt
@@ -16,7 +16,7 @@ if (getenv("USE_ZEND_ALLOC") === "0") {
  * Source code: ext/standard/string.c
 */
 
-/* Test str_pad() function: with unexpected inputs for '$pad_length' 
+/* Test str_pad() function: with unexpected inputs for '$pad_length'
  *  and expected type for '$input'
 */
 
diff --git a/ext/standard/tests/strings/str_repeat.phpt b/ext/standard/tests/strings/str_repeat.phpt
index bbcc489990a..54763ddf8b6 100644
Binary files a/ext/standard/tests/strings/str_repeat.phpt and b/ext/standard/tests/strings/str_repeat.phpt differ
diff --git a/ext/standard/tests/strings/str_replace.phpt b/ext/standard/tests/strings/str_replace.phpt
index b53ed665d47..7b411abac54 100644
--- a/ext/standard/tests/strings/str_replace.phpt
+++ b/ext/standard/tests/strings/str_replace.phpt
@@ -4,10 +4,10 @@ Test str_replace() function
 precision=14
 --FILE--
 <?php
-/* 
-  Prototype: mixed str_replace(mixed $search, mixed $replace, 
+/*
+  Prototype: mixed str_replace(mixed $search, mixed $replace,
                                mixed $subject [, int &$count]);
-  Description: Replace all occurrences of the search string with 
+  Description: Replace all occurrences of the search string with
                the replacement string
 */
 
@@ -27,13 +27,13 @@ var_dump( str_replace("long string here", "", "", $count) );
 var_dump( $count );
 
 $fp = fopen( __FILE__, "r" );
-$fp_copy = $fp; 
+$fp_copy = $fp;
 var_dump( str_replace($fp_copy, $fp_copy, $fp_copy, $fp_copy) );
 var_dump( $fp_copy );
 fclose($fp);
 
 echo "\n*** Testing str_replace() with various search values ***";
-$search_arr = array( TRUE, FALSE, 1, 0, -1, "1", "0", "-1",  NULL, 
+$search_arr = array( TRUE, FALSE, 1, 0, -1, "1", "0", "-1",  NULL,
                      array(), "php", "");
 
 $i = 0;
@@ -41,7 +41,7 @@ $i = 0;
 foreach( $search_arr as $value ) {
   echo "\n-- Iteration $i --\n";
   /* replace the string in array */
-  var_dump( str_replace($value, "FOUND", $search_arr, $count) ); 
+  var_dump( str_replace($value, "FOUND", $search_arr, $count) );
   var_dump( $count );
   $i++;
 }
@@ -52,7 +52,7 @@ $subject = "Hello, world,0120333.3445-1.234567          NULL TRUE FALSE\000
 	    ?Hello, World chr(0).chr(128).chr(234).chr(65).chr(255).chr(256)";
 
 /* needles in an array to be compared in the string $string */
-$search_str = array ( 
+$search_str = array (
   "Hello, World",
   'Hello, World',
   '!!Hello, World',
@@ -97,20 +97,20 @@ for( $i = 0; $i < count($search_str); $i++ ) {
   var_dump( str_replace($search_str[$i], "FOUND", $subject, $count) );
   echo "-- search string has found '$count' times\n";
 }
-  
+
 
 echo "\n*** Testing Miscelleneous input data ***\n";
-/*  If replace has fewer values than search, then an empty 
+/*  If replace has fewer values than search, then an empty
     string is used for the rest of replacement values */
-var_dump( str_replace(array("a", "a", "b"), 
-		      array("q", "q"), 
+var_dump( str_replace(array("a", "a", "b"),
+		      array("q", "q"),
 		      "aaabb", $count
 		     )
 	);
 var_dump($count);
-var_dump( str_replace(array("a", "a", "b"), 
-                      array("q", "q"), 
-                      array("aaa", "bbb", "ccc"), 
+var_dump( str_replace(array("a", "a", "b"),
+                      array("q", "q"),
+                      array("aaa", "bbb", "ccc"),
                       $count
                      )
         );
@@ -122,7 +122,7 @@ echo "\n-- Testing objects --\n";
         to string" by default, when an object is passed instead of string:
 The error can be  avoided by choosing the __toString magix method as follows: */
 
-class subject 
+class subject
 {
   function __toString() {
     return "Hello, world";
@@ -130,7 +130,7 @@ class subject
 }
 $obj_subject = new subject;
 
-class search 
+class search
 {
   function __toString() {
     return "Hello, world";
@@ -138,7 +138,7 @@ class search
 }
 $obj_search = new search;
 
-class replace 
+class replace
 {
   function __toString() {
     return "Hello, world";
@@ -155,15 +155,15 @@ var_dump(str_replace(array("a", "a", "b"), "multi", "aaa", $count));
 var_dump($count);
 
 var_dump(str_replace( array("a", "a", "b"),
-                      array("q", "q", "c"), 
+                      array("q", "q", "c"),
                       "aaa", $count
                     )
 );
 var_dump($count);
 
 var_dump(str_replace( array("a", "a", "b"),
-                      array("q", "q", "c"), 
-                      array("aaa", "bbb"), 
+                      array("q", "q", "c"),
+                      array("aaa", "bbb"),
                       $count
                     )
 );
@@ -182,7 +182,7 @@ var_dump($count);
 echo "\n-- Testing Resources --\n";
 $resource1 = fopen( __FILE__, "r" );
 $resource2 = opendir( "." );
-var_dump(str_replace("stream", "FOUND", $resource1, $count)); 
+var_dump(str_replace("stream", "FOUND", $resource1, $count));
 var_dump($count);
 var_dump(str_replace("stream", "FOUND", $resource2, $count));
 var_dump($count);
@@ -237,7 +237,7 @@ closedir($resource2);
 echo "Done\n";
 
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Testing str_replace() on basic operations ***
 string(0) ""
 string(4) "tbst"
diff --git a/ext/standard/tests/strings/str_replace_basic.phpt b/ext/standard/tests/strings/str_replace_basic.phpt
index 10bf5423424..790a32fffd2 100644
--- a/ext/standard/tests/strings/str_replace_basic.phpt
+++ b/ext/standard/tests/strings/str_replace_basic.phpt
@@ -4,10 +4,10 @@ Test str_replace() function basic function
 precision=14
 --FILE--
 <?php
-/* 
-  Prototype: mixed str_replace(mixed $search, mixed $replace, 
+/*
+  Prototype: mixed str_replace(mixed $search, mixed $replace,
                                mixed $subject [, int &$count]);
-  Description: Replace all occurrences of the search string with 
+  Description: Replace all occurrences of the search string with
                the replacement string
 */
 
@@ -27,14 +27,14 @@ var_dump( str_replace("long string here", "", "", $count) );
 var_dump( $count );
 
 $fp = fopen( __FILE__, "r" );
-$fp_copy = $fp; 
+$fp_copy = $fp;
 var_dump( str_replace($fp_copy, $fp_copy, $fp_copy, $fp_copy) );
 var_dump( $fp_copy );
 fclose($fp);
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 *** Testing str_replace() on basic operations ***
 string(0) ""
 string(4) "tbst"
diff --git a/ext/standard/tests/strings/str_replace_error.phpt b/ext/standard/tests/strings/str_replace_error.phpt
index 9fafc57a398..b66fd8c9ec2 100644
--- a/ext/standard/tests/strings/str_replace_error.phpt
+++ b/ext/standard/tests/strings/str_replace_error.phpt
@@ -4,10 +4,10 @@ Test str_replace() function error conditions
 precision=14
 --FILE--
 <?php
-/* 
-  Prototype: mixed str_replace(mixed $search, mixed $replace, 
+/*
+  Prototype: mixed str_replace(mixed $search, mixed $replace,
                                mixed $subject [, int &$count]);
-  Description: Replace all occurrences of the search string with 
+  Description: Replace all occurrences of the search string with
                the replacement string
 */
 
@@ -22,7 +22,7 @@ var_dump( str_replace(1,2,3,$var,5) );
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 *** Testing str_replace error conditions ***
 Warning: str_replace() expects at least 3 parameters, 0 given in %sstr_replace_error.php on line 12
 NULL
diff --git a/ext/standard/tests/strings/str_replace_variation1.phpt b/ext/standard/tests/strings/str_replace_variation1.phpt
index 279fb2201f8..067e26307d4 100644
--- a/ext/standard/tests/strings/str_replace_variation1.phpt
+++ b/ext/standard/tests/strings/str_replace_variation1.phpt
@@ -4,16 +4,16 @@ Test str_replace() function - test search values
 precision=14
 --FILE--
 <?php
-/* 
-  Prototype: mixed str_replace(mixed $search, mixed $replace, 
+/*
+  Prototype: mixed str_replace(mixed $search, mixed $replace,
                                mixed $subject [, int &$count]);
-  Description: Replace all occurrences of the search string with 
+  Description: Replace all occurrences of the search string with
                the replacement string
 */
 
 
 echo "\n*** Testing str_replace() with various search values ***";
-$search_arr = array( TRUE, FALSE, 1, 0, -1, "1", "0", "-1",  NULL, 
+$search_arr = array( TRUE, FALSE, 1, 0, -1, "1", "0", "-1",  NULL,
                      array(), "php", "");
 
 $i = 0;
@@ -21,14 +21,14 @@ $i = 0;
 foreach( $search_arr as $value ) {
   echo "\n-- Iteration $i --\n";
   /* replace the string in array */
-  var_dump( str_replace($value, "FOUND", $search_arr, $count) ); 
+  var_dump( str_replace($value, "FOUND", $search_arr, $count) );
   var_dump( $count );
   $i++;
 }
 
 ?>
 ===DONE===
---EXPECT--	
+--EXPECT--
 *** Testing str_replace() with various search values ***
 -- Iteration 0 --
 array(12) {
diff --git a/ext/standard/tests/strings/str_replace_variation2.phpt b/ext/standard/tests/strings/str_replace_variation2.phpt
index 5534341dcfe..5cf7f7c0146 100644
Binary files a/ext/standard/tests/strings/str_replace_variation2.phpt and b/ext/standard/tests/strings/str_replace_variation2.phpt differ
diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt
index 8f6f38f1f97..8ae709745f0 100644
--- a/ext/standard/tests/strings/str_replace_variation3.phpt
+++ b/ext/standard/tests/strings/str_replace_variation3.phpt
@@ -4,26 +4,26 @@ Test str_replace() function
 precision=14
 --FILE--
 <?php
-/* 
-  Prototype: mixed str_replace(mixed $search, mixed $replace, 
+/*
+  Prototype: mixed str_replace(mixed $search, mixed $replace,
                                mixed $subject [, int &$count]);
-  Description: Replace all occurrences of the search string with 
+  Description: Replace all occurrences of the search string with
                the replacement string
 */
 
 
 echo "\n*** Testing Miscelleneous input data ***\n";
-/*  If replace has fewer values than search, then an empty 
+/*  If replace has fewer values than search, then an empty
     string is used for the rest of replacement values */
-var_dump( str_replace(array("a", "a", "b"), 
-		      array("q", "q"), 
+var_dump( str_replace(array("a", "a", "b"),
+		      array("q", "q"),
 		      "aaabb", $count
 		     )
 	);
 var_dump($count);
-var_dump( str_replace(array("a", "a", "b"), 
-                      array("q", "q"), 
-                      array("aaa", "bbb", "ccc"), 
+var_dump( str_replace(array("a", "a", "b"),
+                      array("q", "q"),
+                      array("aaa", "bbb", "ccc"),
                       $count
                      )
         );
@@ -35,7 +35,7 @@ echo "\n-- Testing objects --\n";
         to string" by default, when an object is passed instead of string:
 The error can be  avoided by choosing the __toString magix method as follows: */
 
-class subject 
+class subject
 {
   function __toString() {
     return "Hello, world";
@@ -43,7 +43,7 @@ class subject
 }
 $obj_subject = new subject;
 
-class search 
+class search
 {
   function __toString() {
     return "Hello, world";
@@ -51,7 +51,7 @@ class search
 }
 $obj_search = new search;
 
-class replace 
+class replace
 {
   function __toString() {
     return "Hello, world";
@@ -68,15 +68,15 @@ var_dump(str_replace(array("a", "a", "b"), "multi", "aaa", $count));
 var_dump($count);
 
 var_dump(str_replace( array("a", "a", "b"),
-                      array("q", "q", "c"), 
+                      array("q", "q", "c"),
                       "aaa", $count
                     )
 );
 var_dump($count);
 
 var_dump(str_replace( array("a", "a", "b"),
-                      array("q", "q", "c"), 
-                      array("aaa", "bbb"), 
+                      array("q", "q", "c"),
+                      array("aaa", "bbb"),
                       $count
                     )
 );
@@ -95,7 +95,7 @@ var_dump($count);
 echo "\n-- Testing Resources --\n";
 $resource1 = fopen( __FILE__, "r" );
 $resource2 = opendir( "." );
-var_dump(str_replace("stream", "FOUND", $resource1, $count)); 
+var_dump(str_replace("stream", "FOUND", $resource1, $count));
 var_dump($count);
 var_dump(str_replace("stream", "FOUND", $resource2, $count));
 var_dump($count);
@@ -142,7 +142,7 @@ closedir($resource2);
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 *** Testing Miscelleneous input data ***
 string(3) "qqq"
 int(5)
diff --git a/ext/standard/tests/strings/str_rot13_basic.phpt b/ext/standard/tests/strings/str_rot13_basic.phpt
index 321a2bf1b76..c43e6f289fa 100644
--- a/ext/standard/tests/strings/str_rot13_basic.phpt
+++ b/ext/standard/tests/strings/str_rot13_basic.phpt
@@ -14,16 +14,16 @@ var_dump(str_rot13("abcdefghijklmnopqrstuvwxyz"));
 
 echo "\nEnsure numeric characters are left untouched\n";
 if (strcmp(str_rot13("0123456789"), "0123456789") == 0) {
-	echo "Strings equal : TEST PASSED\n"; 
+	echo "Strings equal : TEST PASSED\n";
 } else {
-	echo "Strings unequal : TEST FAILED\n"; 
+	echo "Strings unequal : TEST FAILED\n";
 }
 
 echo "\nEnsure non-alphabetic characters are left untouched\n";
 if (strcmp(str_rot13("!%^&*()_-+={}[]:;@~#<,>.?"), "!%^&*()_-+={}[]:;@~#<,>.?")) {
-	echo "Strings equal : TEST PASSED\n"; 
+	echo "Strings equal : TEST PASSED\n";
 } else {
-	echo "Strings unequal : TEST FAILED\n"; 
+	echo "Strings unequal : TEST FAILED\n";
 }
 
 echo "\nEnsure strings round trip\n";
@@ -31,9 +31,9 @@ $str = "str_rot13() tests starting";
 $encode = str_rot13($str);
 $decode = str_rot13($encode);
 if (strcmp($str, $decode) == 0) {
-	echo "Strings equal : TEST PASSED\n"; 
+	echo "Strings equal : TEST PASSED\n";
 } else {
-	echo "Strings unequal : TEST FAILED\n"; 
+	echo "Strings unequal : TEST FAILED\n";
 }
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/str_shuffle_basic.phpt b/ext/standard/tests/strings/str_shuffle_basic.phpt
index b60a35f5606..348f1bb731d 100644
--- a/ext/standard/tests/strings/str_shuffle_basic.phpt
+++ b/ext/standard/tests/strings/str_shuffle_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test str_shuffle() function : basic functionality 
+Test str_shuffle() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string str_shuffle  ( string $str  )
@@ -19,7 +19,7 @@ var_dump(str_shuffle($str));
 
 
 // For a given i/p string ensure that all combinations are
-// generated given a reasonable sample of calls 
+// generated given a reasonable sample of calls
 $a = array();
 $trys = 1000;
 $ip = 'abcd';
@@ -27,17 +27,17 @@ $len_ip = strlen($ip);
 
 for ($i = 0; $i < $trys; $i++) {
     $op = str_shuffle($ip);
-    
+
     if (!is_string($op) || strlen($op) != $len_ip) {
-    	echo "TEST FAILED\n"; 
-    }	 
-    
+    	echo "TEST FAILED\n";
+    }
+
     // Combination already hit ?
     if (empty($a[$op])) {
-    	// No first time init 
+    	// No first time init
      	$a[$op] = 0;
     }
-     	
+
     // Increment count for this combination
     $a[$op]++;
 }
diff --git a/ext/standard/tests/strings/str_shuffle_error.phpt b/ext/standard/tests/strings/str_shuffle_error.phpt
index d8024290e01..8b83b5e2d03 100644
--- a/ext/standard/tests/strings/str_shuffle_error.phpt
+++ b/ext/standard/tests/strings/str_shuffle_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test str_shuffle() function : error conditions 
+Test str_shuffle() function : error conditions
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/str_shuffle_variation1.phpt b/ext/standard/tests/strings/str_shuffle_variation1.phpt
index a6b663d0aa9..b4e9f3f135c 100644
--- a/ext/standard/tests/strings/str_shuffle_variation1.phpt
+++ b/ext/standard/tests/strings/str_shuffle_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -33,36 +33,36 @@ $inputs =  array (
 		  -2,
   		  2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*6*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*9*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*12*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null vlaues
 /*16*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*18*/	  new sample(),
-		
+
 		  // resource
 /*19*/	  $file_handle,
-		
+
 		  // undefined variable
 /*20*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*21*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/str_split_basic.phpt b/ext/standard/tests/strings/str_split_basic.phpt
index 3a38b9d544f..3c7ddaa7764 100644
--- a/ext/standard/tests/strings/str_split_basic.phpt
+++ b/ext/standard/tests/strings/str_split_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test str_split() function : basic functionality 
+Test str_split() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array str_split(string $str [, int $split_length])
- * Description: Convert a string to an array. If split_length is 
-                specified, break the string down into chunks each 
-                split_length characters long. 
+ * Description: Convert a string to an array. If split_length is
+                specified, break the string down into chunks each
+                split_length characters long.
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/str_split_error.phpt b/ext/standard/tests/strings/str_split_error.phpt
index c7075ec0ce5..1a4558e6802 100644
--- a/ext/standard/tests/strings/str_split_error.phpt
+++ b/ext/standard/tests/strings/str_split_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test str_split() function : error conditions 
+Test str_split() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array str_split(string $str [, int $split_length])
- * Description: Convert a string to an array. If split_length is 
-                specified, break the string down into chunks each 
-                split_length characters long. 
+ * Description: Convert a string to an array. If split_length is
+                specified, break the string down into chunks each
+                split_length characters long.
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/str_split_variation1.phpt b/ext/standard/tests/strings/str_split_variation1.phpt
index 46406f56a06..94eca406fd9 100644
--- a/ext/standard/tests/strings/str_split_variation1.phpt
+++ b/ext/standard/tests/strings/str_split_variation1.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test str_split() function : usage variations - unexpected values for 'str' argument 
+Test str_split() function : usage variations - unexpected values for 'str' argument
 --FILE--
 <?php
 /* Prototype  : array str_split(string $str [, int $split_length])
- * Description: Convert a string to an array. If split_length is 
-                specified, break the string down into chunks each 
-                split_length characters long. 
+ * Description: Convert a string to an array. If split_length is
+                specified, break the string down into chunks each
+                split_length characters long.
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/str_split_variation2.phpt b/ext/standard/tests/strings/str_split_variation2.phpt
index 42a5d5ab389..2ac629530f3 100644
--- a/ext/standard/tests/strings/str_split_variation2.phpt
+++ b/ext/standard/tests/strings/str_split_variation2.phpt
@@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : array str_split(string $str [, int $split_length])
- * Description: Convert a string to an array. If split_length is 
-                specified, break the string down into chunks each 
-                split_length characters long. 
+ * Description: Convert a string to an array. If split_length is
+                specified, break the string down into chunks each
+                split_length characters long.
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/str_split_variation2_64bit.phpt b/ext/standard/tests/strings/str_split_variation2_64bit.phpt
index b80a3b42cc6..921c3377852 100644
--- a/ext/standard/tests/strings/str_split_variation2_64bit.phpt
+++ b/ext/standard/tests/strings/str_split_variation2_64bit.phpt
@@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : array str_split(string $str [, int $split_length])
- * Description: Convert a string to an array. If split_length is 
-                specified, break the string down into chunks each 
-                split_length characters long. 
+ * Description: Convert a string to an array. If split_length is
+                specified, break the string down into chunks each
+                split_length characters long.
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/str_split_variation3.phpt b/ext/standard/tests/strings/str_split_variation3.phpt
index 1e7be76c3a3..974d1ecdd44 100644
Binary files a/ext/standard/tests/strings/str_split_variation3.phpt and b/ext/standard/tests/strings/str_split_variation3.phpt differ
diff --git a/ext/standard/tests/strings/str_split_variation4.phpt b/ext/standard/tests/strings/str_split_variation4.phpt
index 617e932a525..17ac646ce2a 100644
--- a/ext/standard/tests/strings/str_split_variation4.phpt
+++ b/ext/standard/tests/strings/str_split_variation4.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test str_split() function : usage variations - different single quoted strings for 'str' argument 
+Test str_split() function : usage variations - different single quoted strings for 'str' argument
 --FILE--
 <?php
 /* Prototype  : array str_split(string $str [, int $split_length])
- * Description: Convert a string to an array. If split_length is 
-                specified, break the string down into chunks each 
-                split_length characters long. 
+ * Description: Convert a string to an array. If split_length is
+                specified, break the string down into chunks each
+                split_length characters long.
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -28,7 +28,7 @@ $values = array(
   'simple string',  //regular string
   'It\'s string with quote',  //string containing single quote
   'string\tcontains\rwhite space\nchars',
-  'containing @ # $ % ^ & chars', 
+  'containing @ # $ % ^ & chars',
   'with 1234 numbers',
   'with \0 and ".chr(0)."null chars',  //for binary safe
   'with    multiple     space char',
diff --git a/ext/standard/tests/strings/str_split_variation5.phpt b/ext/standard/tests/strings/str_split_variation5.phpt
index 4e4df4f6c38..d7def41e344 100644
--- a/ext/standard/tests/strings/str_split_variation5.phpt
+++ b/ext/standard/tests/strings/str_split_variation5.phpt
@@ -1,18 +1,18 @@
 --TEST--
-Test str_split() function : usage variations - different heredoc strings as 'str' argument 
+Test str_split() function : usage variations - different heredoc strings as 'str' argument
 --FILE--
 <?php
 /* Prototype  : array str_split(string $str [, int $split_length] )
- * Description: Convert a string to an array. If split_length is 
-                specified, break the string down into chunks each 
-                split_length characters long. 
+ * Description: Convert a string to an array. If split_length is
+                specified, break the string down into chunks each
+                split_length characters long.
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
 
 /*
-* Passing different heredoc strings as 'str' argument to the str_split() 
-* with 'split_length' 10 
+* Passing different heredoc strings as 'str' argument to the str_split()
+* with 'split_length' 10
 */
 
 echo "*** Testing str_split() : heredoc strings as 'str' argument ***\n";
@@ -83,7 +83,7 @@ foreach($heredoc_array as $str) {
   var_dump( str_split($str, $split_length) );
   $count++;
 };
- 
+
 echo "Done"
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/strings/str_split_variation6.phpt b/ext/standard/tests/strings/str_split_variation6.phpt
index 53385a76dec..0294ca6614a 100644
--- a/ext/standard/tests/strings/str_split_variation6.phpt
+++ b/ext/standard/tests/strings/str_split_variation6.phpt
@@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : array str_split(string $str [, int $split_length])
- * Description: Convert a string to an array. If split_length is 
-                specified, break the string down into chunks each 
-                split_length characters long. 
+ * Description: Convert a string to an array. If split_length is
+                specified, break the string down into chunks each
+                split_length characters long.
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -22,7 +22,7 @@ echo "*** Testing str_split() : different intger values for 'split_length' ***\n
 //Initialise variables
 $str = 'This is a string with 123 & escape char \t';
 
-//different values for 'split_length' 
+//different values for 'split_length'
 $values = array (
   0,
   1,
diff --git a/ext/standard/tests/strings/str_split_variation6_64bit.phpt b/ext/standard/tests/strings/str_split_variation6_64bit.phpt
index 39c3a85f0d6..583c7db3cf6 100644
--- a/ext/standard/tests/strings/str_split_variation6_64bit.phpt
+++ b/ext/standard/tests/strings/str_split_variation6_64bit.phpt
@@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : array str_split(string $str [, int $split_length])
- * Description: Convert a string to an array. If split_length is 
-                specified, break the string down into chunks each 
-                split_length characters long. 
+ * Description: Convert a string to an array. If split_length is
+                specified, break the string down into chunks each
+                split_length characters long.
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -22,7 +22,7 @@ echo "*** Testing str_split() : different intger values for 'split_length' ***\n
 //Initialise variables
 $str = 'This is a string with 123 & escape char \t';
 
-//different values for 'split_length' 
+//different values for 'split_length'
 $values = array (
   0,
   1,
diff --git a/ext/standard/tests/strings/str_split_variation7.phpt b/ext/standard/tests/strings/str_split_variation7.phpt
index 963e2aa14c1..a110ea125c4 100644
--- a/ext/standard/tests/strings/str_split_variation7.phpt
+++ b/ext/standard/tests/strings/str_split_variation7.phpt
@@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : array str_split(string $str [, int $split_length])
- * Description: Convert a string to an array. If split_length is 
-                specified, break the string down into chunks each 
-                split_length characters long. 
+ * Description: Convert a string to an array. If split_length is
+                specified, break the string down into chunks each
+                split_length characters long.
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -24,7 +24,7 @@ $str = <<<EOT
 string with 123,escape char \t.
 EOT;
 
-//different values for 'split_length' 
+//different values for 'split_length'
 $values = array (
   0,
   1,
diff --git a/ext/standard/tests/strings/str_split_variation7_64bit.phpt b/ext/standard/tests/strings/str_split_variation7_64bit.phpt
index 1f324b24216..bff61adb302 100644
--- a/ext/standard/tests/strings/str_split_variation7_64bit.phpt
+++ b/ext/standard/tests/strings/str_split_variation7_64bit.phpt
@@ -7,9 +7,9 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : array str_split(string $str [, int $split_length])
- * Description: Convert a string to an array. If split_length is 
-                specified, break the string down into chunks each 
-                split_length characters long. 
+ * Description: Convert a string to an array. If split_length is
+                specified, break the string down into chunks each
+                split_length characters long.
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -24,7 +24,7 @@ $str = <<<EOT
 string with 123,escape char \t.
 EOT;
 
-//different values for 'split_length' 
+//different values for 'split_length'
 $values = array (
   0,
   1,
diff --git a/ext/standard/tests/strings/str_word_count.phpt b/ext/standard/tests/strings/str_word_count.phpt
index 00e71f781fb..c99d9a3ebd4 100644
--- a/ext/standard/tests/strings/str_word_count.phpt
+++ b/ext/standard/tests/strings/str_word_count.phpt
@@ -5,11 +5,11 @@ str_word_count()
 error_reporting(E_ALL);
 $str = "Hello friend, you're  
     looking          good today!";
-$b =& $str;       
+$b =& $str;
 var_dump(str_word_count($str, 1));
 var_dump(str_word_count($str, 2));
 var_dump(str_word_count($str));
-var_dump(str_word_count($str, 3)); 
+var_dump(str_word_count($str, 3));
 var_dump(str_word_count($str, 123));
 var_dump(str_word_count($str, -1));
 var_dump(str_word_count($str, 999999999));
diff --git a/ext/standard/tests/strings/str_word_count1.phpt b/ext/standard/tests/strings/str_word_count1.phpt
index 5f49fcfbf33..e942a173858 100644
--- a/ext/standard/tests/strings/str_word_count1.phpt
+++ b/ext/standard/tests/strings/str_word_count1.phpt
@@ -10,7 +10,7 @@ var_dump($a);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(0)
 
 Warning: str_word_count(): Invalid format value -1 in %s on line %d
diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt
index 265b8708ea2..9b1898fb35d 100644
Binary files a/ext/standard/tests/strings/strcasecmp.phpt and b/ext/standard/tests/strings/strcasecmp.phpt differ
diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt
index dea94644aa2..ef659014a51 100644
Binary files a/ext/standard/tests/strings/strcmp.phpt and b/ext/standard/tests/strings/strcmp.phpt differ
diff --git a/ext/standard/tests/strings/strcoll_error.phpt b/ext/standard/tests/strings/strcoll_error.phpt
index 7eda9817eed..8c17e65fc98 100644
--- a/ext/standard/tests/strings/strcoll_error.phpt
+++ b/ext/standard/tests/strings/strcoll_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strcoll() function : error conditions 
+Test strcoll() function : error conditions
 --FILE--
 <?php
 /* Prototype: int strcoll  ( string $str1  , string $str2  )
@@ -13,7 +13,7 @@ var_dump( strcoll() );
 var_dump( strcoll("") );
 
 echo "\n-- Testing strcoll() function with one argument --\n";
-var_dump( strcoll("Hello World") );  
+var_dump( strcoll("Hello World") );
 
 echo "\n-- Testing strcoll() function with more than expected no. of arguments --\n";
 $extra_arg = 10;
diff --git a/ext/standard/tests/strings/strcspn_basic.phpt b/ext/standard/tests/strings/strcspn_basic.phpt
index 232b105f888..d9b56f24363 100644
--- a/ext/standard/tests/strings/strcspn_basic.phpt
+++ b/ext/standard/tests/strings/strcspn_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test strcspn() function : basic functionality 
+Test strcspn() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto int strcspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters not found in mask.
-                If start or/and length is provided, it works like strcspn(substr($s,$start,$len),$bad_chars) 
+                If start or/and length is provided, it works like strcspn(substr($s,$start,$len),$bad_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/strcspn_error.phpt b/ext/standard/tests/strings/strcspn_error.phpt
index 03b4f2d2cf6..ebb7f9f0d09 100644
--- a/ext/standard/tests/strings/strcspn_error.phpt
+++ b/ext/standard/tests/strings/strcspn_error.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test strcspn() function : error conditions 
+Test strcspn() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto int strcspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters not found in mask.
-                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) 
+                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/strcspn_variation1.phpt b/ext/standard/tests/strings/strcspn_variation1.phpt
index 219a12c4bfb..81bd018a8a5 100644
--- a/ext/standard/tests/strings/strcspn_variation1.phpt
+++ b/ext/standard/tests/strings/strcspn_variation1.phpt
@@ -4,7 +4,7 @@ Test strcspn() function : usage variations - unexpected values for str argument
 <?php
 /* Prototype  : proto int strcspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters not found in mask.
-                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) 
+                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/strcspn_variation10.phpt b/ext/standard/tests/strings/strcspn_variation10.phpt
index 37bb00ec14d..218a02f16f4 100644
--- a/ext/standard/tests/strings/strcspn_variation10.phpt
+++ b/ext/standard/tests/strings/strcspn_variation10.phpt
@@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with varying mask & default start a
 <?php
 /* Prototype  : proto int strcspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters not found in mask.
-                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) 
+                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -49,7 +49,7 @@ $mask_array = array(
 		    " \t",
                     "\t\i\100\xa"
                    );
-		
+
 
 // loop through each element of the array for mask argument
 $count = 1;
diff --git a/ext/standard/tests/strings/strcspn_variation11.phpt b/ext/standard/tests/strings/strcspn_variation11.phpt
index 28f1dbe4580..277ccaa1cee 100644
--- a/ext/standard/tests/strings/strcspn_variation11.phpt
+++ b/ext/standard/tests/strings/strcspn_variation11.phpt
@@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with varying start and default len
 <?php
 /* Prototype  : proto int strcspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters not found in mask.
-                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) 
+                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -61,7 +61,7 @@ $start_array = array(
                      2147483647,  // max positive integer
                      -2147483648,  // min negative integer
                     );
-		
+
 
 // loop through each element of the arrays for str,mask and start arguments
 $count = 1;
diff --git a/ext/standard/tests/strings/strcspn_variation12.phpt b/ext/standard/tests/strings/strcspn_variation12.phpt
index b6f8cac0816..44723f13810 100644
--- a/ext/standard/tests/strings/strcspn_variation12.phpt
+++ b/ext/standard/tests/strings/strcspn_variation12.phpt
@@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with varying start and len args
 <?php
 /* Prototype  : proto int strcspn(string str, string mask [,int start [,int len]])
  * Description: Finds length of initial segment consisting entirely of characters not found in mask.
-                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) 
+                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -50,7 +50,7 @@ $start_array = array(
 		    2147483647,  // max positive integer
 		    -2147483648  // min negative integer
                    );
-		
+
 //defining array of len values
 $len_array = array(
 		    0,
@@ -60,7 +60,7 @@ $len_array = array(
 		    2147483647,  // max positive integer
 		    -2147483648  // min negative integer
                    );
-		
+
 
 // loop through each element of the arrays for str,mask,start and len arguments
 
diff --git a/ext/standard/tests/strings/strcspn_variation2.phpt b/ext/standard/tests/strings/strcspn_variation2.phpt
index c21af6f2562..4935cf4b306 100644
--- a/ext/standard/tests/strings/strcspn_variation2.phpt
+++ b/ext/standard/tests/strings/strcspn_variation2.phpt
@@ -4,7 +4,7 @@ Test strcspn() function : usage variations - unexpected values for mask argument
 <?php
 /* Prototype  : proto int strcspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters not found in mask.
-		If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) 
+		If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/strcspn_variation3.phpt b/ext/standard/tests/strings/strcspn_variation3.phpt
index 4940b8cfc95..49d7daa2cc5 100644
--- a/ext/standard/tests/strings/strcspn_variation3.phpt
+++ b/ext/standard/tests/strings/strcspn_variation3.phpt
@@ -4,7 +4,7 @@ Test strcspn() function : usage variations - unexpected values of start argument
 <?php
 /* Prototype  : proto int strcspn(string str, string mask [,int start [,int len]])
  * Description: Finds length of initial segment consisting entirely of characters not found in mask.
-                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) 
+                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/strcspn_variation4.phpt b/ext/standard/tests/strings/strcspn_variation4.phpt
index d7132a64ce8..1f84a38cfee 100644
--- a/ext/standard/tests/strings/strcspn_variation4.phpt
+++ b/ext/standard/tests/strings/strcspn_variation4.phpt
@@ -6,7 +6,7 @@ Test strcspn() function : usage variations - unexpected values of len argument
 <?php
 /* Prototype  : proto int strcspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters not found in mask.
-                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) 
+                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/strcspn_variation5.phpt b/ext/standard/tests/strings/strcspn_variation5.phpt
index a3dfa5177f1..dc237b4b413 100644
Binary files a/ext/standard/tests/strings/strcspn_variation5.phpt and b/ext/standard/tests/strings/strcspn_variation5.phpt differ
diff --git a/ext/standard/tests/strings/strcspn_variation6.phpt b/ext/standard/tests/strings/strcspn_variation6.phpt
index 92fa3d0951d..38ca98310df 100644
--- a/ext/standard/tests/strings/strcspn_variation6.phpt
+++ b/ext/standard/tests/strings/strcspn_variation6.phpt
@@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with heredoc strings, varying mask
 <?php
 /* Prototype  : proto int strcspn(string str, string mask [,int start [,int len]])
  * Description: Finds length of initial segment consisting entirely of characters not found in mask.
-                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) 
+                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -73,7 +73,7 @@ $mask_array = array(
 		    " \t",
                     "\t\i\100\xaa"
                    );
-		
+
 
 // loop through each element of the arrays for string and mask arguments
 
diff --git a/ext/standard/tests/strings/strcspn_variation7.phpt b/ext/standard/tests/strings/strcspn_variation7.phpt
index ae01f91be3a..1fc1a2cea4b 100644
--- a/ext/standard/tests/strings/strcspn_variation7.phpt
+++ b/ext/standard/tests/strings/strcspn_variation7.phpt
@@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with heredoc strings, varying start
 <?php
 /* Prototype  : proto int strcspn(string str, string mask [, int start [,int len]])
  * Description: Finds length of initial segment consisting entirely of characters not found in mask.
-                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) 
+                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -86,7 +86,7 @@ $start_array = array(
 		    2147483647,  // max positive integer
 		    -2147483648,  // min negative integer
                    );
-		
+
 
 // loop through each element of the arrays for str, mask and start arguments
 
diff --git a/ext/standard/tests/strings/strcspn_variation8.phpt b/ext/standard/tests/strings/strcspn_variation8.phpt
index 6b662ecdecd..0d861c00127 100644
--- a/ext/standard/tests/strings/strcspn_variation8.phpt
+++ b/ext/standard/tests/strings/strcspn_variation8.phpt
@@ -4,7 +4,7 @@ Test strcspn() function : usage variations - with heredoc strings, varying start
 <?php
 /* Prototype  : proto int strcspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters not found in mask.
-                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars) 
+                If start or/and length is provided works like strcspn(substr($s,$start,$len),$bad_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -80,7 +80,7 @@ $start_array = array(
 		    2147483647,  // max positive integer
 		    -2147483648,  // min negative integer
                    );
-		
+
 // defining array of len values
 $len_array = array(
 		    0,
@@ -90,7 +90,7 @@ $len_array = array(
 		    2147483647,  // max positive integer
 		    -2147483648,  // min negative integer
                    );
-		
+
 
 // loop through each element of the arrays for all arguments
 
@@ -100,7 +100,7 @@ foreach($heredoc_strings as $str) {
   foreach($mask_array as $mask) {
     foreach($start_array as $start) {
       foreach($len_array as $len) {
-        var_dump( strcspn($str,$mask,$start,$len) ); 
+        var_dump( strcspn($str,$mask,$start,$len) );
       }
     }
   }
diff --git a/ext/standard/tests/strings/strcspn_variation9.phpt b/ext/standard/tests/strings/strcspn_variation9.phpt
index e7650844da1..6dc27978b83 100644
Binary files a/ext/standard/tests/strings/strcspn_variation9.phpt and b/ext/standard/tests/strings/strcspn_variation9.phpt differ
diff --git a/ext/standard/tests/strings/strip_tags_basic1.phpt b/ext/standard/tests/strings/strip_tags_basic1.phpt
index 6d98f472586..f00da7ebbcc 100644
--- a/ext/standard/tests/strings/strip_tags_basic1.phpt
+++ b/ext/standard/tests/strings/strip_tags_basic1.phpt
@@ -5,13 +5,13 @@ short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
- * Description: Strips HTML and PHP tags from a string 
+ * Description: Strips HTML and PHP tags from a string
  * Source code: ext/standard/string.c
 */
 
 echo "*** Testing strip_tags() : basic functionality ***\n";
 
-// array of arguments 
+// array of arguments
 $string_array = array (
   "<html>hello</html>",
   '<html>hello</html>',
@@ -28,8 +28,8 @@ $string_array = array (
   "<html><!-- COMMENT --></html>",
   '<html><!-- COMMENT --></html>'
 );
-  
-  		
+
+
 // Calling strip_tags() with default arguments
 // loop through the $string_array to test strip_tags on various inputs
 $iteration = 1;
diff --git a/ext/standard/tests/strings/strip_tags_error.phpt b/ext/standard/tests/strings/strip_tags_error.phpt
index c45cbb115a1..25f703c3c03 100644
--- a/ext/standard/tests/strings/strip_tags_error.phpt
+++ b/ext/standard/tests/strings/strip_tags_error.phpt
@@ -5,7 +5,7 @@ short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
- * Description: Strips HTML and PHP tags from a string 
+ * Description: Strips HTML and PHP tags from a string
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/strip_tags_variation1.phpt b/ext/standard/tests/strings/strip_tags_variation1.phpt
index 56c8c28850d..5c7fd642ade 100644
--- a/ext/standard/tests/strings/strip_tags_variation1.phpt
+++ b/ext/standard/tests/strings/strip_tags_variation1.phpt
@@ -5,7 +5,7 @@ set short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
- * Description: Strips HTML and PHP tags from a string 
+ * Description: Strips HTML and PHP tags from a string
  * Source code: ext/standard/string.c
 */
 
@@ -37,44 +37,44 @@ $values = array(
 	      1,
 	      12345,
 	      -2345,
-	
+
 	      // float data
 /*5*/      10.5,
 	      -10.5,
 	      10.1234567e10,
 	      10.7654321E-10,
 	      .5,
-	
+
 	      // array data
 /*10*/    array(),
 	      array(0),
 	      array(1),
 	      array(1, 2),
 	      array('color' => 'red', 'item' => 'pen'),
-	
+
 	      // null data
 /*15*/    NULL,
 	      null,
-	
+
 	      // boolean data
 /*17*/    true,
 	      false,
 	      TRUE,
 	      FALSE,
-	
+
 	      // empty data
 /*21*/    "",
 	      '',
-	
+
 	      // object data
 /*23*/    new classA(),
-	
+
 	      // undefined data
 /*24*/    @$undefined_var,
-	
+
 	      // unset data
 /*25*/    @$unset_var,
-	
+
 	      // resource variable
 /*26*/    $fp
 
diff --git a/ext/standard/tests/strings/strip_tags_variation11.phpt b/ext/standard/tests/strings/strip_tags_variation11.phpt
index 3b47b5c6b14..4e6c5fb5c94 100644
--- a/ext/standard/tests/strings/strip_tags_variation11.phpt
+++ b/ext/standard/tests/strings/strip_tags_variation11.phpt
@@ -7,15 +7,15 @@ short_open_tag = on
 
 echo "*** Testing strip_tags() : obscure functionality ***\n";
 
-// array of arguments 
+// array of arguments
 $string_array = array (
   'hello <img title="<"> world',
   'hello <img title=">"> world',
   'hello <img title=">_<"> world',
   "hello <img title='>_<'> world"
 );
-  
-  		
+
+
 // Calling strip_tags() with default arguments
 // loop through the $string_array to test strip_tags on various inputs
 $iteration = 1;
diff --git a/ext/standard/tests/strings/strip_tags_variation2.phpt b/ext/standard/tests/strings/strip_tags_variation2.phpt
index c0a6e92423c..a32e3eccad6 100644
--- a/ext/standard/tests/strings/strip_tags_variation2.phpt
+++ b/ext/standard/tests/strings/strip_tags_variation2.phpt
@@ -5,7 +5,7 @@ short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
- * Description: Strips HTML and PHP tags from a string 
+ * Description: Strips HTML and PHP tags from a string
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/strip_tags_variation3.phpt b/ext/standard/tests/strings/strip_tags_variation3.phpt
index 5b7c50422e0..2117c1306ce 100644
--- a/ext/standard/tests/strings/strip_tags_variation3.phpt
+++ b/ext/standard/tests/strings/strip_tags_variation3.phpt
@@ -5,7 +5,7 @@ set short_open_tag = on
 --FILE--
 <?php
 /* Prototype  : string strip_tags(string $str [, string $allowable_tags])
- * Description: Strips HTML and PHP tags from a string 
+ * Description: Strips HTML and PHP tags from a string
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/stripcslashes_basic.phpt b/ext/standard/tests/strings/stripcslashes_basic.phpt
index af289f7793a..24a23810d57 100644
--- a/ext/standard/tests/strings/stripcslashes_basic.phpt
+++ b/ext/standard/tests/strings/stripcslashes_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test stripcslashes() function : basic functionality 
+Test stripcslashes() function : basic functionality
 --FILE--
 <?php
 
 /* Prototype  : string stripcslashes  ( string $str  )
- * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., 
+ * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ...,
  *              octal and hexadecimal representation.
  * Source code: ext/standard/string.c
 */
diff --git a/ext/standard/tests/strings/stripcslashes_error.phpt b/ext/standard/tests/strings/stripcslashes_error.phpt
index 78103ec31db..174da564433 100644
--- a/ext/standard/tests/strings/stripcslashes_error.phpt
+++ b/ext/standard/tests/strings/stripcslashes_error.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test stripcslashes() function :  error conditions 
+Test stripcslashes() function :  error conditions
 --FILE--
 <?php
 
 /* Prototype  : string stripcslashes  ( string $str  )
- * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., 
+ * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ...,
  *              octal and hexadecimal representation.
  * Source code: ext/standard/string.c
 */
diff --git a/ext/standard/tests/strings/stripcslashes_variation1.phpt b/ext/standard/tests/strings/stripcslashes_variation1.phpt
index a2754c61031..fe3a7866780 100644
--- a/ext/standard/tests/strings/stripcslashes_variation1.phpt
+++ b/ext/standard/tests/strings/stripcslashes_variation1.phpt
@@ -1,15 +1,15 @@
 --TEST--
-Test stripcslashes() function : usage variations  - non-string type argument 
+Test stripcslashes() function : usage variations  - non-string type argument
 --FILE--
 <?php
 /* Prototype  : string stripcslashes  ( string $str  )
- * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ..., 
+ * Description: Returns a string with backslashes stripped off. Recognizes C-like \n, \r ...,
  *              octal and hexadecimal representation.
  * Source code: ext/standard/string.c
 */
 
 /*
- * Test stripcslashes() with non-string type argument such as int, float, etc 
+ * Test stripcslashes() with non-string type argument such as int, float, etc
 */
 
 echo "*** Testing stripcslashes() : with non-string type argument ***\n";
@@ -23,7 +23,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
   return "obj'ct";
-  } 
+  }
 }
 
 // Defining resource
@@ -37,43 +37,43 @@ $values =  array (
 		  1,
 		  12345,
 		  -2345,
-		
+
 		  // float values
 /*5*/	  10.5,
 		  -10.5,
 		  10.1234567e10,
 		  10.7654321E-10,
 		  .5,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1),
 		  array(1, 2),
 		  array('color' => 'red', 'item' => 'pen'),
-		
+
 		  // boolean values
 /*15*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // empty string
 /*19*/	  "",
 		  '',
-		
+
 		  // undefined variable
 /*21*/	  $undefined_var,
-		
+
 		  // unset variable
 /*22*/	  $unset_var,
-		  
+
 		  // objects
 /*23*/	  new sample(),
-		
+
 		  // resource
 /*24*/	  $file_handle,
-		 
+
 		  // null values
 /*25*/	  NULL,
 		  null
diff --git a/ext/standard/tests/strings/stripos_error.phpt b/ext/standard/tests/strings/stripos_error.phpt
index c59473046dd..324014cf6da 100644
--- a/ext/standard/tests/strings/stripos_error.phpt
+++ b/ext/standard/tests/strings/stripos_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test stripos() function : error conditions 
+Test stripos() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int stripos ( string $haystack, string $needle [, int $offset] );
diff --git a/ext/standard/tests/strings/stripos_variation1.phpt b/ext/standard/tests/strings/stripos_variation1.phpt
index 7aeda4082c2..ac53cd6139a 100644
--- a/ext/standard/tests/strings/stripos_variation1.phpt
+++ b/ext/standard/tests/strings/stripos_variation1.phpt
@@ -70,7 +70,7 @@ $needle = array(
   "456HEE",  //numerics + chars
   $haystack  //haystack as needle
 );
- 
+
 /* loop through to get the position of the needle in haystack string */
 $count = 1;
 for($index=0; $index<count($needle); $index++) {
diff --git a/ext/standard/tests/strings/stripos_variation10.phpt b/ext/standard/tests/strings/stripos_variation10.phpt
index 79ba0ed1dc4..fb0a2c8a5b5 100644
--- a/ext/standard/tests/strings/stripos_variation10.phpt
+++ b/ext/standard/tests/strings/stripos_variation10.phpt
@@ -7,8 +7,8 @@ Test stripos() function : usage variations - unexpected inputs for 'needle' argu
  * Source code: ext/standard/string.c
 */
 
-/* Test stripos() function with unexpected inputs for 'needle' and 
- *  an expected type of input for 'haystack' argument 
+/* Test stripos() function with unexpected inputs for 'needle' and
+ *  an expected type of input for 'haystack' argument
 */
 
 echo "*** Testing stripos() function with unexpected values for needle ***\n";
@@ -21,7 +21,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "object";
-  } 
+  }
 }
 
 //getting the resource
diff --git a/ext/standard/tests/strings/stripos_variation11.phpt b/ext/standard/tests/strings/stripos_variation11.phpt
index a754ffa2f44..85ab4ac0994 100644
--- a/ext/standard/tests/strings/stripos_variation11.phpt
+++ b/ext/standard/tests/strings/stripos_variation11.phpt
@@ -19,11 +19,11 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "object";
-  } 
+  }
 }
 
 //getting the resource
-$file_handle = fopen(__FILE__, "r"); 
+$file_handle = fopen(__FILE__, "r");
 
 // array with different values
 $values =  array (
diff --git a/ext/standard/tests/strings/stripos_variation12.phpt b/ext/standard/tests/strings/stripos_variation12.phpt
index bd0d8aeb8f1..8ef1dd3f145 100644
--- a/ext/standard/tests/strings/stripos_variation12.phpt
+++ b/ext/standard/tests/strings/stripos_variation12.phpt
@@ -7,8 +7,8 @@ Test stripos() function : usage variations - null terminated strings for 'haysta
  * Source code: ext/standard/string.c
 */
 
-/* Test stripos() function with null terminated strings for 'haystack' argument 
- *  in order to check the binary safe 
+/* Test stripos() function with null terminated strings for 'haystack' argument
+ *  in order to check the binary safe
 */
 
 echo "*** Test stripos() function: binary safe ***\n";
diff --git a/ext/standard/tests/strings/stripos_variation13.phpt b/ext/standard/tests/strings/stripos_variation13.phpt
index 3c4508f0837..8a65b3386a6 100644
--- a/ext/standard/tests/strings/stripos_variation13.phpt
+++ b/ext/standard/tests/strings/stripos_variation13.phpt
@@ -7,8 +7,8 @@ Test stripos() function : usage variations - null terminated strings for 'needle
  * Source code: ext/standard/string.c
 */
 
-/* Test stripos() function with null terminated strings for 'needle' argument 
- *  in order to check binary safe 
+/* Test stripos() function with null terminated strings for 'needle' argument
+ *  in order to check binary safe
 */
 
 echo "*** Test stripos() function: binary safe ***\n";
diff --git a/ext/standard/tests/strings/stripos_variation14.phpt b/ext/standard/tests/strings/stripos_variation14.phpt
index 3339e2f27ec..dde934f9d9d 100644
--- a/ext/standard/tests/strings/stripos_variation14.phpt
+++ b/ext/standard/tests/strings/stripos_variation14.phpt
@@ -19,11 +19,11 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "object";
-  } 
+  }
 }
 
 //getting the resource
-$file_handle = fopen(__FILE__, "r"); 
+$file_handle = fopen(__FILE__, "r");
 
 //definition of input args
 $haystack = "hello world";
diff --git a/ext/standard/tests/strings/stripos_variation15.phpt b/ext/standard/tests/strings/stripos_variation15.phpt
index 182ecba3c1a..dbeadc99e21 100644
--- a/ext/standard/tests/strings/stripos_variation15.phpt
+++ b/ext/standard/tests/strings/stripos_variation15.phpt
@@ -21,11 +21,11 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "object";
-  } 
+  }
 }
 
 //getting the resource
-$file_handle = fopen(__FILE__, "r"); 
+$file_handle = fopen(__FILE__, "r");
 
 // array with different values
 $values =  array (
diff --git a/ext/standard/tests/strings/stripos_variation3.phpt b/ext/standard/tests/strings/stripos_variation3.phpt
index 40cdea48fe8..0382d61195b 100644
--- a/ext/standard/tests/strings/stripos_variation3.phpt
+++ b/ext/standard/tests/strings/stripos_variation3.phpt
@@ -7,7 +7,7 @@ Test stripos() function : usage variations - multi line heredoc string for 'hays
  * Source code: ext/standard/string.c
 */
 
-/* Test stripos() function by passing multi-line heredoc string for haystack and 
+/* Test stripos() function by passing multi-line heredoc string for haystack and
  *  with various needles & offsets
 */
 
diff --git a/ext/standard/tests/strings/stripos_variation4.phpt b/ext/standard/tests/strings/stripos_variation4.phpt
index 8249ef0f608..ee98a013c20 100644
--- a/ext/standard/tests/strings/stripos_variation4.phpt
+++ b/ext/standard/tests/strings/stripos_variation4.phpt
@@ -8,7 +8,7 @@ Test stripos() function : usage variations - heredoc string containing special c
 */
 
 /* Test stripos() function by passing heredoc string containing special chars for haystack
- *  and with various needles & offets 
+ *  and with various needles & offets
 */
 
 echo "*** Testing stripos() function: with heredoc strings ***\n";
diff --git a/ext/standard/tests/strings/stripos_variation5.phpt b/ext/standard/tests/strings/stripos_variation5.phpt
index 900fe04bb7e..65f88370ea5 100644
--- a/ext/standard/tests/strings/stripos_variation5.phpt
+++ b/ext/standard/tests/strings/stripos_variation5.phpt
@@ -7,8 +7,8 @@ Test stripos() function : usage variations - heredoc string containing escape ch
  * Source code: ext/standard/string.c
 */
 
-/* Test stripos() function by passing heredoc string containing escape chars for haystack 
- *  and with various needles & offsets 
+/* Test stripos() function by passing heredoc string containing escape chars for haystack
+ *  and with various needles & offsets
 */
 
 echo "*** Testing stripos() function: with heredoc strings ***\n";
diff --git a/ext/standard/tests/strings/stripos_variation6.phpt b/ext/standard/tests/strings/stripos_variation6.phpt
index c69ee174d19..f0d251380e5 100644
--- a/ext/standard/tests/strings/stripos_variation6.phpt
+++ b/ext/standard/tests/strings/stripos_variation6.phpt
@@ -7,7 +7,7 @@ Test stripos() function : usage variations - heredoc string containing quotes fo
  * Source code: ext/standard/string.c
 */
 
-/* Test stripos() function by passing heredoc string containing quotes for haystack 
+/* Test stripos() function by passing heredoc string containing quotes for haystack
  *  and with various needles & offsets
 */
 
diff --git a/ext/standard/tests/strings/stripos_variation7.phpt b/ext/standard/tests/strings/stripos_variation7.phpt
index 29a0a20469a..04c636365fc 100644
--- a/ext/standard/tests/strings/stripos_variation7.phpt
+++ b/ext/standard/tests/strings/stripos_variation7.phpt
@@ -7,7 +7,7 @@ Test stripos() function : usage variations - empty heredoc string for 'haystack'
  * Source code: ext/standard/string.c
 */
 
-/* Test stripos() function by passing empty heredoc string for haystack 
+/* Test stripos() function by passing empty heredoc string for haystack
  *  and with various needles & offsets
 */
 
diff --git a/ext/standard/tests/strings/stripos_variation8.phpt b/ext/standard/tests/strings/stripos_variation8.phpt
index cbf96bf12a3..cc20e36d236 100644
--- a/ext/standard/tests/strings/stripos_variation8.phpt
+++ b/ext/standard/tests/strings/stripos_variation8.phpt
@@ -8,7 +8,7 @@ Test stripos() function : usage variations - repetitive chars for 'haystack' arg
 */
 
 /* Test stripos() function with strings containing repetitive chars for haystak
- *  and with various needles & offsets 
+ *  and with various needles & offsets
 */
 
 echo "*** Testing stripos() function: strings repetitive chars ***\n";
diff --git a/ext/standard/tests/strings/stripos_variation9.phpt b/ext/standard/tests/strings/stripos_variation9.phpt
index 1401dcfae8f..03b89695626 100644
--- a/ext/standard/tests/strings/stripos_variation9.phpt
+++ b/ext/standard/tests/strings/stripos_variation9.phpt
@@ -19,7 +19,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "object";
-  } 
+  }
 }
 
 //getting the resource
diff --git a/ext/standard/tests/strings/stripslashes_basic.phpt b/ext/standard/tests/strings/stripslashes_basic.phpt
index 548aee5376c..df49a5116cf 100644
Binary files a/ext/standard/tests/strings/stripslashes_basic.phpt and b/ext/standard/tests/strings/stripslashes_basic.phpt differ
diff --git a/ext/standard/tests/strings/stripslashes_error.phpt b/ext/standard/tests/strings/stripslashes_error.phpt
index 99d877fd696..81b9889fc4e 100644
--- a/ext/standard/tests/strings/stripslashes_error.phpt
+++ b/ext/standard/tests/strings/stripslashes_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test stripslashes() function : error conditions 
+Test stripslashes() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string stripslashes ( string $str )
diff --git a/ext/standard/tests/strings/stripslashes_variation1.phpt b/ext/standard/tests/strings/stripslashes_variation1.phpt
index fb104199bd4..2f9239ceee0 100644
--- a/ext/standard/tests/strings/stripslashes_variation1.phpt
+++ b/ext/standard/tests/strings/stripslashes_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test stripslashes() function : usage variations  - non-string type argument 
+Test stripslashes() function : usage variations  - non-string type argument
 --FILE--
 <?php
 /* Prototype  : string stripslashes ( string $str )
@@ -8,7 +8,7 @@ Test stripslashes() function : usage variations  - non-string type argument
 */
 
 /*
- * Test stripslashes() with non-string type argument such as int, float, etc 
+ * Test stripslashes() with non-string type argument such as int, float, etc
 */
 
 echo "*** Testing stripslashes() : with non-string type argument ***\n";
@@ -22,7 +22,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
   return "obj\'ct";
-  } 
+  }
 }
 
 // Defining resource
@@ -36,43 +36,43 @@ $values =  array (
 		  1,
 		  12345,
 		  -2345,
-		
+
 		  // float values
 /*5*/	  10.5,
 		  -10.5,
 		  10.1234567e10,
 		  10.7654321E-10,
 		  .5,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1),
 		  array(1, 2),
 		  array('color' => 'red', 'item' => 'pen'),
-		
+
 		  // boolean values
 /*15*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // empty string
 /*19*/	  "",
 		  '',
-		
+
 		  // undefined variable
 /*21*/	  $undefined_var,
-		
+
 		  // unset variable
 /*22*/	  $unset_var,
-		  
+
 		  // objects
 /*23*/	  new sample(),
-		
+
 		  // resource
 /*24*/	  $file_handle,
-		 
+
 		  // null values
 /*25*/	  NULL,
 		  null
diff --git a/ext/standard/tests/strings/stripslashes_variation2.phpt b/ext/standard/tests/strings/stripslashes_variation2.phpt
index c86cd5890ce..71cde1bc313 100644
Binary files a/ext/standard/tests/strings/stripslashes_variation2.phpt and b/ext/standard/tests/strings/stripslashes_variation2.phpt differ
diff --git a/ext/standard/tests/strings/stripslashes_variation3.phpt b/ext/standard/tests/strings/stripslashes_variation3.phpt
index 2ccf97ffd29..ef094bcee81 100644
--- a/ext/standard/tests/strings/stripslashes_variation3.phpt
+++ b/ext/standard/tests/strings/stripslashes_variation3.phpt
@@ -25,7 +25,7 @@ This is line 2 \tof "heredoc" string
 EOT;
 // initialising the string array
 
-$str_array = array( 
+$str_array = array(
                     // string with newline character
                     "\n",
 		    "\\n",
@@ -36,7 +36,7 @@ $str_array = array(
                     'Hello \nworld',
                     'Hello \\nworld',
                     $heredoc_string_with_newline,
- 
+
                     // string with tab character
  		    "\t",
 		    "\\t",
diff --git a/ext/standard/tests/strings/stripslashes_variation4.phpt b/ext/standard/tests/strings/stripslashes_variation4.phpt
index eccca6a64d4..b41c5fe1503 100644
--- a/ext/standard/tests/strings/stripslashes_variation4.phpt
+++ b/ext/standard/tests/strings/stripslashes_variation4.phpt
@@ -15,7 +15,7 @@ echo "*** Testing stripslashes() : with double dimensional arrays ***\n";
 
 // initialising the string array
 
-$str_array = array( 
+$str_array = array(
                     array("", array()),
                     array("", array("")),
                     array("f\\'oo", "b\\'ar", array("fo\\'o", "b\\'ar")),
diff --git a/ext/standard/tests/strings/stristr_basic.phpt b/ext/standard/tests/strings/stristr_basic.phpt
index 0d2171496c2..638003f18cd 100644
--- a/ext/standard/tests/strings/stristr_basic.phpt
+++ b/ext/standard/tests/strings/stristr_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test stristr() function : basic functionality 
+Test stristr() function : basic functionality
 --FILE--
 <?php
 /* Prototype:  string stristr  ( string $haystack  , mixed $needle  [, bool $before_needle  ] )
diff --git a/ext/standard/tests/strings/stristr_error.phpt b/ext/standard/tests/strings/stristr_error.phpt
index 2da35de7358..a0057574f91 100644
--- a/ext/standard/tests/strings/stristr_error.phpt
+++ b/ext/standard/tests/strings/stristr_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test stristr() function : error conditions 
+Test stristr() function : error conditions
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/stristr_variation1.phpt b/ext/standard/tests/strings/stristr_variation1.phpt
index fdbd4701cd6..2d1844cb317 100644
--- a/ext/standard/tests/strings/stristr_variation1.phpt
+++ b/ext/standard/tests/strings/stristr_variation1.phpt
@@ -17,7 +17,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -31,36 +31,36 @@ $inputs =  array (
 		  1,
 		  -2,
 		  -PHP_INT_MAX,
-		
+
 		  // float values
 /*5*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*8*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*11*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null vlaues
 /*15*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*17*/	  new sample(),
-		
+
 		  // resource
 /*18*/	  $file_handle,
-		
+
 		  // undefined variable
 /*19*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*20*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/stristr_variation2.phpt b/ext/standard/tests/strings/stristr_variation2.phpt
index 335248dc4df..8b4b2c45e91 100644
--- a/ext/standard/tests/strings/stristr_variation2.phpt
+++ b/ext/standard/tests/strings/stristr_variation2.phpt
@@ -17,7 +17,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -31,36 +31,36 @@ $inputs =  array (
 		  1,
 		  -2,
 		  -PHP_INT_MAX,
-		
+
 		  // float values
 /*5*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*8*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*11*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null vlaues
 /*15*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*17*/	  new sample(),
-		
+
 		  // resource
 /*18*/	  $file_handle,
-		
+
 		  // undefined variable
 /*19*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*20*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt
index 52e0200af16..8e6f857b74a 100644
Binary files a/ext/standard/tests/strings/strlen.phpt and b/ext/standard/tests/strings/strlen.phpt differ
diff --git a/ext/standard/tests/strings/strlen_basic.phpt b/ext/standard/tests/strings/strlen_basic.phpt
index 3ed2b97e566..ba5da3930d1 100644
--- a/ext/standard/tests/strings/strlen_basic.phpt
+++ b/ext/standard/tests/strings/strlen_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strlen() function : basic functionality 
+Test strlen() function : basic functionality
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/strlen_error.phpt b/ext/standard/tests/strings/strlen_error.phpt
index 552e7c1ca6f..d893936de3e 100644
--- a/ext/standard/tests/strings/strlen_error.phpt
+++ b/ext/standard/tests/strings/strlen_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strlen() function :  error conditions 
+Test strlen() function :  error conditions
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/strlen_variation1.phpt b/ext/standard/tests/strings/strlen_variation1.phpt
index 9ba138e57cf..f1d6b6b9788 100644
--- a/ext/standard/tests/strings/strlen_variation1.phpt
+++ b/ext/standard/tests/strings/strlen_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -33,36 +33,36 @@ $inputs =  array (
 		  -2,
 		  2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*6*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*9*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*12*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*16*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*18*/	  new sample(),
-		
+
 		  // resource
 /*19*/	  $file_handle,
-		
+
 		  // undefined variable
 /*20*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*21*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/strnatcasecmp_basic.phpt b/ext/standard/tests/strings/strnatcasecmp_basic.phpt
index d385c1958ae..5b58e2331ef 100644
--- a/ext/standard/tests/strings/strnatcasecmp_basic.phpt
+++ b/ext/standard/tests/strings/strnatcasecmp_basic.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test strnatcasecmp() function : basic functionality 
+Test strnatcasecmp() function : basic functionality
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --FILE--
 <?php
 /* Prototype  : int strnatcasecmp(string s1, string s2)
- * Description: Returns the result of case-insensitive string comparison using 'natural' algorithm 
+ * Description: Returns the result of case-insensitive string comparison using 'natural' algorithm
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function str_dump($one, $two) {
diff --git a/ext/standard/tests/strings/strnatcasecmp_error.phpt b/ext/standard/tests/strings/strnatcasecmp_error.phpt
index 3085e8d8fd6..2105904aac8 100644
--- a/ext/standard/tests/strings/strnatcasecmp_error.phpt
+++ b/ext/standard/tests/strings/strnatcasecmp_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strnatcasecmp() function : error conditions 
+Test strnatcasecmp() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int strnatcasecmp  ( string $str1  , string $str2  )
diff --git a/ext/standard/tests/strings/strnatcasecmp_variation1.phpt b/ext/standard/tests/strings/strnatcasecmp_variation1.phpt
index e74f6b73e9a..ac2cbb69f91 100644
--- a/ext/standard/tests/strings/strnatcasecmp_variation1.phpt
+++ b/ext/standard/tests/strings/strnatcasecmp_variation1.phpt
@@ -1,13 +1,13 @@
 --TEST--
-Test strnatcasecmp() function : variation 
+Test strnatcasecmp() function : variation
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --FILE--
 <?php
 /* Prototype  : int strnatcasecmp(string s1, string s2)
- * Description: Returns the result of case-insensitive string comparison using 'natural' algorithm 
+ * Description: Returns the result of case-insensitive string comparison using 'natural' algorithm
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /* Preparation */
diff --git a/ext/standard/tests/strings/strnatcmp_basic.phpt b/ext/standard/tests/strings/strnatcmp_basic.phpt
index bef01de6535..c80a8e062e5 100644
--- a/ext/standard/tests/strings/strnatcmp_basic.phpt
+++ b/ext/standard/tests/strings/strnatcmp_basic.phpt
@@ -34,7 +34,7 @@ var_dump(strnatcmp($d1, $c2));
 
 echo "Equal too tests\n";
 var_dump(strnatcmp($b1, $b1));
-var_dump(strnatcmp($b1, $b2));	
+var_dump(strnatcmp($b1, $b2));
 
 echo "Greater than tests\n";
 var_dump(strnatcmp($b1, $a1));
diff --git a/ext/standard/tests/strings/strncasecmp_basic.phpt b/ext/standard/tests/strings/strncasecmp_basic.phpt
index 34a1b08dc4a..c0214833594 100644
--- a/ext/standard/tests/strings/strncasecmp_basic.phpt
+++ b/ext/standard/tests/strings/strncasecmp_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strncasecmp() function : basic functionality 
+Test strncasecmp() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int strncasecmp ( string $str1, string $str2, int $len );
diff --git a/ext/standard/tests/strings/strncasecmp_error.phpt b/ext/standard/tests/strings/strncasecmp_error.phpt
index 7b2d19e616f..d443f8113b9 100644
--- a/ext/standard/tests/strings/strncasecmp_error.phpt
+++ b/ext/standard/tests/strings/strncasecmp_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strncasecmp() function : error conditions 
+Test strncasecmp() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int strncasecmp ( string $str1, string $str2, int $len );
diff --git a/ext/standard/tests/strings/strncasecmp_variation10.phpt b/ext/standard/tests/strings/strncasecmp_variation10.phpt
index adc9253964a..1c5708ae695 100644
--- a/ext/standard/tests/strings/strncasecmp_variation10.phpt
+++ b/ext/standard/tests/strings/strncasecmp_variation10.phpt
@@ -32,7 +32,7 @@ $values =  array (
   1,
   12345,
   -2345,
- 
+
   /* float values */
   10.5,
   -10.5,
@@ -43,7 +43,7 @@ $values =  array (
   /* hexadecimal values */
   0x12,
   -0x12,
-  
+
   /* octal values */
   012,
   -012,
@@ -77,7 +77,7 @@ $values =  array (
   @$unset_var,
 
   /* resource */
-  $file_handle,  
+  $file_handle,
 
   /* object */
   new sample()
diff --git a/ext/standard/tests/strings/strncasecmp_variation11.phpt b/ext/standard/tests/strings/strncasecmp_variation11.phpt
index 03cc8370776..362bbf11676 100644
--- a/ext/standard/tests/strings/strncasecmp_variation11.phpt
+++ b/ext/standard/tests/strings/strncasecmp_variation11.phpt
@@ -32,7 +32,7 @@ $values =  array (
   1,
   12345,
   -2345,
- 
+
   /* float values */
   10.5,
   -10.5,
@@ -43,7 +43,7 @@ $values =  array (
   /* hexadecimal values */
   0x12,
   -0x12,
-  
+
   /* octal values */
   012,
   -012,
@@ -77,7 +77,7 @@ $values =  array (
   @$unset_var,
 
   /* resource */
-  $file_handle,  
+  $file_handle,
 
   /* object */
   new sample()
diff --git a/ext/standard/tests/strings/strncasecmp_variation3.phpt b/ext/standard/tests/strings/strncasecmp_variation3.phpt
index 8409260b2e8..bf7c765a1de 100644
--- a/ext/standard/tests/strings/strncasecmp_variation3.phpt
+++ b/ext/standard/tests/strings/strncasecmp_variation3.phpt
@@ -20,7 +20,7 @@ for($len = strlen($str1); $len >= 0; $len--) {
 }
 echo "*** Done ***\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 *** Test strncasecmp() function: with different lengths ***
 int(0)
 int(0)
diff --git a/ext/standard/tests/strings/strncasecmp_variation4.phpt b/ext/standard/tests/strings/strncasecmp_variation4.phpt
index 9d46db9ee13..93968db2da7 100644
--- a/ext/standard/tests/strings/strncasecmp_variation4.phpt
+++ b/ext/standard/tests/strings/strncasecmp_variation4.phpt
@@ -32,7 +32,7 @@ $values =  array (
   1,
   12345,
   -2345,
- 
+
   /* float values */
   10.5,
   -10.5,
@@ -43,7 +43,7 @@ $values =  array (
   /* hexadecimal values */
   0x12,
   -0x12,
-  
+
   /* octal values */
   012,
   -012,
@@ -77,7 +77,7 @@ $values =  array (
   @$unset_var,
 
   /* resource */
-  $file_handle,  
+  $file_handle,
 
   /* object */
   new sample()
diff --git a/ext/standard/tests/strings/strncasecmp_variation8.phpt b/ext/standard/tests/strings/strncasecmp_variation8.phpt
index 6011a7b0fd9..680653af903 100644
--- a/ext/standard/tests/strings/strncasecmp_variation8.phpt
+++ b/ext/standard/tests/strings/strncasecmp_variation8.phpt
@@ -2,7 +2,7 @@
 Test strncasecmp() function: usage variations - single quoted strings
 --FILE--
 <?php
-/* Prototype  : int strncasecmp ( string $str1, string $str2, int $len ); 
+/* Prototype  : int strncasecmp ( string $str1, string $str2, int $len );
  * Description: Binary safe case-insensitive string comparison of the first n characters
  * Source code: Zend/zend_builtin_functions.c
 */
diff --git a/ext/standard/tests/strings/strncmp_basic.phpt b/ext/standard/tests/strings/strncmp_basic.phpt
index 317039859f6..a836e591a54 100644
--- a/ext/standard/tests/strings/strncmp_basic.phpt
+++ b/ext/standard/tests/strings/strncmp_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strncmp() function : basic functionality 
+Test strncmp() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : int strncmp ( string $str1, string $str2, int $len );
diff --git a/ext/standard/tests/strings/strncmp_error.phpt b/ext/standard/tests/strings/strncmp_error.phpt
index 8e4d2805eb6..4eb73eb3182 100644
--- a/ext/standard/tests/strings/strncmp_error.phpt
+++ b/ext/standard/tests/strings/strncmp_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strncmp() function : error conditions 
+Test strncmp() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int strncmp ( string $str1, string $str2, int $len );
diff --git a/ext/standard/tests/strings/strncmp_variation1.phpt b/ext/standard/tests/strings/strncmp_variation1.phpt
index 2fc3c3d4c7a..7bc91784b39 100644
--- a/ext/standard/tests/strings/strncmp_variation1.phpt
+++ b/ext/standard/tests/strings/strncmp_variation1.phpt
@@ -23,7 +23,7 @@ for($ASCII = 97; $ASCII <= 122; $ASCII++) {
 }
 echo "*** Done ***";
 ?>
---EXPECTREGEX--	
+--EXPECTREGEX--
 \*\*\* Test strncmp\(\) function: with alphabets \*\*\*
 -- Passing upper-case letters for 'str1' --
 int\(0\)
diff --git a/ext/standard/tests/strings/strncmp_variation4.phpt b/ext/standard/tests/strings/strncmp_variation4.phpt
index 84684ea551e..5e96e5d16ff 100644
--- a/ext/standard/tests/strings/strncmp_variation4.phpt
+++ b/ext/standard/tests/strings/strncmp_variation4.phpt
@@ -32,7 +32,7 @@ $values =  array (
   1,
   12345,
   -2345,
- 
+
   /* float values */
   10.5,
   -10.5,
@@ -43,7 +43,7 @@ $values =  array (
   /* hexadecimal values */
   0x12,
   -0x12,
-  
+
   /* octal values */
   012,
   -012,
@@ -77,7 +77,7 @@ $values =  array (
   $unset_var,
 
   /* resource */
-  $file_handle,  
+  $file_handle,
 
   /* object */
   new sample()
diff --git a/ext/standard/tests/strings/strncmp_variation6.phpt b/ext/standard/tests/strings/strncmp_variation6.phpt
index b3b918920eb..1ee41ccc4cc 100644
--- a/ext/standard/tests/strings/strncmp_variation6.phpt
+++ b/ext/standard/tests/strings/strncmp_variation6.phpt
@@ -25,7 +25,7 @@ for($ASCII = 0; $ASCII <= 255; $ASCII++) {
 }
 
 echo "\n-- Checking with out of character's range, given in binary format --\n";
-/* Checking with the out of range ASCII value(given in binary format) */ 
+/* Checking with the out of range ASCII value(given in binary format) */
 $str1 = decbin(256);
 $str2 = decbin( ord( chr(256) ));
 var_dump( strncmp($str1, $str2, 8) );  //comparing all the 8-bits; expected: int(1)
diff --git a/ext/standard/tests/strings/strncmp_variation8.phpt b/ext/standard/tests/strings/strncmp_variation8.phpt
index bc000d171e9..9d8c841d682 100644
--- a/ext/standard/tests/strings/strncmp_variation8.phpt
+++ b/ext/standard/tests/strings/strncmp_variation8.phpt
@@ -2,7 +2,7 @@
 Test strncmp() function: usage variations - single quoted strings
 --FILE--
 <?php
-/* Prototype  : int strncmp ( string $str1, string $str2, int $len ); 
+/* Prototype  : int strncmp ( string $str1, string $str2, int $len );
  * Description: Binary safe case-sensitive string comparison of the first n characters
  * Source code: Zend/zend_builtin_functions.c
 */
diff --git a/ext/standard/tests/strings/strpbrk_basic.phpt b/ext/standard/tests/strings/strpbrk_basic.phpt
index 23d59c2ff46..9a92b8b4b58 100644
--- a/ext/standard/tests/strings/strpbrk_basic.phpt
+++ b/ext/standard/tests/strings/strpbrk_basic.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test strpbrk() function : basic functionality 
+Test strpbrk() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : array strpbrk(string haystack, string char_list)
- * Description: Search a string for any of a set of characters 
+ * Description: Search a string for any of a set of characters
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strpbrk() : basic functionality ***\n";
diff --git a/ext/standard/tests/strings/strpbrk_error.phpt b/ext/standard/tests/strings/strpbrk_error.phpt
index 85729ea112a..658e2f429e0 100644
--- a/ext/standard/tests/strings/strpbrk_error.phpt
+++ b/ext/standard/tests/strings/strpbrk_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test strpbrk() function : error conditions 
+Test strpbrk() function : error conditions
 --FILE--
 <?php
 /* Prototype  : array strpbrk(string haystack, string char_list)
- * Description: Search a string for any of a set of characters 
+ * Description: Search a string for any of a set of characters
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing strpbrk() : error conditions ***\n";
diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt
index a2237fe005a..d127d9d77c8 100644
Binary files a/ext/standard/tests/strings/strpos.phpt and b/ext/standard/tests/strings/strpos.phpt differ
diff --git a/ext/standard/tests/strings/strrchr.phpt b/ext/standard/tests/strings/strrchr.phpt
index 5a1fe12a826..26253f0b3ab 100644
--- a/ext/standard/tests/strings/strrchr.phpt
+++ b/ext/standard/tests/strings/strrchr.phpt
@@ -12,7 +12,7 @@ var_dump(strrchr("test".chr(0)."string", "t"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 bool(false)
 bool(false)
 bool(false)
diff --git a/ext/standard/tests/strings/strrchr_basic.phpt b/ext/standard/tests/strings/strrchr_basic.phpt
index b5bfe2d9c25..e61fb8c1080 100644
--- a/ext/standard/tests/strings/strrchr_basic.phpt
+++ b/ext/standard/tests/strings/strrchr_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strrchr() function : basic functionality 
+Test strrchr() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string strrchr(string $haystack, string $needle);
@@ -10,8 +10,8 @@ Test strrchr() function : basic functionality
 echo "*** Testing strrchr() function: basic functionality ***\n";
 var_dump( strrchr("Hello, World", "H") ); //needle as single char
 var_dump( strrchr("Hello, World", "Hello") ); //needle as a first word of haystack
-var_dump( strrchr('Hello, World', 'H') ); 
-var_dump( strrchr('Hello, World', 'Hello') ); 
+var_dump( strrchr('Hello, World', 'H') );
+var_dump( strrchr('Hello, World', 'Hello') );
 
 //considering case
 var_dump( strrchr("Hello, World", "h") );
diff --git a/ext/standard/tests/strings/strrchr_error.phpt b/ext/standard/tests/strings/strrchr_error.phpt
index aa0adf4b85d..de5a9d34de7 100644
--- a/ext/standard/tests/strings/strrchr_error.phpt
+++ b/ext/standard/tests/strings/strrchr_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test strrchr() function : error conditions 
+Test strrchr() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string strrchr(string $haystack, string $needle);
- * Description: Finds the last occurrence of a character in a string. 
+ * Description: Finds the last occurrence of a character in a string.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/strrchr_variation1.phpt b/ext/standard/tests/strings/strrchr_variation1.phpt
index 91290ecf93f..7100f5e8246 100644
Binary files a/ext/standard/tests/strings/strrchr_variation1.phpt and b/ext/standard/tests/strings/strrchr_variation1.phpt differ
diff --git a/ext/standard/tests/strings/strrchr_variation10.phpt b/ext/standard/tests/strings/strrchr_variation10.phpt
index a96f2b01909..8d93bd03359 100644
--- a/ext/standard/tests/strings/strrchr_variation10.phpt
+++ b/ext/standard/tests/strings/strrchr_variation10.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strrchr() function : usage variations - unexpected inputs for needle 
+Test strrchr() function : usage variations - unexpected inputs for needle
 --FILE--
 <?php
 /* Prototype  : string strrchr(string $haystack, string $needle);
@@ -7,8 +7,8 @@ Test strrchr() function : usage variations - unexpected inputs for needle
  * Source code: ext/standard/string.c
 */
 
-/* Test strrchr() function: with unexpected inputs for needle 
- *  and expected type for haystack 
+/* Test strrchr() function: with unexpected inputs for needle
+ *  and expected type for haystack
 */
 
 echo "*** Testing strrchr() function with unexpected inputs for needle ***\n";
@@ -21,7 +21,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "object";
-  } 
+  }
 }
 
 //getting the resource
diff --git a/ext/standard/tests/strings/strrchr_variation11.phpt b/ext/standard/tests/strings/strrchr_variation11.phpt
index ea2e7a68d28..4f1ecd2c1d6 100644
--- a/ext/standard/tests/strings/strrchr_variation11.phpt
+++ b/ext/standard/tests/strings/strrchr_variation11.phpt
@@ -19,7 +19,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "object";
-  } 
+  }
 }
 
 //getting the resource
diff --git a/ext/standard/tests/strings/strrchr_variation2.phpt b/ext/standard/tests/strings/strrchr_variation2.phpt
index 0b15ceeeb2d..f0505c2b8ca 100644
--- a/ext/standard/tests/strings/strrchr_variation2.phpt
+++ b/ext/standard/tests/strings/strrchr_variation2.phpt
@@ -71,7 +71,7 @@ $needle = array(
   42, //needle as int(ASCII value of '*')
   $haystack  //haystack as needle
 );
-  
+
 /* loop through to get the position of the needle in haystack string */
 $count = 1;
 for($index=0; $index<count($needle); $index++) {
diff --git a/ext/standard/tests/strings/strrchr_variation3.phpt b/ext/standard/tests/strings/strrchr_variation3.phpt
index 1d0aa30091d..e22efe9e5cb 100644
--- a/ext/standard/tests/strings/strrchr_variation3.phpt
+++ b/ext/standard/tests/strings/strrchr_variation3.phpt
@@ -19,14 +19,14 @@ using heredoc syntax.
 EOD;
 
 $needles = array(
-  "ing", 
-  "", 
+  "ing",
+  "",
   " ",
-  $multi_line_str //needle as haystack 
+  $multi_line_str //needle as haystack
 );
 
 //loop through to test strrchr() with each needle
-foreach($needles as $needle) {  
+foreach($needles as $needle) {
   var_dump( strrchr($multi_line_str, $needle) );
 }
 
diff --git a/ext/standard/tests/strings/strrchr_variation4.phpt b/ext/standard/tests/strings/strrchr_variation4.phpt
index 8b2c10bf253..10f4ea5abad 100644
--- a/ext/standard/tests/strings/strrchr_variation4.phpt
+++ b/ext/standard/tests/strings/strrchr_variation4.phpt
@@ -8,7 +8,7 @@ Test strrchr() function : usage variations - heredoc string containing special c
 */
 
 /* Test strrchr() function by passing heredoc string containing special chars for haystack
- * and with various needles 
+ * and with various needles
 */
 
 echo "*** Testing strrchr() function: with heredoc strings ***\n";
diff --git a/ext/standard/tests/strings/strrchr_variation5.phpt b/ext/standard/tests/strings/strrchr_variation5.phpt
index 1ef23911e95..e2f590afa10 100644
--- a/ext/standard/tests/strings/strrchr_variation5.phpt
+++ b/ext/standard/tests/strings/strrchr_variation5.phpt
@@ -7,7 +7,7 @@ Test strrchr() function : usage variations - heredoc string containing escape se
  * Source code: ext/standard/string.c
 */
 
-/* Test strrchr() function by passing heredoc string containing 
+/* Test strrchr() function by passing heredoc string containing
  *  escape sequences for haystack and with various needles
 */
 
diff --git a/ext/standard/tests/strings/strrchr_variation7.phpt b/ext/standard/tests/strings/strrchr_variation7.phpt
index ed5acdc045c..1425502b1a0 100644
--- a/ext/standard/tests/strings/strrchr_variation7.phpt
+++ b/ext/standard/tests/strings/strrchr_variation7.phpt
@@ -7,7 +7,7 @@ Test strrchr() function : usage variations - heredoc string containing blank lin
  * Source code: ext/standard/string.c
 */
 
-/* Test strrchr() function by passing heredoc string containing 
+/* Test strrchr() function by passing heredoc string containing
  *  blank-line for haystack and with various needles
 */
 
diff --git a/ext/standard/tests/strings/strrchr_variation9.phpt b/ext/standard/tests/strings/strrchr_variation9.phpt
index a41c0912121..0c78663c067 100644
--- a/ext/standard/tests/strings/strrchr_variation9.phpt
+++ b/ext/standard/tests/strings/strrchr_variation9.phpt
@@ -7,8 +7,8 @@ Test strrchr() function : usage variations - unexpected inputs for haystack
  * Source code: ext/standard/string.c
 */
 
-/* Test strrchr() function with unexpected inputs for haystack 
- *  and expected type for 'needle' 
+/* Test strrchr() function with unexpected inputs for haystack
+ *  and expected type for 'needle'
 */
 
 echo "*** Testing strrchr() function: with unexpected inputs for haystack ***\n";
@@ -21,7 +21,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "object";
-  } 
+  }
 }
 
 //getting the resource
@@ -108,7 +108,7 @@ $needles =  array (
   //empty string
   "",
   '',
- 
+
   //resource variable in string form
   "\$file_handle",
 
diff --git a/ext/standard/tests/strings/strrev.phpt b/ext/standard/tests/strings/strrev.phpt
index 321aca5bd7a..92c66817d95 100644
--- a/ext/standard/tests/strings/strrev.phpt
+++ b/ext/standard/tests/strings/strrev.phpt
@@ -8,7 +8,7 @@ strrev() function
 	while ($i<256) {
 		$str .= chr($i++);
 	}
-	
+
 	var_dump(md5(strrev($str)));
 	var_dump(strrev(NULL));
 	var_dump(strrev(""));
diff --git a/ext/standard/tests/strings/strrev_basic.phpt b/ext/standard/tests/strings/strrev_basic.phpt
index 2cde4cdf897..377a2d147e4 100644
--- a/ext/standard/tests/strings/strrev_basic.phpt
+++ b/ext/standard/tests/strings/strrev_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test strrev() function : basic functionality 
+Test strrev() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string strrev(string $str);
- * Description: Reverse a string 
+ * Description: Reverse a string
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/strrev_error.phpt b/ext/standard/tests/strings/strrev_error.phpt
index ef64e80afda..2bc8a228ef9 100644
--- a/ext/standard/tests/strings/strrev_error.phpt
+++ b/ext/standard/tests/strings/strrev_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test strrev() function : error conditions 
+Test strrev() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string strrev(string $str);
- * Description: Reverse a string 
+ * Description: Reverse a string
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/strrev_variation1.phpt b/ext/standard/tests/strings/strrev_variation1.phpt
index f2334f5a531..8fd957777a1 100644
Binary files a/ext/standard/tests/strings/strrev_variation1.phpt and b/ext/standard/tests/strings/strrev_variation1.phpt differ
diff --git a/ext/standard/tests/strings/strrev_variation2.phpt b/ext/standard/tests/strings/strrev_variation2.phpt
index 41e54d53c66..d5e0592551c 100644
Binary files a/ext/standard/tests/strings/strrev_variation2.phpt and b/ext/standard/tests/strings/strrev_variation2.phpt differ
diff --git a/ext/standard/tests/strings/strrev_variation3.phpt b/ext/standard/tests/strings/strrev_variation3.phpt
index 8ab3e25b668..bd25c1d08e9 100644
Binary files a/ext/standard/tests/strings/strrev_variation3.phpt and b/ext/standard/tests/strings/strrev_variation3.phpt differ
diff --git a/ext/standard/tests/strings/strrev_variation4.phpt b/ext/standard/tests/strings/strrev_variation4.phpt
index fa347cd2fd0..b585035c11d 100644
--- a/ext/standard/tests/strings/strrev_variation4.phpt
+++ b/ext/standard/tests/strings/strrev_variation4.phpt
@@ -3,7 +3,7 @@ Test strrev() function : usage variations - unexpected inputs
 --FILE--
 <?php
 /* Prototype  : string strrev(string $str);
- * Description: Reverse a string 
+ * Description: Reverse a string
  * Source code: ext/standard/string.c
 */
 
@@ -17,7 +17,7 @@ class sample {
   }
 }
 
-//get the resource 
+//get the resource
 $resource = fopen(__FILE__, "r");
 
 //get an unset variable
diff --git a/ext/standard/tests/strings/strripos_basic1.phpt b/ext/standard/tests/strings/strripos_basic1.phpt
index 759c23114ec..70bbdf94e5c 100644
--- a/ext/standard/tests/strings/strripos_basic1.phpt
+++ b/ext/standard/tests/strings/strripos_basic1.phpt
@@ -23,7 +23,7 @@ echo "\n-- single char for needle --\n";
 var_dump( strripos("Hello, World", "O") );
 var_dump( strripos("Hello, World", ",") );
 
-echo "\n-- heredoc string for haystack & needle --\n"; 
+echo "\n-- heredoc string for haystack & needle --\n";
 var_dump( strripos($heredoc_str, "Hello, WoRLd") );
 var_dump( strripos($heredoc_str, 'HelLO') );
 var_dump( strripos($heredoc_str, $heredoc_str) );
diff --git a/ext/standard/tests/strings/strripos_basic2.phpt b/ext/standard/tests/strings/strripos_basic2.phpt
index d4a1a73f061..72d02d5c806 100644
--- a/ext/standard/tests/strings/strripos_basic2.phpt
+++ b/ext/standard/tests/strings/strripos_basic2.phpt
@@ -12,25 +12,25 @@ $heredoc_str = <<<EOD
 Hello, World
 EOD;
 
-echo "\n-- regular string for haystack & needle, with various offsets --\n"; 
+echo "\n-- regular string for haystack & needle, with various offsets --\n";
 var_dump( strripos("Hello, World", "HeLLo", 0) );
 var_dump( strripos("Hello, World", 'Hello', 1) );
 var_dump( strripos('Hello, World', 'world', 1) );
 var_dump( strripos('Hello, World', "WorLD", 5) );
 
-echo "\n-- heredoc string for haystack & needle, with various offsets --\n"; 
+echo "\n-- heredoc string for haystack & needle, with various offsets --\n";
 var_dump( strripos($heredoc_str, "Hello, WORLD", 0) );
 var_dump( strripos($heredoc_str, 'HelLo', 0) );
 var_dump( strripos($heredoc_str, 'HeLLo', 1) );
 var_dump( strripos($heredoc_str, $heredoc_str, 0) );
 var_dump( strripos($heredoc_str, $heredoc_str, 1) );
 
-echo "\n-- various +ve offsets --\n"; 
+echo "\n-- various +ve offsets --\n";
 var_dump( strripos("Hello, World", "O", 3) );
 var_dump( strripos("Hello, World", "O", 6) );
 var_dump( strripos("Hello, World", "O", 10) );
 
-echo "\n-- various -ve offsets --\n"; 
+echo "\n-- various -ve offsets --\n";
 var_dump( strripos("Hello, World", "O", -1) );
 var_dump( strripos("Hello, World", "O", -5) );
 var_dump( strripos("Hello, World", "O",  -9) );
diff --git a/ext/standard/tests/strings/strripos_error.phpt b/ext/standard/tests/strings/strripos_error.phpt
index 59d592681a2..97445f0c86f 100644
--- a/ext/standard/tests/strings/strripos_error.phpt
+++ b/ext/standard/tests/strings/strripos_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strripos() function : error conditions 
+Test strripos() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int strripos ( string $haystack, string $needle [, int $offset] );
diff --git a/ext/standard/tests/strings/strripos_offset.phpt b/ext/standard/tests/strings/strripos_offset.phpt
index 47a672cc7e5..4ba98d137f5 100644
--- a/ext/standard/tests/strings/strripos_offset.phpt
+++ b/ext/standard/tests/strings/strripos_offset.phpt
@@ -17,7 +17,7 @@ var_dump(strripos(1024, "te", -PHP_INT_MAX-1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: strripos() expects parameter 3 to be integer, float given in %s on line %d
 bool(false)
 
diff --git a/ext/standard/tests/strings/strripos_variation1.phpt b/ext/standard/tests/strings/strripos_variation1.phpt
index b8a8943d095..56d2cd6a074 100644
--- a/ext/standard/tests/strings/strripos_variation1.phpt
+++ b/ext/standard/tests/strings/strripos_variation1.phpt
@@ -13,55 +13,55 @@ echo "*** Testing strripos() function: with double quoted strings ***\n";
 $haystack = "Hello,\t\n\0\n  $&!#%()*<=>?@hello123456he \x234 \101 ";
 $needles = array(
 		  //regular strings
-/*1*/	  "l",  
+/*1*/	  "l",
 		  "L",
 		  "HELLO",
 		  "hEllo",
-		
+
 		  //escape characters
-/*5*/	  "\t",  
+/*5*/	  "\t",
 		  "\T",  //invalid input
 		  "     ",
 		  "\n",
 		  "\N",  //invalid input
 		  "
 ",  //new line
-		
+
 		  //nulls
-/*11*/	  "\0",  
+/*11*/	  "\0",
 		  NULL,
 		  null,
-		
+
 		  //boolean false
-/*14*/	  FALSE,  
+/*14*/	  FALSE,
 		  false,
-		
+
 		  //empty string
 /*16*/	  "",
-		
+
 		  //special chars
-/*17*/	  " ",  
+/*17*/	  " ",
 		  "$",
 		  " $",
 		  "&",
-		  "!#", 
+		  "!#",
 		  "()",
-		  "<=>", 
-		  ">",  
+		  "<=>",
+		  ">",
 		  "=>",
 		  "?",
 		  "@",
 		  "@hEllo",
-		
-/*29*/	  "12345", //decimal numeric string  
+
+/*29*/	  "12345", //decimal numeric string
 		  "\x23",  //hexadecimal numeric string
 		  "#",  //respective ASCII char of \x23
 		  "\101",  //octal numeric string
 		  "A",  //respective ASCII char of \101
 		  "456HEE",  //numerics + chars
-		  $haystack  //haystack as needle  
+		  $haystack  //haystack as needle
 );
- 
+
 /* loop through to get the position of the needle in haystack string */
 $count = 1;
 foreach ($needles as $needle) {
diff --git a/ext/standard/tests/strings/strripos_variation2.phpt b/ext/standard/tests/strings/strripos_variation2.phpt
index d8caf73742c..529943bddd9 100644
--- a/ext/standard/tests/strings/strripos_variation2.phpt
+++ b/ext/standard/tests/strings/strripos_variation2.phpt
@@ -13,54 +13,54 @@ echo "*** Testing strripos() function: with single quoted strings ***\n";
 $haystack = 'Hello,\t\n\0\n  $&!#%()*<=>?@hello123456he \x234 \101 ';
 $needles = array(
 		  //regular strings
-/*1*/	  'l',  
+/*1*/	  'l',
 		  'L',
 		  'HELLO',
 		  'hEllo',
-		
+
 		  //escape characters
-/*5*/	  '\t',  
+/*5*/	  '\t',
 		  '\T',
 		  '     ',
 		  '\n',
 		  '\N',
 		  '
 		',  //new line
-		
+
 		  //nulls
-/*11*/	  '\0',  
+/*11*/	  '\0',
 		  NULL,
 		  null,
-		
+
 		  //boolean false
-/*14*/	  FALSE,  
+/*14*/	  FALSE,
 		  false,
-		
+
 		  //empty string
 /*16*/	  '',
-		
+
 		  //special chars
-/*17*/	  ' ',  
+/*17*/	  ' ',
 		  '$',
 		  ' $',
 		  '&',
 		  '!#',
 		  '()',
-		  '<=>',  
+		  '<=>',
 		  '>',
 		  '=>',
 		  '?',
 		  '@',
 		  '@hEllo',
-		
-/*29*/	  '12345', 	//decimal numeric string  
+
+/*29*/	  '12345', 	//decimal numeric string
 		  '\x23',	//hexadecimal numeric string
 		  '#',  	//respective ASCII char of \x23
 		  '\101',  	//octal numeric string
 		  'A', 		// respective ASCII char for \101
 		  '456HEE', //numerics + chars
 		  42, 		//needle as int(ASCII value of '*')
-		  $haystack  //haystack as needle  
+		  $haystack  //haystack as needle
 );
 
 /* loop through to get the position of the needle in haystack string */
diff --git a/ext/standard/tests/strings/strripos_variation3.phpt b/ext/standard/tests/strings/strripos_variation3.phpt
index c3801063418..4fccaeb47ee 100644
--- a/ext/standard/tests/strings/strripos_variation3.phpt
+++ b/ext/standard/tests/strings/strripos_variation3.phpt
@@ -7,7 +7,7 @@ Test strripos() function : usage variations - multi line heredoc string for 'hay
  * Source code: ext/standard/string.c
 */
 
-/* Test strripos() function by passing multi-line heredoc string for haystack and 
+/* Test strripos() function by passing multi-line heredoc string for haystack and
  *  with various needles & offsets
 */
 
diff --git a/ext/standard/tests/strings/strripos_variation4.phpt b/ext/standard/tests/strings/strripos_variation4.phpt
index c355330cabc..f76ea41d36f 100644
--- a/ext/standard/tests/strings/strripos_variation4.phpt
+++ b/ext/standard/tests/strings/strripos_variation4.phpt
@@ -8,7 +8,7 @@ Test strripos() function : usage variations - heredoc string containing special
 */
 
 /* Test strripos() function by passing heredoc string containing special chars for haystack
- *  and with various needles & offets 
+ *  and with various needles & offets
 */
 
 echo "*** Testing strripos() function: with heredoc strings ***\n";
diff --git a/ext/standard/tests/strings/strripos_variation5.phpt b/ext/standard/tests/strings/strripos_variation5.phpt
index 5f6df799039..66802870d4e 100644
--- a/ext/standard/tests/strings/strripos_variation5.phpt
+++ b/ext/standard/tests/strings/strripos_variation5.phpt
@@ -7,8 +7,8 @@ Test strripos() function : usage variations - heredoc string containing escape c
  * Source code: ext/standard/string.c
 */
 
-/* Test strripos() function by passing heredoc string containing escape chars for haystack 
- *  and with various needles & offsets 
+/* Test strripos() function by passing heredoc string containing escape chars for haystack
+ *  and with various needles & offsets
 */
 
 echo "*** Testing strripos() function: with heredoc strings ***\n";
diff --git a/ext/standard/tests/strings/strrpos_error.phpt b/ext/standard/tests/strings/strrpos_error.phpt
index 3900ceaa5d7..d97af99920c 100644
--- a/ext/standard/tests/strings/strrpos_error.phpt
+++ b/ext/standard/tests/strings/strrpos_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strrpos() function : error conditions 
+Test strrpos() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int strrpos ( string $haystack, string $needle [, int $offset] );
diff --git a/ext/standard/tests/strings/strrpos_offset.phpt b/ext/standard/tests/strings/strrpos_offset.phpt
index 4f20895b154..18dcf7b8501 100644
--- a/ext/standard/tests/strings/strrpos_offset.phpt
+++ b/ext/standard/tests/strings/strrpos_offset.phpt
@@ -16,7 +16,7 @@ var_dump(strrpos(1024, "te", -PHP_INT_MAX-1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d
 bool(false)
 
diff --git a/ext/standard/tests/strings/strrpos_variation1.phpt b/ext/standard/tests/strings/strrpos_variation1.phpt
index a7ef3e9b059..cb7078f6222 100644
--- a/ext/standard/tests/strings/strrpos_variation1.phpt
+++ b/ext/standard/tests/strings/strrpos_variation1.phpt
@@ -13,13 +13,13 @@ echo "*** Testing strrpos() function: with double quoted strings ***\n";
 $haystack = "Hello,\t\n\0\n  $&!#%()*<=>?@hello123456he \x234 \101 ";
 $needle = array(
   //regular strings
-  "l",  
+  "l",
   "L",
   "HELLO",
   "hEllo",
 
   //escape characters
-  "\t",  
+  "\t",
   "\T",  //invalid input
   "     ",
   "\n",
@@ -28,40 +28,40 @@ $needle = array(
 ",  //new line
 
   //nulls
-  "\0",  
+  "\0",
   NULL,
   null,
 
   //boolean false
-  FALSE,  
+  FALSE,
   false,
 
   //empty string
   "",
 
   //special chars
-  " ",  
+  " ",
   "$",
   " $",
   "&",
-  "!#", 
+  "!#",
   "()",
-  "<=>", 
-  ">",  
+  "<=>",
+  ">",
   "=>",
   "?",
   "@",
   "@hEllo",
 
-  "12345", //decimal numeric string  
+  "12345", //decimal numeric string
   "\x23",  //hexadecimal numeric string
   "#",  //respective ASCII char of \x23
   "\101",  //octal numeric string
   "A",  //respective ASCII char of \101
   "456HEE",  //numerics + chars
-  $haystack  //haystack as needle  
+  $haystack  //haystack as needle
 );
- 
+
 /* loop through to get the position of the needle in haystack string */
 $count = 1;
 for($index=0; $index<count($needle); $index++) {
diff --git a/ext/standard/tests/strings/strrpos_variation10.phpt b/ext/standard/tests/strings/strrpos_variation10.phpt
index 86ca6cf9273..dabfa0d4a8f 100644
--- a/ext/standard/tests/strings/strrpos_variation10.phpt
+++ b/ext/standard/tests/strings/strrpos_variation10.phpt
@@ -7,8 +7,8 @@ Test strrpos() function : usage variations - unexpected inputs for 'needle' argu
  * Source code: ext/standard/string.c
 */
 
-/* Test strrpos() function with unexpected inputs for 'needle' and 
- *  an expected type of input for 'haystack' argument 
+/* Test strrpos() function with unexpected inputs for 'needle' and
+ *  an expected type of input for 'haystack' argument
 */
 
 echo "*** Testing strrpos() function with unexpected values for needle ***\n";
@@ -21,7 +21,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "object";
-  } 
+  }
 }
 
 //getting the resource
diff --git a/ext/standard/tests/strings/strrpos_variation11.phpt b/ext/standard/tests/strings/strrpos_variation11.phpt
index 5b5e7e3e39b..de4013b9172 100644
--- a/ext/standard/tests/strings/strrpos_variation11.phpt
+++ b/ext/standard/tests/strings/strrpos_variation11.phpt
@@ -19,11 +19,11 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "object";
-  } 
+  }
 }
 
 //getting the resource
-$file_handle = fopen(__FILE__, "r"); 
+$file_handle = fopen(__FILE__, "r");
 
 // array with different values
 $values =  array (
diff --git a/ext/standard/tests/strings/strrpos_variation12.phpt b/ext/standard/tests/strings/strrpos_variation12.phpt
index 87ac3b2f84c..7517eaa707a 100644
--- a/ext/standard/tests/strings/strrpos_variation12.phpt
+++ b/ext/standard/tests/strings/strrpos_variation12.phpt
@@ -7,8 +7,8 @@ Test strrpos() function : usage variations - checking binary safe with 'haystack
  * Source code: ext/standard/string.c
 */
 
-/* Test strrpos() function with null terminated strings for 'haystack' argument 
- *  in order to check the binary safe 
+/* Test strrpos() function with null terminated strings for 'haystack' argument
+ *  in order to check the binary safe
 */
 
 echo "*** Test strrpos() function: binary safe ***\n";
diff --git a/ext/standard/tests/strings/strrpos_variation13.phpt b/ext/standard/tests/strings/strrpos_variation13.phpt
index f85c3c454fc..7c8ef274572 100644
--- a/ext/standard/tests/strings/strrpos_variation13.phpt
+++ b/ext/standard/tests/strings/strrpos_variation13.phpt
@@ -7,8 +7,8 @@ Test strrpos() function : usage variations - checking bianry safe with 'needle'
  * Source code: ext/standard/string.c
 */
 
-/* Test strrpos() function with null terminated strings for 'needle' argument 
- *  in order to check binary safe 
+/* Test strrpos() function with null terminated strings for 'needle' argument
+ *  in order to check binary safe
 */
 
 echo "*** Test strrpos() function: binary safe ***\n";
diff --git a/ext/standard/tests/strings/strrpos_variation14.phpt b/ext/standard/tests/strings/strrpos_variation14.phpt
index ba252b9d2b2..75df2033ff3 100644
--- a/ext/standard/tests/strings/strrpos_variation14.phpt
+++ b/ext/standard/tests/strings/strrpos_variation14.phpt
@@ -21,11 +21,11 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "object";
-  } 
+  }
 }
 
 //getting the resource
-$file_handle = fopen(__FILE__, "r"); 
+$file_handle = fopen(__FILE__, "r");
 
 //definition of input args
 $haystack = "hello world";
diff --git a/ext/standard/tests/strings/strrpos_variation15.phpt b/ext/standard/tests/strings/strrpos_variation15.phpt
index 02bc804fcf2..48e72ccee47 100644
--- a/ext/standard/tests/strings/strrpos_variation15.phpt
+++ b/ext/standard/tests/strings/strrpos_variation15.phpt
@@ -21,11 +21,11 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "object";
-  } 
+  }
 }
 
 //getting the resource
-$file_handle = fopen(__FILE__, "r"); 
+$file_handle = fopen(__FILE__, "r");
 
 // array with different values
 $values =  array (
diff --git a/ext/standard/tests/strings/strrpos_variation2.phpt b/ext/standard/tests/strings/strrpos_variation2.phpt
index 53645866be6..803b2943d60 100644
--- a/ext/standard/tests/strings/strrpos_variation2.phpt
+++ b/ext/standard/tests/strings/strrpos_variation2.phpt
@@ -13,13 +13,13 @@ echo "*** Testing strrpos() function: with single quoted strings ***\n";
 $haystack = 'Hello,\t\n\0\n  $&!#%()*<=>?@hello123456he \x234 \101 ';
 $needle = array(
   //regular strings
-  'l',  
+  'l',
   'L',
   'HELLO',
   'hEllo',
 
   //escape characters
-  '\t',  
+  '\t',
   '\T',
   '     ',
   '\n',
@@ -28,39 +28,39 @@ $needle = array(
 ',  //new line
 
   //nulls
-  '\0',  
+  '\0',
   NULL,
   null,
 
   //boolean false
-  FALSE,  
+  FALSE,
   false,
 
   //empty string
   '',
 
   //special chars
-  ' ',  
+  ' ',
   '$',
   ' $',
   '&',
   '!#',
   '()',
-  '<=>',  
+  '<=>',
   '>',
   '=>',
   '?',
   '@',
   '@hEllo',
 
-  '12345', //decimal numeric string  
+  '12345', //decimal numeric string
   '\x23',  //hexadecimal numeric string
   '#',  //hexadecimal numeric string
   '\101',  //octal numeric string
   'A',
   '456HEE',  //numerics + chars
   42, //needle as int(ASCII value of '*')
-  $haystack  //haystack as needle  
+  $haystack  //haystack as needle
 );
 
 /* loop through to get the position of the needle in haystack string */
diff --git a/ext/standard/tests/strings/strrpos_variation3.phpt b/ext/standard/tests/strings/strrpos_variation3.phpt
index a0a0d270e88..d37342e4648 100644
--- a/ext/standard/tests/strings/strrpos_variation3.phpt
+++ b/ext/standard/tests/strings/strrpos_variation3.phpt
@@ -7,7 +7,7 @@ Test strrpos() function : usage variations - multi line heredoc string for 'hays
  * Source code: ext/standard/string.c
 */
 
-/* Test strrpos() function by passing multi-line heredoc string for haystack and 
+/* Test strrpos() function by passing multi-line heredoc string for haystack and
  *  with various needles & offsets
 */
 
diff --git a/ext/standard/tests/strings/strrpos_variation4.phpt b/ext/standard/tests/strings/strrpos_variation4.phpt
index 1ccf5298566..ed032f264ed 100644
--- a/ext/standard/tests/strings/strrpos_variation4.phpt
+++ b/ext/standard/tests/strings/strrpos_variation4.phpt
@@ -8,7 +8,7 @@ Test strrpos() function : usage variations - heredoc string containing special c
 */
 
 /* Test strrpos() function by passing heredoc string containing special chars for haystack
- *  and with various needles & offets 
+ *  and with various needles & offets
 */
 
 echo "*** Testing strrpos() function: with heredoc strings ***\n";
diff --git a/ext/standard/tests/strings/strrpos_variation5.phpt b/ext/standard/tests/strings/strrpos_variation5.phpt
index f9537da0e2d..b322e97e61e 100644
--- a/ext/standard/tests/strings/strrpos_variation5.phpt
+++ b/ext/standard/tests/strings/strrpos_variation5.phpt
@@ -7,8 +7,8 @@ Test strrpos() function : usage variations - heredoc string containing escape ch
  * Source code: ext/standard/string.c
 */
 
-/* Test strrpos() function by passing heredoc string containing escape chars for haystack 
- *  and with various needles & offsets 
+/* Test strrpos() function by passing heredoc string containing escape chars for haystack
+ *  and with various needles & offsets
 */
 
 echo "*** Testing strrpos() function: with heredoc strings ***\n";
diff --git a/ext/standard/tests/strings/strrpos_variation6.phpt b/ext/standard/tests/strings/strrpos_variation6.phpt
index c879a91209d..f361e8c5ea1 100644
--- a/ext/standard/tests/strings/strrpos_variation6.phpt
+++ b/ext/standard/tests/strings/strrpos_variation6.phpt
@@ -7,7 +7,7 @@ Test strrpos() function : usage variations - heredoc string containing quotes fo
  * Source code: ext/standard/string.c
 */
 
-/* Test strrpos() function by passing heredoc string containing quotes for haystack 
+/* Test strrpos() function by passing heredoc string containing quotes for haystack
  *  and with various needles & offsets
 */
 
diff --git a/ext/standard/tests/strings/strrpos_variation7.phpt b/ext/standard/tests/strings/strrpos_variation7.phpt
index 239dc246bc8..cf70befdbd6 100644
--- a/ext/standard/tests/strings/strrpos_variation7.phpt
+++ b/ext/standard/tests/strings/strrpos_variation7.phpt
@@ -7,7 +7,7 @@ Test strrpos() function : usage variations - empty heredoc string for 'haystack'
  * Source code: ext/standard/string.c
 */
 
-/* Test strrpos() function by passing empty heredoc string for haystack 
+/* Test strrpos() function by passing empty heredoc string for haystack
  *  and with various needles & offsets
 */
 
diff --git a/ext/standard/tests/strings/strrpos_variation8.phpt b/ext/standard/tests/strings/strrpos_variation8.phpt
index eac7d8ff837..b5ee760867f 100644
--- a/ext/standard/tests/strings/strrpos_variation8.phpt
+++ b/ext/standard/tests/strings/strrpos_variation8.phpt
@@ -8,7 +8,7 @@ Test strrpos() function : usage variations - repetitive chars for 'haystack' arg
 */
 
 /* Test strrpos() function with strings containing multiple occurrences of 'needle' in the 'haystack'
- *  and with various needles & offsets 
+ *  and with various needles & offsets
 */
 
 echo "*** Testing strrpos() function: strings repetitive chars ***\n";
diff --git a/ext/standard/tests/strings/strrpos_variation9.phpt b/ext/standard/tests/strings/strrpos_variation9.phpt
index 9b3b8d673dd..ca9a121def1 100644
--- a/ext/standard/tests/strings/strrpos_variation9.phpt
+++ b/ext/standard/tests/strings/strrpos_variation9.phpt
@@ -19,7 +19,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "object";
-  } 
+  }
 }
 
 //getting the resource
diff --git a/ext/standard/tests/strings/strspn_basic.phpt b/ext/standard/tests/strings/strspn_basic.phpt
index d9b1a338813..8ca28243932 100644
--- a/ext/standard/tests/strings/strspn_basic.phpt
+++ b/ext/standard/tests/strings/strspn_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test strspn() function : basic functionality 
+Test strspn() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto int strspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters found in mask.
-                If start or/and length is provided, it works like strspn(substr($s,$start,$len),$good_chars) 
+                If start or/and length is provided, it works like strspn(substr($s,$start,$len),$good_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/strspn_error.phpt b/ext/standard/tests/strings/strspn_error.phpt
index caa1f901a11..0cf88c25d27 100644
--- a/ext/standard/tests/strings/strspn_error.phpt
+++ b/ext/standard/tests/strings/strspn_error.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test strspn() function : error conditions 
+Test strspn() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto int strspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters found in mask.
-                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) 
+                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/strspn_variation1.phpt b/ext/standard/tests/strings/strspn_variation1.phpt
index 45e71edc28a..6b73b212eaa 100644
--- a/ext/standard/tests/strings/strspn_variation1.phpt
+++ b/ext/standard/tests/strings/strspn_variation1.phpt
@@ -4,7 +4,7 @@ Test strspn() function : usage variations  - unexpected values for str argument
 <?php
 /* Prototype  : proto int strspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters found in mask.
-                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) 
+                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/strspn_variation10.phpt b/ext/standard/tests/strings/strspn_variation10.phpt
index 318d16ccfb4..39911aa8b06 100644
--- a/ext/standard/tests/strings/strspn_variation10.phpt
+++ b/ext/standard/tests/strings/strspn_variation10.phpt
@@ -4,7 +4,7 @@ Test strspn() function : usage variations - with varying mask & default start an
 <?php
 /* Prototype  : proto int strspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters found in mask.
-                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) 
+                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -50,7 +50,7 @@ $mask_array = array(
 		    " \t",
                     "fhel\t\i\100\xa"
                    );
-		
+
 
 // loop through each element of the array for mask argument
 
diff --git a/ext/standard/tests/strings/strspn_variation11.phpt b/ext/standard/tests/strings/strspn_variation11.phpt
index 209981e69a3..80b3c8e3100 100644
--- a/ext/standard/tests/strings/strspn_variation11.phpt
+++ b/ext/standard/tests/strings/strspn_variation11.phpt
@@ -4,7 +4,7 @@ Test strspn() function : usage variations - with varying start and default len a
 <?php
 /* Prototype  : proto int strspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters found in mask.
-                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) 
+                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -51,7 +51,7 @@ $mask_array = array(
                     "fhel\t\i\100\xa"
                    );
 
-// defining the array for start values		
+// defining the array for start values
 $start_array = array(
 		    0,
 		    1,
@@ -61,7 +61,7 @@ $start_array = array(
 		    2147483647,  // max positive integer
 		    -2147483648,  // min negative integer
                    );
-		
+
 
 // loop through each element of the arrays for str, mask and start argument
 $count = 1;
diff --git a/ext/standard/tests/strings/strspn_variation12.phpt b/ext/standard/tests/strings/strspn_variation12.phpt
index 9e2eaf010dd..ebb00137205 100644
--- a/ext/standard/tests/strings/strspn_variation12.phpt
+++ b/ext/standard/tests/strings/strspn_variation12.phpt
@@ -4,7 +4,7 @@ Test strspn() function : usage variations - with varying start and len args
 <?php
 /* Prototype  : proto int strspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters found in mask.
-                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) 
+                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -42,7 +42,7 @@ $mask_array = array(
                     "fhel\t\i\100\xa"
                    );
 
-// defining the array for start values		
+// defining the array for start values
 $start_array = array(
 		    0,
 		    1,
@@ -51,7 +51,7 @@ $start_array = array(
 		    2147483647,  // max positive integer
 		    -2147483648,  // min negative integer
                    );
-		
+
 // defining an array of len values
 $len_array = array(
 		    0,
@@ -61,7 +61,7 @@ $len_array = array(
 		    2147483647,  // max positive integer
 		    -2147483648,  // min negative integer
                    );
-		
+
 
 // loop through each element of the array for len argument
 $count = 1;
diff --git a/ext/standard/tests/strings/strspn_variation2.phpt b/ext/standard/tests/strings/strspn_variation2.phpt
index 57929fa3528..b968ce1436d 100644
--- a/ext/standard/tests/strings/strspn_variation2.phpt
+++ b/ext/standard/tests/strings/strspn_variation2.phpt
@@ -4,7 +4,7 @@ Test strspn() function : usage variations - unexpected values for mask argument
 <?php
 /* Prototype  : proto int strspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters found in mask.
-		If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) 
+		If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/strspn_variation3.phpt b/ext/standard/tests/strings/strspn_variation3.phpt
index 13eb327f729..7cc06d10be6 100644
--- a/ext/standard/tests/strings/strspn_variation3.phpt
+++ b/ext/standard/tests/strings/strspn_variation3.phpt
@@ -4,7 +4,7 @@ Test strspn() function : usage variations - unexpected values of start argument
 <?php
 /* Prototype  : proto int strspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters found in mask.
-                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) 
+                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/strspn_variation4.phpt b/ext/standard/tests/strings/strspn_variation4.phpt
index c723328482b..f81dbae64ee 100644
--- a/ext/standard/tests/strings/strspn_variation4.phpt
+++ b/ext/standard/tests/strings/strspn_variation4.phpt
@@ -4,7 +4,7 @@ Test strspn() function : usage variations - unexpected values of len argument
 <?php
 /* Prototype  : proto int strspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters found in mask.
-                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) 
+                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
diff --git a/ext/standard/tests/strings/strspn_variation5.phpt b/ext/standard/tests/strings/strspn_variation5.phpt
index 514af553191..5b4bf7e1081 100644
Binary files a/ext/standard/tests/strings/strspn_variation5.phpt and b/ext/standard/tests/strings/strspn_variation5.phpt differ
diff --git a/ext/standard/tests/strings/strspn_variation6.phpt b/ext/standard/tests/strings/strspn_variation6.phpt
index 413198d1c0a..7ad35017496 100644
--- a/ext/standard/tests/strings/strspn_variation6.phpt
+++ b/ext/standard/tests/strings/strspn_variation6.phpt
@@ -4,7 +4,7 @@ Test strspn() function : usage variations - with heredoc strings, varying mask &
 <?php
 /* Prototype  : proto int strspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters found in mask.
-                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) 
+                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -74,7 +74,7 @@ $mask_array = array(
 		    "l \te",
                     "lf\the\i\100\xaa"
                    );
-		
+
 
 // loop through each element of the array for different heredoc and mask strings
 
diff --git a/ext/standard/tests/strings/strspn_variation7.phpt b/ext/standard/tests/strings/strspn_variation7.phpt
index d0ebee3c925..3191376a0b0 100644
--- a/ext/standard/tests/strings/strspn_variation7.phpt
+++ b/ext/standard/tests/strings/strspn_variation7.phpt
@@ -4,7 +4,7 @@ Test strspn() function : usage variations - with heredoc strings, varying start
 <?php
 /* Prototype  : proto int strspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters found in mask.
-                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) 
+                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -85,7 +85,7 @@ $start_array = array(
 		    2147483647,  // max positive integer
 		    -2147483648,  // min negative integer
                    );
-		
+
 
 // loop through each element of the array for heredoc strings, mask strings and start values
 
diff --git a/ext/standard/tests/strings/strspn_variation8.phpt b/ext/standard/tests/strings/strspn_variation8.phpt
index 3e9e9ddd8c7..2e6a6cc3d9e 100644
--- a/ext/standard/tests/strings/strspn_variation8.phpt
+++ b/ext/standard/tests/strings/strspn_variation8.phpt
@@ -4,7 +4,7 @@ Test strspn() function : usage variations - with heredoc strings, varying start
 <?php
 /* Prototype  : proto int strspn(string str, string mask [, int start [, int len]])
  * Description: Finds length of initial segment consisting entirely of characters found in mask.
-                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) 
+                If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars)
  * Source code: ext/standard/string.c
  * Alias to functions: none
 */
@@ -81,7 +81,7 @@ $start_array = array(
 		    2147483647,  // max positive integer
 		    -2147483648,  // min negative integer
                    );
-		
+
 // defining array of different len values
 $len_array = array(
 		    0,
@@ -91,13 +91,13 @@ $len_array = array(
 		    2147483647,  // max positive integer
 		    -2147483648,  // min negative integer
                    );
-		
+
 
 // loop through each element of the array for heredoc str, mask str , start values and len values
 
 $count = 1;
 
-foreach($heredoc_strings as $str)  { 
+foreach($heredoc_strings as $str)  {
   echo "\n-- Iteration $count --\n";
   foreach($mask_array as $mask)  {
     foreach($start_array as $start)  {
@@ -107,7 +107,7 @@ foreach($heredoc_strings as $str)  {
     }
   }
   $count++;
-}; 
+};
 
 echo "Done"
 ?>
diff --git a/ext/standard/tests/strings/strspn_variation9.phpt b/ext/standard/tests/strings/strspn_variation9.phpt
index 14af0ca0af2..09ad531d2e2 100644
Binary files a/ext/standard/tests/strings/strspn_variation9.phpt and b/ext/standard/tests/strings/strspn_variation9.phpt differ
diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt
index a16cda9c936..d3050f93a25 100644
Binary files a/ext/standard/tests/strings/strstr.phpt and b/ext/standard/tests/strings/strstr.phpt differ
diff --git a/ext/standard/tests/strings/strtok_basic.phpt b/ext/standard/tests/strings/strtok_basic.phpt
index 6ba48f41e3f..8855bac639f 100644
--- a/ext/standard/tests/strings/strtok_basic.phpt
+++ b/ext/standard/tests/strings/strtok_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strtok() function : basic functionality 
+Test strtok() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string strtok ( str $str, str $token )
diff --git a/ext/standard/tests/strings/strtok_error.phpt b/ext/standard/tests/strings/strtok_error.phpt
index 58044e7b62a..b54fbbe19b0 100644
--- a/ext/standard/tests/strings/strtok_error.phpt
+++ b/ext/standard/tests/strings/strtok_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test strtok() function : error conditions 
+Test strtok() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string strtok ( string $str, string $token )
@@ -26,10 +26,10 @@ $extra_arg = 10;
 var_dump( strtok($str, $token, $extra_arg) );
 var_dump( $str );
 
-// Less than expected number of arguments 
+// Less than expected number of arguments
 echo "\n-- Testing strtok() with less than expected no. of arguments --\n";
 $str = 'string val';
- 
+
 var_dump( strtok($str));
 var_dump( $str );
 
diff --git a/ext/standard/tests/strings/strtok_variation1.phpt b/ext/standard/tests/strings/strtok_variation1.phpt
index cb06fc43c35..38d4b5ac8b3 100644
--- a/ext/standard/tests/strings/strtok_variation1.phpt
+++ b/ext/standard/tests/strings/strtok_variation1.phpt
@@ -94,7 +94,7 @@ for($index = 0; $index < count($values); $index ++) {
   $counter ++;
 }
 
-//closing the resource 
+//closing the resource
 fclose($file_handle);
 
 echo "Done\n";
diff --git a/ext/standard/tests/strings/strtok_variation2.phpt b/ext/standard/tests/strings/strtok_variation2.phpt
index 13da4405824..2f88efc0ef1 100644
--- a/ext/standard/tests/strings/strtok_variation2.phpt
+++ b/ext/standard/tests/strings/strtok_variation2.phpt
@@ -24,7 +24,7 @@ class sample  {
   public function __toString() {
   return "obj-ect";
   }
-} 
+}
 
 // Defining resource
 $file_handle = fopen(__FILE__, 'r');
@@ -74,7 +74,7 @@ $values =  array (
 
   // unset variable
   $unset_var,
- 
+
   // resource
   $file_handle
 );
diff --git a/ext/standard/tests/strings/strtok_variation5.phpt b/ext/standard/tests/strings/strtok_variation5.phpt
index c49f7ded9fd..170adfd40b2 100644
--- a/ext/standard/tests/strings/strtok_variation5.phpt
+++ b/ext/standard/tests/strings/strtok_variation5.phpt
@@ -27,7 +27,7 @@ $string_array = array(
                        chr(0).'hello'.chr(0),
                        'hello'.chr(0).'world'
  		     );
-$token_array = array( 
+$token_array = array(
 		      "wr",
 		      "hello world",
 		      "__",
@@ -47,13 +47,13 @@ $token_array = array(
 $counter =1;
 foreach( $string_array as $string )  {
   echo "\n--- Iteration $counter ---\n";
-  var_dump( strtok($string, $token_array[$counter-1]) ); 
+  var_dump( strtok($string, $token_array[$counter-1]) );
   for( $count = 1; $count <=5; $count++ )  {
     var_dump( strtok($token_array[$counter-1]) );
   }
   $counter++;
-}		      
-		      
+}
+
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/strings/strtok_variation6.phpt b/ext/standard/tests/strings/strtok_variation6.phpt
index 73ea3667ebd..7008e3b67ed 100644
--- a/ext/standard/tests/strings/strtok_variation6.phpt
+++ b/ext/standard/tests/strings/strtok_variation6.phpt
@@ -20,12 +20,12 @@ $string_array = array(
  		       "/khello\k world/k",
  		       "/hellok/ world"
  		     );
-$token_array = array( 
+$token_array = array(
 		       "k",
 		       "/ ",
 		       "/k",
 		       "\k",
-		       "\\\\\\\k\h\\e\l\o\w\r\l\d" 
+		       "\\\\\\\k\h\\e\l\o\w\r\l\d"
  		    );
 
 // loop through each element of the array and check the working of strtok()
@@ -34,16 +34,16 @@ $token_array = array(
 $counter =1;
 foreach( $string_array as $string )  {
   echo "\n--- Iteration $counter ---\n";
-  foreach( $token_array as $token )  { 
-    var_dump( strtok($string, $token) ); 
+  foreach( $token_array as $token )  {
+    var_dump( strtok($string, $token) );
     for( $count = 1; $count <=3; $count++ )  {
       var_dump( strtok($token) );
     }
     echo "\n";
   }
   $counter++;
-}		      
-		      
+}
+
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/strings/strtok_variation7.phpt b/ext/standard/tests/strings/strtok_variation7.phpt
index 28cbf7d917f..aed1c7f8a31 100644
--- a/ext/standard/tests/strings/strtok_variation7.phpt
+++ b/ext/standard/tests/strings/strtok_variation7.phpt
@@ -17,7 +17,7 @@ $str = "this is a sample string";
 $token = " ";
 
 echo "\n*** Testing strtok() when string being tokenised is prefixed with another string in between the process ***\n";
-var_dump( strtok($str, $token) ); 
+var_dump( strtok($str, $token) );
 // adding a string to the input string which is being tokenised
 $str = "extra string ".$str;
 for( $count = 1; $count <=6; $count++ )  {
@@ -25,9 +25,9 @@ for( $count = 1; $count <=6; $count++ )  {
   var_dump( strtok($token) );
   echo "\n-- Input str is \"$str\" --\n";
 }
-		      
+
 echo "\n*** Testing strtok() when string being tokenised is suffixed with another string in between the process ***\n";
-var_dump( strtok($str, $token) ); 
+var_dump( strtok($str, $token) );
 // adding a string to the input string which is being tokenised
 $str = $str." extra string";
 for( $count = 1; $count <=10; $count++ )  {
diff --git a/ext/standard/tests/strings/strtolower-win32.phpt b/ext/standard/tests/strings/strtolower-win32.phpt
index ffaa1487bad..c0ad1d0115e 100644
Binary files a/ext/standard/tests/strings/strtolower-win32.phpt and b/ext/standard/tests/strings/strtolower-win32.phpt differ
diff --git a/ext/standard/tests/strings/strtolower.phpt b/ext/standard/tests/strings/strtolower.phpt
index 166b5ccc677..47dfe097626 100644
Binary files a/ext/standard/tests/strings/strtolower.phpt and b/ext/standard/tests/strings/strtolower.phpt differ
diff --git a/ext/standard/tests/strings/strtoupper1-win32.phpt b/ext/standard/tests/strings/strtoupper1-win32.phpt
index e0adc645e04..60701652e19 100644
Binary files a/ext/standard/tests/strings/strtoupper1-win32.phpt and b/ext/standard/tests/strings/strtoupper1-win32.phpt differ
diff --git a/ext/standard/tests/strings/strtoupper1.phpt b/ext/standard/tests/strings/strtoupper1.phpt
index b83a8a3a5d4..e0ebf42ea76 100644
Binary files a/ext/standard/tests/strings/strtoupper1.phpt and b/ext/standard/tests/strings/strtoupper1.phpt differ
diff --git a/ext/standard/tests/strings/strtr_basic.phpt b/ext/standard/tests/strings/strtr_basic.phpt
index 2892ab00823..633e3f93efd 100644
--- a/ext/standard/tests/strings/strtr_basic.phpt
+++ b/ext/standard/tests/strings/strtr_basic.phpt
@@ -27,7 +27,7 @@ var_dump( strtr('test strtr', 'test', 'TEST') );
 var_dump( strtr($heredoc_str, "test", "TEST") );
 
 //$from and $to are of different lengths, extra chars in the longer one are ignored
-var_dump( strtr("test strtr", "test", "TESTz") ); 
+var_dump( strtr("test strtr", "test", "TESTz") );
 var_dump( strtr('test strtr', 'testz', 'TEST') );
 var_dump( strtr($heredoc_str, "test", "TESTz") );
 
diff --git a/ext/standard/tests/strings/strtr_error.phpt b/ext/standard/tests/strings/strtr_error.phpt
index f34085fb4de..0d4d1577763 100644
--- a/ext/standard/tests/strings/strtr_error.phpt
+++ b/ext/standard/tests/strings/strtr_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test strtr() function : error conditions 
+Test strtr() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string strtr(string str, string from[, string to])
- * Description: Translates characters in str using given translation tables 
+ * Description: Translates characters in str using given translation tables
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/strtr_variation5.phpt b/ext/standard/tests/strings/strtr_variation5.phpt
index c90e0280692..fc5f2f5911f 100644
--- a/ext/standard/tests/strings/strtr_variation5.phpt
+++ b/ext/standard/tests/strings/strtr_variation5.phpt
@@ -8,8 +8,8 @@ Test strtr() function : usage variations - unexpected inputs for 'str' argument
  * Source code: ext/standard/string.c
 */
 
-/* Test strtr() function: with unexpected inputs for 'str' 
- *  and expected type for 'from' & 'to' arguments 
+/* Test strtr() function: with unexpected inputs for 'str'
+ *  and expected type for 'from' & 'to' arguments
 */
 
 echo "*** Testing strtr() function: with unexpected inputs for 'str' ***\n";
@@ -22,7 +22,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -35,36 +35,36 @@ $strings =  array (
 /*1*/	  0,
 		  1,
 		  -2,
-		
+
 		  // float values
 /*4*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*7*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*10*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null vlaues
 /*14*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*16*/	  new sample(),
-		
+
 		  // resource
 /*17*/	  $file_handle,
-		
+
 		  // undefined variable
 /*18*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*19*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/strtr_variation6.phpt b/ext/standard/tests/strings/strtr_variation6.phpt
index 46f9e78c720..90586640306 100644
--- a/ext/standard/tests/strings/strtr_variation6.phpt
+++ b/ext/standard/tests/strings/strtr_variation6.phpt
@@ -8,8 +8,8 @@ Test strtr() function : usage variations - unexpected inputs for 'from' argument
  * Source code: ext/standard/string.c
 */
 
-/* Test strtr() function: with unexpected inputs for 'from' 
- *  and expected type for 'str' & 'to' arguments 
+/* Test strtr() function: with unexpected inputs for 'from'
+ *  and expected type for 'str' & 'to' arguments
 */
 
 echo "*** Testing strtr() function: with unexpected inputs for 'from' ***\n";
@@ -22,7 +22,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -38,36 +38,36 @@ $from_arr =  array (
 /*1*/	  0,
 		  1,
 		  -2,
-		
+
 		  // float values
 /*4*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*7*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*10*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null vlaues
 /*14*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*16*/	  new sample(),
-		
+
 		  // resource
 /*17*/	  $file_handle,
-		
+
 		  // undefined variable
 /*18*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*19*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/strtr_variation7.phpt b/ext/standard/tests/strings/strtr_variation7.phpt
index fa2a5eb3c36..981f56688eb 100644
--- a/ext/standard/tests/strings/strtr_variation7.phpt
+++ b/ext/standard/tests/strings/strtr_variation7.phpt
@@ -8,8 +8,8 @@ Test strtr() function : usage variations - unexpected inputs for 'to' argument
  * Source code: ext/standard/string.c
 */
 
-/* Test strtr() function: with unexpected inputs for 'to' 
- *  and expected types for 'str' & 'from' arguments 
+/* Test strtr() function: with unexpected inputs for 'to'
+ *  and expected types for 'str' & 'from' arguments
 */
 
 echo "*** Testing strtr() function: with unexpected inputs for 'to' ***\n";
@@ -22,7 +22,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -41,36 +41,36 @@ $to_arr =  array (
 /*1*/	  0,
 		  1,
 		  -2,
-		
+
 		  // float values
 /*4*/	  10.5,
 		  -20.5,
 		  10.12345675e10,
-		
+
 		  // array values
 /*7*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*10*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null vlaues
 /*14*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*16*/	  new sample(),
-		
+
 		  // resource
 /*17*/	  $file_handle,
-		
+
 		  // undefined variable
 /*18*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*19*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/strtr_variation8.phpt b/ext/standard/tests/strings/strtr_variation8.phpt
index 4d2b42b02b4..4233a166d78 100644
--- a/ext/standard/tests/strings/strtr_variation8.phpt
+++ b/ext/standard/tests/strings/strtr_variation8.phpt
@@ -8,8 +8,8 @@ Test strtr() function : usage variations - unexpected inputs for 'replace_pairs'
  * Source code: ext/standard/string.c
 */
 
-/* Test strtr() function: with unexpected inputs for 'replace_pairs' 
- *  and expected type for 'str' arguments 
+/* Test strtr() function: with unexpected inputs for 'replace_pairs'
+ *  and expected type for 'str' arguments
 */
 
 echo "*** Testing strtr() function: with unexpected inputs for 'replace_pairs' ***\n";
@@ -22,7 +22,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
diff --git a/ext/standard/tests/strings/strtr_variation9.phpt b/ext/standard/tests/strings/strtr_variation9.phpt
index c7d4d995811..38b863b2c67 100644
--- a/ext/standard/tests/strings/strtr_variation9.phpt
+++ b/ext/standard/tests/strings/strtr_variation9.phpt
@@ -20,7 +20,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "sample object";
-  } 
+  }
 }
 
 //getting the resource
@@ -33,38 +33,38 @@ $values =  array (
 /*1*/	  0,
 		  1,
 		  -2,
-		
+
 		  // float values
 /*4*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*7*/	  array(),
 		  array(0),
 		  array(1),
 		  array(1, 2),
 		  array('color' => 'red', 'item' => 'pen'),
-		
+
 		  // boolean values
 /*12*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null vlaues
 /*16*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*18*/	  new sample(),
-		
+
 		  // resource
 /*19*/	  $file_handle,
-		
+
 		  // undefined variable
 /*20*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*21*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/strtr_with_reference.phpt b/ext/standard/tests/strings/strtr_with_reference.phpt
index a28d1e7be90..21cdc203181 100644
--- a/ext/standard/tests/strings/strtr_with_reference.phpt
+++ b/ext/standard/tests/strings/strtr_with_reference.phpt
@@ -4,7 +4,7 @@ strtr() with references
 <?php
 
 $foo = 'foo';
-$arr = ['bar' => &$foo]; 
+$arr = ['bar' => &$foo];
 var_dump(strtr('foobar', $arr));
 
 ?>
diff --git a/ext/standard/tests/strings/strval_basic.phpt b/ext/standard/tests/strings/strval_basic.phpt
index c099058b99f..f727ebdf933 100644
--- a/ext/standard/tests/strings/strval_basic.phpt
+++ b/ext/standard/tests/strings/strval_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test strval() function : basic functionality 
+Test strval() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string strval  ( mixed $var  )
- * Description: Get the string value of a variable. 
+ * Description: Get the string value of a variable.
  * Source code: ext/standard/string.c
  */
 
@@ -21,19 +21,19 @@ $values = array(
 			// Simple strings
 /*1*/		"Hello World",
 			'Hello World',
-			
+
 			// String with control chars
 /*3*/		"String\nwith\ncontrol\ncharacters\r\n",
-			
+
 			// String with quotes
 /*4*/		"String with \"quotes\"",
-			
+
 			//Numeric String
 /*5*/		"123456",
-			
+
 			// Hexadecimal string
 /*6*/		"0xABC",
-			
+
 			//Heredoc String
 /*7*/		$simple_heredoc
 );
diff --git a/ext/standard/tests/strings/strval_error.phpt b/ext/standard/tests/strings/strval_error.phpt
index 629c003679b..94ed70263a1 100644
--- a/ext/standard/tests/strings/strval_error.phpt
+++ b/ext/standard/tests/strings/strval_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test strval() function : usage variations  - error conditions 
+Test strval() function : usage variations  - error conditions
 --FILE--
 <?php
 /* Prototype  : string strval  ( mixed $var  )
- * Description: Get the string value of a variable. 
+ * Description: Get the string value of a variable.
  * Source code: ext/standard/string.c
  */
 
@@ -13,7 +13,7 @@ error_reporting(E_ALL ^ E_NOTICE);
 
 class MyClass
 {
-	// no toString() method defined 
+	// no toString() method defined
 }
 
 $string  = "Hello";
diff --git a/ext/standard/tests/strings/strval_variation1.phpt b/ext/standard/tests/strings/strval_variation1.phpt
index 430a4362bde..2eb665631e2 100644
--- a/ext/standard/tests/strings/strval_variation1.phpt
+++ b/ext/standard/tests/strings/strval_variation1.phpt
@@ -3,7 +3,7 @@ Test strval() function : usage variations  - Pass different data types as strval
 --FILE--
 <?php
 /* Prototype  : string strval  ( mixed $var  )
- * Description: Get the string value of a variable. 
+ * Description: Get the string value of a variable.
  * Source code: ext/standard/string.c
  */
 
@@ -32,53 +32,53 @@ $values = array(
 		  1,
 		  12345,
 		  -12345,
-		  
+
 		  //Octal values
 /*5*/	  02,
 		  010,
 		  030071,
 		  -030071,
-		  
+
 		  //Hexadecimal values
 /*9*/	  0x0,
 		  0x1,
 		  0xABCD,
 		  -0xABCD,
-	
+
 	      // float data
 /*13*/    100.5,
 	      -100.5,
 	      100.1234567e10,
 	      100.7654321E-10,
 	      .5,
-	
+
 	      // array data
 /*18*/    array(),
 	      array('color' => 'red', 'item' => 'pen'),
-	
+
 	      // null data
 /*20*/    NULL,
 	      null,
-	
+
 	      // boolean data
 /*22*/    true,
 	      false,
 	      TRUE,
 	      FALSE,
-	
+
 	      // empty data
 /*26*/    "",
 	      '',
-	
+
 	      // object data
 /*28*/    new MyClass(),
-	      
+
 	      // resource
-/*29*/    $file_handle, 
-	
+/*29*/    $file_handle,
+
 	      // undefined data
 /*30*/    @$undefined_var,
-	
+
 	      // unset data
 /*31*/    @$unset_var,
 );
diff --git a/ext/standard/tests/strings/strval_variation2.phpt b/ext/standard/tests/strings/strval_variation2.phpt
index da74973c5e5..009a1902807 100644
--- a/ext/standard/tests/strings/strval_variation2.phpt
+++ b/ext/standard/tests/strings/strval_variation2.phpt
@@ -3,7 +3,7 @@ Test strval() function : usage variations  - Pass all valid char codes
 --FILE--
 <?php
 /* Prototype  : string strval  ( mixed $var  )
- * Description: Get the string value of a variable. 
+ * Description: Get the string value of a variable.
  * Source code: ext/standard/string.c
  */
 
diff --git a/ext/standard/tests/strings/substr.phpt b/ext/standard/tests/strings/substr.phpt
index f0fc06424b5..0901d2082e8 100644
Binary files a/ext/standard/tests/strings/substr.phpt and b/ext/standard/tests/strings/substr.phpt differ
diff --git a/ext/standard/tests/strings/substr_count_basic.phpt b/ext/standard/tests/strings/substr_count_basic.phpt
index c7c96fd55ba..d1af858db71 100644
--- a/ext/standard/tests/strings/substr_count_basic.phpt
+++ b/ext/standard/tests/strings/substr_count_basic.phpt
@@ -21,7 +21,7 @@ var_dump(substr_count($a, "bca", -200));
 var_dump(substr_count($a, "bca", -200, 50));
 var_dump(substr_count($a, "bca", -200, -50));
 
-echo "Done\n";	
+echo "Done\n";
 
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/strings/substr_count_error.phpt b/ext/standard/tests/strings/substr_count_error.phpt
index 881da391e65..b4cf3d05dfc 100644
--- a/ext/standard/tests/strings/substr_count_error.phpt
+++ b/ext/standard/tests/strings/substr_count_error.phpt
@@ -11,14 +11,14 @@ var_dump( substr_count() );
 
 /* more than expected no. of args */
 var_dump( substr_count($str, "t", 0, 15, 30) );
-	
+
 /* offset before start */
 var_dump(substr_count($str, "t", -20));
 
 /* offset > size of the string */
 var_dump(substr_count($str, "t", 25));
 
-/* Using offset and length to go beyond the size of the string: 
+/* Using offset and length to go beyond the size of the string:
    Warning message expected, as length+offset > length of string */
 var_dump( substr_count($str, "i", 5, 7) );
 
diff --git a/ext/standard/tests/strings/substr_count_variation_001.phpt b/ext/standard/tests/strings/substr_count_variation_001.phpt
index a9d538d17a6..2e70c734c56 100644
--- a/ext/standard/tests/strings/substr_count_variation_001.phpt
+++ b/ext/standard/tests/strings/substr_count_variation_001.phpt
@@ -19,8 +19,8 @@ var_dump( substr_count($str, "I", NULL) );
 var_dump( substr_count($str, "i", NULL, 10) );
 
 echo "\n-- overlapped substrings --\n";
-var_dump( substr_count("abcabcabcabcabc", "abca") ); 
-var_dump( substr_count("abcabcabcabcabc", "abca", 2) ); 
+var_dump( substr_count("abcabcabcabcabc", "abca") );
+var_dump( substr_count("abcabcabcabcabc", "abca", 2) );
 
 echo "\n-- complex strings containing other than 7-bit chars --\n";
 $str = chr(128).chr(129).chr(128).chr(256).chr(255).chr(254).chr(255);
@@ -49,7 +49,7 @@ var_dump(substr_count($str, "\0"));
 var_dump(substr_count($str, "\x000"));
 var_dump(substr_count($str, "0"));
 
-echo "Done\n";	
+echo "Done\n";
 
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/strings/substr_count_variation_002.phpt b/ext/standard/tests/strings/substr_count_variation_002.phpt
index f8b62bd837c..a3c8ecf5aba 100644
--- a/ext/standard/tests/strings/substr_count_variation_002.phpt
+++ b/ext/standard/tests/strings/substr_count_variation_002.phpt
@@ -31,7 +31,7 @@ var_dump(substr_count($str, "\0"));
 var_dump(substr_count($str, "\x000"));
 var_dump(substr_count($str, "0"));
 
-echo "Done\n";	
+echo "Done\n";
 
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/strings/substr_replace_error.phpt b/ext/standard/tests/strings/substr_replace_error.phpt
index 0a15035af2e..ac945349fe2 100644
--- a/ext/standard/tests/strings/substr_replace_error.phpt
+++ b/ext/standard/tests/strings/substr_replace_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test substr_replace() function : error conditions 
+Test substr_replace() function : error conditions
 --FILE--
 <?php
 /* Prototype  : mixed substr_replace  ( mixed $string  , string $replacement  , int $start  [, int $length  ] )
@@ -23,15 +23,15 @@ echo "\n-- Testing substr_replace() function with more than expected no. of argu
 var_dump(substr_replace($s1, "evening", 5, 7, true));
 
 echo "\n-- Testing substr_replace() function with start and length different types --\n";
-var_dump(substr_replace($s1, "evening", array(5))); 
-var_dump(substr_replace($s1, "evening", 5, array(8))); 
-  
+var_dump(substr_replace($s1, "evening", array(5)));
+var_dump(substr_replace($s1, "evening", 5, array(8)));
+
 echo "\n-- Testing substr_replace() function with start and length with a different number of elements --\n";
-var_dump(substr_replace($s1, "evening", array(5, 1), array(8))); 
+var_dump(substr_replace($s1, "evening", array(5, 1), array(8)));
 
 echo "\n-- Testing substr_replace() function with start and length as arrays but string not--\n";
-var_dump(substr_replace($s1, "evening", array(5), array(8))); 
-  
+var_dump(substr_replace($s1, "evening", array(5), array(8)));
+
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt
index dd52efd98e4..330bd015531 100644
Binary files a/ext/standard/tests/strings/trim1.phpt and b/ext/standard/tests/strings/trim1.phpt differ
diff --git a/ext/standard/tests/strings/trim_basic.phpt b/ext/standard/tests/strings/trim_basic.phpt
index 501b477420c..08f75846a59 100644
--- a/ext/standard/tests/strings/trim_basic.phpt
+++ b/ext/standard/tests/strings/trim_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test trim() function : basic functionality 
+Test trim() function : basic functionality
 --FILE--
 <?php
 
@@ -17,10 +17,10 @@ $binary = "\x0A\x0DExample string\x0A\x0D";
 echo "\n-- Trim string with all white space characters --\n";
 var_dump(trim($text));
 
-echo "\n-- Trim non-whitespace from a string --\n"; 
+echo "\n-- Trim non-whitespace from a string --\n";
 var_dump(trim($hello, "=!"));
 
-echo "\n-- Trim some non-white space characters from a string --\n"; 
+echo "\n-- Trim some non-white space characters from a string --\n";
 var_dump(trim($hello, "Hdle"));
 
 echo "\n-- Trim the ASCII control characters at the beginning of a string --\n";
diff --git a/ext/standard/tests/strings/trim_error.phpt b/ext/standard/tests/strings/trim_error.phpt
index 51dc848c9d0..e34cd144cd0 100644
--- a/ext/standard/tests/strings/trim_error.phpt
+++ b/ext/standard/tests/strings/trim_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test trim() function : error conditions 
+Test trim() function : error conditions
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/trim_variation1.phpt b/ext/standard/tests/strings/trim_variation1.phpt
index 4ef40c68018..cbbd5b9e4c1 100644
--- a/ext/standard/tests/strings/trim_variation1.phpt
+++ b/ext/standard/tests/strings/trim_variation1.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "  !---sample object---!  ";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $inputs =  array (
 		  256,
 		  2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/trim_variation2.phpt b/ext/standard/tests/strings/trim_variation2.phpt
index 11b2aaf1ccf..b4c03524044 100644
--- a/ext/standard/tests/strings/trim_variation2.phpt
+++ b/ext/standard/tests/strings/trim_variation2.phpt
@@ -18,7 +18,7 @@ unset($unset_var);
 class sample  {
   public function __toString() {
     return "  sample object  ";
-  } 
+  }
 }
 
 //getting the resource
@@ -34,36 +34,36 @@ $inputs =  array (
 		  256,
 		  2147483647,
 		  -2147483648,
-		
+
 		  // float values
 /*7*/	  10.5,
 		  -20.5,
 		  10.1234567e10,
-		
+
 		  // array values
 /*10*/	  array(),
 		  array(0),
 		  array(1, 2),
-		
+
 		  // boolean values
 /*13*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // null values
 /*17*/	  NULL,
 		  null,
-		
+
 		  // objects
 /*19*/	  new sample(),
-		
+
 		  // resource
 /*20*/	  $file_handle,
-		
+
 		  // undefined variable
 /*21*/	  @$undefined_var,
-		
+
 		  // unset variable
 /*22*/	  @$unset_var
 );
diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt
index 572d26ebd1b..66da7a90f37 100644
Binary files a/ext/standard/tests/strings/ucfirst.phpt and b/ext/standard/tests/strings/ucfirst.phpt differ
diff --git a/ext/standard/tests/strings/ucwords_basic.phpt b/ext/standard/tests/strings/ucwords_basic.phpt
index bba0d9bc4af..0ef6a850a92 100644
--- a/ext/standard/tests/strings/ucwords_basic.phpt
+++ b/ext/standard/tests/strings/ucwords_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test ucwords() function : basic functionality 
+Test ucwords() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string ucwords ( string $str )
@@ -31,7 +31,7 @@ $str_array = array(
  "testing\fucwords"
 );
 
-// loop through the $strings array to test ucwords on each element 
+// loop through the $strings array to test ucwords on each element
 $iteration = 1;
 for($index = 0; $index < count($str_array); $index++) {
   echo "-- Iteration $iteration --\n";
diff --git a/ext/standard/tests/strings/ucwords_error.phpt b/ext/standard/tests/strings/ucwords_error.phpt
index a01c688c4a5..7ada10c6293 100644
--- a/ext/standard/tests/strings/ucwords_error.phpt
+++ b/ext/standard/tests/strings/ucwords_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test ucwords() function : error conditions 
+Test ucwords() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string ucwords ( string $str )
diff --git a/ext/standard/tests/strings/ucwords_variation1.phpt b/ext/standard/tests/strings/ucwords_variation1.phpt
index 02edf051311..16044023534 100644
--- a/ext/standard/tests/strings/ucwords_variation1.phpt
+++ b/ext/standard/tests/strings/ucwords_variation1.phpt
@@ -8,7 +8,7 @@ Test ucwords() function : usage variations - unexpected input values
 */
 
 /*
- * Test ucwords() by passing different values including scalar and non scalar values 
+ * Test ucwords() by passing different values including scalar and non scalar values
 */
 
 echo "*** Testing ucwords() : usage variations ***\n";
@@ -36,7 +36,7 @@ $values =  array (
   12345,
   -2345,
 
-  // hex values 
+  // hex values
   0x10,
   0X20,
   0xAA,
@@ -77,12 +77,12 @@ $values =  array (
   NULL,
   null,
 
-  // hex in string 
+  // hex in string
   "0x123",
   '0x123',
   "0xFF12",
   "-0xFF12",
-  
+
   // undefined variable
   @$undefined_var,
 
diff --git a/ext/standard/tests/strings/ucwords_variation3.phpt b/ext/standard/tests/strings/ucwords_variation3.phpt
index e6f7c405ace..df6d6fd0151 100644
--- a/ext/standard/tests/strings/ucwords_variation3.phpt
+++ b/ext/standard/tests/strings/ucwords_variation3.phpt
@@ -29,7 +29,7 @@ $str_array = array(
   '"testing",ucword,"test"',
   '"t""t",test, t',
   '\'t \'t\',test',
-  
+
   // using other white spaces
   '\ttesting\ttesting\tucwords',
   'testing\rucwords testing ucwords',
@@ -41,7 +41,7 @@ $str_array = array(
   't@@#$% %test ^test &test *test +test -test',
   '!test ~test `test` =test= @test@test.com',
   '/test/r\test\ucwords\t\y\y\u\3 \yy\ /uu/',
-  
+
   //only special chars
   '!@#$%^&*()_+=-`~'
 );
diff --git a/ext/standard/tests/strings/ucwords_variation4.phpt b/ext/standard/tests/strings/ucwords_variation4.phpt
index 2e7092da73c..301b2f4284d 100644
--- a/ext/standard/tests/strings/ucwords_variation4.phpt
+++ b/ext/standard/tests/strings/ucwords_variation4.phpt
@@ -31,7 +31,7 @@ $str_array = array(
   "\'t \'t\',test",
   "Jack's pen",
   "P't'y 't it's ",
-  
+
   // using other white spaces
   "\ttesting\ttesting\tucwords",
   "\\ttesting\\ttesting\tucwords",
@@ -48,7 +48,7 @@ $str_array = array(
   "t@@#$% %test ^test &test *test +test -test",
   "!test ~test `test` =test= @test@test.com",
   "/test/r\test\\ucwords\t\y\y\\u\3 \yy\ /uu/",
-  
+
   //only special chars
   "!@#$%^&*()_+=-`~"
 );
diff --git a/ext/standard/tests/strings/unpack_error.phpt b/ext/standard/tests/strings/unpack_error.phpt
index 484366293b4..f04e4937729 100644
--- a/ext/standard/tests/strings/unpack_error.phpt
+++ b/ext/standard/tests/strings/unpack_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test unpack() function : error conditions 
+Test unpack() function : error conditions
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/utf8_decode_error.phpt b/ext/standard/tests/strings/utf8_decode_error.phpt
index 911cc15cfcb..49e9c19562a 100644
--- a/ext/standard/tests/strings/utf8_decode_error.phpt
+++ b/ext/standard/tests/strings/utf8_decode_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test utf8_decode() function : error conditions 
+Test utf8_decode() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto string utf8_decode(string data)
- * Description: Converts a UTF-8 encoded string to ISO-8859-1 
+ * Description: Converts a UTF-8 encoded string to ISO-8859-1
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing utf8_decode() : error conditions ***\n";
diff --git a/ext/standard/tests/strings/utf8_decode_variation1.phpt b/ext/standard/tests/strings/utf8_decode_variation1.phpt
index f564b87da02..63ccf7d7d12 100644
--- a/ext/standard/tests/strings/utf8_decode_variation1.phpt
+++ b/ext/standard/tests/strings/utf8_decode_variation1.phpt
@@ -3,9 +3,9 @@ Test utf8_decode() function : usage variations  - different types for data
 --FILE--
 <?php
 /* Prototype  : proto string utf8_decode(string data)
- * Description: Converts a UTF-8 encoded string to ISO-8859-1 
+ * Description: Converts a UTF-8 encoded string to ISO-8859-1
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing utf8_decode() : usage variations ***\n";
diff --git a/ext/standard/tests/strings/utf8_encode_error.phpt b/ext/standard/tests/strings/utf8_encode_error.phpt
index e12f0978b6b..e247c38fbbb 100644
--- a/ext/standard/tests/strings/utf8_encode_error.phpt
+++ b/ext/standard/tests/strings/utf8_encode_error.phpt
@@ -3,9 +3,9 @@ Test utf8_encode() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto string utf8_encode(string data)
- * Description: Encodes an ISO-8859-1 string to UTF-8 
+ * Description: Encodes an ISO-8859-1 string to UTF-8
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing utf8_encode() : error conditions ***\n";
diff --git a/ext/standard/tests/strings/utf8_encode_variation1.phpt b/ext/standard/tests/strings/utf8_encode_variation1.phpt
index fa4b79976e5..a06b8d869e1 100644
--- a/ext/standard/tests/strings/utf8_encode_variation1.phpt
+++ b/ext/standard/tests/strings/utf8_encode_variation1.phpt
@@ -3,9 +3,9 @@ Test utf8_encode() function : usage variations  - <type here specifics of this v
 --FILE--
 <?php
 /* Prototype  : proto string utf8_encode(string data)
- * Description: Encodes an ISO-8859-1 string to UTF-8 
+ * Description: Encodes an ISO-8859-1 string to UTF-8
  * Source code: ext/standard/string.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing utf8_encode() : usage variations ***\n";
diff --git a/ext/standard/tests/strings/uuencode.phpt b/ext/standard/tests/strings/uuencode.phpt
index 3671cd736ce..5a1f3d2a244 100644
--- a/ext/standard/tests/strings/uuencode.phpt
+++ b/ext/standard/tests/strings/uuencode.phpt
@@ -17,7 +17,7 @@ var_dump(convert_uudecode(substr($enc, 0, -10)));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: convert_uuencode() expects parameter 1 to be string, array given in %s on line %d
 bool(false)
 
diff --git a/ext/standard/tests/strings/vfprintf_basic.phpt b/ext/standard/tests/strings/vfprintf_basic.phpt
index 8189aaf0b07..ecdae30241d 100644
--- a/ext/standard/tests/strings/vfprintf_basic.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test vfprintf() function : basic functionality 
+Test vfprintf() function : basic functionality
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --INI--
@@ -7,9 +7,9 @@ precision=14
 --FILE--
 <?php
 /* Prototype  : int vfprintf(resource stream, string format, array args)
- * Description: Output a formatted string into a stream 
+ * Description: Output a formatted string into a stream
  * Source code: ext/standard/formatted_print.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function writeAndDump($fp, $format, $args)
diff --git a/ext/standard/tests/strings/vfprintf_basic2.phpt b/ext/standard/tests/strings/vfprintf_basic2.phpt
index 36d6577bbd2..db28f5fb70d 100644
--- a/ext/standard/tests/strings/vfprintf_basic2.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic2.phpt
@@ -28,13 +28,13 @@ if (!($fp = fopen($data_file, 'wt')))
    return;
 
 vfprintf($fp, $format1, $arg1);
-fprintf($fp, "\n"); 
+fprintf($fp, "\n");
 
 vfprintf($fp, $format2, $arg2);
-fprintf($fp, "\n"); 
+fprintf($fp, "\n");
 
 vfprintf($fp, $format3, $arg3);
-fprintf($fp, "\n"); 
+fprintf($fp, "\n");
 
 fclose($fp);
 print_r(file_get_contents($data_file));
diff --git a/ext/standard/tests/strings/vfprintf_basic3.phpt b/ext/standard/tests/strings/vfprintf_basic3.phpt
index 565079dc609..bd9efaa2e00 100644
--- a/ext/standard/tests/strings/vfprintf_basic3.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic3.phpt
@@ -29,22 +29,22 @@ if (!($fp = fopen($data_file, 'wt')))
    return;
 
 vfprintf($fp, $format1,$arg1);
-fprintf($fp, "\n"); 
+fprintf($fp, "\n");
 
 vfprintf($fp,$format11,$arg1);
-fprintf($fp, "\n"); 
+fprintf($fp, "\n");
 
 vfprintf($fp,$format2,$arg2);
-fprintf($fp, "\n"); 
+fprintf($fp, "\n");
 
 vfprintf($fp,$format22,$arg2);
-fprintf($fp, "\n"); 
+fprintf($fp, "\n");
 
 vfprintf($fp,$format3,$arg3);
-fprintf($fp, "\n"); 
+fprintf($fp, "\n");
 
 vfprintf($fp, $format33,$arg3);
-fprintf($fp, "\n"); 
+fprintf($fp, "\n");
 
 fclose($fp);
 print_r(file_get_contents($data_file));
diff --git a/ext/standard/tests/strings/vfprintf_basic5.phpt b/ext/standard/tests/strings/vfprintf_basic5.phpt
index 84fbe33f1ce..a7a7697dc2c 100644
--- a/ext/standard/tests/strings/vfprintf_basic5.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic5.phpt
@@ -22,7 +22,7 @@ $arg3 = array(65,66,67);
 $data_file = dirname(__FILE__) . '/vfprintf_basic5.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
-   
+
 vfprintf($fp, $format1,$arg1);
 fprintf($fp, "\n");
 
diff --git a/ext/standard/tests/strings/vfprintf_basic6.phpt b/ext/standard/tests/strings/vfprintf_basic6.phpt
index 6c1bbf02a22..332370b5def 100644
--- a/ext/standard/tests/strings/vfprintf_basic6.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic6.phpt
@@ -23,7 +23,7 @@ $arg3 = array(1000,2000,3000);
 $data_file = dirname(__FILE__) . '/vfprintf_basic6.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
-   
+
 vfprintf($fp, $format1,$arg1);
 fprintf($fp, "\n");
 
diff --git a/ext/standard/tests/strings/vfprintf_basic7.phpt b/ext/standard/tests/strings/vfprintf_basic7.phpt
index f4c11edc157..f235c1cd6f1 100644
--- a/ext/standard/tests/strings/vfprintf_basic7.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic7.phpt
@@ -26,7 +26,7 @@ $arg3 = array(-1111,-1234567,-2345432);
 $data_file = dirname(__FILE__) . '/vfprintf_basic7.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
-   
+
 vfprintf($fp, $format1,$arg1);
 fprintf($fp, "\n");
 
diff --git a/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt
index 14cd31ddd2c..b5526a652f2 100644
--- a/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt
@@ -26,7 +26,7 @@ $arg3 = array(-1111,-1234567,-2345432);
 $data_file = dirname(__FILE__) . '/vfprintf_basic7_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
-   
+
 vfprintf($fp, $format1,$arg1);
 fprintf($fp, "\n");
 
diff --git a/ext/standard/tests/strings/vfprintf_basic8.phpt b/ext/standard/tests/strings/vfprintf_basic8.phpt
index aad883c6e99..ed9d23c2ad7 100644
--- a/ext/standard/tests/strings/vfprintf_basic8.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic8.phpt
@@ -22,7 +22,7 @@ $arg3 = array(021,0347,0567);
 $data_file = dirname(__FILE__) . '/vfprintf_basic8.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
-   
+
 vfprintf($fp, $format1,$arg1);
 fprintf($fp, "\n");
 
diff --git a/ext/standard/tests/strings/vfprintf_error1.phpt b/ext/standard/tests/strings/vfprintf_error1.phpt
index 8ef086d353d..c3c869bb4dd 100644
--- a/ext/standard/tests/strings/vfprintf_error1.phpt
+++ b/ext/standard/tests/strings/vfprintf_error1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test vfprintf() function : error conditions (more than expected arguments) 
+Test vfprintf() function : error conditions (more than expected arguments)
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --INI--
@@ -7,9 +7,9 @@ precision=14
 --FILE--
 <?php
 /* Prototype  : int vfprintf(resource stream, string format, array args)
- * Description: Output a formatted string into a stream 
+ * Description: Output a formatted string into a stream
  * Source code: ext/standard/formatted_print.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 // Open handle
diff --git a/ext/standard/tests/strings/vfprintf_error2.phpt b/ext/standard/tests/strings/vfprintf_error2.phpt
index bcf7e27690a..1eb89694ec9 100644
--- a/ext/standard/tests/strings/vfprintf_error2.phpt
+++ b/ext/standard/tests/strings/vfprintf_error2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test vfprintf() function : error conditions (less than expected arguments) 
+Test vfprintf() function : error conditions (less than expected arguments)
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --INI--
@@ -7,9 +7,9 @@ precision=14
 --FILE--
 <?php
 /* Prototype  : int vfprintf(resource stream, string format, array args)
- * Description: Output a formatted string into a stream 
+ * Description: Output a formatted string into a stream
  * Source code: ext/standard/formatted_print.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 // Open handle
diff --git a/ext/standard/tests/strings/vfprintf_error3.phpt b/ext/standard/tests/strings/vfprintf_error3.phpt
index 5a207806724..dbc0d08897c 100644
--- a/ext/standard/tests/strings/vfprintf_error3.phpt
+++ b/ext/standard/tests/strings/vfprintf_error3.phpt
@@ -7,9 +7,9 @@ precision=14
 --FILE--
 <?php
 /* Prototype  : int vfprintf(resource stream, string format, array args)
- * Description: Output a formatted string into a stream 
+ * Description: Output a formatted string into a stream
  * Source code: ext/standard/formatted_print.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 // Open handle
diff --git a/ext/standard/tests/strings/vfprintf_error4.phpt b/ext/standard/tests/strings/vfprintf_error4.phpt
index 131b0477c45..589d82c3d60 100644
--- a/ext/standard/tests/strings/vfprintf_error4.phpt
+++ b/ext/standard/tests/strings/vfprintf_error4.phpt
@@ -7,9 +7,9 @@ precision=14
 --FILE--
 <?php
 /* Prototype  : int vfprintf(resource stream, string format, array args)
- * Description: Output a formatted string into a stream 
+ * Description: Output a formatted string into a stream
  * Source code: ext/standard/formatted_print.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 // Open handle
diff --git a/ext/standard/tests/strings/vfprintf_variation1.phpt b/ext/standard/tests/strings/vfprintf_variation1.phpt
index 316e55ce2e7..6ba79341b25 100644
--- a/ext/standard/tests/strings/vfprintf_variation1.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test vfprintf() function : variation functionality 
+Test vfprintf() function : variation functionality
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --INI--
@@ -7,9 +7,9 @@ precision=14
 --FILE--
 <?php
 /* Prototype  : int vfprintf(resource stream, string format, array args)
- * Description: Output a formatted string into a stream 
+ * Description: Output a formatted string into a stream
  * Source code: ext/standard/formatted_print.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing vfprintf() : variation functionality ***\n";
diff --git a/ext/standard/tests/strings/vfprintf_variation10.phpt b/ext/standard/tests/strings/vfprintf_variation10.phpt
index bb00e70389e..fac24dc7a91 100644
Binary files a/ext/standard/tests/strings/vfprintf_variation10.phpt and b/ext/standard/tests/strings/vfprintf_variation10.phpt differ
diff --git a/ext/standard/tests/strings/vfprintf_variation12.phpt b/ext/standard/tests/strings/vfprintf_variation12.phpt
index f0fa354ea63..51ab97e8bf8 100644
--- a/ext/standard/tests/strings/vfprintf_variation12.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation12.phpt
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 echo "*** Testing vfprintf() : octal formats and non-octal values ***\n";
 
 // defining array of octal formats
-$formats = 
+$formats =
   '%o %+o %-o 
    %lo %Lo %4o %-4o
    %10.4o %-10.4o %.4o 
@@ -64,7 +64,7 @@ $args_array = array(
          true, false, TRUE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 /* creating dumping file */
@@ -86,7 +86,7 @@ print_r(file_get_contents($data_file));
 echo "\n";
 
 unlink($data_file);
- 
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt
index fe786d3f495..ffd232355cf 100644
--- a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 echo "*** Testing vfprintf() : octal formats and non-octal values ***\n";
 
 // defining array of octal formats
-$formats = 
+$formats =
   '%o %+o %-o 
    %lo %Lo %4o %-4o
    %10.4o %-10.4o %.4o 
@@ -64,7 +64,7 @@ $args_array = array(
          true, false, TRUE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 /* creating dumping file */
@@ -86,7 +86,7 @@ print_r(file_get_contents($data_file));
 echo "\n";
 
 unlink($data_file);
- 
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/strings/vfprintf_variation14.phpt b/ext/standard/tests/strings/vfprintf_variation14.phpt
index 0173a27fb70..ea2957a18c0 100644
--- a/ext/standard/tests/strings/vfprintf_variation14.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation14.phpt
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 echo "*** Testing vfprintf() : hexa formats and non-hexa values ***\n";
 
 // defining array of different hexa formats
-$formats = 
+$formats =
   '%x %+x %-x 
    %lx %Lx %4x %-4x
    %10.4x %-10.4x %.4x 
@@ -64,7 +64,7 @@ $args_array = array(
          true, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 /* creating dumping file */
diff --git a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt
index fb34befd3cc..9916967b3f0 100644
--- a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 echo "*** Testing vfprintf() : hexa formats and non-hexa values ***\n";
 
 // defining array of different hexa formats
-$formats = 
+$formats =
   '%x %+x %-x 
    %lx %Lx %4x %-4x
    %10.4x %-10.4x %.4x 
@@ -64,7 +64,7 @@ $args_array = array(
          true, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 /* creating dumping file */
diff --git a/ext/standard/tests/strings/vfprintf_variation15.phpt b/ext/standard/tests/strings/vfprintf_variation15.phpt
index 19e319a557d..b513227836c 100644
--- a/ext/standard/tests/strings/vfprintf_variation15.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation15.phpt
@@ -20,9 +20,9 @@ echo "*** Testing vfprintf() : unsigned formats and unsigned values ***\n";
 
 // defining array of unsigned formats
 $formats = array(
-  '%u %+u %-u', 
+  '%u %+u %-u',
   '%lu %Lu %4u %-4u',
-  '%10.4u %-10.4u %.4u', 
+  '%10.4u %-10.4u %.4u',
   '%\'#2u %\'2u %\'$2u %\'_2u',
   '%3$u %4$u %1$u %2$u'
 );
@@ -55,7 +55,7 @@ fclose($fp);
 print_r(file_get_contents($data_file));
 echo "\n";
 
-unlink($data_file); 
+unlink($data_file);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt
index 7bb0d150e01..b31ffd3eb45 100644
--- a/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt
@@ -20,9 +20,9 @@ echo "*** Testing vfprintf() : unsigned formats and unsigned values ***\n";
 
 // defining array of unsigned formats
 $formats = array(
-  '%u %+u %-u', 
+  '%u %+u %-u',
   '%lu %Lu %4u %-4u',
-  '%10.4u %-10.4u %.4u', 
+  '%10.4u %-10.4u %.4u',
   '%\'#2u %\'2u %\'$2u %\'_2u',
   '%3$u %4$u %1$u %2$u'
 );
@@ -55,7 +55,7 @@ fclose($fp);
 print_r(file_get_contents($data_file));
 echo "\n";
 
-unlink($data_file); 
+unlink($data_file);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/vfprintf_variation16.phpt b/ext/standard/tests/strings/vfprintf_variation16.phpt
index 4995ab02a42..254bd8c2c1c 100644
--- a/ext/standard/tests/strings/vfprintf_variation16.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation16.phpt
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 echo "*** Testing vfprintf() : unsigned formats and signed & other types of values ***\n";
 
 // defining array of unsigned formats
-$formats = 
+$formats =
   '%u %+u %-u 
    %lu %Lu %4u %-4u
    %10.4u %-10.4u %.4u 
@@ -57,9 +57,9 @@ $args_array = array(
          true, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
- 
+
 /* creating dumping file */
 $data_file = dirname(__FILE__) . '/vfprintf_variation16.txt';
 if (!($fp = fopen($data_file, 'wt')))
@@ -78,7 +78,7 @@ fclose($fp);
 print_r(file_get_contents($data_file));
 echo "\n";
 
-unlink($data_file);  
+unlink($data_file);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt
index 16d06240180..0819cc0e5f9 100644
--- a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 echo "*** Testing vfprintf() : unsigned formats and signed & other types of values ***\n";
 
 // defining array of unsigned formats
-$formats = 
+$formats =
   '%u %+u %-u 
    %lu %Lu %4u %-4u
    %10.4u %-10.4u %.4u 
@@ -57,9 +57,9 @@ $args_array = array(
          true, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
- 
+
 /* creating dumping file */
 $data_file = dirname(__FILE__) . '/vfprintf_variation16_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
@@ -78,7 +78,7 @@ fclose($fp);
 print_r(file_get_contents($data_file));
 echo "\n";
 
-unlink($data_file);  
+unlink($data_file);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/vfprintf_variation17.phpt b/ext/standard/tests/strings/vfprintf_variation17.phpt
index 6c17b801f6f..545ae6d43d6 100644
--- a/ext/standard/tests/strings/vfprintf_variation17.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation17.phpt
@@ -16,9 +16,9 @@ echo "*** Testing vfprintf() : scientific formats and scientific values ***\n";
 
 // defining array of scientific formats
 $formats = array(
-  '%e %+e %-e', 
+  '%e %+e %-e',
   '%le %Le %4e %-4e',
-  '%10.4e %-10.4e %.4e', 
+  '%10.4e %-10.4e %.4e',
   '%\'#20e %\'20e %\'$20e %\'_20e',
   '%3$e %4$e %1$e %2$e'
 );
@@ -37,7 +37,7 @@ $args_array = array(
 $data_file = dirname(__FILE__) . '/vfprintf_variation17.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
-   
+
 // looping to test vfprintf() with different scientific formats from the above $format array
 // and with signed and other types of  values from the above $args_array array
 $counter = 1;
@@ -51,7 +51,7 @@ fclose($fp);
 print_r(file_get_contents($data_file));
 echo "\n";
 
-unlink($data_file); 
+unlink($data_file);
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/strings/vfprintf_variation18.phpt b/ext/standard/tests/strings/vfprintf_variation18.phpt
index 5467753dc0a..3d0d8104427 100644
--- a/ext/standard/tests/strings/vfprintf_variation18.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation18.phpt
@@ -15,7 +15,7 @@ Test vfprintf() function : usage variations - scientific formats with non-scient
 echo "*** Testing vfprintf() : scientific formats and non-scientific values ***\n";
 
 // defining array of non-scientific formats
-$formats = 
+$formats =
   '%e %+e %-e 
    %le %Le %4e %-4e
    %10.4e %-10.4e %04e %04.4e
@@ -53,14 +53,14 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 /* creating dumping file */
 $data_file = dirname(__FILE__) . '/vfprintf_variation18.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
-   
+
 // looping to test vfprintf() with different scientific formats from the above $format array
 // and with non-scientific values from the above $args_array array
 $counter = 1;
@@ -74,7 +74,7 @@ fclose($fp);
 print_r(file_get_contents($data_file));
 echo "\n";
 
-unlink($data_file); 
+unlink($data_file);
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/strings/vfprintf_variation19.phpt b/ext/standard/tests/strings/vfprintf_variation19.phpt
index b2fbdd88cf7..19aac7738bb 100644
--- a/ext/standard/tests/strings/vfprintf_variation19.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation19.phpt
@@ -49,7 +49,7 @@ $args_array = array(
 $data_file = dirname(__FILE__) . '/vfprintf_variation19.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
-   
+
 // looping to test vfprintf() with different scientific formats from the above $format array
 // and with non-scientific values from the above $args_array array
 $counter = 1;
@@ -63,7 +63,7 @@ fclose($fp);
 print_r(file_get_contents($data_file));
 echo "\n";
 
-unlink($data_file); 
+unlink($data_file);
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt
index 8153ce81297..8ad2df0947e 100644
--- a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt
@@ -49,7 +49,7 @@ $args_array = array(
 $data_file = dirname(__FILE__) . '/vfprintf_variation19_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
-   
+
 // looping to test vfprintf() with different scientific formats from the above $format array
 // and with non-scientific values from the above $args_array array
 $counter = 1;
@@ -63,7 +63,7 @@ fclose($fp);
 print_r(file_get_contents($data_file));
 echo "\n";
 
-unlink($data_file); 
+unlink($data_file);
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/strings/vfprintf_variation20.phpt b/ext/standard/tests/strings/vfprintf_variation20.phpt
index 48fea341edd..3bc9bf6b29a 100644
--- a/ext/standard/tests/strings/vfprintf_variation20.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation20.phpt
@@ -41,44 +41,44 @@ $values = array(
 		  1,
 		  12345,
 		  -2345,
-		
+
 		  // float data
 /*5*/	  10.5,
 		  -10.5,
 		  10.1234567e10,
 		  10.7654321E-10,
 		  .5,
-		
+
 		  // array data
 /*10*/	  array(),
 		  array(0),
 		  array(1),
 		  array(1,2),
 		  array('color' => 'red', 'item' => 'pen'),
-		
+
 		  // null data
 /*15*/	  NULL,
 		  null,
-		
+
 		  // boolean data
 /*17*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // empty data
 /*21*/	  "",
 		  '',
-		
+
 		  // object data
 /*23*/	  new sample(),
-		
+
 		  // undefined data
 /*24*/	  @$undefined_var,
-		
+
 		  // unset data
 /*25*/	  @$unset_var,
-		 
+
 		  // resource data
 /*26*/	  $file_handle
 );
diff --git a/ext/standard/tests/strings/vfprintf_variation21.phpt b/ext/standard/tests/strings/vfprintf_variation21.phpt
index 09bf703957e..5d8c63e2077 100644
--- a/ext/standard/tests/strings/vfprintf_variation21.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation21.phpt
@@ -41,41 +41,41 @@ $values = array(
 		  1,
 		  12345,
 		  -2345,
-		
+
 		  // float data
 /*5*/	  10.5,
 		  -10.5,
 		  10.1234567e10,
 		  10.7654321E-10,
 		  .5,
-		
+
 		  // null data
 /*10*/	  NULL,
 		  null,
-		
+
 		  // boolean data
 /*12*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // empty data
 /*16*/	  "",
 		  '',
-		
+
 		  // string data
 /*18*/	  "string",
 		  'string',
-		
+
 		  // object data
 /*20*/	  new sample(),
-		
+
 		  // undefined data
 /*21*/	  @$undefined_var,
-		
+
 		  // unset data
 /*22*/	  @$unset_var,
-		
+
 		  // resource data
 /*23*/	  $file_handle
 );
diff --git a/ext/standard/tests/strings/vfprintf_variation4.phpt b/ext/standard/tests/strings/vfprintf_variation4.phpt
index 642f35c46a7..55bfd465bb8 100644
--- a/ext/standard/tests/strings/vfprintf_variation4.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation4.phpt
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 echo "*** Testing vfprintf() : int formats and non-integer values ***\n";
 
 // defining array of int formats
-$formats = 
+$formats =
   '%d %+d %-d 
    %ld %Ld %4d %-4d
    %10.4d %-10.4d %.4d %04.4d
@@ -57,7 +57,7 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 
diff --git a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt
index 6bf814003a3..1bf0861c0f7 100644
--- a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 echo "*** Testing vfprintf() : int formats and non-integer values ***\n";
 
 // defining array of int formats
-$formats = 
+$formats =
   '%d %+d %-d 
    %ld %Ld %4d %-4d
    %10.4d %-10.4d %.4d %04.4d
@@ -57,7 +57,7 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 
diff --git a/ext/standard/tests/strings/vfprintf_variation6.phpt b/ext/standard/tests/strings/vfprintf_variation6.phpt
index b5b82bbc62b..9194d848666 100644
--- a/ext/standard/tests/strings/vfprintf_variation6.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation6.phpt
@@ -15,7 +15,7 @@ Test vfprintf() function : usage variations - float formats with non-float value
 echo "*** Testing vfprintf() : float formats and non-float values ***\n";
 
 // defining array of float formats
-$formats = 
+$formats =
   '%f %+f %-f 
    %lf %Lf %4f %-4f
    %10.4f %-10.4f %04f %04.4f
@@ -53,7 +53,7 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 /* creating dumping file */
diff --git a/ext/standard/tests/strings/vfprintf_variation8.phpt b/ext/standard/tests/strings/vfprintf_variation8.phpt
index a72e260e09b..036c52b04ad 100644
--- a/ext/standard/tests/strings/vfprintf_variation8.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation8.phpt
@@ -17,7 +17,7 @@ error_reporting(E_ALL & ~E_NOTICE);
 echo "*** Testing vfprintf() : string formats and non-string values ***\n";
 
 // defining array of string formats
-$formats = 
+$formats =
   '%s %+s %-s 
    %ls %Ls %4s %-4s
    %10.4s %-10.4s %04s %04.4s
@@ -34,7 +34,7 @@ $args_array = array(
         2.1234567e10, +2.7654321e10, -2.7654321e10,
         12345.780, 12.000000011111, -12.00000111111, -123456.234,
         3.33, +4.44, 1.11,-2.22 ),
-  
+
  // array of int values
  array(2, -2, +2,
        123456, 123456234, -12346789, +12346789,
@@ -56,7 +56,7 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 /* creating dumping file */
@@ -78,7 +78,7 @@ print_r(file_get_contents($data_file));
 echo "\n";
 
 unlink($data_file);
- 
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/ext/standard/tests/strings/vfprintf_variation9.phpt b/ext/standard/tests/strings/vfprintf_variation9.phpt
index 8481b41adeb..6f5c7dc6e6a 100644
Binary files a/ext/standard/tests/strings/vfprintf_variation9.phpt and b/ext/standard/tests/strings/vfprintf_variation9.phpt differ
diff --git a/ext/standard/tests/strings/vprintf_basic1.phpt b/ext/standard/tests/strings/vprintf_basic1.phpt
index f694155b8fc..e550ea1c8d0 100644
--- a/ext/standard/tests/strings/vprintf_basic1.phpt
+++ b/ext/standard/tests/strings/vprintf_basic1.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - string format
 --FILE--
 <?php
 /* Prototype  : int vprintf(string $format , array $args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vprintf_basic2.phpt b/ext/standard/tests/strings/vprintf_basic2.phpt
index cdf6c2d83f5..854d6eaeee6 100644
--- a/ext/standard/tests/strings/vprintf_basic2.phpt
+++ b/ext/standard/tests/strings/vprintf_basic2.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - integer format
 --FILE--
 <?php
 /* Prototype  : string vprintf(string $format , array $args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vprintf_basic3.phpt b/ext/standard/tests/strings/vprintf_basic3.phpt
index 966ea56f716..616399eed7a 100644
--- a/ext/standard/tests/strings/vprintf_basic3.phpt
+++ b/ext/standard/tests/strings/vprintf_basic3.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - float format
 --FILE--
 <?php
 /* Prototype  : string vprintf(string $format , array $args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vprintf_basic4.phpt b/ext/standard/tests/strings/vprintf_basic4.phpt
index 89494e12176..d8cfa80452b 100644
--- a/ext/standard/tests/strings/vprintf_basic4.phpt
+++ b/ext/standard/tests/strings/vprintf_basic4.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - bool format
 --FILE--
 <?php
 /* Prototype  : string vprintf(string $format , array $args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vprintf_basic5.phpt b/ext/standard/tests/strings/vprintf_basic5.phpt
index e999417bf82..67922eaa5e8 100644
--- a/ext/standard/tests/strings/vprintf_basic5.phpt
+++ b/ext/standard/tests/strings/vprintf_basic5.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - char format
 --FILE--
 <?php
 /* Prototype  : string vprintf(string $format , array $args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vprintf_basic6.phpt b/ext/standard/tests/strings/vprintf_basic6.phpt
index 7f1bbd1ddec..9ddead58c41 100644
--- a/ext/standard/tests/strings/vprintf_basic6.phpt
+++ b/ext/standard/tests/strings/vprintf_basic6.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - exponential format
 --FILE--
 <?php
 /* Prototype  : string vprintf(string $format , array $args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vprintf_basic7.phpt b/ext/standard/tests/strings/vprintf_basic7.phpt
index fdf90fd47e9..ab1ea6ab3ee 100644
--- a/ext/standard/tests/strings/vprintf_basic7.phpt
+++ b/ext/standard/tests/strings/vprintf_basic7.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string $format , aaray $args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vprintf_basic7_64bit.phpt
index 32aa338897f..163e1388a9e 100644
--- a/ext/standard/tests/strings/vprintf_basic7_64bit.phpt
+++ b/ext/standard/tests/strings/vprintf_basic7_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string $format , aaray $args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vprintf_basic8.phpt b/ext/standard/tests/strings/vprintf_basic8.phpt
index d5f6e222d0e..6fa89a1ea28 100644
--- a/ext/standard/tests/strings/vprintf_basic8.phpt
+++ b/ext/standard/tests/strings/vprintf_basic8.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - octal format
 --FILE--
 <?php
 /* Prototype  : string vprintf(string $format , array $args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -20,15 +20,15 @@ $arg3 = array(021,0347,0567);
 
 $result = vprintf($format1,$arg1);
 echo "\n";
-var_dump($result); 
+var_dump($result);
 
 $result = vprintf($format2,$arg2);
 echo "\n";
-var_dump($result); 
+var_dump($result);
 
 $result = vprintf($format3,$arg3);
 echo "\n";
-var_dump($result); 
+var_dump($result);
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/vprintf_basic9.phpt b/ext/standard/tests/strings/vprintf_basic9.phpt
index 4aa12a080f5..8521d82ec4a 100644
--- a/ext/standard/tests/strings/vprintf_basic9.phpt
+++ b/ext/standard/tests/strings/vprintf_basic9.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : basic functionality - hexadecimal format
 --FILE--
 <?php
 /* Prototype  : string vprintf(string $format , array $args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vprintf_error.phpt b/ext/standard/tests/strings/vprintf_error.phpt
index 91fc1bdc327..cf25257fc54 100644
--- a/ext/standard/tests/strings/vprintf_error.phpt
+++ b/ext/standard/tests/strings/vprintf_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test vprintf() function : error conditions 
+Test vprintf() function : error conditions
 --FILE--
 <?php
 /* Prototype  : int vprintf(string $format , array $args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
  */
 
@@ -19,7 +19,7 @@ echo "\n-- Testing vprintf() function with Zero arguments --\n";
 var_dump( vprintf() );
 
 echo "\n-- Testing vprintf() function with less than expected no. of arguments --\n";
-var_dump( vprintf($format) );  
+var_dump( vprintf($format) );
 
 echo "\n-- testing vprintf() function with more than expected no. of arguments --\n";
 var_dump( vprintf($format, $args, $extra_arg) );
diff --git a/ext/standard/tests/strings/vprintf_variation1.phpt b/ext/standard/tests/strings/vprintf_variation1.phpt
index 18f314f2840..5cf50105ab0 100644
--- a/ext/standard/tests/strings/vprintf_variation1.phpt
+++ b/ext/standard/tests/strings/vprintf_variation1.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : usage variations - unexpected values for the format ar
 --FILE--
 <?php
 /* Prototype  : string vprintf(string $format, array $args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -41,44 +41,44 @@ $values = array(
 		  1,
 		  12345,
 		  -2345,
-		
+
 		  // float data
 /*5*/	  10.5,
 		  -10.5,
 		  10.1234567e10,
 		  10.7654321E-10,
 		  .5,
-		
+
 		  // array data
 /*10*/	  array(),
 		  array(0),
 		  array(1),
 		  array(1,2),
 		  array('color' => 'red', 'item' => 'pen'),
-		
+
 		  // null data
 /*15*/	  NULL,
 		  null,
-		
+
 		  // boolean data
 /*17*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // empty data
 /*21*/	  "",
 		  '',
-		
+
 		  // object data
 /*23*/	  new sample(),
-		
+
 		  // undefined data
 /*24*/	  @$undefined_var,
-		
+
 		  // unset data
 /*25*/	  @$unset_var,
-		 
+
 		  // resource data
 /*26*/	  $file_handle
 );
@@ -90,9 +90,9 @@ foreach($values as $value) {
   echo "\n -- Iteration $counter --\n";
   $result = vprintf($value,$args);
   echo "\n";
-  var_dump($result); 
+  var_dump($result);
   $counter++;
-    
+
 };
 
 // closing the resource
diff --git a/ext/standard/tests/strings/vprintf_variation10.phpt b/ext/standard/tests/strings/vprintf_variation10.phpt
index d63738e723c..747b8c40c56 100644
Binary files a/ext/standard/tests/strings/vprintf_variation10.phpt and b/ext/standard/tests/strings/vprintf_variation10.phpt differ
diff --git a/ext/standard/tests/strings/vprintf_variation11.phpt b/ext/standard/tests/strings/vprintf_variation11.phpt
index 4207bc294e8..99f5c803868 100644
--- a/ext/standard/tests/strings/vprintf_variation11.phpt
+++ b/ext/standard/tests/strings/vprintf_variation11.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -48,10 +48,10 @@ $args_array = array(
 // and with octal values from the above $args_array array
 $counter = 1;
 foreach($formats as $format) {
-  echo "\n-- Iteration $counter --\n";   
+  echo "\n-- Iteration $counter --\n";
   $result = vprintf($format, $args_array[$counter-1]);
   echo "\n";
-  var_dump($result); 
+  var_dump($result);
   $counter++;
 }
 
diff --git a/ext/standard/tests/strings/vprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vprintf_variation11_64bit.phpt
index 039006fdc68..22e1d83840c 100644
--- a/ext/standard/tests/strings/vprintf_variation11_64bit.phpt
+++ b/ext/standard/tests/strings/vprintf_variation11_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -48,10 +48,10 @@ $args_array = array(
 // and with octal values from the above $args_array array
 $counter = 1;
 foreach($formats as $format) {
-  echo "\n-- Iteration $counter --\n";   
+  echo "\n-- Iteration $counter --\n";
   $result = vprintf($format, $args_array[$counter-1]);
   echo "\n";
-  var_dump($result); 
+  var_dump($result);
   $counter++;
 }
 
diff --git a/ext/standard/tests/strings/vprintf_variation12.phpt b/ext/standard/tests/strings/vprintf_variation12.phpt
index 99938502d5d..a4c6139144a 100644
--- a/ext/standard/tests/strings/vprintf_variation12.phpt
+++ b/ext/standard/tests/strings/vprintf_variation12.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 echo "*** Testing vprintf() : octal formats and non-octal values ***\n";
 
 // defining array of octal formats
-$formats = 
+$formats =
   '%o %+o %-o 
    %lo %Lo %4o %-4o
    %10.4o %-10.4o %.4o 
@@ -64,16 +64,16 @@ $args_array = array(
          true, false, TRUE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
- 
+
 // looping to test vprintf() with different octal formats from the above $format array
 // and with non-octal values from the above $args_array array
 $counter = 1;
 foreach($args_array as $args) {
   echo "\n-- Iteration $counter --\n";
   $result = vprintf($formats, $args);
-  echo "\n"; 
+  echo "\n";
   var_dump($result);
   $counter++;
 }
diff --git a/ext/standard/tests/strings/vprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vprintf_variation12_64bit.phpt
index 32dc01bfc1e..4839484ef10 100644
--- a/ext/standard/tests/strings/vprintf_variation12_64bit.phpt
+++ b/ext/standard/tests/strings/vprintf_variation12_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 echo "*** Testing vprintf() : octal formats and non-octal values ***\n";
 
 // defining array of octal formats
-$formats = 
+$formats =
   '%o %+o %-o 
    %lo %Lo %4o %-4o
    %10.4o %-10.4o %.4o 
@@ -64,9 +64,9 @@ $args_array = array(
          true, false, TRUE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
- 
+
 // looping to test vprintf() with different octal formats from the above $format array
 // and with non-octal values from the above $args_array array
 $counter = 1;
diff --git a/ext/standard/tests/strings/vprintf_variation13.phpt b/ext/standard/tests/strings/vprintf_variation13.phpt
index 240db721e8a..6f9ab49b98d 100644
--- a/ext/standard/tests/strings/vprintf_variation13.phpt
+++ b/ext/standard/tests/strings/vprintf_variation13.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -48,7 +48,7 @@ $args_array = array(
 // and with octal values from the above $args_array array
 $counter = 1;
 foreach($formats as $format) {
-  echo "\n-- Iteration $counter --\n";   
+  echo "\n-- Iteration $counter --\n";
   $result = vprintf($format, $args_array[$counter-1]);
   echo "\n";
   var_dump($result);
diff --git a/ext/standard/tests/strings/vprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vprintf_variation13_64bit.phpt
index 06d2bec26df..af5a76eded6 100644
--- a/ext/standard/tests/strings/vprintf_variation13_64bit.phpt
+++ b/ext/standard/tests/strings/vprintf_variation13_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -48,7 +48,7 @@ $args_array = array(
 // and with octal values from the above $args_array array
 $counter = 1;
 foreach($formats as $format) {
-  echo "\n-- Iteration $counter --\n";   
+  echo "\n-- Iteration $counter --\n";
   $result = vprintf($format, $args_array[$counter-1]);
   echo "\n";
   var_dump($result);
diff --git a/ext/standard/tests/strings/vprintf_variation14.phpt b/ext/standard/tests/strings/vprintf_variation14.phpt
index bbb15e149ad..830b7f8e15e 100644
--- a/ext/standard/tests/strings/vprintf_variation14.phpt
+++ b/ext/standard/tests/strings/vprintf_variation14.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 echo "*** Testing vprintf() : hexa formats and non-hexa values ***\n";
 
 // defining array of different hexa formats
-$formats = 
+$formats =
   '%x %+x %-x 
    %lx %Lx %4x %-4x
    %10.4x %-10.4x %.4x 
@@ -64,12 +64,12 @@ $args_array = array(
          true, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 // looping to test vprintf() with different hexa formats from the above $format array
 // and with non-hexa values from the above $args_array array
- 
+
 $counter = 1;
 foreach($args_array as $args) {
   echo "\n-- Iteration $counter --\n";
diff --git a/ext/standard/tests/strings/vprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vprintf_variation14_64bit.phpt
index 51b2f477b84..74b57f4ae89 100644
--- a/ext/standard/tests/strings/vprintf_variation14_64bit.phpt
+++ b/ext/standard/tests/strings/vprintf_variation14_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 echo "*** Testing vprintf() : hexa formats and non-hexa values ***\n";
 
 // defining array of different hexa formats
-$formats = 
+$formats =
   '%x %+x %-x 
    %lx %Lx %4x %-4x
    %10.4x %-10.4x %.4x 
@@ -64,18 +64,18 @@ $args_array = array(
          true, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 // looping to test vprintf() with different hexa formats from the above $format array
 // and with non-hexa values from the above $args_array array
- 
+
 $counter = 1;
 foreach($args_array as $args) {
   echo "\n-- Iteration $counter --\n";
   $result = vprintf($formats, $args);
   echo "\n";
-  var_dump($result); 
+  var_dump($result);
   $counter++;
 }
 
diff --git a/ext/standard/tests/strings/vprintf_variation15.phpt b/ext/standard/tests/strings/vprintf_variation15.phpt
index 97b1bc5c642..d27bb6270ad 100644
--- a/ext/standard/tests/strings/vprintf_variation15.phpt
+++ b/ext/standard/tests/strings/vprintf_variation15.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -20,9 +20,9 @@ echo "*** Testing vprintf() : unsigned formats and unsigned values ***\n";
 
 // defining array of unsigned formats
 $formats = array(
-  '%u %+u %-u', 
+  '%u %+u %-u',
   '%lu %Lu %4u %-4u',
-  '%10.4u %-10.4u %.4u', 
+  '%10.4u %-10.4u %.4u',
   '%\'#2u %\'2u %\'$2u %\'_2u',
   '%3$u %4$u %1$u %2$u'
 );
@@ -36,7 +36,7 @@ $args_array = array(
   array(1, 0, 00, "10_"),
   array(3, 4, 1, 2)
 );
- 
+
 // looping to test vprintf() with different unsigned formats from the above $format array
 // and with signed and other types of  values from the above $args_array array
 $counter = 1;
@@ -44,7 +44,7 @@ foreach($formats as $format) {
   echo "\n-- Iteration $counter --\n";
   $result = vprintf($format, $args_array[$counter-1]);
   echo "\n";
-  var_dump($result); 
+  var_dump($result);
   $counter++;
 }
 
diff --git a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt
index 0475d12e69c..53071c6da15 100644
--- a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt
+++ b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -20,9 +20,9 @@ echo "*** Testing vprintf() : unsigned formats and unsigned values ***\n";
 
 // defining array of unsigned formats
 $formats = array(
-  '%u %+u %-u', 
+  '%u %+u %-u',
   '%lu %Lu %4u %-4u',
-  '%10.4u %-10.4u %.4u', 
+  '%10.4u %-10.4u %.4u',
   '%\'#2u %\'2u %\'$2u %\'_2u',
   '%3$u %4$u %1$u %2$u'
 );
@@ -36,7 +36,7 @@ $args_array = array(
   array(1, 0, 00, "10_"),
   array(3, 4, 1, 2)
 );
- 
+
 // looping to test vprintf() with different unsigned formats from the above $format array
 // and with signed and other types of  values from the above $args_array array
 $counter = 1;
diff --git a/ext/standard/tests/strings/vprintf_variation16.phpt b/ext/standard/tests/strings/vprintf_variation16.phpt
index 8c3d66d02d0..78e03644cca 100644
--- a/ext/standard/tests/strings/vprintf_variation16.phpt
+++ b/ext/standard/tests/strings/vprintf_variation16.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 echo "*** Testing vprintf() : unsigned formats and signed & other types of values ***\n";
 
 // defining array of unsigned formats
-$formats = 
+$formats =
   '%u %+u %-u 
    %lu %Lu %4u %-4u
    %10.4u %-10.4u %.4u 
@@ -57,9 +57,9 @@ $args_array = array(
          true, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
- 
+
 // looping to test vprintf() with different unsigned formats from the above $format array
 // and with signed and other types of  values from the above $args_array array
 $counter = 1;
diff --git a/ext/standard/tests/strings/vprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vprintf_variation16_64bit.phpt
index dab90d1e457..5189d58abc1 100644
--- a/ext/standard/tests/strings/vprintf_variation16_64bit.phpt
+++ b/ext/standard/tests/strings/vprintf_variation16_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 echo "*** Testing vprintf() : unsigned formats and signed & other types of values ***\n";
 
 // defining array of unsigned formats
-$formats = 
+$formats =
   '%u %+u %-u 
    %lu %Lu %4u %-4u
    %10.4u %-10.4u %.4u 
@@ -57,9 +57,9 @@ $args_array = array(
          true, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
- 
+
 // looping to test vprintf() with different unsigned formats from the above $format array
 // and with signed and other types of  values from the above $args_array array
 $counter = 1;
@@ -67,7 +67,7 @@ foreach($args_array as $args) {
   echo "\n-- Iteration $counter --\n";
   $result = vprintf($formats, $args);
   echo "\n";
-  var_dump($result); 
+  var_dump($result);
   $counter++;
 }
 
diff --git a/ext/standard/tests/strings/vprintf_variation17.phpt b/ext/standard/tests/strings/vprintf_variation17.phpt
index e2e85301536..e86f80551c6 100644
--- a/ext/standard/tests/strings/vprintf_variation17.phpt
+++ b/ext/standard/tests/strings/vprintf_variation17.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - scientific formats with scientific
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -16,9 +16,9 @@ echo "*** Testing vprintf() : scientific formats and scientific values ***\n";
 
 // defining array of scientific formats
 $formats = array(
-  '%e %+e %-e', 
+  '%e %+e %-e',
   '%le %Le %4e %-4e',
-  '%10.4e %-10.4e %.4e', 
+  '%10.4e %-10.4e %.4e',
   '%\'#20e %\'20e %\'$20e %\'_20e',
   '%3$e %4$e %1$e %2$e'
 );
@@ -32,7 +32,7 @@ $args_array = array(
   array(1e1, +1e2, -1e3, "1e2_"),
   array(3e3, 4e3, 1e3, 2e3)
 );
- 
+
 // looping to test vprintf() with different scientific formats from the above $format array
 // and with signed and other types of  values from the above $args_array array
 $counter = 1;
diff --git a/ext/standard/tests/strings/vprintf_variation18.phpt b/ext/standard/tests/strings/vprintf_variation18.phpt
index 8b30ae78d99..91f5d136941 100644
--- a/ext/standard/tests/strings/vprintf_variation18.phpt
+++ b/ext/standard/tests/strings/vprintf_variation18.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : usage variations - scientific formats with non-scienti
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -15,7 +15,7 @@ Test vprintf() function : usage variations - scientific formats with non-scienti
 echo "*** Testing vprintf() : scientific formats and non-scientific values ***\n";
 
 // defining array of non-scientific formats
-$formats = 
+$formats =
   '%e %+e %-e 
    %le %Le %4e %-4e
    %10.4e %-10.4e %04e %04.4e
@@ -53,7 +53,7 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 // looping to test vprintf() with different scientific formats from the above $format array
diff --git a/ext/standard/tests/strings/vprintf_variation19.phpt b/ext/standard/tests/strings/vprintf_variation19.phpt
index 8b826d8e94c..6ceda770222 100644
--- a/ext/standard/tests/strings/vprintf_variation19.phpt
+++ b/ext/standard/tests/strings/vprintf_variation19.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string $format , array $args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vprintf_variation19_64bit.phpt
index 6abc1345493..9d059569f2b 100644
--- a/ext/standard/tests/strings/vprintf_variation19_64bit.phpt
+++ b/ext/standard/tests/strings/vprintf_variation19_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string $format , array $args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -49,7 +49,7 @@ foreach($formats as $format) {
   echo"\n-- Iteration $counter --\n";
   $result = vprintf($format, $args_array[$counter-1]);
   echo "\n";
-  var_dump($result); 
+  var_dump($result);
   $counter++;
 }
 
diff --git a/ext/standard/tests/strings/vprintf_variation2.phpt b/ext/standard/tests/strings/vprintf_variation2.phpt
index 63c3dfe39e8..69e17d21a75 100644
--- a/ext/standard/tests/strings/vprintf_variation2.phpt
+++ b/ext/standard/tests/strings/vprintf_variation2.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : usage variations - unexpected values for args argument
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -41,41 +41,41 @@ $values = array(
 		  1,
 		  12345,
 		  -2345,
-		
+
 		  // float data
 /*5*/	  10.5,
 		  -10.5,
 		  10.1234567e10,
 		  10.7654321E-10,
 		  .5,
-		
+
 		  // null data
 /*10*/	  NULL,
 		  null,
-		
+
 		  // boolean data
 /*12*/	  true,
 		  false,
 		  TRUE,
 		  FALSE,
-		
+
 		  // empty data
 /*16*/	  "",
 		  '',
-		
+
 		  // string data
 /*18*/	  "string",
 		  'string',
-		
+
 		  // object data
 /*20*/	  new sample(),
-		
+
 		  // undefined data
 /*21*/	  @$undefined_var,
-		
+
 		  // unset data
 /*22*/	  @$unset_var,
-		
+
 		  // resource data
 /*23*/		  $file_handle
 );
diff --git a/ext/standard/tests/strings/vprintf_variation3.phpt b/ext/standard/tests/strings/vprintf_variation3.phpt
index 0b59ddda1f0..6967679715f 100644
--- a/ext/standard/tests/strings/vprintf_variation3.phpt
+++ b/ext/standard/tests/strings/vprintf_variation3.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : usage variations - int formats with int values
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -45,7 +45,7 @@ $args_array = array(
 // and with int values from the above $args_array array
 $counter = 1;
 foreach($formats as $format) {
-  echo "\n-- Iteration $counter --\n";   
+  echo "\n-- Iteration $counter --\n";
   $result = vprintf($format, $args_array[$counter-1]);
   echo "\n";
   var_dump($result);
diff --git a/ext/standard/tests/strings/vprintf_variation4.phpt b/ext/standard/tests/strings/vprintf_variation4.phpt
index 8d56fc9cb17..aab27337d97 100644
--- a/ext/standard/tests/strings/vprintf_variation4.phpt
+++ b/ext/standard/tests/strings/vprintf_variation4.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 echo "*** Testing vprintf() : int formats and non-integer values ***\n";
 
 // defining array of int formats
-$formats = 
+$formats =
   '%d %+d %-d 
    %ld %Ld %4d %-4d
    %10.4d %-10.4d %.4d %04.4d
@@ -57,7 +57,7 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 // looping to test vprintf() with different int formats from the above $format array
diff --git a/ext/standard/tests/strings/vprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vprintf_variation4_64bit.phpt
index f81dba32a10..76c079d69ae 100644
--- a/ext/standard/tests/strings/vprintf_variation4_64bit.phpt
+++ b/ext/standard/tests/strings/vprintf_variation4_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 echo "*** Testing vprintf() : int formats and non-integer values ***\n";
 
 // defining array of int formats
-$formats = 
+$formats =
   '%d %+d %-d 
    %ld %Ld %4d %-4d
    %10.4d %-10.4d %.4d %04.4d
@@ -57,7 +57,7 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 // looping to test vprintf() with different int formats from the above $format array
@@ -67,7 +67,7 @@ foreach($args_array as $args) {
   echo "\n-- Iteration $counter --\n";
   $result = vprintf($formats, $args);
   echo "\n";
-  var_dump($result); 
+  var_dump($result);
   $counter++;
 }
 
diff --git a/ext/standard/tests/strings/vprintf_variation5.phpt b/ext/standard/tests/strings/vprintf_variation5.phpt
index f54d1e19c5f..dde6170e9f6 100644
--- a/ext/standard/tests/strings/vprintf_variation5.phpt
+++ b/ext/standard/tests/strings/vprintf_variation5.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : usage variations - float formats with float values
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -45,7 +45,7 @@ $args_array = array(
 // and with float values from the above $args_array array
 $counter = 1;
 foreach($formats as $format) {
-  echo "\n-- Iteration $counter --\n";   
+  echo "\n-- Iteration $counter --\n";
   $result = vprintf($format, $args_array[$counter-1]);
   echo "\n";
   var_dump($result);
diff --git a/ext/standard/tests/strings/vprintf_variation6.phpt b/ext/standard/tests/strings/vprintf_variation6.phpt
index 265948b565a..0283bc4541d 100644
--- a/ext/standard/tests/strings/vprintf_variation6.phpt
+++ b/ext/standard/tests/strings/vprintf_variation6.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : usage variations - float formats with non-float values
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Output a formatted string 
+ * Description: Output a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -15,7 +15,7 @@ Test vprintf() function : usage variations - float formats with non-float values
 echo "*** Testing vprintf() : float formats and non-float values ***\n";
 
 // defining array of float formats
-$formats = 
+$formats =
   '%f %+f %-f 
    %lf %Lf %4f %-4f
    %10.4f %-10.4f %04f %04.4f
@@ -53,9 +53,9 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
- 
+
 // looping to test vprintf() with different float formats from the above $format array
 // and with non-float values from the above $args_array array
 $counter = 1;
diff --git a/ext/standard/tests/strings/vprintf_variation7.phpt b/ext/standard/tests/strings/vprintf_variation7.phpt
index ef2bfecdfbb..d7c81fca14b 100644
Binary files a/ext/standard/tests/strings/vprintf_variation7.phpt and b/ext/standard/tests/strings/vprintf_variation7.phpt differ
diff --git a/ext/standard/tests/strings/vprintf_variation8.phpt b/ext/standard/tests/strings/vprintf_variation8.phpt
index c0558ff6b79..f635b1d4c06 100644
--- a/ext/standard/tests/strings/vprintf_variation8.phpt
+++ b/ext/standard/tests/strings/vprintf_variation8.phpt
@@ -3,7 +3,7 @@ Test vprintf() function : usage variations - string formats with non-string valu
 --FILE--
 <?php
 /* Prototype  : string vprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -17,7 +17,7 @@ error_reporting(E_ALL & ~E_NOTICE);
 echo "*** Testing vprintf() : string formats and non-string values ***\n";
 
 // defining array of string formats
-$formats = 
+$formats =
   '%s %+s %-s 
    %ls %Ls %4s %-4s
    %10.4s %-10.4s %04s %04.4s
@@ -34,7 +34,7 @@ $args_array = array(
         2.1234567e10, +2.7654321e10, -2.7654321e10,
         12345.780, 12.000000011111, -12.00000111111, -123456.234,
         3.33, +4.44, 1.11,-2.22 ),
-  
+
  // array of int values
  array(2, -2, +2,
        123456, 123456234, -12346789, +12346789,
@@ -56,9 +56,9 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
- 
+
 // looping to test vprintf() with different string formats from the above $format array
 // and with non-string values from the above $args_array array
 $counter = 1;
@@ -66,7 +66,7 @@ foreach($args_array as $args) {
   echo "\n-- Iteration $counter --\n";
   $result = vprintf($formats, $args);
   echo "\n";
-  var_dump($result); 
+  var_dump($result);
   $counter++;
 }
 
diff --git a/ext/standard/tests/strings/vprintf_variation9.phpt b/ext/standard/tests/strings/vprintf_variation9.phpt
index 5ad2db2afa0..7d55d94f87a 100644
Binary files a/ext/standard/tests/strings/vprintf_variation9.phpt and b/ext/standard/tests/strings/vprintf_variation9.phpt differ
diff --git a/ext/standard/tests/strings/vsprintf_basic1.phpt b/ext/standard/tests/strings/vsprintf_basic1.phpt
index 6639ac3da21..8191731e710 100644
--- a/ext/standard/tests/strings/vsprintf_basic1.phpt
+++ b/ext/standard/tests/strings/vsprintf_basic1.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - string format
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string $format , array $args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_basic2.phpt b/ext/standard/tests/strings/vsprintf_basic2.phpt
index 3e78aab7617..609b05ceced 100644
--- a/ext/standard/tests/strings/vsprintf_basic2.phpt
+++ b/ext/standard/tests/strings/vsprintf_basic2.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - integer format
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string $format , array $args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_basic3.phpt b/ext/standard/tests/strings/vsprintf_basic3.phpt
index bbb6a3267cf..89ef291d970 100644
--- a/ext/standard/tests/strings/vsprintf_basic3.phpt
+++ b/ext/standard/tests/strings/vsprintf_basic3.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - float format
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string $format , array $args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_basic4.phpt b/ext/standard/tests/strings/vsprintf_basic4.phpt
index a82df93ad35..c132459627b 100644
--- a/ext/standard/tests/strings/vsprintf_basic4.phpt
+++ b/ext/standard/tests/strings/vsprintf_basic4.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - bool format
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string $format , array $args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_basic5.phpt b/ext/standard/tests/strings/vsprintf_basic5.phpt
index a4a43d05212..1a5e41c5cbd 100644
--- a/ext/standard/tests/strings/vsprintf_basic5.phpt
+++ b/ext/standard/tests/strings/vsprintf_basic5.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - char format
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string $format , array $args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_basic6.phpt b/ext/standard/tests/strings/vsprintf_basic6.phpt
index f6f6ed58a42..1d435715bb8 100644
--- a/ext/standard/tests/strings/vsprintf_basic6.phpt
+++ b/ext/standard/tests/strings/vsprintf_basic6.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - exponential format
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string $format , array $args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_basic7.phpt b/ext/standard/tests/strings/vsprintf_basic7.phpt
index daf514391bc..84711b40341 100644
--- a/ext/standard/tests/strings/vsprintf_basic7.phpt
+++ b/ext/standard/tests/strings/vsprintf_basic7.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string $format , aaray $args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt
index 022919ec73f..4bc85c29f9b 100644
--- a/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt
+++ b/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string $format , aaray $args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_basic8.phpt b/ext/standard/tests/strings/vsprintf_basic8.phpt
index cd2929e0070..72ad6ec0cfe 100644
--- a/ext/standard/tests/strings/vsprintf_basic8.phpt
+++ b/ext/standard/tests/strings/vsprintf_basic8.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - octal format
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string $format , array $args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_basic9.phpt b/ext/standard/tests/strings/vsprintf_basic9.phpt
index 42012a5c8f3..d3f9319f9a0 100644
--- a/ext/standard/tests/strings/vsprintf_basic9.phpt
+++ b/ext/standard/tests/strings/vsprintf_basic9.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : basic functionality - hexadecimal format
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string $format , array $args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_error.phpt b/ext/standard/tests/strings/vsprintf_error.phpt
index 8d581474b40..2876eb1334d 100644
--- a/ext/standard/tests/strings/vsprintf_error.phpt
+++ b/ext/standard/tests/strings/vsprintf_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test vsprintf() function : error conditions 
+Test vsprintf() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string $format , array $args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
  */
 
@@ -19,7 +19,7 @@ echo "\n-- Testing vsprintf() function with Zero arguments --\n";
 var_dump( vsprintf() );
 
 echo "\n-- Testing vsprintf() function with less than expected no. of arguments --\n";
-var_dump( vsprintf($format) );  
+var_dump( vsprintf($format) );
 
 echo "\n-- testing vsprintf() function with more than expected no. of arguments --\n";
 var_dump( vsprintf($format, $args, $extra_arg) );
diff --git a/ext/standard/tests/strings/vsprintf_variation1.phpt b/ext/standard/tests/strings/vsprintf_variation1.phpt
index 3911587620f..15c749d3f80 100644
--- a/ext/standard/tests/strings/vsprintf_variation1.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation1.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - unexpected values for the format a
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string $format, array $args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -78,7 +78,7 @@ $values = array(
 
   // unset data
   @$unset_var,
- 
+
   // resource data
   $file_handle
 );
@@ -90,7 +90,7 @@ foreach($values as $value) {
   echo "\n -- Iteration $counter --\n";
   var_dump( vsprintf($value,$args) );
   $counter++;
-    
+
 };
 
 // closing the resource
diff --git a/ext/standard/tests/strings/vsprintf_variation10.phpt b/ext/standard/tests/strings/vsprintf_variation10.phpt
index 42ba2679f18..1720164f766 100644
Binary files a/ext/standard/tests/strings/vsprintf_variation10.phpt and b/ext/standard/tests/strings/vsprintf_variation10.phpt differ
diff --git a/ext/standard/tests/strings/vsprintf_variation11.phpt b/ext/standard/tests/strings/vsprintf_variation11.phpt
index 4cc5b029229..11cba075064 100644
--- a/ext/standard/tests/strings/vsprintf_variation11.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation11.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -48,7 +48,7 @@ $args_array = array(
 // and with octal values from the above $args_array array
 $counter = 1;
 foreach($formats as $format) {
-  echo "\n-- Iteration $counter --\n";   
+  echo "\n-- Iteration $counter --\n";
   var_dump( vsprintf($format, $args_array[$counter-1]) );
   $counter++;
 }
diff --git a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt
index 841d104b817..43446e4ede7 100644
--- a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -48,7 +48,7 @@ $args_array = array(
 // and with octal values from the above $args_array array
 $counter = 1;
 foreach($formats as $format) {
-  echo "\n-- Iteration $counter --\n";   
+  echo "\n-- Iteration $counter --\n";
   var_dump( vsprintf($format, $args_array[$counter-1]) );
   $counter++;
 }
diff --git a/ext/standard/tests/strings/vsprintf_variation12.phpt b/ext/standard/tests/strings/vsprintf_variation12.phpt
index ab67cc82f9d..c4f7d02bf13 100644
--- a/ext/standard/tests/strings/vsprintf_variation12.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation12.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 echo "*** Testing vsprintf() : octal formats and non-octal values ***\n";
 
 // defining array of octal formats
-$formats = 
+$formats =
   '%o %+o %-o 
    %lo %Lo %4o %-4o
    %10.4o %-10.4o %.4o 
@@ -64,9 +64,9 @@ $args_array = array(
          true, false, TRUE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
- 
+
 // looping to test vsprintf() with different octal formats from the above $format array
 // and with non-octal values from the above $args_array array
 $counter = 1;
diff --git a/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt
index 530f05b13f3..ea9b4793ee9 100644
--- a/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 echo "*** Testing vsprintf() : octal formats and non-octal values ***\n";
 
 // defining array of octal formats
-$formats = 
+$formats =
   '%o %+o %-o 
    %lo %Lo %4o %-4o
    %10.4o %-10.4o %.4o 
@@ -64,9 +64,9 @@ $args_array = array(
          true, false, TRUE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
- 
+
 // looping to test vsprintf() with different octal formats from the above $format array
 // and with non-octal values from the above $args_array array
 $counter = 1;
diff --git a/ext/standard/tests/strings/vsprintf_variation13.phpt b/ext/standard/tests/strings/vsprintf_variation13.phpt
index b617975759b..9417ab13196 100644
--- a/ext/standard/tests/strings/vsprintf_variation13.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation13.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -48,7 +48,7 @@ $args_array = array(
 // and with octal values from the above $args_array array
 $counter = 1;
 foreach($formats as $format) {
-  echo "\n-- Iteration $counter --\n";   
+  echo "\n-- Iteration $counter --\n";
   var_dump( vsprintf($format, $args_array[$counter-1]) );
   $counter++;
 }
diff --git a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt
index 8d2533a8fc3..f81476baeae 100644
--- a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -48,7 +48,7 @@ $args_array = array(
 // and with octal values from the above $args_array array
 $counter = 1;
 foreach($formats as $format) {
-  echo "\n-- Iteration $counter --\n";   
+  echo "\n-- Iteration $counter --\n";
   var_dump( vsprintf($format, $args_array[$counter-1]) );
   $counter++;
 }
diff --git a/ext/standard/tests/strings/vsprintf_variation14.phpt b/ext/standard/tests/strings/vsprintf_variation14.phpt
index bfe816ee1f9..559e0397c43 100644
--- a/ext/standard/tests/strings/vsprintf_variation14.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation14.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 echo "*** Testing vsprintf() : hexa formats and non-hexa values ***\n";
 
 // defining array of different hexa formats
-$formats = 
+$formats =
   '%x %+x %-x 
    %lx %Lx %4x %-4x
    %10.4x %-10.4x %.4x 
@@ -64,12 +64,12 @@ $args_array = array(
          true, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 // looping to test vsprintf() with different hexa formats from the above $format array
 // and with non-hexa values from the above $args_array array
- 
+
 $counter = 1;
 foreach($args_array as $args) {
   echo "\n-- Iteration $counter --\n";
diff --git a/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt
index f1940ef2ee0..6b78bfc767e 100644
--- a/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 echo "*** Testing vsprintf() : hexa formats and non-hexa values ***\n";
 
 // defining array of different hexa formats
-$formats = 
+$formats =
   '%x %+x %-x 
    %lx %Lx %4x %-4x
    %10.4x %-10.4x %.4x 
@@ -64,12 +64,12 @@ $args_array = array(
          true, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 // looping to test vsprintf() with different hexa formats from the above $format array
 // and with non-hexa values from the above $args_array array
- 
+
 $counter = 1;
 foreach($args_array as $args) {
   echo "\n-- Iteration $counter --\n";
diff --git a/ext/standard/tests/strings/vsprintf_variation15.phpt b/ext/standard/tests/strings/vsprintf_variation15.phpt
index bc1d786920f..62688be727f 100644
--- a/ext/standard/tests/strings/vsprintf_variation15.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation15.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -20,9 +20,9 @@ echo "*** Testing vsprintf() : unsigned formats and unsigned values ***\n";
 
 // defining array of unsigned formats
 $formats = array(
-  '%u %+u %-u', 
+  '%u %+u %-u',
   '%lu %Lu %4u %-4u',
-  '%10.4u %-10.4u %.4u', 
+  '%10.4u %-10.4u %.4u',
   '%\'#2u %\'2u %\'$2u %\'_2u',
   '%3$u %4$u %1$u %2$u'
 );
@@ -36,7 +36,7 @@ $args_array = array(
   array(1, 0, 00, "10_"),
   array(3, 4, 1, 2)
 );
- 
+
 // looping to test vsprintf() with different unsigned formats from the above $format array
 // and with signed and other types of  values from the above $args_array array
 $counter = 1;
diff --git a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt
index af55ce966fc..b95d635800b 100644
--- a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -20,9 +20,9 @@ echo "*** Testing vsprintf() : unsigned formats and unsigned values ***\n";
 
 // defining array of unsigned formats
 $formats = array(
-  '%u %+u %-u', 
+  '%u %+u %-u',
   '%lu %Lu %4u %-4u',
-  '%10.4u %-10.4u %.4u', 
+  '%10.4u %-10.4u %.4u',
   '%\'#2u %\'2u %\'$2u %\'_2u',
   '%3$u %4$u %1$u %2$u'
 );
@@ -36,7 +36,7 @@ $args_array = array(
   array(1, 0, 00, "10_"),
   array(3, 4, 1, 2)
 );
- 
+
 // looping to test vsprintf() with different unsigned formats from the above $format array
 // and with signed and other types of  values from the above $args_array array
 $counter = 1;
diff --git a/ext/standard/tests/strings/vsprintf_variation16.phpt b/ext/standard/tests/strings/vsprintf_variation16.phpt
index 01bcc662d50..03678f851e1 100644
--- a/ext/standard/tests/strings/vsprintf_variation16.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation16.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 echo "*** Testing vsprintf() : unsigned formats and signed & other types of values ***\n";
 
 // defining array of unsigned formats
-$formats = 
+$formats =
   '%u %+u %-u 
    %lu %Lu %4u %-4u
    %10.4u %-10.4u %.4u 
@@ -57,9 +57,9 @@ $args_array = array(
          true, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
- 
+
 // looping to test vsprintf() with different unsigned formats from the above $format array
 // and with signed and other types of  values from the above $args_array array
 $counter = 1;
diff --git a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt
index 91a69c7e70f..8783615371c 100644
--- a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 echo "*** Testing vsprintf() : unsigned formats and signed & other types of values ***\n";
 
 // defining array of unsigned formats
-$formats = 
+$formats =
   '%u %+u %-u 
    %lu %Lu %4u %-4u
    %10.4u %-10.4u %.4u 
@@ -57,9 +57,9 @@ $args_array = array(
          true, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
- 
+
 // looping to test vsprintf() with different unsigned formats from the above $format array
 // and with signed and other types of  values from the above $args_array array
 $counter = 1;
diff --git a/ext/standard/tests/strings/vsprintf_variation17.phpt b/ext/standard/tests/strings/vsprintf_variation17.phpt
index 88cacdd49a5..ec80b8f69e3 100644
--- a/ext/standard/tests/strings/vsprintf_variation17.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation17.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - scientific formats with scientific
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -16,9 +16,9 @@ echo "*** Testing vsprintf() : scientific formats and scientific values ***\n";
 
 // defining array of scientific formats
 $formats = array(
-  '%e %+e %-e', 
+  '%e %+e %-e',
   '%le %Le %4e %-4e',
-  '%10.4e %-10.4e %.4e', 
+  '%10.4e %-10.4e %.4e',
   '%\'#20e %\'20e %\'$20e %\'_20e',
   '%3$e %4$e %1$e %2$e'
 );
@@ -32,7 +32,7 @@ $args_array = array(
   array(1e1, +1e2, -1e3, "1e2_"),
   array(3e3, 4e3, 1e3, 2e3)
 );
- 
+
 // looping to test vsprintf() with different scientific formats from the above $format array
 // and with signed and other types of  values from the above $args_array array
 $counter = 1;
diff --git a/ext/standard/tests/strings/vsprintf_variation18.phpt b/ext/standard/tests/strings/vsprintf_variation18.phpt
index 3d1aeba3354..233916fe8a1 100644
--- a/ext/standard/tests/strings/vsprintf_variation18.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation18.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - scientific formats with non-scient
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -15,7 +15,7 @@ Test vsprintf() function : usage variations - scientific formats with non-scient
 echo "*** Testing vsprintf() : scientific formats and non-scientific values ***\n";
 
 // defining array of non-scientific formats
-$formats = 
+$formats =
   '%e %+e %-e 
    %le %Le %4e %-4e
    %10.4e %-10.4e %04e %04.4e
@@ -53,7 +53,7 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 // looping to test vsprintf() with different scientific formats from the above $format array
diff --git a/ext/standard/tests/strings/vsprintf_variation19.phpt b/ext/standard/tests/strings/vsprintf_variation19.phpt
index 8d475b75a38..5d3c8d63144 100644
--- a/ext/standard/tests/strings/vsprintf_variation19.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation19.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string $format , array $args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt
index 69145ba963d..c889b323430 100644
--- a/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string $format , array $args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_variation2.phpt b/ext/standard/tests/strings/vsprintf_variation2.phpt
index acf4bea9e36..9061c092fe4 100644
--- a/ext/standard/tests/strings/vsprintf_variation2.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation2.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - unexpected values for args argumen
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
diff --git a/ext/standard/tests/strings/vsprintf_variation3.phpt b/ext/standard/tests/strings/vsprintf_variation3.phpt
index 2932e15f185..777c911c8b8 100644
--- a/ext/standard/tests/strings/vsprintf_variation3.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation3.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - int formats with int values
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -45,7 +45,7 @@ $args_array = array(
 // and with int values from the above $args_array array
 $counter = 1;
 foreach($formats as $format) {
-  echo "\n-- Iteration $counter --\n";   
+  echo "\n-- Iteration $counter --\n";
   var_dump( vsprintf($format, $args_array[$counter-1]) );
   $counter++;
 }
diff --git a/ext/standard/tests/strings/vsprintf_variation4.phpt b/ext/standard/tests/strings/vsprintf_variation4.phpt
index e3e6737b826..df15475fa97 100644
--- a/ext/standard/tests/strings/vsprintf_variation4.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation4.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 echo "*** Testing vsprintf() : int formats and non-integer values ***\n";
 
 // defining array of int formats
-$formats = 
+$formats =
   '%d %+d %-d 
    %ld %Ld %4d %-4d
    %10.4d %-10.4d %.4d %04.4d
@@ -57,7 +57,7 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 // looping to test vsprintf() with different int formats from the above $format array
diff --git a/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt
index c6b6db572cc..de95bffea6c 100644
--- a/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt
@@ -7,7 +7,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 echo "*** Testing vsprintf() : int formats and non-integer values ***\n";
 
 // defining array of int formats
-$formats = 
+$formats =
   '%d %+d %-d 
    %ld %Ld %4d %-4d
    %10.4d %-10.4d %.4d %04.4d
@@ -57,7 +57,7 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
 
 // looping to test vsprintf() with different int formats from the above $format array
diff --git a/ext/standard/tests/strings/vsprintf_variation5.phpt b/ext/standard/tests/strings/vsprintf_variation5.phpt
index b2bd0d5b795..cf172899d2e 100644
--- a/ext/standard/tests/strings/vsprintf_variation5.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation5.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - float formats with float values
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -45,7 +45,7 @@ $args_array = array(
 // and with float values from the above $args_array array
 $counter = 1;
 foreach($formats as $format) {
-  echo "\n-- Iteration $counter --\n";   
+  echo "\n-- Iteration $counter --\n";
   var_dump( vsprintf($format, $args_array[$counter-1]) );
   $counter++;
 }
diff --git a/ext/standard/tests/strings/vsprintf_variation6.phpt b/ext/standard/tests/strings/vsprintf_variation6.phpt
index 00f9467cf99..7eb6df81058 100644
--- a/ext/standard/tests/strings/vsprintf_variation6.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation6.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - float formats with non-float value
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -15,7 +15,7 @@ Test vsprintf() function : usage variations - float formats with non-float value
 echo "*** Testing vsprintf() : float formats and non-float values ***\n";
 
 // defining array of float formats
-$formats = 
+$formats =
   '%f %+f %-f 
    %lf %Lf %4f %-4f
    %10.4f %-10.4f %04f %04.4f
@@ -53,9 +53,9 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
- 
+
 // looping to test vsprintf() with different float formats from the above $format array
 // and with non-float values from the above $args_array array
 $counter = 1;
diff --git a/ext/standard/tests/strings/vsprintf_variation7.phpt b/ext/standard/tests/strings/vsprintf_variation7.phpt
index 0085138b782..8f5b8862c29 100644
Binary files a/ext/standard/tests/strings/vsprintf_variation7.phpt and b/ext/standard/tests/strings/vsprintf_variation7.phpt differ
diff --git a/ext/standard/tests/strings/vsprintf_variation8.phpt b/ext/standard/tests/strings/vsprintf_variation8.phpt
index f44eae2db23..109d8b626e0 100644
--- a/ext/standard/tests/strings/vsprintf_variation8.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation8.phpt
@@ -3,7 +3,7 @@ Test vsprintf() function : usage variations - string formats with non-string val
 --FILE--
 <?php
 /* Prototype  : string vsprintf(string format, array args)
- * Description: Return a formatted string 
+ * Description: Return a formatted string
  * Source code: ext/standard/formatted_print.c
 */
 
@@ -17,7 +17,7 @@ error_reporting(E_ALL & ~E_NOTICE);
 echo "*** Testing vsprintf() : string formats and non-string values ***\n";
 
 // defining array of string formats
-$formats = 
+$formats =
   '%s %+s %-s 
    %ls %4s %-4s
    %10.4s %-10.4s %04s %04.4s
@@ -34,7 +34,7 @@ $args_array = array(
         2.1234567e10, +2.7654321e10, -2.7654321e10, 2.1234567e10,
         12345.780, 12.000000011111, -12.00000111111, -123456.234,
         3.33, +4.44, 1.11,-2.22 ),
-  
+
  // array of int values
  array(2, -2, +2,
        123456, -12346789, +12346789,
@@ -56,9 +56,9 @@ $args_array = array(
          true, false, TRUE, FALSE,
          0, 1, 1, 0,
          1, TRUE, 0, FALSE),
-  
+
 );
- 
+
 // looping to test vsprintf() with different string formats from the above $format array
 // and with non-string values from the above $args_array array
 $counter = 1;
diff --git a/ext/standard/tests/strings/vsprintf_variation9.phpt b/ext/standard/tests/strings/vsprintf_variation9.phpt
index c16531b2f5c..14180654d05 100644
Binary files a/ext/standard/tests/strings/vsprintf_variation9.phpt and b/ext/standard/tests/strings/vsprintf_variation9.phpt differ
diff --git a/ext/standard/tests/strings/wordwrap_basic.phpt b/ext/standard/tests/strings/wordwrap_basic.phpt
index 84a7f7335cf..83cbdb4168d 100644
--- a/ext/standard/tests/strings/wordwrap_basic.phpt
+++ b/ext/standard/tests/strings/wordwrap_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test wordwrap() function : basic functionality 
+Test wordwrap() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string wordwrap ( string $str [, int $width [, string $break [, bool $cut]]] )
diff --git a/ext/standard/tests/strings/wordwrap_error.phpt b/ext/standard/tests/strings/wordwrap_error.phpt
index 98f199abc68..41c5cbdb69e 100644
--- a/ext/standard/tests/strings/wordwrap_error.phpt
+++ b/ext/standard/tests/strings/wordwrap_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test wordwrap() function : error conditions 
+Test wordwrap() function : error conditions
 --FILE--
 <?php
 /* Prototype  : string wordwrap ( string $str [, int $width [, string $break [, bool $cut]]] )
@@ -32,7 +32,7 @@ $cut = false;
 var_dump( wordwrap($str, $width, $break, $cut) );
 
 echo "-- width = 0 & cut = true --\n";
-// width as zero and cut as true 
+// width as zero and cut as true
 $width = 0;
 $cut = true;
 var_dump( wordwrap($str, $width, $break, $cut) );
@@ -44,7 +44,7 @@ $cut = false;
 var_dump( wordwrap($str, $width, $break, $cut) );
 
 echo "-- width = -10 & cut = true --\n";
-// width as -ne and cut as true 
+// width as -ne and cut as true
 $width = -10;
 $cut = true;
 var_dump( wordwrap($str, $width, $break, $cut) );
diff --git a/ext/standard/tests/strings/wordwrap_variation1.phpt b/ext/standard/tests/strings/wordwrap_variation1.phpt
index 28fc128bb79..59462448c88 100644
--- a/ext/standard/tests/strings/wordwrap_variation1.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation1.phpt
@@ -97,7 +97,7 @@ for($index = 0; $index < count($values); $index ++) {
   $counter ++;
 }
 
-// close the resource 
+// close the resource
 fclose($fp);
 
 echo "Done\n";
diff --git a/ext/standard/tests/strings/wordwrap_variation2.phpt b/ext/standard/tests/strings/wordwrap_variation2.phpt
index 5f51da81f83..194af0e22f0 100644
--- a/ext/standard/tests/strings/wordwrap_variation2.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation2.phpt
@@ -8,7 +8,7 @@ Test wordwrap() function : usage variations  - unexpected values for width argum
 */
 
 /*
- * test wordwrap by passing different values for width argument 
+ * test wordwrap by passing different values for width argument
 */
 echo "*** Testing wordwrap() : usage variations ***\n";
 // initialize all required variables
@@ -16,7 +16,7 @@ $str = 'testing wordwrap function';
 $break = '<br />\n';
 $cut = true;
 
-// resource var 
+// resource var
 $fp = fopen(__FILE__, "r");
 
 // get an unset variable
@@ -53,7 +53,7 @@ $values =  array (
   // objects
   new stdclass(),
 
-  // Null value 
+  // Null value
   NULL,
   null,
 
@@ -83,7 +83,7 @@ for($index = 0; $index < count($values); $index ++) {
   var_dump( wordwrap($str, $width) );
   var_dump( wordwrap($str, $width, $break) );
 
-  // cut as false 
+  // cut as false
   $cut = false;
   var_dump( wordwrap($str, $width, $break, $cut) );
 
diff --git a/ext/standard/tests/strings/wordwrap_variation3.phpt b/ext/standard/tests/strings/wordwrap_variation3.phpt
index ddf04c77c9a..5774ce3752f 100644
--- a/ext/standard/tests/strings/wordwrap_variation3.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation3.phpt
@@ -8,7 +8,7 @@ Test wordwrap() function : usage variations  - unexptected values for break argu
 */
 
 /*
- * test wordwrap by passing different values for break argument 
+ * test wordwrap by passing different values for break argument
 */
 echo "*** Testing wordwrap() : usage variations ***\n";
 // initialize all required variables
@@ -88,7 +88,7 @@ for($index = 0; $index < count($values); $index ++) {
   $cut = false;
   var_dump( wordwrap($str, $width, $break, $cut) );
 
-  // $cut as true 
+  // $cut as true
   $cut = true;
   var_dump( wordwrap($str, $width, $break, $cut) );
 
diff --git a/ext/standard/tests/strings/wordwrap_variation5.phpt b/ext/standard/tests/strings/wordwrap_variation5.phpt
index b0911a899cd..0235271c7af 100644
--- a/ext/standard/tests/strings/wordwrap_variation5.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation5.phpt
@@ -37,7 +37,7 @@ echo "-- with cut value as true --\n";
 $cut = true;
 var_dump( wordwrap($str, $width, $break, $cut) );
 var_dump( wordwrap($str, $width, $break1, $cut) );
-  
+
 echo "Done\n";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/time/001.phpt b/ext/standard/tests/time/001.phpt
index 3b0ed8a77f4..045271fada0 100644
--- a/ext/standard/tests/time/001.phpt
+++ b/ext/standard/tests/time/001.phpt
@@ -1,8 +1,8 @@
 --TEST--
 microtime() function
 --SKIPIF--
-<?php 
-	if (!function_exists('microtime'))  die('skip microtime() not available'); 
+<?php
+	if (!function_exists('microtime'))  die('skip microtime() not available');
 	die('warn system dependent');
 ?>
 --FILE--
diff --git a/ext/standard/tests/time/strptime_basic.phpt b/ext/standard/tests/time/strptime_basic.phpt
index 30e3e82cc77..e53822ffc8a 100644
--- a/ext/standard/tests/time/strptime_basic.phpt
+++ b/ext/standard/tests/time/strptime_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test strptime() function : basic functionality 
+Test strptime() function : basic functionality
 --SKIPIF--
-<?php 
-	if (!function_exists('strptime')) { 
-		die("skip - strptime() function not available in this build"); 
-	}	 
+<?php
+	if (!function_exists('strptime')) {
+		die("skip - strptime() function not available in this build");
+	}
         if(PHP_OS == 'Darwin') die("skip - strptime() behaves differently on Darwin");
 ?>
 
@@ -16,13 +16,13 @@ Test strptime() function : basic functionality
 */
 
 $orig = setlocale(LC_ALL, 'C');
-date_default_timezone_set("GMT"); 
+date_default_timezone_set("GMT");
 
 echo "*** Testing strptime() : basic functionality ***\n";
 
 $input = "10:00:00 AM July 2 1963";
 $tstamp = strtotime($input);
- 
+
 $str = strftime("%r %B%e %Y %Z", $tstamp);
 var_dump(strptime($str, '%H:%M:%S %p %B %d %Y'));
 
diff --git a/ext/standard/tests/time/strptime_error.phpt b/ext/standard/tests/time/strptime_error.phpt
index ae55028cb24..a84216f4ff0 100644
--- a/ext/standard/tests/time/strptime_error.phpt
+++ b/ext/standard/tests/time/strptime_error.phpt
@@ -1,20 +1,20 @@
 --TEST--
 Test localtime() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!function_exists('strptime')) {
 	echo "SKIP strptime function not available in build";
-}	 
-?> 
+}
+?>
 --FILE--
 <?php
 /* Prototype  : array strptime  ( string $date  , string $format  )
  * Description: Parse a time/date generated with strftime()
  * Source code: ext/standard/datetime.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
-//Set the default time zone 
+//Set the default time zone
 date_default_timezone_set("Europe/London");
 
 echo "*** Testing strptime() : error conditions ***\n";
diff --git a/ext/standard/tests/time/strptime_parts.phpt b/ext/standard/tests/time/strptime_parts.phpt
index fbe684b863c..6a772d588c8 100644
--- a/ext/standard/tests/time/strptime_parts.phpt
+++ b/ext/standard/tests/time/strptime_parts.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Test strptime() function : basic functionality 
+Test strptime() function : basic functionality
 --SKIPIF--
-<?php 
-	if (!function_exists('strptime')) { 
-		die("skip - strptime() function not available in this build"); 
-	}	 
+<?php
+	if (!function_exists('strptime')) {
+		die("skip - strptime() function not available in this build");
+	}
 ?>
 
 --FILE--
@@ -15,14 +15,14 @@ Test strptime() function : basic functionality
 */
 
 $orig = setlocale(LC_ALL, 'C');
-date_default_timezone_set("GMT"); 
+date_default_timezone_set("GMT");
 putenv("TZ=GMT");
 
 echo "*** Testing strptime() : basic functionality ***\n";
 
 $input = "10:01:20 AM July 2 1963";
 $tstamp = strtotime($input);
- 
+
 $str = strftime("%r %B%e %Y %Z", $tstamp);
 $res = strptime($str, '%H:%M:%S %p %B %d %Y %Z');
 var_dump($res["tm_sec"]);
diff --git a/ext/standard/tests/url/base64_decode_basic_001.phpt b/ext/standard/tests/url/base64_decode_basic_001.phpt
index e1469c37e8c..232a0a6f715 100644
--- a/ext/standard/tests/url/base64_decode_basic_001.phpt
+++ b/ext/standard/tests/url/base64_decode_basic_001.phpt
@@ -3,9 +3,9 @@ Test base64_decode() function : basic functionality - ensure all base64 alphabet
 --FILE--
 <?php
 /* Prototype  : proto string base64_decode(string str[, bool strict])
- * Description: Decodes string using MIME base64 algorithm 
+ * Description: Decodes string using MIME base64 algorithm
  * Source code: ext/standard/base64.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "Decode an input string containing the whole base64 alphabet:\n";
diff --git a/ext/standard/tests/url/base64_decode_basic_002.phpt b/ext/standard/tests/url/base64_decode_basic_002.phpt
index 1289894f4a3..4ca8d8f6646 100644
--- a/ext/standard/tests/url/base64_decode_basic_002.phpt
+++ b/ext/standard/tests/url/base64_decode_basic_002.phpt
@@ -3,9 +3,9 @@ Test base64_decode() function : basic functionality - strict vs non-strict with
 --FILE--
 <?php
 /* Prototype  : proto string base64_decode(string str[, bool strict])
- * Description: Decodes string using MIME base64 algorithm 
+ * Description: Decodes string using MIME base64 algorithm
  * Source code: ext/standard/base64.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "Decode 'hello world!':\n";
diff --git a/ext/standard/tests/url/base64_decode_error_001.phpt b/ext/standard/tests/url/base64_decode_error_001.phpt
index 2725164464e..8da0a3ae2f9 100644
--- a/ext/standard/tests/url/base64_decode_error_001.phpt
+++ b/ext/standard/tests/url/base64_decode_error_001.phpt
@@ -3,9 +3,9 @@ Test base64_decode() function : error conditions - wrong number of args
 --FILE--
 <?php
 /* Prototype  : proto string base64_decode(string str[, bool strict])
- * Description: Decodes string using MIME base64 algorithm 
+ * Description: Decodes string using MIME base64 algorithm
  * Source code: ext/standard/base64.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing base64_decode() : error conditions ***\n";
diff --git a/ext/standard/tests/url/base64_decode_variation_001.phpt b/ext/standard/tests/url/base64_decode_variation_001.phpt
index f4906a774a0..7c11ad2c338 100644
--- a/ext/standard/tests/url/base64_decode_variation_001.phpt
+++ b/ext/standard/tests/url/base64_decode_variation_001.phpt
@@ -3,9 +3,9 @@ Test base64_decode() function : usage variations  - unexpected types for arg 1
 --FILE--
 <?php
 /* Prototype  : proto string base64_decode(string str[, bool strict])
- * Description: Decodes string using MIME base64 algorithm 
+ * Description: Decodes string using MIME base64 algorithm
  * Source code: ext/standard/base64.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
@@ -32,44 +32,44 @@ $values =  array (
 	"1" =>  1,
 	"12345" =>  12345,
 	"-2345"	=>  -2345,
-		
+
 	// float data
     "10.5" =>  10.5,
 	"-10.5" => -10.5,
 	"10.1234567e10" =>	10.1234567e10,
 	"10.7654321E-10" => 10.7654321E-10,
 	".5" => .5,
-		
+
     // array data
     "array()" =>   array(),
 	"array(0)" =>  array(0),
 	"array(1)" =>  array(1),
 	"array(1, 2)" => array(1, 2),
 	"array('color' => 'red', 'item' => 'pen'" => array('color' => 'red', 'item' => 'pen'),
-		
+
 	// null data
 	"NULL" => NULL,
 	"null" => null,
-		
+
 	// boolean data
 	"true" => true,
 	"false" => false,
 	"TRUE" => TRUE,
 	"FALSE" => FALSE,
-		
+
 	// empty data
 	"\"\"" => "",
 	"''" => '',
-		
+
 	// object data
 	"stdClass object" => new stdclass(),
-		
+
 	// undefined data
     "undefined variable" => $undefined_var,
-		
+
 	// unset data
 	"unset variable" => $unset_var,
-	
+
 	// resource data
 	"resource" => $file_handle
 );
@@ -79,12 +79,12 @@ $values =  array (
 foreach($values as $key=>$value) {
     echo "\n-- Arg value $key --\n";
     $output =  base64_decode($value, $strict);
-       
-	if (is_string($output)) { 
+
+	if (is_string($output)) {
 		var_dump(bin2hex($output));
     } else {
-        var_dump($output); 
-    }	
+        var_dump($output);
+    }
 };
 
 ?>
diff --git a/ext/standard/tests/url/base64_decode_variation_002.phpt b/ext/standard/tests/url/base64_decode_variation_002.phpt
index 20bf35746bc..6b4628d3bf3 100644
--- a/ext/standard/tests/url/base64_decode_variation_002.phpt
+++ b/ext/standard/tests/url/base64_decode_variation_002.phpt
@@ -3,9 +3,9 @@ Test base64_decode() function : usage variations   - unexpected types for arg 2
 --FILE--
 <?php
 /* Prototype  : proto string base64_decode(string str[, bool strict])
- * Description: Decodes string using MIME base64 algorithm 
+ * Description: Decodes string using MIME base64 algorithm
  * Source code: ext/standard/base64.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
@@ -32,44 +32,44 @@ $values =  array (
 	"1" =>  1,
 	"12345" =>  12345,
 	"-2345"	=>  -2345,
-		
+
 	// float data
     "10.5" =>  10.5,
 	"-10.5" => -10.5,
 	"10.1234567e10" =>	10.1234567e10,
 	"10.7654321E-10" => 10.7654321E-10,
 	".5" => .5,
-		
+
     // array data
     "array()" =>   array(),
 	"array(0)" =>  array(0),
 	"array(1)" =>  array(1),
 	"array(1, 2)" => array(1, 2),
 	"array('color' => 'red', 'item' => 'pen'" => array('color' => 'red', 'item' => 'pen'),
-		
+
 	// null data
 	"NULL" => NULL,
 	"null" => null,
-		
+
 	// boolean data
 	"true" => true,
 	"false" => false,
 	"TRUE" => TRUE,
 	"FALSE" => FALSE,
-		
+
 	// empty data
 	"\"\"" => "",
 	"''" => '',
-		
+
 	// object data
 	"stdClass object" => new stdclass(),
-		
+
 	// undefined data
     "undefined variable" => $undefined_var,
-		
+
 	// unset data
 	"unset variable" => $unset_var,
-	
+
 	// resource data
 	"resource" => $file_handle
 );
diff --git a/ext/standard/tests/url/base64_encode_basic_001.phpt b/ext/standard/tests/url/base64_encode_basic_001.phpt
index 6ab57f4c558..c3cbf12c552 100644
--- a/ext/standard/tests/url/base64_encode_basic_001.phpt
+++ b/ext/standard/tests/url/base64_encode_basic_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test base64_encode() function : basic functionality 
+Test base64_encode() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : proto string base64_encode(string str)
- * Description: Encodes string using MIME base64 algorithm 
+ * Description: Encodes string using MIME base64 algorithm
  * Source code: ext/standard/base64.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/url/base64_encode_basic_002.phpt b/ext/standard/tests/url/base64_encode_basic_002.phpt
index cff8f414250..749757c79f7 100644
--- a/ext/standard/tests/url/base64_encode_basic_002.phpt
+++ b/ext/standard/tests/url/base64_encode_basic_002.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test base64_encode() function : basic functionality - check algorithm round trips 
+Test base64_encode() function : basic functionality - check algorithm round trips
 --FILE--
 <?php
 /* Prototype  : proto string base64_encode(string str)
- * Description: Encodes string using MIME base64 algorithm 
+ * Description: Encodes string using MIME base64 algorithm
  * Source code: ext/standard/base64.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -27,7 +27,7 @@ echo "\n--- Testing base64_encode() with binary string input ---\n";
 $counter = 1;
 foreach($values as $str) {
   	echo "-- Iteration $counter --\n";
-  	
+
   	$enc = base64_encode($str);
 	$dec = base64_decode($enc);
 
@@ -35,7 +35,7 @@ foreach($values as $str) {
 		echo "TEST FAILED\n";
 	} else {
 		echo "TEST PASSED\n";
-	}	
+	}
 
   	$counter ++;
 }
diff --git a/ext/standard/tests/url/base64_encode_error_001.phpt b/ext/standard/tests/url/base64_encode_error_001.phpt
index a8883ac8f91..d87e1483025 100644
--- a/ext/standard/tests/url/base64_encode_error_001.phpt
+++ b/ext/standard/tests/url/base64_encode_error_001.phpt
@@ -3,9 +3,9 @@ Test base64_encode() function : error conditions - wrong number of args
 --FILE--
 <?php
 /* Prototype  : proto string base64_encode(string str)
- * Description: Encodes string using MIME base64 algorithm 
+ * Description: Encodes string using MIME base64 algorithm
  * Source code: ext/standard/base64.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing base64_encode() : error conditions - wrong number of args ***\n";
diff --git a/ext/standard/tests/url/base64_encode_variation_001.phpt b/ext/standard/tests/url/base64_encode_variation_001.phpt
index f632bebf5d9..bdf2bc0dd4a 100644
--- a/ext/standard/tests/url/base64_encode_variation_001.phpt
+++ b/ext/standard/tests/url/base64_encode_variation_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test base64_encode() function : usage variations - unexpected types for argument 1 
+Test base64_encode() function : usage variations - unexpected types for argument 1
 --FILE--
 <?php
 /* Prototype  : proto string base64_encode(string str)
- * Description: Encodes string using MIME base64 algorithm 
+ * Description: Encodes string using MIME base64 algorithm
  * Source code: ext/standard/base64.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing base64_encode() : usage variations ***\n";
diff --git a/ext/standard/tests/url/parse_url_basic_001.phpt b/ext/standard/tests/url/parse_url_basic_001.phpt
index bd4bea5b9c9..53c68e86f18 100644
--- a/ext/standard/tests/url/parse_url_basic_001.phpt
+++ b/ext/standard/tests/url/parse_url_basic_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test parse_url() function: Parse a load of URLs without specifying the component 
+Test parse_url() function: Parse a load of URLs without specifying the component
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a and return its components 
+ * Description: Parse a and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/url/parse_url_basic_002.phpt b/ext/standard/tests/url/parse_url_basic_002.phpt
index eae78febed4..2e5a060a518 100644
--- a/ext/standard/tests/url/parse_url_basic_002.phpt
+++ b/ext/standard/tests/url/parse_url_basic_002.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test parse_url() function: Parse a load of URLs without specifying PHP_URL_SCHEME as the URL component 
+Test parse_url() function: Parse a load of URLs without specifying PHP_URL_SCHEME as the URL component
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a URL and return its components 
+ * Description: Parse a URL and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/url/parse_url_basic_003.phpt b/ext/standard/tests/url/parse_url_basic_003.phpt
index 0ce27b7a2c8..3d5a4a344af 100644
--- a/ext/standard/tests/url/parse_url_basic_003.phpt
+++ b/ext/standard/tests/url/parse_url_basic_003.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test parse_url() function: Parse a load of URLs without specifying PHP_URL_HOST as the URL component 
+Test parse_url() function: Parse a load of URLs without specifying PHP_URL_HOST as the URL component
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a URL and return its components 
+ * Description: Parse a URL and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/url/parse_url_basic_004.phpt b/ext/standard/tests/url/parse_url_basic_004.phpt
index 92d690ae1d5..34e1bde22b5 100644
--- a/ext/standard/tests/url/parse_url_basic_004.phpt
+++ b/ext/standard/tests/url/parse_url_basic_004.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PORT as the URL component 
+Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PORT as the URL component
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a URL and return its components 
+ * Description: Parse a URL and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/url/parse_url_basic_005.phpt b/ext/standard/tests/url/parse_url_basic_005.phpt
index 68162594f1a..aefb33964bc 100644
--- a/ext/standard/tests/url/parse_url_basic_005.phpt
+++ b/ext/standard/tests/url/parse_url_basic_005.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test parse_url() function: Parse a load of URLs without specifying PHP_URL_USER as the URL component 
+Test parse_url() function: Parse a load of URLs without specifying PHP_URL_USER as the URL component
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a URL and return its components 
+ * Description: Parse a URL and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/url/parse_url_basic_006.phpt b/ext/standard/tests/url/parse_url_basic_006.phpt
index 2628559ee51..d348274f02f 100644
--- a/ext/standard/tests/url/parse_url_basic_006.phpt
+++ b/ext/standard/tests/url/parse_url_basic_006.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PASS as the URL component 
+Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PASS as the URL component
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a URL and return its components 
+ * Description: Parse a URL and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/url/parse_url_basic_007.phpt b/ext/standard/tests/url/parse_url_basic_007.phpt
index 15935bb663e..8d871f10bfc 100644
--- a/ext/standard/tests/url/parse_url_basic_007.phpt
+++ b/ext/standard/tests/url/parse_url_basic_007.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PATH as the URL component 
+Test parse_url() function: Parse a load of URLs without specifying PHP_URL_PATH as the URL component
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a URL and return its components 
+ * Description: Parse a URL and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/url/parse_url_basic_008.phpt b/ext/standard/tests/url/parse_url_basic_008.phpt
index 48ea6b92b21..acc7d501edd 100644
--- a/ext/standard/tests/url/parse_url_basic_008.phpt
+++ b/ext/standard/tests/url/parse_url_basic_008.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test parse_url() function: Parse a load of URLs without specifying PHP_URL_QUERY as the URL component 
+Test parse_url() function: Parse a load of URLs without specifying PHP_URL_QUERY as the URL component
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a URL and return its components 
+ * Description: Parse a URL and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/url/parse_url_basic_009.phpt b/ext/standard/tests/url/parse_url_basic_009.phpt
index 19527d87ef3..b5b378cb5f2 100644
--- a/ext/standard/tests/url/parse_url_basic_009.phpt
+++ b/ext/standard/tests/url/parse_url_basic_009.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test parse_url() function: Parse a load of URLs without specifying PHP_URL_FRAGMENT as the URL component 
+Test parse_url() function: Parse a load of URLs without specifying PHP_URL_FRAGMENT as the URL component
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a URL and return its components 
+ * Description: Parse a URL and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/url/parse_url_basic_010.phpt b/ext/standard/tests/url/parse_url_basic_010.phpt
index 3bb2dba1425..05b167cf6db 100644
--- a/ext/standard/tests/url/parse_url_basic_010.phpt
+++ b/ext/standard/tests/url/parse_url_basic_010.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test parse_url() function : check values of URL related constants 
+Test parse_url() function : check values of URL related constants
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a URL and return its components 
+ * Description: Parse a URL and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/standard/tests/url/parse_url_error_001.phpt b/ext/standard/tests/url/parse_url_error_001.phpt
index 0280a87cbc7..c2740dedd9e 100644
--- a/ext/standard/tests/url/parse_url_error_001.phpt
+++ b/ext/standard/tests/url/parse_url_error_001.phpt
@@ -3,9 +3,9 @@ Test parse_url() function : error conditions - wrong number of args
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a URL and return its components 
+ * Description: Parse a URL and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing parse_url() : error conditions ***\n";
diff --git a/ext/standard/tests/url/parse_url_error_002.phpt b/ext/standard/tests/url/parse_url_error_002.phpt
index 45c20f410d9..6131f1a4576 100644
--- a/ext/standard/tests/url/parse_url_error_002.phpt
+++ b/ext/standard/tests/url/parse_url_error_002.phpt
@@ -3,9 +3,9 @@ Test parse_url() function: url component specifier out of range
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a URL and return its components 
+ * Description: Parse a URL and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing parse_url() : error conditions: url component specifier out of range ***\n";
diff --git a/ext/standard/tests/url/parse_url_variation_001.phpt b/ext/standard/tests/url/parse_url_variation_001.phpt
index 0b804eed579..fe04ad4a09f 100644
--- a/ext/standard/tests/url/parse_url_variation_001.phpt
+++ b/ext/standard/tests/url/parse_url_variation_001.phpt
@@ -3,9 +3,9 @@ Test parse_url() function : usage variations  - unexpected type for arg 1.
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a URL and return its components 
+ * Description: Parse a URL and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
diff --git a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt
index b03393ea8ed..0e73ee3637a 100644
--- a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt
+++ b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt
@@ -5,9 +5,9 @@ Test parse_url() function : usage variations  - unexpected type for arg 2.
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a URL and return its components 
+ * Description: Parse a URL and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
diff --git a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt
index 1c24e1f7279..516f804edb8 100644
--- a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt
+++ b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt
@@ -5,9 +5,9 @@ Test parse_url() function : usage variations  - unexpected type for arg 2.
 --FILE--
 <?php
 /* Prototype  : proto mixed parse_url(string url, [int url_component])
- * Description: Parse a URL and return its components 
+ * Description: Parse a URL and return its components
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
diff --git a/ext/standard/tests/url/rawurldecode_error_001.phpt b/ext/standard/tests/url/rawurldecode_error_001.phpt
index 1dcaf40fd49..0fe038caef0 100644
--- a/ext/standard/tests/url/rawurldecode_error_001.phpt
+++ b/ext/standard/tests/url/rawurldecode_error_001.phpt
@@ -3,9 +3,9 @@ Test rawurldecode() function : error conditions - wrong number of args
 --FILE--
 <?php
 /* Prototype  : proto string rawurldecode(string str)
- * Description: Decodes URL-encodes string 
+ * Description: Decodes URL-encodes string
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 // NB: basic functionality tested in tests/strings/001.phpt
diff --git a/ext/standard/tests/url/rawurldecode_variation_001.phpt b/ext/standard/tests/url/rawurldecode_variation_001.phpt
index 9527fe60623..6428b96fcfc 100644
--- a/ext/standard/tests/url/rawurldecode_variation_001.phpt
+++ b/ext/standard/tests/url/rawurldecode_variation_001.phpt
@@ -3,9 +3,9 @@ Test rawurldecode() function : usage variations  - unexpected type for arg 1.
 --FILE--
 <?php
 /* Prototype  : proto string rawurldecode(string str)
- * Description: Decodes URL-encodes string 
+ * Description: Decodes URL-encodes string
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 // NB: basic functionality tested in tests/strings/001.phpt
diff --git a/ext/standard/tests/url/rawurlencode_error_001.phpt b/ext/standard/tests/url/rawurlencode_error_001.phpt
index 7acce9e0c45..f8b3e61c378 100644
--- a/ext/standard/tests/url/rawurlencode_error_001.phpt
+++ b/ext/standard/tests/url/rawurlencode_error_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test rawurlencode() function : error conditions 
+Test rawurlencode() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto string rawurlencode(string str)
- * Description: URL-encodes string 
+ * Description: URL-encodes string
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 // NB: basic functionality tested in tests/strings/001.phpt
diff --git a/ext/standard/tests/url/rawurlencode_variation_001.phpt b/ext/standard/tests/url/rawurlencode_variation_001.phpt
index a3443361ec5..1dabc4bde9d 100644
--- a/ext/standard/tests/url/rawurlencode_variation_001.phpt
+++ b/ext/standard/tests/url/rawurlencode_variation_001.phpt
@@ -3,9 +3,9 @@ Test rawurlencode() function : usage variations  - unexpected type for arg 1.
 --FILE--
 <?php
 /* Prototype  : proto string rawurlencode(string str)
- * Description: URL-encodes string 
+ * Description: URL-encodes string
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 // NB: basic functionality tested in tests/strings/001.phpt
diff --git a/ext/standard/tests/url/urldecode_error_001.phpt b/ext/standard/tests/url/urldecode_error_001.phpt
index f0e5ae08383..b009d7d53e9 100644
--- a/ext/standard/tests/url/urldecode_error_001.phpt
+++ b/ext/standard/tests/url/urldecode_error_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test urldecode() function : error conditions 
+Test urldecode() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto string urldecode(string str)
- * Description: Decodes URL-encoded string 
+ * Description: Decodes URL-encoded string
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 // NB: basic functionality tested in tests/strings/001.phpt
diff --git a/ext/standard/tests/url/urldecode_variation_001.phpt b/ext/standard/tests/url/urldecode_variation_001.phpt
index 42026d103ce..fe538b7072c 100644
--- a/ext/standard/tests/url/urldecode_variation_001.phpt
+++ b/ext/standard/tests/url/urldecode_variation_001.phpt
@@ -3,9 +3,9 @@ Test urldecode() function : usage variations  - <type here specifics of this var
 --FILE--
 <?php
 /* Prototype  : proto string urldecode(string str)
- * Description: Decodes URL-encoded string 
+ * Description: Decodes URL-encoded string
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 // NB: basic functionality tested in tests/strings/001.phpt
diff --git a/ext/standard/tests/url/urlencode_error_001.phpt b/ext/standard/tests/url/urlencode_error_001.phpt
index fc00b057d86..7e43ef73bfc 100644
--- a/ext/standard/tests/url/urlencode_error_001.phpt
+++ b/ext/standard/tests/url/urlencode_error_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test urlencode() function : error conditions 
+Test urlencode() function : error conditions
 --FILE--
 <?php
 /* Prototype  : proto string urlencode(string str)
- * Description: URL-encodes string 
+ * Description: URL-encodes string
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 // NB: basic functionality tested in tests/strings/001.phpt
diff --git a/ext/standard/tests/url/urlencode_variation_001.phpt b/ext/standard/tests/url/urlencode_variation_001.phpt
index 04d0921b2c4..d74209d137a 100644
--- a/ext/standard/tests/url/urlencode_variation_001.phpt
+++ b/ext/standard/tests/url/urlencode_variation_001.phpt
@@ -3,9 +3,9 @@ Test urlencode() function : usage variations  - <type here specifics of this var
 --FILE--
 <?php
 /* Prototype  : proto string urlencode(string str)
- * Description: URL-encodes string 
+ * Description: URL-encodes string
  * Source code: ext/standard/url.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 // NB: basic functionality tested in tests/strings/001.phpt
diff --git a/ext/standard/tests/versioning/php_sapi_name_variation001.phpt b/ext/standard/tests/versioning/php_sapi_name_variation001.phpt
index 4e45870dfca..01f23e7601a 100644
--- a/ext/standard/tests/versioning/php_sapi_name_variation001.phpt
+++ b/ext/standard/tests/versioning/php_sapi_name_variation001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-php_sapi_name() function when switching to webserver by using post 
+php_sapi_name() function when switching to webserver by using post
 --POST--
 foo=BAR
 --CREDITS--
diff --git a/ext/sysvmsg/tests/001.phpt b/ext/sysvmsg/tests/001.phpt
index d3a5b1e3e6d..666ad274e2b 100644
--- a/ext/sysvmsg/tests/001.phpt
+++ b/ext/sysvmsg/tests/001.phpt
@@ -4,7 +4,7 @@ send/receive serialized message.
 <?php // vim600:syn=php
 if (!extension_loaded("sysvmsg")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $key = ftok(dirname(__FILE__) . "/001.phpt", "p");
 $q = msg_get_queue($key);
 msg_send($q, 1, "hello") or print "FAIL\n";
diff --git a/ext/sysvmsg/tests/002.phpt b/ext/sysvmsg/tests/002.phpt
index e603ed02b5e..76f966caa6c 100644
--- a/ext/sysvmsg/tests/002.phpt
+++ b/ext/sysvmsg/tests/002.phpt
@@ -14,7 +14,7 @@ var_dump($res = msg_receive ($queue, 1, $msg_type, 16384, $msg, true, 0, $msg_er
 if (!msg_remove_queue($queue)) {
 	echo "BAD: queue removal failed\n";
 }
-	
+
 echo "Done\n";
 ?>
 --EXPECTF--
diff --git a/ext/sysvmsg/tests/005.phpt b/ext/sysvmsg/tests/005.phpt
index d9437c63e46..a2680c21c0f 100644
--- a/ext/sysvmsg/tests/005.phpt
+++ b/ext/sysvmsg/tests/005.phpt
@@ -13,7 +13,7 @@ foreach ($tests as $q) {
 	do {
 	    $id = ftok(__FILE__, chr(mt_rand(0, 255)));
 	} while (msg_queue_exists($id));
-	
+
 	$q = msg_get_queue($id) or die("Failed to create queue");
 	msg_remove_queue($q) or die("Failed to close queue");
     }
@@ -21,7 +21,7 @@ foreach ($tests as $q) {
     echo "Using '$q' as queue resource:\n";
 
     $errno = 0;
-    
+
     var_dump(msg_set_queue($q, array('msg_qbytes' => 1)));
 
     var_dump(msg_stat_queue($q));
diff --git a/ext/sysvmsg/tests/006.phpt b/ext/sysvmsg/tests/006.phpt
index cb4fd2457ed..2d4976033c3 100644
--- a/ext/sysvmsg/tests/006.phpt
+++ b/ext/sysvmsg/tests/006.phpt
@@ -23,7 +23,7 @@ foreach ($tests as $elem) {
 if (!msg_remove_queue($queue)) {
 	echo "BAD: queue removal failed\n";
 }
-	
+
 echo "Done\n";
 ?>
 --EXPECTF--
diff --git a/ext/sysvshm/tests/001.phpt b/ext/sysvshm/tests/001.phpt
index 778b796dcc6..55fd8eec1dc 100644
--- a/ext/sysvshm/tests/001.phpt
+++ b/ext/sysvshm/tests/001.phpt
@@ -22,7 +22,7 @@ var_dump(ftok(__FILE__,"q"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: ftok() expects exactly 2 parameters, 0 given in %s on line %d
 NULL
 
diff --git a/ext/sysvshm/tests/002.phpt b/ext/sysvshm/tests/002.phpt
index cf83b8228b6..5d9f83bc939 100644
--- a/ext/sysvshm/tests/002.phpt
+++ b/ext/sysvshm/tests/002.phpt
@@ -35,7 +35,7 @@ shm_remove($s);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: shm_attach() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 
diff --git a/ext/sysvshm/tests/003.phpt b/ext/sysvshm/tests/003.phpt
index 9b5ed4ddba0..da461c905c0 100644
--- a/ext/sysvshm/tests/003.phpt
+++ b/ext/sysvshm/tests/003.phpt
@@ -33,7 +33,7 @@ $s = shm_attach($key);
 shm_remove($s);
 
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: shm_detach() expects exactly 1 parameter, 0 given in %s003.php on line %d
 NULL
 
diff --git a/ext/sysvshm/tests/004.phpt b/ext/sysvshm/tests/004.phpt
index 877f9f4a6d4..c163a6dcfc8 100644
--- a/ext/sysvshm/tests/004.phpt
+++ b/ext/sysvshm/tests/004.phpt
@@ -25,7 +25,7 @@ shm_remove($s);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: shm_put_var() expects exactly 3 parameters, 0 given in %s004.php on line %d
 NULL
 
diff --git a/ext/sysvshm/tests/005.phpt b/ext/sysvshm/tests/005.phpt
index 15200c6dd8d..12ba278b2fa 100644
--- a/ext/sysvshm/tests/005.phpt
+++ b/ext/sysvshm/tests/005.phpt
@@ -40,7 +40,7 @@ shm_remove($s);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 
 Warning: shm_get_var() expects exactly 2 parameters, 0 given in %s005.php on line %d
 NULL
diff --git a/ext/sysvshm/tests/006.phpt b/ext/sysvshm/tests/006.phpt
index 1e4ec1c357a..ae23146b052 100644
--- a/ext/sysvshm/tests/006.phpt
+++ b/ext/sysvshm/tests/006.phpt
@@ -28,7 +28,7 @@ var_dump(shm_get_var($s, 1));
 shm_remove($s);
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 
 Warning: shm_remove_var() expects exactly 2 parameters, 0 given in %s006.php on line %d
 NULL
diff --git a/ext/sysvshm/tests/007.phpt b/ext/sysvshm/tests/007.phpt
index 584f13ac7a6..886b8e5b60b 100644
--- a/ext/sysvshm/tests/007.phpt
+++ b/ext/sysvshm/tests/007.phpt
@@ -23,7 +23,7 @@ var_dump(shm_remove($s));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 
 Warning: shm_remove() expects exactly 1 parameter, 0 given in %s007.php on line %d
 NULL
diff --git a/ext/sysvshm/tests/bug72858.phpt b/ext/sysvshm/tests/bug72858.phpt
index 793099f8930..079c8999937 100644
--- a/ext/sysvshm/tests/bug72858.phpt
+++ b/ext/sysvshm/tests/bug72858.phpt
@@ -15,6 +15,6 @@ shm_attach($v1,$v2);
 
 ?>
 ==DONE==
---EXPECTF--	
+--EXPECTF--
 Warning: shm_attach(): failed for key 0x64: Not enough space in %s on line %d
 ==DONE==
diff --git a/ext/sysvshm/tests/shutdown_crash_0.phpt b/ext/sysvshm/tests/shutdown_crash_0.phpt
index c547c7e8592..8509316fa13 100644
--- a/ext/sysvshm/tests/shutdown_crash_0.phpt
+++ b/ext/sysvshm/tests/shutdown_crash_0.phpt
@@ -16,7 +16,7 @@ shm_remove($s);
 var_dump($s = shm_attach($key, 1024));
 shm_remove($s);
 
---EXPECTF--	
+--EXPECTF--
 resource(%d) of type (sysvshm)
 resource(%d) of type (sysvshm)
 
diff --git a/ext/tidy/tests/001.phpt b/ext/tidy/tests/001.phpt
index bfd3782078b..277fd03f5e8 100644
--- a/ext/tidy/tests/001.phpt
+++ b/ext/tidy/tests/001.phpt
@@ -3,7 +3,7 @@ Check for tidy presence
 --SKIPIF--
 <?php if (!extension_loaded("tidy")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 echo "tidy extension is available";
 ?>
 --EXPECT--
diff --git a/ext/tidy/tests/002.phpt b/ext/tidy/tests/002.phpt
index 89c3804b89d..cd06733a2c3 100644
--- a/ext/tidy/tests/002.phpt
+++ b/ext/tidy/tests/002.phpt
@@ -6,7 +6,7 @@ tidy_parse_string()
 <?php
     	$a = tidy_parse_string("<HTML></HTML>");
 		echo tidy_get_output($a);
-	
+
 ?>
 --EXPECT--
 <html>
diff --git a/ext/tidy/tests/003.phpt b/ext/tidy/tests/003.phpt
index 1a63d44dfdd..df4cd18f5f6 100644
--- a/ext/tidy/tests/003.phpt
+++ b/ext/tidy/tests/003.phpt
@@ -3,7 +3,7 @@ tidy_clean_repair()
 --SKIPIF--
 <?php if (!extension_loaded("tidy")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 
 	$a = tidy_parse_string("<HTML></HTML>");
 	tidy_clean_repair($a);
diff --git a/ext/tidy/tests/004.phpt b/ext/tidy/tests/004.phpt
index 9d3cd2ef5a9..0c73b6c687e 100644
--- a/ext/tidy/tests/004.phpt
+++ b/ext/tidy/tests/004.phpt
@@ -3,7 +3,7 @@ tidy_diagnose()
 --SKIPIF--
 <?php if (!extension_loaded("tidy")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $a = tidy_parse_string('<HTML></HTML>');
 var_dump(tidy_diagnose($a));
 echo str_replace("\r", "", tidy_get_error_buffer($a));
diff --git a/ext/tidy/tests/005-mb.phpt b/ext/tidy/tests/005-mb.phpt
index b63ec09635e..1e5f0214631 100644
--- a/ext/tidy/tests/005-mb.phpt
+++ b/ext/tidy/tests/005-mb.phpt
@@ -3,10 +3,10 @@ tidy_parse_file()
 --SKIPIF--
 <?php if (!extension_loaded("tidy")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 	$a = tidy_parse_file(dirname(__FILE__)."/005��ガラスを食�られ��.html");
 	echo tidy_get_output($a);
-	
+
 ?>
 --EXPECT--
 <html>
diff --git a/ext/tidy/tests/005.phpt b/ext/tidy/tests/005.phpt
index 1d3a10c2ffa..144a5862d4f 100644
--- a/ext/tidy/tests/005.phpt
+++ b/ext/tidy/tests/005.phpt
@@ -3,10 +3,10 @@ tidy_parse_file()
 --SKIPIF--
 <?php if (!extension_loaded("tidy")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 	$a = tidy_parse_file(dirname(__FILE__)."/005.html");
 	echo tidy_get_output($a);
-	
+
 ?>
 --EXPECT--
 <html>
diff --git a/ext/tidy/tests/006.phpt b/ext/tidy/tests/006.phpt
index c8261813145..3c00fb452eb 100644
--- a/ext/tidy/tests/006.phpt
+++ b/ext/tidy/tests/006.phpt
@@ -3,10 +3,10 @@ Verbose tidy_get_error_buffer()
 --SKIPIF--
 <?php if (!extension_loaded("tidy")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 	$a = tidy_parse_string("<HTML><asd asdf></HTML>");
 	echo tidy_get_error_buffer($a);
-	
+
 ?>
 --EXPECT--
 line 1 column 1 - Warning: missing <!DOCTYPE> declaration
diff --git a/ext/tidy/tests/008.phpt b/ext/tidy/tests/008.phpt
index 150b98f5607..7c1c945ba0b 100644
--- a/ext/tidy/tests/008.phpt
+++ b/ext/tidy/tests/008.phpt
@@ -3,7 +3,7 @@ Accessing the error buffer via $obj->error_buf...
 --SKIPIF--
 <?php if (!extension_loaded("tidy")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
    	$a = tidy_parse_string("<HTML><asd asdf></HTML>");
 	echo $a->errorBuffer;
 ?>
diff --git a/ext/tidy/tests/009.phpt b/ext/tidy/tests/009.phpt
index 02c65df7cbd..d04a684e8e0 100644
--- a/ext/tidy/tests/009.phpt
+++ b/ext/tidy/tests/009.phpt
@@ -3,11 +3,11 @@ tidy_doc object overloading
 --SKIPIF--
 <?php if (!extension_loaded("tidy")) print "skip"; ?>
 --FILE--
-<?php 
-    
+<?php
+
     $a = tidy_parse_string("<HTML></HTML>");
 	echo $a;
- 
+
 ?>
 --EXPECT--
 <html>
diff --git a/ext/tidy/tests/010.phpt b/ext/tidy/tests/010.phpt
index 695e1c9ce56..42a8676ff6a 100644
--- a/ext/tidy/tests/010.phpt
+++ b/ext/tidy/tests/010.phpt
@@ -3,7 +3,7 @@ Accessing root, body, html, and head nodes..
 --SKIPIF--
 <?php if (!extension_loaded("tidy")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $a = tidy_parse_string("<HTML><BODY BGCOLOR=#FFFFFF ALINK=#000000></BODY></HTML>", array('newline' => 'LF'));
 var_dump($a->root());
 var_dump($a->body());
diff --git a/ext/tidy/tests/011.phpt b/ext/tidy/tests/011.phpt
index 2a946167590..f664c50a3e2 100644
--- a/ext/tidy/tests/011.phpt
+++ b/ext/tidy/tests/011.phpt
@@ -3,7 +3,7 @@ Accessing attributes of a node
 --SKIPIF--
 <?php if (!extension_loaded("tidy")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
     	$a = tidy_parse_string("<HTML><BODY BGCOLOR=#FFFFFF ALINK=#000000></BODY></HTML>");
         $body = $a->body();
         var_dump($body->attribute);
diff --git a/ext/tidy/tests/012.phpt b/ext/tidy/tests/012.phpt
index e86aa6c45c2..eae6eca44c9 100644
--- a/ext/tidy/tests/012.phpt
+++ b/ext/tidy/tests/012.phpt
@@ -28,7 +28,7 @@ Accessing children nodes
     	$a = tidy_parse_string("<HTML><BODY BGCOLOR=#FFFFFF ALINK=#000000><B>Hi</B><I>Bye<U>Test</U></I></BODY></HTML>", array('newline' => 'LF'));
         $html = $a->html();
         dump_nodes($html);
-            
+
 ?>
 --EXPECTF--
 bool(true)
diff --git a/ext/tidy/tests/014.phpt b/ext/tidy/tests/014.phpt
index a391b3dc9eb..a2389f0b7e8 100644
--- a/ext/tidy/tests/014.phpt
+++ b/ext/tidy/tests/014.phpt
@@ -8,7 +8,7 @@ Passing configuration options through tidy_parse_string().
     	$tidy = tidy_parse_string($text, array('show-body-only'=>true));
     	tidy_clean_repair($tidy);
     	echo tidy_get_output($tidy);
-            
+
 ?>
 --EXPECT--
 <b>testing</b>
\ No newline at end of file
diff --git a/ext/tidy/tests/015.phpt b/ext/tidy/tests/015.phpt
index 03018ffa198..ae2e9d3b02f 100644
--- a/ext/tidy/tests/015.phpt
+++ b/ext/tidy/tests/015.phpt
@@ -7,7 +7,7 @@ Passing configuration options through tidy_parse_file().
         $tidy = tidy_parse_file(dirname(__FILE__)."/015.html", array('show-body-only'=>true));
     	tidy_clean_repair($tidy);
     	echo tidy_get_output($tidy);
-            
+
 ?>
 --EXPECT--
 <b>testing</b>
\ No newline at end of file
diff --git a/ext/tidy/tests/018.phpt b/ext/tidy/tests/018.phpt
index 405a46d42b2..d2f1d1e0f3f 100644
--- a/ext/tidy/tests/018.phpt
+++ b/ext/tidy/tests/018.phpt
@@ -4,8 +4,8 @@ binary safety
 <?php if (!extension_loaded("tidy")) print "skip"; ?>
 --FILE--
 <?php
-$x = tidy_repair_string("<p>abra\0cadabra</p>", 
-	array(	'show-body-only' => true, 
+$x = tidy_repair_string("<p>abra\0cadabra</p>",
+	array(	'show-body-only' => true,
 			'clean' => false,
 			'newline' => "\n")
 	);
diff --git a/ext/tidy/tests/019.phpt b/ext/tidy/tests/019.phpt
index 5e9c38d75a3..188b8cd4e9e 100644
--- a/ext/tidy/tests/019.phpt
+++ b/ext/tidy/tests/019.phpt
@@ -21,7 +21,7 @@ tidy_repair_file($a, $a, $a, $a);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: tidy_repair_string(): Could not load configuration file '1' in %s on line %d
 
 Warning: tidy_repair_string(): Could not set encoding '1' in %s on line %d
diff --git a/ext/tidy/tests/022.phpt b/ext/tidy/tests/022.phpt
index 5e9c38d75a3..188b8cd4e9e 100644
--- a/ext/tidy/tests/022.phpt
+++ b/ext/tidy/tests/022.phpt
@@ -21,7 +21,7 @@ tidy_repair_file($a, $a, $a, $a);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: tidy_repair_string(): Could not load configuration file '1' in %s on line %d
 
 Warning: tidy_repair_string(): Could not set encoding '1' in %s on line %d
diff --git a/ext/tidy/tests/029.phpt b/ext/tidy/tests/029.phpt
index 1709cd6f09b..e46181f005b 100644
--- a/ext/tidy/tests/029.phpt
+++ b/ext/tidy/tests/029.phpt
@@ -13,7 +13,7 @@ $inputs = array(
 );
 
 
-foreach ($inputs as $input) { 
+foreach ($inputs as $input) {
 
 	$t = tidy_parse_string($input);
 	$t->cleanRepair();
diff --git a/ext/tokenizer/tests/001.phpt b/ext/tokenizer/tests/001.phpt
index 2f0fb6fc2dc..3f035cb22e3 100644
--- a/ext/tokenizer/tests/001.phpt
+++ b/ext/tokenizer/tests/001.phpt
@@ -131,7 +131,7 @@ echo token_name(array()), "\n";
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 T_INCLUDE
 T_INCLUDE_ONCE
 T_EVAL
diff --git a/ext/tokenizer/tests/003.phpt b/ext/tokenizer/tests/003.phpt
index fdcf7748a84..3ba6d594dfa 100644
--- a/ext/tokenizer/tests/003.phpt
+++ b/ext/tokenizer/tests/003.phpt
@@ -13,7 +13,7 @@ var_dump(token_get_all(-1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: token_get_all() expects parameter 1 to be string, array given in %s on line %d
 NULL
 
diff --git a/ext/tokenizer/tests/bug54089.phpt b/ext/tokenizer/tests/bug54089.phpt
index 77a4c1f3247..ff461ecb788 100644
--- a/ext/tokenizer/tests/bug54089.phpt
+++ b/ext/tokenizer/tests/bug54089.phpt
@@ -15,7 +15,7 @@ $codes = array(
 foreach ($codes as $code) {
 	$tokens = token_get_all($code);
 	var_dump($tokens);
-	
+
 	$code = '';
 	foreach ($tokens as $t)
 	{
diff --git a/ext/tokenizer/tests/token_get_all_basic.phpt b/ext/tokenizer/tests/token_get_all_basic.phpt
index 7af8109f896..2e3b1b46727 100644
--- a/ext/tokenizer/tests/token_get_all_basic.phpt
+++ b/ext/tokenizer/tests/token_get_all_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test token_get_all() function : basic functionality 
+Test token_get_all() function : basic functionality
 --SKIPIF--
 <?php if (!extension_loaded("tokenizer")) print "skip"; ?>
 --FILE--
diff --git a/ext/tokenizer/tests/token_get_all_error.phpt b/ext/tokenizer/tests/token_get_all_error.phpt
index 9ded0a17742..35b5048b6be 100644
--- a/ext/tokenizer/tests/token_get_all_error.phpt
+++ b/ext/tokenizer/tests/token_get_all_error.phpt
@@ -1,11 +1,11 @@
 --TEST--
-Test token_get_all() function : error conditions 
+Test token_get_all() function : error conditions
 --SKIPIF--
 <?php if (!extension_loaded("tokenizer")) print "skip"; ?>
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
- * Description: splits the given source into an array of PHP languange tokens 
+ * Description: splits the given source into an array of PHP languange tokens
  * Source code: ext/tokenizer/tokenizer.c
 */
 
diff --git a/ext/tokenizer/tests/token_get_all_variation1.phpt b/ext/tokenizer/tests/token_get_all_variation1.phpt
index 276453fd157..14ece715eb5 100644
--- a/ext/tokenizer/tests/token_get_all_variation1.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation1.phpt
@@ -5,7 +5,7 @@ Test token_get_all() function : usage variations - unexpected values for 'source
 --FILE--
 <?php
 /* Prototype  : array token_get_all(string $source)
- * Description: splits the given source into an array of PHP languange tokens 
+ * Description: splits the given source into an array of PHP languange tokens
  * Source code: ext/tokenizer/tokenizer.c
 */
 
@@ -71,7 +71,7 @@ $source_values = array(
 
        // object data
 /*23*/ new MyClass(),
- 
+
        // resource data
        $fp,
 
diff --git a/ext/tokenizer/tests/token_get_all_variation10.phpt b/ext/tokenizer/tests/token_get_all_variation10.phpt
index 55e9d7edf82..af2e413d387 100644
--- a/ext/tokenizer/tests/token_get_all_variation10.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation10.phpt
@@ -25,17 +25,17 @@ $b = 0;
 
 $source = array (
   // int const
-  '<?php $a = 1 + 034; $b = $a + 0x3F; ?>', 
-  
+  '<?php $a = 1 + 034; $b = $a + 0x3F; ?>',
+
   // float const
   '<?php $a = 0.23E-2 + 0.43e2 + 0.5; ?>',
 
   // string const
-  '<?php $a = "hello ".\'world\'; ?>',  
+  '<?php $a = "hello ".\'world\'; ?>',
 
   // bool const
-  "<?php \$a = (\$b)? true : false; ?>",  
-  "<?php \$b = (\$a)? FALSE : TRUE; ?>",  
+  "<?php \$a = (\$b)? true : false; ?>",
+  "<?php \$b = (\$a)? FALSE : TRUE; ?>",
 
   // null const
   '<?php $b = null | NULL; ?>'
diff --git a/ext/tokenizer/tests/token_get_all_variation11.phpt b/ext/tokenizer/tests/token_get_all_variation11.phpt
index 98d89961b77..146e433e12c 100644
--- a/ext/tokenizer/tests/token_get_all_variation11.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation11.phpt
@@ -10,7 +10,7 @@ Test token_get_all() function : usage variations - with control structure tokens
 */
 
 /*
- * Using different control structure keywords 
+ * Using different control structure keywords
  *   if..else, elseif - T_IF(301), T_ELSEIF(302), T_ELSE(303)
  *   while - T_WHILE(318)
  *   do...while - T_DO(317)
diff --git a/ext/tokenizer/tests/token_get_all_variation13.phpt b/ext/tokenizer/tests/token_get_all_variation13.phpt
index 6f85492a99a..4c792d59a9c 100644
--- a/ext/tokenizer/tests/token_get_all_variation13.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation13.phpt
@@ -11,12 +11,12 @@ Test token_get_all() function : usage variations - with class/object constructs
 
 /*
  * Testing token_get_all() with different class/object keywords
- *   scope related : 
+ *   scope related :
  *     static - T_STATIC(346), global - T_GLOBAL(340),
  *     private - T_PRIVATE(343), public - T_PUBLIC(341),
  *     protected - T_PROTECTED(342)
- *   class/object related : 
- *     var - T_VAR(347), abstract - T_ABSTRACT(345), 
+ *   class/object related :
+ *     var - T_VAR(347), abstract - T_ABSTRACT(345),
  *     interface - T_INTERFACE(353), class - T_CLASS(352),
  *     extends - T_EXTENDS(354), implements - T_IMPLEMENTS(355), new - T_NEW(299)
 */
diff --git a/ext/tokenizer/tests/token_get_all_variation15.phpt b/ext/tokenizer/tests/token_get_all_variation15.phpt
index fbb50dee862..56269f5d014 100644
--- a/ext/tokenizer/tests/token_get_all_variation15.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation15.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test token_get_all() function : usage variations - heredoc string for 'source' 
+Test token_get_all() function : usage variations - heredoc string for 'source'
 --SKIPIF--
 <?php if (!extension_loaded("tokenizer")) print "skip"; ?>
 --INI--
diff --git a/ext/tokenizer/tests/token_get_all_variation16.phpt b/ext/tokenizer/tests/token_get_all_variation16.phpt
index db9bde1ad62..88fa59760fb 100644
--- a/ext/tokenizer/tests/token_get_all_variation16.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation16.phpt
@@ -12,11 +12,11 @@ Test token_get_all() function : usage variations - with function constructs
 /*
  * Testing token_get_all() with different function keywords
  *   function - T_FUNCTION(333), return - T_RETURN(335)
- *   different functions: 
- *     include() - T_INCLUDE(262), print() - T_PRINT(266), 
- *     isset() - T_ISSET(349), list() - T_LIST(358), 
- *     require() - T_REQUIRE(259), empty() - T_EMPTY(350), 
- *     declare() - T_DECLARE(324), array() - T_ARRAY(359), 
+ *   different functions:
+ *     include() - T_INCLUDE(262), print() - T_PRINT(266),
+ *     isset() - T_ISSET(349), list() - T_LIST(358),
+ *     require() - T_REQUIRE(259), empty() - T_EMPTY(350),
+ *     declare() - T_DECLARE(324), array() - T_ARRAY(359),
  *      __halt_compiler() - T_HALT_COMPILER(351)
 */
 
diff --git a/ext/tokenizer/tests/token_get_all_variation17.phpt b/ext/tokenizer/tests/token_get_all_variation17.phpt
index d34508a8d56..bc9f3df65b8 100644
--- a/ext/tokenizer/tests/token_get_all_variation17.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation17.phpt
@@ -11,7 +11,7 @@ Test token_get_all() function : usage variations - with exception keywords
 
 /*
  * Testing token_get_all() with different exception keywords
- *   try - T_TRY(336), 
+ *   try - T_TRY(336),
  *   catch - T_CATCH(337),
  *   throw - T_THROW(338)
 */
diff --git a/ext/tokenizer/tests/token_get_all_variation18.phpt b/ext/tokenizer/tests/token_get_all_variation18.phpt
index 01219ffaa4c..7da1eaac81e 100644
--- a/ext/tokenizer/tests/token_get_all_variation18.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation18.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test token_get_all() function : usage variations - with HTML code 
+Test token_get_all() function : usage variations - with HTML code
 --SKIPIF--
 <?php if (!extension_loaded("tokenizer")) print "skip"; ?>
 --FILE--
diff --git a/ext/tokenizer/tests/token_get_all_variation19.phpt b/ext/tokenizer/tests/token_get_all_variation19.phpt
index 9ae6759a8fe..6f4f7b68b34 100644
--- a/ext/tokenizer/tests/token_get_all_variation19.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation19.phpt
@@ -33,7 +33,7 @@ for ($i = 0; $i < 10; $i++) {
 $token_array = token_get_all($phpstr);
 
 $script = "";
-// reconstruct a script (without open/close tags) from the token array 
+// reconstruct a script (without open/close tags) from the token array
 foreach ($token_array as $token) {
 	if (is_array($token)) {
 		if (strncmp($token[1], '<?php', 5) == 0) {
diff --git a/ext/tokenizer/tests/token_get_all_variation2.phpt b/ext/tokenizer/tests/token_get_all_variation2.phpt
index 1f206260c78..401fb7d0950 100644
--- a/ext/tokenizer/tests/token_get_all_variation2.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation2.phpt
@@ -17,7 +17,7 @@ Test token_get_all() function : usage variations - with different arithmetic ope
 
 echo "*** Testing token_get_all() : 'source' string with different arithmetic operators ***\n";
 
-// arithmetic operators - '+', '-', '*', '/', '%' 
+// arithmetic operators - '+', '-', '*', '/', '%'
 $source = array (
   '<?php $a = 1 + 2; ?>',
   '<?php $b = $b - 2; ?>',
diff --git a/ext/tokenizer/tests/token_get_all_variation3.phpt b/ext/tokenizer/tests/token_get_all_variation3.phpt
index 66cf4aa87f0..f00ed7966fd 100644
--- a/ext/tokenizer/tests/token_get_all_variation3.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation3.phpt
@@ -11,16 +11,16 @@ Test token_get_all() function : usage variations - with logical operators
 
 /*
  * Passing 'source' argument with different logical operators to test them for tokens
- *   and - T_AND_LOGICAL_AND(265), 
- *   or - T_LOGICAL_OR(263), 
- *   xor - T_LOGICAL_XOR(264), 
- *   && - T_BOOLEAN_AND(279), 
+ *   and - T_AND_LOGICAL_AND(265),
+ *   or - T_LOGICAL_OR(263),
+ *   xor - T_LOGICAL_XOR(264),
+ *   && - T_BOOLEAN_AND(279),
  *   || - T_BOOLEAN_OR(278)
 */
 
 echo "*** Testing token_get_all() : 'source' string with different logical operators ***\n";
 
-// logical operators : 'and', 'or', 'xor', '&&', '||' 
+// logical operators : 'and', 'or', 'xor', '&&', '||'
 $source = array (
   '<?php $a = 1 and 024; ?>',
   '<?php $b = $b or 0X1E; ?>',
diff --git a/ext/tokenizer/tests/token_get_all_variation4.phpt b/ext/tokenizer/tests/token_get_all_variation4.phpt
index 6bc111efbac..1ebafaec3ae 100644
--- a/ext/tokenizer/tests/token_get_all_variation4.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation4.phpt
@@ -11,7 +11,7 @@ Test token_get_all() function : usage variations - with comparison operators
 
 /*
  * Passing 'source' argument with different comparison operators to test them for tokens
- *  == - T_IS_EQUAL(283), === - T_IS_IDENTICAL(281), 
+ *  == - T_IS_EQUAL(283), === - T_IS_IDENTICAL(281),
  *  >= - T_IS_GREATER_OR_EQUAL(284), <= - T_IS_LESS_OR_EQUAL(285)
  *  != - T_IS_NOT_EQUAL, <> - T_IS_NOT_EQUAL(282), !== - T_IS_NOT_IDENTICAL(280)
 */
diff --git a/ext/tokenizer/tests/token_get_all_variation5.phpt b/ext/tokenizer/tests/token_get_all_variation5.phpt
index 681fb48e573..2d8121fd80e 100644
--- a/ext/tokenizer/tests/token_get_all_variation5.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation5.phpt
@@ -11,7 +11,7 @@ Test token_get_all() function : usage variations - with assignment operators
 
 /*
  * Passing 'source' argument with different assignment operators to test them for tokens
- *  += - T_PLUS_EQUAL(277), -= - T_MINUS-EQUAL(276), 
+ *  += - T_PLUS_EQUAL(277), -= - T_MINUS-EQUAL(276),
  *  *= - T_MUL_EQUAL(275), /= - T_DIVIDE_EQUAL(274),
  *  %= - T_MOD_EQUAL(272), &= - T_AND_EQUAL(271),
  *  |= - T_OR_EQUAL(271), ^= - T_EXOR_EQUAL(269),
diff --git a/ext/wddx/tests/bug27287.phpt b/ext/wddx/tests/bug27287.phpt
index 72ac317aa07..f709b71a991 100644
--- a/ext/wddx/tests/bug27287.phpt
+++ b/ext/wddx/tests/bug27287.phpt
@@ -4,12 +4,12 @@ Bug #27287 (segfault with deserializing object data)
 <?php if (!extension_loaded("wddx")) print "skip"; ?>
 --FILE--
 <?php
-	
+
 	class foo {
 	}
 	$foo = new foo();
 	$foo->abc = 'def';
-	
+
 	$string = wddx_serialize_value($foo);
 	$bar = wddx_deserialize($string);
 
diff --git a/ext/wddx/tests/bug35410.phpt b/ext/wddx/tests/bug35410.phpt
index 3b4b9b62cf6..27655c7bdc7 100644
--- a/ext/wddx/tests/bug35410.phpt
+++ b/ext/wddx/tests/bug35410.phpt
@@ -1,8 +1,8 @@
 --TEST--
 #35410 (wddx_deserialize() doesn't handle large ints as keys properly)
 --SKIPIF--
-<?php 
-	if (!extension_loaded("wddx")) print "skip"; 
+<?php
+	if (!extension_loaded("wddx")) print "skip";
     if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
diff --git a/ext/wddx/tests/bug35410_64bit.phpt b/ext/wddx/tests/bug35410_64bit.phpt
index 15377b175ea..8514170fcbf 100644
--- a/ext/wddx/tests/bug35410_64bit.phpt
+++ b/ext/wddx/tests/bug35410_64bit.phpt
@@ -1,8 +1,8 @@
 --TEST--
 #35410 (wddx_deserialize() doesn't handle large ints as keys properly)
 --SKIPIF--
-<?php 
-	if (!extension_loaded("wddx")) print "skip"; 
+<?php
+	if (!extension_loaded("wddx")) print "skip";
 	if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
diff --git a/ext/wddx/tests/bug70661.phpt b/ext/wddx/tests/bug70661.phpt
index e068c20a7a0..702f785bf03 100644
--- a/ext/wddx/tests/bug70661.phpt
+++ b/ext/wddx/tests/bug70661.phpt
@@ -43,12 +43,12 @@ var_dump($y);
 function ptr2str($ptr)
 {
 	$out = '';
-	
+
 	for ($i = 0; $i < 8; $i++) {
 		$out .= chr($ptr & 0xff);
 		$ptr >>= 8;
 	}
-	
+
 	return $out;
 }
 ?>
diff --git a/ext/wddx/tests/bug73065.phpt b/ext/wddx/tests/bug73065.phpt
index aa301aa8382..fcee1f7a84b 100644
--- a/ext/wddx/tests/bug73065.phpt
+++ b/ext/wddx/tests/bug73065.phpt
@@ -25,7 +25,7 @@ $xml1 = <<<XML
         </array>
     </wddxPacket>
 XML;
-    
+
 $xml2 = <<<XML
 <?xml version='1.0' ?>
     <!DOCTYPE et SYSTEM 'w'>
diff --git a/ext/xml/tests/bug26528.phpt b/ext/xml/tests/bug26528.phpt
index 40a1c53c9b4..96da841004c 100644
--- a/ext/xml/tests/bug26528.phpt
+++ b/ext/xml/tests/bug26528.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #26528 (HTML entities are not being decoded)
 --SKIPIF--
-<?php 
+<?php
 require_once("skipif.inc");
 ?>
 --FILE--
diff --git a/ext/xml/tests/bug26614.phpt b/ext/xml/tests/bug26614.phpt
index e1df1bbfde7..c95997a8a6c 100644
--- a/ext/xml/tests/bug26614.phpt
+++ b/ext/xml/tests/bug26614.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Bug #26614 (CDATA sections skipped on line count)
 --SKIPIF--
-<?php 
+<?php
 require_once("skipif.inc");
-if (defined("LIBXML_VERSION")) die('skip expat test'); 
+if (defined("LIBXML_VERSION")) die('skip expat test');
 ?>
 --FILE--
 <?php
@@ -42,7 +42,7 @@ block
 -->
 </data>';
 
-// Case 3: replace even more characters so that only textual data is left 
+// Case 3: replace even more characters so that only textual data is left
 $xmls["Text"] ='<?xml version="1.0" encoding="iso-8859-1" ?>
 <data>
 -!-- ATA[
@@ -68,7 +68,7 @@ function endElement($parser, $name) {
 }
 
 function characterData($parser, $data) {
-  // dummy 
+  // dummy
 }
 
 foreach ($xmls as $desc => $xml) {
@@ -76,7 +76,7 @@ foreach ($xmls as $desc => $xml) {
 	$xml_parser = xml_parser_create();
 	xml_set_element_handler($xml_parser, "startElement", "endElement");
 	xml_set_character_data_handler($xml_parser, "characterData");
-	if (!xml_parse($xml_parser, $xml, true)) 
+	if (!xml_parse($xml_parser, $xml, true))
 		echo "Error: ".xml_error_string(xml_get_error_code($xml_parser))."\n";
 	xml_parser_free($xml_parser);
 }
diff --git a/ext/xml/tests/bug26614_libxml.phpt b/ext/xml/tests/bug26614_libxml.phpt
index 782bdb19366..3ddd35ed0ea 100644
--- a/ext/xml/tests/bug26614_libxml.phpt
+++ b/ext/xml/tests/bug26614_libxml.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Bug #26614 (CDATA sections skipped on line count)
 --SKIPIF--
-<?php 
+<?php
 require_once("skipif.inc");
-if (!defined("LIBXML_VERSION")) die('skip libxml2 test'); 
+if (!defined("LIBXML_VERSION")) die('skip libxml2 test');
 ?>
 --FILE--
 <?php
@@ -42,7 +42,7 @@ block
 -->
 </data>';
 
-// Case 3: replace even more characters so that only textual data is left 
+// Case 3: replace even more characters so that only textual data is left
 $xmls["Text"] ='<?xml version="1.0" encoding="iso-8859-1" ?>
 <data>
 -!-- ATA[
@@ -68,7 +68,7 @@ function endElement($parser, $name) {
 }
 
 function characterData($parser, $data) {
-  // dummy 
+  // dummy
 }
 
 foreach ($xmls as $desc => $xml) {
@@ -76,7 +76,7 @@ foreach ($xmls as $desc => $xml) {
 	$xml_parser = xml_parser_create();
 	xml_set_element_handler($xml_parser, "startElement", "endElement");
 	xml_set_character_data_handler($xml_parser, "characterData");
-	if (!xml_parse($xml_parser, $xml, true)) 
+	if (!xml_parse($xml_parser, $xml, true))
 		echo "Error: ".xml_error_string(xml_get_error_code($xml_parser))."\n";
 	xml_parser_free($xml_parser);
 }
diff --git a/ext/xml/tests/bug27908.phpt b/ext/xml/tests/bug27908.phpt
index e60466fa19f..b1e583efa1c 100644
--- a/ext/xml/tests/bug27908.phpt
+++ b/ext/xml/tests/bug27908.phpt
@@ -7,14 +7,14 @@ require_once("skipif.inc");
 --FILE--
 <?php
 
-function x_default_handler($xp,$data) 
-{ 
-    echo "x_default_handler $data\n"; 
-} 
-$xp = xml_parser_create(); 
-xml_set_default_handler($xp,'x_default_handler'); 
-xml_parse($xp, '<root></root>',TRUE); 
-xml_parser_free($xp); 
+function x_default_handler($xp,$data)
+{
+    echo "x_default_handler $data\n";
+}
+$xp = xml_parser_create();
+xml_set_default_handler($xp,'x_default_handler');
+xml_parse($xp, '<root></root>',TRUE);
+xml_parser_free($xp);
 echo "Done\n";
 ?>
 --EXPECT--
diff --git a/ext/xml/tests/bug30266.phpt b/ext/xml/tests/bug30266.phpt
index 0a3a5ca46bf..2cf0a68cde9 100644
--- a/ext/xml/tests/bug30266.phpt
+++ b/ext/xml/tests/bug30266.phpt
@@ -43,7 +43,7 @@ class XML_Parser
 
 $p1 = new Xml_Parser();
 try {
-    $p1->parse('<tag1><tag2></tag2></tag1>'); 
+    $p1->parse('<tag1><tag2></tag2></tag1>');
 } catch (Exception $e) {
 	echo "OK\n";
 }
diff --git a/ext/xml/tests/bug32001.phpt b/ext/xml/tests/bug32001.phpt
index 2e9e67d4ca4..ff27038a8d3 100644
--- a/ext/xml/tests/bug32001.phpt
+++ b/ext/xml/tests/bug32001.phpt
@@ -122,7 +122,7 @@ HERE;
 		echo "Chunk size: ".($this->chunk_size ? "$this->chunk_size byte(s)\n": "all data at once\n");
 		echo "BOM: ".($this->bom ? 'prepended': 'not prepended'), "\n";
 
-		if ($success) { 
+		if ($success) {
 			var_dump($this->tags);
 		} else {
 			echo "[Error] ", xml_error_string(xml_get_error_code($parser)), "\n";
@@ -155,7 +155,7 @@ $suite = array(
 if (XML_SAX_IMPL == 'libxml') {
   echo "libxml2 Version => " . LIBXML_DOTTED_VERSION. "\n";
 } else {
-  echo "libxml2 Version => NONE\n";  
+  echo "libxml2 Version => NONE\n";
 }
 
 foreach ($suite as $testcase) {
diff --git a/ext/xml/tests/bug32001b.phpt b/ext/xml/tests/bug32001b.phpt
index ddf26ce3cb0..21c20e40de6 100644
--- a/ext/xml/tests/bug32001b.phpt
+++ b/ext/xml/tests/bug32001b.phpt
@@ -78,7 +78,7 @@ HERE;
 		echo "Chunk size: ".($this->chunk_size ? "$this->chunk_size byte(s)\n": "all data at once\n");
 		echo "BOM: ".($this->bom ? 'prepended': 'not prepended'), "\n";
 
-		if ($success) { 
+		if ($success) {
 			var_dump($this->tags);
 		} else {
 			echo "[Error] ", xml_error_string(xml_get_error_code($parser)), "\n";
@@ -97,7 +97,7 @@ $suite = array(
 if (XML_SAX_IMPL == 'libxml') {
   echo "libxml2 Version => " . LIBXML_DOTTED_VERSION. "\n";
 } else {
-  echo "libxml2 Version => NONE\n";  
+  echo "libxml2 Version => NONE\n";
 }
 
 foreach ($suite as $testcase) {
diff --git a/ext/xml/tests/xml001.phpt b/ext/xml/tests/xml001.phpt
index 987991e8a8e..6d22e5526f5 100644
--- a/ext/xml/tests/xml001.phpt
+++ b/ext/xml/tests/xml001.phpt
@@ -16,7 +16,7 @@ xml_set_character_data_handler($xml_parser, "characterData");
 xml_set_processing_instruction_handler($xml_parser, "PIHandler");
 xml_set_default_handler($xml_parser, "defaultHandler");
 xml_set_external_entity_ref_handler($xml_parser, "externalEntityRefHandler");
-    
+
 if (!($fp = @fopen("xmltest.xml", "r"))) {
     die("could not open XML input");
 }
diff --git a/ext/xml/tests/xml003.phpt b/ext/xml/tests/xml003.phpt
index 973431104b3..dd5d8d1e44f 100644
--- a/ext/xml/tests/xml003.phpt
+++ b/ext/xml/tests/xml003.phpt
@@ -11,7 +11,7 @@ chdir(dirname(__FILE__));
 
 class myclass
 {
-	function startElement($parser, $name, $attribs) 
+	function startElement($parser, $name, $attribs)
 	{
 		print '{'.$name;
 		if (sizeof($attribs)) {
diff --git a/ext/xml/tests/xml007.phpt b/ext/xml/tests/xml007.phpt
index 377475bb1c5..1b2510591cb 100644
--- a/ext/xml/tests/xml007.phpt
+++ b/ext/xml/tests/xml007.phpt
@@ -16,8 +16,8 @@ function startHandler($parser,$tag,$attr)
 }
 
 function endHandler($parser,$tag)
-{ 
-	var_dump($tag); 
+{
+	var_dump($tag);
 }
 
 $xmldata = '<?xml version="1.0" encoding="ISO-8859-1"?><äöü üäß="Üäß">ÄÖÜ</äöü>';
diff --git a/ext/xml/tests/xml010.phpt b/ext/xml/tests/xml010.phpt
index e9684421234..511129c699f 100644
--- a/ext/xml/tests/xml010.phpt
+++ b/ext/xml/tests/xml010.phpt
@@ -9,7 +9,7 @@ if (! @xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is n
 <?php
 function start_elem($parser,$name,$attribs) {
 	print "$name ";
-    
+
     foreach($attribs as $key => $value) {
         print "$key = $value ";
     }
diff --git a/ext/xml/tests/xml_error_string_error.phpt b/ext/xml/tests/xml_error_string_error.phpt
index 866346fdd2b..369e3cfb7c5 100644
--- a/ext/xml/tests/xml_error_string_error.phpt
+++ b/ext/xml/tests/xml_error_string_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_error_string() function : error conditions 
+Test xml_error_string() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto string xml_error_string(int code)
- * Description: Get XML parser error string 
+ * Description: Get XML parser error string
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_error_string() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_error_string_variation1.phpt b/ext/xml/tests/xml_error_string_variation1.phpt
index c97d995cf5c..2f1c50bcce7 100644
--- a/ext/xml/tests/xml_error_string_variation1.phpt
+++ b/ext/xml/tests/xml_error_string_variation1.phpt
@@ -3,15 +3,15 @@ Test xml_error_string() function : usage variations  - test different types for
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only");
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto string xml_error_string(int code)
- * Description: Get XML parser error string 
+ * Description: Get XML parser error string
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_error_string() : usage variations ***\n";
diff --git a/ext/xml/tests/xml_get_current_byte_index_error.phpt b/ext/xml/tests/xml_get_current_byte_index_error.phpt
index 74fa2e7dd1f..3e837ef8b58 100644
--- a/ext/xml/tests/xml_get_current_byte_index_error.phpt
+++ b/ext/xml/tests/xml_get_current_byte_index_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_get_current_byte_index() function : error conditions 
+Test xml_get_current_byte_index() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_current_byte_index(resource parser)
- * Description: Get current byte index for an XML parser 
+ * Description: Get current byte index for an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_get_current_byte_index() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
index 2214c86ffa2..bf6f43fce2c 100644
--- a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_get_current_byte_index() function : usage variations  - <type here specifics of this variation>
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_current_byte_index(resource parser)
- * Description: Get current byte index for an XML parser 
+ * Description: Get current byte index for an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_get_current_byte_index() : usage variations ***\n";
@@ -73,9 +73,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_get_current_column_number_error.phpt b/ext/xml/tests/xml_get_current_column_number_error.phpt
index 1fd28cc0b2a..547b0248a70 100644
--- a/ext/xml/tests/xml_get_current_column_number_error.phpt
+++ b/ext/xml/tests/xml_get_current_column_number_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_get_current_column_number() function : error conditions 
+Test xml_get_current_column_number() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_current_column_number(resource parser)
- * Description: Get current column number for an XML parser 
+ * Description: Get current column number for an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_get_current_column_number() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_get_current_column_number_variation1.phpt b/ext/xml/tests/xml_get_current_column_number_variation1.phpt
index afcac48c4b2..3f59852fac6 100644
--- a/ext/xml/tests/xml_get_current_column_number_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_column_number_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_get_current_column_number() function : usage variations 
+Test xml_get_current_column_number() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
-?> 
+	print "skip - XML extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_current_column_number(resource parser)
- * Description: Get current column number for an XML parser 
+ * Description: Get current column number for an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
@@ -74,9 +74,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_get_current_line_number_error.phpt b/ext/xml/tests/xml_get_current_line_number_error.phpt
index 282c120f0f2..db4fe9fdaf6 100644
--- a/ext/xml/tests/xml_get_current_line_number_error.phpt
+++ b/ext/xml/tests/xml_get_current_line_number_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_get_current_line_number() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
-?> 
+	print "skip - XML extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_current_line_number(resource parser)
- * Description: Get current line number for an XML parser 
+ * Description: Get current line number for an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_get_current_line_number() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_get_current_line_number_variation1.phpt b/ext/xml/tests/xml_get_current_line_number_variation1.phpt
index 1b92c2784df..5d4ef2e1425 100644
--- a/ext/xml/tests/xml_get_current_line_number_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_line_number_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_get_current_line_number() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
-?>  
+	print "skip - XML extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_current_line_number(resource parser)
- * Description: Get current line number for an XML parser 
+ * Description: Get current line number for an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_get_current_line_number() : usage variations ***\n";
@@ -73,9 +73,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_get_error_code_error.phpt b/ext/xml/tests/xml_get_error_code_error.phpt
index 683734ae344..2e97ba92b64 100644
--- a/ext/xml/tests/xml_get_error_code_error.phpt
+++ b/ext/xml/tests/xml_get_error_code_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_get_error_code() function : error conditions 
+Test xml_get_error_code() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_error_code(resource parser)
- * Description: Get XML parser error code 
+ * Description: Get XML parser error code
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_get_error_code() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_get_error_code_variation1.phpt b/ext/xml/tests/xml_get_error_code_variation1.phpt
index 62e9ac9fb32..d2e345e7e33 100644
--- a/ext/xml/tests/xml_get_error_code_variation1.phpt
+++ b/ext/xml/tests/xml_get_error_code_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_get_error_code() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_error_code(resource parser)
- * Description: Get XML parser error code 
+ * Description: Get XML parser error code
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_get_error_code() : usage variations ***\n";
@@ -73,9 +73,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_parse_error.phpt b/ext/xml/tests/xml_parse_error.phpt
index d8d8fffa808..e5036ddbeb6 100644
--- a/ext/xml/tests/xml_parse_error.phpt
+++ b/ext/xml/tests/xml_parse_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_parse() function : error conditions 
+Test xml_parse() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parse(resource parser, string data [, int isFinal])
- * Description: Start parsing an XML document 
+ * Description: Start parsing an XML document
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parse() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_parse_into_struct_error.phpt b/ext/xml/tests/xml_parse_into_struct_error.phpt
index 82a26ad05e4..56d943d00f3 100644
--- a/ext/xml/tests/xml_parse_into_struct_error.phpt
+++ b/ext/xml/tests/xml_parse_into_struct_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_parse_into_struct() function : error conditions 
+Test xml_parse_into_struct() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parse_into_struct(resource parser, string data, array &struct, array &index)
- * Description: Parsing a XML document 
+ * Description: Parsing a XML document
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parse_into_struct() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_parse_into_struct_variation.phpt b/ext/xml/tests/xml_parse_into_struct_variation.phpt
index a353e514196..eadc3edc944 100644
--- a/ext/xml/tests/xml_parse_into_struct_variation.phpt
+++ b/ext/xml/tests/xml_parse_into_struct_variation.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_parse_into_struct() function : variation 
+Test xml_parse_into_struct() function : variation
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parse_into_struct(resource parser, string data, array &struct, array &index)
- * Description: Parsing a XML document 
+ * Description: Parsing a XML document
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parse_into_struct() : variation ***\n";
diff --git a/ext/xml/tests/xml_parse_into_struct_variation1.phpt b/ext/xml/tests/xml_parse_into_struct_variation1.phpt
index 39ce62a5da1..b600ed1928a 100644
--- a/ext/xml/tests/xml_parse_into_struct_variation1.phpt
+++ b/ext/xml/tests/xml_parse_into_struct_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parse_into_struct() function : usage variations  - different types for parser
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parse_into_struct(resource parser, string data, array &struct, array &index)
- * Description: Parsing a XML document 
+ * Description: Parsing a XML document
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parse_into_struct() : usage variations ***\n";
@@ -74,9 +74,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_parse_variation1.phpt b/ext/xml/tests/xml_parse_variation1.phpt
index 34afcd87b57..3b6e476f4ce 100644
--- a/ext/xml/tests/xml_parse_variation1.phpt
+++ b/ext/xml/tests/xml_parse_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parse() function : usage variations  - different types of parser
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parse(resource parser, string data [, int isFinal])
- * Description: Start parsing an XML document 
+ * Description: Start parsing an XML document
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parse() : usage variations ***\n";
@@ -75,9 +75,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_parser_create_error.phpt b/ext/xml/tests/xml_parser_create_error.phpt
index 571350e873b..ac64294639c 100644
--- a/ext/xml/tests/xml_parser_create_error.phpt
+++ b/ext/xml/tests/xml_parser_create_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_parser_create() function : error conditions 
+Test xml_parser_create() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto resource xml_parser_create([string encoding])
- * Description: Create an XML parser 
+ * Description: Create an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_create() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_parser_create_ns_error.phpt b/ext/xml/tests/xml_parser_create_ns_error.phpt
index fd50f29488f..f1fd3f00fe4 100644
--- a/ext/xml/tests/xml_parser_create_ns_error.phpt
+++ b/ext/xml/tests/xml_parser_create_ns_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_parser_create_ns() function : error conditions 
+Test xml_parser_create_ns() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto resource xml_parser_create_ns([string encoding [, string sep]])
- * Description: Create an XML parser 
+ * Description: Create an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_create_ns() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_parser_create_ns_variation1.phpt b/ext/xml/tests/xml_parser_create_ns_variation1.phpt
index 2818b82fe83..430bebe6765 100644
--- a/ext/xml/tests/xml_parser_create_ns_variation1.phpt
+++ b/ext/xml/tests/xml_parser_create_ns_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_create_ns() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto resource xml_parser_create_ns([string encoding [, string sep]])
- * Description: Create an XML parser 
+ * Description: Create an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_create_ns() : usage variations ***\n";
@@ -77,9 +77,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
@@ -92,7 +92,7 @@ $values = array(
 
 foreach($values as $value) {
       echo @"\nArg value $value \n";
-      $res = xml_parser_create_ns($value); 
+      $res = xml_parser_create_ns($value);
       var_dump($res);
       if ($res !== false) {
          xml_parser_free($res);
diff --git a/ext/xml/tests/xml_parser_create_variation1.phpt b/ext/xml/tests/xml_parser_create_variation1.phpt
index c5d588fec39..2caefa0d82d 100644
--- a/ext/xml/tests/xml_parser_create_variation1.phpt
+++ b/ext/xml/tests/xml_parser_create_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_create() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto resource xml_parser_create([string encoding])
- * Description: Create an XML parser 
+ * Description: Create an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_create() : usage variations ***\n";
@@ -77,9 +77,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_parser_free_error.phpt b/ext/xml/tests/xml_parser_free_error.phpt
index 13afb95a712..f1a1846a3b1 100644
--- a/ext/xml/tests/xml_parser_free_error.phpt
+++ b/ext/xml/tests/xml_parser_free_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_parser_free() function : error conditions 
+Test xml_parser_free() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_free(resource parser)
- * Description: Free an XML parser 
+ * Description: Free an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_free() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_parser_free_variation1.phpt b/ext/xml/tests/xml_parser_free_variation1.phpt
index 7c6468a8273..439289d3e85 100644
--- a/ext/xml/tests/xml_parser_free_variation1.phpt
+++ b/ext/xml/tests/xml_parser_free_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_free() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_free(resource parser)
- * Description: Free an XML parser 
+ * Description: Free an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_free() : usage variations ***\n";
@@ -73,9 +73,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_parser_get_option_error.phpt b/ext/xml/tests/xml_parser_get_option_error.phpt
index a35536934cb..2455dd5d32c 100644
--- a/ext/xml/tests/xml_parser_get_option_error.phpt
+++ b/ext/xml/tests/xml_parser_get_option_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_get_option() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
-?> 
+	print "skip - XML extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_get_option(resource parser, int option)
- * Description: Get options from an XML parser 
+ * Description: Get options from an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_get_option() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_parser_get_option_variation1.phpt b/ext/xml/tests/xml_parser_get_option_variation1.phpt
index 002bff6cd8a..e5a29163d22 100644
--- a/ext/xml/tests/xml_parser_get_option_variation1.phpt
+++ b/ext/xml/tests/xml_parser_get_option_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_get_option() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_get_option(resource parser, int option)
- * Description: Get options from an XML parser 
+ * Description: Get options from an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_get_option() : usage variations ***\n";
@@ -74,9 +74,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_parser_get_option_variation2.phpt b/ext/xml/tests/xml_parser_get_option_variation2.phpt
index e741b9fa65b..511308527cb 100644
--- a/ext/xml/tests/xml_parser_get_option_variation2.phpt
+++ b/ext/xml/tests/xml_parser_get_option_variation2.phpt
@@ -3,15 +3,15 @@ Test xml_parser_get_option() function : usage variations
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only");
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_get_option(resource parser, int option)
- * Description: Get options from an XML parser 
+ * Description: Get options from an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_get_option() : usage variations ***\n";
@@ -74,7 +74,7 @@ $values = array(
       new aClass(),
 
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_parser_set_option_basic.phpt b/ext/xml/tests/xml_parser_set_option_basic.phpt
index 61316a4b0fe..48d91eafb6a 100644
--- a/ext/xml/tests/xml_parser_set_option_basic.phpt
+++ b/ext/xml/tests/xml_parser_set_option_basic.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_set_notation_decl_handler function : basic 
+Test xml_set_notation_decl_handler function : basic
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto bool xml_set_notation_decl_handler  ( resource $parser  , callback $handler  )
  * Description: Sets the notation declaration handler function for the XML parser.
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "Simple testcase for xml_parser_get_option() function\n";
diff --git a/ext/xml/tests/xml_parser_set_option_error.phpt b/ext/xml/tests/xml_parser_set_option_error.phpt
index 28829bcfa57..6c68252c139 100644
--- a/ext/xml/tests/xml_parser_set_option_error.phpt
+++ b/ext/xml/tests/xml_parser_set_option_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_parser_set_option() function : error conditions 
+Test xml_parser_set_option() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_set_option(resource parser, int option, mixed value)
- * Description: Set options in an XML parser 
+ * Description: Set options in an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_set_option() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_parser_set_option_variation1.phpt b/ext/xml/tests/xml_parser_set_option_variation1.phpt
index 14452dbe213..cd79af23d0e 100644
--- a/ext/xml/tests/xml_parser_set_option_variation1.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_set_option() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_set_option(resource parser, int option, mixed value)
- * Description: Set options in an XML parser 
+ * Description: Set options in an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_set_option() : usage variations ***\n";
@@ -74,9 +74,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_parser_set_option_variation2.phpt b/ext/xml/tests/xml_parser_set_option_variation2.phpt
index a367ede1719..1c5f288642d 100644
--- a/ext/xml/tests/xml_parser_set_option_variation2.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation2.phpt
@@ -1,18 +1,18 @@
 --TEST--
 Test xml_parser_set_option() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only");
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_set_option(resource parser, int option, mixed value)
- * Description: Set options in an XML parser 
+ * Description: Set options in an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_set_option() : usage variations ***\n";
diff --git a/ext/xml/tests/xml_parser_set_option_variation3.phpt b/ext/xml/tests/xml_parser_set_option_variation3.phpt
index c215ef5fded..836ee7a4691 100644
--- a/ext/xml/tests/xml_parser_set_option_variation3.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation3.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_set_option() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_set_option(resource parser, int option, mixed value)
- * Description: Set options in an XML parser 
+ * Description: Set options in an XML parser
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_set_option() : usage variations ***\n";
@@ -78,7 +78,7 @@ $values = array(
       new aClass(),
 
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_set_character_data_handler_error.phpt b/ext/xml/tests/xml_set_character_data_handler_error.phpt
index 16faaa4f679..a0597386acb 100644
--- a/ext/xml/tests/xml_set_character_data_handler_error.phpt
+++ b/ext/xml/tests/xml_set_character_data_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_set_character_data_handler() function : error conditions 
+Test xml_set_character_data_handler() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_character_data_handler(resource parser, string hdl)
- * Description: Set up character data handler 
+ * Description: Set up character data handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_character_data_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
index 3e9f79768a6..e6429ab98a7 100644
--- a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_character_data_handler() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_character_data_handler(resource parser, string hdl)
- * Description: Set up character data handler 
+ * Description: Set up character data handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_character_data_handler() : usage variations ***\n";
@@ -78,9 +78,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_set_default_handler_error.phpt b/ext/xml/tests/xml_set_default_handler_error.phpt
index a4b1b7cbee1..3adc40a6c72 100644
--- a/ext/xml/tests/xml_set_default_handler_error.phpt
+++ b/ext/xml/tests/xml_set_default_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_set_default_handler() function : error conditions 
+Test xml_set_default_handler() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_default_handler(resource parser, string hdl)
- * Description: Set up default handler 
+ * Description: Set up default handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_default_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_default_handler_variation1.phpt b/ext/xml/tests/xml_set_default_handler_variation1.phpt
index afd0b6ed989..544edf3c4f5 100644
--- a/ext/xml/tests/xml_set_default_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_default_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_default_handler() function : usage variations  - test different types for parser
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_default_handler(resource parser, string hdl)
- * Description: Set up default handler 
+ * Description: Set up default handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_default_handler() : usage variations ***\n";
@@ -78,9 +78,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_set_element_handler_error.phpt b/ext/xml/tests/xml_set_element_handler_error.phpt
index 6ccaea1552a..7661df8ea6f 100644
--- a/ext/xml/tests/xml_set_element_handler_error.phpt
+++ b/ext/xml/tests/xml_set_element_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_element_handler() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
-?> 
+	print "skip - XML extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_element_handler(resource parser, string shdl, string ehdl)
- * Description: Set up start and end element handlers 
+ * Description: Set up start and end element handlers
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_element_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_element_handler_variation1.phpt b/ext/xml/tests/xml_set_element_handler_variation1.phpt
index 336237ab84a..945cce6d233 100644
--- a/ext/xml/tests/xml_set_element_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_element_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_element_handler() function : usage variations  - test different types for parser
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_element_handler(resource parser, string shdl, string ehdl)
- * Description: Set up start and end element handlers 
+ * Description: Set up start and end element handlers
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_element_handler() : usage variations ***\n";
@@ -78,9 +78,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt b/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt
index 81bb3f6233f..35f923d72ca 100644
--- a/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt
+++ b/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_set_end_namespace_decl_handler() function : error conditions 
+Test xml_set_end_namespace_decl_handler() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_end_namespace_decl_handler(resource parser, string hdl)
- * Description: Set up character data handler 
+ * Description: Set up character data handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_end_namespace_decl_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
index eb90d99404a..e2b68920aff 100644
--- a/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_end_namespace_decl_handler() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
-?> 
+	print "skip - XML extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_end_namespace_decl_handler(resource parser, string hdl)
- * Description: Set up character data handler 
+ * Description: Set up character data handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_end_namespace_decl_handler() : usage variations ***\n";
@@ -78,9 +78,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt b/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt
index 6dd400ac846..7ba32b9a1e4 100644
--- a/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt
+++ b/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_set_external_entity_ref_handler() function : error conditions 
+Test xml_set_external_entity_ref_handler() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_external_entity_ref_handler(resource parser, string hdl)
- * Description: Set up external entity reference handler 
+ * Description: Set up external entity reference handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_external_entity_ref_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt b/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
index 890374ea248..e31961547f7 100644
--- a/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_external_entity_ref_handler() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_external_entity_ref_handler(resource parser, string hdl)
- * Description: Set up external entity reference handler 
+ * Description: Set up external entity reference handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_external_entity_ref_handler() : usage variations ***\n";
@@ -78,9 +78,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt b/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt
index 6616681ff8b..a4ea86375e7 100644
--- a/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt
+++ b/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_set_notation_decl_handler function : basic 
+Test xml_set_notation_decl_handler function : basic
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto bool xml_set_notation_decl_handler  ( resource $parser  , callback $handler  )
  * Description: Sets the notation declaration handler function for the XML parser.
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 class XML_Parser
@@ -26,16 +26,16 @@ class XML_Parser
  		echo "...Public ID=" . $public_ID . "\n";
  		echo "...Notation name=" . $notation_name . "\n";
   	}
-  	
+
   	function notation_decl_handler($parser, $name, $base, $system_ID,$public_ID)
   	{
-  		echo "notation_decl_handler called\n"; 
+  		echo "notation_decl_handler called\n";
  		echo "...Name=" . $name . "\n";
  		echo "...Base=" . $base . "\n";
  		echo "...System ID=" . $system_ID . "\n";
  		echo "...Public ID=" . $public_ID . "\n";
   	}
-    
+
     function parse($data)
     {
         $parser = xml_parser_create();
@@ -59,10 +59,10 @@ $xml = <<<HERE
 ]>
 HERE;
 
-echo "Simple test of xml_set_notation_decl_handler(() function\n"; 
+echo "Simple test of xml_set_notation_decl_handler(() function\n";
 $p1 = new Xml_Parser();
-$p1->parse($xml); 
-echo "Done\n"; 
+$p1->parse($xml);
+echo "Done\n";
 ?>
 --EXPECT--
 Simple test of xml_set_notation_decl_handler(() function
diff --git a/ext/xml/tests/xml_set_notation_decl_handler_error.phpt b/ext/xml/tests/xml_set_notation_decl_handler_error.phpt
index fccc135f769..60fc4383a7e 100644
--- a/ext/xml/tests/xml_set_notation_decl_handler_error.phpt
+++ b/ext/xml/tests/xml_set_notation_decl_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_set_notation_decl_handler() function : error conditions 
+Test xml_set_notation_decl_handler() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_notation_decl_handler(resource parser, string hdl)
- * Description: Set up notation declaration handler 
+ * Description: Set up notation declaration handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_notation_decl_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
index 97172658f90..c78a47a1d72 100644
--- a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_notation_decl_handler() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_notation_decl_handler(resource parser, string hdl)
- * Description: Set up notation declaration handler 
+ * Description: Set up notation declaration handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_notation_decl_handler() : usage variations ***\n";
@@ -78,9 +78,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_set_object_error.phpt b/ext/xml/tests/xml_set_object_error.phpt
index db3266ea131..39a8511218a 100644
--- a/ext/xml/tests/xml_set_object_error.phpt
+++ b/ext/xml/tests/xml_set_object_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_set_object() function : error conditions 
+Test xml_set_object() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_object(resource parser, object &obj)
- * Description: Set up object which should be used for callbacks 
+ * Description: Set up object which should be used for callbacks
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_object() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_object_variation1.phpt b/ext/xml/tests/xml_set_object_variation1.phpt
index fe06f9a248a..a876b305a19 100644
--- a/ext/xml/tests/xml_set_object_variation1.phpt
+++ b/ext/xml/tests/xml_set_object_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_object() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_object(resource parser, object &obj)
- * Description: Set up object which should be used for callbacks 
+ * Description: Set up object which should be used for callbacks
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_object() : usage variations ***\n";
@@ -74,9 +74,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_set_object_variation2.phpt b/ext/xml/tests/xml_set_object_variation2.phpt
index bca3472a078..6b20be76b99 100644
--- a/ext/xml/tests/xml_set_object_variation2.phpt
+++ b/ext/xml/tests/xml_set_object_variation2.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_object() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_object(resource parser, object &obj)
- * Description: Set up object which should be used for callbacks 
+ * Description: Set up object which should be used for callbacks
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_object() : usage variations ***\n";
@@ -66,9 +66,9 @@ $values = array(
       // string data
       "string",
       'string',
-      
+
       // resource data
-      $fp,       
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt
index e5589cee295..d38085d26c0 100644
--- a/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt
+++ b/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt
@@ -1,28 +1,28 @@
 --TEST--
-Test xml_set_processing_instruction_handler function : basic 
+Test xml_set_processing_instruction_handler function : basic
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto bool xml_set_processing_instruction_handler  ( resource $parser  , callback $handler  )
  * Description: Sets the processing instruction (PI) handler function for the XML parser.
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 class XML_Parser
 {
-    
+
     function PIHandler($parser, $target, $data)
 	{
 		echo "Target: " . $target. "\n";
 		echo "Data: " . $data . "\n";
 	}
-    
+
     function parse($data)
     {
         $parser = xml_parser_create();
@@ -32,7 +32,7 @@ class XML_Parser
         xml_parser_free($parser);
     }
 
- 
+
 }
 
 $xml = <<<HERE
@@ -40,10 +40,10 @@ $xml = <<<HERE
 <?xml-stylesheet href="default.xsl" type="text/xml"?>
 HERE;
 
-echo "Simple test of xml_set_processing_instruction_handler() function\n"; 
+echo "Simple test of xml_set_processing_instruction_handler() function\n";
 $p1 = new Xml_Parser();
-$p1->parse($xml); 
-echo "Done\n"; 
+$p1->parse($xml);
+echo "Done\n";
 ?>
 --EXPECT--
 Simple test of xml_set_processing_instruction_handler() function
diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt
index f2a8494d547..561bd354728 100644
--- a/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt
+++ b/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_set_processing_instruction_handler() function : error conditions 
+Test xml_set_processing_instruction_handler() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_processing_instruction_handler(resource parser, string hdl)
- * Description: Set up processing instruction (PI) handler 
+ * Description: Set up processing instruction (PI) handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_processing_instruction_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
index 957458275ba..0eeb89e88eb 100644
--- a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_processing_instruction_handler() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_processing_instruction_handler(resource parser, string hdl)
- * Description: Set up processing instruction (PI) handler 
+ * Description: Set up processing instruction (PI) handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_processing_instruction_handler() : usage variations ***\n";
@@ -78,9 +78,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt
index 79b8cb88fce..08ea65f8bbe 100644
--- a/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt
+++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_set_start_namespace_decl_handler function: basic 
+Test xml_set_start_namespace_decl_handler function: basic
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : bool xml_set_start_namespace_decl_handler  ( resource $parser  , callback $handler  )
  * Description: Set up start namespace declaration handler.
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $xml = <<<HERE
@@ -34,13 +34,13 @@ xml_parser_free( $parser );
 echo "Done\n";
 
 function Namespace_Start_Handler( $parser, $prefix, $uri ) {
-	echo "Namespace_Start_Handler called\n"; 
+	echo "Namespace_Start_Handler called\n";
  	echo "...Prefix: ". $prefix . "\n";
  	echo "...Uri: ". $uri . "\n";
 }
 
 function Namespace_End_Handler($parser, $prefix) {
-	echo "Namespace_End_Handler called\n"; 
+	echo "Namespace_End_Handler called\n";
  	echo "...Prefix: ". $prefix . "\n\n";
 }
 
diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt
index 221b005dfd4..e3cab09be27 100644
--- a/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt
+++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test xml_set_start_namespace_decl_handler() function : error conditions 
+Test xml_set_start_namespace_decl_handler() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_start_namespace_decl_handler(resource parser, string hdl)
- * Description: Set up character data handler 
+ * Description: Set up character data handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_start_namespace_decl_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
index 0a80b21a76e..2bc6411dc4b 100644
--- a/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_start_namespace_decl_handler() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_start_namespace_decl_handler(resource parser, string hdl)
- * Description: Set up character data handler 
+ * Description: Set up character data handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_start_namespace_decl_handler() : usage variations ***\n";
@@ -78,9 +78,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt
index 952a6984b4e..c0aac2339e9 100644
--- a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt
+++ b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_unparsed_entity_decl_handler() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
-?> 
+	print "skip - XML extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_unparsed_entity_decl_handler(resource parser, string hdl)
- * Description: Set up unparsed entity declaration handler 
+ * Description: Set up unparsed entity declaration handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_unparsed_entity_decl_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
index ec1061e59b5..78565e2953c 100644
--- a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_unparsed_entity_decl_handler() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_unparsed_entity_decl_handler(resource parser, string hdl)
- * Description: Set up unparsed entity declaration handler 
+ * Description: Set up unparsed entity declaration handler
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_unparsed_entity_decl_handler() : usage variations ***\n";
@@ -78,9 +78,9 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
-      $fp, 
+      $fp,
 
       // undefined data
       $undefined_var,
diff --git a/ext/xmlreader/tests/001.phpt b/ext/xmlreader/tests/001.phpt
index ce9ade96189..56c29ba6e7e 100644
--- a/ext/xmlreader/tests/001.phpt
+++ b/ext/xmlreader/tests/001.phpt
@@ -1,9 +1,9 @@
 --TEST--
-XMLReader: libxml2 XML Reader, string data 
+XMLReader: libxml2 XML Reader, string data
 --SKIPIF--
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
diff --git a/ext/xmlreader/tests/002.phpt b/ext/xmlreader/tests/002.phpt
index 7abd3e216c3..cc339e7f29b 100644
--- a/ext/xmlreader/tests/002.phpt
+++ b/ext/xmlreader/tests/002.phpt
@@ -1,9 +1,9 @@
 --TEST--
-XMLReader: libxml2 XML Reader, file data 
+XMLReader: libxml2 XML Reader, file data
 --SKIPIF--
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 $filename = dirname(__FILE__) . '/_002.xml';
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
diff --git a/ext/xmlreader/tests/003-mb.phpt b/ext/xmlreader/tests/003-mb.phpt
index af76382779d..3599263a867 100644
--- a/ext/xmlreader/tests/003-mb.phpt
+++ b/ext/xmlreader/tests/003-mb.phpt
@@ -1,9 +1,9 @@
 --TEST--
-XMLReader: libxml2 XML Reader, attributes test 
+XMLReader: libxml2 XML Reader, attributes test
 --SKIPIF--
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 $filename = dirname(__FILE__) . '/��ガラスを食�られ��_003.xml';
 
diff --git a/ext/xmlreader/tests/003.phpt b/ext/xmlreader/tests/003.phpt
index 85353a8242c..725113540fd 100644
--- a/ext/xmlreader/tests/003.phpt
+++ b/ext/xmlreader/tests/003.phpt
@@ -1,9 +1,9 @@
 --TEST--
-XMLReader: libxml2 XML Reader, attributes test 
+XMLReader: libxml2 XML Reader, attributes test
 --SKIPIF--
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 $filename = dirname(__FILE__) . '/_003.xml';
 
diff --git a/ext/xmlreader/tests/004.phpt b/ext/xmlreader/tests/004.phpt
index b2d7254fe4f..bba7dd10fbc 100644
--- a/ext/xmlreader/tests/004.phpt
+++ b/ext/xmlreader/tests/004.phpt
@@ -1,9 +1,9 @@
 --TEST--
-XMLReader: libxml2 XML Reader, attributes test 
+XMLReader: libxml2 XML Reader, attributes test
 --SKIPIF--
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 $filename = dirname(__FILE__) . '/_004.xml';
 
diff --git a/ext/xmlreader/tests/005.phpt b/ext/xmlreader/tests/005.phpt
index e6fd02c9aaa..5ec0c9102bb 100644
--- a/ext/xmlreader/tests/005.phpt
+++ b/ext/xmlreader/tests/005.phpt
@@ -1,9 +1,9 @@
 --TEST--
-XMLReader: libxml2 XML Reader, parser property set/get 
+XMLReader: libxml2 XML Reader, parser property set/get
 --SKIPIF--
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
@@ -17,14 +17,14 @@ $reader->XML($xmlstring);
 $a = $reader->setParserProperty(XMLReader::LOADDTD, false);
 $b = $reader->getParserProperty(XMLReader::LOADDTD);
 
-if (!$a && !$b) { 
+if (!$a && !$b) {
 	echo "ok\n";
 }
 
 $a = $reader->setParserProperty(XMLReader::SUBST_ENTITIES, true);
 $b = $reader->getParserProperty(XMLReader::SUBST_ENTITIES);
 
-if ($a && $b) { 
+if ($a && $b) {
 	echo "ok\n";
 }
 // Only go through
diff --git a/ext/xmlreader/tests/006.phpt b/ext/xmlreader/tests/006.phpt
index ce9bb451aff..05142bca6e3 100644
--- a/ext/xmlreader/tests/006.phpt
+++ b/ext/xmlreader/tests/006.phpt
@@ -1,9 +1,9 @@
 --TEST--
-XMLReader: libxml2 XML Reader, moveToElement 
+XMLReader: libxml2 XML Reader, moveToElement
 --SKIPIF--
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
@@ -13,7 +13,7 @@ $reader = new XMLReader();
 
 $reader->XML($xmlstring);
 
-// 2 read to get on the 2nd node 
+// 2 read to get on the 2nd node
 $reader->read();
 $reader->read();
 
diff --git a/ext/xmlreader/tests/007.phpt b/ext/xmlreader/tests/007.phpt
index aacd059b6e4..ed7533dc0b1 100644
--- a/ext/xmlreader/tests/007.phpt
+++ b/ext/xmlreader/tests/007.phpt
@@ -3,11 +3,11 @@ XMLReader: libxml2 XML Reader, setRelaxNGSchema
 --SKIPIF--
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xmlstring = '<TEI.2>hello</TEI.2>';
-$relaxngfile = dirname(__FILE__) . '/relaxNG.rng'; 
+$relaxngfile = dirname(__FILE__) . '/relaxNG.rng';
 $file = dirname(__FILE__) . '/_007.xml';
 file_put_contents($file, $xmlstring);
 
diff --git a/ext/xmlreader/tests/008.phpt b/ext/xmlreader/tests/008.phpt
index 2dbb5e7c874..f38bc8d5428 100644
--- a/ext/xmlreader/tests/008.phpt
+++ b/ext/xmlreader/tests/008.phpt
@@ -1,9 +1,9 @@
 --TEST--
-XMLReader: libxml2 XML Reader, DTD 
+XMLReader: libxml2 XML Reader, DTD
 --SKIPIF--
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
@@ -22,7 +22,7 @@ $xmlstring = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 </MOVIE>
 </LIST>';
 
-$dtdfile = rawurlencode(dirname(__FILE__)) . '/dtdexample.dtd'; 
+$dtdfile = rawurlencode(dirname(__FILE__)) . '/dtdexample.dtd';
 $file = dirname(__FILE__) . '/_008.xml';
 file_put_contents($file, $xmlstring);
 
diff --git a/ext/xmlreader/tests/009.phpt b/ext/xmlreader/tests/009.phpt
index 613ef678cbd..9e5dfa5207e 100644
--- a/ext/xmlreader/tests/009.phpt
+++ b/ext/xmlreader/tests/009.phpt
@@ -1,9 +1,9 @@
 --TEST--
-XMLReader: libxml2 XML Reader, next 
+XMLReader: libxml2 XML Reader, next
 --SKIPIF--
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
diff --git a/ext/xmlreader/tests/010.phpt b/ext/xmlreader/tests/010.phpt
index a107c7441ff..abdff6f21b0 100644
--- a/ext/xmlreader/tests/010.phpt
+++ b/ext/xmlreader/tests/010.phpt
@@ -1,9 +1,9 @@
 --TEST--
-XMLReader: libxml2 XML Reader, next 
+XMLReader: libxml2 XML Reader, next
 --SKIPIF--
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <prefix:books xmlns:prefix="uri" isbn="" prefix:isbn="12isbn">book1</prefix:books>';
diff --git a/ext/xmlreader/tests/011.phpt b/ext/xmlreader/tests/011.phpt
index 89599232fce..6700bd8387e 100644
--- a/ext/xmlreader/tests/011.phpt
+++ b/ext/xmlreader/tests/011.phpt
@@ -1,12 +1,12 @@
 --TEST--
-XMLReader: libxml2 XML Reader, string data 
+XMLReader: libxml2 XML Reader, string data
 --SKIPIF--
 <?php if (!extension_loaded("xmlreader")) print "skip";
 $reader = new XMLReader();
 if (!method_exists($reader, 'readInnerXml')) print "skip";
 ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
diff --git a/ext/xmlreader/tests/012.phpt b/ext/xmlreader/tests/012.phpt
index e0edeef2dd5..102e7615b7b 100644
--- a/ext/xmlreader/tests/012.phpt
+++ b/ext/xmlreader/tests/012.phpt
@@ -1,9 +1,9 @@
 --TEST--
-XMLReader: accessing empty and non existing attributes 
+XMLReader: accessing empty and non existing attributes
 --SKIPIF--
 <?php if (!extension_loaded("xmlreader")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xmlstring =<<<EOF
diff --git a/ext/xmlreader/tests/013.phpt b/ext/xmlreader/tests/013.phpt
index f9dcdeeec7e..d8643ffec72 100644
--- a/ext/xmlreader/tests/013.phpt
+++ b/ext/xmlreader/tests/013.phpt
@@ -4,7 +4,7 @@ XMLReader: Schema validation
 <?php if (!extension_loaded('xmlreader')) die('skip');?>
 <?php if (!method_exists('XMLReader','setSchema')) die('skip XMLReader::setSchema() not supported');?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xml =<<<EOF
diff --git a/ext/xmlreader/tests/bug36743.phpt b/ext/xmlreader/tests/bug36743.phpt
index 374941b0c71..93cd7ca4f7c 100644
--- a/ext/xmlreader/tests/bug36743.phpt
+++ b/ext/xmlreader/tests/bug36743.phpt
@@ -19,7 +19,7 @@ $t = new test;
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 array(1) {
   [0]=>
   int(1)
diff --git a/ext/xmlreader/tests/bug42139.phpt b/ext/xmlreader/tests/bug42139.phpt
index 19602f01035..424e8e75c10 100644
--- a/ext/xmlreader/tests/bug42139.phpt
+++ b/ext/xmlreader/tests/bug42139.phpt
@@ -24,7 +24,7 @@ while ( $reader->read() ) {
 $reader->close();
 
 ?>
---EXPECT--	
+--EXPECT--
 10, root, 
 1, root, 
 3, #text, y
diff --git a/ext/xmlreader/tests/expand.phpt b/ext/xmlreader/tests/expand.phpt
index c77e6c31b79..9b8b7258b7f 100644
--- a/ext/xmlreader/tests/expand.phpt
+++ b/ext/xmlreader/tests/expand.phpt
@@ -7,7 +7,7 @@ $reader = new XMLReader();
 if (!method_exists($reader, 'expand')) print "skip";
 ?>
 --FILE--
-<?php 
+<?php
 
 $basexml = '<?xml version="1.0" encoding="UTF-8"?>
 <books><book>base book</book></books>';
diff --git a/ext/xmlrpc/tests/001.phpt b/ext/xmlrpc/tests/001.phpt
index 26250967140..49dfba8f104 100644
--- a/ext/xmlrpc/tests/001.phpt
+++ b/ext/xmlrpc/tests/001.phpt
@@ -12,7 +12,7 @@ var_dump(xmlrpc_encode_request(3.4, 1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(174) "<?xml version="1.0" encoding="iso-8859-1"?>
 <methodCall>
 <methodName>-1</methodName>
diff --git a/ext/xmlrpc/tests/002.phpt b/ext/xmlrpc/tests/002.phpt
index 83586464bc2..cb4b4aa818e 100644
--- a/ext/xmlrpc/tests/002.phpt
+++ b/ext/xmlrpc/tests/002.phpt
@@ -27,7 +27,7 @@ var_dump($method);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 array(0) {
 }
 string(6) "method"
diff --git a/ext/xmlrpc/tests/bug37057.phpt b/ext/xmlrpc/tests/bug37057.phpt
index 013cc9192ce..e656a7c654b 100644
--- a/ext/xmlrpc/tests/bug37057.phpt
+++ b/ext/xmlrpc/tests/bug37057.phpt
@@ -48,7 +48,7 @@ var_dump($retval[0]);
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 array(1) {
   [50]=>
   string(4) "0.29"
diff --git a/ext/xmlrpc/tests/bug38431.phpt b/ext/xmlrpc/tests/bug38431.phpt
index 288fe1041d9..d97ad971ec5 100644
--- a/ext/xmlrpc/tests/bug38431.phpt
+++ b/ext/xmlrpc/tests/bug38431.phpt
@@ -16,7 +16,7 @@ var_dump(xmlrpc_get_type($var));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(5) "array"
 string(5) "array"
 string(5) "array"
diff --git a/ext/xmlrpc/tests/bug40576.phpt b/ext/xmlrpc/tests/bug40576.phpt
index 404aba32bae..2d8aecdcea9 100644
--- a/ext/xmlrpc/tests/bug40576.phpt
+++ b/ext/xmlrpc/tests/bug40576.phpt
@@ -19,7 +19,7 @@ var_dump(xmlrpc_encode("1.22222222222222222222222"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(125) "<?xml version="1.0" encoding="utf-8"?>
 <params>
 <param>
diff --git a/ext/xmlrpc/tests/bug40576_64bit.phpt b/ext/xmlrpc/tests/bug40576_64bit.phpt
index bb4cbe78438..560fe422312 100644
--- a/ext/xmlrpc/tests/bug40576_64bit.phpt
+++ b/ext/xmlrpc/tests/bug40576_64bit.phpt
@@ -19,7 +19,7 @@ var_dump(xmlrpc_encode("1.22222222222222222222222"));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(125) "<?xml version="1.0" encoding="utf-8"?>
 <params>
 <param>
diff --git a/ext/xmlrpc/tests/bug42189.phpt b/ext/xmlrpc/tests/bug42189.phpt
index 55e726cf687..68b29025efc 100644
--- a/ext/xmlrpc/tests/bug42189.phpt
+++ b/ext/xmlrpc/tests/bug42189.phpt
@@ -10,6 +10,6 @@ var_dump($ok);
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 bool(false)
 Done
diff --git a/ext/xmlrpc/tests/bug42736.phpt b/ext/xmlrpc/tests/bug42736.phpt
index b9a46cff5c0..a45eb19fcae 100644
--- a/ext/xmlrpc/tests/bug42736.phpt
+++ b/ext/xmlrpc/tests/bug42736.phpt
@@ -28,7 +28,7 @@ var_dump($response);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(402) "<?xml version="1.0" encoding="iso-8859-1"?>
 <methodResponse>
 <params>
diff --git a/ext/xmlrpc/tests/bug50285.phpt b/ext/xmlrpc/tests/bug50285.phpt
index 0a5fb962b4e..41da3c8aac3 100644
--- a/ext/xmlrpc/tests/bug50285.phpt
+++ b/ext/xmlrpc/tests/bug50285.phpt
@@ -33,7 +33,7 @@ EOD;
 $response = xmlrpc_server_call_method($server, $HTTP_RAW_POST_DATA, null);
 var_dump(xmlrpc_decode($response));
 
-// ------------ 
+// ------------
 
 $server = xmlrpc_server_create();
 $result = xmlrpc_server_register_method($server, 'test2', 'test2');
@@ -47,7 +47,7 @@ EOD;
 $response = xmlrpc_server_call_method($server, $HTTP_RAW_POST_DATA, null);
 var_dump(xmlrpc_decode($response));
 
-// ------------ 
+// ------------
 
 $server = xmlrpc_server_create();
 $result = xmlrpc_server_register_method($server, 'test3', 'test3');
@@ -61,7 +61,7 @@ EOD;
 $response = xmlrpc_server_call_method($server, $HTTP_RAW_POST_DATA, null);
 var_dump(xmlrpc_decode($response));
 
-// ------------ 
+// ------------
 
 $server = xmlrpc_server_create();
 $result = xmlrpc_server_register_method($server, 'test4', 'test4');
diff --git a/ext/xmlrpc/tests/bug68027.phpt b/ext/xmlrpc/tests/bug68027.phpt
index a5c96f1cf29..cc9f6beb2b1 100644
--- a/ext/xmlrpc/tests/bug68027.phpt
+++ b/ext/xmlrpc/tests/bug68027.phpt
@@ -20,7 +20,7 @@ print_r($obj);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 object(stdClass)#1 (3) {
   ["scalar"]=>
   string(16) "6-01-01 20:00:00"
diff --git a/ext/xmlrpc/tests/bug70526.phpt b/ext/xmlrpc/tests/bug70526.phpt
index 6ed3e1b9979..f5f8ea38653 100644
--- a/ext/xmlrpc/tests/bug70526.phpt
+++ b/ext/xmlrpc/tests/bug70526.phpt
@@ -10,5 +10,5 @@ $params = date("Ymd\TH:i:s", time());
 $rv = xmlrpc_set_type($params, 'datetime');
 var_dump($rv);
 ?>
---EXPECT--	
+--EXPECT--
 bool(true)
diff --git a/ext/xmlrpc/tests/bug70728.phpt b/ext/xmlrpc/tests/bug70728.phpt
index 72f72f85b0d..7889b93b4b8 100644
--- a/ext/xmlrpc/tests/bug70728.phpt
+++ b/ext/xmlrpc/tests/bug70728.phpt
@@ -13,7 +13,7 @@ $obj->scalar = 0x1122334455;
 var_dump(xmlrpc_encode($obj));
 var_dump($obj);
 ?>
---EXPECTF--	
+--EXPECTF--
 string(135) "<?xml version="1.0" encoding="utf-8"?>
 <params>
 <param>
diff --git a/ext/xmlrpc/tests/bug70728_64bit.phpt b/ext/xmlrpc/tests/bug70728_64bit.phpt
index 3ed50939184..aa1f0f910e3 100644
--- a/ext/xmlrpc/tests/bug70728_64bit.phpt
+++ b/ext/xmlrpc/tests/bug70728_64bit.phpt
@@ -13,7 +13,7 @@ $obj->scalar = 0x1122334455;
 var_dump(xmlrpc_encode($obj));
 var_dump($obj);
 ?>
---EXPECTF--	
+--EXPECTF--
 string(135) "<?xml version="1.0" encoding="utf-8"?>
 <params>
 <param>
diff --git a/ext/xmlrpc/tests/bug74975.phpt b/ext/xmlrpc/tests/bug74975.phpt
index 8f6a9dfb138..1ba77651472 100644
--- a/ext/xmlrpc/tests/bug74975.phpt
+++ b/ext/xmlrpc/tests/bug74975.phpt
@@ -8,14 +8,14 @@ if (!extension_loaded("xmlrpc")) print "skip";
 <?php
 
 class Foo {
-    
+
 }
 
 class Bar {
-    
+
     public $xmlrpc_type;
     public $scalar;
-    
+
 }
 
 $foo = new Foo();
diff --git a/ext/xmlwriter/tests/001.phpt b/ext/xmlwriter/tests/001.phpt
index a9349d2d16c..79d21e71e84 100644
--- a/ext/xmlwriter/tests/001.phpt
+++ b/ext/xmlwriter/tests/001.phpt
@@ -3,7 +3,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $doc_dest = '001.xml';
diff --git a/ext/xmlwriter/tests/002.phpt b/ext/xmlwriter/tests/002.phpt
index f2537a47ff7..2e6864d7762 100644
--- a/ext/xmlwriter/tests/002.phpt
+++ b/ext/xmlwriter/tests/002.phpt
@@ -3,7 +3,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $doc_dest = '001.xml';
diff --git a/ext/xmlwriter/tests/003.phpt b/ext/xmlwriter/tests/003.phpt
index 5415797864e..fd2700a6724 100644
--- a/ext/xmlwriter/tests/003.phpt
+++ b/ext/xmlwriter/tests/003.phpt
@@ -3,7 +3,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush, attribute
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $doc_dest = '001.xml';
diff --git a/ext/xmlwriter/tests/004.phpt b/ext/xmlwriter/tests/004.phpt
index 2d3e8587256..069dbaeec85 100644
--- a/ext/xmlwriter/tests/004.phpt
+++ b/ext/xmlwriter/tests/004.phpt
@@ -3,7 +3,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $doc_dest = '001.xml';
diff --git a/ext/xmlwriter/tests/005-mb.phpt b/ext/xmlwriter/tests/005-mb.phpt
index 63e77dc6bd5..3dbbe7a4175 100644
--- a/ext/xmlwriter/tests/005-mb.phpt
+++ b/ext/xmlwriter/tests/005-mb.phpt
@@ -1,12 +1,12 @@
 --TEST--
-XMLWriter: libxml2 XML Writer, comments 
+XMLWriter: libxml2 XML Writer, comments
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip");
 if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required");
 ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $doc_dest = '��ガラスを食�られ��001.xml';
diff --git a/ext/xmlwriter/tests/005.phpt b/ext/xmlwriter/tests/005.phpt
index ab933c6f564..1b84b3bdcfd 100644
--- a/ext/xmlwriter/tests/005.phpt
+++ b/ext/xmlwriter/tests/005.phpt
@@ -1,12 +1,12 @@
 --TEST--
-XMLWriter: libxml2 XML Writer, comments 
+XMLWriter: libxml2 XML Writer, comments
 --SKIPIF--
 <?php
-if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!extension_loaded("xmlwriter")) die("skip");
 if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required");
 ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $doc_dest = '001.xml';
diff --git a/ext/xmlwriter/tests/006.phpt b/ext/xmlwriter/tests/006.phpt
index 48eb299418f..9e032ae8ce1 100644
--- a/ext/xmlwriter/tests/006.phpt
+++ b/ext/xmlwriter/tests/006.phpt
@@ -1,11 +1,11 @@
 --TEST--
-XMLWriter: libxml2 XML Writer, startDTD/writeElementNS 
+XMLWriter: libxml2 XML Writer, startDTD/writeElementNS
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $doc_dest = '001.xml';
diff --git a/ext/xmlwriter/tests/007.phpt b/ext/xmlwriter/tests/007.phpt
index 47965c73c41..7922bb25254 100644
--- a/ext/xmlwriter/tests/007.phpt
+++ b/ext/xmlwriter/tests/007.phpt
@@ -1,12 +1,12 @@
 --TEST--
-XMLWriter: libxml2 XML Writer, Elements & Attributes 
+XMLWriter: libxml2 XML Writer, Elements & Attributes
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 if (LIBXML_VERSION < 20629) die("skip: libxml2 2.6.29+ required");
 ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xw = xmlwriter_open_memory();
diff --git a/ext/xmlwriter/tests/008.phpt b/ext/xmlwriter/tests/008.phpt
index 88768b11307..d45fdea725c 100644
--- a/ext/xmlwriter/tests/008.phpt
+++ b/ext/xmlwriter/tests/008.phpt
@@ -1,11 +1,11 @@
 --TEST--
 XMLWriter: libxml2 XML Writer DTD Element & Attlist
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xw = xmlwriter_open_memory();
diff --git a/ext/xmlwriter/tests/009.phpt b/ext/xmlwriter/tests/009.phpt
index 002916ff10a..677db522bb6 100644
--- a/ext/xmlwriter/tests/009.phpt
+++ b/ext/xmlwriter/tests/009.phpt
@@ -1,12 +1,12 @@
 --TEST--
 XMLWriter: PI, Comment, CDATA
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required");
 ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 /*
 Libxml 2.6.24 and up adds a new line after a processing instruction (PI)
diff --git a/ext/xmlwriter/tests/010.phpt b/ext/xmlwriter/tests/010.phpt
index 9f066a7c3e1..a32a9696a64 100644
--- a/ext/xmlwriter/tests/010.phpt
+++ b/ext/xmlwriter/tests/010.phpt
@@ -1,8 +1,8 @@
 --TEST--
 xmlwriter_start/end_attribute()
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 ?>
 --FILE--
 <?php
diff --git a/ext/xmlwriter/tests/011.phpt b/ext/xmlwriter/tests/011.phpt
index 5a479af8f6f..957e635cb53 100644
--- a/ext/xmlwriter/tests/011.phpt
+++ b/ext/xmlwriter/tests/011.phpt
@@ -1,15 +1,15 @@
 --TEST--
 XMLWriter: libxml2 XML Writer, write_attribute_ns function
---CREDITS-- 
+--CREDITS--
 Mauricio Vieira <mauricio [at] @mauriciovieira [dot] net>
 #testfest PHPSP on 2014-07-05
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 if (LIBXML_VERSION < 20701) die("skip: libxml2 2.7.1+ required");
 ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xw = xmlwriter_open_memory();
diff --git a/ext/xmlwriter/tests/OO_001.phpt b/ext/xmlwriter/tests/OO_001.phpt
index be448b9c65b..5f0978d1532 100644
--- a/ext/xmlwriter/tests/OO_001.phpt
+++ b/ext/xmlwriter/tests/OO_001.phpt
@@ -3,7 +3,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $doc_dest = '001.xml';
diff --git a/ext/xmlwriter/tests/OO_002.phpt b/ext/xmlwriter/tests/OO_002.phpt
index ec605f50a4a..5b381ba451c 100644
--- a/ext/xmlwriter/tests/OO_002.phpt
+++ b/ext/xmlwriter/tests/OO_002.phpt
@@ -3,7 +3,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xw = new XMLWriter();
diff --git a/ext/xmlwriter/tests/OO_003.phpt b/ext/xmlwriter/tests/OO_003.phpt
index 7fb47910f0f..5c27df0347b 100644
--- a/ext/xmlwriter/tests/OO_003.phpt
+++ b/ext/xmlwriter/tests/OO_003.phpt
@@ -3,7 +3,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush, text, attribute
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xw = new XMLWriter();
diff --git a/ext/xmlwriter/tests/OO_004.phpt b/ext/xmlwriter/tests/OO_004.phpt
index 08b423ccef2..4b6cad1d793 100644
--- a/ext/xmlwriter/tests/OO_004.phpt
+++ b/ext/xmlwriter/tests/OO_004.phpt
@@ -3,7 +3,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $doc_dest = '001.xml';
diff --git a/ext/xmlwriter/tests/OO_005.phpt b/ext/xmlwriter/tests/OO_005.phpt
index 2c6d2f43339..0d9be6a01ff 100644
--- a/ext/xmlwriter/tests/OO_005.phpt
+++ b/ext/xmlwriter/tests/OO_005.phpt
@@ -1,12 +1,12 @@
 --TEST--
-XMLWriter: libxml2 XML Writer, comments 
+XMLWriter: libxml2 XML Writer, comments
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required");
 ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $doc_dest = '001.xml';
diff --git a/ext/xmlwriter/tests/OO_006.phpt b/ext/xmlwriter/tests/OO_006.phpt
index 465a725debf..7fe38d7642c 100644
--- a/ext/xmlwriter/tests/OO_006.phpt
+++ b/ext/xmlwriter/tests/OO_006.phpt
@@ -1,11 +1,11 @@
 --TEST--
-XMLWriter: libxml2 XML Writer, startDTD/writeElementNS 
+XMLWriter: libxml2 XML Writer, startDTD/writeElementNS
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $doc_dest = '001.xml';
diff --git a/ext/xmlwriter/tests/OO_007.phpt b/ext/xmlwriter/tests/OO_007.phpt
index 257a5cd90cd..a8a34069fcd 100644
--- a/ext/xmlwriter/tests/OO_007.phpt
+++ b/ext/xmlwriter/tests/OO_007.phpt
@@ -1,12 +1,12 @@
 --TEST--
-XMLWriter: libxml2 XML Writer, Elements & Attributes 
+XMLWriter: libxml2 XML Writer, Elements & Attributes
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 if (LIBXML_VERSION < 20629) die("skip: libxml2 2.6.29+ required");
 ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xw = new XMLWriter();
diff --git a/ext/xmlwriter/tests/OO_008.phpt b/ext/xmlwriter/tests/OO_008.phpt
index fe127ced2fc..575bf3a7523 100644
--- a/ext/xmlwriter/tests/OO_008.phpt
+++ b/ext/xmlwriter/tests/OO_008.phpt
@@ -1,11 +1,11 @@
 --TEST--
 XMLWriter: libxml2 XML Writer DTD Element & Attlist
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xw = new XMLWriter();
diff --git a/ext/xmlwriter/tests/OO_009.phpt b/ext/xmlwriter/tests/OO_009.phpt
index c874f3e4ef8..9dcb546a62c 100644
--- a/ext/xmlwriter/tests/OO_009.phpt
+++ b/ext/xmlwriter/tests/OO_009.phpt
@@ -1,11 +1,11 @@
 --TEST--
 XMLWriter: PI, Comment, CDATA
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 /*
 Libxml 2.6.24 and up adds a new line after a processing instruction (PI)
diff --git a/ext/xmlwriter/tests/OO_010.phpt b/ext/xmlwriter/tests/OO_010.phpt
index 38357eca182..8fb7547823f 100644
--- a/ext/xmlwriter/tests/OO_010.phpt
+++ b/ext/xmlwriter/tests/OO_010.phpt
@@ -1,15 +1,15 @@
 --TEST--
 XMLWriter: libxml2 XML Writer, writeAttributeNS method
---CREDITS-- 
+--CREDITS--
 Mauricio Vieira <mauricio [at] @mauriciovieira [dot] net>
 #testfest PHPSP on 2014-07-05
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 if (LIBXML_VERSION < 20701) die("skip: libxml2 2.7.1+ required");
 ?>
 --FILE--
-<?php 
+<?php
 /* $Id$ */
 
 $xw = new XMLWriter();
@@ -19,7 +19,7 @@ $xw->setIndentString('   ');
 $xw->startDocument('1.0', "UTF-8");
 $xw->startElement('root');
 $xw->startElementNS('ns1', 'child1', 'urn:ns1');
-$xw->writeAttributeNS('ns1', 'att1', 'urn:ns1', '<>"\'&'); 
+$xw->writeAttributeNS('ns1', 'att1', 'urn:ns1', '<>"\'&');
 $xw->writeElement('chars', "special characters: <>\"'&");
 $xw->endElement();
 $xw->endDocument();
diff --git a/ext/xmlwriter/tests/bug39504.phpt b/ext/xmlwriter/tests/bug39504.phpt
index af97f81ed59..6287194f576 100644
--- a/ext/xmlwriter/tests/bug39504.phpt
+++ b/ext/xmlwriter/tests/bug39504.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag, not enity)
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 ?>
 --FILE--
 <?php
diff --git a/ext/xmlwriter/tests/bug41287.phpt b/ext/xmlwriter/tests/bug41287.phpt
index 72b6720f1d4..5dcf96637d6 100644
--- a/ext/xmlwriter/tests/bug41287.phpt
+++ b/ext/xmlwriter/tests/bug41287.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #41287 (Namespace functions don't allow xmlns definition to be optional)
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 ?>
 --FILE--
 <?php
diff --git a/ext/xmlwriter/tests/bug41326.phpt b/ext/xmlwriter/tests/bug41326.phpt
index c69cab17957..c87af847227 100644
--- a/ext/xmlwriter/tests/bug41326.phpt
+++ b/ext/xmlwriter/tests/bug41326.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Bug #41287 (Writing empty tags with Xmlwriter::WriteElement[ns])
 --SKIPIF--
-<?php 
-if (!extension_loaded("xmlwriter")) die("skip"); 
+<?php
+if (!extension_loaded("xmlwriter")) die("skip");
 ?>
 --FILE--
 <?php
diff --git a/ext/xmlwriter/tests/bug48204.phpt b/ext/xmlwriter/tests/bug48204.phpt
index 638512b2747..1ce6b06fb6e 100644
--- a/ext/xmlwriter/tests/bug48204.phpt
+++ b/ext/xmlwriter/tests/bug48204.phpt
@@ -3,7 +3,7 @@ xmlwriter_open_uri with PHP_MAXPATHLEN + 1
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $path = str_repeat('a', PHP_MAXPATHLEN + 1);
 var_dump(xmlwriter_open_uri('file:///' . $path));
 ?>
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt
index fb7602b539d..1e97b02f16d 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_001.phpt
@@ -3,7 +3,7 @@ xmlwriter_open_uri with empty string as parameter
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 var_dump(xmlwriter_open_uri(''));
 ?>
 --CREDITS--
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt
index 9cd33f73133..c8410604cf7 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_002.phpt
@@ -3,7 +3,7 @@ xmlwriter_open_uri without parameter
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 var_dump(xmlwriter_open_uri());
 ?>
 --CREDITS--
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt
index 0e56d891dce..7065eed54df 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_003.phpt
@@ -3,7 +3,7 @@ xmlwriter_open_uri with non existing file
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 var_dump(xmlwriter_open_uri('foo/bar.tmp'));
 ?>
 --CREDITS--
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt
index 6970c0eda15..8f5be51c5b0 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_004.phpt
@@ -3,7 +3,7 @@ xmlwriter_open_uri with file:///
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 var_dump(xmlwriter_open_uri('file:///'));
 ?>
 --CREDITS--
diff --git a/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt b/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt
index 9d08716ccf9..0df6ce06d1f 100644
--- a/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_open_uri_error_005.phpt
@@ -3,7 +3,7 @@ xmlwriter_open_uri with file://localhost/
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 var_dump(xmlwriter_open_uri('file://localhost/'));
 ?>
 --CREDITS--
diff --git a/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt b/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt
index 8c3e7d92571..9db8b55346f 100644
--- a/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_set_indent_string_basic_001.phpt
@@ -3,7 +3,7 @@ xmlwriter_set_indent_string passing xmlwriter resource
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $temp_filename = dirname(__FILE__)."/xmlwriter_set_indent_string.tmp";
 	$fp = fopen($temp_filename, "w");
 	fwrite ($fp, "Hi");
diff --git a/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt b/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt
index 5bb9ef8b659..c10ed7bf662 100644
--- a/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt
+++ b/ext/xmlwriter/tests/xmlwriter_set_indent_string_error_001.phpt
@@ -3,7 +3,7 @@ xmlwriter_set_indent_string with missing param(s)
 --SKIPIF--
 <?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
 --FILE--
-<?php 
+<?php
 $temp_filename = dirname(__FILE__)."/xmlwriter_set_indent_string_error.tmp";
 	$fp = fopen($temp_filename, "w");
 	fwrite ($fp, "Hi");
diff --git a/ext/xsl/tests/bug54446.phpt b/ext/xsl/tests/bug54446.phpt
index f00b118ff8b..94197faa181 100644
--- a/ext/xsl/tests/bug54446.phpt
+++ b/ext/xsl/tests/bug54446.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('xsl')) die("skip Extension XSL is required\n");
 ?>
 --FILE--
 <?php
-include("prepare.inc"); 
+include("prepare.inc");
 
 $outputfile = dirname(__FILE__)."/bug54446test.txt";
 if (file_exists($outputfile)) {
@@ -30,11 +30,11 @@ EOT;
 
 $xsl->loadXML( $sXsl );
 
-# START XSLT 
-$proc->importStylesheet( $xsl ); 
+# START XSLT
+$proc->importStylesheet( $xsl );
 
-# TRASNFORM & PRINT 
-print $proc->transformToXML( $dom ); 
+# TRASNFORM & PRINT
+print $proc->transformToXML( $dom );
 
 
 if (file_exists($outputfile)) {
@@ -46,8 +46,8 @@ if (file_exists($outputfile)) {
 #SET NO SECURITY PREFS
 $proc->setSecurityPrefs(XSL_SECPREF_NONE);
 
-# TRASNFORM & PRINT 
-print $proc->transformToXML( $dom ); 
+# TRASNFORM & PRINT
+print $proc->transformToXML( $dom );
 
 
 if (file_exists($outputfile)) {
@@ -61,8 +61,8 @@ unlink($outputfile);
 #SET SECURITY PREFS AGAIN
 $proc->setSecurityPrefs( XSL_SECPREF_WRITE_FILE |  XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_CREATE_DIRECTORY);
 
-# TRASNFORM & PRINT 
-print $proc->transformToXML( $dom ); 
+# TRASNFORM & PRINT
+print $proc->transformToXML( $dom );
 
 if (file_exists($outputfile)) {
     print "$outputfile exists, but shouldn't!\n";
diff --git a/ext/xsl/tests/bug54446_with_ini.phpt b/ext/xsl/tests/bug54446_with_ini.phpt
index 9edc8b38f39..c21292d4c1f 100644
--- a/ext/xsl/tests/bug54446_with_ini.phpt
+++ b/ext/xsl/tests/bug54446_with_ini.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('xsl')) die("skip Extension XSL is required\n");
 ?>
 --FILE--
 <?php
-include("prepare.inc"); 
+include("prepare.inc");
 
 $outputfile = dirname(__FILE__)."/bug54446test.txt";
 if (file_exists($outputfile)) {
@@ -30,11 +30,11 @@ EOT;
 
 $xsl->loadXML( $sXsl );
 
-# START XSLT 
-$proc->importStylesheet( $xsl ); 
+# START XSLT
+$proc->importStylesheet( $xsl );
 
-# TRASNFORM & PRINT 
-print $proc->transformToXML( $dom ); 
+# TRASNFORM & PRINT
+print $proc->transformToXML( $dom );
 
 
 if (file_exists($outputfile)) {
@@ -46,8 +46,8 @@ if (file_exists($outputfile)) {
 #SET NO SECURITY PREFS
 $proc->setSecurityPrefs(XSL_SECPREF_NONE);
 
-# TRANSFORM & PRINT 
-print $proc->transformToXML( $dom ); 
+# TRANSFORM & PRINT
+print $proc->transformToXML( $dom );
 
 
 if (file_exists($outputfile)) {
@@ -61,8 +61,8 @@ unlink($outputfile);
 #SET SECURITY PREFS AGAIN
 $proc->setSecurityPrefs(XSL_SECPREF_WRITE_FILE | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_CREATE_DIRECTORY);
 
-# TRANSFORM & PRINT 
-print $proc->transformToXML( $dom ); 
+# TRANSFORM & PRINT
+print $proc->transformToXML( $dom );
 
 if (file_exists($outputfile)) {
     print "$outputfile exists, but shouldn't!\n";
diff --git a/ext/xsl/tests/xsl-phpinfo.phpt b/ext/xsl/tests/xsl-phpinfo.phpt
index 83e6729ce60..5f830356b74 100644
--- a/ext/xsl/tests/xsl-phpinfo.phpt
+++ b/ext/xsl/tests/xsl-phpinfo.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test phpinfo() displays xsl info
 --SKIPIF--
-<?php 
+<?php
 	if (!extension_loaded("xsl")) {
 		die("SKIP extension gettext not loaded\n");
 	}
diff --git a/ext/xsl/tests/xslt009.phpt b/ext/xsl/tests/xslt009.phpt
index 67b0d67faf3..9d1110ddeb0 100644
--- a/ext/xsl/tests/xslt009.phpt
+++ b/ext/xsl/tests/xslt009.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test 9: Stream Wrapper XPath-Document() 
+Test 9: Stream Wrapper XPath-Document()
 --SKIPIF--
 <?php
 	require_once dirname(__FILE__) .'/skipif.inc';
diff --git a/ext/xsl/tests/xslt010.phpt b/ext/xsl/tests/xslt010.phpt
index adabbf55a07..a805e9fbaa3 100644
--- a/ext/xsl/tests/xslt010.phpt
+++ b/ext/xsl/tests/xslt010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test 10: EXSLT Support
 --SKIPIF--
-<?php 
+<?php
 require_once dirname(__FILE__) .'/skipif.inc';
 $proc = new xsltprocessor;
 if (!$proc->hasExsltSupport()) die('skip EXSLT support not available');
@@ -16,10 +16,10 @@ $dom = new domDocument();
   $dom->load(dirname(__FILE__)."/exslt.xsl");
   $proc = new xsltprocessor;
   $xsl = $proc->importStylesheet($dom);
-  
+
   $xml = new DomDocument();
   $xml->load(dirname(__FILE__)."/exslt.xml");
-  
+
   print $proc->transformToXml($xml);
 --EXPECT--
 Test 10: EXSLT Support
diff --git a/ext/xsl/tests/xslt010_gt10129.phpt b/ext/xsl/tests/xslt010_gt10129.phpt
index 68ea6218dbf..a04f2899849 100644
--- a/ext/xsl/tests/xslt010_gt10129.phpt
+++ b/ext/xsl/tests/xslt010_gt10129.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test 10: EXSLT Support
 --SKIPIF--
-<?php 
+<?php
 require_once dirname(__FILE__) .'/skipif.inc';
 $proc = new xsltprocessor;
 if (!$proc->hasExsltSupport()) die('skip EXSLT support not available');
@@ -15,10 +15,10 @@ $dom = new domDocument();
   $dom->load(dirname(__FILE__)."/exslt.xsl");
   $proc = new xsltprocessor;
   $xsl = $proc->importStylesheet($dom);
-  
+
   $xml = new DomDocument();
   $xml->load(dirname(__FILE__)."/exslt.xml");
-  
+
   print $proc->transformToXml($xml);
 --EXPECT--
 Test 10: EXSLT Support
diff --git a/ext/xsl/tests/xslt011.phpt b/ext/xsl/tests/xslt011.phpt
index 5ddb3dbbe6d..2ca4e91fe92 100644
--- a/ext/xsl/tests/xslt011.phpt
+++ b/ext/xsl/tests/xslt011.phpt
@@ -14,12 +14,12 @@ $dom = new domDocument();
   $dom->load(dirname(__FILE__)."/xslt011.xsl");
   $proc = new xsltprocessor;
   $xsl = $proc->importStylesheet($dom);
-  
+
   $xml = new DomDocument();
   $xml->load(dirname(__FILE__)."/xslt011.xml");
   $proc->registerPHPFunctions();
   print $proc->transformToXml($xml);
- 
+
   function foobar($id, $secondArg = "" ) {
     if (is_array($id)) {
         return $id[0]->value . " - " . $secondArg;
@@ -39,13 +39,13 @@ $dom = new domDocument();
   function nonDomNode() {
     return  new foo();
   }
-  
+
   class aClass {
     static function aStaticFunction($id) {
         return $id;
     }
   }
-  
+
 --EXPECTF--
 Test 11: php:function Support
 
diff --git a/ext/xsl/tests/xsltprocessor_getParameter-invalidparam.phpt b/ext/xsl/tests/xsltprocessor_getParameter-invalidparam.phpt
index 19f7791032d..7c8154c1355 100644
--- a/ext/xsl/tests/xsltprocessor_getParameter-invalidparam.phpt
+++ b/ext/xsl/tests/xsltprocessor_getParameter-invalidparam.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check xsltprocessor::getParameter with undefined parameter
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_getParameter-wrongparam.phpt b/ext/xsl/tests/xsltprocessor_getParameter-wrongparam.phpt
index f6d9a8852fc..aa5ddcf15c4 100644
--- a/ext/xsl/tests/xsltprocessor_getParameter-wrongparam.phpt
+++ b/ext/xsl/tests/xsltprocessor_getParameter-wrongparam.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check xsltprocessor::getparameter error handling
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_getParameter.phpt b/ext/xsl/tests/xsltprocessor_getParameter.phpt
index 2430bc88a44..376a1a3c36b 100644
--- a/ext/xsl/tests/xsltprocessor_getParameter.phpt
+++ b/ext/xsl/tests/xsltprocessor_getParameter.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check xsltprocessor::getparameter functionality
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt
index 1f0453ec843..119a95de1a8 100644
--- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt
+++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-allfuncs.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check xsltprocessor::registerPHPFunctions
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-multiple.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-multiple.phpt
index a5f23735c9e..f8e7e8460e5 100644
--- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-multiple.phpt
+++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-multiple.phpt
@@ -5,7 +5,7 @@ When being called multiple times with an array,
 registerPHPFunctions adds the new functions to the allowed parameter
 list - it does not replace the previously allowed functions.
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-notallowed.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-notallowed.phpt
index 9492fc6861b..cc49371fe6b 100644
--- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-notallowed.phpt
+++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array-notallowed.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check xsltprocessor::registerPHPFunctions with array and a not allowed function
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array.phpt
index 0e467aabaab..539e4207d49 100644
--- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array.phpt
+++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-array.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check xsltprocessor::registerPHPFunctions with array
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
index 90d9c68208c..f66632d2be5 100644
--- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
+++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
@@ -4,7 +4,7 @@ Check xsltprocessor::registerPHPFunctions and a non-string function in xsl
 The XSL script tries to call a php function that is not a string which
 is expected to fail
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
index a26c2103331..e4cf0e816a4 100644
--- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
+++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
@@ -3,7 +3,7 @@ Check xsltprocessor::registerPHPFunctions and a undefined php function
 --DESCRIPTION--
 The XSL script tries to call a php function that is not defined
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-null.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-null.phpt
index f74d785042e..13597d0a4d9 100644
--- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-null.phpt
+++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-null.phpt
@@ -5,7 +5,7 @@ When being called multiple times with an array,
 registerPHPFunctions adds the new functions to the allowed parameter
 list - it does not replace the previously allowed functions.
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-multiple.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-multiple.phpt
index f15c08d327d..5bf929b30ee 100644
--- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-multiple.phpt
+++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-multiple.phpt
@@ -5,7 +5,7 @@ When being called multiple times with a stringular function name only,
 registerPHPFunctions adds the new function to the allowed parameter
 list - it does not replace the old function.
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-notallowed.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-notallowed.phpt
index 92577497146..1e7092c8bd6 100644
--- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-notallowed.phpt
+++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string-notallowed.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check xsltprocessor::registerPHPFunctions with string and not allowed function
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string.phpt
index 5fbba909b17..9a824464d7b 100644
--- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string.phpt
+++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-string.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check xsltprocessor::registerPHPFunctions with string
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_removeParameter-invalidparam.phpt b/ext/xsl/tests/xsltprocessor_removeParameter-invalidparam.phpt
index f35b4708408..a5a62286c19 100644
--- a/ext/xsl/tests/xsltprocessor_removeParameter-invalidparam.phpt
+++ b/ext/xsl/tests/xsltprocessor_removeParameter-invalidparam.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check xsltprocessor::removeParameter with invalid parameter
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_removeParameter-wrongparams.phpt b/ext/xsl/tests/xsltprocessor_removeParameter-wrongparams.phpt
index bbfdc20cd75..2cea8884d9c 100644
--- a/ext/xsl/tests/xsltprocessor_removeParameter-wrongparams.phpt
+++ b/ext/xsl/tests/xsltprocessor_removeParameter-wrongparams.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check xsltprocessor::removeParameter wrong parameter handling
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_removeParameter.phpt b/ext/xsl/tests/xsltprocessor_removeParameter.phpt
index 92be056985e..6568e2bae31 100644
--- a/ext/xsl/tests/xsltprocessor_removeParameter.phpt
+++ b/ext/xsl/tests/xsltprocessor_removeParameter.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check xsltprocessor::removeParameter functionality
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_setparameter-errorquote.phpt b/ext/xsl/tests/xsltprocessor_setparameter-errorquote.phpt
index 44e49de6016..a3114bb7552 100644
--- a/ext/xsl/tests/xsltprocessor_setparameter-errorquote.phpt
+++ b/ext/xsl/tests/xsltprocessor_setparameter-errorquote.phpt
@@ -3,7 +3,7 @@ Check xsltprocessor::setparameter error handling with both single and double quo
 --DESCRIPTION--
 Memleak: http://bugs.php.net/bug.php?id=48221
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/xsl/tests/xsltprocessor_setparameter-nostring.phpt b/ext/xsl/tests/xsltprocessor_setparameter-nostring.phpt
index c4fcd709eab..dd17a72d490 100644
--- a/ext/xsl/tests/xsltprocessor_setparameter-nostring.phpt
+++ b/ext/xsl/tests/xsltprocessor_setparameter-nostring.phpt
@@ -3,7 +3,7 @@ Check xsltprocessor::setparameter error handling with no-string
 --DESCRIPTION--
 Memleak: http://bugs.php.net/bug.php?id=48221
 --SKIPIF--
-<?php 
+<?php
         if (!extension_loaded('xsl')) {
                 die("skip\n");
         }
diff --git a/ext/zip/tests/001.phpt b/ext/zip/tests/001.phpt
index 37dccc055e0..5bedbe7be43 100644
--- a/ext/zip/tests/001.phpt
+++ b/ext/zip/tests/001.phpt
@@ -5,7 +5,7 @@ Check for zip presence
 --POST--
 --GET--
 --FILE--
-<?php 
+<?php
 echo "zip extension is available";
 ?>
 --EXPECT--
diff --git a/ext/zip/tests/bug38944.phpt b/ext/zip/tests/bug38944.phpt
index ede6b67e777..b4ff2b2f193 100644
--- a/ext/zip/tests/bug38944.phpt
+++ b/ext/zip/tests/bug38944.phpt
@@ -19,7 +19,7 @@ var_dump($foo);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 int(0)
 int(0)
 int(0)
diff --git a/ext/zip/tests/bug47667.phpt b/ext/zip/tests/bug47667.phpt
index 9c17de6f9b3..fada9bf80f2 100644
--- a/ext/zip/tests/bug47667.phpt
+++ b/ext/zip/tests/bug47667.phpt
@@ -22,7 +22,7 @@ for ($i = 0; $i < 10; $i++) {
 	$zip = new ZipArchive();
 	if ($zip->open($filename, ZipArchive::OVERWRITE) !== true) {
 		exit("Unable to open the zip file");
-	}	
+	}
 	$zip->addFromString("foo_{$i}.txt", 'foo bar foobar');
 	$zip->close();
 }
diff --git a/ext/zip/tests/oo_encryption.phpt b/ext/zip/tests/oo_encryption.phpt
index b703611667f..a9797e37b13 100644
--- a/ext/zip/tests/oo_encryption.phpt
+++ b/ext/zip/tests/oo_encryption.phpt
@@ -16,7 +16,7 @@ echo "== Write\n";
 $zip  = new ZipArchive;
 $r = $zip->open($name, ZIPARCHIVE::CREATE);
 // Clear
-$zip->addFromString('foo.txt', 'foo'); 
+$zip->addFromString('foo.txt', 'foo');
 // Encrypted
 $zip->addFromString('bar.txt', 'bar');
 var_dump($zip->setEncryptionName('bar.txt', 9999, $pass)); // Fails
diff --git a/ext/zlib/tests/004-mb.phpt b/ext/zlib/tests/004-mb.phpt
index a9371f414f0..92f7db1b708 100644
--- a/ext/zlib/tests/004-mb.phpt
+++ b/ext/zlib/tests/004-mb.phpt
@@ -14,7 +14,7 @@ var_dump(gzfile(dirname(__FILE__)."/004��ガラスを食�られ��.txt.
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gzfile() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 
diff --git a/ext/zlib/tests/004.phpt b/ext/zlib/tests/004.phpt
index ebc7d82b951..b8d0f0eccd2 100644
--- a/ext/zlib/tests/004.phpt
+++ b/ext/zlib/tests/004.phpt
@@ -14,7 +14,7 @@ var_dump(gzfile(dirname(__FILE__)."/004.txt.gz", 1));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gzfile() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 
diff --git a/ext/zlib/tests/005.phpt b/ext/zlib/tests/005.phpt
index 84fc3b5f10f..24d272ece01 100644
--- a/ext/zlib/tests/005.phpt
+++ b/ext/zlib/tests/005.phpt
@@ -1,5 +1,5 @@
 --TEST--
-gzcompress()/gzuncompress() and invalid params 
+gzcompress()/gzuncompress() and invalid params
 --SKIPIF--
 <?php if (!extension_loaded("zlib")) print "skip"; ?>
 --FILE--
diff --git a/ext/zlib/tests/006.phpt b/ext/zlib/tests/006.phpt
index 8c03ea068d9..0d082092ca3 100644
--- a/ext/zlib/tests/006.phpt
+++ b/ext/zlib/tests/006.phpt
@@ -1,5 +1,5 @@
 --TEST--
-gzdeflate()/gzinflate() and invalid params 
+gzdeflate()/gzinflate() and invalid params
 --SKIPIF--
 <?php if (!extension_loaded("zlib")) print "skip"; ?>
 --FILE--
@@ -34,7 +34,7 @@ var_dump(gzinflate($data2));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gzdeflate() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 
diff --git a/ext/zlib/tests/007.phpt b/ext/zlib/tests/007.phpt
index c55d78d126c..6c42bf67dbe 100644
--- a/ext/zlib/tests/007.phpt
+++ b/ext/zlib/tests/007.phpt
@@ -26,7 +26,7 @@ var_dump(gzencode($string, 9, ZLIB_ENCODING_DEFLATE));
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 Warning: gzencode() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 
diff --git a/ext/zlib/tests/bug51269.phpt b/ext/zlib/tests/bug51269.phpt
index 89ad7b62698..97b2e55bcac 100644
--- a/ext/zlib/tests/bug51269.phpt
+++ b/ext/zlib/tests/bug51269.phpt
@@ -5,7 +5,7 @@ zlib.output_compression=1
 --ENV--
 HTTP_ACCEPT_ENCODING=gzip
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) die("skip zlib required");
 ?>
 --FILE--
diff --git a/ext/zlib/tests/bug60761.phpt b/ext/zlib/tests/bug60761.phpt
index 1e9fe69a012..3e14bc2cdb0 100644
--- a/ext/zlib/tests/bug60761.phpt
+++ b/ext/zlib/tests/bug60761.phpt
@@ -28,21 +28,21 @@ for ( $i=0 ; $i < 100 ; $i++ ) {
 	$len = strlen($html);
 
 	$lens[$len] = $len;
-} 
- 
+}
+
 $lens = array_values($lens);
 
 echo "Compressed Lengths\n";
 
 // pass == only ONE length for all iterations
 //         (length didn't change during run)
-// 
+//
 // hard to anticipate what 'correct' length should be since
 // return value of phpinfo() will vary between installations...
 // just check that there is only one length
-// 
+//
 var_dump($lens); // show lengths to help triage in case of failure
- 
+
 // expected headers since its CGI
 
 ?>
diff --git a/ext/zlib/tests/bug61139.phpt b/ext/zlib/tests/bug61139.phpt
index 71961a64dc6..ab7c74e9ccf 100644
--- a/ext/zlib/tests/bug61139.phpt
+++ b/ext/zlib/tests/bug61139.phpt
@@ -1,18 +1,18 @@
 --TEST--
 Bug #61139 (gzopen leaks when specifying invalid mode)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded('zlib')) {
-	die('skip - zlib extension not loaded'); 
-}	 
+	die('skip - zlib extension not loaded');
+}
 ?>
 --FILE--
 <?php
 
 gzopen('someFile', 'c');
 --CLEAN--
-<?php 
-	unlink('someFile'); 
+<?php
+	unlink('someFile');
 ?>
 --EXPECTF--
 Warning: gzopen(): gzopen failed in %s on line %d
diff --git a/ext/zlib/tests/bug61443.phpt b/ext/zlib/tests/bug61443.phpt
index ea2fa68c892..2659a0fc229 100644
--- a/ext/zlib/tests/bug61443.phpt
+++ b/ext/zlib/tests/bug61443.phpt
@@ -6,7 +6,7 @@ extension_loaded("zlib") or die("skip");
 ?>
 --FILE--
 <?php
-ob_start(); echo "foo\n"; ob_get_clean(); 
+ob_start(); echo "foo\n"; ob_get_clean();
 if(!headers_sent()) ini_set('zlib.output_compression', true); echo "end\n";
 ?>
 DONE
diff --git a/ext/zlib/tests/bug_34821.phpt b/ext/zlib/tests/bug_34821.phpt
index b378ec4097c..53ef4d229e9 100644
--- a/ext/zlib/tests/bug_34821.phpt
+++ b/ext/zlib/tests/bug_34821.phpt
@@ -7,9 +7,9 @@ Bug #34821 (zlib encoders fail on widely varying binary data)
 
 // test 50 bytes to 50k
 $b = array(
-	50, 
-	500, 
-	5000, 
+	50,
+	500,
+	5000,
 	50000,
 //	1000000, // works, but test would take too long
 );
diff --git a/ext/zlib/tests/bug_52944.phpt b/ext/zlib/tests/bug_52944.phpt
index 68bd53791d5..4edc147db9b 100644
--- a/ext/zlib/tests/bug_52944.phpt
+++ b/ext/zlib/tests/bug_52944.phpt
@@ -6,7 +6,7 @@ Bug #52944 (segfault with zlib filter and corrupted data)
 allow_url_fopen=1
 --FILE--
 <?php
-/* NOTE this test can fail on asm builds of zlib 1.2.5 or 
+/* NOTE this test can fail on asm builds of zlib 1.2.5 or
    1.2.7 on at least Windows and Darwin. Using unoptimized
    zlib build fixes the issue. */
 
diff --git a/ext/zlib/tests/deflate_add_basic.phpt b/ext/zlib/tests/deflate_add_basic.phpt
index 05fcb037bd5..d530a21e985 100644
--- a/ext/zlib/tests/deflate_add_basic.phpt
+++ b/ext/zlib/tests/deflate_add_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test incremental deflate_add() functionality
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-    print "skip - ZLIB extension not loaded"; 
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/deflate_add_block_v123.phpt b/ext/zlib/tests/deflate_add_block_v123.phpt
index 3fe03f99baa..786f8aed565 100644
--- a/ext/zlib/tests/deflate_add_block_v123.phpt
+++ b/ext/zlib/tests/deflate_add_block_v123.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test deflate_add() errors with ZLIB_BLOCK in zlib < 1.2.4
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
     print "skip - ZLIB extension not loaded";
 }
diff --git a/ext/zlib/tests/deflate_add_buffer_full.phpt b/ext/zlib/tests/deflate_add_buffer_full.phpt
index a2b3fc4ab01..7ba0f2e3cd9 100644
--- a/ext/zlib/tests/deflate_add_buffer_full.phpt
+++ b/ext/zlib/tests/deflate_add_buffer_full.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test deflate_add() buffer issue with data that fills deflate buffer while using ZLIB_SYNC_FLUSH on ZLIB_ENCODING_RAW.
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-    print "skip - ZLIB extension not loaded"; 
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/deflate_add_error.phpt b/ext/zlib/tests/deflate_add_error.phpt
index 159f1648c90..e02cec3832f 100644
--- a/ext/zlib/tests/deflate_add_error.phpt
+++ b/ext/zlib/tests/deflate_add_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test incremental deflate_add() error functionality
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-    print "skip - ZLIB extension not loaded"; 
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/deflate_init_error.phpt b/ext/zlib/tests/deflate_init_error.phpt
index 424272c1242..e7166455a9f 100644
--- a/ext/zlib/tests/deflate_init_error.phpt
+++ b/ext/zlib/tests/deflate_init_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test deflate_init() error
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-    print "skip - ZLIB extension not loaded"; 
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/deflate_init_reuse.phpt b/ext/zlib/tests/deflate_init_reuse.phpt
index b351f496f78..0b807c99f82 100644
--- a/ext/zlib/tests/deflate_init_reuse.phpt
+++ b/ext/zlib/tests/deflate_init_reuse.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test incremental deflate_init() context reuse
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-    print "skip - ZLIB extension not loaded"; 
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzclose_basic.phpt b/ext/zlib/tests/gzclose_basic.phpt
index acad3b2f077..9a84111781a 100644
--- a/ext/zlib/tests/gzclose_basic.phpt
+++ b/ext/zlib/tests/gzclose_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzclose() by calling it with its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzclose_error.phpt b/ext/zlib/tests/gzclose_error.phpt
index ec4b6eb2469..3e1a035060b 100644
--- a/ext/zlib/tests/gzclose_error.phpt
+++ b/ext/zlib/tests/gzclose_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzclose() by calling it more than or less than its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
@@ -11,7 +11,7 @@ if (!extension_loaded("zlib")) {
 
 $f = dirname(__FILE__)."/004.txt.gz";
 $h = gzopen($f, 'r');
-$extra_arg = 'nothing'; 
+$extra_arg = 'nothing';
 
 
 
diff --git a/ext/zlib/tests/gzcompress_basic1.phpt b/ext/zlib/tests/gzcompress_basic1.phpt
index 1506d0c1eef..9d5fcedcf8a 100644
--- a/ext/zlib/tests/gzcompress_basic1.phpt
+++ b/ext/zlib/tests/gzcompress_basic1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gzcompress() function : basic functionality 
+Test gzcompress() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : string gzcompress(string data [, int level, [int encoding]])
- * Description: Gzip-compress a string 
+ * Description: Gzip-compress a string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/zlib/tests/gzcompress_error1.phpt b/ext/zlib/tests/gzcompress_error1.phpt
index 9db0a56fa1d..3f742a4dca5 100644
--- a/ext/zlib/tests/gzcompress_error1.phpt
+++ b/ext/zlib/tests/gzcompress_error1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gzcompress() function : error conditions 
+Test gzcompress() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : string gzcompress(string data [, int level, [int encoding]])
- * Description: Gzip-compress a string 
+ * Description: Gzip-compress a string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -45,7 +45,7 @@ echo "\n-- Testing with incorrect parameters --\n";
 
 class Tester {
     function Hello() {
-        echo "Hello\n"; 
+        echo "Hello\n";
     }
 }
 
diff --git a/ext/zlib/tests/gzcompress_variation1.phpt b/ext/zlib/tests/gzcompress_variation1.phpt
index 7a8457c24f5..71adab1cbf7 100644
--- a/ext/zlib/tests/gzcompress_variation1.phpt
+++ b/ext/zlib/tests/gzcompress_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gzcompress() function : variation 
+Test gzcompress() function : variation
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : string gzcompress(string data [, int level, [int encoding]])
- * Description: Gzip-compress a string 
+ * Description: Gzip-compress a string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 include(dirname(__FILE__) . '/data.inc');
diff --git a/ext/zlib/tests/gzdeflate_basic1.phpt b/ext/zlib/tests/gzdeflate_basic1.phpt
index a2ae0f01dad..5f25a1880b7 100644
--- a/ext/zlib/tests/gzdeflate_basic1.phpt
+++ b/ext/zlib/tests/gzdeflate_basic1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gzdeflate() function : basic functionality 
+Test gzdeflate() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : string gzdeflate(string data [, int level, [int encoding]])
- * Description: Gzip-compress a string 
+ * Description: Gzip-compress a string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
diff --git a/ext/zlib/tests/gzdeflate_error1.phpt b/ext/zlib/tests/gzdeflate_error1.phpt
index 740054269f7..0b3f3dab9cc 100644
--- a/ext/zlib/tests/gzdeflate_error1.phpt
+++ b/ext/zlib/tests/gzdeflate_error1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gzdeflate() function : error conditions 
+Test gzdeflate() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : string gzdeflate(string data [, int level, [int encoding]])
- * Description: Gzip-compress a string 
+ * Description: Gzip-compress a string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -33,16 +33,16 @@ $extra_arg = 10;
 var_dump( gzdeflate($data, $level, $encoding, $extra_arg) );
 
 echo "\n-- Testing with incorrect compression level --\n";
-$bad_level = 99; 
+$bad_level = 99;
 var_dump(gzdeflate($data, $bad_level));
 
 echo "\n-- Testing with incorrect encoding --\n";
-$bad_encoding = 99; 
+$bad_encoding = 99;
 var_dump(gzdeflate($data, $level, $bad_encoding));
 
 class Tester {
     function Hello() {
-        echo "Hello\n"; 
+        echo "Hello\n";
     }
 }
 
diff --git a/ext/zlib/tests/gzdeflate_variation1.phpt b/ext/zlib/tests/gzdeflate_variation1.phpt
index 75eb16e03db..dc8b9d1fcd2 100644
--- a/ext/zlib/tests/gzdeflate_variation1.phpt
+++ b/ext/zlib/tests/gzdeflate_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gzdeflate() function : variation 
+Test gzdeflate() function : variation
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : string gzdeflate(string data [, int level])
- * Description: Gzip-compress a string 
+ * Description: Gzip-compress a string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 include(dirname(__FILE__) . '/data.inc');
diff --git a/ext/zlib/tests/gzencode_basic1.phpt b/ext/zlib/tests/gzencode_basic1.phpt
index 3c0ec559e9b..c6040135f06 100644
--- a/ext/zlib/tests/gzencode_basic1.phpt
+++ b/ext/zlib/tests/gzencode_basic1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gzencode() function : basic functionality 
+Test gzencode() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : string gzencode  ( string $data  [, int $level  [, int $encoding_mode  ]] )
- * Description: Gzip-compress a string 
+ * Description: Gzip-compress a string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -33,10 +33,10 @@ $smallstring = "A small string to compress\n";
 for($i = -1; $i < 10; $i++) {
     echo "-- Compression level $i --\n";
     $output = gzencode($data, $i);
-    
-    // Clear OS byte before encode 
+
+    // Clear OS byte before encode
 	$output[9] = "\x00";
-	
+
     var_dump(md5($output));
 }
 
@@ -44,10 +44,10 @@ for($i = -1; $i < 10; $i++) {
 for($i = -1; $i < 10; $i++) {
     echo "-- Compression level $i --\n";
     $output = gzencode($smallstring, $i);
-    
-    // Clear OS byte before encode 
+
+    // Clear OS byte before encode
 	$output[9] = "\x00";
-	
+
     var_dump(md5($output));
 }
 
diff --git a/ext/zlib/tests/gzencode_error1.phpt b/ext/zlib/tests/gzencode_error1.phpt
index 5a16ffbc5fd..2c4a562634f 100644
--- a/ext/zlib/tests/gzencode_error1.phpt
+++ b/ext/zlib/tests/gzencode_error1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test gzencode() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
-?> 
+	print "skip - ZLIB extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string gzencode  ( string $data  [, int $level  [, int $encoding_mode  ]] )
- * Description: Gzip-compress a string 
+ * Description: Gzip-compress a string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 /*
@@ -37,12 +37,12 @@ $bad_level = 99;
 var_dump(gzencode($data, $bad_level));
 
 echo "\n-- Testing with incorrect encoding_mode --\n";
-$bad_mode = 99; 
+$bad_mode = 99;
 var_dump(gzencode($data, $level, $bad_mode));
 
 class Tester {
     function Hello() {
-        echo "Hello\n"; 
+        echo "Hello\n";
     }
 }
 
diff --git a/ext/zlib/tests/gzencode_variation1-win32.phpt b/ext/zlib/tests/gzencode_variation1-win32.phpt
index 5ff577838b4..4feb7d653c0 100644
--- a/ext/zlib/tests/gzencode_variation1-win32.phpt
+++ b/ext/zlib/tests/gzencode_variation1-win32.phpt
@@ -1,28 +1,28 @@
 --TEST--
 Test gzencode() function : variation
 --SKIPIF--
-<?php 
+<?php
 
 if( substr(PHP_OS, 0, 3) != "WIN" ) {
   die("skip only for Windows");
 }
 
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
-?> 
+	print "skip - ZLIB extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string gzencode  ( string $data  [, int $level  [, int $encoding_mode  ]] )
- * Description: Gzip-compress a string 
+ * Description: Gzip-compress a string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 if(!function_exists("gzdecode")) {
-	function gzdecode($data) 
-	{ 
-	   return gzinflate(substr($data,10,-8)); 
+	function gzdecode($data)
+	{
+	   return gzinflate(substr($data,10,-8));
 	}
 }
 
diff --git a/ext/zlib/tests/gzencode_variation1.phpt b/ext/zlib/tests/gzencode_variation1.phpt
index ef1d3a77f7d..1c82da98f88 100644
--- a/ext/zlib/tests/gzencode_variation1.phpt
+++ b/ext/zlib/tests/gzencode_variation1.phpt
@@ -1,22 +1,22 @@
 --TEST--
 Test gzencode() function : variation
 --SKIPIF--
-<?php 
+<?php
 
 if( substr(PHP_OS, 0, 3) == "WIN" ) {
    die("skip.. Do not run on Windows");
 }
 
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
-?> 
+	print "skip - ZLIB extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string gzencode  ( string $data  [, int $level  [, int $encoding_mode  ]] )
- * Description: Gzip-compress a string 
+ * Description: Gzip-compress a string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 include(dirname(__FILE__) . '/data.inc');
diff --git a/ext/zlib/tests/gzencode_variation2-win32.phpt b/ext/zlib/tests/gzencode_variation2-win32.phpt
index e46ee235230..929d81d74b1 100644
--- a/ext/zlib/tests/gzencode_variation2-win32.phpt
+++ b/ext/zlib/tests/gzencode_variation2-win32.phpt
@@ -1,27 +1,27 @@
 --TEST--
 Test gzencode() function : variation - verify header contents with all encoding modes
 --SKIPIF--
-<?php 
+<?php
 
 if( substr(PHP_OS, 0, 3) != "WIN" ) {
   die("skip.. only for Windows");
 }
 
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 
 include 'func.inc';
 if (version_compare(get_zlib_version(), "1.2.11") < 0) {
 	die("skip - at least zlib 1.2.11 required, got " . get_zlib_version());
 }
-?> 
+?>
 --FILE--
 <?php
 /* Prototype  : string gzencode  ( string $data  [, int $level  [, int $encoding_mode  ]] )
- * Description: Gzip-compress a string 
+ * Description: Gzip-compress a string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gzencode() : variation ***\n";
@@ -30,7 +30,7 @@ $data = "A small string to encode\n";
 
 echo "\n-- Testing with each encoding_mode  --\n";
 var_dump(bin2hex(gzencode($data, -1)));
-var_dump(bin2hex(gzencode($data, -1, FORCE_GZIP)));  
+var_dump(bin2hex(gzencode($data, -1, FORCE_GZIP)));
 var_dump(bin2hex(gzencode($data, -1, FORCE_DEFLATE)));
 
 ?>
diff --git a/ext/zlib/tests/gzencode_variation2.phpt b/ext/zlib/tests/gzencode_variation2.phpt
index de63b7170f5..eabb1cfcf3a 100644
--- a/ext/zlib/tests/gzencode_variation2.phpt
+++ b/ext/zlib/tests/gzencode_variation2.phpt
@@ -1,22 +1,22 @@
 --TEST--
 Test gzencode() function : variation - verify header contents with all encoding modes
 --SKIPIF--
-<?php 
+<?php
 
 if( substr(PHP_OS, 0, 3) == "WIN" ) {
   die("skip.. Do not run on Windows");
 }
 
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
-?> 
+	print "skip - ZLIB extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : string gzencode  ( string $data  [, int $level  [, int $encoding_mode  ]] )
- * Description: Gzip-compress a string 
+ * Description: Gzip-compress a string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gzencode() : variation ***\n";
@@ -25,7 +25,7 @@ $data = "A small string to encode\n";
 
 echo "\n-- Testing with each encoding_mode  --\n";
 var_dump(bin2hex(gzencode($data, -1)));
-var_dump(bin2hex(gzencode($data, -1, FORCE_GZIP)));  
+var_dump(bin2hex(gzencode($data, -1, FORCE_GZIP)));
 var_dump(bin2hex(gzencode($data, -1, FORCE_DEFLATE)));
 
 ?>
diff --git a/ext/zlib/tests/gzeof_basic.phpt b/ext/zlib/tests/gzeof_basic.phpt
index f5d2617a9f4..4b2bb1aec9c 100644
--- a/ext/zlib/tests/gzeof_basic.phpt
+++ b/ext/zlib/tests/gzeof_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function feof() by calling it with its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
@@ -18,7 +18,7 @@ $h = gzopen($f, 'r');
 var_dump(gzeof($h));
 gzpassthru($h);
 var_dump(gzeof($h));
-gzclose($h); 
+gzclose($h);
 
 echo "\n-- test 2 --\n";
 $h = gzopen($f, 'r');
@@ -31,7 +31,7 @@ var_dump(gzeof($h));
 echo "reading 20 characters. eof should be true still\n";
 gzread($h, 20)."\n";
 var_dump(gzeof($h));
-gzclose($h); 
+gzclose($h);
 
 
 
diff --git a/ext/zlib/tests/gzeof_error.phpt b/ext/zlib/tests/gzeof_error.phpt
index af0f7c17fa0..a495b9b646e 100644
--- a/ext/zlib/tests/gzeof_error.phpt
+++ b/ext/zlib/tests/gzeof_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzeof() by calling it more than or less than its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzeof_variation1.phpt b/ext/zlib/tests/gzeof_variation1.phpt
index ba0d8e59323..9e307759281 100644
--- a/ext/zlib/tests/gzeof_variation1.phpt
+++ b/ext/zlib/tests/gzeof_variation1.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzeof while writing.
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzfile_error.phpt b/ext/zlib/tests/gzfile_error.phpt
index 6089f3ebfaa..cea150a86da 100644
--- a/ext/zlib/tests/gzfile_error.phpt
+++ b/ext/zlib/tests/gzfile_error.phpt
@@ -10,7 +10,7 @@ if (!extension_loaded('zlib')) die ('skip zlib extension not available in this b
 
 $filename = dirname(__FILE__)."/004.txt.gz";
 $use_include_path = false;
-$extra_arg = 'nothing'; 
+$extra_arg = 'nothing';
 
 var_dump(gzfile( $filename, $use_include_path, $extra_arg ) );
 
diff --git a/ext/zlib/tests/gzfile_variation15.phpt b/ext/zlib/tests/gzfile_variation15.phpt
index 08360da54d6..54dfedf05fb 100644
--- a/ext/zlib/tests/gzfile_variation15.phpt
+++ b/ext/zlib/tests/gzfile_variation15.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test gzfile() function : variation: use include path (relative directories in path)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 require_once('reading_include_path.inc');
 
 //define the files to go into these directories, create one in dir2
-set_include_path($newIncludePath);   
+set_include_path($newIncludePath);
 test_gzfile();
 restore_include_path();
 
@@ -27,7 +27,7 @@ rmdir($thisTestDir);
 
 function test_gzfile() {
    global $scriptFile, $secondFile, $firstFile, $filename;
-   
+
    // create a file in the middle directory
    $h = gzopen($secondFile, "w");
    gzwrite($h, "This is a file in dir2");
@@ -41,36 +41,36 @@ function test_gzfile() {
    $h = gzopen($firstFile, "w");
    gzwrite($h, "This is a file in dir1");
    gzclose($h);
-   
+
    //should now read dir1 file
    var_dump(gzfile($filename, true));
    echo "\n";
-   
+
    // create a file in working directory
    $h = gzopen($filename, "w");
    gzwrite($h, "This is a file in working dir");
    gzclose($h);
-   
+
    //should still read dir1 file
    var_dump(gzfile($filename, true));
    echo "\n";
-   
+
    unlink($firstFile);
    unlink($secondFile);
-   
+
    //should read the file in working directory
    var_dump(gzfile($filename, true));
    echo "\n";
-   
+
    // create a file in the script directory
    $h = gzopen($scriptFile, "w");
    gzwrite($h, "This is a file in script dir");
    gzclose($h);
-   
+
    //should read the file in script dir
    var_dump(gzfile($filename, true));
    echo "\n";
-     
+
    //cleanup
    unlink($filename);
    unlink($scriptFile);
diff --git a/ext/zlib/tests/gzfile_variation2.phpt b/ext/zlib/tests/gzfile_variation2.phpt
index 36d1d4c71b1..8171a814294 100644
--- a/ext/zlib/tests/gzfile_variation2.phpt
+++ b/ext/zlib/tests/gzfile_variation2.phpt
@@ -8,7 +8,7 @@ if (!extension_loaded('zlib')) die ('skip zlib extension not available in this b
 <?php
 
 
-$use_include_path = 
+$use_include_path =
 
 
 $variation = array(
diff --git a/ext/zlib/tests/gzgetc_basic.phpt b/ext/zlib/tests/gzgetc_basic.phpt
index 5c814e0d1a5..ad8684381bf 100644
--- a/ext/zlib/tests/gzgetc_basic.phpt
+++ b/ext/zlib/tests/gzgetc_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzgetc() by calling it with its expected arguments zlib 1.2.5
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 include 'func.inc';
 if (version_compare(get_zlib_version(), '1.2.5') > 0) {
diff --git a/ext/zlib/tests/gzgetc_basic_1.phpt b/ext/zlib/tests/gzgetc_basic_1.phpt
index 59e3eb6233e..24d847eb640 100644
--- a/ext/zlib/tests/gzgetc_basic_1.phpt
+++ b/ext/zlib/tests/gzgetc_basic_1.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzgetc() by calling it with its expected arguments zlib 1.2.7
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 include 'func.inc';
 if (version_compare(get_zlib_version(), '1.2.7') < 0) {
diff --git a/ext/zlib/tests/gzgetc_error.phpt b/ext/zlib/tests/gzgetc_error.phpt
index cbeabe3a310..2298fa358a0 100644
--- a/ext/zlib/tests/gzgetc_error.phpt
+++ b/ext/zlib/tests/gzgetc_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzgetc() by calling it more than or less than its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzgets_basic.phpt b/ext/zlib/tests/gzgets_basic.phpt
index 3ebc759007e..0e683d1b323 100644
--- a/ext/zlib/tests/gzgets_basic.phpt
+++ b/ext/zlib/tests/gzgets_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzgets() by calling it with its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzgets_error.phpt b/ext/zlib/tests/gzgets_error.phpt
index fe224f1ef41..10b5f0db29f 100644
--- a/ext/zlib/tests/gzgets_error.phpt
+++ b/ext/zlib/tests/gzgets_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzgets() by calling it more than or less than its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzinflate_error1.phpt b/ext/zlib/tests/gzinflate_error1.phpt
index 822d9b81292..f3f9fc97250 100644
--- a/ext/zlib/tests/gzinflate_error1.phpt
+++ b/ext/zlib/tests/gzinflate_error1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gzinflate() function : error conditions 
+Test gzinflate() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : string gzinflate(string data [, int length])
- * Description: Unzip a gzip-compressed string 
+ * Description: Unzip a gzip-compressed string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 include(dirname(__FILE__) . '/data.inc');
@@ -37,7 +37,7 @@ echo "\n-- Testing with incorrect parameters --\n";
 
 class Tester {
     function Hello() {
-        echo "Hello\n"; 
+        echo "Hello\n";
     }
 }
 
diff --git a/ext/zlib/tests/gzopen_basic.phpt b/ext/zlib/tests/gzopen_basic.phpt
index e3697731d8a..8e0c32d5369 100644
--- a/ext/zlib/tests/gzopen_basic.phpt
+++ b/ext/zlib/tests/gzopen_basic.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gzopen() function : basic functionality 
+Test gzopen() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : resource gzopen(string filename, string mode [, int use_include_path])
- * Description: Open a .gz-file and return a .gz-file pointer 
+ * Description: Open a .gz-file and return a .gz-file pointer
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gzopen() : basic functionality ***\n";
diff --git a/ext/zlib/tests/gzopen_basic2.phpt b/ext/zlib/tests/gzopen_basic2.phpt
index 90766b18170..dd3ba182355 100644
--- a/ext/zlib/tests/gzopen_basic2.phpt
+++ b/ext/zlib/tests/gzopen_basic2.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test gzopen() function : basic functionality for writing
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : resource gzopen(string filename, string mode [, int use_include_path])
- * Description: Open a .gz-file and return a .gz-file pointer 
+ * Description: Open a .gz-file and return a .gz-file pointer
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gzopen() : basic functionality ***\n";
@@ -37,8 +37,8 @@ foreach($modes as $mode) {
    else {
       var_dump($h);
    }
-}      
-      
+}
+
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/zlib/tests/gzopen_error.phpt b/ext/zlib/tests/gzopen_error.phpt
index a71791fb246..02f125d6b04 100644
--- a/ext/zlib/tests/gzopen_error.phpt
+++ b/ext/zlib/tests/gzopen_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gzopen() function : error conditions 
+Test gzopen() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : resource gzopen(string filename, string mode [, int use_include_path])
- * Description: Open a .gz-file and return a .gz-file pointer 
+ * Description: Open a .gz-file and return a .gz-file pointer
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gzopen() : error conditions ***\n";
diff --git a/ext/zlib/tests/gzopen_variation2.phpt b/ext/zlib/tests/gzopen_variation2.phpt
index 458293514c5..1fd08455ebf 100644
--- a/ext/zlib/tests/gzopen_variation2.phpt
+++ b/ext/zlib/tests/gzopen_variation2.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gzopen() function : usage variation 
+Test gzopen() function : usage variation
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - zlib extension not loaded"; 
-}	 
+	print "skip - zlib extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : resource gzopen(string filename, string mode [, int use_include_path])
- * Description: Open a .gz-file and return a .gz-file pointer 
+ * Description: Open a .gz-file and return a .gz-file pointer
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gzopen() : usage variation ***\n";
@@ -102,9 +102,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for mode
diff --git a/ext/zlib/tests/gzopen_variation3.phpt b/ext/zlib/tests/gzopen_variation3.phpt
index 4ba607420d0..a07b338594c 100644
--- a/ext/zlib/tests/gzopen_variation3.phpt
+++ b/ext/zlib/tests/gzopen_variation3.phpt
@@ -1,18 +1,18 @@
 --TEST--
-Test gzopen() function : usage variation 
+Test gzopen() function : usage variation
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - zlib extension not loaded"; 
+	print "skip - zlib extension not loaded";
 }
 if (PHP_INT_SIZE != 8) die('skip 64-bit only');
 ?>
 --FILE--
 <?php
 /* Prototype  : resource gzopen(string filename, string mode [, int use_include_path])
- * Description: Open a .gz-file and return a .gz-file pointer 
+ * Description: Open a .gz-file and return a .gz-file pointer
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gzopen() : usage variation ***\n";
@@ -103,9 +103,9 @@ $inputs = array(
 
       // unset data
       'unset var' => @$unset_var,
-      
+
       // resource variable
-      'resource' => $fp      
+      'resource' => $fp
 );
 
 // loop through each element of the array for use_include_path
diff --git a/ext/zlib/tests/gzopen_variation4.phpt b/ext/zlib/tests/gzopen_variation4.phpt
index f829acf063b..9d0eef0eb2b 100644
--- a/ext/zlib/tests/gzopen_variation4.phpt
+++ b/ext/zlib/tests/gzopen_variation4.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test gzopen() function : variation: use include path (relative directories in path)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : resource gzopen(string filename, string mode [, int use_include_path])
- * Description: Open a .gz-file and return a .gz-file pointer 
+ * Description: Open a .gz-file and return a .gz-file pointer
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gzopen() : usage variation ***\n";
@@ -20,7 +20,7 @@ require_once('reading_include_path.inc');
 
 //define the files to go into these directories, create one in dir2
 echo "\n--- testing include path ---\n";
-set_include_path($newIncludePath);   
+set_include_path($newIncludePath);
 $modes = array("r", "r+", "rt");
 foreach($modes as $mode) {
     test_gzopen($mode);
@@ -39,7 +39,7 @@ rmdir($thisTestDir);
 
 function test_gzopen($mode) {
    global $scriptFile, $secondFile, $firstFile, $filename;
-   
+
    // create a file in the middle directory
    $h = gzopen($secondFile, "w");
    gzwrite($h, "This is a file in dir2");
@@ -56,44 +56,44 @@ function test_gzopen($mode) {
    $h = gzopen($firstFile, "w");
    gzwrite($h, "This is a file in dir1");
    gzclose($h);
-   
+
    //should now read dir1 file
    $h = gzopen($filename, $mode, true);
    gzpassthru($h);
    gzclose($h);
    echo "\n";
-   
+
    // create a file in working directory
    $h = gzopen($filename, "w");
    gzwrite($h, "This is a file in working dir");
    gzclose($h);
-   
+
    //should still read dir1 file
    $h = gzopen($filename, $mode, true);
    gzpassthru($h);
    gzclose($h);
    echo "\n";
-   
+
    unlink($firstFile);
    unlink($secondFile);
-   
+
    //should read the file in working dir
    $h = gzopen($filename, $mode, true);
    gzpassthru($h);
    gzclose($h);
    echo "\n";
-   
+
    // create a file in the script directory
    $h = gzopen($scriptFile, "w");
    gzwrite($h, "This is a file in script dir");
    gzclose($h);
-   
+
    //should read the file in script dir
    $h = gzopen($filename, $mode, true);
    gzpassthru($h);
    gzclose($h);
    echo "\n";
-     
+
    //cleanup
    unlink($filename);
    unlink($scriptFile);
diff --git a/ext/zlib/tests/gzopen_variation5.phpt b/ext/zlib/tests/gzopen_variation5.phpt
index de505f72163..c223efeb15d 100644
--- a/ext/zlib/tests/gzopen_variation5.phpt
+++ b/ext/zlib/tests/gzopen_variation5.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test gzopen() function : variation: use include path and stream context create a file, relative path
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : resource gzopen(string filename, string mode [, int use_include_path])
- * Description: Open a .gz-file and return a .gz-file pointer 
+ * Description: Open a .gz-file and return a .gz-file pointer
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 require_once('gzopen_include_path.inc');
@@ -38,8 +38,8 @@ function runtest() {
 	$h = gzopen($tmpfile, "w", true);
 	fwrite($h, "This is the test file");
 	fclose($h);
-	
-	
+
+
 	$h = @gzopen($tmpfile, "r");
 	if ($h === false) {
 	   echo "Not created in working dir\n";
@@ -49,7 +49,7 @@ function runtest() {
 	   gzclose($h);
 	   unlink($tmpfile);
 	}
-	
+
 	$h = @gzopen('dir1/'.$tmpfile, "r");
 	if ($h === false) {
 	   echo "Not created in dir1\n";
@@ -57,7 +57,7 @@ function runtest() {
 	else {
 	   echo "created in dir1\n";
 	   gzclose($h);
-	   unlink('dir1/'.$tmpfile);   
+	   unlink('dir1/'.$tmpfile);
 	}
 }
 ?>
diff --git a/ext/zlib/tests/gzopen_variation6.phpt b/ext/zlib/tests/gzopen_variation6.phpt
index 9fe3f24b47f..0abdd757b72 100644
--- a/ext/zlib/tests/gzopen_variation6.phpt
+++ b/ext/zlib/tests/gzopen_variation6.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gzopen() function : variation: relative/absolute file 
+Test gzopen() function : variation: relative/absolute file
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : resource gzopen(string filename, string mode [, int use_include_path])
- * Description: Open a .gz-file and return a .gz-file pointer 
+ * Description: Open a .gz-file and return a .gz-file pointer
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gzopen() : variation ***\n";
diff --git a/ext/zlib/tests/gzopen_variation7.phpt b/ext/zlib/tests/gzopen_variation7.phpt
index 92642b09938..911c7fd73cc 100644
--- a/ext/zlib/tests/gzopen_variation7.phpt
+++ b/ext/zlib/tests/gzopen_variation7.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzopen() by calling it twice on the same file and not closing one of them at the end of the script
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzopen_variation8.phpt b/ext/zlib/tests/gzopen_variation8.phpt
index bb0126227f8..bb64ecab16a 100644
--- a/ext/zlib/tests/gzopen_variation8.phpt
+++ b/ext/zlib/tests/gzopen_variation8.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test gzopen() function : variation: opening a plain file
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : resource gzopen(string filename, string mode [, int use_include_path])
- * Description: Open a .gz-file and return a .gz-file pointer 
+ * Description: Open a .gz-file and return a .gz-file pointer
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gzopen() : variation ***\n";
diff --git a/ext/zlib/tests/gzopen_variation9.phpt b/ext/zlib/tests/gzopen_variation9.phpt
index 7a44b6eb099..7359a98cfaa 100644
--- a/ext/zlib/tests/gzopen_variation9.phpt
+++ b/ext/zlib/tests/gzopen_variation9.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test gzopen() function : variation: try opening with possibly invalid modes
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : resource gzopen(string filename, string mode [, int use_include_path])
- * Description: Open a .gz-file and return a .gz-file pointer 
+ * Description: Open a .gz-file and return a .gz-file pointer
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gzopen() : variation ***\n";
diff --git a/ext/zlib/tests/gzpassthru_basic.phpt b/ext/zlib/tests/gzpassthru_basic.phpt
index 931c2b22cd9..223944a1440 100644
--- a/ext/zlib/tests/gzpassthru_basic.phpt
+++ b/ext/zlib/tests/gzpassthru_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzpassthru() by calling it with its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzpassthru_error.phpt b/ext/zlib/tests/gzpassthru_error.phpt
index 18d72efafaa..39d5fef9088 100644
--- a/ext/zlib/tests/gzpassthru_error.phpt
+++ b/ext/zlib/tests/gzpassthru_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzpassthru() by calling it more than or less than its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzputs_basic.phpt b/ext/zlib/tests/gzputs_basic.phpt
index 6456e4b55f9..5f00a18626a 100644
--- a/ext/zlib/tests/gzputs_basic.phpt
+++ b/ext/zlib/tests/gzputs_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzputs() by calling it with its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzread_basic.phpt b/ext/zlib/tests/gzread_basic.phpt
index ecb62a82597..825902e7c0a 100644
--- a/ext/zlib/tests/gzread_basic.phpt
+++ b/ext/zlib/tests/gzread_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzread() by calling it with its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzread_error.phpt b/ext/zlib/tests/gzread_error.phpt
index 989e832757a..3baf5247b9d 100644
--- a/ext/zlib/tests/gzread_error.phpt
+++ b/ext/zlib/tests/gzread_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzread() by calling it more than or less than its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
@@ -11,8 +11,8 @@ if (!extension_loaded("zlib")) {
 
 $f = dirname(__FILE__)."/004.txt.gz";
 $h = gzopen($f, 'r');
-$length = 10; 
-$extra_arg = 'nothing'; 
+$length = 10;
+$extra_arg = 'nothing';
 
 var_dump(gzread( $h, $length, $extra_arg ) );
 
diff --git a/ext/zlib/tests/gzread_error2.phpt b/ext/zlib/tests/gzread_error2.phpt
index fae63564195..07367fdf3eb 100644
--- a/ext/zlib/tests/gzread_error2.phpt
+++ b/ext/zlib/tests/gzread_error2.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzread() by calling it invalid lengths
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzread_variation1.phpt b/ext/zlib/tests/gzread_variation1.phpt
index 966351e7361..4aefe3f910f 100644
--- a/ext/zlib/tests/gzread_variation1.phpt
+++ b/ext/zlib/tests/gzread_variation1.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzread() by calling it while file open for writing
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzrewind_basic.phpt b/ext/zlib/tests/gzrewind_basic.phpt
index 959f0fcdec3..ba2ecae5b72 100644
--- a/ext/zlib/tests/gzrewind_basic.phpt
+++ b/ext/zlib/tests/gzrewind_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzrewind() by calling it with its expected arguments when reading
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzrewind_basic2.phpt b/ext/zlib/tests/gzrewind_basic2.phpt
index f51751c6140..00c99801cc0 100644
--- a/ext/zlib/tests/gzrewind_basic2.phpt
+++ b/ext/zlib/tests/gzrewind_basic2.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzrewind() by calling it with its expected arguments when reading
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzrewind_error.phpt b/ext/zlib/tests/gzrewind_error.phpt
index 3a1e4c9b734..d99e2d0a451 100644
--- a/ext/zlib/tests/gzrewind_error.phpt
+++ b/ext/zlib/tests/gzrewind_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzrewind() by calling it more than or less than its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
@@ -11,7 +11,7 @@ if (!extension_loaded("zlib")) {
 
 $f = dirname(__FILE__)."/004.txt.gz";
 $h = gzopen($f, 'r');
-$extra_arg = 'nothing'; 
+$extra_arg = 'nothing';
 var_dump(gzrewind( $h, $extra_arg ) );
 var_dump(gzrewind());
 gzclose($h);
diff --git a/ext/zlib/tests/gzrewind_variation1.phpt b/ext/zlib/tests/gzrewind_variation1.phpt
index 3eef10e93fe..b42a44ad0dd 100644
--- a/ext/zlib/tests/gzrewind_variation1.phpt
+++ b/ext/zlib/tests/gzrewind_variation1.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzrewind() by calling it with its expected arguments when writing
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzseek_basic.phpt b/ext/zlib/tests/gzseek_basic.phpt
index d641bad429f..2f0b5ae4514 100644
--- a/ext/zlib/tests/gzseek_basic.phpt
+++ b/ext/zlib/tests/gzseek_basic.phpt
@@ -1,15 +1,15 @@
 --TEST--
 Test function gzseek() by calling it with its expected arguments when reading
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
 <?php
 $f = dirname(__FILE__)."/004.txt.gz";
-$h = gzopen($f, 'r'); 
+$h = gzopen($f, 'r');
 
 echo "move to the 50th byte\n";
 var_dump(gzseek( $h, 50 ) );
diff --git a/ext/zlib/tests/gzseek_basic2.phpt b/ext/zlib/tests/gzseek_basic2.phpt
index 8e037af139b..70b0d1f0462 100644
--- a/ext/zlib/tests/gzseek_basic2.phpt
+++ b/ext/zlib/tests/gzseek_basic2.phpt
@@ -1,15 +1,15 @@
 --TEST--
 Test function gzseek() by calling it with its expected arguments when writing
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
 <?php
 $f = "gzseek_basic2.gz";
-$h = gzopen($f, 'w'); 
+$h = gzopen($f, 'w');
 $str1 = "This is the first line.";
 $str2 = "This is the second line.";
 gzwrite($h, $str1);
diff --git a/ext/zlib/tests/gzseek_error.phpt b/ext/zlib/tests/gzseek_error.phpt
index ab6c96552e8..e6c43e7b3a0 100644
--- a/ext/zlib/tests/gzseek_error.phpt
+++ b/ext/zlib/tests/gzseek_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzseek() by calling it more than or less than its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
@@ -12,7 +12,7 @@ $f = dirname(__FILE__)."/004.txt.gz";
 $h = gzopen($f, 'r');
 $offset = 1;
 $whence = SEEK_SET;
-$extra_arg = 'nothing'; 
+$extra_arg = 'nothing';
 
 var_dump(gzseek( $h, $offset, $whence, $extra_arg ) );
 var_dump(gzseek($h));
diff --git a/ext/zlib/tests/gzseek_variation1.phpt b/ext/zlib/tests/gzseek_variation1.phpt
index 8512b743bd3..28eff866f9b 100644
--- a/ext/zlib/tests/gzseek_variation1.phpt
+++ b/ext/zlib/tests/gzseek_variation1.phpt
@@ -1,15 +1,15 @@
 --TEST--
 Test function gzseek() by seeking forward in write mode
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
 <?php
 $f = "gzseek_variation1.gz";
-$h = gzopen($f, 'w'); 
+$h = gzopen($f, 'w');
 $str1 = "This is the first line.";
 $str2 = "This is the second line.";
 gzwrite($h, $str1);
diff --git a/ext/zlib/tests/gzseek_variation2.phpt b/ext/zlib/tests/gzseek_variation2.phpt
index e70d6dd8453..615dfe96a35 100644
--- a/ext/zlib/tests/gzseek_variation2.phpt
+++ b/ext/zlib/tests/gzseek_variation2.phpt
@@ -1,15 +1,15 @@
 --TEST--
 Test function gzseek() by calling it with SEEK_SET when reading
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
 <?php
 $f = dirname(__FILE__)."/004.txt.gz";
-$h = gzopen($f, 'r'); 
+$h = gzopen($f, 'r');
 
 echo "move to the 50th byte\n";
 var_dump(gzseek( $h, 50, SEEK_SET ) );
diff --git a/ext/zlib/tests/gzseek_variation3.phpt b/ext/zlib/tests/gzseek_variation3.phpt
index dee7c1302a6..02dc7ac825a 100644
--- a/ext/zlib/tests/gzseek_variation3.phpt
+++ b/ext/zlib/tests/gzseek_variation3.phpt
@@ -1,15 +1,15 @@
 --TEST--
 Test function gzseek() by calling it with SEEK_CUR when reading
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
 <?php
 $f = dirname(__FILE__)."/004.txt.gz";
-$h = gzopen($f, 'r'); 
+$h = gzopen($f, 'r');
 
 echo "move to the 50th byte\n";
 var_dump(gzseek( $h, 50, SEEK_CUR ) );
diff --git a/ext/zlib/tests/gzseek_variation4.phpt b/ext/zlib/tests/gzseek_variation4.phpt
index 529a0121413..2270ccc5f91 100644
--- a/ext/zlib/tests/gzseek_variation4.phpt
+++ b/ext/zlib/tests/gzseek_variation4.phpt
@@ -1,15 +1,15 @@
 --TEST--
 Test function gzseek() by calling it with SEEK_SET when writing
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
 <?php
 $f = "gzseek_variation5.gz";
-$h = gzopen($f, 'w'); 
+$h = gzopen($f, 'w');
 $str1 = "This is the first line.";
 $str2 = "This is the second line.";
 gzwrite($h, $str1);
diff --git a/ext/zlib/tests/gzseek_variation5.phpt b/ext/zlib/tests/gzseek_variation5.phpt
index 11e4912787a..b38b46558e3 100644
--- a/ext/zlib/tests/gzseek_variation5.phpt
+++ b/ext/zlib/tests/gzseek_variation5.phpt
@@ -1,15 +1,15 @@
 --TEST--
 Test function gzseek() by calling it with SEEK_CUR when writing
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
 <?php
 $f = "gzseek_variation5.gz";
-$h = gzopen($f, 'w'); 
+$h = gzopen($f, 'w');
 $str1 = "This is the first line.";
 $str2 = "This is the second line.";
 gzwrite($h, $str1);
diff --git a/ext/zlib/tests/gzseek_variation6.phpt b/ext/zlib/tests/gzseek_variation6.phpt
index 0c4630953c6..bb5d9ed65b8 100644
--- a/ext/zlib/tests/gzseek_variation6.phpt
+++ b/ext/zlib/tests/gzseek_variation6.phpt
@@ -1,16 +1,16 @@
 --TEST--
 Test function gzseek() by calling it with SEEK_END when reading
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
 <?php
 $f = dirname(__FILE__)."/004.txt.gz";
 $h = gzopen($f, 'r');
-// move 40 bytes 
+// move 40 bytes
 echo "move 40 bytes\n";
 gzread($h, 40);
 echo "tell=";
diff --git a/ext/zlib/tests/gzseek_variation7.phpt b/ext/zlib/tests/gzseek_variation7.phpt
index a365272ba21..a1976b2b161 100644
--- a/ext/zlib/tests/gzseek_variation7.phpt
+++ b/ext/zlib/tests/gzseek_variation7.phpt
@@ -1,15 +1,15 @@
 --TEST--
 Test function gzseek() by calling it with SEEK_END when writing
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
 <?php
 $f = "gzseek_variation7.gz";
-$h = gzopen($f, 'w'); 
+$h = gzopen($f, 'w');
 $str1 = "This is the first line.";
 $str2 = "This is the second line.";
 gzwrite($h, $str1);
diff --git a/ext/zlib/tests/gztell_basic.phpt b/ext/zlib/tests/gztell_basic.phpt
index b6baf427dbf..7d7e96d341f 100644
--- a/ext/zlib/tests/gztell_basic.phpt
+++ b/ext/zlib/tests/gztell_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gztell() by calling it with its expected arguments when reading
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gztell_basic2.phpt b/ext/zlib/tests/gztell_basic2.phpt
index ded3fbee7c4..05a3f3dceda 100644
--- a/ext/zlib/tests/gztell_basic2.phpt
+++ b/ext/zlib/tests/gztell_basic2.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gztell() by calling it with its expected arguments when writing
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
@@ -14,7 +14,7 @@ $sizes = array(7, 22, 54, 17, 27, 15, 1000);
 // tell should be 7, 29, 83, 100, 127, 142, 1142
 
 var_dump(gztell($h));
-foreach ($sizes as $size) { 
+foreach ($sizes as $size) {
    echo "bytes written=".gzwrite($h, str_repeat('1', $size))."\n";
    echo "tell=".gztell($h)."\n";
 }
diff --git a/ext/zlib/tests/gztell_error.phpt b/ext/zlib/tests/gztell_error.phpt
index e207c59bde7..b563a334849 100644
--- a/ext/zlib/tests/gztell_error.phpt
+++ b/ext/zlib/tests/gztell_error.phpt
@@ -1,16 +1,16 @@
 --TEST--
 Test function gztell() by calling it more than or less than its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
 <?php
 $f = dirname(__FILE__)."/004.txt.gz";
 $h = gzopen($f, 'r');
-$extra_arg = 'nothing'; 
+$extra_arg = 'nothing';
 var_dump(gztell( $h, $extra_arg ) );
 var_dump(gztell());
 gzclose($h);
diff --git a/ext/zlib/tests/gzuncompress_basic1.phpt b/ext/zlib/tests/gzuncompress_basic1.phpt
index fa7f1759e62..43bc6eb9ab7 100644
--- a/ext/zlib/tests/gzuncompress_basic1.phpt
+++ b/ext/zlib/tests/gzuncompress_basic1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gzuncompress() function : basic functionality 
+Test gzuncompress() function : basic functionality
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : string gzuncompress(string data [, int length])
- * Description: Unzip a gzip-compressed string 
+ * Description: Unzip a gzip-compressed string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 include(dirname(__FILE__) . '/data.inc');
diff --git a/ext/zlib/tests/gzuncompress_error1.phpt b/ext/zlib/tests/gzuncompress_error1.phpt
index baf2527c147..592f6bd6ae3 100644
--- a/ext/zlib/tests/gzuncompress_error1.phpt
+++ b/ext/zlib/tests/gzuncompress_error1.phpt
@@ -1,17 +1,17 @@
 --TEST--
-Test gzuncompress() function : error conditions 
+Test gzuncompress() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : string gzuncompress(string data [, int length])
- * Description: Unzip a gzip-compressed string 
+ * Description: Unzip a gzip-compressed string
  * Source code: ext/zlib/zlib.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing gzuncompress() : error conditions ***\n";
@@ -38,7 +38,7 @@ var_dump(gzuncompress(123));
 
 class Tester {
     function Hello() {
-        echo "Hello\n"; 
+        echo "Hello\n";
     }
 }
 
diff --git a/ext/zlib/tests/gzwrite_basic.phpt b/ext/zlib/tests/gzwrite_basic.phpt
index 46553eedf16..05d877158bf 100644
--- a/ext/zlib/tests/gzwrite_basic.phpt
+++ b/ext/zlib/tests/gzwrite_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzwrite() by calling it with its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzwrite_error.phpt b/ext/zlib/tests/gzwrite_error.phpt
index b4ddbb2ec77..fca081171cf 100644
--- a/ext/zlib/tests/gzwrite_error.phpt
+++ b/ext/zlib/tests/gzwrite_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzwrite() by calling it more than or less than its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
@@ -12,7 +12,7 @@ $filename = "gzwrite_error.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 $length = 10;
-$extra_arg = 'nothing'; 
+$extra_arg = 'nothing';
 var_dump(gzwrite($h, $str, $length, $extra_arg));
 var_dump(gzwrite($h));
 var_dump(gzwrite());
diff --git a/ext/zlib/tests/gzwrite_error2.phpt b/ext/zlib/tests/gzwrite_error2.phpt
index 5f2a4197b5e..803e34a5cce 100644
--- a/ext/zlib/tests/gzwrite_error2.phpt
+++ b/ext/zlib/tests/gzwrite_error2.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzwrite() by calling it invalid lengths
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzwrite_variation1.phpt b/ext/zlib/tests/gzwrite_variation1.phpt
index bd3778e366d..29a67861fd8 100644
--- a/ext/zlib/tests/gzwrite_variation1.phpt
+++ b/ext/zlib/tests/gzwrite_variation1.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function gzwrite() by calling it when file is opened for reading
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/inflate_add_error.phpt b/ext/zlib/tests/inflate_add_error.phpt
index 0e1711e0f87..63c827e4e1a 100644
--- a/ext/zlib/tests/inflate_add_error.phpt
+++ b/ext/zlib/tests/inflate_add_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test incremental inflate_add() error functionality
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-    print "skip - ZLIB extension not loaded"; 
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/inflate_init_error.phpt b/ext/zlib/tests/inflate_init_error.phpt
index 58c07a426ca..fb80573c1cf 100644
--- a/ext/zlib/tests/inflate_init_error.phpt
+++ b/ext/zlib/tests/inflate_init_error.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test inflate_init() error
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-    print "skip - ZLIB extension not loaded"; 
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/inflate_init_reuse.phpt b/ext/zlib/tests/inflate_init_reuse.phpt
index a6b8a309c0c..32fd211002a 100644
--- a/ext/zlib/tests/inflate_init_reuse.phpt
+++ b/ext/zlib/tests/inflate_init_reuse.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test incremental inflate_init() context reuse
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-    print "skip - ZLIB extension not loaded"; 
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/readgzfile_error.phpt b/ext/zlib/tests/readgzfile_error.phpt
index 4ec76d01728..6d393423f72 100644
--- a/ext/zlib/tests/readgzfile_error.phpt
+++ b/ext/zlib/tests/readgzfile_error.phpt
@@ -10,7 +10,7 @@ if (!extension_loaded('zlib')) die ('skip zlib extension not available in this b
 
 $filename = dirname(__FILE__)."/004.txt.gz";
 $use_include_path = false;
-$extra_arg = 'nothing'; 
+$extra_arg = 'nothing';
 
 var_dump(readgzfile( $filename, $use_include_path, $extra_arg ) );
 
diff --git a/ext/zlib/tests/readgzfile_variation15.phpt b/ext/zlib/tests/readgzfile_variation15.phpt
index 36ff6ff254e..dbed5238afb 100644
--- a/ext/zlib/tests/readgzfile_variation15.phpt
+++ b/ext/zlib/tests/readgzfile_variation15.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test readgzfile() function : variation: use include path (relative directories in path)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
 require_once('reading_include_path.inc');
 
 //define the files to go into these directories, create one in dir2
-set_include_path($newIncludePath);   
+set_include_path($newIncludePath);
 test_readgzfile();
 restore_include_path();
 
@@ -27,7 +27,7 @@ rmdir($thisTestDir);
 
 function test_readgzfile() {
    global $scriptFile, $secondFile, $firstFile, $filename;
-   
+
    // create a file in the middle directory
    $h = gzopen($secondFile, "w");
    gzwrite($h, "This is a file in dir2");
@@ -42,40 +42,40 @@ function test_readgzfile() {
    $h = gzopen($firstFile, "w");
    gzwrite($h, "This is a file in dir1");
    gzclose($h);
-   
+
    //should now read dir1 file
-   echo "file content:";   
+   echo "file content:";
    readgzfile($filename, true);
    echo "\n";
-   
+
    // create a file in working directory
    $h = gzopen($filename, "w");
    gzwrite($h, "This is a file in working dir");
    gzclose($h);
-   
+
    //should still read dir1 file
-   echo "file content:";   
+   echo "file content:";
    readgzfile($filename, true);
    echo "\n";
-   
+
    unlink($firstFile);
    unlink($secondFile);
-   
+
    //should read the file in working dir
-   echo "file content:";   
+   echo "file content:";
    readgzfile($filename, true);
    echo "\n";
-   
+
    // create a file in the script directory
    $h = gzopen($scriptFile, "w");
    gzwrite($h, "This is a file in script dir");
    gzclose($h);
-   
+
    //should read the file in script dir
-   echo "file content:";   
+   echo "file content:";
    readgzfile($filename, true);
    echo "\n";
-     
+
    //cleanup
    unlink($filename);
    unlink($scriptFile);
diff --git a/ext/zlib/tests/readgzfile_variation2.phpt b/ext/zlib/tests/readgzfile_variation2.phpt
index 80cb728e930..6862aaae575 100644
--- a/ext/zlib/tests/readgzfile_variation2.phpt
+++ b/ext/zlib/tests/readgzfile_variation2.phpt
@@ -8,7 +8,7 @@ if (!extension_loaded('zlib')) die ('skip zlib extension not available in this b
 <?php
 
 
-$use_include_path = 
+$use_include_path =
 
 
 $variation = array(
diff --git a/ext/zlib/tests/zlib_filter_deflate.phpt b/ext/zlib/tests/zlib_filter_deflate.phpt
index 1811779f04f..2901d40d428 100644
--- a/ext/zlib/tests/zlib_filter_deflate.phpt
+++ b/ext/zlib/tests/zlib_filter_deflate.phpt
@@ -12,6 +12,6 @@ stream_filter_append($fp, 'convert.base64-encode', STREAM_FILTER_WRITE);
 fwrite($fp, $text);
 fclose($fp);
 
-?> 
---EXPECT-- 
+?>
+--EXPECT--
 HctBDoAgDETRq8zOjfEeHKOGATG0TRpC4u1Vdn/xX4IoxkVMxgP1zA4vkJVhULk9UGkM6TvSNolmxUNlNLePVQ45O3eINf0fsQxtCxwv
diff --git a/ext/zlib/tests/zlib_filter_deflate2.phpt b/ext/zlib/tests/zlib_filter_deflate2.phpt
index 764a7606f42..f0bf9b0a29c 100644
--- a/ext/zlib/tests/zlib_filter_deflate2.phpt
+++ b/ext/zlib/tests/zlib_filter_deflate2.phpt
@@ -11,6 +11,6 @@ stream_filter_append($fp, 'zlib.deflate', STREAM_FILTER_WRITE, array('level' =>
 fwrite($fp, $text);
 fclose($fp);
 
-?> 
---EXPECT-- 
+?>
+--EXPECT--
 ËA€ DÑ«ÌÎ�ñ£†
1´MBâíUvñ_‚(ÆELÆõÌ/�•aP¹=Pié;Ò6‰fÅCe4·�U9;wˆ5ý±m/ 
diff --git a/ext/zlib/tests/zlib_filter_inflate.phpt b/ext/zlib/tests/zlib_filter_inflate.phpt
index 026f192a6ec..58ffcfec17b 100644
--- a/ext/zlib/tests/zlib_filter_inflate.phpt
+++ b/ext/zlib/tests/zlib_filter_inflate.phpt
@@ -12,6 +12,6 @@ stream_filter_append($fp, 'zlib.inflate', STREAM_FILTER_WRITE);
 fwrite($fp, $text);
 fclose($fp);
 
-?> 
---EXPECT-- 
+?>
+--EXPECT--
 I am the very model of a modern major general, I've information vegetable, animal, and mineral.
diff --git a/ext/zlib/tests/zlib_scheme_copy_basic.phpt b/ext/zlib/tests/zlib_scheme_copy_basic.phpt
index 028c029e621..ca1a42a85c5 100644
--- a/ext/zlib/tests/zlib_scheme_copy_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_copy_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test compress.zlib:// scheme with the copy function: compressed to compressed
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/zlib_scheme_copy_variation1.phpt b/ext/zlib/tests/zlib_scheme_copy_variation1.phpt
index 3c997ef7e98..f410b6e4f1a 100644
--- a/ext/zlib/tests/zlib_scheme_copy_variation1.phpt
+++ b/ext/zlib/tests/zlib_scheme_copy_variation1.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test compress.zlib:// scheme with the copy function: compressed to uncompressed
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/zlib_scheme_copy_variation2.phpt b/ext/zlib/tests/zlib_scheme_copy_variation2.phpt
index 0b56ec430ad..43e5d9b2fcb 100644
--- a/ext/zlib/tests/zlib_scheme_copy_variation2.phpt
+++ b/ext/zlib/tests/zlib_scheme_copy_variation2.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test compress.zlib:// scheme with the copy function: uncompressed to compressed
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/zlib_scheme_dir_basic.phpt b/ext/zlib/tests/zlib_scheme_dir_basic.phpt
index 02fe4fd3540..80189f2de9b 100644
--- a/ext/zlib/tests/zlib_scheme_dir_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_dir_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test compress.zlib:// scheme with the directory functions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/zlib_scheme_file_basic.phpt b/ext/zlib/tests/zlib_scheme_file_basic.phpt
index b8b60e40e7a..f08183fd252 100644
--- a/ext/zlib/tests/zlib_scheme_file_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_file_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test compress.zlib:// scheme with the file
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt b/ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt
index c679c46be90..071fcd716ee 100644
--- a/ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test compress.zlib:// scheme with the file_get_contents
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt b/ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt
index 8ea41df5a89..2f36d1f6191 100644
--- a/ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test compress.zlib:// scheme with the file_get_contents
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt b/ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt
index ef44292c3f6..eb7fde37b4d 100644
--- a/ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test compress.zlib:// scheme with the file_get_contents
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/zlib_scheme_fopen_basic.phpt b/ext/zlib/tests/zlib_scheme_fopen_basic.phpt
index d6d4514f7ae..8ec10ac463a 100644
--- a/ext/zlib/tests/zlib_scheme_fopen_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_fopen_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test compress.zlib:// scheme with the fopen
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt b/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt
index 8c26492efd2..88057eb3e3c 100644
--- a/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt
+++ b/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test compress.zlib:// scheme with the fopen on a file scheme
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/zlib_scheme_rename_basic.phpt b/ext/zlib/tests/zlib_scheme_rename_basic.phpt
index 9de55aa3e22..ee693de97a5 100644
--- a/ext/zlib/tests/zlib_scheme_rename_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_rename_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test compress.zlib:// scheme with the unlink function
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/zlib_scheme_stat_basic.phpt b/ext/zlib/tests/zlib_scheme_stat_basic.phpt
index 10cd9a4b035..ab673700dc1 100644
--- a/ext/zlib/tests/zlib_scheme_stat_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_stat_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test compress.zlib:// scheme with the unlink function
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/zlib_scheme_stat_basic2.phpt b/ext/zlib/tests/zlib_scheme_stat_basic2.phpt
index e78bcd76c17..d16e2a8adef 100644
--- a/ext/zlib/tests/zlib_scheme_stat_basic2.phpt
+++ b/ext/zlib/tests/zlib_scheme_stat_basic2.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test compress.zlib:// scheme with the unlink function
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/zlib_scheme_unlink_basic.phpt b/ext/zlib/tests/zlib_scheme_unlink_basic.phpt
index b05e45bc6a5..3aa25f9ddab 100644
--- a/ext/zlib/tests/zlib_scheme_unlink_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_unlink_basic.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Test compress.zlib:// scheme with the unlink function
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
-}	 
+	print "skip - ZLIB extension not loaded";
+}
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt b/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
index de1318cfed7..c706b2a7b74 100644
--- a/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function fflush() on a zlib stream wrapper
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_wrapper_flock_basic.phpt b/ext/zlib/tests/zlib_wrapper_flock_basic.phpt
index 9cefce4cbe1..ec1b67a64b2 100644
--- a/ext/zlib/tests/zlib_wrapper_flock_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_flock_basic.phpt
@@ -1,15 +1,15 @@
 --TEST--
 Test function stream_get_meta_data on a zlib stream
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
 <?php
 $f = dirname(__FILE__)."/004.txt.gz";
-$h = gzopen($f,'r');	
+$h = gzopen($f,'r');
 var_dump(flock($h, LOCK_SH));
 gzclose($h);
 ?>
diff --git a/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt b/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt
index 41f957e80b7..4c185be6893 100644
--- a/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Test function fstat() on zlib wrapper 
+Test function fstat() on zlib wrapper
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt b/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
index 348e24505ca..399d32c5f31 100644
--- a/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Test function ftruncate() on zlib wrapper by calling it with its expected arguments
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt b/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt
index a9d208eeaa4..87fa6227ab4 100644
--- a/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt
@@ -1,21 +1,21 @@
 --TEST--
 Test function stream_get_meta_data on a zlib stream
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded"; 
+	print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
 <?php
 echo "no wrapper\n";
 $f = dirname(__FILE__)."/004.txt.gz";
-$h = gzopen($f,'r');	
+$h = gzopen($f,'r');
 var_dump(stream_get_meta_data($h));
 gzclose($h);
 echo "\nwith wrapper\n";
 $f = "compress.zlib://".dirname(__FILE__)."/004.txt.gz";
-$h = fopen($f,'r');	
+$h = fopen($f,'r');
 var_dump(stream_get_meta_data($h));
 gzclose($h);
 
diff --git a/sapi/cgi/tests/002.phpt b/sapi/cgi/tests/002.phpt
index fda8fcbe047..91db184fcb3 100644
--- a/sapi/cgi/tests/002.phpt
+++ b/sapi/cgi/tests/002.phpt
@@ -1,8 +1,8 @@
 --TEST--
 defining INI options with -d
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 ?>
 --FILE--
 <?php
@@ -27,7 +27,7 @@ unlink($file);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(%d) "X-Powered-By: PHP/%s
 Content-type: text/html%r; charset=.*|%r
 
diff --git a/sapi/cgi/tests/003.phpt b/sapi/cgi/tests/003.phpt
index 1ba94f27efd..a4d30586240 100644
--- a/sapi/cgi/tests/003.phpt
+++ b/sapi/cgi/tests/003.phpt
@@ -1,13 +1,13 @@
 --TEST--
 strip comments and whitespace with -w
 --SKIPIF--
-<?php 
+<?php
 
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
 }
 
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
@@ -45,7 +45,7 @@ var_dump(`echo "<?php /* comment */ class test {\n // comment \n function foo()
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(%d) "X-Powered-By: PHP/%s
 Content-type: text/html%r; charset=.*|%r
 
diff --git a/sapi/cgi/tests/004.phpt b/sapi/cgi/tests/004.phpt
index 0e7117080d5..93c48c9ff41 100644
--- a/sapi/cgi/tests/004.phpt
+++ b/sapi/cgi/tests/004.phpt
@@ -1,8 +1,8 @@
 --TEST--
 execute a file with -f
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 ?>
 --FILE--
 <?php
@@ -37,7 +37,7 @@ var_dump(`$php -n -f "wrong"`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(%d) "
 <br />
 <b>Fatal error</b>:  Uncaught Error: Cannot access private property test::$pri in %s004.test.php:8
diff --git a/sapi/cgi/tests/005-win32.phpt b/sapi/cgi/tests/005-win32.phpt
index b7efb9b500f..65ab5a45b3d 100644
--- a/sapi/cgi/tests/005-win32.phpt
+++ b/sapi/cgi/tests/005-win32.phpt
@@ -22,7 +22,7 @@ var_dump(`$php -n -f "wrong" -a`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(51) "Interactive mode enabled
 
 No input file specified.
diff --git a/sapi/cgi/tests/005.phpt b/sapi/cgi/tests/005.phpt
index 259005f3d98..8b6254c089f 100644
--- a/sapi/cgi/tests/005.phpt
+++ b/sapi/cgi/tests/005.phpt
@@ -22,7 +22,7 @@ var_dump(`$php -n -f 'wrong' -a`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(51) "No input file specified.
 Interactive mode enabled
 
diff --git a/sapi/cgi/tests/006.phpt b/sapi/cgi/tests/006.phpt
index 08bfbf5d6ca..bc98656b496 100644
--- a/sapi/cgi/tests/006.phpt
+++ b/sapi/cgi/tests/006.phpt
@@ -54,7 +54,7 @@ if (defined("PHP_WINDOWS_VERSION_MAJOR")) {
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(%d) "No syntax errors detected in %s006.test.php
 "
 string(%d) "No input file specified.
diff --git a/sapi/cgi/tests/007.phpt b/sapi/cgi/tests/007.phpt
index 841137a0465..28cf1db1f47 100644
--- a/sapi/cgi/tests/007.phpt
+++ b/sapi/cgi/tests/007.phpt
@@ -14,7 +14,7 @@ var_dump(`"$php" -n -s -w -l`);
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 string(25) "No input file specified.
 "
 string(49) "No syntax errors detected in Standard input code
diff --git a/sapi/cgi/tests/008.phpt b/sapi/cgi/tests/008.phpt
index 7537664cc84..f0df0bae420 100644
--- a/sapi/cgi/tests/008.phpt
+++ b/sapi/cgi/tests/008.phpt
@@ -37,7 +37,7 @@ var_dump(`"$php" -n -s "unknown"`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(%d) "X-Powered-By: PHP/%s
 Content-type: text/html%r; charset=.*|%r
 
diff --git a/sapi/cgi/tests/apache_request_headers.phpt b/sapi/cgi/tests/apache_request_headers.phpt
index fd36e3024f8..37506006719 100644
--- a/sapi/cgi/tests/apache_request_headers.phpt
+++ b/sapi/cgi/tests/apache_request_headers.phpt
@@ -3,8 +3,8 @@ apache_request_headers() stack overflow.
 --INI--
 default_charset="UTF-8"
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 ?>
 --FILE--
 <?php
@@ -29,7 +29,7 @@ unlink($file);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 X-Powered-By: PHP/%s
 Content-type: text/%s
 
diff --git a/sapi/cgi/tests/bug75574_utf8_win.phpt b/sapi/cgi/tests/bug75574_utf8_win.phpt
index f674168e039..8f9c70e0892 100644
--- a/sapi/cgi/tests/bug75574_utf8_win.phpt
+++ b/sapi/cgi/tests/bug75574_utf8_win.phpt
@@ -29,7 +29,7 @@ unlink($fn);
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 bool(true)
 string(3) "å•Š"
 ===DONE===
diff --git a/sapi/cli/tests/001.phpt b/sapi/cli/tests/001.phpt
index 6fbd608a6fb..744918a3732 100644
--- a/sapi/cli/tests/001.phpt
+++ b/sapi/cli/tests/001.phpt
@@ -11,7 +11,7 @@ var_dump(`$php -n -v`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(%d) "PHP %s (cli) (built: %s)%s
 Copyright (c) 1997-20%d The PHP Group
 Zend Engine v%s, Copyright (c) 1998-20%d Zend Technologies
diff --git a/sapi/cli/tests/002-win32.phpt b/sapi/cli/tests/002-win32.phpt
index 5a00c67f74c..d65961de8ee 100644
--- a/sapi/cli/tests/002-win32.phpt
+++ b/sapi/cli/tests/002-win32.phpt
@@ -1,8 +1,8 @@
 --TEST--
 running code with -r
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (substr(PHP_OS, 0, 3) != 'WIN') {
 	die ("skip only for Windows");
 }
@@ -16,7 +16,7 @@ var_dump(`$php -n -r "var_dump('hello');"`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(18) "string(5) "hello"
 "
 Done
diff --git a/sapi/cli/tests/002.phpt b/sapi/cli/tests/002.phpt
index be2b6331b31..f273aa02d3f 100644
--- a/sapi/cli/tests/002.phpt
+++ b/sapi/cli/tests/002.phpt
@@ -1,8 +1,8 @@
 --TEST--
 running code with -r
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
 }
@@ -16,7 +16,7 @@ var_dump(`$php -n -r 'var_dump("hello");'`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(18) "string(5) "hello"
 "
 Done
diff --git a/sapi/cli/tests/003-2.phpt b/sapi/cli/tests/003-2.phpt
index 2ed9b07db4c..b3fd78233ef 100644
--- a/sapi/cli/tests/003-2.phpt
+++ b/sapi/cli/tests/003-2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 defining INI options with -d (as 2nd arg)
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
 }
@@ -17,7 +17,7 @@ var_dump(`"$php" -nd max_execution_time=500 -r 'var_dump(ini_get("max_execution_
 
 ?>
 ===DONE===
---EXPECTF--	
+--EXPECTF--
 string(16) "string(3) "111"
 "
 string(16) "string(3) "500"
diff --git a/sapi/cli/tests/003.phpt b/sapi/cli/tests/003.phpt
index d62360e1f6f..cbba356fd3b 100644
--- a/sapi/cli/tests/003.phpt
+++ b/sapi/cli/tests/003.phpt
@@ -1,8 +1,8 @@
 --TEST--
 defining INI options with -d
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
 }
@@ -19,7 +19,7 @@ var_dump(`$php -n -d upload_tmp_dir=/test/path -d max_execution_time=555 -r 'var
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(16) "string(3) "111"
 "
 string(16) "string(3) "500"
diff --git a/sapi/cli/tests/004.phpt b/sapi/cli/tests/004.phpt
index 378515d4644..3123d0dc77f 100644
--- a/sapi/cli/tests/004.phpt
+++ b/sapi/cli/tests/004.phpt
@@ -1,8 +1,8 @@
 --TEST--
 show information about function
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (!extension_loaded("reflection")) {
 	die("skip reflection extension required");
 }
@@ -18,7 +18,7 @@ var_dump(`$php -n --rf phpinfo`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(45) "Exception: Function unknown() does not exist
 "
 string(42) "Exception: Function echo() does not exist
diff --git a/sapi/cli/tests/005.phpt b/sapi/cli/tests/005.phpt
index 5a1e8b8fb18..3dd937b55ee 100644
--- a/sapi/cli/tests/005.phpt
+++ b/sapi/cli/tests/005.phpt
@@ -1,8 +1,8 @@
 --TEST--
 show information about class
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (!extension_loaded("reflection")) {
     die("skip reflection extension required");
 }
@@ -18,7 +18,7 @@ var_dump(`"$php" -n --rc exception`);
 
 echo "Done\n";
 ?>
---EXPECTF-- 
+--EXPECTF--
 string(40) "Exception: Class unknown does not exist
 "
 string(183) "Class [ <internal:Core> class stdClass ] {
diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
index 849a8b14e50..a4ac0ca4cf5 100644
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@@ -1,8 +1,8 @@
 --TEST--
 show information about extension
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (!extension_loaded("reflection") || !extension_loaded("session")) {
 	die("skip reflection and session extensions required");
 }
@@ -20,7 +20,7 @@ var_dump(`$php -n --re pcre`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(44) "Exception: Extension unknown does not exist
 "
 string(37) "Exception: Extension  does not exist
diff --git a/sapi/cli/tests/007.phpt b/sapi/cli/tests/007.phpt
index 0bf40703d94..d1af19f1d27 100644
--- a/sapi/cli/tests/007.phpt
+++ b/sapi/cli/tests/007.phpt
@@ -1,8 +1,8 @@
 --TEST--
 strip comments and whitespace with -w
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
 }
@@ -40,7 +40,7 @@ var_dump(`echo "<?php /* comment */ class test {\n // comment \n function foo()
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(81) "
 <?php
  class test { public $var = "test"; private $pri; function foo() { } } ?>
diff --git a/sapi/cli/tests/008.phpt b/sapi/cli/tests/008.phpt
index 0121d94a272..429254f4d6f 100644
--- a/sapi/cli/tests/008.phpt
+++ b/sapi/cli/tests/008.phpt
@@ -1,8 +1,8 @@
 --TEST--
 execute a file with -f
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
 }
@@ -33,7 +33,7 @@ var_dump(`$php -n -f "wrong"`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(%d) "
 
 Fatal error: Uncaught Error: Cannot access private property test::$pri in %s:%d
diff --git a/sapi/cli/tests/009.phpt b/sapi/cli/tests/009.phpt
index 33f859fb388..54c795b0f6b 100644
--- a/sapi/cli/tests/009.phpt
+++ b/sapi/cli/tests/009.phpt
@@ -12,7 +12,7 @@ var_dump(`$php -n -r "echo hello;" -a`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(57) "Either execute direct code, process stdin or use a file.
 "
 string(57) "Either execute direct code, process stdin or use a file.
diff --git a/sapi/cli/tests/010-2.phpt b/sapi/cli/tests/010-2.phpt
index bd33d2cc943..57e0f7a47cd 100644
--- a/sapi/cli/tests/010-2.phpt
+++ b/sapi/cli/tests/010-2.phpt
@@ -1,8 +1,8 @@
 --TEST--
 executing a code with -R
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
 }
@@ -27,7 +27,7 @@ var_dump(`cat "$filename_txt" | "$php" -n -R "var_dump(1);"`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(21) "int(1)
 int(1)
 int(1)
diff --git a/sapi/cli/tests/010.phpt b/sapi/cli/tests/010.phpt
index 77c76c1940d..2c3da0eb412 100644
--- a/sapi/cli/tests/010.phpt
+++ b/sapi/cli/tests/010.phpt
@@ -1,8 +1,8 @@
 --TEST--
-executing a file with -F 
+executing a file with -F
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
 }
@@ -38,7 +38,7 @@ var_dump(`cat "$filename_txt" | "$php" -n -F "$filename"`);
 @unlink(__DIR__."/010.test.php");
 @unlink(__DIR__."/010.test.txt");
 ?>
---EXPECTF--	
+--EXPECTF--
 string(25) "
 string(10) "test
 hello"
diff --git a/sapi/cli/tests/011.phpt b/sapi/cli/tests/011.phpt
index 6154693517a..1fbe93d7032 100644
--- a/sapi/cli/tests/011.phpt
+++ b/sapi/cli/tests/011.phpt
@@ -46,7 +46,7 @@ var_dump(`"$php" -n -l $filename`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(%d) "No syntax errors detected in %s011.test.php
 "
 string(40) "Could not open input file: some.unknown
diff --git a/sapi/cli/tests/012.phpt b/sapi/cli/tests/012.phpt
index c1e4f6a63a5..780e1088d0a 100644
--- a/sapi/cli/tests/012.phpt
+++ b/sapi/cli/tests/012.phpt
@@ -18,7 +18,7 @@ var_dump(`"$php" -n -r '' -r ''`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(32) "You can use -R or -F only once.
 "
 string(32) "You can use -R or -F only once.
diff --git a/sapi/cli/tests/013.phpt b/sapi/cli/tests/013.phpt
index 99bfe5e7bb0..6d497893824 100644
--- a/sapi/cli/tests/013.phpt
+++ b/sapi/cli/tests/013.phpt
@@ -1,8 +1,8 @@
 --TEST--
 running PHP code before and after processing input lines with -B and -E
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
 }
@@ -23,7 +23,7 @@ var_dump(`cat "$filename_txt" | "$php" -n -B 'var_dump("start");' -E 'var_dump("
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(18) "string(5) "start"
 "
 string(16) "string(3) "end"
diff --git a/sapi/cli/tests/014.phpt b/sapi/cli/tests/014.phpt
index e8c5203f67f..572c9e78cdb 100644
--- a/sapi/cli/tests/014.phpt
+++ b/sapi/cli/tests/014.phpt
@@ -34,7 +34,7 @@ var_dump(`"$php" -n -s unknown`);
 
 echo "Done\n";
 ?>
---EXPECTF--	
+--EXPECTF--
 string(1478) "<code><span style="color: #000000">
 <br /><span style="color: #0000BB">&lt;?php<br />$test&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">"var"</span><span style="color: #007700">;&nbsp;</span><span style="color: #FF8000">//var<br />/*&nbsp;test&nbsp;class&nbsp;*/<br /></span><span style="color: #007700">class&nbsp;</span><span style="color: #0000BB">test&nbsp;</span><span style="color: #007700">{<br />&nbsp;&nbsp;&nbsp;&nbsp;private&nbsp;</span><span style="color: #0000BB">$var&nbsp;</span><span style="color: #007700">=&nbsp;array();<br /><br />&nbsp;&nbsp;&nbsp;&nbsp;public&nbsp;static&nbsp;function&nbsp;</span><span style="color: #0000BB">foo</span><span style="color: #007700">(</span><span style="color: #0000BB">Test&nbsp;$arg</span><span style="color: #007700">)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;echo&nbsp;</span><span style="color: #DD0000">"hello"</span><span style="color: #007700">;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);<br />&nbsp;&nbsp;&nbsp;&nbsp;}<br />}<br /><br /></span><span style="color: #0000BB">$o&nbsp;</span><span style="color: #007700">=&nbsp;new&nbsp;</span><span style="color: #0000BB">test</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?&gt;<br /></span>
 </span>
diff --git a/sapi/cli/tests/015.phpt b/sapi/cli/tests/015.phpt
index 62a007b6e41..01f5328e992 100644
--- a/sapi/cli/tests/015.phpt
+++ b/sapi/cli/tests/015.phpt
@@ -1,8 +1,8 @@
 --TEST--
 CLI long options
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
 }
@@ -20,7 +20,7 @@ echo `"$php" -n --notexisting foo bar baz | grep Usage:`;
 
 echo "Done\n";
 ?>
---EXPECTF--     
+--EXPECTF--
 PHP %d.%d.%d%s(cli) (built: %s)%s
 Array
 (
diff --git a/sapi/cli/tests/016.phpt b/sapi/cli/tests/016.phpt
index 9c28d15a300..cf9ff8c9d37 100644
--- a/sapi/cli/tests/016.phpt
+++ b/sapi/cli/tests/016.phpt
@@ -1,8 +1,8 @@
 --TEST--
-CLI -a and readline 
+CLI -a and readline
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (!extension_loaded('readline') || readline_info('done') === NULL) {
 	die ("skip need readline support");
 }
diff --git a/sapi/cli/tests/017.phpt b/sapi/cli/tests/017.phpt
index dbddb283a43..cd1a1adfdc9 100644
--- a/sapi/cli/tests/017.phpt
+++ b/sapi/cli/tests/017.phpt
@@ -1,8 +1,8 @@
 --TEST--
-CLI -a and libedit 
+CLI -a and libedit
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (!extension_loaded('readline') || readline_info('done') !== NULL) {
 	die ("skip need readline support using libedit");
 }
diff --git a/sapi/cli/tests/018.phpt b/sapi/cli/tests/018.phpt
index 56921bd6699..9ebe4faa87f 100644
--- a/sapi/cli/tests/018.phpt
+++ b/sapi/cli/tests/018.phpt
@@ -1,8 +1,8 @@
 --TEST--
-CLI php -m 
+CLI php -m
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
 }
@@ -17,7 +17,7 @@ echo `"$php" -n -m`;
 
 echo "Done\n";
 ?>
---EXPECTF--     
+--EXPECTF--
 [PHP Modules]
 %a
 pcre
diff --git a/sapi/cli/tests/019.phpt b/sapi/cli/tests/019.phpt
index c98155d8d5d..2b8c0f007ec 100644
--- a/sapi/cli/tests/019.phpt
+++ b/sapi/cli/tests/019.phpt
@@ -1,8 +1,8 @@
 --TEST--
-CLI php -i 
+CLI php -i
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
 }
@@ -17,7 +17,7 @@ echo `"$php" -n -i`;
 
 echo "\nDone\n";
 ?>
---EXPECTF--     
+--EXPECTF--
 phpinfo()
 PHP Version => %s
 %a
diff --git a/sapi/cli/tests/020.phpt b/sapi/cli/tests/020.phpt
index 62be4ba31a3..ac23e77f6a2 100644
--- a/sapi/cli/tests/020.phpt
+++ b/sapi/cli/tests/020.phpt
@@ -1,8 +1,8 @@
 --TEST--
-CLI php --ri 
+CLI php --ri
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
 }
diff --git a/sapi/cli/tests/021.phpt b/sapi/cli/tests/021.phpt
index 2ddd6889038..0edd5a81c00 100644
--- a/sapi/cli/tests/021.phpt
+++ b/sapi/cli/tests/021.phpt
@@ -1,7 +1,7 @@
 --TEST--
 CLI shell shebang
 --SKIPIF--
-<?php 
+<?php
 include 'skipif.inc';
 if (substr(PHP_OS, 0, 3) == 'WIN') {
 	die ("skip not for Windows");
diff --git a/sapi/cli/tests/argv_mb.phpt b/sapi/cli/tests/argv_mb.phpt
index e8c47f09725..2e14b1a192d 100644
--- a/sapi/cli/tests/argv_mb.phpt
+++ b/sapi/cli/tests/argv_mb.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Test basic argv multibyte API integration
 --SKIPIF--
-<?php 
-include "skipif.inc"; 
+<?php
+include "skipif.inc";
 if (substr(PHP_OS, 0, 3) != 'WIN') {
 	die ("skip only for Windows");
 }
@@ -21,7 +21,7 @@ var_dump(`$php -n $argv_fl 多字节字符串 マル��イト文字列 мно
 
 ?>
 ==DONE==
---EXPECTF--	
+--EXPECTF--
 string(%d) "array(%d) {
   [0]=>
   string(%d) "%sargv_test.php"
diff --git a/sapi/cli/tests/bug43177.phpt b/sapi/cli/tests/bug43177.phpt
index e475fb09b45..87dc8927ff1 100644
--- a/sapi/cli/tests/bug43177.phpt
+++ b/sapi/cli/tests/bug43177.phpt
@@ -2,7 +2,7 @@
 Bug #61977 Test exit code for various errors
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/bug61977.phpt b/sapi/cli/tests/bug61977.phpt
index 218641a5116..604c9babe68 100644
--- a/sapi/cli/tests/bug61977.phpt
+++ b/sapi/cli/tests/bug61977.phpt
@@ -2,7 +2,7 @@
 Bug #61977 test CLI web-server support for Mime Type File extensions mapping
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/bug65066_100.phpt b/sapi/cli/tests/bug65066_100.phpt
index 34381d8e96c..4203b7444c0 100644
--- a/sapi/cli/tests/bug65066_100.phpt
+++ b/sapi/cli/tests/bug65066_100.phpt
@@ -4,7 +4,7 @@ Bug #65066 (Cli server not responsive when responding with 422 http status code)
 allow_url_fopen=1
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/bug65066_422.phpt b/sapi/cli/tests/bug65066_422.phpt
index f25ddfbca68..e8b497e9236 100644
--- a/sapi/cli/tests/bug65066_422.phpt
+++ b/sapi/cli/tests/bug65066_422.phpt
@@ -4,7 +4,7 @@ Bug #65066 (Cli server not responsive when responding with 422 http status code)
 allow_url_fopen=1
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/bug65066_511.phpt b/sapi/cli/tests/bug65066_511.phpt
index 27c9f9755a1..7e5548aadca 100644
--- a/sapi/cli/tests/bug65066_511.phpt
+++ b/sapi/cli/tests/bug65066_511.phpt
@@ -4,7 +4,7 @@ Bug #65066 (Cli server not responsive when responding with 422 http status code)
 allow_url_fopen=1
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/bug66606_1.phpt b/sapi/cli/tests/bug66606_1.phpt
index ad35038baee..6b1b82772f0 100644
--- a/sapi/cli/tests/bug66606_1.phpt
+++ b/sapi/cli/tests/bug66606_1.phpt
@@ -4,7 +4,7 @@ Bug #66606 (Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE) - GET request
 allow_url_fopen=1
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
@@ -12,6 +12,6 @@ include "php_cli_server.inc";
 php_cli_server_start('var_dump($_SERVER["CONTENT_TYPE"], $_SERVER["CONTENT_LENGTH"])');
 echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS);
 ?>
---EXPECTF--	
+--EXPECTF--
 NULL
 NULL
diff --git a/sapi/cli/tests/bug66606_2.phpt b/sapi/cli/tests/bug66606_2.phpt
index c47b7736c0c..d8bd6162a4b 100644
--- a/sapi/cli/tests/bug66606_2.phpt
+++ b/sapi/cli/tests/bug66606_2.phpt
@@ -4,7 +4,7 @@ Bug #66606 (Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE) - POST request
 allow_url_fopen=1
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
@@ -35,7 +35,7 @@ HEADER
 
 fclose($fp);
 ?>
---EXPECTF--	
+--EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
 Date: %s
diff --git a/sapi/cli/tests/bug71005.phpt b/sapi/cli/tests/bug71005.phpt
index f02f261fbf7..6a163d4639e 100644
--- a/sapi/cli/tests/bug71005.phpt
+++ b/sapi/cli/tests/bug71005.phpt
@@ -2,7 +2,7 @@
 Bug #71005 (Segfault in php_cli_server_dispatch_router())
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
@@ -36,7 +36,7 @@ HEADER
 }
 
 ?>
---EXPECTF--	
+--EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
 Date: %s
diff --git a/sapi/cli/tests/php_cli_server_001.phpt b/sapi/cli/tests/php_cli_server_001.phpt
index 3f1083e7ac8..c2ed8ddff17 100644
--- a/sapi/cli/tests/php_cli_server_001.phpt
+++ b/sapi/cli/tests/php_cli_server_001.phpt
@@ -4,7 +4,7 @@ basic function
 allow_url_fopen=1
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/php_cli_server_002.phpt b/sapi/cli/tests/php_cli_server_002.phpt
index 93151c15d47..e1fbd903981 100644
--- a/sapi/cli/tests/php_cli_server_002.phpt
+++ b/sapi/cli/tests/php_cli_server_002.phpt
@@ -4,7 +4,7 @@ $_SERVER variable
 allow_url_fopen=1
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
@@ -12,7 +12,7 @@ include "php_cli_server.inc";
 php_cli_server_start('var_dump($_SERVER["DOCUMENT_ROOT"], $_SERVER["SERVER_SOFTWARE"], $_SERVER["SERVER_NAME"], $_SERVER["SERVER_PORT"]);');
 var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS));
 ?>
---EXPECTF--	
+--EXPECTF--
 string(%d) "string(%d) "%stests"
 string(%d) "PHP %s Development Server"
 string(%d) "localhost"
diff --git a/sapi/cli/tests/php_cli_server_003.phpt b/sapi/cli/tests/php_cli_server_003.phpt
index d1e95fe6aaf..e763c7ac347 100644
--- a/sapi/cli/tests/php_cli_server_003.phpt
+++ b/sapi/cli/tests/php_cli_server_003.phpt
@@ -4,7 +4,7 @@ Bug #55726 (Changing the working directory makes router script inaccessible)
 allow_url_fopen=1
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
@@ -13,6 +13,6 @@ php_cli_server_start('chdir(__DIR__); echo "okey";');
 var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS));
 var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS));
 ?>
---EXPECTF--	
+--EXPECTF--
 string(4) "okey"
 string(4) "okey"
diff --git a/sapi/cli/tests/php_cli_server_004.phpt b/sapi/cli/tests/php_cli_server_004.phpt
index 5e3bbec18ff..9c93de3f927 100644
--- a/sapi/cli/tests/php_cli_server_004.phpt
+++ b/sapi/cli/tests/php_cli_server_004.phpt
@@ -4,7 +4,7 @@ Bug #55747 (request headers missed in $_SERVER)
 allow_url_fopen=1
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
@@ -35,7 +35,7 @@ HEADER
 }
 
 ?>
---EXPECTF--	
+--EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
 Date: %s
diff --git a/sapi/cli/tests/php_cli_server_005.phpt b/sapi/cli/tests/php_cli_server_005.phpt
index 3f9078c8aeb..f89245df117 100644
--- a/sapi/cli/tests/php_cli_server_005.phpt
+++ b/sapi/cli/tests/php_cli_server_005.phpt
@@ -2,7 +2,7 @@
 Post a file
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
@@ -47,7 +47,7 @@ HEADER
 }
 
 ?>
---EXPECTF--	
+--EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
 Date: %s
diff --git a/sapi/cli/tests/php_cli_server_006.phpt b/sapi/cli/tests/php_cli_server_006.phpt
index c68f1e51b08..ee851b0edd7 100644
--- a/sapi/cli/tests/php_cli_server_006.phpt
+++ b/sapi/cli/tests/php_cli_server_006.phpt
@@ -2,7 +2,7 @@
 Bug #55755 (SegFault when outputting header WWW-Authenticate)
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
@@ -31,7 +31,7 @@ HEADER
 }
 
 ?>
---EXPECTF--	
+--EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
 Date: %s
diff --git a/sapi/cli/tests/php_cli_server_007.phpt b/sapi/cli/tests/php_cli_server_007.phpt
index b588b9ee2ec..3e8fc5f48d7 100644
--- a/sapi/cli/tests/php_cli_server_007.phpt
+++ b/sapi/cli/tests/php_cli_server_007.phpt
@@ -2,7 +2,7 @@
 Bug #55758 (Digest Authenticate missed in 5.4)
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
@@ -31,7 +31,7 @@ HEADER
 }
 
 ?>
---EXPECTF--	
+--EXPECTF--
 HTTP/1.1 401 Unauthorized
 Host: %s
 Date: %s
diff --git a/sapi/cli/tests/php_cli_server_008.phpt b/sapi/cli/tests/php_cli_server_008.phpt
index 58b2485db53..2d9955c031e 100644
--- a/sapi/cli/tests/php_cli_server_008.phpt
+++ b/sapi/cli/tests/php_cli_server_008.phpt
@@ -2,7 +2,7 @@
 SERVER_PROTOCOL header availability
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/php_cli_server_009.phpt b/sapi/cli/tests/php_cli_server_009.phpt
index d63c6abf28e..cb4a14cb082 100644
--- a/sapi/cli/tests/php_cli_server_009.phpt
+++ b/sapi/cli/tests/php_cli_server_009.phpt
@@ -5,7 +5,7 @@ After this fix(#60112), previously 404 request like "localhost/foo/bar"
 now could serve correctly with request_uri "index.php" and PATH_INFO "/foo/bar/"
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/php_cli_server_010.phpt b/sapi/cli/tests/php_cli_server_010.phpt
index fe8f1a98ca3..22cf3de3448 100644
--- a/sapi/cli/tests/php_cli_server_010.phpt
+++ b/sapi/cli/tests/php_cli_server_010.phpt
@@ -2,7 +2,7 @@
 Bug #60180 ($_SERVER["PHP_SELF"] incorrect)
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/php_cli_server_012.phpt b/sapi/cli/tests/php_cli_server_012.phpt
index 10b9cdbfe91..d60d71b02a9 100644
--- a/sapi/cli/tests/php_cli_server_012.phpt
+++ b/sapi/cli/tests/php_cli_server_012.phpt
@@ -2,7 +2,7 @@
 Bug #60159 (Router returns false, but POST is not passed to requested resource)
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/php_cli_server_013.phpt b/sapi/cli/tests/php_cli_server_013.phpt
index 23269580fbc..cfed0c55319 100644
--- a/sapi/cli/tests/php_cli_server_013.phpt
+++ b/sapi/cli/tests/php_cli_server_013.phpt
@@ -2,7 +2,7 @@
 No router, no script
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/php_cli_server_014.phpt b/sapi/cli/tests/php_cli_server_014.phpt
index f308ffb2261..72103219254 100644
--- a/sapi/cli/tests/php_cli_server_014.phpt
+++ b/sapi/cli/tests/php_cli_server_014.phpt
@@ -2,7 +2,7 @@
 Bug #60477: Segfault after two multipart/form-data POST requestes
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/php_cli_server_015.phpt b/sapi/cli/tests/php_cli_server_015.phpt
index 663268aea68..42000adbb9e 100644
--- a/sapi/cli/tests/php_cli_server_015.phpt
+++ b/sapi/cli/tests/php_cli_server_015.phpt
@@ -2,7 +2,7 @@
 Bug #60523 (PHP Errors are not reported in browsers using built-in SAPI)
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --INI--
 display_errors=1
diff --git a/sapi/cli/tests/php_cli_server_016.phpt b/sapi/cli/tests/php_cli_server_016.phpt
index f15aff1240b..855acd5ec37 100644
--- a/sapi/cli/tests/php_cli_server_016.phpt
+++ b/sapi/cli/tests/php_cli_server_016.phpt
@@ -5,7 +5,7 @@ this is an indirect test for bug 60591, since mem leak is reproted in the server
 and require php compiled with --enable-debug
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/php_cli_server_017.phpt b/sapi/cli/tests/php_cli_server_017.phpt
index 28876dc52b4..067d504800e 100644
--- a/sapi/cli/tests/php_cli_server_017.phpt
+++ b/sapi/cli/tests/php_cli_server_017.phpt
@@ -2,7 +2,7 @@
 Implement Req #60850 (Built in web server does not set $_SERVER['SCRIPT_FILENAME'] when using router)
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/php_cli_server_020.phpt b/sapi/cli/tests/php_cli_server_020.phpt
index 766c6669118..23a8bc40e12 100644
--- a/sapi/cli/tests/php_cli_server_020.phpt
+++ b/sapi/cli/tests/php_cli_server_020.phpt
@@ -2,7 +2,7 @@
 Use SEARCH as a HTTP verb
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
@@ -30,7 +30,7 @@ HEADER
 }
 
 ?>
---EXPECTF--	
+--EXPECTF--
 HTTP/1.1 200 OK
 Host: %s
 Date: %s
diff --git a/sapi/phpdbg/tests/finish_leave_001.phpt b/sapi/phpdbg/tests/finish_leave_001.phpt
index e345752b004..cac771fd2f9 100644
--- a/sapi/phpdbg/tests/finish_leave_001.phpt
+++ b/sapi/phpdbg/tests/finish_leave_001.phpt
@@ -32,7 +32,7 @@ prompt>
 <?php
 function foo() {
     $other = bar();
-    
+
     return ["hello", $other];
 }
 
diff --git a/sapi/tests/test006.phpt b/sapi/tests/test006.phpt
index 16d1b2b8404..d3cd74e7da7 100644
--- a/sapi/tests/test006.phpt
+++ b/sapi/tests/test006.phpt
@@ -45,7 +45,7 @@ phpinfo();
 -----------------------------240723202011929--
 
 --FILE--
-<?php 
+<?php
 error_reporting(0);
 print_r($_POST);
 print_r($_FILES);
diff --git a/sapi/tests/test007.phpt b/sapi/tests/test007.phpt
index 8c50e4b80fe..84d9bdb89ac 100644
--- a/sapi/tests/test007.phpt
+++ b/sapi/tests/test007.phpt
@@ -40,7 +40,7 @@ phpinfo();
 -----------------------------240723202011929--
 
 --FILE--
-<?php 
+<?php
 print @$_POST['choices'];
 ?>
 --EXPECT--
diff --git a/tests/basic/003.phpt b/tests/basic/003.phpt
index 43d3be1d9e9..fb906e051dd 100644
--- a/tests/basic/003.phpt
+++ b/tests/basic/003.phpt
@@ -5,7 +5,7 @@ a=Hello+World
 --GET--
 b=Hello+Again+World&c=Hi+Mom
 --FILE--
-<?php 
+<?php
 error_reporting(0);
 echo "post-a=({$_POST['a']}) get-b=({$_GET['b']}) get-c=({$_GET['c']})"?>
 --EXPECT--
diff --git a/tests/basic/004.phpt b/tests/basic/004.phpt
index c381e5009fb..4225c105b5d 100644
--- a/tests/basic/004.phpt
+++ b/tests/basic/004.phpt
@@ -3,7 +3,7 @@ Two variables in POST data
 --POST--
 a=Hello+World&b=Hello+Again+World
 --FILE--
-<?php 
+<?php
 error_reporting(0);
 echo "{$_POST['a']} {$_POST['b']}" ?>
 --EXPECT--
diff --git a/tests/basic/005.phpt b/tests/basic/005.phpt
index 742e0ca4b14..230ba42bb1b 100644
--- a/tests/basic/005.phpt
+++ b/tests/basic/005.phpt
@@ -3,7 +3,7 @@ Three variables in POST data
 --POST--
 a=Hello+World&b=Hello+Again+World&c=1
 --FILE--
-<?php 
+<?php
 error_reporting(0);
 echo "{$_POST['a']} {$_POST['b']} {$_POST['c']}"?>
 --EXPECT--
diff --git a/tests/basic/011.phpt b/tests/basic/011.phpt
index 79256746fec..b5c769d9bd0 100644
--- a/tests/basic/011.phpt
+++ b/tests/basic/011.phpt
@@ -5,7 +5,7 @@ register_argc_argv=1
 --GET--
 ab+cd+ef+123+test
 --FILE--
-<?php 
+<?php
 $argc = $_SERVER['argc'];
 $argv = $_SERVER['argv'];
 
diff --git a/tests/basic/012.phpt b/tests/basic/012.phpt
index 5c10c7c2226..038d4beff91 100644
--- a/tests/basic/012.phpt
+++ b/tests/basic/012.phpt
@@ -8,7 +8,7 @@ variables_order=GPS
 --ARGS--
 ab cd ef 123 test
 --FILE--
-<?php 
+<?php
 $argc = $_SERVER['argc'];
 $argv = $_SERVER['argv'];
 
diff --git a/tests/basic/013.phpt b/tests/basic/013.phpt
index 376cc06dd4f..0cd81a71853 100644
--- a/tests/basic/013.phpt
+++ b/tests/basic/013.phpt
@@ -4,7 +4,7 @@ POST Method test and arrays
 a[]=1
 --FILE--
 <?php
-var_dump($_POST['a']); 
+var_dump($_POST['a']);
 ?>
 --EXPECT--
 array(1) {
diff --git a/tests/basic/014.phpt b/tests/basic/014.phpt
index 7288c44a927..1282aad3e4b 100644
--- a/tests/basic/014.phpt
+++ b/tests/basic/014.phpt
@@ -4,7 +4,7 @@ POST Method test and arrays - 2
 a[]=1&a[]=1
 --FILE--
 <?php
-var_dump($_POST['a']); 
+var_dump($_POST['a']);
 ?>
 --EXPECT--
 array(2) {
diff --git a/tests/basic/015.phpt b/tests/basic/015.phpt
index eecbaf13021..c74e1e414dd 100644
--- a/tests/basic/015.phpt
+++ b/tests/basic/015.phpt
@@ -1,10 +1,10 @@
 --TEST--
-POST Method test and arrays - 3 
+POST Method test and arrays - 3
 --POST--
 a[]=1&a[0]=5
 --FILE--
 <?php
-var_dump($_POST['a']); 
+var_dump($_POST['a']);
 ?>
 --EXPECT--
 array(1) {
diff --git a/tests/basic/016.phpt b/tests/basic/016.phpt
index b34fd1b1dc6..7c814445184 100644
--- a/tests/basic/016.phpt
+++ b/tests/basic/016.phpt
@@ -1,10 +1,10 @@
 --TEST--
-POST Method test and arrays - 4 
+POST Method test and arrays - 4
 --POST--
 a[a]=1&a[b]=3
 --FILE--
 <?php
-var_dump($_POST['a']); 
+var_dump($_POST['a']);
 ?>
 --EXPECT--
 array(2) {
diff --git a/tests/basic/017.phpt b/tests/basic/017.phpt
index d514726d186..ca0a2d6491b 100644
--- a/tests/basic/017.phpt
+++ b/tests/basic/017.phpt
@@ -1,10 +1,10 @@
 --TEST--
-POST Method test and arrays - 5 
+POST Method test and arrays - 5
 --POST--
 a[]=1&a[a]=1&a[b]=3
 --FILE--
 <?php
-var_dump($_POST['a']); 
+var_dump($_POST['a']);
 ?>
 --EXPECT--
 array(3) {
diff --git a/tests/basic/018.phpt b/tests/basic/018.phpt
index 45996b2fe32..93bca86da15 100644
--- a/tests/basic/018.phpt
+++ b/tests/basic/018.phpt
@@ -1,11 +1,11 @@
 --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--
 <?php
-var_dump($_POST['a']); 
-var_dump($_POST['b']); 
+var_dump($_POST['a']);
+var_dump($_POST['b']);
 ?>
 --EXPECT--
 array(2) {
diff --git a/tests/basic/019.phpt b/tests/basic/019.phpt
index 3bece247a02..0c90c4907a3 100644
--- a/tests/basic/019.phpt
+++ b/tests/basic/019.phpt
@@ -1,10 +1,10 @@
 --TEST--
-POST Method test and arrays - 7 
+POST Method test and arrays - 7
 --POST--
 a[]=1&a[]]=3&a[[]=4
 --FILE--
 <?php
-var_dump($_POST['a']); 
+var_dump($_POST['a']);
 ?>
 --EXPECT--
 array(3) {
diff --git a/tests/basic/020.phpt b/tests/basic/020.phpt
index c94a60407bd..3a4d7f455b1 100644
--- a/tests/basic/020.phpt
+++ b/tests/basic/020.phpt
@@ -1,10 +1,10 @@
 --TEST--
-POST Method test and arrays - 8 
+POST Method test and arrays - 8
 --POST--
 a[a[]]=1&a[b[]]=3
 --FILE--
 <?php
-var_dump($_POST['a']); 
+var_dump($_POST['a']);
 ?>
 --EXPECT--
 array(2) {
diff --git a/tests/basic/bug45986.phpt b/tests/basic/bug45986.phpt
index 33c3f27eac8..e63b1b3906f 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/basic/bug67198.phpt b/tests/basic/bug67198.phpt
index 9e2e2245099..4c2322b6dec 100644
--- a/tests/basic/bug67198.phpt
+++ b/tests/basic/bug67198.phpt
@@ -4,7 +4,7 @@ php://input is empty when enable_post_data_reading=Off
 allow_url_fopen=1
 --SKIPIF--
 <?php
-include __DIR__."/../../sapi/cli/tests/skipif.inc"; 
+include __DIR__."/../../sapi/cli/tests/skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/tests/basic/timeout_variation_0.phpt b/tests/basic/timeout_variation_0.phpt
index 4b39ae31ddd..adc8e6b7cf9 100644
--- a/tests/basic/timeout_variation_0.phpt
+++ b/tests/basic/timeout_variation_0.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Timeout within while loop
 --SKIPIF--
-<?php 
+<?php
 	if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
@@ -11,7 +11,7 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc";
 
 set_time_limit($t);
 
-while (1) { 
+while (1) {
 	busy_wait(1);
 }
 
diff --git a/tests/basic/timeout_variation_1.phpt b/tests/basic/timeout_variation_1.phpt
index 28699dcbc41..51568a74923 100644
--- a/tests/basic/timeout_variation_1.phpt
+++ b/tests/basic/timeout_variation_1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Timeout within function
 --SKIPIF--
-<?php 
+<?php
 	if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
@@ -11,8 +11,8 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc";
 
 set_time_limit($t);
 
-function hello ($t) { 
-	echo "call"; 
+function hello ($t) {
+	echo "call";
 	busy_wait($t*2);
 }
 
diff --git a/tests/basic/timeout_variation_10.phpt b/tests/basic/timeout_variation_10.phpt
index 373be27b3d4..030deaf389a 100644
--- a/tests/basic/timeout_variation_10.phpt
+++ b/tests/basic/timeout_variation_10.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Timeout within shutdown function, variation
 --SKIPIF--
-<?php 
+<?php
 	if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
diff --git a/tests/basic/timeout_variation_2.phpt b/tests/basic/timeout_variation_2.phpt
index 5a549500cff..24574e9c5f5 100644
--- a/tests/basic/timeout_variation_2.phpt
+++ b/tests/basic/timeout_variation_2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Timeout within array_walk
 --SKIPIF--
-<?php 
+<?php
 	if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
@@ -12,7 +12,7 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc";
 set_time_limit($t);
 
 function cb(&$i, $k, $p)
-{ 
+{
 	busy_wait(1);
 }
 
diff --git a/tests/basic/timeout_variation_3.phpt b/tests/basic/timeout_variation_3.phpt
index 1dc169c67b8..795ad6505db 100644
--- a/tests/basic/timeout_variation_3.phpt
+++ b/tests/basic/timeout_variation_3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Timeout within eval
 --SKIPIF--
-<?php 
+<?php
 	if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
@@ -11,8 +11,8 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc";
 
 set_time_limit($t);
 
-function hello ($t) { 
-	echo "call", PHP_EOL; 
+function hello ($t) {
+	echo "call", PHP_EOL;
 	busy_wait($t*2);
 }
 
diff --git a/tests/basic/timeout_variation_4.phpt b/tests/basic/timeout_variation_4.phpt
index 19ebf585a9e..7a334fd5446 100644
--- a/tests/basic/timeout_variation_4.phpt
+++ b/tests/basic/timeout_variation_4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Timeout within call_user_func
 --SKIPIF--
-<?php 
+<?php
 	if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
@@ -11,8 +11,8 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc";
 
 set_time_limit($t);
 
-function hello ($t) { 
-	echo "call", PHP_EOL; 
+function hello ($t) {
+	echo "call", PHP_EOL;
 	busy_wait($t*2);
 }
 
diff --git a/tests/basic/timeout_variation_5.phpt b/tests/basic/timeout_variation_5.phpt
index 1c28c00ac98..c3b71e89ab7 100644
--- a/tests/basic/timeout_variation_5.phpt
+++ b/tests/basic/timeout_variation_5.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Timeout within function containing exception
 --SKIPIF--
-<?php 
+<?php
 	if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
@@ -11,7 +11,7 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc";
 
 set_time_limit($t);
 
-function f($t) { 
+function f($t) {
 	echo "call";
 	busy_wait($t*2);
 	throw new Exception("never reached here");
diff --git a/tests/basic/timeout_variation_6.phpt b/tests/basic/timeout_variation_6.phpt
index fb3c3a7aca1..c172625f5d7 100644
--- a/tests/basic/timeout_variation_6.phpt
+++ b/tests/basic/timeout_variation_6.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Timeout within function trowing exception before timeout reached
 --SKIPIF--
-<?php 
+<?php
 	if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
@@ -11,7 +11,7 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc";
 
 set_time_limit($t);
 
-function f($t) { 
+function f($t) {
 	echo "call";
 	busy_wait($t-1);
 	throw new Exception("exception before timeout");
diff --git a/tests/basic/timeout_variation_7.phpt b/tests/basic/timeout_variation_7.phpt
index e642a33a4ec..df8f8975503 100644
--- a/tests/basic/timeout_variation_7.phpt
+++ b/tests/basic/timeout_variation_7.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Timeout within for loop
 --SKIPIF--
-<?php 
+<?php
 	if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
@@ -11,7 +11,7 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc";
 
 set_time_limit($t);
 
-for ($i = 0; $i < 42; $i++) { 
+for ($i = 0; $i < 42; $i++) {
 	busy_wait(1);
 }
 
diff --git a/tests/basic/timeout_variation_8.phpt b/tests/basic/timeout_variation_8.phpt
index 15c9777f2c9..d0a88617004 100644
--- a/tests/basic/timeout_variation_8.phpt
+++ b/tests/basic/timeout_variation_8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Timeout within foreach loop
 --SKIPIF--
-<?php 
+<?php
 	if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
@@ -11,7 +11,7 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc";
 
 set_time_limit($t);
 
-foreach (range(0, 42) as $i) { 
+foreach (range(0, 42) as $i) {
 	busy_wait(1);
 }
 
diff --git a/tests/basic/timeout_variation_9.phpt b/tests/basic/timeout_variation_9.phpt
index 133fdf6daa5..390d29b0c0a 100644
--- a/tests/basic/timeout_variation_9.phpt
+++ b/tests/basic/timeout_variation_9.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Timeout within shutdown function
 --SKIPIF--
-<?php 
+<?php
 	if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
diff --git a/tests/classes/__call_001.phpt b/tests/classes/__call_001.phpt
index be2d0248cc1..a70041ae160 100644
--- a/tests/classes/__call_001.phpt
+++ b/tests/classes/__call_001.phpt
@@ -5,7 +5,7 @@ ZE2 __call()
 
 class Caller {
 	public $x = array(1, 2, 3);
-	
+
 	function __call($m, $a) {
 		echo "Method $m called:\n";
 		var_dump($a);
diff --git a/tests/classes/__call_003.phpt b/tests/classes/__call_003.phpt
index c7aa95cb043..6c3e2cfa6c6 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
@@ -9,16 +9,16 @@ Force pass-by-reference to __call
           $values[0][0] = 'changed';
       }
   }
-  
+
   $a = array('original');
-  
+
   $b = array('original');
   $hack =& $b[0];
-  
+
   $c = new C;
   $c->f($a);
   $c->f($b);
-  
+
   var_dump($a, $b);
 ?>
 --EXPECTF--
diff --git a/tests/classes/__call_004.phpt b/tests/classes/__call_004.phpt
index 0c1f378b8a4..4c2797872ff 100644
--- a/tests/classes/__call_004.phpt
+++ b/tests/classes/__call_004.phpt
@@ -14,7 +14,7 @@ class B extends A {
 		echo "In " . __METHOD__ . "($strMethod, array(" . implode(',',$arrArgs) . "))\n";
 		var_dump($this);
 	}
-	
+
 	function test() {
 		A::test1(1,'a');
 		B::test2(1,'a');
diff --git a/tests/classes/__call_005.phpt b/tests/classes/__call_005.phpt
index 6e1584878e1..33c4df8e493 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 c3937393fd0..e6efdefe9e8 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 cc7a2773bd8..a1dd4594e9c 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/__set__get_001.phpt b/tests/classes/__set__get_001.phpt
index 3c9cb09b4a4..244119a2d07 100644
--- a/tests/classes/__set__get_001.phpt
+++ b/tests/classes/__set__get_001.phpt
@@ -13,7 +13,7 @@ class setter {
 			$r = $this->x[$nm];
 			echo "Returning: $r\n";
 			return $r;
-		} 
+		}
 		else {
 			echo "Nothing!\n";
 		}
@@ -21,11 +21,11 @@ class setter {
 
 	function __set($nm, $val) {
 		echo "Setting [$nm] to $val\n";
-                    
+
 		if (isset($this->x[$nm])) {
 			$this->x[$nm] = $val;
 			echo "OK!\n";
-		} 
+		}
 		else {
 			echo "Not OK!\n";
 		}
@@ -42,7 +42,7 @@ $foo->a = 100;
 $foo->a++;
 $foo->z++;
 var_dump($foo);
-        
+
 ?>
 --EXPECTF--
 Setting [a] to 100
diff --git a/tests/classes/__set__get_004.phpt b/tests/classes/__set__get_004.phpt
index 523cccee1ef..afed2ad8f36 100644
--- a/tests/classes/__set__get_004.phpt
+++ b/tests/classes/__set__get_004.phpt
@@ -8,7 +8,7 @@ class Test {
 	function __get($name) {
 		if (isset($this->x[$name])) {
 			return $this->x[$name];
-		} 
+		}
 		else
 		{
 			return NULL;
diff --git a/tests/classes/__set__get_005.phpt b/tests/classes/__set__get_005.phpt
index fd23cf62760..68cfb39df39 100644
--- a/tests/classes/__set__get_005.phpt
+++ b/tests/classes/__set__get_005.phpt
@@ -10,7 +10,7 @@ class Test
 		echo __METHOD__ . "\n";
 		if (isset($this->x[$name])) {
 			return $this->x[$name];
-		} 
+		}
 		else
 		{
 			return NULL;
diff --git a/tests/classes/__set_data_corrupt.phpt b/tests/classes/__set_data_corrupt.phpt
index 8b51302ab35..4adf5699788 100644
--- a/tests/classes/__set_data_corrupt.phpt
+++ b/tests/classes/__set_data_corrupt.phpt
@@ -6,7 +6,7 @@ $f = 'c="foo"';
 class foo {
         const foobar=1;
         public $pp = array('t'=>null);
-                                                                                                                                                            
+
         function bar() {
                 echo $this->t ='f';
         }
diff --git a/tests/classes/abstract_by_interface_001.phpt b/tests/classes/abstract_by_interface_001.phpt
index 7565fdf45f4..4a746d0d227 100644
--- a/tests/classes/abstract_by_interface_001.phpt
+++ b/tests/classes/abstract_by_interface_001.phpt
@@ -16,7 +16,7 @@ abstract class Derived extends Root implements MyInterface {
 
 class Leaf extends Derived
 {
-	function MyInterfaceFunc() {}	
+	function MyInterfaceFunc() {}
 }
 
 var_dump(new Leaf);
diff --git a/tests/classes/abstract_by_interface_002.phpt b/tests/classes/abstract_by_interface_002.phpt
index 77c5619dfe2..a05660b5b99 100644
--- a/tests/classes/abstract_by_interface_002.phpt
+++ b/tests/classes/abstract_by_interface_002.phpt
@@ -16,7 +16,7 @@ abstract class Derived extends Root implements MyInterface {
 
 class Leaf extends Derived
 {
-	static function MyInterfaceFunc() {}	
+	static function MyInterfaceFunc() {}
 }
 
 var_dump(new Leaf);
diff --git a/tests/classes/array_access_005.phpt b/tests/classes/array_access_005.phpt
index dcb873ff568..92ddeccaf23 100644
--- a/tests/classes/array_access_005.phpt
+++ b/tests/classes/array_access_005.phpt
@@ -1,11 +1,11 @@
 --TEST--
 ZE2 ArrayAccess and sub Arrays
 --FILE--
-<?php 
+<?php
 
 class Peoples implements ArrayAccess {
 	public $person;
-	
+
 	function __construct() {
 		$this->person = array(array('name'=>'Joe'));
 	}
diff --git a/tests/classes/array_access_006.phpt b/tests/classes/array_access_006.phpt
index 342a7e51070..babc808cb44 100644
--- a/tests/classes/array_access_006.phpt
+++ b/tests/classes/array_access_006.phpt
@@ -1,11 +1,11 @@
 --TEST--
 ZE2 ArrayAccess and ASSIGN_OP operators (+=)
 --FILE--
-<?php 
+<?php
 
 class OverloadedArray implements ArrayAccess {
 	public $realArray;
-	
+
 	function __construct() {
 		$this->realArray = array(1,2,3);
 	}
diff --git a/tests/classes/array_access_007.phpt b/tests/classes/array_access_007.phpt
index 42187fe5d5f..801c8e846cf 100644
--- a/tests/classes/array_access_007.phpt
+++ b/tests/classes/array_access_007.phpt
@@ -1,11 +1,11 @@
 --TEST--
 ZE2 ArrayAccess and [] assignment
 --FILE--
-<?php 
+<?php
 
 class OverloadedArray implements ArrayAccess {
 	public $realArray;
-	
+
 	function __construct() {
 		$this->realArray = array();
 	}
diff --git a/tests/classes/array_access_008.phpt b/tests/classes/array_access_008.phpt
index 99798891743..0bb793b2b3a 100644
--- a/tests/classes/array_access_008.phpt
+++ b/tests/classes/array_access_008.phpt
@@ -1,11 +1,11 @@
 --TEST--
-ZE2 ArrayAccess and ASSIGN_OP operators (.=) 
+ZE2 ArrayAccess and ASSIGN_OP operators (.=)
 --FILE--
-<?php 
+<?php
 
 class Peoples implements ArrayAccess {
 	public $person;
-	
+
 	function __construct() {
 		$this->person = array(array('name'=>'Foo'));
 	}
diff --git a/tests/classes/array_access_009.phpt b/tests/classes/array_access_009.phpt
index 3862240261f..7da9084d248 100644
--- a/tests/classes/array_access_009.phpt
+++ b/tests/classes/array_access_009.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ZE2 ArrayAccess and ArrayProxyAccess, ArrayProxy
 --FILE--
-<?php 
+<?php
 
 // NOTE: This will become part of SPL
 
@@ -16,7 +16,7 @@ class ArrayProxy implements ArrayAccess
 {
 	private $object;
 	private $element;
-	
+
 	function __construct(ArrayProxyAccess $object, $element)
 	{
 		echo __METHOD__ . "($element)\n";
@@ -53,7 +53,7 @@ class ArrayProxy implements ArrayAccess
 class Peoples implements ArrayProxyAccess
 {
 	public $person;
-	
+
 	function __construct()
 	{
 		$this->person = array(array('name'=>'Foo'));
@@ -88,7 +88,7 @@ class Peoples implements ArrayProxyAccess
 	{
 		$this->person[$element][$index] = $value;
 	}
-	
+
 	function proxyUnset($element, $index)
 	{
 		unset($this->person[$element][$index]);
diff --git a/tests/classes/array_access_010.phpt b/tests/classes/array_access_010.phpt
index ad374d278c0..3df64fcc7e6 100644
--- a/tests/classes/array_access_010.phpt
+++ b/tests/classes/array_access_010.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ZE2 ArrayAccess and ArrayReferenceProxy with references
 --FILE--
-<?php 
+<?php
 
 // NOTE: This will become part of SPL
 
@@ -9,7 +9,7 @@ class ArrayReferenceProxy implements ArrayAccess
 {
 	private $object;
 	private $element;
-	
+
 	function __construct(ArrayAccess $object, array &$element)
 	{
 		echo __METHOD__ . "(Array)\n";
@@ -41,7 +41,7 @@ class ArrayReferenceProxy implements ArrayAccess
 class Peoples implements ArrayAccess
 {
 	public $person;
-	
+
 	function __construct()
 	{
 		$this->person = array(array('name'=>'Foo'));
diff --git a/tests/classes/array_access_011.phpt b/tests/classes/array_access_011.phpt
index aa20a56d394..36269c0b41d 100644
--- a/tests/classes/array_access_011.phpt
+++ b/tests/classes/array_access_011.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ZE2 ArrayAccess and ArrayAccessReferenceProxy with references to main array
 --FILE--
-<?php 
+<?php
 
 // NOTE: This will become part of SPL
 
@@ -10,7 +10,7 @@ class ArrayAccessReferenceProxy implements ArrayAccess
 	private $object;
 	private $oarray;
 	private $element;
-	
+
 	function __construct(ArrayAccess $object, array &$array, $element)
 	{
 		echo __METHOD__ . "($element)\n";
@@ -43,7 +43,7 @@ class ArrayAccessReferenceProxy implements ArrayAccess
 class Peoples implements ArrayAccess
 {
 	public $person;
-	
+
 	function __construct()
 	{
 		$this->person = array(array('name'=>'Foo'));
diff --git a/tests/classes/assign_op_property_001.phpt b/tests/classes/assign_op_property_001.phpt
index 21e131cfa4e..cd5fcff469d 100644
--- a/tests/classes/assign_op_property_001.phpt
+++ b/tests/classes/assign_op_property_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
 ZE2 assign_op property of overloaded object
 --FILE--
-<?php 
+<?php
 
 class Test {
 	private $real_a = 2;
-	
+
 	function __set($property, $value) {
 	  if ($property == "a") {
 	    $this->real_a = $value;
diff --git a/tests/classes/autoload_001.phpt b/tests/classes/autoload_001.phpt
index 6c09c4e04d3..22bbb6bc7a3 100644
--- a/tests/classes/autoload_001.phpt
+++ b/tests/classes/autoload_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ZE2 Autoload and class_exists
 --SKIPIF--
-<?php 
+<?php
 	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
diff --git a/tests/classes/autoload_002.phpt b/tests/classes/autoload_002.phpt
index ecb1a445124..3ea84370dad 100644
--- a/tests/classes/autoload_002.phpt
+++ b/tests/classes/autoload_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ZE2 Autoload and get_class_methods
 --SKIPIF--
-<?php 
+<?php
 	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
diff --git a/tests/classes/autoload_003.phpt b/tests/classes/autoload_003.phpt
index f79b85a9f03..cb82c06e19f 100644
--- a/tests/classes/autoload_003.phpt
+++ b/tests/classes/autoload_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ZE2 Autoload and derived classes
 --SKIPIF--
-<?php 
+<?php
 	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
diff --git a/tests/classes/autoload_004.phpt b/tests/classes/autoload_004.phpt
index 1f754ca0303..f5830ca6cdb 100644
--- a/tests/classes/autoload_004.phpt
+++ b/tests/classes/autoload_004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ZE2 Autoload and recursion
 --SKIPIF--
-<?php 
+<?php
 	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
diff --git a/tests/classes/autoload_005.phpt b/tests/classes/autoload_005.phpt
index 26f4d6ae108..c21a4420562 100644
--- a/tests/classes/autoload_005.phpt
+++ b/tests/classes/autoload_005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ZE2 Autoload from destructor
 --SKIPIF--
-<?php 
+<?php
 	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
diff --git a/tests/classes/autoload_006.phpt b/tests/classes/autoload_006.phpt
index 092e2e22529..69598afc8d7 100644
--- a/tests/classes/autoload_006.phpt
+++ b/tests/classes/autoload_006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ZE2 Autoload from destructor
 --SKIPIF--
-<?php 
+<?php
 	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
diff --git a/tests/classes/autoload_009.phpt b/tests/classes/autoload_009.phpt
index ebe691ca281..63f1ea9801a 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/autoload_018.phpt b/tests/classes/autoload_018.phpt
index 2099499e118..2e2ef63a3c4 100644
--- a/tests/classes/autoload_018.phpt
+++ b/tests/classes/autoload_018.phpt
@@ -4,15 +4,15 @@ Ensure __autoload() allows for recursive calls if the class name differs.
 <?php
 spl_autoload_register(function ($name) {
   echo "IN:  autoload($name)\n";
-  
+
   static $i = 0;
   if ($i++ > 10) {
       echo "-> Recursion detected - as expected.\n";
       return;
   }
-  
+
   class_exists('UndefinedClass' . $i);
-  
+
   echo "OUT: autoload($name)\n";
 });
 
diff --git a/tests/classes/bug23951.phpt b/tests/classes/bug23951.phpt
index 2e272b87fe9..74b9332d698 100644
--- a/tests/classes/bug23951.phpt
+++ b/tests/classes/bug23951.phpt
@@ -7,15 +7,15 @@ define('FOO1', 1);
 define('FOO2', 2);
 
 class A {
-    
+
     public $a_var = array(FOO1=>'foo1_value', FOO2=>'foo2_value');
-    
+
 }
 
 class B extends A {
- 
-    public $b_var = 'foo';   
-            
+
+    public $b_var = 'foo';
+
 }
 
 $a = new A;
diff --git a/tests/classes/bug29446.phpt b/tests/classes/bug29446.phpt
index 573f136ce06..9ce2309cba7 100644
--- a/tests/classes/bug29446.phpt
+++ b/tests/classes/bug29446.phpt
@@ -6,7 +6,7 @@ Bug #29446 (ZE allows multiple declarations of the same class constant)
 class testClass {
   const TEST_CONST = 'test';
   const TEST_CONST = 'test1';
-  
+
   function testClass() {
     echo self::TEST_CONST;
   }
diff --git a/tests/classes/class_example.phpt b/tests/classes/class_example.phpt
index 621958b1bd2..b0e9cf8f6ef 100644
--- a/tests/classes/class_example.phpt
+++ b/tests/classes/class_example.phpt
@@ -2,7 +2,7 @@
 Classes general test
 --FILE--
 
-<?php 
+<?php
 
 /* pretty nifty object oriented code! */
 
diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt
index 37120579f6a..03af299ba87 100644
--- a/tests/classes/constants_basic_001.phpt
+++ b/tests/classes/constants_basic_001.phpt
@@ -6,31 +6,31 @@ Class constant declarations
   $def = 456;
   define('DEFINED_TO_VAR', $def);
   define('DEFINED_TO_UNDEF_VAR', $undef);
-  
+
   class C
   {
       const c0 = UNDEFINED;
-      
+
       const c1 = 1, c2 = 1.5;
       const c3 =  + 1, c4 =  + 1.5;
       const c5 = -1, c6 = -1.5;
-      
+
       const c7 = __LINE__;
       const c8 = __FILE__;
       const c9 = __CLASS__;
       const c10 = __METHOD__;
       const c11 = __FUNCTION__;
-      
+
       const c12 = DEFINED;
       const c13 = DEFINED_TO_VAR;
       const c14 = DEFINED_TO_UNDEF_VAR;
-      
+
       const c15 = "hello1";
       const c16 = 'hello2';
       const c17 = C::c16;
       const c18 = self::c17;
   }
-  
+
   echo "\nAttempt to access various kinds of class constants:\n";
   var_dump(C::c0);
   var_dump(C::c1);
@@ -51,10 +51,10 @@ Class constant declarations
   var_dump(C::c16);
   var_dump(C::c17);
   var_dump(C::c18);
-  
+
   echo "\nExpecting fatal error:\n";
   var_dump(C::c19);
-  
+
   echo "\nYou should not see this.";
 ?>
 --EXPECTF--
diff --git a/tests/classes/constants_basic_002.phpt b/tests/classes/constants_basic_002.phpt
index 0e53ca97c81..006e5fbab90 100644
--- a/tests/classes/constants_basic_002.phpt
+++ b/tests/classes/constants_basic_002.phpt
@@ -6,14 +6,14 @@ Basic class support - defining and reading a class constant.
   {
       const myConst = "hello";
   }
-  
+
   echo "\nRead class constant.\n";
   var_dump(aclass::myConst);
-  
+
   echo "\nFail to read class constant from instance.\n";
   $myInstance = new aclass();
   var_dump($myInstance->myConst);
-  
+
   echo "\nClass constant not visible in object var_dump.\n";
   var_dump($myInstance)
 ?>
diff --git a/tests/classes/constants_basic_003.phpt b/tests/classes/constants_basic_003.phpt
index 052af8573e7..1762c99a138 100644
--- a/tests/classes/constants_basic_003.phpt
+++ b/tests/classes/constants_basic_003.phpt
@@ -10,12 +10,12 @@ Ensure class properties and constants can be defined in terms of constants that
       const ca = A::MY_CONST;
       const cc = C::MY_CONST;
   }
-  
+
   class C
   {
       const MY_CONST = "hello from C";
   }
-  
+
   var_dump(B::$a);
   var_dump(B::$c);
   var_dump(B::ca);
diff --git a/tests/classes/constants_basic_004.phpt b/tests/classes/constants_basic_004.phpt
index cade66844b7..e893768629d 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
@@ -8,33 +8,33 @@ Test properties with array default values using class constants as keys and valu
       public static $sa_x = array(B::KEY => B::VALUE);
       public $a_x = array(B::KEY => B::VALUE);
   }
-  
+
   class B
   {
       const KEY = "key";
       const VALUE = "value";
-      
+
       // Static and instance array using class constants with self
       public static $sa_b = array(self::KEY => self::VALUE);
       public $a_b = array(self::KEY => self::VALUE);
   }
-  
+
   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);
-      
+
       // Static and instance array using class constants with self (constants should be inherited)
       public static $sa_c_self = array(self::KEY => self::VALUE);
       public $a_c_self = array(self::KEY => self::VALUE);
-      
+
       // Should also include inherited properties from B.
   }
-  
+
   echo "\nStatic properties:\n";
   var_dump(X::$sa_x, B::$sa_b, C::$sa_b, C::$sa_c_parent, C::$sa_c_self);
-  
+
   echo "\nInstance properties:\n";
   $x = new x;
   $b = new B;
diff --git a/tests/classes/constants_basic_005.phpt b/tests/classes/constants_basic_005.phpt
index c840f5385a7..c89b0e8a147 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/constants_basic_006.phpt b/tests/classes/constants_basic_006.phpt
index 73cf0ef3a9c..9ede9bce09c 100644
--- a/tests/classes/constants_basic_006.phpt
+++ b/tests/classes/constants_basic_006.phpt
@@ -7,16 +7,16 @@ Ensure class constants are not evaluated when a class is looked up to resolve in
       const X = E::A;
       public static $a = array(K => D::V, E::A => K);
   }
-  
+
   eval('class D extends C { const V = \'test\'; }');
-  
+
   class E extends D
   {
       const A = "hello";
   }
-  
+
   define('K', "nasty");
-  
+
   var_dump(C::X, C::$a, D::X, D::$a, E::X, E::$a);
 ?>
 --EXPECTF--
diff --git a/tests/classes/constants_comments_001.phpt b/tests/classes/constants_comments_001.phpt
index dbdd67c3328..297ad9f956e 100644
--- a/tests/classes/constants_comments_001.phpt
+++ b/tests/classes/constants_comments_001.phpt
@@ -5,17 +5,17 @@ opcache.save_comments=1
 --FILE--
 <?php
 class X {
-	/** comment X1 */	
+	/** comment X1 */
 	const X1 = 1;
 	const X2 = 2;
-	/** comment X3 */	
+	/** comment X3 */
 	const X3 = 3;
 }
 class Y extends X {
-	/** comment Y1 */	
+	/** comment Y1 */
 	const Y1 = 1;
 	const Y2 = 2;
-	/** comment Y3 */	
+	/** comment Y3 */
 	const Y3 = 3;
 }
 $r = new ReflectionClass('Y');
diff --git a/tests/classes/constants_error_003.phpt b/tests/classes/constants_error_003.phpt
index c67768c8098..b56679b3881 100644
--- a/tests/classes/constants_error_003.phpt
+++ b/tests/classes/constants_error_003.phpt
@@ -6,12 +6,12 @@ Basic class support - attempting to pass a class constant by reference.
   {
       const myConst = "hello";
   }
-  
+
   function f(&$a)
   {
       $a = "changed";
   }
-  
+
   f(aclass::myConst);
   var_dump(aclass::myConst);
 ?>
diff --git a/tests/classes/constants_error_004.phpt b/tests/classes/constants_error_004.phpt
index 3f34473dad1..adafc0614b5 100644
--- a/tests/classes/constants_error_004.phpt
+++ b/tests/classes/constants_error_004.phpt
@@ -6,7 +6,7 @@ Class constant whose initial value references a non-existent class
   {
       const c1 = D::hello;
   }
-  
+
   $a = new C();
 ?>
 --EXPECTF--
diff --git a/tests/classes/constants_error_006.phpt b/tests/classes/constants_error_006.phpt
index f3f14b867be..01839ba7ef8 100644
--- a/tests/classes/constants_error_006.phpt
+++ b/tests/classes/constants_error_006.phpt
@@ -6,7 +6,7 @@ Basic class support - attempting to modify a class constant by assignment
   {
       const myConst = "hello";
   }
-  
+
   echo "\nTrying to modify a class constant directly - should be parse error.\n";
   aclass::myConst = "no!!";
   var_dump(aclass::myConst);
diff --git a/tests/classes/constants_error_007.phpt b/tests/classes/constants_error_007.phpt
index 4be8d885f5f..54b32e4ab2c 100644
--- a/tests/classes/constants_error_007.phpt
+++ b/tests/classes/constants_error_007.phpt
@@ -6,7 +6,7 @@ Basic class support - attempting to create a reference to a class constant
   {
       const myConst = "hello";
   }
-  
+
   echo "\nAttempting to create a reference to a class constant - should be parse error.\n";
   $a = &aclass::myConst;
 ?>
diff --git a/tests/classes/ctor_dtor_inheritance.phpt b/tests/classes/ctor_dtor_inheritance.phpt
index fc43727d2a8..84b38665e60 100644
--- a/tests/classes/ctor_dtor_inheritance.phpt
+++ b/tests/classes/ctor_dtor_inheritance.phpt
@@ -16,7 +16,7 @@ class base {
 		$this->name = 'base';
 		print_r($this);
 	}
-	
+
 	function __destruct() {
 		echo __CLASS__ . "::" . __FUNCTION__ . "\n";
 		print_r($this);
diff --git a/tests/classes/ctor_failure.phpt b/tests/classes/ctor_failure.phpt
index b7d3b64dda6..f86b0cc5f8e 100644
--- a/tests/classes/ctor_failure.phpt
+++ b/tests/classes/ctor_failure.phpt
@@ -9,7 +9,7 @@ class Test
         echo __METHOD__ . "($msg)\n";
         throw new Exception($msg);
     }
-    
+
     function __destruct() {
         echo __METHOD__ . "\n";
     }
diff --git a/tests/classes/ctor_visibility.phpt b/tests/classes/ctor_visibility.phpt
index e7288bb9680..685c7dbe41b 100644
--- a/tests/classes/ctor_visibility.phpt
+++ b/tests/classes/ctor_visibility.phpt
@@ -18,7 +18,7 @@ class Derived extends Test
         echo __METHOD__ . "()\n";
 		parent::__construct();
 	}
-	
+
 	static function f()
 	{
 		new Derived;
@@ -49,7 +49,7 @@ class DerivedPriv extends TestPriv
         echo __METHOD__ . "()\n";
 		parent::__construct();
 	}
-	
+
 	static function f()
 	{
 		new DerivedPriv;
diff --git a/tests/classes/destructor_and_echo.phpt b/tests/classes/destructor_and_echo.phpt
index 0a253593a5e..7d5b57c8aca 100644
--- a/tests/classes/destructor_and_echo.phpt
+++ b/tests/classes/destructor_and_echo.phpt
@@ -8,7 +8,7 @@ class Test
     function __construct() {
         echo __METHOD__ . "\n";
     }
-    
+
     function __destruct() {
         echo __METHOD__ . "\n";
     }
diff --git a/tests/classes/destructor_and_globals.phpt b/tests/classes/destructor_and_globals.phpt
index 9caf0f10267..1276d28348c 100644
--- a/tests/classes/destructor_and_globals.phpt
+++ b/tests/classes/destructor_and_globals.phpt
@@ -28,7 +28,7 @@ class counter {
     global $test_cnt;
     $test_cnt--;
   }
-  
+
   static public function destroy(&$obj) {
   	$obj = NULL;
   	}
diff --git a/tests/classes/destructor_inheritance.phpt b/tests/classes/destructor_inheritance.phpt
index f267a740aed..c527c04b4fc 100644
--- a/tests/classes/destructor_inheritance.phpt
+++ b/tests/classes/destructor_inheritance.phpt
@@ -6,7 +6,7 @@ class base {
    function __construct() {
       echo __METHOD__ . "\n";
    }
-   
+
    function __destruct() {
       echo __METHOD__ . "\n";
    }
diff --git a/tests/classes/factory_and_singleton_001.phpt b/tests/classes/factory_and_singleton_001.phpt
index 970c017f4bf..dbbf07cfadf 100644
--- a/tests/classes/factory_and_singleton_001.phpt
+++ b/tests/classes/factory_and_singleton_001.phpt
@@ -41,7 +41,7 @@ class test {
       return NULL;
     }
   }
-  
+
   static public function count() {
     return test::$cnt;
   }
diff --git a/tests/classes/factory_and_singleton_002.phpt b/tests/classes/factory_and_singleton_002.phpt
index 48125714977..67483212429 100644
--- a/tests/classes/factory_and_singleton_002.phpt
+++ b/tests/classes/factory_and_singleton_002.phpt
@@ -41,7 +41,7 @@ class test {
       return NULL;
     }
   }
-  
+
   static public function count() {
     return test::$cnt;
   }
diff --git a/tests/classes/incdec_property_001.phpt b/tests/classes/incdec_property_001.phpt
index 97a24d30b64..8517a9fc4d0 100644
--- a/tests/classes/incdec_property_001.phpt
+++ b/tests/classes/incdec_property_001.phpt
@@ -1,11 +1,11 @@
 --TEST--
 ZE2 post increment/decrement property of overloaded object
 --FILE--
-<?php 
+<?php
 
 class Test {
 	private $real_a = 2;
-	
+
 	function __set($property, $value) {
 	  if ($property == "a") {
 	    $this->real_a = $value;
diff --git a/tests/classes/incdec_property_002.phpt b/tests/classes/incdec_property_002.phpt
index c1d7dded3b0..930a58dc077 100644
--- a/tests/classes/incdec_property_002.phpt
+++ b/tests/classes/incdec_property_002.phpt
@@ -1,11 +1,11 @@
 --TEST--
 ZE2 post increment/decrement property of overloaded object with assignment
 --FILE--
-<?php 
+<?php
 
 class Test {
 	private $real_a = 2;
-	
+
 	function __set($property, $value) {
 	  if ($property == "a") {
 	    $this->real_a = $value;
diff --git a/tests/classes/incdec_property_003.phpt b/tests/classes/incdec_property_003.phpt
index 1a923849f41..edf3c00963e 100644
--- a/tests/classes/incdec_property_003.phpt
+++ b/tests/classes/incdec_property_003.phpt
@@ -1,11 +1,11 @@
 --TEST--
 ZE2 pre increment/decrement property of overloaded object
 --FILE--
-<?php 
+<?php
 
 class Test {
 	private $real_a = 2;
-	
+
 	function __set($property, $value) {
 	  if ($property == "a") {
 	    $this->real_a = $value;
diff --git a/tests/classes/incdec_property_004.phpt b/tests/classes/incdec_property_004.phpt
index 05e3b445ac1..2267d568afe 100644
--- a/tests/classes/incdec_property_004.phpt
+++ b/tests/classes/incdec_property_004.phpt
@@ -1,11 +1,11 @@
 --TEST--
 ZE2 pre increment/decrement property of overloaded object with assignment
 --FILE--
-<?php 
+<?php
 
 class Test {
 	private $real_a = 2;
-	
+
 	function __set($property, $value) {
 	  if ($property == "a") {
 	    $this->real_a = $value;
diff --git a/tests/classes/inheritance.phpt b/tests/classes/inheritance.phpt
index 070ad9147d7..3f7e38b9efa 100644
--- a/tests/classes/inheritance.phpt
+++ b/tests/classes/inheritance.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Classes inheritance test
 --FILE--
-<?php 
+<?php
 
 /* Inheritance test.  Pretty nifty if I do say so myself! */
 
diff --git a/tests/classes/inheritance_005.phpt b/tests/classes/inheritance_005.phpt
index 7399bf1168c..8c5167f4bf5 100644
--- a/tests/classes/inheritance_005.phpt
+++ b/tests/classes/inheritance_005.phpt
@@ -9,25 +9,25 @@ Check for inherited old-style constructor.
           echo "In " . __METHOD__ . "\n";
       }
   }
-  
+
   class B extends A
   {
   }
-  
+
   class C extends B
   {
   }
-  
-  
+
+
   echo "About to construct new B: \n";
   $b = new B;
-  
+
   echo "Is B::B() callable?\n";
   var_dump(is_callable(array($b, "B")));
-  
+
   echo "Is B::A() callable?\n";
   var_dump(is_callable(array($b, "A")));
-  
+
   echo "About to construct new C: \n";
   $c = new C;
 
diff --git a/tests/classes/interface_and_extends.phpt b/tests/classes/interface_and_extends.phpt
index 1c23d31ca62..8bb1ec05f10 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_class.phpt b/tests/classes/interface_class.phpt
index 46deb490ed9..8975994024e 100644
--- a/tests/classes/interface_class.phpt
+++ b/tests/classes/interface_class.phpt
@@ -4,7 +4,7 @@ ZE2 A class can only implement interfaces
 <?php
 class base {
 }
-	
+
 class derived implements base {
 }
 ?>
diff --git a/tests/classes/interface_constant_inheritance_001.phpt b/tests/classes/interface_constant_inheritance_001.phpt
index f982a4a64eb..046f3b1c5a7 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 af4ce695f75..952dbaf7f4b 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 6b4139bd98b..908ca7b4d68 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 f0559295784..c10b19b8216 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/interface_doubled.phpt b/tests/classes/interface_doubled.phpt
index bcf2fbda8fa..b7c4b7a141d 100644
--- a/tests/classes/interface_doubled.phpt
+++ b/tests/classes/interface_doubled.phpt
@@ -6,7 +6,7 @@ ZE2 An interface extends base interfaces
 interface if_a {
 	function f_a();
 }
-	
+
 interface if_b {
 	function f_b();
 }
diff --git a/tests/classes/interface_implemented.phpt b/tests/classes/interface_implemented.phpt
index f0507dea1c3..bfc9c47fb1c 100644
--- a/tests/classes/interface_implemented.phpt
+++ b/tests/classes/interface_implemented.phpt
@@ -6,7 +6,7 @@ ZE2 An interface is inherited
 interface if_a {
 	function f_a();
 }
-	
+
 interface if_b extends if_a {
 	function f_b();
 }
diff --git a/tests/classes/interface_instantiate.phpt b/tests/classes/interface_instantiate.phpt
index dffd6b10e2b..04b0e297012 100644
--- a/tests/classes/interface_instantiate.phpt
+++ b/tests/classes/interface_instantiate.phpt
@@ -6,7 +6,7 @@ ZE2 An interface cannot be instantiated
 interface if_a {
 	function f_a();
 }
-	
+
 $t = new if_a();
 
 ?>
diff --git a/tests/classes/interface_must_be_implemented.phpt b/tests/classes/interface_must_be_implemented.phpt
index cd7c815f50a..7dc39436e93 100644
--- a/tests/classes/interface_must_be_implemented.phpt
+++ b/tests/classes/interface_must_be_implemented.phpt
@@ -6,7 +6,7 @@ ZE2 An interface must be implemented
 interface if_a {
 	function f_a();
 }
-	
+
 class derived_a implements if_a {
 }
 
diff --git a/tests/classes/interface_optional_arg_003.phpt b/tests/classes/interface_optional_arg_003.phpt
index ece436b4840..aa769ec7dec 100644
--- a/tests/classes/interface_optional_arg_003.phpt
+++ b/tests/classes/interface_optional_arg_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 default argument value in and in implementing class with interface in included file
 --FILE--
-<?php 
+<?php
 include 'interface_optional_arg_003.inc';
 
 class C implements I {
diff --git a/tests/classes/iterators_001.phpt b/tests/classes/iterators_001.phpt
index 548bed53cec..e4060e375fb 100644
--- a/tests/classes/iterators_001.phpt
+++ b/tests/classes/iterators_001.phpt
@@ -37,7 +37,7 @@ class c_iter implements Iterator {
 		}
 	}
 }
-	
+
 class c implements IteratorAggregate {
 
 	public $max = 3;
diff --git a/tests/classes/iterators_002.phpt b/tests/classes/iterators_002.phpt
index 6f93d1e1f99..5e1ceb62082 100644
--- a/tests/classes/iterators_002.phpt
+++ b/tests/classes/iterators_002.phpt
@@ -41,7 +41,7 @@ class c_iter implements Iterator {
 		echo __METHOD__ . "\n";
 	}
 }
-	
+
 class c implements IteratorAggregate {
 
 	public $max = 3;
diff --git a/tests/classes/iterators_003.phpt b/tests/classes/iterators_003.phpt
index 71009e02699..f417478d492 100644
--- a/tests/classes/iterators_003.phpt
+++ b/tests/classes/iterators_003.phpt
@@ -31,7 +31,7 @@ class c_iter implements Iterator {
 		return $this->num;
 	}
 }
-	
+
 class c implements IteratorAggregate {
 
 	public $max = 4;
diff --git a/tests/classes/iterators_006.phpt b/tests/classes/iterators_006.phpt
index 564f15de546..7baa077f2b9 100644
--- a/tests/classes/iterators_006.phpt
+++ b/tests/classes/iterators_006.phpt
@@ -45,7 +45,7 @@ class a implements IteratorAggregate {
 $array = new a();
 
 foreach ($array as $property => $value) {
-	print "$property: $value\n";    
+	print "$property: $value\n";
 }
 
 #$array = $array->getIterator();
@@ -58,13 +58,13 @@ echo "===2nd===\n";
 $array = new ai();
 
 foreach ($array as $property => $value) {
-	print "$property: $value\n";    
+	print "$property: $value\n";
 }
 
 echo "===3rd===\n";
 
 foreach ($array as $property => $value) {
-	print "$property: $value\n";    
+	print "$property: $value\n";
 }
 
 ?>
diff --git a/tests/classes/iterators_007.phpt b/tests/classes/iterators_007.phpt
index f2638b31dcc..87b7e5318ba 100644
--- a/tests/classes/iterators_007.phpt
+++ b/tests/classes/iterators_007.phpt
@@ -6,7 +6,7 @@ class Test implements Iterator
 {
 	public $arr = array(1, 2, 3);
 	public $x = 0;
-	
+
 	public function rewind()    { if ($this->x == 0) throw new Exception(__METHOD__); reset($this->arr); }
 	public function current()   { if ($this->x == 1) throw new Exception(__METHOD__); return current($this->arr); }
 	public function key()       { if ($this->x == 2) throw new Exception(__METHOD__); return key($this->arr); }
diff --git a/tests/classes/iterators_008.phpt b/tests/classes/iterators_008.phpt
index da59ec3aaa1..463e54e1bac 100644
--- a/tests/classes/iterators_008.phpt
+++ b/tests/classes/iterators_008.phpt
@@ -5,31 +5,31 @@ Ensure plain userspace superclass does not override special iterator behaviour o
 Class C {}
 
 class D extends C implements Iterator {
-  
+
   private $counter = 2;
-  
+
   public function valid() {
     echo __METHOD__ . "($this->counter)\n";
-    return $this->counter;    
+    return $this->counter;
   }
-  
+
   public function next() {
-    $this->counter--;   
+    $this->counter--;
     echo __METHOD__ . "($this->counter)\n";
   }
-  
+
   public function rewind() {
     echo __METHOD__ . "($this->counter)\n";
   }
-  
+
   public function current() {
     echo __METHOD__ . "($this->counter)\n";
   }
-  
+
   public function key() {
     echo __METHOD__ . "($this->counter)\n";
   }
-  
+
 }
 
 foreach (new D as $x) {}
diff --git a/tests/classes/method_call_variation_001.phpt b/tests/classes/method_call_variation_001.phpt
index 7950b7deb36..9537321b15b 100644
--- a/tests/classes/method_call_variation_001.phpt
+++ b/tests/classes/method_call_variation_001.phpt
@@ -13,10 +13,10 @@ In $a->$b[Y]() and $a->X[Y]() both $a->$b[Y] and $a->X[Y] represent a global fun
   $c = new C;
   $c->functions[0] = 'foo';
   $c->functions[1][2][3][4] = 'foo';
-  
+
   $c->$name[0](1, 2);
   $c->$name[1][2][3][4](3, 4);
-  
+
   $c->functions[0](5, 6);
   $c->functions[1][2][3][4](7, 8);
 ?>
diff --git a/tests/classes/method_override_optional_arg_002.phpt b/tests/classes/method_override_optional_arg_002.phpt
index c62e3a562e9..254392718b8 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/object_reference_001.phpt b/tests/classes/object_reference_001.phpt
index ca5bbc5abe1..9842ac00f59 100644
--- a/tests/classes/object_reference_001.phpt
+++ b/tests/classes/object_reference_001.phpt
@@ -5,7 +5,7 @@ ZE2 object references
 
 class Foo {
 	public $name;
-    
+
 	function __construct() {
 		$this->name = "I'm Foo!\n";
 	}
diff --git a/tests/classes/private_006.phpt b/tests/classes/private_006.phpt
index a51c9e70dce..cd53ebac8b7 100644
--- a/tests/classes/private_006.phpt
+++ b/tests/classes/private_006.phpt
@@ -14,7 +14,7 @@ class first {
 
 first::do_show();
 
-class second extends first { 
+class second extends first {
 }
 
 second::do_show();
diff --git a/tests/classes/private_006b.phpt b/tests/classes/private_006b.phpt
index 22c3cfd80bf..a31431272c4 100644
--- a/tests/classes/private_006b.phpt
+++ b/tests/classes/private_006b.phpt
@@ -16,7 +16,7 @@ class first {
 $t1 = new first();
 $t1->do_show();
 
-class second extends first { 
+class second extends first {
 }
 
 //$t2 = new second();
diff --git a/tests/classes/private_007.phpt b/tests/classes/private_007.phpt
index f773cc8ed27..acf56665a7e 100644
--- a/tests/classes/private_007.phpt
+++ b/tests/classes/private_007.phpt
@@ -12,7 +12,7 @@ class Bar {
 	}
 }
 class Foo extends Bar {
-	public static function priv()	{ 
+	public static function priv()	{
 		echo "Foo::priv()\n";
 	}
 }
diff --git a/tests/classes/private_007b.phpt b/tests/classes/private_007b.phpt
index cbd0e756de7..588a199e762 100644
--- a/tests/classes/private_007b.phpt
+++ b/tests/classes/private_007b.phpt
@@ -12,7 +12,7 @@ class Bar {
 	}
 }
 class Foo extends Bar {
-	public function priv()	{ 
+	public function priv()	{
 		echo "Foo::priv()\n";
 	}
 }
diff --git a/tests/classes/private_members.phpt b/tests/classes/private_members.phpt
index 7ee6d69cf84..af336ae85d1 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/property_override_privateStatic_private.phpt b/tests/classes/property_override_privateStatic_private.phpt
index ddd2e5d1ac3..c579c1b9697 100644
--- a/tests/classes/property_override_privateStatic_private.phpt
+++ b/tests/classes/property_override_privateStatic_private.phpt
@@ -10,7 +10,7 @@ Redeclare inherited private static property as private.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       private $p = "B::p";
@@ -19,10 +19,10 @@ Redeclare inherited private static property as private.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_privateStatic_privateStatic.phpt b/tests/classes/property_override_privateStatic_privateStatic.phpt
index d7d645fd0ac..fe458f900d6 100644
--- a/tests/classes/property_override_privateStatic_privateStatic.phpt
+++ b/tests/classes/property_override_privateStatic_privateStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited private static property as private static.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       private static $p = "B::p (static)";
@@ -19,10 +19,10 @@ Redeclare inherited private static property as private static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   B::showA();
   B::showB();
 ?>
diff --git a/tests/classes/property_override_privateStatic_protected.phpt b/tests/classes/property_override_privateStatic_protected.phpt
index d4732166c61..52336f22ef2 100644
--- a/tests/classes/property_override_privateStatic_protected.phpt
+++ b/tests/classes/property_override_privateStatic_protected.phpt
@@ -10,7 +10,7 @@ Redeclare inherited private static property as protected.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       protected $p = "B::p";
@@ -19,10 +19,10 @@ Redeclare inherited private static property as protected.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_privateStatic_protectedStatic.phpt b/tests/classes/property_override_privateStatic_protectedStatic.phpt
index 169ff9a3774..fc07929b3a2 100644
--- a/tests/classes/property_override_privateStatic_protectedStatic.phpt
+++ b/tests/classes/property_override_privateStatic_protectedStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited private static property as protected static.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       protected static $p = "B::p (static)";
@@ -19,10 +19,10 @@ Redeclare inherited private static property as protected static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   B::showA();
   B::showB();
 ?>
diff --git a/tests/classes/property_override_privateStatic_public.phpt b/tests/classes/property_override_privateStatic_public.phpt
index 033eb75231f..2eba25c0b52 100644
--- a/tests/classes/property_override_privateStatic_public.phpt
+++ b/tests/classes/property_override_privateStatic_public.phpt
@@ -10,7 +10,7 @@ Redeclare inherited private static property as public.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       public $p = "B::p";
@@ -19,10 +19,10 @@ Redeclare inherited private static property as public.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_privateStatic_publicStatic.phpt b/tests/classes/property_override_privateStatic_publicStatic.phpt
index 5f2b6bf4a89..05c53e7b6e2 100644
--- a/tests/classes/property_override_privateStatic_publicStatic.phpt
+++ b/tests/classes/property_override_privateStatic_publicStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited private static property as public static.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       public static $p = "B::p (static)";
@@ -19,10 +19,10 @@ Redeclare inherited private static property as public static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   B::showA();
   B::showB();
 ?>
diff --git a/tests/classes/property_override_private_private.phpt b/tests/classes/property_override_private_private.phpt
index 2b263eeb673..a0cdd208af5 100644
--- a/tests/classes/property_override_private_private.phpt
+++ b/tests/classes/property_override_private_private.phpt
@@ -10,7 +10,7 @@ Redeclare inherited private property as private.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       private $p = "B::p";
@@ -19,11 +19,11 @@ Redeclare inherited private property as private.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_private_privateStatic.phpt b/tests/classes/property_override_private_privateStatic.phpt
index 606ed21d087..27ba55fad12 100644
--- a/tests/classes/property_override_private_privateStatic.phpt
+++ b/tests/classes/property_override_private_privateStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited private property as private static.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       private static $p = "B::p (static)";
@@ -19,11 +19,11 @@ Redeclare inherited private property as private static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   B::showB();
diff --git a/tests/classes/property_override_private_protected.phpt b/tests/classes/property_override_private_protected.phpt
index b84ed6787e8..70a98078433 100644
--- a/tests/classes/property_override_private_protected.phpt
+++ b/tests/classes/property_override_private_protected.phpt
@@ -10,7 +10,7 @@ Redeclare inherited private property as protected.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       protected $p = "B::p";
@@ -19,11 +19,11 @@ Redeclare inherited private property as protected.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_private_protectedStatic.phpt b/tests/classes/property_override_private_protectedStatic.phpt
index 1bb303dab79..5c670920d36 100644
--- a/tests/classes/property_override_private_protectedStatic.phpt
+++ b/tests/classes/property_override_private_protectedStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited private property as protected static.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       protected static $p = "B::p (static)";
@@ -19,11 +19,11 @@ Redeclare inherited private property as protected static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   B::showB();
diff --git a/tests/classes/property_override_private_public.phpt b/tests/classes/property_override_private_public.phpt
index badbe91d505..06ef7a158bf 100644
--- a/tests/classes/property_override_private_public.phpt
+++ b/tests/classes/property_override_private_public.phpt
@@ -10,7 +10,7 @@ Redeclare inherited private property as public.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       public $p = "B::p";
@@ -19,11 +19,11 @@ Redeclare inherited private property as public.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_private_publicStatic.phpt b/tests/classes/property_override_private_publicStatic.phpt
index 9fc58ece4ac..1910c7e1486 100644
--- a/tests/classes/property_override_private_publicStatic.phpt
+++ b/tests/classes/property_override_private_publicStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited private property as public static.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       public static $p = "B::p (static)";
@@ -19,11 +19,11 @@ Redeclare inherited private property as public static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   B::showB();
diff --git a/tests/classes/property_override_protectedStatic_private.phpt b/tests/classes/property_override_protectedStatic_private.phpt
index 18e9c78a132..712f51cd3ce 100644
--- a/tests/classes/property_override_protectedStatic_private.phpt
+++ b/tests/classes/property_override_protectedStatic_private.phpt
@@ -10,7 +10,7 @@ Redeclare inherited protected static property as private.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       private $p = "B::p";
@@ -19,10 +19,10 @@ Redeclare inherited protected static property as private.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_protectedStatic_privateStatic.phpt b/tests/classes/property_override_protectedStatic_privateStatic.phpt
index 688621077da..72e6e8a0a26 100644
--- a/tests/classes/property_override_protectedStatic_privateStatic.phpt
+++ b/tests/classes/property_override_protectedStatic_privateStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited protected static property as private static.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       private static $p = "B::p (static)";
@@ -19,10 +19,10 @@ Redeclare inherited protected static property as private static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   B::showA();
   B::showB();
 ?>
diff --git a/tests/classes/property_override_protectedStatic_protected.phpt b/tests/classes/property_override_protectedStatic_protected.phpt
index 0e5fdd301c5..b6780586c4c 100644
--- a/tests/classes/property_override_protectedStatic_protected.phpt
+++ b/tests/classes/property_override_protectedStatic_protected.phpt
@@ -10,7 +10,7 @@ Redeclare inherited protected static property as protected.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       protected $p = "B::p";
@@ -19,10 +19,10 @@ Redeclare inherited protected static property as protected.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_protectedStatic_protectedStatic.phpt b/tests/classes/property_override_protectedStatic_protectedStatic.phpt
index 16f11009475..96bebcac3b9 100644
--- a/tests/classes/property_override_protectedStatic_protectedStatic.phpt
+++ b/tests/classes/property_override_protectedStatic_protectedStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited protected static property as protected static.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       protected static $p = "B::p (static)";
@@ -19,10 +19,10 @@ Redeclare inherited protected static property as protected static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   B::showA();
   B::showB();
 ?>
diff --git a/tests/classes/property_override_protectedStatic_public.phpt b/tests/classes/property_override_protectedStatic_public.phpt
index 63033255901..14daa455a6d 100644
--- a/tests/classes/property_override_protectedStatic_public.phpt
+++ b/tests/classes/property_override_protectedStatic_public.phpt
@@ -10,7 +10,7 @@ Redeclare inherited protected static property as public.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       public $p = "B::p";
@@ -19,10 +19,10 @@ Redeclare inherited protected static property as public.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_protectedStatic_publicStatic.phpt b/tests/classes/property_override_protectedStatic_publicStatic.phpt
index e437c5f30f3..91664e59d6a 100644
--- a/tests/classes/property_override_protectedStatic_publicStatic.phpt
+++ b/tests/classes/property_override_protectedStatic_publicStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited protected static property as public static.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       public static $p = "B::p (static)";
@@ -19,10 +19,10 @@ Redeclare inherited protected static property as public static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   B::showA();
   B::showB();
 ?>
diff --git a/tests/classes/property_override_protected_private.phpt b/tests/classes/property_override_protected_private.phpt
index 22cceda1759..9875dd59b80 100644
--- a/tests/classes/property_override_protected_private.phpt
+++ b/tests/classes/property_override_protected_private.phpt
@@ -10,7 +10,7 @@ Redeclare inherited protected property as private (duplicates Zend/tests/errmsg_
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       private $p = "B::p";
@@ -19,11 +19,11 @@ Redeclare inherited protected property as private (duplicates Zend/tests/errmsg_
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_protected_privateStatic.phpt b/tests/classes/property_override_protected_privateStatic.phpt
index fb7102cb3e0..7193178d480 100644
--- a/tests/classes/property_override_protected_privateStatic.phpt
+++ b/tests/classes/property_override_protected_privateStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited protected property as private static.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       private static $p = "B::p (static)";
@@ -19,11 +19,11 @@ Redeclare inherited protected property as private static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   B::showB();
diff --git a/tests/classes/property_override_protected_protected.phpt b/tests/classes/property_override_protected_protected.phpt
index c4b0d438c03..61b42daaf3f 100644
--- a/tests/classes/property_override_protected_protected.phpt
+++ b/tests/classes/property_override_protected_protected.phpt
@@ -10,7 +10,7 @@ Redeclare inherited protected property as protected.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       protected $p = "B::p";
@@ -19,11 +19,11 @@ Redeclare inherited protected property as protected.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_protected_protectedStatic.phpt b/tests/classes/property_override_protected_protectedStatic.phpt
index 1ce4130265f..abac19a7936 100644
--- a/tests/classes/property_override_protected_protectedStatic.phpt
+++ b/tests/classes/property_override_protected_protectedStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited protected property as protected static.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       protected static $p = "B::p (static)";
@@ -19,11 +19,11 @@ Redeclare inherited protected property as protected static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   B::showB();
diff --git a/tests/classes/property_override_protected_public.phpt b/tests/classes/property_override_protected_public.phpt
index 4702f9a0cff..fc6bed46f65 100644
--- a/tests/classes/property_override_protected_public.phpt
+++ b/tests/classes/property_override_protected_public.phpt
@@ -10,7 +10,7 @@ Redeclare inherited protected property as public.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       public $p = "B::p";
@@ -19,11 +19,11 @@ Redeclare inherited protected property as public.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_protected_publicStatic.phpt b/tests/classes/property_override_protected_publicStatic.phpt
index 8efdf5f6fd4..37865cc7d4a 100644
--- a/tests/classes/property_override_protected_publicStatic.phpt
+++ b/tests/classes/property_override_protected_publicStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited protected property as public static.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       public static $p = "B::p (static)";
@@ -19,11 +19,11 @@ Redeclare inherited protected property as public static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   B::showB();
diff --git a/tests/classes/property_override_publicStatic_private.phpt b/tests/classes/property_override_publicStatic_private.phpt
index 7abe92c9ffc..6fd2774c543 100644
--- a/tests/classes/property_override_publicStatic_private.phpt
+++ b/tests/classes/property_override_publicStatic_private.phpt
@@ -10,7 +10,7 @@ Redeclare inherited public static property as private.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       private $p = "B::p";
@@ -19,10 +19,10 @@ Redeclare inherited public static property as private.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_publicStatic_privateStatic.phpt b/tests/classes/property_override_publicStatic_privateStatic.phpt
index d41db6da38b..3635b918dba 100644
--- a/tests/classes/property_override_publicStatic_privateStatic.phpt
+++ b/tests/classes/property_override_publicStatic_privateStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited public static property as private static.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       private static $p = "B::p (static)";
@@ -19,10 +19,10 @@ Redeclare inherited public static property as private static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   B::showA();
   B::showB();
 ?>
diff --git a/tests/classes/property_override_publicStatic_protected.phpt b/tests/classes/property_override_publicStatic_protected.phpt
index 884159f9771..a5eaaea7144 100644
--- a/tests/classes/property_override_publicStatic_protected.phpt
+++ b/tests/classes/property_override_publicStatic_protected.phpt
@@ -10,7 +10,7 @@ Redeclare inherited public static property as protected.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       protected $p = "B::p";
@@ -19,10 +19,10 @@ Redeclare inherited public static property as protected.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_publicStatic_protectedStatic.phpt b/tests/classes/property_override_publicStatic_protectedStatic.phpt
index b022ef8049d..00eb647d5df 100644
--- a/tests/classes/property_override_publicStatic_protectedStatic.phpt
+++ b/tests/classes/property_override_publicStatic_protectedStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited public static property as protected static.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       protected static $p = "B::p (static)";
@@ -19,10 +19,10 @@ Redeclare inherited public static property as protected static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   B::showA();
   B::showB();
 ?>
diff --git a/tests/classes/property_override_publicStatic_public.phpt b/tests/classes/property_override_publicStatic_public.phpt
index d099da04743..f6ea7643c11 100644
--- a/tests/classes/property_override_publicStatic_public.phpt
+++ b/tests/classes/property_override_publicStatic_public.phpt
@@ -10,7 +10,7 @@ Redeclare inherited public static property as public.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       public $p = "B::p";
@@ -19,10 +19,10 @@ Redeclare inherited public static property as public.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_publicStatic_publicStatic.phpt b/tests/classes/property_override_publicStatic_publicStatic.phpt
index 9a868670407..7de7ece151e 100644
--- a/tests/classes/property_override_publicStatic_publicStatic.phpt
+++ b/tests/classes/property_override_publicStatic_publicStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited public static property as public static.
           echo self::$p . "\n";
       }
   }
-  
+
   class B extends A
   {
       public static $p = "B::p (static)";
@@ -19,10 +19,10 @@ Redeclare inherited public static property as public static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   A::showA();
-  
+
   B::showA();
   B::showB();
 ?>
diff --git a/tests/classes/property_override_public_private.phpt b/tests/classes/property_override_public_private.phpt
index c0f37ad95a1..581d663b608 100644
--- a/tests/classes/property_override_public_private.phpt
+++ b/tests/classes/property_override_public_private.phpt
@@ -10,7 +10,7 @@ Redeclare inherited public property as private.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       private $p = "B::p";
@@ -19,11 +19,11 @@ Redeclare inherited public property as private.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_public_privateStatic.phpt b/tests/classes/property_override_public_privateStatic.phpt
index 36223fd345a..bacdc9ffe10 100644
--- a/tests/classes/property_override_public_privateStatic.phpt
+++ b/tests/classes/property_override_public_privateStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited public property as private static.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       private static $p = "B::p (static)";
@@ -19,11 +19,11 @@ Redeclare inherited public property as private static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   B::showB();
diff --git a/tests/classes/property_override_public_protected.phpt b/tests/classes/property_override_public_protected.phpt
index 68fdf8286f2..aa79a53595a 100644
--- a/tests/classes/property_override_public_protected.phpt
+++ b/tests/classes/property_override_public_protected.phpt
@@ -10,7 +10,7 @@ Redeclare inherited public property as protected.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       protected $p = "B::p";
@@ -19,11 +19,11 @@ Redeclare inherited public property as protected.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_public_protectedStatic.phpt b/tests/classes/property_override_public_protectedStatic.phpt
index 77e7ebf1f80..8d78713add2 100644
--- a/tests/classes/property_override_public_protectedStatic.phpt
+++ b/tests/classes/property_override_public_protectedStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited public property as protected static.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       protected static $p = "B::p (static)";
@@ -19,11 +19,11 @@ Redeclare inherited public property as protected static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   B::showB();
diff --git a/tests/classes/property_override_public_public.phpt b/tests/classes/property_override_public_public.phpt
index 893fe5d048f..036f5a197a2 100644
--- a/tests/classes/property_override_public_public.phpt
+++ b/tests/classes/property_override_public_public.phpt
@@ -10,7 +10,7 @@ Redeclare inherited public property as public.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       public $p = "B::p";
@@ -19,11 +19,11 @@ Redeclare inherited public property as public.
           echo $this->p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   $b->showB();
diff --git a/tests/classes/property_override_public_publicStatic.phpt b/tests/classes/property_override_public_publicStatic.phpt
index 725e947a0d8..94feea8a22e 100644
--- a/tests/classes/property_override_public_publicStatic.phpt
+++ b/tests/classes/property_override_public_publicStatic.phpt
@@ -10,7 +10,7 @@ Redeclare inherited public property as public static.
           echo $this->p . "\n";
       }
   }
-  
+
   class B extends A
   {
       public static $p = "B::p (static)";
@@ -19,11 +19,11 @@ Redeclare inherited public property as public static.
           echo self::$p . "\n";
       }
   }
-  
-  
+
+
   $a = new A;
   $a->showA();
-  
+
   $b = new B;
   $b->showA();
   B::showB();
diff --git a/tests/classes/property_recreate_private.phpt b/tests/classes/property_recreate_private.phpt
index b37b974845c..6d25d719120 100644
--- a/tests/classes/property_recreate_private.phpt
+++ b/tests/classes/property_recreate_private.phpt
@@ -5,10 +5,10 @@ Unsetting and recreating private properties.
 class C {
 	private $p = 'test';
 	function unsetPrivate() {
-		unset($this->p);		
+		unset($this->p);
 	}
 	function setPrivate() {
-		$this->p = 'changed';		
+		$this->p = 'changed';
 	}
 }
 
diff --git a/tests/classes/property_recreate_protected.phpt b/tests/classes/property_recreate_protected.phpt
index 3319640e3a2..ddbbb71fc97 100644
--- a/tests/classes/property_recreate_protected.phpt
+++ b/tests/classes/property_recreate_protected.phpt
@@ -5,10 +5,10 @@ Unsetting and recreating protected properties.
 class C {
 	protected $p = 'test';
 	function unsetProtected() {
-		unset($this->p);		
+		unset($this->p);
 	}
 	function setProtected() {
-		$this->p = 'changed';		
+		$this->p = 'changed';
 	}
 }
 
diff --git a/tests/classes/static_mix_1.phpt b/tests/classes/static_mix_1.phpt
index 71db59663f9..70740d23365 100644
--- a/tests/classes/static_mix_1.phpt
+++ b/tests/classes/static_mix_1.phpt
@@ -19,6 +19,6 @@ pass::show();
 fail::show();
 
 echo "Done\n"; // shouldn't be displayed
-?>                                                            
+?>
 --EXPECTF--
 Fatal error: Cannot make static method pass::show() non static in class fail in %s on line %d
diff --git a/tests/classes/static_properties_003.phpt b/tests/classes/static_properties_003.phpt
index 2aab44d5864..89c26d3dd39 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 df297a71b22..68a57a8f89c 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 45095681608..b428b4ff6ed 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 4f4288a63c5..b9423639b0a 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 b43753f1c50..6501689ddb5 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 {
@@ -8,7 +8,7 @@ class C {
 $c = new C;
 
 echo "\n--> Access non-visible static prop like instance prop:\n";
-$c->y =& $ref; 
+$c->y =& $ref;
 ?>
 ==Done==
 --EXPECTF--
diff --git a/tests/classes/static_properties_004.phpt b/tests/classes/static_properties_004.phpt
index b0fc2ccebcd..265553f86d2 100644
--- a/tests/classes/static_properties_004.phpt
+++ b/tests/classes/static_properties_004.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Inherited static properties can be separated from their reference set. 
+Inherited static properties can 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 5551e8ac885..30ea83e2851 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/classes/tostring_002.phpt b/tests/classes/tostring_002.phpt
index eb1bea54475..893611924da 100644
--- a/tests/classes/tostring_002.phpt
+++ b/tests/classes/tostring_002.phpt
@@ -9,7 +9,7 @@ class Test
 	{
 		return "Hello\n";
 	}
-	
+
 	function __destruct()
 	{
 		echo $this;
diff --git a/tests/classes/tostring_003.phpt b/tests/classes/tostring_003.phpt
index 096a7502fe6..e3bc7f8f2c0 100644
--- a/tests/classes/tostring_003.phpt
+++ b/tests/classes/tostring_003.phpt
@@ -10,7 +10,7 @@ class Test
 		throw new Exception("Damn!");
 		return "Hello\n";
 	}
-	
+
 	function __destruct()
 	{
 		echo $this;
diff --git a/tests/classes/tostring_004.phpt b/tests/classes/tostring_004.phpt
index 48e86682359..3c3378f93ee 100644
--- a/tests/classes/tostring_004.phpt
+++ b/tests/classes/tostring_004.phpt
@@ -23,7 +23,7 @@ echo "\n\nObject with bad __toString():\n";
 class badToString {
 	function __toString() {
 		return 0;
-	}	
+	}
 }
 $obj = new badToString;
 echo "Try 1:\n";
diff --git a/tests/classes/type_hinting_004.phpt b/tests/classes/type_hinting_004.phpt
index 95df6264dda..2e4d49070e8 100644
--- a/tests/classes/type_hinting_004.phpt
+++ b/tests/classes/type_hinting_004.phpt
@@ -7,7 +7,7 @@ Ensure type hints are enforced for functions invoked as callbacks.
       echo "$errno: $errstr - $errfile($errline)\n";
       return true;
   }
-  
+
   echo "---> Type hints with callback function:\n";
   class A  {  }
   function f1(A $a)  {
@@ -46,7 +46,7 @@ Ensure type hints are enforced for functions invoked as callbacks.
   } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
-  
+
   echo "\n\n---> Type hints with callback static method:\n";
   class C {
       static function f1(A $a) {
@@ -95,7 +95,7 @@ Ensure type hints are enforced for functions invoked as callbacks.
   } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
-  
+
   echo "\n\n---> Type hints with callback instance method:\n";
   class D {
       function f1(A $a) {
@@ -145,7 +145,7 @@ Ensure type hints are enforced for functions invoked as callbacks.
   } catch (Error $ex) {
     echo "{$ex->getCode()}: {$ex->getMessage()} - {$ex->getFile()}({$ex->getLine()})\n\n";
   }
-  
+
 ?>
 --EXPECTF--
 ---> Type hints with callback function:
diff --git a/tests/classes/unset_properties.phpt b/tests/classes/unset_properties.phpt
index 264e720c9ec..a2a1764ce94 100644
--- a/tests/classes/unset_properties.phpt
+++ b/tests/classes/unset_properties.phpt
@@ -11,29 +11,29 @@ class Test
 	protected $protectedProperty     = 'protectedProperty set';
 
 	private   $privateProperty       = 'privateProperty set';
-	
+
 	public function __get($name)
 	{
 		return '__get "' . $name . '"';
 	}
-	
+
 	public function __set($name, $value)
 	{
 		$this->$name = $value;
 		echo '__set "' . $name . '" to "' . $value . '"';
 	}
-	
+
 	public function __isset($name)
 	{
 		echo '__isset "' . $name . '"';
 		return isset($this->$name);
 	}
-	
+
 	public function getPublicProperty()
 	{
 		return $this->publicProperty;
 	}
-	
+
 	public function setPublicProperty($publicProperty)
 	{
 		$this->publicProperty = $publicProperty;
diff --git a/tests/func/002.phpt b/tests/func/002.phpt
index cb35f920436..4319715e08c 100644
--- a/tests/func/002.phpt
+++ b/tests/func/002.phpt
@@ -1,14 +1,14 @@
 --TEST--
 Static variables in functions
 --FILE--
-<?php 
+<?php
 function blah()
 {
   static $hey=0,$yo=0;
 
   echo "hey=".$hey++.", ",$yo--."\n";
 }
-    
+
 blah();
 blah();
 blah();
diff --git a/tests/func/003.phpt b/tests/func/003.phpt
index d6037840763..1135009e217 100644
--- a/tests/func/003.phpt
+++ b/tests/func/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 General function test
 --FILE--
-<?php 
+<?php
 
 function a()
 {
diff --git a/tests/func/004.phpt b/tests/func/004.phpt
index 1434297b0de..79c891a2234 100644
--- a/tests/func/004.phpt
+++ b/tests/func/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 General function test
 --FILE--
-<?php 
+<?php
 
 echo "Before function declaration...\n";
 
diff --git a/tests/func/005.phpt b/tests/func/005.phpt
index c4215feb498..e19eda496b2 100644
--- a/tests/func/005.phpt
+++ b/tests/func/005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing register_shutdown_function()
 --FILE--
-<?php 
+<?php
 
 function foo()
 {
diff --git a/tests/func/005a.phpt b/tests/func/005a.phpt
index 3c2bcb16650..8cd0d211abf 100644
--- a/tests/func/005a.phpt
+++ b/tests/func/005a.phpt
@@ -8,7 +8,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 <?php
 
 ini_set('display_errors', 0);
-    
+
 echo "Start\n";
 
 function boo()
@@ -19,7 +19,7 @@ function boo()
 register_shutdown_function("boo");
 
 /* not necessary, just to show the error sooner */
-set_time_limit(1); 
+set_time_limit(1);
 
 /* infinite loop to simulate long processing */
 for (;;) {}
diff --git a/tests/func/007.phpt b/tests/func/007.phpt
index 73aae2e6492..6a18d444eea 100644
--- a/tests/func/007.phpt
+++ b/tests/func/007.phpt
@@ -3,11 +3,11 @@ INI functions test
 --FILE--
 <?php
 
-$ini1 =  ini_get('include_path'); 
+$ini1 =  ini_get('include_path');
 ini_set('include_path','ini_set_works');
 echo ini_get('include_path')."\n";
 ini_restore('include_path');
-$ini2 =  ini_get('include_path'); 
+$ini2 =  ini_get('include_path');
 
 if ($ini1 !== $ini2) {
         echo "ini_restore() does not work.\n";
diff --git a/tests/lang/002.phpt b/tests/lang/002.phpt
index ec14d01c3f7..251f90b0a2e 100644
--- a/tests/lang/002.phpt
+++ b/tests/lang/002.phpt
@@ -2,7 +2,7 @@
 Simple While Loop Test
 --FILE--
 <?php
-$a=1; 
+$a=1;
 while ($a<10) {
 	echo $a;
 	$a++;
diff --git a/tests/lang/003.phpt b/tests/lang/003.phpt
index 7049db90470..a580fc60cd5 100644
--- a/tests/lang/003.phpt
+++ b/tests/lang/003.phpt
@@ -2,10 +2,10 @@
 Simple Switch Test
 --FILE--
 <?php
-$a=1; 
+$a=1;
 switch($a) {
 	case 0:
-		echo "bad";	
+		echo "bad";
 		break;
 	case 1:
 		echo "good";
diff --git a/tests/lang/004.phpt b/tests/lang/004.phpt
index be8ebf41552..9ca3492cde7 100644
--- a/tests/lang/004.phpt
+++ b/tests/lang/004.phpt
@@ -2,12 +2,12 @@
 Simple If/Else Test
 --FILE--
 <?php
-$a=1; 
+$a=1;
 if($a==0) {
 	echo "bad";
 } else {
 	echo "good";
 }
-?>	
+?>
 --EXPECT--
 good
diff --git a/tests/lang/005.phpt b/tests/lang/005.phpt
index 404a7cbbf6d..fe3633b58b7 100644
--- a/tests/lang/005.phpt
+++ b/tests/lang/005.phpt
@@ -2,7 +2,7 @@
 Simple If/ElseIf/Else Test
 --FILE--
 <?php
-$a=1; 
+$a=1;
 
 if($a==0) {
 	echo "bad";
@@ -11,6 +11,6 @@ if($a==0) {
 } else {
 	echo "good";
 }
-?>	
+?>
 --EXPECT--
 good
diff --git a/tests/lang/006.phpt b/tests/lang/006.phpt
index 2a2db013aba..5056b8a4eef 100644
--- a/tests/lang/006.phpt
+++ b/tests/lang/006.phpt
@@ -18,6 +18,6 @@ if($a==0) {
 		echo "bad";
 	}
 }
-?>	
+?>
 --EXPECT--
 good
diff --git a/tests/lang/007.phpt b/tests/lang/007.phpt
index 4576d4efa53..946ae9babb5 100644
--- a/tests/lang/007.phpt
+++ b/tests/lang/007.phpt
@@ -17,9 +17,9 @@ function Test()
 	echo "$a $c ";
 }
 
-Test();	
+Test();
 echo "$a $b $c ";
-Test();	
+Test();
 echo "$a $b $c ";
 Test();
 ?>
diff --git a/tests/lang/008.phpt b/tests/lang/008.phpt
index d335e6f1352..8633b6049aa 100644
--- a/tests/lang/008.phpt
+++ b/tests/lang/008.phpt
@@ -6,7 +6,7 @@ Testing recursive function
 function Test()
 {
 	static $a=1;
-	echo "$a ";	
+	echo "$a ";
 	$a++;
 	if($a<10): Test(); endif;
 }
diff --git a/tests/lang/009.phpt b/tests/lang/009.phpt
index ea2aa9294dd..8621a73e501 100644
--- a/tests/lang/009.phpt
+++ b/tests/lang/009.phpt
@@ -3,7 +3,7 @@ Testing function parameter passing
 --FILE--
 <?php
 function test ($a,$b) {
-	echo $a+$b;	
+	echo $a+$b;
 }
 test(1,2);
 ?>
diff --git a/tests/lang/011.phpt b/tests/lang/011.phpt
index 771ef7c129a..b7946b74607 100644
--- a/tests/lang/011.phpt
+++ b/tests/lang/011.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing nested functions
 --FILE--
-<?php 
+<?php
 function F()
 {
 	$a = "Hello ";
@@ -11,7 +11,7 @@ function F()
 function G()
 {
   static $myvar = 4;
-  
+
   echo "$myvar ";
   echo F();
   echo "$myvar";
diff --git a/tests/lang/012.phpt b/tests/lang/012.phpt
index 117137a29b5..203d7cebe38 100644
--- a/tests/lang/012.phpt
+++ b/tests/lang/012.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Testing stack after early function return
 --FILE--
-<?php 
-function F () { 
+<?php
+function F () {
 	if(1) {
 		return("Hello");
 	}
diff --git a/tests/lang/013.phpt b/tests/lang/013.phpt
index be84cdcb8fa..c25cf41abed 100644
--- a/tests/lang/013.phpt
+++ b/tests/lang/013.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing eval function
 --FILE--
-<?php 
+<?php
 error_reporting(0);
 $a="echo \"Hello\";";
 eval($a);
diff --git a/tests/lang/014.phpt b/tests/lang/014.phpt
index f0033b2f77a..fe6f86e22a3 100644
--- a/tests/lang/014.phpt
+++ b/tests/lang/014.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Testing eval function inside user-defined function
 --FILE--
-<?php 
-function F ($a) { 
+<?php
+function F ($a) {
 	eval($a);
 }
 
diff --git a/tests/lang/016.phpt b/tests/lang/016.phpt
index dbaa908b81a..30c36b3d2a3 100644
--- a/tests/lang/016.phpt
+++ b/tests/lang/016.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing user-defined function in included file
 --FILE--
-<?php 
+<?php
 include "016.inc";
 MyFunc("Hello");
 ?>
diff --git a/tests/lang/018.phpt b/tests/lang/018.phpt
index 638b131c2d8..75602192918 100644
--- a/tests/lang/018.phpt
+++ b/tests/lang/018.phpt
@@ -1,7 +1,7 @@
 --TEST--
 eval() test
 --FILE--
-<?php 
+<?php
 
 error_reporting(0);
 
diff --git a/tests/lang/019.phpt b/tests/lang/019.phpt
index c9b5e5f3b58..313da0cbd86 100644
--- a/tests/lang/019.phpt
+++ b/tests/lang/019.phpt
@@ -1,7 +1,7 @@
 --TEST--
 eval() test
 --FILE--
-<?php 
+<?php
 
 eval("function test() { echo \"hey, this is a function inside an eval()!\\n\"; }");
 
diff --git a/tests/lang/020.phpt b/tests/lang/020.phpt
index 46a2a2c1c06..9428ec5e6fc 100644
--- a/tests/lang/020.phpt
+++ b/tests/lang/020.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Switch test 1
 --FILE--
-<?php 
+<?php
 
 $i="abc";
 
diff --git a/tests/lang/021.phpt b/tests/lang/021.phpt
index aff45b6be39..438f873da55 100644
--- a/tests/lang/021.phpt
+++ b/tests/lang/021.phpt
@@ -1,12 +1,12 @@
 --TEST--
 Switch test 2
 --FILE--
-<?php 
+<?php
 
 for ($i=0; $i<=5; $i++)
 {
   echo "i=$i\n";
-  
+
   switch($i) {
     case 0:
       echo "In branch 0\n";
diff --git a/tests/lang/022.phpt b/tests/lang/022.phpt
index dddc6c29553..9660530bc76 100644
--- a/tests/lang/022.phpt
+++ b/tests/lang/022.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Switch test 3
 --FILE--
-<?php 
+<?php
 
 function switchtest ($i, $j)
 {
@@ -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/025.phpt b/tests/lang/025.phpt
index 382960f6281..13c02d31d4f 100644
--- a/tests/lang/025.phpt
+++ b/tests/lang/025.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Mean recursion test
 --FILE--
-<?php 
+<?php
 function RekTest ($nr) {
 	echo " $nr ";
 	$j=$nr+1;
diff --git a/tests/lang/027.phpt b/tests/lang/027.phpt
index d3eb74b22ff..9c826cfe93b 100644
--- a/tests/lang/027.phpt
+++ b/tests/lang/027.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Testing do-while loop
 --FILE--
-<?php 
+<?php
 $i=3;
 do {
 	echo $i;
diff --git a/tests/lang/028.phpt b/tests/lang/028.phpt
index 2c51b79cb25..0c2f2f07567 100644
--- a/tests/lang/028.phpt
+++ b/tests/lang/028.phpt
@@ -19,7 +19,7 @@ function still_working()
 function dafna()
 {
 	static $foo = 0;
-	
+
 	print "Dafna!\n";
 	print call_user_func("still_working")."\n";
 	$foo++;
diff --git a/tests/lang/034.phpt b/tests/lang/034.phpt
index 5d2c6109262..38ecc0b4515 100644
--- a/tests/lang/034.phpt
+++ b/tests/lang/034.phpt
@@ -9,7 +9,7 @@ if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.I
 }
 ?>
 --FILE--
-<?php 
+<?php
 # activate the german locale
 setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1");
 
diff --git a/tests/lang/035.phpt b/tests/lang/035.phpt
index 63f0385e8cf..bc49af99a55 100644
--- a/tests/lang/035.phpt
+++ b/tests/lang/035.phpt
@@ -4,18 +4,18 @@ ZE2: set_exception_handler()
 <?php
 class MyException extends Exception {
 	function __construct($_error) {
-		$this->error = $_error;	
+		$this->error = $_error;
 	}
-	
+
 	function getException()
 	{
-		return $this->error;	
+		return $this->error;
 	}
 }
 
 function ThrowException()
 {
-	throw new MyException("'This is an exception!'");	
+	throw new MyException("'This is an exception!'");
 }
 
 
@@ -26,7 +26,7 @@ try {
 }
 
 try {
-	ThrowException();	
+	ThrowException();
 } catch (MyException $exception) {
 	print "There was an exception: " . $exception->getException();
 	print "\n";
diff --git a/tests/lang/bug18872.phpt b/tests/lang/bug18872.phpt
index 2e3dc22c582..5e5333879d7 100644
--- a/tests/lang/bug18872.phpt
+++ b/tests/lang/bug18872.phpt
@@ -1,18 +1,18 @@
 --TEST--
 Bug #18872 (class constant used as default parameter)
 --FILE--
-<?php   
-class FooBar {   
-	const BIFF = 3;   
-}   
-   
-function foo($biff = FooBar::BIFF) {   
-	echo $biff . "\n";   
-}   
-   
-foo();   
-foo();   
-?>   
+<?php
+class FooBar {
+	const BIFF = 3;
+}
+
+function foo($biff = FooBar::BIFF) {
+	echo $biff . "\n";
+}
+
+foo();
+foo();
+?>
 --EXPECT--
 3
 3
diff --git a/tests/lang/bug20175.phpt b/tests/lang/bug20175.phpt
index a42e35c41eb..0d040c82d91 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
@@ -94,7 +94,7 @@ function wow_static() {
 $oop_global = 0;
 class oop_class {
 	var $oop_name;
-	
+
 	function __construct() {
 		global $oop_global;
 		echo "oop_class()\n";
@@ -104,11 +104,11 @@ class oop_class {
 
 class oop_test {
 	static $oop_value;
-	
+
 	function __construct() {
 		echo "oop_test()\n";
 	}
-	
+
 	function oop_static() {
 		echo "oop_static()\n";
 		if (!isset(self::$oop_value)) {
diff --git a/tests/lang/bug21094.phpt b/tests/lang/bug21094.phpt
index 266a1d6c8fa..ac3ae2a2c72 100644
--- a/tests/lang/bug21094.phpt
+++ b/tests/lang/bug21094.phpt
@@ -6,7 +6,7 @@ class test {
 	function hdlr($errno, $errstr, $errfile, $errline) {
 		printf("[%d] errstr: %s, errfile: %s, errline: %d\n", $errno, $errstr, $errfile, $errline, $errstr);
 	}
-}	
+}
 
 set_error_handler(array(new test(), "hdlr"));
 
diff --git a/tests/lang/bug21849.phpt b/tests/lang/bug21849.phpt
index 2ce99769d9b..def754a3a6c 100644
--- a/tests/lang/bug21849.phpt
+++ b/tests/lang/bug21849.phpt
@@ -4,7 +4,7 @@ Bug #21849 (self::constant doesn't work as method's default parameter)
 <?php
 class foo {
 	const bar = "fubar\n";
-	
+
 	function __construct($arg = self::bar) {
 		echo $arg;
 	}
diff --git a/tests/lang/bug22510.phpt b/tests/lang/bug22510.phpt
index c625ea7dddc..dbf7756daa8 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";
@@ -66,7 +66,7 @@ function ok1(&$bar) {
 
 function ok2(&$bar) {
 	print __FUNCTION__."\n";
-	@$a = $a; 
+	@$a = $a;
 	$bar->run2();
 }
 
diff --git a/tests/lang/bug23384.phpt b/tests/lang/bug23384.phpt
index 2c41217b909..2dc3f2308bf 100644
--- a/tests/lang/bug23384.phpt
+++ b/tests/lang/bug23384.phpt
@@ -15,7 +15,7 @@ class Foo {
     }
 }
 
-Foo::test();   
+Foo::test();
 echo Foo::HUN."\n";
 ?>
 --EXPECTF--
diff --git a/tests/lang/bug24396.phpt b/tests/lang/bug24396.phpt
index 80862191dee..bb5c83860a2 100644
--- a/tests/lang/bug24396.phpt
+++ b/tests/lang/bug24396.phpt
@@ -7,10 +7,10 @@ $arr = array('a' => 1, 'b' => 2, 'c' => 3);
 
 foreach($arr as $k=>$v)  {
     global $$k; // comment this out and it works in PHP 7 too..
-               
+
     echo "($k => $v)\n";
-                       
-    $$k = $v;          
+
+    $$k = $v;
 }
 ?>
 --EXPECT--
diff --git a/tests/lang/bug24908.phpt b/tests/lang/bug24908.phpt
index 30056abf3cb..910b715a055 100644
--- a/tests/lang/bug24908.phpt
+++ b/tests/lang/bug24908.phpt
@@ -4,7 +4,7 @@ Bug #24908 (super-globals can not be used in __destruct())
 variables_order=GPS
 --FILE--
 <?php
-class test { 
+class test {
 	function __construct() {
 		if (count($_SERVER)) echo "O";
 	}
diff --git a/tests/lang/bug24926.phpt b/tests/lang/bug24926.phpt
index e7fd86ce760..f73d265f388 100644
--- a/tests/lang/bug24926.phpt
+++ b/tests/lang/bug24926.phpt
@@ -8,15 +8,15 @@ error_reporting (E_ALL);
 class foo {
 
     public $functions = array();
-    
+
     function __construct()
     {
         $function = create_function('', 'return "FOO\n";');
         print($function());
-        
+
         $this->functions['test'] = $function;
         print($this->functions['test']());    // werkt al niet meer
-    
+
     }
 }
 
diff --git a/tests/lang/bug24951.phpt b/tests/lang/bug24951.phpt
index aa48ab29368..5538e138153 100644
--- a/tests/lang/bug24951.phpt
+++ b/tests/lang/bug24951.phpt
@@ -31,7 +31,7 @@ function t3()
 }
 
 t1(); echo "\n";
-t2(); echo "\n"; 
+t2(); echo "\n";
 t3(); echo "\n";
 ?>
 --EXPECT--
diff --git a/tests/lang/bug25652.phpt b/tests/lang/bug25652.phpt
index 09cfc181977..b0125de0850 100644
--- a/tests/lang/bug25652.phpt
+++ b/tests/lang/bug25652.phpt
@@ -6,17 +6,17 @@ Bug #25652 (Calling Global functions dynamically fails from Class scope)
 	function testfunc ($var) {
 		echo "testfunc $var\n";
 	}
-	
+
 	class foo {
 		public $arr = array('testfunc');
 		function bar () {
 			$this->arr[0]('testvalue');
 		}
 	}
-	
+
 	$a = new foo ();
 	$a->bar ();
-	
+
 ?>
 --EXPECT--
 testfunc testvalue
diff --git a/tests/lang/bug25922.phpt b/tests/lang/bug25922.phpt
index bb030c9df83..41fb135e03b 100644
--- a/tests/lang/bug25922.phpt
+++ b/tests/lang/bug25922.phpt
@@ -9,7 +9,7 @@ function my_error_handler($error, $errmsg='', $errfile='', $errline=0, $errconte
 	echo "$errmsg\n";
 	$errcontext = '';
 }
-                                                                                        
+
 set_error_handler('my_error_handler');
 
 function test()
diff --git a/tests/lang/bug26696.phpt b/tests/lang/bug26696.phpt
index dae182d3073..a73694c95a5 100644
--- a/tests/lang/bug26696.phpt
+++ b/tests/lang/bug26696.phpt
@@ -14,7 +14,7 @@ for ($i = 0; $i < $len; $i++) {
 }
 
 $str = '*';
-switch ($str[0]) { 
+switch ($str[0]) {
 	case '*';
 		echo "OK\n";
 		break;
diff --git a/tests/lang/bug27535.phpt b/tests/lang/bug27535.phpt
index 29fd0334692..604b2d3d04b 100644
--- a/tests/lang/bug27535.phpt
+++ b/tests/lang/bug27535.phpt
@@ -2,7 +2,7 @@
 Bug #27535 (Objects pointing to each other cause Apache to crash)
 --FILE--
 <?php
-                                                                                                                                
+
 class Class1
 {
 	public $_Class2_obj;
diff --git a/tests/lang/bug29893.phpt b/tests/lang/bug29893.phpt
index d320de0ee72..25679893d28 100644
--- a/tests/lang/bug29893.phpt
+++ b/tests/lang/bug29893.phpt
@@ -3,7 +3,7 @@ Bug #29893 (segfault when using array as index)
 --FILE--
 <?php
 $base = 50;
-$base[$base] -= 0; 
+$base[$base] -= 0;
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/tests/lang/bug29944.phpt b/tests/lang/bug29944.phpt
index 7882936f08b..80a76f132ec 100644
--- a/tests/lang/bug29944.phpt
+++ b/tests/lang/bug29944.phpt
@@ -11,7 +11,7 @@ switch ($a) {
 			return false;
 		}
 		echo foo($b);
-}		
+}
 ?>
 
 ===DONE===
diff --git a/tests/lang/bug30578.phpt b/tests/lang/bug30578.phpt
index d8a8d2e54f8..dc9eeeaae4c 100644
--- a/tests/lang/bug30578.phpt
+++ b/tests/lang/bug30578.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #30578 (Output buffers flushed before calling __desctruct functions) 
+Bug #30578 (Output buffers flushed before calling __desctruct functions)
 --FILE--
 <?php
 
diff --git a/tests/lang/bug30638.phpt b/tests/lang/bug30638.phpt
index 30b70f30fb4..24e6609498c 100644
--- a/tests/lang/bug30638.phpt
+++ b/tests/lang/bug30638.phpt
@@ -9,7 +9,7 @@ if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.I
 }
 ?>
 --FILE--
-<?php 
+<?php
 # activate the german locale
 setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1");
 
diff --git a/tests/lang/bug30862.phpt b/tests/lang/bug30862.phpt
index 12c95d57e87..7f2d3ed4aea 100644
--- a/tests/lang/bug30862.phpt
+++ b/tests/lang/bug30862.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #30862 (Static array with boolean indexes)
 --FILE--
-<?php 
+<?php
 class T {
 	static $a = array(false=>"false", true=>"true");
 }
diff --git a/tests/lang/bug32828.phpt b/tests/lang/bug32828.phpt
index 4abf21604f5..b5772afc529 100644
--- a/tests/lang/bug32828.phpt
+++ b/tests/lang/bug32828.phpt
@@ -12,7 +12,7 @@ ob_start('output_handler');
 
 ob_end_clean();
 ?>
---EXPECTF--	
+--EXPECTF--
 Fatal error: Uncaught Exception in %s:%d
 Stack trace:
 #0 [internal function]: output_handler('', %d)
diff --git a/tests/lang/bug32924.phpt b/tests/lang/bug32924.phpt
index d72b0eaa2ec..4c6dab0a16f 100644
--- a/tests/lang/bug32924.phpt
+++ b/tests/lang/bug32924.phpt
@@ -4,7 +4,7 @@ Bug #32924 (prepend does not add file to included files)
 include_path={PWD}
 auto_prepend_file=inc.inc
 --FILE--
-<?php 
+<?php
 include_once(dirname(__FILE__).'/inc.inc');
 require_once(dirname(__FILE__).'/inc.inc');
 ?>
diff --git a/tests/lang/bug44827.phpt b/tests/lang/bug44827.phpt
index 031045b0837..90bf1d8893a 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/bug45392.phpt b/tests/lang/bug45392.phpt
index 78876c7c803..a9bdd40af2b 100644
--- a/tests/lang/bug45392.phpt
+++ b/tests/lang/bug45392.phpt
@@ -6,7 +6,7 @@ display_errors=stderr
 <?php
 if (getenv("USE_ZEND_ALLOC") === "0") {
     die("skip Zend MM disabled");
-} 
+}
 --FILE--
 <?php
 echo __LINE__ . "\n";
diff --git a/tests/lang/compare_objects_basic1.phpt b/tests/lang/compare_objects_basic1.phpt
index 07ebd7cc69d..e54fb2173e0 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
@@ -31,10 +31,10 @@ $obj3 = new class3();
 $obj4 = new class4();
 $obj5 = new class5();
 
-echo "\n-- The following compare should return TRUE --\n"; 
+echo "\n-- The following compare should return TRUE --\n";
 var_dump($obj1 == $obj1);
 
-echo "\n-- All the following compares should return FALSE --\n"; 
+echo "\n-- All the following compares should return FALSE --\n";
 var_dump($obj1 == $obj2);
 var_dump($obj1 == $obj3);
 var_dump($obj1 == $obj4);
diff --git a/tests/lang/compare_objects_basic2.phpt b/tests/lang/compare_objects_basic2.phpt
index 7e4786cd289..5c398227353 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 
+<?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_001.phpt b/tests/lang/engine_assignExecutionOrder_001.phpt
index f4d2bbfee99..78dc31e0083 100644
--- a/tests/lang/engine_assignExecutionOrder_001.phpt
+++ b/tests/lang/engine_assignExecutionOrder_001.phpt
@@ -14,7 +14,7 @@ function g() {
 }
 
 
-echo "\n\nOrder with local assignment:\n"; 
+echo "\n\nOrder with local assignment:\n";
 ${f()} = g();
 var_dump($name);
 
@@ -42,7 +42,7 @@ var_dump($oc);
 
 class C {
 	public static $name = "original";
-	public static $a = array(); 
+	public static $a = array();
 	public static $string = "hello";
 }
 echo "\n\nOrder with static property assignment:\n";
@@ -55,7 +55,7 @@ var_dump(C::$a);
 
 echo "\n\nOrder with indexed string assignment:\n";
 $string = "hello";
-function getOffset() { 
+function getOffset() {
 	echo "in getOffset()\n";
 	return 0;
 }
diff --git a/tests/lang/engine_assignExecutionOrder_002.phpt b/tests/lang/engine_assignExecutionOrder_002.phpt
index c090a452c37..dbb0c0aba4d 100644
--- a/tests/lang/engine_assignExecutionOrder_002.phpt
+++ b/tests/lang/engine_assignExecutionOrder_002.phpt
@@ -28,7 +28,7 @@ $g3 = array(30,30);
 $g = array($g1,$g2,$g3);
 list($e[$f++],$e[$f++]) = $g[2];
 // expect 30,30
-var_dump($e); 
+var_dump($e);
 
 
 $i1 = array(1,2);
@@ -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_003.phpt b/tests/lang/engine_assignExecutionOrder_003.phpt
index 448b46e8ecd..6a9c7f38e34 100644
--- a/tests/lang/engine_assignExecutionOrder_003.phpt
+++ b/tests/lang/engine_assignExecutionOrder_003.phpt
@@ -5,7 +5,7 @@ Evaluation order during assignments.
 $b = "bb";
 $a = "aa";
 
-function foo() 
+function foo()
 {
 echo "Bad call\n";
 }
@@ -75,7 +75,7 @@ $x2 = array(array(2),2);
 $x3 = array(array(3),3);
 $bx = array(10);
 
-$x[mod($x1)][mod($x2)] = $bx[mod($x3)];  
+$x[mod($x1)][mod($x2)] = $bx[mod($x3)];
 
 // expecting 10,3
 
diff --git a/tests/lang/engine_assignExecutionOrder_007.phpt b/tests/lang/engine_assignExecutionOrder_007.phpt
index 51966e01f86..c79d34424d1 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/engine_assignExecutionOrder_009.phpt b/tests/lang/engine_assignExecutionOrder_009.phpt
index e1d5b71c69c..9a9b904d423 100644
--- a/tests/lang/engine_assignExecutionOrder_009.phpt
+++ b/tests/lang/engine_assignExecutionOrder_009.phpt
@@ -8,18 +8,18 @@ function f($x) {
 }
 
 echo "Function call args:\n";
-var_dump(f($i=0) < f(++$i)); 
+var_dump(f($i=0) < f(++$i));
 var_dump(f($i=0) <= f(++$i));
-var_dump(f($i=0) > f(++$i)); 
+var_dump(f($i=0) > f(++$i));
 var_dump(f($i=0) >= f(++$i));
 
 echo "\nArray indices:\n";
 $a[1][2] = 0;
 $a[3][4] = 1;
 $i=0;
-var_dump($a[$i=1][++$i] < $a[++$i][++$i]); 
+var_dump($a[$i=1][++$i] < $a[++$i][++$i]);
 var_dump($a[$i=1][++$i] <= $a[++$i][++$i]);
-var_dump($a[$i=1][++$i] > $a[++$i][++$i]); 
+var_dump($a[$i=1][++$i] > $a[++$i][++$i]);
 var_dump($a[$i=1][++$i] >= $a[++$i][++$i]);
 ?>
 --EXPECTF--
diff --git a/tests/lang/error_2_exception_001.phpt b/tests/lang/error_2_exception_001.phpt
index e084b92dd76..6ef3a526763 100644
--- a/tests/lang/error_2_exception_001.phpt
+++ b/tests/lang/error_2_exception_001.phpt
@@ -12,7 +12,7 @@ class MyException extends Exception {
 	function getErrno() {
 		return $this->errno;
 	}
-    
+
 	function getErrmsg() {
 		return $this->errmsg;
 	}
diff --git a/tests/lang/execution_order.phpt b/tests/lang/execution_order.phpt
index ca3feb32cb7..27424c41b91 100644
--- a/tests/lang/execution_order.phpt
+++ b/tests/lang/execution_order.phpt
@@ -169,7 +169,7 @@ echo "\r\n";
 echo "24)";
 echo ($c->val=300) + $c->val;
 echo "\r\n";
- 
+
 ?>
 --EXPECT--
 1)goodgood
diff --git a/tests/lang/foreachLoop.002.phpt b/tests/lang/foreachLoop.002.phpt
index 31492953a46..5b92736e5dc 100644
--- a/tests/lang/foreachLoop.002.phpt
+++ b/tests/lang/foreachLoop.002.phpt
@@ -35,7 +35,7 @@ foreach ($a as $v) {
 	//avoid infinite loop if test is failing
     if ($counter++>10) {
     	echo "Loop detected\n";
-    	break;    	
+    	break;
     }
 }
 var_dump($a);
@@ -49,8 +49,8 @@ foreach ($a as &$v) {
 	//avoid infinite loop if test is failing
     if ($counter++>10) {
     	echo "Loop detected\n";
-    	break;    	
-    }	
+    	break;
+    }
 }
 var_dump($a);
 
@@ -58,7 +58,7 @@ echo "\nPopping elements off an unreferenced array.\n";
 $a = array("original.1","original.2","original.3");
 foreach ($a as $v) {
 	array_pop($a);
-	var_dump($v);	
+	var_dump($v);
 }
 var_dump($a);
 
diff --git a/tests/lang/foreachLoop.009.phpt b/tests/lang/foreachLoop.009.phpt
index 90aa33953ba..37b01633584 100644
--- a/tests/lang/foreachLoop.009.phpt
+++ b/tests/lang/foreachLoop.009.phpt
@@ -28,7 +28,7 @@ $count=0;
 foreach ($refedArray as $k=>$v3) {
 	array_push($refedArray, "new.$k");
 	echo "key: $k; value: $v3\n";
-	
+
 	if ($count++>5) {
 		echo "Loop detected, as expected.\n";
 		break;
@@ -42,7 +42,7 @@ $count=0;
 foreach ($refedArray as $k=>&$v4) {
 	array_push($refedArray, "new.$k");
 	echo "key: $k; value: $v4\n";
-	
+
 	if ($count++>5) {
 		echo "Loop detected, as expected.\n";
 		break;
diff --git a/tests/lang/foreachLoop.010.phpt b/tests/lang/foreachLoop.010.phpt
index c021a80c395..b1eb231bfa1 100644
--- a/tests/lang/foreachLoop.010.phpt
+++ b/tests/lang/foreachLoop.010.phpt
@@ -7,26 +7,26 @@ 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) {
 	array_push($a, 'new');
 	var_dump($v);
-	
+
 	if (++$i>10) {
 		echo "Infinite loop detected\n";
 		break;
diff --git a/tests/lang/foreachLoop.011.phpt b/tests/lang/foreachLoop.011.phpt
index 6ceebd8a50f..ab0568463c0 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 
+--TEST--
+Changing from an interable type to a non iterable type during the iteration
 --FILE--
 <?php
 echo "\nChange from array to non iterable:\n";
@@ -17,7 +17,7 @@ $a->b=2;
 $b=&$a;
 foreach ($a as $v) {
 	var_dump($v);
-	$b='x';	
+	$b='x';
 }
 
 ?>
diff --git a/tests/lang/foreachLoop.012.phpt b/tests/lang/foreachLoop.012.phpt
index 3652a71aed6..0aa22aea579 100644
--- a/tests/lang/foreachLoop.012.phpt
+++ b/tests/lang/foreachLoop.012.phpt
@@ -12,11 +12,11 @@ function withRefValue($elements, $transform) {
 		$a[] = "v.$i";
 	}
 	$counter=0;
-	
+
 	echo "--> State of array before loop:\n";
 	var_dump($a);
-	
-	echo "--> Do loop:\n";	
+
+	echo "--> Do loop:\n";
 	foreach ($a as $k=>$v) {
 		echo "     iteration $counter:  \$k=$k; \$v=$v\n";
 		eval($transform);
@@ -26,7 +26,7 @@ function withRefValue($elements, $transform) {
 			break;
 		}
 	}
-	
+
 	echo "--> State of array after loop:\n";
 	var_dump($a);
 }
diff --git a/tests/lang/foreachLoop.013.phpt b/tests/lang/foreachLoop.013.phpt
index ba1bc89628d..6fe74b44bf5 100644
--- a/tests/lang/foreachLoop.013.phpt
+++ b/tests/lang/foreachLoop.013.phpt
@@ -12,11 +12,11 @@ function withRefValue($elements, $transform) {
 		$a[] = "v.$i";
 	}
 	$counter=0;
-	
+
 	echo "--> State of array before loop:\n";
 	var_dump($a);
-	
-	echo "--> Do loop:\n";	
+
+	echo "--> Do loop:\n";
 	foreach ($a as $k=>&$v) {
 		echo "     iteration $counter:  \$k=$k; \$v=$v\n";
 		eval($transform);
@@ -26,7 +26,7 @@ function withRefValue($elements, $transform) {
 			break;
 		}
 	}
-	
+
 	echo "--> State of array after loop:\n";
 	var_dump($a);
 }
diff --git a/tests/lang/foreachLoop.014.phpt b/tests/lang/foreachLoop.014.phpt
index 770ee9f92e0..8356b0d2283 100644
--- a/tests/lang/foreachLoop.014.phpt
+++ b/tests/lang/foreachLoop.014.phpt
@@ -12,13 +12,13 @@ function withRefValue($elements, $transform) {
 		$a[] = "v.$i";
 	}
 	$counter=0;
-	
+
 	$ref = &$a;
-	
+
 	echo "--> State of referenced array before loop:\n";
 	var_dump($a);
-	
-	echo "--> Do loop:\n";	
+
+	echo "--> Do loop:\n";
 	foreach ($a as $k=>$v) {
 		echo "     iteration $counter:  \$k=$k; \$v=$v\n";
 		eval($transform);
@@ -28,7 +28,7 @@ function withRefValue($elements, $transform) {
 			break;
 		}
 	}
-	
+
 	echo "--> State of array after loop:\n";
 	var_dump($a);
 }
diff --git a/tests/lang/foreachLoop.015.phpt b/tests/lang/foreachLoop.015.phpt
index f7f53893957..6b61220bf0e 100644
--- a/tests/lang/foreachLoop.015.phpt
+++ b/tests/lang/foreachLoop.015.phpt
@@ -12,13 +12,13 @@ function withRefValue($elements, $transform) {
 		$a[] = "v.$i";
 	}
 	$counter=0;
-	
+
 	$ref = &$a;
-	
+
 	echo "--> State of referenced array before loop:\n";
 	var_dump($a);
-	
-	echo "--> Do loop:\n";	
+
+	echo "--> Do loop:\n";
 	foreach ($a as $k=>&$v) {
 		echo "     iteration $counter:  \$k=$k; \$v=$v\n";
 		eval($transform);
@@ -28,7 +28,7 @@ function withRefValue($elements, $transform) {
 			break;
 		}
 	}
-	
+
 	echo "--> State of array after loop:\n";
 	var_dump($a);
 }
diff --git a/tests/lang/foreachLoop.016.phpt b/tests/lang/foreachLoop.016.phpt
index 91c96f694d7..7bdf8b3c89f 100644
--- a/tests/lang/foreachLoop.016.phpt
+++ b/tests/lang/foreachLoop.016.phpt
@@ -11,7 +11,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so
   }
   var_dump($b);
   unset($a, $b);
-  
+
   echo "\n" . '${\'a\'}' . "\n";
   $b = $a = array('original');
   foreach(${'a'} as $k=>&$v) {
@@ -19,7 +19,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so
   }
   var_dump($b);
   unset($a, $b);
-  
+
   echo "\n" . '$$a' . "\n";
   $a = 'blah';
   $$a = array('original');
@@ -29,7 +29,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so
   }
   var_dump($b);
   unset($a, $b);
-  
+
   echo "\n" . '$a[0]' . "\n";
   $b = $a[0] = array('original');
   foreach($a[0] as $k=>&$v) {
@@ -37,7 +37,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so
   }
   var_dump($b);
   unset($a, $b);
-  
+
   echo "\n" . '$a[0][0]' . "\n";
   $b = $a[0][0] = array('original');
   foreach($a[0][0] as $k=>&$v) {
@@ -45,7 +45,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so
   }
   var_dump($b);
   unset($a, $b);
-  
+
   echo "\n" . '$a->b' . "\n";
   $b = $a->b = array('original');
   foreach($a->b as $k=>&$v) {
@@ -53,7 +53,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so
   }
   var_dump($b);
   unset($a, $b);
-  
+
   echo "\n" . '$a->b->c' . "\n";
   $b = $a->b->c = array('original');
   foreach($a->b as $k=>&$v) {
@@ -61,7 +61,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so
   }
   var_dump($b);
   unset($a, $b);
-  
+
   echo "\n" . '$a->b[0]' . "\n";
   $b = $a->b[0] = array('original');
   foreach($a->b[0] as $k=>&$v) {
@@ -69,7 +69,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so
   }
   var_dump($b);
   unset($a, $b);
-  
+
   echo "\n" . '$a->b[0][0]' . "\n";
   $b = $a->b[0][0] = array('original');
   foreach($a->b[0][0] as $k=>&$v) {
@@ -77,7 +77,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so
   }
   var_dump($b);
   unset($a, $b);
-  
+
   echo "\n" . '$a->b[0]->c' . "\n";
   $b = $a->b[0]->c = array('original');
   foreach($a->b[0]->c as $k=>&$v) {
@@ -85,11 +85,11 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so
   }
   var_dump($b);
   unset($a, $b);
-  
+
   class C {
   	public static $a;
   }
-  
+
   echo "\n" . 'C::$a' . "\n";
   C::$a = array('original');
   $b = C::$a;
@@ -98,7 +98,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so
   }
   var_dump($b);
   unset($a, $b);
-  
+
   echo "\n" . 'C::$a[0]' . "\n";
   C::$a[0] = array('original');
   $b = C::$a[0];
@@ -107,7 +107,7 @@ Ensure foreach splits the iterated entity from its cow reference set, for all so
   }
   var_dump($b);
   unset(C::$a[0], $b);
-  
+
   echo "\n" . 'C::$a[0]->b' . "\n";
   C::$a[0]->b = array('original');
   $b = C::$a[0]->b;
diff --git a/tests/lang/foreachLoop.017.phpt b/tests/lang/foreachLoop.017.phpt
index 987fe3cb27f..e791bf0fef7 100644
--- a/tests/lang/foreachLoop.017.phpt
+++ b/tests/lang/foreachLoop.017.phpt
@@ -5,7 +5,7 @@ Ensure foreach works with arrays with Binary keys.
 $a = array ( "\x90" => 10 );
 foreach ($a as $val=>$key) echo $key;
 echo "\nDone\n";
-?> 
+?>
 --EXPECTF--
 10
 Done
diff --git a/tests/lang/foreachLoopIterator.001.phpt b/tests/lang/foreachLoopIterator.001.phpt
index cba38274514..61fffc617a5 100644
--- a/tests/lang/foreachLoopIterator.001.phpt
+++ b/tests/lang/foreachLoopIterator.001.phpt
@@ -1,24 +1,24 @@
 --TEST--
-foreach with Iterator. 
+foreach with Iterator.
 --FILE--
 <?php
 
 class MealIterator implements Iterator {
 	private $pos=0;
 	private $myContent=array("breakfast", "lunch", "dinner");
-	
+
 	public function valid() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		return $this->pos<3;
 	}
-	
+
 	public function next() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		return $this->myContent[$this->pos++];
 	}
-	
+
 	public function rewind() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
@@ -30,13 +30,13 @@ class MealIterator implements Iterator {
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		return $this->myContent[$this->pos];
 	}
-	
+
 	public function key() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		return "meal " . $this->pos;
 	}
-	
+
 }
 
 $f = new MealIterator;
@@ -44,7 +44,7 @@ var_dump($f);
 
 echo "-----( Simple iteration: )-----\n";
 foreach ($f as $k=>$v) {
-	echo "$k => $v\n";	
+	echo "$k => $v\n";
 }
 
 $f->rewind();
@@ -54,14 +54,14 @@ $indent = " ";
 echo "\n\n\n-----( Nested iteration: )-----\n";
 $count=1;
 foreach ($f as $k=>$v) {
-	echo "\nTop level "  .  $count++ . ": \n"; 
+	echo "\nTop level "  .  $count++ . ": \n";
 	echo "$k => $v\n";
 	$indent = "     ";
 	foreach ($f as $k=>$v) {
-		echo "     $k => $v\n";	
+		echo "     $k => $v\n";
 	}
 	$indent = " ";
-	
+
 }
 
 ?>
diff --git a/tests/lang/foreachLoopIterator.002.phpt b/tests/lang/foreachLoopIterator.002.phpt
index a016dba2b6b..fe38145c3bb 100644
--- a/tests/lang/foreachLoopIterator.002.phpt
+++ b/tests/lang/foreachLoopIterator.002.phpt
@@ -14,7 +14,7 @@ class MyIterator implements Iterator {
 $f = new MyIterator;
 echo "-----( Try to iterate with &\$value: )-----\n";
 foreach ($f as $k=>&$v) {
-	echo "$k => $v\n";	
+	echo "$k => $v\n";
 }
 
 ?>
diff --git a/tests/lang/foreachLoopIteratorAggregate.001.phpt b/tests/lang/foreachLoopIteratorAggregate.001.phpt
index 094fc3b8bb2..47baeab42c3 100644
--- a/tests/lang/foreachLoopIteratorAggregate.001.phpt
+++ b/tests/lang/foreachLoopIteratorAggregate.001.phpt
@@ -5,19 +5,19 @@ foreach with iteratorAggregate
 class EnglishMealIterator implements Iterator {
 	private $pos=0;
 	private $myContent=array("breakfast", "dinner", "tea");
-	
+
 	public function valid() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		return $this->pos < count($this->myContent);
 	}
-	
+
 	public function next() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		$this->pos++;
 	}
-	
+
 	public function rewind() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
@@ -29,31 +29,31 @@ class EnglishMealIterator implements Iterator {
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		return $this->myContent[$this->pos];
 	}
-	
+
 	public function key() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		return "meal " . $this->pos;
 	}
-	
+
 }
 
 class FrenchMealIterator implements Iterator {
 	private $pos=0;
 	private $myContent=array("petit dejeuner", "dejeuner", "gouter", "dinner");
-	
+
 	public function valid() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		return $this->pos < count($this->myContent);
 	}
-	
+
 	public function next() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		$this->pos++;
 	}
-	
+
 	public function rewind() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
@@ -65,30 +65,30 @@ class FrenchMealIterator implements Iterator {
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		return $this->myContent[$this->pos];
 	}
-	
+
 	public function key() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		return "meal " . $this->pos;
 	}
-	
+
 }
 
 
 Class EuropeanMeals implements IteratorAggregate {
-	
+
 	private $storedEnglishMealIterator;
 	private $storedFrenchMealIterator;
-	
+
 	public function __construct() {
 		$this->storedEnglishMealIterator = new EnglishMealIterator;
 		$this->storedFrenchMealIterator = new FrenchMealIterator;
 	}
-	
+
 	public function getIterator() {
 		global $indent;
 		echo "$indent--> " . __METHOD__  . "\n";
-		
+
 		//Alternate between English and French meals
 		static $i = 0;
 		if ($i++%2 == 0) {
@@ -97,7 +97,7 @@ Class EuropeanMeals implements IteratorAggregate {
 			return $this->storedFrenchMealIterator;
 		}
 	}
-	
+
 }
 
 $f = new EuropeanMeals;
@@ -105,11 +105,11 @@ var_dump($f);
 
 echo "-----( Simple iteration 1: )-----\n";
 foreach ($f as $k=>$v) {
-	echo "$k => $v\n";	
+	echo "$k => $v\n";
 }
 echo "-----( Simple iteration 2: )-----\n";
 foreach ($f as $k=>$v) {
-	echo "$k => $v\n";	
+	echo "$k => $v\n";
 }
 
 
@@ -117,11 +117,11 @@ $indent = " ";
 echo "\n\n\n-----( Nested iteration: )-----\n";
 $count=1;
 foreach ($f as $k=>$v) {
-	echo "\nTop level "  .  $count++ . ": \n"; 
+	echo "\nTop level "  .  $count++ . ": \n";
 	echo "$k => $v\n";
 	$indent = "     ";
 	foreach ($f as $k=>$v) {
-		echo "     $k => $v\n";	
+		echo "     $k => $v\n";
 	}
 	$indent = " ";
 }
diff --git a/tests/lang/foreachLoopIteratorAggregate.002.phpt b/tests/lang/foreachLoopIteratorAggregate.002.phpt
index 6cad8e29b6e..81894a75b20 100644
--- a/tests/lang/foreachLoopIteratorAggregate.002.phpt
+++ b/tests/lang/foreachLoopIteratorAggregate.002.phpt
@@ -31,7 +31,7 @@ class bad4 implements IteratorAggregate {
 function f($className) {
 	try {
 		foreach (new $className as $k=>$v) {
-			echo "$k => $v\n";	
+			echo "$k => $v\n";
 		}
 	} catch (Exception $e) {
 			echo $e->getLine() . ": " . $e->getMessage() ."\n";
diff --git a/tests/lang/foreachLoopIteratorAggregate.003.phpt b/tests/lang/foreachLoopIteratorAggregate.003.phpt
index 0a0e23c51ac..b2f853dd1a7 100644
--- a/tests/lang/foreachLoopIteratorAggregate.003.phpt
+++ b/tests/lang/foreachLoopIteratorAggregate.003.phpt
@@ -5,19 +5,19 @@ foreach with nested iteratorAggregates
 class EnglishMealIterator implements Iterator {
 	private $pos=0;
 	private $myContent=array("breakfast", "dinner", "tea");
-	
+
 	public function valid() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		return $this->pos<3;
 	}
-	
+
 	public function next() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		return $this->myContent[$this->pos++];
 	}
-	
+
 	public function rewind() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
@@ -29,13 +29,13 @@ class EnglishMealIterator implements Iterator {
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		return $this->myContent[$this->pos];
 	}
-	
+
 	public function key() {
 		global $indent;
 		echo "$indent--> " . __METHOD__ . " ($this->pos)\n";
 		return "meal " . $this->pos;
 	}
-	
+
 }
 
 class A1 implements IteratorAggregate {
@@ -58,17 +58,17 @@ class A3 implements IteratorAggregate {
 
 echo "\n-----( A1: )-----\n";
 foreach (new A1 as $k=>$v) {
-	echo "$k => $v\n";	
+	echo "$k => $v\n";
 }
 
 echo "\n-----( A2: )-----\n";
 foreach (new A2 as $k=>$v) {
-	echo "$k => $v\n";	
+	echo "$k => $v\n";
 }
 
 echo "\n-----( A3: )-----\n";
 foreach (new A3 as $k=>$v) {
-	echo "$k => $v\n";	
+	echo "$k => $v\n";
 }
 
 ?>
diff --git a/tests/lang/foreachLoopIteratorAggregate.004.phpt b/tests/lang/foreachLoopIteratorAggregate.004.phpt
index 9a1e612c23b..30c422b2c8c 100644
--- a/tests/lang/foreachLoopIteratorAggregate.004.phpt
+++ b/tests/lang/foreachLoopIteratorAggregate.004.phpt
@@ -40,7 +40,7 @@ class c_iter implements Iterator {
 	function __destruct() {
 	}
 }
-	
+
 class c implements IteratorAggregate {
 
 	public $max = 3;
diff --git a/tests/lang/foreachLoopObjects.001.phpt b/tests/lang/foreachLoopObjects.001.phpt
index da025a537fb..fca3442bc11 100644
--- a/tests/lang/foreachLoopObjects.001.phpt
+++ b/tests/lang/foreachLoopObjects.001.phpt
@@ -9,7 +9,7 @@ class C {
 	public $c = "Original c";
 	protected $d = "Original d";
 	private $e = "Original e";
-	
+
 }
 
 echo "\n\nSimple loop.\n";
diff --git a/tests/lang/foreachLoopObjects.002.phpt b/tests/lang/foreachLoopObjects.002.phpt
index 6961f690787..e1e96c86f0f 100644
--- a/tests/lang/foreachLoopObjects.002.phpt
+++ b/tests/lang/foreachLoopObjects.002.phpt
@@ -17,7 +17,7 @@ class C {
 			$v="changed.$k";
 		}
 	}
-		
+
 	static function doForEach($obj) {
 		echo "in C::doForEach\n";
 		foreach ($obj as $k=>&$v) {
@@ -25,7 +25,7 @@ class C {
 			$v="changed.$k";
 		}
 	}
-	
+
 	function doForEachOnThis() {
 		echo "in C::doForEachOnThis\n";
 		foreach ($this as $k=>&$v) {
@@ -33,14 +33,14 @@ class C {
 			$v="changed.$k";
 		}
 	}
-	
+
 }
 
 class D extends C {
-	
+
 	private $f = "Original f";
 	protected $g = "Original g";
-	
+
 	static function doForEach($obj) {
 		echo "in D::doForEach\n";
 		foreach ($obj as $k=>&$v) {
@@ -63,7 +63,7 @@ class E extends D {
 	public $b = "Overridden b";
 	public $c = "Overridden c";
 	protected $d = "Overridden d";
-	private $e = "Overridden e";	
+	private $e = "Overridden e";
 
 	static function doForEach($obj) {
 		echo "in E::doForEach\n";
diff --git a/tests/lang/foreachLoopObjects.003.phpt b/tests/lang/foreachLoopObjects.003.phpt
index c90342364f5..0d0e073eb63 100644
--- a/tests/lang/foreachLoopObjects.003.phpt
+++ b/tests/lang/foreachLoopObjects.003.phpt
@@ -44,7 +44,7 @@ foreach ($obj as $v) {
     	echo "Loop detected\n";
     	break;
     }
-	var_dump($v);    
+	var_dump($v);
 }
 var_dump($obj);
 
@@ -56,9 +56,9 @@ foreach ($obj as &$v) {
 	$obj->$newPropName = "Added property $counter";
     if ($counter++>10) {
     	echo "Loop detected\n";
-    	break;    	
+    	break;
     }
-	var_dump($v);    
+	var_dump($v);
 }
 var_dump($obj);
 
@@ -67,7 +67,7 @@ $obj = new C;
 foreach ($obj as $v) {
 	unset($obj->a);
 	unset($obj->b);
-	unset($obj->c);	
+	unset($obj->c);
 	var_dump($v);
 }
 var_dump($obj);
diff --git a/tests/lang/foreachLoopObjects.004.phpt b/tests/lang/foreachLoopObjects.004.phpt
index c6cadad0f0c..01e4e9fd9a6 100644
--- a/tests/lang/foreachLoopObjects.004.phpt
+++ b/tests/lang/foreachLoopObjects.004.phpt
@@ -16,13 +16,13 @@ $obj = new C;
 $count=0;
 foreach ($obj as $v) {
 	if ($v==$obj->b) {
-		unset($obj->b);	
+		unset($obj->b);
 	}
 	var_dump($v);
 	if (++$count>10) {
 		echo "Loop detected.\n";
 		break;
-	}	
+	}
 }
 var_dump($obj);
 
diff --git a/tests/lang/foreachLoopObjects.005.phpt b/tests/lang/foreachLoopObjects.005.phpt
index 1692bcd2fc4..624d9ad10c4 100644
--- a/tests/lang/foreachLoopObjects.005.phpt
+++ b/tests/lang/foreachLoopObjects.005.phpt
@@ -16,13 +16,13 @@ $obj = new C;
 $count=0;
 foreach ($obj as $v) {
 	if ($v==$obj->a) {
-		unset($obj->c);	
+		unset($obj->c);
 	}
 	var_dump($v);
 	if (++$count>10) {
 		echo "Loop detected.\n";
 		break;
-	}		
+	}
 }
 var_dump($obj);
 
@@ -30,13 +30,13 @@ echo "\nRemoving properties before the current element from an iterated object.\
 $obj = new C;
 foreach ($obj as $v) {
 	if ($v==$obj->b) {
-		unset($obj->a);	
+		unset($obj->a);
 	}
 	var_dump($v);
 	if (++$count>10) {
 		echo "Loop detected.\n";
 		break;
-	}	
+	}
 }
 var_dump($obj);
 
diff --git a/tests/lang/foreachLoopObjects.006.phpt b/tests/lang/foreachLoopObjects.006.phpt
index 5204aca9caf..3e9b73542ac 100644
--- a/tests/lang/foreachLoopObjects.006.phpt
+++ b/tests/lang/foreachLoopObjects.006.phpt
@@ -30,7 +30,7 @@ foreach ($obj as $v) {
 	if (++$count>10) {
 		echo "Loop detected.\n";
 		break;
-	}	
+	}
 }
 var_dump($obj);
 
@@ -47,7 +47,7 @@ foreach ($obj as $v) {
 	if (++$count>10) {
 		echo "Loop detected.\n";
 		break;
-	}	
+	}
 }
 var_dump($obj);
 
diff --git a/tests/lang/func_get_arg.002.phpt b/tests/lang/func_get_arg.002.phpt
index 6ab4f95719a..5b80ec1773b 100644
--- a/tests/lang/func_get_arg.002.phpt
+++ b/tests/lang/func_get_arg.002.phpt
@@ -9,7 +9,7 @@ function foo($a)
 	var_dump($b);
 	$b++;
 	var_dump(func_get_arg(1));
-	
+
 }
 foo(2, 3);
 echo "\n";
diff --git a/tests/lang/func_get_arg.004.phpt b/tests/lang/func_get_arg.004.phpt
index 5afe4c95eba..0a4547ec187 100644
--- a/tests/lang/func_get_arg.004.phpt
+++ b/tests/lang/func_get_arg.004.phpt
@@ -5,7 +5,7 @@ func_get_arg on non-existent arg
 
 function foo($a)
 {
-	var_dump(func_get_arg(2));	
+	var_dump(func_get_arg(2));
 }
 foo(2, 3);
 echo "\n";
diff --git a/tests/lang/func_get_arg.005.phpt b/tests/lang/func_get_arg.005.phpt
index 31f5ffce700..0d52ab8764c 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_get_args.001.phpt b/tests/lang/func_get_args.001.phpt
index 40083aeb37f..a17cfb3d197 100644
--- a/tests/lang/func_get_args.001.phpt
+++ b/tests/lang/func_get_args.001.phpt
@@ -5,7 +5,7 @@ func_get_args with no args
 
 function foo()
 {
-	var_dump(func_get_args());	
+	var_dump(func_get_args());
 }
 foo();
 
diff --git a/tests/lang/func_get_args.002.phpt b/tests/lang/func_get_args.002.phpt
index 0a886c2f047..ea78d99a2b7 100644
--- a/tests/lang/func_get_args.002.phpt
+++ b/tests/lang/func_get_args.002.phpt
@@ -5,7 +5,7 @@ func_get_args with variable number of args
 
 function foo($a)
 {
-	var_dump(func_get_args());	
+	var_dump(func_get_args());
 }
 foo(1, 2, 3);
 
diff --git a/tests/lang/func_get_args.003.phpt b/tests/lang/func_get_args.003.phpt
index 44faf7ebf80..844288d9040 100644
--- a/tests/lang/func_get_args.003.phpt
+++ b/tests/lang/func_get_args.003.phpt
@@ -3,7 +3,7 @@ func_get_args() outside of a function declaration
 --FILE--
 <?php
 
-var_dump(func_get_args());	
+var_dump(func_get_args());
 
 ?>
 --EXPECTREGEX--
diff --git a/tests/lang/func_num_args.001.phpt b/tests/lang/func_num_args.001.phpt
index 117e8d0e06a..5d7a91d25ef 100644
--- a/tests/lang/func_num_args.001.phpt
+++ b/tests/lang/func_num_args.001.phpt
@@ -5,7 +5,7 @@ func_num_args with no args
 
 function foo()
 {
-	var_dump(func_num_args());	
+	var_dump(func_num_args());
 }
 foo();
 
diff --git a/tests/lang/func_num_args.002.phpt b/tests/lang/func_num_args.002.phpt
index 45246a7684a..8586fad735c 100644
--- a/tests/lang/func_num_args.002.phpt
+++ b/tests/lang/func_num_args.002.phpt
@@ -5,7 +5,7 @@ func_num_args with variable number of args
 
 function foo($a)
 {
-	var_dump(func_num_args());	
+	var_dump(func_num_args());
 }
 foo(1, 2, 3);
 
diff --git a/tests/lang/func_num_args.003.phpt b/tests/lang/func_num_args.003.phpt
index dceabbd0962..168f79d04e3 100644
--- a/tests/lang/func_num_args.003.phpt
+++ b/tests/lang/func_num_args.003.phpt
@@ -3,7 +3,7 @@ func_num_args() outside of a function declaration
 --FILE--
 <?php
 
-var_dump(func_num_args());	
+var_dump(func_num_args());
 
 ?>
 --EXPECTF--
diff --git a/tests/lang/func_num_args.004.phpt b/tests/lang/func_num_args.004.phpt
index 8bdc6f07f64..29f999225a2 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/add_basiclong_64bit.phpt b/tests/lang/operators/add_basiclong_64bit.phpt
index eb55d5f2101..01688434942 100644
--- a/tests/lang/operators/add_basiclong_64bit.phpt
+++ b/tests/lang/operators/add_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -24,18 +24,18 @@ error_reporting(E_ERROR);
 
 foreach ($longVals as $longVal) {
    foreach($otherVals as $otherVal) {
-	   echo "--- testing: $longVal + $otherVal ---\n";   
+	   echo "--- testing: $longVal + $otherVal ---\n";
       var_dump($longVal+$otherVal);
    }
 }
 
 foreach ($otherVals as $otherVal) {
    foreach($longVals as $longVal) {
-	   echo "--- testing: $otherVal + $longVal ---\n";   
+	   echo "--- testing: $otherVal + $longVal ---\n";
       var_dump($otherVal+$longVal);
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/add_variationStr.phpt b/tests/lang/operators/add_variationStr.phpt
index 9bf11ec6981..cc5834c5783 100644
--- a/tests/lang/operators/add_variationStr.phpt
+++ b/tests/lang/operators/add_variationStr.phpt
@@ -12,12 +12,12 @@ error_reporting(E_ERROR);
 
 foreach ($strVals as $strVal) {
    foreach($strVals as $otherVal) {
-	   echo "--- testing: '$strVal' + '$otherVal' ---\n";   
+	   echo "--- testing: '$strVal' + '$otherVal' ---\n";
       var_dump($strVal+$otherVal);
    }
 }
 
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/bitwiseAnd_basiclong_64bit.phpt b/tests/lang/operators/bitwiseAnd_basiclong_64bit.phpt
index 5dc322873a1..30bdcf4c60d 100644
--- a/tests/lang/operators/bitwiseAnd_basiclong_64bit.phpt
+++ b/tests/lang/operators/bitwiseAnd_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -24,18 +24,18 @@ error_reporting(E_ERROR);
 
 foreach ($longVals as $longVal) {
    foreach($otherVals as $otherVal) {
-	   echo "--- testing: $longVal & $otherVal ---\n";   
+	   echo "--- testing: $longVal & $otherVal ---\n";
       var_dump($longVal&$otherVal);
    }
 }
 
 foreach ($otherVals as $otherVal) {
    foreach($longVals as $longVal) {
-	   echo "--- testing: $otherVal & $longVal ---\n";   
+	   echo "--- testing: $otherVal & $longVal ---\n";
       var_dump($otherVal&$longVal);
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/bitwiseAnd_variationStr.phpt b/tests/lang/operators/bitwiseAnd_variationStr.phpt
index 5b7cb10b123..50ddb9ddb5b 100644
--- a/tests/lang/operators/bitwiseAnd_variationStr.phpt
+++ b/tests/lang/operators/bitwiseAnd_variationStr.phpt
@@ -12,12 +12,12 @@ error_reporting(E_ERROR);
 
 foreach ($strVals as $strVal) {
    foreach($strVals as $otherVal) {
-	   echo "--- testing: '$strVal' & '$otherVal' ---\n";   
+	   echo "--- testing: '$strVal' & '$otherVal' ---\n";
       var_dump(bin2hex($strVal&$otherVal));
    }
 }
 
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/bitwiseNot_basiclong_64bit.phpt b/tests/lang/operators/bitwiseNot_basiclong_64bit.phpt
index 86df2d771d8..5b8d7c9c48d 100644
--- a/tests/lang/operators/bitwiseNot_basiclong_64bit.phpt
+++ b/tests/lang/operators/bitwiseNot_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(~$longVal);
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/bitwiseNot_variationStr.phpt b/tests/lang/operators/bitwiseNot_variationStr.phpt
index 98bca9e4737..d0f8a759335 100644
--- a/tests/lang/operators/bitwiseNot_variationStr.phpt
+++ b/tests/lang/operators/bitwiseNot_variationStr.phpt
@@ -13,7 +13,7 @@ foreach ($strVals as $strVal) {
    echo "--- testing: '$strVal' ---\n";
    var_dump(bin2hex(~$strVal));
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt b/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt
index 50e35a1c283..dc4126cb0cc 100644
--- a/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt
+++ b/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -24,18 +24,18 @@ error_reporting(E_ERROR);
 
 foreach ($longVals as $longVal) {
    foreach($otherVals as $otherVal) {
-	   echo "--- testing: $longVal | $otherVal ---\n";   
+	   echo "--- testing: $longVal | $otherVal ---\n";
       var_dump($longVal|$otherVal);
    }
 }
 
 foreach ($otherVals as $otherVal) {
    foreach($longVals as $longVal) {
-	   echo "--- testing: $otherVal | $longVal ---\n";   
+	   echo "--- testing: $otherVal | $longVal ---\n";
       var_dump($otherVal|$longVal);
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/bitwiseOr_variationStr.phpt b/tests/lang/operators/bitwiseOr_variationStr.phpt
index 2d1d3537888..a883c4687a4 100644
--- a/tests/lang/operators/bitwiseOr_variationStr.phpt
+++ b/tests/lang/operators/bitwiseOr_variationStr.phpt
@@ -12,12 +12,12 @@ error_reporting(E_ERROR);
 
 foreach ($strVals as $strVal) {
    foreach($strVals as $otherVal) {
-	   echo "--- testing: '$strVal' | '$otherVal' ---\n";   
+	   echo "--- testing: '$strVal' | '$otherVal' ---\n";
       var_dump(bin2hex($strVal|$otherVal));
    }
 }
 
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/bitwiseShiftLeft_basiclong_64bit.phpt b/tests/lang/operators/bitwiseShiftLeft_basiclong_64bit.phpt
index 99626da6f13..218abf9d7a4 100644
--- a/tests/lang/operators/bitwiseShiftLeft_basiclong_64bit.phpt
+++ b/tests/lang/operators/bitwiseShiftLeft_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -43,7 +43,7 @@ foreach ($otherVals as $otherVal) {
       }
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt b/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
index 0176d907389..070db85ea72 100644
--- a/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
+++ b/tests/lang/operators/bitwiseShiftLeft_variationStr.phpt
@@ -24,7 +24,7 @@ foreach ($strVals as $strVal) {
       }
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/bitwiseShiftLeft_variationStr_64bit.phpt b/tests/lang/operators/bitwiseShiftLeft_variationStr_64bit.phpt
index ddfd2f7c6d0..c36e22fef4c 100644
--- a/tests/lang/operators/bitwiseShiftLeft_variationStr_64bit.phpt
+++ b/tests/lang/operators/bitwiseShiftLeft_variationStr_64bit.phpt
@@ -17,7 +17,7 @@ error_reporting(E_ERROR);
 foreach ($strVals as $strVal) {
    foreach($strVals as $otherVal) {
 	  echo "--- testing: '$strVal' << '$otherVal' ---\n";
-      try {      
+      try {
         var_dump($strVal<<$otherVal);
       } catch (ArithmeticError $e) {
         echo "Exception: " . $e->getMessage() . "\n";
@@ -25,7 +25,7 @@ foreach ($strVals as $strVal) {
    }
 }
 
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/bitwiseShiftRight_basiclong_64bit.phpt b/tests/lang/operators/bitwiseShiftRight_basiclong_64bit.phpt
index 65e7e826b8b..7a08ed09da0 100644
--- a/tests/lang/operators/bitwiseShiftRight_basiclong_64bit.phpt
+++ b/tests/lang/operators/bitwiseShiftRight_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -43,7 +43,7 @@ foreach ($otherVals as $otherVal) {
       }
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/bitwiseShiftRight_variationStr.phpt b/tests/lang/operators/bitwiseShiftRight_variationStr.phpt
index a4c425aab3e..e3c9c8962df 100644
--- a/tests/lang/operators/bitwiseShiftRight_variationStr.phpt
+++ b/tests/lang/operators/bitwiseShiftRight_variationStr.phpt
@@ -21,7 +21,7 @@ foreach ($strVals as $strVal) {
    }
 }
 
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt b/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt
index 0bfd8089e64..1b63f38deea 100644
--- a/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt
+++ b/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -24,18 +24,18 @@ error_reporting(E_ERROR);
 
 foreach ($longVals as $longVal) {
    foreach($otherVals as $otherVal) {
-	   echo "--- testing: $longVal ^ $otherVal ---\n";   
+	   echo "--- testing: $longVal ^ $otherVal ---\n";
       var_dump($longVal^$otherVal);
    }
 }
 
 foreach ($otherVals as $otherVal) {
    foreach($longVals as $longVal) {
-	   echo "--- testing: $otherVal ^ $longVal ---\n";   
+	   echo "--- testing: $otherVal ^ $longVal ---\n";
       var_dump($otherVal^$longVal);
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/bitwiseXor_variationStr.phpt b/tests/lang/operators/bitwiseXor_variationStr.phpt
index 64d5eb75d80..dced933ee41 100644
--- a/tests/lang/operators/bitwiseXor_variationStr.phpt
+++ b/tests/lang/operators/bitwiseXor_variationStr.phpt
@@ -12,12 +12,12 @@ error_reporting(E_ERROR);
 
 foreach ($strVals as $strVal) {
    foreach($strVals as $otherVal) {
-	   echo "--- testing: '$strVal' ^ '$otherVal' ---\n";   
+	   echo "--- testing: '$strVal' ^ '$otherVal' ---\n";
       var_dump(bin2hex($strVal^$otherVal));
    }
 }
 
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/divide_basiclong_64bit.phpt b/tests/lang/operators/divide_basiclong_64bit.phpt
index 0dd08f534f6..4349ae0025d 100644
--- a/tests/lang/operators/divide_basiclong_64bit.phpt
+++ b/tests/lang/operators/divide_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -24,18 +24,18 @@ error_reporting(E_ERROR);
 
 foreach ($longVals as $longVal) {
    foreach($otherVals as $otherVal) {
-	   echo "--- testing: $longVal / $otherVal ---\n";   
+	   echo "--- testing: $longVal / $otherVal ---\n";
       var_dump($longVal/$otherVal);
    }
 }
 
 foreach ($otherVals as $otherVal) {
    foreach($longVals as $longVal) {
-	   echo "--- testing: $otherVal / $longVal ---\n";   
+	   echo "--- testing: $otherVal / $longVal ---\n";
       var_dump($otherVal/$longVal);
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/divide_variationStr.phpt b/tests/lang/operators/divide_variationStr.phpt
index 88ff8f18406..f908642765f 100644
--- a/tests/lang/operators/divide_variationStr.phpt
+++ b/tests/lang/operators/divide_variationStr.phpt
@@ -12,12 +12,12 @@ error_reporting(E_ERROR);
 
 foreach ($strVals as $strVal) {
    foreach($strVals as $otherVal) {
-	   echo "--- testing: '$strVal' / '$otherVal' ---\n";   
+	   echo "--- testing: '$strVal' / '$otherVal' ---\n";
       var_dump($strVal/$otherVal);
    }
 }
 
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/modulus_basiclong_64bit.phpt b/tests/lang/operators/modulus_basiclong_64bit.phpt
index 6806bd53a84..155649d2033 100644
--- a/tests/lang/operators/modulus_basiclong_64bit.phpt
+++ b/tests/lang/operators/modulus_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -43,7 +43,7 @@ foreach ($otherVals as $otherVal) {
       }
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/modulus_variationStr.phpt b/tests/lang/operators/modulus_variationStr.phpt
index 6441428e3e5..21765ecb7ca 100644
--- a/tests/lang/operators/modulus_variationStr.phpt
+++ b/tests/lang/operators/modulus_variationStr.phpt
@@ -21,7 +21,7 @@ foreach ($strVals as $strVal) {
    }
 }
 
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/multiply_basiclong_64bit.phpt b/tests/lang/operators/multiply_basiclong_64bit.phpt
index 31d9188a775..512c3fbc180 100644
--- a/tests/lang/operators/multiply_basiclong_64bit.phpt
+++ b/tests/lang/operators/multiply_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -24,18 +24,18 @@ error_reporting(E_ERROR);
 
 foreach ($longVals as $longVal) {
    foreach($otherVals as $otherVal) {
-	   echo "--- testing: $longVal * $otherVal ---\n";   
+	   echo "--- testing: $longVal * $otherVal ---\n";
       var_dump($longVal*$otherVal);
    }
 }
 
 foreach ($otherVals as $otherVal) {
    foreach($longVals as $longVal) {
-	   echo "--- testing: $otherVal * $longVal ---\n";   
+	   echo "--- testing: $otherVal * $longVal ---\n";
       var_dump($otherVal*$longVal);
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/multiply_variationStr.phpt b/tests/lang/operators/multiply_variationStr.phpt
index 01d7e050749..50735e25486 100644
--- a/tests/lang/operators/multiply_variationStr.phpt
+++ b/tests/lang/operators/multiply_variationStr.phpt
@@ -12,12 +12,12 @@ error_reporting(E_ERROR);
 
 foreach ($strVals as $strVal) {
    foreach($strVals as $otherVal) {
-	   echo "--- testing: '$strVal' * '$otherVal' ---\n";   
+	   echo "--- testing: '$strVal' * '$otherVal' ---\n";
       var_dump($strVal*$otherVal);
    }
 }
 
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/negate_basiclong_64bit.phpt b/tests/lang/operators/negate_basiclong_64bit.phpt
index 47b25e5397b..bce8982126a 100644
--- a/tests/lang/operators/negate_basiclong_64bit.phpt
+++ b/tests/lang/operators/negate_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(-$longVal);
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/negate_variationStr.phpt b/tests/lang/operators/negate_variationStr.phpt
index ccff2fba2c2..7956ef4a1c7 100644
--- a/tests/lang/operators/negate_variationStr.phpt
+++ b/tests/lang/operators/negate_variationStr.phpt
@@ -13,7 +13,7 @@ foreach ($strVals as $strVal) {
    echo "--- testing: '$strVal' ---\n";
    var_dump(-$strVal);
 }
-   
+
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/tests/lang/operators/operator_equals_basic.phpt b/tests/lang/operators/operator_equals_basic.phpt
index 9de4ed1a2aa..1f83a481807 100644
--- a/tests/lang/operators/operator_equals_basic.phpt
+++ b/tests/lang/operators/operator_equals_basic.phpt
@@ -22,20 +22,20 @@ $invalid_float2 = array("- 67345.76567", "-67,345.76567", -67345.76566, -6.73457
 
 
 $toCompare = array(
-  true, $valid_true, $valid_false, 
+  true, $valid_true, $valid_false,
   false, $valid_false, $valid_true,
   $int1, $valid_int1, $invalid_int1,
   $int2, $valid_int2, $invalid_int2,
   $float1, $valid_float1, $invalid_float1,
   $float2, $valid_float2, $invalid_float2
 );
-  
+
 $failed = false;
 for ($i = 0; $i < count($toCompare); $i +=3) {
    $typeToTest = $toCompare[$i];
    $valid_compares = $toCompare[$i + 1];
    $invalid_compares = $toCompare[$i + 2];
-   
+
    foreach($valid_compares as $compareVal) {
       if ($typeToTest == $compareVal) {
          // do nothing
@@ -45,19 +45,19 @@ for ($i = 0; $i < count($toCompare); $i +=3) {
          $failed = true;
       }
    }
-   
+
    foreach($invalid_compares as $compareVal) {
       if ($typeToTest == $compareVal) {
          echo "FAILED: '$typeToTest' == '$compareVal'\n";
          $failed = true;
       }
    }
-   
+
 }
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_equals_variation.phpt b/tests/lang/operators/operator_equals_variation.phpt
index d72253404b6..ad561454ae7 100644
--- a/tests/lang/operators/operator_equals_variation.phpt
+++ b/tests/lang/operators/operator_equals_variation.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -55,7 +55,7 @@ for ($i = 0; $i < count($invalidEqual); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_equals_variation_64bit.phpt b/tests/lang/operators/operator_equals_variation_64bit.phpt
index ada6c2d7ecc..15d440978e8 100644
--- a/tests/lang/operators/operator_equals_variation_64bit.phpt
+++ b/tests/lang/operators/operator_equals_variation_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -57,7 +57,7 @@ for ($i = 0; $i < count($invalidEqual); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_gt_basic.phpt b/tests/lang/operators/operator_gt_basic.phpt
index db856c62e65..66c457f0b1b 100644
--- a/tests/lang/operators/operator_gt_basic.phpt
+++ b/tests/lang/operators/operator_gt_basic.phpt
@@ -24,19 +24,19 @@ $toCompare = array(
 // boolean test will result in both sides being converted to boolean so !0 = true and true is not > true for example
 // also note that a string of "0" is converted to false but a string of "0.0" is converted to true
 // false cannot be tested as 0 can never be > 0 or 1
-  true, $valid_false, $valid_true, 
+  true, $valid_false, $valid_true,
   $int1, $valid_int1, $invalid_int1,
   $int2, $valid_int2, $invalid_int2,
   $float1, $valid_float1, $invalid_float1,
   $float2, $valid_float2, $invalid_float2
 );
-  
+
 $failed = false;
 for ($i = 0; $i < count($toCompare); $i +=3) {
    $typeToTest = $toCompare[$i];
    $valid_compares = $toCompare[$i + 1];
    $invalid_compares = $toCompare[$i + 2];
-   
+
    foreach($valid_compares as $compareVal) {
       if ($typeToTest > $compareVal) {
          // do nothing
@@ -46,14 +46,14 @@ for ($i = 0; $i < count($toCompare); $i +=3) {
          $failed = true;
       }
    }
-   
+
    foreach($invalid_compares as $compareVal) {
       if ($typeToTest > $compareVal) {
          echo "FAILED: '$typeToTest' > '$compareVal'\n";
          $failed = true;
       }
    }
-   
+
 }
 if ($failed == false) {
    echo "Test Passed\n";
diff --git a/tests/lang/operators/operator_gt_or_equal_basic.phpt b/tests/lang/operators/operator_gt_or_equal_basic.phpt
index f1b1e01048b..006c22baeb1 100644
--- a/tests/lang/operators/operator_gt_or_equal_basic.phpt
+++ b/tests/lang/operators/operator_gt_or_equal_basic.phpt
@@ -22,19 +22,19 @@ $invalid_float2 = array(-67345.76564, -6.734576564E4);
 $toCompare = array(
 
   true, array_merge($valid_false, $valid_true), NULL,
-  false, $valid_false, $valid_true, 
+  false, $valid_false, $valid_true,
   $int1, $valid_int1, $invalid_int1,
   $int2, $valid_int2, $invalid_int2,
   $float1, $valid_float1, $invalid_float1,
   $float2, $valid_float2, $invalid_float2
 );
-  
+
 $failed = false;
 for ($i = 0; $i < count($toCompare); $i +=3) {
    $typeToTest = $toCompare[$i];
    $valid_compares = $toCompare[$i + 1];
    $invalid_compares = $toCompare[$i + 2];
-   
+
    foreach($valid_compares as $compareVal) {
       if ($typeToTest >= $compareVal) {
          // do nothing
@@ -44,7 +44,7 @@ for ($i = 0; $i < count($toCompare); $i +=3) {
          $failed = true;
       }
    }
-   
+
    if ($invalid_compares != NULL) {
 	   foreach($invalid_compares as $compareVal) {
 	      if ($typeToTest >= $compareVal) {
@@ -53,7 +53,7 @@ for ($i = 0; $i < count($toCompare); $i +=3) {
 	      }
 	   }
    }
-   
+
 }
 if ($failed == false) {
    echo "Test Passed\n";
diff --git a/tests/lang/operators/operator_gt_or_equal_variation.phpt b/tests/lang/operators/operator_gt_or_equal_variation.phpt
index 2355ab4c45a..1e3a338e73d 100644
--- a/tests/lang/operators/operator_gt_or_equal_variation.phpt
+++ b/tests/lang/operators/operator_gt_or_equal_variation.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -55,7 +55,7 @@ for ($i = 0; $i < count($invalidGtOrEqual); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_gt_or_equal_variation_64bit.phpt b/tests/lang/operators/operator_gt_or_equal_variation_64bit.phpt
index 8a1ed35f109..d6245abbfcb 100644
--- a/tests/lang/operators/operator_gt_or_equal_variation_64bit.phpt
+++ b/tests/lang/operators/operator_gt_or_equal_variation_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -55,7 +55,7 @@ for ($i = 0; $i < count($invalidGtOrEqual); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_gt_variation.phpt b/tests/lang/operators/operator_gt_variation.phpt
index ff15550dbe2..d40062435d3 100644
--- a/tests/lang/operators/operator_gt_variation.phpt
+++ b/tests/lang/operators/operator_gt_variation.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -54,7 +54,7 @@ for ($i = 0; $i < count($invalidGreaterThan); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_gt_variation_64bit.phpt b/tests/lang/operators/operator_gt_variation_64bit.phpt
index 15c6b88319f..60a34c89863 100644
--- a/tests/lang/operators/operator_gt_variation_64bit.phpt
+++ b/tests/lang/operators/operator_gt_variation_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -54,7 +54,7 @@ for ($i = 0; $i < count($invalidGreaterThan); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_identical_basic.phpt b/tests/lang/operators/operator_identical_basic.phpt
index e3a0fe272fc..cddba995a67 100644
--- a/tests/lang/operators/operator_identical_basic.phpt
+++ b/tests/lang/operators/operator_identical_basic.phpt
@@ -15,27 +15,27 @@ $invalid_int2 = array("-67835", "-67835abc", " -67835", "-67835  ", -67835.000,
 
 $float1 = 57385.45835;
 $float2 = -67345.76567;
-$valid_float1 = array(57385.45835, 5.738545835e4); 
+$valid_float1 = array(57385.45835, 5.738545835e4);
 $valid_float2 = array(-67345.76567, -6.734576567E4);
 $invalid_float1 = array("57385.45835",  "57385.45835aaa", "  57385.45835", "57385. 45835",  "57,385.45835", 57385.45834, 5.738545834e4);
 $invalid_float2 = array("-67345.76567", "-67345.76567aaa", "  -67345.76567", "- 67345.76567", "-67,345.76567", -67345.76566, -6.734576566E4);
 
 
 $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,
   $float1, $valid_float1, $invalid_float1,
   $float2, $valid_float2, $invalid_float2
 );
-  
+
 $failed = false;
 for ($i = 0; $i < count($toCompare); $i +=3) {
    $typeToTest = $toCompare[$i];
    $valid_compares = $toCompare[$i + 1];
    $invalid_compares = $toCompare[$i + 2];
-   
+
    foreach($valid_compares as $compareVal) {
       if ($typeToTest === $compareVal) {
          // do nothing
@@ -45,19 +45,19 @@ for ($i = 0; $i < count($toCompare); $i +=3) {
          $failed = true;
       }
    }
-   
+
    foreach($invalid_compares as $compareVal) {
       if ($typeToTest === $compareVal) {
          echo "FAILED: '$typeToTest' == '$compareVal'\n";
          $failed = true;
       }
    }
-   
+
 }
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_identical_variation.phpt b/tests/lang/operators/operator_identical_variation.phpt
index a215fef0a44..8b8e1dc7ea8 100644
--- a/tests/lang/operators/operator_identical_variation.phpt
+++ b/tests/lang/operators/operator_identical_variation.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -55,7 +55,7 @@ for ($i = 0; $i < count($invalidIdentical); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_identical_variation_64bit.phpt b/tests/lang/operators/operator_identical_variation_64bit.phpt
index 0c8d398dafa..cd098699f27 100644
--- a/tests/lang/operators/operator_identical_variation_64bit.phpt
+++ b/tests/lang/operators/operator_identical_variation_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -57,7 +57,7 @@ for ($i = 0; $i < count($invalidIdentical); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_lt_basic.phpt b/tests/lang/operators/operator_lt_basic.phpt
index 41f18ef9d23..4574fb7d1d7 100644
--- a/tests/lang/operators/operator_lt_basic.phpt
+++ b/tests/lang/operators/operator_lt_basic.phpt
@@ -21,19 +21,19 @@ $invalid_float2 = array(-67345.76567, -6.734576567E4);
 
 
 $toCompare = array(
-  false, $valid_true, $valid_false, 
+  false, $valid_true, $valid_false,
   $int1, $valid_int1, $invalid_int1,
   $int2, $valid_int2, $invalid_int2,
   $float1, $valid_float1, $invalid_float1,
   $float2, $valid_float2, $invalid_float2
 );
-  
+
 $failed = false;
 for ($i = 0; $i < count($toCompare); $i +=3) {
    $typeToTest = $toCompare[$i];
    $valid_compares = $toCompare[$i + 1];
    $invalid_compares = $toCompare[$i + 2];
-   
+
    foreach($valid_compares as $compareVal) {
       if ($typeToTest < $compareVal) {
          // do nothing
@@ -43,14 +43,14 @@ for ($i = 0; $i < count($toCompare); $i +=3) {
          $failed = true;
       }
    }
-   
+
    foreach($invalid_compares as $compareVal) {
       if ($typeToTest < $compareVal) {
          echo "FAILED: '$typeToTest' < '$compareVal'\n";
          $failed = true;
       }
    }
-   
+
 }
 if ($failed == false) {
    echo "Test Passed\n";
diff --git a/tests/lang/operators/operator_lt_or_equal_basic.phpt b/tests/lang/operators/operator_lt_or_equal_basic.phpt
index 85a86e19965..5439fd7d750 100644
--- a/tests/lang/operators/operator_lt_or_equal_basic.phpt
+++ b/tests/lang/operators/operator_lt_or_equal_basic.phpt
@@ -21,19 +21,19 @@ $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,
   $float2, $valid_float2, $invalid_float2
 );
-  
+
 $failed = false;
 for ($i = 0; $i < count($toCompare); $i +=3) {
    $typeToTest = $toCompare[$i];
    $valid_compares = $toCompare[$i + 1];
    $invalid_compares = $toCompare[$i + 2];
-   
+
    foreach($valid_compares as $compareVal) {
       if ($typeToTest <= $compareVal) {
          // do nothing
@@ -43,7 +43,7 @@ for ($i = 0; $i < count($toCompare); $i +=3) {
          $failed = true;
       }
    }
-   
+
    if ($invalid_compares != NULL) {
 	   foreach($invalid_compares as $compareVal) {
 	      if ($typeToTest <= $compareVal) {
@@ -52,7 +52,7 @@ for ($i = 0; $i < count($toCompare); $i +=3) {
 	      }
 	   }
    }
-   
+
 }
 if ($failed == false) {
    echo "Test Passed\n";
diff --git a/tests/lang/operators/operator_lt_or_equal_variation.phpt b/tests/lang/operators/operator_lt_or_equal_variation.phpt
index 5724511a0e6..a003138ceb1 100644
--- a/tests/lang/operators/operator_lt_or_equal_variation.phpt
+++ b/tests/lang/operators/operator_lt_or_equal_variation.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -55,7 +55,7 @@ for ($i = 0; $i < count($invalidLtOrEqual); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_lt_or_equal_variation_64bit.phpt b/tests/lang/operators/operator_lt_or_equal_variation_64bit.phpt
index f3b16c1fc91..50afd9b3e55 100644
--- a/tests/lang/operators/operator_lt_or_equal_variation_64bit.phpt
+++ b/tests/lang/operators/operator_lt_or_equal_variation_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -55,7 +55,7 @@ for ($i = 0; $i < count($invalidLtOrEqual); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_lt_variation.phpt b/tests/lang/operators/operator_lt_variation.phpt
index 4f468638dcd..47dab39c998 100644
--- a/tests/lang/operators/operator_lt_variation.phpt
+++ b/tests/lang/operators/operator_lt_variation.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -52,7 +52,7 @@ for ($i = 0; $i < count($invalidLessThan); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_lt_variation_64bit.phpt b/tests/lang/operators/operator_lt_variation_64bit.phpt
index 3ee274aea0c..663b840e610 100644
--- a/tests/lang/operators/operator_lt_variation_64bit.phpt
+++ b/tests/lang/operators/operator_lt_variation_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -52,7 +52,7 @@ for ($i = 0; $i < count($invalidLessThan); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_notequals_basic.phpt b/tests/lang/operators/operator_notequals_basic.phpt
index cef0be62790..35bd83e445b 100644
--- a/tests/lang/operators/operator_notequals_basic.phpt
+++ b/tests/lang/operators/operator_notequals_basic.phpt
@@ -22,20 +22,20 @@ $invalid_float2 = array("-67345.76567", "-67345.76567aaa", "  -67345.76567", -6.
 
 
 $toCompare = array(
-  true, $valid_false, $valid_true, 
+  true, $valid_false, $valid_true,
   false, $valid_true, $valid_false,
   $int1, $valid_int1, $invalid_int1,
   $int2, $valid_int2, $invalid_int2,
   $float1, $valid_float1, $invalid_float1,
   $float2, $valid_float2, $invalid_float2
 );
-  
+
 $failed = false;
 for ($i = 0; $i < count($toCompare); $i +=3) {
    $typeToTest = $toCompare[$i];
    $valid_compares = $toCompare[$i + 1];
    $invalid_compares = $toCompare[$i + 2];
-   
+
    foreach($valid_compares as $compareVal) {
       if ($typeToTest != $compareVal && $typeToTest <> $compareVal) {
          // do nothing
@@ -45,19 +45,19 @@ for ($i = 0; $i < count($toCompare); $i +=3) {
          $failed = true;
       }
    }
-   
+
    foreach($invalid_compares as $compareVal) {
       if ($typeToTest != $compareVal || $typeToTest <> $compareVal) {
          echo "FAILED: '$typeToTest' != '$compareVal'\n";
          $failed = true;
       }
    }
-   
+
 }
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_notequals_variation.phpt b/tests/lang/operators/operator_notequals_variation.phpt
index 25bbfc58598..137888506fc 100644
--- a/tests/lang/operators/operator_notequals_variation.phpt
+++ b/tests/lang/operators/operator_notequals_variation.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -37,7 +37,7 @@ for ($i = 0; $i < count($validNotEquals); $i +=2) {
       else {
          echo "FAILED: '$typeToTestVal' == '$compareVal'\n";
          $failed = true;
-      }   
+      }
    }
 }
 // test invalid values
@@ -55,7 +55,7 @@ for ($i = 0; $i < count($invalidNotEquals); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_notequals_variation_64bit.phpt b/tests/lang/operators/operator_notequals_variation_64bit.phpt
index 6fbc496fa5c..ea06b492642 100644
--- a/tests/lang/operators/operator_notequals_variation_64bit.phpt
+++ b/tests/lang/operators/operator_notequals_variation_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -57,7 +57,7 @@ for ($i = 0; $i < count($invalidNotEquals); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_notidentical_basic.phpt b/tests/lang/operators/operator_notidentical_basic.phpt
index 9f21ea4bcaf..d24c9361194 100644
--- a/tests/lang/operators/operator_notidentical_basic.phpt
+++ b/tests/lang/operators/operator_notidentical_basic.phpt
@@ -17,25 +17,25 @@ $float1 = 57385.45835;
 $float2 = -67345.76567;
 $valid_float1 = array("57385.45835",  "57385.45835aaa", "  57385.45835", "57385. 45835",  "57,385.45835", 57385.45834, 5.738545834e4);
 $valid_float2 = array("-67345.76567", "-67345.76567aaa", "  -67345.76567", "- 67345.76567", "-67,345.76567", -67345.76566, -6.734576566E4);
-$invalid_float1 = array(57385.45835, 5.738545835e4); 
+$invalid_float1 = array(57385.45835, 5.738545835e4);
 $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,
   $float1, $valid_float1, $invalid_float1,
   $float2, $valid_float2, $invalid_float2
 );
-  
+
 $failed = false;
 for ($i = 0; $i < count($toCompare); $i +=3) {
    $typeToTest = $toCompare[$i];
    $valid_compares = $toCompare[$i + 1];
    $invalid_compares = $toCompare[$i + 2];
-   
+
    foreach($valid_compares as $compareVal) {
       if ($typeToTest !== $compareVal) {
          // do nothing
@@ -45,19 +45,19 @@ for ($i = 0; $i < count($toCompare); $i +=3) {
          $failed = true;
       }
    }
-   
+
    foreach($invalid_compares as $compareVal) {
       if ($typeToTest !== $compareVal) {
          echo "FAILED: '$typeToTest' !== '$compareVal'\n";
          $failed = true;
       }
    }
-   
+
 }
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_notidentical_variation.phpt b/tests/lang/operators/operator_notidentical_variation.phpt
index a9fbcf60e10..bae03f85b72 100644
--- a/tests/lang/operators/operator_notidentical_variation.phpt
+++ b/tests/lang/operators/operator_notidentical_variation.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -36,7 +36,7 @@ for ($i = 0; $i < count($validNotIdentical); $i +=2) {
       }
       else {
          echo "FAILED: '$typeToTestVal' === '$compareVal'\n";
-         $failed = true;      
+         $failed = true;
       }
    }
 }
@@ -56,7 +56,7 @@ for ($i = 0; $i < count($invalidNotIdentical); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_notidentical_variation_64bit.phpt b/tests/lang/operators/operator_notidentical_variation_64bit.phpt
index aa5aab7a59c..d24f8b62349 100644
--- a/tests/lang/operators/operator_notidentical_variation_64bit.phpt
+++ b/tests/lang/operators/operator_notidentical_variation_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -57,7 +57,7 @@ for ($i = 0; $i < count($invalidNotIdentical); $i +=2) {
 if ($failed == false) {
    echo "Test Passed\n";
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/operator_spaceship_basic.phpt b/tests/lang/operators/operator_spaceship_basic.phpt
index 81b05167574..13b80612dca 100644
--- a/tests/lang/operators/operator_spaceship_basic.phpt
+++ b/tests/lang/operators/operator_spaceship_basic.phpt
@@ -24,19 +24,19 @@ $toCompare = array(
 // boolean test will result in both sides being converted to boolean so !0 = true and true is not > true for example
 // also note that a string of "0" is converted to false but a string of "0.0" is converted to true
 // false cannot be tested as 0 can never be > 0 or 1
-  true, $valid_false, $valid_true, 
+  true, $valid_false, $valid_true,
   $int1, $valid_int1, $invalid_int1,
   $int2, $valid_int2, $invalid_int2,
   $float1, $valid_float1, $invalid_float1,
   $float2, $valid_float2, $invalid_float2
 );
-  
+
 $failed = false;
 for ($i = 0; $i < count($toCompare); $i +=3) {
    $typeToTest = $toCompare[$i];
    $valid_compares = $toCompare[$i + 1];
    $invalid_compares = $toCompare[$i + 2];
-   
+
    foreach($valid_compares as $compareVal) {
       if (($typeToTest <=> $compareVal) === 1) {
          // do nothing
@@ -60,7 +60,7 @@ for ($i = 0; $i < count($toCompare); $i +=3) {
          $failed = true;
       }
    }
-   
+
    foreach($invalid_compares as $compareVal) {
       if (($typeToTest <=> $compareVal) === 1) {
          echo "FAILED: ('$typeToTest' <=> '$compareVal') === 1\n";
@@ -75,7 +75,7 @@ for ($i = 0; $i < count($toCompare); $i +=3) {
          $failed = true;
       }
    }
-   
+
    if (($typeToTest <=> $typeToTest) === 0) {
       // do nothing
    }
diff --git a/tests/lang/operators/postdec_basiclong_64bit.phpt b/tests/lang/operators/postdec_basiclong_64bit.phpt
index f3e825ca3d1..5d0af4d553f 100644
--- a/tests/lang/operators/postdec_basiclong_64bit.phpt
+++ b/tests/lang/operators/postdec_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -24,7 +24,7 @@ foreach ($longVals as $longVal) {
    $longVal--;
    var_dump($longVal);
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/postdec_variationStr.phpt b/tests/lang/operators/postdec_variationStr.phpt
index 0db326d27e6..da88951e461 100644
--- a/tests/lang/operators/postdec_variationStr.phpt
+++ b/tests/lang/operators/postdec_variationStr.phpt
@@ -14,7 +14,7 @@ foreach ($strVals as $strVal) {
    $strVal--;
    var_dump($strVal);
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/postinc_basiclong_64bit.phpt b/tests/lang/operators/postinc_basiclong_64bit.phpt
index 18e8bddedd6..d1003e22a58 100644
--- a/tests/lang/operators/postinc_basiclong_64bit.phpt
+++ b/tests/lang/operators/postinc_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -24,7 +24,7 @@ foreach ($longVals as $longVal) {
    $longVal++;
    var_dump($longVal);
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/postinc_variationStr.phpt b/tests/lang/operators/postinc_variationStr.phpt
index 35e19888e18..c83d598fb7e 100644
--- a/tests/lang/operators/postinc_variationStr.phpt
+++ b/tests/lang/operators/postinc_variationStr.phpt
@@ -14,7 +14,7 @@ foreach ($strVals as $strVal) {
    $strVal++;
    var_dump($strVal);
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/predec_basiclong_64bit.phpt b/tests/lang/operators/predec_basiclong_64bit.phpt
index b2b11709b31..1f460a06e05 100644
--- a/tests/lang/operators/predec_basiclong_64bit.phpt
+++ b/tests/lang/operators/predec_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(--$longVal);
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/predec_variationStr.phpt b/tests/lang/operators/predec_variationStr.phpt
index 1d1fade74d8..8fb1bffac86 100644
--- a/tests/lang/operators/predec_variationStr.phpt
+++ b/tests/lang/operators/predec_variationStr.phpt
@@ -13,7 +13,7 @@ foreach ($strVals as $strVal) {
    echo "--- testing: '$strVal' ---\n";
    var_dump(--$strVal);
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/preinc_basiclong_64bit.phpt b/tests/lang/operators/preinc_basiclong_64bit.phpt
index e24cc283aa7..40a03f9d7a0 100644
--- a/tests/lang/operators/preinc_basiclong_64bit.phpt
+++ b/tests/lang/operators/preinc_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -23,7 +23,7 @@ foreach ($longVals as $longVal) {
    echo "--- testing: $longVal ---\n";
    var_dump(++$longVal);
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/subtract_basiclong_64bit.phpt b/tests/lang/operators/subtract_basiclong_64bit.phpt
index ca80e3f52d7..0c403f343e5 100644
--- a/tests/lang/operators/subtract_basiclong_64bit.phpt
+++ b/tests/lang/operators/subtract_basiclong_64bit.phpt
@@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
 <?php
- 
+
 define("MAX_64Bit", 9223372036854775807);
 define("MAX_32Bit", 2147483647);
 define("MIN_64Bit", -9223372036854775807 - 1);
@@ -14,7 +14,7 @@ define("MIN_32Bit", -2147483647 - 1);
 
 $longVals = array(
     MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
+    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1,
     MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
 );
 
@@ -24,18 +24,18 @@ error_reporting(E_ERROR);
 
 foreach ($longVals as $longVal) {
    foreach($otherVals as $otherVal) {
-	   echo "--- testing: $longVal - $otherVal ---\n";   
+	   echo "--- testing: $longVal - $otherVal ---\n";
       var_dump($longVal-$otherVal);
    }
 }
 
 foreach ($otherVals as $otherVal) {
    foreach($longVals as $longVal) {
-	   echo "--- testing: $otherVal - $longVal ---\n";   
+	   echo "--- testing: $otherVal - $longVal ---\n";
       var_dump($otherVal-$longVal);
    }
 }
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/operators/subtract_variationStr.phpt b/tests/lang/operators/subtract_variationStr.phpt
index 51b5ed4dca8..393b172fb1b 100644
--- a/tests/lang/operators/subtract_variationStr.phpt
+++ b/tests/lang/operators/subtract_variationStr.phpt
@@ -12,12 +12,12 @@ error_reporting(E_ERROR);
 
 foreach ($strVals as $strVal) {
    foreach($strVals as $otherVal) {
-	   echo "--- testing: '$strVal' - '$otherVal' ---\n";   
+	   echo "--- testing: '$strVal' - '$otherVal' ---\n";
       var_dump($strVal-$otherVal);
    }
 }
 
-   
+
 ?>
 ===DONE===
 --EXPECT--
diff --git a/tests/lang/passByReference_003.phpt b/tests/lang/passByReference_003.phpt
index bbbc564654d..8fe27407f1c 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_005.phpt b/tests/lang/passByReference_005.phpt
index d6374676813..e3b0e21c5c6 100644
--- a/tests/lang/passByReference_005.phpt
+++ b/tests/lang/passByReference_005.phpt
@@ -43,32 +43,32 @@ class C {
 	function v($val) {
 	  $val = "Val changed";
 	}
-	
+
 	function r(&$ref) {
 	  $ref = "Ref changed";
 	}
-	
+
 	function vv($val1, $val2) {
 	  $val1 = "Val1 changed";
 	  $val2 = "Val2 changed";
 	}
-	
+
 	function vr($val, &$ref) {
 	  $val = "Val changed";
 	  $ref = "Ref changed";
 	}
-	
+
 	function rv(&$ref, $val) {
 	  $val = "Val changed";
 	  $ref = "Ref changed";
 	}
-	
+
 	function rr(&$ref1, &$ref2) {
 	  $ref1 = "Ref1 changed";
 	  $ref2 = "Ref2 changed";
 	}
 
-} 
+}
 
 echo "\n ---- Pass by ref / pass by val: functions ----\n";
 unset($u1, $u2);
diff --git a/tests/lang/passByReference_006.phpt b/tests/lang/passByReference_006.phpt
index d3857cac409..f725092618e 100644
--- a/tests/lang/passByReference_006.phpt
+++ b/tests/lang/passByReference_006.phpt
@@ -30,7 +30,7 @@ class C {
 	  $ref5 = "Ref5 changed";
 	}
 
-} 
+}
 
 echo "\n ---- Pass uninitialised array & object by ref: function call ---\n";
 unset($u1, $u2, $u3, $u4, $u5);
diff --git a/tests/lang/passByReference_007.phpt b/tests/lang/passByReference_007.phpt
index 300ce56d7c9..51594da0f33 100644
--- a/tests/lang/passByReference_007.phpt
+++ b/tests/lang/passByReference_007.phpt
@@ -7,7 +7,7 @@ class C {
 		global $a;
 		return $a;
 	}
-	
+
 	static function &sreturnReference() {
 		global $a;
 		return $a;
@@ -17,7 +17,7 @@ class C {
 		global $a;
 		return $a;
 	}
-	
+
 	function &returnReference() {
 		global $a;
 		return $a;
diff --git a/tests/lang/passByReference_008.phpt b/tests/lang/passByReference_008.phpt
index 31f0260c5de..6f00cc4b50b 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 941c361dbca..78e22f5f62a 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_010.phpt b/tests/lang/passByReference_010.phpt
index c2e4ba1eafa..431659a24a4 100644
--- a/tests/lang/passByReference_010.phpt
+++ b/tests/lang/passByReference_010.phpt
@@ -6,30 +6,30 @@ Passing assignments by reference
 function f(&$a) {
   var_dump($a);
   $a = "a.changed";
-} 
+}
 
 echo "\n\n---> Pass constant assignment by reference:\n";
 f($a="a.original");
-var_dump($a); 
+var_dump($a);
 
 echo "\n\n---> Pass variable assignment by reference:\n";
 unset($a);
 $a = "a.original";
 f($b = $a);
-var_dump($a); 
+var_dump($a);
 
 echo "\n\n---> Pass reference assignment by reference:\n";
 unset($a, $b);
 $a = "a.original";
 f($b =& $a);
-var_dump($a); 
+var_dump($a);
 
 echo "\n\n---> Pass concat assignment by reference:\n";
 unset($a, $b);
 $b = "b.original";
 $a = "a.original";
 f($b .= $a);
-var_dump($a); 
+var_dump($a);
 
 ?>
 --EXPECTF--
diff --git a/tests/lang/passByReference_012.phpt b/tests/lang/passByReference_012.phpt
index 3ed17539b61..f3e943e2849 100644
--- a/tests/lang/passByReference_012.phpt
+++ b/tests/lang/passByReference_012.phpt
@@ -10,7 +10,7 @@ error_reporting(E_ALL | E_STRICT | E_NOTICE);
 $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 99365f1b144..0880a8b7a55 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/lang/returnByReference.004.phpt b/tests/lang/returnByReference.004.phpt
index b37506ce0a4..1b01bafae6d 100644
--- a/tests/lang/returnByReference.004.phpt
+++ b/tests/lang/returnByReference.004.phpt
@@ -10,7 +10,7 @@ Class C {
 	static function &returnConstantByRef() {
 		return 100;
 	}
-	
+
 	static function &returnVariableByRef() {
 		return $GLOBALS['a'];
 	}
diff --git a/tests/lang/returnByReference.005.phpt b/tests/lang/returnByReference.005.phpt
index adb11617c40..d4465539738 100644
--- a/tests/lang/returnByReference.005.phpt
+++ b/tests/lang/returnByReference.005.phpt
@@ -6,11 +6,11 @@ Class C {
 	function returnConstantByValue() {
 		return 100;
 	}
-	
+
 	function &returnConstantByRef() {
 		return 100;
 	}
-	
+
 	static function &returnVariableByRef() {
 		return $GLOBALS['a'];
 	}
diff --git a/tests/lang/returnByReference.007.phpt b/tests/lang/returnByReference.007.phpt
index 45fa0ddc880..1da209e6b3d 100644
--- a/tests/lang/returnByReference.007.phpt
+++ b/tests/lang/returnByReference.007.phpt
@@ -8,15 +8,15 @@ class C {
 	static function returnConstantByValue() {
 		return 100;
 	}
-	
+
 	static function &returnConstantByRef() {
 		return 100;
 	}
-	
+
 	static function &returnVariableByRef() {
 		return $GLOBALS['a'];
 	}
-	
+
 	static function &returnFunctionCallByRef($functionToCall) {
 		return C::$functionToCall();
 	}
diff --git a/tests/lang/returnByReference.008.phpt b/tests/lang/returnByReference.008.phpt
index 3774a917c5c..2e27208cb68 100644
--- a/tests/lang/returnByReference.008.phpt
+++ b/tests/lang/returnByReference.008.phpt
@@ -8,15 +8,15 @@ class C {
 	function returnConstantByValue() {
 		return 100;
 	}
-	
+
 	function &returnConstantByRef() {
 		return 100;
 	}
-	
+
 	function &returnVariableByRef() {
 		return $GLOBALS['a'];
 	}
-	
+
 	function &returnFunctionCallByRef($functionToCall) {
 		return $this->$functionToCall();
 	}
diff --git a/tests/lang/returnByReference.009.phpt b/tests/lang/returnByReference.009.phpt
index 9e7470edbc2..0d51a22158e 100644
--- a/tests/lang/returnByReference.009.phpt
+++ b/tests/lang/returnByReference.009.phpt
@@ -6,7 +6,7 @@ Returning a references returned by another function
 
 function &returnVarByRef () {
     $b=1;
-	return $b; 
+	return $b;
 }
 
 function &testReturnVarByRef() {
@@ -14,7 +14,7 @@ function &testReturnVarByRef() {
 }
 
 function returnVal () {
-return 1; 
+return 1;
 }
 
 function &testReturnValByRef() {
diff --git a/tests/lang/static_basic_001.phpt b/tests/lang/static_basic_001.phpt
index e7a9ff163f0..47da74d8ce2 100644
--- a/tests/lang/static_basic_001.phpt
+++ b/tests/lang/static_basic_001.phpt
@@ -5,12 +5,12 @@ Static keyword - basic tests
 
 echo "\nSame variable used as static and non static.\n";
 function staticNonStatic() {
-	echo "---------\n";	
+	echo "---------\n";
 	$a=0;
-	echo "$a\n";	
+	echo "$a\n";
 	static $a=10;
 	echo "$a\n";
-	$a++;	
+	$a++;
 }
 staticNonStatic();
 staticNonStatic();
diff --git a/tests/lang/static_basic_002.phpt b/tests/lang/static_basic_002.phpt
index 06e2f724ecf..7e4e0bc3f42 100644
--- a/tests/lang/static_basic_002.phpt
+++ b/tests/lang/static_basic_002.phpt
@@ -15,7 +15,7 @@ var_dump($a);
 function foo() {
 	static $a = 13;
 	static $a = 14;
-	
+
 	var_dump($a);
 }
 
diff --git a/tests/lang/static_variation_001.phpt b/tests/lang/static_variation_001.phpt
index a08c53fef79..e7727a3a722 100644
--- a/tests/lang/static_variation_001.phpt
+++ b/tests/lang/static_variation_001.phpt
@@ -12,9 +12,9 @@ function f1() {
 		static $a = array(4,5,6);
 		var_dump($a);
 	}
-	
+
 	var_dump($a);
-	
+
 }
 
 f1();
@@ -25,12 +25,12 @@ eval(' static $b = array(10,11,12); ');
 
 function f2() {
 	eval(' static $b = array(1,2,3); ');
-	
+
 	function g2a() {
 		eval(' static $b = array(4,5,6); ');
-		var_dump($b);		
+		var_dump($b);
 	}
-	
+
 	eval('function g2b() { static $b = array(7, 8, 9); var_dump($b); } ');
 	var_dump($b);
 }
diff --git a/tests/lang/static_variation_002.phpt b/tests/lang/static_variation_002.phpt
index 54567de768c..9a33b9d0409 100644
--- a/tests/lang/static_variation_002.phpt
+++ b/tests/lang/static_variation_002.phpt
@@ -7,7 +7,7 @@ Class C {
 	function f() {
 		static $a = array(1,2,3);
 		eval(' static $k = array(4,5,6); ');
-		
+
 		function cfg() {
 			static $a = array(7,8,9);
 			eval(' static $k = array(10,11,12); ');
diff --git a/tests/lang/this_assignment.phpt b/tests/lang/this_assignment.phpt
index 14644d69a97..a7c76174a54 100644
--- a/tests/lang/this_assignment.phpt
+++ b/tests/lang/this_assignment.phpt
@@ -6,7 +6,7 @@ class first {
 
    function me() { echo "first"; }
 
-   function who() { 
+   function who() {
      global $a,$b;
      $this->me();
      $a->me();
@@ -20,7 +20,7 @@ class first {
 
 class second {
 
-   function who() { 
+   function who() {
       global $a,$b;
       $this->me();
       $a->me();
diff --git a/tests/output/bug60321.phpt b/tests/output/bug60321.phpt
index 9802a57ccd5..e9c109dbf7b 100644
--- a/tests/output/bug60321.phpt
+++ b/tests/output/bug60321.phpt
@@ -2,7 +2,7 @@
 Bug #60321 (ob_get_status(true) no longer returns an array when buffer is empty)
 --FILE--
 <?php
-$return = ob_get_status(true);                                                  
+$return = ob_get_status(true);
 var_dump($return);
 --EXPECT--
 array(0) {
diff --git a/tests/output/bug65593.phpt b/tests/output/bug65593.phpt
index 3375a6bf08f..2e40afa0761 100644
--- a/tests/output/bug65593.phpt
+++ b/tests/output/bug65593.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #65593 (ob_start(function(){ob_start();});)
 --FILE--
-<?php 
+<?php
 echo "Test\n";
 
 ob_start(function(){ob_start();});
diff --git a/tests/output/flush_basic_001.phpt b/tests/output/flush_basic_001.phpt
index 1cc363d63ca..fb1ce2c208d 100644
--- a/tests/output/flush_basic_001.phpt
+++ b/tests/output/flush_basic_001.phpt
@@ -2,11 +2,11 @@
 Test basic functionality of flush()
 --FILE--
 <?php
-/* 
+/*
  * proto void flush(void)
  * Function is implemented in ext/standard/basic_functions.c.
  */
-  
+
 // Verify return type
 var_dump(flush());
 
diff --git a/tests/output/flush_error_001.phpt b/tests/output/flush_error_001.phpt
index 1f079e6009f..e80f69c6b8b 100644
--- a/tests/output/flush_error_001.phpt
+++ b/tests/output/flush_error_001.phpt
@@ -2,7 +2,7 @@
 Test wrong number of arguments for flush() (no impact)
 --FILE--
 <?php
-/* 
+/*
  * proto void flush(void)
  * Function is implemented in ext/standard/basic_functions.c.
  */
diff --git a/tests/output/ob_clean_basic_001.phpt b/tests/output/ob_clean_basic_001.phpt
index afaa7e2f4a5..bd91676b124 100644
--- a/tests/output/ob_clean_basic_001.phpt
+++ b/tests/output/ob_clean_basic_001.phpt
@@ -1,11 +1,11 @@
 --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: 
+ * Alias to functions:
  */
 
 echo "*** Testing ob_clean() : basic functionality ***\n";
diff --git a/tests/output/ob_clean_error_001.phpt b/tests/output/ob_clean_error_001.phpt
index 8060c2be8b5..fffe4840743 100644
--- a/tests/output/ob_clean_error_001.phpt
+++ b/tests/output/ob_clean_error_001.phpt
@@ -1,11 +1,11 @@
 --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: 
+ * Alias to functions:
  */
 
 echo "*** Testing ob_clean() : error conditions ***\n";
diff --git a/tests/output/ob_end_clean_basic_001.phpt b/tests/output/ob_end_clean_basic_001.phpt
index 54e840bdbd9..87942c2f6d7 100644
--- a/tests/output/ob_end_clean_basic_001.phpt
+++ b/tests/output/ob_end_clean_basic_001.phpt
@@ -2,10 +2,10 @@
 Test return type and value, as well as basic behaviour, for ob_end_clean()
 --FILE--
 <?php
-/* 
+/*
  * proto bool ob_end_clean(void)
  * Function is implemented in main/output.c
-*/ 
+*/
 
 var_dump(ob_end_clean());
 
diff --git a/tests/output/ob_end_clean_error_001.phpt b/tests/output/ob_end_clean_error_001.phpt
index 0279db7b414..09bacaa081d 100644
--- a/tests/output/ob_end_clean_error_001.phpt
+++ b/tests/output/ob_end_clean_error_001.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for ob_end_clean()
 --FILE--
 <?php
-/* 
+/*
  * proto bool ob_end_clean(void)
  * Function is implemented in main/output.c
-*/ 
+*/
 
 $extra_arg = 1;
 
diff --git a/tests/output/ob_end_flush_basic_001.phpt b/tests/output/ob_end_flush_basic_001.phpt
index cba78027619..811d6a0761b 100644
--- a/tests/output/ob_end_flush_basic_001.phpt
+++ b/tests/output/ob_end_flush_basic_001.phpt
@@ -1,11 +1,11 @@
 --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: 
+ * Alias to functions:
  */
 
 echo "*** Testing ob_end_flush() : basic functionality ***\n";
diff --git a/tests/output/ob_end_flush_error_001.phpt b/tests/output/ob_end_flush_error_001.phpt
index 2cd9a64e0d6..e9c15bd05f2 100644
--- a/tests/output/ob_end_flush_error_001.phpt
+++ b/tests/output/ob_end_flush_error_001.phpt
@@ -1,11 +1,11 @@
 --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: 
+ * Alias to functions:
  */
 
 echo "*** Testing ob_end_flush() : error conditions ***\n";
diff --git a/tests/output/ob_flush_basic_001.phpt b/tests/output/ob_flush_basic_001.phpt
index 57de5e31adb..e53c7e5a23a 100644
--- a/tests/output/ob_flush_basic_001.phpt
+++ b/tests/output/ob_flush_basic_001.phpt
@@ -1,11 +1,11 @@
 --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: 
+ * Alias to functions:
  */
 
 echo "*** Testing ob_flush() : basic functionality ***\n";
diff --git a/tests/output/ob_flush_error_001.phpt b/tests/output/ob_flush_error_001.phpt
index f24a19b8cec..6e95810dce3 100644
--- a/tests/output/ob_flush_error_001.phpt
+++ b/tests/output/ob_flush_error_001.phpt
@@ -1,11 +1,11 @@
 --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: 
+ * Alias to functions:
  */
 
 echo "*** Testing ob_flush() : error conditions ***\n";
diff --git a/tests/output/ob_get_clean_basic_001.phpt b/tests/output/ob_get_clean_basic_001.phpt
index 635b58abf93..2f55af41011 100644
--- a/tests/output/ob_get_clean_basic_001.phpt
+++ b/tests/output/ob_get_clean_basic_001.phpt
@@ -2,10 +2,10 @@
 Test return type and value, as well as basic behaviour, of ob_get_clean()
 --FILE--
 <?php
-/* 
+/*
  * proto bool ob_get_clean(void)
  * Function is implemented in main/output.c
-*/ 
+*/
 
 var_dump(ob_get_clean());
 
diff --git a/tests/output/ob_get_clean_basic_002.phpt b/tests/output/ob_get_clean_basic_002.phpt
index c877642e231..9b744385946 100644
--- a/tests/output/ob_get_clean_basic_002.phpt
+++ b/tests/output/ob_get_clean_basic_002.phpt
@@ -2,10 +2,10 @@
 Test basic behaviour of ob_get_clean()
 --FILE--
 <?php
-/* 
+/*
  * proto bool ob_get_clean(void)
  * Function is implemented in main/output.c
-*/ 
+*/
 
 ob_start();
 
diff --git a/tests/output/ob_get_clean_error_001.phpt b/tests/output/ob_get_clean_error_001.phpt
index d6e2dd7b619..563e62c35a7 100644
--- a/tests/output/ob_get_clean_error_001.phpt
+++ b/tests/output/ob_get_clean_error_001.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for ob_get_clean()
 --FILE--
 <?php
-/* 
+/*
  * proto bool ob_get_clean(void)
  * Function is implemented in main/output.c
-*/ 
+*/
 
 $extra_arg = 1;
 
diff --git a/tests/output/ob_get_contents_basic_001.phpt b/tests/output/ob_get_contents_basic_001.phpt
index a2c70d790ac..3b9593339ba 100644
--- a/tests/output/ob_get_contents_basic_001.phpt
+++ b/tests/output/ob_get_contents_basic_001.phpt
@@ -1,13 +1,13 @@
 --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: 
+ * Alias to functions:
  */
 
 
@@ -35,14 +35,14 @@ ob_end_flush();
 
 echo "\ncheck that contents disappear after a flush\n";
 ob_start();
-echo "Hello World\n"; 
+echo "Hello World\n";
 ob_flush();
 var_dump(ob_get_contents());
 ob_end_flush();
 
 echo "\ncheck that no contents found after an end\n";
 ob_start();
-echo "Hello World\n"; 
+echo "Hello World\n";
 ob_end_flush();
 var_dump(ob_get_contents());
 
diff --git a/tests/output/ob_get_contents_error_001.phpt b/tests/output/ob_get_contents_error_001.phpt
index 94e3f313681..2c1c043ba75 100644
--- a/tests/output/ob_get_contents_error_001.phpt
+++ b/tests/output/ob_get_contents_error_001.phpt
@@ -1,13 +1,13 @@
 --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: 
+ * Alias to functions:
  */
 
 
diff --git a/tests/output/ob_get_length_basic_001.phpt b/tests/output/ob_get_length_basic_001.phpt
index 88d6d27850b..43fafcbbf95 100644
--- a/tests/output/ob_get_length_basic_001.phpt
+++ b/tests/output/ob_get_length_basic_001.phpt
@@ -2,10 +2,10 @@
 Test return type and value, as well as basic behaviour, of ob_get_length()
 --FILE--
 <?php
-/* 
+/*
  * proto int ob_get_length(void)
  * Function is implemented in main/output.c
-*/ 
+*/
 
 echo "No output buffers\n";
 var_dump(ob_get_length());
diff --git a/tests/output/ob_get_length_error_001.phpt b/tests/output/ob_get_length_error_001.phpt
index 3de0cb10a8f..8e4318122bb 100644
--- a/tests/output/ob_get_length_error_001.phpt
+++ b/tests/output/ob_get_length_error_001.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments for ob_get_length()
 --FILE--
 <?php
-/* 
+/*
  * proto int ob_get_length(void)
  * Function is implemented in main/output.c
-*/ 
+*/
 
 $extra_arg = 1;
 
diff --git a/tests/output/ob_get_level_basic_001.phpt b/tests/output/ob_get_level_basic_001.phpt
index 65f3291355d..4a6c84785bb 100644
--- a/tests/output/ob_get_level_basic_001.phpt
+++ b/tests/output/ob_get_level_basic_001.phpt
@@ -1,11 +1,11 @@
 --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: 
+ * Alias to functions:
  */
 
 echo "*** Testing ob_get_level() : basic functionality ***\n";
diff --git a/tests/output/ob_get_level_error_001.phpt b/tests/output/ob_get_level_error_001.phpt
index 9694da54a00..00e9eca5557 100644
--- a/tests/output/ob_get_level_error_001.phpt
+++ b/tests/output/ob_get_level_error_001.phpt
@@ -1,11 +1,11 @@
 --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: 
+ * Alias to functions:
  */
 
 echo "*** Testing ob_get_level() : error conditions ***\n";
diff --git a/tests/output/ob_implicit_flush_basic_001.phpt b/tests/output/ob_implicit_flush_basic_001.phpt
index ab6f6a7a6e0..3f06715cac0 100644
--- a/tests/output/ob_implicit_flush_basic_001.phpt
+++ b/tests/output/ob_implicit_flush_basic_001.phpt
@@ -3,9 +3,9 @@ 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: 
+ * Alias to functions:
  */
 
 echo "*** Testing ob_implicit_flush() : check return value ***\n";
diff --git a/tests/output/ob_implicit_flush_basic_002.phpt b/tests/output/ob_implicit_flush_basic_002.phpt
index ad278e34bda..e301beb23c1 100644
--- a/tests/output/ob_implicit_flush_basic_002.phpt
+++ b/tests/output/ob_implicit_flush_basic_002.phpt
@@ -3,9 +3,9 @@ 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: 
+ * Alias to functions:
  */
 
 echo "*** Testing ob_implicit_flush() : ensure implicit flushing does not apply to user buffers. ***\n";
diff --git a/tests/output/ob_implicit_flush_error_001.phpt b/tests/output/ob_implicit_flush_error_001.phpt
index 1fac1b34d99..63c892e0c48 100644
--- a/tests/output/ob_implicit_flush_error_001.phpt
+++ b/tests/output/ob_implicit_flush_error_001.phpt
@@ -3,9 +3,9 @@ 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: 
+ * Alias to functions:
  */
 
 echo "*** Testing ob_implicit_flush() : error conditions ***\n";
diff --git a/tests/output/ob_implicit_flush_variation_001.phpt b/tests/output/ob_implicit_flush_variation_001.phpt
index 64c911d4476..cc4cfa2eb1d 100644
--- a/tests/output/ob_implicit_flush_variation_001.phpt
+++ b/tests/output/ob_implicit_flush_variation_001.phpt
@@ -1,13 +1,13 @@
 --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: 
+ * Alias to functions:
  */
 
 echo "*** Testing ob_implicit_flush() : usage variation ***\n";
diff --git a/tests/output/ob_start_basic_001.phpt b/tests/output/ob_start_basic_001.phpt
index 02275c62c5f..0b06f6077f3 100644
--- a/tests/output/ob_start_basic_001.phpt
+++ b/tests/output/ob_start_basic_001.phpt
@@ -2,10 +2,10 @@
 Test return type and value for ob_start()
 --FILE--
 <?php
-/* 
+/*
  * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]])
  * Function is implemented in main/output.c
-*/ 
+*/
 
 var_dump(ob_start());
 
diff --git a/tests/output/ob_start_basic_004.phpt b/tests/output/ob_start_basic_004.phpt
index c71ac068c44..5ce68bdc351 100644
--- a/tests/output/ob_start_basic_004.phpt
+++ b/tests/output/ob_start_basic_004.phpt
@@ -1,13 +1,13 @@
 --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--
 <?php
-/* 
+/*
  * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]])
  * Function is implemented in main/output.c
-*/ 
+*/
 // In HEAD, $chunk_size value of 1 should not have any special behaviour (http://marc.info/?l=php-internals&m=123476465621346&w=2).
 function callback($string) {
 	global $callback_invocations;
diff --git a/tests/output/ob_start_basic_005.phpt b/tests/output/ob_start_basic_005.phpt
index 4048ad25a28..7cab6ed35fd 100644
--- a/tests/output/ob_start_basic_005.phpt
+++ b/tests/output/ob_start_basic_005.phpt
@@ -2,10 +2,10 @@
 ob_start(): non-static method as static callbacks.
 --FILE--
 <?php
-/* 
+/*
  * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]])
  * Function is implemented in main/output.c
-*/ 
+*/
 
 Class C {
 	function h($string) {
diff --git a/tests/output/ob_start_basic_006.phpt b/tests/output/ob_start_basic_006.phpt
index 464e71be331..d4d0fcc1491 100644
--- a/tests/output/ob_start_basic_006.phpt
+++ b/tests/output/ob_start_basic_006.phpt
@@ -2,10 +2,10 @@
 ob_start(): ensure multiple buffer initialization with a single call using arrays is not supported on PHP6 (http://bugs.php.net/42641)
 --FILE--
 <?php
-/* 
+/*
  * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]])
  * Function is implemented in main/output.c
-*/ 
+*/
 
 function f($string) {
 	static $i=0;
@@ -27,7 +27,7 @@ Class C {
 		$len = strlen($string);
 		return "C::g[call:$i; len:$len] - $string\n";
 	}
-	
+
 	function h($string) {
 		static $i=0;
 		$i++;
diff --git a/tests/output/ob_start_callbacks.phpt b/tests/output/ob_start_callbacks.phpt
index da52d85f7f2..6815bccd63c 100644
--- a/tests/output/ob_start_callbacks.phpt
+++ b/tests/output/ob_start_callbacks.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test ob_start() with callbacks in variables
 --FILE--
-<?php 
+<?php
 
 // Closure in variable
 $a = function ($s) { return strtoupper($s); };
diff --git a/tests/output/ob_start_error_001.phpt b/tests/output/ob_start_error_001.phpt
index 34aa13d802c..9a3dce003ce 100644
--- a/tests/output/ob_start_error_001.phpt
+++ b/tests/output/ob_start_error_001.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments and wrong arg types for ob_start()
 --FILE--
 <?php
-/* 
+/*
  * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]])
  * Function is implemented in main/output.c
-*/ 
+*/
 
 function justPrint($str) {
 	return $str;
diff --git a/tests/output/ob_start_error_002.phpt b/tests/output/ob_start_error_002.phpt
index 38c789908db..7cac3ee4b36 100644
--- a/tests/output/ob_start_error_002.phpt
+++ b/tests/output/ob_start_error_002.phpt
@@ -2,10 +2,10 @@
 Test wrong number of arguments and wrong arg types for ob_start()
 --FILE--
 <?php
-/* 
+/*
  * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]])
  * Function is implemented in main/output.c
-*/ 
+*/
 
 Class C {
 	static function f($str) {
diff --git a/tests/output/ob_start_error_003.phpt b/tests/output/ob_start_error_003.phpt
index 7fa292a7392..3af56f7a2bb 100644
--- a/tests/output/ob_start_error_003.phpt
+++ b/tests/output/ob_start_error_003.phpt
@@ -2,10 +2,10 @@
 Test ob_start() with object supplied but no method.
 --FILE--
 <?php
-/* 
+/*
  * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]])
  * Function is implemented in main/output.c
-*/ 
+*/
 
 Class C {
 }
diff --git a/tests/output/ob_start_error_004.phpt b/tests/output/ob_start_error_004.phpt
index 7ddf998557d..83f5dc8d1c3 100644
--- a/tests/output/ob_start_error_004.phpt
+++ b/tests/output/ob_start_error_004.phpt
@@ -2,10 +2,10 @@
 Test ob_start() with non existent callback method.
 --FILE--
 <?php
-/* 
+/*
  * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]])
  * Function is implemented in main/output.c
-*/ 
+*/
 
 Class C {
 }
diff --git a/tests/output/ob_start_error_005.phpt b/tests/output/ob_start_error_005.phpt
index 134f2249b77..d6f9dc4c104 100644
--- a/tests/output/ob_start_error_005.phpt
+++ b/tests/output/ob_start_error_005.phpt
@@ -3,10 +3,10 @@ ob_start(): ensure buffers can't be added from within callback.
 --FILE--
 <?php
 
-/* 
+/*
  * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]])
  * Function is implemented in main/output.c
-*/ 
+*/
 
 function f($str) {
 	ob_start();
diff --git a/tests/run-test/test005.phpt b/tests/run-test/test005.phpt
index ef644a4fb15..a95281fc137 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 41d22d8e718..c289e7a6968 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 9814fa12f78..d247eb36c28 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/security/open_basedir_dir.phpt b/tests/security/open_basedir_dir.phpt
index b1d6272bdc1..6dababa54ba 100644
--- a/tests/security/open_basedir_dir.phpt
+++ b/tests/security/open_basedir_dir.phpt
@@ -8,7 +8,7 @@ require_once "open_basedir.inc";
 $initdir = getcwd();
 
 test_open_basedir_before("dir");
-test_open_basedir_error("dir");     
+test_open_basedir_error("dir");
 
 var_dump(dir($initdir."/test/ok/"));
 var_dump(dir($initdir."/test/ok"));
diff --git a/tests/security/open_basedir_disk_free_space.phpt b/tests/security/open_basedir_disk_free_space.phpt
index 365300ae61d..e04ed410c4a 100644
--- a/tests/security/open_basedir_disk_free_space.phpt
+++ b/tests/security/open_basedir_disk_free_space.phpt
@@ -7,7 +7,7 @@ open_basedir=.
 require_once "open_basedir.inc";
 $initdir = getcwd();
 test_open_basedir_before("disk_free_space");
-test_open_basedir_error("disk_free_space");     
+test_open_basedir_error("disk_free_space");
 
 var_dump(disk_free_space($initdir."/test/ok"));
 test_open_basedir_after("disk_free_space");
diff --git a/tests/security/open_basedir_file.phpt b/tests/security/open_basedir_file.phpt
index ad222e894bc..e319482f7da 100644
--- a/tests/security/open_basedir_file.phpt
+++ b/tests/security/open_basedir_file.phpt
@@ -8,7 +8,7 @@ require_once "open_basedir.inc";
 $initdir = getcwd();
 test_open_basedir_before("file");
 test_open_basedir_error("file");
-     
+
 var_dump(file("ok.txt"));
 var_dump(file("../ok/ok.txt"));
 var_dump(file($initdir."/test/ok/ok.txt"));
diff --git a/tests/security/open_basedir_file_get_contents.phpt b/tests/security/open_basedir_file_get_contents.phpt
index 8ee5ddb793b..b5a34de0749 100644
--- a/tests/security/open_basedir_file_get_contents.phpt
+++ b/tests/security/open_basedir_file_get_contents.phpt
@@ -8,7 +8,7 @@ require_once "open_basedir.inc";
 $initdir = getcwd();
 test_open_basedir_before("file_get_contents");
 test_open_basedir_error("file_get_contents");
-     
+
 var_dump(file_get_contents("ok.txt"));
 var_dump(file_get_contents("../ok/ok.txt"));
 var_dump(file_get_contents($initdir."/test/ok/ok.txt"));
diff --git a/tests/security/open_basedir_is_executable.phpt b/tests/security/open_basedir_is_executable.phpt
index 375d4277cd2..f0d8f20ba46 100644
--- a/tests/security/open_basedir_is_executable.phpt
+++ b/tests/security/open_basedir_is_executable.phpt
@@ -7,7 +7,7 @@ open_basedir=.
 require_once "open_basedir.inc";
 $initdir = getcwd();
 test_open_basedir_before("is_executable");
-test_open_basedir_error("is_executable");     
+test_open_basedir_error("is_executable");
 
 var_dump(is_executable("ok.txt"));
 var_dump(is_executable("../ok/ok.txt"));
diff --git a/tests/security/open_basedir_opendir.phpt b/tests/security/open_basedir_opendir.phpt
index 774b8535692..fc3111e3618 100644
--- a/tests/security/open_basedir_opendir.phpt
+++ b/tests/security/open_basedir_opendir.phpt
@@ -7,7 +7,7 @@ open_basedir=.
 require_once "open_basedir.inc";
 $initdir = getcwd();
 test_open_basedir_before("opendir");
-test_open_basedir_error("opendir");     
+test_open_basedir_error("opendir");
 
 var_dump(opendir($initdir."/test/ok/"));
 var_dump(opendir($initdir."/test/ok"));
diff --git a/tests/security/open_basedir_scandir.phpt b/tests/security/open_basedir_scandir.phpt
index caffaa1e5d9..3ef9b153f44 100644
--- a/tests/security/open_basedir_scandir.phpt
+++ b/tests/security/open_basedir_scandir.phpt
@@ -7,7 +7,7 @@ open_basedir=.
 require_once "open_basedir.inc";
 $initdir = getcwd();
 test_open_basedir_before("scandir");
-test_open_basedir_error("scandir");     
+test_open_basedir_error("scandir");
 
 var_dump(scandir($initdir."/test/ok/"));
 var_dump(scandir($initdir."/test/ok"));
diff --git a/tests/strings/001.phpt b/tests/strings/001.phpt
index 98ceceb350e..bf1fb677117 100644
--- a/tests/strings/001.phpt
+++ b/tests/strings/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 String functions
 --FILE--
-<?php 
+<?php
 
 error_reporting(0);
 
diff --git a/tests/strings/002.phpt b/tests/strings/002.phpt
index 7b95a256450..5e820910884 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/004.phpt b/tests/strings/004.phpt
index 7bcb452937d..44bb000d14a 100644
--- a/tests/strings/004.phpt
+++ b/tests/strings/004.phpt
@@ -7,7 +7,7 @@ highlight.keyword=#007700
 highlight.default=#0000BB
 highlight.html=#000000
 --FILE--
-<?php 
+<?php
 $var = highlight_string("<br /><?php echo \"foo\"; ?><br />");
 $var = highlight_string("<br /><?php echo \"bar\"; ?><br />", TRUE);
 echo "\n[$var]\n";
diff --git a/tests/strings/bug22592.phpt b/tests/strings/bug22592.phpt
index 3443c328593..c66e27d880c 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);