From 9919d775e49d0bb2e178a62f4d2ceda6159576b2 Mon Sep 17 00:00:00 2001 From: Eileen Noonan Date: Wed, 8 Apr 2020 12:22:41 -0400 Subject: [PATCH] Adddress deprecated Input facade for Laravel version 6 and up --- src/Components/Laravel5/Pager.php | 8 ++++++-- src/GridInputProcessor.php | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Components/Laravel5/Pager.php b/src/Components/Laravel5/Pager.php index 603e998..31518d8 100644 --- a/src/Components/Laravel5/Pager.php +++ b/src/Components/Laravel5/Pager.php @@ -2,7 +2,7 @@ namespace Nayjest\Grids\Components\Laravel5; use Illuminate\Pagination\Paginator; -use Input; +use Illuminate\Support\Facades\App; use Nayjest\Grids\Components\Base\RenderableComponent; use Nayjest\Grids\Grid; @@ -24,7 +24,11 @@ public function render() protected function setupPaginationForReading() { Paginator::currentPageResolver(function () { - return Input::get("$this->input_key.page", 1); + if (version_compare(App::version(), '6.0', '>=')) { + return \Illuminate\Support\Facades\Request::input("$this->input_key.page", 1); + } else { + return \Illuminate\Support\Facades\Input::get("$this->input_key.page", 1); + } }); } diff --git a/src/GridInputProcessor.php b/src/GridInputProcessor.php index 16e08c6..39fc66e 100644 --- a/src/GridInputProcessor.php +++ b/src/GridInputProcessor.php @@ -1,6 +1,7 @@ input = Input::get($this->getKey(), []); + if (version_compare(App::version(), '6.0', '>=')) { + $this->input = \Illuminate\Support\Facades\Request::input($this->getKey(), []); + } else { + $this->input = \Illuminate\Support\Facades\Input::get($this->getKey(), []); + } } /**