Merge pull request #561 from Geolim4/final

 Fixed #560

Author: Geolim4

src/phpFastCache/Core/Item/ItemExtendedTrait.php

@@ -166,12 +166,7 @@ public function setModificationDate(\DateTimeInterface $date)
      */
     public function getTtl()
     {
-        $ttl = $this->expirationDate->getTimestamp() - time();
-        if ($ttl > 2592000) {
-            $ttl = time() + $ttl;
-        }
-
-        return $ttl;
+        return max(0, $this->expirationDate->getTimestamp() - time());
     }
 
     /**

src/phpFastCache/Drivers/Memcache/Driver.php

@@ -78,7 +78,15 @@ protected function driverWrite(CacheItemInterface $item)
          * Check for Cross-Driver type confusion
          */
         if ($item instanceof Item) {
-            return $this->instance->set($item->getKey(), $this->driverPreWrap($item), $this->memcacheFlags, $item->getTtl());
+            $ttl = $item->getExpirationDate()->getTimestamp() - time();
+
+            // Memcache will only allow a expiration timer less than 2592000 seconds,
+            // otherwise, it will assume you're giving it a UNIX timestamp.
+            if ($ttl > 2592000) {
+                $ttl = time() + $ttl;
+            }
+
+            return $this->instance->set($item->getKey(), $this->driverPreWrap($item), $this->memcacheFlags, $ttl);
         } else {
             throw new phpFastCacheInvalidArgumentException('Cross-Driver type confusion detected');
         }

src/phpFastCache/Drivers/Sqlite/Driver.php

@@ -27,6 +27,7 @@
 /**
  * Class Driver
  * @package phpFastCache\Drivers
+ * @todo Remove "exp" column in V7
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
@@ -267,25 +268,25 @@ protected function driverWrite(CacheItemInterface $item)
             }
 
             if ($toWrite == true) {
+                $sql = "INSERT OR REPLACE INTO `caching` (`keyword`,`object`,`exp`) values(:keyword,:object,:exp)";
                 try {
                     $stm = $this->getDb($item->getKey())
-                      ->prepare("INSERT OR REPLACE INTO `caching` (`keyword`,`object`,`exp`) values(:keyword,:object,:exp)");
+                      ->prepare($sql);
                     $stm->execute([
                       ':keyword' => $item->getKey(),
                       ':object' => $this->encode($this->driverPreWrap($item)),
-                      ':exp' => time() + $item->getTtl(),
+                      ':exp' => $item->getExpirationDate()->getTimestamp(),
                     ]);
 
                     return true;
                 } catch (\PDOException $e) {
-
                     try {
                         $stm = $this->getDb($item->getKey(), true)
-                          ->prepare("INSERT OR REPLACE INTO `caching` (`keyword`,`object`,`exp`) values(:keyword,:object,:exp)");
+                          ->prepare($sql);
                         $stm->execute([
                           ':keyword' => $item->getKey(),
                           ':object' => $this->encode($this->driverPreWrap($item)),
-                          ':exp' => time() + $item->getTtl(),
+                          ':exp' => $item->getExpirationDate()->getTimestamp(),
                         ]);
                     } catch (PDOException $e) {
                         return false;
@@ -305,18 +306,18 @@ protected function driverWrite(CacheItemInterface $item)
      */
     protected function driverRead(CacheItemInterface $item)
     {
+        $sql = "SELECT * FROM `caching` WHERE `keyword`=:keyword LIMIT 1";
         try {
             $stm = $this->getDb($item->getKey())
-              ->prepare("SELECT * FROM `caching` WHERE `keyword`=:keyword LIMIT 1");
+              ->prepare($sql);
             $stm->execute([
               ':keyword' => $item->getKey(),
             ]);
             $row = $stm->fetch(PDO::FETCH_ASSOC);
-
         } catch (PDOException $e) {
             try {
                 $stm = $this->getDb($item->getKey(), true)
-                  ->prepare("SELECT * FROM `caching` WHERE `keyword`=:keyword LIMIT 1");
+                  ->prepare($sql);
                 $stm->execute([
                   ':keyword' => $item->getKey(),
                 ]);

tests/issues/Github-560.test.php

@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @author Khoa Bui (khoaofgod)  <[email protected]> http://www.phpfastcache.com
+ * @author Georges.L (Geolim4)  <[email protected]>
+ */
+
+use phpFastCache\CacheManager;
+use phpFastCache\Helper\TestHelper;
+
+
+chdir(__DIR__);
+require_once __DIR__ . '/../../src/autoload.php';
+$testHelper = new TestHelper('Github issue #560 - Expiration date bug with sqlite driver');
+$defaultTTl = 60 * 60 * 24 * 31;
+$cacheInstance = CacheManager::getInstance('Sqlite', [
+  'defaultTtl' => $defaultTTl
+]);
+/**
+ * Clear the cache to avoid
+ * unexpected results
+ */
+$cacheInstance->clear();
+
+$cacheKey = uniqid('ck', true);
+$string = uniqid('pfc', true);
+$testHelper->printText('Preparing test item...');
+
+/**
+ * Setup the cache item
+ */
+$cacheItem = $cacheInstance->getItem($cacheKey);
+$cacheItem->set($string);
+$cacheInstance->save($cacheItem);
+$now = time();
+
+/**
+ * Delete memory references
+ * to be sure that the values
+ * come from the cache itself
+ */
+unset($cacheItem);
+$cacheInstance->detachAllItems();
+$cacheItem = $cacheInstance->getItem($cacheKey);
+
+if($cacheItem->getTtl() === $defaultTTl){
+    $testHelper->printPassText('The cache Item TTL matches the default TTL after 30 days.');
+}else{
+    $testHelper->printFailText('The cache Item TTL des not matches the default TTL after 30 days, got the following value: ' . $cacheItem->getTtl());
+}
+
+$testHelper->terminateTest();