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

php-casbin · Oct 26, 2024 · dada306 · dada306
1 parent 434ee80
commit dada306
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 153 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,73 +27,7 @@ jobs:
         #        laravel: [ ]
         #        stability: [ prefer-lowest, prefer-stable ]
         include:
-          # Laravel 5.5
-          - php: 7.1
-            laravel: 5.5.*
-            phpunit: ~6.0
-          - php: 7.2
-            laravel: 5.5.*
-            phpunit: ~6.0
-          - php: 7.3
-            laravel: 5.5.*
-            phpunit: ~6.0
-
-          # Laravel 5.6
-          - php: 7.1
-            laravel: 5.6.*
-            phpunit: ~7.0
-          - php: 7.2
-            laravel: 5.6.*
-            phpunit: ~7.0
-          - php: 7.3
-            laravel: 5.6.*
-            phpunit: ~7.0
-
-          # Laravel 5.7
-          - php: 7.1
-            laravel: 5.7.*
-            phpunit: ~7.5
-          - php: 7.2
-            laravel: 5.7.*
-            phpunit: ~7.5
-          - php: 7.3
-            laravel: 5.7.*
-            phpunit: ~7.5
-
-          # Laravel 5.8
-          - php: 7.1
-            laravel: 5.8.*
-            phpunit: ~7.5
-          - php: 7.2
-            laravel: 5.8.*
-            phpunit: ~8.0
-          - php: 7.3
-            laravel: 5.8.*
-            phpunit: ~8.0
-
-          # Laravel 6.x
-          - php: 7.2
-            laravel: 6.*
-            phpunit: ~8.0
-          - php: 7.3
-            laravel: 6.*
-            phpunit: ~8.0
-
-          # Laravel 7.x
-          - php: 7.3
-            laravel: 7.*
-            phpunit: ~9.0
-          - php: 7.4
-            laravel: 7.*
-            phpunit: ~9.0
-
           # Laravel 8.x
-          - php: 7.3
-            laravel: 8.*
-            phpunit: ~9.0
-          - php: 7.4
-            laravel: 8.*
-            phpunit: ~9.0
           - php: 8.0
             laravel: 8.*
             phpunit: ~9.0

diff --git a/composer.json b/composer.json
@@ -20,12 +20,11 @@
     ],
     "license": "Apache-2.0",
     "require": {
-        "php": ">=7.1.0",
+        "php": ">=8.0",
         "illuminate/support": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0|~11.0",
         "illuminate/database": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0|~11.0",
         "illuminate/console": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0|~11.0",
-        "casbin/casbin": "~3.1",
-        "casbin/psr3-bridge": "^1.1"
+        "casbin/casbin": "~4.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~7.0|~8.0|~9.0|~10.5",

diff --git a/phpunit.10.xml b/phpunit.10.xml
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,36 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    backupGlobals="false" 
-    bootstrap="vendor/autoload.php" 
-    colors="true" 
-    processIsolation="false" 
-    stopOnFailure="false" 
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd">
-    <testsuites>
-        <testsuite name="Application Test Suite">
-            <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>
-
-    <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="BCRYPT_ROUNDS" value="4"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="MAIL_DRIVER" value="array"/>
-        <env name="QUEUE_CONNECTION" value="sync"/>
-        <env name="SESSION_DRIVER" value="array"/>
-
-        <env name="DB_DATABASE" value="lauthz"/>
-        <env name="DB_USERNAME" value="root"/>
-    </php>
-</phpunit>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/html"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Application Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
+  <php>
+    <env name="APP_ENV" value="testing"/>
+    <env name="BCRYPT_ROUNDS" value="4"/>
+    <env name="CACHE_DRIVER" value="array"/>
+    <env name="MAIL_DRIVER" value="array"/>
+    <env name="QUEUE_CONNECTION" value="sync"/>
+    <env name="SESSION_DRIVER" value="array"/>
+    <env name="DB_DATABASE" value="lauthz"/>
+    <env name="DB_USERNAME" value="root"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
+</phpunit>
diff --git a/src/EnforcerManager.php b/src/EnforcerManager.php
@@ -2,10 +2,10 @@
 
 namespace Lauthz;
 
-use Casbin\Bridge\Logger\LoggerBridge;
 use Casbin\Enforcer;
 use Casbin\Model\Model;
 use Casbin\Log\Log;
+use Casbin\Log\Logger\DefaultLogger;
 use Lauthz\Contracts\Factory;
 use Lauthz\Models\Rule;
 use Illuminate\Support\Arr;
@@ -80,10 +80,10 @@ protected function resolve($name)
 
         if ($logger = Arr::get($config, 'log.logger')) {
             if (is_string($logger)) {
-                $logger = $this->app->make($logger);
+                $logger = new DefaultLogger($this->app->make($logger));
             }
 
-            Log::setLogger(new LoggerBridge($logger));
+            Log::setLogger($logger);
         }
 
         $model = new Model();
@@ -98,7 +98,7 @@ protected function resolve($name)
             ]);
         }
 
-        return new Enforcer($model, $adapter, Arr::get($config, 'log.enabled', false));
+        return new Enforcer($model, $adapter, $logger, Arr::get($config, 'log.enabled', false));
     }
 
     /**

diff --git a/tests/DatabaseAdapterForCacheTest.php b/tests/DatabaseAdapterForCacheTest.php
@@ -2,11 +2,9 @@
 
 namespace Lauthz\Tests;
 
-use Enforcer;
 use Lauthz\Models\Rule;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Casbin\Persist\Adapters\Filter;
-use Casbin\Exceptions\InvalidFilterTypeException;
+use Lauthz\Facades\Enforcer;
 
 class DatabaseAdapterForCacheTest extends TestCase
 {