fixing incorrect --CLEAN-- sections

diff --git a/ext/standard/tests/file/005_variation.phpt b/ext/standard/tests/file/005_variation.phpt
index 72580e2a98bb75582da7352378fbfa22d4739c8d..e46df865fce9b99462cdee67bf16eb5317653fe8 100644 (file)
--- a/ext/standard/tests/file/005_variation.phpt
+++ b/ext/standard/tests/file/005_variation.phpt
@@ -156,13 +156,27 @@ echo "Done\n";
 --CLEAN--
 <?php
 $file_path = dirname(__FILE__);
-unlink($file_path."/005_variation_softlink.tmp");
-unlink($file_path."/005_variation_hardlink.tmp");
-unlink($file_path."/005_variation1.tmp");
-unlink($file_path."/005_variation_copy.tmp");
-unlink($file_path."/005_variation_touch.tmp");
-unlink($file_path."/005_variation_touch_fly.tmp");
-unlink($file_path."/005_variation_touch_new.tmp");
+if(file_exists($file_path."/005_variation_softlink.tmp")) {
+  unlink($file_path."/005_variation_softlink.tmp");
+}
+if(file_exists($file_path."/005_variation_hardlink.tmp")) {
+  unlink($file_path."/005_variation_hardlink.tmp");
+}
+if(file_exists($file_path."/005_variation1.tmp")) {
+  unlink($file_path."/005_variation1.tmp");
+}
+if(file_exists($file_path."/005_variation_copy.tmp")) {
+  unlink($file_path."/005_variation_copy.tmp");
+}
+if(file_exists($file_path."/005_variation_touch.tmp")) {
+  unlink($file_path."/005_variation_touch.tmp");
+}
+if(file_exists($file_path."/005_variation_touch_fly.tmp")) {
+  unlink($file_path."/005_variation_touch_fly.tmp");
+}
+if(file_exists($file_path."/005_variation_touch_new.tmp")) {
+  unlink($file_path."/005_variation_touch_new.tmp");
+}
 ?>
 --EXPECTF--
 *** Testing fileattime(), filemtime(), filectime() & touch() : usage variations ***

diff --git a/ext/standard/tests/file/copy_variation12.phpt b/ext/standard/tests/file/copy_variation12.phpt
index 76d386e6e9197f4d895db1c9af706ce584ae9767..34667ba799bf0dfba6c424f85494d4e0c0820ea9 100644 (file)
--- a/ext/standard/tests/file/copy_variation12.phpt
+++ b/ext/standard/tests/file/copy_variation12.phpt
@@ -35,7 +35,6 @@ echo "*** Done ***\n";
 
 --CLEAN--
 <?php
-unlink(dirname(__FILE__)."/copy_copy_variation12");
 rmdir(dirname(__FILE__)."/copy_variation12");
 ?>
 

diff --git a/ext/standard/tests/file/file_get_contents_basic.phpt b/ext/standard/tests/file/file_get_contents_basic.phpt
index 5dc0a5e5c6757f3ca61f21f8b9e2d0c29e8e287a..413909b450d0f1690bad5c6504ea97ace3932f7b 100644 (file)
--- a/ext/standard/tests/file/file_get_contents_basic.phpt
+++ b/ext/standard/tests/file/file_get_contents_basic.phpt
@@ -30,12 +30,6 @@ delete_files($file_path, 1);
 
 echo "\n*** Done ***";
 ?>
---CLEAN--
-<?php
-$file_path = dirname(__FILE__);
-unlink($file_path."/file_put_contents.tmp");
-unlink($file_path."/file_put_contents1.tmp");
-?>
 --EXPECTF--
 *** Testing the basic functionality of the file_get_contents() function ***
 -- Testing with simple valid data file --

diff --git a/ext/standard/tests/file/file_get_contents_error.phpt b/ext/standard/tests/file/file_get_contents_error.phpt
index 9c30c2357cac1da50f1f42f68ee9d11a81e7d012..631a138a07fbef7b8502142eda43c751c20f43f0 100644 (file)
--- a/ext/standard/tests/file/file_get_contents_error.phpt
+++ b/ext/standard/tests/file/file_get_contents_error.phpt
@@ -38,9 +38,12 @@ echo "\n*** Done ***\n";
 --CLEAN--
 <?php
 $file_path = dirname(__FILE__);
-unlink($file_path."/file_put_contents_error.tmp");
-unlink($file_path."/file_put_contents1.tmp");
-
+if(file_exists($file_path."/file_put_contents_error.tmp")) {
+  unlink($file_path."/file_put_contents_error.tmp");
+}
+if(file_exists($file_path."/file_put_contents1.tmp")) {
+  unlink($file_path."/file_put_contents1.tmp");
+}
 ?>
 --EXPECTF--
 *** Testing error conditions ***
@@ -61,4 +64,4 @@ Warning: file_get_contents() expects at most 5 parameters, 6 given in %s on line
 Warning: file_get_contents(): length must be greater than or equal to zero in %s on line %d
 bool(false)
 
-*** Done ***
\ No newline at end of file
+*** Done ***

diff --git a/ext/standard/tests/file/fscanf_variation51.phpt b/ext/standard/tests/file/fscanf_variation51.phpt
index 5b6fbe926bd3747b7dcacdffa340f0b72e620f97..0f5ab5a61225819be294ea716084225d2a2e8214 100644 (file)
--- a/ext/standard/tests/file/fscanf_variation51.phpt
+++ b/ext/standard/tests/file/fscanf_variation51.phpt
@@ -61,7 +61,9 @@ echo "\n*** Done ***";
 <?php
 $file_path = dirname(__FILE__);
 $filename = "$file_path/fscanf_variation51.tmp";
-unlink($filename);
+if(file_exists($filename)) {
+  unlink($filename);
+}
 ?>
 --EXPECT--
 *** Test fscanf(): to read from a file opened in write only mode ***

diff --git a/ext/standard/tests/file/fscanf_variation52.phpt b/ext/standard/tests/file/fscanf_variation52.phpt
index b91707292245aec0d32bb0d942c2825f7af16047..bf82ab8e43c1a0077b48dfbef74d7729a29933f9 100644 (file)
--- a/ext/standard/tests/file/fscanf_variation52.phpt
+++ b/ext/standard/tests/file/fscanf_variation52.phpt
@@ -59,7 +59,9 @@ echo "\n*** Done ***";
 <?php
 $file_path = dirname(__FILE__);
 $filename = "$file_path/fscanf_variation52.tmp";
-unlink($filename);
+if(file_exists($filename)) {
+  unlink($filename);
+}
 ?>
 --EXPECT--
 *** Test fscanf(): to read an empty file ***

diff --git a/ext/standard/tests/file/fscanf_variation53.phpt b/ext/standard/tests/file/fscanf_variation53.phpt
index 61a78be026f7a6ef653556d522654b0bb691107a..b65bccf8fdddce31fc80f2d11da94513f579183c 100644 (file)
--- a/ext/standard/tests/file/fscanf_variation53.phpt
+++ b/ext/standard/tests/file/fscanf_variation53.phpt
@@ -74,7 +74,9 @@ echo "\n*** Done ***";
 <?php
 $file_path = dirname(__FILE__);
 $filename = "$file_path/fscanf_variation53.tmp";
-unlink($filename);
+if(file_exists($filename)) {
+  unlink($filename);
+}
 ?>
 --EXPECT--
 *** Test fscanf(): to read a file when file pointer is pointing to EOF ***

diff --git a/ext/standard/tests/file/is_dir_variation1.phpt b/ext/standard/tests/file/is_dir_variation1.phpt
index 4f85ba93bb487f71d66d4fc2680a7b66bad6637f..1a0b55669fdeb9e6cff10ef95670545089ccda3e 100644 (file)
--- a/ext/standard/tests/file/is_dir_variation1.phpt
+++ b/ext/standard/tests/file/is_dir_variation1.phpt
@@ -29,7 +29,6 @@ echo "\n*** Done ***";
 <?php
 $file_path = dirname(__FILE__);
 $dir_name = $file_path."/is_dir_variation1";
-unlink($file_path."/is_dir_variation1.tmp");
 rmdir($dir_name."/is_dir_variation1_sub");
 rmdir($dir_name);
 ?>

diff --git a/ext/standard/tests/file/is_dir_variation2.phpt b/ext/standard/tests/file/is_dir_variation2.phpt
index 022e06bb40a3e0c91b8871f13695ec245b3d16c0..65efeab9a14fb5acbf353d6d5068da712853220a 100644 (file)
--- a/ext/standard/tests/file/is_dir_variation2.phpt
+++ b/ext/standard/tests/file/is_dir_variation2.phpt
@@ -56,12 +56,24 @@ echo "\n*** Done ***";
 --CLEAN--
 <?php
 $file_path = dirname(__FILE__);
-unlink($file_path."/is_dir_variation2_symlink");
-unlink($file_path."/is_dir_variation2_link");
-unlink($file_path."/is_dir_variation2_symlink.tmp");
-unlink($file_path."/is_dir_variation2_link.tmp");
-unlink($file_path."/is_dir_variation2.tmp");
-rmdir($file_path."/is_dir_variation2");
+if(file_exists($file_path."/is_dir_variation2_symlink")) {
+  unlink($file_path."/is_dir_variation2_symlink");
+}
+if(file_exists($file_path."/is_dir_variation2_symlink")) {
+  unlink($file_path."/is_dir_variation2_symlink");
+}
+if(file_exists($file_path."/is_dir_variation2_symlink.tmp")) {
+  unlink($file_path."/is_dir_variation2_symlink.tmp");
+}
+if(file_exists($file_path."/is_dir_variation2_link.tmp")) {
+  unlink($file_path."/is_dir_variation2_link.tmp");
+}
+if(file_exists($file_path."/is_dir_variation2.tmp")) {
+  unlink($file_path."/is_dir_variation2.tmp");
+}
+if(file_exists($file_path."/is_dir_variation2")) {
+  rmdir($file_path."/is_dir_variation2");
+}
 ?>
 --EXPECTF--
 *** Testing is_dir() with dir and links to dir ***

diff --git a/ext/standard/tests/file/is_file_error.phpt b/ext/standard/tests/file/is_file_error.phpt
index 1a605d10407a12081ce2b63b735e75d308ebb61b..711d761763a26e5fd40c71a5944ae3f5a8828eaa 100644 (file)
--- a/ext/standard/tests/file/is_file_error.phpt
+++ b/ext/standard/tests/file/is_file_error.phpt
@@ -29,8 +29,12 @@ echo "\n*** Done ***";
 --CLEAN--
 <?php
 $file_path = dirname(__FILE__);
-unlink($file_path."/is_file_error.tmp");
-unlink($file_path."/is_file_error1.tmp");
+if(file_exists($file_path."/is_file_error.tmp")) {
+  unlink($file_path."/is_file_error.tmp");
+}
+if(file_exists($file_path."/is_file_error1.tmp")) {
+  unlink($file_path."/is_file_error1.tmp");
+}
 ?>
 --EXPECTF--
 *** Testing is_file() error conditions ***

diff --git a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
index 5497fd1ac679001577d7a22f6ee28ec1a18fa789..e7c41c4a9dfd64a1fef4097a253d00f76ce7d111 100644 (file)
--- a/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
+++ b/ext/standard/tests/file/mkdir_rmdir_variation2.phpt
@@ -50,7 +50,6 @@ echo "Done\n";
 --CLEAN--
 <?php
 rmdir(dirname(__FILE__)."/mkdir_variation2/test/");
-rmdir(dirname(__FILE__)."/mkdir_variation2/test1/");
 rmdir(dirname(__FILE__)."/mkdir_variation2/");
 ?>
 --EXPECTF--

diff --git a/ext/standard/tests/file/readlink_realpath_variation3.phpt b/ext/standard/tests/file/readlink_realpath_variation3.phpt
index 3a157d9d6e9bfa99fbbaf5011532b044e7315f65..70e8d0c949091c69bb82b742de27d4e93c28ae38 100644 (file)
--- a/ext/standard/tests/file/readlink_realpath_variation3.phpt
+++ b/ext/standard/tests/file/readlink_realpath_variation3.phpt
@@ -40,15 +40,6 @@ for($loop_counter = 0; $loop_counter < count($link_string); $loop_counter++) {
 
 echo "Done\n";
 ?>
---CLEAN--
-<?php
-$name_prefix = dirname(__FILE__)."/readlink_realpath_variation2";
-unlink("$name_prefix/home/tests/link/readlink_realpath_variation2.tmp");
-rmdir("$name_prefix/home/tests/link/");
-rmdir("$name_prefix/home/tests/");
-rmdir("$name_prefix/home/");
-rmdir("$name_prefix/");
-?>
 --EXPECTF--
 *** Testing readlink() and realpath() : usage variations ***
 

diff --git a/ext/standard/tests/file/rename_basic.phpt b/ext/standard/tests/file/rename_basic.phpt
index a45290faa6e6aa0f8764d6e01d8eac9386fbffc4..c589c514e4188f0bb8ae9f66e18d28f38ce6e3b5 100755 (executable)
--- a/ext/standard/tests/file/rename_basic.phpt
+++ b/ext/standard/tests/file/rename_basic.phpt
@@ -34,7 +34,6 @@ var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) );
 ===Done===
 --CLEAN--
 <?php
-unlink(dirname(__FILE__)."/rename_basic.tmp");
 unlink(dirname(__FILE__)."/rename_basic_new.tmp");
 ?>
 --EXPECT--

diff --git a/ext/standard/tests/file/rename_variation.phpt b/ext/standard/tests/file/rename_variation.phpt
index ae7a628bd8c01e51fef061f1d1e2fafa7e2e8ce7..00dc309982b39e71c22d4012f3fd226f812bcc2f 100644 (file)
--- a/ext/standard/tests/file/rename_variation.phpt
+++ b/ext/standard/tests/file/rename_variation.phpt
@@ -47,13 +47,6 @@ rmdir("$file_path/rename_variation");
 
 echo "Done\n";
 ?>
---CLEAN--
-<?php
-$file_path = dirname(__FILE__);
-unlink($file_path."/rename_variation_link.tmp");
-unlink($file_path."/rename_variation.tmp");
-rmdir($file_path."/rename_variation_dir");
-?>
 --EXPECTF--
 *** Testing rename() : rename files across directories ***
 -- Iteration 1 --

diff --git a/ext/standard/tests/file/rename_variation1.phpt b/ext/standard/tests/file/rename_variation1.phpt
index 4a2f55b37c97ac86e5c4fbc907a7d28a2ef1d142..0f7321e20506c8749647de35169446245bc8fec5 100644 (file)
--- a/ext/standard/tests/file/rename_variation1.phpt
+++ b/ext/standard/tests/file/rename_variation1.phpt
@@ -52,8 +52,6 @@ echo "Done\n";
 --CLEAN--
 <?php
 $file_path = dirname(__FILE__);
-unlink($file_path."/rename_variation_link.tmp");
-unlink($file_path."/rename_variation.tmp");
 rmdir($file_path."/rename_variation_dir");
 ?>
 --EXPECTF--

diff --git a/ext/standard/tests/file/rename_variation2.phpt b/ext/standard/tests/file/rename_variation2.phpt
index 1e4ef4b5006dd8569df0c07426b05027e0ac85d6..fa3ee1e017f6bfce50f181fa46cfe1319442cb9a 100644 (file)
--- a/ext/standard/tests/file/rename_variation2.phpt
+++ b/ext/standard/tests/file/rename_variation2.phpt
@@ -18,7 +18,7 @@ mkdir($dest_dir);
 /* Testing rename() on soft and hard links with different permissions */
 echo "\n*** Testing rename() on soft links ***\n";
 // create the file
-$filename = $file_path."/rename_variation1.tmp";
+$filename = $file_path."/rename_variation2.tmp";
 @unlink($filename);
 var_dump(touch($filename));
 
@@ -49,9 +49,7 @@ echo "Done\n";
 --CLEAN--
 <?php
 $file_path = dirname(__FILE__);
-unlink($file_path."/rename_variation1.tmp");
-unlink($file_path."/rename_variation_link.tmp");
-unlink($file_path."/rename_variation.tmp");
+unlink($file_path."/rename_variation2.tmp");
 rmdir($file_path."/rename_variation_dir");
 ?>
 --EXPECTF--

diff --git a/ext/standard/tests/file/rename_variation3.phpt b/ext/standard/tests/file/rename_variation3.phpt
index f6565e437b3ae36c6cee9df8fcd780613656d63b..ce8921630b73c8156395186bf1ff2d7fcc262ede 100644 (file)
--- a/ext/standard/tests/file/rename_variation3.phpt
+++ b/ext/standard/tests/file/rename_variation3.phpt
@@ -44,11 +44,7 @@ echo "Done\n";
 --CLEAN--
 <?php
 $file_path = dirname(__FILE__);
-unlink($file_path."/rename_variation1.tmp");
-unlink($file_path."/rename_variation_link.tmp");
 unlink($file_path."/rename_variation_hard_link1.tmp");
-unlink($file_path."/rename_variation_hard_link2.tmp");
-unlink($file_path."/rename_variation.tmp");
 rmdir($file_path."/rename_variation_dir");
 ?>
 --EXPECTF--

diff --git a/ext/standard/tests/file/rename_variation4.phpt b/ext/standard/tests/file/rename_variation4.phpt
index 10061c6ae82721ba0c143cbe5e055f0ee0d89524..2965f7534a64d8f3289b07cee2cac709818cfa70 100644 (file)
--- a/ext/standard/tests/file/rename_variation4.phpt
+++ b/ext/standard/tests/file/rename_variation4.phpt
@@ -38,9 +38,6 @@ echo "Done\n";
 --CLEAN--
 <?php
 $file_path = dirname(__FILE__);
-unlink($file_path."/rename_variation_link.tmp");
-unlink($file_path."/rename_variation.tmp");
-rmdir($file_path."/rename_variation_dir");
 rmdir($file_path."/12345");
 ?>
 --EXPECTF--

diff --git a/ext/standard/tests/file/rename_variation8.phpt b/ext/standard/tests/file/rename_variation8.phpt
index 650b6c990b60d467719bb94292f1d4422767d2e9..6b3644aee4973030abcdd9f477bafadb0f795a6e 100644 (file)
--- a/ext/standard/tests/file/rename_variation8.phpt
+++ b/ext/standard/tests/file/rename_variation8.phpt
@@ -41,7 +41,6 @@ echo "Done\n";
 ?>
 --CLEAN--
 <?php
-unlink(dirname(__FILE__)."/rename_basic_new2.tmp");
 rmdir(dirname(__FILE__)."/rename_basic_dir1");
 ?>
 --EXPECTF--

diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt
index 2ecd30951bb70b3342de80d8a4b6e0d5c45e0dfc..4df4872f359bca8bd142e8f2e4d4f51a7e5f08d4 100644 (file)
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_basic2.phpt
@@ -67,7 +67,6 @@ echo "Done\n";
 --CLEAN--
 <?php
 $dirname = dirname(__FILE__)."/symlink_link_linkinfo_is_link_basic2";
-unlink("$dirname/symlink_link_linkinfo_is_link_basic2.tmp");
 rmdir($dirname);
 ?>
 --EXPECTF--

diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
index 4cf566ca1978d22447f58620271d6b842cd4a12a..9b9afba10dcbbb32e6285685dc64d992f4a6a05b 100644 (file)
--- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
+++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt
@@ -76,8 +76,12 @@ echo "Done\n";
 $file_path = dirname(__FILE__);
 $dirname = "$file_path/symlink_link_linkinfo_is_link_variation6";
 $filename = "$dirname/symlink_link_linkinfo_is_link_variation6.tmp";
+if(file_exists($filename)) {
 unlink($filename);
+}
+if(file_exists($dirname)) {
 rmdir($dirname);
+}
 ?>
 --EXPECTF--
 *** Creating links in a directory without permission to allow the operation ***