[Feature] Update Laravel 8 support and drop Laravel 7

lindyhopchris · lindyhopchris · commit 4aebdf62b218 · 2020-09-09T13:07:03.000+01:00
Minimum PHP version is now 7.3.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@ in the response body can be tested using:
 `$this->jsonApi()->asMultiPartFormData()->withPayload($data)->post('/api/v1/avatars');`.
 
 ### Changed
+- Minimum PHP version is now `7.3`.
+- Minimum Laravel version is now `8.0`.
 - [#497](https://github.com/cloudcreativity/laravel-json-api/issues/497) and
 [#529](https://github.com/cloudcreativity/laravel-json-api/pull/529)
 **BREAKING:** The method signature of the `AbstractValidators::rules()` method has changed,
diff --git a/README.md b/README.md
@@ -63,7 +63,7 @@ A demo application is available at [here](https://github.com/cloudcreativity/dem
 | Laravel | This Package |
 | --- | --- |
 | `^8.0` | `^3.0` |
-| `^7.0` | `^2.0`, `^3.0` |
+| `^7.0` | `^2.0` |
 | `^6.0` | `^1.7` |
 | `5.8.*` | `^1.7` |
 | `5.7.*` | `^1.0` |
diff --git a/composer.json b/composer.json
@@ -22,15 +22,15 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.3",
         "ext-json": "*",
-        "illuminate/console": "^7.0|^8.0",
-        "illuminate/contracts": "^7.0|^8.0",
-        "illuminate/database": "^7.0|^8.0",
-        "illuminate/filesystem": "^7.0|^8.0",
-        "illuminate/http": "^7.0|^8.0",
-        "illuminate/pagination": "^7.0|^8.0",
-        "illuminate/support": "^7.0|^8.0",
+        "illuminate/console": "^8.0",
+        "illuminate/contracts": "^8.0",
+        "illuminate/database": "^8.0",
+        "illuminate/filesystem": "^8.0",
+        "illuminate/http": "^8.0",
+        "illuminate/pagination": "^8.0",
+        "illuminate/support": "^8.0",
         "neomerx/json-api": "^1.0.3",
         "nyholm/psr7": "^1.2",
         "ramsey/uuid": "^3.0|^4.0",
@@ -39,11 +39,11 @@
     "require-dev": {
         "ext-sqlite3": "*",
         "cloudcreativity/json-api-testing": "^3.1",
-        "guzzlehttp/guzzle": "^6.3|^7.0",
+        "guzzlehttp/guzzle": "^7.0",
         "laravel/legacy-factories": "^1.0.4",
         "laravel/ui": "^2.0",
         "mockery/mockery": "^1.1",
-        "orchestra/testbench": "^5.0|^6.0",
+        "orchestra/testbench": "^6.0",
         "phpunit/phpunit": "^9.0"
     },
     "suggest": {
@@ -78,7 +78,7 @@
             }
         }
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true,
     "config": {
         "sort-packages": true
diff --git a/docs/upgrade.md b/docs/upgrade.md
@@ -26,6 +26,8 @@ protected function rules($record, array $data): array
 }
 ```
 
+> Note that `$record` will still be `null` if the request will create a new resource.
+
 ### Soft Deletes
 
 Previously if no soft deletes field was set on an adapter, the JSON API field would default to the dash-case
diff --git a/src/Document/Error/Translator.php b/src/Document/Error/Translator.php
@@ -529,11 +529,13 @@ public function call(\Closure $closure, ...$args): ErrorInterface
      */
     protected function trans(string $key, string $member, array $replace = [], ?string $locale = null)
     {
-        return $this->translator->get(
-            "jsonapi::errors.{$key}.{$member}",
+        $value = $this->translator->get(
+            $key = "jsonapi::errors.{$key}.{$member}",
             $replace,
             $locale
         ) ?: null;
+
+        return ($key !== $value) ? $value : null;
     }
 
     /**
diff --git a/tests/lib/Integration/Validation/QueryValidationTest.php b/tests/lib/Integration/Validation/QueryValidationTest.php
@@ -146,8 +146,7 @@ public function testSearchWithFailureMeta(): void
 
         $this->resourceType = 'posts';
         $this->doSearch(['filter' => ['foo' => 'bar']])
-            ->assertStatus(400)
-            ->assertExactJson(['errors' => [$expected]]);
+            ->assertExactErrorStatus($expected);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ protected function rules($record, array $data): array`
`26`	`26`	`}`
`27`	`27`	```
`28`	`28`
	`29`	+> Note that `$record` will still be `null` if the request will create a new resource.
	`30`	`+`
`29`	`31`	`### Soft Deletes`
`30`	`32`
`31`	`33`	`Previously if no soft deletes field was set on an adapter, the JSON API field would default to the dash-case`
Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,7 @@ public function testSearchWithFailureMeta(): void`
`146`	`146`
`147`	`147`	`$this->resourceType = 'posts';`
`148`	`148`	`$this->doSearch(['filter' => ['foo' => 'bar']])`
`149`		`- ->assertStatus(400)`
`150`		`- ->assertExactJson(['errors' => [$expected]]);`
	`149`	`+ ->assertExactErrorStatus($expected);`
`151`	`150`	`}`
`152`	`151`
`153`	`152`	`/**`