From 364bb1dc3f64f8a842f1779753d43f1eb926ed7c Mon Sep 17 00:00:00 2001
From: Shift <shift@laravelshift.com>
Date: Wed, 19 Feb 2025 12:21:08 +0000
Subject: [PATCH 1/3] Bump dependencies for Laravel 12

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index bee80fd..4ab4082 100644
--- a/composer.json
+++ b/composer.json
@@ -25,15 +25,15 @@
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "illuminate/contracts": "^11.0",
-        "illuminate/pipeline": "^11.0",
+        "illuminate/contracts": "^11.0|^12.0",
+        "illuminate/pipeline": "^11.0|^12.0",
         "laravel-json-api/core": "^4.3.2|^5.0.1",
         "laravel-json-api/validation": "^4.2"
     },
     "require-dev": {
         "laravel-json-api/testing": "^3.0",
-        "orchestra/testbench": "^9.0",
-        "phpunit/phpunit": "^10.5"
+        "orchestra/testbench": "^9.0|^10.0",
+        "phpunit/phpunit": "^10.5|^11.5.3"
     },
     "autoload": {
         "psr-4": {

From 84e5538a159c088414a59de28bb41b730ef36edd Mon Sep 17 00:00:00 2001
From: Christopher Gammie <contact@gammie.co.uk>
Date: Mon, 24 Feb 2025 19:13:58 +0000
Subject: [PATCH 2/3] build: update github actions

---
 .github/workflows/tests.yml | 64 +++++++++++++++++++++----------------
 composer.json               |  6 ++--
 2 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index eaf0932..6b0a110 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,9 +2,13 @@ name: Tests
 
 on:
   push:
-    branches: [ main, develop ]
+    branches:
+      - main
+      - develop
   pull_request:
-    branches: [ main, develop ]
+    branches:
+      - main
+      - develop
 
 jobs:
   build:
@@ -14,31 +18,35 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3, 8.4]
-        core: ['4.3.2', '5.0.1']
+        php: [ 8.2, 8.3, 8.4 ]
+        core: [ '4.3.2', '5.2' ]
+        laravel: [ 11, 12 ]
 
     steps:
-    - name: Checkout Code
-      uses: actions/checkout@v4
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php }}
-        extensions: dom, curl, libxml, mbstring, zip
-        tools: composer:v2
-        coverage: none
-        ini-values: error_reporting=E_ALL
-
-    - name: Set Laravel JSON:API Core Version
-      run: composer require "laravel-json-api/core:^${{ matrix.core }}" --no-update
-
-    - name: Install dependencies
-      uses: nick-fields/retry@v3
-      with:
-        timeout_minutes: 5
-        max_attempts: 5
-        command: composer update --prefer-dist --no-interaction --no-progress
-
-    - name: Execute tests
-      run: vendor/bin/phpunit
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip
+          tools: composer:v2
+          coverage: none
+          ini-values: error_reporting=E_ALL
+
+      - name: Set Laravel JSON:API Core Version
+        run: composer require "laravel-json-api/core:^${{ matrix.core }}" --no-update
+
+      - name: Set Laravel Version
+        run: composer require "illuminate/contracts:^${{ matrix.laravel }}" --no-update
+
+      - name: Install dependencies
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer update --prefer-dist --no-interaction --no-progress
+
+      - name: Execute tests
+        run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
index 4ab4082..7eaaed4 100644
--- a/composer.json
+++ b/composer.json
@@ -27,11 +27,11 @@
         "ext-json": "*",
         "illuminate/contracts": "^11.0|^12.0",
         "illuminate/pipeline": "^11.0|^12.0",
-        "laravel-json-api/core": "^4.3.2|^5.0.1",
+        "laravel-json-api/core": "^4.3.2|^5.2",
         "laravel-json-api/validation": "^4.2"
     },
     "require-dev": {
-        "laravel-json-api/testing": "^3.0",
+        "laravel-json-api/testing": "^3.1",
         "orchestra/testbench": "^9.0|^10.0",
         "phpunit/phpunit": "^10.5|^11.5.3"
     },
@@ -50,7 +50,7 @@
             "dev-develop": "3.x-dev"
         }
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
         "sort-packages": true

From c2c31073f76a4044ec600b63a8d0f299d9b6dd50 Mon Sep 17 00:00:00 2001
From: Christopher Gammie <contact@gammie.co.uk>
Date: Mon, 24 Feb 2025 19:16:16 +0000
Subject: [PATCH 3/3] build: additional update to github actions

---
 .github/workflows/tests.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6b0a110..f1f09c4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,6 +21,9 @@ jobs:
         php: [ 8.2, 8.3, 8.4 ]
         core: [ '4.3.2', '5.2' ]
         laravel: [ 11, 12 ]
+        exclude:
+          - laravel: 12
+            core: '4.3.2'
 
     steps:
       - name: Checkout Code