Merge branch 'release/0.2.28'

Author: mikebronner

CHANGELOG.md

@@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [0.2.27] - 16 Feb 2018
+## [0.2.28] - 18 Feb 2018
+### Changed
+- disabling of cache from using session to use cache-key instead.
+
+## [0.2.27] - 17 Feb 2018
 ### Fixed
 - the erroneous use of `arrayEmpty()` function, changed to simple `count()`.
 

src/Traits/Cachable.php

@@ -3,6 +3,7 @@
 use GeneaLabs\LaravelModelCaching\CacheKey;
 use GeneaLabs\LaravelModelCaching\CacheTags;
 use GeneaLabs\LaravelModelCaching\CachedModel;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Cache\TaggableStore;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
@@ -11,6 +12,7 @@
 trait Cachable
 {
     protected $isCachable = true;
+    protected static $isCachableKey = 'genealabs:model-caching:is-disabled';
 
     protected function cache(array $tags = [])
     {
@@ -33,7 +35,8 @@ protected function cache(array $tags = [])
 
     public function disableCache()
     {
-        session(['genealabs-laravel-model-caching-is-disabled' => true]);
+        cache()->forever(self::$isCachableKey, true);
+
         $this->isCachable = false;
 
         return $this;
@@ -78,7 +81,7 @@ public static function bootCachable()
 
     public static function all($columns = ['*'])
     {
-        if (session('genealabs-laravel-model-caching-is-disabled')) {
+        if (cache()->get(self::$isCachableKey)) {
             return parent::all($columns);
         }
 
@@ -95,8 +98,8 @@ public static function all($columns = ['*'])
 
     public function newEloquentBuilder($query)
     {
-        if (session('genealabs-laravel-model-caching-is-disabled')) {
-            session()->forget('genealabs-laravel-model-caching-is-disabled');
+        if (cache()->get(self::$isCachableKey)) {
+            cache()->forget(self::$isCachableKey);
 
             return new EloquentBuilder($query);
         }