Apply fixes from StyleCI

Author: edenleung

database/migrations/20190513134639_permission.php

@@ -1,7 +1,6 @@
 <?php
 
 use think\migration\Migrator;
-use think\migration\db\Column;
 
 class Permission extends Migrator
 {
@@ -31,36 +30,36 @@ public function change()
         $tables = config('permission.tables');
 
         // 规则表
-        $table = $this->table($tables['permission'], array('engine'=>'MyISAM'));
-        $table->addColumn('name', 'string', array('limit' => 100,'comment'=>'规则名称'))
-            ->addIndex(array('name'), array('unique' => true))
+        $table = $this->table($tables['permission'], ['engine'=>'MyISAM']);
+        $table->addColumn('name', 'string', ['limit' => 100, 'comment'=>'规则名称'])
+            ->addIndex(['name'], ['unique' => true])
             ->create();
 
         // 角色表
-        $table = $this->table($tables['role'], array('engine'=>'MyISAM'));
-        $table->addColumn('name', 'string', array('limit' => 100,'comment'=>'角色名称'))
-            ->addIndex(array('name'), array('unique' => true))
+        $table = $this->table($tables['role'], ['engine'=>'MyISAM']);
+        $table->addColumn('name', 'string', ['limit' => 100, 'comment'=>'角色名称'])
+            ->addIndex(['name'], ['unique' => true])
             ->create();
 
         // 角色与规则 多对多中间表
-        $table = $this->table($tables['role_permission_access'], array('engine'=>'MyISAM'));
-        $table->addColumn('role_id', 'integer', array('comment'=>'角色主键'))
-            ->addColumn('permission_id', 'integer', array('comment'=>'规则主键'))
-            ->addIndex(array('permission_id', 'role_id'), array('unique' => true))
+        $table = $this->table($tables['role_permission_access'], ['engine'=>'MyISAM']);
+        $table->addColumn('role_id', 'integer', ['comment'=>'角色主键'])
+            ->addColumn('permission_id', 'integer', ['comment'=>'规则主键'])
+            ->addIndex(['permission_id', 'role_id'], ['unique' => true])
             ->create();
-        
+
         // 角色与用户 多对多中间表
-        $table = $this->table($tables['user_role_access'], array('engine'=>'MyISAM'));
-        $table->addColumn('user_id', 'integer', array('comment'=>'用户id'))
-            ->addColumn('role_id', 'integer', array('comment'=>'角色id'))
-            ->addIndex(array('user_id', 'role_id'), array('unique' => true))
+        $table = $this->table($tables['user_role_access'], ['engine'=>'MyISAM']);
+        $table->addColumn('user_id', 'integer', ['comment'=>'用户id'])
+            ->addColumn('role_id', 'integer', ['comment'=>'角色id'])
+            ->addIndex(['user_id', 'role_id'], ['unique' => true])
             ->create();
-        
+
         // 多态关联(用户与角色中间表)
-        $table = $this->table($tables['has_permission'], array('engine'=>'MyISAM'));
-        $table->addColumn('content', 'string', array('limit' => 50))
-            ->addColumn('model_id', 'integer', array('comment'=>'模型主键'))
-            ->addColumn('model_type', 'string', array('limit' => 50,'comment'=>'模型命名空间'))
+        $table = $this->table($tables['has_permission'], ['engine'=>'MyISAM']);
+        $table->addColumn('content', 'string', ['limit' => 50])
+            ->addColumn('model_id', 'integer', ['comment'=>'模型主键'])
+            ->addColumn('model_type', 'string', ['limit' => 50, 'comment'=>'模型命名空间'])
             ->create();
     }
 }

src/Contract/Permission.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace xiaodi\Permission\Contract;
 
 interface Permission
@@ -8,4 +9,4 @@ public function roles();
     public function getById(int $id);
 
     public function getByName(string $name);
-}
+}

src/Contract/Role.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace xiaodi\Permission\Contract;
 
 use think\model\relation\BelongsToMany;
@@ -14,5 +15,4 @@ public function permissions();
     public function getById(int $id);
 
     public function getByName(string $name);
-
-}
+}

src/Contract/User.php

@@ -1,31 +1,33 @@
 <?php
+
 namespace xiaodi\Permission\Contract;
 
 use think\model\relation\BelongsToMany;
 
 interface User
 {
     /**
-     * 实现多对多的角色关系
+     * 实现多对多的角色关系.
      *
      * @return BelongsToMany
      */
-
     public function roles():BelongsToMany;
 
     /**
-     * 通过id获取详情
+     * 通过id获取详情.
+     *
+     * @param int $id
      *
-     * @param integer $id
      * @return void
      */
     public function getById(int $id);
 
     /**
-     * 通过name获取详情
+     * 通过name获取详情.
      *
      * @param string $name
+     *
      * @return void
      */
     public function getByName(string $name);
-}
+}

src/Exceptions/PermissionAlreadyExists.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace xiaodi\Permission\Exceptions;
 
 use InvalidArgumentException;
@@ -9,4 +10,4 @@ public static function create(string $permissionName)
     {
         return new static("此 `{$permissionName}` 已存在数据表中.");
     }
-}
+}

src/Exceptions/UnauthorizedException.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace xiaodi\Permission\Exceptions;
 
 use InvalidArgumentException;
@@ -9,4 +10,4 @@ public static function create(string $permissionName)
     {
         return new static("访问出错，你没有此 `{$permissionName}` 权限.");
     }
-}
+}

src/Middlewares/Permission.php

@@ -1,20 +1,21 @@
 <?php
+
 namespace xiaodi\Permission\Middlewares;
 
 use xiaodi\Permission\Exceptions\UnauthorizedException;
 
 /**
- * 权限验证中间件(验证规则专用)
- * 
+ * 权限验证中间件(验证规则专用).
  */
 class Permission
 {
     /**
-     * 入口
+     * 入口.
      *
-     * @param [type] $request
+     * @param [type]   $request
      * @param \Closure $next
-     * @param [type] $permissions 验证的规则
+     * @param [type]   $permissions 验证的规则
+     *
      * @return void
      */
     public function handle($request, \Closure $next, $permissions)

src/Models/HasPermissionAccess.php

@@ -1,9 +1,10 @@
 <?php
+
 namespace xiaodi\Permission\Models;
 
 use think\Model;
 
 class HasPermissionAccess extends Model
 {
     protected $table = 'auth_has_permission';
-}
+}

src/Models/Permission.php

@@ -1,13 +1,13 @@
 <?php
+
 namespace xiaodi\Permission\Models;
 
 use think\Model;
 use think\model\relation\BelongsToMany;
 use xiaodi\Permission\Contract\Permission as PermissionContract;
 
 /**
- * 权限模型
- * 
+ * 权限模型.
  */
 class Permission extends Model implements PermissionContract
 {
@@ -22,9 +22,9 @@ public function __construct($data = [])
 
         parent::__construct($data);
     }
-    
+
     /**
-     * 获取具有此权限的角色
+     * 获取具有此权限的角色.
      *
      * @return BelongsToMany
      */
@@ -41,15 +41,16 @@ public function roles():BelongsToMany
     }
 
     /**
-     * 将规则分配到角色
+     * 将规则分配到角色.
      *
      * @param [type] $roles
+     *
      * @return void
      */
     public function assignRole(...$roles)
     {
         $class = config('permission.models.role');
-        $model = new $class;
+        $model = new $class();
 
         $roles = $model->where('name', 'in', $roles)->select();
 
@@ -59,29 +60,29 @@ public function assignRole(...$roles)
             $permission = $this->toArray()['name'];
 
             // 插入到权限表
-            foreach($roles as $role) {
+            foreach ($roles as $role) {
                 $role->givePermissionTo($permission);
             }
         }
     }
 
     /**
-     * 删除角色权限
+     * 删除角色权限.
      *
      * @return void
      */
     public function removeRole(...$roles)
     {
         $class = config('permission.models.role');
-        $model = new $class;
+        $model = new $class();
 
         $roles = $model->where('name', 'in', $roles)->select();
 
         // 同步删除 规则、角色中间表
         $this->roles()->detach($this->id);
 
         $name = $this->toArray()['name'];
-        foreach($roles as $role) {
+        foreach ($roles as $role) {
             $role->revokePermissionTo($name);
         }
     }

src/Models/Role.php

@@ -1,16 +1,15 @@
 <?php
+
 namespace xiaodi\Permission\Models;
 
 use think\Model;
-
 use think\model\relation\BelongsToMany;
-use xiaodi\Permission\Traits\HasRoles;
-use xiaodi\Permission\Traits\HasPermissions;
 use xiaodi\Permission\Contract\Role as RoleContract;
+use xiaodi\Permission\Traits\HasPermissions;
+use xiaodi\Permission\Traits\HasRoles;
 
 /**
- * 角色模型
- * 
+ * 角色模型.
  */
 class Role extends Model implements RoleContract
 {
@@ -42,7 +41,7 @@ public function access():BelongsToMany
     }
 
     /**
-     * 获取(用户直接，角色)分配的权限
+     * 获取(用户直接，角色)分配的权限.
      *
      * @return void
      */
@@ -55,7 +54,7 @@ public function permissions()
     }
 
     /**
-     * 删除角色所有权限
+     * 删除角色所有权限.
      *
      * @return void
      */
@@ -73,29 +72,32 @@ public function revokePermissionTo(string $name)
     }
 
     /**
-     * 通过id获取详情
+     * 通过id获取详情.
+     *
+     * @param int $id
      *
-     * @param integer $id
      * @return void
      */
     public function getById(int $id)
     {
         $res = $this->get($id);
+
         return $res;
     }
 
     /**
-     * 通过name获取详情
+     * 通过name获取详情.
      *
      * @param string $name
+     *
      * @return void
      */
     public function getByName(string $name)
     {
         $res = $this->get([
-            'name' => $name
+            'name' => $name,
         ]);
-        
+
         return $res;
     }
 }