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

refactoring.

Browse Source
This commit is contained in:
Taylor Otwell
2011-11-15 19:15:31 -06:00
parent 6bd3dcb039
commit e226a463bf
6 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
laravel/bootstrap/core.php
View File

@@ -58,6 +58,7 @@ require SYS_PATH.'autoloader'.EXT;
*/
Config::load('application');
Config::load('session');
Config::load('error');
/**
* Register the Autoloader's "load" method on the auto-loader stack.

9
laravel/hash.php
View File

@@ -5,11 +5,10 @@ class Hash {
/**
* Hash a password using the Bcrypt hashing scheme.
*
* Bcrypt provides a future-proof hashing algorithm by allowing the
* number of "rounds" to be increased, thus increasing the time it
* takes to generate the hashed value. The longer it takes takes
* to generate the hash, the more impractical a rainbow table
* attack against the hashes becomes.
* Bcrypt provides a future-proof hashing algorithm by allowing the number of
* "rounds" to be increased, thus increasing the time it takes to generate the
* hashed value. The longer it takes takes to generate the hash, the more
* impractical a rainbow table attack against the hashes becomes.
*
* <code>
* // Create a Bcrypt hash of a value

19
laravel/laravel.php
View File

@@ -23,16 +23,16 @@ date_default_timezone_set(Config::$items['application']['timezone']);
*/
$handler = function($exception)
{
$config = Config::get('error');
$config = Config::$items['error'];
if ($config['log'])
{
call_user_func($config['logger'], $exception, $config);
call_user_func($config['logger'], $exception);
}
if ($config['detail'])
{
echo "<html><h2>Uncaught Exception</h2>
echo "<html><h2>Unhandled Exception</h2>
<h3>Message:</h3>
<pre>".$exception->getMessage()."</pre>
<h3>Location:</h3>
@@ -44,6 +44,8 @@ $handler = function($exception)
{
Response::error('500')->send();
}
exit(1);
};
/**
@@ -61,9 +63,14 @@ set_exception_handler(function($exception) use ($handler)
* 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)
set_error_handler(function($number, $error, $file, $line)
{
$handler(new \ErrorException($error, $number, 0, $file, $line));
if (error_reporting() === 0 or in_array($number, Config::$items['error']['ignore']))
{
return;
}
throw new \ErrorException($error, $number, 0, $file, $line);
});
/**
@@ -212,4 +219,4 @@ if (Config::$items['session']['driver'] !== '')
IoC::core('session')->save($driver);
}
$response->send();
$response->send();

7
laravel/request.php
View File

@@ -2,13 +2,6 @@
class Request {
/**
* The request URI for the current request.
*
* @var string
*/
public static $uri;
/**
* The route handling the current request.
*

2
laravel/uri.php
View File

@@ -7,7 +7,7 @@ class URI {
*
* @var string
*/
protected static $uri;
public static $uri;
/**
* The URI segments for the current request.