Skip to content

Commit 86260c6

Browse files
committed
Merge branch 'release/7.0.0'
2 parents 5b4fb29 + 493791b commit 86260c6

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

Diff for: .github/workflows/tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
strategy:
1515
fail-fast: true
1616
matrix:
17-
php: [8.1, 8.2, 8.3]
18-
laravel: [10]
17+
php: [8.2, 8.3]
18+
laravel: [11]
1919

2020
steps:
2121
- name: Checkout Code

Diff for: CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. This projec
55

66
## Unreleased
77

8+
## [7.0.0] - 2024-03-14
9+
10+
### Changed
11+
12+
- **BREAKING** Package now requires Laravel 11.
13+
- Minimum PHP version is now `8.2`.
14+
815
## [6.1.0] - 2024-02-11
916

1017
### Fixed

Diff for: composer.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@
2222
}
2323
],
2424
"require": {
25-
"php": "^8.1",
25+
"php": "^8.2",
2626
"ext-json": "*",
27-
"laravel-json-api/neomerx-json-api": "^5.0.1",
28-
"laravel/framework": "^10.0",
29-
"nyholm/psr7": "^1.2",
27+
"laravel-json-api/neomerx-json-api": "^5.0.2",
28+
"laravel/framework": "^11.0",
29+
"nyholm/psr7": "^1.8",
3030
"ramsey/uuid": "^4.0",
31-
"symfony/psr-http-message-bridge": "^2.0"
31+
"symfony/psr-http-message-bridge": "^7.0"
3232
},
3333
"require-dev": {
3434
"ext-sqlite3": "*",
35-
"guzzlehttp/guzzle": "^7.0",
36-
"laravel-json-api/testing": "^2.0",
37-
"laravel/legacy-factories": "^1.0.4",
38-
"laravel/ui": "^4.2",
39-
"mockery/mockery": "^1.1",
40-
"orchestra/testbench": "^8.0",
35+
"guzzlehttp/guzzle": "^7.8",
36+
"laravel-json-api/testing": "^3.0",
37+
"laravel/legacy-factories": "^1.4.0",
38+
"laravel/ui": "^4.4",
39+
"mockery/mockery": "^1.6",
40+
"orchestra/testbench": "^9.0",
4141
"phpunit/phpunit": "^10.5"
4242
},
4343
"suggest": {
@@ -61,7 +61,7 @@
6161
},
6262
"extra": {
6363
"branch-alias": {
64-
"dev-develop": "5.x-dev"
64+
"dev-develop": "7.x-dev"
6565
},
6666
"laravel": {
6767
"providers": [

0 commit comments

Comments
 (0)