replace die with redirectexception

simonLeary42 · simonLeary42 · commit e99461f95c0e · 2025-04-25T11:17:26.000-04:00
diff --git a/resources/autoload.php b/resources/autoload.php
@@ -20,6 +20,7 @@
 require_once __DIR__ . "/lib/UnityWebhook.php";
 require_once __DIR__ . "/lib/UnityRedis.php";
 require_once __DIR__ . "/lib/UnityGithub.php";
+require_once __DIR__ . "/lib/exceptions/RedirectException.php";
 
 // run init script
 require __DIR__ . "/init.php";
diff --git a/resources/lib/UnitySite.php b/resources/lib/UnitySite.php
@@ -10,7 +10,7 @@ public static function redirect($destination)
     {
         if ($_SERVER["PHP_SELF"] != $destination) {
             header("Location: $destination");
-            die("Redirect failed, click <a href='$destination'>here</a> to continue.");
+            throw new RedirectException("Redirect failed, click <a href='$destination'>here</a> to continue.");
         }
     }
 
diff --git a/resources/lib/exceptions/RedirectException.php b/resources/lib/exceptions/RedirectException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace UnityWebPortal\lib;
+
+class RedirectException extends \Exception
+{
+}
diff --git a/test/phpunit-bootstrap.php b/test/phpunit-bootstrap.php
@@ -14,6 +14,7 @@
 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/RedirectException.php";
 
 global $HTTP_HEADER_TEST_INPUTS;
 $HTTP_HEADER_TEST_INPUTS = [

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public static function redirect($destination)`
`10`	`10`	`{`
`11`	`11`	`if ($_SERVER["PHP_SELF"] != $destination) {`
`12`	`12`	`header("Location: $destination");`
`13`		`- die("Redirect failed, click <a href='$destination'>here</a> to continue.");`
	`13`	`+ throw new RedirectException("Redirect failed, click <a href='$destination'>here</a> to continue.");`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +<?php
++
 +namespace UnityWebPortal\lib;
++
 +class RedirectException extends \Exception
 +{
 +}