Merge remote-tracking branch 'origin/master' into false-query-binding

Author: dmason30

src/Traits/Buildable.php

@@ -1,6 +1,6 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Traits;
 
-use Illuminate\Container\Container;
+use Illuminate\Pagination\Paginator;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
@@ -29,6 +29,17 @@ public function count($columns = "*")
         return $this->cachedValue(func_get_args(), $cacheKey);
     }
 
+    public function exists()
+    {
+        if (! $this->isCachable()) {
+            return parent::exists();
+        }
+
+        $cacheKey = $this->makeCacheKey(['*'], null, "-exists");
+
+        return $this->cachedValue(func_get_args(), $cacheKey);
+    }
+
     public function decrement($column, $amount = 1, array $extra = [])
     {
         $this->cache($this->makeCacheTags())
@@ -117,7 +128,7 @@ public function insert(array $values)
         if (property_exists($this, "model")) {
             $this->checkCooldownAndFlushAfterPersisting($this->model);
         }
-        
+
         return parent::insert($values);
     }
 
@@ -153,11 +164,7 @@ public function paginate(
             return parent::paginate($perPage, $columns, $pageName, $page);
         }
 
-        $page = Container::getInstance()
-            ->make("request")
-            ->input($pageName)
-            ?: $page
-            ?: 1;
+        $page = $page ?: Paginator::resolveCurrentPage($pageName);
 
         if (is_array($page)) {
             $page = $this->recursiveImplodeWithKey($page);