refactor: cleanup Exceptions

Author: paulbalandan

.github/workflows/test-file-permissions.yml

@@ -20,5 +20,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+
       - name: Detect unnecessary execution permissions
         run: php utils/check_permission_x.php

.github/workflows/test-userguide.yml

@@ -26,6 +26,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+
       - name: Setup Python
         uses: actions/setup-python@v6
         with:

system/Debug/BaseExceptionHandler.php

@@ -13,10 +13,6 @@
 
 namespace CodeIgniter\Debug;
 
-use CodeIgniter\HTTP\CLIRequest;
-use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\Exceptions as ExceptionsConfig;
 use Throwable;
 
@@ -53,21 +49,6 @@ public function __construct(ExceptionsConfig $config)
         }
     }
 
-    /**
-     * The main entry point into the handler.
-     *
-     * @param CLIRequest|IncomingRequest $request
-     *
-     * @return void
-     */
-    abstract public function handle(
-        Throwable $exception,
-        RequestInterface $request,
-        ResponseInterface $response,
-        int $statusCode,
-        int $exitCode,
-    );
-
     /**
      * Gathers the variables that will be made available to the view.
      */
@@ -76,7 +57,7 @@ protected function collectVars(Throwable $exception, int $statusCode): array
         // Get the first exception.
         $firstException = $exception;
 
-        while ($prevException = $firstException->getPrevious()) {
+        while (($prevException = $firstException->getPrevious()) instanceof Throwable) {
             $firstException = $prevException;
         }
 
@@ -103,24 +84,22 @@ protected function collectVars(Throwable $exception, int $statusCode): array
     protected function maskSensitiveData(array $trace, array $keysToMask, string $path = ''): array
     {
         foreach ($trace as $i => $line) {
-            $trace[$i]['args'] = $this->maskData($line['args'], $keysToMask);
+            $trace[$i]['args'] = $this->maskData($line['args'], $keysToMask, $path);
         }
 
         return $trace;
     }
 
     /**
-     * @param array|object $args
-     *
-     * @return array|object
+     * @param array<int, string> $keysToMask
      */
-    private function maskData($args, array $keysToMask, string $path = '')
+    private function maskData(mixed $args, array $keysToMask, string $path = ''): mixed
     {
-        foreach ($keysToMask as $keyToMask) {
-            $explode = explode('/', $keyToMask);
+        foreach ($keysToMask as $key) {
+            $explode = explode('/', $key);
             $index   = end($explode);
 
-            if (str_starts_with(strrev($path . '/' . $index), strrev($keyToMask))) {
+            if (str_starts_with(strrev($path . '/' . $index), strrev($key))) {
                 if (is_array($args) && array_key_exists($index, $args)) {
                     $args[$index] = '******************';
                 } elseif (

system/Debug/ExceptionHandler.php

@@ -95,9 +95,7 @@ public function handle(
                 $this->respond($data, $statusCode)->send();
 
                 if (ENVIRONMENT !== 'testing') {
-                    // @codeCoverageIgnoreStart
-                    exit($exitCode);
-                    // @codeCoverageIgnoreEnd
+                    exit($exitCode); // @codeCoverageIgnore
                 }
 
                 return;
@@ -126,9 +124,7 @@ public function handle(
         $this->render($exception, $statusCode, $viewFile);
 
         if (ENVIRONMENT !== 'testing') {
-            // @codeCoverageIgnoreStart
-            exit($exitCode);
-            // @codeCoverageIgnoreEnd
+            exit($exitCode); // @codeCoverageIgnore
         }
     }