Merge pull request #124 from ingatlancom/sfMemcacheCache

sfMemcacheCache fix

Author: j0k3r

.travis.yml

@@ -19,6 +19,9 @@ matrix:
 # faster builds on new travis setup not using sudo
 sudo: false
 
+services:
+    - memcached
+
 # cache vendor dirs
 cache:
     directories:
@@ -30,6 +33,7 @@ install:
 
 before_script:
     - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
+    - sh -c 'if [ $(php -r "echo PHP_RELEASE_VERSION;") -le 98 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
     - composer install
 
 script:

data/bin/check_configuration.php

@@ -97,6 +97,8 @@ function_exists('xcache_set')
 check(!ini_get('register_globals'), 'php.ini has register_globals set to off', 'Set it to off in php.ini', false);
 check(!ini_get('session.auto_start'), 'php.ini has session.auto_start set to off', 'Set it to off in php.ini', false);
 
+check(class_exists('Memcache'), 'Memcache is available', 'You must have memcache installed and enabled to use sfMemcacheCache class.', false);
+
 if (!is_cli())
 {
   echo '</pre></body></html>';

lib/cache/sfMemcacheCache.class.php

@@ -92,15 +92,21 @@ public function get($key, $default = null)
   {
     $value = $this->memcache->get($this->getOption('prefix').$key);
 
-    return false === $value ? $default : $value;
+    return (false === $value && false === $this->getMetadata($key)) ? $default : $value;
   }
 
   /**
    * @see sfCache
    */
   public function has($key)
   {
-    return !(false === $this->memcache->get($this->getOption('prefix').$key));
+    if (false === $this->memcache->get($this->getOption('prefix') . $key))
+    {
+      // if there is metadata, $key exists with a false value
+      return !(false === $this->getMetadata($key));
+    }
+
+    return true;
   }
 
   /**
@@ -232,7 +238,7 @@ protected function getMetadata($key)
    */
   protected function setMetadata($key, $lifetime)
   {
-    $this->memcache->set($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key, array('lastModified' => time(), 'timeout' => time() + $lifetime), false, $lifetime);
+    $this->memcache->set($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key, array('lastModified' => time(), 'timeout' => time() + $lifetime), false, time() + $lifetime);
   }
 
   /**