Fix #116 issue about Laravel cache duration in minutes or seconds

Kevinrob · Jan 8, 2020 · 3a1bb0c · GrahamCampbell · Jan 10, 2020 · GrahamCampbell
1 parent 7a64679
commit 3a1bb0c
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/Storage/LaravelCacheStorage.php b/src/Storage/LaravelCacheStorage.php
@@ -43,8 +43,7 @@ public function fetch($key)
     public function save($key, CacheEntry $data)
     {
         try {
-            // getTTL returns seconds, Laravel needs minutes
-            $lifeTime = $data->getTTL() / 60;
+            $lifeTime = $this->getLifeTime($data);
             if ($lifeTime === 0) {
                 return $this->cache->forever(
                     $key,
@@ -71,4 +70,15 @@ public function delete($key)
     {
         return $this->cache->forget($key);
     }
+
+    protected function getLifeTime(CacheEntry $data)
+    {
+        $version = app()->version();
+        if (preg_match('/^\d+(\.\d+)?(\.\d+)?/', $version) && version_compare($version, '5.8.0') < 0) {
+            // getTTL returns seconds, Laravel needs minutes before v5.8
+            return $data->getTTL() / 60;
+        }
+
+        return $data->getTTL();
+    }
 }