resque / php-resque

lib/Resque/Redis.php

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);
 		}
 	}