Merge branch 'release/6.0.0'

Author: lindyhopchris

.github/workflows/tests.yml

@@ -14,8 +14,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['8.0', 8.1, 8.2]
-        laravel: [9]
+        php: [8.1, 8.2]
+        laravel: [10]
 
     steps:
       - name: Checkout Code

CHANGELOG.md

@@ -3,6 +3,13 @@
 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/).
 
+## [6.0.0] - 2023-02-14
+
+### Changed
+
+- Dropped support for PHP 8.0 - minimum PHP version is now 8.1.
+- Upgraded to Laravel 10, dropping support for Laravel 9.
+
 ## [5.0.0] - 2023-01-21
 
 ### Changed

composer.json

@@ -22,23 +22,23 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-json": "*",
         "laravel-json-api/neomerx-json-api": "^5.0.1",
-        "laravel/framework": "^9.0",
+        "laravel/framework": "^10.0",
         "nyholm/psr7": "^1.2",
         "ramsey/uuid": "^4.0",
         "symfony/psr-http-message-bridge": "^2.0"
     },
     "require-dev": {
         "ext-sqlite3": "*",
         "guzzlehttp/guzzle": "^7.0",
-        "laravel-json-api/testing": "^1.1",
+        "laravel-json-api/testing": "^2.0",
         "laravel/legacy-factories": "^1.0.4",
-        "laravel/ui": "^3.0",
+        "laravel/ui": "^4.2",
         "mockery/mockery": "^1.1",
-        "orchestra/testbench": "^6.23|^7.0",
-        "phpunit/phpunit": "^9.5.10"
+        "orchestra/testbench": "^8.0",
+        "phpunit/phpunit": "^9.5.28"
     },
     "suggest": {
         "cloudcreativity/json-api-testing": "Required to use the test helpers."

src/Queue/ClientJob.php

@@ -74,19 +74,13 @@ class ClientJob extends Model implements AsynchronousProcess
      */
     protected $casts = [
         'attempts' => 'integer',
+        'completed_at' => 'datetime',
         'failed' => 'boolean',
         'timeout' => 'integer',
+        'timeout_at' => 'datetime',
         'tries' => 'integer',
     ];
 
-    /**
-     * @var array
-     */
-    protected $dates = [
-        'completed_at',
-        'timeout_at',
-    ];
-
     /**
      * @inheritdoc
      */

tests/dummy/app/Post.php

@@ -43,9 +43,9 @@ class Post extends Model
     /**
      * @var array
      */
-    protected $dates = [
-        'published_at',
-        'deleted_at',
+    protected $casts = [
+        'deleted_at' => 'datetime',
+        'published_at' => 'datetime',
     ];
 
     /**

tests/lib/Integration/Eloquent/ClientGeneratedIdTest.php

@@ -111,7 +111,7 @@ public function testCreateWithInvalidId()
 
         $error = [
             'title' => 'Unprocessable Entity',
-            'detail' => 'The id format is invalid.',
+            'detail' => 'The id field format is invalid.',
             'status' => '422',
             'source' => ['pointer' => '/data/id'],
         ];

tests/lib/Integration/Eloquent/ResourceTest.php

@@ -270,15 +270,15 @@ public function testCreateInvalid()
             [
                 'status' => '422',
                 'title' => 'Unprocessable Entity',
-                'detail' => 'The title must be a string.',
+                'detail' => 'The title field must be a string.',
                 'source' => [
                     'pointer' => '/data/attributes/title',
                 ],
             ],
             [
                 'status' => '422',
                 'title' => 'Unprocessable Entity',
-                'detail' => 'The title must be between 5 and 255 characters.',
+                'detail' => 'The title field must be between 5 and 255 characters.',
                 'source' => [
                     'pointer' => '/data/attributes/title',
                 ],

tests/lib/Integration/ErrorsTest.php

@@ -17,15 +17,13 @@
 
 namespace CloudCreativity\LaravelJsonApi\Tests\Integration;
 
-use Carbon\Carbon;
 use CloudCreativity\LaravelJsonApi\Document\Error\Error;
 use CloudCreativity\LaravelJsonApi\Exceptions\DocumentRequiredException;
 use CloudCreativity\LaravelJsonApi\Exceptions\InvalidJsonException;
 use CloudCreativity\LaravelJsonApi\Exceptions\JsonApiException;
 use CloudCreativity\LaravelJsonApi\Exceptions\ResourceNotFoundException;
 use DummyApp\Post;
 use Illuminate\Contracts\Validation\Validator;
-use Illuminate\Foundation\Http\Exceptions\MaintenanceModeException;
 use Illuminate\Http\Response;
 use Illuminate\Session\TokenMismatchException;
 use Illuminate\Support\Facades\Route;
@@ -326,24 +324,6 @@ public function testJsonApiException2(): void
             ->assertExactJson($expected);
     }
 
-    public function testMaintenanceMode()
-    {
-        $ex = new MaintenanceModeException(Carbon::now()->getTimestamp(), 60, "We'll be back soon.");
-
-        $this->request($ex)
-            ->assertStatus(503)
-            ->assertHeader('Content-Type', 'application/vnd.api+json')
-            ->assertExactJson([
-                'errors' => [
-                    [
-                        'title' => 'Service Unavailable',
-                        'detail' => "We'll be back soon.",
-                        'status' => '503',
-                    ],
-                ],
-            ]);
-    }
-
     /**
      * By default Laravel sends a 419 response for a TokenMismatchException.
      *

tests/lib/Integration/Validation/FailedMetaTest.php

@@ -73,7 +73,7 @@ public function rulesProvider(): array
                 [
                     'status' => '422',
                     'title' => 'Unprocessable Entity',
-                    'detail' => 'The value must be a date before or equal to 2018-12-31 23:59:59.',
+                    'detail' => 'The value field must be a date before or equal to 2018-12-31 23:59:59.',
                     'meta' => [
                         'failed' => [
                             'rule' => 'before-or-equal',
@@ -93,7 +93,7 @@ public function rulesProvider(): array
                 [
                     'status' => '422',
                     'title' => 'Unprocessable Entity',
-                    'detail' => 'The value must be between 1 and 9.',
+                    'detail' => 'The value field must be between 1 and 9.',
                     'meta' => [
                         'failed' => [
                             'rule' => 'between',
@@ -234,7 +234,7 @@ public function testMultiple(): void
             [
                 'status' => '422',
                 'title' => 'Unprocessable Entity',
-                'detail' => 'The title must be a string.',
+                'detail' => 'The title field must be a string.',
                 'source' => [
                     'pointer' => '/data/attributes/title',
                 ],
@@ -247,7 +247,7 @@ public function testMultiple(): void
             [
                 'status' => '422',
                 'title' => 'Unprocessable Entity',
-                'detail' => 'The title must be between 5 and 255 characters.',
+                'detail' => 'The title field must be between 5 and 255 characters.',
                 'source' => [
                     'pointer' => '/data/attributes/title',
                 ],

tests/lib/Integration/Validation/QueryValidationTest.php

@@ -77,7 +77,7 @@ public function searchProvider()
             'page:invalid' => [
                 ['page' => ['number' => 0, 'size' => 10]],
                 'page.number',
-                'The page.number must be at least 1.',
+                'The page.number field must be at least 1.',
             ],
             'page:not allowed (singular)' => [
                 ['page' => ['foo' => 'bar', 'size' => 10]],