chillerlan / php-cache

src/CacheOptionsTrait.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 namespace chillerlan\SimpleCache;
 
-trait CacheOptionsTrait{
+trait CacheOptionsTrait {
 
 	protected $filestorage = '';
 	protected $cachekey    = '_session_cache';

src/Drivers/FileCacheDriver.php

Spacing +14 added lines, -14 removed lines

@@ -16,7 +16,7 @@ 
 use chillerlan\Traits\ImmutableSettingsInterface;
 use stdClass;
 
-class FileCacheDriver extends CacheDriverAbstract{
+class FileCacheDriver extends CacheDriverAbstract {
 
 	/**
 	 * @var string
@@ -30,19 +30,19 @@ 
 	 *
 	 * @throws \chillerlan\SimpleCache\CacheException
 	 */
-	public function __construct(ImmutableSettingsInterface $options = null){
+	public function __construct(ImmutableSettingsInterface $options = null) {
 		parent::__construct($options);
 
 		$this->cachedir = $this->options->filestorage;
 
-		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);
@@ -52,16 +52,16 @@ 
 	}
 
 	/** @inheritdoc */
-	public function get(string $key, $default = null){
+	public function get(string $key, $default = null) {
 		$filename = $this->filename($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;
 				}
 
@@ -80,13 +80,13 @@ 
 		$data->ttl     = null;
 		$data->content = $value;
 
-		if($ttl !== null){
+		if ($ttl !== null) {
 			$data->ttl = time() + $ttl;
 		}
 
 		file_put_contents($filename, serialize($data));
 
-		if(is_file($filename)){
+		if (is_file($filename)) {
 			return true;
 		}
 
@@ -97,7 +97,7 @@ 
 	public function delete(string $key):bool{
 		$filename = $this->filename($key);
 
-		if(is_file($filename)){
+		if (is_file($filename)) {
 			return unlink($filename);
 		}
 
@@ -108,13 +108,13 @@ 
 	public function clear():bool{
 		$dir = scandir($this->cachedir);
 
-		if(is_array($dir) && !empty($dir)){
+		if (is_array($dir) && !empty($dir)) {
 			$return = [];
 
-			foreach($dir as $file){
+			foreach ($dir as $file) {
 				$path = $this->cachedir.DIRECTORY_SEPARATOR.$file;
 
-				if(is_file($path) && strlen($file) === 64){
+				if (is_file($path) && strlen($file) === 64) {
 					$return[] = unlink($path);
 				}
 

src/Drivers/RedisDriver.php

Spacing +7 added lines, -7 removed lines

@@ -15,7 +15,7 @@ 
 use chillerlan\Traits\ImmutableSettingsInterface;
 use Redis;
 
-class RedisDriver extends CacheDriverAbstract{
+class RedisDriver extends CacheDriverAbstract {
 
 	/**
 	 * @var \Redis
@@ -28,14 +28,14 @@ 
 	 * @param \Redis                                             $redis
 	 * @param \chillerlan\Traits\ImmutableSettingsInterface|null $options
 	 */
-	public function __construct(Redis $redis, ImmutableSettingsInterface $options = null){
+	public function __construct(Redis $redis, ImmutableSettingsInterface $options = null) {
 		parent::__construct($options);
 
 		$this->redis = $redis;
 	}
 
 	/** @inheritdoc */
-	public function get(string $key, $default = null){
+	public function get(string $key, $default = null) {
 		$value = $this->redis->get($key);
 
 		return $value ? $value : $default;
@@ -44,7 +44,7 @@ 
 	/** @inheritdoc */
 	public function set(string $key, $value, int $ttl = null):bool{
 
-		if($ttl === null){
+		if ($ttl === null) {
 			return $this->redis->set($key, $value);
 		}
 
@@ -68,7 +68,7 @@ 
 
 		$return = [];
 
-		foreach($keys as $key){
+		foreach ($keys as $key) {
 			$return[$key] = $values[$key] !== false ? $values[$key] : $default;
 		}
 
@@ -78,13 +78,13 @@ 
 	/** @inheritdoc */
 	public function setMultiple(array $values, int $ttl = null):bool{
 
-		if($ttl === null){
+		if ($ttl === null) {
 			return $this->redis->msetnx($values);
 		}
 
 		$return = [];
 
-		foreach($values as $key => $value){
+		foreach ($values as $key => $value) {
 			$return[] = $this->set($key, $value, $ttl);
 		}
 

src/Drivers/CacheDriverAbstract.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 	 *
 	 * @param \chillerlan\Traits\ImmutableSettingsInterface|null $options
 	 */
-	public function __construct(ImmutableSettingsInterface $options = null){
+	public function __construct(ImmutableSettingsInterface $options = null) {
 		$this->options = $options ?? new CacheOptions;
 		$this->logger  = new NullLogger; // logger will be set from the Cache instance
 	}
@@ -43,7 +43,7 @@ 
 	public function getMultiple(array $keys, $default = null):array{
 		$data = [];
 
-		foreach($keys as $key){
+		foreach ($keys as $key) {
 			$data[$key] = $this->get($key, $default);
 		}
 
@@ -54,7 +54,7 @@ 
 	public function setMultiple(array $values, int $ttl = null):bool{
 		$return = [];
 
-		foreach($values as $key => $value){
+		foreach ($values as $key => $value) {
 			$return[] = $this->set($key, $value, $ttl);
 		}
 
@@ -65,7 +65,7 @@ 
 	public function deleteMultiple(array $keys):bool{
 		$return = [];
 
-		foreach($keys as $key){
+		foreach ($keys as $key) {
 			$return[] = $this->delete($key);
 		}
 
@@ -79,9 +79,9 @@ 
 	 */
 	protected function checkReturn(array $booleans):bool{
 
-		foreach($booleans as $bool){
+		foreach ($booleans as $bool) {
 
-			if(!(bool)$bool){
+			if (!(bool)$bool) {
 				return false; // @codeCoverageIgnore
 			}
 

src/Drivers/SessionCacheDriver.php

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
 use chillerlan\SimpleCache\CacheException;
 use chillerlan\Traits\ImmutableSettingsInterface;
 
-class SessionCacheDriver extends CacheDriverAbstract{
+class SessionCacheDriver extends CacheDriverAbstract {
 
 	/**
 	 * @var string
@@ -29,12 +29,12 @@ 
 	 *
 	 * @throws \chillerlan\SimpleCache\CacheException
 	 */
-	public function __construct(ImmutableSettingsInterface $options = null){
+	public function __construct(ImmutableSettingsInterface $options = null) {
 		parent::__construct($options);
 
 		$this->key = $this->options->cachekey;
 
-		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);
@@ -46,11 +46,11 @@ 
 	}
 
 	/** @inheritdoc */
-	public function get(string $key, $default = null){
+	public function get(string $key, $default = null) {
 
-		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/Drivers/MemcachedDriver.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
 use chillerlan\Traits\ImmutableSettingsInterface;
 use Memcached;
 
-class MemcachedDriver extends CacheDriverAbstract{
+class MemcachedDriver extends CacheDriverAbstract {
 
 	/**
 	 * @var \Memcached
@@ -31,12 +31,12 @@ 
 	 *
 	 * @throws \chillerlan\SimpleCache\CacheException
 	 */
-	public function __construct(Memcached $memcached, ImmutableSettingsInterface $options = null){
+	public function __construct(Memcached $memcached, ImmutableSettingsInterface $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);
@@ -46,7 +46,7 @@ 
 	}
 
 	/** @inheritdoc */
-	public function get(string $key, $default = null){
+	public function get(string $key, $default = null) {
 		$value = $this->memcached->get($key);
 
 		return $value ?: $default;
@@ -72,7 +72,7 @@ 
 		$values = $this->memcached->getMulti($keys);
 		$return = [];
 
-		foreach($keys as $key){
+		foreach ($keys as $key) {
 			$return[$key] = $values[$key] ?? $default;
 		}
 

src/Drivers/CacheDriverInterface.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 /**
  * @method setLogger(\Psr\Log\LoggerInterface $logger)
  */
-interface CacheDriverInterface{
+interface CacheDriverInterface {
 
 	/**
 	 * @param string     $key

src/CacheException.php

Spacing +1 added lines, -1 removed lines

@@ -12,4 +12,4 @@
 
 namespace chillerlan\SimpleCache;
 
-class CacheException extends \Exception implements \Psr\SimpleCache\CacheException{}
+class CacheException extends \Exception implements \Psr\SimpleCache\CacheException {}

src/Cache.php

Spacing +11 added lines, -11 removed lines

@@ -37,7 +37,7 @@ 
 	 * @param \chillerlan\SimpleCache\Drivers\CacheDriverInterface $cacheDriver
 	 * @param \Psr\Log\LoggerInterface                             $logger
 	 */
-	public function __construct(CacheDriverInterface $cacheDriver, LoggerInterface $logger = null){
+	public function __construct(CacheDriverInterface $cacheDriver, LoggerInterface $logger = null) {
 		$this->cacheDriver = $cacheDriver;
 		$this->setLogger($logger ?? new NullLogger);
 	}
@@ -55,7 +55,7 @@ 
 	}
 
 	/** @inheritdoc */
-	public function get($key, $default = null){
+	public function get($key, $default = null) {
 		$this->checkKey($key);
 
 		return $this->cacheDriver->get($key, $default);
@@ -92,7 +92,7 @@ 
 	public function setMultiple($values, $ttl = null):bool{
 		$values = $this->getData($values);
 
-		foreach($values as $key => $value){
+		foreach ($values as $key => $value) {
 			$this->checkKey($key);
 		}
 
@@ -122,7 +122,7 @@ 
 	 */
 	protected function checkKey($key):void{
 
-		if(!is_string($key) || empty($key)){
+		if (!is_string($key) || empty($key)) {
 			$msg = 'invalid cache key: "'.$key.'"';
 			$this->logger->error($msg);
 
@@ -138,7 +138,7 @@ 
 	 */
 	protected function checkKeyArray(array $keys):void{
 
-		foreach($keys as $key){
+		foreach ($keys as $key) {
 			$this->checkKey($key);
 		}
 
@@ -152,10 +152,10 @@ 
 	 */
 	protected function getData($data):array{
 
-		if($data instanceof Traversable){
+		if ($data instanceof Traversable) {
 			return iterator_to_array($data); // @codeCoverageIgnore
 		}
-		else if(is_array($data)){
+		else if (is_array($data)) {
 			return $data;
 		}
 
@@ -171,12 +171,12 @@ 
 	 * @return int|null
 	 * @throws \chillerlan\SimpleCache\InvalidArgumentException
 	 */
-	protected function getTTL($ttl):?int{
+	protected function getTTL($ttl): ?int{
 
-		if($ttl instanceof DateInterval){
+		if ($ttl instanceof DateInterval) {
 			return (new DateTime('now'))->add($ttl)->getTimeStamp() - time();
 		}
-		else if(is_int($ttl) || $ttl === null){
+		else if (is_int($ttl) || $ttl === null) {
 			return $ttl;
 		}
 
@@ -191,7 +191,7 @@ 
 	 *
 	 * @throws \chillerlan\SimpleCache\CacheException
 	 */
-	protected function throwException(string $message){
+	protected function throwException(string $message) {
 		$this->logger->error($message);
 
 		throw new InvalidArgumentException($message);

Braces +2 added lines, -4 removed lines

@@ -154,8 +154,7 @@ 
 
 		if($data instanceof Traversable){
 			return iterator_to_array($data); // @codeCoverageIgnore
-		}
-		else if(is_array($data)){
+		} else if(is_array($data)){
 			return $data;
 		}
 
@@ -175,8 +174,7 @@ 
 
 		if($ttl instanceof DateInterval){
 			return (new DateTime('now'))->add($ttl)->getTimeStamp() - time();
-		}
-		else if(is_int($ttl) || $ttl === null){
+		} else if(is_int($ttl) || $ttl === null){
 			return $ttl;
 		}