add option to disable shutdown message, move globals to config

Author: simonLeary42

defaults/config.ini.default

@@ -13,6 +13,9 @@ description = "The Unity Web Portal is a lightweight HPC cluster front-end"  ; D
 logo = "logo.png"  ; path to logo file, in the webroot/assets/branding folder
 terms_of_service_url = "https://github.com" ; this can be external or a portal page created with "content management"
 account_policy_url = "https://github.com" ; this can be external or a portal page created with "content management"
+allow_die = true ; internal use only
+enable_verbose_error_log = true ; internal use only
+enable_shutdown_msg = true ; internal use only
 
 [ldap]
 uri = "ldap://identity"  ; URI of remote LDAP server

deployment/overrides/phpunit/config/config.ini

@@ -1,2 +1,7 @@
 [ldap]
 custom_user_mappings_dir = "test/custom_user_mappings"
+
+[site]
+allow_die = false
+enable_verbose_error_log = false
+enable_shutdown_message = false

resources/lib/UnityConfig.php

@@ -6,7 +6,7 @@ class UnityConfig
 {
     public static function getConfig($def_config_loc, $deploy_loc)
     {
-        $CONFIG = parse_ini_file($def_config_loc . "/config.ini.default", true);
+        $CONFIG = parse_ini_file($def_config_loc . "/config.ini.default", true, INI_SCANNER_TYPED);
         $CONFIG = self::pullConfig($CONFIG, $deploy_loc);
         if (array_key_exists("HTTP_HOST", $_SERVER)) {
             $cur_url = $_SERVER['HTTP_HOST'];
@@ -22,7 +22,7 @@ private static function pullConfig($CONFIG, $loc)
     {
         $file_loc = $loc . "/config/config.ini";
         if (file_exists(($file_loc))) {
-            $CONFIG_override = parse_ini_file($file_loc, true);
+            $CONFIG_override = parse_ini_file($file_loc, true, INI_SCANNER_TYPED);
             return array_replace_recursive($CONFIG, $CONFIG_override);
         } else {
             return $CONFIG;

resources/lib/UnitySite.php

@@ -9,7 +9,7 @@ class UnitySite
 {
     public static function die($x = null, $show_user = false)
     {
-        if (isset($GLOBALS["PHPUNIT_NO_DIE_PLEASE"]) && $GLOBALS["PHPUNIT_NO_DIE_PLEASE"] == true) {
+        if (CONFIG["site"]["allow_die"] == false) {
             if (is_null($x)) {
                 throw new PhpUnitNoDieException();
             } else {
@@ -39,7 +39,7 @@ private static function headerResponseCode(int $code, string $reason)
 
     public static function errorLog(string $title, string $message)
     {
-        if (@$GLOBALS["PHPUNIT_SIMPLE_ERROR_LOG_PLEASE"] == true) {
+        if (CONFIG["site"]["enable_verbose_error_log"] == false) {
             error_log("$title: $message");
             return;
         }
@@ -74,6 +74,9 @@ public static function forbidden($message)
     // https://www.php.net/manual/en/function.register-shutdown-function.php
     public static function shutdown()
     {
+        if (CONFIG["site"]["enable_shutdown_msg"] == false) {
+            return;
+        }
         if (!is_null($e = error_get_last())) {
             if (!headers_sent()) {
                 self::headerResponseCode(500, "internal server error");

test/phpunit-bootstrap.php

@@ -1,7 +1,4 @@
 <?php
-
-require_once __DIR__ . "/../vendor/autoload.php";
-
 // submodule
 require_once __DIR__ . "/../resources/lib/phpopenldaper/src/PHPOpenLDAPer/LDAPEntry.php";
 require_once __DIR__ . "/../resources/lib/phpopenldaper/src/PHPOpenLDAPer/LDAPConn.php";
@@ -14,14 +11,15 @@
 require_once __DIR__ . "/../resources/lib/UnityMailer.php";
 require_once __DIR__ . "/../resources/lib/UnitySSO.php";
 require_once __DIR__ . "/../resources/lib/UnitySite.php";
+require_once __DIR__ . "/../resources/lib/UnityConfig.php";
 require_once __DIR__ . "/../resources/lib/UnityWebhook.php";
 require_once __DIR__ . "/../resources/lib/UnityRedis.php";
 require_once __DIR__ . "/../resources/lib/UnityGithub.php";
 require_once __DIR__ . "/../resources/lib/exceptions/PhpUnitNoDieException.php";
 require_once __DIR__ . "/../resources/lib/exceptions/SSOException.php";
 
-$GLOBALS["PHPUNIT_NO_DIE_PLEASE"] = true;
-$GLOBALS["PHPUNIT_SIMPLE_ERROR_LOG_PLEASE"] = true;
+$_SERVER["HTTP_HOST"] = "phpunit"; // used for config override
+require_once __DIR__ .  "/../resources/config.php";
 
 global $HTTP_HEADER_TEST_INPUTS;
 $HTTP_HEADER_TEST_INPUTS = [