Added unit testing and fixes to upgrade casbin to 1.0 generated bugs.

Author: leeqvip

.gitignore

@@ -6,4 +6,6 @@ composer.lock
 *.iml
 
 # coverage report
-/build
+/build
+
+log

README.md

@@ -1,6 +1,8 @@
 Think-Casbin
 ====
 
+[![Build Status](https://travis-ci.org/php-casbin/think-casbin.svg?branch=master)](https://travis-ci.org/php-casbin/think-casbin)
+[![Coverage Status](https://coveralls.io/repos/github/php-casbin/think-casbin/badge.svg)](https://coveralls.io/github/php-casbin/think-casbin)
 [![Latest Stable Version](https://poser.pugx.org/casbin/think-adapter/v/stable)](https://packagist.org/packages/casbin/think-adapter)
 [![Total Downloads](https://poser.pugx.org/casbin/think-adapter/downloads)](https://packagist.org/packages/casbin/think-adapter)
 [![License](https://poser.pugx.org/casbin/think-adapter/license)](https://packagist.org/packages/casbin/think-adapter)

autoload.php

@@ -0,0 +1,10 @@
+<?php
+
+require_once __DIR__.'/vendor/autoload.php';
+
+interface LoggerInterface
+{
+}
+class_alias(\think\facade\Env::class, 'Env');
+class_alias(\think\facade\Route::class, 'Route');
+class_alias(LoggerInterface::class, 'think\LoggerInterface');

composer.json

@@ -10,16 +10,27 @@
     ],
     "license": "Apache-2.0",
     "require": {
+        "topthink/think": "5.1.*",
         "topthink/think-migration": "^2.0",
     	"casbin/casbin": "1.*"
     },
+    "require-dev": {
+        "phpunit/phpunit": "~5.7|~6.0|~7.0",
+        "php-coveralls/php-coveralls": "^2.1"        
+    },
     "autoload": {
         "psr-4": {
             "CasbinAdapter\\Think\\": "src/"
         },
         "files": [
             "helper.php"
         ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "CasbinAdapter\\Think\\Tests\\": "tests/",
+            "think\\": "vendor/topthink/framework/library/think/",
+            "traits\\": "vendor/topthink/framework/library/traits/"
+        }
     }
-   
 }

config/casbin-basic-model.conf

@@ -4,8 +4,11 @@ r = sub, obj, act
 [policy_definition]
 p = sub, obj, act
 
+[role_definition]
+g = _, _
+
 [policy_effect]
 e = some(where (p.eft == allow))
 
 [matchers]
-m = r.sub == p.sub && r.obj == p.obj && r.act == p.act
+m = g(r.sub, p.sub) && r.obj == p.obj && r.act == p.act

database/migrations/20181113071924_casbin_rule.php

@@ -41,6 +41,6 @@ public function up()
     public function down()
     {
         $table = $this->table(config('casbin.database.casbin_rules_name'));
-        $table->delete();
+        $table->drop();
     }
 }

helper.php

@@ -4,6 +4,7 @@
     \think\Console::addDefaultCommands([
         'casbin:publish' => \CasbinAdapter\Think\Commands\Publish::class,
         'casbin:migrate' => \CasbinAdapter\Think\Commands\Migrate::class,
+        'casbin:rollback' => \CasbinAdapter\Think\Commands\Rollback::class,
     ]);
 }
 

phpunit.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
+    <testsuites>
+        <testsuite name="Application Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <log type="coverage-html" target="build/html"/>
+    </logging>
+    <php>
+        <env name="DATABASE_DATABASE" value="casbin"/>
+    </php>
+</phpunit>

src/Adapter.php

@@ -36,7 +36,9 @@ public function loadPolicy($model)
         $rows = $this->casbinRule->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);
         }
     }

src/Commands/Migrate.php

@@ -3,44 +3,14 @@
 namespace CasbinAdapter\Think\Commands;
 
 use think\migration\command\migrate\Run as MigrateRun;
-use Db;
 
 class Migrate extends MigrateRun
 {
+    use MigrateTrait;
+
     protected function configure()
     {
         parent::configure();
         $this->setName('casbin:migrate')->setDescription('Migrate the database for Casbin');
     }
-
-    protected function getPath()
-    {
-        return __DIR__.'/../../database/migrations';
-    }
-
-    protected function getDbConfig()
-    {
-        $connection = config('casbin.database.connection') ?: config('database.default');
-
-        if ($connection) {
-            $config = Db::connect()->getConfig();
-            $config = $config[$connection];
-            $dbConfig = [
-                'adapter' => $config['type'],
-                'host' => $config['hostname'],
-                'name' => $config['database'],
-                'user' => $config['username'],
-                'pass' => $config['password'],
-                'port' => $config['hostport'],
-                'charset' => $config['charset'],
-                'table_prefix' => $config['prefix'],
-            ];
-
-            $dbConfig['default_migration_table'] = $this->getConfig('table', $dbConfig['table_prefix'].'migrations');
-
-            return $dbConfig;
-        }
-
-        return parent::getDbConfig();
-    }
 }