jqh 6 лет назад
Родитель
Сommit
6b092b2914
4 измененных файлов с 8 добавлено и 9 удалено
  1. 1 2
      composer.json
  2. 1 1
      src/Controllers/RouteController.php
  3. 5 5
      src/Grid/Concerns/Options.php
  4. 1 1
      src/MiniGrid.php

+ 1 - 2
composer.json

@@ -18,11 +18,10 @@
         "doctrine/dbal": "2.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.0 || ~8.0",
         "laravel/laravel": "~5.5",
         "symfony/css-selector": "~3.1",
         "fzaninotto/faker": "~1.4",
-        "laravel/browser-kit-testing": "^2.0"
+        "laravel/browser-kit-testing": "~5.1"
     },
     "autoload": {
         "psr-4": {

+ 1 - 1
src/Controllers/RouteController.php

@@ -58,7 +58,7 @@ class RouteController extends Controller
             $grid->disableRowSelector();
             $grid->disableActions();
             $grid->disableCreateButton();
-            $grid->disableExport();
+            $grid->disableExporter();
             $grid->disableQuickCreateButton();
 
             $grid->filter(function (Grid\Filter $filter) use ($colors) {

+ 5 - 5
src/Grid/Concerns/Options.php

@@ -342,7 +342,7 @@ trait Options
      *
      * @return $this
      */
-    public function disableExport(bool $disable = true)
+    public function disableExporter(bool $disable = true)
     {
         return $this->option('show_exporter', !$disable);
     }
@@ -352,9 +352,9 @@ trait Options
      *
      * @return $this
      */
-    public function showExport(bool $val = true)
+    public function showExporter(bool $val = true)
     {
-        return $this->disableExport(!$val);
+        return $this->disableExporter(!$val);
     }
 
     /**
@@ -362,7 +362,7 @@ trait Options
      *
      * @return $this
      */
-    public function disableExportAll(bool $disable = true)
+    public function disableExporterAll(bool $disable = true)
     {
         return $this->option('show_export_all', !$disable);
     }
@@ -374,7 +374,7 @@ trait Options
      */
     public function showExportAll(bool $val = true)
     {
-        return $this->disableExportAll(!$val);
+        return $this->disableExporterAll(!$val);
     }
 
     /**

+ 1 - 1
src/MiniGrid.php

@@ -14,7 +14,7 @@ class MiniGrid extends Grid
         $this->setName('mini');
         $this->disableCreateButton();
         $this->disableActions();
-        $this->disableExport();
+        $this->disableExporter();
         $this->disableQuickCreateButton();
 
         $this->options['row_selector_clicktr'] = true;