diff options
148 files changed, 129 insertions, 129 deletions
diff --git a/ext/phar/tests/011.phpt b/ext/phar/tests/011.phpt index 1c6f4d0f14..4a1f0dd42c 100644 --- 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 d6b5ada95e..f6f81f5142 100644 --- 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 9e89577379..ae3ae72936 100644 --- 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 84f482a70b..d08e6550b6 100644 --- 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 cb44c54f77..b93b77e9fb 100644 --- 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 c1664acd9e..08ead2d9c0 100755 --- 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 44e4b73062..302d06d3cb 100644 --- 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 31b7f84ff8..8fe66826d6 100755 --- 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 3f7110e125..cc585d870f 100644 --- 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 361a1285ef..97cd323779 100644 --- 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 7bf062e862..3d00b5f8e9 100644 --- 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 67faf0dc6e..574919b793 100755 --- 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 f896cb1720..242b666871 100755 --- 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 0511c9de13..b06cdbf731 100644 --- 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 1574b1c439..9c9cd97568 100644 --- 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 fdb26a5615..20c24a0214 100644 --- 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 ee5dfc6ab7..808f91deae 100755 --- 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 716749859f..ad30d2644d 100755 --- 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 401ab52b30..bbb5bc4e83 100755 --- 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 224ca9f04c..696fbcf415 100755 --- 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 b4f44d77a6..28174c8e76 100755 --- 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 085d29607a..a42e17470e 100755 --- 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 966fe1c6b7..5302fdb804 100755 --- 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 d9dee01f65..afaeb1a802 100755 --- 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 54a44e401f..560d461129 100755 --- 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 2db715dbb0..f41f88203b 100755 --- 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 c57e4dbead..d53c7f52fa 100644 --- 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 6fbc0db365..e8725bdda6 100644 --- 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 b11580b882..1d98509064 100644 --- 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 f944bc8961..4842d27913 100644 --- 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 55a5acb1cf..d26f51cbf1 100755 --- 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 e24f273ee9..13a8d0db29 100644 --- 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 d11a3fc616..07faae527a 100755 --- 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 index a6e52246a3..a6e52246a3 100755..100644 --- a/ext/phar/tests/extracted.inc +++ b/ext/phar/tests/files/extracted.inc diff --git a/ext/phar/tests/frontcontroller.phar b/ext/phar/tests/files/frontcontroller.phar Binary files differindex 626bf48acf..626bf48acf 100644 --- a/ext/phar/tests/frontcontroller.phar +++ b/ext/phar/tests/files/frontcontroller.phar diff --git a/ext/phar/tests/frontcontroller.phar.inc b/ext/phar/tests/files/frontcontroller.phar.inc index 80d42e886b..80d42e886b 100644 --- a/ext/phar/tests/frontcontroller.phar.inc +++ b/ext/phar/tests/files/frontcontroller.phar.inc diff --git a/ext/phar/tests/frontcontroller10.phar b/ext/phar/tests/files/frontcontroller10.phar Binary files differindex 078ce75b2c..078ce75b2c 100644 --- a/ext/phar/tests/frontcontroller10.phar +++ b/ext/phar/tests/files/frontcontroller10.phar diff --git a/ext/phar/tests/frontcontroller10.phar.inc b/ext/phar/tests/files/frontcontroller10.phar.inc index 4c139db58b..4c139db58b 100644 --- a/ext/phar/tests/frontcontroller10.phar.inc +++ b/ext/phar/tests/files/frontcontroller10.phar.inc diff --git a/ext/phar/tests/frontcontroller11.phar b/ext/phar/tests/files/frontcontroller11.phar Binary files differindex 61ea843222..61ea843222 100644 --- a/ext/phar/tests/frontcontroller11.phar +++ b/ext/phar/tests/files/frontcontroller11.phar diff --git a/ext/phar/tests/frontcontroller11.phar.inc b/ext/phar/tests/files/frontcontroller11.phar.inc index 086350800b..086350800b 100644 --- a/ext/phar/tests/frontcontroller11.phar.inc +++ b/ext/phar/tests/files/frontcontroller11.phar.inc diff --git a/ext/phar/tests/frontcontroller12.phar b/ext/phar/tests/files/frontcontroller12.phar Binary files differindex 9e45587610..9e45587610 100644 --- a/ext/phar/tests/frontcontroller12.phar +++ b/ext/phar/tests/files/frontcontroller12.phar diff --git a/ext/phar/tests/frontcontroller12.phar.inc b/ext/phar/tests/files/frontcontroller12.phar.inc index ba17df37e1..ba17df37e1 100644 --- a/ext/phar/tests/frontcontroller12.phar.inc +++ b/ext/phar/tests/files/frontcontroller12.phar.inc diff --git a/ext/phar/tests/frontcontroller13.phar b/ext/phar/tests/files/frontcontroller13.phar Binary files differindex 2434b1e32d..2434b1e32d 100644 --- a/ext/phar/tests/frontcontroller13.phar +++ b/ext/phar/tests/files/frontcontroller13.phar diff --git a/ext/phar/tests/frontcontroller13.phar.inc b/ext/phar/tests/files/frontcontroller13.phar.inc index 0bfef46853..0bfef46853 100644 --- a/ext/phar/tests/frontcontroller13.phar.inc +++ b/ext/phar/tests/files/frontcontroller13.phar.inc diff --git a/ext/phar/tests/frontcontroller2.phar b/ext/phar/tests/files/frontcontroller2.phar Binary files differindex 0dd0e7f695..0dd0e7f695 100644 --- a/ext/phar/tests/frontcontroller2.phar +++ b/ext/phar/tests/files/frontcontroller2.phar diff --git a/ext/phar/tests/frontcontroller2.phar.inc b/ext/phar/tests/files/frontcontroller2.phar.inc index 653c79691d..653c79691d 100644 --- a/ext/phar/tests/frontcontroller2.phar.inc +++ b/ext/phar/tests/files/frontcontroller2.phar.inc diff --git a/ext/phar/tests/frontcontroller3.phar b/ext/phar/tests/files/frontcontroller3.phar Binary files differindex afcf03af35..afcf03af35 100644 --- a/ext/phar/tests/frontcontroller3.phar +++ b/ext/phar/tests/files/frontcontroller3.phar diff --git a/ext/phar/tests/frontcontroller3.phar.inc b/ext/phar/tests/files/frontcontroller3.phar.inc index 2759d9ee45..2759d9ee45 100644 --- a/ext/phar/tests/frontcontroller3.phar.inc +++ b/ext/phar/tests/files/frontcontroller3.phar.inc diff --git a/ext/phar/tests/frontcontroller4.phar b/ext/phar/tests/files/frontcontroller4.phar Binary files differindex 4c9a92a197..4c9a92a197 100644 --- a/ext/phar/tests/frontcontroller4.phar +++ b/ext/phar/tests/files/frontcontroller4.phar diff --git a/ext/phar/tests/frontcontroller4.phar.inc b/ext/phar/tests/files/frontcontroller4.phar.inc index 5c6a43f954..5c6a43f954 100644 --- a/ext/phar/tests/frontcontroller4.phar.inc +++ b/ext/phar/tests/files/frontcontroller4.phar.inc diff --git a/ext/phar/tests/frontcontroller5.phar b/ext/phar/tests/files/frontcontroller5.phar Binary files differindex f206b5996d..f206b5996d 100644 --- a/ext/phar/tests/frontcontroller5.phar +++ b/ext/phar/tests/files/frontcontroller5.phar diff --git a/ext/phar/tests/frontcontroller5.phar.inc b/ext/phar/tests/files/frontcontroller5.phar.inc index d2d810c367..d2d810c367 100644 --- a/ext/phar/tests/frontcontroller5.phar.inc +++ b/ext/phar/tests/files/frontcontroller5.phar.inc diff --git a/ext/phar/tests/frontcontroller6.phar b/ext/phar/tests/files/frontcontroller6.phar Binary files differindex e3b6bb86a1..e3b6bb86a1 100644 --- a/ext/phar/tests/frontcontroller6.phar +++ b/ext/phar/tests/files/frontcontroller6.phar diff --git a/ext/phar/tests/frontcontroller6.phar.inc b/ext/phar/tests/files/frontcontroller6.phar.inc index 5c900eb603..5c900eb603 100644 --- a/ext/phar/tests/frontcontroller6.phar.inc +++ b/ext/phar/tests/files/frontcontroller6.phar.inc diff --git a/ext/phar/tests/frontcontroller7.phar b/ext/phar/tests/files/frontcontroller7.phar Binary files differindex 79672809b4..79672809b4 100644 --- a/ext/phar/tests/frontcontroller7.phar +++ b/ext/phar/tests/files/frontcontroller7.phar diff --git a/ext/phar/tests/frontcontroller7.phar.inc b/ext/phar/tests/files/frontcontroller7.phar.inc index 684970263e..684970263e 100644 --- a/ext/phar/tests/frontcontroller7.phar.inc +++ b/ext/phar/tests/files/frontcontroller7.phar.inc diff --git a/ext/phar/tests/frontcontroller8.phar b/ext/phar/tests/files/frontcontroller8.phar Binary files differindex 213fe35d4d..213fe35d4d 100644 --- a/ext/phar/tests/frontcontroller8.phar +++ b/ext/phar/tests/files/frontcontroller8.phar diff --git a/ext/phar/tests/frontcontroller8.phar.inc b/ext/phar/tests/files/frontcontroller8.phar.inc index ccedb46e34..ccedb46e34 100644 --- a/ext/phar/tests/frontcontroller8.phar.inc +++ b/ext/phar/tests/files/frontcontroller8.phar.inc diff --git a/ext/phar/tests/frontcontroller9.phar b/ext/phar/tests/files/frontcontroller9.phar Binary files differindex d84b11b875..d84b11b875 100644 --- a/ext/phar/tests/frontcontroller9.phar +++ b/ext/phar/tests/files/frontcontroller9.phar diff --git a/ext/phar/tests/frontcontroller9.phar.inc b/ext/phar/tests/files/frontcontroller9.phar.inc index 00861f6420..00861f6420 100644 --- a/ext/phar/tests/frontcontroller9.phar.inc +++ b/ext/phar/tests/files/frontcontroller9.phar.inc diff --git a/ext/phar/tests/md5.phar b/ext/phar/tests/files/md5.phar Binary files differindex 8ca2f84dac..8ca2f84dac 100644 --- a/ext/phar/tests/md5.phar +++ b/ext/phar/tests/files/md5.phar diff --git a/ext/phar/tests/nophar.phar b/ext/phar/tests/files/nophar.phar Binary files differindex 3672e4f262..3672e4f262 100644 --- a/ext/phar/tests/nophar.phar +++ b/ext/phar/tests/files/nophar.phar diff --git a/ext/phar/tests/nophar.phar.inc b/ext/phar/tests/files/nophar.phar.inc index 36d5628762..36d5628762 100644 --- a/ext/phar/tests/nophar.phar.inc +++ b/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 index 9863e8da93..9863e8da93 100755..100644 --- a/ext/phar/tests/phar_oo_test.inc +++ b/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 index 7c4e9707b9..7c4e9707b9 100755..100644 --- a/ext/phar/tests/phar_test.inc +++ b/ext/phar/tests/files/phar_test.inc diff --git a/ext/phar/tests/sha1.phar b/ext/phar/tests/files/sha1.phar Binary files differindex c7e9e7e6a2..c7e9e7e6a2 100644 --- a/ext/phar/tests/sha1.phar +++ b/ext/phar/tests/files/sha1.phar diff --git a/ext/phar/tests/sha256.phar b/ext/phar/tests/files/sha256.phar Binary files differindex 81459eef0f..81459eef0f 100644 --- a/ext/phar/tests/sha256.phar +++ b/ext/phar/tests/files/sha256.phar diff --git a/ext/phar/tests/sha512.phar b/ext/phar/tests/files/sha512.phar Binary files differindex a7473819aa..a7473819aa 100644 --- a/ext/phar/tests/sha512.phar +++ b/ext/phar/tests/files/sha512.phar diff --git a/ext/phar/tests/zfapp.tgz b/ext/phar/tests/files/zfapp.tgz Binary files differindex fcaec86d65..fcaec86d65 100644 --- a/ext/phar/tests/zfapp.tgz +++ b/ext/phar/tests/files/zfapp.tgz diff --git a/ext/phar/tests/frontcontroller1.phpt b/ext/phar/tests/frontcontroller1.phpt index b925c637ea..7093323617 100644 --- 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 1682124867..2dbf1cbed8 100644 --- 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 d1e8893eb3..14681c81f3 100644 --- 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 0eb0ef7e1f..76ef63ca6e 100644 --- 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 07ec55b0c7..267c73263b 100644 --- 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 508efc8cd0..2bdb145c6e 100644 --- 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 fb75199ec4..eb69ede8f5 100644 --- 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 81210ac2eb..5c6a03e16a 100644 --- 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 e89c9e08e3..233e2e2a49 100644 --- 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 4c50afb5fc..590bd3676e 100644 --- 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 d01cf1e31e..80305c8a10 100644 --- 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 aed4afff42..4b1652c461 100644 --- 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 d55d8a14e1..b650694bb8 100644 --- 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 cfed28a98f..70d3508496 100644 --- 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 7bbebc0b19..9925ba16d3 100644 --- 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 c85bfc635f..1b8093542f 100644 --- 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 d25b2fc005..f2482b9219 100644 --- 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 1265c771c9..1990a2b008 100644 --- 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 8e5d87a1be..1a2cc2cd23 100644 --- 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 28a82c6186..aff2087522 100644 --- 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 088c7f9d8c..36e3206d66 100644 --- 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 877a71e74e..b7af364853 100644 --- 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 2b04b679b7..c3d12d6fbd 100644 --- 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 cde2124c05..4b9930b693 100755 --- 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 e097bb0e49..0d0a5e56ad 100755 --- 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 2b7af7ac63..59671557e7 100644 --- 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 c65a35c569..397dd161b2 100644 --- 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 e333f25d2a..e9e2c05b9e 100644 --- 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 67674ba3a8..6c3cd3e986 100755 --- 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 08eb1fd167..9bbaaae92a 100755 --- 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 39d7d566c6..13114072da 100644 --- 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 7c45291903..1c136ff1d5 100755 --- 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 e06c6496d8..59b4339eb9 100755 --- 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 fd7c664734..b681849c25 100644 --- 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 7eabb08100..9651f44e63 100644 --- 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 48f3e1b565..6b6c0cc1dd 100644 --- 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 1623cec0f8..2bdf621fc2 100644 --- 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 0f02ccb474..ac88f86018 100644 --- 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 5296dc58b4..13b4d6a781 100644 --- 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 f521ec86e3..e305c48367 100644 --- 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 f86fa046d1..a4c7b323ba 100644 --- 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 593c2a0ad4..0a840ec93d 100644 --- 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 bb0f75820b..b04ec4f4c1 100755 --- 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 3291884f69..9bb28689d9 100755 --- 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 bf301b6482..d9d1061415 100755 --- 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 b73e35d9a6..b2ad79bb4e 100755 --- 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 b69d1997ec..89cf108afa 100755 --- 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 488c4f9e5d..5619663b3e 100755 --- 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 798cf26f24..48807660ff 100755 --- 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 a45da58058..45255b5677 100755 --- 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 dbe4919da2..2528ec9f83 100755 --- 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 775e1cd968..d9477e66c8 100755 --- 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 bf523c713c..d7ff82e761 100644 --- 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 7a1ced3097..f8c8d2d080 100755 --- 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 04c3b4bbfc..1bde922593 100644 --- 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 046b15c3b6..be70ca5599 100644 --- 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 eabe0aa87b..669cbea420 100755 --- 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 c4350d08bd..40720ef174 100644 --- 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 ff09b4cd72..4a67bf64ed 100644 --- 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 6edaa5ad58..b97a07c7d8 100644 --- 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 aac5b616ed..78323357e2 100755 --- 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 ab079bd964..d03d6f1a98 100755 --- 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 e5d346f1a1..0e167012b7 100755 --- 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 1bad7558f1..33cfc08e92 100644 --- 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 38f8d5aaf4..fe4544b13f 100644 --- 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 c1e969e231..d2f2ca5420 100644 --- 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 5a5ac853a0..ef9fa283d5 100644 --- 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 3cca420203..b6679b893a 100644 --- 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 2aaa9a1fb5..40216e55f3 100644 --- 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 a9dddfd0ad..99f313bc2f 100755 --- 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 5bc982f1ce..9e5d6d5635 100755 --- 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 994cace74d..c5a0a1eba9 100755 --- 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 ccd912713b..234d49111c 100644 --- 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 b70e25f5ee..78a626371d 100755 --- 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 37ebf5f75b..c73c98ec81 100644 --- 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 5a0e89f611..d7f1866e37 100644 --- 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 b4c95e86c1..c422fa9843 100644 --- 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 68b0241dd9..45acf13d7f 100644 --- 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 7435f34d51..fa898c9a57 100644 --- 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'; |