summaryrefslogtreecommitdiff
path: root/sapi/cgi
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-14 17:45:48 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-14 19:45:12 +0200
commit782352c54ad69c517e3c32b0dd2c25d74842647a (patch)
tree220bdc1e814e9f44b3578d49b3f239a3fdefa1d0 /sapi/cgi
parent604d4bdae5037e021c1f9d35f08cbeddd610d84c (diff)
downloadphp-git-782352c54ad69c517e3c32b0dd2c25d74842647a.tar.gz
Trim trailing whitespace in *.phpt
Diffstat (limited to 'sapi/cgi')
-rw-r--r--sapi/cgi/tests/002.phpt6
-rw-r--r--sapi/cgi/tests/003.phpt6
-rw-r--r--sapi/cgi/tests/004.phpt6
-rw-r--r--sapi/cgi/tests/005-win32.phpt2
-rw-r--r--sapi/cgi/tests/005.phpt2
-rw-r--r--sapi/cgi/tests/006.phpt2
-rw-r--r--sapi/cgi/tests/007.phpt2
-rw-r--r--sapi/cgi/tests/008.phpt2
-rw-r--r--sapi/cgi/tests/apache_request_headers.phpt6
-rw-r--r--sapi/cgi/tests/bug75574_utf8_win.phpt2
10 files changed, 18 insertions, 18 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..93c48c9ff4 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
@@ -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/cgi/tests/bug75574_utf8_win.phpt b/sapi/cgi/tests/bug75574_utf8_win.phpt
index f250de9102..c6e33e54ed 100644
--- a/sapi/cgi/tests/bug75574_utf8_win.phpt
+++ b/sapi/cgi/tests/bug75574_utf8_win.phpt
@@ -29,7 +29,7 @@ unlink($fn);
?>
===DONE===
---EXPECT--
+--EXPECT--
bool(true)
string(3) "啊"
===DONE===