Skip to content

Commit 71f6d88

Browse files
laravel-shiftcmgmyr
laravel-shift
and
cmgmyr
authored
Laravel 12.x Compatibility (#408)
* Bump dependencies for Laravel 12 * Update GitHub Actions for Laravel 12 * update test workflows * fix memory db * rm coverage --------- Co-authored-by: Chris Gmyr <[email protected]>
1 parent 78b30a9 commit 71f6d88

File tree

5 files changed

+36
-54
lines changed

5 files changed

+36
-54
lines changed

‎.github/workflows/run-tests-mysql.yml

+5-16
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,20 @@ jobs:
1616
MYSQL_DATABASE: db_test_laravel
1717
ports:
1818
- 33306:3306
19-
options: >-
20-
--health-cmd="mysqladmin ping"
21-
--health-interval=10s
22-
--health-timeout=5s
23-
--health-retries=3
19+
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
2420

2521
strategy:
2622
fail-fast: false
2723
matrix:
2824
operating-system: [ubuntu-latest]
29-
php-versions: ['8.1', '8.2', '8.3']
25+
php-versions: ['8.3', '8.4']
3026
dependency-stability: [prefer-stable]
31-
laravel: ['9.*', '10.*', '11.*']
27+
laravel: ['11.*', '12.*']
3228
include:
33-
- laravel: 9.*
34-
testbench: 7.*
35-
- laravel: 10.*
36-
testbench: 8.*
3729
- laravel: 11.*
3830
testbench: 9.*
39-
exclude:
40-
- laravel: 10.*
41-
php-versions: 8.0
42-
- laravel: 11.*
43-
php-versions: 8.1
31+
- laravel: 12.*
32+
testbench: 10.*
4433

4534
name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
4635

‎.github/workflows/run-tests-postgres.yml

+5-16
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,20 @@ jobs:
1717
POSTGRES_DB: db_test_laravel
1818
ports:
1919
- 55432:5432
20-
options: >-
21-
--health-cmd pg_isready
22-
--health-interval 10s
23-
--health-timeout 5s
24-
--health-retries 5
20+
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
2521

2622
strategy:
2723
fail-fast: false
2824
matrix:
2925
operating-system: [ubuntu-latest]
30-
php-versions: ['8.1', '8.2', '8.3']
26+
php-versions: ['8.3', '8.4']
3127
dependency-stability: [prefer-stable]
32-
laravel: ['9.*', '10.*', '11.*']
28+
laravel: ['11.*', '12.*']
3329
include:
34-
- laravel: 9.*
35-
testbench: 7.*
36-
- laravel: 10.*
37-
testbench: 8.*
3830
- laravel: 11.*
3931
testbench: 9.*
40-
exclude:
41-
- laravel: 10.*
42-
php-versions: 8.0
43-
- laravel: 11.*
44-
php-versions: 8.1
32+
- laravel: 12.*
33+
testbench: 10.*
4534

4635
name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
4736

‎.github/workflows/run-tests.yml

+20-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
operating-system: [ubuntu-latest]
15-
php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
15+
php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
1616
dependency-stability: [prefer-stable]
17-
laravel: ['6.*', '7.*', '8.*', '9.*', '10.*', '11.*']
17+
laravel: ['6.*', '7.*', '8.*', '9.*', '10.*', '11.*', '12.*']
1818
include:
1919
- laravel: 6.*
2020
testbench: 4.*
@@ -34,21 +34,28 @@ jobs:
3434
- laravel: 11.*
3535
testbench: 9.*
3636
dbal: ^3.1.2
37+
- laravel: 12.*
38+
testbench: 10.*
39+
dbal: ^4.2
3740
exclude:
3841
- laravel: 6.*
3942
php-versions: 8.1
4043
- laravel: 6.*
4144
php-versions: 8.2
4245
- laravel: 6.*
4346
php-versions: 8.3
47+
- laravel: 6.*
48+
php-versions: 8.4
49+
- laravel: 7.*
50+
php-versions: 8.0
4451
- laravel: 7.*
4552
php-versions: 8.1
4653
- laravel: 7.*
4754
php-versions: 8.2
4855
- laravel: 7.*
4956
php-versions: 8.3
5057
- laravel: 7.*
51-
php-versions: 8.0
58+
php-versions: 8.4
5259
- laravel: 8.*
5360
php-versions: 7.2
5461
- laravel: 9.*
@@ -75,6 +82,16 @@ jobs:
7582
php-versions: 7.3
7683
- laravel: 11.*
7784
php-versions: 7.4
85+
- laravel: 12.*
86+
php-versions: 7.2
87+
- laravel: 12.*
88+
php-versions: 7.3
89+
- laravel: 12.*
90+
php-versions: 7.4
91+
- laravel: 12.*
92+
php-versions: 8.0
93+
- laravel: 12.*
94+
php-versions: 8.1
7895

7996
name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
8097

‎composer.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
],
1919
"require": {
2020
"php": "^7.2|^8.0",
21-
"illuminate/config": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
22-
"illuminate/database": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
23-
"illuminate/support": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0"
21+
"illuminate/config": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
22+
"illuminate/database": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
23+
"illuminate/support": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0"
2424
},
2525
"require-dev": {
26-
"doctrine/dbal": "^3.1.2|^2.13.3",
26+
"doctrine/dbal": "^3.1.2|^2.13.3|^4.2",
2727
"fakerphp/faker": "^1.16|^1.9.1",
2828
"friendsofphp/php-cs-fixer": "^3.2|^2.18",
29-
"orchestra/testbench": "^3.0|^4.0|^5.0|^6.0|^7.0|^8.0|^9.0",
30-
"phpunit/phpunit": "^8.0|^9.3.3|^10.5"
29+
"orchestra/testbench": "^3.0|^4.0|^5.0|^6.0|^7.0|^8.0|^9.0|^10.0",
30+
"phpunit/phpunit": "^8.0|^9.3.3|^10.5|^11.5.3"
3131
},
3232
"autoload": {
3333
"psr-4": {

‎phpunit.xml

-13
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,6 @@
1717
beStrictAboutOutputDuringTests="true"
1818
verbose="true"
1919
>
20-
<coverage>
21-
<include>
22-
<directory suffix=".php">src</directory>
23-
</include>
24-
<exclude>
25-
<file>src/MessengerServiceProvider.php</file>
26-
</exclude>
27-
<report>
28-
<clover outputFile="build/logs/clover.xml"/>
29-
<html outputDirectory="build/coverage"/>
30-
<text outputFile="build/coverage.txt"/>
31-
</report>
32-
</coverage>
3320
<testsuites>
3421
<testsuite name="Messenger Test Suite">
3522
<directory suffix="Test.php">./tests/</directory>

0 commit comments

Comments
 (0)