Reword unlink errors if argument is a directory.

Author: Girgias

ext/standard/tests/file/copy_variation4.phpt

@@ -104,6 +104,6 @@ bool(false)
 
 -- Testing unlink() on directory --
 
-Warning: unlink(): Is a directory (%s/unlink_error) in %s on line %d
+Warning: unlink(): (%s/unlink_error) Is a directory in %s on line %d
 bool(false)
 Done

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

@@ -101,6 +101,6 @@ bool(false)
 
 -- Testing unlink() on directory --
 
-Warning: unlink(): Is a directory (%s/unlink_error) in %s on line %d
+Warning: unlink(): (%s/unlink_error) Is a directory in %s on line %d
 bool(false)
 Done

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

@@ -101,6 +101,6 @@ bool(false)
 
 -- Testing unlink() on directory --
 
-Warning: unlink(): %r(Is a directory|Operation not permitted)%r (%s/unlink_error) in %s on line %d
+Warning: unlink(): %r(|Operation not permitted )%r(%s/unlink_error)%r( Is a directory|)%r in %s on line %d
 bool(false)
 Done

ext/standard/tests/file/unlink_error.phpt

@@ -102,5 +102,5 @@ directory unlinked
 
 --- try to unlink a directory ---
 
-Warning: unlink(): %r(Is a directory|Operation not permitted)%r (unlinkVar10.tmp/linkme.tmp) in %s on line %d
+Warning: unlink(): %r(|Operation not permitted )%r(unlinkVar10.tmp/linkme.tmp)%r( Is a directory|)%r in %s on line %d
 ===DONE===

ext/standard/tests/file/unlink_variation10.phpt

@@ -1148,7 +1148,12 @@ static int php_plain_files_unlink(php_stream_wrapper *wrapper, const char *url,
 	ret = VCWD_UNLINK(url);
 	if (ret == -1) {
 		if (options & REPORT_ERRORS) {
-			php_error_docref(NULL, E_WARNING, "%s (%s)", strerror(errno), url);
+			/* If error is "Is directory" show url after error message */
+			if (errno == EISDIR) {
+				php_error_docref(NULL, E_WARNING, "(%s) %s", url, strerror(errno));
+			} else {
+				php_error_docref(NULL, E_WARNING, "%s (%s)", strerror(errno), url);
+			}
 		}
 		return 0;
 	}