@@ -14,77 +14,77 @@  | 
                                                    ||
| 14 | 14 | |
| 15 | 15 | class ErrorHandler  | 
                                                        
| 16 | 16 |  { | 
                                                        
| 17 | - public static function init()  | 
                                                        |
| 18 | -	{ | 
                                                        |
| 19 | -		ini_set('html_errors',0); // @todo review this line | 
                                                        |
| 20 | - // error_reporting((E_ALL | E_STRICT)); // @note we shouldn't override by default, but we could inject  | 
                                                        |
| 21 | -		set_error_handler("\\erdiko\\core\\ErrorHandler::errorHandler"); | 
                                                        |
| 22 | -		register_shutdown_function("\\erdiko\\core\\ErrorHandler::fatalErrorShutdownHandler"); | 
                                                        |
| 23 | - }  | 
                                                        |
| 17 | + public static function init()  | 
                                                        |
| 18 | +    { | 
                                                        |
| 19 | +        ini_set('html_errors',0); // @todo review this line | 
                                                        |
| 20 | + // error_reporting((E_ALL | E_STRICT)); // @note we shouldn't override by default, but we could inject  | 
                                                        |
| 21 | +        set_error_handler("\\erdiko\\core\\ErrorHandler::errorHandler"); | 
                                                        |
| 22 | +        register_shutdown_function("\\erdiko\\core\\ErrorHandler::fatalErrorShutdownHandler"); | 
                                                        |
| 23 | + }  | 
                                                        |
| 24 | 24 | |
| 25 | - public static function errorHandler($errno, $errstr, $errfile, $errline)  | 
                                                        |
| 26 | -	{ | 
                                                        |
| 27 | - $debug = \erdiko\core\ErrorHandler::isDebug();  | 
                                                        |
| 28 | -		if ( ! ( error_reporting() & $errno ) || empty( $errstr ) ) { | 
                                                        |
| 29 | - return null;  | 
                                                        |
| 30 | - }  | 
                                                        |
| 25 | + public static function errorHandler($errno, $errstr, $errfile, $errline)  | 
                                                        |
| 26 | +    { | 
                                                        |
| 27 | + $debug = \erdiko\core\ErrorHandler::isDebug();  | 
                                                        |
| 28 | +        if ( ! ( error_reporting() & $errno ) || empty( $errstr ) ) { | 
                                                        |
| 29 | + return null;  | 
                                                        |
| 30 | + }  | 
                                                        |
| 31 | 31 | |
| 32 | 32 | $errorHook = "500";  | 
                                                        
| 33 | 33 | |
| 34 | -		switch ( $errno ) { | 
                                                        |
| 35 | - case E_USER_ERROR:  | 
                                                        |
| 36 | - $vars['msg_type'] = "USER ERROR";  | 
                                                        |
| 37 | - $vars['msg_description'] = " Fatal error in line $errline of $errfile file";  | 
                                                        |
| 38 | -				$vars['msg_description'] .= ", PHP " . PHP_VERSION . " (" . PHP_OS . ")"; | 
                                                        |
| 39 | - break;  | 
                                                        |
| 34 | +        switch ( $errno ) { | 
                                                        |
| 35 | + case E_USER_ERROR:  | 
                                                        |
| 36 | + $vars['msg_type'] = "USER ERROR";  | 
                                                        |
| 37 | + $vars['msg_description'] = " Fatal error in line $errline of $errfile file";  | 
                                                        |
| 38 | +                $vars['msg_description'] .= ", PHP " . PHP_VERSION . " (" . PHP_OS . ")"; | 
                                                        |
| 39 | + break;  | 
                                                        |
| 40 | 40 | |
| 41 | - case E_USER_WARNING:  | 
                                                        |
| 42 | - $vars['msg_type'] = "USER WARNING";  | 
                                                        |
| 43 | - break;  | 
                                                        |
| 41 | + case E_USER_WARNING:  | 
                                                        |
| 42 | + $vars['msg_type'] = "USER WARNING";  | 
                                                        |
| 43 | + break;  | 
                                                        |
| 44 | 44 | |
| 45 | - case E_USER_NOTICE:  | 
                                                        |
| 46 | - $vars['msg_type'] = "USER NOTICE";  | 
                                                        |
| 47 | - break;  | 
                                                        |
| 45 | + case E_USER_NOTICE:  | 
                                                        |
| 46 | + $vars['msg_type'] = "USER NOTICE";  | 
                                                        |
| 47 | + break;  | 
                                                        |
| 48 | 48 | |
| 49 | - case E_ERROR:  | 
                                                        |
| 50 | - $vars['msg_type'] = "ERROR";  | 
                                                        |
| 51 | - $vars['msg_description'] = print_r(debug_backtrace(),1);  | 
                                                        |
| 52 | - break;  | 
                                                        |
| 49 | + case E_ERROR:  | 
                                                        |
| 50 | + $vars['msg_type'] = "ERROR";  | 
                                                        |
| 51 | + $vars['msg_description'] = print_r(debug_backtrace(),1);  | 
                                                        |
| 52 | + break;  | 
                                                        |
| 53 | 53 | |
| 54 | - default:  | 
                                                        |
| 55 | - $vars['msg_type'] = "Type of error: [$errno] $errstr";  | 
                                                        |
| 56 | - $vars['msg_description'] = print_r(debug_backtrace(),1);  | 
                                                        |
| 57 | - break;  | 
                                                        |
| 58 | - }  | 
                                                        |
| 54 | + default:  | 
                                                        |
| 55 | + $vars['msg_type'] = "Type of error: [$errno] $errstr";  | 
                                                        |
| 56 | + $vars['msg_description'] = print_r(debug_backtrace(),1);  | 
                                                        |
| 57 | + break;  | 
                                                        |
| 58 | + }  | 
                                                        |
| 59 | 59 | |
| 60 | - $vars['code'] = $errno;  | 
                                                        |
| 61 | - $vars['error'] = trim($errstr);  | 
                                                        |
| 62 | - $vars['path_info'] = $errfile . " on line " . $errline;  | 
                                                        |
| 60 | + $vars['code'] = $errno;  | 
                                                        |
| 61 | + $vars['error'] = trim($errstr);  | 
                                                        |
| 62 | + $vars['path_info'] = $errfile . " on line " . $errline;  | 
                                                        |
| 63 | 63 | $vars['debug'] = $debug;  | 
                                                        
| 64 | 64 | |
| 65 | 65 | ToroHook::fire($errorHook, $vars);  | 
                                                        
| 66 | 66 | |
| 67 | - return false;  | 
                                                        |
| 68 | - }  | 
                                                        |
| 67 | + return false;  | 
                                                        |
| 68 | + }  | 
                                                        |
| 69 | 69 | |
| 70 | - public static function fatalErrorShutdownHandler()  | 
                                                        |
| 71 | -	{ | 
                                                        |
| 72 | - $last_error = error_get_last();  | 
                                                        |
| 73 | - static::errorHandler(  | 
                                                        |
| 74 | - E_ERROR,  | 
                                                        |
| 75 | - $last_error['message'],  | 
                                                        |
| 70 | + public static function fatalErrorShutdownHandler()  | 
                                                        |
| 71 | +    { | 
                                                        |
| 72 | + $last_error = error_get_last();  | 
                                                        |
| 73 | + static::errorHandler(  | 
                                                        |
| 74 | + E_ERROR,  | 
                                                        |
| 75 | + $last_error['message'],  | 
                                                        |
| 76 | 76 | $last_error['file'],  | 
                                                        
| 77 | 77 | $last_error['line']  | 
                                                        
| 78 | 78 | );  | 
                                                        
| 79 | - }  | 
                                                        |
| 79 | + }  | 
                                                        |
| 80 | 80 | |
| 81 | - /**  | 
                                                        |
| 82 | - * isDebug  | 
                                                        |
| 83 | - *  | 
                                                        |
| 84 | - * @return bool  | 
                                                        |
| 85 | - */  | 
                                                        |
| 86 | - public static function isDebug()  | 
                                                        |
| 87 | -	{ | 
                                                        |
| 88 | -		return (getenv("ERDIKO_DEBUG")=='1'); | 
                                                        |
| 89 | - }  | 
                                                        |
| 81 | + /**  | 
                                                        |
| 82 | + * isDebug  | 
                                                        |
| 83 | + *  | 
                                                        |
| 84 | + * @return bool  | 
                                                        |
| 85 | + */  | 
                                                        |
| 86 | + public static function isDebug()  | 
                                                        |
| 87 | +    { | 
                                                        |
| 88 | +        return (getenv("ERDIKO_DEBUG")=='1'); | 
                                                        |
| 89 | + }  | 
                                                        |
| 90 | 90 | }  | 
                                                        
@@ -16,7 +16,7 @@ discard block  | 
                                                    ||
| 16 | 16 |  { | 
                                                        
| 17 | 17 | public static function init()  | 
                                                        
| 18 | 18 |  	{ | 
                                                        
| 19 | -		ini_set('html_errors',0); // @todo review this line | 
                                                        |
| 19 | +		ini_set('html_errors', 0); // @todo review this line | 
                                                        |
| 20 | 20 | // error_reporting((E_ALL | E_STRICT)); // @note we shouldn't override by default, but we could inject  | 
                                                        
| 21 | 21 |  		set_error_handler("\\erdiko\\core\\ErrorHandler::errorHandler"); | 
                                                        
| 22 | 22 |  		register_shutdown_function("\\erdiko\\core\\ErrorHandler::fatalErrorShutdownHandler"); | 
                                                        
@@ -25,17 +25,17 @@ discard block  | 
                                                    ||
| 25 | 25 | public static function errorHandler($errno, $errstr, $errfile, $errline)  | 
                                                        
| 26 | 26 |  	{ | 
                                                        
| 27 | 27 | $debug = \erdiko\core\ErrorHandler::isDebug();  | 
                                                        
| 28 | -		if ( ! ( error_reporting() & $errno ) || empty( $errstr ) ) { | 
                                                        |
| 28 | +		if (!(error_reporting() & $errno) || empty($errstr)) { | 
                                                        |
| 29 | 29 | return null;  | 
                                                        
| 30 | 30 | }  | 
                                                        
| 31 | 31 | |
| 32 | 32 | $errorHook = "500";  | 
                                                        
| 33 | 33 | |
| 34 | -		switch ( $errno ) { | 
                                                        |
| 34 | +		switch ($errno) { | 
                                                        |
| 35 | 35 | case E_USER_ERROR:  | 
                                                        
| 36 | 36 | $vars['msg_type'] = "USER ERROR";  | 
                                                        
| 37 | 37 | $vars['msg_description'] = " Fatal error in line $errline of $errfile file";  | 
                                                        
| 38 | -				$vars['msg_description'] .= ", PHP " . PHP_VERSION . " (" . PHP_OS . ")"; | 
                                                        |
| 38 | +				$vars['msg_description'] .= ", PHP ".PHP_VERSION." (".PHP_OS.")"; | 
                                                        |
| 39 | 39 | break;  | 
                                                        
| 40 | 40 | |
| 41 | 41 | case E_USER_WARNING:  | 
                                                        
@@ -48,19 +48,19 @@ discard block  | 
                                                    ||
| 48 | 48 | |
| 49 | 49 | case E_ERROR:  | 
                                                        
| 50 | 50 | $vars['msg_type'] = "ERROR";  | 
                                                        
| 51 | - $vars['msg_description'] = print_r(debug_backtrace(),1);  | 
                                                        |
| 51 | + $vars['msg_description'] = print_r(debug_backtrace(), 1);  | 
                                                        |
| 52 | 52 | break;  | 
                                                        
| 53 | 53 | |
| 54 | 54 | default:  | 
                                                        
| 55 | 55 | $vars['msg_type'] = "Type of error: [$errno] $errstr";  | 
                                                        
| 56 | - $vars['msg_description'] = print_r(debug_backtrace(),1);  | 
                                                        |
| 56 | + $vars['msg_description'] = print_r(debug_backtrace(), 1);  | 
                                                        |
| 57 | 57 | break;  | 
                                                        
| 58 | 58 | }  | 
                                                        
| 59 | 59 | |
| 60 | 60 | $vars['code'] = $errno;  | 
                                                        
| 61 | 61 | $vars['error'] = trim($errstr);  | 
                                                        
| 62 | - $vars['path_info'] = $errfile . " on line " . $errline;  | 
                                                        |
| 63 | - $vars['debug'] = $debug;  | 
                                                        |
| 62 | + $vars['path_info'] = $errfile." on line ".$errline;  | 
                                                        |
| 63 | + $vars['debug'] = $debug;  | 
                                                        |
| 64 | 64 | |
| 65 | 65 | ToroHook::fire($errorHook, $vars);  | 
                                                        
| 66 | 66 | |
@@ -85,6 +85,6 @@ discard block  | 
                                                    ||
| 85 | 85 | */  | 
                                                        
| 86 | 86 | public static function isDebug()  | 
                                                        
| 87 | 87 |  	{ | 
                                                        
| 88 | -		return (getenv("ERDIKO_DEBUG")=='1'); | 
                                                        |
| 88 | +		return (getenv("ERDIKO_DEBUG") == '1'); | 
                                                        |
| 89 | 89 | }  | 
                                                        
| 90 | 90 | }  | 
                                                        
@@ -116,7 +116,7 @@  | 
                                                    ||
| 116 | 116 | $handler_instance->send();  | 
                                                        
| 117 | 117 | }  | 
                                                        
| 118 | 118 | |
| 119 | - // render the response and return the data  | 
                                                        |
| 119 | + // render the response and return the data  | 
                                                        |
| 120 | 120 | ToroHook::fire(  | 
                                                        
| 121 | 121 | 'after_handler',  | 
                                                        
| 122 | 122 |                          compact('routes', 'discovered_handler', 'action', 'arguments', 'result') |