Skip to content

Commit cbd1923

Browse files
avvertixavvertix
authored
Support Laravel 11, drop Laravel 9 (#4)
* Support Laravel 11, drop Laravel 9
1 parent 4d3d099 commit cbd1923

File tree

5 files changed

+38
-54
lines changed

5 files changed

+38
-54
lines changed

‎.github/workflows/php-cs-fixer.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
steps:
1010
- name: Checkout code
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1212
with:
1313
ref: ${{ github.head_ref }}
1414

@@ -18,6 +18,6 @@ jobs:
1818
args: --config=.php_cs.dist.php --allow-risky=yes
1919

2020
- name: Commit changes
21-
uses: stefanzweifel/git-auto-commit-action@v4
21+
uses: stefanzweifel/git-auto-commit-action@v5
2222
with:
2323
commit_message: Fix styling

‎.github/workflows/psalm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: psalm
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
@@ -21,7 +21,7 @@ jobs:
2121
coverage: none
2222

2323
- name: Cache composer dependencies
24-
uses: actions/cache@v3
24+
uses: actions/cache@v4
2525
with:
2626
path: vendor
2727
key: composer-${{ hashFiles('composer.lock') }}

‎.github/workflows/run-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
fail-fast: true
1414
matrix:
1515
os: [ubuntu-latest]
16-
php: [8.1, 8.2]
17-
laravel: ['^9.12', '^10.0']
16+
php: [8.2, 8.3]
17+
laravel: ['^10.0', '^11.0']
1818
stability: [prefer-lowest, prefer-stable]
1919

2020
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2121

2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525

2626
- name: Download Franc binary
2727
run: |
@@ -46,4 +46,4 @@ jobs:
4646
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
4747
4848
- name: Execute tests
49-
run: vendor/bin/phpunit
49+
run: vendor/bin/phpunit --no-coverage

‎composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
],
1818
"require": {
1919
"php": "^8.0",
20-
"illuminate/contracts": "^9.12|^10.0",
21-
"illuminate/support": "^9.12|^10.0",
22-
"illuminate/http": "^9.12|^10.0",
23-
"symfony/process": "^6.0"
20+
"illuminate/contracts": "^10.0|^11.0",
21+
"illuminate/support": "^10.0|^11.0",
22+
"illuminate/http": "^10.0|^11.0",
23+
"symfony/process": "^6.2|^7.0"
2424
},
2525
"require-dev": {
26-
"brianium/paratest": "^6.2",
27-
"nunomaduro/collision": "^6.1|^7.0",
28-
"orchestra/testbench": "^7.0|^8.0",
29-
"phpunit/phpunit": "^9.5.10|^10.0",
30-
"vimeo/psalm": "^4.8",
26+
"brianium/paratest": "^7.0",
27+
"nunomaduro/collision": "^7.0|^8.0",
28+
"orchestra/testbench": "^8.0|^9.0",
29+
"phpunit/phpunit": "^10.5|^11.0",
30+
"vimeo/psalm": "^5.0",
3131
"guzzlehttp/guzzle": "^7.0.1"
3232
},
3333
"autoload": {

‎phpunit.xml.dist

Lines changed: 21 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
5-
backupGlobals="false"
6-
backupStaticAttributes="false"
7-
bootstrap="vendor/autoload.php"
8-
colors="true"
9-
convertErrorsToExceptions="true"
10-
convertNoticesToExceptions="true"
11-
convertWarningsToExceptions="true"
12-
processIsolation="false"
13-
stopOnFailure="false"
14-
executionOrder="random"
15-
failOnWarning="true"
16-
failOnRisky="true"
17-
failOnEmptyTestSuite="true"
18-
beStrictAboutOutputDuringTests="true"
19-
verbose="true"
20-
>
21-
<testsuites>
22-
<testsuite name="Oneofftech Test Suite">
23-
<directory>tests</directory>
24-
</testsuite>
25-
</testsuites>
26-
<coverage>
27-
<include>
28-
<directory suffix=".php">./src</directory>
29-
</include>
30-
<report>
31-
<html outputDirectory="build/coverage"/>
32-
<text outputFile="build/coverage.txt"/>
33-
<clover outputFile="build/logs/clover.xml"/>
34-
</report>
35-
</coverage>
36-
<logging>
37-
<junit outputFile="build/report.junit.xml"/>
38-
</logging>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
3+
<testsuites>
4+
<testsuite name="Oneofftech Test Suite">
5+
<directory>tests</directory>
6+
</testsuite>
7+
</testsuites>
8+
<coverage>
9+
<report>
10+
<html outputDirectory="build/coverage"/>
11+
<text outputFile="build/coverage.txt"/>
12+
<clover outputFile="build/logs/clover.xml"/>
13+
</report>
14+
</coverage>
15+
<logging>
16+
<junit outputFile="build/report.junit.xml"/>
17+
</logging>
18+
<source>
19+
<include>
20+
<directory suffix=".php">./src</directory>
21+
</include>
22+
</source>
3923
</phpunit>

0 commit comments

Comments
 (0)