Skip to content

Commit b6ed2b5

Browse files
committed
use psr3-bridge.
1 parent 8f97b3c commit b6ed2b5

File tree

5 files changed

+10
-122
lines changed

5 files changed

+10
-122
lines changed

composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"license": "Apache-2.0",
1212
"require": {
1313
"laravel/framework": "~5.1|~6.0",
14-
"casbin/casbin": "~1.0"
14+
"casbin/casbin": "~1.0",
15+
"casbin/psr3-bridge": "^1.0"
1516
},
1617
"require-dev": {
1718
"phpunit/phpunit": "~5.7|~6.0|~7.0|~8.0",

config/lauthz.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
// changes whether Lauthz will log messages to the Logger.
4040
'enabled' => false,
4141

42-
// Casbin Logger
43-
'logger' => Lauthz\Logger::class,
42+
// Casbin Logger, Supported: \Psr\Log\LoggerInterface|string
43+
'logger' => 'log',
4444
],
4545

4646
'cache' => [

src/EnforcerManager.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Lauthz;
44

5+
use Casbin\Bridge\Logger\LoggerBridge;
56
use Casbin\Enforcer;
67
use Casbin\Model\Model;
78
use Casbin\Log\Log;
@@ -77,7 +78,11 @@ protected function resolve($name)
7778
}
7879

7980
if ($logger = Arr::get($config, 'log.logger')) {
80-
Log::setLogger(new $logger($this->app['log']));
81+
if (is_string($logger)) {
82+
$logger = $this->app->make($logger);
83+
}
84+
85+
Log::setLogger(new LoggerBridge($logger));
8186
}
8287

8388
$model = new Model();

src/Logger.php

-79
This file was deleted.

tests/LoggerTest.php

-39
This file was deleted.

0 commit comments

Comments
 (0)