fix: incorrect HTTP status code or Exit code may return

Author: kenjis

system/Database/Exceptions/DatabaseException.php

@@ -11,10 +11,10 @@
 
 namespace CodeIgniter\Database\Exceptions;
 
-use CodeIgniter\Exceptions\HasExitCodeException;
+use CodeIgniter\Exceptions\ExitExceptionInterface;
 use Error;
 
-class DatabaseException extends Error implements ExceptionInterface, HasExitCodeException
+class DatabaseException extends Error implements ExceptionInterface, ExitExceptionInterface
 {
     /**
      * Exit status code

system/Debug/Exceptions.php

@@ -12,6 +12,8 @@
 namespace CodeIgniter\Debug;
 
 use CodeIgniter\API\ResponseTrait;
+use CodeIgniter\Exceptions\ExitExceptionInterface;
+use CodeIgniter\Exceptions\HTTPExceptionInterface;
 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 HTTPExceptionInterface) {
+            $statusCode = $exception->getCode();
+        }
 
-            $statusCode = 500;
-        } else {
-            $exitStatus = EXIT_ERROR;
+        if ($exception instanceof ExitExceptionInterface) {
+            $exitStatus = $exception->getCode();
         }
 
         return [$statusCode, $exitStatus];

system/Entity/Exceptions/CastException.php

@@ -11,17 +11,21 @@
 
 namespace CodeIgniter\Entity\Exceptions;
 
+use CodeIgniter\Exceptions\ExitExceptionInterface;
 use CodeIgniter\Exceptions\FrameworkException;
 
 /**
  * CastException is thrown for invalid cast initialization and management.
- *
- * @TODO CodeIgniter\Exceptions\CastException is deprecated and this class is used.
- *      CodeIgniter\Exceptions\CastException has the property $code = EXIT_CONFIG,
- *      but this class does not have the code.
  */
-class CastException extends FrameworkException
+class CastException extends FrameworkException implements ExitExceptionInterface
 {
+    /**
+     * Exit status code
+     *
+     * @var int
+     */
+    protected $code = EXIT_CONFIG;
+
     /**
      * Thrown when the cast class does not extends BaseCast.
      *

system/Exceptions/CastException.php

@@ -18,7 +18,7 @@
  *
  * @codeCoverageIgnore
  */
-class CastException extends CriticalError implements HasExitCodeException
+class CastException extends CriticalError implements ExitExceptionInterface
 {
     use DebugTraceableTrait;
 

system/Exceptions/ConfigException.php

@@ -14,7 +14,7 @@
 /**
  * Exception for automatic logging.
  */
-class ConfigException extends CriticalError implements HasExitCodeException
+class ConfigException extends CriticalError implements ExitExceptionInterface
 {
     use DebugTraceableTrait;
 

system/Exceptions/PageNotFoundException.php

@@ -14,7 +14,7 @@
 use Config\Services;
 use OutOfBoundsException;
 
-class PageNotFoundException extends OutOfBoundsException implements ExceptionInterface, HasHttpStatusCodeException
+class PageNotFoundException extends OutOfBoundsException implements ExceptionInterface, HTTPExceptionInterface
 {
     use DebugTraceableTrait;
 

system/Router/Exceptions/RedirectException.php

@@ -11,13 +11,13 @@
 
 namespace CodeIgniter\Router\Exceptions;
 
-use CodeIgniter\Exceptions\HasHttpStatusCodeException;
+use CodeIgniter\Exceptions\HTTPExceptionInterface;
 use Exception;
 
 /**
  * RedirectException
  */
-class RedirectException extends Exception implements HasHttpStatusCodeException
+class RedirectException extends Exception implements HTTPExceptionInterface
 {
     /**
      * HTTP status code for redirects

tests/system/Debug/ExceptionsTest.php

@@ -60,16 +60,13 @@ public function testDetermineCodes(): void
     {
         $determineCodes = $this->getPrivateMethodInvoker($this->exception, 'determineCodes');
 
-        $this->assertSame([500, EXIT__AUTO_MIN], $determineCodes(new RuntimeException('This.')));
+        $this->assertSame([500, EXIT_ERROR], $determineCodes(new RuntimeException('This.')));
         $this->assertSame([500, EXIT_ERROR], $determineCodes(new RuntimeException('That.', 600)));
-        $this->assertSame([404, EXIT_ERROR], $determineCodes(new RuntimeException('There.', 404)));
-        $this->assertSame([167, EXIT_ERROR], $determineCodes(new RuntimeException('This.', 167)));
-        // @TODO This exit code should be EXIT_CONFIG.
-        $this->assertSame([500, 12], $determineCodes(new ConfigException('This.')));
-        // @TODO This exit code should be EXIT_CONFIG.
-        $this->assertSame([500, 9], $determineCodes(new CastException('This.')));
-        // @TODO This exit code should be EXIT_DATABASE.
-        $this->assertSame([500, 17], $determineCodes(new DatabaseException('This.')));
+        $this->assertSame([500, EXIT_ERROR], $determineCodes(new RuntimeException('There.', 404)));
+        $this->assertSame([500, EXIT_ERROR], $determineCodes(new RuntimeException('This.', 167)));
+        $this->assertSame([500, EXIT_CONFIG], $determineCodes(new ConfigException('This.')));
+        $this->assertSame([500, EXIT_CONFIG], $determineCodes(new CastException('This.')));
+        $this->assertSame([500, EXIT_DATABASE], $determineCodes(new DatabaseException('This.')));
     }
 
     public function testRenderBacktrace(): void