Merge pull request #98 from doctrine/enhancement/#65-remove-cache-sal…

…t-from-cached-reader Enhancement/#65 remove cache salt from cached reader
doctrine · Oct 24, 2016 · dc44263 · dc44263
2 parents fd51a7c + d0b24b6
commit dc44263
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/lib/Doctrine/Common/Annotations/CachedReader.php b/lib/Doctrine/Common/Annotations/CachedReader.php
@@ -30,11 +30,6 @@
  */
 final class CachedReader implements Reader
 {
-    /**
-     * @var string
-     */
-    private static $CACHE_SALT = '@[Annot]';
-
     /**
      * @var Reader
      */
@@ -183,14 +178,13 @@ public function clearLoadedAnnotations()
     /**
      * Fetches a value from the cache.
      *
-     * @param string           $rawCacheKey The cache key.
-     * @param ReflectionClass $class       The related class.
+     * @param string          $cacheKey The cache key.
+     * @param ReflectionClass $class    The related class.
      *
      * @return mixed The cached value or false when the value is not in cache.
      */
-    private function fetchFromCache($rawCacheKey, ReflectionClass $class)
+    private function fetchFromCache($cacheKey, ReflectionClass $class)
     {
-        $cacheKey = $rawCacheKey . self::$CACHE_SALT;
         if (($data = $this->cache->fetch($cacheKey)) !== false) {
             if (!$this->debug || $this->isCacheFresh($cacheKey, $class)) {
                 return $data;
@@ -203,14 +197,13 @@ private function fetchFromCache($rawCacheKey, ReflectionClass $class)
     /**
      * Saves a value to the cache.
      *
-     * @param string $rawCacheKey The cache key.
-     * @param mixed  $value       The value.
+     * @param string $cacheKey The cache key.
+     * @param mixed  $value    The value.
      *
      * @return void
      */
-    private function saveToCache($rawCacheKey, $value)
+    private function saveToCache($cacheKey, $value)
     {
-        $cacheKey = $rawCacheKey . self::$CACHE_SALT;
         $this->cache->save($cacheKey, $value);
         if ($this->debug) {
             $this->cache->save('[C]'.$cacheKey, time());

diff --git a/tests/Doctrine/Tests/Common/Annotations/CachedReaderTest.php b/tests/Doctrine/Tests/Common/Annotations/CachedReaderTest.php
@@ -77,7 +77,7 @@ public function testIgnoresStaleCacheWithInterfacesThatExtendOtherInterfaces()
 
     protected function doTestCacheStale($className, $lastCacheModification)
     {
-        $cacheKey = $className.'@[Annot]';
+        $cacheKey = $className;
 
         $cache = $this->createMock('Doctrine\Common\Cache\Cache');
         $cache
@@ -115,4 +115,4 @@ protected function getReader()
         $this->cache = new ArrayCache();
         return new CachedReader(new AnnotationReader(), $this->cache);
     }
-}
+}