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

refactoring and bug fixes.

This commit is contained in:
Taylor Otwell 2011-09-29 21:22:48 -05:00
parent 2eeb636198
commit 14186a00e0
22 changed files with 192 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/config/auth.php
View File

@ -59,6 +59,6 @@
|
*/
'logout' => function($id) {}
'logout' => function($user) {}
);

21
application/config/error.php
View File

@ -40,23 +40,15 @@
| flexibility in Laravel to manage error logging as you see fit.
|
| This function will be called when an error occurs in your application.
| You can log the error however you like.
| You are free to handle the exception any way your heart desires.
|
| The error "severity" passed to the method is a human-readable severity
| level such as "Parsing Error" or "Fatal Error".
|
| A simple logging system has been setup for you. By default, all errors
| will be logged to the storage/log.txt file.
|
*/
'handler' => function($exception, $severity, $message, $config)
{
if ($config['log'])
{
call_user_func($config['logger'], $severity, $message);
}
if ($config['detail'])
{
$data = compact('exception', 'severity', 'message');
@ -69,8 +61,6 @@
}
$response->send();
exit(1);
},
/*
@ -81,18 +71,15 @@
| Because of the various ways of managing error logging, you get complete
| flexibility to manage error logging as you see fit.
|
| This function will be called when an error occurs in your application.
| You can log the error however you like.
|
| The error "severity" passed to the method is a human-readable severity
| level such as "Parsing Error" or "Fatal Error".
| This function will be called when an error occurs in your application
| and error loggins is enabled. You can log the error however you like.
|
| A simple logging system has been setup for you. By default, all errors
| will be logged to the storage/log.txt file.
|
*/
'logger' => function($severity, $message)
'logger' => function($exception, $severity, $message, $config)
{
File::append(STORAGE_PATH.'log.txt', date('Y-m-d H:i:s').' '.$severity.' - '.$message.PHP_EOL);
}

4
application/filters.php
View File

@ -56,13 +56,13 @@
'auth' => function()
{
return ( ! Auth::check()) ? Redirect::to('login') : null;
if ( ! Auth::check()) return Redirect::to('login');
},
'csrf' => function()
{
return (Input::get('csrf_token') !== Form::raw_token()) ? Response::error('500') : null;
if (Input::get('csrf_token') !== Form::raw_token()) return Response::error('500');
},
);

32
laravel/bootstrap/core.php
View File

@ -26,8 +26,9 @@
define('BLADE_EXT', '.blade.php');
/**
* Load the classes that can't be resolved through the auto-loader. These are typically classes
* that are used by the auto-loader or configuration classes, and therefore cannot be auto-loaded.
* Load the classes that can't be resolved through the auto-loader.
* These are typically classes that are used by the auto-loader or
* configuration classes, and therefore cannot be auto-loaded.
*/
require SYS_PATH.'facades'.EXT;
require SYS_PATH.'config'.EXT;
@ -35,9 +36,10 @@
require SYS_PATH.'arr'.EXT;
/**
* Bootstrap the application inversion of control (IoC) container. The container provides the
* convenient resolution of objects and their dependencies, allowing for flexibility and
* testability within the framework and application.
* Bootstrap the application inversion of control (IoC) container.
* The container provides the convenient resolution of objects and
* their dependencies, allowing for flexibility and testability
* within the framework and application.
*/
require SYS_PATH.'container'.EXT;
@ -46,25 +48,13 @@
IoC::$container = $container;
/**
* Register the application auto-loader. The auto-loader is responsible for the lazy-loading
* of all of the Laravel core classes, as well as the developer created libraries and models.
* Register the application auto-loader. The auto-loader is responsible
* for the lazy-loading of all of the Laravel core classes, as well as
* the developer created libraries and models.
*/
spl_autoload_register(array($container->resolve('laravel.loader'), 'load'));
/**
* Define a few convenient global functions.
*/
function e($value)
{
return HTML::entities($value);
}
function __($key, $replacements = array(), $language = null)
{
return Lang::line($key, $replacements, $language);
}
function fe($function)
{
return function_exists($function);
}
require 'functions'.EXT;

32
laravel/bootstrap/errors.php
View File

@ -1,8 +1,9 @@
<?php namespace Laravel;
/**
* Create the exception formatter closure. This function will format the exception
* message and severity for display and return the two formatted strings in an array.
* Create the exception formatter closure. This function will format
* the exception message and severity for display and return the two
* formatted strings in an array.
*/
$formatter = function($e)
{
@ -32,20 +33,30 @@
};
/**
* Create the exception handler function. All of the handlers registered with PHP
* will call this handler when an error occurs so the code stays D.R.Y.
* Create the exception handler function. All of the handlers
* registered with PHP will call this handler when an error
* occurs so the code stays D.R.Y.
*/
$handler = function($e) use ($formatter)
{
list($severity, $message) = $formatter($e);
call_user_func(Config::get('error.handler'), $e, $severity, $message, Config::get('error'));
$config = Config::get('error');
if ($config['log'])
{
call_user_func($config['logger'], $e, $severity, $message, $config);
}
call_user_func($config['handler'], $e, $severity, $message, $config);
exit(1);
};
/**
* Register the 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 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.
*/
set_exception_handler(function($e) use ($handler)
{
@ -66,8 +77,9 @@
});
/**
* Set the error reporting and display levels. Since the framework will be displaying
* the exception messages, we don't want PHP to display any error information.
* Set the error reporting and display levels. Since the framework
* will be displaying the exception messages, we don't want PHP to
* display any error information.
*/
error_reporting(-1);

16
laravel/bootstrap/functions.php Normal file
View File

@ -0,0 +1,16 @@
<?php
function fe($function)
{
return function_exists($function);
}
function e($value)
{
return HTML::entities($value);
}
function __($key, $replacements = array(), $language = null)
{
return Lang::line($key, $replacements, $language);
}

12
laravel/database/connection.php
View File

@ -44,25 +44,25 @@ public function __construct(PDO $pdo, $config)
}
/**
* Execute a SQL query against the connection and return a scalar result.
* Execute a SQL query against the connection and return a single column result.
*
* <code>
* // Get the total number of rows on a table
* $count = DB::connection()->scalar('select count(*) from users');
* $count = DB::connection()->only('select count(*) from users');
*
* // Get the sum of payment amounts from a table
* $sum = DB::connection()->scalar('select sum(amount) from payments')
* $sum = DB::connection()->only('select sum(amount) from payments')
* </code>
*
* @param string $sql
* @param array $bindings
* @return float
* @return mixed
*/
public function scalar($sql, $bindings = array())
public function only($sql, $bindings = array())
{
$result = (array) $this->first($sql, $bindings);
return (float) reset($result);
return reset($result);
}
/**

2
laravel/database/grammars/grammar.php
View File

@ -113,7 +113,7 @@ final protected function wheres(Query $query)
//
// The only exception to this rule are "raw" where clauses, which are simply
// appended to the query as-is, without any further compiling.
foreach ($wheres as $where)
foreach ($query->wheres as $where)
{
$sql[] = ($where['type'] == 'raw') ? $where['sql'] : $where['connector'].' '.$this->{$where['type']}($where);
}

46
laravel/database/query.php
View File

@ -456,23 +456,16 @@ public function find($id, $columns = array('*'))
}
/**
* Get an aggregate value.
* Execute the query as a SELECT statement and return a single column.
*
* @param string $aggregate
* @param string $column
* @return mixed
*/
private function aggregate($aggregator, $column)
public function only($column)
{
$this->aggregate = compact('aggregator', 'column');
$this->select(array($column));
$result = $this->connection->scalar($this->grammar->select($this), $this->bindings);
// Reset the aggregate so more queries can be performed using the same instance.
// This is helpful for getting aggregates and then getting actual results.
$this->aggregate = null;
return $result;
return $this->connection->only($this->grammar->select($this), $this->bindings);
}
/**
@ -487,16 +480,7 @@ public function first($columns = array('*'))
{
$columns = (array) $columns;
$results = (count($results = $this->take(1)->get($columns)) > 0) ? $results[0] : null;
// If we have results and only a single column was selected from the database,
// we will simply return the value of that column for convenience.
if ( ! is_null($results) and count($columns) == 1 and $columns[0] !== '*')
{
return $results->{$columns[0]};
}
return $results;
return (count($results = $this->take(1)->get($columns)) > 0) ? $results[0] : null;
}
/**
@ -518,6 +502,26 @@ public function get($columns = array('*'))
return $results;
}
/**
* Get an aggregate value.
*
* @param string $aggregate
* @param string $column
* @return mixed
*/
private function aggregate($aggregator, $column)
{
$this->aggregate = compact('aggregator', 'column');
$result = $this->connection->only($this->grammar->select($this), $this->bindings);
// Reset the aggregate so more queries can be performed using the same instance.
// This is helpful for getting aggregates and then getting actual results.
$this->aggregate = null;
return $result;
}
/**
* Insert an array of values into the database table.
*

22
laravel/language/en/validation.php
View File

@ -2,11 +2,12 @@
return array(
/*
|--------------------------------------------------------------------------
| Validation Error Messages
|--------------------------------------------------------------------------
*/
/**
* The validation error messages.
*
* These error messages will be used by the Validator class if no
* other messages are provided by the developer.
*/
"accepted" => "The :attribute must be accepted.",
"active_url" => "The :attribute does not exist.",
@ -29,12 +30,11 @@
"unique" => "The :attribute has already been taken.",
"url" => "The :attribute format is invalid.",
/*
|--------------------------------------------------------------------------
| The following words are appended to the "size" messages when applicable,
| such as when validating string lengths or the size of file uploads.
|--------------------------------------------------------------------------
*/
/**
* The following words are appended to the "size" messages when
* applicable, such as when validating string lengths or the
* size of file uploads.
*/
"characters" => "characters",
"kilobytes" => "kilobytes",

46
laravel/laravel.php
View File

@ -1,15 +1,16 @@
<?php namespace Laravel;
/**
* Bootstrap the core framework components like the IoC container, configuration
* class, and the class auto-loader. Once this file has run, the framework is
* essentially ready for use.
* Bootstrap the core framework components like the IoC container,
* configuration class, and the class auto-loader. Once this file
* has run, the framework is essentially ready for use.
*/
require 'bootstrap/core.php';
/**
* Register the framework error handling methods and set the error_reporting levels.
* This file will register handlers for exceptions, errors, and shutdown.
* Register the framework error handling methods and set the
* error_reporting levels. This file will register handlers
* for exceptions, errors, and shutdown.
*/
require SYS_PATH.'bootstrap/errors'.EXT;
@ -19,9 +20,9 @@
date_default_timezone_set(Config::get('application.timezone'));
/**
* Load the session and session manager instance. The session payload will be
* registered in the IoC container as an instance so it can be retrieved easily
* throughout the application.
* Load the session and session manager instance. The session
* payload will be registered in the IoC container as an instance
* so it can be retrieved easily throughout the application.
*/
if (Config::get('session.driver') !== '')
{
@ -31,11 +32,18 @@
}
/**
* Resolve the incoming request instance from the IoC container and route the
* request to the proper route in the application. If a route is found, the route
* will be called with the current requst instance. If no route is found, the 404
* response will be returned to the browser.
* Resolve the incoming request instance from the IoC container
* and route the request to the proper route in the application.
* If a route is found, the route will be called with the current
* requst instance. If no route is found, the 404 response will
* be returned to the browser.
*/
require SYS_PATH.'request'.EXT;
require SYS_PATH.'routing/route'.EXT;
require SYS_PATH.'routing/router'.EXT;
require SYS_PATH.'routing/loader'.EXT;
require SYS_PATH.'routing/caller'.EXT;
$request = $container->core('request');
list($method, $uri) = array($request->method(), $request->uri());
@ -52,16 +60,18 @@
}
/**
* Stringify the response. We need to force the response to be stringed before
* closing the session, since the developer may be using the session within their
* views, so we cannot age the session data until the view is rendered.
* Stringify the response. We need to force the response to be
* stringed before closing the session, since the developer may
* be using the session within their views, so we cannot age
* the session data until the view is rendered.
*/
$response->content = $response->render();
/**
* Close the session and write the active payload to persistent storage. The input
* for the current request is also flashed to the session so it will be available
* for the next request via the Input::old method.
* Close the session and write the active payload to persistent
* storage. The input for the current request is also flashed
* to the session so it will be available for the next request
* via the Input::old method.
*/
if (isset($session))
{

12
laravel/security/auth.php
View File

@ -1,7 +1,7 @@
<?php namespace Laravel\Security;
use Laravel\Config;
use Laravel\Session\Driver;
use Laravel\Session\Payload;
class Auth {
@ -13,9 +13,9 @@ class Auth {
protected $user;
/**
* The session driver instance.
* The session payload instance.
*
* @var Session\Driver
* @var Session\Payload
*/
protected $session;
@ -29,10 +29,10 @@ class Auth {
/**
* Create a new authenticator instance.
*
* @param Session\Driver $session
* @param Session\Payload $session
* @return void
*/
public function __construct(Driver $session)
public function __construct(Payload $session)
{
$this->session = $session;
}
@ -105,7 +105,7 @@ public function remember($user)
*/
public function logout()
{
call_user_func(Config::get('auth.logout'), $this->user()->id);
call_user_func(Config::get('auth.logout'), $this->user());
$this->user = null;

3
laravel/session/drivers/apc.php
View File

@ -42,9 +42,10 @@ public function load($id)
*
* @param array $session
* @param array $config
* @param bool $exists
* @return void
*/
public function save($session, $config)
public function save($session, $config, $exists)
{
$this->apc->put($session['id'], $session, $config['lifetime']);
}

3
laravel/session/drivers/cookie.php
View File

@ -56,9 +56,10 @@ public function load($id)
*
* @param array $session
* @param array $config
* @param bool $exists
* @return void
*/
public function save($session, $config)
public function save($session, $config, $exists)
{
extract($config);

25
laravel/session/drivers/database.php
View File

@ -50,17 +50,26 @@ public function load($id)
*
* @param array $session
* @param array $config
* @param bool $exists
* @return void
*/
public function save($session, $config)
public function save($session, $config, $exists)
{
$this->delete($session['id']);
$this->table()->insert(array(
'id' => $session['id'],
'last_activity' => $session['last_activity'],
'data' => serialize($session['data'])
));
if ($exists)
{
$this->table()->where('id', '=', $session['id'])->update(array(
'last_activity' => $session['last_activity'],
'data' => serialize($session['data']),
));
}
else
{
$this->table()->insert(array(
'id' => $session['id'],
'last_activity' => $session['last_activity'],
'data' => serialize($session['data'])
));
}
}
/**

3
laravel/session/drivers/driver.php
View File

@ -17,9 +17,10 @@ public function load($id);
*
* @param array $session
* @param array $config
* @param bool $exists
* @return void
*/
public function save($session, $config);
public function save($session, $config, $exists);
/**
* Delete a session from storage by a given ID.

3
laravel/session/drivers/file.php
View File

@ -40,9 +40,10 @@ public function load($id)
*
* @param array $session
* @param array $config
* @param bool $exists
* @return void
*/
public function save($session, $config)
public function save($session, $config, $exists)
{
F::put($this->path.$session['id'], serialize($session), LOCK_EX);
}

3
laravel/session/drivers/memcached.php
View File

@ -38,9 +38,10 @@ public function load($id)
*
* @param array $session
* @param array $config
* @param bool $exists
* @return void
*/
public function save($session, $config)
public function save($session, $config, $exists)
{
$this->memcached->put($session['id'], $session, $config['lifetime']);
}

22
laravel/session/manager.php
View File

@ -28,6 +28,13 @@ class Manager {
*/
private $payload;
/**
* Indicates if the session exists in persistent storage.
*
* @var bool
*/
private $exists = true;
/**
* Create a new session manager instance.
*
@ -56,6 +63,8 @@ public function payload($config)
// string ID to uniquely identify it among the application's current users.
if (is_null($session) or $this->expired($session, $config))
{
$this->exists = false;
$session = array('id' => Str::random(40), 'data' => array());
}
@ -96,12 +105,19 @@ private function expired($session, $config)
*/
public function close(Payload $payload, $config, $flash = array())
{
foreach ($flash as $key => $value)
// If the session ID has been regenerated, we will need to inform the session driver
// that the session will need to be persisted to the data store as a new session.
if ($payload->regenerated)
{
$this->driver->flash($key, $value);
$this->exists = false;
}
$this->driver->save($payload->age(), $config);
foreach ($flash as $key => $value)
{
$payload->flash($key, $value);
}
$this->driver->save($payload->age(), $config, $this->exists);
$this->transporter->put($payload->session['id'], $config);

9
laravel/session/payload.php
View File

@ -12,6 +12,13 @@ class Payload {
*/
public $session = array();
/**
* Indicates if the session ID has been regenerated.
*
* @var bool
*/
public $regenerated = false;
/**
* Create a new session container instance.
*
@ -144,6 +151,8 @@ public function flush()
public function regenerate()
{
$this->session['id'] = Str::random(40);
$this->regenerated = true;
}
/**

2
laravel/validation/validator.php
View File

@ -535,7 +535,7 @@ protected function parse($rule)
* @param string $language
* @return Validator
*/
public function lang($language)
public function speaks($language)
{
$this->language = $language;
return $this;

4
public/index.php
View File

@ -43,4 +43,6 @@
| 3... 2... 1... Lift-off!
|--------------------------------------------------------------------------
*/
require $laravel.'/laravel.php';
require $laravel.'/laravel.php';
echo number_format((microtime(true) - START_TIME) * 1000, 2);