Skip to content

Commit e099ab9

Browse files
committed
Merge branch 'release/5.1.0'
2 parents 53045c6 + 1d9955f commit e099ab9

File tree

3 files changed

+26
-14
lines changed

3 files changed

+26
-14
lines changed

.github/workflows/tests.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@ name: Tests
22

33
on:
44
push:
5-
branches: [ main, develop, 3.x ]
5+
branches:
6+
- main
7+
- develop
8+
- 3.x
69
pull_request:
7-
branches: [ main, develop, 3.x ]
10+
branches:
11+
- main
12+
- develop
13+
- 3.x
814

915
jobs:
1016
build:
@@ -14,8 +20,8 @@ jobs:
1420
strategy:
1521
fail-fast: true
1622
matrix:
17-
php: [8.2, 8.3, 8.4]
18-
laravel: [11]
23+
php: [ 8.2, 8.3, 8.4 ]
24+
laravel: [ 11, 12 ]
1925

2026
steps:
2127
- name: Checkout Code

CHANGELOG.md

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

66
## Unreleased
77

8+
## [5.1.0] - 2025-02-24
9+
10+
### Added
11+
12+
- Package now supports Laravel 12.
13+
814
## [5.0.2] - 2025-12-03
915

1016
### Fixed

composer.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@
2525
"require": {
2626
"php": "^8.2",
2727
"ext-json": "*",
28-
"laravel-json-api/core": "^5.0.1",
29-
"laravel-json-api/eloquent": "^4.4",
30-
"laravel-json-api/encoder-neomerx": "^4.1",
31-
"laravel-json-api/exceptions": "^3.1",
32-
"laravel-json-api/spec": "^3.1",
33-
"laravel-json-api/validation": "^4.2",
34-
"laravel/framework": "^11.0"
28+
"laravel-json-api/core": "^5.2",
29+
"laravel-json-api/eloquent": "^4.5",
30+
"laravel-json-api/encoder-neomerx": "^4.2",
31+
"laravel-json-api/exceptions": "^3.2",
32+
"laravel-json-api/spec": "^3.2",
33+
"laravel-json-api/validation": "^4.3",
34+
"laravel/framework": "^11.0|^12.0"
3535
},
3636
"require-dev": {
37-
"laravel-json-api/testing": "^3.0.2",
38-
"orchestra/testbench": "^9.0",
39-
"phpunit/phpunit": "^10.5"
37+
"laravel-json-api/testing": "^3.1",
38+
"orchestra/testbench": "^9.0|^10.0",
39+
"phpunit/phpunit": "^10.5|^11.0"
4040
},
4141
"autoload": {
4242
"psr-4": {

0 commit comments

Comments
 (0)