".$exception->getMessage()."
-Exception thrown on line ".$exception->getLine()." in ".$exception->getFile()."
' . $line['number'] . '' . $line['code'] . '';
- }
- echo 'An unexpected error has occurred.
-', '', '<?php ', '#$@r4!/*'),
- array('', '', '', '', '/*'),
- highlight_string(' $line + $padding) {
+ break; // Exit loop after we have found what we were looking for
+ }
+
+ if ($currentLine >= ($line - $padding) && $currentLine <= ($line + $padding)) {
+ $lines[] = array
+ (
+ 'number' => str_pad($currentLine, 4, ' ', STR_PAD_LEFT),
+ 'highlighted' => ($currentLine === $line),
+ 'code' => ErrorHandler::highlightString($temp),
+ );
+ }
+ }
+
+ fclose($handle);
+
+ return $lines;
+ }
+
+ /**
+ * Converts errors to ErrorExceptions.
+ *
+ * @param integer $code The error code
+ * @param string $message The error message
+ * @param string $file The filename where the error occurred
+ * @param integer $line The line number where the error occurred
+ * @return boolean
+ */
+ public static function errorHandler($code, $message, $file, $line)
+ {
+ // If isset error_reporting and $code then throw new error exception
+ if ((error_reporting() & $code) !== 0) {
+ throw new ErrorException($message, $code, 0, $file, $line);
+ }
+
+ // Don't execute PHP internal error handler
+ return true;
+ }
+
+ /**
+ * Highlight string
+ *
+ * @param string $string String
+ * @return string
+ */
+ protected static function highlightString($string)
+ {
+ $search = array("\r\n", "\n\r", "\r", "\n", '', '', '<?php ', '#$@r4!/*');
+ $replace = array('', '', '', '', '', '', '', '/*');
+
+ return str_replace($search, $replace, highlight_string(' 0) {
+ foreach ($entry['args'] as $arg) {
+ ob_start();
+
+ var_dump($arg);
+
+ $arg = htmlspecialchars(ob_get_contents());
+
+ ob_end_clean();
+
+ $arguments[] = $arg;
+ }
+ }
+
+ // Location
+
+ $location = array();
+
+ if (isset($entry['file'])) {
+ $location['file'] = $entry['file'];
+ $location['line'] = $entry['line'];
+ $location['code'] = static::highlightCode($entry['file'], $entry['line']);
+ }
+
+ // Compile into array
+
+ $trace[] = array
+ (
+ 'function' => $function,
+ 'arguments' => $arguments,
+ 'location' => $location,
+ );
+ }
+
+ return $trace;
+ }
+
+ /**
+ * Convert errors not caught by the errorHandler to ErrorExceptions.
+ */
+ public static function fatalErrorHandler()
+ {
+ $e = error_get_last();
+
+ if ($e !== null && (error_reporting() & $e['type']) !== 0) {
+ ErrorHandler::exception(new ErrorException($e['message'], $e['type'], 0, $e['file'], $e['line']));
+
+ exit(1);
+ }
+ }
+
+ /**
+ * Handles uncaught exceptions and returns a pretty error screen.
+ *
+ * @access public
+ * @param Exception $exception An exception object
+ */
+ public static function exception($exception)
+ {
+ try {
+ // Empty output buffers
+
+ while(ob_get_level() > 0) ob_end_clean();
+
+ // Get exception info
+
+ $error['code'] = $exception->getCode();
+ $error['message'] = $exception->getMessage();
+ $error['file'] = $exception->getFile();
+ $error['line'] = $exception->getLine();
+
+ // Determine error type
+
+ if ($exception instanceof ErrorException) {
+ $error['type'] = 'ErrorException: ';
+
+ $codes = array
+ (
+ E_ERROR => 'Fatal Error',
+ E_PARSE => 'Parse Error',
+ E_COMPILE_ERROR => 'Compile Error',
+ E_COMPILE_WARNING => 'Compile Warning',
+ E_STRICT => 'Strict Mode Error',
+ E_NOTICE => 'Notice',
+ E_WARNING => 'Warning',
+ E_RECOVERABLE_ERROR => 'Recoverable Error',
+ /*E_DEPRECATED => 'Deprecated',*/
+ E_USER_NOTICE => 'Notice',
+ E_USER_WARNING => 'Warning',
+ E_USER_ERROR => 'Error',
+ /*E_USER_DEPRECATED => 'Deprecated'*/
+ );
+
+ $error['type'] .= in_array($error['code'], array_keys($codes)) ? $codes[$error['code']] : 'Unknown Error';
+ } else {
+ $error['type'] = get_class($exception);
+ }
+
+ // Write to error log
+
+ /*if () {
+ Write here
+ }*/
+
+ // Send headers and output
+ @header('Content-Type: text/html; charset=UTF-8');
+
+ if (GELATO_DISPLAY_ERRORS) {
+ $error['backtrace'] = $exception->getTrace();
+
+ if ($exception instanceof ErrorException) {
+ $error['backtrace'] = array_slice($error['backtrace'], 1); //Remove call to error handler from backtrace
+ }
+
+ $error['backtrace'] = static::formatBacktrace($error['backtrace']);
+ $error['highlighted'] = static::highlightCode($error['file'], $error['line']);
+
+ Response::status(500);
+ include 'Resources/Templates/exception.php';
+ } else {
+ Response::status(500);
+ include 'Resources/Templates/error.php';
+ }
+ } catch (Exception $e) {
+ while(ob_get_level() > 0) ob_end_clean();
+
+ echo $e->getMessage() . ' in ' . $e->getFile() . ' (line ' . $e->getLine() . ').';
+ }
+
+ exit(1);
+ }
+}
diff --git a/libraries/Gelato/Gelato.php b/libraries/Gelato/Gelato.php
index 63c6996..02bb78a 100644
--- a/libraries/Gelato/Gelato.php
+++ b/libraries/Gelato/Gelato.php
@@ -13,6 +13,18 @@
* @since 1.0.0
*/
+/**
+ * The version of Gelato
+ */
+define('GELATO_VERSION', '1.0.0');
+
+/**
+ * Display Gelato Errors or not ?
+ */
+if ( ! defined('GELATO_DISPLAY_ERRORS')) {
+ define('GELATO_DISPLAY_ERRORS', true);
+}
+
/**
* Should we use the Gelato Autoloader to ensure the dependancies are automatically
* loaded?
@@ -22,7 +34,27 @@ if ( ! defined('GELATO_AUTOLOADER')) {
}
/**
- * Register autoload function
+ * Load Gelato Error Handler
+ */
+require_once __DIR__ . '/ErrorHandler.php';
+
+/**
+ * Set Error Handler
+ */
+set_error_handler('ErrorHandler::errorHandler');
+
+/**
+ * Set Fatal Error Handler
+ */
+register_shutdown_function('ErrorHandler::fatalErrorHandler');
+
+/**
+ * Set Exception Handler
+ */
+set_exception_handler('ErrorHandler::exception');
+
+/**
+ * Register Gelato Autoloader
*/
if (GELATO_AUTOLOADER) {
spl_autoload_register(array('Gelato', 'autoload'));
@@ -33,12 +65,6 @@ if (GELATO_AUTOLOADER) {
*/
class Gelato
{
-
- /**
- * The version of Gelato
- */
- const VERSION = '1.0.0';
-
/**
* Registry of variables
*
diff --git a/libraries/Gelato/docs/README.md b/libraries/Gelato/Resources/Docs/README.md
similarity index 100%
rename from libraries/Gelato/docs/README.md
rename to libraries/Gelato/Resources/Docs/README.md
diff --git a/libraries/Gelato/docs/changelog.txt b/libraries/Gelato/Resources/Docs/changelog.txt
similarity index 100%
rename from libraries/Gelato/docs/changelog.txt
rename to libraries/Gelato/Resources/Docs/changelog.txt
diff --git a/libraries/Gelato/docs/license.txt b/libraries/Gelato/Resources/Docs/license.txt
similarity index 100%
rename from libraries/Gelato/docs/license.txt
rename to libraries/Gelato/Resources/Docs/license.txt
diff --git a/libraries/Gelato/Resources/Views/Errors/exception.php b/libraries/Gelato/Resources/Views/Errors/exception.php
new file mode 100644
index 0000000..319e8a5
--- /dev/null
+++ b/libraries/Gelato/Resources/Views/Errors/exception.php
@@ -0,0 +1,225 @@
+
+
+Aw, snap! An error has occurred while processing your request.
+