Fix 'clean' sections

diff --git a/ext/phar/tests/031.phpt b/ext/phar/tests/031.phpt
index 560d461129895b1da9ee54ad0a20581968339e60..4d5988621de88f5fa92b235108826f0cb1c385ac 100755 (executable)
--- a/ext/phar/tests/031.phpt
+++ b/ext/phar/tests/031.phpt
@@ -22,7 +22,7 @@ require $pname;
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--

diff --git a/ext/phar/tests/032.phpt b/ext/phar/tests/032.phpt
index f41f88203b4d0d62ac01c3a1821d7c7c6bba20ed..faf3dcbf588111b773a80d1aa2d7f82775f5e740 100755 (executable)
--- a/ext/phar/tests/032.phpt
+++ b/ext/phar/tests/032.phpt
@@ -21,7 +21,7 @@ echo $e->getMessage();
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--

diff --git a/ext/phar/tests/phar_oo_001.phpt b/ext/phar/tests/phar_oo_001.phpt
index b04ec4f4c19a3f95715be2629d957a67e2fd903d..616b2ec0ac0546d464d6b3c4b91d063926b5de39 100755 (executable)
--- a/ext/phar/tests/phar_oo_001.phpt
+++ b/ext/phar/tests/phar_oo_001.phpt
@@ -35,7 +35,7 @@ catch (BadMethodCallException $e)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--

diff --git a/ext/phar/tests/phar_oo_003.phpt b/ext/phar/tests/phar_oo_003.phpt
index d9d1061415755a5ddc59944d319650181d7c50d7..9d24b1919b884a6b785fe1a171ae841663ac6424 100755 (executable)
--- a/ext/phar/tests/phar_oo_003.phpt
+++ b/ext/phar/tests/phar_oo_003.phpt
@@ -27,7 +27,7 @@ foreach($phar as $name => $ent)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--

diff --git a/ext/phar/tests/phar_oo_004.phpt b/ext/phar/tests/phar_oo_004.phpt
index b2ad79bb4ece309c01b84f2304aae4883cfd10db..acd647bf5ab8c7c31a587fe31cb5285d71c93321 100755 (executable)
--- a/ext/phar/tests/phar_oo_004.phpt
+++ b/ext/phar/tests/phar_oo_004.phpt
@@ -75,7 +75,7 @@ foreach($it as $name => $ent)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--

diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt
index 89cf108afa11b0d75409b77a96b91b1ed60c24c0..687cf59d070925f0ef79b625a4afb91fc0b51bd8 100755 (executable)
--- a/ext/phar/tests/phar_oo_005.phpt
+++ b/ext/phar/tests/phar_oo_005.phpt
@@ -28,7 +28,7 @@ foreach($it as $name => $ent)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--

diff --git a/ext/phar/tests/phar_oo_006.phpt b/ext/phar/tests/phar_oo_006.phpt
index 5619663b3e576212aee2820526af819ac9ffeb58..556c98ce0b620629c83e459c854581b2bdcd500e 100755 (executable)
--- a/ext/phar/tests/phar_oo_006.phpt
+++ b/ext/phar/tests/phar_oo_006.phpt
@@ -38,7 +38,7 @@ echo $phar['b.php']->getFilename() . "\n";
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--

diff --git a/ext/phar/tests/phar_oo_008.phpt b/ext/phar/tests/phar_oo_008.phpt
index 45255b5677eded46e155a4dba07907f1244533a9..80d1ece0ca97d8ba2f0b8c6189d7ae322958cf5c 100755 (executable)
--- a/ext/phar/tests/phar_oo_008.phpt
+++ b/ext/phar/tests/phar_oo_008.phpt
@@ -83,7 +83,7 @@ foreach($v as $k => $d)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--

diff --git a/ext/phar/tests/phar_oo_009.phpt b/ext/phar/tests/phar_oo_009.phpt
index 2528ec9f83e69a0391ee9894b91f7e32baae984e..6abd03ee30b529308917efadf632469f3141ac11 100755 (executable)
--- a/ext/phar/tests/phar_oo_009.phpt
+++ b/ext/phar/tests/phar_oo_009.phpt
@@ -36,7 +36,7 @@ foreach($f as $k => $v)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--

diff --git a/ext/phar/tests/phar_oo_010.phpt b/ext/phar/tests/phar_oo_010.phpt
index d9477e66c81108f47d859b646333b5b741a25c1d..4e4435a7bb283a618309c113b220b2f6e839ecd6 100755 (executable)
--- a/ext/phar/tests/phar_oo_010.phpt
+++ b/ext/phar/tests/phar_oo_010.phpt
@@ -36,7 +36,7 @@ var_dump(isset($phar['b']));
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--

diff --git a/ext/phar/tests/phar_oo_011.phpt b/ext/phar/tests/phar_oo_011.phpt
index d7ff82e761186365f1252f7930177d05e6fee79e..236009b7e4278356a4222059c3c4cb5ec579e046 100644 (file)
--- a/ext/phar/tests/phar_oo_011.phpt
+++ b/ext/phar/tests/phar_oo_011.phpt
@@ -25,7 +25,7 @@ echo "\n";
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--

diff --git a/ext/phar/tests/phar_oo_011b.phpt b/ext/phar/tests/phar_oo_011b.phpt
index f8c8d2d080bbf04abae27e1d60a8820b242d70a0..37a0e570a541aca74b97e098496c0a93a3d06a31 100755 (executable)
--- a/ext/phar/tests/phar_oo_011b.phpt
+++ b/ext/phar/tests/phar_oo_011b.phpt
@@ -31,7 +31,7 @@ catch (BadMethodCallException $e)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--

diff --git a/ext/phar/tests/phar_oo_012.phpt b/ext/phar/tests/phar_oo_012.phpt
index 1bde9225936c0b31f9cab4c17fa4d83b9b54884c..e79ac0960edc63def8b618a955417b3501b0db3c 100644 (file)
--- a/ext/phar/tests/phar_oo_012.phpt
+++ b/ext/phar/tests/phar_oo_012.phpt
@@ -27,7 +27,7 @@ var_dump(isset($phar['f.php']));
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--

diff --git a/ext/phar/tests/phar_oo_012_confirm.phpt b/ext/phar/tests/phar_oo_012_confirm.phpt
index be70ca5599950c68b6c3bfe181d64e639963b038..58a3be87b323f9a07841b234a8aceaf98304421d 100644 (file)
--- a/ext/phar/tests/phar_oo_012_confirm.phpt
+++ b/ext/phar/tests/phar_oo_012_confirm.phpt
@@ -30,7 +30,7 @@ var_dump(isset($phar['f.php']));
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--

diff --git a/ext/phar/tests/phar_oo_012b.phpt b/ext/phar/tests/phar_oo_012b.phpt
index 669cbea420e85c7b8cfc39196f5f238ad2a0d8ce..01cf77698646c8ebd01b2a09f192dc1b31259861 100755 (executable)
--- a/ext/phar/tests/phar_oo_012b.phpt
+++ b/ext/phar/tests/phar_oo_012b.phpt
@@ -34,7 +34,7 @@ catch (BadMethodCallException $e)
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--

diff --git a/ext/phar/tests/phar_oo_nosig.phpt b/ext/phar/tests/phar_oo_nosig.phpt
index fe4544b13f33b246d0f80508b5ffedca065d65b5..d99222e12ce1a2e3b72cd4a90c732a659304e15d 100644 (file)
--- a/ext/phar/tests/phar_oo_nosig.phpt
+++ b/ext/phar/tests/phar_oo_nosig.phpt
@@ -16,7 +16,7 @@ var_dump($phar->getSignature());
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECT--

diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt
index fa4b96ebf140185622be4bb46ecba604915f0e8f..a30e55b3cf716a9155635d5107d2f6cf84e4ceb4 100644 (file)
--- a/ext/phar/tests/tar/tar_nostub.phpt
+++ b/ext/phar/tests/tar/tar_nostub.phpt
@@ -24,7 +24,7 @@ var_dump($phar->getStub());
 ===DONE===
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . '/tar_004.phar');
+@unlink(dirname(__FILE__) . '/tar_004.phar.tar');
 ?>
 --EXPECTF--
 string(0) ""