Added Casbin 2.0 support

Author: leeqvip

composer.json

@@ -20,11 +20,11 @@
     ],
     "license": "Apache-2.0",
     "require": {
-        "casbin/casbin": "~1.0",
+        "casbin/casbin": "~2.0",
         "topthink/framework": "6.0.*-dev",
         "topthink/think-orm": "2.0.*-dev",
         "topthink/think-migration": "^3.0",
-        "casbin/psr3-bridge": "^1.0"
+        "casbin/psr3-bridge": "^1.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~7.0",

src/adapter/DatabaseAdapter.php

@@ -3,6 +3,7 @@
 namespace tauthz\adapter;
 
 use tauthz\model\Rule;
+use Casbin\Model\Model;
 use Casbin\Persist\Adapter;
 use Casbin\Persist\AdapterHelper;
 
@@ -53,15 +54,13 @@ public function savePolicyLine($ptype, array $rule)
      * loads all policy rules from the storage.
      *
      * @param Model $model
-     *
-     * @return mixed
      */
-    public function loadPolicy($model)
+    public function loadPolicy(Model $model): void
     {
         $rows = $this->model->select()->toArray();
         foreach ($rows as $row) {
-            $line = implode(', ', array_filter(array_slice($row, 1),function($val){
-                return $val != "" && !is_null($val);
+            $line = implode(', ', array_filter(array_slice($row, 1), function ($val) {
+                return '' != $val && !is_null($val);
             }));
             $this->loadPolicyLine(trim($line), $model);
         }
@@ -71,39 +70,33 @@ public function loadPolicy($model)
      * saves all policy rules to the storage.
      *
      * @param Model $model
-     *
-     * @return bool
      */
-    public function savePolicy($model)
+    public function savePolicy(Model $model): void
     {
-        foreach ($model->model['p'] as $ptype => $ast) {
+        foreach ($model['p'] as $ptype => $ast) {
             foreach ($ast->policy as $rule) {
                 $this->savePolicyLine($ptype, $rule);
             }
         }
 
-        foreach ($model->model['g'] as $ptype => $ast) {
+        foreach ($model['g'] as $ptype => $ast) {
             foreach ($ast->policy as $rule) {
                 $this->savePolicyLine($ptype, $rule);
             }
         }
-
-        return true;
     }
 
     /**
-     * Adds a policy rule to the storage.
+     * adds a policy rule to the storage.
      * This is part of the Auto-Save feature.
      *
      * @param string $sec
      * @param string $ptype
      * @param array  $rule
-     *
-     * @return mixed
      */
-    public function addPolicy($sec, $ptype, $rule)
+    public function addPolicy(string $sec, string $ptype, array $rule): void
     {
-        return $this->savePolicyLine($ptype, $rule);
+        $this->savePolicyLine($ptype, $rule);
     }
 
     /**
@@ -112,10 +105,8 @@ public function addPolicy($sec, $ptype, $rule)
      * @param string $sec
      * @param string $ptype
      * @param array  $rule
-     *
-     * @return mixed
      */
-    public function removePolicy($sec, $ptype, $rule)
+    public function removePolicy(string $sec, string $ptype, array $rule): void
     {
         $count = 0;
 
@@ -130,8 +121,6 @@ public function removePolicy($sec, $ptype, $rule)
                 ++$count;
             }
         }
-
-        return $count;
     }
 
     /**
@@ -141,11 +130,9 @@ public function removePolicy($sec, $ptype, $rule)
      * @param string $sec
      * @param string $ptype
      * @param int    $fieldIndex
-     * @param mixed  ...$fieldValues
-     *
-     * @return mixed
+     * @param string ...$fieldValues
      */
-    public function removeFilteredPolicy($sec, $ptype, $fieldIndex, ...$fieldValues)
+    public function removeFilteredPolicy(string $sec, string $ptype, int $fieldIndex, string ...$fieldValues): void
     {
         $count = 0;
 
@@ -163,7 +150,5 @@ public function removeFilteredPolicy($sec, $ptype, $fieldIndex, ...$fieldValues)
                 ++$count;
             }
         }
-        
-        return $count;
     }
 }