refactoring and working on redis.

This commit is contained in:
Taylor Otwell
2011-10-19 22:44:02 -05:00
parent ba29a0bd38
commit df9130dafa
8 changed files with 224 additions and 49 deletions

View File

@@ -1,16 +1,13 @@
<?php
/**
* Define the extensions used by the framework.
*/
define('EXT', '.php');
define('BLADE_EXT', '.blade.php');
define('CRLF', chr(13).chr(10));
define('EXT', '.php');
/**
* Define a function that registers an array of constants
* if they haven't already been registered. This allows the
* constants to be changed from their default values when
* unit testing the framework.
* Define a function that registers an array of constants if they
* haven't already been registered. This allows the constants to
* be changed from their default values when unit testing.
*/
function constants($constants)
{
@@ -21,9 +18,9 @@ function constants($constants)
}
/**
* Register the core framework paths. All other paths are
* built on top of these core paths. All of these paths are
* changable by the developer in the front controller.
* Register the core framework paths. All other paths are built on
* top of these core paths. All of these paths are changable by
* the developer in the front controller.
*/
$constants = array(
'APP_PATH' => realpath($application).'/',
@@ -37,8 +34,9 @@ $constants = array(
constants($constants);
/**
* Register all of the other framework paths. All of these
* paths are built on top of the core paths above.
* Register all of the other framework paths. All of these paths
* are built on top of the core paths above. We still allow the
* developer to override these for easy unit testing.
*/
$constants = array(
'CACHE_PATH' => STORAGE_PATH.'cache/',
@@ -63,7 +61,7 @@ unset($constants);
/**
* Set the Laravel environment configuration path constant.
* The environment is controller by setting an environment
* The environment is controlled by setting an environment
* variable on the server running Laravel.
*/
$environment = (isset($_SERVER['LARAVEL_ENV'])) ? $_SERVER['LARAVEL_ENV'] : '';

View File

@@ -59,20 +59,31 @@ $handler = function($e) use ($message, $severity)
};
/**
* Register the PHP exception, error, and shutdown error handlers.
* These handlers will catch all PHP exceptions and errors and pass
* the exceptions into the common Laravel error handler.
* Register the PHP exception handler. The framework throws exceptions
* on every error that cannot be handled. All of those exceptions will
* fall into this closure for processing.
*/
set_exception_handler(function($e) use ($handler)
{
$handler($e);
});
/**
* Register the PHP error handler. All PHP errors will fall into this
* handler, which will convert the error into an ErrorException object
* and pass the exception into the common exception handler.
*/
set_error_handler(function($number, $error, $file, $line) use ($handler)
{
$handler(new \ErrorException($error, $number, 0, $file, $line));
});
/**
* Register the PHP shutdown handler. This function will be called at
* the end of the PHP script or on a fatal PHP error. If an error has
* occurred, we will convert it to an ErrorException and pass it to
* the common exception handler.
*/
register_shutdown_function(function() use ($handler)
{
if ( ! is_null($error = error_get_last()))