Merge pull request #217 from enoonan/master

Fix issue #200 - address deprecated Input facade for Laravel version 6 and up, with 4.2 fallback
Nayjest · Apr 16, 2020 · ccb25a6 · ccb25a6
2 parents a8f9b43 + 9919d77
commit ccb25a6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git 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
@@ -1,6 +1,7 @@
 <?php
 namespace Nayjest\Grids;
 
+use Illuminate\Support\Facades\App;
 use Input;
 use Request;
 use Form;
@@ -37,7 +38,11 @@ public function __construct(Grid $grid)
 
     protected function loadInput()
     {
-        $this->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(), []);
+      }
     }
 
     /**