Merge branch 'release/4.2.0'

Author: lindyhopchris

.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,38 @@ 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 ]
+        exclude:
+          - laravel: 12
+            core: '4.3.2'
 
     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

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [4.2.0] - 2025-01-24
+
+### Added
+
+- Package now supports Laravel 11 and 12.
+
 ## [4.1.0] - 2024-11-30
 
 ### Added

composer.json

@@ -24,11 +24,11 @@
     ],
     "require": {
         "php": "^8.2",
-        "laravel-json-api/core": "^4.3.2|^5.0.1"
+        "laravel-json-api/core": "^4.3.2|^5.2"
     },
     "require-dev": {
-        "orchestra/testbench": "^9.0",
-        "phpunit/phpunit": "^10.5"
+        "orchestra/testbench": "^9.0|^10.0",
+        "phpunit/phpunit": "^10.5|^11.0"
     },
     "autoload": {
         "psr-4": {