jqh 5 years ago
parent
commit
eaca249575
6 changed files with 40 additions and 39 deletions
  1. 13 34
      src/Admin.php
  2. 2 2
      src/Console/ImportCommand.php
  3. 1 1
      src/Form.php
  4. 1 1
      src/Grid/Model.php
  5. 1 1
      src/Show.php
  6. 22 0
      src/Support/Helper.php

+ 13 - 34
src/Admin.php

@@ -16,12 +16,9 @@ use Dcat\Admin\Layout\Menu;
 use Dcat\Admin\Layout\Navbar;
 use Illuminate\Auth\GuardHelpers;
 use Illuminate\Contracts\Auth\Authenticatable;
-use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
-use phpDocumentor\Reflection\Types\Mixed_;
 
 /**
  * Class Admin.
@@ -343,13 +340,13 @@ class Admin
     }
 
     /**
-     * Create a repository instance
+     * Create a repository instance.
      *
      * @param $class
      * @param array $args
      * @return Repository
      */
-    public static function createRepository($class, array $args = [])
+    public static function repository($class, array $args = [])
     {
         $repository = $class;
         if (is_string($repository)) {
@@ -432,35 +429,7 @@ class Admin
 
         $config[$name]['enable'] = $enable;
 
-        return static::updateExtensionConfig($config);
-    }
-
-    /**
-     * @return Handler
-     */
-    public static function makeExceptionHandler()
-    {
-        return app(
-            config('admin.exception_handler') ?: Handler::class
-        );
-    }
-
-    /**
-     * @param array $config
-     * @return bool
-     */
-    public static function updateExtensionConfig(array $config)
-    {
-        $files  = app('files');
-        $result = (bool)$files->put(config_path('admin-extensions.php'), Helper::exportArrayPhp($config));
-
-        if ($result && is_file(base_path('bootstrap/cache/config.php'))) {
-            Artisan::call('config:cache');
-        }
-
-        \config(['admin-extensions' => $config]);
-
-        return $result;
+        return Helper::updateExtensionConfig($config);
     }
 
     /**
@@ -474,6 +443,16 @@ class Admin
         return static::enableExtenstion($class, false);
     }
 
+    /**
+     * @return Handler
+     */
+    public static function makeExceptionHandler()
+    {
+        return app(
+            config('admin.exception_handler') ?: Handler::class
+        );
+    }
+
     /**
      * @param callable $callback
      */

+ 2 - 2
src/Console/ImportCommand.php

@@ -4,7 +4,7 @@ namespace Dcat\Admin\Console;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Extension;
-use Illuminate\Console\Command;
+use Dcat\Admin\Support\Helper;
 use Illuminate\Foundation\Console\VendorPublishCommand;
 use Illuminate\Support\Arr;
 
@@ -89,7 +89,7 @@ class ImportCommand extends VendorPublishCommand
         $config[$name]['imported']    = true;
         $config[$name]['imported_at'] = date('Y-m-d H:i:s');
 
-        return Admin::updateExtensionConfig($config);
+        return Helper::updateExtensionConfig($config);
 
     }
 }

+ 1 - 1
src/Form.php

@@ -266,7 +266,7 @@ class Form implements Renderable
      */
     public function __construct(Repository $repository, ?Closure $callback = null)
     {
-        $this->repository = Admin::createRepository($repository);
+        $this->repository = Admin::repository($repository);
 
         $this->callback = $callback;
 

+ 1 - 1
src/Grid/Model.php

@@ -129,7 +129,7 @@ class Model
     public function __construct(Request $request, ?Repository $repository = null)
     {
         if ($repository) {
-            $this->repository = Admin::createRepository($repository);
+            $this->repository = Admin::repository($repository);
         }
 
         $this->request = $request;

+ 1 - 1
src/Show.php

@@ -86,7 +86,7 @@ class Show implements Renderable
     public function __construct(?Repository $repository = null, ?\Closure $builder = null)
     {
         if ($repository) {
-            $this->repository = Admin::createRepository($repository);
+            $this->repository = Admin::repository($repository);
         }
         $this->builder = $builder;
 

+ 22 - 0
src/Support/Helper.php

@@ -6,10 +6,32 @@ use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Str;
 
 class Helper
 {
+    /**
+     * Update extension config.
+     *
+     * @param array $config
+     * @return bool
+     */
+    public static function updateExtensionConfig(array $config)
+    {
+        $files  = app('files');
+        $result = (bool)$files->put(config_path('admin-extensions.php'), Helper::exportArrayPhp($config));
+
+        if ($result && is_file(base_path('bootstrap/cache/config.php'))) {
+            Artisan::call('config:cache');
+        }
+
+        \config(['admin-extensions' => $config]);
+
+        return $result;
+    }
+
+
     /**
      * Converts the given value to an array.
      *