ext/standard/file: clarify fclose() warning

Girgias · Girgias · commit ec13ba7e81a0 · 2025-03-15T21:00:36.000Z
diff --git a/ext/spl/tests/bug81691.phpt b/ext/spl/tests/bug81691.phpt
@@ -10,6 +10,6 @@ var_dump($obj->fgets());
 
 ?>
 --EXPECTF--
-Warning: fclose(): %d is not a valid stream resource in %s on line %d
+Warning: fclose(): cannot close the provided stream, as it must not be manually closed in %s on line %d
 string(6) "<?php
 "
diff --git a/ext/standard/file.c b/ext/standard/file.c
@@ -757,7 +757,7 @@ PHPAPI PHP_FUNCTION(fclose)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if ((stream->flags & PHP_STREAM_FLAG_NO_FCLOSE) != 0) {
-		php_error_docref(NULL, E_WARNING, ZEND_LONG_FMT " is not a valid stream resource", stream->res->handle);
+		php_error_docref(NULL, E_WARNING, "cannot close the provided stream, as it must not be manually closed");
 		RETURN_FALSE;
 	}
 
diff --git a/ext/standard/tests/filters/bug54350.phpt b/ext/standard/tests/filters/bug54350.phpt
@@ -22,5 +22,5 @@ fwrite($fd, "foo");
 
 ?>
 --EXPECTF--
-Warning: fclose(): %d is not a valid stream resource in %s on line %d
+Warning: fclose(): cannot close the provided stream, as it must not be manually closed in %s on line %d
 fclose(): Argument #1 ($stream) must be an open stream resource
diff --git a/ext/xmlwriter/tests/bug79029.phpt b/ext/xmlwriter/tests/bug79029.phpt
@@ -26,7 +26,7 @@ okey
 @unlink("bug79029_3.txt");
 ?>
 --EXPECTF--
-Warning: fclose(): %d is not a valid stream resource in %sbug79029.php on line %d
+Warning: fclose(): cannot close the provided stream, as it must not be manually closed in %sbug79029.php on line %d
 
-Warning: fclose(): %d is not a valid stream resource in %sbug79029.php on line %d
+Warning: fclose(): cannot close the provided stream, as it must not be manually closed in %sbug79029.php on line %d
 okey

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ var_dump($obj->fgets());`
`10`	`10`
`11`	`11`	`?>`
`12`	`12`	`--EXPECTF--`
`13`		`-Warning: fclose(): %d is not a valid stream resource in %s on line %d`
	`13`	`+Warning: fclose(): cannot close the provided stream, as it must not be manually closed in %s on line %d`
`14`	`14`	`string(6) "<?php`
`15`	`15`	`"`
Original file line number	Diff line number	Diff line change
`@@ -757,7 +757,7 @@ PHPAPI PHP_FUNCTION(fclose)`
`757`	`757`	`ZEND_PARSE_PARAMETERS_END();`
`758`	`758`
`759`	`759`	`if ((stream->flags & PHP_STREAM_FLAG_NO_FCLOSE) != 0) {`
`760`		`- php_error_docref(NULL, E_WARNING, ZEND_LONG_FMT " is not a valid stream resource", stream->res->handle);`
	`760`	`+ php_error_docref(NULL, E_WARNING, "cannot close the provided stream, as it must not be manually closed");`
`761`	`761`	`RETURN_FALSE;`
`762`	`762`	`}`
`763`	`763`