@@ -17,9 +17,9 @@ |
||
| 17 | 17 | /** |
| 18 | 18 | * Register Autoload |
| 19 | 19 | */ |
| 20 | -spl_autoload_register(function ($entity) { |
|
| 20 | +spl_autoload_register(function($entity) { |
|
| 21 | 21 | $module = explode('\\', $entity, 2); |
| 22 | - if (!in_array($module[ 0 ], ['phpFastCache', 'Psr'])) { |
|
| 22 | + if (!in_array($module[0], ['phpFastCache', 'Psr'])) { |
|
| 23 | 23 | /** |
| 24 | 24 | * Not a part of phpFastCache file |
| 25 | 25 | * then we return here. |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | throw new \InvalidArgumentException(sprintf('$key must be a string, got type "%s" instead.', gettype($key))); |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - return $this->itemInstances[ $key ]; |
|
| 74 | + return $this->itemInstances[$key]; |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | public function setItem(CacheItemInterface $item) |
| 83 | 83 | { |
| 84 | 84 | if ($this->getClassNamespace() . '\\Item' === get_class($item)) { |
| 85 | - $this->itemInstances[ $item->getKey() ] = $item; |
|
| 85 | + $this->itemInstances[$item->getKey()] = $item; |
|
| 86 | 86 | |
| 87 | 87 | return $this; |
| 88 | 88 | } else { |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | { |
| 100 | 100 | $collection = []; |
| 101 | 101 | foreach ($keys as $key) { |
| 102 | - $collection[ $key ] = $this->getItem($key); |
|
| 102 | + $collection[$key] = $this->getItem($key); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | return $collection; |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | */ |
| 172 | 172 | public function saveDeferred(CacheItemInterface $item) |
| 173 | 173 | { |
| 174 | - return $this->deferredList[ $item->getKey() ] = $item; |
|
| 174 | + return $this->deferredList[$item->getKey()] = $item; |
|
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | /** |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | foreach ($this->deferredList as $key => $item) { |
| 185 | 185 | $result = $this->save($item); |
| 186 | 186 | if ($return !== false) { |
| 187 | - unset($this->deferredList[ $key ]); |
|
| 187 | + unset($this->deferredList[$key]); |
|
| 188 | 188 | $return = $result; |
| 189 | 189 | } |
| 190 | 190 | } |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | public function __destruct() |
| 63 | 63 | { |
| 64 | 64 | // clean up the memory and don't want for PHP clean for caching method "phpfastcache" |
| 65 | - if (isset($this->config[ 'instance' ]) && (int) $this->config[ 'cache_method' ] === 3) { |
|
| 66 | - CacheManager::cleanCachingMethod($this->config[ 'instance' ]); |
|
| 65 | + if (isset($this->config['instance']) && (int) $this->config['cache_method'] === 3) { |
|
| 66 | + CacheManager::cleanCachingMethod($this->config['instance']); |
|
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | |
@@ -85,9 +85,9 @@ discard block |
||
| 85 | 85 | */ |
| 86 | 86 | public function getInfo($keyword, $option = []) |
| 87 | 87 | { |
| 88 | - if ((int) $this->config[ 'cache_method' ] > 1) { |
|
| 89 | - if (isset(CacheManager::$memory[ $this->config[ 'instance' ] ][ $keyword ])) { |
|
| 90 | - $object = CacheManager::$memory[ $this->config[ 'instance' ] ][ $keyword ]; |
|
| 88 | + if ((int) $this->config['cache_method'] > 1) { |
|
| 89 | + if (isset(CacheManager::$memory[$this->config['instance']][$keyword])) { |
|
| 90 | + $object = CacheManager::$memory[$this->config['instance']][$keyword]; |
|
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | 93 | if (!isset($object)) { |
@@ -116,9 +116,9 @@ discard block |
||
| 116 | 116 | public function clean(array $option = []) |
| 117 | 117 | { |
| 118 | 118 | // handle method |
| 119 | - if ((int) $this->config[ 'cache_method' ] > 1) { |
|
| 119 | + if ((int) $this->config['cache_method'] > 1) { |
|
| 120 | 120 | // use memory |
| 121 | - CacheManager::$memory[ $this->config[ 'instance' ] ] = []; |
|
| 121 | + CacheManager::$memory[$this->config['instance']] = []; |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | // end handle method |
@@ -153,12 +153,12 @@ discard block |
||
| 153 | 153 | */ |
| 154 | 154 | public function search($query_as_regex_or_string, $search_in_value = false) |
| 155 | 155 | { |
| 156 | - if ($this->config[ 'allow_search' ] != true) { |
|
| 156 | + if ($this->config['allow_search'] != true) { |
|
| 157 | 157 | throw new phpFastCacheDriverException('Please setup allow_search = true'); |
| 158 | 158 | } else { |
| 159 | 159 | $list = $this->getTags("search", $search_in_value); |
| 160 | 160 | $tmp = explode("/", $query_as_regex_or_string, 2); |
| 161 | - $regex = isset($tmp[ 1 ]) ? true : false; |
|
| 161 | + $regex = isset($tmp[1]) ? true : false; |
|
| 162 | 162 | $return_list = []; |
| 163 | 163 | foreach ($list as $tag) { |
| 164 | 164 | foreach ($tag as $keyword => $value) { |
@@ -169,13 +169,13 @@ discard block |
||
| 169 | 169 | |
| 170 | 170 | if ($regex == true && $gotcha == false) { // look in keyword |
| 171 | 171 | if (preg_match($query_as_regex_or_string, $keyword)) { |
| 172 | - $return_list[ $keyword ] = $value; |
|
| 172 | + $return_list[$keyword] = $value; |
|
| 173 | 173 | $gotcha = true; |
| 174 | 174 | } |
| 175 | 175 | } |
| 176 | 176 | if ($gotcha == false) { |
| 177 | 177 | if (strpos($keyword, $query_as_regex_or_string) !== false) { |
| 178 | - $return_list[ $keyword ] = $value; |
|
| 178 | + $return_list[$keyword] = $value; |
|
| 179 | 179 | $gotcha = true; |
| 180 | 180 | } |
| 181 | 181 | } |
@@ -183,13 +183,13 @@ discard block |
||
| 183 | 183 | if ($search_in_value == true && $gotcha == false) { // value search |
| 184 | 184 | if ($regex == true && $gotcha == false) { |
| 185 | 185 | if (preg_match($query_as_regex_or_string, $value)) { |
| 186 | - $return_list[ $keyword ] = $value; |
|
| 186 | + $return_list[$keyword] = $value; |
|
| 187 | 187 | $gotcha = true; |
| 188 | 188 | } |
| 189 | 189 | } |
| 190 | 190 | if ($gotcha == false) { |
| 191 | 191 | if (strpos($value, $query_as_regex_or_string) !== false) { |
| 192 | - $return_list[ $keyword ] = $value; |
|
| 192 | + $return_list[$keyword] = $value; |
|
| 193 | 193 | $gotcha = true; |
| 194 | 194 | } |
| 195 | 195 | } |
@@ -213,8 +213,8 @@ discard block |
||
| 213 | 213 | if ($object == null) { |
| 214 | 214 | return false; |
| 215 | 215 | } else { |
| 216 | - $value = $object[ 'value' ]; |
|
| 217 | - $time = $object[ 'expired_time' ] - time() + $time; |
|
| 216 | + $value = $object['value']; |
|
| 217 | + $time = $object['expired_time'] - time() + $time; |
|
| 218 | 218 | $this->set($keyword, $value, $time, $option); |
| 219 | 219 | |
| 220 | 220 | return true; |
@@ -229,9 +229,9 @@ discard block |
||
| 229 | 229 | { |
| 230 | 230 | $res = []; |
| 231 | 231 | foreach ($list as $array) { |
| 232 | - $name = $array[ 0 ]; |
|
| 233 | - $res[ $name ] = $this->touch($name, $array[ 1 ], |
|
| 234 | - isset($array[ 2 ]) ? $array[ 2 ] : []); |
|
| 232 | + $name = $array[0]; |
|
| 233 | + $res[$name] = $this->touch($name, $array[1], |
|
| 234 | + isset($array[2]) ? $array[2] : []); |
|
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | return $res; |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | if (is_array($config_name)) { |
| 250 | 250 | $this->config = array_merge($this->config, $config_name); |
| 251 | 251 | } else { |
| 252 | - $this->config[ $config_name ] = $value; |
|
| 252 | + $this->config[$config_name] = $value; |
|
| 253 | 253 | } |
| 254 | 254 | } |
| 255 | 255 | |
@@ -274,9 +274,9 @@ discard block |
||
| 274 | 274 | */ |
| 275 | 275 | public function __set($name, $v) |
| 276 | 276 | { |
| 277 | - if (isset($v[ 1 ]) && is_scalar($v[ 1 ])) { |
|
| 278 | - return $this->set($name, $v[ 0 ], $v[ 1 ], |
|
| 279 | - isset($v[ 2 ]) ? $v[ 2 ] : []); |
|
| 277 | + if (isset($v[1]) && is_scalar($v[1])) { |
|
| 278 | + return $this->set($name, $v[0], $v[1], |
|
| 279 | + isset($v[2]) ? $v[2] : []); |
|
| 280 | 280 | } else { |
| 281 | 281 | throw new phpFastCacheDriverException("Example ->$name = array('VALUE', 300);"); |
| 282 | 282 | } |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | */ |
| 294 | 294 | protected function backup() |
| 295 | 295 | { |
| 296 | - return CacheManager::getInstance(CacheManager::$config[ 'fallback' ]); |
|
| 296 | + return CacheManager::getInstance(CacheManager::$config['fallback']); |
|
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | /** |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | { |
| 397 | 397 | return CacheManager::Sqlite( |
| 398 | 398 | [ |
| 399 | - "path" => $this->config[ 'path' ], |
|
| 399 | + "path" => $this->config['path'], |
|
| 400 | 400 | "cache_method" => 3, |
| 401 | 401 | ] |
| 402 | 402 | ); |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | if (!is_array($tags)) { |
| 416 | 416 | $tags = [$tags]; |
| 417 | 417 | } |
| 418 | - $option[ 'tags' ] = $tags; |
|
| 418 | + $option['tags'] = $tags; |
|
| 419 | 419 | |
| 420 | 420 | return $this->set($keyword, $value, $time, $option); |
| 421 | 421 | } |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | if (is_null($list)) { |
| 428 | 428 | $list = []; |
| 429 | 429 | } |
| 430 | - $list[ $keyword ] = time() + $time; |
|
| 430 | + $list[$keyword] = time() + $time; |
|
| 431 | 431 | $this->_tagCaching()->set($this->_getTagName($tag), $list, 3600 * 24 * 30); |
| 432 | 432 | } |
| 433 | 433 | } |
@@ -455,21 +455,21 @@ discard block |
||
| 455 | 455 | } |
| 456 | 456 | foreach ($list as $keyword => $time) { |
| 457 | 457 | if ($time <= time()) { |
| 458 | - unset($list[ $keyword ]); |
|
| 458 | + unset($list[$keyword]); |
|
| 459 | 459 | } else { |
| 460 | 460 | if ($tmp < $time) { |
| 461 | 461 | $tmp = $time; |
| 462 | 462 | } |
| 463 | 463 | if ($return_content == true) { |
| 464 | - $list_return[ $keyword ] = $this->get($keyword); |
|
| 464 | + $list_return[$keyword] = $this->get($keyword); |
|
| 465 | 465 | } else { |
| 466 | - $list_return[ $keyword ] = $time; |
|
| 466 | + $list_return[$keyword] = $time; |
|
| 467 | 467 | } |
| 468 | 468 | } |
| 469 | 469 | } |
| 470 | 470 | |
| 471 | 471 | $this->_tagCaching()->set($this->_getTagName($tag), $list, $tmp); |
| 472 | - $keywords[ $tag ] = $list_return; |
|
| 472 | + $keywords[$tag] = $list_return; |
|
| 473 | 473 | } |
| 474 | 474 | |
| 475 | 475 | return $keywords; |
@@ -579,7 +579,7 @@ discard block |
||
| 579 | 579 | */ |
| 580 | 580 | public function driverUnwrapData(array $wrapper) |
| 581 | 581 | { |
| 582 | - return $wrapper[ self::DRIVER_DATA_WRAPPER_INDEX ]; |
|
| 582 | + return $wrapper[self::DRIVER_DATA_WRAPPER_INDEX]; |
|
| 583 | 583 | } |
| 584 | 584 | |
| 585 | 585 | /** |
@@ -588,7 +588,7 @@ discard block |
||
| 588 | 588 | */ |
| 589 | 589 | public function driverUnwrapTags(array $wrapper) |
| 590 | 590 | { |
| 591 | - return $wrapper[ self::DRIVER_TAGS_WRAPPER_INDEX ]; |
|
| 591 | + return $wrapper[self::DRIVER_TAGS_WRAPPER_INDEX]; |
|
| 592 | 592 | } |
| 593 | 593 | |
| 594 | 594 | |
@@ -598,7 +598,7 @@ discard block |
||
| 598 | 598 | */ |
| 599 | 599 | public function driverUnwrapTime(array $wrapper) |
| 600 | 600 | { |
| 601 | - return $wrapper[ self::DRIVER_TIME_WRAPPER_INDEX ]; |
|
| 601 | + return $wrapper[self::DRIVER_TIME_WRAPPER_INDEX]; |
|
| 602 | 602 | } |
| 603 | 603 | |
| 604 | 604 | /** |
@@ -652,7 +652,7 @@ discard block |
||
| 652 | 652 | foreach ($tagsItems as $tagsItem) { |
| 653 | 653 | $data = (array) $tagsItem->get(); |
| 654 | 654 | |
| 655 | - unset($data[ $item->getKey() ]); |
|
| 655 | + unset($data[$item->getKey()]); |
|
| 656 | 656 | $tagsItem->set($data); |
| 657 | 657 | |
| 658 | 658 | /** |
@@ -29,27 +29,27 @@ discard block |
||
| 29 | 29 | { |
| 30 | 30 | $tmp_dir = ini_get('upload_tmp_dir') ? ini_get('upload_tmp_dir') : sys_get_temp_dir(); |
| 31 | 31 | |
| 32 | - if (!isset($this->config[ 'path' ]) || $this->config[ 'path' ] == '') { |
|
| 32 | + if (!isset($this->config['path']) || $this->config['path'] == '') { |
|
| 33 | 33 | if (self::isPHPModule()) { |
| 34 | 34 | $path = $tmp_dir; |
| 35 | 35 | } else { |
| 36 | - $document_root_path = rtrim($_SERVER[ 'DOCUMENT_ROOT' ], '/') . '/../'; |
|
| 37 | - $path = isset($_SERVER[ 'DOCUMENT_ROOT' ]) && is_writable($document_root_path) ? $document_root_path : rtrim(__DIR__, '/') . '/'; |
|
| 36 | + $document_root_path = rtrim($_SERVER['DOCUMENT_ROOT'], '/') . '/../'; |
|
| 37 | + $path = isset($_SERVER['DOCUMENT_ROOT']) && is_writable($document_root_path) ? $document_root_path : rtrim(__DIR__, '/') . '/'; |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - if ($this->config[ 'path' ] != '') { |
|
| 41 | - $path = $this->config[ 'path' ]; |
|
| 40 | + if ($this->config['path'] != '') { |
|
| 41 | + $path = $this->config['path']; |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | } else { |
| 45 | - $path = $this->config[ 'path' ]; |
|
| 45 | + $path = $this->config['path']; |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - $securityKey = array_key_exists('securityKey', $this->config) ? $this->config[ 'securityKey' ] : ''; |
|
| 48 | + $securityKey = array_key_exists('securityKey', $this->config) ? $this->config['securityKey'] : ''; |
|
| 49 | 49 | if ($securityKey == "" || $securityKey == 'auto') { |
| 50 | - $securityKey = $this->config[ 'securityKey' ]; |
|
| 50 | + $securityKey = $this->config['securityKey']; |
|
| 51 | 51 | if ($securityKey == 'auto' || $securityKey == '') { |
| 52 | - $securityKey = isset($_SERVER[ 'HTTP_HOST' ]) ? preg_replace('/^www./', '', strtolower($_SERVER[ 'HTTP_HOST' ])) : "default"; |
|
| 52 | + $securityKey = isset($_SERVER['HTTP_HOST']) ? preg_replace('/^www./', '', strtolower($_SERVER['HTTP_HOST'])) : "default"; |
|
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | if ($securityKey != '') { |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | $full_pathx = md5($full_path); |
| 63 | 63 | |
| 64 | 64 | |
| 65 | - if (!isset($this->tmp[ $full_pathx ])) { |
|
| 65 | + if (!isset($this->tmp[$full_pathx])) { |
|
| 66 | 66 | |
| 67 | 67 | if (!@file_exists($full_path) || !@is_writable($full_path)) { |
| 68 | 68 | if (!@file_exists($full_path)) { |
@@ -86,8 +86,8 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | - $this->tmp[ $full_pathx ] = true; |
|
| 90 | - $this->htaccessGen($full_path, array_key_exists('htaccess', $this->config) ? $this->config[ 'htaccess' ] : false); |
|
| 89 | + $this->tmp[$full_pathx] = true; |
|
| 90 | + $this->htaccessGen($full_path, array_key_exists('htaccess', $this->config) ? $this->config['htaccess'] : false); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | return realpath($full_path); |
@@ -146,10 +146,10 @@ discard block |
||
| 146 | 146 | */ |
| 147 | 147 | public function setChmodAuto() |
| 148 | 148 | { |
| 149 | - if (!isset($this->config[ 'default_chmod' ]) || $this->config[ 'default_chmod' ] == '' || is_null($this->config[ 'default_chmod' ])) { |
|
| 149 | + if (!isset($this->config['default_chmod']) || $this->config['default_chmod'] == '' || is_null($this->config['default_chmod'])) { |
|
| 150 | 150 | return 0777; |
| 151 | 151 | } else { |
| 152 | - return $this->config[ 'default_chmod' ]; |
|
| 152 | + return $this->config['default_chmod']; |
|
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | 155 | |
@@ -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 | } |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | /* |
| 72 | 72 | * Skip if Existing Caching in Options |
| 73 | 73 | */ |
| 74 | - if (isset($option[ 'skipExisting' ]) && $option[ 'skipExisting' ] == true && file_exists($file_path)) { |
|
| 74 | + if (isset($option['skipExisting']) && $option['skipExisting'] == true && file_exists($file_path)) { |
|
| 75 | 75 | $content = $this->readfile($file_path); |
| 76 | 76 | $old = $this->decode($content); |
| 77 | 77 | $toWrite = false; |
@@ -250,11 +250,11 @@ discard block |
||
| 250 | 250 | } else { |
| 251 | 251 | //Because PHP 5.3, this cannot be written in single line |
| 252 | 252 | $key = explode('.', $f); |
| 253 | - $key = $key[ 0 ]; |
|
| 253 | + $key = $key[0]; |
|
| 254 | 254 | } |
| 255 | - $content[ $key ] = [ |
|
| 255 | + $content[$key] = [ |
|
| 256 | 256 | 'size' => $size, |
| 257 | - 'write_time' => (isset($object[ 'write_time' ]) ? $object[ 'write_time' ] : null), |
|
| 257 | + 'write_time' => (isset($object['write_time']) ? $object['write_time'] : null), |
|
| 258 | 258 | ]; |
| 259 | 259 | if ($object->isExpired()) { |
| 260 | 260 | @unlink($file_path); |
@@ -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); |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | return false; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - return isset($result[ 'ok' ]) ? $result[ 'ok' ] == 1 : true; |
|
| 94 | + return isset($result['ok']) ? $result['ok'] == 1 : true; |
|
| 95 | 95 | } else { |
| 96 | 96 | throw new \InvalidArgumentException('Cross-Driver type confusion detected'); |
| 97 | 97 | } |
@@ -106,8 +106,8 @@ discard block |
||
| 106 | 106 | $document = $this->getCollection()->findOne(['_id' => $key], [self::DRIVER_DATA_WRAPPER_INDEX, self::DRIVER_TIME_WRAPPER_INDEX /*'d', 'e'*/]); |
| 107 | 107 | if ($document) { |
| 108 | 108 | return [ |
| 109 | - self::DRIVER_DATA_WRAPPER_INDEX => $this->decode($document[ self::DRIVER_DATA_WRAPPER_INDEX ]->bin), |
|
| 110 | - self::DRIVER_TIME_WRAPPER_INDEX => (new \DateTime())->setTimestamp($document[ self::DRIVER_TIME_WRAPPER_INDEX ]->sec), |
|
| 109 | + self::DRIVER_DATA_WRAPPER_INDEX => $this->decode($document[self::DRIVER_DATA_WRAPPER_INDEX]->bin), |
|
| 110 | + self::DRIVER_TIME_WRAPPER_INDEX => (new \DateTime())->setTimestamp($document[self::DRIVER_TIME_WRAPPER_INDEX]->sec), |
|
| 111 | 111 | ]; |
| 112 | 112 | } else { |
| 113 | 113 | return null; |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | if ($item instanceof Item) { |
| 128 | 128 | $deletionResult = (array) $this->getCollection()->remove(['_id' => $item->getKey()], ["w" => 1]); |
| 129 | 129 | |
| 130 | - return (int) $deletionResult[ 'ok' ] === 1 && !$deletionResult[ 'err' ]; |
|
| 130 | + return (int) $deletionResult['ok'] === 1 && !$deletionResult['err']; |
|
| 131 | 131 | } else { |
| 132 | 132 | throw new \InvalidArgumentException('Cross-Driver type confusion detected'); |
| 133 | 133 | } |
@@ -151,11 +151,11 @@ discard block |
||
| 151 | 151 | if ($this->instance instanceof MongodbClient) { |
| 152 | 152 | throw new LogicException('Already connected to Mongodb server'); |
| 153 | 153 | } else { |
| 154 | - $host = isset($this->config[ 'host' ]) ? $this->config[ 'host' ] : '127.0.0.1'; |
|
| 155 | - $port = isset($server[ 'port' ]) ? $server[ 'port' ] : '27017'; |
|
| 156 | - $timeout = isset($server[ 'timeout' ]) ? $server[ 'timeout' ] : 3; |
|
| 157 | - $password = isset($this->config[ 'password' ]) ? $this->config[ 'password' ] : ''; |
|
| 158 | - $username = isset($this->config[ 'username' ]) ? $this->config[ 'username' ] : ''; |
|
| 154 | + $host = isset($this->config['host']) ? $this->config['host'] : '127.0.0.1'; |
|
| 155 | + $port = isset($server['port']) ? $server['port'] : '27017'; |
|
| 156 | + $timeout = isset($server['timeout']) ? $server['timeout'] : 3; |
|
| 157 | + $password = isset($this->config['password']) ? $this->config['password'] : ''; |
|
| 158 | + $username = isset($this->config['username']) ? $this->config['username'] : ''; |
|
| 159 | 159 | |
| 160 | 160 | |
| 161 | 161 | /** |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | { |
| 189 | 189 | $document = $this->getCollection()->findOne(['_id' => $item->getKey()], [self::DRIVER_TIME_WRAPPER_INDEX /*'d', 'e'*/]); |
| 190 | 190 | if ($document) { |
| 191 | - return $document[ self::DRIVER_TIME_WRAPPER_INDEX ]->sec >= time(); |
|
| 191 | + return $document[self::DRIVER_TIME_WRAPPER_INDEX]->sec >= time(); |
|
| 192 | 192 | } else { |
| 193 | 193 | return null; |
| 194 | 194 | } |
@@ -217,8 +217,8 @@ discard block |
||
| 217 | 217 | ]); |
| 218 | 218 | |
| 219 | 219 | $stats = (new driverStatistic()) |
| 220 | - ->setInfo('MongoDB version ' . $serverStatus[ 'version' ] . ', Uptime (in days): ' . round($serverStatus[ 'uptime' ] / 86400, 1)) |
|
| 221 | - ->setSize((int) $collStats[ 'size' ]) |
|
| 220 | + ->setInfo('MongoDB version ' . $serverStatus['version'] . ', Uptime (in days): ' . round($serverStatus['uptime'] / 86400, 1)) |
|
| 221 | + ->setSize((int) $collStats['size']) |
|
| 222 | 222 | ->setRawData([ |
| 223 | 223 | 'serverStatus' => $serverStatus, |
| 224 | 224 | 'collStats' => $collStats, |
@@ -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) { |