style(admin): php-cs-fixer, phpcs

miaoxing · Dec 18, 2023 · ca89f1e · ca89f1e
1 parent 39bcaf5
commit ca89f1e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 18 deletions.
diff --git a/pages/api/admin/admins/[id].php b/pages/api/admin/admins/[id].php
@@ -21,7 +21,7 @@
     public function get()
     {
         return ShowAction::new()
-            ->buildData(function (AdminModel $admin) {
+            ->buildData(static function (AdminModel $admin) {
                 $userRoles = RolesUserModel::fetchAll('user_id', $admin->userId);
                 return [
                     'roleIds' => array_column($userRoles, 'roleId'),

diff --git a/pages/api/admin/groups/[id].php b/pages/api/admin/groups/[id].php
@@ -21,7 +21,7 @@ public function get()
     public function patch()
     {
         return UpdateAction::new()
-            ->validate(function (GroupModel $group, $req) {
+            ->validate(static function (GroupModel $group, $req) {
                 $v = V::defaultOptional()->defaultNotEmpty();
                 $v->setModel($group);
                 $v->modelColumn('parentId', '父级分组')->modelExists(GroupModel::class);
@@ -53,8 +53,8 @@ public function patch()
 
     public function delete()
     {
-        return DestroyAction
-            ::beforeDestroy(function (BaseModel $model) {
+        return DestroyAction::new()
+            ->beforeDestroy(static function (BaseModel $model) {
                 return Event::until('groupDestroy', [$model]);
             })
             ->afterDestroy(function () {

diff --git a/pages/api/admin/groups/index.php b/pages/api/admin/groups/index.php
@@ -13,11 +13,11 @@
     public function get()
     {
         return IndexAction::new()
-            ->beforeFind(function (GroupModel $models) {
+            ->beforeFind(static function (GroupModel $models) {
                 $models->where('level', 1)
                     ->setDefaultSortColumn(['sort', 'id']);
             })
-            ->afterFind(function (GroupModel $models) {
+            ->afterFind(static function (GroupModel $models) {
                 $models->load('children');
             })
             ->exec($this);

diff --git a/pages/api/admin/permissions/[id].php b/pages/api/admin/permissions/[id].php
@@ -14,7 +14,7 @@
     public function patch()
     {
         return UpdateAction::new()
-            ->validate(function (PermissionModel $permission, $req) {
+            ->validate(static function (PermissionModel $permission, $req) {
                 $v = V::defaultOptional()->defaultNotEmpty();
                 $v->setModel($permission);
                 $v->modelColumn('name', '名称')->requiredIfNew()->notModelDup();

diff --git a/pages/api/admin/roles/[id].php b/pages/api/admin/roles/[id].php
@@ -13,7 +13,7 @@
     public function get()
     {
         return ShowAction::new()
-            ->buildData(function (RoleModel $role) {
+            ->buildData(static function (RoleModel $role) {
                 return [
                     'permissionIds' => $role->permissions->getAll('id'),
                 ];
@@ -24,7 +24,7 @@ public function get()
     public function patch()
     {
         return UpdateAction::new()
-            ->validate(function ($role, $req) {
+            ->validate(static function ($role, $req) {
                 $v = V::defaultOptional();
                 $v->setModel($role);
                 $v->modelColumn('name', '名称');
@@ -34,7 +34,7 @@ public function patch()
                 $v->array('permissionIds', '权限', 0, 100);
                 return $v->check($req);
             })
-            ->afterSave(function (RoleModel $role, $req) {
+            ->afterSave(static function (RoleModel $role, $req) {
                 if (isset($req['permissionIds'])) {
                     $role->permissions()->syncRelation($req['permissionIds']);
                 }

diff --git a/src/AdminPlugin.php b/src/AdminPlugin.php
@@ -64,7 +64,7 @@ public function onAdminMenuGetMenus(AdminMenu $menu)
 
     public function onPermissionGetMap(PermissionMap $map)
     {
-        $map->prefix('admin/admins', function (PermissionMap $map) {
+        $map->prefix('admin/admins', static function (PermissionMap $map) {
             $map->addList('', [
                 'GET api/admin/groups',
             ]);
@@ -76,7 +76,7 @@ public function onPermissionGetMap(PermissionMap $map)
             ]);
         });
 
-        $map->prefix('admin/groups', function (PermissionMap $map) {
+        $map->prefix('admin/groups', static function (PermissionMap $map) {
             $map->addList();
             $map->addNew('', [
                 'GET api/admin/groups',
@@ -87,7 +87,7 @@ public function onPermissionGetMap(PermissionMap $map)
             $map->addDelete();
         });
 
-        $map->prefix('admin/roles', function (PermissionMap $map) {
+        $map->prefix('admin/roles', static function (PermissionMap $map) {
             $map->addList();
             $map->addNew('', [
                 'GET api/admin/permissions',
@@ -98,7 +98,7 @@ public function onPermissionGetMap(PermissionMap $map)
             $map->addDelete();
         });
 
-        $map->prefix('admin/permissions', function (PermissionMap $map) {
+        $map->prefix('admin/permissions', static function (PermissionMap $map) {
             $map->addList();
             $map->addNew();
             $map->addEdit();

diff --git a/src/Service/AdminMenu/Item.php b/src/Service/AdminMenu/Item.php
@@ -2,12 +2,10 @@
 
 namespace Miaoxing\Admin\Service\AdminMenu;
 
-use JsonSerializable;
-
 /**
  * @experimental May be rename
  */
-class Item implements JsonSerializable
+class Item implements \JsonSerializable
 {
     /**
      * @var string|null
@@ -299,7 +297,7 @@ protected function childrenToArray(array $children): array
         }
 
         // Sort items
-        usort($children, function ($childA, $childB) {
+        usort($children, static function ($childA, $childB) {
             return $childA->getSort() < $childB->getSort();
         });