+ * // Resolver the "name" dependency
+ * $name = $container->resolve('name');
+ *
+ *
+ * @param string $name
+ * @return mixed
+ */
+ public function resolve($name)
+ {
+ if (array_key_exists($name, $this->singletons)) return $this->singletons[$name];
+
+ if ( ! array_key_exists($name, $this->resolvers))
+ {
+ throw new \Exception("Error resolving [$name]. No resolver has been registered in the container.");
+ }
+
+ $object = call_user_func($this->resolvers[$name]['resolver'], $this);
+
+ if ($this->resolvers[$name]['singleton']) $this->singletons[$name] = $object;
+
+ return $object;
+ }
+
+}
\ No newline at end of file
diff --git a/laravel/db/query.php b/laravel/db/query.php
index 75638cee..7f4cb1c0 100644
--- a/laravel/db/query.php
+++ b/laravel/db/query.php
@@ -2,6 +2,7 @@
use Laravel\Str;
use Laravel\Config;
+use Laravel\Request;
use Laravel\Paginator;
class Query {
@@ -569,15 +570,18 @@ class Query {
*
* @param int $per_page
* @param array $columns
+ * @param int $page
* @return Paginator
*/
public function paginate($per_page, $columns = array('*'))
{
$total = $this->count();
- $results = $this->skip((Paginator::page($total, $per_page) - 1) * $per_page)->take($per_page)->get($columns);
+ $paginator = new Paginator(Request::active()->input->get('page', 1), $total, $per_page);
- return Paginator::make($results, $total, $per_page);
+ $paginator->results = $this->skip(($paginator->page - 1) * $per_page)->take($per_page)->get($columns);
+
+ return $paginator;
}
/**
diff --git a/laravel/download.php b/laravel/download.php
new file mode 100644
index 00000000..1d042a5b
--- /dev/null
+++ b/laravel/download.php
@@ -0,0 +1,35 @@
+
+ * // 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');
+ *
+ *
+ * @param string $path
+ * @param string $name
+ */
+ public function __construct($path, $name = null)
+ {
+ if (is_null($name)) $name = basename($path);
+
+ parent::__construct(file_get_contents($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', filesize($path));
+ }
+
+}
\ No newline at end of file
diff --git a/laravel/exception/examiner.php b/laravel/exception/examiner.php
index f996eb17..14f49b31 100644
--- a/laravel/exception/examiner.php
+++ b/laravel/exception/examiner.php
@@ -68,7 +68,7 @@ class Examiner {
*/
public function message()
{
- $file = str_replace(array(ACTIVE_MODULE_PATH, SYS_PATH), array('MODULE_PATH/', 'SYS_PATH/'), $this->exception->getFile());
+ $file = str_replace(array(APP_PATH, SYS_PATH), array('APP_PATH/', 'SYS_PATH/'), $this->exception->getFile());
return rtrim($this->exception->getMessage(), '.').' in '.$file.' on line '.$this->exception->getLine().'.';
}
diff --git a/laravel/file.php b/laravel/file.php
index c3a9d630..0349f3cf 100644
--- a/laravel/file.php
+++ b/laravel/file.php
@@ -71,7 +71,9 @@ class File {
array_unshift($file, '');
- $length = ($line - ($start = $line - $padding)) + $padding + 1;
+ $start = $line - $padding;
+
+ $length = ($line - $start) + $padding + 1;
return array_slice($file, ($start > 0) ? $start : 0, ($length > 0) ? $length : 0, true);
}
@@ -128,32 +130,4 @@ class File {
return (is_array($mimes[$extension])) ? in_array($mime, $mimes[$extension]) : $mime === $mimes[$extension];
}
- /**
- * Create a response that will force a file to be downloaded.
- *
- * @param string $path
- * @param string $name
- * @return Response
- */
- public static function download($path, $name = null)
- {
- if (is_null($name))
- {
- $name = basename($path);
- }
-
- $response = Response::make(static::get($path));
-
- $response->header('Content-Description', 'File Transfer');
- $response->header('Content-Type', static::mime(static::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', filesize($path));
-
- return $response;
- }
-
}
\ No newline at end of file
diff --git a/laravel/input.php b/laravel/input.php
index 06fc7822..c74a969e 100644
--- a/laravel/input.php
+++ b/laravel/input.php
@@ -105,6 +105,16 @@ class Input {
/**
* Get an item from the input data.
*
+ * This method should be used for all request methods (GET, POST, PUT, and DELETE).
+ *
+ *
+ * // Get the "name" item from the input data
+ * $name = Request::active()->input->get('name');
+ *
+ * // Get the "name" item and return "Fred" if it doesn't exist.
+ * $name = Request::active()->input->get('name', 'Fred');
+ *
+ *
* @param string $key
* @param mixed $default
* @return string
@@ -128,6 +138,13 @@ class Input {
/**
* Get input data from the previous request.
*
+ * If no session driver is provided, the default driver will be used.
+ *
+ *
+ * // Get the "name" item from the old input data
+ * $name = Request::active()->input->old('name');
+ *
+ *
* @param string $key
* @param mixed $default
* @param Session\Driver $driver
@@ -143,6 +160,16 @@ class Input {
/**
* Get an item from the uploaded file data.
*
+ * "Dot" syntax may be used to get a specific item from the file array.
+ *
+ *
+ * // Get the array of information regarding a given file
+ * $file = Request::active()->input->file('picture');
+ *
+ * // Get the size of a given file
+ * $file = Request::active()->input->file('picture.size');
+ *
+ *
* @param string $key
* @param mixed $default
* @return array
@@ -155,6 +182,8 @@ class Input {
/**
* Move an uploaded file to permanent storage.
*
+ * This method is simply a convenient wrapper around move_uploaded_file.
+ *
* @param string $key
* @param string $path
* @return bool
@@ -166,6 +195,11 @@ class Input {
/**
* Magic Method for retrieving items from the request input.
+ *
+ *
+ * // Retrieve the "name" item from the input data
+ * $name = Request::active()->input->name;
+ *
*/
public function __get($key)
{
diff --git a/laravel/ioc.php b/laravel/ioc.php
new file mode 100644
index 00000000..551579d4
--- /dev/null
+++ b/laravel/ioc.php
@@ -0,0 +1,70 @@
+ $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.
+ *
+ *
+ * // Get the default container instance
+ * $container = IoC::container();
+ *
+ * // Get a specific container instance
+ * $container = IoC::container('models');
+ *
+ *
+ * @param string $container
+ * @return Container
+ */
+ public static function container($container = 'default')
+ {
+ if ( ! array_key_exists($container, static::$containers))
+ {
+ static::$containers[$container] = new Container;
+ }
+
+ return static::$containers[$container];
+ }
+
+ /**
+ * Magic Method for passing methods to the default container.
+ *
+ *
+ * // Resolve an object from the default container
+ * $user = IoC::resolve('user');
+ *
+ * // Equivalent method of resolving using the container method
+ * $user = IoC::container()->resolve('user');
+ *
+ */
+ public static function __callStatic($method, $parameters)
+ {
+ return call_user_func_array(array(static::container(), $method), $parameters);
+ }
+
+}
\ No newline at end of file
diff --git a/laravel/lang.php b/laravel/lang.php
index a8088406..a1f244db 100644
--- a/laravel/lang.php
+++ b/laravel/lang.php
@@ -18,6 +18,13 @@ class Lang {
*/
public $key;
+ /**
+ * The language the line should be returned in.
+ *
+ * @var string
+ */
+ public $language;
+
/**
* The place-holder replacements.
*
@@ -28,22 +35,30 @@ class Lang {
/**
* Create a new Lang instance.
*
- * Language lines are retrieved using "dot" notation. So, asking for the
- * "messages.required" language line would return the "required" line
- * from the "messages" language file.
- *
* @param string $key
* @param array $replacements
* @return void
*/
- public function __construct($key, $replacements = array())
+ private function __construct($key, $replacements = array())
{
$this->key = $key;
$this->replacements = $replacements;
+ $this->language = Config::get('application.language');
}
/**
- * Create a Lang instance for a language line.
+ * Create a new Lang instance.
+ *
+ * Language lines are retrieved using "dot" notation. So, asking for the "messages.required" langauge
+ * line would return the "required" line from the "messages" language file.
+ *
+ *
+ * // Get the "required" line from the "validation" language file
+ * $line = Lang::line('validation.required')->get();
+ *
+ * // Specify a replacement for a language line
+ * $line = Lang::line('welcome.message', array('name' => 'Fred'))->get();
+ *
*
* @param string $key
* @param array $replacements
@@ -55,24 +70,47 @@ class Lang {
}
/**
- * Get the language line.
+ * Set the language the line should be returned in.
+ *
+ * The language specified in this method should correspond to a language directory in your application.
+ *
+ *
+ * // Get a "fr" language line
+ * $line = Lang::line('validation.required')->in('fr')->get();
+ *
+ *
+ * @param string $language
+ * @return Lang
+ */
+ public function in($language)
+ {
+ $this->language = $language;
+ return $this;
+ }
+
+ /**
+ * Get the language line.
+ *
+ * A default value may also be specified, which will be returned in the language line doesn't exist.
+ *
+ *
+ * // Get a validation line and return a default value if the line doesn't exist
+ * $line = Lang::line('welcome.message')->get('Hello!');
+ *
*
* @param string $language
- * @param mixed $default
* @return string
*/
- public function get($language = null, $default = null)
+ public function get($default = null)
{
- if (is_null($language)) $language = Config::get('application.language');
+ list($file, $line) = $this->parse($this->key);
- list($module, $file, $line) = $this->parse($this->key, $language);
-
- if ( ! $this->load($module, $file, $language))
+ if ( ! $this->load($file))
{
return is_callable($default) ? call_user_func($default) : $default;
}
- $line = Arr::get(static::$lines[$module][$language.$file], $line, $default);
+ $line = Arr::get(static::$lines[$this->language.$file], $line, $default);
foreach ($this->replacements as $key => $value)
{
@@ -85,17 +123,16 @@ class Lang {
/**
* Parse a language key.
*
+ * Language keys follow a {file}.{key} convention.
+ *
* @param string $key
- * @param string $language
* @return array
*/
- private function parse($key, $language)
+ private function parse($key)
{
- list($module, $key) = Module::parse($key);
-
if (count($segments = explode('.', $key)) > 1)
{
- return array($module, $segments[0], implode('.', array_slice($segments, 1)));
+ return array($segments[0], implode('.', array_slice($segments, 1)));
}
throw new \Exception("Invalid language line [$key]. A specific line must be specified.");
@@ -104,25 +141,31 @@ class Lang {
/**
* Load a language file.
*
- * @param string $module
+ * If the language file has already been loaded, it will not be loaded again.
+ *
* @param string $file
- * @param string $language
* @return bool
*/
- private function load($module, $file, $language)
+ private function load($file)
{
- if (isset(static::$lines[$module][$language.$file])) return;
+ if (isset(static::$lines[$this->language.$file])) return;
- $lang = array();
+ $language = array();
- foreach (array(LANG_PATH, Module::path($module).'lang/') as $directory)
+ foreach (array(SYS_LANG_PATH, LANG_PATH) as $directory)
{
- $lang = (file_exists($path = $directory.$language.'/'.$file.EXT)) ? array_merge($lang, require $path) : $lang;
+ if (file_exists($path = $directory.$this->language.'/'.$file.EXT))
+ {
+ $language = array_merge($language, require $path);
+ }
}
- if (count($lang) > 0) static::$lines[$module][$language.$file] = $lang;
+ if (count($language) > 0)
+ {
+ static::$lines[$this->language.$file] = $language;
+ }
- return isset(static::$lines[$module][$language.$file]);
+ return isset(static::$lines[$this->language.$file]);
}
/**
diff --git a/laravel/lang/en/pagination.php b/laravel/lang/en/pagination.php
index 7c5790bb..eef78c03 100644
--- a/laravel/lang/en/pagination.php
+++ b/laravel/lang/en/pagination.php
@@ -2,6 +2,12 @@
return array(
+ /*
+ |--------------------------------------------------------------------------
+ | Pagination "Next" and "Previous" Language
+ |--------------------------------------------------------------------------
+ */
+
'previous' => '« Previous',
'next' => 'Next »',
diff --git a/laravel/laravel.php b/laravel/laravel.php
index 966434c1..8e9d27a1 100644
--- a/laravel/laravel.php
+++ b/laravel/laravel.php
@@ -10,61 +10,45 @@ define('EXT', '.php');
// --------------------------------------------------------------
define('APP_PATH', realpath($application).'/');
define('BASE_PATH', realpath(str_replace('laravel', '', $laravel)).'/');
-define('MODULE_PATH', realpath($modules).'/');
define('PACKAGE_PATH', realpath($packages).'/');
define('PUBLIC_PATH', realpath($public).'/');
define('STORAGE_PATH', realpath($storage).'/');
define('SYS_PATH', realpath($laravel).'/');
-unset($laravel, $application, $config, $modules, $packages, $public, $storage);
+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('DATABASE_PATH', STORAGE_PATH.'db/');
-define('LANG_PATH', SYS_PATH.'lang/');
-define('SCRIPT_PATH', PUBLIC_PATH.'js/');
-define('SESSION_PATH', STORAGE_PATH.'sessions/');
-define('STYLE_PATH', PUBLIC_PATH.'css/');
-
-// --------------------------------------------------------------
-// Define the default module and path.
-// --------------------------------------------------------------
-define('DEFAULT_MODULE', 'application');
-
-define('DEFAULT_MODULE_PATH', APP_PATH);
+define('CACHE_PATH', STORAGE_PATH.'cache/');
+define('CONFIG_PATH', APP_PATH.'config/');
+define('DATABASE_PATH', STORAGE_PATH.'db/');
+define('LANG_PATH', APP_PATH.'lang/');
+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.'lang/');
+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.'module'.EXT;
require SYS_PATH.'arr'.EXT;
-// --------------------------------------------------------------
-// Register the active modules.
-// --------------------------------------------------------------
-Module::$modules = array_merge(array(DEFAULT_MODULE => DEFAULT_MODULE_PATH), $active);
-
-unset($active);
-
// --------------------------------------------------------------
// Register the auto-loader.
// --------------------------------------------------------------
-Loader::bootstrap(array(
- APP_PATH.'libraries/',
- APP_PATH.'models/',
-));
+Loader::bootstrap(Config::get('aliases'), array(APP_PATH.'libraries/', APP_PATH.'models/'));
spl_autoload_register(array('Laravel\\Loader', 'load'));
// --------------------------------------------------------------
-// Set the default timezone.
+// Bootstrap the IoC container.
// --------------------------------------------------------------
-date_default_timezone_set(Config::get('application.timezone'));
+IoC::bootstrap(Config::get('dependencies'));
// --------------------------------------------------------------
// Set the error reporting and display levels.
@@ -73,28 +57,6 @@ error_reporting(E_ALL | E_STRICT);
ini_set('display_errors', 'Off');
-// --------------------------------------------------------------
-// Initialize the request instance for the request.
-// --------------------------------------------------------------
-$request = new Request($_SERVER);
-
-// --------------------------------------------------------------
-// Hydrate the input for the current request.
-// --------------------------------------------------------------
-$request->input = new Input($request, $_GET, $_POST, $_COOKIE, $_FILES);
-
-// --------------------------------------------------------------
-// Determine the module that should handle the request.
-// --------------------------------------------------------------
-$segments = explode('/', $request->uri());
-
-define('ACTIVE_MODULE', (array_key_exists($segments[0], Module::$modules)) ? $segments[0] : DEFAULT_MODULE);
-
-// --------------------------------------------------------------
-// Determine the path to the root of the active module.
-// --------------------------------------------------------------
-define('ACTIVE_MODULE_PATH', Module::path(ACTIVE_MODULE));
-
// --------------------------------------------------------------
// Register the error / exception handlers.
// --------------------------------------------------------------
@@ -131,14 +93,20 @@ register_shutdown_function(function() use ($error_dependencies)
}
});
+// --------------------------------------------------------------
+// Set the default timezone.
+// --------------------------------------------------------------
+date_default_timezone_set(Config::get('application.timezone'));
+
// --------------------------------------------------------------
// Load the session.
// --------------------------------------------------------------
if (Config::get('session.driver') != '') Session::driver()->start(Cookie::get('laravel_session'));
// --------------------------------------------------------------
-// Load all of the core routing classes.
+// Load all of the core routing and response classes.
// --------------------------------------------------------------
+require SYS_PATH.'renderable'.EXT;
require SYS_PATH.'response'.EXT;
require SYS_PATH.'routing/route'.EXT;
require SYS_PATH.'routing/router'.EXT;
@@ -156,34 +124,31 @@ if (count(Config::get('application.packages')) > 0)
}
// --------------------------------------------------------------
-// Register the filters for the default module.
+// Initialize the request instance for the request.
// --------------------------------------------------------------
-Routing\Filter::register(require DEFAULT_MODULE_PATH.'filters'.EXT);
+$request = new Request($_SERVER);
// --------------------------------------------------------------
-// Register the filters for the active module.
+// Hydrate the input for the current request.
// --------------------------------------------------------------
-if (file_exists(ACTIVE_MODULE_PATH.'filters'.EXT))
-{
- Routing\Filter::register(require ACTIVE_MODULE_PATH.'filters'.EXT);
-}
+$request->input = new Input($request, $_GET, $_POST, $_COOKIE, $_FILES);
+
+// --------------------------------------------------------------
+// Register the filters for the default module.
+// --------------------------------------------------------------
+Routing\Filter::register(require APP_PATH.'filters'.EXT);
// --------------------------------------------------------------
// Call the "before" filter for the application and module.
// --------------------------------------------------------------
-foreach (array('before', ACTIVE_MODULE.'::before') as $filter)
-{
- $response = Routing\Filter::call($filter, array($request->method(), $request->uri()), true);
-
- if ( ! is_null($response)) break;
-}
+$response = Routing\Filter::call('before', array($request->method(), $request->uri()), true);
// --------------------------------------------------------------
// Route the request and get the response from the route.
// --------------------------------------------------------------
if (is_null($response))
{
- $loader = new Routing\Loader(ACTIVE_MODULE_PATH);
+ $loader = new Routing\Loader(APP_PATH);
$route = Routing\Router::make($request, $loader)->route();
@@ -195,15 +160,12 @@ $response = Response::prepare($response);
// --------------------------------------------------------------
// Call the "after" filter for the application and module.
// --------------------------------------------------------------
-foreach (array(ACTIVE_MODULE.'::after', 'after') as $filter)
-{
- Routing\Filter::call($filter, array($response, $request->method(), $request->uri()));
-}
+Routing\Filter::call('after', array($response, $request->method(), $request->uri()));
// --------------------------------------------------------------
// Stringify the response.
// --------------------------------------------------------------
-$response->content = ($response->content instanceof View) ? $response->content->get() : (string) $response->content;
+$response->content = $response->render();
// --------------------------------------------------------------
// Close the session.
diff --git a/laravel/loader.php b/laravel/loader.php
index ef48984a..6d0c9e30 100644
--- a/laravel/loader.php
+++ b/laravel/loader.php
@@ -16,22 +16,16 @@ class Loader {
*/
public static $aliases = array();
- /**
- * All of the active modules.
- *
- * @var array
- */
- public static $modules = array();
-
/**
* Bootstrap the auto-loader.
*
+ * @param array $aliases
* @param array $paths
* @return void
*/
- public static function bootstrap($paths = array())
+ public static function bootstrap($aliases, $paths)
{
- static::$aliases = Config::get('aliases');
+ static::$aliases = $aliases;
foreach ($paths as $path) { static::register_path($path); }
}
@@ -49,67 +43,20 @@ class Loader {
{
$file = strtolower(str_replace('\\', '/', $class));
- if (array_key_exists($class, static::$aliases)) return class_alias(static::$aliases[$class], $class);
+ if (array_key_exists($class, static::$aliases))
+ {
+ return class_alias(static::$aliases[$class], $class);
+ }
- (static::load_from_registered($file)) or static::load_from_module($file);
- }
-
- /**
- * Load a class that is stored in the registered directories.
- *
- * @param string $file
- * @return bool
- */
- private static function load_from_registered($file)
- {
foreach (static::$paths as $directory)
{
if (file_exists($path = $directory.$file.EXT))
{
require $path;
- return true;
+ return;
}
}
-
- return false;
- }
-
- /**
- * Search the active modules for a given file.
- *
- * @param string $file
- * @return void
- */
- private static function load_from_module($file)
- {
- if (is_null($module = static::module_path($file))) return;
-
- // Slice the module name off of the filename. Even though module libraries
- // and models are namespaced under the module, there will obviously not be
- // a folder matching that namespace in the libraries or models directory.
- $file = substr($file, strlen($module));
-
- foreach (array(MODULE_PATH.$module.'/models', MODULE_PATH.$module.'/libraries') as $directory)
- {
- if (file_exists($path = $directory.'/'.$file.EXT)) return require $path;
- }
- }
-
- /**
- * Search the module paths for a match on the file.
- *
- * The file namespace should correspond to a directory within the module directory.
- *
- * @param string $file
- * @return string
- */
- private static function module_path($file)
- {
- foreach (Module::$modules as $key => $module)
- {
- if (strpos($file, $module) === 0) return $module;
- }
}
/**
diff --git a/laravel/memcached.php b/laravel/memcached.php
deleted file mode 100644
index 115d89cd..00000000
--- a/laravel/memcached.php
+++ /dev/null
@@ -1,55 +0,0 @@
-addServer($server['host'], $server['port'], true, $server['weight']);
- }
-
- if ($memcache->getVersion() === false)
- {
- throw new \Exception('Memcached is configured. However, no connections could be made. Please verify your memcached configuration.');
- }
-
- return $memcache;
- }
-
-}
\ No newline at end of file
diff --git a/laravel/messages.php b/laravel/messages.php
index e8645d27..a919440a 100644
--- a/laravel/messages.php
+++ b/laravel/messages.php
@@ -12,6 +12,8 @@ class Messages {
/**
* Create a new Messages instance.
*
+ * The Messages class provides a convenient wrapper around an array of generic messages.
+ *
* @return void
*/
public function __construct($messages = array())
@@ -24,6 +26,11 @@ class Messages {
*
* Duplicate messages will not be added.
*
+ *
+ * // Add an error message for the "email" key
+ * $messages->add('email', 'The e-mail address is invalid.');
+ *
+ *
* @param string $key
* @param string $message
* @return void
@@ -39,6 +46,11 @@ class Messages {
/**
* Determine if messages exist for a given key.
*
+ *
+ * // Determine if there are any messages for the "email" key
+ * $has = $messages->has('email');
+ *
+ *
* @param string $key
* @return bool
*/
@@ -50,6 +62,16 @@ class Messages {
/**
* Get the first message for a given key.
*
+ * Optionally, a format may be specified for the returned message.
+ *
+ *
+ * // Get the first message for the "email" key
+ * $message = $messages->first('email');
+ *
+ * // Get the first message for the "email" key wrapped in tags
+ * $message = $messages->first('email', '
:message
');
+ *
+ *
* @param string $key
* @param string $format
* @return string
@@ -62,7 +84,13 @@ class Messages {
/**
* Get all of the messages for a key.
*
- * If no key is specified, all of the messages will be returned.
+ *
+ * // Get all of the messages for the "email" key
+ * $message = $messages->get('email');
+ *
+ * // Get all of the messages for the "email" key wrapped in tags
+ * $message = $messages->get('email', '
:message
');
+ *
*
* @param string $key
* @param string $format
@@ -76,7 +104,15 @@ class Messages {
}
/**
- * Get all of the messages.
+ * Get all of the messages for every key.
+ *
+ *
+ * // Get all of the messages for every key
+ * $message = $messages->all();
+ *
+ * // Get all of the messages for every key wrapped in tags
+ * $message = $messages->all('
:message
');
+ *
*
* @param string $format
* @return array
diff --git a/laravel/module.php b/laravel/module.php
deleted file mode 100644
index 1a9609ee..00000000
--- a/laravel/module.php
+++ /dev/null
@@ -1,84 +0,0 @@
-
- * // Returns array('admin', 'test.example')
- * Module::parse('admin::test.example');
- *
- * // Returns array('application', 'test.example')
- * Module::parse('test.example');
- *
- *
- * @param string $key
- * @return array
- */
- public static function parse($key)
- {
- $module = (strpos($key, '::') !== false) ? substr($key, 0, strpos($key, ':')) : DEFAULT_MODULE;
-
- $module = str_replace('.', '/', $module);
-
- if ($module !== DEFAULT_MODULE) $key = substr($key, strpos($key, ':') + 2);
-
- return array($module, $key);
- }
-
- /**
- * Get the path for a given module.
- *
- * Once the path has been determined, it will be cached by the class for quick access.
- *
- * @param string $module
- * @return string
- */
- public static function path($module)
- {
- if (array_key_exists($module, static::$paths)) return static::$paths[$module];
-
- if (array_key_exists($module, static::$modules))
- {
- return (static::$modules[$module] == DEFAULT_MODULE_PATH) ? static::$modules[$module] : MODULE_PATH.static::$modules[$module].'/';
- }
- elseif (in_array($module, static::$modules))
- {
- return static::$paths[$module] = MODULE_PATH.$module.'/';
- }
- }
-
- /**
- * Get an array of paths to all of the modules.
- *
- * @return array
- */
- public static function paths()
- {
- return array_map(function($module) { return Laravel\Module::path($module); }, static::$modules);
- }
-
-}
\ No newline at end of file
diff --git a/laravel/package.php b/laravel/package.php
index 289af68a..82e2f5fc 100644
--- a/laravel/package.php
+++ b/laravel/package.php
@@ -12,6 +12,16 @@ class Package {
/**
* Load a package or set of packages.
*
+ * The package name should correspond to a package directory for your application.
+ *
+ *
+ * // Load the "swift-mailer" package
+ * Package::load('swift-mailer');
+ *
+ * // Load the "swift-mailer" and "facebook" package
+ * Package::load(array('swift-mailer', 'facebook'));
+ *
+ *
* @param string|array $packages
* @return void
*/
@@ -31,6 +41,11 @@ class Package {
/**
* Determine if a given package has been loaded.
*
+ *
+ * // Determine if the "swift-mailer" package has been loaded
+ * $loaded = Package::loaded('swift-mailer');
+ *
+ *
* @param string $package
* @return bool
*/
diff --git a/laravel/paginator.php b/laravel/paginator.php
index c3b1b44b..a369285d 100644
--- a/laravel/paginator.php
+++ b/laravel/paginator.php
@@ -37,6 +37,20 @@ class Paginator {
*/
public $last_page;
+ /**
+ * The number of links that should be adjacent to the current page.
+ *
+ * @var int
+ */
+ public $adjacent = 3;
+
+ /**
+ * Indicates if the generated links should use HTTPS.
+ *
+ * @var bool
+ */
+ public $secure;
+
/**
* The language that should be used when generating page links.
*
@@ -54,54 +68,48 @@ class Paginator {
/**
* Create a new Paginator instance.
*
- * @param array $results
+ * In general, the Paginator will be instantiated through the database query. However, you are free
+ * to instantiate a paginator for an arbitrary array if you wish.
+ *
+ *
+ * // Create a Paginator for the first page of 10 total results and 2 items per page
+ * $paginator = new Paginator(1, 10, 2);
+ *
+ *
* @param int $page
* @param int $total
* @param int $per_page
- * @param int $last_page
* @return void
*/
- public function __construct($results, $page, $total, $per_page, $last_page)
+ public function __construct($page, $total, $per_page)
{
- $this->last_page = $last_page;
+ $this->last_page = ceil($total / $per_page);
$this->per_page = $per_page;
- $this->results = $results;
$this->total = $total;
- $this->page = $page;
+
+ // Determine if the current request is using HTTPS. If it is, we will use HTTPS when
+ // generating the links unless otherwise specified by the secure() method.
+ $this->secure = Request::active()->is_secure();
+
+ // The page method will validate the given page number and adjust it if necessary.
+ // For example, when the given page number is greater than the last page or less
+ // than zero, the page number will be adjusted.
+ $this->page = $this->adjust($page);
}
/**
- * Create a new Paginator instance.
- *
- * @param array $results
- * @param int $total
- * @param int $per_page
- * @return Paginator
- */
- public static function make($results, $total, $per_page)
- {
- return new static($results, static::page($total, $per_page), $total, $per_page, ceil($total / $per_page));
- }
-
- /**
- * Get the current page from the request query string.
+ * Check a given page number for validity and adjust it if necessary.
*
* The page will be validated and adjusted if it is less than one or greater than the last page.
* For example, if the current page is not an integer or less than one, one will be returned.
* If the current page is greater than the last page, the last page will be returned.
*
- * @param int $total
- * @param int $per_page
+ * @param int $page
* @return int
*/
- public static function page($total, $per_page)
+ private function adjust($page)
{
- $page = Input::get('page', 1);
-
- if (is_numeric($page) and $page > $last_page = ceil($total / $per_page))
- {
- return ($last_page > 0) ? $last_page : 1;
- }
+ if (is_numeric($page) and $page > $this->last_page) return ($this->last_page > 0) ? $this->last_page : 1;
return ($page < 1 or filter_var($page, FILTER_VALIDATE_INT) === false) ? 1 : $page;
}
@@ -109,43 +117,56 @@ class Paginator {
/**
* Create the HTML pagination links.
*
- * @param int $adjacent
+ * If there are enough pages, an intelligent, sliding list of links will be created.
+ * Otherwise, a simple list of page number links will be created.
+ *
* @return string
*/
- public function links($adjacent = 3)
+ public function links()
{
if ($this->last_page <= 1) return '';
// The hard-coded "7" is to account for all of the constant elements in a sliding range.
// Namely: The the current page, the two ellipses, the two beginning pages, and the two ending pages.
- $numbers = ($this->last_page < 7 + ($adjacent * 2)) ? $this->range(1, $this->last_page) : $this->slider($adjacent);
+ $numbers = ($this->last_page < 7 + ($this->adjacent * 2)) ? $this->range(1, $this->last_page) : $this->slider();
return '
+ * // Set the "sort" query string item on the links that will be generated
+ * echo $paginator->append(array('sort' => 'desc'))->links();
+ *
+ *
* @param array $values
* @return Paginator
*/
diff --git a/laravel/redirect.php b/laravel/redirect.php
index ba351aff..61e3b472 100644
--- a/laravel/redirect.php
+++ b/laravel/redirect.php
@@ -1,28 +1,21 @@
response = $response;
- }
+class Redirect extends Response {
/**
* Create a redirect response.
*
+ *
+ * // Create a redirect for the "user/profile" URI
+ * return Redirect::to('user/profile');
+ *
+ * // Create a redirect using the 301 status code
+ * return Redirect::to('user/profile', 301);
+ *
+ * // Create a redirect using the "refresh" method
+ * return Redirect::to('user/profile', 302, 'refresh');
+ *
+ *
* @param string $url
* @param int $status
* @param string $method
@@ -33,14 +26,24 @@ class Redirect {
{
$url = URL::to($url, $https);
- return ($method == 'refresh')
- ? new static(Response::make('', $status)->header('Refresh', '0;url='.$url))
- : new static(Response::make('', $status)->header('Location', $url));
+ if ($method == 'location')
+ {
+ return static::make('', $status)->header('Refresh', '0;url='.$url);
+ }
+ else
+ {
+ return static::make('', $status)->header('Location', $url);
+ }
}
/**
* Create a redirect response to a HTTPS URL.
*
+ *
+ * // Create a HTTPS redirect to the "user/profile" URI
+ * return Redirect::to_secure('user/profile');
+ *
+ *
* @param string $url
* @param int $status
* @param string $method
@@ -54,24 +57,37 @@ class Redirect {
/**
* Add an item to the session flash data.
*
- * @param string $key
- * @param mixed $value
+ * This is useful for passing status messages or other temporary data to the next request.
+ *
+ *
+ * // Flash a status message to the session on a redirect
+ * return Redirect::to('user/profile')->with('status', 'Welcome Back!');
+ *
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param Session\Driver $driver
* @return Response
*/
- public function with($key, $value)
+ public function with($key, $value, Session\Driver $driver)
{
- if (Config::get('session.driver') == '')
- {
- throw new \Exception("Attempting to flash data to the session, but no session driver has been specified.");
- }
+ if (is_null($driver)) $driver = Session::driver();
- Session::flash($key, $value);
+ $driver->flash($key, $value);
return $this;
}
/**
- * Magic Method to handle redirecting to routes.
+ * Magic Method to handle redirecting to named routes.
+ *
+ *
+ * // Create a redirect to the "profile" route
+ * return Redirect::to_profile();
+ *
+ * // Create a redirect to the "profile" route using HTTPS
+ * return Redirect::to_secure_profile();
+ *
*/
public static function __callStatic($method, $parameters)
{
diff --git a/laravel/renderable.php b/laravel/renderable.php
new file mode 100644
index 00000000..5a095d9e
--- /dev/null
+++ b/laravel/renderable.php
@@ -0,0 +1,12 @@
+uri = $this->remove_from_uri($uri, array(parse_url(Config::get('application.url'), PHP_URL_PATH), '/index.php'));
}
@@ -180,7 +180,12 @@ class Request {
}
/**
- * Determine if the route handling the request is a given name.
+ * Determine if the route handling the request has a given name.
+ *
+ *
+ * // Determine if the route handling the request is named "profile"
+ * $profile = Request::active()->route_is('profile');
+ *
*
* @param string $name
* @return bool
@@ -193,7 +198,12 @@ class Request {
}
/**
- * Magic Method to handle dynamic static methods.
+ * Magic Method to handle dynamic method calls to determine the route handling the request.
+ *
+ *
+ * // Determine if the route handling the request is named "profile"
+ * $profile = Request::active()->route_is_profile();
+ *
*/
public function __call($method, $parameters)
{
@@ -205,6 +215,11 @@ class Request {
/**
* Magic Method for dynamically retrieving properties of the request instance.
+ *
+ *
+ * // Get all of the input for the request
+ * $input = Request::active()->input;
+ *
*/
public function __get($key)
{
diff --git a/laravel/response.php b/laravel/response.php
index 8bb63e79..8bedb1dd 100644
--- a/laravel/response.php
+++ b/laravel/response.php
@@ -1,6 +1,6 @@
content = $content;
- $this->status = $status;
+ $this->status = $status;
}
/**
@@ -104,6 +104,15 @@ class Response {
/**
* Factory for creating new error response instances.
*
+ * 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.
+ *
+ *
+ * // Return a 404 error response
+ * return Response::error('404');
+ *
+ *
* @param int $code
* @param array $data
* @return Response
@@ -121,11 +130,19 @@ class Response {
*/
public static function prepare($response)
{
- if ($response instanceof Redirect) $response = $response->response;
-
return ( ! $response instanceof Response) ? new static($response) : $response;
}
+ /**
+ * Get the evaluated string contents of the response.
+ *
+ * @return string
+ */
+ public function render()
+ {
+ return ($this->content instanceof Renderable) ? $this->content->render() : (string) $this->content;
+ }
+
/**
* Send the response to the browser.
*
@@ -140,7 +157,7 @@ class Response {
if ( ! headers_sent()) $this->send_headers();
- echo (string) $this->content;
+ echo $this->render();
}
/**
@@ -163,6 +180,11 @@ class Response {
/**
* Add a header to the response.
*
+ *
+ * // Add a "location" header to a response
+ * $response->header('Location', 'http://google.com');
+ *
+ *
* @param string $name
* @param string $value
* @return Response
@@ -173,22 +195,4 @@ class Response {
return $this;
}
- /**
- * Determine if the response is a redirect.
- *
- * @return bool
- */
- public function is_redirect()
- {
- return $this->status == 301 or $this->status == 302;
- }
-
- /**
- * Get the parsed content of the Response.
- */
- public function __toString()
- {
- return (string) $this->content;
- }
-
}
\ No newline at end of file
diff --git a/laravel/routing/loader.php b/laravel/routing/loader.php
index db36b08b..b7c376a2 100644
--- a/laravel/routing/loader.php
+++ b/laravel/routing/loader.php
@@ -60,13 +60,6 @@ class Loader {
array_push($segments, substr($segment, 0, strpos($segment, '.')));
}
- // Since it is no part of the route directory structure, shift the module name off of the
- // beginning of the array so we can locate the appropriate route file.
- if (count($segments) > 0 and ACTIVE_MODULE !== DEFAULT_MODULE)
- {
- array_shift($segments);
- }
-
// Work backwards through the URI segments until we find the deepest possible
// matching route directory. Once we find it, we will return those routes.
foreach (array_reverse($segments, true) as $key => $value)
@@ -89,33 +82,30 @@ class Loader {
* @param bool $reload
* @return array
*/
- public static function all($reload = false)
+ public static function all($path = APP_PATH, $reload = false)
{
if ( ! is_null(static::$routes) and ! $reload) return static::$routes;
$routes = array();
- foreach (Module::paths() as $path)
+ if (file_exists($path.'routes'.EXT))
{
- if (file_exists($path.'routes'.EXT))
+ $routes = array_merge($routes, require $path.'routes'.EXT);
+ }
+
+ if (is_dir($path.'routes'))
+ {
+ // Since route files can be nested deep within the route directory, we need to
+ // recursively spin through the directory to find every file.
+ $directoryIterator = new \RecursiveDirectoryIterator($path.'routes');
+
+ $recursiveIterator = new \RecursiveIteratorIterator($directoryIterator, \RecursiveIteratorIterator::SELF_FIRST);
+
+ foreach ($recursiveIterator as $file)
{
- $routes = array_merge($routes, require $path.'routes'.EXT);
- }
-
- if (is_dir($path.'routes'))
- {
- // Since route files can be nested deep within the route directory, we need to
- // recursively spin through the directory to find every file.
- $directoryIterator = new \RecursiveDirectoryIterator($path.'routes');
-
- $recursiveIterator = new \RecursiveIteratorIterator($directoryIterator, \RecursiveIteratorIterator::SELF_FIRST);
-
- foreach ($recursiveIterator as $file)
+ if (filetype($file) === 'file' and strpos($file, EXT) !== false)
{
- if (filetype($file) === 'file' and strpos($file, EXT) !== false)
- {
- $routes = array_merge($routes, require $file);
- }
+ $routes = array_merge($routes, require $file);
}
}
}
diff --git a/laravel/session/driver.php b/laravel/session/driver.php
index 6d51b347..928523ee 100644
--- a/laravel/session/driver.php
+++ b/laravel/session/driver.php
@@ -233,7 +233,7 @@ abstract class Driver {
{
$minutes = (Config::get('session.expire_on_close')) ? 0 : Config::get('session.lifetime');
- Cookie::put('laravel_session', static::$session['id'], $minutes, Config::get('session.path'), Config::get('session.domain'), Config::get('session.https'), Config::get('session.http_only'));
+ Cookie::put('laravel_session', static::$session['id'], $minutes, Config::get('session.path'), Config::get('session.domain'), Config::get('session.https'), Config::get('http_only'));
}
}
diff --git a/laravel/str.php b/laravel/str.php
index 6f99a2f1..22ccd414 100644
--- a/laravel/str.php
+++ b/laravel/str.php
@@ -2,17 +2,6 @@
class Str {
- /**
- * Convert HTML characters to entities.
- *
- * @param string $value
- * @return string
- */
- public static function entities($value)
- {
- return htmlentities($value, ENT_QUOTES, Config::get('application.encoding'), false);
- }
-
/**
* Convert a string to lowercase.
*
diff --git a/laravel/url.php b/laravel/url.php
index bb338c4f..50fde8ad 100644
--- a/laravel/url.php
+++ b/laravel/url.php
@@ -9,20 +9,14 @@ class URL {
*
* @param string $url
* @param bool $https
- * @param bool $asset
* @return string
*/
- public static function to($url = '', $https = false, $asset = false)
+ public static function to($url = '', $https = false)
{
if (filter_var($url, FILTER_VALIDATE_URL) !== false) return $url;
$base = Config::get('application.url').'/'.Config::get('application.index');
- if ($asset and Config::get('application.index') !== '')
- {
- $base = str_replace('/'.Config::get('application.index'), '', $base);
- }
-
if ($https and strpos($base, 'http://') === 0)
{
$base = 'https://'.substr($base, 7);
@@ -43,23 +37,31 @@ class URL {
}
/**
- * Generate an application URL to an asset. The index file
- * will not be added to the URL.
+ * Generate an application URL to an asset.
+ *
+ * The index file will not be added to asset URLs.
*
* @param string $url
* @return string
*/
public static function to_asset($url)
{
- return static::to($url, Request::is_secure(), true);
+ return str_replace('index.php/', '', static::to($url, Request::active()->is_secure()));
}
/**
* Generate a URL from a route name.
*
- * For routes that have wildcard parameters, an array may be passed as the
- * second parameter to the method. The values of this array will be used
- * to fill the wildcard segments of the route URI.
+ * For routes that have wildcard parameters, an array may be passed as the second parameter to the method.
+ * The values of this array will be used to fill the wildcard segments of the route URI.
+ *
+ *
+ * // Generate a URL for the "profile" named route
+ * $url = URL::to_route('profile');
+ *
+ * // Generate a URL for the "profile" named route with parameters.
+ * $url = URL::to_route('profile', array('fred'));
+ *
*
* @param string $name
* @param array $parameters
@@ -90,6 +92,11 @@ class URL {
/**
* Generate a HTTPS URL from a route name.
*
+ *
+ * // Generate a HTTPS URL for the "profile" named route
+ * $url = URL::to_secure_route('profile');
+ *
+ *
* @param string $name
* @param array $parameters
* @return string
@@ -102,6 +109,14 @@ class URL {
/**
* Generate a URL friendly "slug".
*
+ *
+ * // Returns "my-first-post"
+ * $slug = URL::slug('My First Post!!');
+ *
+ * // Returns "my_first_post"
+ * $slug = URL::slug('My First Post!!', '_');
+ *
+ *
* @param string $title
* @param string $separator
* @return string
@@ -120,7 +135,18 @@ class URL {
}
/**
- * Magic Method for dynamically creating route URLs.
+ * Magic Method for dynamically creating URLs to named routes.
+ *
+ *
+ * // Generate a URL for the "profile" named route
+ * $url = URL::to_profile();
+ *
+ * // Generate a URL for the "profile" named route using HTTPS
+ * $url = URL::to_secure_profile();
+ *
+ * // Generate a URL for the "profile" named route with parameters.
+ * $url = URL::to_profile(array('fred'));
+ *
*/
public static function __callStatic($method, $parameters)
{
diff --git a/laravel/validator.php b/laravel/validator.php
index ffcd7cd4..7314d2f9 100644
--- a/laravel/validator.php
+++ b/laravel/validator.php
@@ -37,6 +37,13 @@ class Validator {
*/
public $language;
+ /**
+ * The database connection that should be used by the validator.
+ *
+ * @var DB\Connection
+ */
+ public $connection;
+
/**
* The size related validation rules.
*
@@ -302,7 +309,9 @@ class Validator {
{
if ( ! isset($parameters[1])) $parameters[1] = $attribute;
- return DB::connection()->table($parameters[0])->where($parameters[1], '=', $this->attributes[$attribute])->count() == 0;
+ if (is_null($this->connection)) $this->connection = DB::connection();
+
+ return $this->connection->table($parameters[0])->where($parameters[1], '=', $this->attributes[$attribute])->count() == 0;
}
/**
@@ -514,4 +523,16 @@ class Validator {
return $this;
}
+ /**
+ * Set the database connection that should be used by the validator.
+ *
+ * @param DB\Connection $connection
+ * @return Validator
+ */
+ public function connection(DB\Connection $connection)
+ {
+ $this->connection = $connection;
+ return $this;
+ }
+
}
\ No newline at end of file
diff --git a/laravel/view.php b/laravel/view.php
index 2ca13aa0..a63483f7 100644
--- a/laravel/view.php
+++ b/laravel/view.php
@@ -1,6 +1,6 @@
view = $view;
$this->data = $data;
-
- list($this->module, $this->path, $this->view) = static::parse($view);
-
- $this->compose();
+ $this->path = str_replace('.', '/', $view);
}
/**
@@ -68,44 +66,25 @@ class View {
/**
* Create a new view instance from a view name.
*
- * The view names for the active module will be searched first, followed by the view names
- * for the default module. Finally, the names for all modules will be searched.
- *
* @param string $name
* @param array $data
* @return View
*/
protected static function of($name, $data = array())
{
- foreach (array_unique(array_merge(array(ACTIVE_MODULE, DEFAULT_MODULE), Module::$modules)) as $module)
- {
- static::load_composers($module);
+ if (is_null(static::$composers)) static::$composers = require APP_PATH.'composers'.EXT;
- foreach (static::$composers[$module] as $key => $value)
+ foreach (static::$composers as $key => $value)
+ {
+ if ($name === $value or (isset($value['name']) and $name === $value['name']))
{
- if ($name === $value or (isset($value['name']) and $name === $value['name']))
- {
- return new static($key, $data);
- }
+ return new static($key, $data);
}
}
throw new \Exception("Named view [$name] is not defined.");
}
- /**
- * Parse a view identifier and get the module, path, and view name.
- *
- * @param string $view
- * @return array
- */
- protected static function parse($view)
- {
- list($module, $view) = Module::parse($view);
-
- return array($module, Module::path($module).'views/', $view);
- }
-
/**
* Call the composer for the view instance.
*
@@ -113,11 +92,11 @@ class View {
*/
protected function compose()
{
- static::load_composers($this->module);
+ if (is_null(static::$composers)) static::$composers = require APP_PATH.'composers'.EXT;
- if (isset(static::$composers[$this->module][$this->view]))
+ if (isset(static::$composers[$this->view]))
{
- foreach ((array) static::$composers[$this->module][$this->view] as $key => $value)
+ foreach ((array) static::$composers[$this->view] as $key => $value)
{
if (is_callable($value)) return call_user_func($value, $this);
}
@@ -125,42 +104,27 @@ class View {
}
/**
- * Load the view composers for a given module.
- *
- * @param string $module
- * @return void
- */
- protected static function load_composers($module)
- {
- if (isset(static::$composers[$module])) return;
-
- $composers = Module::path($module).'composers'.EXT;
-
- static::$composers[$module] = (file_exists($composers)) ? require $composers : array();
- }
-
- /**
- * Get the parsed content of the view.
+ * Get the evaluated string content of the view.
*
* @return string
*/
- public function get()
+ public function render()
{
- $view = str_replace('.', '/', $this->view);
+ $this->compose();
- if ( ! file_exists($this->path.$view.EXT))
+ if ( ! file_exists(VIEW_PATH.$this->path.EXT))
{
- Exception\Handler::make(new Exception("View [$view] does not exist."))->handle();
+ Exception\Handler::make(new Exception('View ['.$this->path.'] does not exist.'))->handle();
}
- foreach ($this->data as &$data)
+ foreach ($this->data as &$data)
{
- if ($data instanceof View or $data instanceof Response) $data = (string) $data;
+ if ($data instanceof Renderable) $data = $data->render();
}
ob_start() and extract($this->data, EXTR_SKIP);
- try { include $this->path.$view.EXT; } catch (\Exception $e) { Exception\Handler::make($e)->handle(); }
+ try { include VIEW_PATH.$this->path.EXT; } catch (\Exception $e) { Exception\Handler::make($e)->handle(); }
return ob_get_clean();
}
@@ -168,6 +132,14 @@ class View {
/**
* Add a view instance to the view data.
*
+ *
+ * // Bind the view "partial/login" to the view
+ * View::make('home')->partial('login', 'partial/login');
+ *
+ * // Equivalent binding using the "bind" method
+ * View::make('home')->bind('login', View::make('partials/login'));
+ *
+ *
* @param string $key
* @param string $view
* @param array $data
@@ -181,6 +153,13 @@ class View {
/**
* Add a key / value pair to the view data.
*
+ * Bound data will be available to the view as variables.
+ *
+ *
+ * // Bind a "name" value to the view
+ * View::make('home')->bind('name', 'Fred');
+ *
+ *
* @param string $key
* @param mixed $value
* @return View
@@ -193,6 +172,14 @@ class View {
/**
* Magic Method for handling the dynamic creation of named views.
+ *
+ *
+ * // 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'));
+ *
*/
public static function __callStatic($method, $parameters)
{
@@ -234,12 +221,4 @@ class View {
unset($this->data[$key]);
}
- /**
- * Get the parsed content of the View.
- */
- public function __toString()
- {
- return $this->get();
- }
-
}
\ No newline at end of file
diff --git a/modules/.gitignore b/modules/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/public/index.php b/public/index.php
index 4b616b5e..e0868e92 100644
--- a/public/index.php
+++ b/public/index.php
@@ -8,23 +8,6 @@
* @link http://laravel.com
*/
-/*
-|--------------------------------------------------------------------------
-| Active Modules
-|--------------------------------------------------------------------------
-|
-| Modules are a convenient way to organize your application into logical
-| components. Each module may have its own libraries, models, routes,
-| views, language files, and configuration.
-|
-| Here you may specify which modules are active for your application.
-| This simply gives Laravel an easy way to know which directories to
-| check when auto-loading your classes, routes, and views.
-|
-*/
-
-$active = array();
-
/*
|--------------------------------------------------------------------------
| Installation Paths
@@ -44,8 +27,6 @@ $laravel = '../laravel';
$packages = '../packages';
-$modules = '../modules';
-
$storage = '../storage';
$public = __DIR__;