Support ssl/tls protocol for Credis

Author: pprkut

lib/Redis.php

@@ -223,7 +223,7 @@ public static function parseDsn($dsn)
 		$parts = parse_url($dsn);
 
 		// Check the URI scheme
-		$validSchemes = array('redis', 'rediss', 'tcp');
+		$validSchemes = array('redis', 'tcp', 'rediss', 'tls', 'ssl');
 		if (isset($parts['scheme']) && ! in_array($parts['scheme'], $validSchemes)) {
 			throw new InvalidArgumentException("Invalid DSN. Supported schemes are " . implode(', ', $validSchemes));
 		}
@@ -267,7 +267,7 @@ public static function parseDsn($dsn)
 		}
 
 		return array(
-			$parts['host'],
+			$parts['scheme'] . '://' . $parts['host'],
 			$port,
 			$database,
 			$user,

test/Resque/Tests/RedisTest.php

@@ -41,126 +41,126 @@ public function validDsnStringProvider()
 		return array(
 			// Input , Expected output
 			array('', array(
-				'localhost',
+				'redis://localhost',
 				6379,
 				false,
 				false, false,
 				array(),
 			)),
 			array('localhost', array(
-				'localhost',
+				'tcp://localhost',
 				6379,
 				false,
 				false, false,
 				array(),
 			)),
 			array('localhost:1234', array(
-				'localhost',
+				'tcp://localhost',
 				1234,
 				false,
 				false, false,
 				array(),
 			)),
 			array('localhost:1234/2', array(
-				'localhost',
+				'tcp://localhost',
 				1234,
 				2,
 				false, false,
 				array(),
 			)),
 			array('redis://foobar', array(
-				'foobar',
+				'redis://foobar',
 				6379,
 				false,
 				false, false,
 				array(),
 			)),
 			array('redis://foobar/', array(
-				'foobar',
+				'redis://foobar',
 				6379,
 				false,
 				false, false,
 				array(),
 			)),
 			array('redis://foobar:1234', array(
-				'foobar',
+				'redis://foobar',
 				1234,
 				false,
 				false, false,
 				array(),
 			)),
 			array('redis://foobar:1234/15', array(
-				'foobar',
+				'redis://foobar',
 				1234,
 				15,
 				false, false,
 				array(),
 			)),
 			array('redis://foobar:1234/0', array(
-				'foobar',
+				'redis://foobar',
 				1234,
 				0,
 				false, false,
 				array(),
 			)),
 			array('redis://user@foobar:1234', array(
-				'foobar',
+				'redis://foobar',
 				1234,
 				false,
 				'user', false,
 				array(),
 			)),
 			array('redis://user@foobar:1234/15', array(
-				'foobar',
+				'redis://foobar',
 				1234,
 				15,
 				'user', false,
 				array(),
 			)),
 			array('redis://user:pass@foobar:1234', array(
-				'foobar',
+				'redis://foobar',
 				1234,
 				false,
 				'user', 'pass',
 				array(),
 			)),
 			array('redis://user:pass@foobar:1234?x=y&a=b', array(
-				'foobar',
+				'redis://foobar',
 				1234,
 				false,
 				'user', 'pass',
 				array('x' => 'y', 'a' => 'b'),
 			)),
 			array('redis://:pass@foobar:1234?x=y&a=b', array(
-				'foobar',
+				'redis://foobar',
 				1234,
 				false,
 				false, 'pass',
 				array('x' => 'y', 'a' => 'b'),
 			)),
 			array('redis://user@foobar:1234?x=y&a=b', array(
-				'foobar',
+				'redis://foobar',
 				1234,
 				false,
 				'user', false,
 				array('x' => 'y', 'a' => 'b'),
 			)),
 			array('redis://foobar:1234?x=y&a=b', array(
-				'foobar',
+				'redis://foobar',
 				1234,
 				false,
 				false, false,
 				array('x' => 'y', 'a' => 'b'),
 			)),
 			array('redis://user@foobar:1234/12?x=y&a=b', array(
-				'foobar',
+				'redis://foobar',
 				1234,
 				12,
 				'user', false,
 				array('x' => 'y', 'a' => 'b'),
 			)),
 			array('tcp://user@foobar:1234/12?x=y&a=b', array(
-				'foobar',
+				'tcp://foobar',
 				1234,
 				12,
 				'user', false,