Merge pull request #6 from WebFiori/dev

Dev
WebFiori · Jan 8, 2024 · 0158343 · 0158343
2 parents 5c3c5a8 + 0a2151c
commit 0158343
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/webfiori/error/ErrorHandlerException.php b/webfiori/error/ErrorHandlerException.php
@@ -1,13 +1,13 @@
 <?php
 namespace webfiori\error;
 
-use Exception;
+use ErrorException;
 /**
  * This class is used to represent PHP errors which was converted to exceptions.
  *
  * @author Ibrahim
  */
-class ErrorHandlerException extends Exception {
+class ErrorHandlerException extends ErrorException {
     private $debugTrace;
     /**
      * Creates new instance of the class.
@@ -18,8 +18,8 @@ class ErrorHandlerException extends Exception {
      * 
      * @param string $file The path to the file at which the error happened.
      */
-    public function __construct(string $message = "", int $code = 0, string $file = '') {
-        parent::__construct($message, $code);
+    public function __construct(string $message = "", int $code = 0, string $file = '', int $line = 0) {
+        parent::__construct($message, $code, $code, $file, $line);
         $this->debugTrace = [];
         $trace = debug_backtrace();
         $line = null;

diff --git a/webfiori/error/Handler.php b/webfiori/error/Handler.php
@@ -97,15 +97,15 @@ class Handler {
     private $exceptionsHandler;
     private $shutdownFunction;
     private function __construct() {
-        //ini_set('display_startup_errors', 1);
-        //ini_set('display_errors', 1);
+        ini_set('display_startup_errors', 1);
+        ini_set('display_errors', 1);
         error_reporting(-1);
         $this->errToExceptionHandler = function (int $errno, string $errString, string $errFile, int $errLine) {
             //Convert errors to exceptions
             $errClass = TraceEntry::extractClassName($errFile);
             $errType = Handler::ERR_TYPES[$errno];
             $message = 'An exception caused by an error. '.$errType['description'].': '.$errString.' at '.$errClass.' Line '.$errLine;
-            throw new ErrorHandlerException($message, $errno, $errFile);
+            throw new ErrorHandlerException($message, $errno, $errFile, $errLine);
         };
         $this->exceptionsHandler = function (Throwable $ex = null) {
             Handler::get()->lastException = $ex;
@@ -141,9 +141,8 @@ private function __construct() {
             }
         };
         $this->isErrOccured = false;
-        set_exception_handler($this->exceptionsHandler);
         set_error_handler($this->errToExceptionHandler);
-
+        set_exception_handler($this->exceptionsHandler);
         register_shutdown_function($this->shutdownFunction);
         $this->handlersPool = [];
         $this->handlersPool[] = new DefaultHandler();