Skip to content

Commit 39f0beb

Browse files
Arthur-SkArthur
and
Arthur
authored
Update laravel to v11 and other composer dependencies (#26)
* Update composer dependencies * Adjust main.yml indent size * Add laravel v11 to tests matrix * Migrate phpunit configuration * Exclude incompatible versions from matrix * Exclude incompatible versions from matrix --------- Co-authored-by: Arthur <[email protected]>
1 parent 6ca79c1 commit 39f0beb

File tree

4 files changed

+31
-10
lines changed

4 files changed

+31
-10
lines changed

.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ trim_trailing_whitespace = true
1313

1414
[*.md]
1515
trim_trailing_whitespace = false
16+
17+
[main.yml]
18+
indent_size = 2

.github/workflows/main.yml

+18-2
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,39 @@ jobs:
3535
strategy:
3636
fail-fast: false
3737
matrix:
38-
php: [ 8.1, 8.0, 7.4 ]
39-
laravel: [ 10.*, 9.*, 8.*, 7.* ]
38+
php: [ 8.3, 8.2, 8.1, 8.0, 7.4 ]
39+
laravel: [ 11.*, 10.*, 9.*, 8.*, 7.* ]
4040
dependency-version: [ prefer-lowest, prefer-stable ]
4141
exclude:
4242
- php: 8.0
4343
dependency-version: prefer-lowest
4444
- php: 8.1
4545
dependency-version: prefer-lowest
46+
- php: 8.2
47+
dependency-version: prefer-lowest
48+
- php: 8.3
49+
dependency-version: prefer-lowest
4650
- php: 8.1
4751
laravel: 7.*
52+
- php: 8.2
53+
laravel: 7.*
54+
- php: 8.3
55+
laravel: 7.*
4856
- php: 7.4
4957
laravel: 9.*
5058
- php: 7.4
5159
laravel: 10.*
5260
- php: 8.0
5361
laravel: 10.*
62+
- php: 7.4
63+
laravel: 11.*
64+
- php: 8.0
65+
laravel: 11.*
66+
- php: 8.1
67+
laravel: 11.*
5468
include:
69+
- laravel: 11.*
70+
testbench: 9.*
5571
- laravel: 10.*
5672
testbench: 8.*
5773
- laravel: 9.*

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
],
2626
"require": {
2727
"php": "^8.0|^7.4",
28-
"illuminate/support": "^7.0|^8.0|^9.0|^10.0",
29-
"nesbot/carbon": "^2.16"
28+
"illuminate/support": "^7.0|^8.0|^9.0|^10.0|^11.0",
29+
"nesbot/carbon": "^2.16|^3.0"
3030
},
3131
"require-dev": {
32-
"orchestra/testbench": "^5.0|^6.0|^7.0|^8.0",
33-
"phpunit/phpunit": "^9.0|^10.0"
32+
"orchestra/testbench": "^5.0|^6.0|^7.0|^8.0|^9.0",
33+
"phpunit/phpunit": "^9.0|^10.0|^11.0"
3434
},
3535
"autoload": {
3636
"psr-4": {

phpunit.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
33
<coverage>
4-
<include>
5-
<directory suffix=".php">src/</directory>
6-
</include>
74
<report>
85
<clover outputFile="build/logs/clover.xml"/>
96
<html outputDirectory="build/coverage"/>
@@ -24,4 +21,9 @@
2421
<php>
2522
<env name="DB_CONNECTION" value="testing"/>
2623
</php>
24+
<source>
25+
<include>
26+
<directory suffix=".php">src/</directory>
27+
</include>
28+
</source>
2729
</phpunit>

0 commit comments

Comments
 (0)