@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | public function removeTag($tagName) |
| 350 | 350 | { |
| 351 | 351 | if (($key = array_search($tagName, $this->tags)) !== false) { |
| 352 | - unset($this->tags[ $key ]); |
|
| 352 | + unset($this->tags[$key]); |
|
| 353 | 353 | $this->removedTags[] = $tagName; |
| 354 | 354 | } |
| 355 | 355 | |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | final public function __debugInfo() |
| 393 | 393 | { |
| 394 | 394 | $info = get_object_vars($this); |
| 395 | - $info[ 'driver' ] = 'object(' . get_class($info[ 'driver' ]) . ')'; |
|
| 395 | + $info['driver'] = 'object(' . get_class($info['driver']) . ')'; |
|
| 396 | 396 | |
| 397 | 397 | return (array) $info; |
| 398 | 398 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | */ |
| 127 | 127 | public function driverConnect() |
| 128 | 128 | { |
| 129 | - $server = isset($this->config[ 'redis' ]) ? $this->config[ 'redis' ] : [ |
|
| 129 | + $server = isset($this->config['redis']) ? $this->config['redis'] : [ |
|
| 130 | 130 | 'host' => '127.0.0.1', |
| 131 | 131 | 'port' => '6379', |
| 132 | 132 | 'password' => '', |
@@ -134,32 +134,32 @@ discard block |
||
| 134 | 134 | ]; |
| 135 | 135 | |
| 136 | 136 | $config = [ |
| 137 | - 'host' => $server[ 'host' ], |
|
| 137 | + 'host' => $server['host'], |
|
| 138 | 138 | ]; |
| 139 | 139 | |
| 140 | - $port = isset($server[ 'port' ]) ? $server[ 'port' ] : ''; |
|
| 140 | + $port = isset($server['port']) ? $server['port'] : ''; |
|
| 141 | 141 | if ($port != '') { |
| 142 | - $config[ 'port' ] = $port; |
|
| 142 | + $config['port'] = $port; |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - $password = isset($server[ 'password' ]) ? $server[ 'password' ] : ''; |
|
| 145 | + $password = isset($server['password']) ? $server['password'] : ''; |
|
| 146 | 146 | if ($password != '') { |
| 147 | - $config[ 'password' ] = $password; |
|
| 147 | + $config['password'] = $password; |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | - $database = isset($server[ 'database' ]) ? $server[ 'database' ] : ''; |
|
| 150 | + $database = isset($server['database']) ? $server['database'] : ''; |
|
| 151 | 151 | if ($database != '') { |
| 152 | - $config[ 'database' ] = $database; |
|
| 152 | + $config['database'] = $database; |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | - $timeout = isset($server[ 'timeout' ]) ? $server[ 'timeout' ] : ''; |
|
| 155 | + $timeout = isset($server['timeout']) ? $server['timeout'] : ''; |
|
| 156 | 156 | if ($timeout != '') { |
| 157 | - $config[ 'timeout' ] = $timeout; |
|
| 157 | + $config['timeout'] = $timeout; |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | - $read_write_timeout = isset($server[ 'read_write_timeout' ]) ? $server[ 'read_write_timeout' ] : ''; |
|
| 160 | + $read_write_timeout = isset($server['read_write_timeout']) ? $server['read_write_timeout'] : ''; |
|
| 161 | 161 | if ($read_write_timeout != '') { |
| 162 | - $config[ 'read_write_timeout' ] = $read_write_timeout; |
|
| 162 | + $config['read_write_timeout'] = $read_write_timeout; |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | $this->instance = new PredisClient($config); |
@@ -127,14 +127,14 @@ discard block |
||
| 127 | 127 | public function driverConnect() |
| 128 | 128 | { |
| 129 | 129 | $server = isset($this->config[ 'redis' ]) ? $this->config[ 'redis' ] : [ |
| 130 | - 'host' => '127.0.0.1', |
|
| 131 | - 'port' => '6379', |
|
| 132 | - 'password' => '', |
|
| 133 | - 'database' => '', |
|
| 130 | + 'host' => '127.0.0.1', |
|
| 131 | + 'port' => '6379', |
|
| 132 | + 'password' => '', |
|
| 133 | + 'database' => '', |
|
| 134 | 134 | ]; |
| 135 | 135 | |
| 136 | 136 | $config = [ |
| 137 | - 'host' => $server[ 'host' ], |
|
| 137 | + 'host' => $server[ 'host' ], |
|
| 138 | 138 | ]; |
| 139 | 139 | |
| 140 | 140 | $port = isset($server[ 'port' ]) ? $server[ 'port' ] : ''; |
@@ -196,8 +196,8 @@ discard block |
||
| 196 | 196 | public function getStats() |
| 197 | 197 | { |
| 198 | 198 | return (new driverStatistic()) |
| 199 | - ->setRawData($this->instance->info()) |
|
| 200 | - ->setSize(0) |
|
| 201 | - ->setInfo(''); |
|
| 199 | + ->setRawData($this->instance->info()) |
|
| 200 | + ->setSize(0) |
|
| 201 | + ->setInfo(''); |
|
| 202 | 202 | } |
| 203 | 203 | } |
| 204 | 204 | \ No newline at end of file |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | $this->instance = new MemcacheSoftware(); |
| 53 | 53 | $this->driverConnect(); |
| 54 | 54 | |
| 55 | - if (array_key_exists('compress_data', $config) && $config[ 'compress_data' ] === true) { |
|
| 55 | + if (array_key_exists('compress_data', $config) && $config['compress_data'] === true) { |
|
| 56 | 56 | $this->memcacheFlags = MEMCACHE_COMPRESSED; |
| 57 | 57 | } |
| 58 | 58 | } |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | */ |
| 131 | 131 | public function driverConnect() |
| 132 | 132 | { |
| 133 | - $servers = (!empty($this->config[ 'memcache' ]) && is_array($this->config[ 'memcache' ]) ? $this->config[ 'memcache' ] : []); |
|
| 133 | + $servers = (!empty($this->config['memcache']) && is_array($this->config['memcache']) ? $this->config['memcache'] : []); |
|
| 134 | 134 | if (count($servers) < 1) { |
| 135 | 135 | $servers = [ |
| 136 | 136 | ['127.0.0.1', 11211], |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | foreach ($servers as $server) { |
| 141 | 141 | try { |
| 142 | - if (!$this->instance->addserver($server[ 0 ], $server[ 1 ])) { |
|
| 142 | + if (!$this->instance->addserver($server[0], $server[1])) { |
|
| 143 | 143 | $this->fallback = true; |
| 144 | 144 | } |
| 145 | 145 | } catch (\Exception $e) { |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | $servers = (!empty($this->config[ 'memcache' ]) && is_array($this->config[ 'memcache' ]) ? $this->config[ 'memcache' ] : []); |
| 132 | 132 | if (count($servers) < 1) { |
| 133 | 133 | $servers = [ |
| 134 | - ['127.0.0.1', 11211], |
|
| 134 | + ['127.0.0.1', 11211], |
|
| 135 | 135 | ]; |
| 136 | 136 | } |
| 137 | 137 | |
@@ -178,9 +178,9 @@ discard block |
||
| 178 | 178 | $stats = (array) $this->instance->getstats(); |
| 179 | 179 | $date = (new \DateTime())->setTimestamp(time() - $stats['uptime']); |
| 180 | 180 | return (new driverStatistic()) |
| 181 | - ->setData(implode(', ', array_keys($this->itemInstances))) |
|
| 182 | - ->setInfo(sprintf("The memcache daemon v%s is up since %s.\n For more information see RawData.", $stats['version'], $date->format(DATE_RFC2822))) |
|
| 183 | - ->setRawData($stats) |
|
| 184 | - ->setSize($stats['bytes']); |
|
| 181 | + ->setData(implode(', ', array_keys($this->itemInstances))) |
|
| 182 | + ->setInfo(sprintf("The memcache daemon v%s is up since %s.\n For more information see RawData.", $stats['version'], $date->format(DATE_RFC2822))) |
|
| 183 | + ->setRawData($stats) |
|
| 184 | + ->setSize($stats['bytes']); |
|
| 185 | 185 | } |
| 186 | 186 | } |
| 187 | 187 | \ No newline at end of file |
@@ -122,11 +122,11 @@ |
||
| 122 | 122 | } else { |
| 123 | 123 | $this->instance = $this->instance ?: new RedisClient(); |
| 124 | 124 | |
| 125 | - $host = isset($this->config[ 'host' ]) ? $this->config[ 'host' ] : '127.0.0.1'; |
|
| 126 | - $port = isset($this->config[ 'port' ]) ? (int) $this->config[ 'port' ] : '6379'; |
|
| 127 | - $password = isset($this->config[ 'password' ]) ? $this->config[ 'password' ] : ''; |
|
| 128 | - $database = isset($this->config[ 'database' ]) ? $this->config[ 'database' ] : ''; |
|
| 129 | - $timeout = isset($this->config[ 'timeout' ]) ? $this->config[ 'timeout' ] : ''; |
|
| 125 | + $host = isset($this->config['host']) ? $this->config['host'] : '127.0.0.1'; |
|
| 126 | + $port = isset($this->config['port']) ? (int) $this->config['port'] : '6379'; |
|
| 127 | + $password = isset($this->config['password']) ? $this->config['password'] : ''; |
|
| 128 | + $database = isset($this->config['database']) ? $this->config['database'] : ''; |
|
| 129 | + $timeout = isset($this->config['timeout']) ? $this->config['timeout'] : ''; |
|
| 130 | 130 | |
| 131 | 131 | if (!$this->instance->connect($host, (int) $port, (int) $timeout)) { |
| 132 | 132 | return false; |
@@ -175,9 +175,9 @@ |
||
| 175 | 175 | $info = $this->instance->info(); |
| 176 | 176 | $date = (new \DateTime())->setTimestamp(time() - $info['uptime_in_seconds']); |
| 177 | 177 | return (new driverStatistic()) |
| 178 | - ->setData(implode(', ', array_keys($this->itemInstances))) |
|
| 179 | - ->setRawData($info) |
|
| 180 | - ->setSize($info['used_memory']) |
|
| 181 | - ->setInfo(sprintf("The Redis daemon v%s is up since %s.\n For more information see RawData. \n Driver size includes the memory allocation size.", $info['redis_version'], $date->format(DATE_RFC2822))); |
|
| 178 | + ->setData(implode(', ', array_keys($this->itemInstances))) |
|
| 179 | + ->setRawData($info) |
|
| 180 | + ->setSize($info['used_memory']) |
|
| 181 | + ->setInfo(sprintf("The Redis daemon v%s is up since %s.\n For more information see RawData. \n Driver size includes the memory allocation size.", $info['redis_version'], $date->format(DATE_RFC2822))); |
|
| 182 | 182 | } |
| 183 | 183 | } |
| 184 | 184 | \ No newline at end of file |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | $this->driver->setItem($this); |
| 43 | 43 | } else { |
| 44 | 44 | throw new \InvalidArgumentException(sprintf('$key must be a string, got type "%s" instead.', |
| 45 | - gettype($key))); |
|
| 45 | + gettype($key))); |
|
| 46 | 46 | } |
| 47 | 47 | } |
| 48 | 48 | |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | $keyword = self::PREFIX . $item->getKey(); |
| 80 | 80 | $v = json_encode($this->driverPreWrap($item)); |
| 81 | 81 | |
| 82 | - if (isset($this->config[ 'limited_memory_each_object' ]) && strlen($v) > $this->config[ 'limited_memory_each_object' ]) { |
|
| 82 | + if (isset($this->config['limited_memory_each_object']) && strlen($v) > $this->config['limited_memory_each_object']) { |
|
| 83 | 83 | return false; |
| 84 | 84 | } |
| 85 | 85 | |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | // return null if no caching |
| 101 | 101 | // return value if in caching |
| 102 | 102 | $keyword = self::PREFIX . $key; |
| 103 | - $x = isset($_COOKIE[ $keyword ]) ? $this->decode(json_decode($_COOKIE[ $keyword ], true)) : false; |
|
| 103 | + $x = isset($_COOKIE[$keyword]) ? $this->decode(json_decode($_COOKIE[$keyword], true)) : false; |
|
| 104 | 104 | |
| 105 | 105 | if ($x == false) { |
| 106 | 106 | return null; |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | { |
| 122 | 122 | $this->driverConnect(); |
| 123 | 123 | $keyword = self::PREFIX . $key; |
| 124 | - $x = isset($_COOKIE[ $keyword ]) ? $this->decode(json_decode($_COOKIE[ $keyword ])->t) : false; |
|
| 124 | + $x = isset($_COOKIE[$keyword]) ? $this->decode(json_decode($_COOKIE[$keyword])->t) : false; |
|
| 125 | 125 | |
| 126 | 126 | return $x ? $x - time() : $x; |
| 127 | 127 | } |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | if ($item instanceof Item) { |
| 140 | 140 | $this->driverConnect(); |
| 141 | 141 | $keyword = self::PREFIX . $item->getKey(); |
| 142 | - $_COOKIE[ $keyword ] = null; |
|
| 142 | + $_COOKIE[$keyword] = null; |
|
| 143 | 143 | |
| 144 | 144 | return @setcookie($keyword, null, -10); |
| 145 | 145 | } else { |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | $this->driverConnect(); |
| 157 | 157 | foreach ($_COOKIE as $keyword => $value) { |
| 158 | 158 | if (strpos($keyword, self::PREFIX) !== false) { |
| 159 | - $_COOKIE[ $keyword ] = null; |
|
| 159 | + $_COOKIE[$keyword] = null; |
|
| 160 | 160 | $result = @setcookie($keyword, null, -10); |
| 161 | 161 | if ($return !== false) { |
| 162 | 162 | $return = $result; |
@@ -128,7 +128,7 @@ |
||
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | /** |
| 131 | - * @return bool |
|
| 131 | + * @return boolean|null |
|
| 132 | 132 | */ |
| 133 | 133 | public function driverConnect() |
| 134 | 134 | { |
@@ -176,9 +176,9 @@ |
||
| 176 | 176 | public function getStats() |
| 177 | 177 | { |
| 178 | 178 | return (new driverStatistic()) |
| 179 | - ->setData(implode(', ', array_keys($this->itemInstances))) |
|
| 180 | - ->setInfo('Number of files used to build the cache: ' . Directory::getFileCount($this->getLeveldbFile())) |
|
| 181 | - ->setSize(Directory::dirSize($this->getLeveldbFile())); |
|
| 179 | + ->setData(implode(', ', array_keys($this->itemInstances))) |
|
| 180 | + ->setInfo('Number of files used to build the cache: ' . Directory::getFileCount($this->getLeveldbFile())) |
|
| 181 | + ->setSize(Directory::dirSize($this->getLeveldbFile())); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | /** |
@@ -147,10 +147,10 @@ |
||
| 147 | 147 | { |
| 148 | 148 | try{ |
| 149 | 149 | $server = isset($this->config[ 'ssdb' ]) ? $this->config[ 'ssdb' ] : [ |
| 150 | - 'host' => "127.0.0.1", |
|
| 151 | - 'port' => 8888, |
|
| 152 | - 'password' => '', |
|
| 153 | - 'timeout' => 2000, |
|
| 150 | + 'host' => "127.0.0.1", |
|
| 151 | + 'port' => 8888, |
|
| 152 | + 'password' => '', |
|
| 153 | + 'timeout' => 2000, |
|
| 154 | 154 | ]; |
| 155 | 155 | |
| 156 | 156 | $host = $server[ 'host' ]; |
@@ -145,18 +145,18 @@ discard block |
||
| 145 | 145 | */ |
| 146 | 146 | public function driverConnect() |
| 147 | 147 | { |
| 148 | - try{ |
|
| 149 | - $server = isset($this->config[ 'ssdb' ]) ? $this->config[ 'ssdb' ] : [ |
|
| 148 | + try { |
|
| 149 | + $server = isset($this->config['ssdb']) ? $this->config['ssdb'] : [ |
|
| 150 | 150 | 'host' => "127.0.0.1", |
| 151 | 151 | 'port' => 8888, |
| 152 | 152 | 'password' => '', |
| 153 | 153 | 'timeout' => 2000, |
| 154 | 154 | ]; |
| 155 | 155 | |
| 156 | - $host = $server[ 'host' ]; |
|
| 157 | - $port = isset($server[ 'port' ]) ? (int) $server[ 'port' ] : 8888; |
|
| 158 | - $password = isset($server[ 'password' ]) ? $server[ 'password' ] : ''; |
|
| 159 | - $timeout = !empty($server[ 'timeout' ]) ? (int) $server[ 'timeout' ] : 2000; |
|
| 156 | + $host = $server['host']; |
|
| 157 | + $port = isset($server['port']) ? (int) $server['port'] : 8888; |
|
| 158 | + $password = isset($server['password']) ? $server['password'] : ''; |
|
| 159 | + $timeout = !empty($server['timeout']) ? (int) $server['timeout'] : 2000; |
|
| 160 | 160 | $this->instance = new SimpleSSDB($host, $port, $timeout); |
| 161 | 161 | if (!empty($password)) { |
| 162 | 162 | $this->instance->auth($password); |
@@ -167,8 +167,8 @@ discard block |
||
| 167 | 167 | } else { |
| 168 | 168 | return true; |
| 169 | 169 | } |
| 170 | - }catch(SSDBException $e){ |
|
| 171 | - throw new phpFastCacheDriverException('Ssdb failed to connect with error: '. $e->getMessage(), 0 , $e); |
|
| 170 | + } catch (SSDBException $e) { |
|
| 171 | + throw new phpFastCacheDriverException('Ssdb failed to connect with error: ' . $e->getMessage(), 0, $e); |
|
| 172 | 172 | } |
| 173 | 173 | } |
| 174 | 174 | |
@@ -167,7 +167,7 @@ |
||
| 167 | 167 | } else { |
| 168 | 168 | return true; |
| 169 | 169 | } |
| 170 | - }catch(SSDBException $e){ |
|
| 170 | + } catch(SSDBException $e){ |
|
| 171 | 171 | throw new phpFastCacheDriverException('Ssdb failed to connect with error: '. $e->getMessage(), 0 , $e); |
| 172 | 172 | } |
| 173 | 173 | } |
@@ -115,7 +115,7 @@ |
||
| 115 | 115 | |
| 116 | 116 | |
| 117 | 117 | /** |
| 118 | - * @param $file |
|
| 118 | + * @param string $file |
|
| 119 | 119 | * @return string |
| 120 | 120 | * @throws \Exception |
| 121 | 121 | */ |
@@ -214,9 +214,9 @@ |
||
| 214 | 214 | public function driverPreWrap(ExtendedCacheItemInterface $item) |
| 215 | 215 | { |
| 216 | 216 | return [ |
| 217 | - self::DRIVER_DATA_WRAPPER_INDEX => $item->get(), |
|
| 218 | - self::DRIVER_TIME_WRAPPER_INDEX => $item->getExpirationDate(), |
|
| 219 | - self::DRIVER_TAGS_WRAPPER_INDEX => $item->getTags(), |
|
| 217 | + self::DRIVER_DATA_WRAPPER_INDEX => $item->get(), |
|
| 218 | + self::DRIVER_TIME_WRAPPER_INDEX => $item->getExpirationDate(), |
|
| 219 | + self::DRIVER_TAGS_WRAPPER_INDEX => $item->getTags(), |
|
| 220 | 220 | ]; |
| 221 | 221 | } |
| 222 | 222 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | if (is_array($config_name)) { |
| 66 | 66 | $this->config = array_merge($this->config, $config_name); |
| 67 | 67 | } else { |
| 68 | - $this->config[ $config_name ] = $value; |
|
| 68 | + $this->config[$config_name] = $value; |
|
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | */ |
| 183 | 183 | public function driverUnwrapData(array $wrapper) |
| 184 | 184 | { |
| 185 | - return $wrapper[ self::DRIVER_DATA_WRAPPER_INDEX ]; |
|
| 185 | + return $wrapper[self::DRIVER_DATA_WRAPPER_INDEX]; |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | /** |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | */ |
| 192 | 192 | public function driverUnwrapTags(array $wrapper) |
| 193 | 193 | { |
| 194 | - return $wrapper[ self::DRIVER_TAGS_WRAPPER_INDEX ]; |
|
| 194 | + return $wrapper[self::DRIVER_TAGS_WRAPPER_INDEX]; |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | */ |
| 202 | 202 | public function driverUnwrapTime(array $wrapper) |
| 203 | 203 | { |
| 204 | - return $wrapper[ self::DRIVER_TIME_WRAPPER_INDEX ]; |
|
| 204 | + return $wrapper[self::DRIVER_TIME_WRAPPER_INDEX]; |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | /** |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | foreach ($tagsItems as $tagsItem) { |
| 256 | 256 | $data = (array) $tagsItem->get(); |
| 257 | 257 | |
| 258 | - unset($data[ $item->getKey() ]); |
|
| 258 | + unset($data[$item->getKey()]); |
|
| 259 | 259 | $tagsItem->set($data); |
| 260 | 260 | |
| 261 | 261 | /** |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | */ |
| 307 | 307 | public static function isValidOption($optionName, $optionValue) |
| 308 | 308 | { |
| 309 | - if(!is_string($optionName)) |
|
| 309 | + if (!is_string($optionName)) |
|
| 310 | 310 | { |
| 311 | 311 | throw new \InvalidArgumentException('$optionName must be a string'); |
| 312 | 312 | } |