casbin
/
laravel-authz
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated casbin to 1.x.

This commit is contained in:
TechLee 2019-08-09 11:59:07 +08:00 committed by root
parent 1883034043
commit 4e53d87672
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -11,7 +11,7 @@
"license": "Apache-2.0", "license": "Apache-2.0",
"require": { "require": {
"laravel/framework": "~5.1", "laravel/framework": "~5.1",
"casbin/casbin": ">=0.2.1" "casbin/casbin": "~1.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~5.7|~6.0|~7.0|~8.0", "phpunit/phpunit": "~5.7|~6.0|~7.0|~8.0",

4
src/Adapters/DatabaseAdapter.php
View File

@ -62,7 +62,9 @@ class DatabaseAdapter implements DatabaseAdapterContract
$rows = $this->eloquent->getAllFromCache(); $rows = $this->eloquent->getAllFromCache();
foreach ($rows as $row) { foreach ($rows as $row) {
$line = implode(', ', array_slice(array_values($row), 1)); $line = implode(', ', array_filter($row, function ($val) {
return '' != $val && !is_null($val);
}));
$this->loadPolicyLine(trim($line), $model); $this->loadPolicyLine(trim($line), $model);
} }
} }

10
src/Models/Rule.php
View File

@ -44,12 +44,12 @@ class Rule extends Model
/** /**
* Gets rules from caches. * Gets rules from caches.
* *
* @return void * @return mixed
*/ */
public function getAllFromCache() public function getAllFromCache()
{ {
$get = function () { $get = function () {
return $this->get()->toArray(); return $this->select('ptype', 'v0', 'v1', 'v2', 'v3', 'v4', 'v5')->get()->toArray();
}; };
if (!$this->config('cache.enabled', false)) { if (!$this->config('cache.enabled', false)) {
return $get(); return $get();
@ -60,8 +60,6 @@ class Rule extends Model
/** /**
* Refresh Cache. * Refresh Cache.
*
* @return void
*/ */
public function refreshCache() public function refreshCache()
{ {
@ -75,8 +73,6 @@ class Rule extends Model
/** /**
* Forget Cache. * Forget Cache.
*
* @return void
*/ */
public function forgetCache() public function forgetCache()
{ {
@ -85,8 +81,6 @@ class Rule extends Model
/** /**
* Init cache. * Init cache.
*
* @return void
*/ */
protected function initCache() protected function initCache()
{ {