Skip to content

S
syncEnrollments
Commit 1e49001d authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

continued ioc refactoring.

parent fb3a0df0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1386 additions and 1044 deletions
application/config/database.php
View file @ 1e49001d
......@@ -2,6 +2,25 @@
return array(
/*
|--------------------------------------------------------------------------
| Database Manager Auto Load
|--------------------------------------------------------------------------
|
| Determines if the database manager will be loaded one every request.
|
| By default, the database manager is loaded on every request and set on
| a property of the application instance. However, if you will not be using
| any of the Laravel database facilities, you may set this to "false".
|
| Loading the database manager does not create database connections. The
| connections are only established once you request a connection from the
| database manager instance.
|
*/
'autoload' => true,
/*
|--------------------------------------------------------------------------
| Default Database Connection
......
application/config/error.php
View file @ 1e49001d
......@@ -4,36 +4,7 @@ return array(
/*
|--------------------------------------------------------------------------
| Error Detail
|--------------------------------------------------------------------------
|
| Detailed error messages contain information about the file in which
| an error occurs, a stack trace, and a snapshot of the source code
| in which the error occured.
|
| If your application is in production, consider turning off error details
| for enhanced security and user experience.
|
*/
'detail' => true,
/*
|--------------------------------------------------------------------------
| Error Logging
|--------------------------------------------------------------------------
|
| Error Logging will use the "logger" function defined below to log error
| messages, which gives you complete freedom to determine how error
| messages are logged. Enjoy the flexibility.
|
*/
'log' => false,
/*
|--------------------------------------------------------------------------
| Error Logger
| Error Handler
|--------------------------------------------------------------------------
|
| Because of the various ways of managing error logging, you get complete
......@@ -50,11 +21,11 @@ return array(
|
*/
'logger' => function($severity, $message, $trace)
'handler' => function($exception)
{
$file = IoC::resolve('laravel.file');
var_dump($exception);
$file->append(STORAGE_PATH.'log.txt', date('Y-m-d H:i:s').' '.$severity.' - '.$message.PHP_EOL);
exit(1);
},
);
\ No newline at end of file
application/filters.php
View file @ 1e49001d
<?php
use Laravel\Application;
use Laravel\Response;
return array(
/*
......@@ -42,13 +45,13 @@ return array(
|
*/
'before' => function(Laravel\Request $request)
'before' => function(Application $application)
{
// Do stuff before every request to your application.
},
'after' => function(Laravel\Request $request, Laravel\Response $response)
'after' => function(Application $application, Response $response)
{
// Do stuff after every request to your application.
},
......
application/routes.php
View file @ 1e49001d
......@@ -37,9 +37,9 @@ return array(
|
*/
'GET /' => function($request)
'GET /' => function($application)
{
return View::make('home.index');
return $application->view->make('home.index');
},
);
\ No newline at end of file
laravel/application.php 0 → 100644
View file @ 1e49001d
<?php namespace Laravel;
class Application {
/**
* The active request instance.
*
* @var Request
*/
public $request;
/**
* The application input manager.
*
* @var Input
*/
public $input;
/**
* The application configuration manager.
*
* @var Config
*/
public $config;
/**
* The application session driver.
*
* @var Session\Driver
*/
public $session;
/**
* The application cache manager.
*
* @var Cache\Driver
*/
public $cache;
/**
* The application database manager.
*/
public $database;
/**
* The application auto-loader.
*
* @var Loader
*/
public $loader;
/**
* The application IoC container.
*
* @var Container
*/
public $container;
/**
* Magic Method for resolving core classes out of the IoC container.
*/
public function __get($key)
{
if ($this->container->registered('laravel.'.$key))
{
return $this->container->resolve('laravel.'.$key);
}
elseif ($this->container->registered($key))
{
return $this->container->resolve($key);
}
throw new \Exception("Attempting to access undefined property [$key] on application instance.");
}
}
\ No newline at end of file
laravel/asset.php
View file @ 1e49001d
......@@ -33,7 +33,7 @@ class Asset {
{
if ( ! isset(static::$containers[$container]))
{
static::$containers[$container] = new Asset_Container($container, new File);
static::$containers[$container] = new Asset_Container($container);
}
return static::$containers[$container];
......@@ -78,13 +78,6 @@ class Asset_Container {
*/
public $assets = array();
/**
* The file manager instance.
*
* @var File
*/
private $file;
/**
* Create a new asset container instance.
*
......@@ -92,10 +85,9 @@ class Asset_Container {
* @param File $file
* @return void
*/
public function __construct($name, File $file)
public function __construct($name)
{
$this->name = $name;
$this->file = $file;
}
/**
......@@ -125,7 +117,7 @@ class Asset_Container {
*/
public function add($name, $source, $dependencies = array(), $attributes = array())
{
$type = ($this->file->extension($source) == 'css') ? 'style' : 'script';
$type = (pathinfo($source, PATHINFO_EXTENSION) == 'css') ? 'style' : 'script';
return call_user_func(array($this, $type), $name, $source, $dependencies, $attributes);
}
......
laravel/bootstrap/constants.php 0 → 100644
View file @ 1e49001d
<?php
// --------------------------------------------------------------
// Define the PHP file extension.
// --------------------------------------------------------------
define('EXT', '.php');
// --------------------------------------------------------------
// Define the core framework paths.
// --------------------------------------------------------------
define('APP_PATH', realpath($application).'/');
define('BASE_PATH', realpath(str_replace('laravel', '', $laravel)).'/');
define('PACKAGE_PATH', realpath($packages).'/');
define('PUBLIC_PATH', realpath($public).'/');
define('STORAGE_PATH', realpath($storage).'/');
define('SYS_PATH', realpath($laravel).'/');
unset($laravel, $application, $config, $packages, $public, $storage);
// --------------------------------------------------------------
// Define various other framework paths.
// --------------------------------------------------------------
define('CACHE_PATH', STORAGE_PATH.'cache/');
define('CONFIG_PATH', APP_PATH.'config/');
define('CONTROLLER_PATH', APP_PATH.'controllers/');
define('DATABASE_PATH', STORAGE_PATH.'database/');
define('LANG_PATH', APP_PATH.'language/');
define('SCRIPT_PATH', PUBLIC_PATH.'js/');
define('SESSION_PATH', STORAGE_PATH.'sessions/');
define('STYLE_PATH', PUBLIC_PATH.'css/');
define('SYS_CONFIG_PATH', SYS_PATH.'config/');
define('SYS_LANG_PATH', SYS_PATH.'language/');
define('VIEW_PATH', APP_PATH.'views/');
\ No newline at end of file
laravel/bootstrap/core.php 0 → 100644
View file @ 1e49001d
<?php namespace Laravel;
// --------------------------------------------------------------
// Bootstrap the application instance.
// --------------------------------------------------------------
require SYS_PATH.'application'.EXT;
$application = new Application;
// --------------------------------------------------------------
// Load the configuration manager and auto-loader.
// --------------------------------------------------------------
require SYS_PATH.'loader'.EXT;
require SYS_PATH.'config'.EXT;
require SYS_PATH.'arr'.EXT;
$application->config = new Config;
$paths = array(BASE_PATH, APP_PATH.'models/', APP_PATH.'libraries/');
$application->loader = new Loader($application->config->get('aliases'), $paths);
spl_autoload_register(array($application->loader, 'load'));
unset($paths);
// --------------------------------------------------------------
// Bootstrap the IoC container.
// --------------------------------------------------------------
require SYS_PATH.'container'.EXT;
$application->container = new Container($application->config->get('container'));
// --------------------------------------------------------------
// Register the core application components in the container.
// --------------------------------------------------------------
$application->container->instance('laravel.application', $application);
$application->container->instance('laravel.config', $application->config);
$application->container->instance('laravel.loader', $application->loader);
// --------------------------------------------------------------
// Set the global IoC container instance for emergency use.
// --------------------------------------------------------------
IoC::$container = $application->container;
\ No newline at end of file
laravel/cache/apc.php
View file @ 1e49001d
<?php namespace Laravel\Cache;
use Laravel\Config;
/**
* Wrap the APC functions in a class that can be injected into driver.
* Since the APC functions are global, the driver is untestable without
......@@ -55,15 +53,23 @@ class APC extends Driver {
*/
private $apc;
/**
* The cache key from the cache configuration file.
*
* @var string
*/
private $key;
/**
* Create a new APC cache driver instance.
*
* @param APC_Engine $apc
* @return void
*/
public function __construct(APC_Engine $apc)
public function __construct(APC_Engine $apc, $key)
{
$this->apc = $apc;
$this->key = $key;
}
/**
......@@ -90,7 +96,7 @@ class APC extends Driver {
*/
protected function retrieve($key)
{
return ( ! is_null($cache = $this->apc->get(Config::get('cache.key').$key))) ? $cache : null;
return ( ! is_null($cache = $this->apc->get($this->key.$key))) ? $cache : null;
}
/**
......@@ -108,7 +114,7 @@ class APC extends Driver {
*/
public function put($key, $value, $minutes)
{
$this->apc->put(Config::get('cache.key').$key, $value, $minutes * 60);
$this->apc->put($this->key.$key, $value, $minutes * 60);
}
/**
......@@ -119,7 +125,7 @@ class APC extends Driver {
*/
public function forget($key)
{
$this->apc->forget(Config::get('cache.key').$key);
$this->apc->forget($this->key.$key);
}
}
\ No newline at end of file
laravel/cache/file.php
View file @ 1e49001d
......@@ -9,15 +9,24 @@ class File extends Driver {
*/
private $file;
/**
* The path to which the cache files should be written.
*
* @var string
*/
private $path;
/**
* Create a new File cache driver instance.
*
* @param Laravel\File $file
* @param string $path
* @return void
*/
public function __construct(\Laravel\File $file)
public function __construct(\Laravel\File $file, $path)
{
$this->file = $file;
$this->path = $path;
}
/**
......@@ -44,9 +53,9 @@ class File extends Driver {
*/
protected function retrieve($key)
{
if ( ! $this->file->exists(CACHE_PATH.$key)) return null;
if ( ! $this->file->exists($this->path.$key)) return null;
if (time() >= substr($cache = $this->file->get(CACHE_PATH.$key), 0, 10))
if (time() >= substr($cache = $this->file->get($this->path.$key), 0, 10))
{
return $this->forget($key);
}
......@@ -69,7 +78,7 @@ class File extends Driver {
*/
public function put($key, $value, $minutes)
{
$this->file->put(CACHE_PATH.$key, (time() + ($minutes * 60)).serialize($value));
$this->file->put($this->path.$key, (time() + ($minutes * 60)).serialize($value));
}
/**
......@@ -80,7 +89,7 @@ class File extends Driver {
*/
public function forget($key)
{
$this->file->delete(CACHE_PATH.$key);
$this->file->delete($this->path.$key);
}
}
\ No newline at end of file
laravel/cache/manager.php
View file @ 1e49001d
<?php namespace Laravel\Cache;
use Laravel\IoC;
use Laravel\Config;
use Laravel\Container;
class Manager {
......@@ -10,7 +9,33 @@ class Manager {
*
* @var Cache\Driver
*/
public static $drivers = array();
public $drivers = array();
/**
* The application IoC container.
*
* @var Container
*/
private $container;
/**
* The default cache driver.
*
* @var string
*/
private $default;
/**
* Create a new cache manager instance.
*
* @param Container $container
* @return void
*/
public function __construct(Container $container, $default)
{
$this->default = $default;
$this->container = $container;
}
/**
* Get a cache driver instance.
......@@ -20,30 +45,30 @@ class Manager {
*
* <code>
* // Get the default cache driver
* $driver = Cache::driver();
* $driver = $application->cache->driver();
*
* // Get the APC cache driver
* $apc = Cache::driver('apc');
* $apc = $application->cache->driver('apc');
* </code>
*
* @param string $driver
* @return Cache\Driver
*/
public static function driver($driver = null)
public function driver($driver = null)
{
if (is_null($driver)) $driver = Config::get('cache.driver');
if (is_null($driver)) $driver = $this->default;
if ( ! array_key_exists($driver, static::$drivers))
if ( ! array_key_exists($driver, $this->drivers))
{
if ( ! in_array($driver, array('apc', 'file', 'memcached')))
{
throw new \Exception("Cache driver [$driver] is not supported.");
}
return static::$drivers[$driver] = IoC::container()->resolve('laravel.cache.'.$driver);
return $this->drivers[$driver] = $this->container->resolve('laravel.cache.'.$driver);
}
return static::$drivers[$driver];
return $this->drivers[$driver];
}
/**
......@@ -54,12 +79,12 @@ class Manager {
*
* <code>
* // Get an item from the default cache driver
* $name = Cache::get('name');
* $name = $application->cache->get('name');
* </code>
*/
public static function __callStatic($method, $parameters)
public function __call($method, $parameters)
{
return call_user_func_array(array(static::driver(), $method), $parameters);
return call_user_func_array(array($this->driver(), $method), $parameters);
}
}
\ No newline at end of file
laravel/cache/memcached.php
View file @ 1e49001d
<?php namespace Laravel\Cache;
use Memcache;
use Laravel\Config;
class Memcached extends Driver {
......@@ -11,14 +12,22 @@ class Memcached extends Driver {
*/
private $memcache;
/**
* The cache key from the cache configuration file.
*
* @var string
*/
private $key;
/**
* Create a new Memcached cache driver instance.
*
* @param Memcache $memcache
* @return void
*/
public function __construct(\Memcache $memcache)
public function __construct(Memcache $memcache, $key)
{
$this->key = $key;
$this->memcache = $memcache;
}
......@@ -46,7 +55,7 @@ class Memcached extends Driver {
*/
protected function retrieve($key)
{
return (($cache = $this->memcache->get(Config::get('cache.key').$key)) !== false) ? $cache : null;
return (($cache = $this->memcache->get($this->key.$key)) !== false) ? $cache : null;
}
/**
......@@ -64,7 +73,7 @@ class Memcached extends Driver {
*/
public function put($key, $value, $minutes)
{
$this->memcache->set(Config::get('cache.key').$key, $value, 0, $minutes * 60);
$this->memcache->set($this->key.$key, $value, 0, $minutes * 60);
}
/**
......@@ -75,7 +84,7 @@ class Memcached extends Driver {
*/
public function forget($key)
{
$this->memcache->delete(Config::get('cache.key').$key);
$this->memcache->delete($this->key.$key);
}
}
\ No newline at end of file
laravel/config.php
View file @ 1e49001d
......@@ -9,7 +9,7 @@ class Config {
*
* @var array
*/
public static $items = array();
public $items = array();
/**
* Determine if a configuration item or file exists.
......@@ -25,9 +25,9 @@ class Config {
* @param string $key
* @return bool
*/
public static function has($key)
public function has($key)
{
return ! is_null(static::get($key));
return ! is_null($this->get($key));
}
/**
......@@ -52,18 +52,18 @@ class Config {
* @param string $default
* @return array
*/
public static function get($key, $default = null)
public function get($key, $default = null)
{
list($file, $key) = static::parse($key);
list($file, $key) = $this->parse($key);
if ( ! static::load($file))
if ( ! $this->load($file))
{
return ($default instanceof \Closure) ? call_user_func($default) : $default;
}
if (is_null($key)) return static::$items[$file];
if (is_null($key)) return $this->items[$file];
return Arr::get(static::$items[$file], $key, $default);
return Arr::get($this->items[$file], $key, $default);
}
/**
......@@ -87,13 +87,13 @@ class Config {
* @param mixed $value
* @return void
*/
public static function set($key, $value)
public function set($key, $value)
{
list($file, $key) = static::parse($key);
list($file, $key) = $this->parse($key);
static::load($file);
$this->load($file);
(is_null($key)) ? Arr::set(static::$items, $file, $value) : Arr::set(static::$items[$file], $key, $value);
(is_null($key)) ? Arr::set($this->items, $file, $value) : Arr::set($this->items[$file], $key, $value);
}
/**
......@@ -104,7 +104,7 @@ class Config {
* @param string $key
* @return array
*/
private static function parse($key)
private function parse($key)
{
$segments = explode('.', $key);
......@@ -119,23 +119,23 @@ class Config {
* @param string $file
* @return bool
*/
private static function load($file)
private function load($file)
{
if (isset(static::$items[$file])) return true;
if (isset($this->items[$file])) return true;
$config = array();
foreach (static::paths() as $directory)
foreach ($this->paths() as $directory)
{
$config = (file_exists($path = $directory.$file.EXT)) ? array_merge($config, require $path) : $config;
}
if (count($config) > 0)
{
static::$items[$file] = $config;
$this->items[$file] = $config;
}
return isset(static::$items[$file]);
return isset($this->items[$file]);
}
/**
......@@ -149,7 +149,7 @@ class Config {
*
* @return array
*/
private static function paths()
private function paths()
{
$paths = array(SYS_CONFIG_PATH, CONFIG_PATH);
......
laravel/config/container.php
View file @ 1e49001d
......@@ -8,36 +8,73 @@ return array(
|--------------------------------------------------------------------------
*/
'laravel.file' => array('singleton' => true, 'resolver' => function()
'laravel.file' => array('singleton' => true, 'resolver' => function($container)
{
return new File;
return new File($container->resolve('laravel.config')->get('mimes'));
}),
/*
|--------------------------------------------------------------------------
| Laravel View Components
|--------------------------------------------------------------------------
*/
'laravel.composers' => array('singleton' => true, 'resolver' => function()
'laravel.form' => array('singleton' => true, 'resolver' => function($container)
{
return require APP_PATH.'composers'.EXT;
$request = $container->resolve('laravel.request');
$html = $container->resolve('laravel.html');
$url = $container->resolve('laravel.url');
$token = ($container->registered('laravel.session.driver')) ? $container->resolve('laravel.session.driver')->get('csrf_token') : null;
return new Form($request, $html, $url, $token);
}),
/*
|--------------------------------------------------------------------------
| Laravel Routing Components
|--------------------------------------------------------------------------
*/
'laravel.routing.router' => array('singleton' => true, 'resolver' => function($container)
'laravel.html' => array('singleton' => true, 'resolver' => function($container)
{
$encoding = $container->resolve('laravel.config')->get('application.encoding');
return new HTML($container->resolve('laravel.url'), $encoding);
}),
'laravel.package' => array('singleton' => true, 'resolver' => function()
{
return new Package;
}),
'laravel.responder' => array('singleton' => true, 'resolver' => function($container)
{
require_once SYS_PATH.'response'.PHP;
return new Response_Factory($container->resolve('laravel.view'), $container->resolve('laravel.file'));
}),
'laravel.router' => array('singleton' => true, 'resolver' => function($container)
{
return new Routing\Router($container->resolve('laravel.request'), require APP_PATH.'routes'.EXT, CONTROLLER_PATH);
}),
'laravel.url' => array('singleton' => true, 'resolver' => function($container)
{
return new Routing\Router($container->resolve('laravel.request'), require APP_PATH.'routes'.EXT);
$config = $container->resolve('laravel.config');
$request = $container->resolve('laravel.request');
$base = $config->get('application.url');
$index = $config->get('application.index');
return new URL($container->resolve('laravel.router'), $base, $index, $request->secure);
}),
'laravel.routing.handler' => array('resolver' => function($container)
'laravel.view' => array('singleton' => true, 'resolver' => function()
{
return new Routing\Handler($container->resolve('laravel.request'), require APP_PATH.'filters'.EXT);
require_once SYS_PATH.'view'.EXT;
return new View_Factory(require APP_PATH.'composers'.EXT, VIEW_PATH);
}),
/*
......@@ -53,22 +90,12 @@ return array(
return new Security\Auth(Session\Manager::driver(), $hasher);
}),
'laravel.security.hashing.engine' => array('resolver' => function()
{
return new Security\Hashing\BCrypt(10, false);
}),
/*
|--------------------------------------------------------------------------
| Laravel Session Components
|--------------------------------------------------------------------------
*/
'laravel.session.driver' => array('resolver' => function()
{
return Session\Manager::driver();
}),
/*
|--------------------------------------------------------------------------
| Laravel Cookie Session Components
......@@ -77,7 +104,11 @@ return array(
'laravel.session.cookie' => array('resolver' => function($container)
{
return new Session\Cookie(Security\Crypter::make(), $container->resolve('laravel.request')->input->cookies);
$cookies = $container->resolve('laravel.request')->input->cookies;
$config = $container->resolve('laravel.config')->get('session');
return new Session\Cookie(Security\Crypter::make(), $cookies, $config);
}),
/*
......@@ -88,12 +119,9 @@ return array(
'laravel.session.database' => array('resolver' => function($container)
{
return new Session\Database($container->resolve('laravel.session.database.connection'));
}),
$table = $container->resolve('laravel.config')->get('session.table');
'laravel.session.database.connection' => array('resolver' => function()
{
return Database\Manager::connection();
return new Session\Database($container->resolve('laravel.database.manager')->connection(), $table);
}),
/*
......@@ -102,14 +130,15 @@ return array(
|--------------------------------------------------------------------------
*/
'laravel.cache.file' => array('resolver' => function()
'laravel.cache.file' => array('resolver' => function($container)
{
return new Cache\File(new File);
return new Cache\File($container->resolve('laravel.file'), CACHE_PATH);
}),
'laravel.session.file' => array('resolver' => function()
'laravel.session.file' => array('resolver' => function($container)
{
return new Session\File(new File);
return new Session\File($container->resolve('laravel.file'), SESSION_PATH);
}),
/*
......@@ -120,17 +149,15 @@ return array(
'laravel.cache.apc' => array('resolver' => function($container)
{
return new Cache\APC($container->resolve('laravel.cache.apc_engine'));
return new Cache\APC(new Cache\APC_Engine, $container->resolve('laravel.config')->get('cache.key'));
}),
'laravel.cache.apc_engine' => array('resolver' => function()
{
return new Cache\APC_Engine;
}),
'laravel.session.apc' => array('resolver' => function($container)
{
return new Session\APC($container->resolve('laravel.cache.apc'));
$lifetime = $container->resolve('laravel.config')->get('session.lifetime');
return new Session\APC($container->resolve('laravel.cache.apc'), $lifetime);
}),
/*
......@@ -141,15 +168,23 @@ return array(
'laravel.cache.memcached' => array('resolver' => function($container)
{
return new Cache\Memcached($container->resolve('laravel.memcache'));
$connection = $container->resolve('laravel.cache.memcache.connection');
$key = $container->resolve('laravel.config')->get('cache.key');
return new Cache\Memcached($connection, $key);
}),
'laravel.session.memcached' => array('resolver' => function($container)
{
return new Session\Memcached($container->resolve('laravel.cache.memcached'));
$lifetime = $container->resolve('laravel.config')->get('session.lifetime');
return new Session\Memcached($container->resolve('laravel.cache.memcached'), $lifetime);
}),
'laravel.memcache' => array('singleton' => true, 'resolver' => function()
'laravel.cache.memcache.connection' => array('singleton' => true, 'resolver' => function()
{
if ( ! class_exists('Memcache'))
{
......
laravel/ioc.php → laravel/container.php
View file @ 1e49001d
......@@ -3,68 +3,33 @@
class IoC {
/**
* The available IoC containers.
* The active container instance.
*
* @var array
* @var Container
*/
public static $containers = array();
public static $container;
/**
* Bootstrap the default container and register the dependencies.
* Get the active container instance.
*
* @param array $dependencies
* @return void
*/
public static function bootstrap($dependencies)
{
$container = static::container();
foreach ($dependencies as $key => $value)
{
$container->register($key, $value['resolver'], (isset($value['singleton'])) ? $value['singleton'] : false);
}
}
/**
* Get a container instance.
*
* If no container name is specified, the default container will be returned.
*
* <code>
* // Get the default container instance
* $container = IoC::container();
*
* // Get a specific container instance
* $container = IoC::container('models');
* </code>
*
* @param string $container
* @return Container
*/
public static function container($container = 'default')
public static function container()
{
if ( ! array_key_exists($container, static::$containers))
{
static::$containers[$container] = new Container;
}
return static::$containers[$container];
return static::$container;
}
/**
* Magic Method for passing methods to the default container.
* Magic Method for calling methods on the active container instance.
*
* <code>
* // Resolve an object from the default container
* $user = IoC::resolve('user');
*
* // Equivalent method of resolving using the container method
* $user = IoC::container()->resolve('user');
* // Get the request registered in the container
* $request = IoC::resolve('laravel.request');
* </code>
*/
public static function __callStatic($method, $parameters)
{
return call_user_func_array(array(static::container(), $method), $parameters);
return call_user_func_array(array(static::$container, $method), $parameters);
}
}
......@@ -85,6 +50,20 @@ class Container {
*/
private $resolvers = array();
/**
* Create a new IoC container instance.
*
* @param array $dependencies
* @return void
*/
public function __construct($dependencies = array())
{
foreach ($dependencies as $key => $value)
{
$this->register($key, $value['resolver'], (isset($value['singleton'])) ? $value['singleton'] : false);
}
}
/**
* Register a dependency and its resolver.
*
......
laravel/controller.php
View file @ 1e49001d
......@@ -8,14 +8,26 @@ abstract class Controller {
* If a value is returned by the method, it will be halt the request process
* and will be considered the response to the request.
*
* @param Request $request
* @return mixed
*/
public function before($request) {}
public function before() {}
/**
* Magic Method for getting items from the application instance.
*/
public function __get($key)
{
$application = IoC::resolve('laravel.application');
return $application->$key;
}
/**
* Magic Method to handle calls to undefined functions on the controller.
*/
public function __call($method, $parameters) { return new Error('404'); }
public function __call($method, $parameters)
{
return IoC::resolve('laravel.application')->responder->error('404');
}
}
\ No newline at end of file
laravel/database/eloquent/model.php
View file @ 1e49001d
<?php namespace Laravel\Database\Eloquent;
use Laravel\IoC;
use Laravel\Str;
use Laravel\Config;
use Laravel\Inflector;
use Laravel\Database\Manager;
......
laravel/database/manager.php
View file @ 1e49001d
<?php namespace Laravel\Database;
use Laravel\Config;
class Manager {
/**
......@@ -9,7 +7,32 @@ class Manager {
*
* @var array
*/
public static $connections = array();
public $connections = array();
/**
* The database connection configurations.
*
* @var array
*/
private $config;
/**
* The default database connection name.
*
* @var string
*/
private $default;
/**
* Create a new database manager instance.
*
* @param string $default
*/
public function __construct($config, $default)
{
$this->config = $config;
$this->default = $default;
}
/**
* Get a database connection. If no database name is specified, the default
......@@ -28,23 +51,23 @@ class Manager {
* @param string $connection
* @return Database\Connection
*/
public static function connection($connection = null)
public function connection($connection = null)
{
if (is_null($connection)) $connection = Config::get('database.default');
if (is_null($connection)) $connection = $this->default;
if ( ! array_key_exists($connection, static::$connections))
if ( ! array_key_exists($connection, $this->connections))
{
if (is_null($config = Config::get('database.connections.'.$connection)))
if ( ! isset($this->config[$connection]))
{
throw new \Exception("Database connection [$connection] is not defined.");
}
$connector = Connector\Factory::make($config);
$connector = Connector\Factory::make($this->config[$connection]);
static::$connections[$connection] = new Connection($connection, $config, $connector);
static::$connections[$connection] = new Connection($connection, $this->config[$connection], $connector);
}
return static::$connections[$connection];
return $this->connections[$connection];
}
/**
......@@ -67,9 +90,9 @@ class Manager {
* @param string $connection
* @return Database\Query
*/
public static function table($table, $connection = null)
public function table($table, $connection = null)
{
return static::connection($connection)->table($table);
return $this->connection($connection)->table($table);
}
/**
......@@ -85,9 +108,9 @@ class Manager {
* $results = DB::connection()->query('select * from users');
* </code>
*/
public static function __callStatic($method, $parameters)
public function __call($method, $parameters)
{
return call_user_func_array(array(static::connection(), $method), $parameters);
return call_user_func_array(array($this->connection(), $method), $parameters);
}
}
\ No newline at end of file
laravel/database/query.php
View file @ 1e49001d
<?php namespace Laravel\Database;
use Laravel\IoC;
use Laravel\Str;
use Laravel\Config;
use Laravel\Request;
class Query {
/**
......
laravel/download.php deleted 100644 → 0
View file @ fb3a0df0
<?php namespace Laravel;
class Download extends Response {
/**
* Create a new download response instance.
*
* <code>
* // Return a download response for a given file
* return new Download('path/to/image.jpg');
*
* // Return a download response for a given file and assign a name
* return new Download('path/to/image.jpg', 'you.jpg');
* </code>
*
* @param string $path
* @param string $name
*/
public function __construct($path, $name = null)
{
if (is_null($name)) $name = basename($path);
$file = IoC::container()->resolve('laravel.file');
parent::__construct($file->get($path));
$this->header('Content-Description', 'File Transfer');
$this->header('Content-Type', $file->mime($file->extension($path)));
$this->header('Content-Disposition', 'attachment; filename="'.$name.'"');
$this->header('Content-Transfer-Encoding', 'binary');
$this->header('Expires', 0);
$this->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0');
$this->header('Pragma', 'public');
$this->header('Content-Length', $file->size($path));
}
}
\ No newline at end of file
laravel/error.php deleted 100644 → 0
View file @ fb3a0df0
<?php namespace Laravel;
class Error extends Response {
/**
* Create a new error response instance.
*
* The response status code will be set using the specified code.
*
* Note: The specified error code should correspond to a view in your views/error directory.
*
* <code>
* // Return a 404 error response
* return new Error('404');
* </code>
*
* @param int $code
* @param array $data
* @return void
*/
public function __construct($code, $data = array())
{
return parent::__construct(View::make('error/'.$code, $data), $code);
}
}
\ No newline at end of file
laravel/exception/examiner.php
View file @ 1e49001d
......@@ -11,13 +11,6 @@ class Examiner {
*/
public $exception;
/**
* The file manager instance.
*
* @var File
*/
private $file;
/**
* Human-readable error levels and descriptions.
*
......@@ -43,13 +36,11 @@ class Examiner {
* Create a new exception examiner instance.
*
* @param Exception $exception
* @param File $file
* @return void
*/
public function __construct($exception, File $file)
public function __construct($exception)
{
$this->exception = $exception;
$this->file = $file;
}
/**
......@@ -89,7 +80,19 @@ class Examiner {
*/
public function context()
{
return $this->file->snapshot($this->exception->getFile(), $this->exception->getLine());
list($path, $line) = array($this->exception->getFile(), $this->exception->getLine());
if ( ! file_exists($path)) return array();
$file = file($path, FILE_IGNORE_NEW_LINES);
array_unshift($file, '');
$start = $line - 5;
$length = ($line - $start) + 5 + 1;
return array_slice($file, ($start > 0) ? $start : 0, ($length > 0) ? $length : 0, true);
}
/**
......
laravel/file.php
View file @ 1e49001d
......@@ -2,6 +2,24 @@
class File {
/**
* All of the MIME types understood by the manager.
*
* @var array
*/
private $mimes;
/**
* Create a new file manager instance.
*
* @param array $mimes
* @return void
*/
public function __construct($mimes)
{
$this->mimes = $mimes;
}
/**
* Determine if a file exists.
*
......@@ -103,36 +121,6 @@ class File {
return filemtime($path);
}
/**
* Get the lines surrounding a given line in a file.
*
* The amount of padding with which to surround the line may also be specified.
*
* <code>
* // Get lines 10 - 20 of the "routes.php" file
* $lines = $file->snapshot(APP_PATH.'routes'.EXT, 15, 5);
* </code>
*
* @param string $path
* @param int $line
* @param int $padding
* @return array
*/
public function snapshot($path, $line, $padding = 5)
{
if ( ! file_exists($path)) return array();
$file = file($path, FILE_IGNORE_NEW_LINES);
array_unshift($file, '');
$start = $line - $padding;
$length = ($line - $start) + $padding + 1;
return array_slice($file, ($start > 0) ? $start : 0, ($length > 0) ? $length : 0, true);
}
/**
* Get a file MIME type by extension.
*
......@@ -149,11 +137,9 @@ class File {
*/
public function mime($extension, $default = 'application/octet-stream')
{
$mimes = Config::get('mimes');
if ( ! array_key_exists($extension, $mimes)) return $default;
if ( ! array_key_exists($extension, $this->mimes)) return $default;
return (is_array($mimes[$extension])) ? $mimes[$extension][0] : $mimes[$extension];
return (is_array($this->mimes[$extension])) ? $this->mimes[$extension][0] : $this->mimes[$extension];
}
/**
......@@ -173,16 +159,14 @@ class File {
*/
public function is($extension, $path)
{
$mimes = Config::get('mimes');
if ( ! array_key_exists($extension, $mimes))
if ( ! array_key_exists($extension, $this->mimes))
{
throw new \Exception("File extension [$extension] is unknown. Cannot determine file type.");
}
$mime = finfo_file(finfo_open(FILEINFO_MIME_TYPE), $path);
return (is_array($mimes[$extension])) ? in_array($mime, $mimes[$extension]) : $mime === $mimes[$extension];
return (is_array($this->mimes[$extension])) ? in_array($mime, $this->mimes[$extension]) : $mime === $this->mimes[$extension];
}
}
\ No newline at end of file
laravel/form.php
View file @ 1e49001d
This diff is collapsed.
laravel/html.php
View file @ 1e49001d
......@@ -2,6 +2,32 @@
class HTML {
/**
* The encoding being used by the application.
*
* @var string
*/
private $encoding;
/**
* The URL generator instance.
*
* @var URL
*/
private $url;
/**
* Create a new HTML writer instance.
*
* @param string $encoding
* @return void
*/
public function __construct(URL $url, $encoding)
{
$this->url = $url;
$this->encoding = $encoding;
}
/**
* Convert HTML characters to entities.
*
......@@ -10,9 +36,9 @@ class HTML {
* @param string $value
* @return string
*/
public static function entities($value)
public function entities($value)
{
return htmlentities($value, ENT_QUOTES, Config::get('application.encoding'), false);
return htmlentities($value, ENT_QUOTES, $this->encoding, false);
}
/**
......@@ -22,11 +48,11 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function script($url, $attributes = array())
public function script($url, $attributes = array())
{
$url = static::entities(URL::to_asset($url));
$url = $this->entities($this->url->to_asset($url));
return '<script type="text/javascript" src="'.$url.'"'.static::attributes($attributes).'></script>'.PHP_EOL;
return '<script type="text/javascript" src="'.$url.'"'.$this->attributes($attributes).'></script>'.PHP_EOL;
}
/**
......@@ -36,13 +62,13 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function style($url, $attributes = array())
public function style($url, $attributes = array())
{
if ( ! array_key_exists('media', $attributes)) $attributes['media'] = 'all';
$attributes = array_merge($attributes, array('rel' => 'stylesheet', 'type' => 'text/css'));
return '<link href="'.static::entities(URL::to_asset($url)).'"'.static::attributes($attributes).'>'.PHP_EOL;
return '<link href="'.$this->entities($this->url->to_asset($url)).'"'.$this->attributes($attributes).'>'.PHP_EOL;
}
/**
......@@ -52,9 +78,9 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function span($value, $attributes = array())
public function span($value, $attributes = array())
{
return '<span'.static::attributes($attributes).'>'.static::entities($value).'</span>';
return '<span'.$this->attributes($attributes).'>'.$this->entities($value).'</span>';
}
/**
......@@ -67,11 +93,11 @@ class HTML {
* @param bool $asset
* @return string
*/
public static function link($url, $title, $attributes = array(), $https = false, $asset = false)
public function link($url, $title, $attributes = array(), $https = false, $asset = false)
{
$url = static::entities(URL::to($url, $https, $asset));
$url = $this->entities($this->url->to($url, $https, $asset));
return '<a href="'.$url.'"'.static::attributes($attributes).'>'.static::entities($title).'</a>';
return '<a href="'.$url.'"'.$this->attributes($attributes).'>'.$this->entities($title).'</a>';
}
/**
......@@ -82,9 +108,9 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function link_to_secure($url, $title, $attributes = array())
public function link_to_secure($url, $title, $attributes = array())
{
return static::link($url, $title, $attributes, true);
return $this->link($url, $title, $attributes, true);
}
/**
......@@ -95,9 +121,9 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function link_to_asset($url, $title, $attributes = array(), $https = false)
public function link_to_asset($url, $title, $attributes = array(), $https = false)
{
return static::link($url, $title, $attributes, $https, true);
return $this->link($url, $title, $attributes, $https, true);
}
/**
......@@ -108,9 +134,9 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function link_to_secure_asset($url, $title, $attributes = array())
public function link_to_secure_asset($url, $title, $attributes = array())
{
return static::link_to_asset($url, $title, $attributes, true);
return $this->link_to_asset($url, $title, $attributes, true);
}
/**
......@@ -132,9 +158,9 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function link_to_route($name, $title, $parameters = array(), $attributes = array(), $https = false)
public function link_to_route($name, $title, $parameters = array(), $attributes = array(), $https = false)
{
return static::link(URL::to_route($name, $parameters, $https), $title, $attributes);
return $this->link($this->url->to_route($name, $parameters, $https), $title, $attributes);
}
/**
......@@ -146,9 +172,9 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function link_to_secure_route($name, $title, $parameters = array(), $attributes = array())
public function link_to_secure_route($name, $title, $parameters = array(), $attributes = array())
{
return static::link_to_route($name, $title, $parameters, $attributes, true);
return $this->link_to_route($name, $title, $parameters, $attributes, true);
}
/**
......@@ -161,15 +187,15 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function mailto($email, $title = null, $attributes = array())
public function mailto($email, $title = null, $attributes = array())
{
$email = static::email($email);
$email = $this->email($email);
if (is_null($title)) $title = $email;
$email = '&#109;&#097;&#105;&#108;&#116;&#111;&#058;'.$email;
return '<a href="'.$email.'"'.static::attributes($attributes).'>'.static::entities($title).'</a>';
return '<a href="'.$email.'"'.$this->attributes($attributes).'>'.$this->entities($title).'</a>';
}
/**
......@@ -178,9 +204,9 @@ class HTML {
* @param string $email
* @return string
*/
public static function email($email)
public function email($email)
{
return str_replace('@', '&#64;', static::obfuscate($email));
return str_replace('@', '&#64;', $this->obfuscate($email));
}
/**
......@@ -191,11 +217,11 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function image($url, $alt = '', $attributes = array())
public function image($url, $alt = '', $attributes = array())
{
$attributes['alt'] = static::entities($alt);
$attributes['alt'] = $this->entities($alt);
return '<img src="'.static::entities(URL::to_asset($url)).'"'.static::attributes($attributes).'>';
return '<img src="'.$this->entities($this->url->to_asset($url)).'"'.$this->attributes($attributes).'>';
}
/**
......@@ -205,9 +231,9 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function ol($list, $attributes = array())
public function ol($list, $attributes = array())
{
return static::list_elements('ol', $list, $attributes);
return $this->list_elements('ol', $list, $attributes);
}
/**
......@@ -217,9 +243,9 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function ul($list, $attributes = array())
public function ul($list, $attributes = array())
{
return static::list_elements('ul', $list, $attributes);
return $this->list_elements('ul', $list, $attributes);
}
/**
......@@ -230,16 +256,16 @@ class HTML {
* @param array $attributes
* @return string
*/
private static function list_elements($type, $list, $attributes = array())
private function list_elements($type, $list, $attributes = array())
{
$html = '';
foreach ($list as $key => $value)
{
$html .= (is_array($value)) ? static::list_elements($type, $value) : '<li>'.static::entities($value).'</li>';
$html .= (is_array($value)) ? $this->list_elements($type, $value) : '<li>'.$this->entities($value).'</li>';
}
return '<'.$type.static::attributes($attributes).'>'.$html.'</'.$type.'>';
return '<'.$type.$this->attributes($attributes).'>'.$html.'</'.$type.'>';
}
/**
......@@ -248,7 +274,7 @@ class HTML {
* @param array $attributes
* @return string
*/
public static function attributes($attributes)
public function attributes($attributes)
{
$html = array();
......@@ -260,7 +286,7 @@ class HTML {
if ( ! is_null($value))
{
$html[] = $key.'="'.static::entities($value).'"';
$html[] = $key.'="'.$this->entities($value).'"';
}
}
......@@ -273,7 +299,7 @@ class HTML {
* @param string $value
* @return string
*/
public static function obfuscate($value)
public function obfuscate($value)
{
$safe = '';
......@@ -313,23 +339,23 @@ class HTML {
* echo HTML::link_to_profile('Profile', array('taylor'));
* </code>
*/
public static function __callStatic($method, $parameters)
public function __call($method, $parameters)
{
if (strpos($method, 'link_to_secure_') === 0)
{
array_unshift($parameters, substr($method, 15));
return forward_static_call_array('HTML::link_to_secure_route', $parameters);
return call_user_func_array(array($this, 'link_to_secure_route'), $parameters);
}
if (strpos($method, 'link_to_') === 0)
{
array_unshift($parameters, substr($method, 8));
return forward_static_call_array('HTML::link_to_route', $parameters);
return call_user_func_array(array($this, 'link_to_route'), $parameters);
}
throw new \Exception("Static method [$method] is not defined on the HTML class.");
throw new \Exception("Method [$method] is not defined on the HTML class.");
}
}
\ No newline at end of file
laravel/input.php
View file @ 1e49001d
......@@ -7,7 +7,7 @@ class Input {
*
* @var array
*/
public $input;
private $input;
/**
* The $_GET array for the request.
......@@ -40,33 +40,16 @@ class Input {
/**
* Create a new Input instance.
*
* @param string $method
* @param bool $spoofed
* @param array $get
* @param array $post
* @param array $input
* @param array $files
* @param Cookie $cookies
* @return void
*/
public function __construct($method, $spoofed, $get, $post, $files, Cookie $cookies)
public function __construct($input, $files, Cookie $cookies)
{
$this->get = $get;
$this->post = $post;
$this->input = $input;
$this->files = $files;
$this->cookies = $cookies;
if ($method == 'GET')
{
$this->input = $this->get;
}
elseif ($method == 'POST')
{
$this->input = $this->post;
}
elseif ($method == 'PUT' or $method == 'DELETE')
{
($spoofed) ? $this->input = $this->post : parse_str(file_get_contents('php://input'), $this->input);
}
}
/**
......
laravel/laravel.php
View file @ 1e49001d
<?php namespace Laravel;
// --------------------------------------------------------------
// Define the PHP file extension.
// Define the framework constants.
// --------------------------------------------------------------
define('EXT', '.php');
require 'bootstrap/constants.php';
// --------------------------------------------------------------
// Define the core framework paths.
// Load the application and the core application components.
// --------------------------------------------------------------
define('APP_PATH', realpath($application).'/');
define('BASE_PATH', realpath(str_replace('laravel', '', $laravel)).'/');
define('PACKAGE_PATH', realpath($packages).'/');
define('PUBLIC_PATH', realpath($public).'/');
define('STORAGE_PATH', realpath($storage).'/');
define('SYS_PATH', realpath($laravel).'/');
unset($laravel, $application, $config, $packages, $public, $storage);
// --------------------------------------------------------------
// Define various other framework paths.
// --------------------------------------------------------------
define('CACHE_PATH', STORAGE_PATH.'cache/');
define('CONFIG_PATH', APP_PATH.'config/');
define('CONTROLLER_PATH', APP_PATH.'controllers/');
define('DATABASE_PATH', STORAGE_PATH.'database/');
define('LANG_PATH', APP_PATH.'language/');
define('SCRIPT_PATH', PUBLIC_PATH.'js/');
define('SESSION_PATH', STORAGE_PATH.'sessions/');
define('STYLE_PATH', PUBLIC_PATH.'css/');
define('SYS_CONFIG_PATH', SYS_PATH.'config/');
define('SYS_LANG_PATH', SYS_PATH.'language/');
define('VIEW_PATH', APP_PATH.'views/');
// --------------------------------------------------------------
// Load the classes used by the auto-loader.
// --------------------------------------------------------------
require SYS_PATH.'loader'.EXT;
require SYS_PATH.'config'.EXT;
require SYS_PATH.'arr'.EXT;
// --------------------------------------------------------------
// Register the auto-loader.
// --------------------------------------------------------------
Loader::bootstrap(Config::get('aliases'), array(APP_PATH.'libraries/', APP_PATH.'models/'));
spl_autoload_register(array('Laravel\\Loader', 'load'));
// --------------------------------------------------------------
// Bootstrap the IoC container.
// --------------------------------------------------------------
require SYS_PATH.'ioc'.EXT;
IoC::bootstrap(Config::get('container'));
require SYS_PATH.'bootstrap/core'.EXT;
// --------------------------------------------------------------
// Set the error reporting and display levels.
......@@ -63,92 +20,122 @@ ini_set('display_errors', 'Off');
// --------------------------------------------------------------
// Register the error / exception handlers.
// --------------------------------------------------------------
$error_dependencies = function()
{
require_once SYS_PATH.'exception/handler'.EXT;
require_once SYS_PATH.'exception/examiner'.EXT;
require_once SYS_PATH.'file'.EXT;
};
set_exception_handler(function($e) use ($error_dependencies)
set_exception_handler(function($e) use ($application)
{
call_user_func($error_dependencies);
Exception\Handler::make(new Exception\Examiner($e, new File))->handle();
call_user_func($application->config->get('error.handler'), $e);
});
set_error_handler(function($number, $error, $file, $line) use ($error_dependencies)
set_error_handler(function($number, $error, $file, $line) use ($application)
{
call_user_func($error_dependencies);
$exception = new \ErrorException($error, $number, 0, $file, $line);
$e = new \ErrorException($error, $number, 0, $file, $line);
Exception\Handler::make(new Exception\Examiner($e, new File))->handle();
call_user_func($application->config->get('error.handler'), $exception);
});
register_shutdown_function(function() use ($error_dependencies)
register_shutdown_function(function() use ($application)
{
if ( ! is_null($error = error_get_last()))
{
call_user_func($error_dependencies);
$e = new \ErrorException($error['message'], $error['type'], 0, $error['file'], $error['line']);
$exception = new \ErrorException($error['message'], $error['type'], 0, $error['file'], $error['line']);
Exception\Handler::make(new Exception\Examiner($e, new File))->handle();
call_user_func($application->config->get('error.handler'), $exception);
}
});
// --------------------------------------------------------------
// Set the default timezone.
// --------------------------------------------------------------
date_default_timezone_set(Config::get('application.timezone'));
date_default_timezone_set($application->config->get('application.timezone'));
// --------------------------------------------------------------
// Load all of the core routing and response classes.
// Initialize the request instance for the request.
// --------------------------------------------------------------
require SYS_PATH.'input'.EXT;
require SYS_PATH.'request'.EXT;
require SYS_PATH.'response'.EXT;
require SYS_PATH.'routing/route'.EXT;
require SYS_PATH.'routing/router'.EXT;
require SYS_PATH.'routing/handler'.EXT;
$application->request = new Request($_SERVER, $application->config->get('application.url'));
$application->container->instance('laravel.request', $application->request);
// --------------------------------------------------------------
// Initialize the request instance for the request.
// Hydrate the input for the current request.
// --------------------------------------------------------------
$input = array();
if ($application->request->method == 'GET')
{
$input = $_GET;
}
elseif ($application->request->method == 'POST')
{
$input = $_POST;
}
elseif ($application->request->method == 'PUT' or $application->request->method == 'DELETE')
{
($application->request->spoofed) ? $input = $_POST : parse_str(file_get_contents('php://input'), $input);
}
$application->input = new Input($input, $_FILES, new Cookie($_COOKIE));
$application->container->instance('laravel.input', $application->input);
// --------------------------------------------------------------
$request = new Request($_SERVER);
// Load the cache manager.
// --------------------------------------------------------------
$application->cache = new Cache\Manager($application->container, $application->config->get('cache.driver'));
IoC::container()->instance('laravel.request', $request);
$application->container->instance('laravel.cache.manager', $application->cache);
// --------------------------------------------------------------
// Hydrate the input for the current request.
// Load the database manager.
// --------------------------------------------------------------
$request->input = new Input($request->method(), $request->is_spoofed(), $_GET, $_POST, $_FILES, new Cookie($_COOKIE));
if ($application->config->get('database.autoload'))
{
$connections = $application->config->get('database.connections');
$application->database = new Database\Manager($connections, $application->config->get('database.default'));
$application->container->instance('laravel.database.manager', $application->database);
unset($connections);
}
// --------------------------------------------------------------
// Load the session.
// Load the session and session manager.
// --------------------------------------------------------------
if (Config::get('session.driver') != '')
if ($application->config->get('session.driver') !== '')
{
Session\Manager::driver()->start($request->input->cookies->get('laravel_session'));
$application->session = Session\Manager::driver($application->container, $application->config->get('session.driver'));
$application->container->instance('laravel.session.driver', $application->session);
$application->session->start($application->input->cookies->get('laravel_session'), $application->config->get('session.lifetime'));
}
// --------------------------------------------------------------
// Load the packages that are in the auto-loaded packages array.
// --------------------------------------------------------------
if (count(Config::get('application.packages')) > 0)
{
require SYS_PATH.'package'.EXT;
$packages = $application->config->get('application.packages');
Package::load(Config::get('application.packages'));
if (count($packages) > 0)
{
$application->package->load($packages);
}
unset($packages);
// --------------------------------------------------------------
// Route the request and get the response from the route.
// --------------------------------------------------------------
$route = IoC::container()->resolve('laravel.routing.router')->route();
$route = $application->container->resolve('laravel.router')->route();
if ( ! is_null($route))
{
$route->filters = require APP_PATH.'filters'.EXT;
$response = ( ! is_null($route)) ? IoC::container()->resolve('laravel.routing.handler')->handle($route) : new Error('404');
$response = $route->call($application);
}
else
{
$response = new Error('404');
}
// --------------------------------------------------------------
// Stringify the response.
......@@ -158,18 +145,9 @@ $response->content = $response->render();
// --------------------------------------------------------------
// Close the session.
// --------------------------------------------------------------
if (Config::get('session.driver') != '')
if ( ! is_null($application->session))
{
$driver = Session\Manager::driver();
$driver->flash('laravel_old_input', $request->input->get());
$driver->close($request->input->cookies);
if ($driver instanceof Session\Sweeper and mt_rand(1, 100) <= 2)
{
$driver->sweep(time() - (Config::get('session.lifetime') * 60));
}
$application->session->close($application->input, $application->config->get('session'));
}
// --------------------------------------------------------------
......
laravel/loader.php
View file @ 1e49001d
......@@ -7,27 +7,24 @@ class Loader {
*
* @var array
*/
public static $paths = array(BASE_PATH);
public $paths;
/**
* All of the class aliases.
*
* @var array
*/
public static $aliases = array();
public $aliases;
/**
* Bootstrap the auto-loader.
*
* @param array $aliases
* @param array $paths
* @return void
*/
public static function bootstrap($aliases, $paths)
public function __construct($aliases, $paths)
{
static::$aliases = $aliases;
foreach ($paths as $path) { static::register_path($path); }
$this->paths = $paths;
$this->aliases = $aliases;
}
/**
......@@ -39,16 +36,16 @@ class Loader {
* @param string $class
* @return void
*/
public static function load($class)
public function load($class)
{
$file = strtolower(str_replace('\\', '/', $class));
if (array_key_exists($class, static::$aliases))
if (array_key_exists($class, $this->aliases))
{
return class_alias(static::$aliases[$class], $class);
return class_alias($this->aliases[$class], $class);
}
foreach (static::$paths as $directory)
foreach ($this->paths as $directory)
{
if (file_exists($path = $directory.$file.EXT))
{
......@@ -67,9 +64,9 @@ class Loader {
* @param string $path
* @return void
*/
public static function register_path($path)
public function register_path($path)
{
static::$paths[] = rtrim($path, '/').'/';
$this->paths[] = rtrim($path, '/').'/';
}
/**
......@@ -78,9 +75,9 @@ class Loader {
* @param array $alias
* @return void
*/
public static function register_alias($alias)
public function register_alias($alias)
{
static::$aliases = array_merge(static::$aliases, $alias);
$this->aliases = array_merge($this->aliases, $alias);
}
/**
......@@ -89,9 +86,9 @@ class Loader {
* @param string $alias
* @return void
*/
public static function forget_alias($alias)
public function forget_alias($alias)
{
unset(static::$aliases[$alias]);
unset($this->aliases[$alias]);
}
}
\ No newline at end of file
laravel/package.php
View file @ 1e49001d
......@@ -7,7 +7,7 @@ class Package {
*
* @var array
*/
public static $loaded = array();
public $loaded = array();
/**
* Load a package or set of packages.
......@@ -26,16 +26,16 @@ class Package {
* @param string $path
* @return void
*/
public static function load($packages, $path = PACKAGE_PATH)
public function load($packages, $path = PACKAGE_PATH)
{
foreach ((array) $packages as $package)
{
if ( ! static::loaded($package) and file_exists($bootstrap = $path.$package.'/bootstrap'.EXT))
if ( ! $this->loaded($package) and file_exists($bootstrap = $path.$package.'/bootstrap'.EXT))
{
require $bootstrap;
}
static::$loaded[] = $package;
$this->loaded[] = $package;
}
}
......@@ -50,9 +50,9 @@ class Package {
* @param string $package
* @return bool
*/
public static function loaded($package)
public function loaded($package)
{
return array_key_exists($package, static::$loaded);
return array_key_exists($package, $this->loaded);
}
}
\ No newline at end of file
laravel/request.php
View file @ 1e49001d
......@@ -3,18 +3,46 @@
class Request {
/**
* The request instance for the current request.
* The request URI.
*
* @var Request
* @var string
*/
private static $active;
public $uri;
/**
* The $_SERVER array for the request.
* The request method (GET, POST, PUT, or DELETE).
*
* @var array
* @var string
*/
public $method;
/**
* Indicates if the request method is being spoofed by a hidden form element.
*
* @var bool
*/
public $spoofed;
/**
* The requestor's IP address.
*
* @var string
*/
private $server;
public $ip;
/**
* Indicates if the request is using HTTPS.
*
* @var bool
*/
public $secure;
/**
* Indicates if the request is an AJAX request.
*
* @var bool
*/
public $ajax;
/**
* The input instance for the request.
......@@ -24,51 +52,53 @@ class Request {
public $input;
/**
* The route handling the current request.
* The $_SERVER array for the request.
*
* @var Routing\Route
* @var array
*/
public $route;
public $server;
/**
* The request URI.
* The route handling the current request.
*
* @var string
* @var Routing\Route
*/
private $uri;
public $route;
/**
* Create a new request instance.
*
* @param array $server
* @param array $server
* @param string $url
* @return void
*/
public function __construct($server)
public function __construct($server, $url)
{
$this->server = $server;
static::$active = $this;
}
$this->uri = $this->uri($url);
/**
* Get the request instance for the current request.
*
* @return Request
*/
public static function active()
{
return static::$active;
foreach (array('method', 'spoofed', 'ip', 'secure', 'ajax') as $item)
{
$this->$item = $this->$item();
}
}
/**
* Get the raw request URI.
* Determine the request URI.
*
* The request URI will be trimmed to remove to the application URL and application index file.
* If the request is to the root of the application, the URI will be set to a forward slash.
*
* If the $_SERVER "PATH_INFO" variable is available, it will be used; otherwise, we will try
* to determine the URI using the REQUEST_URI variable. If neither are available, an exception
* will be thrown by the method.
*
* @param string $url
* @return string
*/
public function uri()
private function uri($url)
{
if ( ! is_null($this->uri)) return $this->uri;
if (isset($this->server['PATH_INFO']))
{
$uri = $this->server['PATH_INFO'];
......@@ -84,36 +114,26 @@ class Request {
if ($uri === false) throw new \Exception('Malformed request URI. Request terminated.');
return $this->uri = $this->remove_from_uri($uri, array(parse_url(Config::get('application.url'), PHP_URL_PATH), '/index.php'));
}
/**
* Remove an array of values from the beginning from a URI.
*
* @param string $uri
* @param array $values
* @return string
*/
private function remove_from_uri($uri, $values)
{
foreach ($values as $value)
foreach (array(parse_url($url, PHP_URL_PATH), '/index.php') as $value)
{
$uri = (strpos($uri, $value) === 0) ? substr($uri, strlen($value)) : $uri;
}
return $uri;
return (($uri = trim($uri, '/')) == '') ? '/' : $uri;
}
/**
* Get the request method.
*
* Note: If the request method is being spoofed, the spoofed method will be returned.
* Typically, this will be the value of the REQUEST_METHOD $_SERVER variable.
* However, when the request is being spoofed by a hidden form value, the request
* method will be stored in the $_POST array.
*
* @return string
*/
public function method()
private function method()
{
return ($this->is_spoofed()) ? $_POST['REQUEST_METHOD'] : $this->server['REQUEST_METHOD'];
return ($this->spoofed()) ? $_POST['REQUEST_METHOD'] : $this->server['REQUEST_METHOD'];
}
/**
......@@ -123,7 +143,7 @@ class Request {
*
* @return bool
*/
public function is_spoofed()
private function spoofed()
{
return is_array($_POST) and array_key_exists('REQUEST_METHOD', $_POST);
}
......@@ -133,7 +153,7 @@ class Request {
*
* @return string
*/
public function ip()
private function ip()
{
if (isset($this->server['HTTP_X_FORWARDED_FOR']))
{
......@@ -150,11 +170,11 @@ class Request {
}
/**
* Get the HTTP protocol for the request (http or https).
* Get the HTTP protocol for the request.
*
* @return string
*/
public function protocol()
private function protocol()
{
return (isset($this->server['HTTPS']) and $this->server['HTTPS'] !== 'off') ? 'https' : 'http';
}
......@@ -164,7 +184,7 @@ class Request {
*
* @return bool
*/
public function is_secure()
private function secure()
{
return ($this->protocol() == 'https');
}
......@@ -174,9 +194,11 @@ class Request {
*
* @return bool
*/
public function is_ajax()
private function ajax()
{
return (isset($this->server['HTTP_X_REQUESTED_WITH']) and strtolower($this->server['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest');
if ( ! isset($this->server['HTTP_X_REQUESTED_WITH'])) return false;
return strtolower($this->server['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest';
}
/**
......
laravel/response.php
View file @ 1e49001d
<?php namespace Laravel;
interface Renderable {
class Response_Factory {
/**
* Get the evaluated string contents of the object.
* The view factory instance.
*
* @return string
* @var View_Factory
*/
private $view;
/**
* The file manager instance.
*
* @var File
*/
public function render();
private $file;
/**
* Create a new response factory instance.
*
* @param File $file
* @return void
*/
public function __construct(View_Factory $view, File $file)
{
$this->view = $view;
$this->file = $file;
}
/**
* Create a new response instance.
*
* @param mixed $content
* @param int $status
* @return Response
*/
public function make($content, $status = 200)
{
return new Response($content, $status);
}
/**
* Create a new download response instance.
*
* <code>
* // Return a download response for a given file
* return new Download('path/to/image.jpg');
*
* // Return a download response for a given file and assign a name
* return new Download('path/to/image.jpg', 'you.jpg');
* </code>
*
* @param string $path
* @param string $name
* @return Response
*/
public function download($path, $name = null)
{
if (is_null($name)) $name = basename($path);
$response = new Response($this->file->get($path));
$response->header('Content-Description', 'File Transfer');
$response->header('Content-Type', $this->file->mime($this->file->extension($path)));
$response->header('Content-Disposition', 'attachment; filename="'.$name.'"');
$response->header('Content-Transfer-Encoding', 'binary');
$response->header('Expires', 0);
$response->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0');
$response->header('Pragma', 'public');
$response->header('Content-Length', $this->file->size($path));
return $response;
}
/**
* Create a new error response instance.
*
* The response status code will be set using the specified code.
*
* Note: The specified error code should correspond to a view in your views/error directory.
*
* <code>
* // Return a 404 error response
* return new Error('404');
* </code>
*
* @param int $code
* @param array $data
* @return void
*/
public function error($code, $data = array())
{
return new Response($this->view->make('error/'.$code, $data), $code);
}
}
class Response implements Renderable {
class Response {
/**
* The content of the response.
......@@ -100,30 +185,14 @@ class Response implements Renderable {
$this->status = $status;
}
/**
* Factory for creating new response instances.
*
* @param string $content
* @param int $status
* @return Response
*/
public static function make($content, $status = 200)
{
return new static($content, $status);
}
/**
* Get the evaluated string contents of the response.
*
* If the content implements the Renderable interface, the render method will be called
* on the content and the result will be returned. Otherwise, the content will be cast
* to a string and returned.
*
* @return string
*/
public function render()
{
return ($this->content instanceof Renderable) ? $this->content->render() : (string) $this->content;
return ($this->content instanceof View) ? $this->content->render() : (string) $this->content;
}
/**
......
laravel/routing/handler.php deleted 100644 → 0
View file @ fb3a0df0
<?php namespace Laravel\Routing;
use Closure;
use Laravel\IoC;
use Laravel\Error;
use Laravel\Request;
use Laravel\Response;
class Handler {
/**
* The active request instance.
*
* @var Request
*/
protected $request;
/**
* The route filter manager.
*
* @var array
*/
protected $filters;
/**
* Create a new route handler instance.
*
* @param array $filters
* @return void
*/
public function __construct(Request $request, $filters)
{
$this->request = $request;
$this->filters = $filters;
}
/**
* Execute a given route and return the response.
*
* @param Route $route
* @return Response
*/
public function handle(Route $route)
{
$this->validate($route);
if ( ! is_null($response = $this->filter(array_merge($route->before(), array('before')), array($this->request), true)))
{
return $this->finish($route, $response);
}
$closure = ( ! $route->callback instanceof Closure) ? $this->find_route_closure($route) : $route->callback;
if ( ! is_null($closure)) return $this->handle_closure($route, $closure);
return $this->finish($route, new Error('404'));
}
/**
* Validate that a given route is callable.
*
* @param Route $route
* @return void
*/
protected function validate(Route $route)
{
if ( ! $route->callback instanceof Closure and ! is_array($route->callback))
{
throw new \Exception('Invalid route defined for URI ['.$route->key.']');
}
}
/**
* Extract the route closure from the route.
*
* If a "do" index is specified on the callback, that is the handler.
* Otherwise, we will return the first callable array value.
*
* @param Route $route
* @return Closure
*/
protected function find_route_closure(Route $route)
{
if (isset($route->callback['do'])) return $route->callback['do'];
foreach ($route->callback as $value) { if ($value instanceof Closure) return $value; }
}
/**
* Handle a route closure.
*
* @param Route $route
* @param Closure $closure
* @return mixed
*/
protected function handle_closure(Route $route, Closure $closure)
{
array_unshift($route->parameters, $this->request);
$response = call_user_func_array($closure, $route->parameters);
if (is_array($response))
{
$response = $this->delegate($response[0], $response[1], $route->parameters);
}
return $this->finish($route, $response);
}
/**
* Handle the delegation of a route to a controller method.
*
* @param string $controller
* @param string $method
* @param array $parameters
* @return Response
*/
protected function delegate($controller, $method, $parameters)
{
if ( ! file_exists($path = CONTROLLER_PATH.strtolower(str_replace('.', '/', $controller)).EXT))
{
throw new \Exception("Controller [$controller] is not defined.");
}
require $path;
$controller = $this->resolve($controller);
$response = ($method == 'before' or strncmp($method, '_', 1) === 0) ? new Error('404') : $controller->before($this->request);
return (is_null($response)) ? call_user_func_array(array($controller, $method), $parameters) : $response;
}
/**
* Resolve a controller name to a controller instance.
*
* @param string $controller
* @return Controller
*/
protected function resolve($controller)
{
if (IoC::container()->registered('controllers.'.$controller))
{
return IoC::container()->resolve('controllers.'.$controller);
}
$controller = str_replace(' ', '_', ucwords(str_replace('.', ' ', $controller))).'_Controller';
return new $controller;
}
/**
* Call a filter or set of filters.
*
* @param array $filters
* @param array $parameters
* @param bool $override
* @return mixed
*/
protected function filter($filters, $parameters = array(), $override = false)
{
foreach ((array) $filters as $filter)
{
if ( ! isset($this->filters[$filter])) continue;
$response = call_user_func_array($this->filters[$filter], $parameters);
// "Before" filters may override the request cycle. For example, an authentication
// filter may redirect a user to a login view if they are not logged in. Because of
// this, we will return the first filter response if overriding is enabled.
if ( ! is_null($response) and $override) return $response;
}
}
/**
* Finish the route handling for the request.
*
* The route response will be converted to a Response instance and the "after" filters
* defined for the route will be executed.
*
* @param Route $route
* @param mixed $response
* @return Response
*/
protected function finish(Route $route, $response)
{
if ( ! $response instanceof Response) $response = new Response($response);
$this->filter(array_merge($route->after(), array('after')), array($this->request, $response));
return $response;
}
}
\ No newline at end of file
laravel/routing/route.php
View file @ 1e49001d
<?php namespace Laravel\Routing;
use Closure;
use Laravel\Response;
use Laravel\Container;
use Laravel\Application;
class Route {
/**
......@@ -23,19 +28,198 @@ class Route {
*/
public $parameters;
/**
* The route filters for the application.
*
* @param array $filters
*/
public $filters = array();
/**
* The path the application controllers.
*
* @var string
*/
protected $controller_path;
/**
* Create a new Route instance.
*
* @param string $key
* @param mixed $callback
* @param array $parameters
* @param string $key
* @param mixed $callback
* @param array $parameters
* @return void
*/
public function __construct($key, $callback, $parameters = array())
public function __construct($key, $callback, $parameters, $controller_path)
{
$this->key = $key;
$this->callback = $callback;
$this->parameters = $parameters;
$this->controller_path = $controller_path;
}
/**
* Execute the route for a given request to the application and return the response.
*
* @param Application $application
* @return Response
*/
public function call(Application $application)
{
$this->validate();
if ( ! is_null($response = $this->filter(array_merge($this->before(), array('before')), array($application), true)))
{
return $this->finish($application, $response);
}
$closure = ( ! $this->callback instanceof Closure) ? $this->find_route_closure() : $this->callback;
if ( ! is_null($closure)) return $this->handle_closure($application, $closure);
return $this->finish($application, $application->responder->error('404'));
}
/**
* Validate that a given route is callable.
*
* @return void
*/
protected function validate()
{
if ( ! $this->callback instanceof Closure and ! is_array($this->callback))
{
throw new \Exception('Invalid route defined for URI ['.$this->key.']');
}
}
/**
* Extract the route closure from the route.
*
* If a "do" index is specified on the callback, that is the handler.
* Otherwise, we will return the first callable array value.
*
* @return Closure
*/
protected function find_route_closure()
{
if (isset($this->callback['do'])) return $this->callback['do'];
foreach ($this->callback as $value) { if ($value instanceof Closure) return $value; }
}
/**
* Handle a route closure.
*
* @param Route $route
* @param Closure $closure
* @return mixed
*/
protected function handle_closure(Application $application, Closure $closure)
{
array_unshift($this->parameters, $application);
$response = call_user_func_array($closure, $this->parameters);
if (is_array($response))
{
$response = $this->delegate($application, $response[0], $response[1], $this->parameters);
}
return $this->finish($application, $response);
}
/**
* Handle the delegation of a route to a controller method.
*
* @param Application $application
* @param string $controller
* @param string $method
* @param array $parameters
* @return Response
*/
protected function delegate(Application $application, $controller, $method, $parameters)
{
if ( ! file_exists($path = $this->controller_path.strtolower(str_replace('.', '/', $controller)).EXT))
{
throw new \Exception("Controller [$controller] is not defined.");
}
require $path;
$controller = $this->resolve($application->container, $controller);
if ($method == 'before' or strncmp($method, '_', 1) === 0)
{
$response = $application->responder->error('404');
}
else
{
$response = $controller->before();
}
return (is_null($response)) ? call_user_func_array(array($controller, $method), $parameters) : $response;
}
/**
* Resolve a controller name to a controller instance.
*
* @param Container $container
* @param string $controller
* @return Controller
*/
protected function resolve(Container $container, $controller)
{
if ($container->registered('controllers.'.$controller))
{
return $container->resolve('controllers.'.$controller);
}
$controller = str_replace(' ', '_', ucwords(str_replace('.', ' ', $controller))).'_Controller';
return new $controller;
}
/**
* Finish the route handling for the request.
*
* The route response will be converted to a Response instance and the "after" filters
* defined for the route will be executed.
*
* @param Route $route
* @param mixed $response
* @return Response
*/
protected function finish(Application $application, $response)
{
if ( ! $response instanceof Response) $response = new Response($response);
$this->filter(array_merge($this->after(), array('after')), array($application, $response));
return $response;
}
/**
* Call a filter or set of filters.
*
* @param array $filters
* @param array $parameters
* @param bool $override
* @return mixed
*/
protected function filter($filters, $parameters = array(), $override = false)
{
foreach ((array) $filters as $filter)
{
if ( ! isset($this->filters[$filter])) continue;
$response = call_user_func_array($this->filters[$filter], $parameters);
// "Before" filters may override the request cycle. For example, an authentication
// filter may redirect a user to a login view if they are not logged in. Because of
// this, we will return the first filter response if overriding is enabled.
if ( ! is_null($response) and $override) return $response;
}
}
/**
......
laravel/routing/router.php
View file @ 1e49001d
......@@ -25,6 +25,13 @@ class Router {
*/
protected $names = array();
/**
* The path the application controllers.
*
* @var string
*/
protected $controller_path;
/**
* Create a new router for a request method and URI.
*
......@@ -32,10 +39,11 @@ class Router {
* @param array $routes
* @return void
*/
public function __construct(Request $request, $routes)
public function __construct(Request $request, $routes, $controller_path)
{
$this->routes = $routes;
$this->request = $request;
$this->controller_path = $controller_path;
}
/**
......@@ -84,13 +92,13 @@ class Router {
{
// Put the request method and URI in route form. Routes begin with
// the request method and a forward slash.
$destination = $this->request->method().' /'.trim($this->request->uri(), '/');
$destination = $this->request->method.' /'.trim($this->request->uri, '/');
// Check for a literal route match first. If we find one, there is
// no need to spin through all of the routes.
if (isset($this->routes[$destination]))
{
return $this->request->route = new Route($destination, $this->routes[$destination]);
return $this->request->route = new Route($destination, $this->routes[$destination], array(), $this->controller_path);
}
foreach ($this->routes as $keys => $callback)
......@@ -103,7 +111,7 @@ class Router {
{
if (preg_match('#^'.$this->translate_wildcards($key).'$#', $destination))
{
return $this->request->route = new Route($keys, $callback, $this->parameters($destination, $key));
return $this->request->route = new Route($keys, $callback, $this->parameters($destination, $key), $this->controller_path);
}
}
}
......@@ -121,7 +129,7 @@ class Router {
*/
protected function route_to_controller()
{
$segments = explode('/', trim($this->request->uri(), '/'));
$segments = explode('/', trim($this->request->uri, '/'));
if ( ! is_null($key = $this->controller_key($segments)))
{
......@@ -145,7 +153,7 @@ class Router {
// were they to code the controller delegation manually.
$callback = function() use ($controller, $method) { return array($controller, $method); };
return new Route($controller, $callback, $segments);
return new Route($controller, $callback, $segments, $this->controller_path);
}
}
......@@ -165,7 +173,7 @@ class Router {
// matching controller. Once we find it, we will return those routes.
foreach (array_reverse($segments, true) as $key => $value)
{
if (file_exists($path = CONTROLLER_PATH.implode('/', array_slice($segments, 0, $key + 1)).EXT))
if (file_exists($path = $this->controller_path.implode('/', array_slice($segments, 0, $key + 1)).EXT))
{
return $key + 1;
}
......
laravel/session/apc.php
View file @ 1e49001d
<?php namespace Laravel\Session;
use Laravel\Config;
class APC extends Driver {
/**
......@@ -11,15 +9,23 @@ class APC extends Driver {
*/
private $apc;
/**
* The session lifetime.
*
* @var int
*/
private $lifetime;
/**
* Create a new APC session driver instance.
*
* @param Cache\APC $apc
* @return void
*/
public function __construct(\Laravel\Cache\APC $apc)
public function __construct(\Laravel\Cache\APC $apc, $lifetime)
{
$this->apc = $apc;
$this->lifetime = $lifetime;
}
/**
......@@ -43,7 +49,7 @@ class APC extends Driver {
*/
protected function save()
{
$this->apc->put($this->session['id'], $this->session, Config::get('session.lifetime'));
$this->apc->put($this->session['id'], $this->session, $this->lifetime);
}
/**
......
laravel/session/cookie.php
View file @ 1e49001d
<?php namespace Laravel\Session;
use Laravel\Config;
use Laravel\Security\Crypter;
class Cookie extends Driver {
......@@ -19,22 +18,26 @@ class Cookie extends Driver {
*/
private $crypter;
/**
* The session configuration array.
*
* @var array
*/
private $config;
/**
* Create a new Cookie session driver instance.
*
* @param Crypter $crypter
* @param Laravel\Cookie $cookie
* @param array $config
* @return void
*/
public function __construct(Crypter $crypter, \Laravel\Cookie $cookie)
public function __construct(Crypter $crypter, \Laravel\Cookie $cookie, $config)
{
$this->cookie = $cookie;
$this->config = $config;
$this->crypter = $crypter;
if (Config::get('application.key') == '')
{
throw new \Exception("You must set an application key before using the Cookie session driver.");
}
}
/**
......@@ -63,7 +66,7 @@ class Cookie extends Driver {
{
if ( ! headers_sent())
{
extract(Config::get('session'));
extract($this->config);
$payload = $this->crypter->encrypt(serialize($this->session));
......
laravel/session/database.php
View file @ 1e49001d
<?php namespace Laravel\Session;
use Laravel\Config;
use Laravel\Database\Connection;
class Database extends Driver implements Sweeper {
......@@ -12,14 +11,23 @@ class Database extends Driver implements Sweeper {
*/
private $connection;
/**
* The database table to which the sessions should be written.
*
* @var string
*/
private $table;
/**
* Create a new database session driver.
*
* @param Connection $connection
* @param string $table
* @return void
*/
public function __construct(Connection $connection)
public function __construct(Connection $connection, $table)
{
$this->table = $table;
$this->connection = $connection;
}
......@@ -90,7 +98,7 @@ class Database extends Driver implements Sweeper {
*/
private function table()
{
return $this->connection->table(Config::get('session.table'));
return $this->connection->table($this->table);
}
}
\ No newline at end of file
laravel/session/driver.php
View file @ 1e49001d
<?php namespace Laravel\Session;
use Laravel\Str;
use Laravel\Config;
use Laravel\Input;
use Laravel\Cookie;
abstract class Driver {
......@@ -22,13 +22,14 @@ abstract class Driver {
* If the session has expired, a new, empty session will be generated.
*
* @param string $id
* @param int $lifetime
* @return void
*/
public function start($id)
public function start($id, $lifetime)
{
$this->session = ( ! is_null($id)) ? $this->load($id) : null;
if (is_null($this->session) or (time() - $this->session['last_activity']) > (Config::get('session.lifetime') * 60))
if (is_null($this->session) or (time() - $this->session['last_activity']) > ($lifetime * 60))
{
$this->session = array('id' => Str::random(40), 'data' => array());
}
......@@ -117,11 +118,13 @@ abstract class Driver {
*
* @param string $key
* @param mixed $value
* @return void
* @return Driver
*/
public function put($key, $value)
{
$this->session['data'][$key] = $value;
return $this;
}
/**
......@@ -137,11 +140,13 @@ abstract class Driver {
*
* @param string $key
* @param mixed $value
* @return void
* @return Driver
*/
public function flash($key, $value)
{
$this->put(':new:'.$key, $value);
return $this;
}
/**
......@@ -153,7 +158,7 @@ abstract class Driver {
* </code>
*
* @param string $key
* @return void
* @return Driver
*/
public function forget($key)
{
......@@ -188,59 +193,94 @@ abstract class Driver {
* The session will be stored in persistant storage and the session cookie will be
* session cookie will be sent to the browser.
*
* @param Laravel\Cookie $cookie
* The input of the current request will also be flashed to the session so it is
* available for the next request via the "old" method on the input class.
*
* @param Laravel\Input $input
* @param array $config
* @return void
*/
public function close(\Laravel\Cookie $cookie)
public function close(Input $input, $config)
{
$this->age_flash();
$this->flash('laravel_old_input', $input->get())->age();
$this->save();
$this->write_cookie($cookie);
$this->write_cookie($input->cookies, $config);
if ($this instanceof Sweeper and mt_rand(1, 100) <= 2)
{
$this->sweep(time() - ($config['lifetime'] * 60));
}
}
/**
* Age the session flash data.
*
* To age the data, we will forget all of the old keys and then rewrite the newly
* flashed items to have old keys, which will be available for the next request.
*
* @return void
*/
public function age_flash()
protected function age()
{
foreach ($this->session['data'] as $key => $value)
{
if (strpos($key, ':old:') === 0) $this->forget($key);
}
foreach ($this->session['data'] as $key => $value)
{
if (strpos($key, ':new:') === 0)
{
$this->put(':old:'.substr($key, 5), $value);
$session = $this->session['data'];
$this->forget($key);
}
}
$this->session['data'] = array_combine(str_replace(':new:', ':old:', array_keys($session)), array_values($session));
}
/**
* Write the session cookie.
*
* All of the session cookie configuration options are stored in the session
* configuration file. The cookie will only be written if the headers have not
* already been sent to the browser.
*
* @param Laravel\Cookie $cookie
* @param array $config
* @return void
*/
protected function write_cookie(\Laravel\Cookie $cookie)
protected function write_cookie(Cookie $cookies, $config)
{
if ( ! headers_sent())
{
$config = Config::get('session');
extract($config);
$minutes = ($expire_on_close) ? 0 : $lifetime;
$cookie->put('laravel_session', $this->session['id'], $minutes, $path, $domain, $https, $http_only);
$cookies->put('laravel_session', $this->session['id'], $minutes, $path, $domain, $https, $http_only);
}
}
/**
* Magic Method for retrieving items from the session.
*
* <code>
* // Get the "name" item from the session
* $name = $application->session->name;
* </code>
*/
public function __get($key)
{
return $this->get($key);
}
/**
* Magic Method for writings items to the session.
*
* <code>
* // Write "Fred" to the session "name" item
* $application->session->name = 'Fred';
* </code>
*/
public function __set($key, $value)
{
$this->put($key, $value);
}
}
\ No newline at end of file
laravel/session/file.php
View file @ 1e49001d
......@@ -9,15 +9,24 @@ class File extends Driver implements Sweeper {
*/
private $file;
/**
* The path to which the session files should be written.
*
* @var string
*/
private $path;
/**
* Create a new File session driver instance.
*
* @param Laravel\File $file
* @param string $path
* @return void
*/
public function __construct(\Laravel\File $file)
public function __construct(\Laravel\File $file, $path)
{
$this->file = $file;
$this->path = $path;
}
/**
......@@ -31,7 +40,7 @@ class File extends Driver implements Sweeper {
*/
protected function load($id)
{
if ($this->file->exists($path = SESSION_PATH.$id)) return unserialize($this->file->get($path));
if ($this->file->exists($path = $this->path.$id)) return unserialize($this->file->get($path));
}
/**
......@@ -41,7 +50,7 @@ class File extends Driver implements Sweeper {
*/
protected function save()
{
$this->file->put(SESSION_PATH.$this->session['id'], serialize($this->session), LOCK_EX);
$this->file->put($this->path.$this->session['id'], serialize($this->session), LOCK_EX);
}
/**
......@@ -51,7 +60,7 @@ class File extends Driver implements Sweeper {
*/
protected function delete()
{
$this->file->delete(SESSION_PATH.$this->session['id']);
$this->file->delete($this->path.$this->session['id']);
}
/**
......@@ -62,7 +71,7 @@ class File extends Driver implements Sweeper {
*/
public function sweep($expiration)
{
foreach (glob(SESSION_PATH.'*') as $file)
foreach (glob($this->path.'*') as $file)
{
if ($this->file->type($file) == 'file' and $this->file->modified($file) < $expiration) $this->file->delete($file);
}
......
laravel/session/manager.php
View file @ 1e49001d
<?php namespace Laravel\Session;
use Laravel\IoC;
use Laravel\Config;
use Laravel\Container;
class Manager {
/**
* The active session driver.
*
* @var Session\Driver
*/
public static $driver;
/**
* Get the session driver.
*
......@@ -19,42 +12,18 @@ class Manager {
* file. Only one session driver may be active for a given request, so the driver will
* be managed as a singleton.
*
* @param Container $container
* @param string $driver
* @return Session\Driver
*/
public static function driver()
public static function driver(Container $container, $driver)
{
if (is_null(static::$driver))
if (in_array($driver, array('cookie', 'file', 'database', 'apc', 'memcached')))
{
$driver = Config::get('session.driver');
if (in_array($driver, array('cookie', 'file', 'database', 'apc', 'memcached')))
{
return static::$driver = IoC::container()->resolve('laravel.session.'.$driver);
}
throw new \Exception("Session driver [$driver] is not supported.");
return $container->resolve('laravel.session.'.$driver);
}
return static::$driver;
}
/**
* Pass all other methods to the default session driver.
*
* By dynamically passing these method calls to the default driver, the developer is
* able to use with a convenient API when working with the session.
*
* <code>
* // Get an item from the default session driver
* $name = Session::get('name');
*
* // Equivalent call using the driver method
* $name = Session::driver()->get('name');
* </code>
*/
public static function __callStatic($method, $parameters)
{
return call_user_func_array(array(static::driver(), $method), $parameters);
throw new \Exception("Session driver [$driver] is not supported.");
}
}
\ No newline at end of file
laravel/session/memcached.php
View file @ 1e49001d
<?php namespace Laravel\Session;
use Laravel\Config;
class Memcached extends Driver {
/**
......@@ -11,14 +9,22 @@ class Memcached extends Driver {
*/
private $memcached;
/**
* The session lifetime.
*
* @var int
*/
private $lifetime;
/**
* Create a new Memcached session driver instance.
*
* @param Memcached $memcached
* @return void
*/
public function __construct(\Laravel\Cache\Memcached $memcached)
public function __construct(\Laravel\Cache\Memcached $memcached, $lifetime)
{
$this->lifetime = $lifetime;
$this->memcached = $memcached;
}
......@@ -43,7 +49,7 @@ class Memcached extends Driver {
*/
protected function save()
{
$this->memcached->put($this->session['id'], $this->session, Config::get('session.lifetime'));
$this->memcached->put($this->session['id'], $this->session, $this->lifetime);
}
/**
......
laravel/url.php
View file @ 1e49001d
......@@ -2,6 +2,23 @@
class URL {
/**
* Create a new URL writer instance.
*
* @param Router $router
* @param string $base
* @param string $index
* @param bool $https
* @return void
*/
public function __construct(Routing\Router $router, $base, $index, $https)
{
$this->base = $base;
$this->https = $https;
$this->index = $index;
$this->router = $router;
}
/**
* Generate an application URL.
*
......@@ -16,11 +33,11 @@ class URL {
* @param bool $https
* @return string
*/
public static function to($url = '', $https = false)
public function to($url = '', $https = false)
{
if (filter_var($url, FILTER_VALIDATE_URL) !== false) return $url;
$base = Config::get('application.url').'/'.Config::get('application.index');
$base = $this->base.'/'.$this->index;
if ($https) $base = preg_replace('~http://~', 'https://', $base, 1);
......@@ -38,9 +55,9 @@ class URL {
* @param string $url
* @return string
*/
public static function to_secure($url = '')
public function to_secure($url = '')
{
return static::to($url, true);
return $this->to($url, true);
}
/**
......@@ -61,11 +78,11 @@ class URL {
* @param bool $https
* @return string
*/
public static function to_asset($url, $https = null)
public function to_asset($url, $https = null)
{
if (is_null($https)) $https = IoC::resolve('laravel.request')->is_secure();
if (is_null($https)) $https = $this->https;
return str_replace('index.php/', '', static::to($url, $https));
return str_replace('index.php/', '', $this->to($url, $https));
}
/**
......@@ -89,11 +106,9 @@ class URL {
* @param bool $https
* @return string
*/
public static function to_route($name, $parameters = array(), $https = false)
public function to_route($name, $parameters = array(), $https = false)
{
$router = IoC::container()->resolve('laravel.routing.router');
if ( ! is_null($route = $router->find($name)))
if ( ! is_null($route = $this->router->find($name)))
{
$uris = explode(', ', key($route));
......@@ -104,7 +119,7 @@ class URL {
$uri = preg_replace('/\(.+?\)/', $parameter, $uri, 1);
}
return static::to(str_replace(array('/(:any?)', '/(:num?)'), '', $uri), $https);
return $this->to(str_replace(array('/(:any?)', '/(:num?)'), '', $uri), $https);
}
throw new \Exception("Error generating named route for route [$name]. Route is not defined.");
......@@ -122,9 +137,9 @@ class URL {
* @param array $parameters
* @return string
*/
public static function to_secure_route($name, $parameters = array())
public function to_secure_route($name, $parameters = array())
{
return static::to_route($name, $parameters, true);
return $this->to_route($name, $parameters, true);
}
/**
......@@ -169,18 +184,18 @@ class URL {
* $url = URL::to_profile(array('fred'));
* </code>
*/
public static function __callStatic($method, $parameters)
public function __call($method, $parameters)
{
$parameters = (isset($parameters[0])) ? $parameters[0] : array();
if (strpos($method, 'to_secure_') === 0)
{
return static::to_route(substr($method, 10), $parameters, true);
return $this->to_route(substr($method, 10), $parameters, true);
}
if (strpos($method, 'to_') === 0)
{
return static::to_route(substr($method, 3), $parameters);
return $this->to_route(substr($method, 3), $parameters);
}
throw new \Exception("Method [$method] is not defined on the URL class.");
......
laravel/view.php
View file @ 1e49001d
<?php namespace Laravel;
class View implements Renderable {
class View_Factory {
/**
* Create a new view factory instance.
*
* @param array $composers
* @param string $path
* @return void
*/
public function __construct($composers, $path)
{
$this->path = $path;
$this->composers = $composers;
}
/**
* Create a new view instance.
*
* @param string $view
* @param array $data
* @return View
*/
public function make($view, $data = array())
{
return new View($view, $this->path, $data, $this->composers, $this);
}
/**
* Create a new view instance from a view name.
*
* @param string $name
* @param array $data
* @return View
*/
protected function of($name, $data = array())
{
foreach ($this->composers as $key => $value)
{
if ($name === $value or (isset($value['name']) and $name === $value['name']))
{
return new View($key, $this->path, $data, $this->composers, $this);
}
}
throw new \Exception("Named view [$name] is not defined.");
}
/**
* Magic Method for handling the dynamic creation of named views.
*
* <code>
* // Create an instance of the "login" named view
* $view = View::of_login();
*
* // Create an instance of the "login" named view and bind data to the view
* $view = View::of_login(array('name' => 'Fred'));
* </code>
*/
public function __call($method, $parameters)
{
if (strpos($method, 'of_') === 0)
{
return $this->of(substr($method, 3), Arr::get($parameters, 0, array()));
}
}
}
class View {
/**
* The name of the view.
......@@ -14,14 +82,28 @@ class View implements Renderable {
*
* @var string
*/
protected $path;
public $path;
/**
* The view data.
*
* @var array
*/
public $data = array();
public $data;
/**
* The view composers defined for the application.
*
* @var array $composers
*/
protected $composers;
/**
* The view factory instance, which is used to create sub-views.
*
* @var View_Factory
*/
protected $factory;
/**
* Create a new view instance.
......@@ -29,12 +111,15 @@ class View implements Renderable {
* @param string $view
* @param array $data
* @param string $path
* @param array $composers
* @return void
*/
public function __construct($view, $data = array(), $path = VIEW_PATH)
public function __construct($view, $path, $data, $composers, $factory)
{
$this->view = $view;
$this->data = $data;
$this->factory = $factory;
$this->composers = $composers;
$this->path = $path.str_replace('.', '/', $view).EXT;
if ( ! file_exists($this->path))
......@@ -43,41 +128,6 @@ class View implements Renderable {
}
}
/**
* Create a new view instance.
*
* @param string $view
* @param array $data
* @param string $path
* @return View
*/
public static function make($view, $data = array(), $path = VIEW_PATH)
{
return new static($view, $data, $path);
}
/**
* Create a new view instance from a view name.
*
* @param string $name
* @param array $data
* @return View
*/
protected static function of($name, $data = array())
{
$composers = IoC::container()->resolve('laravel.composers');
foreach ($composers as $key => $value)
{
if ($name === $value or (isset($value['name']) and $name === $value['name']))
{
return new static($key, $data);
}
}
throw new \Exception("Named view [$name] is not defined.");
}
/**
* Call the composer for the view instance.
*
......@@ -85,11 +135,9 @@ class View implements Renderable {
*/
protected function compose()
{
$composers = IoC::container()->resolve('laravel.composers');
if (isset($composers[$this->view]))
if (isset($this->composers[$this->view]))
{
foreach ((array) $composers[$this->view] as $key => $value)
foreach ((array) $this->composers[$this->view] as $key => $value)
{
if ($value instanceof \Closure) return call_user_func($value, $this);
}
......@@ -110,7 +158,7 @@ class View implements Renderable {
foreach ($this->data as &$data)
{
if ($data instanceof Renderable) $data = $data->render();
if ($data instanceof View or $data instanceof Response) $data = $data->render();
}
ob_start() and extract($this->data, EXTR_SKIP);
......@@ -121,7 +169,7 @@ class View implements Renderable {
}
catch (\Exception $e)
{
Exception\Handler::make(new Exception\Examiner($e, new File))->handle();
Exception\Handler::make(new Exception\Examiner($e))->handle();
}
return ob_get_clean();
......@@ -145,7 +193,7 @@ class View implements Renderable {
*/
public function partial($key, $view, $data = array())
{
return $this->with($key, new static($view, $data));
return $this->with($key, $this->factory->make($view, $data));
}
/**
......@@ -168,25 +216,6 @@ class View implements Renderable {
return $this;
}
/**
* Magic Method for handling the dynamic creation of named views.
*
* <code>
* // Create an instance of the "login" named view
* $view = View::of_login();
*
* // Create an instance of the "login" named view and bind data to the view
* $view = View::of_login(array('name' => 'Fred'));
* </code>
*/
public static function __callStatic($method, $parameters)
{
if (strpos($method, 'of_') === 0)
{
return static::of(substr($method, 3), Arr::get($parameters, 0, array()));
}
}
/**
* Magic Method for getting items from the view data.
*/
......
public/index.php
View file @ 1e49001d
......@@ -36,4 +36,4 @@ $public = __DIR__;
| 3... 2... 1... Lift-off!
|--------------------------------------------------------------------------
*/
require $laravel.'/laravel.php';
require $laravel.'/laravel.php';
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment