Use '/' for slash. This breaks full-psr6 compliance but allows to hav…

…e hierarchical cache.
locomotivemtl · Feb 15, 2017 · 237b26d · 237b26d
1 parent e140e67
commit 237b26d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/Charcoal/Model/Service/MetadataLoader.php b/src/Charcoal/Model/Service/MetadataLoader.php
@@ -271,7 +271,7 @@ public function load($ident, MetadataInterface $metadata, array $interfaces = nu
             $interfaces = null;
         }
 
-        $cacheKey  = str_replace('/', '.', 'metadata/object/'.$ident);
+        $cacheKey  = 'metadata/'.str_replace('/', '.', $ident);
         $cacheItem = $this->cachePool()->getItem($cacheKey);
 
         if (!$cacheItem->isHit()) {

diff --git a/src/Charcoal/Model/Service/ModelLoader.php b/src/Charcoal/Model/Service/ModelLoader.php
@@ -165,13 +165,12 @@ public function load($ident, $useCache = true)
             // Do not use cache;
             return $this->loadFromSource($ident);
         }
-        $cacheKey = str_replace('/', '.', 'model/loader/'.$this->objType.'/'.$ident);
+        $cacheKey = 'objects/'.str_replace('/', '.', $this->objType.'.'.$ident);
         $cacheItem = $this->cachePool->getItem($cacheKey);
 
         $obj = $cacheItem->get();
         if (!$cacheItem->isHit()) {
             $obj = $this->loadFromSource($ident);
-
             $this->cachePool->save($cacheItem->set($obj));
         }
         return $obj;