Improve error messages during certain rename conditions:

Error messages improved to point out that the target name chosen is
already used for a directory/file if the source is file/directory.

Shooting in the dark for Windows here so will see if it compiles.

Author: Girgias

ext/standard/tests/file/rename_variation.phpt

@@ -55,7 +55,7 @@ bool(false)
 bool(true)
 -- Iteration 2 --
 
-Warning: rename(): Not a directory (%s) in %s on line %d
+Warning: rename(): (%s) Not a directory in %s on line %d
 bool(false)
 bool(false)
 bool(false)

ext/standard/tests/file/rename_variation5.phpt

@@ -70,27 +70,27 @@ bool(true)
 
 -- Renaming existing link to existing directory name --
 
-Warning: rename(): Is a directory (%s) in %s on line %d
+Warning: rename(): (%s) Is a directory in %s on line %d
 bool(false)
 
 -- Renaming existing link to existing file name --
 bool(true)
 
 -- Renaming existing file to existing directory name --
 
-Warning: rename(): Is a directory (%s) in %s on line %d
+Warning: rename(): (%s) Is a directory in %s on line %d
 bool(false)
 
 -- Renaming existing file to existing link name --
 bool(true)
 
 -- Renaming existing directory to existing file name --
 
-Warning: rename(): Not a directory (%s) in %s on line %d
+Warning: rename(): (%s) Not a directory in %s on line %d
 bool(false)
 
 -- Renaming existing directory to existing link name --
 
-Warning: rename(): Not a directory (%s) in %s on line %d
+Warning: rename(): (%s) Not a directory in %s on line %d
 bool(false)
 Done

main/streams/plain_wrapper.c

@@ -1248,10 +1248,15 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, const char *url_f
 # endif
 #endif
 
+		/* If error is "Is directory" or "Not a directory" then faulty argument is url_to */
+		if (errno == EISDIR || errno == ENOTDIR) {
+			php_error_docref(NULL, E_WARNING, "(%s) %s", url_to, strerror(errno));
+		} else {
 #ifdef PHP_WIN32
-		php_win32_docref2_from_error(GetLastError(), url_from, url_to);
+			php_win32_docref2_from_error(GetLastError(), url_from, url_from);
 #else
-		php_error_docref(NULL, E_WARNING, "%s (%s)", strerror(errno), url_from);
+			php_error_docref(NULL, E_WARNING, "%s (%s)", strerror(errno), url_from);
+		}
 #endif
 		return 0;
 	}