Merge branch 'release/3.0.0'

Author: lindyhopchris

.github/workflows/tests.yml

@@ -2,9 +2,9 @@ name: Tests
 
 on:
   push:
-    branches: [ main, develop ]
+    branches: [ main, develop, 3.x ]
   pull_request:
-    branches: [ main, develop ]
+    branches: [ main, develop, 3.x ]
 
 jobs:
   build:
@@ -14,11 +14,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4, '8.0', 8.1, 8.2]
-        laravel: [8.76, 9]
-        exclude:
-          - php: 7.4
-            laravel: 9
+        php: [8.1, 8.2]
+        laravel: [10]
 
     steps:
       - name: Checkout Code

CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file. This project adheres to
 [Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
 
+## [3.0.0] - 2023-02-14
+
+### Changed
+
+- Upgraded to Laravel 10 and set minimum PHP version to `8.1`.
+- **BREAKING** If using the `laravel-json-api/cursor-pagination` package, you now need to passed the schema's `id` field
+  to the paginator's `make()` method. I.e. use `CursorPagination::make($this->id())`
+
+### Fixed
+
+- **BREAKING** [#190](https://github.com/laravel-json-api/laravel/issues/190) The JSON:API media type now needs to be
+  sent in the `Accept` header for a "delete" resource request. Previously there was no checking of the `Accept` media
+  type, so anything could be sent. This is incorrect as the JSON:API specification shows the `Accept` header as
+  `application/vnd.api+json` for [delete resource requests.](https://jsonapi.org/format/#crud-deleting)
+
 ## [2.6.0] - 2023-02-09
 
 ### Added

composer.json

@@ -23,20 +23,20 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.1",
         "ext-json": "*",
-        "laravel-json-api/core": "^2.4",
-        "laravel-json-api/eloquent": "^2.3",
-        "laravel-json-api/encoder-neomerx": "^2.0.1",
-        "laravel-json-api/exceptions": "^1.1.1",
-        "laravel-json-api/spec": "^1.2",
-        "laravel-json-api/validation": "^2.1.3",
-        "laravel/framework": "^8.76|^9.0"
+        "laravel-json-api/core": "^3.0",
+        "laravel-json-api/eloquent": "^3.0",
+        "laravel-json-api/encoder-neomerx": "^3.0",
+        "laravel-json-api/exceptions": "^2.0",
+        "laravel-json-api/spec": "^2.0",
+        "laravel-json-api/validation": "^3.0",
+        "laravel/framework": "^10.0"
     },
     "require-dev": {
-        "laravel-json-api/testing": "^1.1.2",
-        "orchestra/testbench": "^6.23|^7.0",
-        "phpunit/phpunit": "^9.5.10"
+        "laravel-json-api/testing": "^2.0",
+        "orchestra/testbench": "^8.0",
+        "phpunit/phpunit": "^9.5.28"
     },
     "autoload": {
         "psr-4": {
@@ -53,7 +53,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "2.x-dev"
+            "dev-develop": "3.x-dev"
         },
         "laravel": {
             "aliases": {

src/Http/Controllers/Actions/Destroy.php

@@ -26,6 +26,7 @@
 use Illuminate\Support\Facades\Auth;
 use LaravelJsonApi\Contracts\Routing\Route;
 use LaravelJsonApi\Contracts\Store\Store as StoreContract;
+use LaravelJsonApi\Laravel\Exceptions\HttpNotAcceptableException;
 use LaravelJsonApi\Laravel\Http\Requests\ResourceRequest;
 
 trait Destroy
@@ -37,10 +38,26 @@ trait Destroy
      * @param Route $route
      * @param StoreContract $store
      * @return Response|Responsable
-     * @throws AuthenticationException|AuthorizationException
+     * @throws AuthenticationException|AuthorizationException|HttpNotAcceptableException
      */
     public function destroy(Route $route, StoreContract $store)
     {
+        /**
+         * As we do not have a query request class for a delete request,
+         * we need to manually check that the request Accept header
+         * is the JSON:API media type.
+         */
+        $acceptable = false;
+
+        foreach (request()->getAcceptableContentTypes() as $contentType) {
+            if ($contentType === ResourceRequest::JSON_API_MEDIA_TYPE) {
+                $acceptable = true;
+                break;
+            }
+        }
+
+        throw_unless($acceptable, new HttpNotAcceptableException());
+
         $request = ResourceRequest::forResourceIfExists(
             $resourceType = $route->resourceType()
         );

src/Http/Requests/FormRequest.php

@@ -33,7 +33,7 @@ class FormRequest extends BaseFormRequest
     /**
      * @var string
      */
-    protected const JSON_API_MEDIA_TYPE = 'application/vnd.api+json';
+    public const JSON_API_MEDIA_TYPE = 'application/vnd.api+json';
 
     /**
      * @return bool

tests/dummy/tests/Api/V1/Posts/DeleteTest.php

@@ -102,4 +102,20 @@ public function testForbidden(): void
             'id' => $this->post->getKey(),
         ]);
     }
+
+    /**
+     * @param string $mediaType
+     * @return void
+     * @dataProvider notAcceptableMediaTypeProvider
+     */
+    public function testNotAcceptableMediaType(string $mediaType): void
+    {
+        $response = $this
+            ->actingAs($this->post->author)
+            ->jsonApi()
+            ->accept($mediaType)
+            ->delete(url('api/v1/posts', $this->post));
+
+        $response->assertStatus(406);
+    }
 }

tests/lib/Acceptance/RequestBodyContentTest.php

@@ -110,6 +110,7 @@ public function testDeleteWithoutBody(): void
         $response = $this
             ->withoutExceptionHandling()
             ->actingAs($post->author)
+            ->withHeader('Accept', 'application/vnd.api+json')
             ->delete('/api/v1/posts/' . $post->getRouteKey());
 
         $response->assertNoContent();