Completed
Pull Request — master (#20)
by
unknown
03:15
created
lib/Resque/Redis.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -122,11 +122,9 @@  discard block
 block discarded – undo
122 122
 		try {
123 123
 			if (is_array($server)) {
124 124
 				$this->driver = new Credis_Cluster($server);
125
-			}
126
-			else if (is_object($client)) {
125
+			} else if (is_object($client)) {
127 126
 				$this->driver = $client;
128
-			}
129
-			else {
127
+			} else {
130 128
 				list($host, $port, $dsnDatabase, $user, $password, $options) = self::parseDsn($server);
131 129
 				// $user is not used, only $password
132 130
 
@@ -151,8 +149,7 @@  discard block
 block discarded – undo
151 149
 			if ($database !== null) {
152 150
 				$this->driver->select($database);
153 151
 			}
154
-		}
155
-		catch(CredisException $e) {
152
+		} catch(CredisException $e) {
156 153
 			throw new Resque_RedisException('Error communicating with Redis: ' . $e->getMessage(), 0, $e);
157 154
 		}
158 155
 	}
@@ -247,8 +244,7 @@  discard block
 block discarded – undo
247 244
 				foreach ($args[0] AS $i => $v) {
248 245
 					$args[0][$i] = self::$defaultNamespace . $v;
249 246
 				}
250
-			}
251
-			else {
247
+			} else {
252 248
 				$args[0] = self::$defaultNamespace . $args[0];
253 249
 			}
254 250
 		} elseif (in_array($name, $this->scanCommands)) {
@@ -257,8 +253,7 @@  discard block
 block discarded – undo
257 253
 		}
258 254
 		try {
259 255
 			return $this->driver->__call($name, $args);
260
-		}
261
-		catch (CredisException $e) {
256
+		} catch (CredisException $e) {
262 257
 			throw new Resque_RedisException('Error communicating with Redis: ' . $e->getMessage(), 0, $e);
263 258
 		}
264 259
 	}
Please login to merge, or discard this patch.