use psr3-bridge

Author: leeqvip

composer.json

@@ -23,12 +23,12 @@
         "casbin/casbin": "~1.0",
         "topthink/framework": "6.0.*-dev",
         "topthink/think-orm": "2.0.*-dev",
-        "topthink/think-migration": "^3.0"
+        "topthink/think-migration": "^3.0",
+        "casbin/psr3-bridge": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~7.0",
         "php-coveralls/php-coveralls": "^2.1",
-        "mockery/mockery": "^1.0",
         "topthink/think": "6.0.*-dev"
     },
     "autoload": {
@@ -51,4 +51,4 @@
             ]
         }
     }
-}
+}

config/tauthz.php

@@ -1,4 +1,5 @@
 <?php
+
 return [
     /*
      *Default Tauthz enforcer
@@ -8,8 +9,8 @@
     'log' => [
         // changes whether Lauthz will log messages to the Logger.
         'enabled' => false,
-        // Casbin Logger
-        'logger' => tauthz\Logger::class,
+        // Casbin Logger, Supported: \Psr\Log\LoggerInterface|string
+        'logger' => 'log',
     ],
 
     'enforcers' => [
@@ -40,4 +41,4 @@
             ],
         ],
     ],
-];
+];

src/TauthzService.php

@@ -1,61 +1,67 @@
 <?php
+
 namespace tauthz;
 
+use Casbin\Bridge\Logger\LoggerBridge;
 use Casbin\Enforcer;
 use Casbin\Model\Model;
 use Casbin\Log\Log;
 use think\Service;
 use tauthz\command\Publish;
 
 /**
- * Tauthz service
- * 
+ * Tauthz service.
+ *
  * @author [email protected]
  */
 class TauthzService extends Service
 {
     /**
-     * Register service
+     * Register service.
      *
      * @return void
      */
     public function register()
     {
         // 注册数据迁移服务
         $this->app->register(\think\migration\Service::class);
-        
+
         // 绑定 Casbin决策器
         $this->app->bind('enforcer', function () {
-            $default = $this->app->config->get("tauthz.default");
-            
-            $config = $this->app->config->get("tauthz.enforcers.".$default);
+            $default = $this->app->config->get('tauthz.default');
+
+            $config = $this->app->config->get('tauthz.enforcers.'.$default);
             $adapter = $config['adapter'];
-            
+
             $configType = $config['model']['config_type'];
-            
+
             $model = new Model();
             if ('file' == $configType) {
                 $model->loadModel($config['model']['config_file_path']);
             } elseif ('text' == $configType) {
                 $model->loadModel($config['model']['config_text']);
             }
-            
-            return new Enforcer($model, app($adapter), $this->app->config->get("tauthz.log.enabled", false));
+
+            return new Enforcer($model, app($adapter), $this->app->config->get('tauthz.log.enabled', false));
         });
     }
 
     /**
-     * Boot function
+     * Boot function.
      *
      * @return void
      */
     public function boot()
     {
-        $this->mergeConfigFrom(__DIR__ . '/../config/tauthz.php', 'tauthz');
+        $this->mergeConfigFrom(__DIR__.'/../config/tauthz.php', 'tauthz');
 
         // 设置 Casbin Logger
-        if ($logger = $this->app->config->get("tauthz.log.logger")){            
-            Log::setLogger(new $logger($this->app->log));
+        if ($logger = $this->app->config->get('tauthz.log.logger')) {
+            if (is_string($logger)) {
+                $logger = $this->app->make($logger);
+            }
+
+            Log::setLogger(new LoggerBridge($logger));
         }
 
         $this->commands(['tauthz:publish' => Publish::class]);
@@ -64,8 +70,9 @@ public function boot()
     /**
      * Merge the given configuration with the existing configuration.
      *
-     * @param  string  $path
-     * @param  string  $key
+     * @param string $path
+     * @param string $key
+     *
      * @return void
      */
     protected function mergeConfigFrom(string $path, string $key)
@@ -74,4 +81,4 @@ protected function mergeConfigFrom(string $path, string $key)
 
         $this->app->config->set(array_merge(require $path, $config), $key);
     }
-}
+}