Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  cleanup temporary data

ext/standard/tests/file/bug47767.phpt

@@ -11,7 +11,9 @@ if(PHP_WINDOWS_VERSION_MAJOR < 6)  {
         die('skip windows version 6.0+ only test');
 }
 
-$ret = exec('mklink rename_variation13tmp.lnk ' . __FILE__ .' 2>&1', $out);
+$fn = "bug47767.lnk";
+$ret = exec("mklink $fn " . __FILE__ .' 2>&1', $out);
+@unlink($fn);
 if (strpos($ret, 'privilege')) {
 	die('skip. SeCreateSymbolicLinkPrivilege not enable for this user.');
 }
@@ -47,4 +49,4 @@ rmdir($junctionname);
 Testing include_once using file symbolic link
 I am included
 Testing include_once using directory symbolic link
-Testing include_once using junction points
+Testing include_once using junction points

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

@@ -4,7 +4,9 @@ Test rename() function: usage variations-6
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') die('skip..  for Windows');
 if (!function_exists("symlink")) die("skip symlinks are not supported");
-$ret = exec('mklink rename_variation13tmp.lnk ' . __FILE__ .' 2>&1', $out);
+$fn = "rename_variation6tmp.lnk";
+$ret = exec("mklink $fn " . __FILE__ .' 2>&1', $out);
+@unlink($fn);
 if (strpos($ret, 'privilege')) {
 	die('skip. SeCreateSymbolicLinkPrivilege not enable for this user.');
 }