evict stale class metadata from cache

stof · May 7, 2011 · 2350020 · 2350020
1 parent 1139730
commit 2350020
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/Metadata/MetadataFactory.php b/src/Metadata/MetadataFactory.php
@@ -58,11 +58,14 @@ public function getMetadataForClass($className)
 
             // check the cache
             if (null !== $this->cache
-                && (null !== $classMetadata = $this->cache->loadClassMetadataFromCache($class))
-                && (!$this->debug || $classMetadata->isFresh())) {
-                $this->loadedClassMetadata[$name] = $classMetadata;
-                $metadata->addClassMetadata($classMetadata);
-                continue;
+                && (null !== $classMetadata = $this->cache->loadClassMetadataFromCache($class))) {
+                if ($this->debug && !$classMetadata->isFresh()) {
+                    $this->cache->evictClassMetadataFromCache($classMetadata->reflection);
+                } else {
+                    $this->loadedClassMetadata[$name] = $classMetadata;
+                    $metadata->addClassMetadata($classMetadata);
+                    continue;
+                }
             }
 
             // load from source