Skip to content

Commit 95d2581

Browse files
authored
Merge pull request #596 from laravel-shift/l11-compatibility
Laravel 11.x Compatibility
2 parents f7a36eb + 9a6f921 commit 95d2581

File tree

2 files changed

+33
-32
lines changed

2 files changed

+33
-32
lines changed

.github/workflows/run-tests.yml

+22-20
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,43 @@ name: Unit Tests
33
on:
44
push:
55
branches:
6-
- master
6+
- master
77
pull_request:
88
branches:
9-
- "*"
9+
- *
1010
schedule:
11-
- cron: '0 0 * * *'
11+
- cron: '0 0 * * *'
1212

1313
jobs:
1414
php-tests:
1515
runs-on: ubuntu-latest
16+
1617
timeout-minutes: 15
18+
1719
env:
1820
COMPOSER_NO_INTERACTION: 1
1921

2022
strategy:
2123
fail-fast: false
2224
matrix:
23-
php: [8.1, 8.0, 7.4, 7.3, 7.2]
25+
php: [7.2, 7.3, 7.4, 8.0, 8.1, '8.2']
2426

2527
name: P${{ matrix.php }}
2628

2729
steps:
28-
- name: Checkout code
29-
uses: actions/checkout@v2
30-
31-
- name: Setup PHP
32-
uses: shivammathur/setup-php@v2
33-
with:
34-
php-version: ${{ matrix.php }}
35-
coverage: none
36-
tools: composer:v2
37-
38-
- name: Install dependencies
39-
run: |
40-
composer install -o --quiet
41-
42-
- name: Execute Unit Tests
43-
run: composer test
30+
- name: Checkout code
31+
uses: actions/checkout@v2
32+
33+
- name: Setup PHP
34+
uses: shivammathur/setup-php@v2
35+
with:
36+
php-version: ${{ matrix.php }}
37+
coverage: none
38+
tools: composer:v2
39+
40+
- name: Install dependencies
41+
run: |
42+
composer install -o --quiet
43+
44+
- name: Execute Unit Tests
45+
run: composer test

composer.json

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
11
{
22
"name": "kalnoy/nestedset",
33
"description": "Nested Set Model for Laravel 5.7 and up",
4-
"keywords": ["laravel", "nested sets", "nsm", "database", "hierarchy"],
4+
"keywords": [
5+
"laravel",
6+
"nested sets",
7+
"nsm",
8+
"database",
9+
"hierarchy"
10+
],
511
"license": "MIT",
6-
712
"authors": [
813
{
914
"name": "Alexander Kalnoy",
1015
"email": "[email protected]"
1116
}
1217
],
13-
1418
"require": {
1519
"php": "^7.2.5|^8.0",
16-
"illuminate/support": "^7.0|^8.0|^9.0|^10.0",
17-
"illuminate/database": "^7.0|^8.0|^9.0|^10.0",
18-
"illuminate/events": "^7.0|^8.0|^9.0|^10.0"
20+
"illuminate/support": "^7.0|^8.0|^9.0|^10.0|^11.0",
21+
"illuminate/database": "^7.0|^8.0|^9.0|^10.0|^11.0",
22+
"illuminate/events": "^7.0|^8.0|^9.0|^10.0|^11.0"
1923
},
20-
2124
"autoload": {
2225
"psr-4": {
2326
"Kalnoy\\Nestedset\\": "src/"
2427
}
2528
},
26-
2729
"require-dev": {
28-
"phpunit/phpunit": "7.*|8.*|9.*"
30+
"phpunit/phpunit": "7.*|8.*|9.*|^10.5"
2931
},
30-
3132
"minimum-stability": "dev",
3233
"prefer-stable": true,
33-
3434
"extra": {
3535
"branch-alias": {
3636
"dev-master": "v5.0.x-dev"
3737
},
38-
3938
"laravel": {
4039
"providers": [
4140
"Kalnoy\\Nestedset\\NestedSetServiceProvider"

0 commit comments

Comments
 (0)