.github/semantic.yml

@@ -0,0 +1,2 @@
+# Always validate the PR title AND all the commits
+titleAndCommits: true

.github/workflows/phpunit.yml

@@ -0,0 +1,83 @@
+name: PHPUnit
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: casbin
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.1, 8.2, 8.3]        
+
+    name: PHP ${{ matrix.php }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: composer:v2
+          coverage: xdebug
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Install dependencies
+        if: steps.composer-cache.outputs.cache-hit != 'true'
+        run: |
+          composer install --prefer-dist --no-progress --no-suggest
+
+      - name: Run test suite
+        run: ./vendor/bin/phpunit
+
+      - name: Run Coveralls
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_PARALLEL: true
+          COVERALLS_FLAG_NAME: ${{ runner.os }} - ${{ matrix.php }}
+        run: |
+          composer global require php-coveralls/php-coveralls:^2.7
+          php-coveralls --coverage_clover=build/logs/clover.xml -v
+
+  upload-coverage:
+    runs-on: ubuntu-latest
+    needs: [ test ]
+    steps:
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true
+
+  semantic-release:
+    runs-on: ubuntu-latest
+    needs: [ test, upload-coverage ]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 'lts/*'
+
+      - name: Run semantic-release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+        run: npx semantic-release

.releaserc.yml

@@ -0,0 +1,4 @@
+plugins:
+  - "@semantic-release/commit-analyzer"
+  - "@semantic-release/release-notes-generator"
+  - "@semantic-release/github"

README.md

@@ -7,8 +7,8 @@
 </p>
 
 <p align="center">
-    <a href="https://travis-ci.org/php-casbin/codeigniter-permission">
-        <img src="https://travis-ci.org/php-casbin/codeigniter-permission.svg?branch=master" alt="Build Status">
+    <a href="https://github.com/php-casbin/codeigniter-permission/actions/workflows/phpunit.yml">
+        <img src="https://github.com/php-casbin/codeigniter-permission/actions/workflows/phpunit.yml/badge.svg" alt="Build Status">
     </a>
     <a href="https://coveralls.io/github/php-casbin/codeigniter-permission">
         <img src="https://coveralls.io/repos/github/php-casbin/codeigniter-permission/badge.svg" alt="Coverage Status">
@@ -39,10 +39,10 @@ All you need to learn to use `Casbin` first.
 
 ## Installation
 
-Require this package in the `composer.json` of your CodeIgniter project. This will download the package.
+Require this package in the `composer.json` of your `CodeIgniter 4` project. This will download the package.
 
 ```
-composer require casbin/codeigniter-permission:dev-master
+composer require casbin/codeigniter-permission
 ```
 
 To migrate the migrations, run the migrate command:

composer.json

@@ -22,23 +22,21 @@
         "test": "vendor/bin/phpunit"
     },
     "require": {
-        "php": ">=7.2",
-        "codeigniter4/framework": "^4",
-        "casbin/casbin": "^2.0",
-        "casbin/psr3-bridge": "^1.1"
+        "php": "^8.1",
+        "codeigniter4/framework": "^4.5",
+        "casbin/casbin": "^4.0.2"
     },
     "autoload": {
         "psr-4": {
             "Casbin\\CodeIgniter\\": "src/"
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0",
-        "php-coveralls/php-coveralls": "^2.1"
+        "phpunit/phpunit": "^10.0|^11.0"
     },
     "autoload-dev": {
         "psr-4": {
             "Casbin\\CodeIgniter\\Tests\\": "tests/"
         }
     }
-}
+}

phpunit.xml.dist

@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/codeigniter4/framework/tests/_support/_bootstrap.php"
+<phpunit bootstrap="vendor/codeigniter4/framework/system/Test/bootstrap.php"
         backupGlobals="false"
         colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
         stopOnError="false"
         stopOnFailure="false"
         stopOnIncomplete="false"
@@ -14,15 +11,23 @@
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="coverage-html" target="build/html"/>
-    </logging>
+
+    <coverage includeUncoveredFiles="true"
+          pathCoverage="false"
+          ignoreDeprecatedCodeUnits="true"
+          disableCodeCoverageIgnore="true">
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+            <html outputDirectory="build/html" lowUpperBound="50" highLowerBound="90"/>
+        </report>
+    </coverage>
+
+    <source>
+        <include>
+            <directory>./src</directory>
+        </include>
+    </source>
+
     <php>
         <env name="app.baseURL" value="http://example.com"/>
         <env name="database.tests.hostname" value="127.0.0.1"/>

src/Config/Enforcer.php

@@ -47,8 +47,8 @@ class Enforcer extends BaseConfig
             // changes whether Casbin will log messages to the Logger.
             'enabled' => false,
 
-            // Casbin Logger
-            'logger' => \Casbin\CodeIgniter\Logger::class,
+            // Casbin Logger, Supported: \Psr\Log\LoggerInterface|string
+            'logger' => 'logger',
         ],
 
         'cache' => [

src/Config/Services.php

@@ -15,7 +15,7 @@ class Services extends BaseService
      *
      * @return \Casbin\CodeIgniter\EnforcerManager
      */
-    public static function enforcer(Enforcer $config = null, bool $getShared = true)
+    public static function enforcer(?Enforcer $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('enforcer', $config);

src/EnforcerManager.php

@@ -5,6 +5,8 @@
 use Casbin\Enforcer;
 use Casbin\Model\Model;
 use Casbin\Log\Log;
+use Casbin\Log\Logger\DefaultLogger;
+use Config\Services;
 use InvalidArgumentException;
 use Casbin\CodeIgniter\Config\Enforcer as EnforcerConfig;
 
@@ -75,7 +77,11 @@ protected function resolve($name)
         }
 
         if ($logger = $config['log']['logger']) {
-            Log::setLogger(new $logger());
+            if (is_string($logger)) {
+                $logger = new DefaultLogger(Services::$logger());
+            }
+
+            Log::setLogger($logger);
         }
 
         $model = new Model();
@@ -92,7 +98,7 @@ protected function resolve($name)
             }
         }
 
-        return new Enforcer($model, $adapter, $config['log']['enabled']);
+        return new Enforcer($model, $adapter, $logger, $config['log']['enabled']);
     }
 
     /**

tests/EnforcerManagerTest.php

@@ -2,14 +2,17 @@
 
 namespace Casbin\CodeIgniter\Tests;
 
-use CodeIgniter\Test\CIDatabaseTestCase;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
 use Config\Services
 ;
 use Config\Autoload;
 use Config\Modules;
 
-class EnforcerManagerTest extends CIDatabaseTestCase
+class EnforcerManagerTest extends CIUnitTestCase
 {    
+    use DatabaseTestTrait;
+
     protected function createApplication()
     {
         $app = parent::createApplication();