Skip to content

Commit e1cedd2

Browse files
committed
Merge branch 'release/2.6.0'
2 parents dca1d33 + e454af4 commit e1cedd2

File tree

4 files changed

+41
-5
lines changed

4 files changed

+41
-5
lines changed

.github/workflows/build.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,33 @@ jobs:
5151
composer_update_flags: '--prefer-lowest --prefer-stable'
5252
php_ini: 'xdebug.coverage_enable=On'
5353
name: 'PHP 8.1 with lowest stable deps'
54+
- php: 8.2
55+
allow_fail: true
56+
php_ini: 'xdebug.coverage_enable=On'
57+
name: 'PHP 8.2 with latest deps'
58+
- php: 8.2
59+
allow_fail: true
60+
composer_update_flags: '--prefer-lowest --prefer-stable'
61+
php_ini: 'xdebug.coverage_enable=On'
62+
name: 'PHP 8.2 with lowest stable deps'
63+
- php: 8.3
64+
allow_fail: true
65+
php_ini: 'xdebug.coverage_enable=On'
66+
name: 'PHP 8.3 with latest deps'
67+
- php: 8.3
68+
allow_fail: true
69+
composer_update_flags: '--prefer-lowest --prefer-stable'
70+
php_ini: 'xdebug.coverage_enable=On'
71+
name: 'PHP 8.3 with lowest stable deps'
72+
- php: 8.4
73+
allow_fail: true
74+
php_ini: 'xdebug.coverage_enable=On'
75+
name: 'PHP 8.4 with latest deps'
76+
- php: 8.4
77+
allow_fail: true
78+
composer_update_flags: '--prefer-lowest --prefer-stable'
79+
php_ini: 'xdebug.coverage_enable=On'
80+
name: 'PHP 8.4 with lowest stable deps'
5481

5582
runs-on: ubuntu-latest
5683

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [2.6.0] - 2025-02-17
10+
### Added
11+
- Support Laravel 12 [PR#23](https://github.com/JsonMapper/LaravelPackage/pull/23). Thanks to [laravel-shift](https://github.com/laravel-shift) for creating the PR.
12+
- Extend workflow matrix to include PHP 8.2, 8.3 and 8.4 [PR#24](https://github.com/JsonMapper/LaravelPackage/pull/24)
13+
14+
## [2.5.0] - 2024-04-05
15+
### Added
16+
- Support Laravel 11 [PR#21](https://github.com/JsonMapper/LaravelPackage/pull/21). Thanks to [laravel-shift](https://github.com/laravel-shift) for creating the PR.
17+
918
## [2.4.0] - 2023-04-04
1019
### Added
1120
- Support Laravel 10 [PR#19](https://github.com/JsonMapper/LaravelPackage/pull/19). Thanks to [Sunil Bhatia](https://github.com/sunil19822701) for creating the PR.

Version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0
1+
2.6.0

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"require": {
1515
"json-mapper/json-mapper": "^2.3",
1616
"php": "^7.2 || ^8.0",
17-
"illuminate/support": "^5.5|^6|^7|^8|^9|^10"
17+
"illuminate/support": "^5.5|^6|^7|^8|^9|^10 || ^11.0 || ^12.0"
1818
},
1919
"autoload": {
2020
"psr-4": {
@@ -42,9 +42,9 @@
4242
"require-dev": {
4343
"ext-json": "*",
4444
"squizlabs/php_codesniffer": "^3.5",
45-
"phpstan/phpstan": "^0.12.19 || ^1.0.0",
46-
"phpunit/phpunit": "^8.0 || ^9.0",
47-
"orchestra/testbench": "^5.3|^6.0",
45+
"phpstan/phpstan": "^0.12.19 || ^1.0.0 || ^2.1",
46+
"phpunit/phpunit": "^8.0 || ^9.0 || ^10.5 || ^11.5.3",
47+
"orchestra/testbench": "^5.3|^6.0 || ^9.0 || ^10.0",
4848
"php-coveralls/php-coveralls": "^2.4",
4949
"guzzlehttp/guzzle": "^6.5 || ^7.0"
5050
}

0 commit comments

Comments
 (0)