From 5599a387e108eb5f998173e900ee907c1f910c87 Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Wed, 28 Feb 2024 10:25:05 +0100 Subject: [PATCH 1/4] Laravel 11 support --- .github/workflows/run-tests.yml | 11 +++++++++++ CHANGELOG.md | 6 +++++- composer.json | 8 ++++---- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 16e5fec..ae08bf1 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -17,6 +17,17 @@ jobs: testbench: 8.* - laravel: 9.* testbench: 7.* + include: + - laravel: 9.* + testbench: 7.* + - laravel: 10.* + testbench: 8.* + - laravel: 11.* + testbench: 9.* + exclude: + - laravel: 11.* + php: 8.1 + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/CHANGELOG.md b/CHANGELOG.md index a15cf07..167ca7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,9 +55,13 @@ The following changes are required when updating: ## Changes +### 2.2.0 + +- Add Laravel 11 support + ### 2.1.0 -- Add PHP 8.2 support +- Add PHP 8.3 support ### 2.0.0 diff --git a/composer.json b/composer.json index 6de4747..0e98ab4 100644 --- a/composer.json +++ b/composer.json @@ -23,13 +23,13 @@ "php": "~8.3.0 | ~8.2.0 | ~8.1.0", "ext-json": "*", "guzzlehttp/guzzle": "^7.2", - "illuminate/http": "^9.0 || ^10.0", - "illuminate/support": "^9.0 || ^10.0", + "illuminate/http": "^9.0 || ^10.0 || ^11.0", + "illuminate/support": "^9.0 || ^10.0 || ^11.0", "spatie/laravel-package-tools": "^1.1" }, "require-dev": { - "orchestra/testbench": "^7.0", - "phpunit/phpunit": "^9.5.10", + "orchestra/testbench": "^7.0 || ^8.0 || ^9.0", + "phpunit/phpunit": "^9.5.10 || ^10.0", "spatie/laravel-ray": "^1.29", "timacdonald/log-fake": "^2.0", "vimeo/psalm": "^4.20" From e910c1a81d559d3a7c43c8d9124dca691feed284 Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Wed, 28 Feb 2024 10:28:19 +0100 Subject: [PATCH 2/4] Fix github action syntax --- .github/workflows/run-tests.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index ae08bf1..b0b974a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -1,10 +1,17 @@ name: run-tests -on: [push, pull_request] +on: + push: + branches: + - main + pull_request: + branches: + - main jobs: test: runs-on: ${{ matrix.os }} + strategy: fail-fast: false matrix: @@ -12,11 +19,6 @@ jobs: php: [8.3, 8.2, 8.1] laravel: [10.*, 9.*] stability: [prefer-stable] - include: - - laravel: 10.* - testbench: 8.* - - laravel: 9.* - testbench: 7.* include: - laravel: 9.* testbench: 7.* From 4e00558ff372134e2ba4a123f4f315fc941c28d8 Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Wed, 28 Feb 2024 10:30:23 +0100 Subject: [PATCH 3/4] WIP --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b0b974a..f8b9dab 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -17,7 +17,7 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] php: [8.3, 8.2, 8.1] - laravel: [10.*, 9.*] + laravel: ['10.*', '9.*'] stability: [prefer-stable] include: - laravel: 9.* From b04836f90526d4f6c0fa8a528b78f80a4a8fd3a5 Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Wed, 28 Feb 2024 10:32:59 +0100 Subject: [PATCH 4/4] WIP --- .github/workflows/run-tests.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f8b9dab..9e5dbd5 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -17,8 +17,8 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] php: [8.3, 8.2, 8.1] - laravel: ['10.*', '9.*'] - stability: [prefer-stable] + laravel: ['9.*', '10.*', '11.*'] + dependency-version: [prefer-stable] include: - laravel: 9.* testbench: 7.* @@ -30,8 +30,7 @@ jobs: - laravel: 11.* php: 8.1 - - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} steps: - name: Checkout code @@ -52,7 +51,7 @@ jobs: - name: Install dependencies run: | composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --${{ matrix.stability }} --prefer-dist --no-interaction --dev + composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Execute tests - run: vendor/bin/phpunit + run: composer run-script test \ No newline at end of file