Move supporting files to their own directory (toplevel tests)

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');

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');
 ?>

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');
 ?>

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');
 ?>

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');
 ?>

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'));
 ?>

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'));

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');
 ?>

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');

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/');

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))) {

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)

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)

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'));

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;
 

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;
 

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'));

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';

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';

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';
 

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)
 {

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');
 

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);
 

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);
 

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);
 

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);

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);

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());

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);
 

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';

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';

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';

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===

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

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

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--

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--

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--

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

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--

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--

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

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:

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:

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--

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:

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--

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--

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--

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

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

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--

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

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--

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--

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));

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));

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));

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--

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

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');

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";

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');

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');