Rename withoutScopes and withoutAllScopes

Author: Bill Harding

src/CacheKey.php

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

src/Traits/BuilderCaching.php

@@ -24,19 +24,19 @@ public function truncate()
 
     public function withoutGlobalScope($scope)
     {
-        array_push($this->withoutScopes, $scope);
+        array_push($this->withoutGlobalScopes, $scope);
 
         return parent::withoutGlobalScope($scope);
     }
 
     public function withoutGlobalScopes(array $scopes = null)
     {
         if ($scopes != null) {
-            $this->withoutScopes = $scopes;
+            $this->withoutGlobalScopes = $scopes;
         }
 
         if ($scopes == null || ($scopes != null && count($scopes) == 0)) {
-            $this->withoutAllScopes = true;
+            $this->withoutAllGlobalScopes = true;
         }
 
         return parent::withoutGlobalScopes($scopes);

src/Traits/Caching.php

@@ -16,8 +16,8 @@ trait Caching
     protected $isCachable = true;
     protected $scopesAreApplied = false;
     protected $macroKey = "";
-    protected $withoutScopes = [];
-    protected $withoutAllScopes = false;
+    protected $withoutGlobalScopes = [];
+    protected $withoutAllGlobalScopes = false;
 
     public function __call($method, $parameters)
     {
@@ -47,13 +47,13 @@ protected function applyScopesToInstance()
     {
         if (! property_exists($this, "scopes")
             || $this->scopesAreApplied
-            || $this->withoutAllScopes
+            || $this->withoutAllGlobalScopes
         ) {
             return;
         }
 
         foreach ($this->scopes as $identifier => $scope) {
-            if (! isset($this->scopes[$identifier]) || isset($this->withoutScopes[$identifier])) {
+            if (! isset($this->scopes[$identifier]) || isset($this->withoutGlobalScopes[$identifier])) {
                 continue;
             }
 
@@ -169,7 +169,7 @@ protected function makeCacheKey(
             $query = $this->query->getQuery();
         }
 
-        return (new CacheKey($eagerLoad, $model, $query, $this->macroKey, $this->withoutScopes, $this->withoutAllScopes))
+        return (new CacheKey($eagerLoad, $model, $query, $this->macroKey, $this->withoutGlobalScopes, $this->withoutAllGlobalScopes))
             ->make($columns, $idColumn, $keyDifferentiator);
     }