Merge branch 'release/3.3.0'

Author: lindyhopchris

.github/workflows/tests.yml

@@ -18,16 +18,17 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.2, 8.3, 8.4 ]
-        core: [ '4.3.2', '5.2' ]
-        laravel: [ 11, 12 ]
+        php: [ 8.2, 8.3, 8.4, 8.5 ]
+        laravel: [ 11, 12, 13 ]
         exclude:
-          - laravel: 12
-            core: '4.3.2'
+          - php: 8.5
+            laravel: 11
+          - php: 8.2
+            laravel: 13
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -38,14 +39,11 @@ jobs:
           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
+        uses: nick-fields/retry@v4
         with:
           timeout_minutes: 5
           max_attempts: 5

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [3.3.0] - 2026-03-28
+
+### Added
+
+- Package now supports Laravel 13.
+
+### Changed
+
+- Dropped support for `laravel-json-api/core` v4.
+
 ## [3.2.0] - 2025-02-24
 
 ### Added

composer.json

@@ -19,20 +19,20 @@
         },
         {
             "name": "Christopher Gammie",
-            "email": "contact@gammie.co.uk"
+            "email": "chris@cloudcreativity.co.uk"
         }
     ],
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "illuminate/contracts": "^11.0|^12.0",
-        "illuminate/pipeline": "^11.0|^12.0",
-        "laravel-json-api/core": "^4.3.2|^5.2",
-        "laravel-json-api/validation": "^4.2"
+        "illuminate/contracts": "^11.0|^12.0|^13.0",
+        "illuminate/pipeline": "^11.0|^12.0|^13.0",
+        "laravel-json-api/core": "^5.3",
+        "laravel-json-api/validation": "^4.4"
     },
     "require-dev": {
-        "laravel-json-api/testing": "^3.1",
-        "orchestra/testbench": "^9.0|^10.0",
+        "laravel-json-api/testing": "^3.2",
+        "orchestra/testbench": "^9.0|^10.0|^11.0",
         "phpunit/phpunit": "^10.5|^11.5.3"
     },
     "autoload": {

tests/Integration/AcceptHeaderTest.php

@@ -150,10 +150,13 @@ public function testAcceptsMiddlewareDoesNotMatch(): void
             ->acceptsMiddleware('foo', 'bar')
             ->renderable();
 
-        $this->get('/test', ['Accept' => '*/*'])
+        $response = $this->get('/test', ['Accept' => '*/*']);
+
+        $response
             ->assertStatus(418)
-            ->assertHeader('Content-Type', 'text/html; charset=UTF-8')
             ->assertSee('teapot');
+
+        $this->assertSame('text/html; charset=utf-8', strtolower($response->headers->get('Content-Type')));
     }
 
     /**
@@ -167,11 +170,7 @@ public function testAcceptsMiddlewareWhenRouteNotFound(): void
 
         $response = $this->get('/blah', ['Accept' => '*/*']);
         $response->assertStatus(404)->assertSee('Not Found');
-
-        // @TODO remove once Laravel 8 is no longer supported (8 doesn't add the header)
-        if (version_compare(Application::VERSION, '9.0.0') >= 0) {
-            $response->assertHeader('Content-Type', 'text/html; charset=UTF-8');
-        }
+        $this->assertSame('text/html; charset=utf-8', strtolower($response->headers->get('Content-Type')));
     }
 
     public function testAcceptsMiddlewareWhenRouteNotFoundWithJsonApiMediaType(): void
@@ -223,10 +222,12 @@ public function testAcceptFalse(): void
             ->accept(fn(\Throwable $ex, Request $request) => false)
             ->renderable();
 
-        $this->get('/test', ['Accept' => '*/*'])
-            ->assertStatus(418)
-            ->assertHeader('Content-Type', 'text/html; charset=UTF-8')
+        $response = $this->get('/test', ['Accept' => '*/*']);
+
+        $response->assertStatus(418)
             ->assertSee('teapot');
+
+        $this->assertSame('text/html; charset=utf-8', strtolower($response->headers->get('Content-Type')));
     }
 
     public function testAcceptFalseWithJsonApiAcceptHeader(): void
@@ -279,9 +280,12 @@ public function testMultipleAcceptCallbacks2(): void
 
     public function testHtml(): void
     {
-        $this->get('/test', ['Accept' => '*/*'])
+        $response = $this->get('/test', ['Accept' => '*/*']);
+
+        $response
             ->assertStatus(418)
-            ->assertHeader('Content-Type', 'text/html; charset=UTF-8')
             ->assertSee('teapot');
+
+        $this->assertSame('text/html; charset=utf-8', strtolower($response->headers->get('Content-Type')));
     }
 }