Merge pull request #415 from spencer-leopold/master

Use Paginator to resolve current page.

Author: mikebronner

src/Traits/Buildable.php

@@ -1,6 +1,6 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Traits;
 
-use Illuminate\Container\Container;
+use Illuminate\Pagination\Paginator;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
@@ -153,11 +153,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);