支持laravel6

composer.json

@@ -14,11 +14,10 @@
     "require": {
         "php": ">=7.1.0",
         "symfony/dom-crawler": "~3.1|~4.0",
-        "laravel/framework": "~5.5",
+        "laravel/framework": "~5.5|~6.0",
         "doctrine/dbal": "2.*"
     },
     "require-dev": {
-        "laravel/laravel": "~5.5",
         "symfony/css-selector": "~3.1",
         "fzaninotto/faker": "~1.4",
         "laravel/browser-kit-testing": "~5.1"

src/Controllers/PermissionController.php

@@ -8,16 +8,9 @@ use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Row;
 use Dcat\Admin\MiniGrid;
-use Dcat\Admin\Repositories\EloquentRepository;
 use Dcat\Admin\Show;
 use Dcat\Admin\Tree;
-use Dcat\Admin\Widgets\Checkbox;
-use Dcat\Admin\Widgets\Radio;
-use Dcat\Admin\Widgets\Tab;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Routing\Controller;
-use Illuminate\Support\Facades\Input;
-use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Str;
 
 class PermissionController extends Controller
@@ -33,7 +26,7 @@ class PermissionController extends Controller
      */
     public function index(Content $content)
     {
-        if (Input::get('_mini')) {
+        if (request('_mini')) {
             return $content->body($this->miniGrid());
         }
 

src/Form.php

@@ -13,7 +13,6 @@ use Dcat\Admin\Widgets\DialogForm;
 use Illuminate\Contracts\Support\MessageProvider;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Fluent;
 use Illuminate\Support\MessageBag;
 use Illuminate\Support\Str;
@@ -546,7 +545,7 @@ class Form implements Renderable
      */
     public function store(?array $data = null, $redirectTo = null)
     {
-        $data = $data ?: Input::all();
+        $data = $data ?: request()->all();
 
         if (($response = $this->callSubmitted())) {
             return $response;
@@ -714,7 +713,7 @@ class Form implements Renderable
         $redirectTo = null
     )
     {
-        $data = $data ?: Input::all();
+        $data = $data ?: request()->all();
 
         $this->builder->setResourceId($id);
         $this->builder->setMode(Builder::MODE_EDIT);

src/Form/Concerns/HasFiles.php

@@ -3,7 +3,6 @@
 namespace Dcat\Admin\Form\Concerns;
 
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Illuminate\Support\Facades\Input;
 use Dcat\Admin\Form\Field;
 
 trait HasFiles
@@ -96,7 +95,7 @@ trait HasFiles
             unset($input['key']);
         }
 
-        Input::replace($input);
+        request()->replace($input);
 
         return $input;
     }

src/Grid/Concerns/HasExporter.php

@@ -6,7 +6,6 @@ use Dcat\Admin\Grid\Exporter;
 use Dcat\Admin\Grid\Exporters\AbstractExporter;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Grid\Tools;
-use Illuminate\Support\Facades\Input;
 
 trait HasExporter
 {
@@ -111,7 +110,7 @@ trait HasExporter
      */
     public function getExportUrl($scope = 1, $args = null)
     {
-        $input = array_merge(Input::all(), $this->getExporter()->formatExportQuery($scope, $args));
+        $input = array_merge(request()->all(), $this->getExporter()->formatExportQuery($scope, $args));
 
         if ($constraints = $this->model()->getConstraints()) {
             $input = array_merge($input, $constraints);

src/Grid/Filter.php

@@ -33,7 +33,6 @@ use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Input;
 
 /**
  * Class Filter.
@@ -392,7 +391,7 @@ class Filter implements Renderable
             return $this->inputs;
         }
 
-        $this->inputs = Arr::dot(Input::all());
+        $this->inputs = Arr::dot(request()->all());
 
         $this->inputs = array_filter($this->inputs, function ($input) {
             return $input !== '' && !is_null($input) && $input !== static::IGNORE_VALUE;

src/Grid/Model.php

@@ -12,7 +12,6 @@ use Illuminate\Pagination\AbstractPaginator;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Str;
 
@@ -561,7 +560,7 @@ class Model
      */
     protected function setSort()
     {
-        $this->sort = Input::get($this->sortName, []);
+        $this->sort = request($this->sortName, []);
 
         if (empty($this->sort['column']) || empty($this->sort['type'])) {
             return;

src/Grid/Tools/Paginator.php

@@ -4,7 +4,6 @@ namespace Dcat\Admin\Grid\Tools;
 
 use Dcat\Admin\Grid;
 use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Facades\Input;
 
 class Paginator extends AbstractTool
 {
@@ -35,7 +34,7 @@ class Paginator extends AbstractTool
         $this->paginator = $this->grid->model()->paginator();
 
         if ($this->paginator instanceof LengthAwarePaginator) {
-            $this->paginator->appends(Input::all());
+            $this->paginator->appends(request()->all());
         }
     }
 

src/Widgets/Dump.php

@@ -21,6 +21,8 @@ class Dump extends Widget
      */
     protected $content = '';
 
+    protected $maxWidth;
+
     /**
      * Dump constructor.
      *
@@ -57,6 +59,13 @@ class Dump extends Widget
         return $this;
     }
 
+    public function maxWidth($width)
+    {
+        $this->maxWidth = $width;
+
+        return $this;
+    }
+
     /**
      * @param mixed $content
      * @return array|null
@@ -76,7 +85,10 @@ class Dump extends Widget
 
     public function render()
     {
-        $this->defaultHtmlAttribute('style', 'white-space:pre-wrap');
+        $this->defaultHtmlAttribute(
+            'style',
+            'white-space:pre-wrap;'.($this->maxWidth ? "max-width:{$this->maxWidth};" : '')
+        );
 
         return <<<EOF
 <div style="padding:{$this->padding}"><pre class="dump" {$this->formatHtmlAttributes()}>{$this->content}</pre></div>