Override withoutGlobalScopes

Author: Bill Harding

src/CacheKey.php

@@ -16,17 +16,23 @@ class CacheKey
     protected $macroKey;
     protected $model;
     protected $query;
+    protected $withoutScopes = [];
+    protected $withoutAllScopes = false;
 
     public function __construct(
         array $eagerLoad,
         $model,
         $query,
-        $macroKey
+        $macroKey,
+        $withoutScopes,
+        $withoutAllScopes
     ) {
         $this->eagerLoad = $eagerLoad;
         $this->macroKey = $macroKey;
         $this->model = $model;
         $this->query = $query;
+        $this->withoutScopes = $withoutScopes;
+        $this->withoutAllScopes = $withoutAllScopes;
     }
 
     public function make(
@@ -57,6 +63,10 @@ protected function getBindingsSlug() : string
             return '';
         }
 
+        if ($this->withoutAllScopes || ($this->withoutScopes != null && count($this->withoutScopes) == 0)) {
+            return Arr::query($this->model->query()->withoutGlobalScopes($this->withoutScopes)->getBindings());
+        }
+
         return Arr::query($this->model->query()->getBindings());
     }
 

src/Traits/BuilderCaching.php

@@ -21,4 +21,16 @@ public function truncate()
 
         return parent::truncate();
     }
+
+    public function withoutGlobalScopes(array $scopes = null)
+    {
+        $this->scopesAreApplied = true;
+        $this->withoutScopes = $scopes;
+
+        if ($scopes == null || ($scopes != null && count($scopes) == 0)) {
+            $this->withoutAllScopes = true;
+        }
+
+        return parent::withoutGlobalScopes($scopes);
+    }
 }

src/Traits/Caching.php

@@ -16,6 +16,8 @@ trait Caching
     protected $isCachable = true;
     protected $scopesAreApplied = false;
     protected $macroKey = "";
+    protected $withoutScopes = null;
+    protected $withoutAllScopes = false;
 
     public function __call($method, $parameters)
     {
@@ -166,7 +168,7 @@ protected function makeCacheKey(
             $query = $this->query->getQuery();
         }
 
-        return (new CacheKey($eagerLoad, $model, $query, $this->macroKey))
+        return (new CacheKey($eagerLoad, $model, $query, $this->macroKey, $this->withoutScopes, $this->withoutAllScopes))
             ->make($columns, $idColumn, $keyDifferentiator);
     }