Skip to content

Commit 1cd3407

Browse files
Merge pull request #79 from TheDragonCode/andrey-helldar-patch-1
Added Laravel 12 support
2 parents 219c1ba + 25e82ff commit 1cd3407

File tree

3 files changed

+30
-28
lines changed

3 files changed

+30
-28
lines changed

.github/workflows/phpunit.yml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,57 +9,64 @@ jobs:
99
strategy:
1010
fail-fast: true
1111
matrix:
12-
php: [ "7.3", "7.4", "8.0", "8.1", "8.2", "8.3" ]
13-
laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0", "11.0" ]
12+
php: [ "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
13+
laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0", "11.0", "12.0" ]
1414
exclude:
1515
- laravel: "6.0"
1616
php: "8.1"
17-
1817
- laravel: "6.0"
1918
php: "8.2"
20-
2119
- laravel: "6.0"
2220
php: "8.3"
21+
- laravel: "6.0"
22+
php: "8.4"
2323

2424
- laravel: "7.0"
2525
php: "8.1"
26-
2726
- laravel: "7.0"
2827
php: "8.2"
29-
3028
- laravel: "7.0"
3129
php: "8.3"
30+
- laravel: "7.0"
31+
php: "8.4"
32+
33+
- laravel: "8.0"
34+
php: "8.4"
3235

3336
- laravel: "9.0"
3437
php: "7.3"
35-
3638
- laravel: "9.0"
3739
php: "7.4"
38-
3940
- laravel: "9.0"
4041
php: "8.3"
42+
- laravel: "9.0"
43+
php: "8.4"
4144

4245
- laravel: "10.0"
4346
php: "7.3"
44-
4547
- laravel: "10.0"
4648
php: "7.4"
47-
4849
- laravel: "10.0"
4950
php: "8.0"
5051

5152
- laravel: "11.0"
5253
php: "7.3"
53-
5454
- laravel: "11.0"
5555
php: "7.4"
56-
5756
- laravel: "11.0"
5857
php: "8.0"
59-
6058
- laravel: "11.0"
6159
php: "8.1"
6260

61+
- laravel: "12.0"
62+
php: "7.3"
63+
- laravel: "12.0"
64+
php: "7.4"
65+
- laravel: "12.0"
66+
php: "8.0"
67+
- laravel: "12.0"
68+
php: "8.1"
69+
6370
name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
6471

6572
steps:

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@
4444
"dragon-code/laravel-routes-core": "^4.1 || ^5.0",
4545
"dragon-code/laravel-support": "^3.3",
4646
"dragon-code/support": "^5.6 || ^6.1",
47-
"illuminate/contracts": ">=6.0 <12.0",
48-
"illuminate/http": ">=6.0 <12.0",
49-
"illuminate/routing": ">=6.0 <12.0",
50-
"illuminate/support": ">=6.0 <12.0",
51-
"illuminate/view": ">=6.0 <12.0"
47+
"illuminate/contracts": ">=6.0 <13.0",
48+
"illuminate/http": ">=6.0 <13.0",
49+
"illuminate/routing": ">=6.0 <13.0",
50+
"illuminate/support": ">=6.0 <13.0",
51+
"illuminate/view": ">=6.0 <13.0"
5252
},
5353
"require-dev": {
5454
"mockery/mockery": "^1.0",
55-
"orchestra/testbench": ">=4.0 <10.0",
56-
"phpunit/phpunit": "^8.0 || ^9.6 || ^10.0"
55+
"orchestra/testbench": ">=4.0 <11.0",
56+
"phpunit/phpunit": "^8.0 || ^9.6 || ^10.0 || ^11.0 || ^12.0"
5757
},
5858
"conflict": {
5959
"garygreen/pretty-routes": "*"
@@ -97,4 +97,4 @@
9797
}
9898
]
9999
}
100-
}
100+
}

phpunit.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
convertNoticesToExceptions="false"
2323
convertWarningsToExceptions="false"
2424
processIsolation="false"
25-
stopOnError="false"
26-
stopOnFailure="false"
25+
stopOnError="true"
26+
stopOnFailure="true"
2727
verbose="true"
2828
>
2929
<coverage processUncoveredFiles="true">
@@ -33,11 +33,6 @@
3333
<exclude>
3434
<file>src/ServiceProvider.php</file>
3535
</exclude>
36-
<report>
37-
<clover outputFile="build/logs/clover.xml"/>
38-
<html outputDirectory="build/logs/coverage"/>
39-
<text outputFile="build/logs/coverage.txt"/>
40-
</report>
4136
</coverage>
4237
<php>
4338
<env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>

0 commit comments

Comments
 (0)