Stream test fixes

Author: nikic

ext/standard/tests/streams/bug46426.phpt

@@ -21,8 +21,6 @@ echo stream_get_contents($tmp, 1, 0);
 echo "\n";
 echo stream_get_contents($tmp, -1);
 
-@unlink($tmp);
-
 ?>
 --EXPECT--
 23

ext/standard/tests/streams/stream_get_contents_001.phpt

@@ -12,8 +12,6 @@ echo stream_get_contents($tmp, 2), "--\n";
 echo stream_get_contents($tmp, 2, 3), "--\n";
 echo stream_get_contents($tmp, 2, -1), "--\n";
 
-@unlink($tmp);
-
 ?>
 --EXPECT--
 --

ext/standard/tests/streams/stream_get_meta_data_file_error.phpt

@@ -10,21 +10,6 @@ Test stream_get_meta_data() function : error conditions
 
 echo "*** Testing stream_get_meta_data() : error conditions ***\n";
 
-// Zero arguments
-echo "\n-- Testing stream_get_meta_data() function with Zero arguments --\n";
-var_dump( stream_get_meta_data() );
-
-//Test stream_get_meta_data with one more than the expected number of arguments
-echo "\n-- Testing stream_get_meta_data() function with more than expected no. of arguments --\n";
-
-$fp = null;
-$extra_arg = 10;
-var_dump( stream_get_meta_data($fp, $extra_arg) );
-
-echo "\n-- Testing stream_get_meta_data() function with invalid stream resource --\n";
-$fp = null;
-var_dump(stream_get_meta_data($fp));
-
 echo "\n-- Testing stream_get_meta_data() function with closed stream resource --\n";
 $fp = fopen(__FILE__, 'r');
 fclose($fp);
@@ -35,21 +20,6 @@ echo "Done";
 --EXPECTF--
 *** Testing stream_get_meta_data() : error conditions ***
 
--- Testing stream_get_meta_data() function with Zero arguments --
-
-Warning: stream_get_meta_data() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing stream_get_meta_data() function with more than expected no. of arguments --
-
-Warning: stream_get_meta_data() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
--- Testing stream_get_meta_data() function with invalid stream resource --
-
-Warning: stream_get_meta_data() expects parameter 1 to be resource, null given in %s on line %d
-NULL
-
 -- Testing stream_get_meta_data() function with closed stream resource --
 
 Warning: stream_get_meta_data(): supplied resource is not a valid stream resource in %s on line %d

ext/standard/tests/streams/stream_resolve_include_path.phpt

@@ -14,8 +14,6 @@ mkdir($include_path_nested);
 file_put_contents($include_path_file, 'include_path');
 file_put_contents($include_path_nested_file, 'include_path');
 
-var_dump(stream_resolve_include_path());
-
 set_include_path($include_path . PATH_SEPARATOR . $include_path_nested);
 var_dump(stream_resolve_include_path('file-does-not-exist'));
 
@@ -24,13 +22,20 @@ var_dump(stream_resolve_include_path('file'));
 set_include_path($include_path_nested . PATH_SEPARATOR . $include_path);
 var_dump(stream_resolve_include_path('file'));
 
+?>
+--CLEAN--
+<?php
+$include_path = __DIR__ . '/test_path';
+$include_path_nested = $include_path . '/nested';
+$include_path_file = $include_path . DIRECTORY_SEPARATOR . 'file';
+$include_path_nested_file = $include_path_nested . DIRECTORY_SEPARATOR . 'file';
+
 unlink($include_path_nested_file);
 rmdir($include_path_nested);
 unlink($include_path_file);
 rmdir($include_path);
+?>
 --EXPECTF--
-Warning: stream_resolve_include_path() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
 bool(false)
 string(%d) "%stest_path%sfile"
 string(%d) "%stest_path%snested%sfile"

ext/standard/tests/streams/stream_set_chunk_size.phpt

@@ -51,7 +51,6 @@ var_dump(strlen(fwrite($f, str_repeat('b', 250))));
 echo "\nerror conditions\n";
 var_dump(stream_set_chunk_size($f, 0));
 var_dump(stream_set_chunk_size($f, -1));
-var_dump(stream_set_chunk_size($f, array()));
 --EXPECTF--
 bool(true)
 should return previous chunk size (8192)
@@ -87,6 +86,3 @@ bool(false)
 
 Warning: stream_set_chunk_size(): The chunk size must be a positive integer, given -1 in %s on line %d
 bool(false)
-
-Warning: stream_set_chunk_size() expects parameter 2 to be int, array given in %s on line %d
-bool(false)

ext/standard/tests/streams/stream_set_timeout_error.phpt

@@ -10,9 +10,6 @@ Test stream_set_timeout() function : error conditions
 
 echo "*** Testing stream_set_timeout() : error conditions ***\n";
 
-//Test stream_set_timeout with one more than the expected number of arguments
-echo "\n-- Testing stream_set_timeout() function with more than expected no. of arguments --\n";
-
 for ($i=0; $i<100; $i++) {
   $port = rand(10000, 65000);
   /* Setup socket server */
@@ -26,23 +23,11 @@ $client = fsockopen("tcp://127.0.0.1:$port");
 
 $seconds = 10;
 $microseconds = 10;
-$extra_arg = 10;
-var_dump( stream_set_timeout($client, $seconds, $microseconds, $extra_arg) );
-
-// Testing stream_set_timeout with one less than the expected number of arguments
-echo "\n-- Testing stream_set_timeout() function with less than expected no. of arguments --\n";
-
-$seconds = 10;
-var_dump( stream_set_timeout($client) );
-
 
 echo "\n-- Testing stream_set_timeout() function with a closed socket --\n";
 fclose($client);
 var_dump( stream_set_timeout($client, $seconds) );
 
-echo "\n-- Testing stream_set_timeout() function with an invalid stream --\n";
-var_dump( stream_set_timeout($seconds, $seconds) );
-
 echo "\n-- Testing stream_set_timeout() function with a stream that does not support timeouts --\n";
 $filestream = fopen(__FILE__, "r");
 var_dump( stream_set_timeout($filestream, $seconds) );
@@ -55,26 +40,11 @@ echo "Done";
 --EXPECTF--
 *** Testing stream_set_timeout() : error conditions ***
 
--- Testing stream_set_timeout() function with more than expected no. of arguments --
-
-Warning: stream_set_timeout() expects at most 3 parameters, 4 given in %s on line %d
-NULL
-
--- Testing stream_set_timeout() function with less than expected no. of arguments --
-
-Warning: stream_set_timeout() expects at least 2 parameters, 1 given in %s on line %d
-NULL
-
 -- Testing stream_set_timeout() function with a closed socket --
 
 Warning: stream_set_timeout(): supplied resource is not a valid stream resource in %s on line %d
 bool(false)
 
--- Testing stream_set_timeout() function with an invalid stream --
-
-Warning: stream_set_timeout() expects parameter 1 to be resource, int given in %s on line %d
-NULL
-
 -- Testing stream_set_timeout() function with a stream that does not support timeouts --
 bool(false)
 Done

ext/standard/tests/streams/stream_socket_sendto.phpt

@@ -16,8 +16,6 @@ $sock = stream_socket_server($serverUri, $errno, $errstr);
 
 if (is_resource($sock)) {
     fwrite($sock, $stringFWrite);
-    var_dump(stream_socket_sendto());
-    var_dump(stream_socket_sendto($sock));
     var_dump(stream_socket_sendto($sock, $stringSocket));
     var_dump(stream_socket_sendto($sock, $stringSocket, STREAM_OOB));
     var_dump(stream_socket_sendto($sock, $stringSocket, STREAM_OOB, $serverUri));
@@ -29,12 +27,6 @@ if (is_resource($sock)) {
 --EXPECTF--
 Notice: fwrite(): send of %i bytes failed with errno=%i Broken pipe in %s on line %d
 
-Warning: stream_socket_sendto() expects at least %i parameters, %i given in %s on line %d
-bool(%s)
-
-Warning: stream_socket_sendto() expects at least %i parameters, %i given in %s on line %d
-bool(%s)
-
 Warning: stream_socket_sendto(): Broken pipe
  in %s on line %d
 int(%i)

ext/standard/tests/time/strptime_error.phpt

@@ -19,42 +19,15 @@ date_default_timezone_set("Europe/London");
 
 echo "*** Testing strptime() : error conditions ***\n";
 
-echo "\n-- Testing strptime() function with Zero arguments --\n";
-var_dump( strptime() );
-
-echo "\n-- Testing strptime() function with less than expected no. of arguments --\n";
-$format = '%b %d %Y %H:%M:%S';
-$timestamp = mktime(8, 8, 8, 8, 8, 2008);
-$date = strftime($format, $timestamp);
-var_dump( strptime($date) );
-
-echo "\n-- Testing strptime() function with more than expected no. of arguments --\n";
-$extra_arg = 10;
-var_dump( strptime($date, $format, $extra_arg) );
-
 echo "\n-- Testing strptime() function on failure --\n";
+$format = '%b %d %Y %H:%M:%S';
 var_dump( strptime('foo', $format) );
 
 ?>
 ===DONE===
 --EXPECTF--
 *** Testing strptime() : error conditions ***
 
--- Testing strptime() function with Zero arguments --
-
-Warning: strptime() expects exactly 2 parameters, 0 given in %s on line %d
-NULL
-
--- Testing strptime() function with less than expected no. of arguments --
-
-Warning: strptime() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-
--- Testing strptime() function with more than expected no. of arguments --
-
-Warning: strptime() expects exactly 2 parameters, 3 given in %s on line %d
-NULL
-
 -- Testing strptime() function on failure --
 bool(false)
 ===DONE===