There's a difference between 'BORKED' and 'FAILED'...

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

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

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

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

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

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

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

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

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

diff --git a/ext/phar/tests/zip/frontcontroller18.phar.phpt b/ext/phar/tests/zip/frontcontroller18.phar.phpt
index d5f673572837dab4b9199e239707706e07934b90..407c8a7780b231fc8b2da0733c6f86476dcb2231 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller18.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller18.phar.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller18.phar.php
 REQUEST_URI=/frontcontroller18.phar.php/fronk.gronk
 PATH_INFO=/fronk.gronk
 --FILE_EXTERNAL--
-frontcontroller9.phar.zip
+files/frontcontroller9.phar.zip
 --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.phar.php:2
 Stack trace:

diff --git a/ext/phar/tests/zip/frontcontroller19.phar.phpt b/ext/phar/tests/zip/frontcontroller19.phar.phpt
index 5ad74530a1afcb24a62f1366d1400106fbd385a8..dd8b0571723e22356dac81894f3dbbc6d31b03ef 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller19.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller19.phar.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller19.phar.php
 REQUEST_URI=/frontcontroller19.phar.php/
 PATH_INFO=/
 --FILE_EXTERNAL--
-frontcontroller10.phar.zip
+files/frontcontroller10.phar.zip
 --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.phar.php:2
 Stack trace:

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

diff --git a/ext/phar/tests/zip/frontcontroller20.phar.phpt b/ext/phar/tests/zip/frontcontroller20.phar.phpt
index c19052b192a825f2d53aee61191d3254239f878f..ec59a3add82d7cdab46f3dce5243295ff4b9993f 100644 (file)
--- a/ext/phar/tests/zip/frontcontroller20.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller20.phar.phpt
@@ -7,7 +7,7 @@ SCRIPT_NAME=/frontcontroller20.phar.php
 REQUEST_URI=/frontcontroller20.phar.php/
 PATH_INFO=/
 --FILE_EXTERNAL--
-frontcontroller11.phar.zip
+files/frontcontroller11.phar.zip
 --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.phar.php:2
 Stack trace:

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

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

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

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

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

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

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

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