Merge pull request #214 from cluebattery/master

mikebronner · web-flow · commit 7b3a4f8ad2d4 · 2019-02-28T17:35:43.000-08:00
Laravel may return either an object or a collection. If laravel-model…
diff --git a/src/CachedBuilder.php b/src/CachedBuilder.php
@@ -61,7 +61,8 @@ public function find($id, $columns = ["*"])
         }
 
         $idKey = collect($id)->implode('-');
-        $cacheKey = $this->makeCacheKey($columns, null, "-find_{$idKey}");
+        $preStr = is_array($id) ? 'find-list' : 'find';
+        $cacheKey = $this->makeCacheKey($columns, null, "-" . $preStr . "_{$idKey}");
 
         return $this->cachedValue(func_get_args(), $cacheKey);
     }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@ public function find($id, $columns = ["*"])`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`$idKey = collect($id)->implode('-');`
`64`		`- $cacheKey = $this->makeCacheKey($columns, null, "-find_{$idKey}");`
	`64`	`+ $preStr = is_array($id) ? 'find-list' : 'find';`
	`65`	`+ $cacheKey = $this->makeCacheKey($columns, null, "-" . $preStr . "_{$idKey}");`
`65`	`66`
`66`	`67`	`return $this->cachedValue(func_get_args(), $cacheKey);`
`67`	`68`	`}`