Commit 150fa6a3 authored by Taylor Otwell's avatar Taylor Otwell

Lazy-load error class inside of error handlers. Speed boost!

parent 90fadb29
...@@ -31,7 +31,6 @@ define('EXT', '.php'); ...@@ -31,7 +31,6 @@ define('EXT', '.php');
// Load the configuration, error, and string classes. // Load the configuration, error, and string classes.
// -------------------------------------------------------------- // --------------------------------------------------------------
require SYS_PATH.'config'.EXT; require SYS_PATH.'config'.EXT;
require SYS_PATH.'error'.EXT;
require SYS_PATH.'str'.EXT; require SYS_PATH.'str'.EXT;
// -------------------------------------------------------------- // --------------------------------------------------------------
...@@ -54,11 +53,13 @@ error_reporting((System\Config::get('error.detail')) ? E_ALL | E_STRICT : 0); ...@@ -54,11 +53,13 @@ error_reporting((System\Config::get('error.detail')) ? E_ALL | E_STRICT : 0);
// -------------------------------------------------------------- // --------------------------------------------------------------
set_exception_handler(function($e) set_exception_handler(function($e)
{ {
require_once SYS_PATH.'error'.EXT;
System\Error::handle($e); System\Error::handle($e);
}); });
set_error_handler(function($number, $error, $file, $line) set_error_handler(function($number, $error, $file, $line)
{ {
require_once SYS_PATH.'error'.EXT;
System\Error::handle(new ErrorException($error, 0, $number, $file, $line)); System\Error::handle(new ErrorException($error, 0, $number, $file, $line));
}); });
...@@ -66,6 +67,7 @@ register_shutdown_function(function() ...@@ -66,6 +67,7 @@ register_shutdown_function(function()
{ {
if ( ! is_null($error = error_get_last())) if ( ! is_null($error = error_get_last()))
{ {
require_once SYS_PATH.'error'.EXT;
System\Error::handle(new ErrorException($error['message'], 0, $error['type'], $error['file'], $error['line'])); System\Error::handle(new ErrorException($error['message'], 0, $error['type'], $error['file'], $error['line']));
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment