From 9281f04cddb2fd5dd3e3443db658a59852378530 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Fri, 11 Nov 2011 23:15:17 -0600
Subject: [PATCH] minor refactorings.

---
 laravel/cache/drivers/factory.php       | 34 -------------------------
 laravel/cache/manager.php               | 34 ++++++++++++++++++++-----
 laravel/database/connectors/factory.php | 29 ---------------------
 laravel/database/manager.php            | 26 ++++++++++++++++++-
 4 files changed, 53 insertions(+), 70 deletions(-)
 delete mode 100644 laravel/cache/drivers/factory.php
 delete mode 100644 laravel/database/connectors/factory.php

diff --git a/laravel/cache/drivers/factory.php b/laravel/cache/drivers/factory.php
deleted file mode 100644
index 25044ec5..00000000
--- a/laravel/cache/drivers/factory.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php namespace Laravel\Cache\Drivers;
-
-use Laravel\Config;
-
-class Factory {
-
-	/**
-	 * Create a new cache driver instance.
-	 *
-	 * @param  string          $driver
-	 * @return Driver
-	 */
-	public static function make($driver)
-	{
-		switch ($driver)
-		{
-			case 'apc':
-				return new APC(Config::get('cache.key'));
-
-			case 'file':
-				return new File(CACHE_PATH);
-
-			case 'memcached':
-				return new Memcached(\Laravel\Memcached::instance(), Config::get('cache.key'));
-
-			case 'redis':
-				return new Redis(\Laravel\Redis::db());
-
-			default:
-				throw new \Exception("Cache driver {$driver} is not supported.");
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/laravel/cache/manager.php b/laravel/cache/manager.php
index d0ff49dc..d8eeaf5e 100644
--- a/laravel/cache/manager.php
+++ b/laravel/cache/manager.php
@@ -36,17 +36,39 @@ class Manager {
 
 		if ( ! array_key_exists($driver, static::$drivers))
 		{
-			if ( ! IoC::registered("laravel.cache.{$driver}"))
-			{
-				throw new \Exception("Cache driver [$driver] is not supported.");
-			}
-
-			return static::$drivers[$driver] = Drivers\Factory::make($driver);
+			return static::$drivers[$driver] = static::factory($driver);
 		}
 
 		return static::$drivers[$driver];
 	}
 
+	/**
+	 * Create a new cache driver instance.
+	 *
+	 * @param  string  $driver
+	 * @return Driver
+	 */
+	protected static function factory($driver)
+	{
+		switch ($driver)
+		{
+			case 'apc':
+				return new Drivers\APC(Config::get('cache.key'));
+
+			case 'file':
+				return new Drivers\File(CACHE_PATH);
+
+			case 'memcached':
+				return new Drivers\Memcached(Memcached::instance(), Config::get('cache.key'));
+
+			case 'redis':
+				return new Drivers\Redis(Redis::db());
+
+			default:
+				throw new \Exception("Cache driver {$driver} is not supported.");
+		}
+	}
+
 	/**
 	 * Pass all other methods to the default cache driver.
 	 *
diff --git a/laravel/database/connectors/factory.php b/laravel/database/connectors/factory.php
deleted file mode 100644
index 48cc238c..00000000
--- a/laravel/database/connectors/factory.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php namespace Laravel\Database\Connectors;
-
-class Factory {
-
-	/**
-	 * Create a new database connector instance.
-	 *
-	 * @param  string     $driver
-	 * @return Connector
-	 */
-	public static function make($driver)
-	{
-		switch ($driver)
-		{
-			case 'sqlite':
-				return new SQLite(DATABASE_PATH);
-
-			case 'mysql':
-				return new MySQL;
-
-			case 'pgsql':
-				return new Postgres;
-
-			default:
-				throw new \Exception("Database driver [$driver] is not supported.");
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/laravel/database/manager.php b/laravel/database/manager.php
index b2c6a863..fa63c0e5 100644
--- a/laravel/database/manager.php
+++ b/laravel/database/manager.php
@@ -65,7 +65,31 @@ class Manager {
 			return call_user_func($config['connector'], $config);
 		}
 
-		return Connectors\Factory::make($config['driver'])->connect($config);
+		return static::connector($config['driver'])->connect($config);
+	}
+
+	/**
+	 * Create a new database connector instance.
+	 *
+	 * @param  string     $driver
+	 * @return Connector
+	 */
+	protected static function connector($driver)
+	{
+		switch ($driver)
+		{
+			case 'sqlite':
+				return new Connectors\SQLite(DATABASE_PATH);
+
+			case 'mysql':
+				return new Connectors\MySQL;
+
+			case 'pgsql':
+				return new Connectors\Postgres;
+
+			default:
+				throw new \Exception("Database driver [$driver] is not supported.");
+		}
 	}
 
 	/**