Move supporting files to their own directory (toplevel tests)

diff --git a/ext/phar/tests/011.phpt b/ext/phar/tests/011.phpt
index 1c6f4d0f14798a41579d0c5d1c38373a1d441aa3..4a1f0dd42cb47a2012fa3cf608fab1d1b2130703 100644 (file)
--- a/ext/phar/tests/011.phpt
+++ b/ext/phar/tests/011.phpt
@@ -16,7 +16,7 @@ __HALT_COMPILER(); ?>";
 
 $files = array();
 $files['a'] = array('cont'=>'a','ulen'=>1,'clen'=>2);;
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 try {
 include $fname;
 echo file_get_contents('phar://hio/a');

diff --git a/ext/phar/tests/012.phpt b/ext/phar/tests/012.phpt
index d6b5ada95e116054e466ee1c2a3c5ad092a03dd7..f6f81f51422da274cabf78905c1219f487f091be 100644 (file)
--- a/ext/phar/tests/012.phpt
+++ b/ext/phar/tests/012.phpt
@@ -15,7 +15,7 @@ __HALT_COMPILER(); ?>";
 $files = array();
 $files['a'] = 'a';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 include $fname;
 echo file_get_contents('phar://hio/a');
 ?>

diff --git a/ext/phar/tests/013.phpt b/ext/phar/tests/013.phpt
index 9e89577379f97e900f98594bdc298ac418ec8864..ae3ae72936423d16e4bc4e4d4b7a81e3e299e4c1 100644 (file)
--- a/ext/phar/tests/013.phpt
+++ b/ext/phar/tests/013.phpt
@@ -13,7 +13,7 @@ $file = "<?php __HALT_COMPILER(); ?>";
 
 $files = array();
 $files['a'] = array('cont'=>'a', 'ulen'=>2, 'clen'=>2);
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 echo file_get_contents($pname.'/a');
 ?>

diff --git a/ext/phar/tests/014.phpt b/ext/phar/tests/014.phpt
index 84f482a70b7130aaa05db56e22dd272f28cfe1ec..d08e6550b688bc81e39aa548b87832cc84b9ee8a 100644 (file)
--- a/ext/phar/tests/014.phpt
+++ b/ext/phar/tests/014.phpt
@@ -13,7 +13,7 @@ $file = "<?php __HALT_COMPILER(); ?>";
 
 $files = array();
 $files['a'] = array('cont'=>'a', 'crc32'=>crc32('aX'));
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 echo file_get_contents($pname.'/a');
 ?>

diff --git a/ext/phar/tests/015.phpt b/ext/phar/tests/015.phpt
index cb44c54f77e94680417738edf81384f6e588d921..b93b77e9fbc0cda6a5c406a2fe362b6a01e04890 100644 (file)
--- a/ext/phar/tests/015.phpt
+++ b/ext/phar/tests/015.phpt
@@ -13,7 +13,7 @@ $file = "<?php __HALT_COMPILER(); ?>";
 
 $files = array();
 $files['a'] = array('cont'=>'a','comp'=>chr(75) . chr(4) . chr(0) /* 'a' gzdeflated */, 'flags'=>0x00001000);
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 echo file_get_contents($pname .'/a');
 ?>

diff --git a/ext/phar/tests/015b.phpt b/ext/phar/tests/015b.phpt
index c1664acd9e05f0c9e36a14cb56b740e9ce9f2947..08ead2d9c006f50cebba0d43aac81a0a90248616 100755 (executable)
--- a/ext/phar/tests/015b.phpt
+++ b/ext/phar/tests/015b.phpt
@@ -13,7 +13,7 @@ $file = "<?php __HALT_COMPILER(); ?>";
 
 $files = array();
 $files['a'] = array('cont'=>'Hello World', 'comp'=>pack('H*', '425a6834314159265359065c89da0000009780400000400080060490002000310c082031a916c41d41e2ee48a70a1200cb913b40'),'flags'=>0x00002000);
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 var_dump(file_get_contents($pname . '/a'));
 ?>

diff --git a/ext/phar/tests/016.phpt b/ext/phar/tests/016.phpt
index 44e4b730620b889c7189c62ef37d945c5e2bf330..302d06d3cb3d1d2ac49c547c563440c0e87431ba 100644 (file)
--- a/ext/phar/tests/016.phpt
+++ b/ext/phar/tests/016.phpt
@@ -18,7 +18,7 @@ $files['a'] = array('cont'=>'a','comp'=> pack('H*', 'cbc80400'),'flags'=>0x00001
 $files['b'] = $files['a'];
 $files['c'] = array('cont'=>'*');
 $files['d'] = $files['a'];
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 var_dump(file_get_contents($pname . '/a'));
 var_dump(file_get_contents($pname . '/b'));

diff --git a/ext/phar/tests/016b.phpt b/ext/phar/tests/016b.phpt
index 31b7f84ff8d166b619f6ceee6fb10b1ba509ea15..8fe66826d6d37de84aecebbd2de6d6da2221fac3 100755 (executable)
--- a/ext/phar/tests/016b.phpt
+++ b/ext/phar/tests/016b.phpt
@@ -14,7 +14,7 @@ $file = "<?php __HALT_COMPILER(); ?>";
 
 $files = array();
 $files['a'] = array('cont'=>'a','flags'=>0x00001000, 'clen' => 1);
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 echo file_get_contents($pname . '/a');
 ?>

diff --git a/ext/phar/tests/017.phpt b/ext/phar/tests/017.phpt
index 3f7110e125c1849548651bb7ab686bba86a042ef..cc585d870f32e0783bd5c8864d3e7749f8f9dab7 100644 (file)
--- a/ext/phar/tests/017.phpt
+++ b/ext/phar/tests/017.phpt
@@ -14,7 +14,7 @@ __HALT_COMPILER(); ?>";
 
 $files = array();
 $files['a'] = 'abc';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 include $fname;
 $dir = opendir('phar://hio');

diff --git a/ext/phar/tests/018.phpt b/ext/phar/tests/018.phpt
index 361a1285efb121d99bcc7690260cc00c178871be..97cd323779b8e2a138dcb85d79a4a59ba72bc36c 100644 (file)
--- a/ext/phar/tests/018.phpt
+++ b/ext/phar/tests/018.phpt
@@ -15,7 +15,7 @@ __HALT_COMPILER(); ?>";
 $files = array();
 $files['a'] = 'a';
 $files['b/a'] = 'b';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 include $fname;
 $dir = opendir('phar://hio/');

diff --git a/ext/phar/tests/019.phpt b/ext/phar/tests/019.phpt
index 7bf062e862724e6e7c8179355dd42d3009de5b84..3d00b5f8e913422adf436e86354bbae1a6becd78 100644 (file)
--- a/ext/phar/tests/019.phpt
+++ b/ext/phar/tests/019.phpt
@@ -17,7 +17,7 @@ $files['a'] = 'a';
 $files['b/a'] = 'b';
 $files['b/c/d'] = 'c';
 $files['bad/c'] = 'd';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 include $fname;
 $dir = opendir('phar://hio/b');
 while (false !== ($a = readdir($dir))) {

diff --git a/ext/phar/tests/019b.phpt b/ext/phar/tests/019b.phpt
index 67faf0dc6e1c4565de51a762e4e2347542470f66..574919b79388133924f4fa6bd53f45ac05dd87d9 100755 (executable)
--- a/ext/phar/tests/019b.phpt
+++ b/ext/phar/tests/019b.phpt
@@ -17,7 +17,7 @@ $files['a'] = 'a';
 $files['b/a'] = 'b';
 $files['b/c/d'] = 'c';
 $files['bad/c'] = 'd';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 include $fname;
 
 function dump($phar, $base)

diff --git a/ext/phar/tests/019c.phpt b/ext/phar/tests/019c.phpt
index f896cb1720be8c4998f96bc3b86fc623cb75a8d4..242b6668712ab05770a599c5d22eba1739291e92 100755 (executable)
--- a/ext/phar/tests/019c.phpt
+++ b/ext/phar/tests/019c.phpt
@@ -17,7 +17,7 @@ $files['a'] = 'a';
 $files['b/a'] = 'b';
 $files['b/c/d'] = 'c';
 $files['bad/c'] = 'd';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 include $fname;
 
 function dump($phar, $base)

diff --git a/ext/phar/tests/020.phpt b/ext/phar/tests/020.phpt
index 0511c9de1330af2d9571fb35cc8ec9d5c1be4dda..b06cdbf7312f0ba11ca6abcaab9957189749f996 100644 (file)
--- a/ext/phar/tests/020.phpt
+++ b/ext/phar/tests/020.phpt
@@ -18,7 +18,7 @@ $files['a'] = 'a';
 $files['b/a'] = 'b';
 $files['b/c/d'] = 'c';
 $files['bad/c'] = 'd';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 include $fname;
 
 var_dump(stat('phar://hio/a'), stat('phar://hio/b'));

diff --git a/ext/phar/tests/021.phpt b/ext/phar/tests/021.phpt
index 1574b1c43954aa9a2e92df1a2dc6efabf930185f..9c9cd97568851af39376eef7a5c512dcb165bbc0 100644 (file)
--- a/ext/phar/tests/021.phpt
+++ b/ext/phar/tests/021.phpt
@@ -18,7 +18,7 @@ $files['b/a'] = 'b';
 $files['b/c/d'] = 'c';
 $files['bad/c'] = 'd';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 include $fname;
 

diff --git a/ext/phar/tests/022.phpt b/ext/phar/tests/022.phpt
index fdb26a561544b336b1d4190176f020609ec5a07d..20c24a021436f27be10584a98ea717ee47a7cebd 100644 (file)
--- a/ext/phar/tests/022.phpt
+++ b/ext/phar/tests/022.phpt
@@ -15,7 +15,7 @@ __HALT_COMPILER(); ?>";
 $files = array();
 $files['a'] = 'abcdefg';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 include $fname;
 

diff --git a/ext/phar/tests/023.phpt b/ext/phar/tests/023.phpt
index ee5dfc6ab70378c1cebfbb81052dd534aac92f1d..808f91deaeff0569b4bfcb0eb9ae5f101d200dff 100755 (executable)
--- a/ext/phar/tests/023.phpt
+++ b/ext/phar/tests/023.phpt
@@ -15,7 +15,7 @@ $files['a.php'] = '<?php echo "This is a\n"; ?>';
 $files['b.php'] = '<?php echo "This is b\n"; ?>';
 $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 var_dump(file_get_contents($pname . '/a.php'));
 var_dump(file_get_contents($pname . '/b.php'));

diff --git a/ext/phar/tests/024.phpt b/ext/phar/tests/024.phpt
index 716749859f15558d90f2d7113b4273750e9ed45a..ad30d2644d53cd2d5aa75fd9bb99339005f56262 100755 (executable)
--- a/ext/phar/tests/024.phpt
+++ b/ext/phar/tests/024.phpt
@@ -15,7 +15,7 @@ $files['a.php'] = '<?php echo "This is a\n"; ?>';
 $files['b.php'] = '<?php echo "This is b\n"; ?>';
 $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 include $pname . '/a.php';
 include $pname . '/b.php';

diff --git a/ext/phar/tests/025.phpt b/ext/phar/tests/025.phpt
index 401ab52b304add4f5cf28e59f9a4e36500d795d6..bbb5bc4e83cd5c78c6bfe4c9cc08920fbe3c065c 100755 (executable)
--- a/ext/phar/tests/025.phpt
+++ b/ext/phar/tests/025.phpt
@@ -15,7 +15,7 @@ $files['a'] = '<?php echo "This is a\n"; ?>';
 $files['b'] = '<?php echo "This is b\n"; ?>';
 $files['b/b'] = '<?php echo "This is b/b\n"; ?>';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 include $pname . '/a';
 include $pname . '/b';

diff --git a/ext/phar/tests/026.phpt b/ext/phar/tests/026.phpt
index 224ca9f04c7925e8cc37517516d06e3367bed9be..696fbcf415ad6024e5b224bcf52ed61646a6914b 100755 (executable)
--- a/ext/phar/tests/026.phpt
+++ b/ext/phar/tests/026.phpt
@@ -17,7 +17,7 @@ $files['b/c.php'] = '<?php echo "This is b/c\n"; require \''.$pname.'/b/d.php\';
 $files['b/d.php'] = '<?php echo "This is b/d\n"; require \''.$pname.'/e.php\'; ?>';    
 $files['e.php']   = '<?php echo "This is e\n"; ?>';                                  
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 require $pname . '/a.php';
 

diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt
index b4f44d77a6058d959f8440822a1a6bc5d888f337..28174c8e762847ac373684dcbc8d14c61a81bad3 100755 (executable)
--- a/ext/phar/tests/027.phpt
+++ b/ext/phar/tests/027.phpt
@@ -17,7 +17,7 @@ $files['b/c.php'] = '<?php echo "This is b/c\n"; require \''.$pname.'/b/d.php\';
 $files['b/d.php'] = '<?php echo "This is b/d\n"; require \''.$pname.'/e.php\'; ?>';    
 $files['e.php']   = '<?php echo "This is e\n"; ?>';                                  
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 function dump($phar, $base)
 {

diff --git a/ext/phar/tests/028.phpt b/ext/phar/tests/028.phpt
index 085d29607a7f1bb8eb06281743fc4920eb2f0f65..a42e17470eec39ea8c4f44f204406e36d0f9ecc0 100755 (executable)
--- a/ext/phar/tests/028.phpt
+++ b/ext/phar/tests/028.phpt
@@ -17,7 +17,7 @@ $files['b/c.php'] = '<?php echo "This is b/c\n"; include "'.$pname.'/b/d.php"; ?
 $files['b/d.php'] = '<?php echo "This is b/d\n"; include "'.$pname.'/e.php"; ?>';    
 $files['e.php']   = '<?php echo "This is e\n"; ?>';                                  
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 Phar::loadPhar($fname, 'hio');
 

diff --git a/ext/phar/tests/029.phpt b/ext/phar/tests/029.phpt
index 966fe1c6b7d77c3b80a220715bc1f2b1477456c4..5302fdb804426c3617de09a87ee1ce59303f080e 100755 (executable)
--- a/ext/phar/tests/029.phpt
+++ b/ext/phar/tests/029.phpt
@@ -19,7 +19,7 @@ $files['b/c.php'] = '<?php echo "This is b/c\n"; include "'.$pname.'/b/d.php"; ?
 $files['b/d.php'] = '<?php echo "This is b/d\n"; include "'.$pname.'/e.php"; ?>';    
 $files['e.php']   = '<?php echo "This is e\n"; ?>';                                  
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 file_put_contents($fname2, $file);
 

diff --git a/ext/phar/tests/030.phpt b/ext/phar/tests/030.phpt
index d9dee01f65b9939cbd6e30ae7488321fcff21acf..afaeb1a802e25343d4cc1e9ff645a9a8d1f0cf09 100755 (executable)
--- a/ext/phar/tests/030.phpt
+++ b/ext/phar/tests/030.phpt
@@ -17,7 +17,7 @@ $files['b/c.php'] = '<?php echo "This is b/c\n"; include \''.$pname.'/b/d.php\';
 $files['b/d.php'] = '<?php echo "This is b/d\n"; include \''.$pname.'/e.php\'; ?>';    
 $files['e.php']   = '<?php echo "This is e\n"; ?>';                                  
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 Phar::loadPhar($fname);
 

diff --git a/ext/phar/tests/031.phpt b/ext/phar/tests/031.phpt
index 54a44e401f1605ff3383e47dd78df574290df024..560d461129895b1da9ee54ad0a20581968339e60 100755 (executable)
--- a/ext/phar/tests/031.phpt
+++ b/ext/phar/tests/031.phpt
@@ -9,7 +9,7 @@ phar.require_hash=0
 
 $pharconfig = 3;
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 Phar::loadPhar($fname);
 

diff --git a/ext/phar/tests/032.phpt b/ext/phar/tests/032.phpt
index 2db715dbb056ff725b800abcd320a7abc9ea49d1..f41f88203b4d0d62ac01c3a1821d7c7c6bba20ed 100755 (executable)
--- a/ext/phar/tests/032.phpt
+++ b/ext/phar/tests/032.phpt
@@ -9,7 +9,7 @@ phar.require_hash=1
 
 $pharconfig = 0;
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 try {
 Phar::loadPhar($fname);

diff --git a/ext/phar/tests/033.phpt b/ext/phar/tests/033.phpt
index c57e4dbeaded95d37699f65d033b9313b7d021b6..d53c7f52fa8795a740238861f5c17be26da3e32f 100644 (file)
--- a/ext/phar/tests/033.phpt
+++ b/ext/phar/tests/033.phpt
@@ -15,7 +15,7 @@ $files = array();
 $files['a.php']   = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>';
 $files['dir/'] = '';
 $hasdir = 1;
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 $a = new Phar($fname);
 var_dump($a['a.php']->isExecutable());
 $a['a.php']->chmod(0777);

diff --git a/ext/phar/tests/033a.phpt b/ext/phar/tests/033a.phpt
index 6fbc0db365aaf0ce9ea8a36c38a71f9bd617fb6d..e8725bdda635c8b5ed25470ac8a2aaa02cc97c69 100644 (file)
--- a/ext/phar/tests/033a.phpt
+++ b/ext/phar/tests/033a.phpt
@@ -13,7 +13,7 @@ $file = '<?php include "' . $pname . '/a.php"; __HALT_COMPILER(); ?>';
 
 $files = array();
 $files['a.php']   = '<?php echo "This is a\n"; include "'.$pname.'/b.php"; ?>';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 try {
        $a = new Phar($fname);
        var_dump($a['a.php']->isExecutable());

diff --git a/ext/phar/tests/delete.phpt b/ext/phar/tests/delete.phpt
index b11580b882bbe5693a8609ea9f1d9a4d8b43a694..1d985090645f042e6ad722e8cc6f8076210b14e4 100644 (file)
--- a/ext/phar/tests/delete.phpt
+++ b/ext/phar/tests/delete.phpt
@@ -15,7 +15,7 @@ __HALT_COMPILER(); ?>";
 
 $files = array();
 $files['a'] = 'a';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 include $fname;
 $phar = new Phar($fname);
 

diff --git a/ext/phar/tests/delete_in_phar.phpt b/ext/phar/tests/delete_in_phar.phpt
index f944bc8961b5b29a42f86895c5a1e66ca00bb67b..4842d27913313027c4e05db7b303add81b70127e 100644 (file)
--- a/ext/phar/tests/delete_in_phar.phpt
+++ b/ext/phar/tests/delete_in_phar.phpt
@@ -15,7 +15,7 @@ $files = array();
 $files['a.php'] = '<?php echo "This is a\n"; ?>';
 $files['b.php'] = '<?php echo "This is b\n"; ?>';
 $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 include $pname . '/a.php';
 include $pname . '/b.php';

diff --git a/ext/phar/tests/delete_in_phar_b.phpt b/ext/phar/tests/delete_in_phar_b.phpt
index 55a5acb1cfdf2adcc7787361ec02a355ad8b7b8a..d26f51cbf1408f672543d18d2130933609e3be76 100755 (executable)
--- a/ext/phar/tests/delete_in_phar_b.phpt
+++ b/ext/phar/tests/delete_in_phar_b.phpt
@@ -15,7 +15,7 @@ $files = array();
 $files['a.php'] = '<?php echo "This is a\n"; ?>';
 $files['b.php'] = '<?php echo "This is b\n"; ?>';
 $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 include $pname . '/a.php';
 include $pname . '/b.php';

diff --git a/ext/phar/tests/delete_in_phar_confirm.phpt b/ext/phar/tests/delete_in_phar_confirm.phpt
index e24f273ee904a90ce9acf73d9183781ea614f8d4..13a8d0db298935b6c424ae76ab481da6176351d4 100644 (file)
--- a/ext/phar/tests/delete_in_phar_confirm.phpt
+++ b/ext/phar/tests/delete_in_phar_confirm.phpt
@@ -15,7 +15,7 @@ $files = array();
 $files['a.php'] = '<?php echo "This is a\n"; ?>';
 $files['b.php'] = '<?php echo "This is b\n"; ?>';
 $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 include $pname . '/a.php';
 include $pname . '/b.php';

diff --git a/ext/phar/tests/extracted_001.phpt b/ext/phar/tests/extracted_001.phpt
index d11a3fc61678d4ede2fb111a6239eae4f8dac0db..07faae527ab0292e442b0f2eab747581be3d04a6 100755 (executable)
--- a/ext/phar/tests/extracted_001.phpt
+++ b/ext/phar/tests/extracted_001.phpt
@@ -14,9 +14,9 @@ var_dump(Phar::getExtractList());
 
 $pname = 'phar://phar_test.phar';
 
-var_dump(file_get_contents($pname . '/extracted.inc'));
+var_dump(file_get_contents($pname . '/files/extracted.inc'));
 
-include $pname . '/extracted.inc';
+include $pname . '/files/extracted.inc';
 
 ?>
 ===DONE===

diff --git a/ext/phar/tests/extracted.inc b/ext/phar/tests/files/extracted.inc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from ext/phar/tests/extracted.inc
rename to ext/phar/tests/files/extracted.inc

diff --git a/ext/phar/tests/frontcontroller.phar b/ext/phar/tests/files/frontcontroller.phar
similarity index 100%
rename from ext/phar/tests/frontcontroller.phar
rename to ext/phar/tests/files/frontcontroller.phar

diff --git a/ext/phar/tests/frontcontroller.phar.inc b/ext/phar/tests/files/frontcontroller.phar.inc
similarity index 100%
rename from ext/phar/tests/frontcontroller.phar.inc
rename to ext/phar/tests/files/frontcontroller.phar.inc

diff --git a/ext/phar/tests/frontcontroller10.phar b/ext/phar/tests/files/frontcontroller10.phar
similarity index 100%
rename from ext/phar/tests/frontcontroller10.phar
rename to ext/phar/tests/files/frontcontroller10.phar

diff --git a/ext/phar/tests/frontcontroller10.phar.inc b/ext/phar/tests/files/frontcontroller10.phar.inc
similarity index 100%
rename from ext/phar/tests/frontcontroller10.phar.inc
rename to ext/phar/tests/files/frontcontroller10.phar.inc

diff --git a/ext/phar/tests/frontcontroller11.phar b/ext/phar/tests/files/frontcontroller11.phar
similarity index 100%
rename from ext/phar/tests/frontcontroller11.phar
rename to ext/phar/tests/files/frontcontroller11.phar

diff --git a/ext/phar/tests/frontcontroller11.phar.inc b/ext/phar/tests/files/frontcontroller11.phar.inc
similarity index 100%
rename from ext/phar/tests/frontcontroller11.phar.inc
rename to ext/phar/tests/files/frontcontroller11.phar.inc

diff --git a/ext/phar/tests/frontcontroller12.phar b/ext/phar/tests/files/frontcontroller12.phar
similarity index 100%
rename from ext/phar/tests/frontcontroller12.phar
rename to ext/phar/tests/files/frontcontroller12.phar

diff --git a/ext/phar/tests/frontcontroller12.phar.inc b/ext/phar/tests/files/frontcontroller12.phar.inc
similarity index 100%
rename from ext/phar/tests/frontcontroller12.phar.inc
rename to ext/phar/tests/files/frontcontroller12.phar.inc

diff --git a/ext/phar/tests/frontcontroller13.phar b/ext/phar/tests/files/frontcontroller13.phar
similarity index 100%
rename from ext/phar/tests/frontcontroller13.phar
rename to ext/phar/tests/files/frontcontroller13.phar

diff --git a/ext/phar/tests/frontcontroller13.phar.inc b/ext/phar/tests/files/frontcontroller13.phar.inc
similarity index 100%
rename from ext/phar/tests/frontcontroller13.phar.inc
rename to ext/phar/tests/files/frontcontroller13.phar.inc

diff --git a/ext/phar/tests/frontcontroller2.phar b/ext/phar/tests/files/frontcontroller2.phar
similarity index 100%
rename from ext/phar/tests/frontcontroller2.phar
rename to ext/phar/tests/files/frontcontroller2.phar

diff --git a/ext/phar/tests/frontcontroller2.phar.inc b/ext/phar/tests/files/frontcontroller2.phar.inc
similarity index 100%
rename from ext/phar/tests/frontcontroller2.phar.inc
rename to ext/phar/tests/files/frontcontroller2.phar.inc

diff --git a/ext/phar/tests/frontcontroller3.phar b/ext/phar/tests/files/frontcontroller3.phar
similarity index 100%
rename from ext/phar/tests/frontcontroller3.phar
rename to ext/phar/tests/files/frontcontroller3.phar

diff --git a/ext/phar/tests/frontcontroller3.phar.inc b/ext/phar/tests/files/frontcontroller3.phar.inc
similarity index 100%
rename from ext/phar/tests/frontcontroller3.phar.inc
rename to ext/phar/tests/files/frontcontroller3.phar.inc

diff --git a/ext/phar/tests/frontcontroller4.phar b/ext/phar/tests/files/frontcontroller4.phar
similarity index 100%
rename from ext/phar/tests/frontcontroller4.phar
rename to ext/phar/tests/files/frontcontroller4.phar

diff --git a/ext/phar/tests/frontcontroller4.phar.inc b/ext/phar/tests/files/frontcontroller4.phar.inc
similarity index 100%
rename from ext/phar/tests/frontcontroller4.phar.inc
rename to ext/phar/tests/files/frontcontroller4.phar.inc

diff --git a/ext/phar/tests/frontcontroller5.phar b/ext/phar/tests/files/frontcontroller5.phar
similarity index 100%
rename from ext/phar/tests/frontcontroller5.phar
rename to ext/phar/tests/files/frontcontroller5.phar

diff --git a/ext/phar/tests/frontcontroller5.phar.inc b/ext/phar/tests/files/frontcontroller5.phar.inc
similarity index 100%
rename from ext/phar/tests/frontcontroller5.phar.inc
rename to ext/phar/tests/files/frontcontroller5.phar.inc

diff --git a/ext/phar/tests/frontcontroller6.phar b/ext/phar/tests/files/frontcontroller6.phar
similarity index 100%
rename from ext/phar/tests/frontcontroller6.phar
rename to ext/phar/tests/files/frontcontroller6.phar

diff --git a/ext/phar/tests/frontcontroller6.phar.inc b/ext/phar/tests/files/frontcontroller6.phar.inc
similarity index 100%
rename from ext/phar/tests/frontcontroller6.phar.inc
rename to ext/phar/tests/files/frontcontroller6.phar.inc

diff --git a/ext/phar/tests/frontcontroller7.phar b/ext/phar/tests/files/frontcontroller7.phar
similarity index 100%
rename from ext/phar/tests/frontcontroller7.phar
rename to ext/phar/tests/files/frontcontroller7.phar

diff --git a/ext/phar/tests/frontcontroller7.phar.inc b/ext/phar/tests/files/frontcontroller7.phar.inc
similarity index 100%
rename from ext/phar/tests/frontcontroller7.phar.inc
rename to ext/phar/tests/files/frontcontroller7.phar.inc

diff --git a/ext/phar/tests/frontcontroller8.phar b/ext/phar/tests/files/frontcontroller8.phar
similarity index 100%
rename from ext/phar/tests/frontcontroller8.phar
rename to ext/phar/tests/files/frontcontroller8.phar

diff --git a/ext/phar/tests/frontcontroller8.phar.inc b/ext/phar/tests/files/frontcontroller8.phar.inc
similarity index 100%
rename from ext/phar/tests/frontcontroller8.phar.inc
rename to ext/phar/tests/files/frontcontroller8.phar.inc

diff --git a/ext/phar/tests/frontcontroller9.phar b/ext/phar/tests/files/frontcontroller9.phar
similarity index 100%
rename from ext/phar/tests/frontcontroller9.phar
rename to ext/phar/tests/files/frontcontroller9.phar

diff --git a/ext/phar/tests/frontcontroller9.phar.inc b/ext/phar/tests/files/frontcontroller9.phar.inc
similarity index 100%
rename from ext/phar/tests/frontcontroller9.phar.inc
rename to ext/phar/tests/files/frontcontroller9.phar.inc

diff --git a/ext/phar/tests/md5.phar b/ext/phar/tests/files/md5.phar
similarity index 100%
rename from ext/phar/tests/md5.phar
rename to ext/phar/tests/files/md5.phar

diff --git a/ext/phar/tests/nophar.phar b/ext/phar/tests/files/nophar.phar
similarity index 100%
rename from ext/phar/tests/nophar.phar
rename to ext/phar/tests/files/nophar.phar

diff --git a/ext/phar/tests/nophar.phar.inc b/ext/phar/tests/files/nophar.phar.inc
similarity index 100%
rename from ext/phar/tests/nophar.phar.inc
rename to ext/phar/tests/files/nophar.phar.inc

diff --git a/ext/phar/tests/phar_oo_test.inc b/ext/phar/tests/files/phar_oo_test.inc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from ext/phar/tests/phar_oo_test.inc
rename to ext/phar/tests/files/phar_oo_test.inc

diff --git a/ext/phar/tests/phar_test.inc b/ext/phar/tests/files/phar_test.inc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from ext/phar/tests/phar_test.inc
rename to ext/phar/tests/files/phar_test.inc

diff --git a/ext/phar/tests/sha1.phar b/ext/phar/tests/files/sha1.phar
similarity index 100%
rename from ext/phar/tests/sha1.phar
rename to ext/phar/tests/files/sha1.phar

diff --git a/ext/phar/tests/sha256.phar b/ext/phar/tests/files/sha256.phar
similarity index 100%
rename from ext/phar/tests/sha256.phar
rename to ext/phar/tests/files/sha256.phar

diff --git a/ext/phar/tests/sha512.phar b/ext/phar/tests/files/sha512.phar
similarity index 100%
rename from ext/phar/tests/sha512.phar
rename to ext/phar/tests/files/sha512.phar

diff --git a/ext/phar/tests/zfapp.tgz b/ext/phar/tests/files/zfapp.tgz
similarity index 100%
rename from ext/phar/tests/zfapp.tgz
rename to ext/phar/tests/files/zfapp.tgz

diff --git a/ext/phar/tests/frontcontroller1.phpt b/ext/phar/tests/frontcontroller1.phpt
index b925c637ea9c7df1e8f24773eb9a749de44f7d8c..709332361719766b916873383e5988b14b183bdb 100644 (file)
--- a/ext/phar/tests/frontcontroller1.phpt
+++ b/ext/phar/tests/frontcontroller1.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller1.php
 REQUEST_URI=/frontcontroller1.php/a.jpg
 PATH_INFO=/a.jpg
 --FILE_EXTERNAL--
-frontcontroller.phar
+files/frontcontroller.phar
 --EXPECTHEADERS--
 Content-type: image/jpeg
 Content-length: 3

diff --git a/ext/phar/tests/frontcontroller10.phpt b/ext/phar/tests/frontcontroller10.phpt
index 16821248679754eac365a59e0b1b76479d22f855..2dbf1cbed8b3e6fefbf4d8dfe05dad891da2d8fc 100644 (file)
--- a/ext/phar/tests/frontcontroller10.phpt
+++ b/ext/phar/tests/frontcontroller10.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller10.php
 REQUEST_URI=/frontcontroller10.php/hi
 PATH_INFO=/hi
 --FILE_EXTERNAL--
-frontcontroller4.phar
+files/frontcontroller4.phar
 --EXPECTHEADERS--
 Content-type: text/html
 Status: 403 Access Denied

diff --git a/ext/phar/tests/frontcontroller11.phpt b/ext/phar/tests/frontcontroller11.phpt
index d1e8893eb3b0590fd53d822cbe6e7838ae49f9e3..14681c81f3f146d3ac990e1ecb5f8675c6d4ace7 100644 (file)
--- a/ext/phar/tests/frontcontroller11.phpt
+++ b/ext/phar/tests/frontcontroller11.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller11.php
 REQUEST_URI=/frontcontroller11.php/a.php
 PATH_INFO=/a.php
 --FILE_EXTERNAL--
-frontcontroller5.phar
+files/frontcontroller5.phar
 --EXPECTHEADERS--
 Content-type: text/html
 --EXPECTF--

diff --git a/ext/phar/tests/frontcontroller12.phpt b/ext/phar/tests/frontcontroller12.phpt
index 0eb0ef7e1f3aea1fedbf54bb94e66f4625d34344..76ef63ca6e488b0aeb00e2c8c333333eb70d7c45 100644 (file)
--- a/ext/phar/tests/frontcontroller12.phpt
+++ b/ext/phar/tests/frontcontroller12.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller12.php
 REQUEST_URI=/frontcontroller12.php/a.php
 PATH_INFO=/a.php
 --FILE_EXTERNAL--
-frontcontroller6.phar
+files/frontcontroller6.phar
 --EXPECTHEADERS--
 Content-type: text/html
 --EXPECTF--

diff --git a/ext/phar/tests/frontcontroller13.phpt b/ext/phar/tests/frontcontroller13.phpt
index 07ec55b0c72971f7680289bf9b77d2ac33cb7114..267c73263bcb05b5ef9efaacc290865623a6b784 100644 (file)
--- a/ext/phar/tests/frontcontroller13.phpt
+++ b/ext/phar/tests/frontcontroller13.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller13.php
 REQUEST_URI=/frontcontroller13.php/a.php
 PATH_INFO=/a.php
 --FILE_EXTERNAL--
-frontcontroller7.phar
+files/frontcontroller7.phar
 --EXPECTHEADERS--
 Content-type: text/html
 --EXPECTF--

diff --git a/ext/phar/tests/frontcontroller14.phpt b/ext/phar/tests/frontcontroller14.phpt
index 508efc8cd0525d4f268371cddf9bcb6ab0f1701a..2bdb145c6e365850f24998ded85b76e53e2e54fc 100644 (file)
--- a/ext/phar/tests/frontcontroller14.phpt
+++ b/ext/phar/tests/frontcontroller14.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller14.php
 REQUEST_URI=/frontcontroller14.php/a.jpg
 PATH_INFO=/a.jpg
 --FILE_EXTERNAL--
-frontcontroller8.phar
+files/frontcontroller8.phar
 --EXPECTHEADERS--
 Content-type: foo/bar
 Content-length: 4

diff --git a/ext/phar/tests/frontcontroller15.phpt b/ext/phar/tests/frontcontroller15.phpt
index fb75199ec4b0858851a0dcea71a790a2933a8cf4..eb69ede8f5cb7647e8cddaf490ffc6ff057a358a 100644 (file)
--- a/ext/phar/tests/frontcontroller15.phpt
+++ b/ext/phar/tests/frontcontroller15.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller15.php
 REQUEST_URI=/frontcontroller15.php/a.php
 PATH_INFO=/a.php
 --FILE_EXTERNAL--
-frontcontroller8.phar
+files/frontcontroller8.phar
 --EXPECTHEADERS--
 Content-type: text/html
 --EXPECT--

diff --git a/ext/phar/tests/frontcontroller16.phpt b/ext/phar/tests/frontcontroller16.phpt
index 81210ac2eb14bad7261fd94a8d21e3dfaf6bcd3d..5c6a03e16aa2dae4439fd758d245b80cc974a28d 100644 (file)
--- a/ext/phar/tests/frontcontroller16.phpt
+++ b/ext/phar/tests/frontcontroller16.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller16.php
 REQUEST_URI=/frontcontroller16.php/a.phps
 PATH_INFO=/a.phps
 --FILE_EXTERNAL--
-frontcontroller8.phar
+files/frontcontroller8.phar
 --EXPECTHEADERS--
 Content-type: text/html
 --EXPECT--

diff --git a/ext/phar/tests/frontcontroller17.phpt b/ext/phar/tests/frontcontroller17.phpt
index e89c9e08e373252560b267641fbd4c202b2dffe0..233e2e2a49078cafbc39a3525a83ccc2af24cf50 100644 (file)
--- a/ext/phar/tests/frontcontroller17.phpt
+++ b/ext/phar/tests/frontcontroller17.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller17.php
 REQUEST_URI=/frontcontroller17.php/fronk.gronk
 PATH_INFO=/fronk.gronk
 --FILE_EXTERNAL--
-frontcontroller8.phar
+files/frontcontroller8.phar
 --EXPECTHEADERS--
 Content-type: application/octet-stream
 Content-length: 4

diff --git a/ext/phar/tests/frontcontroller18.phpt b/ext/phar/tests/frontcontroller18.phpt
index 4c50afb5fc0e59330669233e648a0d428ea2a8ec..590bd3676e57c6efe534dc22c70fb04a1d2df3d4 100644 (file)
--- a/ext/phar/tests/frontcontroller18.phpt
+++ b/ext/phar/tests/frontcontroller18.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller18.php
 REQUEST_URI=/frontcontroller18.php/fronk.gronk
 PATH_INFO=/fronk.gronk
 --FILE_EXTERNAL--
-frontcontroller9.phar
+files/frontcontroller9.phar
 --EXPECTF--
 Fatal error: Uncaught exception 'UnexpectedValueException' with message 'No values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller18.php:2
 Stack trace:

diff --git a/ext/phar/tests/frontcontroller19.phpt b/ext/phar/tests/frontcontroller19.phpt
index d01cf1e31e17272d99709b641774dac0d752da8e..80305c8a10f9f8c19f95dbb9dde3fad8e1f4fa5d 100644 (file)
--- a/ext/phar/tests/frontcontroller19.phpt
+++ b/ext/phar/tests/frontcontroller19.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller19.php
 REQUEST_URI=/frontcontroller19.php/
 PATH_INFO=/
 --FILE_EXTERNAL--
-frontcontroller10.phar
+files/frontcontroller10.phar
 --EXPECTF--
 Fatal error: Uncaught exception 'UnexpectedValueException' with message 'Too many values passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller19.php:2
 Stack trace:

diff --git a/ext/phar/tests/frontcontroller2.phpt b/ext/phar/tests/frontcontroller2.phpt
index aed4afff42fc3b106b7729af0db60a37f4390d07..4b1652c4610a982cf535fe30a83bc4fe30175648 100644 (file)
--- a/ext/phar/tests/frontcontroller2.phpt
+++ b/ext/phar/tests/frontcontroller2.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller2.php
 REQUEST_URI=/frontcontroller2.php/a.php
 PATH_INFO=/a.php
 --FILE_EXTERNAL--
-frontcontroller.phar
+files/frontcontroller.phar
 --EXPECTHEADERS--
 Content-type: text/html
 --EXPECT--

diff --git a/ext/phar/tests/frontcontroller20.phpt b/ext/phar/tests/frontcontroller20.phpt
index d55d8a14e106912c4ab679ca817f5750ce543a89..b650694bb801bab810e7f227ecea443e97d0b2c5 100644 (file)
--- a/ext/phar/tests/frontcontroller20.phpt
+++ b/ext/phar/tests/frontcontroller20.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller20.php
 REQUEST_URI=/frontcontroller20.php/
 PATH_INFO=/
 --FILE_EXTERNAL--
-frontcontroller11.phar
+files/frontcontroller11.phar
 --EXPECTF--
 Fatal error: Uncaught exception 'UnexpectedValueException' with message 'Non-string value passed to Phar::mungServer(), expecting an array of any of these strings: PHP_SELF, REQUEST_URI, SCRIPT_FILENAME, SCRIPT_NAME' in %sfrontcontroller20.php:2
 Stack trace:

diff --git a/ext/phar/tests/frontcontroller21.phpt b/ext/phar/tests/frontcontroller21.phpt
index cfed28a98f34b780395d91d385f0b003c5225a99..70d3508496359ffc4650d9e9ea659ef4bdd98ee4 100644 (file)
--- a/ext/phar/tests/frontcontroller21.phpt
+++ b/ext/phar/tests/frontcontroller21.phpt
@@ -8,7 +8,7 @@ REQUEST_URI=/frontcontroller21.php/index.php?test=hi
 PATH_INFO=/index.php
 QUERY_STRING=test=hi
 --FILE_EXTERNAL--
-frontcontroller12.phar
+files/frontcontroller12.phar
 --EXPECTHEADERS--
 Content-type: text/html
 --EXPECTF--

diff --git a/ext/phar/tests/frontcontroller22.phpt b/ext/phar/tests/frontcontroller22.phpt
index 7bbebc0b1973630342f49d5c57c1acfd89f8edf0..9925ba16d38cc64e2b55c37561d9ed890809f580 100644 (file)
--- a/ext/phar/tests/frontcontroller22.phpt
+++ b/ext/phar/tests/frontcontroller22.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller22.php
 REQUEST_URI=/frontcontroller22.php/index.php
 PATH_INFO=/index.php
 --FILE_EXTERNAL--
-frontcontroller13.phar
+files/frontcontroller13.phar
 --EXPECTHEADERS--
 Content-type: text/html
 --EXPECTF--

diff --git a/ext/phar/tests/frontcontroller3.phpt b/ext/phar/tests/frontcontroller3.phpt
index c85bfc635f49277fa1c844cce1d4d9b7125f8d31..1b8093542f108c80c3c2b68935944a1e8187c51a 100644 (file)
--- a/ext/phar/tests/frontcontroller3.phpt
+++ b/ext/phar/tests/frontcontroller3.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller3.php
 REQUEST_URI=/frontcontroller3.php/a.phps
 PATH_INFO=/a.phps
 --FILE_EXTERNAL--
-frontcontroller.phar
+files/frontcontroller.phar
 --EXPECTHEADERS--
 Content-type: text/html
 --EXPECT--

diff --git a/ext/phar/tests/frontcontroller4.phpt b/ext/phar/tests/frontcontroller4.phpt
index d25b2fc005959eb65d66c6548b0001ff8f9789ec..f2482b921979115838b12ac70798879d9bcb46ce 100644 (file)
--- a/ext/phar/tests/frontcontroller4.phpt
+++ b/ext/phar/tests/frontcontroller4.phpt
@@ -6,7 +6,7 @@ Phar front controller index.php relocate (no /)
 SCRIPT_NAME=/frontcontroller4.php
 REQUEST_URI=/frontcontroller4.php
 --FILE_EXTERNAL--
-frontcontroller.phar
+files/frontcontroller.phar
 --EXPECTHEADERS--
 Status: 301 Moved Permanently
 Location: /frontcontroller4.php/index.php

diff --git a/ext/phar/tests/frontcontroller5.phpt b/ext/phar/tests/frontcontroller5.phpt
index 1265c771c930af216441c1a61df89354fe50ce35..1990a2b008322c4da70e0bea024cafe96fa2b36d 100644 (file)
--- a/ext/phar/tests/frontcontroller5.phpt
+++ b/ext/phar/tests/frontcontroller5.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller5.php
 REQUEST_URI=/frontcontroller5.php/
 PATH_INFO=/
 --FILE_EXTERNAL--
-frontcontroller.phar
+files/frontcontroller.phar
 --EXPECTHEADERS--
 Status: 301 Moved Permanently
 Location: /frontcontroller5.php/index.php

diff --git a/ext/phar/tests/frontcontroller6.phpt b/ext/phar/tests/frontcontroller6.phpt
index 8e5d87a1bec9b2e36cfafcea9431d914a2de38d1..1a2cc2cd23d12324cdfeb332d93adfb60cedc3da 100644 (file)
--- a/ext/phar/tests/frontcontroller6.phpt
+++ b/ext/phar/tests/frontcontroller6.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller6.php
 REQUEST_URI=/frontcontroller6.php/notfound.php
 PATH_INFO=/notfound.php
 --FILE_EXTERNAL--
-frontcontroller.phar
+files/frontcontroller.phar
 --EXPECTHEADERS--
 Status: 404 Not Found
 --EXPECT--

diff --git a/ext/phar/tests/frontcontroller7.phpt b/ext/phar/tests/frontcontroller7.phpt
index 28a82c6186dad360ae6cef190eb874401fc1de6d..aff2087522c3aa3e398842f21a61dfea6c7afef7 100644 (file)
--- a/ext/phar/tests/frontcontroller7.phpt
+++ b/ext/phar/tests/frontcontroller7.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller7.php
 REQUEST_URI=/frontcontroller7.php/
 PATH_INFO=/
 --FILE_EXTERNAL--
-frontcontroller2.phar
+files/frontcontroller2.phar
 --EXPECTHEADERS--
 Status: 301 Moved Permanently
 Location: /frontcontroller7.php/a.php

diff --git a/ext/phar/tests/frontcontroller8.phpt b/ext/phar/tests/frontcontroller8.phpt
index 088c7f9d8c7c873e9769f6f095c664461fb3b1ac..36e3206d66879080bcaf3a097b5111aefae22733 100644 (file)
--- a/ext/phar/tests/frontcontroller8.phpt
+++ b/ext/phar/tests/frontcontroller8.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller8.php
 REQUEST_URI=/frontcontroller8.php/
 PATH_INFO=/
 --FILE_EXTERNAL--
-frontcontroller3.phar
+files/frontcontroller3.phar
 --EXPECTHEADERS--
 Status: 404 Not Found
 --EXPECT--

diff --git a/ext/phar/tests/frontcontroller9.phpt b/ext/phar/tests/frontcontroller9.phpt
index 877a71e74ecaa00fce97d68332a8356e6549e097..b7af364853177d92de586768c91f19eb1c3ddc2e 100644 (file)
--- a/ext/phar/tests/frontcontroller9.phpt
+++ b/ext/phar/tests/frontcontroller9.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller9.php
 REQUEST_URI=/frontcontroller9.php/hi
 PATH_INFO=/hi
 --FILE_EXTERNAL--
-frontcontroller3.phar
+files/frontcontroller3.phar
 --EXPECTHEADERS--
 Content-type: text/html
 --EXPECT--

diff --git a/ext/phar/tests/metadata_read.phpt b/ext/phar/tests/metadata_read.phpt
index 2b04b679b709c02fd1d3b7f01f434b5b11d17142..c3d12d6fbd0dd73e3193ffc2ef12d0cbc8083708 100644 (file)
--- a/ext/phar/tests/metadata_read.phpt
+++ b/ext/phar/tests/metadata_read.phpt
@@ -15,7 +15,7 @@ $files['a'] = array('cont' => 'a');
 $files['b'] = array('cont' => 'b', 'meta' => 'hi there');
 $files['c'] = array('cont' => 'c', 'meta' => array('hi', 'there'));
 $files['d'] = array('cont' => 'd', 'meta' => array('hi'=>'there','foo'=>'bar'));
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 foreach($files as $name => $cont) {
        var_dump(file_get_contents($pname.'/'.$name));

diff --git a/ext/phar/tests/metadata_write.phpt b/ext/phar/tests/metadata_write.phpt
index cde2124c053da337657556cc79f49aa9209a4a79..4b9930b693e259b1c0af6722c14bd3b65bd2b5b2 100755 (executable)
--- a/ext/phar/tests/metadata_write.phpt
+++ b/ext/phar/tests/metadata_write.phpt
@@ -16,7 +16,7 @@ $files['a'] = array('cont' => 'a');
 $files['b'] = array('cont' => 'b', 'meta' => 'hi there');
 $files['c'] = array('cont' => 'c', 'meta' => array('hi', 'there'));
 $files['d'] = array('cont' => 'd', 'meta' => array('hi'=>'there','foo'=>'bar'));
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 foreach($files as $name => $cont) {
        var_dump(file_get_contents($pname.'/'.$name));

diff --git a/ext/phar/tests/metadata_write_commit.phpt b/ext/phar/tests/metadata_write_commit.phpt
index e097bb0e4936d328e9a0ce8a5add1d052e12a359..0d0a5e56adf4bd22d91b972730e28417c9801b2c 100755 (executable)
--- a/ext/phar/tests/metadata_write_commit.phpt
+++ b/ext/phar/tests/metadata_write_commit.phpt
@@ -16,7 +16,7 @@ $files['a'] = array('cont' => 'a');
 $files['b'] = array('cont' => 'b', 'meta' => 'hi there');
 $files['c'] = array('cont' => 'c', 'meta' => array('hi', 'there'));
 $files['d'] = array('cont' => 'd', 'meta' => array('hi'=>'there','foo'=>'bar'));
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 foreach($files as $name => $cont) {
        var_dump(file_get_contents($pname.'/'.$name));

diff --git a/ext/phar/tests/nophar.phpt b/ext/phar/tests/nophar.phpt
index 2b7af7ac639dc8c4d61d9cd6bf14245759621a7a..59671557e7e61f70fb8f5cf7a2e5d12efda65b73 100644 (file)
--- a/ext/phar/tests/nophar.phpt
+++ b/ext/phar/tests/nophar.phpt
@@ -4,7 +4,7 @@ Phar: phar run without pecl/phar with default stub
 <?php if (extension_loaded("phar")) die("skip"); ?>
 --FILE--
 <?php
-include dirname(__FILE__) . '/nophar.phar';
+include dirname(__FILE__) . '/files/nophar.phar';
 ?>
 ===DONE===
 --EXPECT--

diff --git a/ext/phar/tests/nophar_web.phpt b/ext/phar/tests/nophar_web.phpt
index c65a35c569a184c39827fe3298ee98e51bbaf7f1..397dd161b24a38cd884215f07105de4f02d077ed 100644 (file)
--- a/ext/phar/tests/nophar_web.phpt
+++ b/ext/phar/tests/nophar_web.phpt
@@ -6,6 +6,6 @@ Phar: default web stub, no phar extension
 SCRIPT_NAME=/nophar.phar
 REQUEST_URI=/nophar.phar
 --FILE_EXTERNAL--
-nophar.phar
+files/nophar.phar
 --EXPECT--
 web

diff --git a/ext/phar/tests/open_for_write_existing.phpt b/ext/phar/tests/open_for_write_existing.phpt
index e333f25d2afc3332249608722b97714527249945..e9e2c05b9e91d2f905e61c5fe9f51e0cb86ea9d7 100644 (file)
--- a/ext/phar/tests/open_for_write_existing.phpt
+++ b/ext/phar/tests/open_for_write_existing.phpt
@@ -15,7 +15,7 @@ $files = array();
 $files['a.php'] = '<?php echo "This is a\n"; ?>';
 $files['b.php'] = '<?php echo "This is b\n"; ?>';
 $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $fp = fopen($pname . '/b/c.php', 'wb');
 fwrite($fp, 'extra');

diff --git a/ext/phar/tests/open_for_write_existing_b.phpt b/ext/phar/tests/open_for_write_existing_b.phpt
index 67674ba3a8e061277641780bb3e97fc324d04ec7..6c3cd3e986828fbb6b714700fb50e229bdd0883f 100755 (executable)
--- a/ext/phar/tests/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/open_for_write_existing_b.phpt
@@ -15,7 +15,7 @@ $files = array();
 $files['a.php'] = '<?php echo "This is a\n"; ?>';
 $files['b.php'] = '<?php echo "This is b\n"; ?>';
 $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 function err_handler($errno, $errstr, $errfile, $errline) {
   echo "Catchable fatal error: $errstr in $errfile on line $errline\n";

diff --git a/ext/phar/tests/open_for_write_existing_c.phpt b/ext/phar/tests/open_for_write_existing_c.phpt
index 08eb1fd16717124c78012829facc10e9ef14514c..9bbaaae92a003aaf5b54947e1670be3552dd2416 100755 (executable)
--- a/ext/phar/tests/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/open_for_write_existing_c.phpt
@@ -15,7 +15,7 @@ $files = array();
 $files['a.php'] = '<?php echo "This is a\n"; ?>';
 $files['b.php'] = '<?php echo "This is b\n"; ?>';
 $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $fp = fopen($pname . '/b/c.php', 'wb');
 fwrite($fp, 'extra');

diff --git a/ext/phar/tests/open_for_write_newfile.phpt b/ext/phar/tests/open_for_write_newfile.phpt
index 39d7d566c6038908d540fea045ccb767f2c45f9f..13114072da0e6aa7643aeb6c5d99f3a269327630 100644 (file)
--- a/ext/phar/tests/open_for_write_newfile.phpt
+++ b/ext/phar/tests/open_for_write_newfile.phpt
@@ -15,7 +15,7 @@ $files = array();
 $files['a.php'] = '<?php echo "This is a\n"; ?>';
 $files['b.php'] = '<?php echo "This is b\n"; ?>';
 $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $fp = fopen($pname . '/b/new.php', 'wb');
 fwrite($fp, 'extra');

diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt
index 7c45291903ad68a5bcd0645d95e32240b4ac8e94..1c136ff1d52da41dc6dca7744238aa929a0ffe0a 100755 (executable)
--- a/ext/phar/tests/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/open_for_write_newfile_b.phpt
@@ -15,7 +15,7 @@ $files = array();
 $files['a.php'] = '<?php echo "This is a\n"; ?>';
 $files['b.php'] = '<?php echo "This is b\n"; ?>';
 $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 function err_handler($errno, $errstr, $errfile, $errline) {
   echo "Catchable fatal error: $errstr in $errfile on line $errline\n";

diff --git a/ext/phar/tests/open_for_write_newfile_c.phpt b/ext/phar/tests/open_for_write_newfile_c.phpt
index e06c6496d8894bc38dbf2f631222ee1048a6bf5f..59b4339eb95dd817b5b1a1d88eccaa6f0a05936b 100755 (executable)
--- a/ext/phar/tests/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/open_for_write_newfile_c.phpt
@@ -15,7 +15,7 @@ $files = array();
 $files['a.php'] = '<?php echo "This is a\n"; ?>';
 $files['b.php'] = '<?php echo "This is b\n"; ?>';
 $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $fp = fopen($pname . '/b/new.php', 'wb');
 fwrite($fp, 'extra');

diff --git a/ext/phar/tests/phar_bz2.phpt b/ext/phar/tests/phar_bz2.phpt
index fd7c664734612c74281c16cf540d1fe5443643df..b681849c25430e5c0d162d16db4939c3ab89cdcb 100644 (file)
--- a/ext/phar/tests/phar_bz2.phpt
+++ b/ext/phar/tests/phar_bz2.phpt
@@ -27,7 +27,7 @@ $files['internal/dir/'] = '';
 $files['dir/'] = '';
 $bz2 = true;
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 include $fname;
 

diff --git a/ext/phar/tests/phar_convert_tar.phpt b/ext/phar/tests/phar_convert_tar.phpt
index 7eabb0810098576b5a5f381345473a138f46a5a3..9651f44e639f68ace0b08898b2ba3287a15c54d0 100644 (file)
--- a/ext/phar/tests/phar_convert_tar.phpt
+++ b/ext/phar/tests/phar_convert_tar.phpt
@@ -19,7 +19,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 $phar->convertToTar();

diff --git a/ext/phar/tests/phar_convert_tar2.phpt b/ext/phar/tests/phar_convert_tar2.phpt
index 48f3e1b56562a43146574cbab93a31c50b9a8a97..6b6c0cc1ddd26ef90fc37a442b840ea0bdbb5c85 100644 (file)
--- a/ext/phar/tests/phar_convert_tar2.phpt
+++ b/ext/phar/tests/phar_convert_tar2.phpt
@@ -20,7 +20,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 $phar->convertToTar(Phar::GZ);

diff --git a/ext/phar/tests/phar_convert_tar3.phpt b/ext/phar/tests/phar_convert_tar3.phpt
index 1623cec0f812e32b0207eaec3c9c2ef5ba9291bb..2bdf621fc22b08cb642dca4719ea40edcc31e684 100644 (file)
--- a/ext/phar/tests/phar_convert_tar3.phpt
+++ b/ext/phar/tests/phar_convert_tar3.phpt
@@ -20,7 +20,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 $phar->convertToTar(Phar::BZ2);

diff --git a/ext/phar/tests/phar_convert_zip.phpt b/ext/phar/tests/phar_convert_zip.phpt
index 0f02ccb474391cd3293ca3451c0568a20b8a8a8e..ac88f860186b9f5b3d78eca1117af1fb41ddcbf9 100644 (file)
--- a/ext/phar/tests/phar_convert_zip.phpt
+++ b/ext/phar/tests/phar_convert_zip.phpt
@@ -19,7 +19,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 $phar->convertToZip();

diff --git a/ext/phar/tests/phar_ctx_001.phpt b/ext/phar/tests/phar_ctx_001.phpt
index 5296dc58b436a52846e78fae0c2ccb3e5062b809..13b4d6a7812161854c61104fc17c43d1ce6414aa 100644 (file)
--- a/ext/phar/tests/phar_ctx_001.phpt
+++ b/ext/phar/tests/phar_ctx_001.phpt
@@ -17,7 +17,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 

diff --git a/ext/phar/tests/phar_gzip.phpt b/ext/phar/tests/phar_gzip.phpt
index f521ec86e31da1c0a4801b5593059eb9c776ed54..e305c48367d60b2949642dc37805c001d88be616 100644 (file)
--- a/ext/phar/tests/phar_gzip.phpt
+++ b/ext/phar/tests/phar_gzip.phpt
@@ -28,7 +28,7 @@ $files['internal/dir/'] = '';
 $files['dir/'] = '';
 $gzip = true;
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 include $fname;
 

diff --git a/ext/phar/tests/phar_metadata_read.phpt b/ext/phar/tests/phar_metadata_read.phpt
index f86fa046d120781d9e2f57ec47526161b2812497..a4c7b323ba68c9fdc964ddf93f243da780f989a2 100644 (file)
--- a/ext/phar/tests/phar_metadata_read.phpt
+++ b/ext/phar/tests/phar_metadata_read.phpt
@@ -17,7 +17,7 @@ $files['a'] = array('cont' => 'a');
 $files['b'] = array('cont' => 'b');
 $files['c'] = array('cont' => 'c', 'meta' => array('hi', 'there'));
 $files['d'] = array('cont' => 'd', 'meta' => array('hi'=>'there','foo'=>'bar'));
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 foreach($files as $name => $cont) {
        var_dump(file_get_contents($pname.'/'.$name));

diff --git a/ext/phar/tests/phar_metadata_write.phpt b/ext/phar/tests/phar_metadata_write.phpt
index 593c2a0ad45389fc97d817901efb3d4ca7bdec1f..0a840ec93d739b5a6e69b1a81cef248c85e7bbb0 100644 (file)
--- a/ext/phar/tests/phar_metadata_write.phpt
+++ b/ext/phar/tests/phar_metadata_write.phpt
@@ -16,7 +16,7 @@ $files['a'] = array('cont' => 'a');
 $files['b'] = array('cont' => 'b', 'meta' => 'hi there');
 $files['c'] = array('cont' => 'c', 'meta' => array('hi', 'there'));
 $files['d'] = array('cont' => 'd', 'meta' => array('hi'=>'there','foo'=>'bar'));
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 foreach($files as $name => $cont) {
        var_dump(file_get_contents($pname.'/'.$name));

diff --git a/ext/phar/tests/phar_oo_001.phpt b/ext/phar/tests/phar_oo_001.phpt
index bb0f75820bc6ac57e113efe1607d8ad31752e426..b04ec4f4c19a3f95715be2629d957a67e2fd903d 100755 (executable)
--- a/ext/phar/tests/phar_oo_001.phpt
+++ b/ext/phar/tests/phar_oo_001.phpt
@@ -8,7 +8,7 @@ phar.require_hash=0
 --FILE--
 <?php
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 $phar = new Phar($fname);
 var_dump($phar->getVersion());

diff --git a/ext/phar/tests/phar_oo_002.phpt b/ext/phar/tests/phar_oo_002.phpt
index 3291884f691827d4be454656877035230d415713..9bb28689d9be1424bd517a3426289ddf296917f9 100755 (executable)
--- a/ext/phar/tests/phar_oo_002.phpt
+++ b/ext/phar/tests/phar_oo_002.phpt
@@ -9,7 +9,7 @@ phar.require_hash=0
 --FILE--
 <?php
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 $phar = new Phar($fname);
 $phar->setInfoClass('SplFileInfo');
@@ -47,11 +47,11 @@ foreach(new RecursiveIteratorIterator($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();
 ?>
 --EXPECTF--
-string(36) "phar://*/phar_oo_test.phar.php%ca.php"
+string(42) "phar://*/files/phar_oo_test.phar.php%ca.php"
 string(5) "a.php"
 int(32)
 string(4) "file"
@@ -64,7 +64,7 @@ bool(false)
 int(1141214400)
 int(1141214400)
 int(1141214400)
-string(32) "phar://*/phar_oo_test.phar.php%cb"
+string(38) "phar://*/files/phar_oo_test.phar.php%cb"
 string(1) "b"
 int(0)
 string(3) "dir"
@@ -77,7 +77,7 @@ bool(false)
 int(1141214400)
 int(1141214400)
 int(1141214400)
-string(36) "phar://*/phar_oo_test.phar.php%cb.php"
+string(42) "phar://*/files/phar_oo_test.phar.php%cb.php"
 string(5) "b.php"
 int(32)
 string(4) "file"
@@ -90,7 +90,7 @@ bool(false)
 int(1141214400)
 int(1141214400)
 int(1141214400)
-string(36) "phar://*/phar_oo_test.phar.php%ce.php"
+string(42) "phar://*/files/phar_oo_test.phar.php%ce.php"
 string(5) "e.php"
 int(32)
 string(4) "file"
@@ -104,31 +104,31 @@ int(1141214400)
 int(1141214400)
 int(1141214400)
 ==RECURSIVE==
-string(36) "phar://*/phar_oo_test.phar.php%ca.php"
+string(42) "phar://*/files/phar_oo_test.phar.php%ca.php"
 string(5) "a.php"
 int(32)
 bool(false)
 NULL
 int(0)
-string(38) "phar://*/phar_oo_test.phar.php%cb%cc.php"
+string(44) "phar://*/files/phar_oo_test.phar.php%cb%cc.php"
 string(5) "c.php"
 int(34)
 bool(false)
 NULL
 int(0)
-string(38) "phar://*/phar_oo_test.phar.php%cb%cd.php"
+string(44) "phar://*/files/phar_oo_test.phar.php%cb%cd.php"
 string(5) "d.php"
 int(34)
 bool(false)
 NULL
 int(0)
-string(36) "phar://*/phar_oo_test.phar.php%cb.php"
+string(42) "phar://*/files/phar_oo_test.phar.php%cb.php"
 string(5) "b.php"
 int(32)
 bool(false)
 NULL
 int(0)
-string(36) "phar://*/phar_oo_test.phar.php%ce.php"
+string(42) "phar://*/files/phar_oo_test.phar.php%ce.php"
 string(5) "e.php"
 int(32)
 bool(false)

diff --git a/ext/phar/tests/phar_oo_003.phpt b/ext/phar/tests/phar_oo_003.phpt
index bf301b648224bdd66cae1c2332249fce0ba976fc..d9d1061415755a5ddc59944d319650181d7c50d7 100755 (executable)
--- a/ext/phar/tests/phar_oo_003.phpt
+++ b/ext/phar/tests/phar_oo_003.phpt
@@ -8,7 +8,7 @@ phar.require_hash=0
 --FILE--
 <?php
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 $phar = new Phar($fname);
 $phar->setInfoClass();

diff --git a/ext/phar/tests/phar_oo_004.phpt b/ext/phar/tests/phar_oo_004.phpt
index b73e35d9a602aa3801eca0073eacc03191e1e92e..b2ad79bb4ece309c01b84f2304aae4883cfd10db 100755 (executable)
--- a/ext/phar/tests/phar_oo_004.phpt
+++ b/ext/phar/tests/phar_oo_004.phpt
@@ -8,7 +8,7 @@ phar.require_hash=0
 --FILE--
 <?php
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 $it = new DirectoryIterator('phar://'.$fname);
 

diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt
index b69d1997ec963bf5c9293902185f0cff6e3edec3..89cf108afa11b0d75409b77a96b91b1ed60c24c0 100755 (executable)
--- a/ext/phar/tests/phar_oo_005.phpt
+++ b/ext/phar/tests/phar_oo_005.phpt
@@ -8,7 +8,7 @@ phar.require_hash=0
 --FILE--
 <?php
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 $fname = str_replace('\\', '/', $fname);
 
 $it = new RecursiveDirectoryIterator('phar://'.$fname);

diff --git a/ext/phar/tests/phar_oo_006.phpt b/ext/phar/tests/phar_oo_006.phpt
index 488c4f9e5d4d8e5ec4a5cfde8e76ad312ca1fb74..5619663b3e576212aee2820526af819ac9ffeb58 100755 (executable)
--- a/ext/phar/tests/phar_oo_006.phpt
+++ b/ext/phar/tests/phar_oo_006.phpt
@@ -8,7 +8,7 @@ phar.require_hash=0
 --FILE--
 <?php
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 class MyFile extends SplFileObject
 {

diff --git a/ext/phar/tests/phar_oo_007.phpt b/ext/phar/tests/phar_oo_007.phpt
index 798cf26f247e00b43f5f62b66639749f4f228c64..48807660ff081792a9242078d783c6eec0797fd2 100755 (executable)
--- a/ext/phar/tests/phar_oo_007.phpt
+++ b/ext/phar/tests/phar_oo_007.phpt
@@ -8,7 +8,7 @@ phar.require_hash=0
 --FILE--
 <?php
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 class MyFile extends SplFileObject
 {
@@ -59,11 +59,11 @@ var_dump($f->eof());
 ===DONE===
 --CLEAN--
 <?php 
-unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
+unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--
-MyFile::__construct(phar://*/phar_oo_test.phar.php/a.php)
+MyFile::__construct(phar://*/files/phar_oo_test.phar.php/a.php)
 int(1141214400)
 int(1141214400)
 int(1141214400)
@@ -79,7 +79,7 @@ int(0)
 string(32) "<?php echo "This is a.php\n"; ?>"
 int(32)
 ===AGAIN===
-MyFile::__construct(phar://*/phar_oo_test.phar.php/a.php)
+MyFile::__construct(phar://*/files/phar_oo_test.phar.php/a.php)
 int(0)
 bool(false)
 string(32) "<?php echo "This is a.php\n"; ?>"

diff --git a/ext/phar/tests/phar_oo_008.phpt b/ext/phar/tests/phar_oo_008.phpt
index a45da580587da5d4e814c6f4235f0d27b915533d..45255b5677eded46e155a4dba07907f1244533a9 100755 (executable)
--- a/ext/phar/tests/phar_oo_008.phpt
+++ b/ext/phar/tests/phar_oo_008.phpt
@@ -10,7 +10,7 @@ phar.require_hash=0
 
 $pharconfig = 1;
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 $phar = new Phar($fname);
 $phar->setInfoClass('SplFileObject');

diff --git a/ext/phar/tests/phar_oo_009.phpt b/ext/phar/tests/phar_oo_009.phpt
index dbe4919da2319cc24622e078139b6267edc9df25..2528ec9f83e69a0391ee9894b91f7e32baae984e 100755 (executable)
--- a/ext/phar/tests/phar_oo_009.phpt
+++ b/ext/phar/tests/phar_oo_009.phpt
@@ -10,7 +10,7 @@ phar.require_hash=0
 
 $pharconfig = 2;
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 $phar = new Phar($fname);
 $phar->setInfoClass('SplFileObject');

diff --git a/ext/phar/tests/phar_oo_010.phpt b/ext/phar/tests/phar_oo_010.phpt
index 775e1cd9684d32e933f8b4cd322c66e8e17addc3..d9477e66c81108f47d859b646333b5b741a25c1d 100755 (executable)
--- a/ext/phar/tests/phar_oo_010.phpt
+++ b/ext/phar/tests/phar_oo_010.phpt
@@ -10,7 +10,7 @@ phar.require_hash=0
 
 $pharconfig = 0;
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 $phar = new Phar($fname);
 

diff --git a/ext/phar/tests/phar_oo_011.phpt b/ext/phar/tests/phar_oo_011.phpt
index bf523c713cb47d63c97fea8bce1a39ee3bf934ba..d7ff82e761186365f1252f7930177d05e6fee79e 100644 (file)
--- a/ext/phar/tests/phar_oo_011.phpt
+++ b/ext/phar/tests/phar_oo_011.phpt
@@ -11,7 +11,7 @@ phar.require_hash=0
 
 $pharconfig = 0;
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 $phar = new Phar($fname);
 $phar->setInfoClass('SplFileObject');

diff --git a/ext/phar/tests/phar_oo_011b.phpt b/ext/phar/tests/phar_oo_011b.phpt
index 7a1ced30977413eaacf6201b28dc1aa9c4d045ce..f8c8d2d080bbf04abae27e1d60a8820b242d70a0 100755 (executable)
--- a/ext/phar/tests/phar_oo_011b.phpt
+++ b/ext/phar/tests/phar_oo_011b.phpt
@@ -13,7 +13,7 @@ try
 {
        $pharconfig = 0;
        
-       require_once 'phar_oo_test.inc';
+       require_once 'files/phar_oo_test.inc';
        
        $phar = new Phar($fname);
        

diff --git a/ext/phar/tests/phar_oo_012.phpt b/ext/phar/tests/phar_oo_012.phpt
index 04c3b4bbfcfc57a954ae1b39fee20520ece6106e..1bde9225936c0b31f9cab4c17fa4d83b9b54884c 100644 (file)
--- a/ext/phar/tests/phar_oo_012.phpt
+++ b/ext/phar/tests/phar_oo_012.phpt
@@ -11,7 +11,7 @@ phar.require_hash=0
 
 $pharconfig = 0;
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 $phar = new Phar($fname);
 $phar->setInfoClass('SplFileObject');

diff --git a/ext/phar/tests/phar_oo_012_confirm.phpt b/ext/phar/tests/phar_oo_012_confirm.phpt
index 046b15c3b6fcd47fc502097e6523f78d0ccad242..be70ca5599950c68b6c3bfe181d64e639963b038 100644 (file)
--- a/ext/phar/tests/phar_oo_012_confirm.phpt
+++ b/ext/phar/tests/phar_oo_012_confirm.phpt
@@ -11,7 +11,7 @@ phar.require_hash=0
 
 $pharconfig = 0;
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 $phar = new Phar($fname);
 $phar->setInfoClass('SplFileObject');

diff --git a/ext/phar/tests/phar_oo_012b.phpt b/ext/phar/tests/phar_oo_012b.phpt
index eabe0aa87be51ee52b90875babe082b3a9a47742..669cbea420e85c7b8cfc39196f5f238ad2a0d8ce 100755 (executable)
--- a/ext/phar/tests/phar_oo_012b.phpt
+++ b/ext/phar/tests/phar_oo_012b.phpt
@@ -13,7 +13,7 @@ try
 {
        $pharconfig = 0;
 
-       require_once 'phar_oo_test.inc';
+       require_once 'files/phar_oo_test.inc';
        
        $phar = new Phar($fname);
        $phar->setInfoClass('SplFileObject');

diff --git a/ext/phar/tests/phar_oo_compressallbz2.phpt b/ext/phar/tests/phar_oo_compressallbz2.phpt
index c4350d08bd8137c13056c70ef0c0b14d3bb2dc97..40720ef174b770c64cc9c7a77c3c8be7cadac91f 100644 (file)
--- a/ext/phar/tests/phar_oo_compressallbz2.phpt
+++ b/ext/phar/tests/phar_oo_compressallbz2.phpt
@@ -17,7 +17,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 

diff --git a/ext/phar/tests/phar_oo_compressallgz.phpt b/ext/phar/tests/phar_oo_compressallgz.phpt
index ff09b4cd725f3d0e9ceb0e3961d627b96f847655..4a67bf64ed916363e79c7c93e68e27ac6bf1b624 100644 (file)
--- a/ext/phar/tests/phar_oo_compressallgz.phpt
+++ b/ext/phar/tests/phar_oo_compressallgz.phpt
@@ -17,7 +17,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 

diff --git a/ext/phar/tests/phar_oo_compressed_001.phpt b/ext/phar/tests/phar_oo_compressed_001.phpt
index 6edaa5ad58053f3ba2b7e24144dad53135424f88..b97a07c7d89ab7424c44d1ad1e9771504ff6faeb 100644 (file)
--- a/ext/phar/tests/phar_oo_compressed_001.phpt
+++ b/ext/phar/tests/phar_oo_compressed_001.phpt
@@ -17,7 +17,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 

diff --git a/ext/phar/tests/phar_oo_compressed_001b.phpt b/ext/phar/tests/phar_oo_compressed_001b.phpt
index aac5b616ed9b891ecb2e81477329c03fee09f8f3..78323357e2322e02de46ca33fafa3252eb194bcc 100755 (executable)
--- a/ext/phar/tests/phar_oo_compressed_001b.phpt
+++ b/ext/phar/tests/phar_oo_compressed_001b.phpt
@@ -17,7 +17,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 

diff --git a/ext/phar/tests/phar_oo_compressed_002.phpt b/ext/phar/tests/phar_oo_compressed_002.phpt
index ab079bd964a3d0f15bd17c8e27a3f3410beff733..d03d6f1a989418f079f599ef672e0792031d5ad0 100755 (executable)
--- a/ext/phar/tests/phar_oo_compressed_002.phpt
+++ b/ext/phar/tests/phar_oo_compressed_002.phpt
@@ -17,7 +17,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 

diff --git a/ext/phar/tests/phar_oo_compressed_002b.phpt b/ext/phar/tests/phar_oo_compressed_002b.phpt
index e5d346f1a1e9d0023124cac289f50c8d6d1d3fc7..0e167012b7681485861aa8608518ccc1155185a3 100755 (executable)
--- a/ext/phar/tests/phar_oo_compressed_002b.phpt
+++ b/ext/phar/tests/phar_oo_compressed_002b.phpt
@@ -17,7 +17,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 

diff --git a/ext/phar/tests/phar_oo_getmodified.phpt b/ext/phar/tests/phar_oo_getmodified.phpt
index 1bad7558f1b6b7b39d52c736a393f1b064241124..33cfc08e9229672e4b039d66c3776e1f102d307a 100644 (file)
--- a/ext/phar/tests/phar_oo_getmodified.phpt
+++ b/ext/phar/tests/phar_oo_getmodified.phpt
@@ -17,7 +17,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 var_dump($phar->getModified());

diff --git a/ext/phar/tests/phar_oo_nosig.phpt b/ext/phar/tests/phar_oo_nosig.phpt
index 38f8d5aaf4e69040bb5833cbee401e2c19fd5f39..fe4544b13f33b246d0f80508b5ffedca065d65b5 100644 (file)
--- a/ext/phar/tests/phar_oo_nosig.phpt
+++ b/ext/phar/tests/phar_oo_nosig.phpt
@@ -8,7 +8,7 @@ phar.require_hash=0
 --FILE--
 <?php
 
-require_once 'phar_oo_test.inc';
+require_once 'files/phar_oo_test.inc';
 
 $phar = new Phar($fname);
 var_dump($phar->getSignature());

diff --git a/ext/phar/tests/phar_oo_uncompressall.phpt b/ext/phar/tests/phar_oo_uncompressall.phpt
index c1e969e231aa66b6bb6957f5988f2c17c8b9d601..d2f2ca5420b97d7401b2ff6198a84c5b20ff0246 100644 (file)
--- a/ext/phar/tests/phar_oo_uncompressall.phpt
+++ b/ext/phar/tests/phar_oo_uncompressall.phpt
@@ -17,7 +17,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 

diff --git a/ext/phar/tests/phar_setalias.phpt b/ext/phar/tests/phar_setalias.phpt
index 5a5ac853a09bbf02f5fcc27900269c7ebe00e4ba..ef9fa283d5be58620e8829bb47d2781c55caea1a 100644 (file)
--- a/ext/phar/tests/phar_setalias.phpt
+++ b/ext/phar/tests/phar_setalias.phpt
@@ -16,7 +16,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 echo $phar->getAlias() . "\n";

diff --git a/ext/phar/tests/phar_setalias2.phpt b/ext/phar/tests/phar_setalias2.phpt
index 3cca4202031c7f6af6d2dedb44c5f4bad5eab6ef..b6679b893af4de2aa08475953cfc32fd5a62af02 100644 (file)
--- a/ext/phar/tests/phar_setalias2.phpt
+++ b/ext/phar/tests/phar_setalias2.phpt
@@ -16,7 +16,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 echo $phar->getAlias() . "\n";

diff --git a/ext/phar/tests/phar_stub.phpt b/ext/phar/tests/phar_stub.phpt
index 2aaa9a1fb5afd5aa41d60e9835ee31f3aa53ceab..40216e55f388794166f3f82176f292211ffad681 100644 (file)
--- a/ext/phar/tests/phar_stub.phpt
+++ b/ext/phar/tests/phar_stub.phpt
@@ -16,7 +16,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $file = '<?php echo "first stub\n"; __HALT_COMPILER(); ?>';
 $fp = fopen($fname, 'rb');

diff --git a/ext/phar/tests/phar_stub_error.phpt b/ext/phar/tests/phar_stub_error.phpt
index a9dddfd0adb1a9ee36423211c601523c43f2e7c3..99f313bc2ff92391fb9516eaa43bed0f4876cf07 100755 (executable)
--- a/ext/phar/tests/phar_stub_error.phpt
+++ b/ext/phar/tests/phar_stub_error.phpt
@@ -15,7 +15,7 @@ $file = $stub;
 $files = array();
 $files['a'] = 'a';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 var_dump($stub);

diff --git a/ext/phar/tests/phar_stub_write.phpt b/ext/phar/tests/phar_stub_write.phpt
index 5bc982f1ce207cd09c7efe79a6e3dbd6f3922cb1..9e5d6d56352d2b2a794f25b71bbe53456601e9f9 100755 (executable)
--- a/ext/phar/tests/phar_stub_write.phpt
+++ b/ext/phar/tests/phar_stub_write.phpt
@@ -17,7 +17,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 var_dump($stub);

diff --git a/ext/phar/tests/phar_stub_write_file.phpt b/ext/phar/tests/phar_stub_write_file.phpt
index 994cace74df6c6f61cda2a52c13643e578245240..c5a0a1eba90140172cd5b1c7997f16dde63a66fa 100755 (executable)
--- a/ext/phar/tests/phar_stub_write_file.phpt
+++ b/ext/phar/tests/phar_stub_write_file.phpt
@@ -18,7 +18,7 @@ $files['a'] = 'a';
 $files['b'] = 'b';
 $files['c'] = 'c';
 
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
 var_dump($stub);

diff --git a/ext/phar/tests/refcount1.phpt b/ext/phar/tests/refcount1.phpt
index ccd912713b1976679c2ddd2431a8fc537936963d..234d49111c3a8b3635ef124ee4630c428fcfb644 100644 (file)
--- a/ext/phar/tests/refcount1.phpt
+++ b/ext/phar/tests/refcount1.phpt
@@ -17,7 +17,7 @@ $files = array();
 $files['a.php'] = '<?php echo "This is a\n"; ?>';
 $files['b.php'] = '<?php echo "This is b\n"; ?>';
 $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $fp = fopen($pname . '/b/c.php', 'wb');
 fwrite($fp, "extra");

diff --git a/ext/phar/tests/refcount1_5_2.phpt b/ext/phar/tests/refcount1_5_2.phpt
index b70e25f5eeb838a081aaee552e1efe9eeb081670..78a626371d960b5eb37726d558f9b2af3d995bc2 100755 (executable)
--- a/ext/phar/tests/refcount1_5_2.phpt
+++ b/ext/phar/tests/refcount1_5_2.phpt
@@ -17,7 +17,7 @@ $files = array();
 $files['a.php'] = '<?php echo "This is a\n"; ?>';
 $files['b.php'] = '<?php echo "This is b\n"; ?>';
 $files['b/c.php'] = '<?php echo "This is b/c\n"; ?>';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 
 $fp = fopen($pname . '/b/c.php', 'wb');
 fwrite($fp, "extra");

diff --git a/ext/phar/tests/rename.phpt b/ext/phar/tests/rename.phpt
index 37ebf5f75b2f0878aa3e7784b66529c98977eb9f..c73c98ec816f4e6fbc0cff8541fd969a6ca6a3da 100644 (file)
--- a/ext/phar/tests/rename.phpt
+++ b/ext/phar/tests/rename.phpt
@@ -15,7 +15,7 @@ __HALT_COMPILER(); ?>";
 
 $files = array();
 $files['a'] = 'a';
-include 'phar_test.inc';
+include 'files/phar_test.inc';
 include $fname;
 
 echo file_get_contents($pname . '/a') . "\n";

diff --git a/ext/phar/tests/test_signaturealgos.phpt b/ext/phar/tests/test_signaturealgos.phpt
index 5a0e89f611324c927d87d15ae12c7aba6c57a9ea..d7f1866e37145d297df40514468acda9eaac429b 100644 (file)
--- a/ext/phar/tests/test_signaturealgos.phpt
+++ b/ext/phar/tests/test_signaturealgos.phpt
@@ -8,16 +8,16 @@ phar.require_hash=0
 phar.readonly=0
 --FILE--
 <?php
-$a = new Phar('sha1.phar');
+$a = new Phar('files/sha1.phar');
 $r = $a->getSignature();
 var_dump($r['hash_type']);
-$a = new Phar('sha512.phar');
+$a = new Phar('files/sha512.phar');
 $r = $a->getSignature();
 var_dump($r['hash_type']);
-$a = new Phar('sha256.phar');
+$a = new Phar('files/sha256.phar');
 $r = $a->getSignature();
 var_dump($r['hash_type']);
-$a = new Phar('md5.phar');
+$a = new Phar('files/md5.phar');
 $r = $a->getSignature();
 var_dump($r['hash_type']);
 ?>

diff --git a/ext/phar/tests/withphar.phpt b/ext/phar/tests/withphar.phpt
index b4c95e86c1c2627159c237ab970c5cee79937a81..c422fa9843a651be0d128f0237eb2f2cb74fc750 100644 (file)
--- a/ext/phar/tests/withphar.phpt
+++ b/ext/phar/tests/withphar.phpt
@@ -4,7 +4,7 @@ Phar: phar run with pecl/phar with default stub
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --FILE--
 <?php
-include dirname(__FILE__) . '/nophar.phar';
+include dirname(__FILE__) . '/files/nophar.phar';
 ?>
 ===DONE===
 --EXPECT--

diff --git a/ext/phar/tests/withphar_web.phpt b/ext/phar/tests/withphar_web.phpt
index 68b0241dd93dc79bd1eabf5015ea5564bd6e4acb..45acf13d7fb61980da4ae1d4d576e21732f8748d 100644 (file)
--- a/ext/phar/tests/withphar_web.phpt
+++ b/ext/phar/tests/withphar_web.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/withphar_web.php
 REQUEST_URI=/withphar_web.php/web.php
 PATH_INFO=/web.php
 --FILE_EXTERNAL--
-nophar.phar
+files/nophar.phar
 --EXPECTHEADERS--
 Content-type: text/html
 --EXPECT--

diff --git a/ext/phar/tests/zf_test.phpt b/ext/phar/tests/zf_test.phpt
index 7435f34d51910f53c32ac3300d6dd87058d6ba9e..fa898c9a5733566687bb11355a92c4182cfca079 100644 (file)
--- a/ext/phar/tests/zf_test.phpt
+++ b/ext/phar/tests/zf_test.phpt
@@ -8,7 +8,7 @@ phar.readonly=0
 <?php
 
 $file = "zfapp";
-$tgz_file = dirname(__FILE__) . "/$file.tgz";
+$tgz_file = dirname(__FILE__) . "/files/$file.tgz";
 chdir(dirname(__FILE__));
 
 $phar_file = basename(__FILE__, '.php') . '.phar';