@@ -57,7 +57,7 @@ |
||
57 | 57 | |
58 | 58 | /** |
59 | 59 | * @param \Psr\Cache\CacheItemInterface $item |
60 | - * @return mixed |
|
60 | + * @return boolean |
|
61 | 61 | * @throws \InvalidArgumentException |
62 | 62 | */ |
63 | 63 | public function driverWrite(CacheItemInterface $item) |
@@ -79,9 +79,9 @@ discard block |
||
79 | 79 | protected function driverRead(CacheItemInterface $item) |
80 | 80 | { |
81 | 81 | return [ |
82 | - self::DRIVER_DATA_WRAPPER_INDEX => true, |
|
83 | - self::DRIVER_TAGS_WRAPPER_INDEX => [], |
|
84 | - self::DRIVER_TIME_WRAPPER_INDEX => new \DateTime(), |
|
82 | + self::DRIVER_DATA_WRAPPER_INDEX => true, |
|
83 | + self::DRIVER_TAGS_WRAPPER_INDEX => [], |
|
84 | + self::DRIVER_TIME_WRAPPER_INDEX => new \DateTime(), |
|
85 | 85 | ]; |
86 | 86 | } |
87 | 87 | |
@@ -131,9 +131,9 @@ discard block |
||
131 | 131 | { |
132 | 132 | $stat = new driverStatistic(); |
133 | 133 | $stat->setInfo('[Devtrue] A void info string') |
134 | - ->setSize(0) |
|
135 | - ->setData(implode(', ', array_keys($this->itemInstances))) |
|
136 | - ->setRawData(true); |
|
134 | + ->setSize(0) |
|
135 | + ->setData(implode(', ', array_keys($this->itemInstances))) |
|
136 | + ->setRawData(true); |
|
137 | 137 | |
138 | 138 | return $stat; |
139 | 139 | } |
@@ -133,8 +133,8 @@ |
||
133 | 133 | $stats = (array) zend_shm_cache_info(); |
134 | 134 | return (new driverStatistic()) |
135 | 135 | ->setData(implode(', ', array_keys($this->namespaces))) |
136 | - ->setInfo(sprintf("The Zend memory have %d item(s) in cache.\n For more information see RawData.",$stats[ 'items_total' ])) |
|
136 | + ->setInfo(sprintf("The Zend memory have %d item(s) in cache.\n For more information see RawData.", $stats['items_total'])) |
|
137 | 137 | ->setRawData($stats) |
138 | - ->setSize($stats[ 'memory_total' ]); |
|
138 | + ->setSize($stats['memory_total']); |
|
139 | 139 | } |
140 | 140 | } |
141 | 141 | \ No newline at end of file |
@@ -83,7 +83,7 @@ |
||
83 | 83 | } else { |
84 | 84 | $item->setHit(true); |
85 | 85 | } |
86 | - }else{ |
|
86 | + } else{ |
|
87 | 87 | $item->expiresAfter(abs((int) $this->getConfig()[ 'defaultTtl' ])); |
88 | 88 | } |
89 | 89 |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | public function __construct() |
23 | 23 | { |
24 | - $this->instances =& CacheManager::getInternalInstances(); |
|
24 | + $this->instances = & CacheManager::getInternalInstances(); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | /** |
@@ -29,22 +29,22 @@ discard block |
||
29 | 29 | */ |
30 | 30 | protected function getGenericCallback() |
31 | 31 | { |
32 | - return function($method, $args){ |
|
32 | + return function($method, $args) { |
|
33 | 33 | $getterMethod = (strpos($method, 'get') === 0); |
34 | 34 | $return = false; |
35 | 35 | |
36 | - if($getterMethod){ |
|
36 | + if ($getterMethod) { |
|
37 | 37 | $return = []; |
38 | 38 | } |
39 | 39 | |
40 | 40 | foreach ($this->instances as $instance) |
41 | 41 | { |
42 | 42 | $reflectionMethod = new \ReflectionMethod(get_class($instance), $method); |
43 | - if($getterMethod){ |
|
44 | - $return[ $instance->getDriverName() ] = $reflectionMethod->invokeArgs($instance, $args); |
|
45 | - }else{ |
|
43 | + if ($getterMethod) { |
|
44 | + $return[$instance->getDriverName()] = $reflectionMethod->invokeArgs($instance, $args); |
|
45 | + } else { |
|
46 | 46 | $result = $reflectionMethod->invokeArgs($instance, $args); |
47 | - if($result !== false){ |
|
47 | + if ($result !== false) { |
|
48 | 48 | $return = $result; |
49 | 49 | } |
50 | 50 | } |
@@ -84,13 +84,13 @@ |
||
84 | 84 | if(is_callable($arguments[0])){ |
85 | 85 | if(isset($arguments[1]) && is_string($arguments[0])){ |
86 | 86 | $this->events[$name][$arguments[1]] = $arguments[0]; |
87 | - }else { |
|
87 | + } else { |
|
88 | 88 | $this->events[$name][] = $arguments[0]; |
89 | 89 | } |
90 | - }else{ |
|
90 | + } else{ |
|
91 | 91 | throw new \InvalidArgumentException(sprintf('Expected Callable, got "%s"', gettype($arguments[0]))); |
92 | 92 | } |
93 | - }else{ |
|
93 | + } else{ |
|
94 | 94 | throw new \BadMethodCallException('An event must start with "on" such as "onCacheGetItem"'); |
95 | 95 | } |
96 | 96 | } |
@@ -66,8 +66,8 @@ discard block |
||
66 | 66 | public function dispatch($eventName, ...$args) |
67 | 67 | { |
68 | 68 | $eventName = 'on' . ucfirst($eventName); |
69 | - if(array_key_exists($eventName, $this->events)){ |
|
70 | - foreach ($this->events[ $eventName ] as $event) { |
|
69 | + if (array_key_exists($eventName, $this->events)) { |
|
70 | + foreach ($this->events[$eventName] as $event) { |
|
71 | 71 | call_user_func_array($event, $args); |
72 | 72 | } |
73 | 73 | } |
@@ -81,17 +81,17 @@ discard block |
||
81 | 81 | */ |
82 | 82 | public function __call($name, $arguments) |
83 | 83 | { |
84 | - if(strpos($name, 'on') === 0){ |
|
85 | - if(is_callable($arguments[0])){ |
|
86 | - if(isset($arguments[1]) && is_string($arguments[0])){ |
|
84 | + if (strpos($name, 'on') === 0) { |
|
85 | + if (is_callable($arguments[0])) { |
|
86 | + if (isset($arguments[1]) && is_string($arguments[0])) { |
|
87 | 87 | $this->events[$name][$arguments[1]] = $arguments[0]; |
88 | - }else { |
|
88 | + } else { |
|
89 | 89 | $this->events[$name][] = $arguments[0]; |
90 | 90 | } |
91 | - }else{ |
|
91 | + } else { |
|
92 | 92 | throw new \InvalidArgumentException(sprintf('Expected Callable, got "%s"', gettype($arguments[0]))); |
93 | 93 | } |
94 | - }else{ |
|
94 | + } else { |
|
95 | 95 | throw new \BadMethodCallException('An event must start with "on" such as "onCacheGetItem"'); |
96 | 96 | } |
97 | 97 | } |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | */ |
104 | 104 | public function unbindEventCallback($eventName, $callbackName) |
105 | 105 | { |
106 | - if(isset($this->events[$eventName][$callbackName])){ |
|
106 | + if (isset($this->events[$eventName][$callbackName])) { |
|
107 | 107 | unset($this->events[$eventName][$callbackName]); |
108 | 108 | return true; |
109 | 109 | } |
@@ -15,7 +15,7 @@ |
||
15 | 15 | if (!class_exists('phpFastCache\CacheManager')) { |
16 | 16 | echo "[FAIL] Autoload failed to find the CacheManager\n"; |
17 | 17 | $status = 255; |
18 | -}else{ |
|
18 | +} else { |
|
19 | 19 | echo "[PASS] Autoload successfully found the CacheManager\n"; |
20 | 20 | } |
21 | 21 |
@@ -15,7 +15,7 @@ |
||
15 | 15 | if (!class_exists('phpFastCache\CacheManager')) { |
16 | 16 | echo "[FAIL] Autoload failed to find the CacheManager\n"; |
17 | 17 | $status = 255; |
18 | -}else{ |
|
18 | +} else{ |
|
19 | 19 | echo "[PASS] Autoload successfully found the CacheManager\n"; |
20 | 20 | } |
21 | 21 |
@@ -25,21 +25,21 @@ |
||
25 | 25 | $actOnAll = new ActOnAll(); |
26 | 26 | $statsAry = $actOnAll->getStats(); |
27 | 27 | |
28 | -if(is_array($statsAry)){ |
|
29 | - if(count($statsAry) !== 3){ |
|
28 | +if (is_array($statsAry)) { |
|
29 | + if (count($statsAry) !== 3) { |
|
30 | 30 | $status = 1; |
31 | 31 | echo 'Wrong count of driverStatistics objects: Got ' . count($statsAry) . " element(s), expected 3\n"; |
32 | 32 | goto endOfTest; |
33 | 33 | } |
34 | 34 | |
35 | 35 | foreach ($statsAry as $stat) { |
36 | - if(!is_object($stat) || !($stat instanceof driverStatistic)){ |
|
36 | + if (!is_object($stat) || !($stat instanceof driverStatistic)) { |
|
37 | 37 | echo "\$statsAry contains one element that is not an driverStatistic object\n"; |
38 | 38 | goto endOfTest; |
39 | 39 | } |
40 | 40 | } |
41 | 41 | echo "[PASS] ActOnAll helper passed all tests\n"; |
42 | -}else{ |
|
42 | +} else { |
|
43 | 43 | $status = 1; |
44 | 44 | echo "\$statsAry is not an array\n"; |
45 | 45 | } |
@@ -15,7 +15,7 @@ |
||
15 | 15 | if (!class_exists('phpFastCache\CacheManager')) { |
16 | 16 | echo "[FAIL] Autoload failed to find the CacheManager\n"; |
17 | 17 | $status = 255; |
18 | -}else{ |
|
18 | +} else{ |
|
19 | 19 | echo "[PASS] Autoload successfully found the CacheManager\n"; |
20 | 20 | } |
21 | 21 |
@@ -16,8 +16,8 @@ discard block |
||
16 | 16 | $status = 0; |
17 | 17 | echo "Testing EventManager\n"; |
18 | 18 | |
19 | -EventManager::getInstance()->onCacheSaveItem(function(ExtendedCacheItemPoolInterface $itemPool, ExtendedCacheItemInterface $item){ |
|
20 | - if($item->get() === 1000){ |
|
19 | +EventManager::getInstance()->onCacheSaveItem(function(ExtendedCacheItemPoolInterface $itemPool, ExtendedCacheItemInterface $item) { |
|
20 | + if ($item->get() === 1000) { |
|
21 | 21 | $item->increment(337); |
22 | 22 | } |
23 | 23 | }); |
@@ -30,9 +30,9 @@ discard block |
||
30 | 30 | $cacheInstance->save($item); |
31 | 31 | |
32 | 32 | |
33 | -if($cacheInstance->getItem($cacheKey)->get() === 1337){ |
|
33 | +if ($cacheInstance->getItem($cacheKey)->get() === 1337) { |
|
34 | 34 | echo "[PASS] The dispatched event executed the custom callback to alter to item.\n"; |
35 | -}else{ |
|
35 | +} else { |
|
36 | 36 | echo "[FAIL] The dispatched event did not worked well, the expected value '1337', got '" . (int) $cacheInstance->getItem($cacheKey)->get() . "'\n"; |
37 | 37 | $status = 1; |
38 | 38 | } |
@@ -15,7 +15,7 @@ |
||
15 | 15 | if (!class_exists('phpFastCache\CacheManager')) { |
16 | 16 | echo "[FAIL] Autoload failed to find the CacheManager\n"; |
17 | 17 | $status = 255; |
18 | -}else{ |
|
18 | +} else{ |
|
19 | 19 | echo "[PASS] Autoload successfully found the CacheManager\n"; |
20 | 20 | } |
21 | 21 |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | /** |
62 | 62 | * @param \Psr\Cache\CacheItemInterface $item |
63 | - * @return mixed |
|
63 | + * @return boolean |
|
64 | 64 | * @throws \InvalidArgumentException |
65 | 65 | */ |
66 | 66 | protected function driverWrite(CacheItemInterface $item) |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | /** |
147 | 147 | * @param string $optionName |
148 | 148 | * @param mixed $optionValue |
149 | - * @return bool |
|
149 | + * @return boolean|null |
|
150 | 150 | * @throws \InvalidArgumentException |
151 | 151 | */ |
152 | 152 | public static function isValidOption($optionName, $optionValue) |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | } |
175 | 175 | |
176 | 176 | /** |
177 | - * @return array |
|
177 | + * @return string[] |
|
178 | 178 | */ |
179 | 179 | public static function getValidOptions() |
180 | 180 | { |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | } |
183 | 183 | |
184 | 184 | /** |
185 | - * @return array |
|
185 | + * @return string[] |
|
186 | 186 | */ |
187 | 187 | public static function getRequiredOptions() |
188 | 188 | { |
@@ -215,11 +215,11 @@ |
||
215 | 215 | } |
216 | 216 | |
217 | 217 | $stat->setData(implode(', ', array_keys($this->itemInstances))) |
218 | - ->setRawData([ |
|
218 | + ->setRawData([ |
|
219 | 219 | 'tmp' => $this->tmp |
220 | - ]) |
|
221 | - ->setSize(Directory::dirSize($path)) |
|
222 | - ->setInfo('Number of files used to build the cache: ' . Directory::getFileCount($path)); |
|
220 | + ]) |
|
221 | + ->setSize(Directory::dirSize($path)) |
|
222 | + ->setInfo('Number of files used to build the cache: ' . Directory::getFileCount($path)); |
|
223 | 223 | |
224 | 224 | return $stat; |
225 | 225 | } |
@@ -186,9 +186,9 @@ discard block |
||
186 | 186 | protected static function cleanFileName($filename) |
187 | 187 | { |
188 | 188 | $regex = [ |
189 | - '/[\?\[\]\/\\\=\<\>\:\;\,\'\"\&\$\#\*\(\)\|\~\`\!\{\}]/', |
|
190 | - '/\.$/', |
|
191 | - '/^\./', |
|
189 | + '/[\?\[\]\/\\\=\<\>\:\;\,\'\"\&\$\#\*\(\)\|\~\`\!\{\}]/', |
|
190 | + '/\.$/', |
|
191 | + '/^\./', |
|
192 | 192 | ]; |
193 | 193 | $replace = ['-', '', '']; |
194 | 194 | |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | $tmpFilename = Directory::getAbsolutePath(dirname($file) . '/tmp_' . md5( |
278 | 278 | str_shuffle(uniqid($this->getDriverName(), false)) |
279 | 279 | . str_shuffle(uniqid($this->getDriverName(), false)) |
280 | - )); |
|
280 | + )); |
|
281 | 281 | |
282 | 282 | $f = fopen($tmpFilename, 'w+'); |
283 | 283 | flock($f, LOCK_EX); |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | } |
131 | 131 | |
132 | 132 | /** |
133 | - * @param $keyword |
|
133 | + * @param string|false $keyword |
|
134 | 134 | * @param bool $skip |
135 | 135 | * @return string |
136 | 136 | * @throws phpFastCacheIOException |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | |
177 | 177 | /** |
178 | 178 | * @param $filename |
179 | - * @return mixed |
|
179 | + * @return string |
|
180 | 180 | */ |
181 | 181 | protected static function cleanFileName($filename) |
182 | 182 | { |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | } |
192 | 192 | |
193 | 193 | /** |
194 | - * @param $path |
|
194 | + * @param string $path |
|
195 | 195 | * @param bool $create |
196 | 196 | * @throws phpFastCacheIOException |
197 | 197 | */ |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | |
226 | 226 | |
227 | 227 | /** |
228 | - * @param $file |
|
228 | + * @param string $file |
|
229 | 229 | * @return string |
230 | 230 | * @throws phpFastCacheIOException |
231 | 231 | */ |
@@ -97,11 +97,11 @@ discard block |
||
97 | 97 | return $tmp_dir; |
98 | 98 | } |
99 | 99 | return $full_path; |
100 | - }else{ |
|
100 | + } else{ |
|
101 | 101 | if (!isset($this->tmp[ $full_path_hash ]) || (!@file_exists($full_path) || !@is_writable($full_path))) { |
102 | 102 | if (!@file_exists($full_path)) { |
103 | 103 | @mkdir($full_path, $this->setChmodAuto(), true); |
104 | - }else if (!@is_writable($full_path)) { |
|
104 | + } else if (!@is_writable($full_path)) { |
|
105 | 105 | @chmod($full_path, $this->setChmodAuto()); |
106 | 106 | } |
107 | 107 | |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | if(!rename($tmpFilename, $file)){ |
313 | 313 | throw new phpFastCacheIOException(sprintf('Failed to rename %s to %s', $tmpFilename, $file)); |
314 | 314 | } |
315 | - }else{ |
|
315 | + } else{ |
|
316 | 316 | $f = fopen($file, 'w+'); |
317 | 317 | $octetWritten = fwrite($f, $data); |
318 | 318 | fclose($f); |
@@ -41,10 +41,10 @@ discard block |
||
41 | 41 | * Calculate the security key |
42 | 42 | */ |
43 | 43 | { |
44 | - $securityKey = array_key_exists('securityKey', $this->config) ? $this->config[ 'securityKey' ] : ''; |
|
44 | + $securityKey = array_key_exists('securityKey', $this->config) ? $this->config['securityKey'] : ''; |
|
45 | 45 | if (!$securityKey || $securityKey === 'auto') { |
46 | - if (isset($_SERVER[ 'HTTP_HOST' ])) { |
|
47 | - $securityKey = preg_replace('/^www./', '', strtolower(str_replace(':', '_', $_SERVER[ 'HTTP_HOST' ]))); |
|
46 | + if (isset($_SERVER['HTTP_HOST'])) { |
|
47 | + $securityKey = preg_replace('/^www./', '', strtolower(str_replace(':', '_', $_SERVER['HTTP_HOST']))); |
|
48 | 48 | } else { |
49 | 49 | $securityKey = ($this->isPHPModule() ? 'web' : 'cli'); |
50 | 50 | } |
@@ -63,10 +63,10 @@ discard block |
||
63 | 63 | */ |
64 | 64 | $tmp_dir = rtrim($tmp_dir, '/') . DIRECTORY_SEPARATOR; |
65 | 65 | |
66 | - if (empty($this->config[ 'path' ]) || !is_string($this->config[ 'path' ])) { |
|
66 | + if (empty($this->config['path']) || !is_string($this->config['path'])) { |
|
67 | 67 | $path = $tmp_dir; |
68 | 68 | } else { |
69 | - $path = rtrim($this->config[ 'path' ], '/') . DIRECTORY_SEPARATOR; |
|
69 | + $path = rtrim($this->config['path'], '/') . DIRECTORY_SEPARATOR; |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | $path_suffix = $securityKey . DIRECTORY_SEPARATOR . $this->getDriverName(); |
@@ -81,16 +81,16 @@ discard block |
||
81 | 81 | * return the temp dir |
82 | 82 | */ |
83 | 83 | if ($readonly === true) { |
84 | - if($this->config[ 'autoTmpFallback' ] && (!@file_exists($full_path) || !@is_writable($full_path))){ |
|
84 | + if ($this->config['autoTmpFallback'] && (!@file_exists($full_path) || !@is_writable($full_path))) { |
|
85 | 85 | return $full_path_tmp; |
86 | 86 | } |
87 | 87 | return $full_path; |
88 | - }else{ |
|
89 | - if (!isset($this->tmp[ $full_path_hash ]) || (!@file_exists($full_path) || !@is_writable($full_path))) { |
|
88 | + } else { |
|
89 | + if (!isset($this->tmp[$full_path_hash]) || (!@file_exists($full_path) || !@is_writable($full_path))) { |
|
90 | 90 | if (!@file_exists($full_path)) { |
91 | 91 | @mkdir($full_path, $this->setChmodAuto(), true); |
92 | - }else if (!@is_writable($full_path)) { |
|
93 | - if (!@chmod($full_path, $this->setChmodAuto()) && $this->config[ 'autoTmpFallback' ]) |
|
92 | + } else if (!@is_writable($full_path)) { |
|
93 | + if (!@chmod($full_path, $this->setChmodAuto()) && $this->config['autoTmpFallback']) |
|
94 | 94 | { |
95 | 95 | /** |
96 | 96 | * Switch back to tmp dir |
@@ -112,8 +112,8 @@ discard block |
||
112 | 112 | throw new phpFastCacheIOException('PLEASE CREATE OR CHMOD ' . $full_path . ' - 0777 OR ANY WRITABLE PERMISSION!'); |
113 | 113 | } |
114 | 114 | |
115 | - $this->tmp[ $full_path_hash ] = $full_path; |
|
116 | - $this->htaccessGen($full_path, array_key_exists('htaccess', $this->config) ? $this->config[ 'htaccess' ] : false); |
|
115 | + $this->tmp[$full_path_hash] = $full_path; |
|
116 | + $this->htaccessGen($full_path, array_key_exists('htaccess', $this->config) ? $this->config['htaccess'] : false); |
|
117 | 117 | } |
118 | 118 | } |
119 | 119 | |
@@ -180,10 +180,10 @@ discard block |
||
180 | 180 | */ |
181 | 181 | public function setChmodAuto() |
182 | 182 | { |
183 | - if (!isset($this->config[ 'default_chmod' ]) || $this->config[ 'default_chmod' ] == '' || is_null($this->config[ 'default_chmod' ])) { |
|
183 | + if (!isset($this->config['default_chmod']) || $this->config['default_chmod'] == '' || is_null($this->config['default_chmod'])) { |
|
184 | 184 | return 0777; |
185 | 185 | } else { |
186 | - return $this->config[ 'default_chmod' ]; |
|
186 | + return $this->config['default_chmod']; |
|
187 | 187 | } |
188 | 188 | } |
189 | 189 | |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | if ($create === true) { |
214 | 214 | if (!is_writable($path)) { |
215 | 215 | try { |
216 | - if(!chmod($path, 0777)){ |
|
216 | + if (!chmod($path, 0777)) { |
|
217 | 217 | throw new phpFastCacheIOException('Chmod failed on : ' . $path); |
218 | 218 | } |
219 | 219 | } catch (phpFastCacheIOException $e) { |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | */ |
285 | 285 | $this->eventManager->dispatch('CacheWriteFileOnDisk', $this, $file, $secureFileManipulation); |
286 | 286 | |
287 | - if($secureFileManipulation){ |
|
287 | + if ($secureFileManipulation) { |
|
288 | 288 | $tmpFilename = Directory::getAbsolutePath(dirname($file) . '/tmp_' . md5( |
289 | 289 | str_shuffle(uniqid($this->getDriverName(), false)) |
290 | 290 | . str_shuffle(uniqid($this->getDriverName(), false)) |
@@ -296,10 +296,10 @@ discard block |
||
296 | 296 | flock($f, LOCK_UN); |
297 | 297 | fclose($f); |
298 | 298 | |
299 | - if(!rename($tmpFilename, $file)){ |
|
299 | + if (!rename($tmpFilename, $file)) { |
|
300 | 300 | throw new phpFastCacheIOException(sprintf('Failed to rename %s to %s', $tmpFilename, $file)); |
301 | 301 | } |
302 | - }else{ |
|
302 | + } else { |
|
303 | 303 | $f = fopen($file, 'w+'); |
304 | 304 | $octetWritten = fwrite($f, $data); |
305 | 305 | fclose($f); |