Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactoring database and error classes.

This commit is contained in:
Taylor Otwell 2011-08-14 22:10:36 -05:00
parent d72f2c642b
commit b196313bd0
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
system/db.php
View File

@ -20,10 +20,7 @@ class DB {
*/ */
public static function connection($connection = null) public static function connection($connection = null)
{ {
if (is_null($connection)) if (is_null($connection)) $connection = Config::get('db.default');
{
$connection = Config::get('db.default');
}
if ( ! array_key_exists($connection, static::$connections)) if ( ! array_key_exists($connection, static::$connections))
{ {

15
system/error.php
View File

@ -38,7 +38,7 @@ public static function handle($e)
$severity = (array_key_exists($e->getCode(), static::$levels)) ? static::$levels[$e->getCode()] : $e->getCode(); $severity = (array_key_exists($e->getCode(), static::$levels)) ? static::$levels[$e->getCode()] : $e->getCode();
$message = rtrim($e->getMessage(), '.').' in '.str_replace(array(APP_PATH, SYS_PATH), array('APP_PATH/', 'SYS_PATH/'), $e->getFile()).' on line '.$e->getLine().'.'; $message = static::format($e);
if (Config::get('error.log')) if (Config::get('error.log'))
{ {
@ -50,6 +50,19 @@ public static function handle($e)
exit(1); exit(1);
} }
/**
* Format the error message for a given exception.
*
* @param Exception $e
* @return string
*/
private static function format($e)
{
$file = str_replace(array(APP_PATH, SYS_PATH), array('APP_PATH/', 'SYS_PATH/'), $e->getFile());
return rtrim($e->getMessage(), '.').' in '.$file.' on line '.$e->getLine().'.';
}
/** /**
* Show the error view. * Show the error view.
* *