diff options
author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-02-09 22:49:21 -0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-02-10 19:20:23 +0100 |
commit | 21e3b0c70cb338a237cc11ccc27959eac9862ded (patch) | |
tree | 2c805882a8d0b48b40ea05ba3af1d9871f12fac8 /tests | |
parent | 1422e2ffd19916a6c6a15577a36d1e21b5f630b8 (diff) | |
download | php-git-21e3b0c70cb338a237cc11ccc27959eac9862ded.tar.gz |
Remove trailing whitespace in inc files
Diffstat (limited to 'tests')
-rw-r--r-- | tests/classes/constants_basic_003.inc | 2 | ||||
-rw-r--r-- | tests/classes/interface_optional_arg_003.inc | 2 | ||||
-rw-r--r-- | tests/lang/015.inc | 2 | ||||
-rw-r--r-- | tests/lang/016.inc | 2 | ||||
-rw-r--r-- | tests/lang/023-1.inc | 34 | ||||
-rw-r--r-- | tests/lang/023-2.inc | 2 | ||||
-rw-r--r-- | tests/lang/023.phpt | 4 | ||||
-rw-r--r-- | tests/lang/024.phpt | 134 | ||||
-rw-r--r-- | tests/quicktester.inc | 4 | ||||
-rw-r--r-- | tests/security/open_basedir.inc | 8 |
10 files changed, 97 insertions, 97 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/lang/023.phpt b/tests/lang/023.phpt index 331308d01d..59bd472f64 100644 --- a/tests/lang/023.phpt +++ b/tests/lang/023.phpt @@ -5,7 +5,7 @@ date.timezone=UTC --FILE-- PHP Regression Test -<?php +<?php include("023-1.inc"); @@ -246,7 +246,7 @@ $i=2<br> *** Nested file include test ***<br> <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. and this is PHP code, 2+2=4 </html> diff --git a/tests/lang/024.phpt b/tests/lang/024.phpt index 954b58fa05..357846555a 100644 --- a/tests/lang/024.phpt +++ b/tests/lang/024.phpt @@ -1,7 +1,7 @@ --TEST-- Looped regression test (may take a while) --FILE-- -<?php +<?php for ($jdk=0; $jdk<50; $jdk++) { ?><html> <head> @@ -11,11 +11,11 @@ for ($jdk=0; $jdk<50; $jdk++) { */ ?> *** Testing assignments and variable aliasing: *** -<?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\n"; ?> @@ -23,7 +23,7 @@ This should read "this is nifty": <?php echo $blah[$test="associative arrays wor ************************************************* *** Testing integer operators *** -<?php +<?php /* test just about any operator possible on $i and $j (ints) */ $i = 5; $j = 3; @@ -47,7 +47,7 @@ Correct result - 3: <?php echo $j%$i; ?> ********************************* *** Testing real operators *** -<?php +<?php /* test just about any operator possible on $i and $j (floats) */ $i = 5.0; $j = 3.0; @@ -72,7 +72,7 @@ Correct result - 3: <?php echo $j%$i; ?> *** Testing if/elseif/else control *** -<?php +<?php /* sick if/elseif/else test by Andi :) */ $a = 5; if ($a == "4") { @@ -107,7 +107,7 @@ if ($a == "4") { *** Seriously nested if's test *** ** 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:\n"; @@ -143,7 +143,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++); @@ -197,7 +197,7 @@ if (0) { /* this code is not supposed to be executed */ ?> *** C-style else-if's *** -<?php +<?php /* looks like without we even tried, C-style else-if structure works fine! */ if ($a=0) { echo "This shouldn't be displayed\n"; @@ -214,7 +214,7 @@ if (0) { /* this code is not supposed to be executed */ ************************* *** WHILE tests *** -<?php +<?php $i=0; $j=20; while ($i<(2*$j)) { @@ -232,7 +232,7 @@ while ($i<(2*$j)) { *** Nested WHILEs *** -<?php +<?php $arr_len=3; $i=0; @@ -268,7 +268,7 @@ while ($i<$arr_len) { ********************* *** hash test... *** -<?php +<?php /* $i=0; @@ -288,7 +288,7 @@ echo "commented out..."; ************************** *** Hash resizing test *** -<?php +<?php $i = 10; $a = "b"; while ($i > 0) { @@ -310,7 +310,7 @@ while ($i > 0) { *** break/continue test *** -<?php +<?php $i=0; echo "\$i should go from 0 to 2\n"; @@ -364,7 +364,7 @@ while ($i<5) { <?php include("023-2.inc"); ?> ******************************** -<?php +<?php { echo "Tests completed.\n"; # testing some PHP style comment... } @@ -589,7 +589,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -814,7 +814,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -1039,7 +1039,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -1264,7 +1264,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -1489,7 +1489,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -1714,7 +1714,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -1939,7 +1939,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -2164,7 +2164,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -2389,7 +2389,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -2614,7 +2614,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -2839,7 +2839,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -3064,7 +3064,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -3289,7 +3289,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -3514,7 +3514,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -3739,7 +3739,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -3964,7 +3964,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -4189,7 +4189,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -4414,7 +4414,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -4639,7 +4639,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -4864,7 +4864,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -5089,7 +5089,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -5314,7 +5314,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -5539,7 +5539,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -5764,7 +5764,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -5989,7 +5989,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -6214,7 +6214,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -6439,7 +6439,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -6664,7 +6664,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -6889,7 +6889,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -7114,7 +7114,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -7339,7 +7339,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -7564,7 +7564,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -7789,7 +7789,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -8014,7 +8014,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -8239,7 +8239,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -8464,7 +8464,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -8689,7 +8689,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -8914,7 +8914,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -9139,7 +9139,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -9364,7 +9364,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -9589,7 +9589,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -9814,7 +9814,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -10039,7 +10039,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -10264,7 +10264,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -10489,7 +10489,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -10714,7 +10714,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -10939,7 +10939,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -11164,7 +11164,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -11389,7 +11389,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </html> @@ -11614,7 +11614,7 @@ $i=2 *** Nested file include test *** <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. and this is PHP code, 2+2=4 </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")); |