Skip to content

Commit a45f4df

Browse files
authored
Merge pull request #30 from bilfeldt/features/laravel-10
Add Laravel 10 support
2 parents 1152000 + 66bced0 commit a45f4df

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

.github/workflows/run-tests.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,22 @@ jobs:
1010
test:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
13-
fail-fast: true
13+
fail-fast: false
1414
matrix:
1515
os: [ubuntu-latest, windows-latest]
1616
php: [8.2, 8.1, 8.0]
17-
laravel: [9.*, 8.*]
17+
laravel: [10.*, 9.*, 8.*]
1818
stability: [prefer-stable]
1919
include:
20+
- laravel: 10.*
21+
testbench: 8.*
2022
- laravel: 9.*
2123
testbench: 7.*
2224
- laravel: 8.*
2325
testbench: 6.*
26+
exclude:
27+
- laravel: 10.*
28+
php: 8.0
2429

2530
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2631

@@ -46,4 +51,4 @@ jobs:
4651
composer update --${{ matrix.stability }} --no-interaction
4752
4853
- name: Execute tests
49-
run: vendor/bin/pest
54+
run: vendor/bin/phpunit

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
All notable changes to `laravel-flash-message` will be documented in this file.
44

5+
## 1.1.0 - 2023-05-01
6+
7+
- Add Laravel 10 support
8+
59
## 1.0.0 - 2022-12-18
610

711
- initial release

composer.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^8.0",
20-
"illuminate/contracts": "^8.51 || ^9.0"
19+
"php": "~8.0.0 || ~8.1.0 || ~8.2.0",
20+
"illuminate/contracts": "^8.51 || ^9.0 || ^10.0"
2121
},
2222
"require-dev": {
23-
"nunomaduro/collision": "^5.3 || ^6.0",
24-
"orchestra/testbench": "^6.15 || ^7.0",
25-
"pestphp/pest": "^1.18",
26-
"pestphp/pest-plugin-laravel": "^1.1",
27-
"spatie/laravel-ray": "^1.23",
28-
"vimeo/psalm": "^4.8"
23+
"nunomaduro/collision": "^5.3 || ^6.0 || ^7.0",
24+
"orchestra/testbench": "^6.15 || ^7.0 || ^8.0",
25+
"phpunit/phpunit": "^9.3",
26+
"spatie/laravel-ray": "^1.23"
2927
},
3028
"autoload": {
3129
"psr-4": {
@@ -41,7 +39,7 @@
4139
}
4240
},
4341
"scripts": {
44-
"test": "./vendor/bin/pest --no-coverage",
42+
"test": "./vendor/bin/testbench package:test --no-coverage",
4543
"test-coverage": "vendor/bin/phpunit --coverage-html coverage"
4644
},
4745
"config": {

tests/Pest.php

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)