From 1e64c81847cf67217e42d19dbd954cce4e54e88a Mon Sep 17 00:00:00 2001 From: Joost de Bruijn Date: Sun, 18 Feb 2024 15:26:42 +0000 Subject: [PATCH 1/3] chore: prepare for laravel 11 --- .github/workflows/tests.yml | 22 +++++++++++----------- composer.json | 12 ++++++------ phpunit.xml.dist | 10 ++++++---- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ab61807..a913754 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,36 +11,36 @@ jobs: strategy: fail-fast: true matrix: - php: [8.2, 8.1, 8.0] - laravel: [9.*, 8.*, 10.*] + php: [8.3, 8.2, 8.1] + laravel: [9.*, 10.*, 11.*] stability: [prefer-lowest, prefer-stable] include: + - laravel: 11.* + testbench: 9.* - laravel: 10.* testbench: 8.* - laravel: 9.* testbench: ^7.19 - - laravel: 8.* - testbench: ^6.23 exclude: - # Laravel 10 doesn't support PHP 8.0 + # Laravel 11 doesn't support PHP 8.1 + - laravel: 11.* + php: 8.1 + # Laravel 9 doesn't support PHP 8.3 - laravel: 10.* - php: 8.0 - # Laravel 8 doesn't support PHP 8.2 - - laravel: 8.* - php: 8.2 + php: 8.3 name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.stability }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get Composer cache directory id: composer-cache run: | echo "::set-output name=dir::$(composer config cache-files-dir)" - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.laravel }}-${{ matrix.testbench }}-${{ matrix.stability }}-composer diff --git a/composer.json b/composer.json index 722e033..7ee20b7 100644 --- a/composer.json +++ b/composer.json @@ -12,15 +12,15 @@ } ], "require": { - "php": "^8.0", - "illuminate/notifications": "^8.0|^9.0|^10.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "php": "^8.1", + "illuminate/notifications": "^9.0|^10.0|^11.0", + "illuminate/support": "^9.0|^10.0|^11.0", "minishlink/web-push": "^8.0" }, "require-dev": { "mockery/mockery": "~1.0", - "orchestra/testbench": "^6.0|^7.0|^8.0", - "phpunit/phpunit": "^9.0" + "orchestra/testbench": "^7.0|^8.0|^9.0", + "phpunit/phpunit": "^10.5" }, "autoload": { "psr-4": { @@ -47,4 +47,4 @@ "scripts": { "test": "vendor/bin/phpunit" } -} +} \ No newline at end of file diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 2a03185..07eed76 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,9 +1,6 @@ - + - - src/ - @@ -22,4 +19,9 @@ + + + src/ + + From a7ed923b84ec4862b08c1ba497c29cf015cc8332 Mon Sep 17 00:00:00 2001 From: Joost de Bruijn Date: Sun, 18 Feb 2024 15:28:45 +0000 Subject: [PATCH 2/3] fix: allow phpunit 9 and enable php coverage driver --- .github/workflows/tests.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a913754..e3ae30e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -52,7 +52,7 @@ jobs: with: php-version: ${{ matrix.php }} extensions: curl - coverage: none + coverage: xdebug - name: Install dependencies run: | diff --git a/composer.json b/composer.json index 7ee20b7..3edd171 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "require-dev": { "mockery/mockery": "~1.0", "orchestra/testbench": "^7.0|^8.0|^9.0", - "phpunit/phpunit": "^10.5" + "phpunit/phpunit": "^9.5|^10.5" }, "autoload": { "psr-4": { From 7a8719f795616881b9ba982c9fb4fe1427d131b2 Mon Sep 17 00:00:00 2001 From: Joost de Bruijn Date: Sun, 18 Feb 2024 15:30:26 +0000 Subject: [PATCH 3/3] fix: don't use deprecated set-output in github actions --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e3ae30e..5d98588 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,7 +38,7 @@ jobs: - name: Get Composer cache directory id: composer-cache run: | - echo "::set-output name=dir::$(composer config cache-files-dir)" + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - uses: actions/cache@v4 with: