streams: remove php_stream_wrapper_warn_param() functions

Girgias · Girgias · commit 1f7abed78993 · 2026-07-17T14:33:38.000+01:00
And instead let the normal docref error handling code handle arguments
diff --git a/Zend/tests/display_error_function_args.phpt b/Zend/tests/display_error_function_args.phpt
@@ -25,6 +25,6 @@ Warning: unlink('/'): %s in %s on line %d
 
 Warning: password_hash(Object(SensitiveParameterValue), '2y', Array): The "salt" option has been ignored, since providing a custom salt is no longer supported in %s on line %d
 
-Warning: unlink(/): %s in %s on line %d
+Warning: unlink(): %s in %s on line %d
 
 Warning: password_hash(): The "salt" option has been ignored, since providing a custom salt is no longer supported in %s on line %d
diff --git a/ext/session/tests/user_session_module/session_set_save_handler_variation4.phpt b/ext/session/tests/user_session_module/session_set_save_handler_variation4.phpt
@@ -83,6 +83,6 @@ array(3) {
 }
 Destroy [%s,%s]
 
-Warning: unlink(%s): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 Close [%s,PHPSESSID]
 bool(true)
diff --git a/ext/session/tests/user_session_module/session_set_save_handler_variation5.phpt b/ext/session/tests/user_session_module/session_set_save_handler_variation5.phpt
@@ -97,6 +97,6 @@ GC [0]
 bool(true)
 Destroy [%s,PHPT-%d]
 
-Warning: unlink(%s): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 Close [%s,PHPSESSID]
 bool(true)
diff --git a/ext/standard/tests/file/copy_variation4.phpt b/ext/standard/tests/file/copy_variation4.phpt
@@ -91,7 +91,7 @@ Destination file name => %s/
 Size of source file => int(1500)
 Size of destination file => int(%d)
 
-Warning: unlink(%s): %s
+Warning: unlink(): %s
 
 -- Iteration 2 --
 Existence of destination file before copy => bool(true)
@@ -103,7 +103,7 @@ Destination file name => %s/
 Size of source file => int(1500)
 Size of destination file => int(%d)
 
-Warning: unlink(%s): %s
+Warning: unlink(): %s
 
 -- Iteration 3 --
 Existence of destination file before copy => bool(true)
@@ -115,7 +115,7 @@ Destination file name => %s/
 Size of source file => int(1500)
 Size of destination file => int(%d)
 
-Warning: unlink(%s): %s
+Warning: unlink(): %s
 
 -- Iteration 4 --
 Existence of destination file before copy => bool(true)
@@ -127,7 +127,7 @@ Destination file name => %s/
 Size of source file => int(1500)
 Size of destination file => int(%d)
 
-Warning: unlink(%s): %s
+Warning: unlink(): %s
 
 -- Iteration 5 --
 Existence of destination file before copy => bool(false)
diff --git a/ext/standard/tests/file/copy_variation5-win32.phpt b/ext/standard/tests/file/copy_variation5-win32.phpt
@@ -98,7 +98,7 @@ Destination file name => %s/CopY5.TMP
 Size of source file => int(1500)
 Size of destination file => int(1500)
 
-Warning: unlink(%s/COPY5.TMP): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 
-Warning: unlink(%s/CopY5.TMP): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 *** Done ***
diff --git a/ext/standard/tests/file/mkdir_rmdir_error.phpt b/ext/standard/tests/file/mkdir_rmdir_error.phpt
@@ -11,6 +11,6 @@ echo "Done\n";
 --EXPECTF--
 *** Testing rmdir() on non-existent directory ***
 
-Warning: rmdir(temp): No such file or directory in %s on line %d
+Warning: rmdir(): No such file or directory in %s on line %d
 bool(false)
 Done
diff --git a/ext/standard/tests/file/mkdir_rmdir_variation-win32-mb.phpt b/ext/standard/tests/file/mkdir_rmdir_variation-win32-mb.phpt
@@ -1596,7 +1596,7 @@ bool(true)
 *** Testing rmdir() on a non-empty directory ***
 bool(true)
 
-Warning: rmdir(%s/mkdir私はガラスを食べられます/): Directory not empty in %s on line %d
+Warning: rmdir(): Directory not empty in %s on line %d
 bool(false)
 
 *** Testing mkdir() and rmdir() for binary safe functionality ***
diff --git a/ext/standard/tests/file/mkdir_rmdir_variation-win32.phpt b/ext/standard/tests/file/mkdir_rmdir_variation-win32.phpt
@@ -1596,7 +1596,7 @@ bool(true)
 *** Testing rmdir() on a non-empty directory ***
 bool(true)
 
-Warning: rmdir(%s/mkdir/): Directory not empty in %s on line %d
+Warning: rmdir(): Directory not empty in %s on line %d
 bool(false)
 
 *** Testing mkdir() and rmdir() for binary safe functionality ***
diff --git a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
@@ -56,7 +56,7 @@ bool(true)
 *** Testing rmdir() on a non-empty directory ***
 bool(true)
 
-Warning: rmdir(%s/mkdir_variation2/): %s on line %d
+Warning: rmdir(): %s on line %d
 bool(false)
 
 *** Testing mkdir() and rmdir() for binary safe functionality ***
diff --git a/ext/standard/tests/file/readlink_realpath_variation2-win32.phpt b/ext/standard/tests/file/readlink_realpath_variation2-win32.phpt
@@ -80,7 +80,7 @@ Warning: readlink(): readlink failed to read the symbolic link (%s), error %d in
 bool(false)
 bool(false)
 
-Warning: unlink(%s/./readlink_realpath_variation2/home/../home//tests//..//..//..//home//readlink_realpath_variation2_link.tmp/): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 
 -- Testing readlink() and realpath() with hardlink, linkname stored inside an array --
 bool(true)
@@ -94,5 +94,5 @@ Warning: readlink(): readlink failed to read the symbolic link (%s), error %d in
 bool(false)
 bool(false)
 
-Warning: unlink(%s/./readlink_realpath_variation2/home/../home//tests//..//..//..//home//readlink_realpath_variation2_link.tmp/): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 Done
diff --git a/ext/standard/tests/file/readlink_realpath_variation2.phpt b/ext/standard/tests/file/readlink_realpath_variation2.phpt
@@ -77,7 +77,7 @@ Warning: readlink(): No such file or directory in %s on line %d
 bool(false)
 bool(false)
 
-Warning: unlink(%s/./readlink_realpath_variation2/home/../home//tests//..//..//..//home//readlink_realpath_variation2_link.tmp/): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 
 -- Testing readlink() and realpath() with hardlink, linkname stored inside an array --
 bool(true)
@@ -93,5 +93,5 @@ Warning: readlink(): No such file or directory in %s on line %d
 bool(false)
 bool(false)
 
-Warning: unlink(%s/./readlink_realpath_variation2/home/../home//tests//..//..//..//home//readlink_realpath_variation2_link.tmp/): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 Done
diff --git a/ext/standard/tests/file/rename_variation-win32.phpt b/ext/standard/tests/file/rename_variation-win32.phpt
@@ -66,7 +66,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: unlink(%s/rename_variation2.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 -- Iteration 3 --
 bool(true)
 bool(false)
diff --git a/ext/standard/tests/file/rename_variation.phpt b/ext/standard/tests/file/rename_variation.phpt
@@ -60,7 +60,7 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: unlink(%s): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 -- Iteration 3 --
 bool(true)
 bool(false)
diff --git a/ext/standard/tests/file/rmdir_variation3-win32.phpt b/ext/standard/tests/file/rmdir_variation3-win32.phpt
@@ -75,10 +75,10 @@ Directory removed
 Directory removed
 -- removing rmdirVar3.tmp\..\BADDIR\aSubDir --
 
-Warning: rmdir(rmdirVar3.tmp\..\BADDIR\aSubDir): No such file or directory in %s on line %d
+Warning: rmdir(): No such file or directory in %s on line %d
 -- removing BADDIR\aSubDir --
 
-Warning: rmdir(BADDIR\aSubDir): No such file or directory in %s on line %d
+Warning: rmdir(): No such file or directory in %s on line %d
 -- removing %s\rmdirVar3.tmp\aSubDir --
 Directory removed
 -- removing %s\.\rmdirVar3.tmp\aSubDir --
@@ -87,7 +87,7 @@ Directory removed
 Directory removed
 -- removing %s\BADDIR\aSubDir --
 
-Warning: rmdir(%s\BADDIR\aSubDir): No such file or directory in %s on line %d
+Warning: rmdir(): No such file or directory in %s on line %d
 -- removing rmdirVar3.tmp\aSubDir\ --
 Directory removed
 -- removing %s\rmdirVar3.tmp\aSubDir\ --
diff --git a/ext/standard/tests/file/rmdir_variation3.phpt b/ext/standard/tests/file/rmdir_variation3.phpt
@@ -65,10 +65,10 @@ Directory removed
 Directory removed
 -- removing rmdirVar3.tmp/../BADDIR/aSubDir --
 
-Warning: rmdir(rmdirVar3.tmp/../BADDIR/aSubDir): No such file or directory in %s on line %d
+Warning: rmdir(): No such file or directory in %s on line %d
 -- removing BADDIR/aSubDir --
 
-Warning: rmdir(BADDIR/aSubDir): No such file or directory in %s on line %d
+Warning: rmdir(): No such file or directory in %s on line %d
 -- removing %s/rmdirVar3.tmp/aSubDir --
 Directory removed
 -- removing %s/./rmdirVar3.tmp/aSubDir --
@@ -77,7 +77,7 @@ Directory removed
 Directory removed
 -- removing %s/BADDIR/aSubDir --
 
-Warning: rmdir(%s/BADDIR/aSubDir): No such file or directory in %s on line %d
+Warning: rmdir(): No such file or directory in %s on line %d
 -- removing rmdirVar3.tmp/aSubDir/ --
 Directory removed
 -- removing %s/rmdirVar3.tmp/aSubDir/ --
diff --git a/ext/standard/tests/file/unlink_error-win32-mb.phpt b/ext/standard/tests/file/unlink_error-win32-mb.phpt
@@ -65,11 +65,11 @@ bool(false)
 
 -- Testing unlink() on non-existent file --
 
-Warning: unlink(%s/non_existent_file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 bool(false)
 
 -- Testing unlink() on directory --
 
-Warning: unlink(%s/unlink_error): Is a directory in %s on line %d
+Warning: unlink(): Is a directory in %s on line %d
 bool(false)
 Done
diff --git a/ext/standard/tests/file/unlink_error-win32.phpt b/ext/standard/tests/file/unlink_error-win32.phpt
@@ -62,11 +62,11 @@ bool(false)
 
 -- Testing unlink() on non-existent file --
 
-Warning: unlink(%s/non_existent_file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 bool(false)
 
 -- Testing unlink() on directory --
 
-Warning: unlink(%s/unlink_error): Is a directory in %s on line %d
+Warning: unlink(): Is a directory in %s on line %d
 bool(false)
 Done
diff --git a/ext/standard/tests/file/unlink_error.phpt b/ext/standard/tests/file/unlink_error.phpt
@@ -61,11 +61,11 @@ bool(false)
 
 -- Testing unlink() on non-existent file --
 
-Warning: unlink(%s/non_existent_file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 bool(false)
 
 -- Testing unlink() on directory --
 
-Warning: unlink(%s/unlink_error): %s in %s on line %d
+Warning: unlink(): %s in %s on line %d
 bool(false)
 Done
diff --git a/ext/standard/tests/file/unlink_variation1-win32-mb.phpt b/ext/standard/tests/file/unlink_variation1-win32-mb.phpt
@@ -77,7 +77,7 @@ bool(true)
 -- Unlinking file without write permission, its dir having default permission --
 bool(true)
 
-Warning: unlink(%s/unlink_variation1/unlink_variation1-win32.tmp): Permission denied in %s on line %d
+Warning: unlink(): Permission denied in %s on line %d
 bool(false)
 bool(true)
 bool(false)
diff --git a/ext/standard/tests/file/unlink_variation1-win32.phpt b/ext/standard/tests/file/unlink_variation1-win32.phpt
@@ -75,7 +75,7 @@ bool(true)
 -- Unlinking file without write permission, its dir having default permission --
 bool(true)
 
-Warning: unlink(%s/unlink_variation1/unlink_variation1-win32.tmp): Permission denied in %s on line %d
+Warning: unlink(): Permission denied in %s on line %d
 bool(false)
 bool(true)
 bool(false)
diff --git a/ext/standard/tests/file/unlink_variation1.phpt b/ext/standard/tests/file/unlink_variation1.phpt
@@ -64,7 +64,7 @@ echo "Done\n";
 -- Unlink file having default permission and its dir having read only permission --
 bool(true)
 
-Warning: unlink(%s): %s in %s on line %d
+Warning: unlink(): %s in %s on line %d
 bool(false)
 bool(false)
 bool(true)
diff --git a/ext/standard/tests/file/unlink_variation10.phpt b/ext/standard/tests/file/unlink_variation10.phpt
@@ -95,4 +95,4 @@ directory unlinked
 
 --- try to unlink a directory ---
 
-Warning: unlink(unlinkVar10.tmp/linkme.tmp): %s in %s on line %d
+Warning: unlink(): %s in %s on line %d
diff --git a/ext/standard/tests/file/unlink_variation4.phpt b/ext/standard/tests/file/unlink_variation4.phpt
@@ -29,6 +29,6 @@ echo "Done\n";
 bool(true)
 bool(false)
 
-Warning: unlink(%s/unlink_variation4.tmp): %s in %s on line %d
+Warning: unlink(): %s in %s on line %d
 bool(false)
 Done
diff --git a/ext/standard/tests/file/unlink_variation8-win32.phpt b/ext/standard/tests/file/unlink_variation8-win32.phpt
@@ -80,10 +80,10 @@ file removed
 file removed
 -- removing unlinkVar8.tmp/../BADDIR/file.tmp --
 
-Warning: unlink(unlinkVar8.tmp/../BADDIR/file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 -- removing BADDIR/file.tmp --
 
-Warning: unlink(BADDIR/file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 -- removing %s/unlinkVar8.tmp/file.tmp --
 file removed
 -- removing %s/./unlinkVar8.tmp/file.tmp --
@@ -92,13 +92,13 @@ file removed
 file removed
 -- removing %s/BADDIR/file.tmp --
 
-Warning: unlink(%s/BADDIR/file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 -- removing unlinkVar8.tmp/file.tmp/ --
 
-Warning: unlink(unlinkVar8.tmp/file.tmp/): %rNo such file or directory|Not a directory%r in %s on line %d
+Warning: unlink(): %rNo such file or directory|Not a directory%r in %s on line %d
 -- removing %s/unlinkVar8.tmp/file.tmp/ --
 
-Warning: unlink(%s/unlinkVar8.tmp/file.tmp/): %rNo such file or directory|Not a directory%r in %s on line %d
+Warning: unlink(): %rNo such file or directory|Not a directory%r in %s on line %d
 -- removing unlinkVar8.tmp//file.tmp --
 file removed
 -- removing %s//unlinkVar8.tmp//file.tmp --
diff --git a/ext/standard/tests/file/unlink_variation8.phpt b/ext/standard/tests/file/unlink_variation8.phpt
@@ -123,22 +123,22 @@ file unlinked
 file unlinked
 -- removing unlinkVar8.tmp/../BADDIR/file.tmp --
 
-Warning: unlink(unlinkVar8.tmp/../BADDIR/file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 -- unlinking soft link unlinkVar8.tmp/../BADDIR/file.tmp --
 
-Warning: unlink(unlinkVar8.tmp/../BADDIR/file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 -- unlinking hard link unlinkVar8.tmp/../BADDIR/file.tmp --
 
-Warning: unlink(unlinkVar8.tmp/../BADDIR/file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 -- removing BADDIR/file.tmp --
 
-Warning: unlink(BADDIR/file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 -- unlinking soft link BADDIR/file.tmp --
 
-Warning: unlink(BADDIR/file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 -- unlinking hard link BADDIR/file.tmp --
 
-Warning: unlink(BADDIR/file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 -- removing /%s/unlinkVar8.tmp/file.tmp --
 file removed
 -- unlinking soft link /%s/unlinkVar8.tmp/file.tmp --
@@ -159,31 +159,31 @@ file unlinked
 file unlinked
 -- removing /%s/BADDIR/file.tmp --
 
-Warning: unlink(/%s/BADDIR/file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 -- unlinking soft link /%s/BADDIR/file.tmp --
 
-Warning: unlink(/%s/BADDIR/file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 -- unlinking hard link /%s/BADDIR/file.tmp --
 
-Warning: unlink(/%s/BADDIR/file.tmp): No such file or directory in %s on line %d
+Warning: unlink(): No such file or directory in %s on line %d
 -- removing unlinkVar8.tmp/file.tmp/ --
 
-Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
+Warning: unlink(): Not a directory in %s on line %d
 -- unlinking soft link unlinkVar8.tmp/file.tmp/ --
 
-Warning: unlink(unlinkVar8.tmp/file.tmp/): %s directory in %s on line %d
+Warning: unlink(): %s directory in %s on line %d
 -- unlinking hard link unlinkVar8.tmp/file.tmp/ --
 
-Warning: unlink(unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
+Warning: unlink(): Not a directory in %s on line %d
 -- removing /%s/unlinkVar8.tmp/file.tmp/ --
 
-Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
+Warning: unlink(): Not a directory in %s on line %d
 -- unlinking soft link /%s/unlinkVar8.tmp/file.tmp/ --
 
-Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): %s directory in %s on line %d
+Warning: unlink(): %s directory in %s on line %d
 -- unlinking hard link /%s/unlinkVar8.tmp/file.tmp/ --
 
-Warning: unlink(/%s/unlinkVar8.tmp/file.tmp/): Not a directory in %s on line %d
+Warning: unlink(): Not a directory in %s on line %d
 -- removing unlinkVar8.tmp//file.tmp --
 file removed
 -- unlinking soft link unlinkVar8.tmp//file.tmp --
diff --git a/ext/standard/tests/file/unlink_variation9-win32.phpt b/ext/standard/tests/file/unlink_variation9-win32.phpt
diff --git a/ext/zlib/tests/gh19922.phpt b/ext/zlib/tests/gh19922.phpt
diff --git a/main/streams/php_stream_errors.h b/main/streams/php_stream_errors.h
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
diff --git a/main/streams/stream_errors.c b/main/streams/stream_errors.c
diff --git a/main/streams/streams.c b/main/streams/streams.c
diff --git a/tests/security/open_basedir_copy_variation1.phpt b/tests/security/open_basedir_copy_variation1.phpt

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,6 @@ array(3) {`
`83`	`83`	`}`
`84`	`84`	`Destroy [%s,%s]`
`85`	`85`
`86`		`-Warning: unlink(%s): No such file or directory in %s on line %d`
	`86`	`+Warning: unlink(): No such file or directory in %s on line %d`
`87`	`87`	`Close [%s,PHPSESSID]`
`88`	`88`	`bool(true)`