From 3456717d116c375c25276a8811e2d35447937525 Mon Sep 17 00:00:00 2001
From: Christopher Gammie <contact@gammie.co.uk>
Date: Mon, 24 Feb 2025 20:18:02 +0000
Subject: [PATCH] feat: add support for Laravel 12

---
 .github/workflows/tests.yml | 14 ++++++++++----
 composer.json               | 22 +++++++++++-----------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1f1b5a4..d9d6048 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,9 +2,15 @@ name: Tests
 
 on:
   push:
-    branches: [ main, develop, 3.x ]
+    branches:
+      - main
+      - develop
+      - 3.x
   pull_request:
-    branches: [ main, develop, 3.x ]
+    branches:
+      - main
+      - develop
+      - 3.x
 
 jobs:
   build:
@@ -14,8 +20,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3, 8.4]
-        laravel: [11]
+        php: [ 8.2, 8.3, 8.4 ]
+        laravel: [ 11, 12 ]
 
     steps:
       - name: Checkout Code
diff --git a/composer.json b/composer.json
index e6fb771..4f187ca 100644
--- a/composer.json
+++ b/composer.json
@@ -25,18 +25,18 @@
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "laravel-json-api/core": "^5.0.1",
-        "laravel-json-api/eloquent": "^4.4",
-        "laravel-json-api/encoder-neomerx": "^4.1",
-        "laravel-json-api/exceptions": "^3.1",
-        "laravel-json-api/spec": "^3.1",
-        "laravel-json-api/validation": "^4.2",
-        "laravel/framework": "^11.0"
+        "laravel-json-api/core": "^5.2",
+        "laravel-json-api/eloquent": "^4.5",
+        "laravel-json-api/encoder-neomerx": "^4.2",
+        "laravel-json-api/exceptions": "^3.2",
+        "laravel-json-api/spec": "^3.2",
+        "laravel-json-api/validation": "^4.3",
+        "laravel/framework": "^11.0|^12.0"
     },
     "require-dev": {
-        "laravel-json-api/testing": "^3.0.2",
-        "orchestra/testbench": "^9.0",
-        "phpunit/phpunit": "^10.5"
+        "laravel-json-api/testing": "^3.1",
+        "orchestra/testbench": "^9.0|^10.0",
+        "phpunit/phpunit": "^10.5|^11.0"
     },
     "autoload": {
         "psr-4": {
@@ -65,7 +65,7 @@
             ]
         }
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
         "sort-packages": true