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 /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 'tests')
28 files changed, 53 insertions, 53 deletions
diff --git a/tests/classes/autoload_001.phpt b/tests/classes/autoload_001.phpt index cdea16f689..7fe6757d68 100644 --- a/tests/classes/autoload_001.phpt +++ b/tests/classes/autoload_001.phpt @@ -2,7 +2,7 @@ ZE2 Autoload and class_exists --SKIPIF-- <?php - if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); + if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- <?php diff --git a/tests/classes/autoload_002.phpt b/tests/classes/autoload_002.phpt index 752a9928af..32321b3bfe 100644 --- a/tests/classes/autoload_002.phpt +++ b/tests/classes/autoload_002.phpt @@ -2,7 +2,7 @@ ZE2 Autoload and get_class_methods --SKIPIF-- <?php - if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); + if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- <?php diff --git a/tests/classes/autoload_003.phpt b/tests/classes/autoload_003.phpt index 05887433c3..a81d56fe6c 100644 --- a/tests/classes/autoload_003.phpt +++ b/tests/classes/autoload_003.phpt @@ -2,7 +2,7 @@ ZE2 Autoload and derived classes --SKIPIF-- <?php - if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); + if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- <?php diff --git a/tests/classes/autoload_004.phpt b/tests/classes/autoload_004.phpt index 8539e07433..a5dd5e393c 100644 --- a/tests/classes/autoload_004.phpt +++ b/tests/classes/autoload_004.phpt @@ -2,7 +2,7 @@ ZE2 Autoload and recursion --SKIPIF-- <?php - if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); + if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- <?php diff --git a/tests/classes/autoload_005.phpt b/tests/classes/autoload_005.phpt index 72d83b88f6..16f55b9363 100644 --- a/tests/classes/autoload_005.phpt +++ b/tests/classes/autoload_005.phpt @@ -2,7 +2,7 @@ ZE2 Autoload from destructor --SKIPIF-- <?php - if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); + if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- <?php diff --git a/tests/classes/autoload_006.phpt b/tests/classes/autoload_006.phpt index f17011ca5e..fd3c85580f 100644 --- a/tests/classes/autoload_006.phpt +++ b/tests/classes/autoload_006.phpt @@ -2,7 +2,7 @@ ZE2 Autoload from destructor --SKIPIF-- <?php - if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); + if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already'); ?> --FILE-- <?php diff --git a/tests/lang/034.phpt b/tests/lang/034.phpt index 2ed6bce9d7..439c87e13b 100644 --- a/tests/lang/034.phpt +++ b/tests/lang/034.phpt @@ -5,7 +5,7 @@ precision=14 --SKIPIF-- <?php # try to activate a german locale if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) { - print "skip Can't find german locale"; + print "skip Can't find german locale"; } ?> --FILE-- diff --git a/tests/lang/bug30638.phpt b/tests/lang/bug30638.phpt index 24e6609498..3eb2c35241 100644 --- a/tests/lang/bug30638.phpt +++ b/tests/lang/bug30638.phpt @@ -3,7 +3,7 @@ Bug #30638 (localeconv returns wrong LC_NUMERIC settings) (ok to fail on MacOS X --SKIPIF-- <?php # try to activate a german locale if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) { - print "skip setlocale() failed"; + print "skip setlocale() failed"; } elseif (strtolower(php_uname('s')) == 'darwin') { print "skip ok to fail on MacOS X"; } diff --git a/tests/output/sapi_windows_vt100_support_winko_err.phpt b/tests/output/sapi_windows_vt100_support_winko_err.phpt index d609e48770..21be3b76a9 100644 --- a/tests/output/sapi_windows_vt100_support_winko_err.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_err.phpt @@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDERR --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, - '10.0.10586' + '10.0.10586' ) >= 0) { - echo "skip Only for Windows systems < 10.0.10586"; + echo "skip Only for Windows systems < 10.0.10586"; } ?> --CAPTURE_STDIO-- diff --git a/tests/output/sapi_windows_vt100_support_winko_in-err.phpt b/tests/output/sapi_windows_vt100_support_winko_in-err.phpt index 86cf631110..94e692d01f 100644 --- a/tests/output/sapi_windows_vt100_support_winko_in-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_in-err.phpt @@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDIN/ --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, - '10.0.10586' + '10.0.10586' ) >= 0) { - echo "skip Only for Windows systems < 10.0.10586"; + echo "skip Only for Windows systems < 10.0.10586"; } ?> --CAPTURE_STDIO-- diff --git a/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt b/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt index 4c0f5f9909..11caa432d1 100644 --- a/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt @@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDIN/ --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, - '10.0.10586' + '10.0.10586' ) >= 0) { - echo "skip Only for Windows systems < 10.0.10586"; + echo "skip Only for Windows systems < 10.0.10586"; } ?> --CAPTURE_STDIO-- diff --git a/tests/output/sapi_windows_vt100_support_winko_in-out.phpt b/tests/output/sapi_windows_vt100_support_winko_in-out.phpt index 01efb3bb4e..fc0429c4b0 100644 --- a/tests/output/sapi_windows_vt100_support_winko_in-out.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_in-out.phpt @@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDIN/ --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, - '10.0.10586' + '10.0.10586' ) >= 0) { - echo "skip Only for Windows systems < 10.0.10586"; + echo "skip Only for Windows systems < 10.0.10586"; } ?> --CAPTURE_STDIO-- diff --git a/tests/output/sapi_windows_vt100_support_winko_out-err.phpt b/tests/output/sapi_windows_vt100_support_winko_out-err.phpt index 09d3d8f0be..ee34be988b 100644 --- a/tests/output/sapi_windows_vt100_support_winko_out-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_out-err.phpt @@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDOUT --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, - '10.0.10586' + '10.0.10586' ) >= 0) { - echo "skip Only for Windows systems < 10.0.10586"; + echo "skip Only for Windows systems < 10.0.10586"; } ?> --CAPTURE_STDIO-- diff --git a/tests/output/sapi_windows_vt100_support_winko_out.phpt b/tests/output/sapi_windows_vt100_support_winko_out.phpt index 65958ae19c..3241ba352a 100644 --- a/tests/output/sapi_windows_vt100_support_winko_out.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_out.phpt @@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDOUT --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, - '10.0.10586' + '10.0.10586' ) >= 0) { - echo "skip Only for Windows systems < 10.0.10586"; + echo "skip Only for Windows systems < 10.0.10586"; } ?> --CAPTURE_STDIO-- diff --git a/tests/output/sapi_windows_vt100_support_winok_err.phpt b/tests/output/sapi_windows_vt100_support_winok_err.phpt index 01a31a6b92..4d7543fdda 100644 --- a/tests/output/sapi_windows_vt100_support_winok_err.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_err.phpt @@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDERR --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, - '10.0.10586' + '10.0.10586' ) < 0) { - echo "skip Only for Windows systems >= 10.0.10586"; + echo "skip Only for Windows systems >= 10.0.10586"; } ?> --CAPTURE_STDIO-- diff --git a/tests/output/sapi_windows_vt100_support_winok_in-err.phpt b/tests/output/sapi_windows_vt100_support_winok_in-err.phpt index d36d79c8dc..e08d558e25 100644 --- a/tests/output/sapi_windows_vt100_support_winok_in-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_in-err.phpt @@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDIN/ --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, - '10.0.10586' + '10.0.10586' ) < 0) { - echo "skip Only for Windows systems >= 10.0.10586"; + echo "skip Only for Windows systems >= 10.0.10586"; } ?> --CAPTURE_STDIO-- diff --git a/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt b/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt index 1606604651..285a72f936 100644 --- a/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt @@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDIN/ --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, - '10.0.10586' + '10.0.10586' ) < 0) { - echo "skip Only for Windows systems >= 10.0.10586"; + echo "skip Only for Windows systems >= 10.0.10586"; } ?> --CAPTURE_STDIO-- diff --git a/tests/output/sapi_windows_vt100_support_winok_in-out.phpt b/tests/output/sapi_windows_vt100_support_winok_in-out.phpt index f67942f603..a84b365347 100644 --- a/tests/output/sapi_windows_vt100_support_winok_in-out.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_in-out.phpt @@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDIN/ --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, - '10.0.10586' + '10.0.10586' ) < 0) { - echo "skip Only for Windows systems >= 10.0.10586"; + echo "skip Only for Windows systems >= 10.0.10586"; } ?> --CAPTURE_STDIO-- diff --git a/tests/output/sapi_windows_vt100_support_winok_out-err.phpt b/tests/output/sapi_windows_vt100_support_winok_out-err.phpt index ebc6bcb120..f3f49aa618 100644 --- a/tests/output/sapi_windows_vt100_support_winok_out-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_out-err.phpt @@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDOUT --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, - '10.0.10586' + '10.0.10586' ) < 0) { - echo "skip Only for Windows systems >= 10.0.10586"; + echo "skip Only for Windows systems >= 10.0.10586"; } ?> --CAPTURE_STDIO-- diff --git a/tests/output/sapi_windows_vt100_support_winok_out.phpt b/tests/output/sapi_windows_vt100_support_winok_out.phpt index 94a5f20a1b..7fc5ae142b 100644 --- a/tests/output/sapi_windows_vt100_support_winok_out.phpt +++ b/tests/output/sapi_windows_vt100_support_winok_out.phpt @@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDOUT --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } if(PHP_OS_FAMILY !== "Windows") { echo "skip Only for Windows systems"; } elseif (version_compare( PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, - '10.0.10586' + '10.0.10586' ) < 0) { - echo "skip Only for Windows systems >= 10.0.10586"; + echo "skip Only for Windows systems >= 10.0.10586"; } ?> --CAPTURE_STDIO-- diff --git a/tests/output/stream_isatty_err.phpt b/tests/output/stream_isatty_err.phpt index e7c1038350..c048739281 100644 --- a/tests/output/stream_isatty_err.phpt +++ b/tests/output/stream_isatty_err.phpt @@ -3,7 +3,7 @@ Test stream_isatty with redirected STDERR --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } ?> --CAPTURE_STDIO-- diff --git a/tests/output/stream_isatty_in-err.phpt b/tests/output/stream_isatty_in-err.phpt index 73514955d4..8c10baae80 100644 --- a/tests/output/stream_isatty_in-err.phpt +++ b/tests/output/stream_isatty_in-err.phpt @@ -3,7 +3,7 @@ Test stream_isatty with redirected STDIN/STDERR --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } ?> --CAPTURE_STDIO-- diff --git a/tests/output/stream_isatty_in-out-err.phpt b/tests/output/stream_isatty_in-out-err.phpt index 9b65e8861b..851327ead8 100644 --- a/tests/output/stream_isatty_in-out-err.phpt +++ b/tests/output/stream_isatty_in-out-err.phpt @@ -3,7 +3,7 @@ Test stream_isatty with redirected STDIN/STDOUT/STDERR --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } ?> --CAPTURE_STDIO-- diff --git a/tests/output/stream_isatty_in-out.phpt b/tests/output/stream_isatty_in-out.phpt index c2bb346854..19fa8552b8 100644 --- a/tests/output/stream_isatty_in-out.phpt +++ b/tests/output/stream_isatty_in-out.phpt @@ -3,7 +3,7 @@ Test stream_isatty with redirected STDIN/STDOUT --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } ?> --CAPTURE_STDIO-- diff --git a/tests/output/stream_isatty_out-err.phpt b/tests/output/stream_isatty_out-err.phpt index dc113a9720..e080810ae8 100644 --- a/tests/output/stream_isatty_out-err.phpt +++ b/tests/output/stream_isatty_out-err.phpt @@ -3,7 +3,7 @@ Test stream_isatty with redirected STDOUT/STDERR --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } ?> --CAPTURE_STDIO-- diff --git a/tests/output/stream_isatty_out.phpt b/tests/output/stream_isatty_out.phpt index f18c986c5a..80db509510 100644 --- a/tests/output/stream_isatty_out.phpt +++ b/tests/output/stream_isatty_out.phpt @@ -3,7 +3,7 @@ Test stream_isatty with redirected STDOUT --SKIPIF-- <?php if (getenv("SKIP_IO_CAPTURE_TESTS")) { - die("skip I/O capture test"); + die("skip I/O capture test"); } ?> --CAPTURE_STDIO-- diff --git a/tests/run-test/bug75042.phpt b/tests/run-test/bug75042.phpt index af3005372b..a7979d6b5e 100644 --- a/tests/run-test/bug75042.phpt +++ b/tests/run-test/bug75042.phpt @@ -4,7 +4,7 @@ phpt EXTENSIONS directive with shared module <?php $php = getenv('TEST_PHP_EXECUTABLE'); if (false !== stripos(`$php -n -m`, 'openssl')) { - die('skip openssl is built static'); + die('skip openssl is built static'); } $ext_module = ini_get('extension_dir') . DIRECTORY_SEPARATOR . (substr(PHP_OS, 0, 3) === "WIN" ? "php_openssl." : "openssl.") . PHP_SHLIB_SUFFIX; if( !file_exists($ext_module) ) die('skip openssl shared extension not found'); diff --git a/tests/security/open_basedir_001.phpt b/tests/security/open_basedir_001.phpt index e6068350a8..a68e9ac531 100644 --- a/tests/security/open_basedir_001.phpt +++ b/tests/security/open_basedir_001.phpt @@ -3,10 +3,10 @@ openbase_dir runtime tightning --SKIPIF-- <?php if(PHP_OS_FAMILY === "Windows") { - die('skip.. only for unix'); + die('skip.. only for unix'); } if (!is_dir("/usr/local/bin")) { - die('skip.. no /usr/local/bin on this machine'); + die('skip.. no /usr/local/bin on this machine'); } --INI-- open_basedir=/usr/local |