fix: incorrect HTTP status code may return

codeigniter4 · Jul 22, 2022 · e62b283 · e62b283
1 parent eda0ca8
commit e62b283
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
@@ -12,6 +12,8 @@
 namespace CodeIgniter\Debug;
 
 use CodeIgniter\API\ResponseTrait;
+use CodeIgniter\Exceptions\HasExitCodeException;
+use CodeIgniter\Exceptions\HasHttpStatusCodeException;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
@@ -312,18 +314,15 @@ protected function maskSensitiveData(&$trace, array $keysToMask, string $path =
      */
     protected function determineCodes(Throwable $exception): array
     {
-        $statusCode = abs($exception->getCode());
+        $statusCode = 500;
+        $exitStatus = EXIT_ERROR;
 
-        if ($statusCode < 100 || $statusCode > 599) {
-            $exitStatus = $statusCode + EXIT__AUTO_MIN;
-
-            if ($exitStatus > EXIT__AUTO_MAX) {
-                $exitStatus = EXIT_ERROR;
-            }
+        if ($exception instanceof HasHttpStatusCodeException) {
+            $statusCode = $exception->getCode();
+        }
 
-            $statusCode = 500;
-        } else {
-            $exitStatus = EXIT_ERROR;
+        if ($exception instanceof HasExitCodeException) {
+            $exitStatus = $exception->getCode();
         }
 
         return [$statusCode, $exitStatus];

diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
@@ -58,8 +58,9 @@ public function testDetermineCodes(): void
         $determineCodes = $this->getPrivateMethodInvoker($this->exception, 'determineCodes');
 
         $this->assertSame([500, 9], $determineCodes(new RuntimeException('This.')));
+        $this->assertSame([500, 1], $determineCodes(new RuntimeException('This.', 167)));
         $this->assertSame([500, 1], $determineCodes(new RuntimeException('That.', 600)));
-        $this->assertSame([404, 1], $determineCodes(new RuntimeException('There.', 404)));
+        $this->assertSame([500, 1], $determineCodes(new RuntimeException('There.', 404)));
     }
 
     public function testRenderBacktrace(): void