summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-13 14:12:55 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-13 14:12:55 +0200
commit7f6387b59ae1b5d642b0d05afbb14cab07061a9a (patch)
treed09f6f4674163b6a57d8805408877b05294f6931 /tests
parent3f72c77ce47ee0906905b83161d9c1d24e425d89 (diff)
downloadphp-git-7f6387b59ae1b5d642b0d05afbb14cab07061a9a.tar.gz
Trim trailing whitespace in source code files
Diffstat (limited to 'tests')
-rw-r--r--tests/classes/constants_basic_003.inc2
-rw-r--r--tests/classes/interface_optional_arg_003.inc2
-rw-r--r--tests/lang/015.inc2
-rw-r--r--tests/lang/016.inc2
-rw-r--r--tests/lang/023-1.inc34
-rw-r--r--tests/lang/023-2.inc2
-rw-r--r--tests/quicktester.inc4
-rw-r--r--tests/security/open_basedir.inc8
8 files changed, 28 insertions, 28 deletions
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 @@
<?php
class A {
- const MY_CONST = "hello from A";
+ const MY_CONST = "hello from A";
}
?>
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 @@
-<?php
+<?php
interface I {
function f($a = null);
}
diff --git a/tests/lang/015.inc b/tests/lang/015.inc
index d436a7bb14..fae56c4810 100644
--- a/tests/lang/015.inc
+++ b/tests/lang/015.inc
@@ -1,3 +1,3 @@
-<?php
+<?php
echo "Hello";
?>
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 @@
-<?php
+<?php
function MyFunc ($a) {
echo $a;
}
diff --git a/tests/lang/023-1.inc b/tests/lang/023-1.inc
index 8d52e844c9..153f5d7668 100644
--- a/tests/lang/023-1.inc
+++ b/tests/lang/023-1.inc
@@ -10,11 +10,11 @@
?>
*** Testing assignments and variable aliasing: ***<br>
-<?php
+<?php
/* This test tests assignments to variables using other variables as variable-names */
- $a = "b";
- $$a = "test";
- $$$a = "blah";
+ $a = "b";
+ $$a = "test";
+ $$$a = "blah";
${$$$a}["associative arrays work too"] = "this is nifty";
?>
This should read "blah": <?php echo "$test<br>\n"; ?>
@@ -22,7 +22,7 @@ This should read "this is nifty": <?php echo $blah[$test="associative arrays wor
*************************************************<br>
*** Testing integer operators ***<br>
-<?php
+<?php
/* test just about any operator possible on $i and $j (ints) */
$i = 5;
$j = 3;
@@ -38,7 +38,7 @@ Correct result - 3: <?php echo $j%$i; ?><br>
*********************************<br>
*** Testing real operators ***<br>
-<?php
+<?php
/* test just about any operator possible on $i and $j (floats) */
$i = 5.0;
$j = 3.0;
@@ -55,7 +55,7 @@ Correct result - 3: <?php echo $j%$i; ?><br>
*** Testing if/elseif/else control ***<br>
-<?php
+<?php
/* sick if/elseif/else test by Andi :) */
$a = 5;
if ($a == "4") {
@@ -90,7 +90,7 @@ if ($a == "4") {
*** Seriously nested if's test ***<br>
** spelling correction by kluzz **
-<?php
+<?php
/* yet another sick if/elseif/else test by Zeev */
$i=$j=0;
echo "Only two lines of text should follow:<br>\n";
@@ -98,7 +98,7 @@ if (0) { /* this code is not supposed to be executed */
echo "hmm, this shouldn't be displayed #1<br>\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<br>\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 ***<br>
-<?php
+<?php
/* looks like without we even tried, C-style else-if structure works fine! */
if ($a=0) {
echo "This shouldn't be displayed<br>\n";
@@ -199,7 +199,7 @@ if (0) { /* this code is not supposed to be executed */
*************************<br>
*** WHILE tests ***<br>
-<?php
+<?php
$i=0;
$j=20;
while ($i<(2*$j)) {
@@ -217,7 +217,7 @@ while ($i<(2*$j)) {
*** Nested WHILEs ***<br>
-<?php
+<?php
$arr_len=3;
$i=0;
@@ -253,7 +253,7 @@ while ($i<$arr_len) {
*********************<br>
*** hash test... ***<br>
-<?php
+<?php
/*
$i=0;
@@ -273,7 +273,7 @@ echo "commented out...";
**************************<br>
*** Hash resizing test ***<br>
-<?php
+<?php
$i = 10;
$a = 'b';
while ($i > 0) {
@@ -295,7 +295,7 @@ while ($i > 0) {
*** break/continue test ***<br>
-<?php
+<?php
$i=0;
echo "\$i should go from 0 to 2<br>\n";
@@ -349,7 +349,7 @@ while ($i<5) {
<?php include("023-2.inc"); ?>
********************************<br>
-<?php
+<?php
{
echo "Tests completed.<br>\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 @@
<html>
-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.
<?php echo "and this is PHP code, 2+2=".(2+2).""; ?>
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"));