resque / php-resque

lib/Resque/Redis.php

Spacing +10 added lines, -10 removed lines

@@ -133,7 +133,7 @@ 
 
 				$this->driver = new Credis_Client($host, $port, $timeout, $persistent);
 				$this->driver->setMaxConnectRetries($maxRetries);
-				if ($password){
+				if ($password) {
 					$this->driver->auth($password);
 				}
 
@@ -148,7 +148,7 @@ 
 				$this->driver->select($database);
 			}
 		}
-		catch(CredisException $e) {
+		catch (CredisException $e) {
 			throw new Resque_RedisException('Error communicating with Redis: ' . $e->getMessage(), 0, $e);
 		}
 	}
@@ -173,7 +173,7 @@ 
 			// Use a sensible default for an empty DNS string
 			$dsn = 'redis://' . self::DEFAULT_HOST;
 		}
-		if(substr($dsn, 0, 7) === 'unix://') {
+		if (substr($dsn, 0, 7) === 'unix://') {
 			return array(
 				$dsn,
 				null,
@@ -187,12 +187,12 @@ 
 
 		// Check the URI scheme
 		$validSchemes = array('redis', 'tcp');
-		if (isset($parts['scheme']) && ! in_array($parts['scheme'], $validSchemes)) {
+		if (isset($parts['scheme']) && !in_array($parts['scheme'], $validSchemes)) {
 			throw new \InvalidArgumentException("Invalid DSN. Supported schemes are " . implode(', ', $validSchemes));
 		}
 
 		// Allow simple 'hostname' format, which `parse_url` treats as a path, not host.
-		if ( ! isset($parts['host']) && isset($parts['path'])) {
+		if (!isset($parts['host']) && isset($parts['path'])) {
 			$parts['host'] = $parts['path'];
 			unset($parts['path']);
 		}
@@ -218,15 +218,15 @@ 
 		}
 
 		//check 'password-encoding' parameter and extracting password based on encoding
-		if($options && isset($options['password-encoding']) && $options['password-encoding'] === 'u'){
+		if ($options && isset($options['password-encoding']) && $options['password-encoding'] === 'u') {
 			//extracting urlencoded password
 			$pass = isset($parts['pass']) ? urldecode($parts['pass']) : false;
 		}
-		else if($options && isset($options['password-encoding']) && $options['password-encoding'] === 'b'){
+		else if ($options && isset($options['password-encoding']) && $options['password-encoding'] === 'b') {
 			//extracting base64 encoded password
 			$pass = isset($parts['pass']) ? base64_decode($parts['pass']) : false;
 		}
-		else{
+		else {
 			//extracting pass directly since 'password-encoding' parameter is not present
 			$pass = isset($parts['pass']) ? $parts['pass'] : false;
 		}
@@ -276,10 +276,10 @@ 
 
 	public static function removePrefix($string)
 	{
-	    $prefix=self::getPrefix();
+	    $prefix = self::getPrefix();
 
 	    if (substr($string, 0, strlen($prefix)) == $prefix) {
-	        $string = substr($string, strlen($prefix), strlen($string) );
+	        $string = substr($string, strlen($prefix), strlen($string));
 	    }
 	    return $string;
 	}

Braces +8 added lines, -16 removed lines

@@ -115,14 +115,11 @@ 
 		try {
 			if (is_object($client)) {
 				$this->driver = $client;
-			}
-			elseif (is_object($server)) {
+			} elseif (is_object($server)) {
 				$this->driver = $server;
-			}
-			elseif (is_array($server)) {
+			} elseif (is_array($server)) {
 				$this->driver = new Credis_Cluster($server);
-			}
-			else {
+			} else {
 				list($host, $port, $dsnDatabase, $user, $password, $options) = self::parseDsn($server);
 				// $user is not used, only $password
 
@@ -147,8 +144,7 @@ 
 			if ($database !== null) {
 				$this->driver->select($database);
 			}
-		}
-		catch(CredisException $e) {
+		} catch(CredisException $e) {
 			throw new Resque_RedisException('Error communicating with Redis: ' . $e->getMessage(), 0, $e);
 		}
 	}
@@ -221,12 +217,10 @@ 
 		if($options && isset($options['password-encoding']) && $options['password-encoding'] === 'u'){
 			//extracting urlencoded password
 			$pass = isset($parts['pass']) ? urldecode($parts['pass']) : false;
-		}
-		else if($options && isset($options['password-encoding']) && $options['password-encoding'] === 'b'){
+		} else if($options && isset($options['password-encoding']) && $options['password-encoding'] === 'b'){
 			//extracting base64 encoded password
 			$pass = isset($parts['pass']) ? base64_decode($parts['pass']) : false;
-		}
-		else{
+		} else{
 			//extracting pass directly since 'password-encoding' parameter is not present
 			$pass = isset($parts['pass']) ? $parts['pass'] : false;
 		}
@@ -256,15 +250,13 @@ 
 				foreach ($args[0] AS $i => $v) {
 					$args[0][$i] = self::$defaultNamespace . $v;
 				}
-			}
-			else {
+			} else {
 				$args[0] = self::$defaultNamespace . $args[0];
 			}
 		}
 		try {
 			return $this->driver->__call($name, $args);
-		}
-		catch (CredisException $e) {
+		} catch (CredisException $e) {
 			throw new Resque_RedisException('Error communicating with Redis: ' . $e->getMessage(), 0, $e);
 		}
 	}