From e1756cd29fe5dc9e5ad8b8b56841a96a44331240 Mon Sep 17 00:00:00 2001 From: Patrick O'Meara Date: Sun, 10 Mar 2024 16:26:07 +1100 Subject: [PATCH 1/4] Support Laravel 11 --- .github/workflows/main.yml | 4 +++- composer.json | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f136191..483fc76 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,13 +61,15 @@ jobs: strategy: matrix: php: ['8.1', '8.2'] - laravel: ['^9.0', '^10.0'] + laravel: ['^9.0', '^10.0', '^11.0'] prefer: ['prefer-lowest', 'prefer-stable'] include: - laravel: '^9.0' testbench: '^7.0' - laravel: '^10.0' testbench: '^8.0' + - laravel: '^11.0' + testbench: '^9.0' steps: - name: checkout code diff --git a/composer.json b/composer.json index f241e80..d1e4e37 100644 --- a/composer.json +++ b/composer.json @@ -22,8 +22,8 @@ }, "require": { "php": "^8.1", - "illuminate/support": "^9.0 || ^10.0", - "illuminate/http": "^9.0 || ^10.0" + "illuminate/support": "^9.0 || ^10.0 || ^11.0", + "illuminate/http": "^9.0 || ^10.0 || ^11.0" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.4" From aff164baa8ca12afa136da6e26ef136db71de512 Mon Sep 17 00:00:00 2001 From: Patrick O'Meara Date: Mon, 11 Mar 2024 13:55:52 +1100 Subject: [PATCH 2/4] Update PHP and Laravel versions in README --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 3f0d0bd..19aaa9a 100644 --- a/readme.md +++ b/readme.md @@ -10,8 +10,8 @@ Read more about the why in my blog post [Rethinking Laravel's middleware argumen ## Version support -- **PHP**: 8.1, 8.2 -- **Laravel**: 9.0, 10.0 +- **PHP**: 8.1, 8.2, 8.3 +- **Laravel**: 9.0, 10.0, 11.0 ## Installation From 12e908585111e9ce28f0f9697689b582747a0150 Mon Sep 17 00:00:00 2001 From: Patrick O'Meara Date: Wed, 13 Mar 2024 08:50:17 +1100 Subject: [PATCH 3/4] Remove unsupported Illuminate packages * exclude unsupported combinations in test matrix --- .github/workflows/main.yml | 11 +++++++---- composer.json | 4 ++-- readme.md | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 483fc76..6caeb93 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,16 +60,19 @@ jobs: name: 'PHP: ${{ matrix.php }}; Laravel: ${{ matrix.laravel }}; Prefer: ${{ matrix.prefer }}' strategy: matrix: - php: ['8.1', '8.2'] - laravel: ['^9.0', '^10.0', '^11.0'] + php: ['8.1', '8.2', '8.3'] + laravel: ['^10.0', '^11.0'] prefer: ['prefer-lowest', 'prefer-stable'] include: - - laravel: '^9.0' - testbench: '^7.0' - laravel: '^10.0' testbench: '^8.0' - laravel: '^11.0' testbench: '^9.0' + exclude: + - php: '8.3' + laravel: '^10.0' + - php: '8.1' + laravel: '^11.0' steps: - name: checkout code diff --git a/composer.json b/composer.json index d1e4e37..5fd9480 100644 --- a/composer.json +++ b/composer.json @@ -22,8 +22,8 @@ }, "require": { "php": "^8.1", - "illuminate/support": "^9.0 || ^10.0 || ^11.0", - "illuminate/http": "^9.0 || ^10.0 || ^11.0" + "illuminate/support": "^10.0 || ^11.0", + "illuminate/http": "^10.0 || ^11.0" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.4" diff --git a/readme.md b/readme.md index 19aaa9a..4f76696 100644 --- a/readme.md +++ b/readme.md @@ -10,8 +10,8 @@ Read more about the why in my blog post [Rethinking Laravel's middleware argumen ## Version support -- **PHP**: 8.1, 8.2, 8.3 -- **Laravel**: 9.0, 10.0, 11.0 +- **PHP**: 8.2, 8.3 +- **Laravel**: 10.0, 11.0 ## Installation From 6d7b3b2e0db43629ca50c58433c8e0f17577168c Mon Sep 17 00:00:00 2001 From: Patrick O'Meara Date: Tue, 19 Mar 2024 16:54:39 +1100 Subject: [PATCH 4/4] Use latest actions steps --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6caeb93..c566dcb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,14 +12,14 @@ jobs: name: 'Lint' steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get composer cache directory id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ matrix.prefer }}-${{ hashFiles('**/composer.json') }} @@ -76,14 +76,14 @@ jobs: steps: - name: checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Get composer cache directory id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ matrix.prefer }}-php-${{ matrix.php }}-phpunit-${{ matrix.phpunit }}-${{ hashFiles('**/composer.json') }}