Skip to content

Commit a6614c4

Browse files
authored
add support for laravel 10 (norbybaru#14)
* add support for laravel 10 * fix phpunit
1 parent c993629 commit a6614c4

File tree

4 files changed

+29
-23
lines changed

4 files changed

+29
-23
lines changed

.github/workflows/run-tests.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,20 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
php: [8.0, 8.1]
19-
laravel: [8.*, 9.*]
19+
laravel: [8.*, 9.*, 10.*]
2020
dependency-version: [prefer-lowest, prefer-stable]
2121
include:
2222
- laravel: 8.*
2323
testbench: ^6.0
24+
exclude:
25+
- laravel: 10.*
26+
php: 8.0
2427

2528
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
2629

2730
steps:
2831
- name: Checkout
29-
uses: actions/checkout@v2
32+
uses: actions/checkout@v3
3033

3134
- name: Setup PHP
3235
uses: shivammathur/setup-php@v2
@@ -38,7 +41,7 @@ jobs:
3841
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
3942

4043
- name: Cache Composer dependencies
41-
uses: actions/cache@v1
44+
uses: actions/cache@v3
4245
with:
4346
path: ${{ steps.composer-cache.outputs.dir }}
4447
# Use composer.json for key, if composer.lock is not committed.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
*.lock
2+
*.bak
23
/.env
34
/.phpunit.result.cache
45
/.vscode
6+
/*.cache
57
/build
68
/vendor

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
],
3232
"require": {
3333
"php": "^8.0",
34-
"illuminate/support": "^8.0|^9.0",
35-
"aws/aws-sdk-php": "^3.209"
34+
"aws/aws-sdk-php": "^3.209",
35+
"illuminate/support": "^8.0|^9.52|^10.0"
3636
},
3737
"minimum-stability": "dev",
3838
"prefer-stable": true,
@@ -46,8 +46,8 @@
4646
"require-dev": {
4747
"guzzlehttp/guzzle": "^7.4",
4848
"nunomaduro/larastan": "^1.0|^2.0",
49-
"orchestra/testbench": "^6.24|^7.0",
50-
"phpunit/phpunit": "^9.5",
49+
"orchestra/testbench": "^6.24|^7.0|^8.0",
50+
"phpunit/phpunit": "^9.5|^10.0",
5151
"vlucas/phpdotenv": "^5.4"
5252
}
5353
}

phpunit.xml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit
3-
backupGlobals="false"
4-
backupStaticAttributes="false"
5-
bootstrap="vendor/autoload.php"
6-
colors="true"
7-
convertErrorsToExceptions="true"
8-
convertNoticesToExceptions="true"
9-
convertWarningsToExceptions="true"
10-
processIsolation="false"
11-
stopOnFailure="false">
12-
<testsuites>
13-
<testsuite name="Test Suite">
14-
<directory suffix="Test.php">./tests</directory>
15-
</testsuite>
16-
</testsuites>
17-
</phpunit>
2+
<phpunit
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
backupGlobals="false"
5+
bootstrap="vendor/autoload.php"
6+
colors="true"
7+
processIsolation="false"
8+
stopOnFailure="false"
9+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
10+
cacheDirectory=".phpunit.cache"
11+
backupStaticProperties="false"
12+
>
13+
<testsuites>
14+
<testsuite name="Test Suite">
15+
<directory suffix="Test.php">./tests</directory>
16+
</testsuite>
17+
</testsuites>
18+
</phpunit>

0 commit comments

Comments
 (0)