From: Steph Fox Date: Mon, 11 Feb 2008 21:05:47 +0000 (+0000) Subject: There's a difference between 'BORKED' and 'FAILED'... X-Git-Tag: RELEASE_2_0_0a1~523 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1ed2e8059d55d23eb45af28ece095b3e2015514;p=php 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 9caef7572f..0a6847885d 100644 --- 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 76c2ca2c04..ffe23bc08e 100644 --- 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 8c63e6b7dd..fd3fc24ff2 100644 --- 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 60a2f8ef24..6dc8471001 100644 --- 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 20fa512f56..f80c464352 100644 --- 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 06ced558c4..1caa85bc07 100644 --- 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 64fb212cff..89adc0a106 100644 --- 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 366e57501b..e27faf3931 100644 --- 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 6dca6132f1..f85bec2911 100644 --- 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 d5f6735728..407c8a7780 100644 --- 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 5ad74530a1..dd8b057172 100644 --- 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 3a2c5bc9cb..0e101f6d41 100644 --- 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 c19052b192..ec59a3add8 100644 --- 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 e1d8ea2fdf..d31b730ab8 100644 --- 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 4f3ed2fb0b..abe33bb502 100644 --- 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 0a6e39e2c0..6c03620c1c 100644 --- 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 b3b04a09ee..9597a1c14c 100644 --- 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 a1c8adfef0..1da20e96d7 100644 --- 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 0cc9671f41..d13cf33c16 100644 --- 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 08ee754485..1b0d133bc7 100644 --- 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 6c116e2955..8c550539fc 100644 --- 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--