Merge pull request #15 from php-casbin/develop

leeqvip · web-flow · commit 81d1f7aedd77 · 2025-05-17T14:08:11.000+08:00
upgrade to PHP 8.0 and PHP-Casbin 4.0
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.3, 7.4, 8.0, 8.1, 8.2]
+        php: [8.1, 8.2, 8.3, 8.4]
         stability: [prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
diff --git a/composer.json b/composer.json
@@ -10,12 +10,12 @@
     ],
     "license": "Apache-2.0",
     "require": {
-        "php": ">=7.2.0",
-        "cakephp/cakephp": "~4.0|~5.0",
-        "casbin/casbin": "~3.1"
+        "php": ">=8.1",
+        "cakephp/cakephp": "~5.0",
+        "casbin/casbin": "~4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~8.5.0 || ^9.3"
+        "phpunit/phpunit": "^10.1"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    colors="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    bootstrap="vendor/autoload.php"
-    >
+<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">
 
     <!-- Add any additional test suites you want to run here -->
     <testsuites>
@@ -13,15 +14,21 @@
         </testsuite>
     </testsuites>
 
+    <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>
+
     <!-- Ignore vendor tests in code coverage reports -->
-    <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>
+    <source>
+        <include>
+            <directory>./src</directory>
+        </include>
+    </source>
+
 </phpunit>
