Move withoutGlobalScopes

Author: Bill Harding

src/Traits/BuilderCaching.php

@@ -21,16 +21,4 @@ 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

@@ -43,6 +43,31 @@ public function applyScopes()
         return parent::applyScopes();
     }
 
+    public function withoutGlobalScope($scope)
+    {
+        $this->scopesAreApplied = true;
+        if ($this->withoutScopes == null) {
+            $this->withoutScopes = [];
+        }
+
+        array_push($this->withoutScopes[], $scope);
+        $this->withoutAllScopes = false;
+
+        return parent::withoutGlobalScope($scope);
+    }
+
+    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);
+    }
+
     protected function applyScopesToInstance()
     {
         if (! property_exists($this, "scopes")