修正cache

top-think · Jul 19, 2019 · f6501b9 · f6501b9
1 parent d35ba14
commit f6501b9
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/CachedReader.php b/src/CachedReader.php
@@ -5,7 +5,7 @@
 use Doctrine\Common\Annotations\Reader;
 use ReflectionClass;
 use think\App;
-use think\Cache;
+use think\cache\Driver;
 
 class CachedReader implements Reader
 {
@@ -20,7 +20,7 @@ class CachedReader implements Reader
     private $loadedAnnotations = [];
 
     /**
-     * @var Cache
+     * @var Driver
      */
     private $cache;
 
@@ -146,10 +146,8 @@ public function clearLoadedAnnotations()
 
     private function fetchFromCache($cacheKey, ReflectionClass $class)
     {
-        if (($data = $this->cache->get($cacheKey)) !== false) {
-            if (!$this->debug || $this->isCacheFresh($cacheKey, $class)) {
-                return $data;
-            }
+        if ((!$this->debug || $this->isCacheFresh($cacheKey, $class)) && $this->cache->has($cacheKey)) {
+            return $this->cache->get($cacheKey, false);
         }
 
         return false;