Use psr3-bridge.

Author: leeqvip

composer.json

@@ -20,7 +20,8 @@
     ],
     "require": {
         "codeigniter4/framework": "^4@rc",
-        "casbin/casbin": "^1.0"
+        "casbin/casbin": "^2.0",
+        "casbin/psr3-bridge": "^1.1"
     },
     "autoload": {
         "psr-4": {
@@ -36,4 +37,4 @@
             "Casbin\\CodeIgniter\\Tests\\": "tests/"
         }
     }
-}
+}

src/Adapters/DatabaseAdapter.php

@@ -1,7 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Casbin\CodeIgniter\Adapters;
 
+use Casbin\Model\Model;
 use Casbin\Persist\Adapter;
 use Casbin\Persist\AdapterHelper;
 use Casbin\CodeIgniter\Models\RuleModel;
@@ -46,7 +49,7 @@ public function __construct(array $config)
      * @param string $ptype
      * @param array  $rule
      */
-    public function savePolicyLine($ptype, array $rule)
+    public function savePolicyLine(string $ptype, array $rule): void
     {
         $col['ptype'] = $ptype;
         foreach ($rule as $key => $value) {
@@ -60,12 +63,10 @@ public function savePolicyLine($ptype, array $rule)
      * loads all policy rules from the storage.
      *
      * @param Model $model
-     *
-     * @return mixed
      */
-    public function loadPolicy($model)
+    public function loadPolicy(Model $model): void
     {
-        $rows = $this->model->getAllFromCache();        
+        $rows = $this->model->getAllFromCache();
 
         foreach ($rows as $row) {
             $line = implode(', ', array_filter($row, function ($val) {
@@ -79,39 +80,33 @@ public function loadPolicy($model)
      * saves all policy rules to the storage.
      *
      * @param Model $model
-     *
-     * @return bool
      */
-    public function savePolicy($model)
+    public function savePolicy(Model $model): void
     {
-        foreach ($model->model['p'] as $ptype => $ast) {
+        foreach ($model['p'] as $ptype => $ast) {
             foreach ($ast->policy as $rule) {
                 $this->savePolicyLine($ptype, $rule);
             }
         }
 
-        foreach ($model->model['g'] as $ptype => $ast) {
+        foreach ($model['g'] as $ptype => $ast) {
             foreach ($ast->policy as $rule) {
                 $this->savePolicyLine($ptype, $rule);
             }
         }
-
-        return true;
     }
 
     /**
-     * Adds a policy rule to the storage.
+     * adds a policy rule to the storage.
      * This is part of the Auto-Save feature.
      *
      * @param string $sec
      * @param string $ptype
      * @param array  $rule
-     *
-     * @return mixed
      */
-    public function addPolicy($sec, $ptype, $rule)
+    public function addPolicy(string $sec, string $ptype, array $rule): void
     {
-        return $this->savePolicyLine($ptype, $rule);
+        $this->savePolicyLine($ptype, $rule);
     }
 
     /**
@@ -120,10 +115,8 @@ public function addPolicy($sec, $ptype, $rule)
      * @param string $sec
      * @param string $ptype
      * @param array  $rule
-     *
-     * @return mixed
      */
-    public function removePolicy($sec, $ptype, $rule)
+    public function removePolicy(string $sec, string $ptype, array $rule): void
     {
         $count = 0;
 
@@ -138,8 +131,6 @@ public function removePolicy($sec, $ptype, $rule)
                 ++$count;
             }
         }
-
-        return $count;
     }
 
     /**
@@ -149,11 +140,9 @@ public function removePolicy($sec, $ptype, $rule)
      * @param string $sec
      * @param string $ptype
      * @param int    $fieldIndex
-     * @param mixed  ...$fieldValues
-     *
-     * @return mixed
+     * @param string ...$fieldValues
      */
-    public function removeFilteredPolicy($sec, $ptype, $fieldIndex, ...$fieldValues)
+    public function removeFilteredPolicy(string $sec, string $ptype, int $fieldIndex, string ...$fieldValues): void
     {
         $count = 0;
 
@@ -171,7 +160,5 @@ public function removeFilteredPolicy($sec, $ptype, $fieldIndex, ...$fieldValues)
                 ++$count;
             }
         }
-
-        return $count;
     }
 }

src/Logger.php

@@ -3,68 +3,16 @@
 namespace Casbin\CodeIgniter;
 
 use Casbin\Log\Logger as LoggerContract;
+use Casbin\Bridge\Logger\LoggerBridge;
+use Config\Services;
 
-class Logger implements LoggerContract
+class Logger extends LoggerBridge implements LoggerContract
 {
-    public $enable = false;
-
-    /**
-     * controls whether print the message.
-     *
-     * @param bool $enable
-     */
-    public function enableLog($enable)
-    {
-        $this->enable = $enable;
-    }
-
-    /**
-     * returns if logger is enabled.
-     *
-     * @return bool
-     */
-    public function isEnabled()
-    {
-        return $this->enable;
-    }
-
     /**
-     * formats using the default formats for its operands and logs the message.
-     *
-     * @param mixed ...$v
-     *
-     * @return mixed
+     * LoggerBridge constructor.
      */
-    public function write(...$v)
+    public function __construct()
     {
-        if (!$this->enable) {
-            return;
-        }
-        $content = '';
-        foreach ($v as $value) {
-            if (\is_array($value) || \is_object($value)) {
-                $value = json_encode($value);
-            }
-            $content .= $value;
-        }
-
-        log_message('info', $content);
-    }
-
-    /**
-     * formats according to a format specifier and logs the message.
-     *
-     * @param $format
-     * @param mixed ...$v
-     *
-     * @return mixed
-     */
-    public function writef($format, ...$v)
-    {
-        if (!$this->enable) {
-            return;
-        }
-
-        log_message('info', sprintf($format, ...$v));
+        parent::__construct(Services::logger(true));
     }
 }