diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-18 14:28:32 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-18 14:28:32 +0200 |
| commit | c5401854fcea27ff9aabfd0682ff4d81bbb3c888 (patch) | |
| tree | f6b8e94b80d682da470133f0771fa83182d2226e /sapi/cli/tests | |
| parent | bfceb710becab71d7d561d64667be4c9668b6a9c (diff) | |
| download | php-git-c5401854fcea27ff9aabfd0682ff4d81bbb3c888.tar.gz | |
Run tidy
This should fix most of the remaining issues with tabs and spaces
being mixed in tests.
Diffstat (limited to 'sapi/cli/tests')
| -rw-r--r-- | sapi/cli/tests/002-unix.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/003-2.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/003.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/006.phpt | 4 | ||||
| -rw-r--r-- | sapi/cli/tests/007.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/008.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/010-2.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/010.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/013.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/015.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/016.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/017.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/018.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/019.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/020.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/021.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/argv_mb_bug77111.phpt | 4 | ||||
| -rw-r--r-- | sapi/cli/tests/bug44564.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/bug64529.phpt | 6 | ||||
| -rw-r--r-- | sapi/cli/tests/bug64544.phpt | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/bug65275.inc | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/upload_2G.phpt | 24 |
22 files changed, 37 insertions, 37 deletions
diff --git a/sapi/cli/tests/002-unix.phpt b/sapi/cli/tests/002-unix.phpt index 2be668f188..8eb4e47b6e 100644 --- a/sapi/cli/tests/002-unix.phpt +++ b/sapi/cli/tests/002-unix.phpt @@ -4,7 +4,7 @@ running code with -r <?php include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { - die ("skip not for Windows"); + die ("skip not for Windows"); } ?> --FILE-- diff --git a/sapi/cli/tests/003-2.phpt b/sapi/cli/tests/003-2.phpt index 71ef7163be..3a88b2a9a3 100644 --- a/sapi/cli/tests/003-2.phpt +++ b/sapi/cli/tests/003-2.phpt @@ -4,7 +4,7 @@ defining INI options with -d (as 2nd arg) <?php include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { - die ("skip not for Windows"); + die ("skip not for Windows"); } ?> --FILE-- diff --git a/sapi/cli/tests/003.phpt b/sapi/cli/tests/003.phpt index 6584e2c7be..63e812d4a7 100644 --- a/sapi/cli/tests/003.phpt +++ b/sapi/cli/tests/003.phpt @@ -4,7 +4,7 @@ defining INI options with -d <?php include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { - die ("skip not for Windows"); + die ("skip not for Windows"); } ?> --FILE-- diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt index f3443b7475..77a5667bda 100644 --- a/sapi/cli/tests/006.phpt +++ b/sapi/cli/tests/006.phpt @@ -4,10 +4,10 @@ show information about extension <?php include "skipif.inc"; if (!extension_loaded("session")) { - die("skip session extension required"); + die("skip session extension required"); } if (PCRE_JIT_SUPPORT == false) { - die ("skip not pcre jit support builtin"); + die ("skip not pcre jit support builtin"); } ?> --INI-- diff --git a/sapi/cli/tests/007.phpt b/sapi/cli/tests/007.phpt index 94ea6fd247..73faa33423 100644 --- a/sapi/cli/tests/007.phpt +++ b/sapi/cli/tests/007.phpt @@ -4,7 +4,7 @@ strip comments and whitespace with -w <?php include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { - die ("skip not for Windows"); + die ("skip not for Windows"); } ?> --FILE-- diff --git a/sapi/cli/tests/008.phpt b/sapi/cli/tests/008.phpt index c96170d497..c3acf6b863 100644 --- a/sapi/cli/tests/008.phpt +++ b/sapi/cli/tests/008.phpt @@ -4,7 +4,7 @@ execute a file with -f <?php include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { - die ("skip not for Windows"); + die ("skip not for Windows"); } ?> --FILE-- diff --git a/sapi/cli/tests/010-2.phpt b/sapi/cli/tests/010-2.phpt index af998351bb..1780c3ffd6 100644 --- a/sapi/cli/tests/010-2.phpt +++ b/sapi/cli/tests/010-2.phpt @@ -4,7 +4,7 @@ executing a code with -R <?php include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { - die ("skip not for Windows"); + die ("skip not for Windows"); } ?> --FILE-- diff --git a/sapi/cli/tests/010.phpt b/sapi/cli/tests/010.phpt index 01b3599136..d06007bd55 100644 --- a/sapi/cli/tests/010.phpt +++ b/sapi/cli/tests/010.phpt @@ -4,7 +4,7 @@ executing a file with -F <?php include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { - die ("skip not for Windows"); + die ("skip not for Windows"); } ?> --FILE-- diff --git a/sapi/cli/tests/013.phpt b/sapi/cli/tests/013.phpt index 3ca2ba833c..0684b8d057 100644 --- a/sapi/cli/tests/013.phpt +++ b/sapi/cli/tests/013.phpt @@ -4,7 +4,7 @@ running PHP code before and after processing input lines with -B and -E <?php include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { - die ("skip not for Windows"); + die ("skip not for Windows"); } ?> --FILE-- diff --git a/sapi/cli/tests/015.phpt b/sapi/cli/tests/015.phpt index 5a5e6c5190..b64a5f0d50 100644 --- a/sapi/cli/tests/015.phpt +++ b/sapi/cli/tests/015.phpt @@ -4,7 +4,7 @@ CLI long options <?php include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { - die ("skip not for Windows"); + die ("skip not for Windows"); } ?> --FILE-- diff --git a/sapi/cli/tests/016.phpt b/sapi/cli/tests/016.phpt index bbba579ec2..bf23affe81 100644 --- a/sapi/cli/tests/016.phpt +++ b/sapi/cli/tests/016.phpt @@ -4,7 +4,7 @@ CLI -a and readline <?php include "skipif.inc"; if (!extension_loaded('readline') || readline_info('done') === NULL) { - die ("skip need readline support"); + die ("skip need readline support"); } ?> --FILE-- diff --git a/sapi/cli/tests/017.phpt b/sapi/cli/tests/017.phpt index 6c9a792476..344daa7408 100644 --- a/sapi/cli/tests/017.phpt +++ b/sapi/cli/tests/017.phpt @@ -4,7 +4,7 @@ CLI -a and libedit <?php include "skipif.inc"; if (!extension_loaded('readline') || readline_info('done') !== NULL) { - die ("skip need readline support using libedit"); + die ("skip need readline support using libedit"); } if(substr(PHP_OS, 0, 3) == 'WIN' ) { die('skip not for Windows'); diff --git a/sapi/cli/tests/018.phpt b/sapi/cli/tests/018.phpt index 9ebe4faa87..2aadfef62a 100644 --- a/sapi/cli/tests/018.phpt +++ b/sapi/cli/tests/018.phpt @@ -4,7 +4,7 @@ CLI php -m <?php include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { - die ("skip not for Windows"); + die ("skip not for Windows"); } ?> --FILE-- diff --git a/sapi/cli/tests/019.phpt b/sapi/cli/tests/019.phpt index 2b8c0f007e..e8404d835e 100644 --- a/sapi/cli/tests/019.phpt +++ b/sapi/cli/tests/019.phpt @@ -4,7 +4,7 @@ CLI php -i <?php include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { - die ("skip not for Windows"); + die ("skip not for Windows"); } ?> --FILE-- diff --git a/sapi/cli/tests/020.phpt b/sapi/cli/tests/020.phpt index 001cf62a38..fb7bcb4e7b 100644 --- a/sapi/cli/tests/020.phpt +++ b/sapi/cli/tests/020.phpt @@ -4,7 +4,7 @@ CLI php --ri <?php include "skipif.inc"; if (substr(PHP_OS, 0, 3) == 'WIN') { - die ("skip not for Windows"); + die ("skip not for Windows"); } ?> --FILE-- diff --git a/sapi/cli/tests/021.phpt b/sapi/cli/tests/021.phpt index a5d97c326d..837f64109d 100644 --- a/sapi/cli/tests/021.phpt +++ b/sapi/cli/tests/021.phpt @@ -4,7 +4,7 @@ CLI shell shebang <?php include 'skipif.inc'; if (substr(PHP_OS, 0, 3) == 'WIN') { - die ("skip not for Windows"); + die ("skip not for Windows"); } if (strlen("#!".getenv('TEST_PHP_EXECUTABLE')) > 127) { diff --git a/sapi/cli/tests/argv_mb_bug77111.phpt b/sapi/cli/tests/argv_mb_bug77111.phpt index a2bae24dc3..0ed6204b89 100644 --- a/sapi/cli/tests/argv_mb_bug77111.phpt +++ b/sapi/cli/tests/argv_mb_bug77111.phpt @@ -5,12 +5,12 @@ Bug #77111 php-win.exe corrupts unicode symbols from cli parameters include "skipif.inc"; if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') { - die("skip this test is for Windows platforms only"); + die("skip this test is for Windows platforms only"); } $php = dirname(getenv('TEST_PHP_EXECUTABLE')) . DIRECTORY_SEPARATOR . "php-win.exe"; if (!file_exists($php)) { - die("skip php-win.exe doesn't exist"); + die("skip php-win.exe doesn't exist"); } ?> diff --git a/sapi/cli/tests/bug44564.phpt b/sapi/cli/tests/bug44564.phpt index 7dca62a7e8..6ef5b9f950 100644 --- a/sapi/cli/tests/bug44564.phpt +++ b/sapi/cli/tests/bug44564.phpt @@ -3,7 +3,7 @@ Bug #44564 (escapeshellarg removes UTF-8 multi-byte characters) --SKIPIF-- <?php if (false == setlocale(LC_CTYPE, "UTF8", "en_US.UTF-8")) { - die("skip setlocale() failed\n"); + die("skip setlocale() failed\n"); } ?> --FILE-- diff --git a/sapi/cli/tests/bug64529.phpt b/sapi/cli/tests/bug64529.phpt index ff3e3029e6..7350cd2046 100644 --- a/sapi/cli/tests/bug64529.phpt +++ b/sapi/cli/tests/bug64529.phpt @@ -3,14 +3,14 @@ Bug #64529 (Ran out of opcode space) --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == "WIN") { - die("skip non windows test"); + die("skip non windows test"); } if (!extension_loaded("readline") || !readline_info("done")) { - die("skip readline support required"); + die("skip readline support required"); } exec('which expect', $output, $ret); if ($ret) { - die("skip no expect installed"); + die("skip no expect installed"); } ?> --FILE-- diff --git a/sapi/cli/tests/bug64544.phpt b/sapi/cli/tests/bug64544.phpt index 33a6e16a10..87e8eda64a 100644 --- a/sapi/cli/tests/bug64544.phpt +++ b/sapi/cli/tests/bug64544.phpt @@ -3,7 +3,7 @@ Bug #64544 (Valgrind warnings after using putenv) --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) == "WIN") { - die("skip non windows test"); + die("skip non windows test"); } ?> --FILE-- diff --git a/sapi/cli/tests/bug65275.inc b/sapi/cli/tests/bug65275.inc index 6b8a2ad948..addc026322 100644 --- a/sapi/cli/tests/bug65275.inc +++ b/sapi/cli/tests/bug65275.inc @@ -1,7 +1,7 @@ <?php register_shutdown_function(function() { - die(111); + die(111); }); die(222); diff --git a/sapi/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt index 81258da1d3..3d139ce650 100644 --- a/sapi/cli/tests/upload_2G.phpt +++ b/sapi/cli/tests/upload_2G.phpt @@ -5,31 +5,31 @@ file upload greater than 2G include "skipif.inc"; if (PHP_INT_SIZE < 8) { - die("skip need PHP_INT_SIZE>=8"); + die("skip need PHP_INT_SIZE>=8"); } if (disk_free_space(sys_get_temp_dir()) < 2300000000) { - die("skip need more than 2.15G of free disk space for the uploaded file"); + die("skip need more than 2.15G of free disk space for the uploaded file"); } if (!file_exists('/proc/meminfo')) { - die('skip Cannot check free RAM from /proc/meminfo on this platform'); + die('skip Cannot check free RAM from /proc/meminfo on this platform'); } $free_ram = 0; if ($f = fopen("/proc/meminfo","r")) { - while (!feof($f)) { - if (preg_match('/MemFree[^\d]*(\d+)/i', fgets($f), $m)) { - $free_ram = max($free_ram, $m[1]/1024/1024); - if ($free_ram > 3) { - $enough_free_ram = true; - } - } - } + while (!feof($f)) { + if (preg_match('/MemFree[^\d]*(\d+)/i', fgets($f), $m)) { + $free_ram = max($free_ram, $m[1]/1024/1024); + if ($free_ram > 3) { + $enough_free_ram = true; + } + } + } } if (empty($enough_free_ram)) { - die(sprintf("skip need +3G free RAM, but only %01.2f available", $free_ram)); + die(sprintf("skip need +3G free RAM, but only %01.2f available", $free_ram)); } if (getenv('TRAVIS')) { |
