From 9681e3f79fcd76ef29334346265d212c1a25a73c Mon Sep 17 00:00:00 2001 From: James Brooks Date: Tue, 18 Feb 2025 12:33:29 +0000 Subject: [PATCH 1/4] Support Laravel 12 --- .github/workflows/run-tests.yml | 2 +- composer.json | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index ede237e1..8d59ffd8 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: php: [8.4, 8.3, 8.2] - laravel: [11.x] + laravel: [12.x, 11.x] stability: [prefer-lowest, prefer-stable] name: Static Analysis - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} diff --git a/composer.json b/composer.json index 86e60ff0..2ae0bc63 100644 --- a/composer.json +++ b/composer.json @@ -24,11 +24,11 @@ "filament/filament": "^3.2.57", "filament/spatie-laravel-settings-plugin": "^3.2", "guzzlehttp/guzzle": "^7.8", - "illuminate/console": "^11.23.0", - "illuminate/database": "^11.23.0", - "illuminate/events": "^11.23.0", - "illuminate/queue": "^11.23.0", - "illuminate/support": "^11.23.0", + "illuminate/console": "^11.23.0|^12.0", + "illuminate/database": "^11.23.0|^12.0", + "illuminate/events": "^11.23.0|^12.0", + "illuminate/queue": "^11.23.0|^12.0", + "illuminate/support": "^11.23.0|^12.0", "laravel/sanctum": "^4.0", "nesbot/carbon": "^2.70", "spatie/laravel-data": "^4.11", @@ -42,7 +42,7 @@ "dedoc/scramble": "0.12.0-alpha.1", "larastan/larastan": "^3.0", "laravel/pail": "^1.1", - "orchestra/testbench": "^9.5.1", + "orchestra/testbench": "^9.5.1|^10.0", "pestphp/pest": "^3.2", "pestphp/pest-plugin-laravel": "^3.0", "pestphp/pest-plugin-livewire": "*" From d3ec4d0682a1c2e793c517eeee704696731178bd Mon Sep 17 00:00:00 2001 From: James Brooks Date: Tue, 18 Feb 2025 12:41:27 +0000 Subject: [PATCH 2/4] wip --- .github/workflows/run-tests.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8d59ffd8..ef8300e2 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -59,7 +59,7 @@ jobs: fail-fast: false matrix: php: [8.4, 8.3, 8.2] - laravel: [11.x] + laravel: [12.x, 11.x] stability: [prefer-lowest, prefer-stable] name: Tests - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - MySQL 8.0 @@ -116,7 +116,7 @@ jobs: fail-fast: false matrix: php: [8.4, 8.3, 8.2] - laravel: [11.x] + laravel: [12.x, 11.x] stability: [prefer-lowest, prefer-stable] name: Tests - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - PostgreSQL 13 @@ -172,8 +172,8 @@ jobs: strategy: fail-fast: false matrix: - php: [ 8.3, 8.2 ] - laravel: [ 11.x ] + php: [8.4, 8.3, 8.2] + laravel: [12.x, 11.x] stability: [ prefer-lowest, prefer-stable ] name: Tests - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - PostgreSQL 14 @@ -229,8 +229,8 @@ jobs: strategy: fail-fast: false matrix: - php: [ 8.3, 8.2 ] - laravel: [ 11.x ] + php: [8.4, 8.3, 8.2] + laravel: [12.x, 11.x] stability: [ prefer-lowest, prefer-stable ] name: Tests - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - PostgreSQL 15 @@ -274,8 +274,8 @@ jobs: strategy: fail-fast: false matrix: - php: [ 8.3, 8.2 ] - laravel: [ 11.x ] + php: [8.4, 8.3, 8.2] + laravel: [12.x, 11.x] stability: [ prefer-lowest, prefer-stable ] name: Tests - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - SQLite From b938527fcd89ddfb736d13f1219d32534a18bfd0 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Tue, 18 Feb 2025 12:43:34 +0000 Subject: [PATCH 3/4] wip --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2ae0bc63..507bf96d 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "illuminate/queue": "^11.23.0|^12.0", "illuminate/support": "^11.23.0|^12.0", "laravel/sanctum": "^4.0", - "nesbot/carbon": "^2.70", + "nesbot/carbon": "^2.70|^3.0", "spatie/laravel-data": "^4.11", "spatie/laravel-query-builder": "^5.5", "spatie/laravel-settings": "^3.2", From e6e3b40b4aa0a91c9220aa1f04e1c8d0971ce5e1 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Mon, 24 Feb 2025 21:40:27 +0000 Subject: [PATCH 4/4] Update query builder --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2d06c1d0..00853790 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "laravel/sanctum": "^4.0", "nesbot/carbon": "^2.70|^3.0", "spatie/laravel-data": "^4.11", - "spatie/laravel-query-builder": "^5.5", + "spatie/laravel-query-builder": "^6.3.1", "spatie/laravel-settings": "^3.2", "spatie/laravel-webhook-server": "^3.8", "timacdonald/json-api": "^1.0.0-beta.4",