Small updates, CS cleaning (#11)

- FileClient creates now 1-level subdirectories (down from 2)
- improves the error handling in Redis/Json clients
- uses psr-4 for autoloading
- upgraded phpunit version
- updates some unit tests
- CS cleanup

Author: kodeart

Cache.php

@@ -13,7 +13,7 @@
 namespace Koded\Caching;
 
 use Koded\Stdlib\Interfaces\StringSerializable;
-use Psr\SimpleCache\{ CacheInterface, InvalidArgumentException };
+use Psr\SimpleCache\{CacheInterface, InvalidArgumentException};
 
 interface Cache
 {

CacheException.php

@@ -36,7 +36,7 @@ public static function forUnsupportedLogger(string $supported, string $given)
     {
         return new self(Cache::E_UNSUPPORTED_LOGGER, [':supported' => $supported, ':given' => $given]);
     }
-    
+
     public static function forCreatingDirectory(string $directory)
     {
         return new static(Cache::E_DIRECTORY_NOT_CREATED, [':dir' => $directory]);

Client/FileClient.php

@@ -50,7 +50,7 @@ public function get($key, $default = null)
     {
         $filename = $this->filename($key, false);
 
-        if (!is_file($filename)) {
+        if (false === is_file($filename)) {
             return $default;
         }
 
@@ -100,8 +100,8 @@ public function clear()
             $this->logger->error($e->getMessage());
 
             return false;
+            // @codeCoverageIgnoreEnd
         }
-        // @codeCoverageIgnoreEnd
     }
 
     public function deleteMultiple($keys)
@@ -133,7 +133,7 @@ private function initialize(string $directory)
         $dir = $directory ?: sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'cache';
         $dir = rtrim($dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
-        if (!is_dir($dir) && false === mkdir($dir, 0775, true)) {
+        if (false === is_dir($dir) && false === mkdir($dir, 0775, true)) {
             $e = FileCacheClientException::forCreatingDirectory($dir);
             $this->logger->error($e->getMessage());
             throw $e;
@@ -153,13 +153,13 @@ private function initialize(string $directory)
     private function filename(string $key, bool $create = true): string
     {
         $filename = sha1($key);
-        $dir = $this->dir . substr($filename, 0, 2);
+        $dir = $this->dir . substr($filename, 0, 1);
 
-        if ($create && !is_dir($dir)) {
-            mkdir($dir, 0775, true);
+        if ($create && false === is_dir($dir)) {
+            mkdir($dir, 0775, true) || $this->logger->error('Failed to create cache directory: {dir}', ['dir' => $dir]);
         }
 
-        $filename = $dir . DIRECTORY_SEPARATOR . substr($filename, 2) . '.php';
+        $filename = $dir . DIRECTORY_SEPARATOR . substr($filename, 1) . '.php';
 
         if ($create && !is_file($filename)) {
             touch($filename);

Client/PredisClient.php

@@ -13,7 +13,7 @@
 namespace Koded\Caching\Client;
 
 use Exception;
-use Koded\Caching\{ CacheException, CacheSerializer };
+use Koded\Caching\{CacheException, CacheSerializer};
 use Koded\Caching\Configuration\PredisConfiguration;
 use Koded\Caching\Serializer\PhpSerializer;
 use Predis\Client;

Client/RedisClient.php

@@ -15,8 +15,10 @@
 use Exception;
 use Koded\Caching\CacheException;
 use Koded\Caching\Configuration\RedisConfiguration;
+use function Koded\Stdlib\dump;
 use Psr\SimpleCache\CacheInterface;
 use Redis;
+use RedisException;
 
 /**
  * Class RedisClient uses the Redis PHP extension.
@@ -35,7 +37,9 @@ public function __construct(Redis $client, RedisConfiguration $config)
         try {
             // Because connect() does not throw exception, but E_WARNING
             if (false === @$this->client->connect(...$config->getConnectionParams())) {
+                // @codeCoverageIgnoreStart
                 throw CacheException::withConnectionErrorFor('Redis');
+                // @codeCoverageIgnoreEnd
             }
 
             $this->client->setOption(Redis::OPT_SERIALIZER, $config->getSerializerType());
@@ -45,6 +49,10 @@ public function __construct(Redis $client, RedisConfiguration $config)
             if ($auth = $config->get('auth')) {
                 $this->client->auth($auth);
             }
+
+        } catch (RedisException $e) {
+            error_log($e->getMessage());
+            throw CacheException::withConnectionErrorFor('Redis');
         } catch (CacheException $e) {
             throw $e;
         } catch (Exception $e) {

Client/RedisJsonClient.php

@@ -18,6 +18,7 @@
 use Koded\Caching\Serializer\{ JsonSerializer, PhpSerializer };
 use Psr\SimpleCache\CacheInterface;
 use Redis;
+use RedisException;
 
 /**
  * Class RedisJsonClient uses the Redis PHP extension to save the cache item as JSON.
@@ -62,7 +63,9 @@ public function __construct(
         try {
             // Because connect() does not throw exception, but E_WARNING
             if (false === @$this->client->connect(...$config->getConnectionParams())) {
+                // @codeCoverageIgnoreStart
                 throw CacheException::withConnectionErrorFor('Redis');
+                // @codeCoverageIgnoreEnd
             }
 
             $this->client->setOption(Redis::OPT_SERIALIZER, $config->getSerializerType());
@@ -72,8 +75,14 @@ public function __construct(
             if ($auth = $config->get('auth')) {
                 $this->client->auth($auth);
             }
+
+        } catch (RedisException $e) {
+            error_log($e->getMessage());
+            throw CacheException::withConnectionErrorFor('Redis');
         } catch (CacheException $e) {
+            // @codeCoverageIgnoreStart
             throw $e;
+            // @codeCoverageIgnoreEnd
         } catch (Exception $e) {
             throw CacheException::generic($e->getMessage(), $e);
         }

ClientFactory.php

@@ -12,10 +12,16 @@
 
 namespace Koded\Caching;
 
-use Koded\Caching\Client\{ FileClient, MemcachedClient, MemoryClient, NullClient, PredisClient, RedisClient, RedisJsonClient };
-use Koded\Caching\Serializer\{ JsonSerializer, PhpSerializer };
+use Koded\Caching\Client\{FileClient,
+    MemcachedClient,
+    MemoryClient,
+    NullClient,
+    PredisClient,
+    RedisClient,
+    RedisJsonClient};
+use Koded\Caching\Serializer\{JsonSerializer, PhpSerializer};
 use Koded\Stdlib\Interfaces\ConfigurationFactory;
-use Psr\Log\{ LoggerInterface, NullLogger };
+use Psr\Log\{LoggerInterface, NullLogger};
 use Psr\SimpleCache\CacheInterface;
 
 class ClientFactory

Configuration/ConfigFactory.php

@@ -12,12 +12,13 @@
 
 namespace Koded\Caching\Configuration;
 
-use Koded\Stdlib\{ Arguments, Config, Interfaces\Configuration };
+use Koded\Stdlib\{Arguments, Config};
+use Koded\Stdlib\Interfaces\Configuration;
 
 /**
  * Class ConfigFactory
  *
- * @property int $ttl Default Time-To-Live seconds for the cached items
+ * @property int    $ttl      Default Time-To-Live seconds for the cached items
  * @property string $keyRegex Regex for validating the cache item key
  *
  */

Configuration/PredisConfiguration.php

@@ -15,7 +15,7 @@
 use Koded\Stdlib\Immutable;
 use Koded\Stdlib\Interfaces\Configuration;
 
-final class PredisConfiguration  extends Immutable implements Configuration
+final class PredisConfiguration extends Immutable implements Configuration
 {
 
     public function getConnectionParams(): array

Configuration/RedisConfiguration.php

@@ -12,7 +12,7 @@
 
 namespace Koded\Caching\Configuration;
 
-use Koded\Caching\{ Cache, CacheException };
+use Koded\Caching\{Cache, CacheException};
 use Koded\Stdlib\Immutable;
 use Koded\Stdlib\Interfaces\Configuration;
 use Redis;