Skip to content

Commit 283d9c9

Browse files
authored
Support Laravel 10 (#498)
1 parent 466511d commit 283d9c9

File tree

4 files changed

+36
-41
lines changed

4 files changed

+36
-41
lines changed

.editorconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
; This file is for unifying the coding style for different editors and IDEs.
2+
; More information at http://editorconfig.org
3+
4+
root = true
5+
6+
[*]
7+
charset = utf-8
8+
indent_size = 4
9+
indent_style = space
10+
end_of_line = lf
11+
insert_final_newline = true
12+
trim_trailing_whitespace = true
13+
14+
[*.md]
15+
trim_trailing_whitespace = false

.github/workflows/run-tests.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,12 @@ jobs:
1919

2020
strategy:
2121
matrix:
22-
php: [8.0, 7.4, 7.3, 7.2]
23-
laravel: [8.*, 7.*, 6.*]
22+
php: [8.2, 8.1, 8.0]
23+
laravel: [10.*, 9.*]
2424
dependency-version: [prefer-lowest, prefer-stable]
25-
include:
26-
- laravel: 9.*
27-
php: 8.1
28-
dependency-version: prefer-stable
29-
- laravel: 9.*
30-
php: 8.0
31-
dependency-version: prefer-lowest
3225
exclude:
33-
- laravel: 8.*
34-
php: 7.2
35-
- php: 8.0
36-
dependency-version: prefer-lowest
26+
- laravel: 10.*
27+
php: 8.0
3728

3829
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
3930

@@ -60,4 +51,4 @@ jobs:
6051
composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress
6152
6253
- name: Execute Unit Tests
63-
run: composer test
54+
run: composer test

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
],
1212
"require": {
1313
"php": ">=7.2",
14-
"illuminate/support": "^6|^7|^8|^9",
15-
"illuminate/filesystem": "^6|^7|^8|^9",
16-
"knplabs/knp-snappy": "^1"
14+
"illuminate/support": "^9|^10",
15+
"illuminate/filesystem": "^9|^10",
16+
"knplabs/knp-snappy": "^1.4"
1717
},
1818
"require-dev": {
19-
"orchestra/testbench": "^4|^5|^6|^7"
19+
"orchestra/testbench": "^7|^8"
2020
},
2121
"autoload": {
2222
"psr-4": {

phpunit.xml.dist

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

0 commit comments

Comments
 (0)