fix: Improve some coding

.github/workflows/build.yml → .github/workflows/phpunit.yml

@@ -1,4 +1,4 @@
-name: build
+name: PHPUnit
 
 on:
   push:
@@ -46,6 +46,9 @@ jobs:
           - php: 8.3
             laravel: 11.*
             phpunit: ~10.5
+          - php: 8.4
+            laravel: 11.*
+            phpunit: ~10.5
 
     name: Laravel${{ matrix.laravel }}-PHP${{ matrix.php }}
 

README.md

@@ -8,7 +8,7 @@
 
 <p align="center">
     <a href="https://github.com/php-casbin/laravel-authz/actions">
-        <img src="https://github.com/php-casbin/laravel-authz/actions/workflows/build.yml/badge.svg?branch=master" alt="Build Status">
+        <img src="https://github.com/php-casbin/laravel-authz/actions/workflows/phpunit.yml/badge.svg" alt="PHPUnit Status">
     </a>
     <a href="https://coveralls.io/github/php-casbin/laravel-authz">
         <img src="https://coveralls.io/repos/github/php-casbin/laravel-authz/badge.svg" alt="Coverage Status">
@@ -123,6 +123,13 @@ if (Enforcer::enforce("eve", "articles", "edit")) {
 
 ```
 
+By default, [Gate](https://laravel.com/docs/11.x/authorization#gates) checks will be automatically intercepted
+. You can check if a user has a permission with Laravel's default `can` function:
+
+```php
+$user->can('articles,read');
+```
+
 ### Using Enforcer Api
 
 It provides a very rich api to facilitate various operations on the Policy:

src/Adapters/DatabaseAdapter.php

@@ -14,7 +14,6 @@
 use Casbin\Persist\AdapterHelper;
 use DateTime;
 use Casbin\Exceptions\InvalidFilterTypeException;
-use Illuminate\Support\Facades\DB;
 
 /**
  * DatabaseAdapter.
@@ -28,14 +27,14 @@ class DatabaseAdapter implements DatabaseAdapterContract, BatchDatabaseAdapterCo
     /**
      * @var bool
      */
-    private $filtered = false;
+    private bool $filtered = false;
 
     /**
      * Rules eloquent model.
      *
      * @var Rule
      */
-    protected $eloquent;
+    protected Rule $eloquent;
 
     /**
      * the DatabaseAdapter constructor.
@@ -331,10 +330,8 @@ public function loadFilteredPolicy(Model $model, $filter): void
         }
         $rows = $instance->get()->makeHidden(['created_at','updated_at', 'id'])->toArray();
         foreach ($rows as $row) {
-            $row = array_filter($row, function($value) { return !is_null($value) && $value !== ''; });
-            $line = implode(', ', array_filter($row, function ($val) {
-                return '' != $val && !is_null($val);
-            }));
+            $row = array_filter($row, static fn($value): bool => !is_null($value) && $value !== '');
+            $line = implode(', ', array_filter($row, static fn ($val): bool => '' != $val && !is_null($val)));
             $this->loadPolicyLine(trim($line), $model);
         }
         $this->setFiltered(true);

src/Commands/GroupAdd.php

@@ -33,7 +33,7 @@ class GroupAdd extends Command
     public function handle()
     {
         $params = explode(',', $this->argument('policy'));
-        array_walk($params, function (&$value) {
+        array_walk($params, static function (&$value): void {
             $value = trim($value);
         });
         $ret = Enforcer::addGroupingPolicy(...$params);

src/Commands/PolicyAdd.php

@@ -33,7 +33,7 @@ class PolicyAdd extends Command
     public function handle()
     {
         $params = explode(',', $this->argument('policy'));
-        array_walk($params, function (&$value) {
+        array_walk($params, static function (&$value): void {
             $value = trim($value);
         });
         $ret = Enforcer::addPolicy(...$params);

src/EnforcerLocalizer.php

@@ -4,23 +4,24 @@
 
 use Illuminate\Contracts\Auth\Access\Authorizable;
 use Illuminate\Contracts\Auth\Access\Gate;
+use Illuminate\Foundation\Application;
 use Lauthz\Facades\Enforcer;
 
 class EnforcerLocalizer
 {
     /**
      * The application instance.
      *
-     * @var \Illuminate\Foundation\Application
+     * @var Application
      */
-    protected $app;
+    protected Application $app;
 
     /**
      * Create a new localizer instance.
      *
-     * @param \Illuminate\Foundation\Application $app
+     * @param Application $app
      */
-    public function __construct($app)
+    public function __construct(Application $app)
     {
         $this->app = $app;
     }

src/EnforcerManager.php

@@ -8,6 +8,7 @@
 use Casbin\Log\Logger\DefaultLogger;
 use Lauthz\Contracts\Factory;
 use Lauthz\Models\Rule;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Arr;
 use InvalidArgumentException;
 use Lauthz\Loaders\ModelLoaderManager;
@@ -20,23 +21,23 @@ class EnforcerManager implements Factory
     /**
      * The application instance.
      *
-     * @var \Illuminate\Foundation\Application
+     * @var \
      */
-    protected $app;
+    protected Application $app;
 
     /**
      * The array of created "guards".
      *
      * @var array
      */
-    protected $guards = [];
+    protected array $guards = [];
 
     /**
      * Create a new manager instance.
      *
-     * @param \Illuminate\Foundation\Application $app
+     * @param Application $app
      */
-    public function __construct($app)
+    public function __construct(Application $app)
     {
         $this->app = $app;
     }

src/LauthzServiceProvider.php

@@ -51,17 +51,11 @@ protected function bootObserver()
      */
     public function register()
     {
-        $this->app->singleton('enforcer', function ($app) {
-            return new EnforcerManager($app);
-        });
+        $this->app->singleton('enforcer', fn ($app) => new EnforcerManager($app));
 
-        $this->app->singleton(ModelLoaderManager::class, function ($app) {
-            return new ModelLoaderManager($app);
-        });
+        $this->app->singleton(ModelLoaderManager::class, fn ($app) => new ModelLoaderManager($app));
 
-        $this->app->singleton(EnforcerLocalizer::class, function ($app) {
-            return new EnforcerLocalizer($app);
-        });
+        $this->app->singleton(EnforcerLocalizer::class, fn ($app) => new EnforcerLocalizer($app));
     }
 
     /**

src/Loaders/FileLoader.php

@@ -13,7 +13,7 @@ class FileLoader implements ModelLoader
      *
      * @var string
      */
-    private $filePath;
+    private string $filePath;
 
     /**
      * Constructor to initialize the file path.

src/Loaders/TextLoader.php

@@ -13,7 +13,7 @@ class TextLoader implements ModelLoader
      *
      * @var string
      */
-    private $text;
+    private string $text;
 
     /**
      * Constructor to initialize the model text.

src/Loaders/UrlLoader.php

@@ -14,7 +14,7 @@ class UrlLoader implements ModelLoader
      *
      * @var string
      */
-    private $url;
+    private string $url;
 
     /**
      * Constructor to initialize the url path.

src/Models/Rule.php

@@ -61,9 +61,7 @@ public function __construct(array $attributes = [], $guard = '')
      */
     public function getAllFromCache()
     {
-        $get = function () {
-            return $this->select('ptype', 'v0', 'v1', 'v2', 'v3', 'v4', 'v5')->get()->toArray();
-        };
+        $get = fn () => $this->select('ptype', 'v0', 'v1', 'v2', 'v3', 'v4', 'v5')->get()->toArray();
         if (!$this->config('cache.enabled', false)) {
             return $get();
         }