chillerlan / php-cache

src/SessionCache.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 
 use chillerlan\Settings\SettingsContainerInterface;
 
-class SessionCache extends CacheDriverAbstract{
+class SessionCache extends CacheDriverAbstract {
 
 	/**
 	 * @var string
@@ -28,12 +28,12 @@ 
 	 *
 	 * @throws \chillerlan\SimpleCache\CacheException
 	 */
-	public function __construct(SettingsContainerInterface $options = null){
+	public function __construct(SettingsContainerInterface $options = null) {
 		parent::__construct($options);
 
 		$this->key = $this->options->cacheSessionkey;
 
-		if(!is_string($this->key) || empty($this->key)){
+		if (!is_string($this->key) || empty($this->key)) {
 			$msg = 'invalid session cache key';
 
 			$this->logger->error($msg);
@@ -45,12 +45,12 @@ 
 	}
 
 	/** @inheritdoc */
-	public function get($key, $default = null){
+	public function get($key, $default = null) {
 		$key = $this->checkKey($key);
 
-		if(isset($_SESSION[$this->key][$key])){
+		if (isset($_SESSION[$this->key][$key])) {
 
-			if($_SESSION[$this->key][$key]['ttl'] === null || $_SESSION[$this->key][$key]['ttl'] > time()){
+			if ($_SESSION[$this->key][$key]['ttl'] === null || $_SESSION[$this->key][$key]['ttl'] > time()) {
 				return $_SESSION[$this->key][$key]['content'];
 			}
 

src/FileCache.php

Spacing +15 added lines, -15 removed lines

@@ -15,7 +15,7 @@ 
 use chillerlan\Settings\SettingsContainerInterface;
 use FilesystemIterator, RecursiveDirectoryIterator, RecursiveIteratorIterator, stdClass;
 
-class FileCache extends CacheDriverAbstract{
+class FileCache extends CacheDriverAbstract {
 
 	/**
 	 * @var string
@@ -29,19 +29,19 @@ 
 	 *
 	 * @throws \chillerlan\SimpleCache\CacheException
 	 */
-	public function __construct(SettingsContainerInterface $options = null){
+	public function __construct(SettingsContainerInterface $options = null) {
 		parent::__construct($options);
 
 		$this->cachedir = rtrim($this->options->cacheFilestorage, '/\\').DIRECTORY_SEPARATOR;
 
-		if(!is_dir($this->cachedir)){
+		if (!is_dir($this->cachedir)) {
 			$msg = 'invalid cachedir "'.$this->cachedir.'"';
 
 			$this->logger->error($msg);
 			throw new CacheException($msg);
 		}
 
-		if(!is_writable($this->cachedir)){
+		if (!is_writable($this->cachedir)) {
 			$msg = 'cachedir is read-only. permissions?';
 
 			$this->logger->error($msg);
@@ -51,16 +51,16 @@ 
 	}
 
 	/** @inheritdoc */
-	public function get($key, $default = null){
+	public function get($key, $default = null) {
 		$filename = $this->getFilepath($this->checkKey($key));
 
-		if(is_file($filename)){
+		if (is_file($filename)) {
 			$content = file_get_contents($filename);
 
-			if(!empty($content)){
+			if (!empty($content)) {
 				$data = unserialize($content);
 
-				if($data->ttl === null || $data->ttl > time()){
+				if ($data->ttl === null || $data->ttl > time()) {
 					return $data->content;
 				}
 
@@ -79,7 +79,7 @@ 
 		$file = $this->getFilepath($this->checkKey($key));
 		$dir  = dirname($file);
 
-		if(!is_dir($dir)){
+		if (!is_dir($dir)) {
 			mkdir($dir, 0755, true);
 		}
 
@@ -87,13 +87,13 @@ 
 		$data->ttl     = null;
 		$data->content = $value;
 
-		if($ttl !== null){
+		if ($ttl !== null) {
 			$data->ttl = time() + $ttl;
 		}
 
 		file_put_contents($file, serialize($data));
 
-		if(is_file($file)){
+		if (is_file($file)) {
 			return true;
 		}
 
@@ -104,7 +104,7 @@ 
 	public function delete($key):bool{
 		$filename = $this->getFilepath($this->checkKey($key));
 
-		if(is_file($filename)){
+		if (is_file($filename)) {
 			return unlink($filename);
 		}
 
@@ -113,13 +113,13 @@ 
 
 	/** @inheritdoc */
 	public function clear():bool{
-		$iterator = new RecursiveDirectoryIterator($this->cachedir, FilesystemIterator::CURRENT_AS_PATHNAME|FilesystemIterator::SKIP_DOTS);
+		$iterator = new RecursiveDirectoryIterator($this->cachedir, FilesystemIterator::CURRENT_AS_PATHNAME | FilesystemIterator::SKIP_DOTS);
 		$return   = [];
 
-		foreach(new RecursiveIteratorIterator($iterator) as $path){
+		foreach (new RecursiveIteratorIterator($iterator) as $path) {
 
 			// skip files in the parent directory - cache files are only under /a/ab/[hash]
-			if(strpos(str_replace($this->cachedir, '', $path), DIRECTORY_SEPARATOR) === false){
+			if (strpos(str_replace($this->cachedir, '', $path), DIRECTORY_SEPARATOR) === false) {
 				continue;
 			}
 

src/MemoryCache.php

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 
 namespace chillerlan\SimpleCache;
 
-class MemoryCache extends CacheDriverAbstract{
+class MemoryCache extends CacheDriverAbstract {
 
 	/**
 	 * @var array
@@ -20,12 +20,12 @@ 
 	protected $cache = [];
 
 	/** @inheritdoc */
-	public function get($key, $default = null){
+	public function get($key, $default = null) {
 		$key = $this->checkKey($key);
 
-		if(isset($this->cache[$key])){
+		if (isset($this->cache[$key])) {
 
-			if($this->cache[$key]['ttl'] === null || $this->cache[$key]['ttl'] > time()){
+			if ($this->cache[$key]['ttl'] === null || $this->cache[$key]['ttl'] > time()) {
 				return $this->cache[$key]['content'];
 			}
 

src/APCUCache.php

Spacing +3 added lines, -3 removed lines

@@ -12,13 +12,13 @@
 
 namespace chillerlan\SimpleCache;
 
-class APCUCache extends CacheDriverAbstract{
+class APCUCache extends CacheDriverAbstract {
 
 	/** @inheritdoc */
-	public function get($key, $default = null){
+	public function get($key, $default = null) {
 		$value = apcu_fetch($this->checkKey($key));
 
-		if($value !== false){
+		if ($value !== false) {
 			return $value;
 		}
 

src/RedisCache.php

Spacing +8 added lines, -8 removed lines

@@ -15,7 +15,7 @@ 
 use chillerlan\Settings\SettingsContainerInterface;
 use Redis;
 
-class RedisCache extends CacheDriverAbstract{
+class RedisCache extends CacheDriverAbstract {
 
 	/**
 	 * @var \Redis
@@ -28,17 +28,17 @@ 
 	 * @param \Redis                                             $redis
 	 * @param \chillerlan\Settings\SettingsContainerInterface|null $options
 	 */
-	public function __construct(Redis $redis, SettingsContainerInterface $options = null){
+	public function __construct(Redis $redis, SettingsContainerInterface $options = null) {
 		parent::__construct($options);
 
 		$this->redis = $redis;
 	}
 
 	/** @inheritdoc */
-	public function get($key, $default = null){
+	public function get($key, $default = null) {
 		$value = $this->redis->get($this->checkKey($key));
 
-		if($value !== false){
+		if ($value !== false) {
 			return $value;
 		}
 
@@ -50,7 +50,7 @@ 
 		$key = $this->checkKey($key);
 		$ttl = $this->getTTL($ttl);
 
-		if($ttl === null){
+		if ($ttl === null) {
 			return $this->redis->set($key, $value);
 		}
 
@@ -78,7 +78,7 @@ 
 
 		$return = [];
 
-		foreach($keys as $key){
+		foreach ($keys as $key) {
 			$return[$key] = $values[$key] !== false ? $values[$key] : $default;
 		}
 
@@ -90,7 +90,7 @@ 
 		$values = $this->getData($values);
 		$ttl    = $this->getTTL($ttl);
 
-		if($ttl === null){
+		if ($ttl === null) {
 			$this->checkKeyArray(array_keys($values));
 
 			return $this->redis->msetnx($values);
@@ -98,7 +98,7 @@ 
 
 		$return = [];
 
-		foreach($values as $key => $value){
+		foreach ($values as $key => $value) {
 			$return[] = $this->set($key, $value, $ttl);
 		}
 

src/CacheDriverAbstract.php

Spacing +13 added lines, -13 removed lines

@@ -30,7 +30,7 @@ 
 	 *
 	 * @param \chillerlan\Settings\SettingsContainerInterface|null $options
 	 */
-	public function __construct(SettingsContainerInterface $options = null){
+	public function __construct(SettingsContainerInterface $options = null) {
 		$this->options = $options ?? new CacheOptions;
 		$this->logger  = new NullLogger;
 	}
@@ -44,7 +44,7 @@ 
 	public function getMultiple($keys, $default = null):array{
 		$data = [];
 
-		foreach($this->getData($keys) as $key){
+		foreach ($this->getData($keys) as $key) {
 			$data[$key] = $this->get($key, $default);
 		}
 
@@ -55,7 +55,7 @@ 
 	public function setMultiple($values, $ttl = null):bool{
 		$return = [];
 
-		foreach($this->getData($values) as $key => $value){
+		foreach ($this->getData($values) as $key => $value) {
 			$return[] = $this->set($key, $value, $ttl);
 		}
 
@@ -66,7 +66,7 @@ 
 	public function deleteMultiple($keys):bool{
 		$return = [];
 
-		foreach($this->getData($keys) as $key){
+		foreach ($this->getData($keys) as $key) {
 			$return[] = $this->delete($key);
 		}
 
@@ -81,7 +81,7 @@ 
 	 */
 	protected function checkKey($key):string{
 
-		if(!is_string($key) || empty($key)){
+		if (!is_string($key) || empty($key)) {
 			$msg = 'invalid cache key: "'.$key.'"';
 			$this->logger->error($msg);
 
@@ -98,7 +98,7 @@ 
 	 */
 	protected function checkKeyArray(array $keys):void{
 
-		foreach($keys as $key){
+		foreach ($keys as $key) {
 			$this->checkKey($key);
 		}
 
@@ -112,10 +112,10 @@ 
 	 */
 	protected function getData($data):array{
 
-		if(is_array($data)){
+		if (is_array($data)) {
 			return $data;
 		}
-		elseif($data instanceof Traversable){
+		elseif ($data instanceof Traversable) {
 			return iterator_to_array($data); // @codeCoverageIgnore
 		}
 
@@ -131,12 +131,12 @@ 
 	 * @return int|null
 	 * @throws \Psr\SimpleCache\InvalidArgumentException
 	 */
-	protected function getTTL($ttl):?int{
+	protected function getTTL($ttl): ?int{
 
-		if($ttl instanceof DateInterval){
+		if ($ttl instanceof DateInterval) {
 			return (new DateTime)->add($ttl)->getTimeStamp() - time();
 		}
-		else if((is_int($ttl) && $ttl > 0) || $ttl === null){
+		else if ((is_int($ttl) && $ttl > 0) || $ttl === null) {
 			return $ttl;
 		}
 
@@ -153,9 +153,9 @@ 
 	 */
 	protected function checkReturn(array $booleans):bool{
 
-		foreach($booleans as $bool){
+		foreach ($booleans as $bool) {
 
-			if(!(bool)$bool){
+			if (!(bool)$bool) {
 				return false; // @codeCoverageIgnore
 			}
 

Braces +2 added lines, -4 removed lines

@@ -114,8 +114,7 @@ 
 
 		if(is_array($data)){
 			return $data;
-		}
-		elseif($data instanceof Traversable){
+		} elseif($data instanceof Traversable){
 			return iterator_to_array($data); // @codeCoverageIgnore
 		}
 
@@ -135,8 +134,7 @@ 
 
 		if($ttl instanceof DateInterval){
 			return (new DateTime)->add($ttl)->getTimeStamp() - time();
-		}
-		else if((is_int($ttl) && $ttl > 0) || $ttl === null){
+		} else if((is_int($ttl) && $ttl > 0) || $ttl === null){
 			return $ttl;
 		}
 

src/MemcachedCache.php

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
 use chillerlan\Settings\SettingsContainerInterface;
 use Memcached;
 
-class MemcachedCache extends CacheDriverAbstract{
+class MemcachedCache extends CacheDriverAbstract {
 
 	/**
 	 * @var \Memcached
@@ -30,12 +30,12 @@ 
 	 *
 	 * @throws \chillerlan\SimpleCache\CacheException
 	 */
-	public function __construct(Memcached $memcached, SettingsContainerInterface $options = null){
+	public function __construct(Memcached $memcached, SettingsContainerInterface $options = null) {
 		parent::__construct($options);
 
 		$this->memcached = $memcached;
 
-		if(empty($this->memcached->getServerList())){
+		if (empty($this->memcached->getServerList())) {
 			$msg = 'no memcache server available';
 
 			$this->logger->error($msg);
@@ -45,10 +45,10 @@ 
 	}
 
 	/** @inheritdoc */
-	public function get($key, $default = null){
+	public function get($key, $default = null) {
 		$value = $this->memcached->get($this->checkKey($key));
 
-		if($value !== false){
+		if ($value !== false) {
 			return $value;
 		}
 
@@ -79,7 +79,7 @@ 
 		$values = $this->memcached->getMulti($keys);
 		$return = [];
 
-		foreach($keys as $key){
+		foreach ($keys as $key) {
 			$return[$key] = $values[$key] ?? $default;
 		}