Trim trailing whitespace in tests

62 files changed, 109 insertions, 109 deletions

diff --git a/sapi/cgi/tests/002.phpt b/sapi/cgi/tests/002.phpt
index fda8fcbe04..91db184fcb 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 1ba94f27ef..a4d3058624 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 0e7117080d..c41df11acc 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
@@ -16,8 +16,8 @@ $filename = dirname(__FILE__).'/004.test.php';
 $code ='
 <?php
 
-class test { 
-	private $pri; 
+class test {
+	private $pri;
 }
 
 var_dump(test::$pri);
@@ -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 855dc57de3..1674f16fb9 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";
 ?>
---EXPECT--	
+--EXPECT--
 string(51) "Interactive mode enabled
 
 No input file specified.
diff --git a/sapi/cgi/tests/005.phpt b/sapi/cgi/tests/005.phpt
index c36d5939c7..6b41f7a99f 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";
 ?>
---EXPECT--	
+--EXPECT--
 string(51) "No input file specified.
 Interactive mode enabled
 
diff --git a/sapi/cgi/tests/006.phpt b/sapi/cgi/tests/006.phpt
index 08bfbf5d6c..bc98656b49 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 1c8b0eb1c5..950f451083 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===
---EXPECT--	
+--EXPECT--
 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 7537664cc8..f0df0bae42 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 fd36e3024f..3750600671 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/cli/tests/001.phpt b/sapi/cli/tests/001.phpt
index 6fbd608a6f..744918a373 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-unix.phpt b/sapi/cli/tests/002-unix.phpt
index c67b93eba2..2be668f188 100644
--- a/sapi/cli/tests/002-unix.phpt
+++ b/sapi/cli/tests/002-unix.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";
 ?>
---EXPECT--	
+--EXPECT--
 string(18) "string(5) "hello"
 "
 Done
diff --git a/sapi/cli/tests/002.phpt b/sapi/cli/tests/002.phpt
index 496715376e..9fb2465ee4 100644
--- a/sapi/cli/tests/002.phpt
+++ b/sapi/cli/tests/002.phpt
@@ -13,7 +13,7 @@ var_dump(`$php -n -r "var_dump('hello');"`);
 
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 string(18) "string(5) "hello"
 "
 Done
diff --git a/sapi/cli/tests/003-2.phpt b/sapi/cli/tests/003-2.phpt
index 24c3b591cc..6b8957e644 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===
---EXPECT--	
+--EXPECT--
 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 aff5a845b8..6584e2c7be 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";
 ?>
---EXPECT--	
+--EXPECT--
 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 1a5473987f..78158ba70a 100644
--- a/sapi/cli/tests/004.phpt
+++ b/sapi/cli/tests/004.phpt
@@ -2,7 +2,7 @@
 show information about function
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/005.phpt b/sapi/cli/tests/005.phpt
index 2a4b8d955d..0a366b6975 100644
--- a/sapi/cli/tests/005.phpt
+++ b/sapi/cli/tests/005.phpt
@@ -2,7 +2,7 @@
 show information about class
 --SKIPIF--
 <?php
-include "skipif.inc"; 
+include "skipif.inc";
 ?>
 --FILE--
 <?php
diff --git a/sapi/cli/tests/007.phpt b/sapi/cli/tests/007.phpt
index d50c38149a..dd8e17163c 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";
 ?>
---EXPECT--	
+--EXPECT--
 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 0121d94a27..d795c98879 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");
 }
@@ -16,8 +16,8 @@ $filename = dirname(__FILE__).'/008.test.php';
 $code ='
 <?php
 
-class test { 
-	private $pri; 
+class test {
+	private $pri;
 }
 
 var_dump(test::$pri);
@@ -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 5e72e39f03..c110966458 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";
 ?>
---EXPECT--	
+--EXPECT--
 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 cec29c6b4a..73198ad28b 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";
 ?>
---EXPECT--	
+--EXPECT--
 string(21) "int(1)
 int(1)
 int(1)
diff --git a/sapi/cli/tests/010.phpt b/sapi/cli/tests/010.phpt
index 198eef4bed..ddcae81ed8 100644
--- a/sapi/cli/tests/010.phpt
+++ b/sapi/cli/tests/010.phpt
@@ -1,8 +1,8 @@
 --TEST--
 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");
 ?>
---EXPECT--	
+--EXPECT--
 string(25) "
 string(10) "test
 hello"
diff --git a/sapi/cli/tests/011.phpt b/sapi/cli/tests/011.phpt
index 6154693517..1fbe93d703 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 90527143e5..08ec4ecb1c 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";
 ?>
---EXPECT--	
+--EXPECT--
 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 af5a82ecd7..9e17c009c2 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";
 ?>
---EXPECT--	
+--EXPECT--
 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 84c6d16204..1794d78b54 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";
 ?>
---EXPECT--	
+--EXPECT--
 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 62a007b6e4..01f5328e99 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 cbedb1e7ac..40f079e28d 100644
--- a/sapi/cli/tests/016.phpt
+++ b/sapi/cli/tests/016.phpt
@@ -1,8 +1,8 @@
 --TEST--
 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 a19d0a6bd3..f3c3b60e8b 100644
--- a/sapi/cli/tests/017.phpt
+++ b/sapi/cli/tests/017.phpt
@@ -1,8 +1,8 @@
 --TEST--
 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 56921bd669..8d0e10bc0a 100644
--- a/sapi/cli/tests/018.phpt
+++ b/sapi/cli/tests/018.phpt
@@ -1,8 +1,8 @@
 --TEST--
 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 c98155d8d5..34a4714dd3 100644
--- a/sapi/cli/tests/019.phpt
+++ b/sapi/cli/tests/019.phpt
@@ -1,8 +1,8 @@
 --TEST--
 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 62be4ba31a..c8ceb43d04 100644
--- a/sapi/cli/tests/020.phpt
+++ b/sapi/cli/tests/020.phpt
@@ -1,8 +1,8 @@
 --TEST--
 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 cd27715334..a5d97c326d 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 2a9d7a132a..3b7c6eac19 100644
--- a/sapi/cli/tests/argv_mb.phpt
+++ b/sapi/cli/tests/argv_mb.phpt
@@ -18,7 +18,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 e475fb09b4..87dc8927ff 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 b23f0e28f6..1b29dea31b 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 34381d8e96..4203b7444c 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 f25ddfbca6..e8b497e923 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 27c9f9755a..7e5548aadc 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 3cda764e61..b58db6cfdd 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);
 ?>
---EXPECT--	
+--EXPECT--
 NULL
 NULL
diff --git a/sapi/cli/tests/bug66606_2.phpt b/sapi/cli/tests/bug66606_2.phpt
index c47b7736c0..d8bd6162a4 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 f02f261fbf..6a163d4639 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 3f1083e7ac..c2ed8ddff1 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 93151c15d4..e1fbd90398 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 d8fb8461be..f8aa94edf6 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));
 ?>
---EXPECT--	
+--EXPECT--
 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 5e3bbec18f..9c93de3f92 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 3f9078c8ae..f89245df11 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 c68f1e51b0..ee851b0edd 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 b588b9ee2e..3e8fc5f48d 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 58b2485db5..2d9955c031 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 d63c6abf28..cb4a14cb08 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 fe8f1a98ca..22cf3de344 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 10b9cdbfe9..d60d71b02a 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 23269580fb..cfed0c5531 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 f308ffb226..7210321925 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 663268aea6..42000adbb9 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 513d7ec027..ae1d3f272a 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 28876dc52b..067d504800 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 766c666911..23a8bc40e1 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/fpm/tests/getallheaders.phpt b/sapi/fpm/tests/getallheaders.phpt
index b41f1c6687..b1f9683788 100644
--- a/sapi/fpm/tests/getallheaders.phpt
+++ b/sapi/fpm/tests/getallheaders.phpt
@@ -31,7 +31,7 @@ $tester = new FPM\Tester($cfg, $code);
 $tester->start();
 $tester->expectLogStartNotices();
 $tester->request(
-		'', 
+		'',
 		[
 			'HTTP_X_FOO' => 'BAR',
 			'HTTP_FOO'   => 'foo'
diff --git a/sapi/phpdbg/tests/finish_leave_001.phpt b/sapi/phpdbg/tests/finish_leave_001.phpt
index e345752b00..cac771fd2f 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 16d1b2b840..d3cd74e7da 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 8c50e4b80f..84d9bdb89a 100644
--- a/sapi/tests/test007.phpt
+++ b/sapi/tests/test007.phpt
@@ -40,7 +40,7 @@ phpinfo();
 -----------------------------240723202011929--
 
 --FILE--
-<?php 
+<?php
 print @$_POST['choices'];
 ?>
 --EXPECT--