Added MediaTrait::getMediaCache() to allow custom caching

getgrav · Jul 20, 2018 · 6b5849b · 6b5849b
1 parent ba0a8c4
commit 6b5849b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
     * Added twig filters for casting values: `|string`, `|int`, `|bool`, `|float`, `|array`
 1. [](#improved)
     * Added `MediaTrait::clearMediaCache()` to allow cache to be cleared
+    * Added `MediaTrait::getMediaCache()` to allow custom caching
 1. [](#bugfix)
     * Made `|markdown` filter HTML safe
 

diff --git a/system/src/Grav/Common/Media/Traits/MediaTrait.php b/system/src/Grav/Common/Media/Traits/MediaTrait.php
@@ -55,8 +55,7 @@ public function getMediaUri()
      */
     public function getMedia()
     {
-        /** @var Cache $cache */
-        $cache = Grav::instance()['cache'];
+        $cache = $this->getMediaCache();
 
         if ($this->media === null) {
             // Use cached media if possible.
@@ -79,8 +78,7 @@ public function getMedia()
      */
     protected function setMedia(MediaCollectionInterface $media)
     {
-         /** @var Cache $cache */
-        $cache = Grav::instance()['cache'];
+        $cache = $this->getMediaCache();
         $cacheKey = md5('media' . $this->getCacheKey());
         $cache->save($cacheKey, $media);
 
@@ -94,13 +92,19 @@ protected function setMedia(MediaCollectionInterface $media)
      */
     protected function clearMediaCache()
     {
-        /** @var Cache $cache */
-        $cache = Grav::instance()['cache'];
-
+        $cache = $this->getMediaCache();
         $cacheKey = md5('media' . $this->getCacheKey());
         $cache->delete($cacheKey);
     }
 
+    /**
+     * @return Cache
+     */
+    protected function getMediaCache()
+    {
+        return Grav::instance()['cache'];
+    }
+
     /**
      * @return string
      */