From 2d170e2314e006e2ff5b0ce3098b629279a6d0b1 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Sat, 3 Sep 2011 23:05:06 -0500
Subject: [PATCH] added more facades.

---
 application/config/aliases.php      | 14 +++++++-------
 laravel/cache/manager.php           |  3 +++
 laravel/database/manager.php        |  4 ++++
 laravel/facade.php                  |  4 ++++
 laravel/security/authenticator.php  | 13 +++----------
 laravel/security/crypter.php        |  3 +++
 laravel/security/hashing/hasher.php | 17 ++++-------------
 laravel/session/manager.php         |  3 +++
 laravel/validation/validator.php    | 22 +++++++---------------
 9 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/application/config/aliases.php b/application/config/aliases.php
index 1b74b916..f52970f2 100644
--- a/application/config/aliases.php
+++ b/application/config/aliases.php
@@ -19,19 +19,19 @@
 	*/
 
 	'Asset'     => 'Laravel\\Asset',
-	'Auth'      => 'Laravel\\Security\\Authenticator',
+	'Auth'      => 'Laravel\\Security\\Authenticator_Facade',
 	'Benchmark' => 'Laravel\\Benchmark',
-	'Cache'     => 'Laravel\\Cache\\Manager',
+	'Cache'     => 'Laravel\\Cache\\Manager_Facade',
 	'Config'    => 'Laravel\\Config_Facade',
 	'Cookie'    => 'Laravel\\Cookie_Facade',
-	'Crypter'   => 'Laravel\\Security\\Crypter',
-	'DB'        => 'Laravel\\Database\\Manager',
+	'Crypter'   => 'Laravel\\Security\\Crypter_Facade',
+	'DB'        => 'Laravel\\Database\\Manager_Facade',
 	'Download'  => 'Laravel\\Download_Facade',
 	'Eloquent'  => 'Laravel\\Database\\Eloquent\\Model',
 	'Error'     => 'Laravel\\Error',
 	'File'      => 'Laravel\\File_Facade',
 	'Form'      => 'Laravel\\Form_Facade',
-	'Hasher'    => 'Laravel\\Security\\Hasher',
+	'Hasher'    => 'Laravel\\Security\\Hashing\\Hasher_Facade',
 	'HTML'      => 'Laravel\\HTML_Facade',
 	'Inflector' => 'Laravel\\Inflector',
 	'Input'     => 'Laravel\\Input_Facade',
@@ -43,9 +43,9 @@
 	'Redirect'  => 'Laravel\\Redirect_Facade',
 	'Request'   => 'Laravel\\Request_Facade',
 	'Response'  => 'Laravel\\Response_Facade',
-	'Session'   => 'Laravel\\Session\\Manager',
+	'Session'   => 'Laravel\\Session\\Manager_Facade',
 	'Str'       => 'Laravel\\Str',
-	'Validator' => 'Laravel\\Validation\\Validator',
+	'Validator' => 'Laravel\\Validation\\Validator_Facade',
 	'View'      => 'Laravel\\View_Facade',
 
 );
\ No newline at end of file
diff --git a/laravel/cache/manager.php b/laravel/cache/manager.php
index a70cc3ed..9b08389c 100644
--- a/laravel/cache/manager.php
+++ b/laravel/cache/manager.php
@@ -1,7 +1,10 @@
 <?php namespace Laravel\Cache;
 
+use Laravel\Facade;
 use Laravel\Container;
 
+class Manager_Facade extends Facade { public static $resolve = 'cache'; }
+
 class Manager {
 
 	/**
diff --git a/laravel/database/manager.php b/laravel/database/manager.php
index 474b6166..b2765bcb 100644
--- a/laravel/database/manager.php
+++ b/laravel/database/manager.php
@@ -1,5 +1,9 @@
 <?php namespace Laravel\Database;
 
+use Laravel\Facade;
+
+class Manager_Facade extends Facade { public static $resolve = 'database'; }
+
 class Manager {
 
 	/**
diff --git a/laravel/facade.php b/laravel/facade.php
index 3c98147e..d3836172 100644
--- a/laravel/facade.php
+++ b/laravel/facade.php
@@ -6,6 +6,10 @@ abstract class Facade {
 	 * Magic Method for passing methods to a class registered in the IoC container.
 	 * This provides a convenient method of accessing functions on classes that
 	 * could not otherwise be accessed staticly.
+	 *
+	 * Facades allow Laravel to still have a high level of dependency injection
+	 * and testability while still accomodating the common desire to conveniently
+	 * use classes via static methods.
 	 */
 	public static function __callStatic($method, $parameters)
 	{
diff --git a/laravel/security/authenticator.php b/laravel/security/authenticator.php
index dd59b9d8..25490f20 100644
--- a/laravel/security/authenticator.php
+++ b/laravel/security/authenticator.php
@@ -1,8 +1,11 @@
 <?php namespace Laravel\Security;
 
 use Laravel\IoC;
+use Laravel\Facade;
 use Laravel\Session\Driver;
 
+class Authenticator_Facade extends Facade { public static $resolve = 'auth'; }
+
 class Authenticator {
 
 	/**
@@ -51,16 +54,6 @@ public function __construct(Driver $driver, Hashing\Engine $hasher)
 		$this->session = $driver;
 	}
 
-	/**
-	 * Get an authenticator instance from the IoC container.
-	 *
-	 * @return Authenticator
-	 */
-	public static function make()
-	{
-		return IoC::container()->resolve('laravel.auth');
-	}
-
 	/**
 	 * Determine if the current user of the application is authenticated.
 	 *
diff --git a/laravel/security/crypter.php b/laravel/security/crypter.php
index dc76c8b6..5306ecad 100644
--- a/laravel/security/crypter.php
+++ b/laravel/security/crypter.php
@@ -1,6 +1,9 @@
 <?php namespace Laravel\Security;
 
 use Laravel\IoC;
+use Laravel\Facade;
+
+class Crypter_Facade extends Facade { public static $resolve = 'crypter'; }
 
 class Crypter {
 
diff --git a/laravel/security/hashing/hasher.php b/laravel/security/hashing/hasher.php
index 3aab2ef4..e02e01e2 100644
--- a/laravel/security/hashing/hasher.php
+++ b/laravel/security/hashing/hasher.php
@@ -1,5 +1,9 @@
 <?php namespace Laravel\Security\Hashing;
 
+use Laravel\Facade;
+
+class Hasher_Facade extends Facade { public static $resolve = 'hasher'; }
+
 class Hasher {
 
 	/**
@@ -22,19 +26,6 @@ public function __construct(Engine $engine = null)
 		$this->engine = (is_null($engine)) ? new BCrypt(10, false) : $engine;
 	}
 
-	/**
-	 * Create a new Hasher instance.
-	 *
-	 * If no hashing engine is provided, the BCrypt engine will be used.
-	 *
-	 * @param  Engine  $engine
-	 * @return Hasher
-	 */
-	public static function make(Engine $engine = null)
-	{
-		return new static($engine);
-	}
-
 	/**
 	 * Magic Method for delegating method calls to the hashing engine.
 	 *
diff --git a/laravel/session/manager.php b/laravel/session/manager.php
index 9c190b5b..397777d2 100644
--- a/laravel/session/manager.php
+++ b/laravel/session/manager.php
@@ -1,7 +1,10 @@
 <?php namespace Laravel\Session;
 
+use Laravel\Facade;
 use Laravel\Container;
 
+class Manager_Facade extends Facade { public static $resolve = 'session'; }
+
 class Manager {
 
 	/**
diff --git a/laravel/validation/validator.php b/laravel/validation/validator.php
index 36197752..0cfc74c6 100644
--- a/laravel/validation/validator.php
+++ b/laravel/validation/validator.php
@@ -2,7 +2,10 @@
 
 use Laravel\IoC;
 use Laravel\Str;
-use Laravel\Lang;
+use Laravel\Facade;
+use Laravel\Lang_Factory;
+
+class Validator_Facade extends Facade { public static $resolve = 'validator'; }
 
 class Validator {
 
@@ -68,24 +71,11 @@ class Validator {
 	 * @param  Lang  $lang
 	 * @return void
 	 */
-	public function __construct(Lang $lang)
+	public function __construct(Lang_Factory $lang)
 	{
 		$this->lang = $lang;
 	}
 
-	/**
-	 * Factory for creating new validator instances.
-	 *
-	 * @param  array      $attributes
-	 * @param  array      $rules
-	 * @param  array      $messages
-	 * @return Validator
-	 */
-	public static function make($attributes, $rules, $messages = array())
-	{
-		return IoC::resolve('laravel.validator')->of($attributes, $rules, $messages);
-	}
-
 	/**
 	 * Set the attributes, rules, and messages for the validator.
 	 *
@@ -104,6 +94,8 @@ public function of($attributes, $rules, $messages = array())
 		$this->attributes = $attributes;
 		$this->messages = $messages;
 		$this->rules = $rules;
+
+		return $this;
 	}
 
 	/**