From 49cf20174ef1b4d31c13434485d65567f3b88ce0 Mon Sep 17 00:00:00 2001
From: Tinywan <756684177@qq.com>
Date: Sun, 12 Mar 2023 12:40:50 +0800
Subject: [PATCH] fix: $driver type update ?string  $driver

---
 src/Adapter/DatabaseAdapter.php | 4 ++--
 src/Model/RuleModel.php         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Adapter/DatabaseAdapter.php b/src/Adapter/DatabaseAdapter.php
index 01187b3..d440ec5 100644
--- a/src/Adapter/DatabaseAdapter.php
+++ b/src/Adapter/DatabaseAdapter.php
@@ -33,14 +33,14 @@ class DatabaseAdapter implements Adapter, UpdatableAdapter, BatchAdapter, Filter
     /**
      * @var bool
      */
-    private $filtered = false;
+    private bool $filtered = false;
 
     /**
      * RuleModel model.
      *
      * @var RuleModel
      */
-    protected $model;
+    protected RuleModel $model;
 
     /**
      * the DatabaseAdapter constructor.
diff --git a/src/Model/RuleModel.php b/src/Model/RuleModel.php
index d9adaea..466b9ce 100644
--- a/src/Model/RuleModel.php
+++ b/src/Model/RuleModel.php
@@ -34,8 +34,8 @@ class RuleModel extends Model implements Arrayable
         'v5'    => 'string'
     ];
 
-    /** @var string $driver */
-    protected string $driver;
+    /** @var string|null $driver */
+    protected ?string  $driver;
 
     /**
      * 架构函数
@@ -61,7 +61,7 @@ public function __construct(array $data = [], ?string $driver = null)
      */
     protected function config(string $key = null, $default = null)
     {
-        $driver = $this->driver ?? config('plugin.casbin.webman-permission.permission.default');
+        $driver = $this->driver ?: config('plugin.casbin.webman-permission.permission.default');
         return config('plugin.casbin.webman-permission.permission.' . $driver . '.' . $key, $default);
     }
 }
\ No newline at end of file