Fix PSR-4 name issue #4

Author: byjg

.travis.yml

@@ -10,6 +10,7 @@ addons:
     - redis-container
 
 php:
+  - "7.4"
   - "7.3"
   - "7.2"
   - "7.1"

src/Exception/InvalidArgumentException.php

@@ -1,14 +1,8 @@
 <?php
-/**
- * User: jg
- * Date: 27/05/17
- * Time: 12:21
- */
 
-namespace ByJG\Cache;
+namespace ByJG\Cache\Exception;
 
-
-class InvalidArgumentException extends \Exception implements \Psr\Cache\InvalidArgumentException
+class InvalidArgumentException extends \Exception implements \Psr\Cache\InvalidArgumentException, \Psr\SimpleCache\InvalidArgumentException
 {
 
 }

src/Exception/StorageErrorException.php

@@ -0,0 +1,9 @@
+<?php
+
+
+namespace ByJG\Cache\Exception;
+
+class StorageErrorException extends \Exception
+{
+
+}

src/Psr16/BaseCacheEngine.php

@@ -3,7 +3,7 @@
 namespace ByJG\Cache\Psr16;
 
 use ByJG\Cache\CacheAvailabilityInterface;
-use ByJG\Cache\InvalidArgumentException;
+use ByJG\Cache\Exception\InvalidArgumentException;
 use Psr\SimpleCache\CacheInterface;
 
 abstract class BaseCacheEngine implements CacheInterface, CacheAvailabilityInterface
@@ -12,7 +12,6 @@ abstract class BaseCacheEngine implements CacheInterface, CacheAvailabilityInter
      * @param $keys
      * @param null $default
      * @return array|iterable
-     * @throws \ByJG\Cache\InvalidArgumentException
      * @throws \Psr\SimpleCache\InvalidArgumentException
      */
     public function getMultiple($keys, $default = null)
@@ -68,4 +67,4 @@ protected function addToNow($ttl)
 
         return null;
     }
-}
+}

src/Psr16/MemcachedEngine.php

@@ -2,6 +2,7 @@
 
 namespace ByJG\Cache\Psr16;
 
+use ByJG\Cache\Exception\StorageErrorException;
 use Memcached;
 use Psr\Log\NullLogger;
 
@@ -38,7 +39,7 @@ protected function fixKey($key) {
     }
 
     /**
-     * @throws \Exception
+     * @throws StorageErrorException
      */
     protected function lazyLoadMemCachedServers()
     {
@@ -50,7 +51,7 @@ protected function lazyLoadMemCachedServers()
 
                 $stats = $this->memCached->getStats();
                 if (!isset($stats[$server]) || $stats[$server]['pid'] === -1) {
-                    throw new \Exception("Memcached server $server is down");
+                    throw new StorageErrorException("Memcached server $server is down");
                 }
             }
         }
@@ -60,7 +61,7 @@ protected function lazyLoadMemCachedServers()
      * @param string $key The object KEY
      * @param int $default IGNORED IN MEMCACHED.
      * @return mixed Description
-     * @throws \Exception
+     * @throws StorageErrorException
      */
     public function get($key, $default = null)
     {
@@ -80,7 +81,7 @@ public function get($key, $default = null)
      * @param object $value The object to be cached
      * @param int $ttl The time to live in seconds of this objects
      * @return bool If the object is successfully posted
-     * @throws \Exception
+     * @throws StorageErrorException
      */
     public function set($key, $value, $ttl = null)
     {
@@ -98,7 +99,7 @@ public function set($key, $value, $ttl = null)
     /**
      * @param string $key
      * @return bool
-     * @throws \Exception
+     * @throws StorageErrorException
      */
     public function delete($key)
     {
@@ -117,14 +118,14 @@ public function isAvailable()
         try {
             $this->lazyLoadMemCachedServers();
             return true;
-        } catch (\Exception $ex) {
+        } catch (StorageErrorException $ex) {
             return false;
         }
     }
 
     /**
      * @return bool
-     * @throws \Exception
+     * @throws StorageErrorException
      */
     public function clear()
     {
@@ -136,7 +137,7 @@ public function clear()
     /**
      * @param string $key
      * @return bool
-     * @throws \Exception
+     * @throws StorageErrorException
      */
     public function has($key)
     {

src/Psr16/ShmopCacheEngine.php

@@ -2,7 +2,8 @@
 
 namespace ByJG\Cache\Psr16;
 
-use Psr\Cache\InvalidArgumentException;
+use ByJG\Cache\Exception\InvalidArgumentException;
+use ByJG\Cache\Exception\StorageErrorException;
 use Psr\Log\NullLogger;
 
 /**
@@ -125,6 +126,7 @@ protected function isValidAge($file)
      *                                     for it or let the driver take care of that.
      * @return bool True on success and false on failure.
      * @throws InvalidArgumentException
+     * @throws StorageErrorException
      */
     public function set($key, $value, $ttl = null)
     {
@@ -136,7 +138,7 @@ public function set($key, $value, $ttl = null)
         $size = strlen($serialized);
 
         if ($size > $this->getMaxSize()) {
-            throw new \ByJG\Cache\InvalidArgumentException('Object is greater than the max size allowed: ' . $this->getMaxSize());
+            throw new StorageErrorException('Object is greater than the max size allowed: ' . $this->getMaxSize());
         }
 
         $file = $this->getFilenameToken($key);
@@ -148,7 +150,7 @@ public function set($key, $value, $ttl = null)
             if (isset($lastError['message'])) {
                 $message = $lastError['message'];
             }
-            throw new \ByJG\Cache\InvalidArgumentException($message);
+            throw new StorageErrorException($message);
         }
 
         $shm_bytes_written = shmop_write($shm_id, $serialized, 0);

src/Psr6/CachePool.php

@@ -2,10 +2,10 @@
 
 namespace ByJG\Cache\Psr6;
 
+use ByJG\Cache\Exception\InvalidArgumentException;
 use ByJG\Cache\Psr16\BaseCacheEngine;
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
-use Psr\Log\InvalidArgumentException;
 
 class CachePool implements CacheItemPoolInterface
 {
@@ -204,7 +204,6 @@ public function deleteItems(array $keys)
      * @param CacheItemInterface $item
      * @return bool
      * @throws \Psr\SimpleCache\InvalidArgumentException
-     * @throws \Psr\SimpleCache\InvalidArgumentException
      */
     public function save(CacheItemInterface $item)
     {