added auth support to redis.

taylorotwell · taylorotwell · commit 1a3e2be12679 · 2013-02-15T22:01:19.000-06:00
diff --git a/src/Illuminate/Redis/Database.php b/src/Illuminate/Redis/Database.php
@@ -23,6 +23,13 @@ class Database {
 	 */
 	protected $database;
 
+	/**
+	 * The password value.
+	 *
+	 * @var string
+	 */
+	protected $password;
+
 	/**
 	 * The Redis connection handler.
 	 *
@@ -36,13 +43,15 @@ class Database {
 	 * @param  string  $host
 	 * @param  int     $port
 	 * @param  int     $database
+	 * @param  string  $password
 	 * @return void
 	 */
-	public function __construct($host, $port, $database = 0)
+	public function __construct($host, $port, $database = 0, $password = null)
 	{
 		$this->host = $host;
 		$this->port = $port;
 		$this->database = $database;
+		$this->password = $password;
 	}
 
 	/**
@@ -56,6 +65,11 @@ public function connect()
 
 		$this->connection = $this->openSocket();
 
+		if ( ! is_null($this->password))
+		{
+			$this->command('auth', array($this->password));
+		}
+
 		$this->command('select', array($this->database));
 	}
 
diff --git a/src/Illuminate/Redis/RedisManager.php b/src/Illuminate/Redis/RedisManager.php
@@ -55,7 +55,12 @@ protected function createConnection($name)
 	{
 		$config = $this->getConfig($name);
 
-		$connection = new Database($config['host'], $config['port'], $config['database']);
+		// Redis may optionally have a password. So, we will attempt to extract out
+		// the password from the configuration. But one is not required so we'll
+		// just use array_get to return null if one hasn't been set in config.
+		$password = array_get($config, 'password');
+
+		$connection = new Database($config['host'], $config['port'], $config['database'], $password);
 
 		$connection->connect();
 
