wenjy / php-redis

src/Connection.php

Spacing +12 added lines, -12 removed lines

@@ -573,9 +573,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'),
@@ -605,7 +605,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 (SocketRedisException $e) {
@@ -717,9 +717,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) {
@@ -749,10 +749,10 @@ 
     {
         $written = @fwrite($this->_socket, $command);
         if ($written === false) {
-            throw new SocketRedisException("Failed to write to socket.\nRedis command was: " . $command);
+            throw new SocketRedisException("Failed to write to socket.\nRedis command was: ".$command);
         }
         if ($written !== ($len = mb_strlen($command, '8bit'))) {
-            throw new SocketRedisException("Failed to write to socket. $written of $len bytes written.\nRedis command was: " . $command);
+            throw new SocketRedisException("Failed to write to socket. $written of $len bytes written.\nRedis command was: ".$command);
         }
         return $this->parseResponse(implode(' ', $params));
     }
@@ -770,7 +770,7 @@ 
     private function parseResponse($command)
     {
         if (($line = fgets($this->_socket)) === false) {
-            throw new SocketRedisException("Failed to read from socket.\nRedis command was: " . $command);
+            throw new SocketRedisException("Failed to read from socket.\nRedis command was: ".$command);
         }
         $type = $line[0];
         $line = mb_substr($line, 1, -2, '8bit');
@@ -782,7 +782,7 @@ 
                     return $line;
                 }
             case '-': // Error reply
-                throw new RedisException("Redis error: " . $line . "\nRedis command was: " . $command);
+                throw new RedisException("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;
@@ -790,11 +790,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 SocketRedisException("Failed to read from socket.\nRedis command was: " . $command);
+                        throw new SocketRedisException("Failed to read from socket.\nRedis command was: ".$command);
                     }
                     $data .= $block;
                     $length -= mb_strlen($block, '8bit');
@@ -810,7 +810,7 @@ 
 
                 return $data;
             default:
-                throw new RedisException('Received illegal data from redis: ' . $line . "\nRedis command was: " . $command);
+                throw new RedisException('Received illegal data from redis: '.$line."\nRedis command was: ".$command);
         }
     }
 }

src/Lock.php

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
      */
     public function acquireLock(string $lockName, $acquireTimeout = 10, $lockTimeout = 10)
     {
-        $lockName = 'lock:' . $lockName;
+        $lockName = 'lock:'.$lockName;
         $identifier = $this->getIdentifier();
         $end = time() + $acquireTimeout;
         while (time() < $end) {
@@ -47,7 +47,7 @@ 
      */
     public function releaseLock(string $lockName, string $identifier)
     {
-        $lockName = 'lock:' . $lockName;
+        $lockName = 'lock:'.$lockName;
         while (true) {
             $this->redis->watch($lockName);
             if ($this->redis->get($lockName) == $identifier) {
@@ -76,8 +76,8 @@ 
     {
         $identifier = $this->getIdentifier();
         $microTime = $this->microTimeFloat();
-        $ownerZset = $semname . ':owner';
-        $counterStr = $semname . ':counter';
+        $ownerZset = $semname.':owner';
+        $counterStr = $semname.':counter';
 
         // 清理过期的信号量持有者
         $this->redis->zremrangebyscore($semname, '-inf', $microTime + $timeout);
@@ -109,8 +109,8 @@ 
     public function releaseFairSemaphore($semname, $identifier)
     {
         $this->redis->zrem($semname, $identifier);
-        $ownerZset = $semname . ':owner';
-        return (bool)$this->redis->zrem($ownerZset, $identifier);
+        $ownerZset = $semname.':owner';
+        return (bool) $this->redis->zrem($ownerZset, $identifier);
     }
 
     /**
@@ -155,7 +155,7 @@ 
     protected function microTimeFloat()
     {
         list($usec, $sec) = explode(' ', microtime());
-        return ((float)$usec + (float)$sec);
+        return ((float) $usec + (float) $sec);
     }
 
     protected function getIdentifier()