Skip to content

Commit 6faca1b

Browse files
authored
Update testbench to ensure compatibility with phpunit 9.x (#40)
* Remove 7.x from php 7.2 matrix
1 parent 040c138 commit 6faca1b

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ jobs:
1616
fail-fast: true
1717
matrix:
1818
php: [7.2, 7.3, 7.4]
19-
laravel: ["6.*", "7.0", "7.*", "8.*"]
19+
laravel: ["6.*", "7.*", "8.*"]
2020
exclude:
2121
- laravel: "8.*"
2222
php: 7.2
23+
- laravel: "7.*"
24+
php: 7.2
2325

2426
steps:
2527
- uses: actions/checkout@v2

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
"illuminate/view": "6.*|7.*|8.*"
1616
},
1717
"require-dev": {
18-
"fzaninotto/faker": "~1.9.1",
1918
"mockery/mockery": "^1.3.1",
2019
"phpunit/phpunit": "^8.5|^9.0",
21-
"orchestra/testbench": "^4.0|^5.0|^6.0"
20+
"orchestra/testbench": "^4.13|^5.0|^6.0"
2221
},
2322
"autoload": {
2423
"classmap": [

phpunit.xml.dist

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit backupGlobals="false"
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
backupGlobals="false"
34
backupStaticAttributes="false"
45
bootstrap="vendor/autoload.php"
56
colors="true"
67
convertErrorsToExceptions="true"
78
convertNoticesToExceptions="true"
89
convertWarningsToExceptions="true"
910
processIsolation="false"
10-
stopOnFailure="false">
11-
<testsuites>
12-
<testsuite name="TusUpload Test Suite">
13-
<directory suffix="Test.php">./tests/</directory>
14-
</testsuite>
15-
</testsuites>
16-
<php>
17-
<!--<env name="APP_ENV" value="testing"/>
11+
stopOnFailure="false"
12+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
13+
<coverage>
14+
<include>
15+
<directory>src</directory>
16+
</include>
17+
</coverage>
18+
<testsuites>
19+
<testsuite name="TusUpload Test Suite">
20+
<directory suffix="Test.php">./tests/</directory>
21+
</testsuite>
22+
</testsuites>
23+
<php>
24+
<!--<env name="APP_ENV" value="testing"/>
1825
<env name="CACHE_DRIVER" value="array"/>
1926
<env name="SESSION_DRIVER" value="array"/>
2027
<env name="QUEUE_DRIVER" value="sync"/>
2128
<env name="DB_CONNECTION" value="sqlite"/>
2229
<env name="DB_DATABASE" value=":memory:"/>-->
23-
</php>
24-
<filter>
25-
<whitelist>
26-
<directory>src</directory>
27-
</whitelist>
28-
</filter>
30+
</php>
2931
</phpunit>

0 commit comments

Comments
 (0)