From ae49f18c4abf694ca69b81222ea1c582fbe7c5a8 Mon Sep 17 00:00:00 2001 From: Jon Lee Date: Tue, 25 Feb 2025 23:24:50 +0800 Subject: [PATCH] feat: Laravel 12.x Compatibility --- .github/workflows/phpunit.yml | 18 ++++++++++++++---- composer.json | 10 +++++----- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index b307b8e..08bed5d 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -49,7 +49,17 @@ jobs: - php: 8.4 laravel: 11.* phpunit: ~10.5 - + # Laravel 12.x + - php: 8.2 + laravel: 12.* + phpunit: ~11.5 + - php: 8.3 + laravel: 12.* + phpunit: ~11.5 + - php: 8.4 + laravel: 12.* + phpunit: ~11.5 + name: Laravel${{ matrix.laravel }}-PHP${{ matrix.php }} steps: @@ -74,11 +84,11 @@ jobs: composer install --prefer-dist --no-progress --no-suggest - name: Run test suite - if: matrix.laravel != '11.*' - run: ./vendor/bin/phpunit -v + if: matrix.laravel != '11.*' && matrix.laravel != '12.*' + run: ./vendor/bin/phpunit - name: Run test suite laravel 11 - if: matrix.laravel == '11.*' + if: matrix.laravel == '11.*' || matrix.laravel == '12.*' run: ./vendor/bin/phpunit -c phpunit.10.xml - name: Run Coveralls diff --git a/composer.json b/composer.json index 0849465..ed6866a 100755 --- a/composer.json +++ b/composer.json @@ -21,16 +21,16 @@ "license": "Apache-2.0", "require": { "php": ">=8.0", - "illuminate/support": "~8.0|~9.0|~10.0|~11.0", - "illuminate/database": "~8.0|~9.0|~10.0|~11.0", - "illuminate/console": "~8.0|~9.0|~10.0|~11.0", + "illuminate/support": "~8.0|~9.0|~10.0|~11.0|~12.0", + "illuminate/database": "~8.0|~9.0|~10.0|~11.0|~12.0", + "illuminate/console": "~8.0|~9.0|~10.0|~11.0|~12.0", "casbin/casbin": "~4.0" }, "require-dev": { - "phpunit/phpunit": "~9.0|~10.5", + "phpunit/phpunit": "~9.0|~10.5|^11.5.3", "php-coveralls/php-coveralls": "^2.7", "mockery/mockery": "^1.0", - "laravel/laravel": "~9.0|~10.0|~11.0" + "laravel/laravel": "~9.0|~10.0|~11.0|~12.0" }, "autoload": { "psr-4": {