Skip to content

Commit 1b3ce0d

Browse files
Merge pull request #18 from JacobBennett/tests/jb-l11-test-fixes
Fix L11 Shift tests
2 parents 246701f + ad4284a commit 1b3ce0d

File tree

3 files changed

+41
-45
lines changed

3 files changed

+41
-45
lines changed

Diff for: .github/workflows/tests.yml

+22-18
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,38 @@ on:
44
push:
55
branches:
66
- main
7-
87
pull_request:
9-
types: [ opened, synchronize, reopened ]
8+
types:
9+
- opened
10+
- synchronize
11+
- reopened
1012

1113
jobs:
1214
test:
1315
runs-on: ubuntu-latest
16+
1417
if: "!contains(github.event.head_commit.message, 'ci skip')"
18+
1519
strategy:
1620
fail-fast: false
1721
matrix:
18-
php: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
19-
laravel: [ 7.*, 8.*, 9.* , 10.*]
20-
dependency-version: [ prefer-lowest, prefer-stable ]
22+
php: [7.2, 7.3, 7.4, 8.0, 8.1, '8.2']
23+
laravel: ['7.*', '8.*', '9.*', '10.*', '11.*']
24+
dependency-version: [prefer-lowest, prefer-stable]
2125
include:
2226
- laravel: 10.*
2327
testbench: 8.*
2428
- laravel: 7.*
2529
testbench: 5.*
26-
2730
- laravel: 7.*
2831
dependency-version: prefer-lowest
2932
composer-version: --1
30-
3133
- laravel: 8.*
3234
testbench: 6.*
33-
3435
- laravel: 9.*
3536
testbench: 7.*
36-
37+
- laravel: 11.*
38+
testbench: 9.*
3739
exclude:
3840
- laravel: 10.*
3941
php: 7.2
@@ -45,25 +47,27 @@ jobs:
4547
php: 8.0
4648
- laravel: 7.*
4749
php: 8.1
48-
4950
- laravel: 8.*
5051
php: 8.1
5152
dependency-version: prefer-lowest
52-
53-
# Laravel 8 requires PHP 7.3.
5453
- laravel: 8.*
5554
php: 7.2
56-
57-
# Laravel 9 requires PHP 8.
5855
- laravel: 9.*
5956
php: 7.2
60-
6157
- laravel: 9.*
6258
php: 7.3
63-
6459
- laravel: 9.*
6560
php: 7.4
66-
61+
- laravel: 11.*
62+
php: 7.2
63+
- laravel: 11.*
64+
php: 7.3
65+
- laravel: 11.*
66+
php: 7.4
67+
- laravel: 11.*
68+
php: 8.0
69+
- laravel: 11.*
70+
php: 8.1
6771

6872
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
6973

@@ -91,4 +95,4 @@ jobs:
9195
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
9296
9397
- name: Execute tests
94-
run: vendor/bin/phpunit
98+
run: vendor/bin/phpunit

Diff for: composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
],
1212
"require": {
1313
"php": "^7.2|^8.0",
14-
"illuminate/support": "^7.0|^8.0|^9.0|^10.0",
15-
"illuminate/filesystem": "^7.0|^8.0|^9.0|^10.0",
16-
"illuminate/console": "^7.0|^8.0|^9.0|^10.0"
14+
"illuminate/support": "^7.0|^8.0|^9.0|^10.0|^11.0",
15+
"illuminate/filesystem": "^7.0|^8.0|^9.0|^10.0|^11.0",
16+
"illuminate/console": "^7.0|^8.0|^9.0|^10.0|^11.0"
1717
},
1818
"require-dev": {
19-
"orchestra/testbench": "^5.0|^6.0|^7.0|^8.0",
19+
"orchestra/testbench": "^5.0|^6.0|^7.0|^8.0|^9.0",
2020
"mockery/mockery": "^1.3.3",
21-
"phpunit/phpunit": "^8.4|^9.5"
21+
"phpunit/phpunit": "^8.4|^9.5|^10.5"
2222
},
2323
"autoload": {
2424
"psr-4": {

Diff for: phpunit.xml.dist

+14-22
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit bootstrap="vendor/autoload.php"
3-
backupGlobals="false"
4-
backupStaticAttributes="false"
5-
colors="true"
6-
verbose="true"
7-
convertErrorsToExceptions="true"
8-
convertNoticesToExceptions="true"
9-
convertWarningsToExceptions="true"
10-
processIsolation="false"
11-
stopOnFailure="false">
12-
<testsuites>
13-
<testsuite name="TBD Test Suite">
14-
<directory>tests</directory>
15-
</testsuite>
16-
</testsuites>
17-
<filter>
18-
<whitelist>
19-
<directory suffix=".php">src/</directory>
20-
</whitelist>
21-
</filter>
22-
<php>
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.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
3+
<testsuites>
4+
<testsuite name="TBD Test Suite">
5+
<directory>tests</directory>
6+
<exclude>tests/BaseTest.php</exclude>
7+
</testsuite>
8+
</testsuites>
9+
<php>
2310
</php>
24-
</phpunit>
11+
<source>
12+
<include>
13+
<directory suffix=".php">src/</directory>
14+
</include>
15+
</source>
16+
</phpunit>

0 commit comments

Comments
 (0)