Added Casbin 2.0 support

Author: leeqvip

.travis.yml

@@ -2,8 +2,6 @@ language: php
 sudo: false
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
   - 7.3

composer.json

@@ -10,11 +10,11 @@
     ],
     "license": "Apache-2.0",
     "require": {
-    	"casbin/casbin": "~1.0",
-        "techone/database": ">=0.2.0"
+        "casbin/casbin": "^2.0",
+        "techone/database": "^0.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.7|~6.0|~7.0",
+        "phpunit/phpunit": "~7.0",
         "php-coveralls/php-coveralls": "^2.1"
     },
     "autoload": {

src/Adapter.php

@@ -2,6 +2,7 @@
 
 namespace CasbinAdapter\Database;
 
+use Casbin\Model\Model;
 use Casbin\Persist\Adapter as AdapterContract;
 use TechOne\Database\Manager;
 use Casbin\Persist\AdapterHelper;
@@ -56,7 +57,12 @@ public function savePolicyLine($ptype, array $rule)
         $this->connection->execute($sql, array_values($col));
     }
 
-    public function loadPolicy($model)
+    /**
+     * loads all policy rules from the storage.
+     *
+     * @param Model $model
+     */
+    public function loadPolicy(Model $model): void
     {
         $rows = $this->connection->query('SELECT ptype, v0, v1, v2, v3, v4, v5 FROM '.$this->casbinRuleTableName.'');
 
@@ -68,29 +74,47 @@ public function loadPolicy($model)
         }
     }
 
-    public function savePolicy($model)
+    /**
+     * saves all policy rules to the storage.
+     *
+     * @param Model $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;
     }
 
-    public function addPolicy($sec, $ptype, $rule)
+    /**
+     * adds a policy rule to the storage.
+     * This is part of the Auto-Save feature.
+     *
+     * @param string $sec
+     * @param string $ptype
+     * @param array  $rule
+     */
+    public function addPolicy(string $sec, string $ptype, array $rule): void
     {
-        return $this->savePolicyLine($ptype, $rule);
+        $this->savePolicyLine($ptype, $rule);
     }
 
-    public function removePolicy($sec, $ptype, $rule)
+    /**
+     * This is part of the Auto-Save feature.
+     *
+     * @param string $sec
+     * @param string $ptype
+     * @param array  $rule
+     */
+    public function removePolicy(string $sec, string $ptype, array $rule): void
     {
         $where['ptype'] = $ptype;
         $condition[] = 'ptype = :ptype';
@@ -101,10 +125,19 @@ public function removePolicy($sec, $ptype, $rule)
 
         $sql = 'DELETE FROM '.$this->casbinRuleTableName.' WHERE '.implode(' AND ', $condition);
 
-        return $this->connection->execute($sql, $where);
+        $this->connection->execute($sql, $where);
     }
 
-    public function removeFilteredPolicy($sec, $ptype, $fieldIndex, ...$fieldValues)
+    /**
+     * RemoveFilteredPolicy removes policy rules that match the filter from the storage.
+     * This is part of the Auto-Save feature.
+     *
+     * @param string $sec
+     * @param string $ptype
+     * @param int    $fieldIndex
+     * @param string ...$fieldValues
+     */
+    public function removeFilteredPolicy(string $sec, string $ptype, int $fieldIndex, string ...$fieldValues): void
     {
         $where['ptype'] = $ptype;
         $condition[] = 'ptype = :ptype';
@@ -119,6 +152,6 @@ public function removeFilteredPolicy($sec, $ptype, $fieldIndex, ...$fieldValues)
 
         $sql = 'DELETE FROM '.$this->casbinRuleTableName.' WHERE '.implode(' AND ', $condition);
 
-        return $this->connection->execute($sql, $where);
+        $this->connection->execute($sql, $where);
     }
 }