Use CLEAN section in some tests

Author: Girgias

ext/standard/tests/file/lstat_stat_variation2.phpt

@@ -8,12 +8,12 @@ $file_path = __DIR__;
 require("file.inc");
 
 /* create temp directory */
-mkdir("$file_path/lstat_stat_variation1/");  // temp dir
+mkdir("$file_path/lstat_stat_variation2/");  // temp dir
 
 // renaming a directory and check stat
 echo "*** Testing stat() for directory after being renamed ***\n";
-$old_dirname = "$file_path/lstat_stat_variation1";
-$new_dirname = "$file_path/lstat_stat_variation1a";
+$old_dirname = "$file_path/lstat_stat_variation2";
+$new_dirname = "$file_path/lstat_stat_variation2a";
 $old_stat = stat($old_dirname);
 clearstatcache();
 var_dump( rename($old_dirname, $new_dirname) );
@@ -36,7 +36,8 @@ echo "\n--- Done ---";
 --CLEAN--
 <?php
 $file_path = __DIR__;
-rmdir("$file_path/lstat_stat_variation1a");
+@rmdir("$file_path/lstat_stat_variation2");
+@rmdir("$file_path/lstat_stat_variation2a");
 ?>
 --EXPECT--
 *** Testing stat() for directory after being renamed ***

ext/standard/tests/file/rename_variation.phpt

@@ -42,11 +42,13 @@ foreach($src_filenames as $src_filename) {
   unlink($dest_filename);
 }
 
-// clean the temp dir and file
-rmdir("$file_path/rename_variation");
-
 echo "Done\n";
 ?>
+--CLEAN--
+<?php
+$file_path = __DIR__;
+@rmdir("$file_path/rename_variation");
+?>
 --EXPECTF--
 *** Testing rename() : rename files across directories ***
 -- Iteration 1 --