From abc63d7c66d12cec40a195ad3405b83d10cdac54 Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 23 Mar 2024 00:08:09 +0800 Subject: [PATCH] fix: add laravel 11 --- .github/workflows/build.yml | 14 ++++++++++++- composer.json | 10 ++++----- phpunit.10.xml | 42 +++++++++++++++++++++++++++++++++++++ phpunit.xml | 2 ++ tests/TestCase.php | 1 + 5 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 phpunit.10.xml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e3359d..8dbd181 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -105,7 +105,14 @@ jobs: - php: 8.1 laravel: 10.* phpunit: ~9.0 - + # Laravel 11.x + - php: 8.2 + laravel: 11.* + phpunit: ~10.5 + - php: 8.3 + laravel: 11.* + phpunit: ~10.5 + name: Laravel${{ matrix.laravel }}-PHP${{ matrix.php }} steps: @@ -130,8 +137,13 @@ jobs: composer install --prefer-dist --no-progress --no-suggest - name: Run test suite + if: matrix.laravel != '11.*' run: ./vendor/bin/phpunit -v + - name: Run test suite laravel 11 + if: matrix.laravel == '11.*' + run: ./vendor/bin/phpunit -c phpunit.10.xml + - name: Run Coveralls env: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/composer.json b/composer.json index b008c26..76b38ed 100755 --- a/composer.json +++ b/composer.json @@ -21,17 +21,17 @@ "license": "Apache-2.0", "require": { "php": ">=7.1.0", - "illuminate/support": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0", - "illuminate/database": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0", - "illuminate/console": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.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" }, "require-dev": { - "phpunit/phpunit": "~7.0|~8.0|~9.0", + "phpunit/phpunit": "~7.0|~8.0|~9.0|~10.5", "php-coveralls/php-coveralls": "^2.4", "mockery/mockery": "^1.0", - "laravel/laravel": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0" + "laravel/laravel": "~5.5|~6.0|~7.0|~8.0|~9.0|~10.0|~11.0" }, "autoload": { "psr-4": { diff --git a/phpunit.10.xml b/phpunit.10.xml new file mode 100644 index 0000000..b0bf020 --- /dev/null +++ b/phpunit.10.xml @@ -0,0 +1,42 @@ + + + + + ./tests/ + + + + + + + + + + + + + ./src + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/phpunit.xml b/phpunit.xml index 71b0f49..6d45124 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -16,10 +16,12 @@ ./src + + diff --git a/tests/TestCase.php b/tests/TestCase.php index 262aac2..8a5643b 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -46,6 +46,7 @@ abstract class TestCase extends BaseTestCase $this->app['config']->set('database.default', 'mysql'); $this->app['config']->set('database.connections.mysql.charset', 'utf8'); $this->app['config']->set('database.connections.mysql.collation', 'utf8_unicode_ci'); + $this->app['config']->set('cache.default', 'array'); // $app['config']->set('lauthz.log.enabled', true); }