From 7f6387b59ae1b5d642b0d05afbb14cab07061a9a Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sat, 13 Oct 2018 14:12:55 +0200 Subject: Trim trailing whitespace in source code files --- tests/classes/constants_basic_003.inc | 2 +- tests/classes/interface_optional_arg_003.inc | 2 +- tests/lang/015.inc | 2 +- tests/lang/016.inc | 2 +- tests/lang/023-1.inc | 34 ++++++++++++++-------------- tests/lang/023-2.inc | 2 +- tests/quicktester.inc | 4 ++-- tests/security/open_basedir.inc | 8 +++---- 8 files changed, 28 insertions(+), 28 deletions(-) (limited to 'tests') diff --git a/tests/classes/constants_basic_003.inc b/tests/classes/constants_basic_003.inc index 5eb9065b82..17e067b534 100644 --- a/tests/classes/constants_basic_003.inc +++ b/tests/classes/constants_basic_003.inc @@ -1,5 +1,5 @@ diff --git a/tests/classes/interface_optional_arg_003.inc b/tests/classes/interface_optional_arg_003.inc index 27b3350da0..be2a69a4c6 100644 --- a/tests/classes/interface_optional_arg_003.inc +++ b/tests/classes/interface_optional_arg_003.inc @@ -1,4 +1,4 @@ - diff --git a/tests/lang/016.inc b/tests/lang/016.inc index b73333f7b0..56aa85d65b 100644 --- a/tests/lang/016.inc +++ b/tests/lang/016.inc @@ -1,4 +1,4 @@ - *** Testing assignments and variable aliasing: ***
- This should read "blah": \n"; ?> @@ -22,7 +22,7 @@ This should read "this is nifty": *** Testing integer operators ***
-
*********************************
*** Testing real operators ***
-
*** Testing if/elseif/else control ***
- ** spelling correction by kluzz ** -\n"; @@ -98,7 +98,7 @@ if (0) { /* this code is not supposed to be executed */ echo "hmm, this shouldn't be displayed #1
\n"; $j++; if (1) { - $i + $i += $j; if (0) { @@ -128,7 +128,7 @@ if (0) { /* this code is not supposed to be executed */ } elseif (2-2) { /* as long as 2-2==0, this isn't supposed to be executed either */ $i = ++$j; echo "hmm, this shouldn't be displayed #2
\n"; - if (1) { + if (1) { $j = ++$i; if (0) { $j = $i*2+$j*($i++); @@ -182,7 +182,7 @@ if (0) { /* this code is not supposed to be executed */ ?> *** C-style else-if's ***
-\n"; @@ -199,7 +199,7 @@ if (0) { /* this code is not supposed to be executed */ *************************
*** WHILE tests ***
- - *** hash test... ***
- *** Hash resizing test ***
- 0) { @@ -295,7 +295,7 @@ while ($i > 0) { *** break/continue test ***
-\n"; @@ -349,7 +349,7 @@ while ($i<5) { ********************************
-\n"; # testing some PHP style comment... } diff --git a/tests/lang/023-2.inc b/tests/lang/023-2.inc index 6dd1e730f1..a66030775d 100644 --- a/tests/lang/023-2.inc +++ b/tests/lang/023-2.inc @@ -1,5 +1,5 @@ -This is Finish.phtml. This file is supposed to be included +This is Finish.phtml. This file is supposed to be included from regression_test.phtml. This is normal HTML. diff --git a/tests/quicktester.inc b/tests/quicktester.inc index 48ed6b549f..70cb115684 100644 --- a/tests/quicktester.inc +++ b/tests/quicktester.inc @@ -15,7 +15,7 @@ TESTS; Remember to NOT put a trailing ; after a line! */ -error_reporting(E_ALL); +error_reporting(E_ALL); $tests = explode("\n",$tests); $success = TRUE; foreach ($tests as $n=>$test) @@ -72,4 +72,4 @@ foreach ($tests as $n=>$test) } } if ($success) echo "OK"; - + diff --git a/tests/security/open_basedir.inc b/tests/security/open_basedir.inc index c5de8ca112..d229f8497f 100644 --- a/tests/security/open_basedir.inc +++ b/tests/security/open_basedir.inc @@ -3,7 +3,7 @@ // This file contains helper functions for testing open_basedir configuration // Care must be taken with where the directories are created because different // SAPIs set the working directory differently. So simply creating a directory -// relative to the current working directory like this: mkdir("blah") might +// relative to the current working directory like this: mkdir("blah") might // actually create it in several different places depending on the SAPI..! // // Note also depending on the version of php being tested, so the open_basedir @@ -26,7 +26,7 @@ function recursive_delete_directory($directory) { // Make sure the directory is valid if (is_dir($directory) == FALSE) { return FALSE; - } + } // Check we can access the directory if (is_readable($directory) == FALSE) { @@ -110,7 +110,7 @@ function test_open_basedir_array($function) { global $savedDirectory; test_open_basedir_before($function); - test_open_basedir_error($function); + test_open_basedir_error($function); var_dump(is_array($function("./../."))); var_dump(is_array($function("../ok"))); var_dump(is_array($function("ok.txt"))); @@ -124,7 +124,7 @@ function test_open_basedir_array($function) { function test_open_basedir($function) { global $savedDirectory; test_open_basedir_before($function); - test_open_basedir_error($function); + test_open_basedir_error($function); var_dump($function("./../.")); var_dump($function("../ok")); var_dump($function("ok.txt")); -- cgit v1.2.1