diff options
author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-02-13 14:04:31 -0200 |
---|---|---|
committer | Joe <krakjoe@php.net> | 2018-02-14 11:10:59 +0100 |
commit | b8bb4d77ca93b926ced5bd76461465970e68dfeb (patch) | |
tree | 5dacd5a999e471d7354690df623fcbdade3391ce | |
parent | b7d2e04f1f229cc10a73628b4a56240f317c746d (diff) | |
download | php-git-b8bb4d77ca93b926ced5bd76461465970e68dfeb.tar.gz |
Remove empty sections in tests
-rw-r--r-- | Zend/tests/declare_005.phpt | 1 | ||||
-rw-r--r-- | ext/curl/tests/curl_file_upload.phpt | 1 | ||||
-rw-r--r-- | ext/curl/tests/curl_ftp_pasv.phpt | 7 | ||||
-rw-r--r-- | ext/curl/tests/curl_multi_segfault.phpt | 11 | ||||
-rw-r--r-- | ext/date/tests/bug55397.phpt | 1 | ||||
-rw-r--r-- | ext/pgsql/tests/09notice.phpt | 1 | ||||
-rw-r--r-- | ext/session/tests/bug61470.phpt | 3 | ||||
-rw-r--r-- | ext/session/tests/bug66827.phpt | 2 | ||||
-rw-r--r-- | ext/standard/tests/general_functions/intval_binary_prefix.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/network/setcookie.phpt | 1 | ||||
-rw-r--r-- | ext/zip/tests/001.phpt | 4 | ||||
-rw-r--r-- | tests/basic/encoding.phpt | 3 |
12 files changed, 12 insertions, 24 deletions
diff --git a/Zend/tests/declare_005.phpt b/Zend/tests/declare_005.phpt index 8f5adcfbd2..d1c716cebc 100644 --- a/Zend/tests/declare_005.phpt +++ b/Zend/tests/declare_005.phpt @@ -1,6 +1,5 @@ --TEST-- Testing declare statement with ticks ---SKIPIF-- --FILE-- <?php register_tick_function(function () { echo "tick\n"; }); diff --git a/ext/curl/tests/curl_file_upload.phpt b/ext/curl/tests/curl_file_upload.phpt index c64e67aa5c..8d304c5f01 100644 --- a/ext/curl/tests/curl_file_upload.phpt +++ b/ext/curl/tests/curl_file_upload.phpt @@ -1,6 +1,5 @@ --TEST-- CURL file uploading ---INI-- --SKIPIF-- <?php include 'skipif.inc'; ?> --FILE-- diff --git a/ext/curl/tests/curl_ftp_pasv.phpt b/ext/curl/tests/curl_ftp_pasv.phpt index 6cd7429104..31d670ae0d 100644 --- a/ext/curl/tests/curl_ftp_pasv.phpt +++ b/ext/curl/tests/curl_ftp_pasv.phpt @@ -1,8 +1,7 @@ --TEST-- -Test curl_exec() function with basic functionality ---CREDITS-- +Test curl_exec() function with basic functionality --SKIPIF-- -<?php +<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); if (false === getenv('PHP_CURL_FTP_REMOTE_SERVER')) exit("skip PHP_CURL_FTP_REMOTE_SERVER env variable is not defined"); if (false === getenv('PHP_CURL_FTP_REMOTE_USER')) exit("skip PHP_CURL_FTP_REMOTE_USER env variable is not defined"); @@ -14,7 +13,7 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD')) exit("skip PHP_CURL_FTP_REM $username = getenv('PHP_CURL_FTP_REMOTE_USER'); $password = getenv('PHP_CURL_FTP_REMOTE_PASSWD'); - // FTP this script to a server + // FTP this script to a server $fp = fopen ( __FILE__ , "r" ); $url = "ftp://$username:$password@$host/test.phpt" ; diff --git a/ext/curl/tests/curl_multi_segfault.phpt b/ext/curl/tests/curl_multi_segfault.phpt index dde8189411..fffe9f1fbb 100644 --- a/ext/curl/tests/curl_multi_segfault.phpt +++ b/ext/curl/tests/curl_multi_segfault.phpt @@ -1,8 +1,7 @@ --TEST-- -Segfault due to libcurl connection caching ---CREDITS-- +Segfault due to libcurl connection caching --SKIPIF-- -<?php +<?php if (!extension_loaded("curl")) exit("skip curl extension not loaded"); if (false === getenv('PHP_CURL_FTP_REMOTE_SERVER')) exit("skip PHP_CURL_FTP_REMOTE_SERVER env variable is not defined"); if (false === getenv('PHP_CURL_FTP_REMOTE_USER')) exit("skip PHP_CURL_FTP_REMOTE_USER env variable is not defined"); @@ -14,7 +13,7 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD')) exit("skip PHP_CURL_FTP_REM $username = getenv('PHP_CURL_FTP_REMOTE_USER'); $password = getenv('PHP_CURL_FTP_REMOTE_PASSWD'); - // FTP this script to a server + // FTP this script to a server $fp = fopen ( __FILE__ , "r" ); $url = "ftp://$username:$password@$host/" ; @@ -43,8 +42,8 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD')) exit("skip PHP_CURL_FTP_REM $mrc = curl_multi_exec($cmh, $active); } while ($mrc == CURLM_CALL_MULTI_PERFORM); } - } - + } + var_dump(is_string(curl_multi_getcontent($ch))); curl_multi_remove_handle($cmh, $ch); curl_close($ch); diff --git a/ext/date/tests/bug55397.phpt b/ext/date/tests/bug55397.phpt index 2ce1257710..98f29a25b5 100644 --- a/ext/date/tests/bug55397.phpt +++ b/ext/date/tests/bug55397.phpt @@ -1,6 +1,5 @@ --TEST-- Bug #55397 (comparison of incomplete DateTime causes SIGSEGV) ---INI-- --FILE-- <?php date_default_timezone_set('Europe/Prague'); diff --git a/ext/pgsql/tests/09notice.phpt b/ext/pgsql/tests/09notice.phpt index 64ab068e4a..11c80481f6 100644 --- a/ext/pgsql/tests/09notice.phpt +++ b/ext/pgsql/tests/09notice.phpt @@ -8,7 +8,6 @@ include("skipif.inc"); _skip_lc_messages(); ?> ---INI-- --FILE-- <?php include 'config.inc'; diff --git a/ext/session/tests/bug61470.phpt b/ext/session/tests/bug61470.phpt index 93d79fb75c..7f07929f2e 100644 --- a/ext/session/tests/bug61470.phpt +++ b/ext/session/tests/bug61470.phpt @@ -2,7 +2,6 @@ Bug #61470 (session_regenerate_id() does not create session file) --SKIPIF-- <?php include('skipif.inc'); ?> ---INI-- --FILE-- <?php ob_start(); @@ -21,7 +20,7 @@ var_dump(is_file($file2)); // cleanup @unlink($file1); @unlink($file2); +?> --EXPECT-- bool(true) bool(true) - diff --git a/ext/session/tests/bug66827.phpt b/ext/session/tests/bug66827.phpt index 4e1a4f7aea..09bfa203ef 100644 --- a/ext/session/tests/bug66827.phpt +++ b/ext/session/tests/bug66827.phpt @@ -1,6 +1,5 @@ --TEST-- Bug #66827: Session raises E_NOTICE when session name variable is array. ---INI-- --SKIPIF-- <?php include('skipif.inc'); ?> --FILE-- @@ -8,5 +7,6 @@ Bug #66827: Session raises E_NOTICE when session name variable is array. $_COOKIE[session_name()] = array(); session_start(); echo 'OK'; +?> --EXPECTF-- OK diff --git a/ext/standard/tests/general_functions/intval_binary_prefix.phpt b/ext/standard/tests/general_functions/intval_binary_prefix.phpt index af49515396..e5b8214881 100644 --- a/ext/standard/tests/general_functions/intval_binary_prefix.phpt +++ b/ext/standard/tests/general_functions/intval_binary_prefix.phpt @@ -1,6 +1,5 @@ --TEST-- Test intval() function with "0b" string prefix ---SKIPIF-- --FILE-- <?php diff --git a/ext/standard/tests/network/setcookie.phpt b/ext/standard/tests/network/setcookie.phpt index 3582d341a7..167e65f0a7 100644 --- a/ext/standard/tests/network/setcookie.phpt +++ b/ext/standard/tests/network/setcookie.phpt @@ -1,6 +1,5 @@ --TEST-- setcookie() tests ---DESCRIPTION-- --INI-- date.timezone=UTC --FILE-- diff --git a/ext/zip/tests/001.phpt b/ext/zip/tests/001.phpt index 37dccc055e..3adaabbf32 100644 --- a/ext/zip/tests/001.phpt +++ b/ext/zip/tests/001.phpt @@ -2,10 +2,8 @@ Check for zip presence --SKIPIF-- <?php if (!extension_loaded("zip")) print "skip"; ?> ---POST-- ---GET-- --FILE-- -<?php +<?php echo "zip extension is available"; ?> --EXPECT-- diff --git a/tests/basic/encoding.phpt b/tests/basic/encoding.phpt index c513cbfa79..dbf61db9bc 100644 --- a/tests/basic/encoding.phpt +++ b/tests/basic/encoding.phpt @@ -1,6 +1,5 @@ --TEST-- PHP encoding setting test ---INI-- --FILE-- <?php var_dump(ini_get('default_charset')); @@ -20,7 +19,7 @@ var_dump(ini_set('output_encoding', 'EUC-JP')); var_dump(ini_get('input_encoding')); var_dump(ini_get('internal_encoding')); var_dump(ini_get('output_encoding')); - +?> --EXPECT-- string(5) "UTF-8" string(0) "" |