Merge pull request #8766 from kenjis/fix-ExceptionHandler-error-msg

refactor: improve error message in BaseExceptionHandler
codeigniter4 · Apr 12, 2024 · 73ffc06 · 73ffc06
2 parents 774cbd5 + cd6b587
commit 73ffc06
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -4121,11 +4121,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/Seeder.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Debug/BaseExceptionHandler.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method CodeIgniter\\\\Debug\\\\BaseExceptionHandler\\:\\:collectVars\\(\\) return type has no value type specified in iterable type array\\.$#',
 	'count' => 1,

diff --git a/system/Debug/BaseExceptionHandler.php b/system/Debug/BaseExceptionHandler.php
@@ -245,8 +245,14 @@ protected static function highlightFile(string $file, int $lineNumber, int $line
      */
     protected function render(Throwable $exception, int $statusCode, $viewFile = null): void
     {
-        if (empty($viewFile) || ! is_file($viewFile)) {
-            echo 'The error view files were not found. Cannot render exception trace.';
+        if ($viewFile === null) {
+            echo 'The error view file was not specified. Cannot display error view.';
+
+            exit(1);
+        }
+
+        if (! is_file($viewFile)) {
+            echo 'The error view file "' . $viewFile . '" was not found. Cannot display error view.';
 
             exit(1);
         }