Implemented passing a key suffix to CacheKey.

Author: sjbronner

src/CachedBuilder.php

@@ -17,9 +17,12 @@ public function avg($column)
         }
 
         return $this->cache($this->makeCacheTags())
-            ->rememberForever($this->makeCacheKey() . "-avg_{$column}", function () use ($column) {
-                return parent::avg($column);
-            });
+            ->rememberForever(
+                $this->makeCacheKey(['*'], null, "-avg_{$column}"),
+                function () use ($column) {
+                    return parent::avg($column);
+                }
+            );
     }
 
     public function count($columns = ['*'])
@@ -29,9 +32,12 @@ public function count($columns = ['*'])
         }
 
         return $this->cache($this->makeCacheTags())
-            ->rememberForever($this->makeCacheKey() . "-count", function () use ($columns) {
-                return parent::count($columns);
-            });
+            ->rememberForever(
+                $this->makeCacheKey(['*'], null, "-count"),
+                function () use ($columns) {
+                    return parent::count($columns);
+                }
+            );
     }
 
     public function cursor()
@@ -41,9 +47,12 @@ public function cursor()
         }
 
         return $this->cache($this->makeCacheTags())
-            ->rememberForever($this->makeCacheKey() . "-cursor", function () {
-                return collect(parent::cursor());
-            });
+            ->rememberForever(
+                $this->makeCacheKey(['*'], null, "-cursor"),
+                function () {
+                    return collect(parent::cursor());
+                }
+            );
     }
 
     public function delete()
@@ -64,9 +73,12 @@ public function find($id, $columns = ['*'])
         }
 
         return $this->cache($this->makeCacheTags())
-            ->rememberForever($this->makeCacheKey($columns, $id), function () use ($id, $columns) {
-                return parent::find($id, $columns);
-            });
+            ->rememberForever(
+                $this->makeCacheKey($columns, $id),
+                function () use ($id, $columns) {
+                    return parent::find($id, $columns);
+                }
+            );
     }
 
     public function first($columns = ['*'])
@@ -76,9 +88,12 @@ public function first($columns = ['*'])
         }
 
         return $this->cache($this->makeCacheTags())
-            ->rememberForever($this->makeCacheKey($columns) . '-first', function () use ($columns) {
-                return parent::first($columns);
-            });
+            ->rememberForever(
+                $this->makeCacheKey($columns, null, '-first'),
+                function () use ($columns) {
+                    return parent::first($columns);
+                }
+            );
     }
 
     public function get($columns = ['*'])
@@ -88,9 +103,12 @@ public function get($columns = ['*'])
         }
 
         return $this->cache($this->makeCacheTags())
-            ->rememberForever($this->makeCacheKey($columns), function () use ($columns) {
-                return parent::get($columns);
-            });
+            ->rememberForever(
+                $this->makeCacheKey($columns),
+                function () use ($columns) {
+                    return parent::get($columns);
+                }
+            );
     }
 
     public function max($column)
@@ -100,9 +118,12 @@ public function max($column)
         }
 
         return $this->cache($this->makeCacheTags())
-            ->rememberForever($this->makeCacheKey() . "-max_{$column}", function () use ($column) {
-                return parent::max($column);
-            });
+            ->rememberForever(
+                $this->makeCacheKey(['*'], null, "-max_{$column}"),
+                function () use ($column) {
+                    return parent::max($column);
+                }
+            );
     }
 
     public function min($column)
@@ -112,9 +133,12 @@ public function min($column)
         }
 
         return $this->cache($this->makeCacheTags())
-            ->rememberForever($this->makeCacheKey() . "-min_{$column}", function () use ($column) {
-                return parent::min($column);
-            });
+            ->rememberForever(
+                $this->makeCacheKey(['*'], null, "-min_{$column}"),
+                function () use ($column) {
+                    return parent::min($column);
+                }
+            );
     }
 
     public function pluck($column, $key = null)
@@ -123,7 +147,7 @@ public function pluck($column, $key = null)
             return parent::pluck($column, $key);
         }
 
-        $cacheKey = $this->makeCacheKey([$column]) . "-pluck_{$column}";
+        $cacheKey = $this->makeCacheKey([$column], null, "-pluck_{$column}");
 
         if ($key) {
             $cacheKey .= "_{$key}";
@@ -142,9 +166,12 @@ public function sum($column)
         }
 
         return $this->cache($this->makeCacheTags())
-            ->rememberForever($this->makeCacheKey() . "-sum_{$column}", function () use ($column) {
-                return parent::sum($column);
-            });
+            ->rememberForever(
+                $this->makeCacheKey(['*'], null, "-sum_{$column}"),
+                function () use ($column) {
+                    return parent::sum($column);
+                }
+            );
     }
 
     public function value($column)
@@ -154,8 +181,11 @@ public function value($column)
         }
 
         return $this->cache($this->makeCacheTags())
-            ->rememberForever($this->makeCacheKey() . "-value_{$column}", function () use ($column) {
-                return parent::value($column);
-            });
+            ->rememberForever(
+                $this->makeCacheKey(['*'], null, "-value_{$column}"),
+                function () use ($column) {
+                    return parent::value($column);
+                }
+            );
     }
 }

src/Traits/Cachable.php

@@ -41,13 +41,13 @@ public function flushCache(array $tags = [])
         $this->cache($tags)->flush();
     }
 
-    protected function makeCacheKey(array $columns = ['*'], $idColumn = null) : string
-    {
-        $cacheKey = (new CacheKey($this->eagerLoad, $this->model, $this->query));
-        if ($suffix) {
-            $cacheKey->setSuffix($suffix);
-        }
-        return $cacheKey->make($columns, $idColumn, $suffix);
+    protected function makeCacheKey(
+        array $columns = ['*'],
+        $idColumn = null,
+        string $suffix = ''
+    ) : string {
+        return (new CacheKey($this->eagerLoad, $this->model, $this->query))
+            ->make($columns, $idColumn, $suffix);
     }
 
     protected function makeCacheTags() : array