wenjy / php-redis

src/Connection.php

Spacing +12 added lines, -12 removed lines

@@ -551,9 +551,9 @@ 
         if ($this->_socket !== false) {
             return;
         }
-        $connection = ($this->unixSocket ?: $this->hostname . ':' . $this->port) . ', database=' . $this->database;
+        $connection = ($this->unixSocket ?: $this->hostname.':'.$this->port).', database='.$this->database;
         $this->_socket = @stream_socket_client(
-            $this->unixSocket ? 'unix://' . $this->unixSocket : 'tcp://' . $this->hostname . ':' . $this->port,
+            $this->unixSocket ? 'unix://'.$this->unixSocket : 'tcp://'.$this->hostname.':'.$this->port,
             $errorNumber,
             $errorDescription,
             $this->connectionTimeout ? $this->connectionTimeout : ini_get('default_socket_timeout'),
@@ -583,7 +583,7 @@ 
     public function close()
     {
         if ($this->_socket !== false) {
-            $connection = ($this->unixSocket ?: $this->hostname . ':' . $this->port) . ', database=' . $this->database;
+            $connection = ($this->unixSocket ?: $this->hostname.':'.$this->port).', database='.$this->database;
             try {
                 $this->executeCommand('QUIT');
             } catch (SocketException $e) {
@@ -666,9 +666,9 @@ 
         $this->open();
 
         $params = array_merge(explode(' ', $name), $params);
-        $command = '*' . count($params) . "\r\n";
+        $command = '*'.count($params)."\r\n";
         foreach ($params as $arg) {
-            $command .= '$' . mb_strlen($arg, '8bit') . "\r\n" . $arg . "\r\n";
+            $command .= '$'.mb_strlen($arg, '8bit')."\r\n".$arg."\r\n";
         }
 
         if ($this->retries > 0) {
@@ -698,10 +698,10 @@ 
     {
         $written = @fwrite($this->_socket, $command);
         if ($written === false) {
-            throw new SocketException("Failed to write to socket.\nRedis command was: " . $command);
+            throw new SocketException("Failed to write to socket.\nRedis command was: ".$command);
         }
         if ($written !== ($len = mb_strlen($command, '8bit'))) {
-            throw new SocketException("Failed to write to socket. $written of $len bytes written.\nRedis command was: " . $command);
+            throw new SocketException("Failed to write to socket. $written of $len bytes written.\nRedis command was: ".$command);
         }
         return $this->parseResponse(implode(' ', $params));
     }
@@ -719,7 +719,7 @@ 
     private function parseResponse($command)
     {
         if (($line = fgets($this->_socket)) === false) {
-            throw new SocketException("Failed to read from socket.\nRedis command was: " . $command);
+            throw new SocketException("Failed to read from socket.\nRedis command was: ".$command);
         }
         $type = $line[0];
         $line = mb_substr($line, 1, -2, '8bit');
@@ -731,7 +731,7 @@ 
                     return $line;
                 }
             case '-': // Error reply
-                throw new Exception("Redis error: " . $line . "\nRedis command was: " . $command);
+                throw new Exception("Redis error: ".$line."\nRedis command was: ".$command);
             case ':': // Integer reply
                 // no cast to int as it is in the range of a signed 64 bit integer
                 return $line;
@@ -739,11 +739,11 @@ 
                 if ($line == '-1') {
                     return null;
                 }
-                $length = (int)$line + 2;
+                $length = (int) $line + 2;
                 $data = '';
                 while ($length > 0) {
                     if (($block = fread($this->_socket, $length)) === false) {
-                        throw new SocketException("Failed to read from socket.\nRedis command was: " . $command);
+                        throw new SocketException("Failed to read from socket.\nRedis command was: ".$command);
                     }
                     $data .= $block;
                     $length -= mb_strlen($block, '8bit');
@@ -759,7 +759,7 @@ 
 
                 return $data;
             default:
-                throw new Exception('Received illegal data from redis: ' . $line . "\nRedis command was: " . $command);
+                throw new Exception('Received illegal data from redis: '.$line."\nRedis command was: ".$command);
         }
     }
 }