Trim trailing whitespace in *.phpt

22 files changed, 128 insertions, 128 deletions

diff --git a/ext/standard/tests/mail/bug66535.phpt b/ext/standard/tests/mail/bug66535.phpt
index db1f449cb6..f0a5d5ea85 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 bc485de678..f81d32403e 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 79615f31b5..c3f22d36d5 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 2f810e2562..b6ed463edc 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 46abdba7c8..44a06651ad 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 c5f49dd73a..f5bc578558 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 58957c84a9..123195e5ec 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 70f32df40f..ddc5571c7e 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 60ad009190..aa1e0b1ecd 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 3e648e5cac..3bab805649 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 de2407a740..c7f8ff9824 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 8d755ebb86..c6cc005dd5 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 fc50498347..eb4c47271f 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 892d92391e..dedb1e3ff8 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 1caa68c068..5d1ec6b7a3 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 c8e45242e2..c90e909c6f 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 871b6da0be..efecd162e9 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 a8eb6bec79..fd40f97b68 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 f0e44241b1..7e78bcfade 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 dd7fd937e2..258bf31377 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 817cc36af4..4c8ee2ff6c 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 4062fae981..ae6e308715 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";
 }