Merge branch 'release/5.1.0'

lindyhopchris · lindyhopchris · commit e099ab901bad · 2025-02-24T20:53:48.000Z
diff --git 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/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [5.1.0] - 2025-02-24
+
+### Added
+
+- Package now supports Laravel 12.
+
 ## [5.0.2] - 2025-12-03
 
 ### Fixed
diff --git 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": {
