Skip to content

Commit b7032be

Browse files
committed
Merge branch 'release/5.2.0'
2 parents 846e3da + 9d7a1e5 commit b7032be

File tree

3 files changed

+44
-33
lines changed

3 files changed

+44
-33
lines changed

.github/workflows/tests.yml

+34-29
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,48 @@ name: Tests
22

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

915
jobs:
1016
build:
11-
1217
runs-on: ubuntu-latest
1318

1419
strategy:
1520
fail-fast: true
1621
matrix:
17-
php: [8.2, 8.3, 8.4]
18-
laravel: [11]
22+
php: [ 8.2, 8.3, 8.4 ]
23+
laravel: [ 11, 12 ]
1924

2025
steps:
21-
- name: Checkout Code
22-
uses: actions/checkout@v3
23-
24-
- name: Setup PHP
25-
uses: shivammathur/setup-php@v2
26-
with:
27-
php-version: ${{ matrix.php }}
28-
extensions: dom, curl, libxml, mbstring, zip
29-
tools: composer:v2
30-
coverage: none
31-
ini-values: error_reporting=E_ALL, zend.assertions=1
32-
33-
- name: Set Laravel Version
34-
run: composer require "illuminate/contracts:^${{ matrix.laravel }}" --no-update
35-
36-
- name: Install dependencies
37-
uses: nick-fields/retry@v2
38-
with:
39-
timeout_minutes: 5
40-
max_attempts: 5
41-
command: composer update --prefer-dist --no-interaction --no-progress
42-
43-
- name: Execute tests
44-
run: vendor/bin/phpunit
26+
- name: Checkout Code
27+
uses: actions/checkout@v3
28+
29+
- name: Setup PHP
30+
uses: shivammathur/setup-php@v2
31+
with:
32+
php-version: ${{ matrix.php }}
33+
extensions: dom, curl, libxml, mbstring, zip
34+
tools: composer:v2
35+
coverage: none
36+
ini-values: error_reporting=E_ALL, zend.assertions=1
37+
38+
- name: Set Laravel Version
39+
run: composer require "illuminate/contracts:^${{ matrix.laravel }}" --no-update
40+
41+
- name: Install dependencies
42+
uses: nick-fields/retry@v2
43+
with:
44+
timeout_minutes: 5
45+
max_attempts: 5
46+
command: composer update --prefer-dist --no-interaction --no-progress
47+
48+
- name: Execute tests
49+
run: vendor/bin/phpunit

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.2.0] - 2025-02-24
9+
10+
### Added
11+
12+
- Package now supports both Laravel 11 and 12.
13+
814
## [5.1.0] - 2025-01-23
915

1016
### Added

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
"require": {
2626
"php": "^8.2",
2727
"ext-json": "*",
28-
"illuminate/auth": "^11.0",
29-
"illuminate/contracts": "^11.0",
30-
"illuminate/http": "^11.0",
31-
"illuminate/support": "^11.0"
28+
"illuminate/auth": "^11.0|^12.0",
29+
"illuminate/contracts": "^11.0|^12.0",
30+
"illuminate/http": "^11.0|^12.0",
31+
"illuminate/support": "^11.0|^12.0"
3232
},
3333
"require-dev": {
3434
"phpunit/phpunit": "^10.5"

0 commit comments

Comments
 (0)