Standardize stream error output

Author: Girgias

ext/standard/tests/file/mkdir_rmdir_error.phpt

@@ -53,6 +53,6 @@ bool(false)
 
 *** Testing rmdir() on non-existent directory ***
 
-Warning: rmdir(): No such file or directory with URI (temp) in %s on line %d
+Warning: rmdir(): No such file or directory (temp) in %s on line %d
 bool(false)
 Done

ext/standard/tests/file/mkdir_rmdir_variation-win32-mb.phpt

@@ -1599,7 +1599,7 @@ bool(true)
 *** Testing rmdir() on a non-empty directory ***
 bool(true)
 
-Warning: rmdir(): Directory not empty with URI (%s/mkdir私はガラスを食べられます/) in %s on line %d
+Warning: rmdir(): Directory not empty (%s/mkdir私はガラスを食べられます/) in %s on line %d
 bool(false)
 
 *** Testing mkdir() and rmdir() for binary safe functionality ***

ext/standard/tests/file/mkdir_rmdir_variation-win32.phpt

@@ -1599,7 +1599,7 @@ bool(true)
 *** Testing rmdir() on a non-empty directory ***
 bool(true)
 
-Warning: rmdir(): Directory not empty with URI (%s/mkdir/) in %s on line %d
+Warning: rmdir(): Directory not empty (%s/mkdir/) in %s on line %d
 bool(false)
 
 *** Testing mkdir() and rmdir() for binary safe functionality ***

ext/standard/tests/file/mkdir_rmdir_variation2.phpt

@@ -60,7 +60,7 @@ bool(true)
 *** Testing rmdir() on a non-empty directory ***
 bool(true)
 
-Warning: rmdir(): %s with URI (%s/mkdir_variation2/) in %s on line %d
+Warning: rmdir(): %s (%s/mkdir_variation2/) in %s on line %d
 bool(false)
 
 *** Testing mkdir() and rmdir() for binary safe functionality ***

ext/standard/tests/file/rmdir_variation3-win32.phpt

@@ -82,10 +82,10 @@ Directory removed
 Directory removed
 -- removing rmdirVar3.tmp\..\BADDIR\aSubDir --
 
-Warning: rmdir(): No such file or directory with URI (rmdirVar3.tmp\..\BADDIR\aSubDir) in %s on line %d
+Warning: rmdir(): No such file or directory (rmdirVar3.tmp\..\BADDIR\aSubDir) in %s on line %d
 -- removing BADDIR\aSubDir --
 
-Warning: rmdir(): No such file or directory with URI (BADDIR\aSubDir) in %s on line %d
+Warning: rmdir(): No such file or directory (BADDIR\aSubDir) in %s on line %d
 -- removing %s\rmdirVar3.tmp\aSubDir --
 Directory removed
 -- removing %s\.\rmdirVar3.tmp\aSubDir --
@@ -94,7 +94,7 @@ Directory removed
 Directory removed
 -- removing %s\BADDIR\aSubDir --
 
-Warning: rmdir(): No such file or directory with URI (%s\BADDIR\aSubDir) in %s on line %d
+Warning: rmdir(): No such file or directory (%s\BADDIR\aSubDir) in %s on line %d
 -- removing rmdirVar3.tmp\aSubDir\ --
 Directory removed
 -- removing %s\rmdirVar3.tmp\aSubDir\ --

ext/standard/tests/file/rmdir_variation3.phpt

@@ -72,10 +72,10 @@ Directory removed
 Directory removed
 -- removing rmdirVar3.tmp/../BADDIR/aSubDir --
 
-Warning: rmdir(): No such file or directory with URI (rmdirVar3.tmp/../BADDIR/aSubDir) in %s on line %d
+Warning: rmdir(): No such file or directory (rmdirVar3.tmp/../BADDIR/aSubDir) in %s on line %d
 -- removing BADDIR/aSubDir --
 
-Warning: rmdir(): No such file or directory with URI (BADDIR/aSubDir) in %s on line %d
+Warning: rmdir(): No such file or directory (BADDIR/aSubDir) in %s on line %d
 -- removing %s/rmdirVar3.tmp/aSubDir --
 Directory removed
 -- removing %s/./rmdirVar3.tmp/aSubDir --
@@ -84,7 +84,7 @@ Directory removed
 Directory removed
 -- removing %s/BADDIR/aSubDir --
 
-Warning: rmdir(): No such file or directory with URI (%s/BADDIR/aSubDir) in %s on line %d
+Warning: rmdir(): No such file or directory (%s/BADDIR/aSubDir) in %s on line %d
 -- removing rmdirVar3.tmp/aSubDir/ --
 Directory removed
 -- removing %s/rmdirVar3.tmp/aSubDir/ --

main/streams/plain_wrapper.c

@@ -1357,13 +1357,13 @@ static int php_plain_files_rmdir(php_stream_wrapper *wrapper, const char *url, i
 
 #ifdef PHP_WIN32
 	if (!php_win32_check_trailing_space(url, strlen(url))) {
-		php_error_docref(NULL, E_WARNING, "%s with URI (%s)", strerror(errno), url);
+		php_error_docref(NULL, E_WARNING, "%s (%s)", strerror(errno), url);
 		return 0;
 	}
 #endif
 
 	if (VCWD_RMDIR(url) < 0) {
-		php_error_docref(NULL, E_WARNING, "%s with URI (%s)", strerror(errno), url);
+		php_error_docref(NULL, E_WARNING, "%s (%s)", strerror(errno), url);
 		return 0;
 	}
 
@@ -1385,6 +1385,7 @@ static int php_plain_files_metadata(php_stream_wrapper *wrapper, const char *url
 
 #ifdef PHP_WIN32
 	if (!php_win32_check_trailing_space(url, strlen(url))) {
+		/* Seems no tests is covering this section */
 		php_error_docref(NULL, E_WARNING, "%s with URI (%s)", strerror(ENOENT), url);
 		return 0;
 	}