8000 Merge tag 'v6.0.0' into develop · cloudcreativity/laravel-json-api@bec3311 · GitHub
[go: up one dir, main page]
Skip to content

Commit bec3311

Browse files
lindyhopchrislindyhopchris
committed
Merge tag 'v6.0.0' into develop
Laravel 10
2 parents 591e5af + c8cc395 commit bec3311

File tree

7 files changed

+10
-12
lines changed

7 files changed

+10
-12
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
All notable changes to this project will be documented in this file. This project adheres to
44
[Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
55

6-
## Unreleased (6.0)
6+
## [6.0.0] - 2023-02-14
77

88
### Changed
99

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
}
7373
}
7474
},
75-
"minimum-stability": "dev",
75+
"minimum-stability": "stable",
7676
"prefer-stable": true,
7777
"config": {
7878
"sort-packages": true

‎tests/lib/Integration/Eloquent/ClientGeneratedIdTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function testCreateWithInvalidId()
111111

112112
$error = [
113113
'title' => 'Unprocessable Entity',
114-
'detail' => 'The id format is invalid.',
114+
'detail' => 'The id field format is invalid.',
115115
'status' => '422',
116116
'source' => ['pointer' => '/data/id'],
117117
];

‎tests/lib/Integration/Eloquent/ResourceTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,15 +270,15 @@ public function testCreateInvalid()
270270
[
271271
'status' => '422',
272272
'title' => 'Unprocessable Entity',
273-
'detail' => 'The title must be a string.',
273+
'detail' => 'The title field must be a string.',
274274
'source' => [
275275
'pointer' => '/data/attributes/title',
276276
],
277277
],
278278
[
279279
'status' => '422',
280280
'title' => 'Unprocessable Entity',
281-
'detail' => 'The title must be between 5 and 255 characters.',
281+
'detail' => 'The title field must be between 5 and 255 characters.',
282282
'source' => [
283283
'pointer' => '/data/attributes/title',
284284
],

‎tests/lib/Integration/GeneratorsTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ protected function setUp(): void
4545
{
4646
parent::setUp();
4747

48-
$this->markTestSkipped('@TODO requires bugfix: https://github.com/laravel/framework/pull/45864');
49-
5048
// required for tests to work in Laravel 5.7
5149
if (method_exists($this, 'withoutMockingConsoleOutput')) {
5250
$this->withoutMockingConsoleOutput();

‎tests/lib/Integration/Validation/FailedMetaTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function rulesProvider(): array
7373
[
7474
'status' => '422',
7575
'title' => 'Unprocessable Entity',
76-
'detail' => 'The value must be a date before or equal to 2018-12-31 23:59:59.',
76+
'detail' => 'The value field must be a date before or equal to 2018-12-31 23:59:59.',
7777
'meta' => [
7878
'failed' => [
7979
'rule' => 'before-or-equal',
@@ -93,7 +93,7 @@ public function rulesProvider(): array
9393
[
9494
'status' => '422',
9595
'title' => 'Unprocessable Entity',
96-
'detail' => 'The value must be between 1 and 9.',
96+
'detail' => 'The value field must be between 1 and 9.',
9797
'meta' => [
9898
'failed' => [
9999
'rule' => 'between',
@@ -234,7 +234,7 @@ public function testMultiple(): void
234234
[
235235
'status' => '422',
236236
'title' => 'Unprocessable Entity',
237-
'detail' => 'The title must be a string.',
237+
'detail' => 'The title field must be a string.',
238238
'source' => [
239239
'pointer' => '/data/attributes/title',
240240
],
@@ -247,7 +247,7 @@ public function testMultiple(): void
247247
[
248248
'status' => '422',
249249
'title' => 'Unprocessable Entity',
250-
'detail' => 'The title must be between 5 and 255 characters.',
250+
'detail' => 'The title field must be between 5 and 255 characters.',
251251
'source' => [
252252
'pointer' => '/data/attributes/title',
253253
],

‎tests/lib/Integration/Validation/QueryValidationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function searchProvider()
7777
'page:invalid' => [
7878
['page' => ['number' => 0, 'size' => 10]],
7979
'page.number',
80-
'The page.number must be at least 1.',
80+
'The page.number field must be at least 1.',
8181
],
8282
'page:not allowed (singular)' => [
8383
['page' => ['foo' => 'bar', 'size' => 10]],

0 commit comments

Comments
 (0)
0