fixup! Promote warnings to exceptions in stream-related functions

Fix exception types

Author: kocsismate

ext/standard/streamsfuncs.c

@@ -921,7 +921,7 @@ static int parse_context_params(php_stream_context *context, zval *params)
 		if (Z_TYPE_P(tmp) == IS_ARRAY) {
 			return parse_context_options(context, tmp);
 		} else {
-			zend_value_error("Invalid stream/context parameter");
+			zend_type_error("Invalid stream/context parameter");
 			return FAILURE;
 		}
 	}
@@ -972,7 +972,7 @@ PHP_FUNCTION(stream_context_get_options)
 
 	context = decode_context_param(zcontext);
 	if (!context) {
-		zend_value_error("Invalid stream/context parameter");
+		zend_type_error("Invalid stream/context parameter");
 		return;
 	}
 
@@ -997,7 +997,7 @@ PHP_FUNCTION(stream_context_set_option)
 
 		/* figure out where the context is coming from exactly */
 		if (!(context = decode_context_param(zcontext))) {
-			zend_value_error("Invalid stream/context parameter");
+			zend_type_error("Invalid stream/context parameter");
 			return;
 		}
 
@@ -1016,7 +1016,7 @@ PHP_FUNCTION(stream_context_set_option)
 
 		/* figure out where the context is coming from exactly */
 		if (!(context = decode_context_param(zcontext))) {
-			zend_value_error("Invalid stream/context parameter");
+			zend_type_error("Invalid stream/context parameter");
 			return;
 		}
 
@@ -1039,7 +1039,7 @@ PHP_FUNCTION(stream_context_set_params)
 
 	context = decode_context_param(zcontext);
 	if (!context) {
-		zend_value_error("Invalid stream/context parameter");
+		zend_type_error("Invalid stream/context parameter");
 		return;
 	}
 
@@ -1060,7 +1060,7 @@ PHP_FUNCTION(stream_context_get_params)
 
 	context = decode_context_param(zcontext);
 	if (!context) {
-		zend_value_error("Invalid stream/context parameter");
+		zend_type_error("Invalid stream/context parameter");
 		return;
 	}
 
@@ -1259,9 +1259,8 @@ PHP_FUNCTION(stream_filter_remove)
 		Z_PARAM_RESOURCE(zfilter)
 	ZEND_PARSE_PARAMETERS_END();
 
-	filter = zend_fetch_resource(Z_RES_P(zfilter), NULL, php_file_le_stream_filter());
+	filter = zend_fetch_resource(Z_RES_P(zfilter), "stream filter", php_file_le_stream_filter());
 	if (!filter) {
-		zend_value_error("Invalid resource given, not a stream filter");
 		return;
 	}
 
@@ -1435,7 +1434,7 @@ PHP_FUNCTION(stream_set_chunk_size)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (csize <= 0) {
-		zend_value_error("The chunk size must be a positive integer, given " ZEND_LONG_FMT, csize);
+		zend_value_error("The chunk size must be a positive integer, " ZEND_LONG_FMT " given", csize);
 		return;
 	}
 	/* stream.chunk_size is actually a size_t, but php_stream_set_option

ext/standard/tests/filters/stream_filter_remove_error.phpt

@@ -23,7 +23,7 @@ echo "*** Testing stream_filter_remove() : error conditions ***\n";
 echo "\n-- Testing stream_filter_remove() function with bad resource --\n";
 try {
     stream_filter_remove($fp);
-} catch (ValueError $exception) {
+} catch (TypeError $exception) {
     echo $exception->getMessage() . "\n";
 }
 
@@ -32,7 +32,7 @@ echo "\n-- Testing stream_filter_remove() function with an already removed filte
 var_dump(stream_filter_remove( $filter ));
 try {
     stream_filter_remove($filter);
-} catch (ValueError $exception) {
+} catch (TypeError $exception) {
     echo $exception->getMessage() . "\n";
 }
 
@@ -50,8 +50,8 @@ unlink( $file );
 *** Testing stream_filter_remove() : error conditions ***
 
 -- Testing stream_filter_remove() function with bad resource --
-Invalid resource given, not a stream filter
+stream_filter_remove(): supplied resource is not a valid stream filter resource
 
 -- Testing stream_filter_remove() function with an already removed filter --
 bool(true)
-Invalid resource given, not a stream filter
+stream_filter_remove(): supplied resource is not a valid stream filter resource

ext/standard/tests/streams/bug44712.phpt

@@ -5,7 +5,7 @@ bug#44712 (stream_context_set_params segfaults on invalid arguments)
 $ctx = stream_context_get_default();
 try {
     stream_context_set_params($ctx, array("options" => 1));
-} catch (ValueError $exception) {
+} catch (TypeError $exception) {
     echo $exception->getMessage() . "\n";
 }
 ?>

ext/standard/tests/streams/stream_set_chunk_size.phpt

@@ -84,5 +84,5 @@ write with size: 250
 int(3)
 
 error conditions
-The chunk size must be a positive integer, given 0
-The chunk size must be a positive integer, given -1
+The chunk size must be a positive integer, 0 given
+The chunk size must be a positive integer, -1 given