styleci

config/admin.php

@@ -1,7 +1,5 @@
 <?php
 
-use Dcat\Admin\Grid\Displayers\DropdownActions;
-
 return [
 
     /*
@@ -191,7 +189,7 @@ return [
         'cache' => [
             // enable cache or not
             'enable' => true,
-            'store' => 'file',
+            'store'  => 'file',
         ],
 
         // Whether enable menu bind to a permission.
@@ -317,7 +315,7 @@ return [
     | "sidebar-mini".
     |
     */
-    'layout' => ['sidebar-mini', 'fixed',],
+    'layout' => ['sidebar-mini', 'fixed'],
 
     /*
     |--------------------------------------------------------------------------

resources/lang/en/admin.php

@@ -186,7 +186,7 @@ return [
     ],
     'import_extension_confirm' => 'Are you sure import the extension?',
     'selected_must_less_then'  => 'Only supports maximum :num options.',
-    'validation' => [
+    'validation'               => [
         'match'     => 'The :attribute and :other must match.',
         'minlength' => 'The :attribute must be at least :min characters.',
         'maxlength' => 'The :attribute may not be greater than :max characters.',

resources/lang/zh-CN/admin.php

@@ -172,7 +172,7 @@ return [
         'selected_files'         => '选中:num个文件，共:size。',
         'selected_has_failed'    => '已成功上传:success个文件，:fail个文件上传失败，<a class="retry"  href="javascript:"";">重新上传</a>失败文件或<a class="ignore" href="javascript:"";">忽略</a>',
         'selected_success'       => '共:num个(:size)，已上传:success个。',
-        'dot' =>                 '，',
+        'dot'                    =>                 '，',
         'failed_num'             => '失败:fail个。',
         'pause_upload'           => '暂停上传',
         'go_on_upload'           => '继续上传',
@@ -187,7 +187,7 @@ return [
     ],
     'import_extension_confirm' => '确认导入拓展？',
     'selected_must_less_then'  => '最多只能选择:num个选项',
-    'validation' => [
+    'validation'               => [
         'match'     => '与 :attribute 不匹配。',
         'minlength' => ':attribute 字符长度不能少于 :min。',
         'maxlength' => ':attribute 字符长度不能超出 :max。',

resources/lang/zh-CN/extension.php

@@ -1,4 +1,5 @@
-<?php 
+<?php
+
 return [
     'labels' => [
         'Extensions' => '扩展',

src/Admin.php

@@ -3,17 +3,17 @@
 namespace Dcat\Admin;
 
 use Closure;
+use Dcat\Admin\Contracts\Repository;
+use Dcat\Admin\Controllers\AuthController;
 use Dcat\Admin\Exception\Handler;
 use Dcat\Admin\Layout\Content;
-use Dcat\Admin\Models\HasPermissions;
-use Dcat\Admin\Controllers\AuthController;
+use Dcat\Admin\Layout\Menu;
+use Dcat\Admin\Layout\Navbar;
 use Dcat\Admin\Layout\SectionManager;
+use Dcat\Admin\Models\HasPermissions;
 use Dcat\Admin\Repositories\Proxy;
-use Dcat\Admin\Contracts\Repository;
 use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Traits\HasAssets;
-use Dcat\Admin\Layout\Menu;
-use Dcat\Admin\Layout\Navbar;
 use Illuminate\Auth\GuardHelpers;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Database\Eloquent\Model;
@@ -134,7 +134,6 @@ class Admin
      * @param Closure $callable
      *
      * @return Form
-     *
      */
     public static function form(Repository $repository, Closure $callable = null)
     {
@@ -265,6 +264,7 @@ class Admin
      * Get section manager.
      *
      * @param Closure|null $builder
+     *
      * @return SectionManager
      */
     public static function section(Closure $builder = null)
@@ -342,8 +342,9 @@ class Admin
     /**
      * Create a repository instance.
      *
-     * @param $class
-     * @param array $args
+     * @param string $class
+     * @param array  $args
+     *
      * @return Repository
      */
     public static function repository($class, array $args = [])
@@ -412,7 +413,8 @@ class Admin
      * Enable the extension.
      *
      * @param string $class
-     * @param bool $enable
+     * @param bool   $enable
+     *
      * @return bool
      */
     public static function enableExtenstion(string $class, bool $enable = true)
@@ -423,9 +425,9 @@ class Admin
 
         $name = $class::NAME;
 
-        $config = (array)\config('admin-extensions');
+        $config = (array) config('admin-extensions');
 
-        $config[$name] = (array)($config[$name] ?? []);
+        $config[$name] = (array) ($config[$name] ?? []);
 
         $config[$name]['enable'] = $enable;
 
@@ -436,6 +438,7 @@ class Admin
      * Disable the extension.
      *
      * @param string $class
+     *
      * @return bool
      */
     public static function disableExtenstion(string $class)
@@ -484,5 +487,4 @@ class Admin
     {
         Event::dispatch('admin.booted');
     }
-
 }

src/AdminServiceProvider.php

@@ -40,7 +40,7 @@ class AdminServiceProvider extends ServiceProvider
         'admin.log'        => Middleware\LogOperation::class,
         'admin.permission' => Middleware\Permission::class,
         'admin.bootstrap'  => Middleware\Bootstrap::class,
-        'admin.session'    => Middleware\Session::class,
+        'admin.session'    => Middleware\Session::class
     ];
 
     /**
@@ -55,7 +55,7 @@ class AdminServiceProvider extends ServiceProvider
             'admin.log',
             'admin.bootstrap',
             'admin.permission',
-            'admin.session',
+            'admin.session'
         ],
     ];
 
@@ -81,7 +81,7 @@ class AdminServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        require_once __DIR__ . '/Support/AdminSection.php';
+        require_once __DIR__.'/Support/AdminSection.php';
 
         $this->registerExtensionProviders();
         $this->loadAdminAuthConfig();

src/Auth/Permission.php

@@ -3,9 +3,9 @@
 namespace Dcat\Admin\Auth;
 
 use Dcat\Admin\Admin;
-use Dcat\Admin\Models\Role;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Middleware\Pjax;
+use Dcat\Admin\Models\Role;
 
 class Permission
 {
@@ -91,7 +91,7 @@ class Permission
         }
 
         Pjax::respond(
-            response((new Content)->withError(trans('admin.deny')))
+            response((new Content())->withError(trans('admin.deny')))
         );
     }
 

src/Console/CreateUserCommand.php

@@ -27,6 +27,7 @@ class CreateUserCommand extends Command
     {
         if (!config('app.debug')) {
             $this->error('Permission deny!');
+
             return;
         }
 

src/Console/ExportSeedCommand.php

@@ -2,7 +2,6 @@
 
 namespace Dcat\Admin\Console;
 
-use Dcat\Admin\Admin;
 use Illuminate\Console\Command;
 
 class ExportSeedCommand extends Command

src/Console/ExtendCommand.php

@@ -168,11 +168,11 @@ TREE;
 
         // make bootstrap
         $bootstrap = str_replace(
-            [':namespace', ':class_name',],
+            [':namespace', ':class_name'],
             [$this->namespace, $this->className],
             file_get_contents(__DIR__.'/stubs/extension/bootstrap.stub')
         );
-        $this->putFile("src/bootstrap.php", $bootstrap);
+        $this->putFile('src/bootstrap.php', $bootstrap);
 
         // make service provider
         $providerContents = str_replace(

src/Console/IdeHelperCommand.php

@@ -12,7 +12,7 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
 
 /**
- * Class IdeHelperCommand
+ * Class IdeHelperCommand.
  *
  * @authr jqh <841324345@qq.com>
  */
@@ -36,10 +36,10 @@ class IdeHelperCommand extends Command
      * @var array
      */
     protected $patterns = [
-        'grid' => '/(?:grid)->([\w0-9_]+)(?:\(|;|->|\s)/i',
-        'show' => '/show->([\w0-9_]+)(?:\(|;|->|\s)/i',
+        'grid'        => '/(?:grid)->([\w0-9_]+)(?:\(|;|->|\s)/i',
+        'show'        => '/show->([\w0-9_]+)(?:\(|;|->|\s)/i',
         'grid-column' => '/@method[\s]+\$this[\s]+([\w0-9_]+)/i',
-        'form-field' => '/@method[\s]+[\\\\\w0-9_]+[\s]+([\w0-9_]+)/i',
+        'form-field'  => '/@method[\s]+[\\\\\w0-9_]+[\s]+([\w0-9_]+)/i',
         'grid-filter' => '/@method[\s]+[\\\\\w0-9_]+[\s]+([\w0-9_]+)/i',
     ];
 
@@ -55,7 +55,7 @@ class IdeHelperCommand extends Command
             'method'   => '* @method Show\Field|Collection %s(string $label = null)',
             'property' => '* @property Show\Field|Collection %s',
         ],
-        'form' => '* @method %s %s(...$params)',
+        'form'        => '* @method %s %s(...$params)',
         'grid-column' => '* @method $this %s(...$params)',
         'grid-filter' => '* @method %s %s(...$params)',
         'show-column' => '* @method $this %s(...$params)',
@@ -70,6 +70,7 @@ class IdeHelperCommand extends Command
     {
         if (!config('app.debug')) {
             $this->error('Permission deny!');
+
             return;
         }
         if (is_file($bootstrap = admin_path('bootstrap.php'))) {
@@ -92,6 +93,7 @@ class IdeHelperCommand extends Command
 
     /**
      * @param array $reject
+     *
      * @return Collection
      */
     protected function getFieldsFromDatabase(array $reject = [])
@@ -115,7 +117,7 @@ class IdeHelperCommand extends Command
 
                 $each = collect(DB::connection($connectName)->select($sql))
                     ->map(function ($v) use ($value, $exceptTables, &$reject) {
-                        $v = (array)$v;
+                        $v = (array) $v;
 
                         if (in_array($v['TABLE_NAME'], $exceptTables) || in_array($v['COLUMN_NAME'], $reject)) {
                             return;
@@ -135,6 +137,7 @@ class IdeHelperCommand extends Command
 
     /**
      * @param array $reject
+     *
      * @return Collection
      */
     protected function getFieldsFromControllerFiles(array $reject = [])
@@ -192,21 +195,22 @@ class IdeHelperCommand extends Command
     }
 
     /**
-     * @param string $type
+     * @param string     $type
      * @param Collection $fields
+     *
      * @return string
      */
     public function generate(string $type, Collection $fields)
     {
         $methods = $properties = [];
-        $space   = str_repeat(' ', 5);
+        $space = str_repeat(' ', 5);
 
         $fields->each(function ($name) use ($type, &$methods, &$properties, $space) {
             $properties[] = $space.sprintf($this->templates[$type]['property'], $name);
-            $methods[]    = $space.sprintf($this->templates[$type]['method'], $name);
+            $methods[] = $space.sprintf($this->templates[$type]['method'], $name);
         });
 
-        return trim(join("\r\n", array_merge($properties, [$space.'*'], $methods)));
+        return trim(implode("\r\n", array_merge($properties, [$space.'*'], $methods)));
     }
 
     /**
@@ -225,6 +229,7 @@ class IdeHelperCommand extends Command
         });
 
         $space = str_repeat(' ', 5);
+
         return trim(
             $fields
                 ->map(function ($value, $key) use (&$space) {
@@ -242,6 +247,7 @@ class IdeHelperCommand extends Command
         $extensions = collect(Show\Field::getExtensions());
 
         $space = str_repeat(' ', 5);
+
         return trim(
             $extensions
                 ->map(function ($value, $key) use (&$space) {
@@ -267,6 +273,7 @@ class IdeHelperCommand extends Command
         });
 
         $space = str_repeat(' ', 5);
+
         return trim(
             $fields
                 ->map(function ($value, $key) use (&$space) {
@@ -343,7 +350,7 @@ class IdeHelperCommand extends Command
                 $action = $route->getActionName();
 
                 if ($action == 'Closure') {
-                    return null;
+                    return;
                 }
 
                 return explode('@', $action)[0];
@@ -360,16 +367,16 @@ class IdeHelperCommand extends Command
     }
 
     /**
-     * @param $class
+     * @param string $class
+     *
      * @return string
      */
     public function getFileNameByClass($class)
     {
-        if (!class_exists($class)) {
-            return null;
+        if (! class_exists($class)) {
+            return;
         }
 
         return (new \ReflectionClass($class))->getFileName();
     }
-
 }

src/Console/ImportCommand.php

@@ -76,20 +76,20 @@ class ImportCommand extends VendorPublishCommand
 
     /**
      * @param $class
+     *
      * @return bool
      */
     protected function updateExtensionConfig($class)
     {
-        $config = (array)\config('admin-extensions');
+        $config = (array) config('admin-extensions');
 
         $name = $class::NAME;
 
-        $config[$name] = (array)($config[$name] ?? []);
+        $config[$name] = (array) ($config[$name] ?? []);
 
-        $config[$name]['imported']    = true;
+        $config[$name]['imported'] = true;
         $config[$name]['imported_at'] = date('Y-m-d H:i:s');
 
         return Helper::updateExtensionConfig($config);
-
     }
 }

src/Console/ResetPasswordCommand.php

@@ -27,6 +27,7 @@ class ResetPasswordCommand extends Command
     {
         if (!config('app.debug')) {
             $this->error('Permission deny!');
+
             return;
         }
 

src/Contracts/Repository.php

@@ -7,6 +7,7 @@
  * This source file is subject to the MIT license that is bundled
  * with this source code in the file LICENSE.
  */
+
 namespace Dcat\Admin\Contracts;
 
 use Dcat\Admin\Form;
@@ -29,6 +30,7 @@ interface Repository
      * @return string
      */
     public function getCreatedAtColumn();
+
     /**
      * Get the name of the "updated at" column.
      *
@@ -45,6 +47,7 @@ interface Repository
      * Get the grid data.
      *
      * @param Grid\Model $model
+     *
      * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|Collection|array
      */
     public function get(Grid\Model $model);
@@ -53,6 +56,7 @@ interface Repository
      * Get data to build edit form.
      *
      * @param Form $form
+     *
      * @return array
      */
     public function edit(Form $form): array;
@@ -61,6 +65,7 @@ interface Repository
      * Get detail data.
      *
      * @param Show $show
+     *
      * @return array
      */
     public function detail(Show $show): array;
@@ -69,6 +74,7 @@ interface Repository
      * Store a new record.
      *
      * @param Form $form
+     *
      * @return mixed
      */
     public function store(Form $form);
@@ -77,6 +83,7 @@ interface Repository
      * Get data before update.
      *
      * @param Form $form
+     *
      * @return array
      */
     public function getDataWhenUpdating(Form $form): array;
@@ -85,6 +92,7 @@ interface Repository
      * Update form data.
      *
      * @param Form $form
+     *
      * @return bool
      */
     public function update(Form $form);
@@ -92,8 +100,9 @@ interface Repository
     /**
      * Destroy data.
      *
-     * @param Form $form
+     * @param Form  $form
      * @param array $deletingData
+     *
      * @return mixed
      */
     public function destroy(Form $form, array $deletingData);
@@ -102,8 +111,8 @@ interface Repository
      * Get data before destroy.
      *
      * @param Form $form
+     *
      * @return array
      */
     public function getDataWhenDeleting(Form $form): array;
-
 }

src/Controllers/AuthController.php

@@ -2,14 +2,13 @@
 
 namespace Dcat\Admin\Controllers;
 
-use Dcat\Admin\Models\Repositories\Administrator;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Layout\Content;
+use Dcat\Admin\Models\Repositories\Administrator;
 use Illuminate\Auth\GuardHelpers;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Validator;

src/Repositories/Repository.php

@@ -83,6 +83,7 @@ abstract class Repository implements \Dcat\Admin\Contracts\Repository
      * Get the grid data.
      *
      * @param Grid\Model $model
+     *
      * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|Collection|array
      */
     public function get(Grid\Model $model)
@@ -94,6 +95,7 @@ abstract class Repository implements \Dcat\Admin\Contracts\Repository
      * Get data to build edit form.
      *
      * @param Form $form
+     *
      * @return array
      */
     public function edit(Form $form): array
@@ -105,6 +107,7 @@ abstract class Repository implements \Dcat\Admin\Contracts\Repository
      * Get detail data.
      *
      * @param Show $show
+     *
      * @return array
      */
     public function detail(Show $show): array
@@ -116,6 +119,7 @@ abstract class Repository implements \Dcat\Admin\Contracts\Repository
      * Store a new record.
      *
      * @param Form $form
+     *
      * @return mixed
      */
     public function store(Form $form)
@@ -127,6 +131,7 @@ abstract class Repository implements \Dcat\Admin\Contracts\Repository
      * Get data before update.
      *
      * @param Form $form
+     *
      * @return array
      */
     public function getDataWhenUpdating(Form $form): array
@@ -138,6 +143,7 @@ abstract class Repository implements \Dcat\Admin\Contracts\Repository
      * Update form data.
      *
      * @param Form $form
+     *
      * @return bool
      */
     public function update(Form $form)
@@ -148,8 +154,9 @@ abstract class Repository implements \Dcat\Admin\Contracts\Repository
     /**
      * Destroy data.
      *
-     * @param Form $form
+     * @param Form  $form
      * @param array $deletingData
+     *
      * @return mixed
      */
     public function destroy(Form $form, array $deletingData)
@@ -161,6 +168,7 @@ abstract class Repository implements \Dcat\Admin\Contracts\Repository
      * Get data before destroy.
      *
      * @param Form $form
+     *
      * @return array
      */
     public function getDataWhenDeleting(Form $form): array
@@ -206,6 +214,7 @@ abstract class Repository implements \Dcat\Admin\Contracts\Repository
      * Get the repository listeners.
      *
      * @param null|string $repository
+     *
      * @return RepositoryListener[]
      */
     public static function getListeners(?string $repository)
@@ -252,6 +261,7 @@ abstract class Repository implements \Dcat\Admin\Contracts\Repository
     /**
      * @param string $method
      * @param array  $arguments
+     *
      * @return $this
      */
     public function __call($method, $arguments)