feat: LaravelRuleModel update

Author: Tinywan

README.md

@@ -96,16 +96,17 @@ Permission::addPolicy('writer', 'articles','edit');
 你可以检查一个用户是否拥有某个权限:
 
 ```php
-if (Permission::enforce("eve", "articles", "edit")) {
+if (\Casbin\WebmanPermission\Permission::enforce("eve", "articles", "edit")) {
     echo '恭喜你！通过权限认证';
 } else {
     echo '对不起，您没有该资源访问权限';
 }
 ```
 
-### 多套配置
+### 多套驱动配置
+
 ```php
-$permission = Permission::client("restful_conf")
+$permission = \Casbin\WebmanPermission\Permission::driver("restful_conf");
 // adds permissions to a user
 $permission->addPermissionForUser('eve', 'articles', 'read');
 // adds a role for a user.

src/Model/LaravelRuleModel.php

@@ -34,13 +34,13 @@ class LaravelRuleModel extends Model
     protected $fillable = ['ptype', 'v0', 'v1', 'v2', 'v3', 'v4', 'v5'];
 
 
-    /** @var string $driver */
-    protected string $driver;
+    /** @var string|null $driver */
+    protected ?string $driver;
 
     /**
      * 架构函数
-     * @access public
-     * @param array $data 数据
+     * @param array $data
+     * @param string|null $driver
      */
     public function __construct(array $data = [], ?string $driver = null)
     {

src/Permission.php

@@ -55,10 +55,10 @@ class Permission
      * @throws CasbinException
      * @author Lyt8384
      */
-    public static function client(?string $driver = null): Enforcer
+    public static function driver(?string $driver = null): Enforcer
     {
-        $driver = $driver ?? config('plugin.casbin.webman-permission.permission.default');
-        $config = config('plugin.casbin.webman-permission.permission.' . $driver);
+        $driver = $driver ?? self::getDefaultDriver();
+        $config = self::getConfig($driver);
 
         if (isset(static::$_manager[$driver])) {
             return static::$_manager[$driver];
@@ -81,14 +81,50 @@ public static function client(?string $driver = null): Enforcer
     }
 
     /**
-     * @param $name
+     * @desc: 获取所有驱动
+     * @return Enforcer[]
+     * @author Tinywan(ShaoBo Wan)
+     */
+    public static function getAllDriver(): array
+    {
+        return static::$_manager;
+    }
+
+    /**
+     * @desc: 默认驱动
+     * @return mixed
+     * @author Tinywan(ShaoBo Wan)
+     */
+    public static function getDefaultDriver()
+    {
+        return self::getConfig('default');
+    }
+
+    /**
+     * @desc: 获取驱动配置
+     * @param string|null $name 名称
+     * @param null $default 默认值
+     * @return mixed
+     * @author Tinywan(ShaoBo Wan)
+     */
+    public static function getConfig(string $name = null, $default = null)
+    {
+        if (!is_null($name)) {
+            return config('plugin.casbin.webman-permission.permission.' . $name, $default);
+        }
+        return config('plugin.casbin.webman-permission.permission.default');
+    }
+
+    /**
+     * @desc: 静态调用
+     * @param string $method
      * @param $arguments
      * @return mixed
      * @throws CasbinException
      * @author Tinywan(ShaoBo Wan)
      */
-    public static function __callStatic($name, $arguments)
+    public static function __callStatic(string $method, $arguments)
     {
-        return self::client()->{$name}(...$arguments);
+        return self::driver()->{$method}(...$arguments);
     }
 }

tests/Adapter.php

@@ -8,36 +8,36 @@ trait Adapter
 {
     public function testAddOtherPolicy()
     {
-        // var_dump(config('plugin.casbin.webman-permission.permission'));
-        $this->assertTrue(Permission::client('other')->addPolicy('writer', 'articles', 'edit'));
-        $this->assertTrue(Permission::client('other')->addPolicies([
+        var_dump(config('plugin.casbin.webman-permission.permission'));
+        $this->assertTrue(Permission::driver('other')->addPolicy('writer', 'articles', 'edit'));
+        $this->assertTrue(Permission::driver('other')->addPolicies([
             ['writer', 'articles', 'list'],
             ['writer', 'articles', 'delete'],
         ]));
 
-        $this->assertFalse(Permission::client('other')->addPolicies([
+        $this->assertFalse(Permission::driver('other')->addPolicies([
             ['writer', 'articles', 'list'],
             ['writer', 'articles', 'delete'],
         ]));
 
-        $this->assertTrue(Permission::client('other')->enforce('writer', 'articles', 'edit'));
-        $this->assertTrue(Permission::client('other')->enforce('writer', 'articles', 'delete'));
-        $this->assertFalse(Permission::client('other')->enforce('writer', 'articles', 'other'));
+        $this->assertTrue(Permission::driver('other')->enforce('writer', 'articles', 'edit'));
+        $this->assertTrue(Permission::driver('other')->enforce('writer', 'articles', 'delete'));
+        $this->assertFalse(Permission::driver('other')->enforce('writer', 'articles', 'other'));
 
-        $this->assertTrue(Permission::client('other')->hasPolicy('writer', 'articles', 'edit'));
-        $this->assertFalse(Permission::client('other')->hasPolicy('writer', 'articles', 'other'));
+        $this->assertTrue(Permission::driver('other')->hasPolicy('writer', 'articles', 'edit'));
+        $this->assertFalse(Permission::driver('other')->hasPolicy('writer', 'articles', 'other'));
 
-        $this->assertTrue(Permission::client('other')->removePolicy('writer', 'articles', 'edit'));
-        $this->assertFalse(Permission::client('other')->hasPolicy('writer', 'articles', 'edit'));
-        $this->assertFalse(Permission::client('other')->enforce('writer', 'articles', 'edit'));
+        $this->assertTrue(Permission::driver('other')->removePolicy('writer', 'articles', 'edit'));
+        $this->assertFalse(Permission::driver('other')->hasPolicy('writer', 'articles', 'edit'));
+        $this->assertFalse(Permission::driver('other')->enforce('writer', 'articles', 'edit'));
     }
 
     public function testAddOtherRoleForUser()
     {
-        $this->assertFalse(Permission::client('other')->hasRoleForUser('eve', 'data2'));
-        Permission::client('other')->addRoleForUser('eve', 'data2');
-        $this->assertTrue(in_array('data2', Permission::client('other')->getAllRoles()));
-        $this->assertTrue(Permission::client('other')->hasRoleForUser('eve', 'data2'));
+        $this->assertFalse(Permission::driver('other')->hasRoleForUser('eve', 'data2'));
+        Permission::driver('other')->addRoleForUser('eve', 'data2');
+        $this->assertTrue(in_array('data2', Permission::driver('other')->getAllRoles()));
+        $this->assertTrue(Permission::driver('other')->hasRoleForUser('eve', 'data2'));
     }
 
     public function testAddPermissionForUser()
@@ -82,8 +82,8 @@ public function testAddRoleForUser()
 
     public function testOtherAddPermissionForUser()
     {
-        $this->assertFalse(Permission::client('other')->enforce('eve', 'data1', 'read'));
-        Permission::client('other')->addPermissionForUser('eve', 'data1', 'read');
-        $this->assertTrue(Permission::client('other')->enforce('eve', 'data1', 'read'));
+        $this->assertFalse(Permission::driver('other')->enforce('eve', 'data1', 'read'));
+        Permission::driver('other')->addPermissionForUser('eve', 'data1', 'read');
+        $this->assertTrue(Permission::driver('other')->enforce('eve', 'data1', 'read'));
     }
 }