From 5bcd0c0ce267d18a032b748ac81eac3542a268e4 Mon Sep 17 00:00:00 2001
From: Shift <shift@laravelshift.com>
Date: Wed, 19 Feb 2025 11:31:09 +0000
Subject: [PATCH 1/2] Bump dependencies for Laravel 12

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

diff --git a/composer.json b/composer.json
index 87ff4a6..2b65d1b 100644
--- a/composer.json
+++ b/composer.json
@@ -26,12 +26,12 @@
         "php": "^8.2",
         "ext-json": "*",
         "cloudcreativity/json-api-testing": "^6.0.1",
-        "illuminate/http": "^11.0",
-        "illuminate/support": "^11.0",
-        "illuminate/testing": "^11.0"
+        "illuminate/http": "^11.0|^12.0",
+        "illuminate/support": "^11.0|^12.0",
+        "illuminate/testing": "^11.0|^12.0"
     },
     "require-dev": {
-        "laravel/framework": "^11.0",
+        "laravel/framework": "^11.0|^12.0",
         "phpunit/phpunit": "^10.5"
     },
     "autoload": {

From 7d6fa88d4f78c4e58253b9f7249be57230353fde Mon Sep 17 00:00:00 2001
From: Christopher Gammie <contact@gammie.co.uk>
Date: Mon, 24 Feb 2025 19:06:45 +0000
Subject: [PATCH 2/2] build: update github actions

---
 .github/workflows/tests.yml | 58 ++++++++++++++++++++++---------------
 composer.json               |  6 ++--
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3f0b631..9fba1ea 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:
@@ -15,26 +19,34 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.2, 8.3, 8.4]
+        laravel: [11, 12]
+        phpunit: ['10.5', '11.0']
 
     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: 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 Version
+        run: composer require "illuminate/contracts:^${{ matrix.laravel }}" --no-update
+
+      - name: Set PHPUnit Version
+        run: composer require "phpunit/phpunit:^${{ matrix.phpunit }}" --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 2b65d1b..12dadbe 100644
--- a/composer.json
+++ b/composer.json
@@ -25,14 +25,14 @@
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "cloudcreativity/json-api-testing": "^6.0.1",
+        "cloudcreativity/json-api-testing": "^6.1",
         "illuminate/http": "^11.0|^12.0",
         "illuminate/support": "^11.0|^12.0",
         "illuminate/testing": "^11.0|^12.0"
     },
     "require-dev": {
         "laravel/framework": "^11.0|^12.0",
-        "phpunit/phpunit": "^10.5"
+        "phpunit/phpunit": "^10.5|^11.0"
     },
     "autoload": {
         "psr-4": {
@@ -49,7 +49,7 @@
             "dev-develop": "3.x-dev"
         }
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
         "sort-packages": true