Fix various PHP compatibility issues and update dependencies to suppo…

…rted versions
rapidwebltd · Dec 15, 2018 · f44ed1f · f44ed1f
1 parent becae54
commit f44ed1f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 vendor/
 composer.lock
-cache/*.cache
+cache/*.cache
+.idea
diff --git a/composer.json b/composer.json
@@ -11,11 +11,11 @@
       ],
     "require": {
         "php": ">=5.3",
-        "rapidwebltd/rw-file-cache-psr-6": "^1.0"
+        "divineomega/do-file-cache-psr-6": "^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",
-        "satooshi/php-coveralls": "^2.0"
+        "php-coveralls/php-coveralls": "^2.1"
     },
     "autoload": {
         "psr-4": {

diff --git a/...bjects/CacheDrivers/RWFileCacheDriver.php → ...bjects/CacheDrivers/DOFileCacheDriver.php b/...bjects/CacheDrivers/RWFileCacheDriver.php → ...bjects/CacheDrivers/DOFileCacheDriver.php
@@ -2,23 +2,23 @@
 
 namespace RapidWeb\UkBankHolidays\Objects\CacheDrivers;
 
-use rapidweb\RWFileCachePSR6\CacheItemPool;
+use DivineOmega\DOFileCachePSR6\CacheItemPool;
 use RapidWeb\UkBankHolidays\Interfaces\CacheDriverInterface;
 
-class RWFileCacheDriver implements CacheDriverInterface
+class DOFileCacheDriver implements CacheDriverInterface
 {
-    const CACHE_EXPIRY_IN_SECONDS = 60 * 60 * 24 * 30; // 30 days
+    const CACHE_EXPIRY_IN_SECONDS = 2592000; // 30 days
 
     private $cache = null;
 
     public function __construct()
     {
         $this->cache = new CacheItemPool();
         $this->cache->changeConfig(
-            [
+            array(
                 'cacheDirectory'  => '/tmp/php-uk-bank-holidays-cache/',
                 'gzipCompression' => true,
-                ]
+                )
             );
     }
 

diff --git a/src/Objects/DataRetrievers/GovUkDataRetriever.php b/src/Objects/DataRetrievers/GovUkDataRetriever.php
@@ -7,7 +7,7 @@
 use RapidWeb\UkBankHolidays\Interfaces\CacheDriverInterface;
 use RapidWeb\UkBankHolidays\Interfaces\DataRetrieverInterface;
 use RapidWeb\UkBankHolidays\Objects\CacheDrivers\LaravelCacheDriver;
-use RapidWeb\UkBankHolidays\Objects\CacheDrivers\RWFileCacheDriver;
+use RapidWeb\UkBankHolidays\Objects\CacheDrivers\DOFileCacheDriver;
 use RapidWeb\UkBankHolidays\Objects\UkBankHoliday;
 
 class GovUkDataRetriever implements DataRetrieverInterface
@@ -26,7 +26,7 @@ private function setupCache()
         if (class_exists('Illuminate\Support\Facades\Cache')) {
             $this->setCacheDriver(new LaravelCacheDriver());
         } else {
-            $this->setCacheDriver(new RWFileCacheDriver());
+            $this->setCacheDriver(new DOFileCacheDriver());
         }
     }