Fixed bugs in Adapter and updated composer.json.

Author: leeqvip

composer.json

@@ -1,6 +1,16 @@
 {
     "name": "casbin/think-authz",
-    "keywords": ["thinkphp", "casbin", "permission", "access-control", "authorization", "rbac", "acl", "abac", "authz"],
+    "keywords": [
+        "thinkphp",
+        "casbin",
+        "permission",
+        "access-control",
+        "authorization",
+        "rbac",
+        "acl",
+        "abac",
+        "authz"
+    ],
     "description": "An authorization library that supports access control models like ACL, RBAC, ABAC in ThinkPHP 6. ",
     "authors": [
         {
@@ -10,15 +20,16 @@
     ],
     "license": "Apache-2.0",
     "require": {
-    	"casbin/casbin": ">=0.2.1",
-        "topthink/framework": "6.0.x-dev",
+        "casbin/casbin": "~1.0",
+        "topthink/framework": "6.0.*-dev",
+        "topthink/think-orm": "2.0.*-dev",
         "topthink/think-migration": "^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~7.0",
         "php-coveralls/php-coveralls": "^2.1",
         "mockery/mockery": "^1.0",
-        "topthink/think": "6.0.x-dev"
+        "topthink/think": "6.0.*-dev"
     },
     "autoload": {
         "psr-4": {
@@ -27,7 +38,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-          "tauthz\\tests\\": "tests/"
+            "tauthz\\tests\\": "tests/"
         }
     },
     "config": {
@@ -40,4 +51,4 @@
             ]
         }
     }
-}
+}

src/adapter/DatabaseAdapter.php

@@ -60,7 +60,9 @@ public function loadPolicy($model)
     {
         $rows = $this->model->select()->toArray();
         foreach ($rows as $row) {
-            $line = implode(', ', array_slice(array_values($row), 1));
+            $line = implode(', ', array_filter(array_slice($row, 1),function($val){
+                return $val != "" && !is_null($val);
+            }));
             $this->loadPolicyLine(trim($line), $model);
         }
     }