Skip to content

Commit 78b30a9

Browse files
laravel-shiftcmgmyr
laravel-shift
and
cmgmyr
authored
Laravel 11.x Compatibility (#402)
* Bump dependencies for Laravel 11 * Update GitHub Actions for Laravel 11 * update actions * fix mem tests * L11 include options * update action versions * wip * rm refresh db --------- Co-authored-by: Chris Gmyr <[email protected]>
1 parent 765aa2d commit 78b30a9

File tree

6 files changed

+112
-94
lines changed

6 files changed

+112
-94
lines changed

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

+2-2
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-fixer.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/run-tests-mysql.yml

+22-20
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
name: MySQL Tests
22

3-
on: [push, pull_request]
3+
on:
4+
- push
5+
- pull_request
46

57
jobs:
68
laravel-tests:
79
runs-on: ubuntu-latest
8-
# Service container Mysql mysql
10+
911
services:
10-
# Label used to access the service container
1112
mysql:
12-
# Docker Hub image (also with version)
1313
image: mysql:8.0
1414
env:
1515
MYSQL_ALLOW_EMPTY_PASSWORD: yes
16-
MYSQL_DATABASE: db_test_laravel
17-
## map the "external" 33306 port with the "internal" 3306
16+
MYSQL_DATABASE: db_test_laravel
1817
ports:
1918
- 33306:3306
20-
# Set health checks to wait until mysql database has started (it takes some seconds to start)
2119
options: >-
2220
--health-cmd="mysqladmin ping"
2321
--health-interval=10s
@@ -28,50 +26,54 @@ jobs:
2826
fail-fast: false
2927
matrix:
3028
operating-system: [ubuntu-latest]
31-
php-versions: [ '8.3', '8.2', '8.1' ]
32-
dependency-stability: [ prefer-stable ]
33-
34-
laravel: [ '10.*', '9.*' ]
29+
php-versions: ['8.1', '8.2', '8.3']
30+
dependency-stability: [prefer-stable]
31+
laravel: ['9.*', '10.*', '11.*']
3532
include:
33+
- laravel: 9.*
34+
testbench: 7.*
3635
- laravel: 10.*
3736
testbench: 8.*
38-
- laravel: 9.*
39-
testbench: 7.*
37+
- laravel: 11.*
38+
testbench: 9.*
4039
exclude:
4140
- laravel: 10.*
4241
php-versions: 8.0
42+
- laravel: 11.*
43+
php-versions: 8.1
4344

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

4647
steps:
47-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v4
49+
4850
- name: Install PHP versions
4951
uses: shivammathur/setup-php@v2
5052
with:
5153
php-version: ${{ matrix.php-versions }}
54+
5255
- name: Get Composer Cache Directory 2
5356
id: composer-cache
5457
run: |
5558
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
56-
- uses: actions/cache@v3
59+
60+
- uses: actions/cache@v4
5761
id: actions-cache
5862
with:
5963
path: ${{ steps.composer-cache.outputs.dir }}
6064
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
6165
restore-keys: |
6266
${{ runner.os }}-composer-
67+
6368
- name: Install Laravel Dependencies
6469
run: |
65-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
66-
composer update --${{ matrix.dependency-stability }} --prefer-dist --no-interaction --no-suggest
70+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev
71+
composer update --${{ matrix.dependency-stability }} --prefer-dist --no-interaction
6772
68-
# Code quality
6973
- name: Execute tests (Unit and Feature tests) via PHPUnit
70-
# Set environment
7174
env:
7275
DB_CONNECTION: mysql
7376
DB_DATABASE: db_test_laravel
7477
DB_PORT: 33306
7578
DB_USERNAME: root
76-
7779
run: vendor/bin/phpunit --testdox

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

+26-23
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
1-
name: PostgreSQL Tests
1+
name: PostgreSQL Tests
22

3-
on: [push, pull_request]
3+
on:
4+
- push
5+
- pull_request
46

57
jobs:
68
laravel-tests:
79
runs-on: ubuntu-latest
8-
# Service container Postgresql postgresql
10+
911
services:
10-
# Label used to access the service container
1112
postgres:
12-
# Docker Hub image (also with version)
1313
image: postgres:latest
1414
env:
1515
POSTGRES_USER: postgres
1616
POSTGRES_PASSWORD: postgres
17-
POSTGRES_DB: db_test_laravel
18-
## map the "external" 55432 port with the "internal" 5432
17+
POSTGRES_DB: db_test_laravel
1918
ports:
2019
- 55432:5432
21-
# Set health checks to wait until postgresql database has started (it takes some seconds to start)
2220
options: >-
2321
--health-cmd pg_isready
2422
--health-interval 10s
@@ -29,63 +27,68 @@ jobs:
2927
fail-fast: false
3028
matrix:
3129
operating-system: [ubuntu-latest]
32-
php-versions: [ '8.3', '8.2', '8.1' ]
33-
dependency-stability: [ prefer-stable ]
34-
35-
laravel: [ '10.*', '9.*']
30+
php-versions: ['8.1', '8.2', '8.3']
31+
dependency-stability: [prefer-stable]
32+
laravel: ['9.*', '10.*', '11.*']
3633
include:
34+
- laravel: 9.*
35+
testbench: 7.*
3736
- laravel: 10.*
3837
testbench: 8.*
39-
- laravel: 9.*
40-
testbench: 7.*
38+
- laravel: 11.*
39+
testbench: 9.*
4140
exclude:
4241
- laravel: 10.*
4342
php-versions: 8.0
43+
- laravel: 11.*
44+
php-versions: 8.1
4445

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

4748
steps:
48-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v4
50+
4951
- name: Install PHP versions
5052
uses: shivammathur/setup-php@v2
5153
with:
5254
php-version: ${{ matrix.php-versions }}
55+
5356
- name: Get Composer Cache Directory 2
5457
id: composer-cache
5558
run: |
5659
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
57-
- uses: actions/cache@v3
60+
61+
- uses: actions/cache@v4
5862
id: actions-cache
5963
with:
6064
path: ${{ steps.composer-cache.outputs.dir }}
6165
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
6266
restore-keys: |
6367
${{ runner.os }}-composer-
68+
6469
- name: Cache PHP dependencies
65-
uses: actions/cache@v3
70+
uses: actions/cache@v4
6671
id: vendor-cache
6772
with:
6873
path: vendor
6974
key: ${{ runner.OS }}-build-${{ hashFiles('**/composer.lock') }}
75+
7076
- name: Install Laravel Dependencies
7177
run: |
72-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
73-
composer update --${{ matrix.dependency-stability }} --prefer-dist --no-interaction --no-suggest
74-
78+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev
79+
composer update --${{ matrix.dependency-stability }} --prefer-dist --no-interaction
7580
7681
- name: Show dir
7782
run: pwd
83+
7884
- name: PHP Version
7985
run: php --version
8086

81-
# Code quality
8287
- name: Execute tests (Unit and Feature tests) via PHPUnit
83-
# Set environment
8488
env:
8589
DB_CONNECTION: pgsql
8690
DB_DATABASE: db_test_laravel
8791
DB_PORT: 55432
8892
DB_USERNAME: postgres
8993
DB_PASSWORD: postgres
90-
9194
run: vendor/bin/phpunit --testdox

‎.github/workflows/run-tests.yml

+57-42
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: SQLite Tests
22

3-
on: [push, pull_request]
3+
on:
4+
- push
5+
- pull_request
46

57
jobs:
68
laravel-tests:
@@ -10,87 +12,100 @@ jobs:
1012
fail-fast: false
1113
matrix:
1214
operating-system: [ubuntu-latest]
13-
php-versions: [ '8.3', '8.2', '8.1', '8.0', '7.4', '7.3', '7.2' ]
14-
dependency-stability: [ prefer-stable ]
15-
laravel: [ '10.*', '9.*', '8.*', '7.*', '6.*' ]
16-
15+
php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
16+
dependency-stability: [prefer-stable]
17+
laravel: ['6.*', '7.*', '8.*', '9.*', '10.*', '11.*']
1718
include:
19+
- laravel: 6.*
20+
testbench: 4.*
21+
dbal: ^2.6
22+
- laravel: 7.*
23+
testbench: 5.*
24+
dbal: ^2.6
25+
- laravel: 8.*
26+
testbench: 6.*
27+
dbal: ^3.1.2|^2.13.3
28+
- laravel: 9.*
29+
testbench: 7.*
30+
dbal: ^3.1.2
1831
- laravel: 10.*
1932
testbench: 8.*
2033
dbal: ^3.1.2
21-
- laravel: 9.*
22-
testbench: 7.*
34+
- laravel: 11.*
35+
testbench: 9.*
2336
dbal: ^3.1.2
24-
- laravel: 8.*
25-
testbench: 6.*
26-
dbal: ^3.1.2|^2.13.3
27-
- laravel: 7.*
28-
testbench: 5.*
29-
dbal: ^2.6
30-
- laravel: 6.*
31-
testbench: 4.*
32-
dbal: ^2.6
3337
exclude:
34-
- laravel: 10.*
38+
- laravel: 6.*
39+
php-versions: 8.1
40+
- laravel: 6.*
41+
php-versions: 8.2
42+
- laravel: 6.*
43+
php-versions: 8.3
44+
- laravel: 7.*
45+
php-versions: 8.1
46+
- laravel: 7.*
47+
php-versions: 8.2
48+
- laravel: 7.*
49+
php-versions: 8.3
50+
- laravel: 7.*
3551
php-versions: 8.0
36-
- laravel: 10.*
37-
php-versions: 7.4
38-
- laravel: 10.*
39-
php-versions: 7.3
40-
- laravel: 10.*
52+
- laravel: 8.*
4153
php-versions: 7.2
4254
- laravel: 9.*
4355
php-versions: 7.2
4456
- laravel: 9.*
4557
php-versions: 7.3
4658
- laravel: 9.*
4759
php-versions: 7.4
48-
- laravel: 8.*
60+
- laravel: 10.*
61+
php-versions: 8.0
62+
- laravel: 10.*
4963
php-versions: 7.2
50-
- laravel: 7.*
51-
php-versions: 8.3
52-
- laravel: 7.*
53-
php-versions: 8.2
54-
- laravel: 7.*
55-
php-versions: 8.1
56-
- laravel: 7.*
64+
- laravel: 10.*
65+
php-versions: 7.3
66+
- laravel: 10.*
67+
php-versions: 7.4
68+
- laravel: 11.*
5769
php-versions: 8.0
58-
- laravel: 6.*
59-
php-versions: 8.3
60-
- laravel: 6.*
61-
php-versions: 8.2
62-
- laravel: 6.*
70+
- laravel: 11.*
6371
php-versions: 8.1
72+
- laravel: 11.*
73+
php-versions: 7.2
74+
- laravel: 11.*
75+
php-versions: 7.3
76+
- laravel: 11.*
77+
php-versions: 7.4
6478

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

6781
steps:
68-
- uses: actions/checkout@v3
82+
- uses: actions/checkout@v4
83+
6984
- name: Install PHP versions
7085
uses: shivammathur/setup-php@v2
7186
with:
7287
php-version: ${{ matrix.php-versions }}
88+
7389
- name: Get Composer Cache Directory 2
7490
id: composer-cache
7591
run: |
7692
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
77-
- uses: actions/cache@v3
93+
94+
- uses: actions/cache@v4
7895
id: actions-cache
7996
with:
8097
path: ${{ steps.composer-cache.outputs.dir }}
8198
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
8299
restore-keys: |
83100
${{ runner.os }}-composer-
101+
84102
- name: Install Laravel Dependencies
85103
run: |
86-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "doctrine/dbal:${{ matrix.dbal }}" --no-interaction --no-update
87-
composer update --${{ matrix.dependency-stability }} --prefer-dist --no-interaction --no-suggest
104+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "doctrine/dbal:${{ matrix.dbal }}" --no-interaction --no-update --dev
105+
composer update --${{ matrix.dependency-stability }} --prefer-dist --no-interaction
88106
89-
# Code quality
90107
- name: Execute tests (Unit and Feature tests) via PHPUnit
91-
# Set environment
92108
env:
93109
DB_CONNECTION: sqlite
94110
DB_DATABASE: ":memory:"
95-
96111
run: vendor/bin/phpunit --testdox

0 commit comments

Comments
 (0)