ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added uri class. refactored.

Browse Source
This commit is contained in:
Taylor Otwell
2011-11-14 21:18:18 -06:00
parent 2758b4c16d
commit d1a969bd29
12 changed files with 142 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
laravel/laravel.php
View File

@@ -30,8 +30,6 @@ $handler = function($exception)
call_user_func($config['logger'], $exception, $config);
}
call_user_func($config['handler'], $exception, $config);
if ($config['detail'])
{
echo "<html><h2>Uncaught Exception</h2>
@@ -42,6 +40,10 @@ $handler = function($exception)
<h3>Stack Trace:</h3>
<pre>".$exception->getTraceAsString()."</pre></html>";
}
else
{
Response::error('500')->send();
}
};
/**
@@ -84,19 +86,15 @@ register_shutdown_function(function() use ($handler)
* Setting the PHP error reporting level to -1 essentially forces
* PHP to report every error, and is guranteed to show every error
* on future versions of PHP.
*/
error_reporting(-1);
/**
*
* If error detail is turned off, we will turn off all PHP error
* reporting and display since the framework will be displaying a
* generic message and we don't want any sensitive details about
* the exception leaking into the views.
*/
if ( ! Config::$items['error']['detail'])
{
ini_set('display_errors', 'Off');
}
error_reporting(-1);
ini_set('display_errors', 'Off');
/**
* Load the session and session manager instance. The session
@@ -122,6 +120,7 @@ if (Config::$items['session']['driver'] !== '')
* we can avoid using the loader for these classes. This saves us
* some overhead on each request.
*/
require SYS_PATH.'uri'.EXT;
require SYS_PATH.'input'.EXT;
require SYS_PATH.'request'.EXT;
require SYS_PATH.'response'.EXT;
@@ -183,7 +182,7 @@ $router = new Routing\Router($loader, CONTROLLER_PATH);
IoC::instance('laravel.routing.router', $router);
Request::$route = $router->route(Request::method(), Request::uri());
Request::$route = $router->route(Request::method(), URI::current());
if ( ! is_null(Request::$route))
{