From 0692645799905d820773a9b7983ffcc824e2d6f6 Mon Sep 17 00:00:00 2001 From: Jon Lee Date: Sat, 7 Jun 2025 00:58:48 +0800 Subject: [PATCH 1/3] feat: upgrade php-casbin 4.0 BREAKING CHANGE: upgrade to PHP 8.1 and PHP-Casbin 4.0 --- .github/workflows/build.yml | 2 +- .gitignore | 4 +++- composer.json | 9 ++++---- phpunit.xml | 42 +++++++++++++++++++------------------ 4 files changed, 31 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7798aa..76e6071 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ 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 }} diff --git a/.gitignore b/.gitignore index 39ae54f..01784ff 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,6 @@ composer.lock *.iml # coverage report -/build \ No newline at end of file +/build + +.phpunit.* \ No newline at end of file diff --git a/composer.json b/composer.json index 7048ea6..19e125a 100644 --- 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 index e34bc8d..f5ead57 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,28 +1,30 @@ - - - - ./tests/ - - - - - ./src - - - - - - - - - + stopOnFailure="false" + xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"> + + + ./src + + + + + + + + + ./tests/ + + + + + + \ No newline at end of file From 077a1e8ad563b3c678f64c23100af2106219a19b Mon Sep 17 00:00:00 2001 From: Jon Lee Date: Sat, 7 Jun 2025 01:07:40 +0800 Subject: [PATCH 2/3] chore: update github action badges --- .github/workflows/{build.yml => phpunit.yml} | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{build.yml => phpunit.yml} (99%) diff --git a/.github/workflows/build.yml b/.github/workflows/phpunit.yml similarity index 99% rename from .github/workflows/build.yml rename to .github/workflows/phpunit.yml index 76e6071..0e109ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/phpunit.yml @@ -1,4 +1,4 @@ -name: build +name: PHPUnit on: push: diff --git a/README.md b/README.md index 3bf7552..189fecd 100644 --- 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) From a9d69308c45e5ddc54e8c78226a8b24f5db24213 Mon Sep 17 00:00:00 2001 From: Jon Lee Date: Sat, 7 Jun 2025 01:10:23 +0800 Subject: [PATCH 3/3] ci: update node version --- .github/workflows/phpunit.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 0e109ed..6fc02ae 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -44,7 +44,7 @@ jobs: 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: