Merge pull request #6 from php-casbin/develop

leeqvip · web-flow · commit 7f39bbded498 · 2025-06-07T01:13:38.000+08:00
feat: upgrade php-casbin 4.0
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -1,4 +1,4 @@
-name: build
+name: PHPUnit
 
 on:
   push:
@@ -37,14 +37,14 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ 5.6, 7.0, 7.1, 7.2, 7.3, 7.4 ]
+        php: [ 8.1, 8.2, 8.3 ]
         stability: [ prefer-lowest, prefer-stable ]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -87,10 +87,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ test, upload-coverage ]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: '12'
+          node-version: 'lts/*'
 
       - name: Run semantic-release
         env:
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,6 @@ composer.lock
 *.iml
 
 # coverage report
-/build
+/build
+
+.phpunit.*
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Laminas-db Adapter for PHP-Casbin
 
-[![Build Status](https://travis-ci.org/php-casbin/laminas-db-adapter.svg?branch=master)](https://travis-ci.org/php-casbin/laminas-db-adapter)
+[![PHPUnit](https://github.com/php-casbin/laminas-db-adapter/actions/workflows/phpunit.yml/badge.svg)](https://github.com/php-casbin/laminas-db-adapter/actions/workflows/phpunit.yml)
 [![Coverage Status](https://coveralls.io/repos/github/php-casbin/laminas-db-adapter/badge.svg)](https://coveralls.io/github/php-casbin/laminas-db-adapter)
 [![Latest Stable Version](https://poser.pugx.org/casbin/laminas-db-adapter/v/stable)](https://packagist.org/packages/casbin/laminas-db-adapter)
 [![Total Downloads](https://poser.pugx.org/casbin/laminas-db-adapter/downloads)](https://packagist.org/packages/casbin/laminas-db-adapter)
diff --git a/composer.json b/composer.json
@@ -21,12 +21,13 @@
         "test": "vendor/bin/phpunit"
     },
     "require": {
-        "casbin/casbin": "~3.1",
-        "laminas/laminas-db": "^2.11"
+		"php": ">=8.1",
+        "casbin/casbin": "~4.0",
+        "laminas/laminas-db": "^2.19"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.7|~6.0|~7.0",
-        "php-coveralls/php-coveralls": "^2.1"
+        "phpunit/phpunit": "~10.0",
+        "php-coveralls/php-coveralls": "^2.4"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false" backupStaticAttributes="false"
          bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false">
-    <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="DB_DATABASE" value="casbin"/>
-    </php>
+         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<coverage processUncoveredFiles="true">
+    <include>
+        <directory suffix=".php">./src</directory>
+    </include>
+    <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="DB_DATABASE" value="casbin"/>
+</php>
 </phpunit>
