@@ -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); |
@@ -23,9 +23,9 @@ |
||
| 23 | 23 | $keys = []; |
| 24 | 24 | |
| 25 | 25 | $dirs = [ |
| 26 | - __DIR__ . '/../var/cache/IO-', |
|
| 27 | - sys_get_temp_dir() . '/phpfastcache/IO-1', |
|
| 28 | - sys_get_temp_dir() . '/phpfastcache/IO-2' |
|
| 26 | + __DIR__ . '/../var/cache/IO-', |
|
| 27 | + sys_get_temp_dir() . '/phpfastcache/IO-1', |
|
| 28 | + sys_get_temp_dir() . '/phpfastcache/IO-2' |
|
| 29 | 29 | ]; |
| 30 | 30 | |
| 31 | 31 | |
@@ -39,9 +39,9 @@ discard block |
||
| 39 | 39 | { |
| 40 | 40 | $cacheInstanceName = 'cacheInstance' . $i; |
| 41 | 41 | |
| 42 | - $instances[$dirIndex][$cacheInstanceName] = CacheManager::getInstance('Files',array('path' => $dir . str_pad($i, 3, '0', STR_PAD_LEFT))); |
|
| 42 | + $instances[$dirIndex][$cacheInstanceName] = CacheManager::getInstance('Files', array('path' => $dir . str_pad($i, 3, '0', STR_PAD_LEFT))); |
|
| 43 | 43 | |
| 44 | - foreach($keys[$dirIndex] as $index => $key) |
|
| 44 | + foreach ($keys[$dirIndex] as $index => $key) |
|
| 45 | 45 | { |
| 46 | 46 | $items[$dirIndex][$index] = $instances[$dirIndex][$cacheInstanceName]->getItem($key); |
| 47 | 47 | $items[$dirIndex][$index]->set("test-$dirIndex-$index")->expiresAfter(600); |
@@ -51,11 +51,11 @@ discard block |
||
| 51 | 51 | $instances[$dirIndex][$cacheInstanceName]->detachAllItems(); |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - foreach($instances[$dirIndex] as $cacheInstanceName => $instance) |
|
| 54 | + foreach ($instances[$dirIndex] as $cacheInstanceName => $instance) |
|
| 55 | 55 | { |
| 56 | - foreach($keys[$dirIndex] as $index => $key) |
|
| 56 | + foreach ($keys[$dirIndex] as $index => $key) |
|
| 57 | 57 | { |
| 58 | - if($instances[$dirIndex][$cacheInstanceName]->getItem($key)->get() === "test-$dirIndex-$index") |
|
| 58 | + if ($instances[$dirIndex][$cacheInstanceName]->getItem($key)->get() === "test-$dirIndex-$index") |
|
| 59 | 59 | { |
| 60 | 60 | echo "[PASS] Item #{$key} of instance #{$cacheInstanceName} of dir #{$dirIndex} has returned the expected value (" . gettype("test-$dirIndex-$index") . ":'" . "test-$dirIndex-$index" . "')\n"; |
| 61 | 61 | } |
@@ -58,8 +58,7 @@ |
||
| 58 | 58 | if($instances[$dirIndex][$cacheInstanceName]->getItem($key)->get() === "test-$dirIndex-$index") |
| 59 | 59 | { |
| 60 | 60 | echo "[PASS] Item #{$key} of instance #{$cacheInstanceName} of dir #{$dirIndex} has returned the expected value (" . gettype("test-$dirIndex-$index") . ":'" . "test-$dirIndex-$index" . "')\n"; |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | echo "[FAIL] Item #{$key} of instance #{$cacheInstanceName} of dir #{$dirIndex} returned an unexpected value (" . gettype($instances[$dirIndex][$cacheInstanceName]->getItem($key)->get()) . ":'" . $instances[$dirIndex][$cacheInstanceName]->getItem($key)->get() . "') expected (" . gettype("test-$dirIndex-$index") . ":'" . "test-$dirIndex-$index" . "') \n"; |
| 65 | 64 | $status = 255; |
@@ -33,20 +33,20 @@ |
||
| 33 | 33 | $cacheResult = $cacheInstance->getItem($cacheKey)->get(); |
| 34 | 34 | |
| 35 | 35 | if($cacheResult === $randomStr){ |
| 36 | - echo "[PASS] The cache key value match, got expected value '{$cacheResult}'\n"; |
|
| 36 | + echo "[PASS] The cache key value match, got expected value '{$cacheResult}'\n"; |
|
| 37 | 37 | }else{ |
| 38 | - echo "[FAIL] The cache key value match expected value '{$randomStr}', got '{$cacheResult}'\n"; |
|
| 39 | - $status = 1; |
|
| 38 | + echo "[FAIL] The cache key value match expected value '{$randomStr}', got '{$cacheResult}'\n"; |
|
| 39 | + $status = 1; |
|
| 40 | 40 | } |
| 41 | 41 | echo "Clearing the whole cache to test item cleaning...\n"; |
| 42 | 42 | $cacheInstance->clear(); |
| 43 | 43 | $cacheResult = ($cacheInstance->getItem($cacheKey)->isHit() === false && $cacheInstance->getItem($cacheKey)->get() === null); |
| 44 | 44 | |
| 45 | 45 | if($cacheResult === true){ |
| 46 | - echo "[PASS] The cache item is null as expected\n"; |
|
| 46 | + echo "[PASS] The cache item is null as expected\n"; |
|
| 47 | 47 | }else{ |
| 48 | - echo "[FAIL] The cache is not null'\n"; |
|
| 49 | - $status = 1; |
|
| 48 | + echo "[FAIL] The cache is not null'\n"; |
|
| 49 | + $status = 1; |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | exit($status); |
| 53 | 53 | \ No newline at end of file |
@@ -32,9 +32,9 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | $cacheResult = $cacheInstance->getItem($cacheKey)->get(); |
| 34 | 34 | |
| 35 | -if($cacheResult === $randomStr){ |
|
| 35 | +if ($cacheResult === $randomStr) { |
|
| 36 | 36 | echo "[PASS] The cache key value match, got expected value '{$cacheResult}'\n"; |
| 37 | -}else{ |
|
| 37 | +} else { |
|
| 38 | 38 | echo "[FAIL] The cache key value match expected value '{$randomStr}', got '{$cacheResult}'\n"; |
| 39 | 39 | $status = 1; |
| 40 | 40 | } |
@@ -42,9 +42,9 @@ discard block |
||
| 42 | 42 | $cacheInstance->clear(); |
| 43 | 43 | $cacheResult = ($cacheInstance->getItem($cacheKey)->isHit() === false && $cacheInstance->getItem($cacheKey)->get() === null); |
| 44 | 44 | |
| 45 | -if($cacheResult === true){ |
|
| 45 | +if ($cacheResult === true) { |
|
| 46 | 46 | echo "[PASS] The cache item is null as expected\n"; |
| 47 | -}else{ |
|
| 47 | +} else { |
|
| 48 | 48 | echo "[FAIL] The cache is not null'\n"; |
| 49 | 49 | $status = 1; |
| 50 | 50 | } |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | if (!class_exists('phpFastCache\CacheManager')) { |
| 19 | 19 | echo "[FAIL] Autoload failed to find the CacheManager\n"; |
| 20 | 20 | $status = 255; |
| 21 | -}else{ |
|
| 21 | +} else{ |
|
| 22 | 22 | echo "[PASS] Autoload successfully found the CacheManager\n"; |
| 23 | 23 | } |
| 24 | 24 | |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | if (!interface_exists('Psr\Cache\CacheItemInterface')) { |
| 29 | 29 | echo "[FAIL] Autoload failed to find the Psr CacheItemInterface\n"; |
| 30 | 30 | $status = 255; |
| 31 | -}else{ |
|
| 31 | +} else{ |
|
| 32 | 32 | echo "[PASS] Autoload successfully found the Psr CacheItemInterface\n"; |
| 33 | 33 | } |
| 34 | 34 | |
@@ -29,9 +29,9 @@ discard block |
||
| 29 | 29 | { |
| 30 | 30 | use DriverBaseTrait; |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @var array |
|
| 34 | - */ |
|
| 32 | + /** |
|
| 33 | + * @var array |
|
| 34 | + */ |
|
| 35 | 35 | protected $staticStack = []; |
| 36 | 36 | |
| 37 | 37 | /** |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | { |
| 86 | 86 | $key = md5($item->getKey()); |
| 87 | 87 | if(isset($this->staticStack[$key])){ |
| 88 | - return $this->staticStack[$key]; |
|
| 88 | + return $this->staticStack[$key]; |
|
| 89 | 89 | } |
| 90 | 90 | return null; |
| 91 | 91 | } |
@@ -101,12 +101,12 @@ discard block |
||
| 101 | 101 | * Check for Cross-Driver type confusion |
| 102 | 102 | */ |
| 103 | 103 | if ($item instanceof Item) { |
| 104 | - $key = md5($item->getKey()); |
|
| 105 | - if(isset($this->staticStack[$key])){ |
|
| 106 | - unset($this->staticStack[$key]); |
|
| 107 | - return true; |
|
| 108 | - } |
|
| 109 | - return false; |
|
| 104 | + $key = md5($item->getKey()); |
|
| 105 | + if(isset($this->staticStack[$key])){ |
|
| 106 | + unset($this->staticStack[$key]); |
|
| 107 | + return true; |
|
| 108 | + } |
|
| 109 | + return false; |
|
| 110 | 110 | } else { |
| 111 | 111 | throw new \InvalidArgumentException('Cross-Driver type confusion detected'); |
| 112 | 112 | } |
@@ -117,9 +117,9 @@ discard block |
||
| 117 | 117 | */ |
| 118 | 118 | protected function driverClear() |
| 119 | 119 | { |
| 120 | - unset($this->staticStack); |
|
| 121 | - $this->staticStack = []; |
|
| 122 | - return true; |
|
| 120 | + unset($this->staticStack); |
|
| 121 | + $this->staticStack = []; |
|
| 122 | + return true; |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | /** |
@@ -143,9 +143,9 @@ discard block |
||
| 143 | 143 | { |
| 144 | 144 | $stat = new driverStatistic(); |
| 145 | 145 | $stat->setInfo('[Memstatic] A memory static driver') |
| 146 | - ->setSize(mb_strlen(serialize($this->staticStack))) |
|
| 147 | - ->setData(implode(', ', array_keys($this->itemInstances))) |
|
| 148 | - ->setRawData($this->staticStack); |
|
| 146 | + ->setSize(mb_strlen(serialize($this->staticStack))) |
|
| 147 | + ->setData(implode(', ', array_keys($this->itemInstances))) |
|
| 148 | + ->setRawData($this->staticStack); |
|
| 149 | 149 | |
| 150 | 150 | return $stat; |
| 151 | 151 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | protected function driverRead(CacheItemInterface $item) |
| 85 | 85 | { |
| 86 | 86 | $key = md5($item->getKey()); |
| 87 | - if(isset($this->staticStack[$key])){ |
|
| 87 | + if (isset($this->staticStack[$key])) { |
|
| 88 | 88 | return $this->staticStack[$key]; |
| 89 | 89 | } |
| 90 | 90 | return null; |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | */ |
| 103 | 103 | if ($item instanceof Item) { |
| 104 | 104 | $key = md5($item->getKey()); |
| 105 | - if(isset($this->staticStack[$key])){ |
|
| 105 | + if (isset($this->staticStack[$key])) { |
|
| 106 | 106 | unset($this->staticStack[$key]); |
| 107 | 107 | return true; |
| 108 | 108 | } |
@@ -46,6 +46,7 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | /** |
| 48 | 48 | * @inheritdoc |
| 49 | + * @param string $tagName |
|
| 49 | 50 | */ |
| 50 | 51 | public function getItemsByTag($tagName) |
| 51 | 52 | { |
@@ -416,7 +417,7 @@ discard block |
||
| 416 | 417 | |
| 417 | 418 | /** |
| 418 | 419 | * @internal This method de-register an item from $this->itemInstances |
| 419 | - * @param CacheItemInterface|string $item |
|
| 420 | + * @param CacheItemInterface $item |
|
| 420 | 421 | * @throws \InvalidArgumentException |
| 421 | 422 | */ |
| 422 | 423 | protected function deregisterItem($item) |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | public function getItemsAsJsonString(array $keys = [], $option = 0, $depth = 512) |
| 40 | 40 | { |
| 41 | - $callback = function (CacheItemInterface $item) { |
|
| 41 | + $callback = function(CacheItemInterface $item) { |
|
| 42 | 42 | return $item->get(); |
| 43 | 43 | }; |
| 44 | 44 | return json_encode(array_map($callback, array_values($this->getItems($keys))), $option, $depth); |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | if (is_string($tagName)) { |
| 53 | 53 | $driverResponse = $this->getItem($this->getTagKey($tagName)); |
| 54 | 54 | if ($driverResponse->isHit()) { |
| 55 | - $items = (array)$driverResponse->get(); |
|
| 55 | + $items = (array) $driverResponse->get(); |
|
| 56 | 56 | |
| 57 | 57 | /** |
| 58 | 58 | * getItems() may provides expired item(s) |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | * |
| 65 | 65 | * #headache |
| 66 | 66 | */ |
| 67 | - return array_filter($this->getItems(array_unique(array_keys($items))), function (ExtendedCacheItemInterface $item) { |
|
| 67 | + return array_filter($this->getItems(array_unique(array_keys($items))), function(ExtendedCacheItemInterface $item) { |
|
| 68 | 68 | return $item->isHit(); |
| 69 | 69 | }); |
| 70 | 70 | } else { |
@@ -82,9 +82,9 @@ discard block |
||
| 82 | 82 | { |
| 83 | 83 | $items = []; |
| 84 | 84 | foreach (array_unique($tagNames) as $tagName) { |
| 85 | - if(is_string($tagName)){ |
|
| 85 | + if (is_string($tagName)) { |
|
| 86 | 86 | $items = array_merge($items, $this->getItemsByTag($tagName)); |
| 87 | - }else{ |
|
| 87 | + } else { |
|
| 88 | 88 | throw new InvalidArgumentException('$tagName must be a a string'); |
| 89 | 89 | } |
| 90 | 90 | } |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | |
| 103 | 103 | foreach ($items as $key => $item) { |
| 104 | 104 | if (array_diff($tagNames, $item->getTags())) { |
| 105 | - unset($items[ $key ]); |
|
| 105 | + unset($items[$key]); |
|
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | 108 | |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | */ |
| 116 | 116 | public function getItemsByTagsAsJsonString(array $tagNames, $option = 0, $depth = 512) |
| 117 | 117 | { |
| 118 | - $callback = function (CacheItemInterface $item) { |
|
| 118 | + $callback = function(CacheItemInterface $item) { |
|
| 119 | 119 | return $item->get(); |
| 120 | 120 | }; |
| 121 | 121 | |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | */ |
| 387 | 387 | public function detachItem(CacheItemInterface $item) |
| 388 | 388 | { |
| 389 | - if (isset($this->itemInstances[ $item->getKey() ])) { |
|
| 389 | + if (isset($this->itemInstances[$item->getKey()])) { |
|
| 390 | 390 | $this->deregisterItem($item); |
| 391 | 391 | } |
| 392 | 392 | } |
@@ -406,10 +406,10 @@ discard block |
||
| 406 | 406 | */ |
| 407 | 407 | public function attachItem(CacheItemInterface $item) |
| 408 | 408 | { |
| 409 | - if (isset($this->itemInstances[ $item->getKey() ]) && spl_object_hash($item) !== spl_object_hash($this->itemInstances[ $item->getKey() ])) { |
|
| 409 | + if (isset($this->itemInstances[$item->getKey()]) && spl_object_hash($item) !== spl_object_hash($this->itemInstances[$item->getKey()])) { |
|
| 410 | 410 | throw new \LogicException('The item already exists and cannot be overwritten because the Spl object hash mismatches ! You probably tried to re-attach a detached item which has been already retrieved from cache.'); |
| 411 | 411 | } else { |
| 412 | - $this->itemInstances[ $item->getKey() ] = $item; |
|
| 412 | + $this->itemInstances[$item->getKey()] = $item; |
|
| 413 | 413 | } |
| 414 | 414 | } |
| 415 | 415 | |
@@ -422,10 +422,10 @@ discard block |
||
| 422 | 422 | protected function deregisterItem($item) |
| 423 | 423 | { |
| 424 | 424 | if ($item instanceof CacheItemInterface) { |
| 425 | - unset($this->itemInstances[ $item->getKey() ]); |
|
| 425 | + unset($this->itemInstances[$item->getKey()]); |
|
| 426 | 426 | |
| 427 | 427 | } else if (is_string($item)) { |
| 428 | - unset($this->itemInstances[ $item ]); |
|
| 428 | + unset($this->itemInstances[$item]); |
|
| 429 | 429 | } else { |
| 430 | 430 | throw new \InvalidArgumentException('Invalid type for $item variable'); |
| 431 | 431 | } |
@@ -445,8 +445,8 @@ discard block |
||
| 445 | 445 | */ |
| 446 | 446 | public function isAttached(CacheItemInterface $item) |
| 447 | 447 | { |
| 448 | - if (isset($this->itemInstances[ $item->getKey() ])) { |
|
| 449 | - return spl_object_hash($item) === spl_object_hash($this->itemInstances[ $item->getKey() ]); |
|
| 448 | + if (isset($this->itemInstances[$item->getKey()])) { |
|
| 449 | + return spl_object_hash($item) === spl_object_hash($this->itemInstances[$item->getKey()]); |
|
| 450 | 450 | } |
| 451 | 451 | return null; |
| 452 | 452 | } |
@@ -466,8 +466,8 @@ discard block |
||
| 466 | 466 | */ |
| 467 | 467 | public function saveMultiple(...$items) |
| 468 | 468 | { |
| 469 | - if (isset($items[ 0 ]) && is_array($items[ 0 ])) { |
|
| 470 | - foreach ($items[ 0 ] as $item) { |
|
| 469 | + if (isset($items[0]) && is_array($items[0])) { |
|
| 470 | + foreach ($items[0] as $item) { |
|
| 471 | 471 | $this->save($item); |
| 472 | 472 | } |
| 473 | 473 | return true; |
@@ -84,7 +84,7 @@ |
||
| 84 | 84 | foreach (array_unique($tagNames) as $tagName) { |
| 85 | 85 | if(is_string($tagName)){ |
| 86 | 86 | $items = array_merge($items, $this->getItemsByTag($tagName)); |
| 87 | - }else{ |
|
| 87 | + } else{ |
|
| 88 | 88 | throw new InvalidArgumentException('$tagName must be a a string'); |
| 89 | 89 | } |
| 90 | 90 | } |
@@ -28,36 +28,36 @@ |
||
| 28 | 28 | $item3 = $driverInstance->getItem('tag-test3'); |
| 29 | 29 | |
| 30 | 30 | $item1->set('item-test_1') |
| 31 | - ->expiresAfter(600) |
|
| 32 | - ->addTag('tag-test_1') |
|
| 33 | - ->addTag('tag-test_all') |
|
| 34 | - ->addTag('tag-test_all2') |
|
| 35 | - ->addTag('tag-test_all3'); |
|
| 31 | + ->expiresAfter(600) |
|
| 32 | + ->addTag('tag-test_1') |
|
| 33 | + ->addTag('tag-test_all') |
|
| 34 | + ->addTag('tag-test_all2') |
|
| 35 | + ->addTag('tag-test_all3'); |
|
| 36 | 36 | |
| 37 | 37 | $item2->set('item-test_2') |
| 38 | - ->expiresAfter(600) |
|
| 39 | - ->addTag('tag-test_1') |
|
| 40 | - ->addTag('tag-test_2') |
|
| 41 | - ->addTag('tag-test_all') |
|
| 42 | - ->addTag('tag-test_all2') |
|
| 43 | - ->addTag('tag-test_all3'); |
|
| 38 | + ->expiresAfter(600) |
|
| 39 | + ->addTag('tag-test_1') |
|
| 40 | + ->addTag('tag-test_2') |
|
| 41 | + ->addTag('tag-test_all') |
|
| 42 | + ->addTag('tag-test_all2') |
|
| 43 | + ->addTag('tag-test_all3'); |
|
| 44 | 44 | |
| 45 | 45 | $item3->set('item-test_3') |
| 46 | - ->expiresAfter(600) |
|
| 47 | - ->addTag('tag-test_1') |
|
| 48 | - ->addTag('tag-test_2') |
|
| 49 | - ->addTag('tag-test_3') |
|
| 50 | - ->addTag('tag-test_all') |
|
| 51 | - ->addTag('tag-test_all2') |
|
| 52 | - ->addTag('tag-test_all3') |
|
| 53 | - ->addTag('tag-test_all4'); |
|
| 46 | + ->expiresAfter(600) |
|
| 47 | + ->addTag('tag-test_1') |
|
| 48 | + ->addTag('tag-test_2') |
|
| 49 | + ->addTag('tag-test_3') |
|
| 50 | + ->addTag('tag-test_all') |
|
| 51 | + ->addTag('tag-test_all2') |
|
| 52 | + ->addTag('tag-test_all3') |
|
| 53 | + ->addTag('tag-test_all4'); |
|
| 54 | 54 | |
| 55 | 55 | $driverInstance->saveMultiple($item1, $item2, $item3); |
| 56 | 56 | |
| 57 | 57 | return [ |
| 58 | - 'item1' => $item1, |
|
| 59 | - 'item2' => $item2, |
|
| 60 | - 'item3' => $item3 |
|
| 58 | + 'item1' => $item1, |
|
| 59 | + 'item2' => $item2, |
|
| 60 | + 'item3' => $item3 |
|
| 61 | 61 | ]; |
| 62 | 62 | }; |
| 63 | 63 | |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | require_once __DIR__ . '/../src/autoload.php'; |
| 12 | 12 | echo '[PhpFastCache API v' . Api::getVersion() . "]\n\n"; |
| 13 | 13 | |
| 14 | -$defaultDriver = (!empty($argv[ 1 ]) ? ucfirst($argv[ 1 ]) : 'Files'); |
|
| 14 | +$defaultDriver = (!empty($argv[1]) ? ucfirst($argv[1]) : 'Files'); |
|
| 15 | 15 | $status = 0; |
| 16 | 16 | echo "Testing items tags feature\n"; |
| 17 | 17 | |
@@ -69,14 +69,14 @@ discard block |
||
| 69 | 69 | echo "\n#1 Testing getter: getItemsByTag() // Expecting 3 results\n"; |
| 70 | 70 | |
| 71 | 71 | $tagsItems = $driverInstance->getItemsByTag('tag-test_all'); |
| 72 | -if(is_array($tagsItems)) |
|
| 72 | +if (is_array($tagsItems)) |
|
| 73 | 73 | { |
| 74 | - if(count($tagsItems) === 3) |
|
| 74 | + if (count($tagsItems) === 3) |
|
| 75 | 75 | { |
| 76 | - foreach($tagsItems as $tagsItem) |
|
| 76 | + foreach ($tagsItems as $tagsItem) |
|
| 77 | 77 | { |
| 78 | - if(!in_array($tagsItem->getKey(), ['tag-test1', 'tag-test2', 'tag-test3'])){ |
|
| 79 | - echo '[FAIL] STEP#1 // Got unexpected tagged item key:' . $tagsItem->getKey() . "\n"; |
|
| 78 | + if (!in_array($tagsItem->getKey(), ['tag-test1', 'tag-test2', 'tag-test3'])) { |
|
| 79 | + echo '[FAIL] STEP#1 // Got unexpected tagged item key:' . $tagsItem->getKey() . "\n"; |
|
| 80 | 80 | $status = 1; |
| 81 | 81 | goto itemTagTest2; |
| 82 | 82 | } |
@@ -85,14 +85,14 @@ discard block |
||
| 85 | 85 | } |
| 86 | 86 | else |
| 87 | 87 | { |
| 88 | - echo '[FAIL] STEP#1 //Got wrong count of item:' . count($tagsItems) . "\n"; |
|
| 88 | + echo '[FAIL] STEP#1 //Got wrong count of item:' . count($tagsItems) . "\n"; |
|
| 89 | 89 | $status = 1; |
| 90 | 90 | goto itemTagTest2; |
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | 93 | else |
| 94 | 94 | { |
| 95 | - echo '[FAIL] STEP#1 // Expected $tagsItems to be an array, got: ' . gettype($tagsItems) . "\n"; |
|
| 95 | + echo '[FAIL] STEP#1 // Expected $tagsItems to be an array, got: ' . gettype($tagsItems) . "\n"; |
|
| 96 | 96 | $status = 1; |
| 97 | 97 | goto itemTagTest2; |
| 98 | 98 | } |
@@ -107,14 +107,14 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | $tagsItems = $driverInstance->getItemsByTagsAll(['tag-test_all', 'tag-test_all2', 'tag-test_all3']); |
| 109 | 109 | |
| 110 | -if(is_array($tagsItems)) |
|
| 110 | +if (is_array($tagsItems)) |
|
| 111 | 111 | { |
| 112 | - if(count($tagsItems) === 3) |
|
| 112 | + if (count($tagsItems) === 3) |
|
| 113 | 113 | { |
| 114 | - foreach($tagsItems as $tagsItem) |
|
| 114 | + foreach ($tagsItems as $tagsItem) |
|
| 115 | 115 | { |
| 116 | - if(!in_array($tagsItem->getKey(), ['tag-test1', 'tag-test2', 'tag-test3'])){ |
|
| 117 | - echo '[FAIL] STEP#2 // Got unexpected tagged item key:' . $tagsItem->getKey() . "\n"; |
|
| 116 | + if (!in_array($tagsItem->getKey(), ['tag-test1', 'tag-test2', 'tag-test3'])) { |
|
| 117 | + echo '[FAIL] STEP#2 // Got unexpected tagged item key:' . $tagsItem->getKey() . "\n"; |
|
| 118 | 118 | $status = 1; |
| 119 | 119 | goto itemTagTest3; |
| 120 | 120 | } |
@@ -123,14 +123,14 @@ discard block |
||
| 123 | 123 | } |
| 124 | 124 | else |
| 125 | 125 | { |
| 126 | - echo '[FAIL] STEP#2 // Got wrong count of item:' . count($tagsItems) . "\n"; |
|
| 126 | + echo '[FAIL] STEP#2 // Got wrong count of item:' . count($tagsItems) . "\n"; |
|
| 127 | 127 | $status = 1; |
| 128 | 128 | goto itemTagTest3; |
| 129 | 129 | } |
| 130 | 130 | } |
| 131 | 131 | else |
| 132 | 132 | { |
| 133 | - echo '[FAIL] STEP#2 // Expected $tagsItems to be an array, got: ' . gettype($tagsItems) . "\n"; |
|
| 133 | + echo '[FAIL] STEP#2 // Expected $tagsItems to be an array, got: ' . gettype($tagsItems) . "\n"; |
|
| 134 | 134 | $status = 1; |
| 135 | 135 | goto itemTagTest3; |
| 136 | 136 | } |
@@ -145,14 +145,14 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | $tagsItems = $driverInstance->getItemsByTagsAll(['tag-test_all', 'tag-test_all2', 'tag-test_all3', 'tag-test_all4']); |
| 147 | 147 | |
| 148 | -if(is_array($tagsItems)) |
|
| 148 | +if (is_array($tagsItems)) |
|
| 149 | 149 | { |
| 150 | - if(count($tagsItems) === 1) |
|
| 150 | + if (count($tagsItems) === 1) |
|
| 151 | 151 | { |
| 152 | - if(isset($tagsItems['tag-test3'])) |
|
| 152 | + if (isset($tagsItems['tag-test3'])) |
|
| 153 | 153 | { |
| 154 | - if($tagsItems['tag-test3']->getKey() !== 'tag-test3'){ |
|
| 155 | - echo '[FAIL] STEP#3 // Got unexpected tagged item key:' . $tagsItems['tag-test3']->getKey() . "\n"; |
|
| 154 | + if ($tagsItems['tag-test3']->getKey() !== 'tag-test3') { |
|
| 155 | + echo '[FAIL] STEP#3 // Got unexpected tagged item key:' . $tagsItems['tag-test3']->getKey() . "\n"; |
|
| 156 | 156 | $status = 1; |
| 157 | 157 | goto itemTagTest4; |
| 158 | 158 | } |
@@ -160,21 +160,21 @@ discard block |
||
| 160 | 160 | } |
| 161 | 161 | else |
| 162 | 162 | { |
| 163 | - echo '[FAIL] STEP#3 // Got wrong array key, expected "tag-test3", got "' . key($tagsItems) . "\"\n"; |
|
| 163 | + echo '[FAIL] STEP#3 // Got wrong array key, expected "tag-test3", got "' . key($tagsItems) . "\"\n"; |
|
| 164 | 164 | $status = 1; |
| 165 | 165 | goto itemTagTest4; |
| 166 | 166 | } |
| 167 | 167 | } |
| 168 | 168 | else |
| 169 | 169 | { |
| 170 | - echo '[FAIL] STEP#3 // Got wrong count of item:' . count($tagsItems) . "\n"; |
|
| 170 | + echo '[FAIL] STEP#3 // Got wrong count of item:' . count($tagsItems) . "\n"; |
|
| 171 | 171 | $status = 1; |
| 172 | 172 | goto itemTagTest4; |
| 173 | 173 | } |
| 174 | 174 | } |
| 175 | 175 | else |
| 176 | 176 | { |
| 177 | - echo '[FAIL] STEP#3 // Expected $tagsItems to be an array, got: ' . gettype($tagsItems) . "\n"; |
|
| 177 | + echo '[FAIL] STEP#3 // Expected $tagsItems to be an array, got: ' . gettype($tagsItems) . "\n"; |
|
| 178 | 178 | $status = 1; |
| 179 | 179 | goto itemTagTest4; |
| 180 | 180 | } |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | $createItemsCallback(); |
| 189 | 189 | $driverInstance->deleteItemsByTag('tag-test_all'); |
| 190 | 190 | |
| 191 | -if(count($driverInstance->getItemsByTag('tag-test_all')) > 0) |
|
| 191 | +if (count($driverInstance->getItemsByTag('tag-test_all')) > 0) |
|
| 192 | 192 | { |
| 193 | 193 | echo "[FAIL] STEP#4 // Getter getItemsByTag() found item(s), possible memory leak \n"; |
| 194 | 194 | $status = 1; |
@@ -199,9 +199,9 @@ discard block |
||
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | $i = 0; |
| 202 | -while(++$i <= 3) |
|
| 202 | +while (++$i <= 3) |
|
| 203 | 203 | { |
| 204 | - if($driverInstance->getItem("tag-test{$i}")->isHit()) |
|
| 204 | + if ($driverInstance->getItem("tag-test{$i}")->isHit()) |
|
| 205 | 205 | { |
| 206 | 206 | echo "[FAIL] STEP#4 // Item 'tag-test{$i}' should've been deleted and is still in cache storage \n"; |
| 207 | 207 | $status = 1; |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | |
| 223 | 223 | $driverInstance->deleteItemsByTagsAll(['tag-test_all', 'tag-test_all2', 'tag-test_all3']); |
| 224 | 224 | |
| 225 | -if(count($driverInstance->getItemsByTag('tag-test_all')) > 0) |
|
| 225 | +if (count($driverInstance->getItemsByTag('tag-test_all')) > 0) |
|
| 226 | 226 | { |
| 227 | 227 | echo "[FAIL] STEP#5 // Getter getItemsByTag() found item(s), possible memory leak \n"; |
| 228 | 228 | $status = 1; |
@@ -233,9 +233,9 @@ discard block |
||
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | $i = 0; |
| 236 | -while(++$i <= 3) |
|
| 236 | +while (++$i <= 3) |
|
| 237 | 237 | { |
| 238 | - if($driverInstance->getItem("tag-test{$i}")->isHit()) |
|
| 238 | + if ($driverInstance->getItem("tag-test{$i}")->isHit()) |
|
| 239 | 239 | { |
| 240 | 240 | echo "[FAIL] STEP#5 // Item 'tag-test{$i}' should've been deleted and is still in cache storage \n"; |
| 241 | 241 | $status = 1; |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | */ |
| 260 | 260 | $driverInstance->deleteItemsByTagsAll(['tag-test_all', 'tag-test_all2', 'tag-test_all3', 'tag-test_all4']); |
| 261 | 261 | |
| 262 | -if($driverInstance->getItem('item-test_3')->isHit()) |
|
| 262 | +if ($driverInstance->getItem('item-test_3')->isHit()) |
|
| 263 | 263 | { |
| 264 | 264 | echo "[FAIL] STEP#6 // Getter getItem() found item 'item-test_3', possible memory leak \n"; |
| 265 | 265 | $status = 1; |
@@ -279,9 +279,9 @@ discard block |
||
| 279 | 279 | $appendStr = '$*#*$'; |
| 280 | 280 | $driverInstance->appendItemsByTagsAll(['tag-test_all', 'tag-test_all2', 'tag-test_all3'], $appendStr); |
| 281 | 281 | |
| 282 | -foreach($driverInstance->getItems(['tag-test1', 'tag-test2', 'tag-test3']) as $item) |
|
| 282 | +foreach ($driverInstance->getItems(['tag-test1', 'tag-test2', 'tag-test3']) as $item) |
|
| 283 | 283 | { |
| 284 | - if(strpos($item->get(), $appendStr) === false) |
|
| 284 | + if (strpos($item->get(), $appendStr) === false) |
|
| 285 | 285 | { |
| 286 | 286 | echo "[FAIL] STEP#7 // Item '{$item->getKey()}' does not have the string part '{$appendStr}' in it's value \n"; |
| 287 | 287 | $status = 1; |
@@ -302,9 +302,9 @@ discard block |
||
| 302 | 302 | $prependStr = '&+_+&'; |
| 303 | 303 | $driverInstance->prependItemsByTagsAll(['tag-test_all', 'tag-test_all2', 'tag-test_all3'], $prependStr); |
| 304 | 304 | |
| 305 | -foreach($driverInstance->getItems(['tag-test1', 'tag-test2', 'tag-test3']) as $item) |
|
| 305 | +foreach ($driverInstance->getItems(['tag-test1', 'tag-test2', 'tag-test3']) as $item) |
|
| 306 | 306 | { |
| 307 | - if(strpos($item->get(), $prependStr) === false) |
|
| 307 | + if (strpos($item->get(), $prependStr) === false) |
|
| 308 | 308 | { |
| 309 | 309 | echo "[FAIL] STEP#7 // Item '{$item->getKey()}' does not have the string part '{$prependStr}' in it's value \n"; |
| 310 | 310 | $status = 1; |
@@ -82,15 +82,13 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | echo "[PASS] STEP#1 // Successfully retrieved 3 tagged item keys\n"; |
| 85 | - } |
|
| 86 | - else |
|
| 85 | + } else |
|
| 87 | 86 | { |
| 88 | 87 | echo '[FAIL] STEP#1 //Got wrong count of item:' . count($tagsItems) . "\n"; |
| 89 | 88 | $status = 1; |
| 90 | 89 | goto itemTagTest2; |
| 91 | 90 | } |
| 92 | -} |
|
| 93 | -else |
|
| 91 | +} else |
|
| 94 | 92 | { |
| 95 | 93 | echo '[FAIL] STEP#1 // Expected $tagsItems to be an array, got: ' . gettype($tagsItems) . "\n"; |
| 96 | 94 | $status = 1; |
@@ -120,15 +118,13 @@ discard block |
||
| 120 | 118 | } |
| 121 | 119 | } |
| 122 | 120 | echo "[PASS] STEP#2 // Successfully retrieved 3 tagged item key\n"; |
| 123 | - } |
|
| 124 | - else |
|
| 121 | + } else |
|
| 125 | 122 | { |
| 126 | 123 | echo '[FAIL] STEP#2 // Got wrong count of item:' . count($tagsItems) . "\n"; |
| 127 | 124 | $status = 1; |
| 128 | 125 | goto itemTagTest3; |
| 129 | 126 | } |
| 130 | -} |
|
| 131 | -else |
|
| 127 | +} else |
|
| 132 | 128 | { |
| 133 | 129 | echo '[FAIL] STEP#2 // Expected $tagsItems to be an array, got: ' . gettype($tagsItems) . "\n"; |
| 134 | 130 | $status = 1; |
@@ -157,22 +153,19 @@ discard block |
||
| 157 | 153 | goto itemTagTest4; |
| 158 | 154 | } |
| 159 | 155 | echo "[PASS] STEP#3 // Successfully retrieved 1 tagged item keys\n"; |
| 160 | - } |
|
| 161 | - else |
|
| 156 | + } else |
|
| 162 | 157 | { |
| 163 | 158 | echo '[FAIL] STEP#3 // Got wrong array key, expected "tag-test3", got "' . key($tagsItems) . "\"\n"; |
| 164 | 159 | $status = 1; |
| 165 | 160 | goto itemTagTest4; |
| 166 | 161 | } |
| 167 | - } |
|
| 168 | - else |
|
| 162 | + } else |
|
| 169 | 163 | { |
| 170 | 164 | echo '[FAIL] STEP#3 // Got wrong count of item:' . count($tagsItems) . "\n"; |
| 171 | 165 | $status = 1; |
| 172 | 166 | goto itemTagTest4; |
| 173 | 167 | } |
| 174 | -} |
|
| 175 | -else |
|
| 168 | +} else |
|
| 176 | 169 | { |
| 177 | 170 | echo '[FAIL] STEP#3 // Expected $tagsItems to be an array, got: ' . gettype($tagsItems) . "\n"; |
| 178 | 171 | $status = 1; |
@@ -192,8 +185,7 @@ discard block |
||
| 192 | 185 | { |
| 193 | 186 | echo "[FAIL] STEP#4 // Getter getItemsByTag() found item(s), possible memory leak \n"; |
| 194 | 187 | $status = 1; |
| 195 | -} |
|
| 196 | -else |
|
| 188 | +} else |
|
| 197 | 189 | { |
| 198 | 190 | echo "[PASS] STEP#4 // Getter getItemsByTag() found no item \n"; |
| 199 | 191 | } |
@@ -205,8 +197,7 @@ discard block |
||
| 205 | 197 | { |
| 206 | 198 | echo "[FAIL] STEP#4 // Item 'tag-test{$i}' should've been deleted and is still in cache storage \n"; |
| 207 | 199 | $status = 1; |
| 208 | - } |
|
| 209 | - else |
|
| 200 | + } else |
|
| 210 | 201 | { |
| 211 | 202 | echo "[PASS] STEP#4 // Item 'tag-test{$i}' have been deleted and is no longer in cache storage \n"; |
| 212 | 203 | } |
@@ -226,8 +217,7 @@ discard block |
||
| 226 | 217 | { |
| 227 | 218 | echo "[FAIL] STEP#5 // Getter getItemsByTag() found item(s), possible memory leak \n"; |
| 228 | 219 | $status = 1; |
| 229 | -} |
|
| 230 | -else |
|
| 220 | +} else |
|
| 231 | 221 | { |
| 232 | 222 | echo "[PASS] STEP#5 // Getter getItemsByTag() found no item \n"; |
| 233 | 223 | } |
@@ -239,8 +229,7 @@ discard block |
||
| 239 | 229 | { |
| 240 | 230 | echo "[FAIL] STEP#5 // Item 'tag-test{$i}' should've been deleted and is still in cache storage \n"; |
| 241 | 231 | $status = 1; |
| 242 | - } |
|
| 243 | - else |
|
| 232 | + } else |
|
| 244 | 233 | { |
| 245 | 234 | echo "[PASS] STEP#5 // Item 'tag-test{$i}' have been deleted and is no longer in cache storage \n"; |
| 246 | 235 | } |
@@ -263,8 +252,7 @@ discard block |
||
| 263 | 252 | { |
| 264 | 253 | echo "[FAIL] STEP#6 // Getter getItem() found item 'item-test_3', possible memory leak \n"; |
| 265 | 254 | $status = 1; |
| 266 | -} |
|
| 267 | -else |
|
| 255 | +} else |
|
| 268 | 256 | { |
| 269 | 257 | echo "[PASS] STEP#6 // Getter getItem() did not found item 'item-test_3' \n"; |
| 270 | 258 | } |
@@ -285,8 +273,7 @@ discard block |
||
| 285 | 273 | { |
| 286 | 274 | echo "[FAIL] STEP#7 // Item '{$item->getKey()}' does not have the string part '{$appendStr}' in it's value \n"; |
| 287 | 275 | $status = 1; |
| 288 | - } |
|
| 289 | - else |
|
| 276 | + } else |
|
| 290 | 277 | { |
| 291 | 278 | echo "[PASS] STEP#7 // Item 'tag-test{$item->getKey()}' does have the string part '{$appendStr}' in it's value \n"; |
| 292 | 279 | } |
@@ -308,8 +295,7 @@ discard block |
||
| 308 | 295 | { |
| 309 | 296 | echo "[FAIL] STEP#7 // Item '{$item->getKey()}' does not have the string part '{$prependStr}' in it's value \n"; |
| 310 | 297 | $status = 1; |
| 311 | - } |
|
| 312 | - else |
|
| 298 | + } else |
|
| 313 | 299 | { |
| 314 | 300 | echo "[PASS] STEP#7 // Item 'tag-test{$item->getKey()}' does have the string part '{$prependStr}' in it's value \n"; |
| 315 | 301 | } |