diff --git a/src/AbstractCursorPaginator.php b/src/AbstractCursorPaginator.php index 6c46b7e..425c524 100644 --- a/src/AbstractCursorPaginator.php +++ b/src/AbstractCursorPaginator.php @@ -6,13 +6,13 @@ use Closure; use Exception; use Illuminate\Contracts\Support\Htmlable; +use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\Pivot; use Illuminate\Pagination\Paginator; use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Illuminate\Support\Str; use Illuminate\Support\Traits\ForwardsCalls; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Database\Eloquent\Relations\Pivot; /** * @mixin \Illuminate\Support\Collection diff --git a/src/BelongsToManyCursorPaginateMixin.php b/src/BelongsToManyCursorPaginateMixin.php index cf1035a..6af8d50 100644 --- a/src/BelongsToManyCursorPaginateMixin.php +++ b/src/BelongsToManyCursorPaginateMixin.php @@ -6,8 +6,7 @@ class BelongsToManyCursorPaginateMixin { public function cursorPaginate() { - return function($perPage = null, $columns = ['*'], $cursorName = 'cursor', $cursor = null) - { + return function ($perPage = null, $columns = ['*'], $cursorName = 'cursor', $cursor = null) { $this->query->addSelect($this->shouldSelect($columns)); return tap($this->query->cursorPaginate($perPage, $columns, $cursorName, $cursor), function ($paginator) { @@ -15,4 +14,4 @@ public function cursorPaginate() }); }; } -} \ No newline at end of file +} diff --git a/src/EloquentCursorPaginateMixin.php b/src/EloquentCursorPaginateMixin.php index 8b87dc4..8b01ada 100644 --- a/src/EloquentCursorPaginateMixin.php +++ b/src/EloquentCursorPaginateMixin.php @@ -3,8 +3,8 @@ namespace Vanthao03596\LaravelCursorPaginate; use Illuminate\Container\Container; -use Illuminate\Pagination\Paginator; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Pagination\Paginator; class EloquentCursorPaginateMixin { @@ -99,8 +99,7 @@ protected function cursorPaginator() protected function getOriginalColumnNameForCursorPagination() { - return function($builder, string $parameter) - { + return function ($builder, string $parameter) { $columns = $builder instanceof Builder ? $builder->getQuery()->columns : $builder->columns; if (! is_null($columns)) { diff --git a/src/Query/Builder.php b/src/Query/Builder.php index e7eb4d6..4ac52a0 100644 --- a/src/Query/Builder.php +++ b/src/Query/Builder.php @@ -3,11 +3,11 @@ namespace Vanthao03596\LaravelCursorPaginate\Query; use Illuminate\Container\Container; +use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Query\Builder as Base; use Illuminate\Pagination\Paginator; -use Vanthao03596\LaravelCursorPaginate\CursorPaginator; -use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Vanthao03596\LaravelCursorPaginate\Cursor; +use Vanthao03596\LaravelCursorPaginate\CursorPaginator; class Builder extends Base {