修复禁用权限中间件无效问题

src/AdminServiceProvider.php

@@ -13,6 +13,7 @@ use Dcat\Admin\Layout\Menu;
 use Dcat\Admin\Layout\Navbar;
 use Dcat\Admin\Layout\SectionManager;
 use Dcat\Admin\Support\Context;
+use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Support\Setting;
 use Dcat\Admin\Support\Translator;
 use Dcat\Admin\Support\WebUploader;
@@ -274,8 +275,8 @@ PHP;
 
         // register middleware group.
         foreach ($this->middlewareGroups as $key => $middleware) {
-            if ($disablePermission && $middleware == 'admin.permission') {
-                continue;
+            if ($disablePermission) {
+                Helper::deleteByValue($middleware, 'admin.permission', true);
             }
             $router->middlewareGroup($key, $middleware);
         }

src/Extend/ServiceProvider.php

@@ -138,7 +138,7 @@ abstract class ServiceProvider extends LaravelServiceProvider
      *
      * @return string|void
      */
-    final public function getName()
+    public function getName()
     {
         return $this->name ?: ($this->name = str_replace('/', '.', $this->getPackageName()));
     }
@@ -162,7 +162,7 @@ abstract class ServiceProvider extends LaravelServiceProvider
      *
      * @return string|void
      */
-    final public function getPackageName()
+    public function getPackageName()
     {
         if (! $this->packageName) {
             if (! $this->composerProperty) {
@@ -190,7 +190,7 @@ abstract class ServiceProvider extends LaravelServiceProvider
      *
      * @return string
      */
-    final public function getVersion()
+    public function getVersion()
     {
         return Admin::extension()->versionManager()->getCurrentVersion($this);
     }
@@ -200,7 +200,7 @@ abstract class ServiceProvider extends LaravelServiceProvider
      *
      * @return string
      */
-    final public function getLatestVersion()
+    public function getLatestVersion()
     {
         return Admin::extension()->versionManager()->getFileVersions($this);
     }
@@ -210,7 +210,7 @@ abstract class ServiceProvider extends LaravelServiceProvider
      *
      * @return string
      */
-    final public function getLocalLatestVersion()
+    public function getLocalLatestVersion()
     {
         return last(
             array_keys(Admin::extension()->versionManager()->getFileVersions($this))
@@ -277,7 +277,7 @@ abstract class ServiceProvider extends LaravelServiceProvider
      *
      * @return bool
      */
-    final public function enabled()
+    public function enabled()
     {
         return Admin::extension()->enabled($this->getName());
     }
@@ -287,7 +287,7 @@ abstract class ServiceProvider extends LaravelServiceProvider
      *
      * @return bool
      */
-    final public function disabled()
+    public function disabled()
     {
         return ! $this->enabled();
     }
@@ -300,7 +300,7 @@ abstract class ServiceProvider extends LaravelServiceProvider
      *
      * @return mixed
      */
-    final public function config($key = null, $default = null)
+    public function config($key = null, $default = null)
     {
         if ($this->config === null) {
             $this->initConfig();

src/Grid/Filter/Scope.php

@@ -6,12 +6,15 @@ use Dcat\Admin\Grid\Filter;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Traits\Macroable;
 
 /**
  * @mixin Builder
  */
 class Scope implements Renderable
 {
+    use Macroable;
+
     /**
      * @var Filter
      */