Update cache_list tests

TODO: It seems like one needs to copy the files from ext/phar/tests/files/ to ext/phar/tests/cache_list/files/ and that they were out of sync

Author: Girgias

ext/phar/tests/cache_list/files/frontcontroller10.phar

@@ -12,8 +12,12 @@ var_dump($_SERVER["PHAR_SCRIPT_FILENAME"]);
 var_dump($_SERVER["PHAR_REQUEST_URI"]);
 ';
 $a->setStub('<?php
-Phar::mungServer(array("PHP_SELF", "SCRIPT_NAME", "SCRIPT_FILENAME", "REQUEST_URI", "OOPSIE"));
-Phar::webPhar();
+try {
+	Phar::mungServer(array("PHP_SELF", "SCRIPT_NAME", "SCRIPT_FILENAME", "REQUEST_URI", "OOPSIE"));
+	Phar::webPhar();
+} catch (Throwable $e) {
+	die($e::class . ": " . $e->getMessage() . "\n");
+}
 echo "oops did not run\n";
 var_dump($_ENV, $_SERVER);
 __HALT_COMPILER();');

ext/phar/tests/cache_list/files/frontcontroller10.phar.inc

@@ -12,8 +12,12 @@ var_dump($_SERVER["PHAR_SCRIPT_FILENAME"]);
 var_dump($_SERVER["PHAR_REQUEST_URI"]);
 ';
 $a->setStub('<?php
-Phar::mungServer(array(array(), "SCRIPT_NAME", "SCRIPT_FILENAME", "REQUEST_URI"));
-Phar::webPhar();
+try {
+	Phar::mungServer(array(array(), "SCRIPT_NAME", "SCRIPT_FILENAME", "REQUEST_URI"));
+	Phar::webPhar();
+} catch (Throwable $e) {
+	die($e::class . ": " . $e->getMessage() . "\n");
+}
 echo "oops did not run\n";
 var_dump($_ENV, $_SERVER);
 __HALT_COMPILER();');

ext/phar/tests/cache_list/files/frontcontroller11.phar

@@ -12,8 +12,12 @@ var_dump($_SERVER["PHAR_SCRIPT_FILENAME"]);
 var_dump($_SERVER["PHAR_REQUEST_URI"]);
 ';
 $a->setStub('<?php
-Phar::mungServer(array("PHP_SELF", "SCRIPT_NAME", "SCRIPT_FILENAME", "REQUEST_URI"));
-Phar::webPhar();
+try {
+	Phar::mungServer(array("PHP_SELF", "SCRIPT_NAME", "SCRIPT_FILENAME", "REQUEST_URI"));
+	Phar::webPhar();
+} catch (Throwable $e) {
+	die($e::class . ": " . $e->getMessage() . "\n");
+}
 echo "oops did not run\n";
 var_dump($_ENV, $_SERVER);
 __HALT_COMPILER();');

ext/phar/tests/cache_list/files/frontcontroller11.phar.inc

@@ -10,9 +10,13 @@ function s($a)
 {
     return "/html/index.php";
 }
-Phar::interceptFileFuncs();
-Phar::mungServer(array("PHP_SELF", "REQUEST_URI"));
-Phar::webPhar("whatever", "/html/index.php", null, array(), "s");
+try {
+    Phar::interceptFileFuncs();
+    Phar::mungServer(array("PHP_SELF", "REQUEST_URI"));
+    Phar::webPhar("whatever", "/html/index.php", null, array(), "s");
+} catch (Throwable $e) {
+    die($e::class . ": " . $e->getMessage() . "\n");
+}
 echo "oops did not run\n";
 var_dump($_ENV, $_SERVER);
 __HALT_COMPILER();');

ext/phar/tests/cache_list/files/frontcontroller12.phar

@@ -6,9 +6,9 @@ echo "hi";
 ';
 $a->setStub('<?php
 try {
-Phar::webPhar("test.phar", "/index.php", null, array(), array("fail", "here"));
-} catch (TypeError|Exception $e) {
-die($e->getMessage() . "\n");
+	Phar::webPhar("test.phar", "/index.php", null, array(), array("fail", "here"));
+} catch (Throwable $e) {
+	die($e::class . ": " . $e->getMessage() . "\n");
 }
 echo "oops did not run\n";
 var_dump($_ENV, $_SERVER);