From 67379a96ae3f7bfdb3124d3b8e4eb4b0ae14ecb3 Mon Sep 17 00:00:00 2001 From: Enrico De Lazzari Date: Wed, 27 Mar 2024 13:05:20 +0100 Subject: [PATCH] Laravel 11.x Compatibility (#30) --- .github/workflows/run-tests.yml | 9 +++++- .gitignore | 1 + composer.json | 11 ++++--- phpunit.xml.dist | 51 +++++++++------------------------ 4 files changed, 28 insertions(+), 44 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 6bd1bdb..d67827d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,9 +14,12 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] php: [8.3, 8.2, 8.1, 8.0] - laravel: [10.*, 9.*] + laravel: [11.*, 10.*, 9.*] stability: [prefer-lowest, prefer-stable] include: + - laravel: 11.* + testbench: 9.* + carbon: ^3.0 - laravel: 10.* testbench: 8.* carbon: ^2.63 @@ -26,6 +29,10 @@ jobs: exclude: - laravel: 10.* php: 8.0 + - laravel: 11.* + php: 8.1 + - laravel: 11.* + php: 8.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/.gitignore b/.gitignore index 0a63bc1..e6987cc 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ testbench.yaml vendor node_modules .php-cs-fixer.cache +.phpunit.cache/test-results diff --git a/composer.json b/composer.json index 84ff8db..da49fde 100644 --- a/composer.json +++ b/composer.json @@ -17,16 +17,15 @@ ], "require": { "php": "^8.0", - "illuminate/database": "^9.0|^10.0", - "illuminate/support": "^9.0|^10.0", + "illuminate/database": "^9.0|^10.0|^11.0", + "illuminate/support": "^9.0|^10.0|^11.0", "spatie/laravel-package-tools": "^1.14.1" }, "require-dev": { "laravel/pint": "^1.0", - "nunomaduro/collision": "^6.0", - "orchestra/testbench": "^7.0|^8.0", - "phpunit/phpunit": "^9.5", - "vimeo/psalm": "^4.20" + "orchestra/testbench": "^7.0|^8.0|^9.0", + "phpunit/phpunit": "^9.5|^10.5", + "vimeo/psalm": "^4.20|^5.22" }, "autoload": { "psr-4": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 290f954..6a26e4c 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,39 +1,16 @@ - - - - tests - - - - - ./src - - - - - - - - - - + + + + tests + + + + + + + + ./src + +