Skip to content

Commit

Permalink
Merge pull request #30 from bilfeldt/features/laravel-10
Browse files Browse the repository at this point in the history
Add Laravel 10 support
  • Loading branch information
bilfeldt authored May 1, 2023
2 parents 1152000 + 66bced0 commit a45f4df
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 17 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,22 @@ jobs:
test:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.2, 8.1, 8.0]
laravel: [9.*, 8.*]
laravel: [10.*, 9.*, 8.*]
stability: [prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 9.*
testbench: 7.*
- laravel: 8.*
testbench: 6.*
exclude:
- laravel: 10.*
php: 8.0

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

Expand All @@ -46,4 +51,4 @@ jobs:
composer update --${{ matrix.stability }} --no-interaction
- name: Execute tests
run: vendor/bin/pest
run: vendor/bin/phpunit
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

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

## 1.1.0 - 2023-05-01

- Add Laravel 10 support

## 1.0.0 - 2022-12-18

- initial release
Expand Down
16 changes: 7 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,14 @@
}
],
"require": {
"php": "^8.0",
"illuminate/contracts": "^8.51 || ^9.0"
"php": "~8.0.0 || ~8.1.0 || ~8.2.0",
"illuminate/contracts": "^8.51 || ^9.0 || ^10.0"
},
"require-dev": {
"nunomaduro/collision": "^5.3 || ^6.0",
"orchestra/testbench": "^6.15 || ^7.0",
"pestphp/pest": "^1.18",
"pestphp/pest-plugin-laravel": "^1.1",
"spatie/laravel-ray": "^1.23",
"vimeo/psalm": "^4.8"
"nunomaduro/collision": "^5.3 || ^6.0 || ^7.0",
"orchestra/testbench": "^6.15 || ^7.0 || ^8.0",
"phpunit/phpunit": "^9.3",
"spatie/laravel-ray": "^1.23"
},
"autoload": {
"psr-4": {
Expand All @@ -41,7 +39,7 @@
}
},
"scripts": {
"test": "./vendor/bin/pest --no-coverage",
"test": "./vendor/bin/testbench package:test --no-coverage",
"test-coverage": "vendor/bin/phpunit --coverage-html coverage"
},
"config": {
Expand Down
5 changes: 0 additions & 5 deletions tests/Pest.php

This file was deleted.

0 comments on commit a45f4df

Please sign in to comment.