diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b07e451..3927485 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,12 @@ jobs: fail-fast: true matrix: php: [8.1, 8.2, 8.3] - laravel: [10] + laravel: [10,11] + stability: [prefer-stable] + exclude: + # Laravel 11 doesn't support PHP 8.1 + - laravel: 11 + php: 8.1 name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} @@ -29,7 +34,7 @@ jobs: - name: Install dependencies run: | - composer require "illuminate/contracts=^${{ matrix.laravel }}" --dev --no-update + composer require "laravel/framework=^${{ matrix.laravel }}" --dev --no-update composer update --prefer-dist --no-interaction --no-progress - name: Execute tests diff --git a/.gitignore b/.gitignore index e50f7fb..1dc0823 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /.idea/ /vendor/ .phpunit.result.cache -composer.lock \ No newline at end of file +.phpunit.cache +composer.lock diff --git a/composer.json b/composer.json index 519e5af..e3f1d96 100644 --- a/composer.json +++ b/composer.json @@ -16,13 +16,12 @@ "require": { "php": "^8.1", "ext-json": "*", - "illuminate/console": "^10.0", - "illuminate/support": "^10.0" + "laravel/framework": "^10.0|^11.0" }, "require-dev": { "mockery/mockery": "^1.0", - "orchestra/testbench": "^8.0", - "phpunit/phpunit": "^9.0" + "orchestra/testbench": "^8.0|^9.0", + "phpunit/phpunit": "^9.0|^10.5|^11.0" }, "autoload": { "psr-4": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 1871d85..e70bc77 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,21 +1,11 @@ - - - - ./tests/ - - - - - - \ No newline at end of file + + + + ./tests/ + + + + + +