BREAKING CHANGE: upgrade to PHP 8.0 and PHP-Casbin 4.0

leeqvip · leeqvip · commit 1b7c7e9c7219 · 2024-11-29T17:32:53.000+08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,11 +23,9 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ 7.2, 7.3,7.4,8.0 ]
+        php: [ 8.1, 8.2, 8.3, 8.4 ]        
 
-        stability: [ prefer-lowest, prefer-stable ]            
-
-    name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
+    name: PHP ${{ matrix.php }}
 
     steps:
       - name: Checkout code
@@ -57,7 +55,7 @@ jobs:
           COVERALLS_PARALLEL: true
           COVERALLS_FLAG_NAME: ${{ runner.os }} - ${{ matrix.php }}
         run: |
-          composer global require php-coveralls/php-coveralls:^2.4
+          composer global require php-coveralls/php-coveralls:^2.7
           php-coveralls --coverage_clover=build/logs/clover.xml -v
 
   upload-coverage:
diff --git a/composer.json b/composer.json
@@ -22,19 +22,17 @@
         "test": "vendor/bin/phpunit"
     },
     "require": {
-        "php": ">=7.2",
-        "codeigniter4/framework": "^4",
-        "casbin/casbin": "^3.21.6",
-        "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|^8.0|^9.0",
-        "php-coveralls/php-coveralls": "^2.1"
+        "phpunit/phpunit": "^10.0|^11.0"
     },
     "autoload-dev": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,9 +2,6 @@
 <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"/>
diff --git a/src/Config/Enforcer.php b/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' => [
diff --git a/src/Config/Services.php b/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);
diff --git a/src/EnforcerManager.php b/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']);
     }
 
     /**
diff --git a/src/Logger.php b/src/Logger.php
diff --git a/tests/EnforcerManagerTest.php b/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();

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class Services extends BaseService`
`15`	`15`	`*`
`16`	`16`	`* @return \Casbin\CodeIgniter\EnforcerManager`
`17`	`17`	`*/`
`18`		`- public static function enforcer(Enforcer $config = null, bool $getShared = true)`
	`18`	`+ public static function enforcer(?Enforcer $config = null, bool $getShared = true)`
`19`	`19`	`{`
`20`	`20`	`if ($getShared) {`
`21`	`21`	`return static::getSharedInstance('enforcer', $config);`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`use Casbin\Enforcer;`
`6`	`6`	`use Casbin\Model\Model;`
`7`	`7`	`use Casbin\Log\Log;`
	`8`	`+use Casbin\Log\Logger\DefaultLogger;`
	`9`	`+use Config\Services;`
`8`	`10`	`use InvalidArgumentException;`
`9`	`11`	`use Casbin\CodeIgniter\Config\Enforcer as EnforcerConfig;`
`10`	`12`
`@@ -75,7 +77,11 @@ protected function resolve($name)`
`75`	`77`	`}`
`76`	`78`
`77`	`79`	`if ($logger = $config['log']['logger']) {`
`78`		`- Log::setLogger(new $logger());`
	`80`	`+ if (is_string($logger)) {`
	`81`	`+ $logger = new DefaultLogger(Services::$logger());`
	`82`	`+ }`
	`83`	`+`
	`84`	`+ Log::setLogger($logger);`
`79`	`85`	`}`
`80`	`86`
`81`	`87`	`$model = new Model();`
`@@ -92,7 +98,7 @@ protected function resolve($name)`
`92`	`98`	`}`
`93`	`99`	`}`
`94`	`100`
`95`		`- return new Enforcer($model, $adapter, $config['log']['enabled']);`
	`101`	`+ return new Enforcer($model, $adapter, $logger, $config['log']['enabled']);`
`96`	`102`	`}`
`97`	`103`
`98`	`104`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,17 @@`
`2`	`2`
`3`	`3`	`namespace Casbin\CodeIgniter\Tests;`
`4`	`4`
`5`		`-use CodeIgniter\Test\CIDatabaseTestCase;`
	`5`	`+use CodeIgniter\Test\CIUnitTestCase;`
	`6`	`+use CodeIgniter\Test\DatabaseTestTrait;`
`6`	`7`	`use Config\Services`
`7`	`8`	`;`
`8`	`9`	`use Config\Autoload;`
`9`	`10`	`use Config\Modules;`
`10`	`11`
`11`		`-class EnforcerManagerTest extends CIDatabaseTestCase`
	`12`	`+class EnforcerManagerTest extends CIUnitTestCase`
`12`	`13`	`{`
	`14`	`+ use DatabaseTestTrait;`
	`15`	`+`
`13`	`16`	`protected function createApplication()`
`14`	`17`	`{`
`15`	`18`	`$app = parent::createApplication();`