diff options
| author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-02-19 05:59:41 -0300 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-02-20 21:53:48 +0100 |
| commit | ded3d984c6133b1f508ed84e96df3316e207c99b (patch) | |
| tree | 175c208197d72966fbeb22c1df9dac0a1a33124f /sapi/cli | |
| parent | a00286921e8963d284a7a5db0c1fecffa6cb6b54 (diff) | |
| download | php-git-ded3d984c6133b1f508ed84e96df3316e207c99b.tar.gz | |
Use EXPECT instead of EXPECTF when possible
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
Diffstat (limited to 'sapi/cli')
27 files changed, 27 insertions, 27 deletions
diff --git a/sapi/cli/tests/002-win32.phpt b/sapi/cli/tests/002-win32.phpt index 5a00c67f74..6176625c5b 100644 --- a/sapi/cli/tests/002-win32.phpt +++ b/sapi/cli/tests/002-win32.phpt @@ -16,7 +16,7 @@ var_dump(`$php -n -r "var_dump('hello');"`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(18) "string(5) "hello" " Done diff --git a/sapi/cli/tests/002.phpt b/sapi/cli/tests/002.phpt index be2b6331b3..c67b93eba2 100644 --- a/sapi/cli/tests/002.phpt +++ b/sapi/cli/tests/002.phpt @@ -16,7 +16,7 @@ var_dump(`$php -n -r 'var_dump("hello");'`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(18) "string(5) "hello" " Done diff --git a/sapi/cli/tests/003-2.phpt b/sapi/cli/tests/003-2.phpt index 2ed9b07db4..24c3b591cc 100644 --- a/sapi/cli/tests/003-2.phpt +++ b/sapi/cli/tests/003-2.phpt @@ -17,7 +17,7 @@ var_dump(`"$php" -nd max_execution_time=500 -r 'var_dump(ini_get("max_execution_ ?> ===DONE=== ---EXPECTF-- +--EXPECT-- string(16) "string(3) "111" " string(16) "string(3) "500" diff --git a/sapi/cli/tests/003.phpt b/sapi/cli/tests/003.phpt index d62360e1f6..aff5a845b8 100644 --- a/sapi/cli/tests/003.phpt +++ b/sapi/cli/tests/003.phpt @@ -19,7 +19,7 @@ var_dump(`$php -n -d upload_tmp_dir=/test/path -d max_execution_time=555 -r 'var echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(16) "string(3) "111" " string(16) "string(3) "500" diff --git a/sapi/cli/tests/004.phpt b/sapi/cli/tests/004.phpt index 0248525dab..1a5473987f 100644 --- a/sapi/cli/tests/004.phpt +++ b/sapi/cli/tests/004.phpt @@ -15,7 +15,7 @@ var_dump(`$php -n --rf phpinfo`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(45) "Exception: Function unknown() does not exist " string(42) "Exception: Function echo() does not exist diff --git a/sapi/cli/tests/005.phpt b/sapi/cli/tests/005.phpt index 0790904f8c..2a4b8d955d 100644 --- a/sapi/cli/tests/005.phpt +++ b/sapi/cli/tests/005.phpt @@ -15,7 +15,7 @@ var_dump(`"$php" -n --rc exception`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(40) "Exception: Class unknown does not exist " string(183) "Class [ <internal:Core> class stdClass ] { diff --git a/sapi/cli/tests/007.phpt b/sapi/cli/tests/007.phpt index 0bf40703d9..d50c38149a 100644 --- a/sapi/cli/tests/007.phpt +++ b/sapi/cli/tests/007.phpt @@ -40,7 +40,7 @@ var_dump(`echo "<?php /* comment */ class test {\n // comment \n function foo() echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(81) " <?php class test { public $var = "test"; private $pri; function foo() { } } ?> diff --git a/sapi/cli/tests/009.phpt b/sapi/cli/tests/009.phpt index 33f859fb38..5e72e39f03 100644 --- a/sapi/cli/tests/009.phpt +++ b/sapi/cli/tests/009.phpt @@ -12,7 +12,7 @@ var_dump(`$php -n -r "echo hello;" -a`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(57) "Either execute direct code, process stdin or use a file. " string(57) "Either execute direct code, process stdin or use a file. diff --git a/sapi/cli/tests/010-2.phpt b/sapi/cli/tests/010-2.phpt index bd33d2cc94..cec29c6b4a 100644 --- a/sapi/cli/tests/010-2.phpt +++ b/sapi/cli/tests/010-2.phpt @@ -27,7 +27,7 @@ var_dump(`cat "$filename_txt" | "$php" -n -R "var_dump(1);"`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(21) "int(1) int(1) int(1) diff --git a/sapi/cli/tests/010.phpt b/sapi/cli/tests/010.phpt index 77c76c1940..198eef4bed 100644 --- a/sapi/cli/tests/010.phpt +++ b/sapi/cli/tests/010.phpt @@ -38,7 +38,7 @@ var_dump(`cat "$filename_txt" | "$php" -n -F "$filename"`); @unlink(__DIR__."/010.test.php"); @unlink(__DIR__."/010.test.txt"); ?> ---EXPECTF-- +--EXPECT-- string(25) " string(10) "test hello" diff --git a/sapi/cli/tests/012-2.phpt b/sapi/cli/tests/012-2.phpt index 34be936708..da73fa9b26 100644 --- a/sapi/cli/tests/012-2.phpt +++ b/sapi/cli/tests/012-2.phpt @@ -27,7 +27,7 @@ var_dump(`"$php" -n -l -r "echo 9;"`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(57) "Either execute direct code, process stdin or use a file. " string(57) "Either execute direct code, process stdin or use a file. diff --git a/sapi/cli/tests/012.phpt b/sapi/cli/tests/012.phpt index c1e4f6a63a..90527143e5 100644 --- a/sapi/cli/tests/012.phpt +++ b/sapi/cli/tests/012.phpt @@ -18,7 +18,7 @@ var_dump(`"$php" -n -r '' -r ''`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(32) "You can use -R or -F only once. " string(32) "You can use -R or -F only once. diff --git a/sapi/cli/tests/013.phpt b/sapi/cli/tests/013.phpt index 99bfe5e7bb..af5a82ecd7 100644 --- a/sapi/cli/tests/013.phpt +++ b/sapi/cli/tests/013.phpt @@ -23,7 +23,7 @@ var_dump(`cat "$filename_txt" | "$php" -n -B 'var_dump("start");' -E 'var_dump(" echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(18) "string(5) "start" " string(16) "string(3) "end" diff --git a/sapi/cli/tests/014.phpt b/sapi/cli/tests/014.phpt index e8c5203f67..84c6d16204 100644 --- a/sapi/cli/tests/014.phpt +++ b/sapi/cli/tests/014.phpt @@ -34,7 +34,7 @@ var_dump(`"$php" -n -s unknown`); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(1478) "<code><span style="color: #000000"> <br /><span style="color: #0000BB"><?php<br />$test </span><span style="color: #007700">= </span><span style="color: #DD0000">"var"</span><span style="color: #007700">; </span><span style="color: #FF8000">//var<br />/* test class */<br /></span><span style="color: #007700">class </span><span style="color: #0000BB">test </span><span style="color: #007700">{<br /> private </span><span style="color: #0000BB">$var </span><span style="color: #007700">= array();<br /><br /> public static function </span><span style="color: #0000BB">foo</span><span style="color: #007700">(</span><span style="color: #0000BB">Test $arg</span><span style="color: #007700">) {<br /> echo </span><span style="color: #DD0000">"hello"</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);<br /> }<br />}<br /><br /></span><span style="color: #0000BB">$o </span><span style="color: #007700">= new </span><span style="color: #0000BB">test</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?><br /></span> </span> diff --git a/sapi/cli/tests/016.phpt b/sapi/cli/tests/016.phpt index 9c28d15a30..cbedb1e7ac 100644 --- a/sapi/cli/tests/016.phpt +++ b/sapi/cli/tests/016.phpt @@ -59,7 +59,7 @@ foreach ($codes as $key => $code) { echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- -------------- Snippet no. 1: -------------- diff --git a/sapi/cli/tests/017.phpt b/sapi/cli/tests/017.phpt index dbddb283a4..a19d0a6bd3 100644 --- a/sapi/cli/tests/017.phpt +++ b/sapi/cli/tests/017.phpt @@ -59,7 +59,7 @@ foreach ($codes as $key => $code) { echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- -------------- Snippet no. 1: -------------- diff --git a/sapi/cli/tests/021.phpt b/sapi/cli/tests/021.phpt index 2ddd688903..cd27715334 100644 --- a/sapi/cli/tests/021.phpt +++ b/sapi/cli/tests/021.phpt @@ -35,7 +35,7 @@ echo "\nDone\n"; <?php unlink(__DIR__.'/021.tmp.php'); ?> ---EXPECTF-- +--EXPECT-- ola 2 adeus diff --git a/sapi/cli/tests/023.phpt b/sapi/cli/tests/023.phpt index 91674e321e..09b256a9af 100644 --- a/sapi/cli/tests/023.phpt +++ b/sapi/cli/tests/023.phpt @@ -41,6 +41,6 @@ proc_close($proc); <?php unlink(__DIR__ . "/023.ini"); ?> ---EXPECTF-- +--EXPECT-- string(3) "40M" string(0) "" diff --git a/sapi/cli/tests/bug61679.phpt b/sapi/cli/tests/bug61679.phpt index 819ce2fa89..3ba36d572c 100644 --- a/sapi/cli/tests/bug61679.phpt +++ b/sapi/cli/tests/bug61679.phpt @@ -39,5 +39,5 @@ HEADER fclose($fp); ?> ---EXPECTF-- +--EXPECT-- HTTP/1.1 501 Not Implemented diff --git a/sapi/cli/tests/bug61977.phpt b/sapi/cli/tests/bug61977.phpt index 218641a511..b23f0e28f6 100644 --- a/sapi/cli/tests/bug61977.phpt +++ b/sapi/cli/tests/bug61977.phpt @@ -43,7 +43,7 @@ HEADER; test_mimetypes($mimetypes); ?> ---EXPECTF-- +--EXPECT-- foo.html => Content-Type: text/html; charset=UTF-8 foo.htm => Content-Type: text/html; charset=UTF-8 foo.svg => Content-Type: image/svg+xml diff --git a/sapi/cli/tests/bug64544.phpt b/sapi/cli/tests/bug64544.phpt index cc49545c16..33a6e16a10 100644 --- a/sapi/cli/tests/bug64544.phpt +++ b/sapi/cli/tests/bug64544.phpt @@ -15,6 +15,6 @@ var_dump(getenv("HOME")); putenv("FOO=BAR"); var_dump(getenv("FOO")); ?> ---EXPECTF-- +--EXPECT-- string(4) "/tmp" string(3) "BAR" diff --git a/sapi/cli/tests/bug66606_1.phpt b/sapi/cli/tests/bug66606_1.phpt index ad35038bae..3cda764e61 100644 --- a/sapi/cli/tests/bug66606_1.phpt +++ b/sapi/cli/tests/bug66606_1.phpt @@ -12,6 +12,6 @@ include "php_cli_server.inc"; php_cli_server_start('var_dump($_SERVER["CONTENT_TYPE"], $_SERVER["CONTENT_LENGTH"])'); echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS); ?> ---EXPECTF-- +--EXPECT-- NULL NULL diff --git a/sapi/cli/tests/bug74600.phpt b/sapi/cli/tests/bug74600.phpt index 0ca7be95a7..eee222aaa3 100644 --- a/sapi/cli/tests/bug74600.phpt +++ b/sapi/cli/tests/bug74600.phpt @@ -33,6 +33,6 @@ proc_close($proc); <?php unlink(__DIR__ . "/bug74600.ini"); ?> ---EXPECTF-- +--EXPECT-- string(4) "okey" string(0) "" diff --git a/sapi/cli/tests/cli_process_title_unix.phpt b/sapi/cli/tests/cli_process_title_unix.phpt index 659299c1fc..418433d8f2 100644 --- a/sapi/cli/tests/cli_process_title_unix.phpt +++ b/sapi/cli/tests/cli_process_title_unix.phpt @@ -47,7 +47,7 @@ else echo "Actually loaded from get: $read_title\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing setting the process title *** Successfully set title Successfully verified title using ps diff --git a/sapi/cli/tests/cli_process_title_windows.phpt b/sapi/cli/tests/cli_process_title_windows.phpt index 91bac579e8..677f43fd8b 100644 --- a/sapi/cli/tests/cli_process_title_windows.phpt +++ b/sapi/cli/tests/cli_process_title_windows.phpt @@ -66,7 +66,7 @@ else echo "Actually loaded from get: $read_title\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing setting the process title *** Successfully set title Successfully verified title using get-process diff --git a/sapi/cli/tests/php_cli_server_003.phpt b/sapi/cli/tests/php_cli_server_003.phpt index d1e95fe6aa..d8fb8461be 100644 --- a/sapi/cli/tests/php_cli_server_003.phpt +++ b/sapi/cli/tests/php_cli_server_003.phpt @@ -13,6 +13,6 @@ php_cli_server_start('chdir(__DIR__); echo "okey";'); var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS)); var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS)); ?> ---EXPECTF-- +--EXPECT-- string(4) "okey" string(4) "okey" diff --git a/sapi/cli/tests/php_cli_server_016.phpt b/sapi/cli/tests/php_cli_server_016.phpt index f15aff1240..513d7ec027 100644 --- a/sapi/cli/tests/php_cli_server_016.phpt +++ b/sapi/cli/tests/php_cli_server_016.phpt @@ -42,5 +42,5 @@ HEADER fclose($fp); ?> ---EXPECTF-- +--EXPECT-- HTTP/1.1 404 Not Found |